1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-10 21:22:58 +01:00
Commit Graph

1107 Commits

Author SHA1 Message Date
David Bomba
b33ad0c03e Set plan 2021-08-12 22:04:50 +10:00
David Bomba
bc81043973 Fixes for Molli 2021-08-11 16:43:20 +10:00
David Bomba
7b73104a45 Merge branch 'paytrace' into v5-develop 2021-08-11 10:03:02 +10:00
David Bomba
3727bafaa1 More logging for migrations 2021-08-10 11:40:58 +10:00
David Bomba
c2c71ab69c Hosted email quotas 2021-08-09 20:33:59 +10:00
=
3fe22e79a8 system logs 2021-08-08 22:20:32 +10:00
=
93ab5480a6 Minor fixes for referral codes 2021-08-08 21:50:13 +10:00
David Bomba
659b955862 Make markdown support in invoices optional 2021-08-08 08:27:53 +10:00
=
2ec4adc4c8 Fixes for account reference 2021-08-07 21:34:20 +10:00
=
2bd5c35775 Email quotas exceeded 2021-08-07 21:10:01 +10:00
=
e6ccb9bde7 Email quota exceeded emails 2021-08-07 20:56:42 +10:00
=
0f2ed3fe97 Email Quotas for hosted 2021-08-07 19:55:18 +10:00
David Bomba
b32d852a00 Fixes for payment variables 2021-08-07 13:43:34 +10:00
Benjamin Beganović
4db925104a Refunds & fixes for profileId 2021-08-04 14:31:47 +02:00
Benjamin Beganović
d3cc6d6014 Allow $client in driver() (CompanyGateway) to be nullable 2021-08-02 14:47:34 +02:00
=
6efe373c55 Client merge 2021-08-01 15:46:40 +10:00
David Bomba
9acc02a7df Tets 2021-07-31 19:59:04 +10:00
David Bomba
c298ab40fa Fixes for bulk invoice downloads 2021-07-30 10:37:32 +10:00
Benjamin Beganović
1e2e55c9e4 Credit card 3ds processing 2021-07-29 15:13:38 +02:00
David Bomba
f7a31f9ed2 Merge branch 'v5-develop' of https://github.com/turbo124/invoiceninja into v5-develop 2021-07-29 12:20:05 +10:00
David Bomba
b91af0dc69 Client Contact password reset links 2021-07-29 12:19:56 +10:00
David Bomba
7fab6e05a4 Fixes for locked invoices 2021-07-28 12:29:51 +10:00
David Bomba
83fbf55a32
Merge pull request #6340 from turbo124/eway
Eway Payment Driver
2021-07-27 15:42:07 +10:00
David Bomba
9ef77e8b53 Token and Refunding from eWay 2021-07-27 15:41:31 +10:00
David Bomba
0fe892a292 Sort order of system log 2021-07-27 09:02:14 +10:00
Benjamin Beganović
2501654fec Add withData() to PaymentHash 2021-07-26 17:03:28 +02:00
David Bomba
052fb222d5 Minor fixes for invoice notifications 2021-07-26 19:55:54 +10:00
=
8ea34e4f7f Protected subdomains 2021-07-25 21:51:41 +10:00
David Bomba
8ff01a97a2 Remove base 64 encoding 2021-07-24 17:43:16 +10:00
David Bomba
23a7cb2057 Alternate company logo presenter 2021-07-24 17:29:33 +10:00
Benjamin Beganović
a29d4f2075 wip 2021-07-23 14:43:32 +02:00
David Bomba
5ea07be358
Merge pull request #6317 from turbo124/paytrace
Paytrace
2021-07-23 17:31:23 +10:00
David Bomba
437bb735d6 Working on eWay 2021-07-22 16:05:58 +10:00
David Bomba
b5697966b5 eway 2021-07-22 11:30:16 +10:00
David Bomba
c6ed151813 Fixes for ACH 2021-07-22 08:44:03 +10:00
David Bomba
00d1273bd9 Fixes for gateway abilities 2021-07-21 20:35:22 +10:00
David Bomba
c0287085b5 Scaffolding Paytrace 2021-07-20 21:26:24 +10:00
David Bomba
0a77e571fe Fixes for uses_inclusive_taxes 2021-07-17 20:36:51 +10:00
David Bomba
ba5d2f8fc3 Fixes for importing payments with non-transformed invoices 2021-07-16 17:47:44 +10:00
=
ecf7f66cfe Working on actions when a subscription invoice is paid 2021-07-14 21:20:41 +10:00
David Bomba
d448ae1119 fixes for trial_started 2021-07-14 17:15:59 +10:00
David Bomba
45dce736ba Fixes for fillables 2021-07-14 17:07:02 +10:00
David Bomba
a2d0965ed5 Fixes for plan_expires type casting 2021-07-11 14:54:57 +10:00
David Bomba
6edfa0a966 Fixes for User model 2021-07-10 18:59:55 +10:00
David Bomba
72a6dd8f4c Cache timezones and languages 2021-07-10 11:40:27 +10:00
David Bomba
70a7336163 Bug fixes 2021-07-09 15:50:16 +10:00
David Bomba
5affb4a036 Additional checks for payment method objects 2021-07-09 09:46:18 +10:00
David Bomba
95bc747523 Fixes for displaying enabled gateways for payment methods 2021-07-07 08:46:03 +10:00
David Bomba
852461541e Minor fixes 2021-07-05 20:45:40 +10:00
David Bomba
552afe3374 Minor fixes 2021-07-05 20:45:00 +10:00
David Bomba
620ad57d50 merging v5-dev 2021-07-05 09:00:46 +10:00
David Bomba
7dbe870ce0 Fixes for payment methods - gateway types 2021-07-04 13:16:12 +10:00
David Bomba
71e0ec9b60 Fixes for company gateway system logs 2021-07-04 08:22:33 +10:00
David Bomba
e8a1df16cd Fixes for credit query 2021-07-02 16:36:14 +10:00
David Bomba
69461104fe Fixes for client gateways 2021-07-01 15:56:44 +10:00
David Bomba
d353ef9a5f Fixes for gateways 2021-06-30 21:21:46 +10:00
David Bomba
a48328b90c Fixes for email translations 2021-06-29 19:46:40 +10:00
David Bomba
021761d33d Make navigating subscriptions easier 2021-06-27 19:20:56 +10:00
David Bomba
fd81ac4ea3 Fixes for timeshift offsets when offset is negative 2021-06-25 12:20:08 +10:00
David Bomba
0bf29ed65c Fixes for timeshift when offset is negative causing the date to be set the day before 2021-06-25 11:57:17 +10:00
David Bomba
15bdb3ff3c Payfast 2021-06-24 15:46:10 +10:00
David Bomba
50749cd2bb Payfast 2021-06-24 14:43:14 +10:00
Benjamin Beganović
8a3f06c039
Merge pull request #6090 from beganovich/v5-2106-change-default-email-logo
(v5) Change default company logo
2021-06-21 14:22:35 +02:00
Benjamin Beganović
ea9d071004 Update default company logo 2021-06-21 07:01:15 +02:00
David Bomba
2aad520733 Fixes for Payment Fillables 2021-06-21 06:51:42 +10:00
David Bomba
172604a1a0 WePay 2021-06-20 22:10:22 +10:00
=
886e006de7 Handle payment success/failure with WePay 2021-06-20 09:57:19 +10:00
David Bomba
0772c05e66 Fixes for address presentation for clients 2021-06-20 07:55:47 +10:00
David Bomba
183e8ac36f Minor fixes for paths in hosted 2021-06-17 11:22:11 +10:00
David Bomba
36f6cbbcc9 Update license in codebase 2021-06-16 16:58:16 +10:00
David Bomba
43ff685543 WePay authorize for Bank Transfer 2021-06-16 16:41:29 +10:00
David Bomba
95c9eb03a9 merge v5-dev 2021-06-14 20:47:03 +10:00
=
afdfddd7e9 Refactor for entity paths 2021-06-12 21:50:01 +10:00
David Bomba
edf2dfcc80 Minor fixes 2021-06-12 19:40:28 +10:00
David Bomba
3954ac3f3a Fixes for timezone offsets 2021-06-12 07:41:02 +10:00
David Bomba
b111483ef1 We Pay Account Signup 2021-06-11 17:39:51 +10:00
David Bomba
c367ea60ae Timezone Offset implementation 2021-06-11 08:20:46 +10:00
David Bomba
1bc32c2aca Working on Timezone Offsets 2021-06-11 07:34:03 +10:00
=
99d6d1c516 Email timing offset 2021-06-10 21:25:47 +10:00
David Bomba
821ed8678e Catch missing cache items 2021-06-10 13:56:02 +10:00
David Bomba
887c9a8eab Minor fixes 2021-06-10 12:24:32 +10:00
David Bomba
8170c395b4 Fixes for if plan is null 2021-06-08 22:17:19 +10:00
David Bomba
ec6bf52b43 Add specific route for disabling 2FA 2021-06-06 19:21:05 +10:00
David Bomba
d6f1caef73 Fixes for passing variables to artisan commands 2021-06-04 07:30:11 +10:00
David Bomba
b72217d74c Fixes for import company tests 2021-05-30 21:26:43 +10:00
David Bomba
e86286ee9a Fixes for tests 2021-05-30 18:03:31 +10:00
David Bomba
f22745d131 Remove delivery not from try/catch block 2021-05-30 06:50:55 +10:00
David Bomba
9fc5a1c947 Tests for import company 2021-05-28 08:00:30 +10:00
David Bomba
af04fb9a37 Fixes for MultiDB UserController 2021-05-24 10:41:23 +10:00
David Bomba
601d795ace Fixes for reset password 2021-05-22 14:45:09 +10:00
David Bomba
bf812ad19e Add auto bill enabled to transformer 2021-05-21 22:08:56 +10:00
David Bomba
2e6896dd58 Fixes for importing customers into Stripe. 2021-05-19 14:27:47 +10:00
David Bomba
9599c8de4f Refactor for Stripe Connect 2021-05-18 12:13:00 +10:00
David Bomba
1183be3c5f Fixes for invitation URL for invoicing.co subdomain 2021-05-16 16:44:12 +10:00
David Bomba
b0d1b7e1a1 Fixes for delivering PDFs over the wire 2021-05-16 16:26:55 +10:00
David Bomba
7bf74e012c Fixes for PDF display latency 2021-05-16 09:41:12 +10:00
David Bomba
8f996d9a93 Fixes for gateway fees less that 2021-05-16 08:18:43 +10:00
David Bomba
ae74f5a9d8 Fixes for client portal PDF display 2021-05-15 17:14:31 +10:00
David Bomba
2eca9a286f Fixes for domains 2021-05-15 14:29:19 +10:00
David Bomba
c52311bcde Fixes for PDF file paths 2021-05-15 12:19:36 +10:00
David Bomba
11a150274d Fixes for resolve user / company 2021-05-13 23:37:25 +10:00
David Bomba
777c2dd24a Reorder middleware to allow route model binding to be delayed 2021-05-13 22:41:32 +10:00
David Bomba
2688f7472e fixes for sofort cancellation 2021-05-13 13:32:36 +10:00
David Bomba
fcfe04e18e Company Exporter 2021-05-13 11:25:26 +10:00
David Bomba
9a44561b2f Fixes for attaching documents and pdfs 2021-05-13 08:13:33 +10:00
David Bomba
ac77100981 New login notification 2021-05-12 16:31:02 +10:00
Benjamin Beganović
f07c911f8b
Merge branch 'v5-develop' into v5-2804-braintree 2021-05-10 16:55:04 +02:00
Benjamin Beganović
85822c45ac Merge upstream/v5-develop 2021-05-10 11:50:05 +02:00
=
3b5a6d5392 Events and listeners for Recurring Invoices 2021-05-10 18:45:07 +10:00
=
9f9bcb0fce Add history and activities relations' 2021-05-10 18:27:51 +10:00
=
ab0de39c75 Fixes for activities 2021-05-07 21:00:55 +10:00
David Bomba
bdda63a214 We Pay 2021-05-07 17:07:49 +10:00
David Bomba
85c05f7c30 Fixes for VarEvents 2021-05-07 07:12:07 +10:00
David Bomba
2b8d7c26da Fixes for checkout gateway 2021-05-06 15:38:39 +10:00
David Bomba
eff664a586 WePayg 2021-05-06 14:39:18 +10:00
David Bomba
8c00bce71b We Pay signup 2021-05-05 14:29:58 +10:00
David Bomba
2655ba679b Fixes for Task properties, drop column on company_user table 2021-05-05 09:53:35 +10:00
Benjamin Beganović
e0f83af653 Corret class instantiate 2021-05-04 14:56:30 +02:00
David Bomba
ff7799b0bf Fixes for eager loading 2021-05-04 22:20:55 +10:00
David Bomba
4703496c7c Fixes for PSR loading 2021-05-04 22:04:07 +10:00
David Bomba
349d6daa07 Fixes for company gateway contsts 2021-05-04 18:56:01 +10:00
David Bomba
34ba510d80 Fixes for company gateway edge case 2021-05-04 17:00:05 +10:00
David Bomba
aba280d9ab Fixes for recurring 2021-04-30 09:01:56 +10:00
David Bomba
9cb2fa4263 Add parameter to reduce query burden 2021-04-29 18:57:13 +10:00
David Bomba
f26948b76f Log query analytics 2021-04-29 09:19:00 +10:00
Benjamin Beganović
e77c3492ed wip 2021-04-28 12:54:27 +02:00
David Bomba
83da701646 Fixes for company domain 2021-04-28 13:58:37 +10:00
David Bomba
8a4b1a11b3 Fixes for company domain 2021-04-28 13:40:11 +10:00
David Bomba
1bcfa1b19d Add ability to logout all tokens from company 2021-04-27 09:34:35 +10:00
David Bomba
ac3b0dfad3 Fixes for gateway fees 2021-04-23 15:26:58 +10:00
David Bomba
f62518f63b Stripe Connect 2021-04-22 20:38:22 +10:00
=
fc223e3432 Fixes for invoice status 2021-04-21 22:27:08 +10:00
David Bomba
82892a6349 Fixes for stateless events 2021-04-21 07:26:04 +10:00
David Bomba
e6c083cf29 Stripe Connect 2021-04-20 21:30:52 +10:00
David Bomba
68ddc6e7b1 Tests for ClientGatewayToken routes 2021-04-20 16:03:14 +10:00
David Bomba
03b19e27f7 Add client gateway tokens 2021-04-20 14:26:16 +10:00
David Bomba
0426b6c941 Add payment notification on manual payment creation 2021-04-16 07:58:34 +10:00
David Bomba
f2342e640a Subscriptions 2021-04-13 19:34:59 +10:00
David Bomba
7e3a9205b9 Add event listeners for Subscriptions + fix user actioning the event() 2021-04-13 09:52:17 +10:00
David Bomba
c16b2c193a Fixes for white label 2021-04-10 08:27:02 +10:00
David Bomba
47113da4fa Fixes for invoice properties 2021-04-08 20:50:53 +10:00
David Bomba
3857b1dc3e Test for recurring updates 2021-04-08 09:21:09 +10:00
David Bomba
3a3ddc031c Working on subscriptions 2021-04-07 18:06:50 +10:00
David Bomba
498d8e4efc Subscription Crons 2021-04-07 13:35:16 +10:00
David Bomba
38a648866c Account cleanup 2021-04-07 12:40:48 +10:00
David Bomba
161f20fae7 Fixes for paths to s3 type storage 2021-04-06 22:36:50 +10:00
David Bomba
355d0ae7b5 Testing Permissions 2021-04-06 14:02:27 +10:00
David Bomba
6d1d950c4e Ninja Feature Tests 2021-04-06 13:05:40 +10:00
David Bomba
b1e6325ef8 Fixes for tests 2021-04-06 08:19:27 +10:00
David Bomba
40335c0d92 Add rest method and headers to webhooks 2021-04-06 07:41:51 +10:00
David Bomba
d293c28a55
Merge pull request #5339 from turbo124/v5-develop
Subscriptions
2021-04-05 22:59:27 +10:00
Benjamin Beganović
b230680e8f Allow prefilling the client/contact fields over query parameters 2021-04-05 10:43:25 +02:00
=
858c99e09d Working on subscriptions 2021-04-04 22:14:33 +10:00
David Bomba
f7cf6b521f
Merge pull request #5321 from turbo124/v5-develop
fixes for subscriptions
2021-04-02 10:19:37 +11:00
David Bomba
c3eb46d0b7 fixes for subscriptions 2021-04-02 09:09:01 +11:00
Benjamin Beganović
08b317f7b8 allow cancellation under specific conditions 2021-04-01 16:38:46 +02:00
David Bomba
1e83b729d5 Minor fixes for subscriptions 2021-04-01 20:33:50 +11:00
David Bomba
c279cf013e add per_seat_enabled to fillable 2021-04-01 07:04:53 +11:00
David Bomba
f5c6847a36 Minor fixes for subscription types 2021-03-30 20:41:58 +11:00
David Bomba
96c191daf0 Add system logs to first load 2021-03-30 09:32:33 +11:00
David Bomba
2e139a633b Validation rules for subscriptions 2021-03-28 08:45:46 +11:00
David Bomba
8dedfa4cb5
Merge pull request #5266 from turbo124/v5-develop
Subscriptions
2021-03-27 20:26:53 +11:00
David Bomba
2c83abe432 Subscriptions 2021-03-27 07:28:56 +11:00
David Bomba
fc3889671e Fixes for HTMLEngine 2021-03-27 06:30:46 +11:00
David Bomba
c47318df1e Fixes for company presenter 2021-03-27 06:21:47 +11:00
Benjamin Beganović
8e3508a2b1
Merge pull request #5253 from beganovich/v5-2503-billing-portal
(v5) 25.03: Billing page
2021-03-26 15:05:08 +01:00
David Bomba
8eb8f6e098 Fixes for tests 2021-03-26 06:42:25 +11:00
Benjamin Beganović
ed4fff2385 - Bundle qty without ability to increment/decrement value
- One time & subs 
- A table with all products included in subscription (qty, price, notes) 
- Two tables, one for subscriptions, one for one-time purchases 
- If no products, no table 
- Remove quantity from cached data that is being sent 
- Remove "billing_subscription_id" from data sent 
2021-03-25 16:52:03 +01:00
David Bomba
abd3a89bc9
Subscriptions (#5248)
* Fixes for converting quote to invoice

* Fixes for naming PDFs

* Refresh entity prior to sending

* Fixes for subscriptions

* Add in required use

* Fixes for notifications

* Fixes for notifications

* Add with trasheD

* Rename BillingSubscriptions to Subscriptions

* Refactoring subscriptions
2021-03-25 21:55:59 +11:00
David Bomba
cb7f27462b
Client subscriptions + bug fixes (#5238)
* Fixes for converting quote to invoice

* Fixes for naming PDFs

* Refresh entity prior to sending

* Fixes for subscriptions

* Add in required use

* Fixes for notifications

* Fixes for notifications
2021-03-24 20:14:30 +11:00
=
7173ba2931 catch project exceptions 2021-03-20 11:16:29 +11:00
David Bomba
7fbe4ceb5d
Merge pull request #5162 from turbo124/v5-develop
Remove illegal characters from pdf file names
2021-03-18 08:19:56 +11:00
Benjamin Beganović
c320b6bfbb
Merge branch 'v5-develop' into v5-1103-billing-landing-page 2021-03-17 17:14:55 +01:00
Benjamin Beganović
127c6cb3cd wip 2021-03-17 16:12:25 +01:00
David Bomba
f52fb31ced Remove illegal characters from pdf file names 2021-03-17 22:29:20 +11:00
Benjamin Beganović
81f5808bf6 - Use user from $billing_subscription to create client
- Disable generating the cache for temporary state
- Generate the blank invoice based on the product
2021-03-17 12:06:58 +01:00
David Bomba
c95e0c3d7e Tuning company settings for missing properties 2021-03-17 20:28:44 +11:00
David Bomba
b762ea37d2 Throw 400's on incorrect 2FA data 2021-03-17 00:40:58 +11:00
David Bomba
8f37a06e24 Fixes for 2FA 2021-03-15 08:40:07 +11:00
David Bomba
00eefcd781 Client Subscription scaffolding 2021-03-10 11:08:58 +11:00
David Bomba
b91fcf1b34
Merge branch 'v5-develop' into billing_subscriptions 2021-03-10 09:27:28 +11:00
David Bomba
599a1626a7 Fix for logo 2021-03-10 07:56:23 +11:00
Benjamin Beganović
868b6efd8e Add currency_id to billing_subscriptions table 2021-03-09 14:24:31 +01:00
David Bomba
d7d0768eae Minor fixes 2021-03-09 21:34:39 +11:00
David Bomba
053c1ca5fa billing_subscriptions cleanup 2021-03-09 08:29:59 +11:00
David Bomba
31d92a3dc0 add russian language 2021-03-09 08:05:20 +11:00
David Bomba
45104f6ae5
Merge branch 'billing_subscriptions' into billing_subscription_scaffold 2021-03-09 07:43:30 +11:00
Benjamin Beganović
420d904551 Client subscriptions: Model 2021-03-08 15:18:48 +01:00
Benjamin Beganović
9c1a3368e9 Billing subscriptions: Database schema & model 2021-03-08 15:18:34 +01:00
=
f4d1917f32 Hosted feature implementation 2021-03-07 21:14:53 +11:00
David Bomba
1599711dee Observers and policy scaffold 2021-03-05 21:18:28 +11:00
David Bomba
609cb1ee8d
Merge pull request #5022 from turbo124/v5-develop
Fixes for user management
2021-03-04 13:51:03 +11:00
David Bomba
365c190cca Remove return type for User Service 2021-03-04 10:12:34 +11:00
David Bomba
1780db52bd Invite user route 2021-03-04 09:39:24 +11:00
Benjamin Beganović
c69b424928
Merge pull request #5020 from beganovich/v5-0303-payment-methods-fix-blinking-modal
Payment methods improvements
2021-03-03 11:54:57 +01:00
Benjamin Beganović
c48dafa962 wip 2021-03-03 11:38:59 +01:00
=
c23b9b147d Fixes for attaching a user to different companies 2021-03-03 18:22:14 +11:00
David Bomba
ab5fb7c376 Fixes for company logo 2021-03-02 07:15:28 +11:00
David Bomba
2ab76e9098 v5.1.12 2021-03-01 22:00:07 +11:00
David Bomba
e668e7fd5a Fixes for Quotes not attaching to emails 2021-02-28 13:12:55 +11:00