Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-16 16:13:20 +01:00
Code Issues Releases Activity
9,009 Commits 7 Branches 925 Tags 2 GiB
d114445ab2
Commit Graph

4989 Commits

Author SHA1 Message Date
=
e7707a919b Delete invoice when payments are applied 2021-04-09 19:51:17 +10:00
=
045fd56304 Change default pdf column properties 2021-04-09 17:44:17 +10:00
=
2ab00ed2d8 Remove redundant packages 2021-04-09 17:39:52 +10:00
David Bomba
5be620ccde Refactor self updater 2021-04-09 15:53:12 +10:00
David Bomba
b6d26fa7c9 Refactor self updater 2021-04-09 15:03:06 +10:00
David Bomba
c77faa746d refactor self updating 2021-04-09 11:22:11 +10:00
David Bomba
a6e12ee95b Working on new self updater 2021-04-09 10:33:54 +10:00
David Bomba
17a36fd14b minor fixes 2021-04-09 08:37:03 +10:00
David Bomba
5f7f18840f v5.1.42 2021-04-09 07:57:01 +10:00
Benjamin Beganović
6b8b29536a
Merge pull request #5385 from beganovich/v5-0804-page-size 
(v5) PDFs: Add $page_size & $page_layout
 2021-04-08 17:54:15 +02:00
Benjamin Beganović
c17893f9a8 Add $page_size & $page_layout 2021-04-08 17:49:28 +02:00
Benjamin Beganović
c0f5780172 wip 2021-04-08 17:11:14 +02:00
Benjamin Beganović
ec1d4e05c1 - Rename: $target_subscription to $target and all references 
- Ability to pay for the upgrade
 2021-04-08 16:53:54 +02:00
David Bomba
8e327d3a75 v5.1.41 2021-04-08 21:08:29 +10:00
David Bomba
47113da4fa Fixes for invoice properties 2021-04-08 20:50:53 +10:00
David Bomba
d9d042724e Add daily reset 2021-04-08 20:38:31 +10:00
David Bomba
084c3b78a6 Add update route 2021-04-08 20:01:00 +10:00
David Bomba
0225526756 Set password for new users 2021-04-08 14:35:02 +10:00
David Bomba
8f91969c49 bug fixes for subscriptions 2021-04-08 12:43:31 +10:00
David Bomba
fbec084e9d
Merge pull request #5374 from turbo124/v5-develop 
Suppress optimize on shared hosting
 2021-04-08 10:33:31 +10:00
David Bomba
3857b1dc3e Test for recurring updates 2021-04-08 09:21:09 +10:00
David Bomba
c2b4210241 Suppress optimize on shared hosting 2021-04-08 08:42:23 +10:00
David Bomba
4c56d7328c Add page layout option 2021-04-08 08:19:36 +10:00
Benjamin Beganović
969d9f03dc wip 2021-04-07 18:08:26 +02:00
Benjamin Beganović
71d28e691b wip 2021-04-07 14:23:14 +02:00
Benjamin Beganović
43e6ba2ec6 Check if payment is eligible to process 2021-04-07 13:26:50 +02:00
David Bomba
c1b6e2043e Fixes for subscriptions 2021-04-07 21:05: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
73e7aadaad Working on pro plan; 2021-04-07 08:56:36 +10:00
David Bomba
23206d7a67 Add licenses table 2021-04-07 00:00:24 +10:00
David Bomba
048405decc check object prior to testing properties 2021-04-06 22:38:59 +10:00
David Bomba
161f20fae7 Fixes for paths to s3 type storage 2021-04-06 22:36:50 +10:00
David Bomba
69f6179e6a 5.1.36 2021-04-06 20:38:56 +10:00
David Bomba
db5e896e46 5.1.35 2021-04-06 19:07:21 +10:00
David Bomba
fcac89a92c Subscription service 2021-04-06 17:55:18 +10:00
David Bomba
06c5cf0519 add response to system logger for subscription API calls 2021-04-06 17:14:30 +10:00
David Bomba
6b9001684e Fixes for tests 2021-04-06 17:11:58 +10:00
David Bomba
fe7b3c79e7 Working on subscriptions 2021-04-06 16:07:35 +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
fac1eebd2c PHP 8.0 suppotr 2021-04-06 10:43:56 +10:00
David Bomba
378cf1c60c Fixes for localizing emails 2021-04-06 08:35:27 +10:00
David Bomba
9cb8e865fc Fixes for assigned_user_id and group_id not sticking to subscriptions 2021-04-06 08:21:55 +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
d9047b413a Disable product price updating if currencies do not match 2021-04-06 07:36:20 +10:00
David Bomba
d293c28a55
Merge pull request #5339 from turbo124/v5-develop 
Subscriptions
 2021-04-05 22:59:27 +10:00
David Bomba
660dca561b subscriptions 2021-04-05 22:37:25 +10:00
Benjamin Beganović
2cd3ceed2e Allow expenses to be part of products table 2021-04-05 14:21:49 +02:00
Benjamin Beganović
4738920475
Merge pull request #5333 from beganovich/v5-0504-fillables-fields-over-queries 
(v5) Billing portal: Allow prefilling the client/contact fields over query parameters
 2021-04-05 13:24:45 +02:00
Benjamin Beganović
5ac1ae16ff Fixes #5314 (https://github.com/invoiceninja/invoiceninja/issues/5314) 2021-04-05 13:22:21 +02:00
Benjamin Beganović
c1a92bfb52 Fixes #5312 (https://github.com/invoiceninja/invoiceninja/issues/5312) 2021-04-05 11:04:33 +02:00
Benjamin Beganović
b230680e8f Allow prefilling the client/contact fields over query parameters 2021-04-05 10:43:25 +02:00
David Bomba
8d4fa8cb42 Working on subs 2021-04-05 12:42:49 +10:00
David Bomba
fcaabace7f Subscriptions 2021-04-05 09:21:54 +10:00
David Bomba
51c7a16423 Subscriptions 2021-04-05 09:08:16 +10:00
David Bomba
c814a754c3 Subscriptions 2021-04-05 08:37:01 +10:00
=
bf71acfe2d Fixes for tests 2021-04-04 22:47:59 +10:00
=
858c99e09d Working on subscriptions 2021-04-04 22:14:33 +10:00
David Bomba
f1f8201683 fixes for delivery note generation 2021-04-02 22:44:44 +11: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ć
9ce4a787e9
Merge pull request #5318 from beganovich/v5-0104-billing-portal 
(v5) Billing portal: Show OG price when discount is applied
 2021-04-01 17:03:43 +02:00
Benjamin Beganović
83844652e5 show og price when discount is applied 2021-04-01 17:02:11 +02:00
Benjamin Beganović
e67b5acbe9
Merge pull request #5313 from beganovich/v5-0104-tax-column-hiding-fix 
(v5) Alias the $task.rate to $task.cost for column support
 2021-04-01 16:44:05 +02:00
Benjamin Beganović
08b317f7b8 allow cancellation under specific conditions 2021-04-01 16:38:46 +02:00
Benjamin Beganović
b25f79f4e1 carry coupon over magic link 2021-04-01 16:20:31 +02:00
Benjamin Beganović
6af6668ba6 remove price() from subscriptionservice 2021-04-01 16:10:26 +02:00
Benjamin Beganović
0b2613146b Show spinner after clicking payment method 2021-04-01 16:09:30 +02:00
Benjamin Beganović
30d3c8a92e pull the initial price from the model itself 2021-04-01 16:04:22 +02:00
Benjamin Beganović
ecbe6494c6 Alias the $task.rate to $task.cost for column support 2021-04-01 15:00:09 +02:00
David Bomba
a2e0fd0849 Unique subscription nameS 2021-04-01 20:56:50 +11:00
David Bomba
1e83b729d5 Minor fixes for subscriptions 2021-04-01 20:33:50 +11:00
David Bomba
3a770361aa Set valid until when a quote is marked as sent 2021-04-01 19:07:32 +11:00
David Bomba
3b9ffb431f Fixes for tests 2021-04-01 19:02:28 +11:00
David Bomba
61489ca7d3 fixes for service methods 2021-04-01 13:24:05 +11:00
David Bomba
be648230de Working on subscriptions 2021-04-01 12:58:12 +11:00
David Bomba
9bf9bc35ad
Merge pull request #5305 from turbo124/v5-develop 
Payment mailer fixes
 2021-04-01 08:29:12 +11:00
David Bomba
c78feb80e8 Fixes for payment mailer 2021-04-01 08:28:51 +11:00
David Bomba
c279cf013e add per_seat_enabled to fillable 2021-04-01 07:04:53 +11:00
Benjamin Beganović
c300ffc4d9 passwordless login 2021-03-31 18:10:44 +02:00
David Bomba
b9e56a271d Add expense type id for invoice items 2021-03-31 21:41:17 +11:00
David Bomba
9c4a223923 Fixes for notification gates 2021-03-31 13:28:03 +11:00
David Bomba
89a271e59c Improve custom label replacements in emails 2021-03-31 12:55:33 +11:00
David Bomba
e453030b4b Fixes for subscriptions repo naming 2021-03-31 11:20:41 +11:00
David Bomba
6cbfe6b1bf rename method for subcsriptions 2021-03-31 11:14:19 +11:00
David Bomba
404ee307fd Magic link maker 2021-03-31 11:07:54 +11:00
David Bomba
ffdd81ab6b
Merge pull request #5296 from turbo124/v5-develop 
Fixes for subscriptions
 2021-03-31 10:08:29 +11:00
David Bomba
f1131c07fe Fixes 2021-03-31 10:03:18 +11:00
David Bomba
8e2c07b0df Fixes 2021-03-31 09:58:50 +11:00
David Bomba
b5e0276b1c Mark approved quotes as sent 2021-03-31 08:57:14 +11:00
Benjamin Beganović
eec902429a
Merge pull request #5286 from beganovich/v5-3003-company-user-registration 
(v5) Fix acessing client register route without company instance
 2021-03-30 16:30:16 +02:00
Benjamin Beganović
1e618dcbad
Merge pull request #5287 from beganovich/v5-3003-locale-fixes-for-literal 
(v5) Show "literal" months using locale on PDFs
 2021-03-30 16:30:07 +02:00
Benjamin Beganović
6af83a8675 wip 2021-03-30 15:50:39 +02:00
Benjamin Beganović
eb0aed513f wip 2021-03-30 14:44:33 +02:00
Benjamin Beganović
d5109af225 wip 2021-03-30 14:07:31 +02:00
David Bomba
3eb9688a83 fix subscriptions schema 2021-03-30 21:08:02 +11:00
David Bomba
f5c6847a36 Minor fixes for subscription types 2021-03-30 20:41:58 +11:00
David Bomba
32fd16dfb7
Merge pull request #5284 from turbo124/v5-develop 
Subscriptions
 2021-03-30 20:37:28 +11:00
David Bomba
caf7ad5998 Minor fixes for self updater - more verbose messaging after self update 2021-03-30 18:01:20 +11:00
David Bomba
1af565abd3 minor fixes for texts 2021-03-30 16:10:31 +11:00
David Bomba
9377b9cae4 Fixes for authorize credit cards 2021-03-30 12:28:49 +11:00
David Bomba
96c191daf0 Add system logs to first load 2021-03-30 09:32:33 +11:00
David Bomba
878f00b375 add additional query filter for recurring invoices 2021-03-30 09:30:41 +11:00
Benjamin Beganović
972c1ef56e wip 2021-03-29 15:51:03 +02:00
Benjamin Beganović
05cbd30bef wip 2021-03-29 15:50:36 +02:00
Benjamin Beganović
c4ff24132e wip 2021-03-29 14:35:27 +02:00
Benjamin Beganović
d37d727d2c - Fix typo in BaseController.php 
- Add labels on top of billing page (one-time, or/and subscription)
- Show products
- Pull the price from the service
 2021-03-29 12:58:03 +02:00
David Bomba
f1ece9ab6b Subscriptions 2021-03-29 21:43:42 +11:00
Benjamin Beganović
97d92cd127 wip 2021-03-29 12:25:29 +02:00
David Bomba
3183186d4d Working on subscriptions 2021-03-29 21:19:30 +11:00
David Bomba
de99ed2ba4 Fixes for quote numbering 2021-03-29 21:00:22 +11:00
David Bomba
db7df69db7 Recurring services - trial phase' 2021-03-29 14:49:29 +11:00
David Bomba
d7bf927549 Set exchange rates on invoices 2021-03-29 13:14:55 +11:00
=
646130a104 Fixes for tests 2021-03-28 13:26:46 +11:00
=
40dc8efd46 limit logging conditionally 2021-03-28 13:19:44 +11:00
=
6e813e233e Fix missing USE in CreditWasViewed event 2021-03-28 13:09:47 +11:00
David Bomba
6489d73ad6 Fixes for subscriptions 2021-03-28 09:15:12 +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
=
9fd40f55c6 Exchange rates 2021-03-27 14:51:34 +11:00
=
3479c127fd Fixes for subscription refactor 2021-03-27 14:22:19 +11:00
=
83c636aa55 update todos 2021-03-27 09:05:37 +11:00
=
46a525f04d Create invoice for subscription 2021-03-27 08:55:04 +11:00
=
95749b4822 Subscriptions - invoice generation logic 2021-03-27 08:39:08 +11:00
David Bomba
2c83abe432 Subscriptions 2021-03-27 07:28:56 +11:00
David Bomba
f067290462 Update rules for updating an entity 2021-03-27 06:43:52 +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
750da31021 Transform id's correctly 2021-03-26 20:38:51 +11:00
David Bomba
b3863581ae Stubs for products / recurring products and subscription price 2021-03-26 20:20:37 +11:00
David Bomba
b40751a2b9 Auto optimize after composer install 2021-03-26 19:34:39 +11:00
David Bomba
98e314b6c0 Fixes for calculating the correct gateway fee depending on the payment method 2021-03-26 19:18:25 +11:00
David Bomba
fd24449f95 Fixes for deleting / restoring / removing users 2021-03-26 19:07:43 +11: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
Benjamin Beganović
49c4707e38
Update BillingPortalPurchase.php 2021-03-23 16:27:30 +01:00
Benjamin Beganović
77fdb25304
Merge branch 'v5-develop' into v5-2203-billing-portal 2021-03-23 16:23:56 +01:00
=
ae9e927039 Working on client subs 2021-03-23 23:35:48 +11:00
=
3d375e4148 Workig on client subscriptions 2021-03-23 23:17:28 +11:00
=
f74368e869 Set first user to gmail after first authorization 2021-03-23 17:19:06 +11:00
David Bomba
3ed8479411 Improve user migrations 2021-03-23 14:53:10 +11:00
David Bomba
3b72fa343f complete purchase - billing subscription 2021-03-23 14:26:21 +11:00
David Bomba
417ed6c13d Fixes for recurring 2021-03-23 08:24:05 +11:00
David Bomba
3ebe533fc8 include Account clas 2021-03-23 07:09:42 +11:00
Benjamin Beganović
e78fb7e891 Update quering the language/locale using Cache instead of DB 2021-03-22 14:09:29 +01:00
Benjamin Beganović
535d9ae471 Update data passed to startTrial 2021-03-22 14:03:32 +01:00
Benjamin Beganović
d5ad6088f6 Create data mapper for cached data / billing context 2021-03-22 13:56:26 +01:00
Benjamin Beganović
6e714747bd Update price per quantity 2021-03-22 13:53:34 +01:00
Benjamin Beganović
8bc4896daa Hide/show coupon code field if promo code configured in billing tableclear 2021-03-22 13:34:59 +01:00
Benjamin Beganović
8839bfabd3 Hide quantity if max_seats_limit = 1 2021-03-22 13:32:29 +01:00
David Bomba
5700da5323 Fixes for password protection 2021-03-22 22:18:57 +11:00
David Bomba
a74e38902b
Merge pull request #5222 from turbo124/v5-develop 
Fixes for default timeouts
 2021-03-22 22:12:28 +11:00
David Bomba
5d28271df9 Fixes for default timeouts 2021-03-22 22:12:12 +11:00
Benjamin Beganović
296d3046e8 Add margins between items 2021-03-22 12:10:53 +01:00
Benjamin Beganović
500fa38a29 Remove nl2br for public notes 2021-03-22 12:08:59 +01:00
David Bomba
22f81a036f
Merge pull request #5220 from turbo124/v5-develop 
Fixes for default timeouts
 2021-03-22 21:55:25 +11:00
David Bomba
793247e0f7 Fixes for default timeouts 2021-03-22 21:55:09 +11:00
Benjamin Beganović
540f5b647a uncomment the initialization of billing service 2021-03-22 11:14:56 +01:00
Benjamin Beganović
44bf716fc9
Merge branch 'v5-develop' into v5-2003-fix-billing-subscription-integration 2021-03-22 11:12:14 +01:00
Benjamin Beganović
187be058f7
Merge branch 'v5-develop' into v5-1803-billing 2021-03-22 09:38:34 +01:00
David Bomba
cfdcf889ad Small type check fix 2021-03-22 17:46:59 +11:00
David Bomba
56b0452d2e Add oauth user token 2021-03-22 12:54:50 +11:00
David Bomba
0c5b551ce1 Connected Gmail Account 2021-03-22 10:48:00 +11:00
David Bomba
c97dea08d2 Connected Gmail Account 2021-03-22 09:52:39 +11:00
David Bomba
24c8325fb1 Connected Gmail Account 2021-03-22 09:02:22 +11:00
David Bomba
32b8575ce1 Connected Gmail Account 2021-03-22 08:06:26 +11:00
David Bomba
f80179814d fix conflicts 2021-03-22 07:22:20 +11:00
David Bomba
1b5d6d44f2 Set default time out 2021-03-22 07:21:51 +11:00
=
4285b5f6fc Minor fixes for oauth login 2021-03-21 21:38:57 +11:00
=
42ae8d53dd Working on client subscriptions 2021-03-21 20:45:30 +11:00
=
932185e6c2 Working on client subscriptions 2021-03-21 20:26:30 +11:00
David Bomba
c7d7916b04 Update defaults 2021-03-21 16:35:09 +11:00
David Bomba
8d490200b6 Merge branch 'v5-develop' of https://github.com/turbo124/invoiceninja into v5-develop 2021-03-21 13:51:45 +11:00
David Bomba
58aee4250e Fixes for task policy 2021-03-21 13:51:28 +11:00
Benjamin Beganović
fdd1601120 wip 2021-03-20 23:15:26 +01:00
=
5b290b1770 Small fix for usernotifies 2021-03-21 08:57:11 +11:00
=
36ffeb9344 bug fixes 2021-03-21 08:53:33 +11:00
=
2eb7de95ad Add invoie_id to client subs 2021-03-20 14:39:30 +11:00
David Bomba
6be79ad022 Billing Subs 2021-03-20 13:57:03 +11:00
David Bomba
ba91c96c40 update texts 2021-03-20 13:49:45 +11:00
=
e2314359b9 Pass back the correct entity! 2021-03-20 11:54:47 +11:00
=
5288893220 Small fixes for 2FA 2021-03-20 11:46:42 +11:00
=
b158fb430f Small fixes for 2FA 2021-03-20 11:41:41 +11:00
=
7173ba2931 catch project exceptions 2021-03-20 11:16:29 +11:00
David Bomba
9e0328757a Tests for number validation across entities 2021-03-20 10:06:44 +11:00
David Bomba
451e4e1bbe Ensure better unique rules 2021-03-20 09:51:52 +11:00
David Bomba
b841fe7000 Working on unique rules for numbers 2021-03-20 09:29:20 +11:00
David Bomba
422fd4f88c
Merge pull request #5182 from turbo124/v5-develop 
Minor fixes
 2021-03-19 23:40:05 +11:00
David Bomba
34b9877868 Minor fixes 2021-03-19 23:37:57 +11:00
Benjamin Beganović
d98165a8dd Set client language_id if locale is present 2021-03-18 16:01:13 +01:00
Benjamin Beganović
3bcb65efc2 Set locale from query parameter 2021-03-18 15:41:26 +01:00
Benjamin Beganović
69eecbf281 Qty 2021-03-18 15:22:22 +01:00
Benjamin Beganović
415ea81eec Support for "Start Free Trial" 2021-03-18 14:14:10 +01:00
Benjamin Beganović
85c09ecf11 Show the message about coupon code/discount under the input field 2021-03-18 13:51:10 +01:00
David Bomba
2a89a12b69
Merge pull request #5175 from turbo124/v5-develop 
Fixes for 2fa
 2021-03-18 22:47:31 +11:00
David Bomba
10f7b1a309 Fixes for 2fa 2021-03-18 22:46:58 +11:00
Benjamin Beganović
c75e4e678f Set min-width for designs when using repeating headers/footers 2021-03-18 12:12:44 +01:00
David Bomba
ea1156cc81
Merge pull request #5172 from turbo124/v5-develop 
Small fix for new PDF generator
 2021-03-18 20:58:36 +11:00
David Bomba
ac6feb706e Small fix for new PDF generator 2021-03-18 20:57:55 +11:00
Benjamin Beganović
d706d226e8 Disable automatic custom column processing on the PDF 2021-03-18 09:32:11 +01:00
David Bomba
9ca9736de6 resolved conflicts' 2021-03-18 12:00:01 +11:00
David Bomba
ee15ea9434 v5.1.27 2021-03-18 11:58:10 +11:00
David Bomba
086189a1ea Hosted PDFs by invoice ninja 2021-03-18 11:53:08 +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
dc4980a8b2 Update demo data 2021-03-17 21:26:02 +11:00
David Bomba
f00c1f95c0 Add new counter settings 2021-03-17 21:06:08 +11:00
David Bomba
c95e0c3d7e Tuning company settings for missing properties 2021-03-17 20:28:44 +11:00
Benjamin Beganović
eb2cfde303 Merge remote-tracking branch 'upstream/v5-develop' into v5-1103-billing-landing-page 2021-03-17 07:34:23 +01:00
David Bomba
1012c8df4b Working on billing subscriptions 2021-03-17 13:21:06 +11:00
David Bomba
86ea2f0709 Fixes for free plan invoice designs - default to clean 2021-03-17 12:04:54 +11:00
David Bomba
059cec705d Small fix for user notifications 2021-03-17 11:13:29 +11:00
David Bomba
db03dccbaf Limit reminders for free plans 2021-03-17 08:15:43 +11:00
David Bomba
5ef6afdc28 Limit attachment features on free plan 2021-03-17 08:08:23 +11:00
David Bomba
b762ea37d2 Throw 400's on incorrect 2FA data 2021-03-17 00:40:58 +11:00
Benjamin Beganović
851a31b3c0 Proof of concept for billing page 2021-03-16 14:35:57 +01:00
David Bomba
0422c95e13 Cache password protection on login 2021-03-16 23:10:15 +11:00
David Bomba
ae62bf63c6 Fixes for 2FA 2021-03-16 22:47:14 +11:00
David Bomba
aef2270f05 Fixes for connected account 2021-03-16 22:44:10 +11:00
David Bomba
816ea281ff Fixes for connected account 2021-03-16 22:33:48 +11:00
David Bomba
591bfb9e9d Fixes for connected account 2021-03-16 22:30:33 +11:00
David Bomba
6bb71dc33b Fixes for connected account 2021-03-16 22:29:16 +11:00
David Bomba
05b008ca60 Fixes for 2FA 2021-03-16 09:33:55 +11:00
David Bomba
eb70c7c2ed
Merge pull request #5139 from turbo124/v5-develop 
Fix for invite resend
 2021-03-16 07:35:47 +11:00
David Bomba
1e72f20c3d Fix for invite resend permission 2021-03-16 07:35:19 +11:00
Benjamin Beganović
4350816804 wip 2021-03-15 17:33:27 +01:00
Benjamin Beganović
dade7bad0a Merge upstream/v5-develop 2021-03-15 13:08:43 +01:00
Benjamin Beganović
4918423124 use ->getData() 2021-03-15 11:14:09 +01:00
Benjamin Beganović
b07eedb755 PayPal fixes for loggin 2021-03-15 11:12:01 +01:00
David Bomba
6a2332526b Biling Subscription Service 2021-03-15 08:42:05 +11:00
David Bomba
8f37a06e24 Fixes for 2FA 2021-03-15 08:40:07 +11:00
David Bomba
e176be086a Fixes for 2FA 2021-03-15 07:18:53 +11:00
David Bomba
255643d7dc Fixes for connected account 2021-03-14 21:32:09 +11:00
Benjamin Beganović
0b9c6e782d merge upstream/v5-develop 2021-03-13 14:55:13 +01:00
Benjamin Beganović
b9bea02b68 wip 2021-03-13 14:51:01 +01:00
=
e2bc086f75 Type check on custom fields 2021-03-13 19:36:00 +11:00
=
94b1e59535 Improvements in Setup workflow 2021-03-13 17:55:18 +11:00
=
0bf8b9c9e5 Fixes for setup flow 2021-03-13 17:45:41 +11:00
=
487cf555b9 Fix for displaying logo 2021-03-13 16:56:52 +11:00
David Bomba
f67652cf88
Merge pull request #5100 from beganovich/v5-1003-company-custom-fields 
(v5) Support for custom company fields on the PDF
 2021-03-13 15:07:08 +11:00
David Bomba
d01b97104a
Merge pull request #5111 from joshuadwire/v5-develop 
Fix request validation for preconfigured installs
 2021-03-13 14:58:23 +11:00
Joshua Dwire
941132133c Fix request validation for preconfigured installs 2021-03-12 18:46:56 -05:00
Benjamin Beganović
908678cdc4 wip 2021-03-12 15:00:33 +01:00
David Bomba
aef31d8193
Merge pull request #5104 from joshuadwire/v5-develop 
Support pre-configured installs where setup doesn't allow changing DB config
 2021-03-12 21:00:58 +11:00
David Bomba
4f626ca90d
Merge pull request #5105 from turbo124/v5-develop 
Improve PDF creation performance
 2021-03-12 15:00:50 +11:00
Joshua Dwire
a844afd128 Support pre-configured installs where setup doesn't allow changing DB info 2021-03-11 19:48:41 -05:00
David Bomba
ff2f43d8fc Do no add value from custom_value to invoice total 2021-03-12 07:24:09 +11:00
David Bomba
57ef1c9b78 Return user for /connected_account 2021-03-12 07:07:52 +11:00
Benjamin Beganović
d546c4711c wip 2021-03-11 17:20:30 +01:00
Benjamin Beganović
3696b06566 Scaffold landing page for billing, controller & endpoint 2021-03-11 14:05:23 +01:00
Benjamin Beganović
b88533d3d2 Catch possible invalid format exception & return "Invalid date!" 2021-03-10 16:56:17 +01:00
Benjamin Beganović
7c01b3bb64 Support for custom fields in company details section 2021-03-10 16:55:49 +01:00
Benjamin Beganović
653973c826 Align content to left by default 2021-03-10 14:32:17 +01:00
David Bomba
b9c9874533 Improve PDF creation performance 2021-03-10 21:00:18 +11:00
David Bomba
64c483befe Code cleanup 2021-03-10 20:42:39 +11:00
David Bomba
76a27f3946 Fix for null design column 2021-03-10 20:41:18 +11:00
David Bomba
e54562b6d4 Only one confirmation per user signup 2021-03-10 20:32:38 +11:00
David Bomba
ed8c880750 add reconfirm route 2021-03-10 20:15:24 +11:00
David Bomba
9888d7acb9 Improve delete pdf performance 2021-03-10 13:28:35 +11:00
David Bomba
e7e455667d Fixes for company logo in emails 2021-03-10 12:51:08 +11:00
David Bomba
18e8934e70 Delete pdf in service rather than child job 2021-03-10 12:28:12 +11:00
David Bomba
839a5c49d3 Fixes for billing subs cron 2021-03-10 11:14:05 +11:00
David Bomba
11de159458 Commit event for client subs 2021-03-10 11:11:05 +11:00
David Bomba
00eefcd781 Client Subscription scaffolding 2021-03-10 11:08:58 +11:00
David Bomba
e0b169b64b Fixes for billing subscriptions 2021-03-10 09:56:59 +11:00
David Bomba
b91fcf1b34
Merge branch 'v5-develop' into billing_subscriptions 2021-03-10 09:27:28 +11:00
David Bomba
90b3b25849 Fixes for tests - changed listResponse to itemResponse 2021-03-10 09:23:13 +11:00
David Bomba
599a1626a7 Fix for logo 2021-03-10 07:56:23 +11:00
Benjamin Beganović
737020eeed Fix wrong variable in the BillingSubscriptionTransformer.php 2021-03-09 15:25:11 +01:00
Benjamin Beganović
83b23956f6 Update authorize methods on billing subscription requests 2021-03-09 14:29:57 +01:00
Benjamin Beganović
868b6efd8e Add currency_id to billing_subscriptions table 2021-03-09 14:24:31 +01:00
David Bomba
9290873b8b Fixes for qr code" 2021-03-09 21:53:25 +11:00
David Bomba
59beb9dd39 Customize the password protect timeout 2021-03-09 21:52:48 +11:00
David Bomba
d7d0768eae Minor fixes 2021-03-09 21:34:39 +11:00
David Bomba
cd48ae78f9 Minor fixes 2021-03-09 21:30:34 +11:00
David Bomba
0a3b5e0665 minor fixes 2021-03-09 17:06:03 +11:00
David Bomba
67cedb8348 minor fixes 2021-03-09 17:03:22 +11:00
David Bomba
9a15d2c6cf Minor fixes 2021-03-09 15:43:54 +11:00
David Bomba
4baa89382b Minor fix for connected account 2021-03-09 09:55:31 +11:00
David Bomba
68f0e99f26 Fixes for connected account 2021-03-09 09:53:04 +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
4e9b92c2da Minor fix for 2fa method name 2021-03-09 07:46:30 +11:00
David Bomba
45104f6ae5
Merge branch 'billing_subscriptions' into billing_subscription_scaffold 2021-03-09 07:43:30 +11:00
David Bomba
b21714c00c Merge branch 'v5-develop' of https://github.com/turbo124/invoiceninja into v5-develop 2021-03-09 05:57:34 +11:00
David Bomba
38e5a14172 Bug fix for reconfirm useR 2021-03-09 05:47:49 +11:00
Benjamin Beganović
2660b8fa58 Billing subscriptions: Requests for crud endpoints 2021-03-08 15:19:45 +01:00
Benjamin Beganović
29922a24a0 Billing subscriptions: Event for created 2021-03-08 15:19:23 +01:00
Benjamin Beganović
780ab6885b Billing subscriptions: Controller 2021-03-08 15:19:04 +01: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
Benjamin Beganović
ea5117ecbe Billing subscriptions: Factory, repository & transformer 2021-03-08 15:18:14 +01:00
David Bomba
9c2e5c2de4 Fixes for blank company name 2021-03-08 15:20:02 +11:00
David Bomba
d83073ad91 Validation rule for recurring frequency 2021-03-08 12:31:00 +11:00
David Bomba
e39ce7491b Feature permissions for hosted 2021-03-08 08:32:38 +11:00
David Bomba
2595d3d2a4 Fixes for typo in password protection 2021-03-08 07:56:44 +11:00
David Bomba
8d6f6d9eb5 Fixes for 2FA 2021-03-08 07:49:33 +11:00
=
f4d1917f32 Hosted feature implementation 2021-03-07 21:14:53 +11:00
=
616dea2c9d Add webcron support 2021-03-07 17:45:48 +11:00
=
6360f62ef3 Integrate phantom js secret default value into config 2021-03-07 17:27:44 +11:00
David Bomba
7a50032b35 Logging 2021-03-07 08:50:14 +11:00
=
93493116ed Scaffolds for billing_subscriptions 2021-03-06 17:19:57 +11:00
=
097d9ac1b8 Padding out functionality 2021-03-06 11:47:05 +11:00
David Bomba
86673a6c66 Fixes for client address 2021-03-05 21:27:36 +11:00
David Bomba
1599711dee Observers and policy scaffold 2021-03-05 21:18:28 +11:00
David Bomba
f99195c07a Small fixes 2021-03-05 11:16:38 +11:00
David Bomba
7dae7cb326 Fixes for mailer 2021-03-04 19:42:22 +11:00
David Bomba
20440189d2 Fixes for password protection middleware 2021-03-04 16:03: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
11ad2cd57e Fixes for caching protection route 2021-03-04 12:17:29 +11:00
David Bomba
07aca3d8c0 Fixes for tests 2021-03-04 10:34:18 +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
David Bomba
a6282cee56 Create single account from command line 2021-03-04 08:30:11 +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
David Bomba
9b3ea22c22
Merge pull request #5018 from turbo124/v5-develop 
Fixes for attaching a user to different companies
 2021-03-03 21:11:12 +11:00
David Bomba
bfbde2ba51 Fixes 2021-03-03 21:04:10 +11:00
Benjamin Beganović
2ab76adfad Reduce default white label logo size 2021-03-03 08:49:02 +01:00
=
c23b9b147d Fixes for attaching a user to different companies 2021-03-03 18:22:14 +11:00
Benjamin Beganović
a04b075956 Update entity labels on PDF 2021-03-02 15:42:42 +01:00
Benjamin Beganović
7543ab33ff Update white label logo 2021-03-02 14:26:34 +01:00
=
b57d4bfb7c Fixes for recurring invoice number not being prefixed 2021-03-02 21:57:14 +11:00
=
7a2cea1d9c One Time Token 2021-03-02 19:54:23 +11:00
=
aa290172ae One Time Token Requests 2021-03-02 19:03:01 +11:00
=
18fa537791 Add one time token functionality 2021-03-02 18:52:25 +11:00
David Bomba
c37c441d92 Associate a user with multiple companies 2021-03-02 09:18:19 +11:00
David Bomba
edc25c1342 Associate a user with multiple companies 2021-03-02 09:08:57 +11:00
David Bomba
ab5fb7c376 Fixes for company logo 2021-03-02 07:15:28 +11:00
David Bomba
bf326e6d26 Working on adding user to another company 2021-03-01 23:06:24 +11:00
David Bomba
2ab76e9098 v5.1.12 2021-03-01 22:00:07 +11:00
David Bomba
9a2160c325 Verified users only for hosted platform 2021-03-01 13:51:00 +11:00
David Bomba
d238d53b26 Delete PDF helper 2021-03-01 10:40:18 +11:00
David Bomba
92f729c10d Catch if an OAuth user doesn't exist and attempts to login 2021-02-28 19:54:14 +11:00
David Bomba
e668e7fd5a Fixes for Quotes not attaching to emails 2021-02-28 13:12:55 +11:00
=
5f14cc0c5d Working on task range overlap 2021-02-27 21:08:39 +11:00
David Bomba
c887d81dd6
Merge pull request #5000 from turbo124/v5-develop 
Fixes for archived invoice not emailing
 2021-02-27 11:32:50 +11:00
=
4b147ca77a Fixes for migration mailer 2021-02-27 11:32:10 +11:00
=
c94c3fa373 Add project relationships across all entities 2021-02-27 08:37:56 +11:00
=
57e3b59b91 Add project relationship to recurring invoice 2021-02-27 07:48:49 +11:00
David Bomba
cc883f0926 Fixes for archived invoice not emailing 2021-02-26 22:20:17 +11:00
Benjamin Beganović
6284b3a9ea
Merge pull request #4996 from beganovich/v5-2602-currency-fixes 
(v5) Prevent word breaking from unit costs & task rates
 2021-02-26 07:48:19 +01:00
Benjamin Beganović
da9e2e1759 Prevent word breaking from unit costs & task rates 2021-02-26 07:47:04 +01:00
Benjamin Beganović
441db23414 Format quantity output using formatValue() 2021-02-26 07:05:44 +01:00
David Bomba
4b3c7ec771
Merge pull request #4991 from turbo124/v5-develop 
User verified middleware
 2021-02-26 08:18:59 +11:00
David Bomba
4884b039df User verified middleware 2021-02-26 08:18:14 +11:00
David Bomba
c063aee812 enums for email delivery 2021-02-26 08:06:43 +11:00
Benjamin Beganović
786f4095d8 Add invoices as description for Stripe payment 2021-02-25 12:57:12 +01:00
Benjamin Beganović
c074aa9aca
Merge pull request #4790 from beganovich/v5-2701-dynamic-dates-for-recurring 
(v5) PDF: Support for dynamic keywords in items description
 2021-02-25 12:01:04 +01:00
Benjamin Beganović
81dfb25f5f Use translated format of months based on locale 2021-02-25 12:00:01 +01:00
David Bomba
29b4e6d1b7 minor fixes 2021-02-25 21:41:18 +11:00
David Bomba
661fc8ea00 Fixes for first account - verify user email! 2021-02-25 11:09:06 +11:00
David Bomba
f7e4bca5a5 Update task status_order on update() 2021-02-24 13:12:23 +11:00
David Bomba
90b33ef063 clean up 2021-02-24 11:48:32 +11:00
David Bomba
717fcc4b20 Fix for Reply To Name 2021-02-24 11:07:09 +11:00
David Bomba
d18e1d7436 fixes for BCC 2021-02-24 10:43:08 +11:00
David Bomba
ab54f9f75c Custom reply to and from name 2021-02-24 10:39:37 +11:00
David Bomba
d1044a861e Bug fix for TwoFactorController 2021-02-24 10:00:51 +11:00
David Bomba
f54c482010 Postmark webhooks 2021-02-24 09:56:23 +11:00
David Bomba
9b1b677e8e Working on OAuth password protection routes 2021-02-24 08:12:23 +11:00
Benjamin Beganović
7319d073c8 wip 2021-02-23 14:56:16 +01:00
David Bomba
c20d2eedbc remove redundant method 2021-02-23 23:45:50 +11:00
David Bomba
62feba5a51 Localizing Dates 2021-02-23 21:04:39 +11:00
David Bomba
db0e684ff8 Translated dates 2021-02-23 16:15:23 +11:00
David Bomba
ffd9c10ef6
Merge pull request #4968 from turbo124/v5-develop 
Fixes for fillable properties + other minor fixes"
 2021-02-23 12:18:11 +11:00
David Bomba
c7cb299d1c Fixes for fillable properties 2021-02-23 12:17:46 +11:00
David Bomba
55b673241b Fixes for fillable properties 2021-02-23 12:17:09 +11:00
David Bomba
47a2ff7df3 Fixes for tests 2021-02-23 09:47:54 +11:00
David Bomba
1b3a9e6398 Fixes for updating products 2021-02-23 09:08:43 +11:00
Benjamin Beganović
b22825bf17 wip 2021-02-22 17:01:01 +01:00
Benjamin Beganović
8e3875da96 Merge remote-tracking branch 'upstream/v5-develop' into v5-2701-dynamic-dates-for-recurring 2021-02-22 13:15:37 +01:00
Benjamin Beganović
75bd911b66 Fixes for   in public notes 2021-02-22 11:52:55 +01:00
David Bomba
c0d49fff40 Fixes for casts 2021-02-22 21:35:00 +11:00
David Bomba
84d3ca8738 Fixes for casts 2021-02-22 21:30:28 +11:00
David Bomba
c7048e8cb1 Fixes for user present name 2021-02-22 20:54:46 +11:00
David Bomba
67d0f525af Postmark webhooks 2021-02-22 20:46:01 +11:00
David Bomba
55a0d596e0 Fixes for newer postmark driver 2021-02-22 14:39:53 +11:00
David Bomba
0317bae985 Harvest message ID from postmark 2021-02-22 11:57:54 +11:00
David Bomba
c72fcfed64 Mail listeners to harvest message ids 2021-02-22 11:18:52 +11:00
David Bomba
e8d40d2fde Fixes for tests 2021-02-22 08:29:39 +11:00
David Bomba
53f79440c0 Connected accounts 2021-02-22 08:27:00 +11:00
David Bomba
9a46a886a1 fixes for surcharge tax calculations and also implemented Zero % tax rates 2021-02-21 20:36:34 +11:00
David Bomba
1b19b3d0a9
Merge pull request #4950 from turbo124/v5-develop 
Update dependencies
 2021-02-20 23:13:53 +11:00
=
633210e281 Fixes for PHP 8 2021-02-20 21:51:33 +11:00
David Bomba
e8da728428
Merge pull request #4946 from joshuadwire/v5-develop 
Update import process to handle new data format
 2021-02-20 11:57:36 +11:00
Joshua Dwire
4aae7c0b1a Update import process to handle new data format 2021-02-19 19:50:17 -05:00
=
087129788b Working on 2FA 2021-02-20 11:45:20 +11:00
=
4b1030f881 Add former email address for rollbacks 2021-02-20 08:42:29 +11:00
Benjamin Beganović
8ecc33087a
Merge pull request #4940 from beganovich/v5-1902-streamline-client-portal 
(v5) Streamline client portal (centralised pay now button)
 2021-02-19 16:53:21 +01:00
David Bomba
ce5338dbdf Fixes for tests 2021-02-19 09:20:09 +11:00
David Bomba
8c52df6158 Dynamic from name 2021-02-19 08:43:47 +11:00
David Bomba
2735efedd2 Remove BaseMailerJob 2021-02-19 07:57:10 +11:00
David Bomba
7241430ce5 Improve coverage for CSV imports 2021-02-19 07:20:23 +11:00
Benjamin Beganović
7990ca22ec Centralize "Pay now" button 2021-02-18 13:37:27 +01:00
Benjamin Beganović
3cb6d07c20 Change default full-screen view for invoices & quotes: 
- New $url property for file_path() for invoices & quotes
- "Full screen" mode now returns raw file
- Show default browser viewer for desktop devices
 2021-02-18 13:18:41 +01:00
David Bomba
8346875f88 Fixes for mails 2021-02-18 21:33:54 +11:00
Benjamin Beganović
b7a9700f90 Fix issue with entity footer items causing 500 error 2021-02-18 10:12:57 +01:00
David Bomba
704477f803 Imports 2021-02-18 14:37:17 +11:00
David Bomba
f48c6680d9
Merge pull request #4936 from joshuadwire/v5-develop 
Add tests; block sending payment emails during an import.
 2021-02-18 14:21:02 +11:00
Joshua Dwire
e11e71514a Add tests; block sending payment emails during an import. 2021-02-17 22:05:33 -05:00
David Bomba
222cd28836 Fix for mail refactor 2021-02-18 11:12:49 +11:00
David Bomba
64afdc20fa Fixes for payment failure mailer 2021-02-18 10:51:56 +11:00
David Bomba
06bc49b0d6 Refactoring emails 2021-02-18 10:30:31 +11:00
Benjamin Beganović
10733418c6 Allow default company registration without company key in the URL 2021-02-17 12:13:27 +01:00
Benjamin Beganović
6872057207
Merge pull request #4912 from beganovich/v5-1502-client-portal-documents 
(v5) Client portal: "Documents" improvements & bug fixes
 2021-02-17 11:26:08 +01:00
Benjamin Beganović
deb0cd345a
Merge pull request #4923 from beganovich/v5-1602-invoice-footer-variable-parsing 
(v5) PDF: Support for dynamic variables in invoice footer, public notes & terms
 2021-02-17 11:25:28 +01:00
David Bomba
86e0f906e9
Merge pull request #4927 from joshuadwire/v5-develop 
Improve CSV import
 2021-02-17 20:17:33 +11:00
David Bomba
c3f157717f Fixes for multi-mailer gmail implementation 2021-02-17 13:21:47 +11:00
David Bomba
76f57387dc Fixes for multi-mailer gmail implementation 2021-02-17 13:20:25 +11:00
David Bomba
aa9970326c Fixes for multi mailer - gmail 2021-02-17 11:25:30 +11:00
Joshua Dwire
10462cdeb4 Merge remote-tracking branch 'origin/v5-develop' into v5-develop 
# Conflicts:
#	resources/views/email/import/completed.blade.php
 2021-02-16 18:20:27 -05:00
Joshua Dwire
68c2246e64 Remove dispatchNow used for testing 2021-02-16 18:17:41 -05:00
Joshua Dwire
ff27f351c7 Bug fixes; add support for other platform imports 2021-02-16 18:15:42 -05:00
Benjamin Beganović
a081f966f8 wip 2021-02-16 14:57:37 +01:00
Benjamin Beganović
001b6902f2 wip 2021-02-16 14:42:35 +01:00
David Bomba
0b8bf4fbf1 Remove invoice deletion observer 2021-02-17 00:31:00 +11:00
David Bomba
a056f95e13 Fixes for EmailEntity 2021-02-16 23:56:12 +11:00
David Bomba
6e4979f2a1 Fixes for switching mailers are runtime when using queues 2021-02-16 23:24:36 +11:00
Benjamin Beganović
22bd29f8fc wip 2021-02-16 13:16:22 +01:00
David Bomba
da8fe555a7 Add back 2021-02-16 22:47:30 +11:00
David Bomba
68b000efe9 Register mail provider after initing variables 2021-02-16 22:46:05 +11:00
David Bomba
58a1e2812d Wire up settings in mailer job 2021-02-16 22:19:07 +11:00
David Bomba
0a4cb4afe7 Wire up settings in mailer job 2021-02-16 21:59:49 +11:00
David Bomba
818e56d39e Wire up settings in mailer job 2021-02-16 21:55:48 +11:00
David Bomba
d4532c4d21 Refactoring emails 2021-02-16 21:23:32 +11:00
David Bomba
13e96121d7 Refactoring emails 2021-02-16 21:14:53 +11:00
David Bomba
92c83100e0
Merge pull request #4914 from turbo124/v5-develop 
Dedicated upload routes
 2021-02-16 20:06:53 +11:00
David Bomba
4612379811 Fixes for file upload on dedicated routes 2021-02-16 20:02:33 +11:00
David Bomba
181902fece Additional company table properties 2021-02-16 08:52:38 +11:00
David Bomba
6edaf5d557 Entity upload routes + reorder api.php routes file 2021-02-16 08:14:30 +11:00
David Bomba
e546764e29 Upload documents route 2021-02-16 07:58:19 +11:00
Benjamin Beganović
aacc3b6602 wip 2021-02-15 15:52:13 +01:00
Benjamin Beganović
63060cd878 Stripe: Show required fields if enabled in admin panel 2021-02-15 14:58:25 +01:00
Benjamin Beganović
5f443116f3
Merge pull request #4909 from beganovich/v5-1502-alias-task-as-service 
(v5) PDF: Alias task.product key for task.service
 2021-02-15 13:17:54 +01:00
Benjamin Beganović
a593ecc48d wip 2021-02-15 13:16:47 +01:00
David Bomba
4ff96c0f58
Merge pull request #4908 from turbo124/v5-develop 
Refactoring emails
 2021-02-15 22:40:12 +11:00
David Bomba
292c7b8068 Invoice upload document route 2021-02-15 22:34:05 +11:00
David Bomba
dedc7c2cb3 Expense document uploads 2021-02-15 22:07:47 +11:00
David Bomba
afb2306598 Credit upload route 2021-02-15 22:00:02 +11:00
David Bomba
7bf6d7c48a Document route for clients / company 2021-02-15 21:52:50 +11:00
Benjamin Beganović
2a5cd72d0b Get invoice_id from payment has 2021-02-15 11:45:14 +01:00
David Bomba
1feba49670
Merge pull request #4855 from beganovich/v5-0902-custom-driver-variables 
(v5) Allow variables in the custom payment driver
 2021-02-15 21:32:00 +11:00
David Bomba
e4697bb5f3 Refactor emails 2021-02-15 16:08:05 +11:00
David Bomba
5076b8c70c Notification cleanup 2021-02-15 11:49:34 +11:00
David Bomba
120d2c21ab Refactor password reset for admin users 2021-02-15 10:39:40 +11:00
David Bomba
08e280e651 Refactor password reset - clientcontact 2021-02-15 09:54:27 +11:00
David Bomba
5ad5606ea2 Request cancellation notification refactor 2021-02-15 09:12:14 +11:00
David Bomba
2b31b3bd8c Notification types 2021-02-15 08:32:59 +11:00
David Bomba
71d643070b Update texts 2021-02-15 07:55:09 +11:00
David Bomba
48d1a6726c Refactoring emails 2021-02-14 22:36:36 +11:00
David Bomba
4bfff15612 refactoring emails 2021-02-14 22:09:32 +11:00
David Bomba
6fd5d436c7 Refactoring mailers 2021-02-14 21:43:44 +11:00
David Bomba
862e86b8c9 Set client balances 2021-02-14 21:19:52 +11:00
David Bomba
01ee9529b6 Add trusted proxy config 2021-02-14 20:55:04 +11:00
David Bomba
575a3b3190 Improve quote document imports 2021-02-14 20:25:19 +11:00
Joshua Dwire
ac99b0039d Import functionality updates 2021-02-12 19:20:15 -05:00
Benjamin Beganović
29e4566be8 Inject signature on PDfs 2021-02-12 13:03:46 +01:00
David Bomba
ac2c7b2bbe Fixes for deleting a payment 2021-02-12 09:01:39 +11:00
David Bomba
3c23d5e31f Add updateBalance method to credit service 2021-02-12 08:16:43 +11:00
David Bomba
d870bb5a87
Merge pull request #4887 from turbo124/v5-develop 
Fix for entity footer
 2021-02-12 08:01:07 +11:00
David Bomba
bd6e3db554 Fix for entity footer 2021-02-12 08:00:42 +11:00
Benjamin Beganović
6afed935db Hide draft credits from client 2021-02-11 14:14:11 +01:00
David Bomba
fb7e4c11f6 Remove queuable 2021-02-12 00:02:22 +11:00
David Bomba
d689611929 minor fixes 2021-02-11 23:59:47 +11:00
David Bomba
b274d41e40 Remove queuable 2021-02-11 23:58:36 +11:00
David Bomba
f89091d6ef Change notification - disable queue 2021-02-11 23:53:53 +11:00
David Bomba
324a79023c Prevent mailables from being queueable" 
git push
 2021-02-11 23:35:46 +11:00
David Bomba
c2527c56b5 Gmail 2021-02-11 22:37:58 +11:00
David Bomba
c934c09b67 Reply to name 2021-02-11 21:09:34 +11:00
David Bomba
1eb396f300 Fixes for attachments 2021-02-11 19:04:40 +11:00
David Bomba
e11592e172 Fixes for gmail attachments 2021-02-11 18:58:37 +11:00
=
64351e0f0a Fixes for attachments with gmail 2021-02-11 18:32:49 +11:00
David Bomba
5f3efdc5ff Working on swift attachments 2021-02-11 16:48:13 +11:00
David Bomba
a36cfb99b8 GMail attachments 2021-02-11 14:43:48 +11:00
David Bomba
1e5b112254 Filter additional exceptions 2021-02-11 14:06:03 +11:00
David Bomba
22fdb082b0 Tuning mime types for attachments 2021-02-11 10:55:08 +11:00
David Bomba
5a29b3ef02 Working on GMail 2021-02-11 10:38:42 +11:00
David Bomba
0a6907349d
Merge pull request #4869 from turbo124/v5-develop 
Temporarily disable attachments from gmail emails
 2021-02-11 08:25:16 +11:00
Benjamin Beganović
c4d5004df8
Merge pull request #4868 from beganovich/v5-0902-design-updates 
(v5) PDF design updates
 2021-02-10 13:51:24 +01:00
=
c9d58d7af7 Temporarily disable attachments from gmail emails 2021-02-10 23:03:58 +11:00
=
dcf3d40709 Add Mail Manager 2021-02-10 22:34:39 +11:00
Benjamin Beganović
6607442740 wip 2021-02-10 12:31:14 +01:00
=
02ad1c0a55 Register mail.mailer 2021-02-10 22:17:27 +11:00
=
2b48477785 Register Gmail Mail Transport 2021-02-10 22:06:10 +11:00
=
b81afb9cb9 Decode user hashed id 2021-02-10 21:49:12 +11:00
=
85df91a6e8 Add redirect URI to google auth requests 2021-02-10 21:43:32 +11:00
David Bomba
7981093d97 Working on migration email notifications 2021-02-10 17:08:16 +11:00
David Bomba
0a1b4b26b9 Fixes for tests 2021-02-10 15:10:05 +11:00
David Bomba
6854c6c1f9 Fixes for multi db migration 2021-02-10 14:42:02 +11:00
David Bomba
3956184560 Working on multi-db 2021-02-10 14:18:23 +11:00
David Bomba
6cc02243f5 Working on multi-db 2021-02-10 13:26:05 +11:00
David Bomba
313488dc60 Working on handling check data within migrations" 2021-02-10 12:59:30 +11:00
Benjamin Beganović
d8c6d40cab wip 2021-02-09 16:47:41 +01:00
David Bomba
81217cc7f2 skip files that cannot be matched 2021-02-10 01:15:26 +11:00
Benjamin Beganović
f9457de073 Allow variables in the custom payment driver 2021-02-09 13:23:48 +01:00
Benjamin Beganović
3653c7901a Update rules for under payments 2021-02-09 12:48:22 +01:00
Benjamin Beganović
a84d6aca58 Drop address2 field from required 2021-02-09 12:01:46 +01:00
David Bomba
d6f8244d5f
Merge pull request #4848 from turbo124/v5-develop 
Add quote() relation to activity
 2021-02-09 07:13:43 +11:00
David Bomba
e115536b8c Add quote() relation to activity 2021-02-09 07:13:16 +11:00
Benjamin Beganović
051aa48b27
Merge pull request #4835 from beganovich/v5-0402-cypress-testing 
(v5) Testing gateways
 2021-02-08 16:49:52 +01:00
Benjamin Beganović
c56d88bba1 wip 2021-02-08 16:39:04 +01:00
David Bomba
ef8f5d8e28 Check data 2021-02-08 21:11:17 +11:00
David Bomba
ad725f3988 Parallel check data 2021-02-08 16:11:25 +11:00
David Bomba
e56a37a718 Return object not null if you have to return early!! 2021-02-08 00:03:59 +11:00
David Bomba
6681b4fbfe Fixes for import / migrartions 2021-02-07 23:35:16 +11:00
David Bomba
507367f430 Set vendor -> number in demo data 2021-02-07 19:25:05 +11:00
=
a217b086b1 Delete payment migration 2021-02-06 15:30:01 +11:00
=
7c3a6766c0 FIxes for Zero taxes 2021-02-06 11:18:42 +11:00
David Bomba
773e131afc Fixes for negative taxes 2021-02-06 10:39:40 +11:00
David Bomba
91fd4240b6 Merge branch 'v5-develop' of https://github.com/turbo124/invoiceninja into v5-develop 2021-02-06 09:32:42 +11:00
David Bomba
59ae0d3219 Fixes for migrations - do not applied cancelled payments to invoices 2021-02-06 09:31:26 +11:00
David Bomba
d7677d1d0c working on check data 2021-02-05 21:41:34 +11:00
David Bomba
47eabf5434 Invoice Actions 2021-02-05 16:03:34 +11:00
David Bomba
55839d66ed Auto archive invoice - Mark Paid 2021-02-05 16:02:38 +11:00
David Bomba
4c721e5027 fixes for credits 2021-02-05 07:47:16 +11:00
Benjamin Beganović
66c81d9b51 wip 2021-02-04 17:19:28 +01:00
=
e918d8243e Fixes for default template 2021-02-04 22:48:01 +11:00
David Bomba
e06403edba Fixes for tests 2021-02-04 21:45:11 +11:00
David Bomba
b546d54c2e Fix for migrations 2021-02-04 11:07:21 +11:00
David Bomba
7559bf3ab9
Merge pull request #4830 from turbo124/v5-develop 
Fixes for tests
 2021-02-04 09:22:08 +11:00
David Bomba
a5372b1cf3 Fixes for migrating V4 data - pushing credits off leger 2021-02-04 07:52:37 +11:00
Benjamin Beganović
aec701040a
Merge pull request #4828 from beganovich/v5-0302-cypress-checkout 
(v5) Fixes & tests for gateways
 2021-02-03 17:02:09 +01:00
Benjamin Beganović
7fb13ac516 wip 2021-02-03 16:59:09 +01:00
Benjamin Beganović
6a972ba378 wip 2021-02-03 16:49:29 +01:00
David Bomba
fc79835ed6
Merge pull request #4825 from turbo124/v5-develop 
Working on migrations.
 2021-02-03 23:30:31 +11:00
David Bomba
2e2843c27d Fixes for migrations 2021-02-03 23:29:44 +11:00
Benjamin Beganović
83a42cf410 wip 2021-02-03 12:36:10 +01:00
David Bomba
d26e347d6d Working on migrations 2021-02-03 10:59:58 +11:00
David Bomba
7711a21429
Merge pull request #4820 from turbo124/v5-develop 
Generic payment failure notifications.
 2021-02-03 09:26:16 +11:00
Benjamin Beganović
9e08ce7415 escape hash 2021-02-02 14:52:21 +01:00
=
a20fcaf299 Add logging to Phantom JS 2021-02-02 20:33:02 +11:00
=
883c11f12b Add a composer dump after install 2021-02-02 19:59:33 +11:00
=
306838c417 Fixes for tests 2021-02-02 19:51:12 +11:00
David Bomba
1797cac1a9 Refactoring email 2021-02-02 16:11:33 +11:00
David Bomba
2474507790 Working on generic payment failure notification 2021-02-02 12:04:52 +11:00
David Bomba
e9d0ac30e2 Refactor exception handling in stripe 2021-02-02 08:33:04 +11:00
David Bomba
0ae2c6db27 Fix for pausing recurring invoices 2021-02-02 07:14:38 +11:00
David Bomba
58970fab99 payment failure emails 2021-02-01 23:41:11 +11:00
David Bomba
2ab99e8132 AutoBilling failure mailer 2021-02-01 22:26:42 +11:00
David Bomba
c14d34350f Working on payment failure emails 2021-02-01 16:30:28 +11:00
David Bomba
fb8bf55e5c Clean up logging 2021-01-31 17:49:28 +11:00
David Bomba
d48756ea79 Improvements to migration email 2021-01-31 16:07:45 +11:00
David Bomba
dc231bc8b5 Fixes for PhantomJS displaying Recurring Invoice 2021-01-30 12:23:43 +11:00
David Bomba
65ee07b8ec Remove Spatie Ray - poor error handling 2021-01-30 12:13:32 +11:00
David Bomba
3c72a15707 Fix for phantom displaying Recurring Invoices 2021-01-30 11:19:43 +11:00
David Bomba
f2d4c7c72c
Merge pull request #4798 from turbo124/v5-develop 
Fixes for counters
 2021-01-30 00:02:20 +11:00
David Bomba
6d278a9c05 Add flag when permissions change 2021-01-29 23:29:42 +11:00
David Bomba
af472b21c1 Working on filtering responses based on user permissions 2021-01-29 23:05:03 +11:00
Benjamin Beganović
84f7e14d11
Merge pull request #4781 from beganovich/v5-2701-checkout-autobill 
(v5) Checkout.com auto-billing
 2021-01-29 12:01:54 +01:00
Benjamin Beganović
dbade2f497 wip 2021-01-29 12:00:30 +01:00
David Bomba
e213203ed9 Fixes for generates counteR" 2021-01-29 18:36:22 +11:00
David Bomba
dbfee7d519 Refactor for invoice number generator 2021-01-29 16:41:19 +11:00
David Bomba
e669718adb Fixes for client counter across entities 2021-01-29 13:18:21 +11:00
Benjamin Beganović
0db9f41a70
Merge pull request #4779 from beganovich/v5-2701-stripe-countries 
(v5) Define countries availability for Stripe
 2021-01-29 00:31:08 +01:00
David Bomba
05d657631e
Merge pull request #4794 from turbo124/v5-develop 
Reduce primary font size
 2021-01-29 07:18:09 +11:00
Benjamin Beganović
1727f3948e Fix issue with 2021-01-28 16:57:32 +01:00
Benjamin Beganović
8bbfbbb9e1 checkout token billing 2021-01-28 16:13:32 +01:00
Benjamin Beganović
e2d1c7ac43
Merge pull request #4778 from beganovich/v5-2701-ach-blank-screen 
(v5) ACH: Fix blank screen after payment
 2021-01-28 15:45:14 +01:00
Benjamin Beganović
3b31953d14
Merge branch 'v5-develop' into v5-2701-payable-draft-invoices 2021-01-28 15:44:22 +01:00
Benjamin Beganović
8a209a4c93
Merge pull request #4776 from beganovich/v5-2701-shift-token-resolving-to-backend 
(v5) Authorize.net, Checkout: Pass token hash id's instead of plain tokens
 2021-01-28 15:43:48 +01:00
Benjamin Beganović
874732f55d fix translation reference 2021-01-28 15:42:11 +01:00
Benjamin Beganović
119b361297 wip 2021-01-28 15:19:21 +01:00
Benjamin Beganović
6d77cce1a9 wip 2021-01-28 15:18:18 +01:00
David Bomba
e0d14cc82e Reduce primary font size 2021-01-28 21:07:15 +11:00
David Bomba
cc7a1876d0 Fixes for ledger - not adjusting for gateway fees 2021-01-28 15:21:04 +11:00
David Bomba
e0758e587f Add logging for migrations 2021-01-28 13:53:40 +11:00
David Bomba
4e10d4665e Remove redundant code in PaymentEmailEngine 2021-01-28 10:36:43 +11:00
David Bomba
6af67e6bdd Improve payment emails 2021-01-28 10:35:52 +11:00
David Bomba
756f421319 Add gateway fees for autobill 2021-01-28 08:31:31 +11:00
Benjamin Beganović
76a327bb01 wip 2021-01-27 18:01:47 +01:00
Benjamin Beganović
d7277b7c6d wip 2021-01-27 15:58:19 +01:00
Benjamin Beganović
615ef1e780 Allow payments of draft invoices: 
- Remove processing overlay scripts
- Add flash message to clean layout
- Remove $balance > 0 check from filtered invoices
- Only show the payment methods if total is bigger than 0
- Change flash message from "warning" to "message"
- Show message for $1 payments
 2021-01-27 14:10:24 +01:00
Benjamin Beganović
44f6dd3e4d Define countries availability for Stripe 2021-01-27 13:36:10 +01:00
Benjamin Beganović
0ff531fafa ACH: Fix white screen 
- Pass token hashed_id instead of token value
 2021-01-27 13:07:01 +01:00
Benjamin Beganović
84e888863f Authorize.net: Throw a PaymentFailed exception if token not found 
Checkout.com: Throw a PaymentFailed exception if token not found
- Show "Client portal" button even when invoice is paid
- Authorize.net: Pass token hashed_id instead of token to frontend
- Checkout.com: Pass token hashed_id instead of token to frontend
- Show "Paid" label for paid invoices
- Translation for not found token
 2021-01-27 12:45:38 +01:00
Benjamin Beganović
0c7ae3bca8
Merge pull request #4775 from beganovich/v5-2701-disable-google-apple-pay 
(v5) Disable SEPA, Apple, Google PAY
 2021-01-27 12:01:24 +01:00
Benjamin Beganović
b11972c369 disable sepa & applepay 2021-01-27 12:00:42 +01:00
David Bomba
d492d6c12f
Merge pull request #4774 from turbo124/v5-develop 
Payment notifications for autobilling
 2021-01-27 21:57:16 +11:00
David Bomba
9b72acf506 Payment notifications for autobilling 2021-01-27 21:56:50 +11:00
Benjamin Beganović
e6b6175ee5
Merge pull request #4770 from beganovich/v5-2601-show-save-card-programatically 
(v5) Show save card if token billing isn't always
 2021-01-27 11:55:18 +01:00
Benjamin Beganović
130714f457 Throw PaymentFailed exception if something goes wrong with response 2021-01-27 11:54:29 +01:00
David Bomba
b4bf6cc760 Add document list view 2021-01-27 21:38:28 +11:00
David Bomba
cf0e086d2a Reduce test data client numbers 2021-01-27 20:57:12 +11:00
David Bomba
af47c504e4 Working on payment failed emails 2021-01-27 19:45:55 +11:00
David Bomba
9d27480f2d Fixes for getPaymentMethods 2021-01-27 16:18:30 +11:00
David Bomba
78d726a483 Fixes for system logging custom payment drivers 2021-01-27 16:10:05 +11:00
David Bomba
b5ff2d8a02 Fixes for company gateway payment method resolution 2021-01-27 12:06:25 +11:00
David Bomba
6420658b3e
Merge pull request #4772 from turbo124/v5-develop 
Fixes for parallel testing
 2021-01-27 09:25:16 +11:00
David Bomba
458dd1fa4a Soft delete/restore tokens in sync with CompanyGateway" 2021-01-27 09:17:27 +11:00
Benjamin Beganović
c5ad3a94eb hide empty columns now pulling from settings 2021-01-26 17:41:36 +01:00
Benjamin Beganović
150a6622cd
Merge pull request #4767 from beganovich/v5-2601-fix-instance-of-gateway-authorize 
(v5) Fix not showing required gateway fields for Authorize.net
 2021-01-26 13:31:42 +01:00
Benjamin Beganović
d537d012a1 fix instance 2021-01-26 13:29:27 +01:00
David Bomba
bd02d7babd Fixes for payment failer mailer 2021-01-26 23:09:08 +11:00
David Bomba
09c23e6654 Fixes for refunds / logging 2021-01-26 21:03:50 +11:00
David Bomba
ae3a7fa182 Fixes for refunds / logging 2021-01-26 21:02:12 +11:00
David Bomba
ed853efd19 Additional logging 2021-01-26 20:53:18 +11:00
David Bomba
d127643405 Fix for auth.net autobill 2021-01-26 20:42:55 +11:00
David Bomba
e1ae7688a8 Fix for auth.net autobill 2021-01-26 20:39:52 +11:00
David Bomba
7b08355c75 Fix for auth.net autobill 2021-01-26 20:38:11 +11:00
David Bomba
c664428a81 Fix for auth.net autobill 2021-01-26 20:31:28 +11:00
David Bomba
31ff7fcc39 Fix for auth.net autobill 2021-01-26 20:17:27 +11:00
David Bomba
eb31c6b6d4 Fix for auth.net autobill 2021-01-26 20:13:53 +11:00
David Bomba
e4ae78cd41 Fix for auth.net autobill 2021-01-26 20:11:29 +11:00
David Bomba
61ea7e3897 Change thrown exception when adding payment method - auth.net 2021-01-26 16:37:45 +11:00
Benjamin Beganović
64e6dad248
Merge branch 'v5-develop' into v5-2001-gateways-and-new-tokens 2021-01-25 16:47:58 +01:00
Benjamin Beganović
fb66bfbe71 wip 2021-01-25 16:46:40 +01:00
Benjamin Beganović
f5f257292c wip 2021-01-25 16:12:21 +01:00
David Bomba
af523a6346 detach payment method from authorize gateway 2021-01-25 23:16:43 +11:00
David Bomba
64dfe1d6c3 Minor fix for authorize.net 2021-01-25 22:48:12 +11:00
David Bomba
337afe5220
Merge pull request #4758 from turbo124/v5-develop 
Fix for updating quote
 2021-01-25 22:23:35 +11:00
David Bomba
f950f84b61 Fix for 500 on updating quote by removing contacts 2021-01-25 21:54:36 +11:00
David Bomba
6540a25531 Refactor client numbering 2021-01-25 21:34:12 +11:00
Benjamin Beganović
324fcc287c wip 2021-01-25 10:07:42 +01:00
Benjamin Beganović
3c4e779585 add mount to requiredfields 2021-01-25 10:07:12 +01:00
David Bomba
269f83f317 Translations 2021-01-25 11:57:49 +11:00
David Bomba
af19afedb5 Translations 2021-01-25 10:04:50 +11:00
David Bomba
a0d0c77630 translations 2021-01-25 09:24:13 +11:00
David Bomba
8e06644fac Track payment ID with Activity 54 2021-01-25 07:55:04 +11:00
David Bomba
45cc39a3f1 Add alias for public_notes 2021-01-25 07:50:40 +11:00
David Bomba
b54c3a5b22 Fixes for demo 2021-01-25 07:46:53 +11:00
=
04d1a43dfe Remove strings and replace with translations 2021-01-24 22:48:09 +11:00
=
36d7ee5d6a Small fix for CSV Imports 2021-01-24 21:51:46 +11:00
David Bomba
3fa8158bc3 Fixes for refunds 2021-01-24 20:53:45 +11:00
David Bomba
cecee6cbfe Fixes for tests 2021-01-24 20:28:18 +11:00
David Bomba
0f8ee2d101 Tests for paid_to_date 2021-01-24 20:08:57 +11:00
David Bomba
6170dfae12 Fixes for tests 2021-01-24 20:00:45 +11:00
David Bomba
24dfbe48dc working on paid_to_date fields and calculations 2021-01-24 17:44:14 +11:00
=
e39759c35b Place additional checks in the scheduler to ensure the config is optimized appropriately 2021-01-23 16:09:58 +11:00
=
ad40434686 Additional checks that the scheduler has been configured and is working 2021-01-23 15:52:54 +11:00
=
27c7572821 Do not update or create a product if Invoice generated from a task/expense 2021-01-23 15:42:27 +11:00
David Bomba
272a089c38 Fixes for task and task status order 2021-01-22 21:55:03 +11:00
David Bomba
4b87df07b7 Check that a company gateway always has at least one fee and limits object 2021-01-22 08:36:25 +11:00
David Bomba
3d468e5f40 Company Gateway cleanup 2021-01-22 07:45:00 +11:00
Benjamin Beganović
713a95d3b2 ACH (Stripe): 
- Pass instance of $gateway to authorize page for fields  verification
- Support for multiple tokens
 2021-01-21 15:53:37 +01:00
Benjamin Beganović
056bee1c47 Credit card (Stripe): 
- Wrapped Stripe card widget into div
- Default intent option is setup_future_use now
- Support for token billing
 2021-01-21 14:03:38 +01:00
David Bomba
e9e4c39f17 Add support for QR code variables 2021-01-21 23:34:21 +11:00
David Bomba
c173fdcc5b Fixes for ledger 2021-01-21 15:42:30 +11:00
David Bomba
05ea7f092a Fixes for ledger adjustments 2021-01-21 15:05:05 +11:00
David Bomba
ff4f2f3953 Checks on Company Ledger sanity 2021-01-21 12:33:39 +11:00
David Bomba
f06fc9f720 Minor fix for payment validations' 2021-01-21 10:58:54 +11:00
David Bomba
db9e8ff830 Add rules preventing overpayment on invoices 2021-01-21 10:53:02 +11:00
David Bomba
79723759eb Reduce test data size for large account 2021-01-21 10:05:23 +11:00
David Bomba
7d5b679214 Fix for failed() method returning an error instead of exception 2021-01-21 10:02:39 +11:00
David Bomba
62bc55cf0b Fixes for client authentication to client portal 2021-01-21 10:01:13 +11:00
David Bomba
cb959fd3a3
Merge branch 'v5-develop' into v5-develop 2021-01-21 07:58:58 +11:00
Benjamin Beganović
2fccfe2df1 - Rewrite of checkout-credit-card.js 
- Fixed bug with detach() on driver class
- Changed the way token checking works from frontend
- Support for multiple payment methods on payment page
- Changed save card label to "Save payment method details"
- Updated relevant Javascript assets
 2021-01-20 16:19:01 +01:00
Benjamin Beganović
e5c7fc4416 E-mail improvements: 
- Removed injection of Tailwind CSS in the TemplateEngine.php
- Removed tailwindcss@1.4.6.css & tailwind-1.2.0.css
- Updated master template of e-mails for greeting, signature & footer sections
- Updated generic template for emails
- Updated footer (clean up)
- Fixed EntitySentObject.php class name
- Removed css-inliner.php config file
- Updated button component for e-mails
 2021-01-20 13:18:17 +01:00
David Bomba
e054894ffa Working on payments 2021-01-20 21:59:24 +11:00
David Bomba
a021bd83d9 Clean up emails 2021-01-20 14:49:22 +11:00
David Bomba
92e5465679 Entity mail failure email 2021-01-20 12:59:39 +11:00
David Bomba
656d7941cb
Merge pull request #4727 from turbo124/v5-develop 
Fixes for Migration
 2021-01-20 09:41:53 +11:00
David Bomba
612df00a2f Fixes for migration 2021-01-20 09:35:52 +11:00
David Bomba
5ce2a035da Fixes for approve / convert quotes 2021-01-20 08:30:04 +11:00
David Bomba
cfc144b6ec Group Document defaults 2021-01-20 07:22:14 +11:00
Benjamin Beganović
4413580b39 Add authorize view for SOFORT 2021-01-19 16:07:58 +01:00
Benjamin Beganović
617cc54de9 - Pass instance of AuthorizePaymentDriver.php as $gateway instead of CompanyGateway record 
- Define required fields for AuthorizePaymentDriver.php
- Update references to $gateway (CompanyGateway)
- Pass $countries to required-client-info.blade.php
- Handle country submission for required-client-info.blade.php
- Only show non-filled fields in RequiredClientInfo.php
 2021-01-19 14:36:07 +01:00
Benjamin Beganović
8ed701519b Change views to authorize.blade & pay.blade 
Change structure to use the new one
Add $data to pay now button
 2021-01-19 14:03:18 +01:00
Benjamin Beganović
6295a2647d refactor authorize.blade.php 2021-01-19 13:43:03 +01:00
Benjamin Beganović
924af2a981 Remove <br/> from template defaults 2021-01-19 11:15:54 +01:00
Benjamin Beganović
5dd38421e7
Merge pull request #4709 from beganovich/v5-1801-refactor-email-templates 
(v5) Refactor email templates
 2021-01-19 11:07:39 +01:00
David Bomba
cfbf6e8f4e Working on email failure notifications 2021-01-19 20:16:29 +11:00
David Bomba
7907eae103 raw subject and raw body 2021-01-19 11:46:00 +11:00
Benjamin Beganović
9471305021 Add class button to view links 2021-01-18 23:29:20 +01:00
David Bomba
4a34c6b903 Add is_docker variable to account transformeR 2021-01-19 07:40:54 +11:00
David Bomba
f20db94b62 Fixes for how we auth a client contact 2021-01-19 07:29:36 +11:00
David Bomba
63eae6000a fixes for service methods 2021-01-19 07:04:13 +11:00
David Bomba
40f336c469 Fixes for defaults 2021-01-19 07:02:32 +11:00
David Bomba
1a4b5ed51d Add public notes to invoices 2021-01-18 22:08:18 +11:00
David Bomba
81da8e169d Add documents to groups 2021-01-18 22:06:26 +11:00
David Bomba
d4bfca46bc Fixes for reminder job 2021-01-18 21:59:24 +11:00
David Bomba
cbd6f212b5 deprecate old getPaymentMethods() 2021-01-18 13:59:06 +11:00
David Bomba
69bc2f0183 Fixes for getPaymentMethods 2021-01-18 13:12:48 +11:00
David Bomba
bd5defe455 Refactor getPaymentMethods() 2021-01-18 12:36:13 +11:00
David Bomba
6f95715917 Update model exchange rate if client currency differs from company 2021-01-18 10:01:37 +11:00
David Bomba
a33c781919 Payment notifications for online payments to the client 2021-01-18 08:31:49 +11:00
David Bomba
13be9c5ad6 Fixes for autobill 2021-01-17 21:33:05 +11:00
David Bomba
af86d1e69f Fix for import 2021-01-17 20:35:01 +11:00
David Bomba
7e908ef776 Fire notification when sending recurring invoice 2021-01-17 20:14:56 +11:00
David Bomba
ebd9a2c328 Try / catch for webhooks 2021-01-17 15:37:55 +11:00
David Bomba
c4bfb33dbf Add destroy() methods in all controllers 2021-01-17 15:28:03 +11:00
David Bomba
8c8509ca40
Merge pull request #4703 from turbo124/v5-develop 
Refactor alternateSave() in BaseRepo
 2021-01-16 08:45:37 +11:00
Benjamin Beganović
3970ee3450 only require email in settings 2021-01-15 14:07:33 +01:00
Benjamin Beganović
72b509dfe2 only require postal_code for billing address 2021-01-15 13:27:46 +01:00
Benjamin Beganović
c7226f7fa6 update designs 2021-01-15 13:08:09 +01:00
Benjamin Beganović
8df374c9db add data-refs to taxes 2021-01-15 12:56:05 +01:00
Benjamin Beganović
d43daeaddb hide terms label if terms are empty 2021-01-15 12:44:37 +01:00
David Bomba
cbce8c8a46 minor fixes for client portal 2021-01-15 22:19:34 +11:00
David Bomba
2b77951ea0 Deprecate task fields 2021-01-15 22:01:44 +11:00
Benjamin Beganović
bc584c387c merge upstream/v5-develop 2021-01-15 11:03:40 +01:00
David Bomba
1b551796c5 Recurring PDF Dependencies 2021-01-15 14:10:35 +11:00
David Bomba
2f58096872 Fixes for displaying Recurring Invoice PDF 2021-01-15 13:02:55 +11:00
David Bomba
12c4cdb4ed Refactor alternateSave() in BaseRepo 2021-01-15 11:59:23 +11:00
David Bomba
6857393ff6 Fixes for logging 2021-01-15 10:50:27 +11:00
David Bomba
1f97744083
Merge pull request #4695 from turbo124/v5-develop 
Fix for recurring invoice tax calculations.
 2021-01-15 09:58:44 +11:00
David Bomba
af1e211abe Fix for recurring invoice tax calculations. 2021-01-15 09:58:21 +11:00
David Bomba
fc6384f051
Merge pull request #4690 from beganovich/v5-0114-design-improvements 
(v5) Invoices/quotes design improvements
 2021-01-15 08:34:03 +11:00
David Bomba
7b1f7b7bbd
Merge pull request #4687 from beganovich/v5-0114-change-default-pdf-viewer 
(v5) Show quotes/invoices in full-screen by default
 2021-01-15 08:33:14 +11:00
David Bomba
b72a4567db
Merge pull request #4688 from beganovich/v5-0114-remove-url-in-settings 
(v5) Client portal: Remove URL validation from the website
 2021-01-15 08:33:09 +11:00
David Bomba
f64a798ca5
Merge pull request #4689 from beganovich/v5-0114-hide-drafts-from-quote-tables 
(v5) Client portal: Remove drafts from the quotes table
 2021-01-15 08:33:01 +11:00
David Bomba
af1a458b1e
Merge pull request #4691 from beganovich/v5-0114-show-terms 
(v5) Support for entity terms
 2021-01-15 08:32:54 +11:00
David Bomba
6a8f3d6b1c
Merge pull request #4692 from beganovich/v5-show-partial-due 
(v5) Show partial due at invoice totals
 2021-01-15 08:32:26 +11:00
Roman Miniv
b20594dc43 Deleted fillable duplicates. 2021-01-14 23:01:31 +02:00
Benjamin Beganović
3bcc9a2d74 show partial due 2021-01-14 16:49:24 +01:00
Benjamin Beganović
c92ae4d86f Support for invoice terms 2021-01-14 16:38:40 +01:00
Benjamin Beganović
1c5c7250ee Unified margin across designs 2021-01-14 15:57:14 +01:00
Benjamin Beganović
a43d756068 missing break 2021-01-14 14:24:43 +01:00
Benjamin Beganović
ab4ed1f2b0 add status converted 2021-01-14 14:22:01 +01:00
Benjamin Beganović
f8e57f57a5 Remove drafts from the quotes-table 2021-01-14 14:17:39 +01:00
Benjamin Beganović
6f9bedd7f1 remove url validation from settings/website 2021-01-14 14:15:09 +01:00
Benjamin Beganović
2a193c97ea Show quotes/invoices in full-screen by default 2021-01-14 13:29:46 +01:00
David Bomba
1ff29a2d55 Fix for usercreated event 2021-01-14 20:31:27 +11:00
Benjamin Beganović
c70eb17c16 fix jpg issues in the documents-table 2021-01-14 10:25:39 +01:00
David Bomba
8b22fa5a47 Fixes for user events 2021-01-14 15:31:45 +11:00
David Bomba
29038a16fa Fixes for tests 2021-01-14 14:56:21 +11:00
David Bomba
7d46ec489a User Activities 2021-01-14 14:44:52 +11:00
David Bomba
502b8f336f HTMLEngine clean up 2021-01-14 13:20:26 +11:00
David Bomba
bf6436e350 Catch exception in Authorize - failedResponse method 2021-01-14 11:47:32 +11:00
David Bomba
ae5f5ac30a Fixes for invitation creation 2021-01-14 10:00:32 +11:00
David Bomba
95e5b89641 fixes for validation of line_items 2021-01-14 08:16:07 +11:00
David Bomba
4ad3e7fc8a Fix for group_settings_id being dropped in certain edge cases 2021-01-14 08:01:27 +11:00
David Bomba
ee85a6487c
Merge pull request #4670 from beganovich/v5-jan12-required-fields 
(v5) Required fields for gateways
 2021-01-14 07:55:27 +11:00
David Bomba
cfc8c248cd
Merge pull request #4678 from beganovich/v5-0113-fix-authorize 
(v5) Fix Authorize.net
 2021-01-14 07:55:18 +11:00
David Bomba
f5c37ac2f4 fix for json documents presenting itself as file uploads 2021-01-14 07:53:42 +11:00
David Bomba
97180508e8 Remove stale invoice_type_id properties 2021-01-14 07:35:52 +11:00
David Bomba
20b13d131b Return expense response when using delete route 2021-01-14 07:33:45 +11:00
Benjamin Beganović
0c91226352 fix authorize 2021-01-13 15:36:28 +01:00
Benjamin Beganović
253e2254ef Remove redirect redirect 2021-01-13 13:41:20 +01:00
Benjamin Beganović
9975691ef4 Remove redirect redirect 2021-01-13 13:41:04 +01:00
Benjamin Beganović
9516f877f6 Skip showing the page if no fields 2021-01-13 13:39:34 +01:00
Benjamin Beganović
b755daf7f5 - AuthorizePaymentDriver.php rules 2021-01-13 13:34:21 +01:00
Benjamin Beganović
b014aecc7d - Add getClientRequiredFields in BaseDriver.php 
- Pass $fields in @required-client-info
- Don't show form if fields are satisfied
- Remove $gateway reference in RequiredClientInfo.php
- StripePaymentDriver.php required fields
- Removed old-redirect logic for required fields
 2021-01-13 13:31:00 +01:00
David Bomba
976f610158 fixes for validation 2021-01-13 23:20:15 +11:00
David Bomba
4ff0108c5c fixes for validation 2021-01-13 22:52:30 +11:00
David Bomba
e3efa5790f Email validation 2021-01-13 22:47:36 +11:00
David Bomba
b5807d8d9c Fixes for document upload from company 2021-01-13 21:18:39 +11:00
David Bomba
3b02dd56e0 Save documents to Company Entity 2021-01-13 21:12:14 +11:00
David Bomba
a6121295c2 Fix for retrieving quote PDF 2021-01-13 19:58:01 +11:00
David Bomba
989d2fe574 Default show dashboard to false 2021-01-13 18:47:14 +11:00
David Bomba
ccf65f1c7c Fix for Hide/Show Client Portal Dashboard 2021-01-13 18:43:26 +11:00
David Bomba
7f03a1900e Refactor notifications to be more specific, ie. Invoice -> Reminder 1 template 2021-01-13 18:20:46 +11:00
David Bomba
eb7cee706d Fixes for displaying company logo in email templates 2021-01-13 12:22:23 +11:00
David Bomba
249c0e8b2b fix for presenting company logo in portal 2021-01-13 12:15:04 +11:00
David Bomba
b2b464fb9e Check PhantomJS response is valid PDF 2021-01-13 10:25:33 +11:00
David Bomba
43626c92a2 Tests for PDF mime 2021-01-13 10:12:01 +11:00
David Bomba
e0c995a8b3 Fix for trailing $ in default templates 2021-01-13 07:40:49 +11:00
Benjamin Beganović
0b4e85957c wip 2021-01-12 16:30:11 +01:00
Benjamin Beganović
cdd62f7e2a wip 2021-01-12 16:23:39 +01:00
Benjamin Beganović
ff3ee60cf9 wip 2021-01-12 15:43:07 +01:00
David Bomba
e804e083a0 Add slight delay to mailer 2021-01-12 20:54:45 +11:00
David Bomba
f0bf26ad14 Fixes for system logging successful gateway responses" 2021-01-12 20:35:47 +11:00
David Bomba
51cd6f71fd fixes for tests which handle remote disks 2021-01-12 19:04:05 +11:00
David Bomba
1432605211 Remove custom values from product table 2021-01-12 18:45:51 +11:00
David Bomba
b0c5cb3f46 Fix for DateTime 2021-01-12 18:40:18 +11:00
David Bomba
6222a1386c Fixes for timezones 2021-01-12 18:38:16 +11:00
David Bomba
e3f0493c48 Cleanup for emails 2021-01-12 10:21:17 +11:00
David Bomba
3cb4585880 Fixes for migrations 2021-01-12 09:14:52 +11:00
David Bomba
63087de0bc Fix for tests (typo) 2021-01-12 09:06:56 +11:00
David Bomba
7d69f5eba3 Changes to schema for expenses, drop redundant columns from company table 2021-01-12 08:57:48 +11:00
David Bomba
b76e404401 Adjust use credits functionality 2021-01-12 08:42:30 +11:00
David Bomba
9e3b28f6ac
Merge pull request #4668 from turbo124/v5-develop 
Fixes for recurring invoice cron query
 2021-01-12 08:20:52 +11:00
Benjamin Beganović
2f17f7011a Show "Apply credits" only 2021-01-11 15:21:17 +01:00
Benjamin Beganović
50203f56a1 - Fix issue with & not appending correctly 
- Bump snappdf
 2021-01-11 13:34:54 +01:00
David Bomba
6098700823 Fix partially refunded status 2021-01-11 21:51:54 +11:00
David Bomba
df55785df9 fix for calculating invoice payments (include partial and full refunds). 2021-01-11 21:45:38 +11:00
David Bomba
fe457537b6 Change the way company logos are stored in the settings 2021-01-11 19:27:11 +11:00
David Bomba
fb847dba69 Fixes for recurring cron 2021-01-11 08:06:32 +11:00
David Bomba
d26d26fccf Fixes for client counteR 2021-01-10 21:45:02 +11:00
David Bomba
ffec88979e document migration 2021-01-10 21:17:18 +11:00
David Bomba
7c1d751e56
Merge pull request #4659 from turbo124/v5-develop 
Version bump
 2021-01-10 09:15:47 +11:00
David Bomba
7285a6df03 Mark invoice as sent if viewed in portal as Draft 2021-01-10 09:13:48 +11:00
David Bomba
e8dd0622e0 Documents for migration 2021-01-09 22:10:04 +11:00
David Bomba
597d582a73 Add third party docs to invoices credit and quotes 2021-01-09 15:18:20 +11:00
David Bomba
c317e93af3 Comments for hosted version 2021-01-09 15:15:53 +11:00
David Bomba
6b5da010a9 Add Ray as dev dependency, handle third party document attachments 2021-01-09 15:10:48 +11:00
Benjamin Beganović
fe4f01d98a Wrap processPaymentView & processPaymentRequest into try-catch 2021-01-08 13:45:08 +01:00
David Bomba
c82d6fa270 additional column on company and expenses table 2021-01-08 21:27:49 +11:00
David Bomba
13420a93b9 Fixes for validation 2021-01-08 21:19:26 +11:00
David Bomba
0797c8e4af fix for fee label 2021-01-08 14:43:29 +11:00
David Bomba
a5290e067e Fix for suming amounts payable 2021-01-08 14:25:54 +11:00
David Bomba
aae2f1d198 Add .datetime variable for invoice designs 2021-01-08 13:15:55 +11:00
David Bomba
da7eb3b4c2 Fixes for invoice creation from recurring where balance doubles 2021-01-08 12:44:31 +11:00
David Bomba
b5606c1524 Fixes for task statuses and tests 2021-01-08 09:25:00 +11:00
David Bomba
2e499adea6 Fix for task status null color value 2021-01-08 09:03:29 +11:00
=
56bcaf0785 Fix for custom payment driver label 2021-01-07 21:09:24 +11:00
David Bomba
5d302ad450 Fixes for multi payments 2021-01-07 18:21:49 +11:00
David Bomba
ceb8637310 fix for type 2021-01-07 17:24:02 +11:00
David Bomba
31dd8b2d77
Merge pull request #4643 from turbo124/v5-develop 
Fixes for tax precision
 2021-01-07 17:09:08 +11:00
David Bomba
5a840201da Move field from company table to settings 2021-01-07 17:08:34 +11:00
David Bomba
2cd5d2d68a Minor fixes for credit_payments in CP 2021-01-07 10:18:57 +11:00
David Bomba
e42cb6f4d3 display tax rates with no trailing precision 2021-01-07 09:43:08 +11:00
David Bomba
996355a738 Add system_logs to company gateway transformer 2021-01-07 08:27:59 +11:00
David Bomba
3d9755b906
Merge pull request #4624 from beganovich/v5-refactor-calcGatewayFee 
(v5) Refactor calcGatewayFee
 2021-01-07 07:29:10 +11:00
Benjamin Beganović
e1df465883 Show the message if invoice is unpayable 2021-01-06 14:22:48 +01:00
Benjamin Beganović
b6d55ceea0 php-cs-fixer 2021-01-06 13:06:42 +01:00
Benjamin Beganović
132f9da3ff Pass GatewayType from gateway_type_id on token 2021-01-06 13:06:18 +01:00
David Bomba
9bc27c05d3 remove loggin 2021-01-06 22:28:43 +11:00
David Bomba
04d8bcccb1 Fix for error handling in PayPal driver 2021-01-06 20:28:48 +11:00
David Bomba
65afd70b38 Always ensure the client has a currency set 2021-01-06 19:50:13 +11:00
David Bomba
47f42b804d Fixes for partial credit payments" 2021-01-06 16:54:04 +11:00
David Bomba
3ee3f67c8c Fixes for over payments 2021-01-06 16:14:20 +11:00
David Bomba
6d366febd8 Fixes for paypal driver 2021-01-06 13:26:40 +11:00
David Bomba
c132e9ace8 Fixes for tasks, and migrations 2021-01-06 10:36:20 +11:00
David Bomba
2e3c80500c
Merge pull request #4632 from beganovich/v5-remove-ninja-key-command 
(v5) Remove ninja:generate-setup-key command
 2021-01-06 08:54:33 +11:00
Benjamin Beganović
2b6b2f8061 Remove ninja:generate-setup-key command 2021-01-05 18:03:57 +01:00
Benjamin Beganović
4ca96b4136 Toggle this hiding behaviour based on settings 2021-01-05 17:55:57 +01:00
Benjamin Beganović
ae534b146b Inject Javascript that'll filter for hidden columns 2021-01-05 17:48:06 +01:00
Benjamin Beganović
329c72128c Set all elements to be hidden by default 2021-01-05 17:47:50 +01:00
Benjamin Beganović
40c5392aa0 Change info() to nlog() 2021-01-05 17:45:34 +01:00
David Bomba
f267408029
Merge pull request #4629 from turbo124/v5-develop 
update decimal precision
 2021-01-05 17:19:41 +11:00
David Bomba
13e9197ae5 Tests for task sorting 2021-01-05 15:41:43 +11:00
David Bomba
0c74a4601f Change decimal resolution 2021-01-05 13:24:32 +11:00
David Bomba
f3e39a203d
Merge pull request #4626 from beganovich/v5-remove-task-calculation-from-backend 
(v5) Remove task hours calculation from the invoice/PDF
 2021-01-05 09:16:20 +11:00
Benjamin Beganović
4b6257da3b Remove task hours calculation from the invocie 2021-01-04 14:38:56 +01:00
Benjamin Beganović
5833df9850 Refactor calcGatewayFee: 
- Remove default GatewayType::CREDIT_CARD
- Swapped spaces for taxes & gateway type
 2021-01-04 14:07:50 +01:00
Benjamin Beganović
fd1c655c34 Set debug default to 'false' 2021-01-04 13:43:13 +01:00
Benjamin Beganović
b266def75b Remove debug from the setup page 2021-01-04 13:42:31 +01:00
Benjamin Beganović
603f7baa58 apply php-cs-fixeR 2021-01-04 13:38:00 +01:00
Benjamin Beganović
14efcc77e6 Support for database port on the setup 2021-01-04 13:36:47 +01:00
David Bomba
2dd7e07c82 Fix for expense documents 2021-01-04 22:22:48 +11:00
David Bomba
15b2ee6642 Add additional mimes 2021-01-04 21:49:28 +11:00
David Bomba
ad57469ee4 Flutter Service Worker 2021-01-04 20:53:58 +11:00
David Bomba
934610a01c Update copyright + version bump + set canadian dollar symbol to $ 2021-01-04 08:54:54 +11:00
David Bomba
8653cc6114 Fixes for unique taxrate constraint on update 2021-01-04 08:22:42 +11:00
David Bomba
e791741efa Fixes for displaying recurring invoices in the client portal 2021-01-03 18:56:42 +11:00
David Bomba
34e04ce31b Fixes for recurring invoice daily recurring 2021-01-03 18:08:08 +11:00
=
0dbf1f1dfd Fix for missing Daily Recurring const 2021-01-02 10:01:33 +11:00
=
ba8fcb0de0 Fixes for next_send_date when updating a recurring invoice 2021-01-02 09:52:42 +11:00
=
564e1aefe1 Fixes for next_send_date when updating a recurring invoice 2021-01-02 09:51:13 +11:00
=
0f70579b72 Fixes for client_id_number placeholder for generatescounter 2021-01-02 09:32:58 +11:00
=
6c098160df Allow a user to change only their own password 2021-01-01 20:11:21 +11:00
David Bomba
2e2b815371
Merge pull request #4607 from turbo124/v5-develop 
Display client name if contact name is not present
 2021-01-01 11:53:34 +11:00
=
1a87b05b96 Display client name if contact is not present 2021-01-01 11:52:42 +11:00
Benjamin Beganović
3d5730d653 pass inclusive taxes 2020-12-31 11:55:09 +01:00
Benjamin Beganović
03cdb516c7 fix issue with gateway type id not being passed 2020-12-31 11:29:40 +01:00
=
02e535b5a1 Fix for recurring invoice null next_send_date 2020-12-31 09:18:29 +11:00
David Bomba
0650f066e2
Merge pull request #4599 from turbo124/v5-develop 
Clean up logging
 2020-12-31 08:48:56 +11:00
Benjamin Beganović
8df80ddab0 fixes for paypal redirecting to stripe 2020-12-30 12:02:04 +01:00
=
876eedd3f4 Clean up logging 2020-12-30 10:38:07 +11:00
=
eabaed87da Fixes for invoice status 2020-12-30 10:23:14 +11:00
=
ccc4133094 Fixes for recurring 2020-12-30 09:24:33 +11:00
=
389c80ca13 Fixes for import 2020-12-30 08:58:48 +11:00
=
9a5b27eb09 Fixes for importing recurring invoices 2020-12-30 08:43:27 +11:00
=
7a058c9ae6 Move logging to nlog 2020-12-30 08:10:03 +11:00
=
48520746a2 Fixes for migration 2020-12-30 07:37:48 +11:00
=
e14bef7eee Migrate invitations from V4 2020-12-29 10:44:24 +11:00
=
b8fae9249b fixes for migration 2020-12-28 17:04:24 +11:00
=
0a9c66cab8 Autoload snappdf in composer post hooks - add client number when importing 2020-12-28 08:58:49 +11:00
=
4129dba08b Test for HTML output for preview controller 2020-12-26 20:26:19 +11:00
David Bomba
b3962986fb
Merge pull request #4577 from turbo124/v5-develop 
Fix for company.users.company_user
 2020-12-26 19:04:03 +11:00
=
53ff009d74 fix for company.users.company_user 2020-12-26 19:03:24 +11:00
Benjamin Beganović
6f7ec1c188
Merge pull request #4574 from beganovich/v5-makeCustomField-refactor 
(v5) Refactor methods for custom fields
 2020-12-25 17:19:02 +01:00
Benjamin Beganović
3219400812
Merge pull request #4575 from beganovich/v5-discount-visibility 
(v5) Show $product.quantity & product.discount based on settings
 2020-12-25 17:18:54 +01:00
Benjamin Beganović
9f58ccb028 Add support for custom Chromium path (ie. support for Windows & Mac) 2020-12-25 14:15:57 +01:00
Benjamin Beganović
b43b52519f Show $product.quantity & product.discount based on settings 2020-12-25 13:45:37 +01:00
Benjamin Beganović
f3f76e9644 remove duplicate methods 2020-12-25 12:30:40 +01:00
Benjamin Beganović
0bbd910490 apply php-cs-fixer 2020-12-25 12:29:42 +01:00
Benjamin Beganović
3198ef3352 paymentemailengine: refactor to makeCustomField 2020-12-25 12:29:13 +01:00
Benjamin Beganović
491d080ab4 add new makeCustomField (centralised refactor) 2020-12-25 12:27:37 +01:00
Benjamin Beganović
ebfbfb6e10 htmlengine: refactor makeCustomField to helpers 2020-12-25 12:27:23 +01:00
Benjamin Beganović
83ec60cf70 Remove unused makeCustomFieldKeyValuePair() method 2020-12-25 12:25:28 +01:00
Benjamin Beganović
85a27941f2 paymentemailengine: refactor formatCustomFieldValue 2020-12-25 12:13:26 +01:00
Benjamin Beganović
710c08cdef update formatCustomField value to accept nullable client 2020-12-25 12:12:56 +01:00
Benjamin Beganović
2f18ab1eeb htmlengine: refactor formatCustomFieldValue 2020-12-25 12:12:43 +01:00
Benjamin Beganović
2963824924
Merge pull request #4572 from beganovich/v5-ninja-generate-setup-key 
(v5) Command to generate app_key value
 2020-12-24 17:07:22 +01:00
Benjamin Beganović
f0dbf2ba71 nlog() 2020-12-24 17:01:34 +01:00
Benjamin Beganović
747e34247f add licence info 2020-12-24 15:42:23 +01:00
Benjamin Beganović
01ad794bce generate setup key command 2020-12-24 15:40:20 +01:00
Benjamin Beganović
77a8771c78 Setup improvements: 
- Disable Test PDF button while network request loading
- Return correct public/test.pdf file path
 2020-12-24 12:25:22 +01:00
David Bomba
bc8c68af18
Merge pull request #4568 from turbo124/v5-develop 
Fix for null values in country table
 2020-12-24 09:21:26 +11:00
Benjamin Beganović
751b355576
Merge pull request #4565 from beganovich/v5-cleanup-browsershot 
(v5) Removing Browsershot & Puppeteer
 2020-12-23 18:10:43 +01:00
Benjamin Beganović
4c351f6658 remove node/npm requirement 2020-12-23 16:32:56 +01:00
Benjamin Beganović
972099d89f fix product key 2020-12-23 15:51:29 +01:00
Benjamin Beganović
f98627e47f Rename product.product_key to product.item 2020-12-23 14:25:12 +01:00
Benjamin Beganović
16edac3738 add support for multiline text 2020-12-23 13:49:25 +01:00
Benjamin Beganović
3251efeb40
Merge pull request #4553 from beganovich/v5-support-for-custom-columns-on-invoice 
(v5) Support for custom columns on invoice
 2020-12-23 13:12:37 +01:00
Benjamin Beganović
ada4f3065c fixes for tests 2020-12-23 11:41:57 +01:00
Benjamin Beganović
a907933d57 transformlineitems -> switch 2020-12-23 11:17:14 +01:00
=
445bf451bf Fixes for tests and throwing correct failure 2020-12-23 09:04:19 +11:00
David Bomba
ef9c0d4975
Merge pull request #4555 from turbo124/v5-develop 
Fixes for import / texts
 2020-12-23 08:38:32 +11:00
=
383d3ab8c1 Fixes for import / texts 2020-12-23 08:38:13 +11:00
Benjamin Beganović
8fd560dcce process custom columns 2020-12-22 13:56:09 +01:00
Benjamin Beganović
eb5ad3a4ea html engine, new $product1-4 variables 2020-12-22 13:55:40 +01:00
Benjamin Beganović
3b4c2ba5b0 add $custom_value in makeinvoicevalues 2020-12-22 13:55:29 +01:00
Benjamin Beganović
f3c57e87f1 Set default margin to standard A4 printing 2020-12-22 09:43:14 +01:00
Benjamin Beganović
69bc664457
Merge pull request #4549 from beganovich/v5-snappdf-integration 
(v5) snappdf support
 2020-12-22 09:31:22 +01:00
Benjamin Beganović
6009d49330
Merge pull request #4546 from beganovich/v5-amount-with-fee 
(v5) Change amount_with_fee source location
 2020-12-22 09:26:24 +01:00
Benjamin Beganović
85d241e15e update global margin 2020-12-21 16:55:47 +01:00
Benjamin Beganović
95c1f60674 Install beganovich/snappdf package 2020-12-21 16:32:04 +01:00
Benjamin Beganović
940c5c77f3 find and setup db by company key in webhook request 2020-12-21 12:19:48 +01:00
Benjamin Beganović
09a5ab4fad Merge remote-tracking branch 'upstream/v5-develop' into v5-amount-with-fee 2020-12-21 12:14:43 +01:00
Benjamin Beganović
f6758873e7 PayPal: Update amount with fee 2020-12-21 12:10:47 +01:00
Benjamin Beganović
0b95e8c8bc Checkout.com: Update amount with fee 2020-12-21 12:10:39 +01:00
Benjamin Beganović
24d76e98f0 Authorize.net: Update amount with fee 2020-12-21 12:10:28 +01:00
Benjamin Beganović
5a8dfd85eb Apply php-cs-fixer 2020-12-21 11:46:46 +01:00
Benjamin Beganović
7764833037 Update Stripe's amount with fee: 
- Update Sofort to support latest architecture for payments
 2020-12-21 11:46:10 +01:00
David Bomba
950a057496
Merge pull request #4545 from turbo124/v5-develop 
Fix for preview
 2020-12-21 20:59:17 +11:00
David Bomba
95455f732b Minor fix for preview 2020-12-21 20:58:55 +11:00
Benjamin Beganović
75902c6d3f Fixes for client number formatting 2020-12-21 09:08:12 +01:00
Benjamin Beganović
6f32fd6c4b
Merge pull request #4527 from beganovich/v5-stripe-webhook-support 
(v5) Stripe support for webhooks
 2020-12-21 08:14:00 +01:00
David Bomba
26cceac505 Fixes for import 2020-12-21 15:55:15 +11:00
David Bomba
ea360cead4 Import notifications 2020-12-21 12:52:33 +11:00
David Bomba
2347b9db7a Import notification 2020-12-21 12:16:26 +11:00
David Bomba
bc06476431 Fix for Quote View Activitry 2020-12-21 10:47:03 +11:00
David Bomba
caa30da38d Ignore HTTPS errors in browsershop 2020-12-21 10:11:33 +11:00
David Bomba
c1edc905db Importing invoices 2020-12-20 20:02:10 +11:00
David Bomba
ccde0eaced Working on importing CSV Invoices 2020-12-20 18:02:58 +11:00
David Bomba
4df646f93b Fixes for tests 2020-12-20 12:21:40 +11:00
David Bomba
d8fab379ac Fixes for release 2020-12-20 08:00:02 +11:00
Benjamin Beganović
92d2a514ca Supprot Stripe for webhooks 2020-12-19 13:11:42 +01:00
David Bomba
6b02d51080 Invoice Import 2020-12-19 18:28:58 +11:00
David Bomba
4877d3c2f5 Working on importing invoices 2020-12-19 15:11:15 +11:00
David Bomba
298deac062 Working on Invoice CSV Import 2020-12-19 14:49:15 +11:00
David Bomba
c3c868b90d Working on Invoice + Payment csv import 2020-12-19 12:45:12 +11:00
=
7285c78afb remove GMP extension requirements 2020-12-19 08:29:32 +11:00
David Bomba
09c2c40903 Fixes for import test 2020-12-18 15:34:40 +11:00
David Bomba
df30f0cbc5 Fixes for github actions 2020-12-18 11:31:27 +11:00
David Bomba
3ad3d0a418 Fix for editting invoice where number in pending state 2020-12-18 07:14:46 +11:00
David Bomba
f45588d26e
Merge pull request #4522 from turbo124/v5-develop 
Handle invoice numbers on restore
 2020-12-18 07:12:17 +11:00
David Bomba
adab53ed97 Handle restoring a deleted invoice 2020-12-18 07:11:31 +11:00
Benjamin Beganović
220c7f080a Provide action selectors to match PDF elements: 
- Add ext-libxml to composer.json
- Support outputting the PDF in CreateEntityPdf.php & GenerateDeliveryNote.php
- Add reference names to Design.php
 2020-12-17 15:44:01 +01:00
Benjamin Beganović
eadcff544f Support for multiline entity public notes. 2020-12-17 14:03:07 +01:00
David Bomba
d3cdfd670f Product import 2020-12-17 23:00:32 +11:00
Benjamin Beganović
6fa90c7060 Change webhook order 2020-12-17 12:47:46 +01:00
Benjamin Beganović
79c6cc474a
Merge pull request #4515 from beganovich/v5-checkout-webhooks-update 
(v5) Support for Checkout @ webhooks
 2020-12-17 12:33:01 +01:00
Benjamin Beganović
5ea07fde66
Merge pull request #4512 from beganovich/v5-remove-trailing-slash-from-setup 
(v5) Remove trailing slash from URLs on setup
 2020-12-17 12:32:47 +01:00
Benjamin Beganović
942652b668 Update webhooks to support Checkout.com & apply php-cs-fixer 2020-12-17 12:27:15 +01:00
David Bomba
c75bd84cbe
Merge pull request #4514 from turbo124/v5-develop 
add enable_product_discount to company table.
 2020-12-17 21:57:10 +11:00
Benjamin Beganović
d8405710e7
Merge pull request #4513 from beganovich/v5-webhooks-refactor 
(wip) (v5) Webhooks refactor
 2020-12-17 11:56:16 +01:00
David Bomba
feb78a63f2 Add service worker back in 2020-12-17 21:53:20 +11:00
Benjamin Beganović
c78a03b095 Remove trailing slash from URLs on setup 2020-12-17 11:10:47 +01:00
David Bomba
24d4095709 Fixes for composer 2020-12-17 10:32:42 +11:00
David Bomba
831d1e0816 revert to exec() to composer install 2020-12-17 10:23:54 +11:00
David Bomba
c498f230d4 Adjustments for post update 2020-12-17 07:12:20 +11:00
David Bomba
d035fce0ac Adjustments for post update 2020-12-17 07:10:06 +11:00
David Bomba
e5c30c67f1
Merge pull request #4506 from turbo124/v5-develop 
Adjustments for post update
 2020-12-17 07:07:42 +11:00
David Bomba
ad156e5935 Adjustments for post update 2020-12-17 07:06:40 +11:00
Benjamin Beganović
d3033c902d wip 2020-12-16 15:25:42 +01:00
Benjamin Beganović
9662d9af92 Update webhooks for Checkout: 
- Update api.php -> gateway_key => company_gateway_id
- Pass correct reference to url in CreditCard.php
- Update PaymentWebhookController.php to support new company_gateway_id
- Update PaymentWebhookRequest.php to resolve company gateway from correct input
 2020-12-16 13:47:10 +01:00
Benjamin Beganović
20c010448a apply php-cs-fixer 2020-12-16 12:52:40 +01:00
Benjamin Beganović
9f4481d35f Enable support for ChromiumPdf on setup 
Add test.pdf to .gitignore
 2020-12-16 12:51:41 +01:00
David Bomba
ece104695c Client Imports 2020-12-16 21:13:02 +11:00
David Bomba
7353687c04 Working on client import 2020-12-16 21:06:20 +11:00
David Bomba
8df553c4cc Working on CSV imports 2020-12-16 11:01:15 +11:00
David Bomba
b087046489 Client import map 2020-12-16 09:17:31 +11:00
David Bomba
5715f34086 Better error handling with self updater 2020-12-16 07:37:30 +11:00
David Bomba
15489e2300
Merge pull request #4499 from turbo124/v5-develop 
Better error handling with self updater
 2020-12-16 07:36:14 +11:00
David Bomba
bff5b94ff0 Better error handling with self updater 2020-12-16 07:35:54 +11:00
Benjamin Beganović
0c1f17cd4e
Merge pull request #4497 from beganovich/v5-fixes-for-chromiumpdf 
(v5) Fixes for ChromiumPdf
 2020-12-15 11:50:44 +01:00
Benjamin Beganović
7ccd10adf9 - Change $global-margin to $global_margin to keep consistency 
- Update designs accordingly
- Update ChromiumPdf version
- Apply php-cs-fixer
 2020-12-15 11:45:04 +01:00
David Bomba
008f3fd45f
Merge pull request #4496 from turbo124/v5-develop 
Client filters by name
 2020-12-15 20:50:42 +11:00
Benjamin Beganović
3b5c592f25
Merge pull request #4492 from beganovich/v5-experimental-chromiumpdf-support 
Experimental PDF rendering
 2020-12-15 10:47:39 +01:00
David Bomba
300e42278f Client filters by name 2020-12-15 20:44:22 +11:00
David Bomba
3c9a8fdd35 Fixes for query filters 2020-12-15 20:38:12 +11:00
David Bomba
5025949eaa CSV import 2020-12-15 15:31:49 +11:00
David Bomba
57ee54032f Import CSV 2020-12-15 09:59:41 +11:00
David Bomba
864892a7d2 Migrate white label license 2020-12-15 08:52:14 +11:00
David Bomba
ed20f2c4bc Null safety in translations 2020-12-15 07:53:31 +11:00
Benjamin Beganović
dcd6574b2d Experimental PDF rendering: 
- Added experimental flag in ninja.php
- Added experimental rendering in PdfMaker.php
- Added dynamic $global-margin for 1cm/0cm based on PDF method
 2020-12-14 17:23:04 +01:00
David Bomba
141f45f402 Minor fixes for currency in expenses 2020-12-14 22:18:54 +11:00
David Bomba
05f4572454
Merge branch 'v5-develop' into v5-develop 2020-12-14 21:44:01 +11:00
David Bomba
64b9f94299 Working on Import / Export 2020-12-14 21:43:07 +11:00
Benjamin Beganović
79570b6118
Merge pull request #4453 from beganovich/v5-custom-payment-driver 
(v5) Custom payment driver
 2020-12-14 10:12:56 +01:00
David Bomba
c0aa30ab58 Import|Export 2020-12-14 16:03:23 +11:00
David Bomba
d115609d3c Import | Exports 2020-12-14 15:59:15 +11:00
David Bomba
8b808c97fa Fixes for expense currency not setting default 2020-12-14 07:58:18 +11:00
David Bomba
2c4aaa2131 Fixes for sentry reporting 2020-12-14 07:37:29 +11:00
David Bomba
0f86b3ec21 Fixes 2020-12-13 21:33:30 +11:00
David Bomba
6f451b8924 Remove redundant info() Change document download route 2020-12-13 20:46:29 +11:00
David Bomba
d440d4421d Fix for doubling client balance erroneously on emailing" 2020-12-13 11:04:56 +11:00
David Bomba
8abce54d7e Fixes for customised language options for Preview Controller 2020-12-13 10:20:03 +11:00
David Bomba
0f861554f0 Fixes for exec and open_basedir checks 2020-12-13 08:06:47 +11:00
David Bomba
1913318124 bump the import cache timeout from 10 minutes to 60 minutes 2020-12-13 07:54:25 +11:00
David Bomba
419b381c21 Filter exceptions 2020-12-12 22:23:29 +11:00
David Bomba
2a1a9e2a16 Working on import 2020-12-12 21:47:52 +11:00
David Bomba
3419d7900f Tests for importing CSV files 2020-12-12 21:35:42 +11:00
David Bomba
584bef52fc Working on import 2020-12-12 21:01:53 +11:00
David Bomba
aa1a788d6e Public document download route 2020-12-12 19:46:28 +11:00
David Bomba
f6ed7be0da Fixes for expense and project numbers 2020-12-12 07:51:10 +11:00
David Bomba
23f07a901b Version bump to 5.0.35 2020-12-11 23:20:46 +11:00
David Bomba
c94eaa4599 Force Custom Language translations before pushing to PhantomJS 2020-12-11 19:54:40 +11:00
David Bomba
6ee4e45d1e Add custom variables 2020-12-11 17:50:54 +11:00
David Bomba
f49faf8f16 Fix for custom gateway query 2020-12-11 08:10:50 +11:00
David Bomba
763fa6ef08 Fix for custom gateway query 2020-12-11 08:09:04 +11:00
David Bomba
44fdadff07 Return NPM String error rather than bool 2020-12-11 07:24:43 +11:00
Benjamin Beganović
e6890e5430
Merge branch 'v5-develop' into v5-custom-payment-driver 2020-12-10 12:40:27 +01:00
Benjamin Beganović
5f796aeab6 php-cs-fixer 2020-12-10 12:38:46 +01:00
Benjamin Beganović
9df4938837 change gateway type & remove processPayment 2020-12-10 12:38:23 +01:00
David Bomba
c5a4b1fcfd Fixes for version check + schema fixes 2020-12-10 21:48:16 +11:00
David Bomba
3fc8374cb5 Fixes for attempting to create a user with duplicate email 2020-12-10 21:28:19 +11:00
David Bomba
bb1ca556c4 wire up custom gateway 2020-12-10 21:20:12 +11:00
David Bomba
22cd6cdff0 Fixes for NPM/NODE status 2020-12-10 21:06:24 +11:00
David Bomba
8c46e140af Also factor in optin and optout for auto_enabled 2020-12-10 19:51:00 +11:00
David Bomba
894481989c Also factor in optin and optout for auto_enabled 2020-12-10 19:47:17 +11:00
David Bomba
91f90c94e3
Merge pull request #4454 from turbo124/v5-develop 
Notifications clean up.
 2020-12-10 07:58:08 +11:00
Benjamin Beganović
d45571d7f9 wip 2020-12-09 15:17:48 +01:00
Benjamin Beganović
23a64562c9 fix issue with setup & apply php-cs-fixer 2020-12-09 13:38:22 +01:00
David Bomba
df9fe5677d Notification for quotes credits and invoices 2020-12-09 21:05:26 +11:00
David Bomba
7ba78cc342 Reduce notification emails to one per entity 2020-12-09 20:52:08 +11:00
David Bomba
dc2e5706c6 Fixes for how to display CHF currency 2020-12-09 07:35:26 +11:00
David Bomba
6a03bcc546
Merge branch 'v5-develop' into v5-develop 2020-12-09 07:25:16 +11:00
David Bomba
7075ec5096 Reorder default includes 2020-12-09 07:12:10 +11:00
Benjamin Beganović
829d4feaff
Merge pull request #4445 from beganovich/v5-task-product-key-to-service 
(v5) Rename task.product_key to taks.service
 2020-12-08 16:53:03 +01:00
Benjamin Beganović
ef0584b442 add entity_string in htmlengine 2020-12-08 16:44:35 +01:00
Benjamin Beganović
0f62c6c2f2 remove info() 2020-12-08 16:15:36 +01:00
Benjamin Beganović
53525dc93f rename task.service to task.product key 2020-12-08 16:10:29 +01:00
Benjamin Beganović
0155907b27 php-cs-fixer 2020-12-08 15:05:05 +01:00
Benjamin Beganović
82bbe5b389 php-cs-fixer 2020-12-08 15:04:45 +01:00
Benjamin Beganović
1d0f5b2ad7 add post-submit checks to smtp & db 2020-12-08 15:04:07 +01:00
Benjamin Beganović
68a84df0dd prefix all smtp fields with mail_ 2020-12-08 14:29:15 +01:00
Benjamin Beganović
3ffb600117 prefix all db field with db_ 2020-12-08 14:21:00 +01:00
Benjamin Beganović
3505c89e2d remove fallback to log driver 2020-12-08 14:20:24 +01:00
Benjamin Beganović
4bf46a45b1 Update reference on balance due 2020-12-08 13:57:31 +01:00
Benjamin Beganović
bdedec19db remove balance due & total from delivery note pdf 2020-12-08 13:19:38 +01:00
Benjamin Beganović
812824100c wrap getting file into try-catch 2020-12-08 13:10:27 +01:00
David Bomba
634e5cadcc remove redundant code 2020-12-08 21:49:23 +11:00
David Bomba
beccfd00c7 Only send email changed notification if new and old emails are different. 2020-12-08 20:32:17 +11:00
David Bomba
594dda9b65 fixes for delivery notes{ 2020-12-08 20:18:17 +11:00
David Bomba
e765bcce08 Fixes for swagger 2020-12-08 07:25:56 +11:00
David Bomba
8107a49677 remove trailing slash from app url 2020-12-08 07:21:08 +11:00
Benjamin Beganović
a92d38ae06 php-cs-fixer 2020-12-07 14:56:23 +01:00
Benjamin Beganović
5c89fdab02 pass client id in paymentResponse 2020-12-07 14:50:43 +01:00
Benjamin Beganović
7818afddf8 getParent() ref to utilities 2020-12-07 14:50:30 +01:00
Benjamin Beganović
fdafc068bb processWebhookRequest for checkoutpaymentdriver 2020-12-07 14:49:56 +01:00
Benjamin Beganović
c548bc2e0d refactor paymentwebhook suite with new methods 2020-12-07 14:49:30 +01:00
Benjamin Beganović
2609e0027a allow paymentfailed exception for guest middleware 2020-12-07 14:49:11 +01:00
David Bomba
269fff3fc8 Changes for counters 2020-12-07 21:43:21 +11:00
Benjamin Beganović
1f2c3f2823 update pagination links & apply php-cs-fixer 2020-12-05 14:24:21 +01:00
David Bomba
d8efdc6817 Tests for deleting and restoring an invoice 2020-12-05 09:10:32 +11:00
David Bomba
4f0776a323 Working on tests for deleted invoice 2020-12-05 09:08:10 +11:00
David Bomba
bc621aa01a fixes for directories 2020-12-04 08:24:34 +11:00
David Bomba
41e39fa9c4 Fixes for directory creation error 2020-12-04 08:22:31 +11:00
David Bomba
34463eac64
Merge branch 'v5-develop' into v5-develop 2020-12-04 07:41:36 +11:00
David Bomba
a94b0357e0 Merge branch 'delete_paymentables_on_invoice_deleting' into v5-develop 2020-12-04 07:40:22 +11:00
David Bomba
76fb186f02 Fix for calculating balance with inclusive taxes 2020-12-04 07:40:00 +11:00
Benjamin Beganović
4959917b7e fix issue with multiple companies switching 2020-12-03 15:33:18 +01:00
Benjamin Beganović
458e207fe3 fixes for smtp testing on setup 2020-12-03 14:10:40 +01:00
Benjamin Beganović
8ad5d14659
Merge pull request #4419 from beganovich/v5-checkout-frames 
(v5) Checkout.com migration to Frames
 2020-12-03 13:49:52 +01:00
Benjamin Beganović
d84f5bc5bb Fixes for Checkout.com refunding 2020-12-03 13:38:57 +01:00
David Bomba
528a02db6f fixes for mail order 2020-12-03 22:00:34 +11:00
David Bomba
02c810633a Working on invoice delete restore refactor 2020-12-03 21:46:49 +11:00
David Bomba
fceaab9e40 Working on invoice delete restore refactor 2020-12-03 21:46:36 +11:00
David Bomba
d30ef031a2 refactor invoice deletion 2020-12-03 15:30:32 +11:00
David Bomba
f96bde6fca Refactor invoice delete/restore 2020-12-03 15:20:39 +11:00
David Bomba
73c9474912 Working on invoice delete refactor 2020-12-03 14:56:00 +11:00
David Bomba
48f2f469d3 refactor for invoice deletion 2020-12-03 14:11:24 +11:00
David Bomba
e772a2b638 Fix for regression 2020-12-03 11:05:22 +11:00
David Bomba
53c2db072f Fixes for pdf attachment to invoices 2020-12-03 09:26:46 +11:00
Benjamin Beganović
00ab670d71 Checkout.com migration to Frames: 
- Changed cardToken to token in CreditCard reference
- Updated checkout.com.js
- Added "Pay" translation
- Fix issue with switching between token & credt card
 2020-12-02 15:33:43 +01:00
David Bomba
bcb21fb234 Working on invoice deletion 2020-12-02 22:01:50 +11:00
David Bomba
bc0a925f39 Fixes for include 2020-12-02 19:59:45 +11:00
David Bomba
aa852930e6 refactor from email names to use config() values 2020-12-02 14:08:35 +11:00
David Bomba
b63972e250 fixes for payment refunds 2020-12-02 11:56:29 +11:00
David Bomba
66fc75bb83
Merge pull request #4410 from turbo124/v5-develop 
V5 develop
 2020-12-02 08:32:45 +11:00
David Bomba
54fd048614
Merge pull request #4408 from turbo124/v5-develop 
V5 develop
 2020-12-02 07:28:23 +11:00
Benjamin Beganović
9198cf5175 support tasks as of same day 2020-12-01 15:52:12 +01:00
Benjamin Beganović
e5af99d884 fix issue with client date formatc 2020-12-01 15:25:48 +01:00
Benjamin Beganović
1a066f2f9f add alias to task searvice from task product 2020-12-01 15:18:48 +01:00
Benjamin Beganović
b373a3df52 fix stripe refunding & apply php-cs-fixer 2020-12-01 13:46:09 +01:00
David Bomba
9623dba2c8 fix for showinvoicerequest 2020-12-01 21:22:48 +11:00
David Bomba
a8958f4b09 Minor fixes for batch migrations 2020-11-30 18:43:33 +11:00
David Bomba
1210a81a09 Minor changes to migration 2020-11-30 09:58:31 +11:00
David Bomba
f2f8837269 Merge branch 'v5-stable' of https://github.com/turbo124/invoiceninja into v5-stable 2020-11-30 08:32:27 +11:00
David Bomba
4368dc7272
Merge pull request #4392 from turbo124/v5-develop 
Fixes for migration file location
 2020-11-30 08:31:30 +11:00
David Bomba
d7dd592d18 Fixes for migration file location 2020-11-30 08:28:12 +11:00
Benjamin Beganović
d888780ed8 update quotes logic 2020-11-29 14:20:47 +01:00
Benjamin Beganović
ba6c157128 Surround multiple words with quotes in env file 2020-11-29 13:54:12 +01:00
David Bomba
9aee129737 Fixes for import 2020-11-28 17:22:43 +11:00
David Bomba
7d96a6d389
Merge pull request #4385 from turbo124/v5-develop 
Fixes for lock
 2020-11-28 15:16:00 +11:00
Benjamin Beganović
4284870c4e Merge remote-tracking branch 'upstream/v5-develop' into v5-paypal-refactor 2020-11-28 01:01:18 +01:00
David Bomba
c0c7fd8de4 Minor fixes 2020-11-28 07:44:27 +11:00
Benjamin Beganović
0aff363f5d php-cs-fixer 2020-11-27 12:08:42 +01:00
Benjamin Beganović
2618a1d3b8 add ability to edit client's phone 2020-11-27 12:08:39 +01:00
Benjamin Beganović
50ae8fd608 php-cs-fixer & required fields check 2020-11-27 11:12:05 +01:00
David Bomba
9f4979095b Temp routes" 2020-11-27 20:21:18 +11:00
David Bomba
3a78326a83 Temp routes" 2020-11-27 20:19:23 +11:00
David Bomba
78e5a91175 Temp routes" 2020-11-27 20:17:47 +11:00
David Bomba
5a3c93bb3c Temp routes" 2020-11-27 20:14:01 +11:00
David Bomba
e410a99f91 Phantom adjustment for preview 2020-11-27 13:31:21 +11:00
David Bomba
b5840f8e45 Phantom adjustment for preview 2020-11-27 13:30:37 +11:00
David Bomba
3cdd5bc544 Phantom adjustment for preview 2020-11-27 13:29:46 +11:00
David Bomba
2d80e12457 Phantom adjustment for preview 2020-11-27 13:24:13 +11:00
David Bomba
a99f871fb7 Phantom adjustment for preview 2020-11-27 13:23:02 +11:00
David Bomba
b593cb0ff3 Fixes for preview PDF using phantom js 2020-11-27 13:02:05 +11:00
David Bomba
2c2d1b50f4 Fix for invitation resolution with PhantomJS 2020-11-27 08:24:25 +11:00
David Bomba
f1e1fa0b82 Fix for invitation resolution with PhantomJS 2020-11-27 08:22:28 +11:00
David Bomba
d07dedf264 Add tax_rates relation to company_user 2020-11-27 08:05:30 +11:00
Benjamin Beganović
5d3d31ddef paypal 2020-11-26 16:36:43 +01:00
David Bomba
1181f9de62
Merge branch 'v5-develop' into authorize_refactor 2020-11-26 22:43:25 +11:00
David Bomba
ccac432978 Fixes for authorize 2020-11-26 22:35:17 +11:00
David Bomba
dff41d4881 Fixes for authorize 2020-11-26 22:27:32 +11:00
David Bomba
0e1b6c9341 Fixes for authorize 2020-11-26 22:22:33 +11:00
David Bomba
a8daa31167 Fixes for authorize 2020-11-26 21:12:36 +11:00
David Bomba
ed1539db50 Fixes for authorize 2020-11-26 21:00:55 +11:00
David Bomba
150bb9c396 Fix for payment method route 2020-11-26 20:53:01 +11:00
David Bomba
5e0bcfbc88 working on authorize 2020-11-26 20:39:35 +11:00
David Bomba
72bbf24c69 Working on refactor 2020-11-26 15:43:53 +11:00
David Bomba
4888a7dc4f Working on authorize refactor 2020-11-26 13:30:36 +11:00
David Bomba
56ac6c7b1f Refactoring authorize 2020-11-26 10:42:59 +11:00
David Bomba
b2c005a1aa Create driver template 2020-11-26 08:07:09 +11:00
David Bomba
b3cdb19b4d
Merge pull request #4362 from beganovich/v5-gateways-required-fields 
(v5) Support for pre-checking gateway requirements
 2020-11-26 06:57:48 +11:00
Benjamin Beganović
ae88d5e08e php-cs-fixer format 2020-11-25 15:19:52 +01:00
Benjamin Beganović
169e5ba93e support for checking requirements based on gateway 2020-11-25 14:38:49 +01:00
David Bomba
137231c95e cs-fixer 2020-11-25 21:30:00 +11:00
David Bomba
79e8f096fe Fix for custom_values breaking invoicesum 2020-11-25 20:53:50 +11:00
David Bomba
efbf8069b5
Merge pull request #4360 from turbo124/v5-develop 
Fixes for migrations
 2020-11-25 20:24:06 +11:00
David Bomba
b0740b46dd fixes for tests 2020-11-25 20:21:26 +11:00
David Bomba
656bf13510 Fixes for tests 2020-11-25 14:44:37 +11:00
David Bomba
c2b07c3ebc Fixes for migration data checks 2020-11-25 13:59:23 +11:00
David Bomba
2f4b46e435 Refactor webhook handler 2020-11-25 11:23:39 +11:00
Benjamin Beganović
549fd92671 wrap into try catch 2020-11-24 11:52:01 +01:00
Benjamin Beganović
242d48cd1a update variables for .env instead of writing completely new file 2020-11-24 11:45:27 +01:00
David Bomba
ffc87c4dc1 Check Data Script 2020-11-24 21:37:48 +11:00
David Bomba
4f35c6f894 explicit where for client in payment repo 2020-11-24 21:14:06 +11:00
Benjamin Beganović
3b765d32c1 log as an option for mail driver 2020-11-24 11:12:44 +01:00
David Bomba
63cc567244 Working on migrations 2020-11-24 21:12:05 +11:00
David Bomba
0c9f982bdf Fixes for imports 2020-11-24 16:11:20 +11:00
David Bomba
6f1b4d4548 Change JSON parser 2020-11-24 08:33:37 +11:00
David Bomba
8cbaac53c6 Fixes for projects in migration 2020-11-24 08:00:59 +11:00
David Bomba
b5fe5070b5 Working on migrations 2020-11-23 23:55:04 +11:00
David Bomba
0991dbf8d7 Fixes for migrations 2020-11-23 14:51:49 +11:00
David Bomba
4b1aabbac7 Fixes for migration 2020-11-23 12:46:16 +11:00
David Bomba
388c0e8467 Add withTrashed() for queries in migration 2020-11-23 08:25:29 +11:00
David Bomba
9f420ba084
Merge pull request #4346 from turbo124/v5-develop 
Change default queue to Database.
 2020-11-22 22:22:52 +11:00
David Bomba
e55de0fb1b Change default queue to database 2020-11-22 22:14:49 +11:00
David Bomba
6eaf78a1d5 Fix for casting line items 2020-11-22 16:34:05 +11:00
Benjamin Beganović
18312b9583 always show invoice.totals 2020-11-20 14:31:47 +01:00
Benjamin Beganović
952899c8ec
Merge pull request #4339 from beganovich/v5-fix-issue-with-invitation 
(v5) Fix refernece to $invitation in QuoteEmailEngine
 2020-11-20 11:38:09 +01:00
Benjamin Beganović
a1c714c51e reference correct invitation 2020-11-20 11:37:07 +01:00
Benjamin Beganović
c434d6313c start database migration with correct key 2020-11-20 10:34:54 +01:00
David Bomba
e82d8e0d8d Fail gracefully if cannot upload logo 2020-11-19 22:33:14 +11:00
David Bomba
4140051877 fixes for check data 2020-11-19 16:16:47 +11:00
David Bomba
4318423a05 fixes for check data 2020-11-19 14:53:32 +11:00
David Bomba
e7376aa42b fixes for check data 2020-11-19 14:52:22 +11:00
David Bomba
7fb9877eca Fixes for currency seeder 2020-11-18 21:46:36 +11:00
David Bomba
e91c82aa8b Fixes for bulk import 2020-11-18 20:35:09 +11:00
David Bomba
6376d5fa98
Merge pull request #4325 from turbo124/v5-develop 
Minor fixes for client portal
 2020-11-18 08:00:02 +11:00
Benjamin Beganović
f81526af2d
Merge pull request #4322 from beganovich/v5-display-signature-and-terms-on-quotes 
(v5) Display signatures & accepting terms for invoices & quotes
 2020-11-17 17:00:59 +01:00
Benjamin Beganović
d64308fdd1 production builds 2020-11-17 16:57:42 +01:00
Benjamin Beganović
501f3c9b0e injecting signatures into entity invitations 2020-11-17 16:57:34 +01:00
Benjamin Beganović
1bf6f34c7c Add task to PortalComposer 2020-11-17 15:01:28 +01:00
Benjamin Beganović
1b70f24dbc Update logic for rendering task hours 2020-11-17 14:47:32 +01:00
Benjamin Beganović
3112efcded Support for .description 2020-11-17 14:46:22 +01:00
Benjamin Beganović
2144153e41 pass correct company 2020-11-17 13:28:13 +01:00
Benjamin Beganović
42ca352409 Fix issue with webhook handler 2020-11-17 13:23:16 +01:00
David Bomba
3f9bea3f91 Minor fixes for tests 2020-11-17 20:53:32 +11:00
David Bomba
c231dca308
Merge pull request #4314 from turbo124/v5-develop 
Remove redundant entity notification
 2020-11-17 20:18:09 +11:00
David Bomba
a182c5a8ca minor fixes for imports 2020-11-17 10:04:10 +11:00
David Bomba
5a6d543e34 Minor fixes for imports 2020-11-17 08:56:52 +11:00
Benjamin Beganović
b886ceac4d
Merge pull request #4311 from beganovich/v5-stripe-failure 
(v5) Fix bug with Stripe saving credit card
 2020-11-16 22:19:38 +01:00
Benjamin Beganović
8080dffa85 show custom messages in cp 2020-11-16 15:37:09 +01:00
Benjamin Beganović
54014d93ee pass correct $customer->id 2020-11-16 14:10:45 +01:00
Benjamin Beganović
5457838c4d Store 'amount' in payment hash (Stripe/CC) 2020-11-16 13:37:13 +01:00
Benjamin Beganović
1ab8d1322b Logic for getting amount in internallyFailedPayments 2020-11-16 13:36:47 +01:00
Benjamin Beganović
fca1d94afe Support for SYSTEM_LOG_TYPE in: 
- Authorize.net
- Stripe
- PayPal
 2020-11-16 13:36:29 +01:00
David Bomba
3353527333 Minor fixes for migrations 2020-11-16 21:29:17 +11:00
David Bomba
77929a6bc3 Minor fixes for bulk import 2020-11-16 15:40:52 +11:00
David Bomba
a8f186c921 Remove redundant entity notification 2020-11-16 13:41:43 +11:00
David Bomba
68a6ea4d22
Merge branch 'v5-develop' into v5-develop 2020-11-16 12:20:44 +11:00
Benjamin Beganović
f9b55dcd72 fix pdfmaker issues with special chars 2020-11-16 00:49:44 +01:00
Benjamin Beganović
956e1fe287 notes => description, cost => unit_cost 2020-11-16 00:42:21 +01:00
David Bomba
4b240b05ca Add deleted_at column to paymentables 2020-11-16 08:23:20 +11:00
David Bomba
a1119f9bbe Fix edge cases with cloning invoice 2020-11-15 19:24:57 +11:00
David Bomba
8d62b704e6
Merge pull request #4304 from turbo124/v5-develop 
Refactor login route response.
 2020-11-14 17:04:46 +11:00
David Bomba
861c4ef4e7
Merge pull request #4296 from beganovich/v5-migration-fixes 
(v5) (wip) (no-merge) Refactor accepting new migrations
 2020-11-14 17:03:26 +11:00
David Bomba
b1591632d8 Refactor defaults for invoice PDF 2020-11-13 22:52:11 +11:00
David Bomba
fe5218fd2c Fixes for resolving company_user from user object 2020-11-13 21:42:06 +11:00
David Bomba
3bec5a4044 Refactor login routes 2020-11-13 20:09:20 +11:00
David Bomba
58c6cb415e
Merge pull request #4302 from turbo124/v5-develop 
Mail exceptions
 2020-11-13 07:22:28 +11:00
David Bomba
d8bb01430f Fixes for renaming company gateway columns 2020-11-12 22:09:31 +11:00
David Roizenman
039544e753
Use correct formula when adjust_fee_percent=true 2020-11-12 02:53:25 -08:00
David Bomba
f1c1243146 Fixes for mail 2020-11-12 20:41:19 +11:00
Benjamin Beganović
952b6a7e4f Fix the way we process migration 2020-11-12 10:24:59 +01:00
David Bomba
ef9043db44 error handling for mail 2020-11-12 15:37:50 +11:00
David Bomba
5cd2ae0dbe payment listeners 2020-11-12 14:04:27 +11:00
David Bomba
7af791a4c4 Working on from, replyTo and bcc emails 2020-11-12 12:43:32 +11:00
David Bomba
42c1f8fe5f Minor fixes 2020-11-12 07:42:20 +11:00
Benjamin Beganović
d503f1ee58 Refactor accepting new migrations: 
- Remove {company} parameter from /migration/start
- Refactor logic for startMigration
 2020-11-11 18:26:17 +01:00
David Bomba
ddaba5a953 Fix for refresh query 2020-11-11 19:55:53 +11:00
David Bomba
28cbd75fcb Fixes for credit PDF 2020-11-11 11:13:39 +11:00
David Bomba
c5643bea7b
Merge pull request #4287 from turbo124/v5-develop 
Fixes for reminder templates
 2020-11-10 19:32:44 +11:00
David Bomba
277eec508a Clean up TODOs 2020-11-10 15:07:25 +11:00
David Bomba
ade0148d67 custom translations 2020-11-10 15:06:46 +11:00
David Bomba
b329d317ef Custom labels 2020-11-10 15:04:53 +11:00
David Bomba
58ef5240cd Custom Translations 2020-11-10 14:36:16 +11:00
David Bomba
efb40f1777 Custom translations 2020-11-10 14:27:25 +11:00
David Bomba
7977b2a1e7 Remove stale classes 2020-11-10 08:04:57 +11:00
David Bomba
284bb9be9f
Merge pull request #4283 from beganovich/v5-fix-quote-approval-status 
(v5) Fix quotes approval process in client portal
 2020-11-10 07:29:14 +11:00
Benjamin Beganović
4dc3443d16 fix quotes not approving 2020-11-09 16:37:53 +01:00
Benjamin Beganović
f02826deed Don't render delivery-not-table on products/tasks 2020-11-09 16:10:47 +01:00
Benjamin Beganović
8adab67251 - Pass $invoice to the getInvoiceDeliveryNote() in InvoiceService 
- GenerateDeliveryNote action for InvoiceService
- New delivery-note-table element in the \Services\PdfMaker\Design.php
- $item & $description variables in the HtmlEngine
 2020-11-09 14:30:50 +01:00
David Bomba
af39d5e50c Fixes for payment notifications 2020-11-09 21:26:36 +11:00
David Bomba
9174b7e628 Fixes for emails and reminders 2020-11-09 21:17:20 +11:00
David Bomba
be2f83cfea Endless reminder activity 2020-11-09 16:00:15 +11:00
David Bomba
2e8cb84570 Payment emails 2020-11-09 13:57:34 +11:00
David Bomba
fcef2c72b3 Working on payment emails 2020-11-09 13:39:42 +11:00
David Bomba
087c442a64 Add custom values to payments table 2020-11-09 08:21:52 +11:00
=
fc92fbdaab Fixes for tests 2020-11-08 22:01:32 +11:00
=
cd0bbbe096 Remove redundant classes 2020-11-08 21:53:47 +11:00
David Bomba
b174334263 Fixes for invoice templates 2020-11-08 16:21:18 +11:00
David Bomba
0d4ad91cd4 Fixes for reminder template emails 2020-11-08 08:17:30 +11:00
=
3a7a35c845 Fixes for import 2020-11-07 21:13:04 +11:00
David Bomba
84888b0bf0
Merge pull request #4280 from turbo124/v5-develop 
Fixes for import
 2020-11-07 20:08:52 +11:00
=
2cf97caaaf Fixes for import 2020-11-07 20:08:21 +11:00
Clément Gayot
9fd76f60e6
Remove useless "use" 2020-11-07 03:18:25 +01:00
David Bomba
07af666ca4
Merge pull request #4273 from turbo124/v5-develop 
Reminders
 2020-11-07 07:03:57 +11:00
Benjamin Beganović
3768add8a0 pass $task_id inside of row item 2020-11-06 13:13:13 +01:00
Benjamin Beganović
a601702a0e geTaskTimeLogs() helper 2020-11-06 13:13:04 +01:00
Benjamin Beganović
892c440ea4 fix items count() & add support for task times 2020-11-06 13:12:51 +01:00
David Bomba
60a141d529 Fixes for reminders 2020-11-06 15:43:10 +11:00
David Bomba
3928ab3e39 Merge branch 'v5-develop' of https://github.com/turbo124/invoiceninja into v5-develop 2020-11-06 07:53:43 +11:00
David Bomba
67741010f0 Refactoring remindersg 2020-11-05 21:36:55 +11:00
David Bomba
09fbc9762a Fixes for custom emails. 2020-11-05 21:14:30 +11:00
David Bomba
cd08367ce6 Working on reminders 2020-11-05 13:59:19 +11:00
David Bomba
8e2cea7129 Working on reminders 2020-11-05 12:33:31 +11:00
David Bomba
4784e80859 Working on templates / reminders and late fees 2020-11-05 09:48:46 +11:00
David Bomba
a1afb38514 Fix for invoice attachment 2020-11-05 08:19:44 +11:00
David Bomba
3d11639cb4 Fixes for tests 2020-11-05 07:50:39 +11:00
David Bomba
100207f4cb
Merge pull request #4267 from turbo124/v5-develop 
Company Settings Implmentation
 2020-11-05 07:49:10 +11:00
Benjamin Beganović
5c2bfaa8ce Alpha testing on tasks: 
- Change 'products' to '$product' with design within: CreateEntityPdf, ActivityRepository, HtmlGenerationTest, Phantom
- New 'task-table' element in the Services\PdfMaker\Design.php
- buildTableHeader & buildTableBody are now more generic
- processTaxColumns() now requires $type to be specified
 2020-11-04 14:56:08 +01:00
Benjamin Beganović
e222aa8620 Refactor 'product-table-footer' to 'table-totals' 2020-11-04 11:23:06 +01:00
Benjamin Beganović
14b11ecbbd Refactor total table columns: 
- $task.cost => $task.rate
- $task.quantity => $task.hours
 2020-11-04 11:22:43 +01:00
David Bomba
5c5102baeb Working on reminders 2020-11-04 20:32:49 +11:00
David Bomba
d598aeeb03 Working on reminders 2020-11-04 19:43:20 +11:00
David Bomba
697fa568db Working on company settings implementation 2020-11-04 18:57:16 +11:00
David Bomba
5fe85ca3f0 Working on company settings implmentation 2020-11-04 17:02:15 +11:00
David Bomba
529ef5d686 Working on settings implementation 2020-11-04 16:22:51 +11:00
David Bomba
c995ac5f44 Add API Documentation to repo 2020-11-04 12:27:07 +11:00
David Bomba
37aaa1fc5b Fixes for importing company logo 2020-11-04 11:32:18 +11:00
David Bomba
5089f2183b
Merge pull request #4263 from turbo124/v5-develop 
Fix for removing company logo from storage
 2020-11-04 10:57:22 +11:00
David Bomba
870a41a93e Fix for removing company logo from storage 2020-11-04 10:56:29 +11:00
David Bomba
a3acc6a019 Update or Create product 2020-11-04 09:47:06 +11:00
David Bomba
64b703513d Refactor company gateway schema for required fields 2020-11-04 08:26:28 +11:00
David Bomba
bbf240be2d New fields for company gateway 2020-11-04 07:19:59 +11:00
Clément Gayot
92b4df729b
Support PDF design with UTF-8 characters 2020-11-03 16:18:07 +01:00
David Bomba
f98e7d15da fixes for updating products 2020-11-04 00:57:48 +11:00
David Bomba
d762c5e842 Psalm code cleanup 2020-11-04 00:34:24 +11:00
David Bomba
13a00fc897 Redundant code cleanup 2020-11-04 00:27:41 +11:00
David Bomba
552ac4ee8f
Merge pull request #4257 from turbo124/v5-develop 
Event Tests
 2020-11-03 23:45:04 +11:00
David Bomba
6e6a24359c Expense events 2020-11-03 23:39:41 +11:00
David Bomba
14fd4a5af4 Event Tests 2020-11-03 23:35:05 +11:00
David Bomba
a98e9c3b68
Merge pull request #4252 from beganovich/v5-ach-refactor 
(v5) ACH payments with Stripe
 2020-11-03 23:14:02 +11:00
David Bomba
5c13e1681b Tests for events 2020-11-03 21:19:32 +11:00
David Bomba
6eb9f0f6a6 Event testing 2020-11-03 21:04:15 +11:00
David Bomba
e7a1e4c4db Working on activities 2020-11-03 16:44:50 +11:00
David Bomba
9717424ce1 Payment Tests 2020-11-03 08:18:02 +11:00
Benjamin Beganović
f50bbd1900 Fix issue with the form 2020-11-02 16:29:02 +01:00
Benjamin Beganović
0942169d4f Handle Alipay payments 
- Refactored main Alipay class
- Added new N/A translation
- Fixed issue with alipay.js
 2020-11-02 16:20:38 +01:00
David Bomba
aa0b9ed976 Deprecate invoice fields 2020-11-02 21:12:58 +11:00
David Bomba
3434d5dd70 Add events for payments 2020-11-02 15:58:43 +11:00
David Bomba
53fad7eb40 Fixes for composer 2020-11-02 13:13:31 +11:00
David Bomba
30bfd0b808 Validation rules for credits and payments 2020-11-02 12:11:49 +11:00
David Bomba
9bbffea260 Fixes for setup 2020-11-02 11:23:02 +11:00
David Bomba
a829db9890 Fixes for setup 2020-11-02 09:51:56 +11:00
David Bomba
ae361ed22f Update composer 2020-11-02 08:49:58 +11:00
David Bomba
8e27999246
Merge pull request #4246 from turbo124/v5-develop 
is_disabled for recurring invoices
 2020-11-02 07:35:09 +11:00
Benjamin Beganović
7f3c4ada5a Merge remote-tracking branch 'upstream/v5-develop' into v2-frontend-refactor 2020-11-01 19:26:43 +01:00
Benjamin Beganović
4c27652545 ACH payments 2020-11-01 19:21:31 +01:00
Benjamin Beganović
1ae2649be6 Stripe ACH authorization & verification 2020-11-01 18:47:48 +01:00
Benjamin Beganović
99c30846ad Stripe: Payments with tokens & error handling 2020-11-01 16:52:37 +01:00
Benjamin Beganović
7d50430a9e Stripe with credit card: 
- Remove createPaymentData from StripePaymentDriver
 2020-11-01 16:37:41 +01:00
Benjamin Beganović
7e30093429 Checkout.com payments with token: 
- Convert "true" from frontend to boolean in PaymentResponseRequest
- Reference correct 'transaction_reference' in BaseDriver & Checkout\Utilities
- Frontend switching between token & credit card when making payments with Checkout.com
- New 'pay_with' translation string
- Added 'save-card--container' to save card partial
- Ensure we show whole transaction reference string in payments/show.blade
 2020-11-01 15:56:17 +01:00
Benjamin Beganović
d15701b4b3 Checkout.com with credit card 2020-11-01 15:08:47 +01:00
Benjamin Beganović
d2e677cb9d Merge remote-tracking branch 'origin/v5-stripe-backend-refactor' into v2-frontend-refactor 2020-11-01 14:49:11 +01:00
David Bomba
f6b53d27e6 is_disabled for recurring invoices 2020-11-01 21:29:34 +11:00
David Bomba
f911d17a6b Fix for migration 2020-11-01 20:41:49 +11:00
David Bomba
503cc6a5a8 Link entities 2020-11-01 19:53:23 +11:00
David Bomba
ae44b9c032 Version bump + linking tasks expenses with invoices 2020-11-01 18:53:43 +11:00
David Bomba
685b7e25c2 Fixes for queries 2020-11-01 16:18:40 +11:00
=
0077df1be7 Handler.php 2020-11-01 16:16:37 +11:00
=
6479b2fd3e Fix for laravel 8 route file regression + psalm cleanup 2020-11-01 16:09:09 +11:00
=
39f084c030 Clean setupcontroller and .env.example variables 2020-11-01 14:25:55 +11:00
=
e4b326c423 Removing is_migrating 2020-11-01 14:21:39 +11:00
=
dfb55dbd8b remove is_migrating 2020-11-01 14:19:03 +11:00
David Bomba
6a54bb8c45 Fixes for migrations Vendor Contacts 2020-10-31 16:35:05 +11:00
David Bomba
afcbb870bf Fixes for migration 2020-10-31 11:46:00 +11:00
David Bomba
a18b1b431e working on migration for vendors, expenses, tasks 2020-10-31 08:13:02 +11:00
David Bomba
f5c03fee6e Process Expenses 2020-10-30 23:22:32 +11:00
David Bomba
98d81d09fa Fixes for task status types" 2020-10-30 23:16:19 +11:00
David Bomba
c289a8252a Migration of expenses and tasks 2020-10-30 23:01:30 +11:00
David Bomba
e455ec47e6 Fixes for unique task number " 2020-10-30 22:47:12 +11:00
David Bomba
a283f1dcf7 Working on migration for expenses and tasks 2020-10-30 20:17:29 +11:00
=
3f202b8c58 Add view link to payment templates 2020-10-30 17:54:25 +11:00
David Bomba
de48512908 Activity record when quote is approved 2020-10-30 08:43:23 +11:00
David Bomba
ba6c45c08a fix task status id on update 2020-10-30 08:00:35 +11:00
David Bomba
afa5f2338c Fixes for account plan 2020-10-30 07:59:47 +11:00
David Bomba
86d472fa05 Project numbers 2020-10-29 22:01:37 +11:00
David Bomba
86ee5f477b Fixes for expense numbers 2020-10-29 21:48:56 +11:00
David Bomba
fa92dd76e4 Tests for starting and stopping tasks 2020-10-29 21:44:05 +11:00
David Bomba
8cf55010c6 Fixes for tasks 2020-10-29 20:56:37 +11:00
David Bomba
c1c8b6c14e Change start_time datatype 2020-10-29 20:40:13 +11:00
David Bomba
c21ad042ce fixes for payment notifications 2020-10-29 15:47:44 +11:00
David Bomba
bc688985e1 Set next_send_date to null when balance == 0 2020-10-29 14:34:29 +11:00
David Bomba
e891238db0 Set next_send_date to null when balance == 0 2020-10-29 13:55:26 +11:00
David Bomba
73802c3647 Task duration / start time helpers 2020-10-29 13:24:12 +11:00
David Bomba
dbcfce8bb9 Fixes for missing fields in transformers / fillable for vendors and expenses 2020-10-29 11:17:10 +11:00
David Bomba
85eb1a990a Fixes for non sticking fields in project 2020-10-29 11:09:51 +11:00
David Bomba
1bda0190bb fixes for company transformer 2020-10-29 10:14:09 +11:00
David Bomba
d123840bfa Fix for fillable fields 2020-10-29 10:11:52 +11:00
David Bomba
59291b799c Fixes for tasks status column 2020-10-29 09:48:05 +11:00
Benjamin Beganović
13655d48ea BaseDriver: 
- Allow passing additional properties to ClientGatewayToken entity
CreditCard:
- Fix saving gateway_customer_reference
 2020-10-28 16:48:24 +01:00
Benjamin Beganović
dab59138cc StripePaymentDriver: 
- Added attach() method for attaching payment method to Stripe customer
- getStripeMethod() for getting method information out of Stripe
 2020-10-28 16:31:47 +01:00
David Bomba
9aeb2d7a5b Psalm cleanup 2020-10-28 21:10:49 +11:00
David Bomba
7886482fb5 Localize dates in entities 2020-10-28 19:32:14 +11:00
David Bomba
adeda5526e Add Psalm, code cleanup! 2020-10-28 17:58:15 +11:00
David Bomba
d7930e4c14 Remove redundant classes 2020-10-28 17:27:10 +11:00
David Bomba
a07f04e1df Refactor Template Engine 2020-10-28 16:50:06 +11:00
David Bomba
064f7d98ef
Merge pull request #4220 from turbo124/v5-develop 
Fixes for tests
 2020-10-28 10:45:05 +11:00
David Bomba
946b1d6396
Merge pull request #4219 from Striffly/fix/company-logo 
Fix logo upload, keep png alpha
 2020-10-28 10:43:27 +11:00
David Bomba
0b16b2ac9c Fixes for tests 2020-10-28 10:34:09 +11:00
David Bomba
d211fb3afa
Merge pull request #4218 from turbo124/v5-develop 
Email / Credit Email engine
 2020-10-28 10:30:21 +11:00
David Bomba
7aed55178c Refactor HTML generation in activities 2020-10-28 10:29:54 +11:00
Clément Gayot
0df7e59d89 🐛 Fix logo upload, keep png alpha 2020-10-28 00:22:24 +01:00
David Bomba
2c40adca8d Credit Emailer 2020-10-28 10:21:53 +11:00
David Bomba
0a02323792 Quote email engine 2020-10-28 10:02:32 +11:00
Clément Gayot
ed3ba8020a 🐛 Remove blank lines from pdf content when designated pdf variables are empty 2020-10-27 23:51:39 +01:00
David Bomba
d555796418
Merge pull request #4213 from beganovich/v5-checkout-token-billing 
(v5) Checkout.com payments using token
 2020-10-28 09:37:00 +11:00
David Bomba
7a67b8ded0
Merge pull request #4214 from beganovich/v5-fix-setup-javascript 
(v5) Fix setup issue with opening new PDFs
 2020-10-28 09:36:41 +11:00
David Bomba
f855ba7231
Merge pull request #4215 from beganovich/v5-remove-deprecated-design-classes 
(v5) Remove old invoice/quotes/tasks design classes & client portal theme
 2020-10-28 09:36:16 +11:00
David Bomba
073caab09b
Merge pull request #4216 from turbo124/v5-develop 
Refactor HTMLEngine
 2020-10-28 06:17:49 +11:00
Benjamin Beganović
e78aacdcfc Password reset e-mai l& fix for button 2020-10-27 16:04:28 +01:00
Benjamin Beganović
99bfadc0dc Remove old designs & old bootstrap theme 2020-10-27 14:44:12 +01:00
Benjamin Beganović
8270762311 Fix setup issue with opening new PDFs 2020-10-27 14:02:36 +01:00
Benjamin Beganović
88b428aae0 checkout.com payments using token 2020-10-27 13:44:16 +01:00
David Bomba
3135139f90 Remove logging 2020-10-27 23:19:26 +11:00
David Bomba
97db2ad3b6
Merge pull request #4202 from beganovich/v2-checkout-refactor 
(v5) Checkout.com refactor
 2020-10-27 23:18:42 +11:00
David Bomba
f6435ab030 Working on emails 2020-10-27 22:57:12 +11:00
Benjamin Beganović
223ae4cb5b - Extract $payment_hash property onto BaseDriver 
- Handle internally failed payments inside BaseDriver
- Add SYSTEM_LOG_TYPE property on CheckoutComPaymentDriver
- Remove resolving of $payment_hash inside of payment methods
 2020-10-27 12:53:35 +01:00
David Bomba
dceff35f9a Working on refactoring emails 2020-10-27 15:53:59 +11:00
David Bomba
6650f5404f Fixes for camelcase Invitation names 2020-10-27 15:26:56 +11:00
David Bomba
417562b80d Fixes for phantom JS view invitation 2020-10-27 15:26:04 +11:00
David Bomba
1de7a693cc Refactor Phantom JS building HTML 2020-10-27 14:09:13 +11:00
David Bomba
3bef11c87e Add invoice_documents field to tasks 2020-10-27 13:27:38 +11:00
David Bomba
e17f5438ee Working on generic entity emailer 2020-10-27 11:05:42 +11:00
David Bomba
4561ed41f2 Minor fixes for email template 2020-10-27 08:54:59 +11:00
David Bomba
0df672baaa remove white space and carriage returns from version 2020-10-27 07:46:06 +11:00
David Bomba
8f53424017 Fixes 2020-10-27 06:10:04 +11:00
Benjamin Beganović
f3e578cc5c Fix value after payment 2020-10-26 14:55:48 +01:00
Benjamin Beganović
e5670ed313 confirm & unwind gateway fees & better typehinting 2020-10-26 14:53:52 +01:00
Benjamin Beganović
488b8d859d Move saving methods into BaseDriver 2020-10-26 14:40:50 +01:00
Benjamin Beganović
6e6e73825c Throw an renderable exception instead of returning view 2020-10-26 11:02:23 +01:00
David Bomba
0453c989eb PDF Entity generation tests 2020-10-26 20:13:00 +11:00
David Bomba
8d508bb1f9 Refactor pdf generation 2020-10-26 15:06:58 +11:00
David Bomba
651a1a6cbe Add credit gateway type id 2020-10-26 13:06:24 +11:00
David Bomba
1b2922b57c credit payment type 2020-10-26 11:58:08 +11:00
David Bomba
8b3fafa19c Fixes for first_load 2020-10-26 08:16:07 +11:00
David Bomba
5ffd2b4678 Add sort order to task status 2020-10-26 08:05:33 +11:00
David Bomba
b00e0b5a04 Fixes for first_load includes 2020-10-26 07:56:02 +11:00
David Bomba
f26a20dbbd working on date formatting 2020-10-26 06:15:03 +11:00
Benjamin Beganović
f73ad4bef7 Move after-payment logic into BaseDriver 2020-10-25 18:51:26 +01:00
David Bomba
3e21c301a5 Fix for custom values 2020-10-24 18:01:07 +11:00
David Bomba
50eaf0cc78 Fix for date localization 2020-10-24 14:38:53 +11:00
David Bomba
2d0e1a53f2 Fixes for autobill 2020-10-23 15:18:16 +11:00
David Bomba
3139539f46 Fixes for paid to date when refund is applied 2020-10-23 12:57:54 +11:00
David Bomba
73b3c11d80 Fixes for update expenses 2020-10-23 08:00:49 +11:00
Benjamin Beganović
dcb48297fb wip refactor 2020-10-22 15:24:18 +02:00
David Bomba
c8e2d94b3f Fixes for tests + remove swoole 2020-10-22 21:14:14 +11:00
David Bomba
b346ed714b Fix rate limiting 2020-10-22 20:27:53 +11:00
David Bomba
004c07f1e6 Merge branch 'v5-develop' into v5-stable 2020-10-22 20:26:20 +11:00
David Bomba
4ac554607c implement swoole 2020-10-22 20:25:36 +11:00
David Bomba
1e3617b27a
Merge pull request #4195 from Striffly/fix/invoice-preview 
Fix invoice preview with custom designs
 2020-10-22 20:13:41 +11:00
David Bomba
6c1b952111
Refactor requests to use generics (#41) 
* Validation rules for expenses

* Tests

* Tests
 2020-10-22 17:46:02 +11:00
Clément Gayot
5458bf83b0 🐛 Fix invoice preview with custom designs 2020-10-22 01:19:33 +02:00
David Bomba
f0a08544d6 Fixes for show recurring" 2020-10-21 20:24:33 +11:00
David Bomba
f8411ad7c1 Credit PAYMENTS 2020-10-21 17:40:05 +11:00
David Bomba
2d01bc1e27 Working on credit payments 2020-10-21 17:33:04 +11:00
David Bomba
1338a5e558 Fixes for check data script 2020-10-21 17:15:03 +11:00
David Bomba
d881e7cea1
Merge pull request #4193 from turbo124/v5-develop 
Credit payments and general fixes
 2020-10-21 15:14:25 +11:00
David Bomba
8ddc14c4d0 Working on check data script 2020-10-21 15:12:54 +11:00
David Bomba
3d59717776 Fixes for credit payments 2020-10-21 15:03:22 +11:00
=
a0b269ce99 Fixes for creating single account 2020-10-21 14:10:32 +11:00
=
aa0735bb3d Working on credit payments 2020-10-21 10:47:12 +11:00
David Bomba
6f84e07c10 Fixes for schema, fixes for recurring invoice markViewed() 2020-10-21 08:15:11 +11:00
Benjamin Beganović
b4b6bd3ae0 ach adding & verify, todo: payment 2020-10-20 17:54:08 +02:00
Benjamin Beganović
c82e5b2647 stripe adding credit card 2020-10-20 16:08:21 +02:00
Benjamin Beganović
6ae18dac6f fix credit card saving with stripe 2020-10-20 15:02:34 +02:00
Benjamin Beganović
1de6f94f10 fix custom1234 2020-10-20 13:01:07 +02:00
Benjamin Beganović
9bcea0cf58 Fix for invoice custom fields 2020-10-20 12:46:08 +02:00
David Bomba
fd19e9dc2c Working on credit payments 2020-10-20 16:14:11 +11:00
David Bomba
90494547c5 Fix for whitelabel getter 2020-10-20 13:23:48 +11:00
David Bomba
c1e080acd5 Recurring invoice balance fix 2020-10-20 12:30:55 +11:00
David Bomba
e129419644 recurring logging 2020-10-20 11:57:58 +11:00
David Bomba
bc2b0f4aae Fix for recurring number collisions - use dispatchNow() 2020-10-20 11:53:54 +11:00
David Bomba
686f12261d Project number 2020-10-20 10:55:14 +11:00
David Bomba
840696ad3c Fixes for email invoice 2020-10-20 10:37:33 +11:00
David Bomba
f0e4a94bee Task Statuses 2020-10-20 10:01:59 +11:00
Benjamin Beganović
6af7aa7dc0 checkout: push aditional page 2020-10-19 23:49:17 +02:00
David Bomba
8b49c83a67 Fixes for required expense fields 2020-10-20 08:31:19 +11:00
David Bomba
9c324f187e Fixes for vendor presenter; 2020-10-20 08:18:09 +11:00
Benjamin Beganović
4f9d9c106c checkout 2020-10-19 14:18:00 +02:00
David Bomba
a3afa8ede9 Remove project name unique constraint 2020-10-19 21:59:58 +11:00
David Bomba
93ea785131 Fix for incorrect company country being displayed 2020-10-19 08:21:14 +11:00
David Bomba
5a720325b3
Merge pull request #4180 from turbo124/v5-develop 
Improve eager loading - first load
 2020-10-19 07:56:38 +11:00
David Bomba
6f1f0ecebe Adjust the way we import credits from V4 to V5 - refactor check data script to reflect changes 2020-10-18 20:25:32 +11:00
David Bomba
708db5a991 Improve eager loading - first load 2020-10-18 18:46:10 +11:00
David Bomba
f1042b1079
Merge pull request #4175 from Striffly/patch-2 
Support PDF variables with UTF-8 characters
 2020-10-17 16:02:36 +11:00
Clément Gayot
675e211e33
Support PDF variables with UTF-8 characters 2020-10-17 02:24:02 +02:00
Clément Gayot
b7470798d4
Fix BaseRepository 
Fix BaseRepository (remove useless ";")
 2020-10-17 01:32:53 +02:00
David Bomba
0717744c5a Valid projects with clients validation 2020-10-16 20:12:37 +11:00
David Bomba
c7d7e71e78 Validation for project clients 2020-10-16 16:17:36 +11:00
David Bomba
3d40df6264 Fixes for ledger id in transformer 2020-10-16 08:55:24 +11:00
David Bomba
62fe99c2d5 Project name should be required 2020-10-16 08:19:55 +11:00
David Bomba
d5ccb17624 Validation rules for Recurring 2020-10-16 08:17:50 +11:00
David Bomba
79e625d8f2 Fixes for recurring number rules and assigned_user_id stickiness for Vendors 2020-10-16 08:17:31 +11:00
David Bomba
07cbb6a71a Fixes for showing recurring invoices in the client portal 2020-10-16 07:35:15 +11:00
David Bomba
3d83be9d08
Merge pull request #4169 from turbo124/v5-develop 
Recurring Invoice Invitations
 2020-10-15 21:35:16 +11:00
David Bomba
2f948b603b Using Credits for payment 2020-10-15 20:41:59 +11:00
David Bomba
bf592b0805
Merge pull request #4168 from beganovich/v2-cypress-payments-tests 
(v5) Stripe testing using Cypress
 2020-10-15 20:16:50 +11:00
Benjamin Beganović
f6346efc99 make tests green & remove unused 2020-10-15 10:50:53 +02:00
David Bomba
27f678bd8c working on credit payments 2020-10-15 15:07:42 +11:00
David Bomba
901f7c4117 Working on credit payments 2020-10-15 14:35:35 +11:00
David Bomba
0d17b299a0 Refactor payments for credits 2020-10-15 11:37:16 +11:00
David Bomba
4ca112e61e
Merge pull request #4166 from turbo124/v2 
Additional fields for company model.
 2020-10-15 08:26:24 +11:00
David Bomba
460545882c Additional fields for company model 2020-10-15 08:25:40 +11:00
David Bomba
1e10f0297b
Merge pull request #4162 from beganovich/v2-fix-setup-buttons 
(v5) Setup fixes & improvements
 2020-10-15 08:15:31 +11:00
David Bomba
3dca6ff171 Add projects to all entities - fixes for gateway casts 2020-10-15 07:58:20 +11:00
Benjamin Beganović
1d89656bad Setup changes: 
- Return actual SQL error when connection is failing
- Update buttons on setup with correct color
 2020-10-14 13:40:00 +02:00
David Bomba
60c29a95c9
Merge pull request #4161 from turbo124/v2 
Expense Categories + Tasks API
 2020-10-14 21:46:04 +11:00
David Bomba
0ec89c18ac Fixes for autobill 2020-10-14 21:45:26 +11:00
David Bomba
99920389b4 Credit payments 2020-10-14 11:11:24 +11:00
David Bomba
a5555cc434 Working on credit payments" 2020-10-14 10:53:20 +11:00
Clément Gayot
c21c79b8be ✨ Add ability to use Browsershot with NODE_PATH & NPM_PATH .env variables 2020-10-13 14:42:54 +02:00
David Bomba
080c82770e Working on credit payments 2020-10-13 23:28:30 +11:00
David Bomba
96750d5fdb Refactor for payments via client portal 2020-10-13 21:32:15 +11:00
David Bomba
f58ba0b502 Fixes for name validation for expense categories 2020-10-13 19:05:12 +11:00
David Bomba
5b2a43bd9a Fixes for expense categories 2020-10-13 16:02:12 +11:00
David Bomba
28f140ee37 Expense categories 2020-10-13 15:14:13 +11:00
David Bomba
05caec8aef expense categories 2020-10-13 15:08:56 +11:00
David Bomba
57faf6eeb5 Use credits for payments in client portal 2020-10-13 14:25:51 +11:00
David Bomba
b7292a0432 Update email validation 2020-10-13 08:27:42 +11:00
David Bomba
71535c0e41 Add tasks to API 2020-10-13 07:42:02 +11:00
David Bomba
d89b4fcbc3 Refactor for gateway fee calculations 2020-10-12 22:25:27 +11:00
David Bomba
1eadbde544 working on refactor of company gateway fees 2020-10-12 22:02:02 +11:00
David Bomba
65a1f150d5 Fixes for tests 2020-10-12 20:38:55 +11:00
David Bomba
f063337ec4 Refactoring gateway fees and limits 2020-10-12 15:58:07 +11:00
David Bomba
046805995a Recalculating gateway fees depending on gateway type 2020-10-12 15:30:53 +11:00
David Bomba
c8770f09ca Refactor for determining gateway fees 2020-10-12 15:10:34 +11:00
David Bomba
c8a9997a98 fix return type in AddGatewayFee 2020-10-12 10:27:38 +11:00
David Bomba
5072d63436 Set visible to boolean cast 2020-10-12 10:21:24 +11:00
David Bomba
f1c5f37189 Documents for tasks 2020-10-12 08:36:59 +11:00
David Bomba
4c08187bf1 tests for documents 2020-10-12 08:34:02 +11:00
David Bomba
1042bbec7b Update vendor contact schema to match client contact schema 2020-10-12 08:16:39 +11:00
David Bomba
b12fe64a63 Refactor gateway types 2020-10-12 07:59:25 +11:00
David Bomba
bfa2e4d5d0 Refactor Gateway options 2020-10-11 20:17:33 +11:00
David Bomba
8b48f26c79 Fixes for calcuting gateway fees and for removing unpaid gateway fees appropriately 2020-10-11 08:31:50 +11:00
David Bomba
965b7691fd Fixes for docs 2020-10-10 23:29:00 +11:00
David Bomba
a13b97b0cb Fixes for api docs 2020-10-10 23:07:52 +11:00
David Bomba
b6bea31646 Working on gateway fee slippage 2020-10-10 21:57:28 +11:00
David Bomba
61646ec55c
Merge pull request #4151 from turbo124/v2 
Console commands for small test data batches
 2020-10-10 14:32:49 +11:00
David Bomba
407304d3c6 Console commands for small test data batches 2020-10-10 14:32:10 +11:00
David Bomba
41d674083a
Merge pull request #4144 from beganovich/v2-enable-support-for-html-on-pdf 
(v5) Support for HTML in line items
 2020-10-10 07:37:21 +11:00
David Bomba
14bcc07da6
Merge pull request #4145 from beganovich/v2-change-text-on-test-pdf 
(v5) Update text on test PDF
 2020-10-10 07:37:09 +11:00
David Bomba
3702f68f32
Merge pull request #4146 from beganovich/v2-update-countries-in-cp 
(v5) Show empty string on PDF if country is not set
 2020-10-10 07:36:56 +11:00
David Bomba
6e00b09065 Add partial payment template 2020-10-10 07:31:24 +11:00
Benjamin Beganović
f33e6768c0 Use invoice 'balance' when comparing with over & under payments. 2020-10-09 16:08:12 +02:00
Benjamin Beganović
b0c383f75b Show empty string if country is not set: 
- Replace "No country set" with empty string in HtmlEngine.php
- Allow country_id & shipping_country_id to be null in shipping-address.blade.php & personal-address.blade.php
 2020-10-09 16:03:27 +02:00
Benjamin Beganović
f2390de9b3 Change text on test PDF 2020-10-09 15:12:50 +02:00
Benjamin Beganović
b8b2ae527c Support for HTML in line items 2020-10-09 15:05:57 +02:00
David Bomba
ae2562b020 Implementing paratest 2020-10-09 23:13:18 +11:00
David Bomba
5cd1acd484
Merge pull request #4143 from turbo124/v2 
Gateway fixes
 2020-10-09 22:13:58 +11:00
David Bomba
9187946760 Fixes for gateway 2020-10-09 22:13:33 +11:00
Benjamin Beganović
4f26a868a7 Add findOrFail() 2020-10-09 12:44:57 +02:00
David Bomba
44d31ce326 Move cache clearance to base controller 2020-10-09 17:55:03 +11:00
David Bomba
c48b02a690 Static template data 2020-10-09 13:28:33 +11:00
David Bomba
cf7ee6338e Working on templates 2020-10-09 12:59:59 +11:00
David Bomba
1a0d98ef3d Fixes for base repo 2020-10-08 20:12:44 +11:00
David Bomba
5101e7cce6 Update credit balance 2020-10-08 15:05:38 +11:00
David Bomba
d2d6262941 Testing Autobill 2020-10-08 14:31:02 +11:00
David Bomba
8255b1d7e2 Working on credits on autobill 2020-10-08 11:28:23 +11:00
David Bomba
459523722c Working on credits on autobill 2020-10-08 10:36:06 +11:00
David Bomba
cd0dce3816
Merge pull request #4138 from turbo124/v2 
Projects API
 2020-10-08 09:31:37 +11:00
David Bomba
dd4d14d128 Implement Projects API 2020-10-08 09:25:39 +11:00
David Bomba
4bbdeef539
Merge pull request #4136 from beganovich/v2-products-table-in-invoices 
(v5) Support for custom products table columns
 2020-10-08 06:59:16 +11:00
Benjamin Beganović
6e66a8d1a7 Update design seeders 2020-10-07 18:42:41 +02:00
David Bomba
ee77993006 Working on applying credits to payments prior to billing via gateway 2020-10-07 22:06:00 +11:00
David Bomba
50b24c55d9 Working on applying credits to payments prior to billing via gateway 2020-10-07 22:03:53 +11:00
David Bomba
c41fb6e00f Auto bill flag enable/disable auto_bill_enabled 2020-10-07 17:33:16 +11:00
David Bomba
d4e2a0071a Analytics 2020-10-07 14:56:35 +11:00
David Bomba
b8b3149582 Working on recurring & analytics 2020-10-07 14:00:32 +11:00
David Bomba
ff00ed3815 Fixes for Recurring 2020-10-07 11:20:28 +11:00
David Bomba
70a575386c Fixes for designs in migration: 2020-10-07 10:16:57 +11:00
Benjamin Beganović
76695b8462 - Add new "product" key to $context of Design 
- Add custom products table body handling in Design.php
 2020-10-06 12:49:00 +02:00
David Bomba
8860001381 Fixes for create test data 2020-10-06 21:27:49 +11:00
David Bomba
1212ea756d
Merge pull request #4134 from turbo124/v2 
Work on Recurring Invoices
 2020-10-06 21:08:12 +11:00
David Bomba
3aa5e2e4eb Minor release 2020-10-06 21:06:14 +11:00
David Bomba
02baff1119 Fixes for tests 2020-10-06 16:04:54 +11:00
David Bomba
4a4c61f1cf recurring 2020-10-06 15:11:48 +11:00
David Bomba
07701779ff Add options property to gateway table 2020-10-06 14:01:28 +11:00
David Bomba
4fe1c29751 Working on recurring 2020-10-06 12:36:25 +11:00
David Bomba
484b28d3ce Fixes for recurring migratoin 2020-10-06 11:52:16 +11:00
David Bomba
1264486bb9 Working on recurring migration 2020-10-06 08:46:47 +11:00
David Bomba
45b6c1bcc2 Recurring migration 2020-10-05 22:32:56 +11:00
David Bomba
c4866625cd
Merge pull request #4132 from beganovich/v2-invoices-fix-bottom-padding 
(v5) Invoice/quotes design improvements
 2020-10-05 19:47:14 +11:00
Benjamin Beganović
c0f3576d55 Fix imports 2020-10-05 10:16:36 +02:00
Benjamin Beganović
50d82426c5 Import models 2020-10-05 10:08:30 +02:00
David Bomba
d3fdb57233 Working on recurring migration 2020-10-05 08:55:52 +11:00
David Bomba
be388ba493 Fixes for tests 2020-10-05 08:37:12 +11:00
David Bomba
06b7dfa291 Fixes for Recurring 2020-10-04 21:24:55 +11:00
David Bomba
a6234da23a Fix for no due date set on recurring invoices 2020-10-04 20:47:38 +11:00
David Bomba
fccc98caa7 Fixes for model factories -> invoice designs 2020-10-04 20:34:08 +11:00
David Bomba
f6ac4a8201 Add mysqlnd requirement to systemhealth check 2020-10-04 19:52:58 +11:00
David Bomba
ee8ae09314 Fixes for no invitation 2020-10-03 18:09:48 +10:00
David Bomba
1390e739e3 recurring 2020-10-02 16:33:55 +10:00
David Bomba
62ec47b5cc Fixes for migration email 2020-10-02 08:28:29 +10:00
David Bomba
2c4cfa409a Recurring invoice migrations 2020-10-02 08:19:42 +10:00
David Bomba
a4ddcc90fa Fixes for Email preview with blank entity 2020-10-02 07:29:11 +10:00
David Bomba
15320500c0
Merge pull request #4126 from turbo124/v2 
Laravel 8 support
 2020-10-01 21:47:07 +10:00
David Bomba
92c65f73da
Merge pull request #4125 from beganovich/v2-fix-font-size-variable 
Rename $font-size to $font_size & remove all comments from designs
 2020-10-01 21:45:00 +10:00
David Bomba
ade36d591c Fixes for demo mode 2020-10-01 21:44:17 +10:00
David Bomba
b94bfacc19 Fixes for demo mode in l8 2020-10-01 21:41:23 +10:00
Benjamin Beganović
b40d2bc50b Replace $font-size with $font_size 2020-10-01 13:37:34 +02:00
David Bomba
3fa336946f Fixes for Laravel 8 2020-10-01 21:34:05 +10:00
Benjamin Beganović
5e773a03c8 Add $primary_color & $seconday_color to variables list 2020-10-01 13:20:32 +02:00
David Bomba
c65950672d Fixes for model factories for L8 2020-10-01 20:49:47 +10:00
David Bomba
16b731d010 Bump laravel to version 8 2020-10-01 15:33:38 +10:00
David Bomba
6d779030dc Trust proxies setup 2020-10-01 09:32:27 +10:00
Benjamin Beganović
487c695b68 Replace blue color with $primary_color: 
- Change ClientPortal helper to return 'bg-primary-darken' instead of 'active-page'
- Buttons & input fields don't have SASS color now
- bg-blue-600/900 replaced with primary/primary-darken
- Production build of assets
 2020-09-30 13:30:27 +02:00
=
09399b3aaa Delete invoice PDF on invoice update! 2020-09-30 19:10:02 +10:00
David Bomba
8756a89885 Allow login using contact_key or client_hash 2020-09-30 08:42:55 +10:00
David Bomba
9b546e66ac Fixes for pdf variables 2020-09-29 22:31:08 +10:00
Benjamin Beganović
a210790a57 Fix overpayments 2020-09-29 14:16:01 +02:00
David Bomba
7a9ab624a3 Working on gateway help url 2020-09-29 14:32:29 +10:00
David Bomba
e310118bf4 Fixes for cleanly deleting and restoring users 2020-09-29 08:08:44 +10:00
David Bomba
3e86da3712 Fixes for tests 2020-09-29 07:54:12 +10:00
David Bomba
1a4d2a4460
Merge pull request #4112 from beganovich/v2-rename-download-files-to-documents 
Rename "Downloads" to "Documents":
 2020-09-29 06:55:39 +10:00
Benjamin Beganović
69b24f95c4 Centralised variables: 
- New Helpers.php with sharedEmailVariables
- Merged settings from TemplateEngine
- @isset check for $whitelabel in the master.blade
 2020-09-28 12:36:51 +02:00
David Bomba
7b926980f1
Merge pull request #4111 from turbo124/v2 
Only show implemented gateways
 2020-09-28 20:34:52 +10:00
Benjamin Beganović
4e9bc0552d Rename "Downloads" to "Documents": 
- Remove Livewire auto-publish from composer.json
- Replace old DocumentController with DownloadsController
- Rename DownloadsTable & downloads-table to DocumentsTable & documents-table
- New ShowDocumentRequest for displaying documents
- Change authorize() with DownloadMultipleDocumentsRequest
- Change route in PortalComposer
- Update Livewire assets
- Remove old documents routes
 2020-09-28 12:04:34 +02:00
David Bomba
58e48034e7
Merge pull request #4110 from beganovich/v2-rename-downloads-to-documents 
(wip) Change Downloads translation to Documents in CP
 2020-09-28 20:00:46 +10:00
David Bomba
80ecab54af
Merge pull request #4106 from beganovich/v2-email-footer-whitelabel 
Add whitelabel to e-mail
 2020-09-28 20:00:28 +10:00
Benjamin Beganović
69b5ec1705 Change Downloads translation to Documents in CP 2020-09-28 11:45:22 +02:00
David Bomba
5c0776cf14 Working on Delete user bug 2020-09-28 12:56:11 +10:00
David Bomba
fd67a48c91 Bug fixes 2020-09-27 20:39:13 +10:00
David Bomba
c965e8d08b Fixes for injecting settings object into email blade templates 2020-09-27 19:22:34 +10:00
David Bomba
3c4bc4a516 Fixes for recurring scheduling 2020-09-26 09:48:42 +10:00
Benjamin Beganović
c5fcb56ca6 Add whitelabel to e-mail 2020-09-25 13:57:02 +02:00
David Bomba
038d5e0406 remove stripe omnipay driver 2020-09-25 20:05:45 +10:00
David Bomba
951188b39e
Merge pull request #4102 from beganovich/v2-profile-settings-in-livewire 
Profile settings updates
 2020-09-25 07:23:31 +10:00
Benjamin Beganović
35ed396323 Profile settings: Shipping address 2020-09-24 14:40:27 +02:00
Benjamin Beganović
b06c9c18fc Update country_id for personal country id 2020-09-24 14:40:20 +02:00
Benjamin Beganović
2f089707f4 Use Hash:: to encrypt passwords 2020-09-24 14:40:06 +02:00
Benjamin Beganović
554e595211 Profile settings: Shipping address 2020-09-24 14:23:05 +02:00
Benjamin Beganović
e5183dee56 Profile section: Name, website, logo 2020-09-24 13:44:56 +02:00
David Bomba
7e85ee0be3
Merge branch 'v2' into v2 2020-09-24 21:37:17 +10:00
David Bomba
e678f1d373 Fixes for recurring 2020-09-24 21:30:46 +10:00
Benjamin Beganović
a9e40aab37 Profile section: General informatioon 2020-09-24 13:29:41 +02:00
David Bomba
4cf56d5138 Working on recurring schedules 2020-09-24 21:03:59 +10:00
David Bomba
5ca9dae789
Merge pull request #4087 from beganovich/v2-1809-remove-omnipay-from-stripe 
Stripe use SDK to refund
 2020-09-24 21:00:03 +10:00
Benjamin Beganović
f6263fd59e Disable unused methods from RefundPayment 2020-09-24 12:21:17 +02:00
Benjamin Beganović
f34410cdea Remove logging from StripePaymentDriver 2020-09-24 12:20:57 +02:00
Benjamin Beganović
9b4d166e10 Merge remote-tracking branch 'upstream/v2' into v2-1809-remove-omnipay-from-stripe 2020-09-24 11:36:41 +02:00
Benjamin Beganović
24685db429
Merge branch 'v2' into v2-editable-invoice-amount 2020-09-24 11:33:01 +02:00
Benjamin Beganović
0216286efc Support for over & under payments 2020-09-24 11:29:47 +02:00
David Bomba
b906e1e92f Fixes for hasrecurrence trait 2020-09-24 13:40:13 +10:00
David Bomba
4db72d11e1 Actions for recurring invoices 2020-09-24 10:57:44 +10:00
David Bomba
a43688fd30 Append DELETED to invoice number on delete action 2020-09-23 20:52:54 +10:00
David Bomba
2627ec8894 PHP Cli version 2020-09-23 14:11:34 +10:00
David Bomba
c59e6a2141 Client contact authentication using contact_key 2020-09-23 13:56:56 +10:00
David Bomba
0e5199e052 Working on contact auth using contact key 2020-09-23 11:45:07 +10:00
David Bomba
81ef541d2e Expense API Endpoints 2020-09-23 10:46:35 +10:00
David Bomba
ab0ec5e2cb Vendor API endpoints 2020-09-23 10:16:19 +10:00
David Bomba
10d62f23f8 Fixes for regressions 2020-09-22 16:11:32 +10:00
David Bomba
8d3154a149 Add credit to paymentables on invoice reversal 2020-09-22 13:09:42 +10:00
David Bomba
8c1174b20b
Merge pull request #4095 from beganovich/v2-save-card-details-logic 
Save card opt-in/opt-out logic
 2020-09-22 07:30:44 +10:00
David Bomba
617a923894 Fixes for notifications: 2020-09-21 20:54:58 +10:00
Benjamin Beganović
3a1906bd87 Stripe: Optin/optout for saving card 2020-09-21 11:17:16 +02:00
David Bomba
78848fff4f fixes 2020-09-21 16:27:02 +10:00
David Bomba
3f62ff941e Add more events when a PDF must be updated 2020-09-21 12:26:10 +10:00
David Bomba
0338a30a48 Fixes for generic email templates 2020-09-21 08:17:57 +10:00
David Bomba
624f8db661 Improve payments page for client portal and fix invoice status after payment made 2020-09-19 20:33:59 +10:00
David Bomba
4b00d3a82a Improve eager loading 2020-09-19 20:05:29 +10:00
David Bomba
8dd8b83fd3 Fixes for passing settings object into all mail templates 2020-09-19 15:02:34 +10:00
=
83be13c049 fixes for types 2020-09-19 12:15:38 +10:00
=
20e4c4b1ad Improve eager loading 2020-09-19 12:05:54 +10:00
=
88eb05786e Fixes for updateinvoicepayment 2020-09-19 11:20:14 +10:00
David Bomba
23c22dd9dc Fixes for tests 2020-09-19 10:17:13 +10:00
David Bomba
bcc63c7a33
Merge pull request #4093 from turbo124/v2 
Fixes for tests
 2020-09-19 09:52:54 +10:00
David Bomba
3205c2cd09 Fixes for tests 2020-09-19 09:52:35 +10:00
Benjamin Beganović
a1e11cf161 invoices-table fix for balance due 2020-09-18 14:47:36 +02:00
Benjamin Beganović
94ebf95caa Stripe use SDK to refund 2020-09-18 14:35:53 +02:00
Benjamin Beganović
792f9717f7 Dynamic primary color borders on e-mails 2020-09-18 14:27:20 +02:00
David Bomba
12342e6002
Merge pull request #4084 from beganovich/v2-client-portal-fixes 
Client portal improvements & fixes
 2020-09-18 21:28:59 +10:00
Benjamin Beganović
99d31207e1 Fix quote generating 2020-09-18 10:45:26 +02:00
Benjamin Beganović
210ebb1754 Add placeholder methods for Authorize, Custom & PayPalExpress 2020-09-18 10:01:19 +02:00
Benjamin Beganović
71ca5d108c Detach payment methods from Stripe 2020-09-18 09:48:53 +02:00
Benjamin Beganović
020005d20d Update PaymentMethodController:destroy() with generic gateway detach 2020-09-18 09:48:39 +02:00
David Bomba
083e834400
Merge pull request #4082 from turbo124/v2 
Working on recurring invoices
 2020-09-18 17:05:05 +10:00
David Bomba
4b482c76f3 Fixes for recurring invoice 2020-09-18 17:04:28 +10:00
David Bomba
67492c3384 Recurring Invoice Invitations 2020-09-18 07:49:22 +10:00
Benjamin Beganović
32b5ee26ba Update $whitelabel variable 2020-09-17 14:28:55 +02:00
David Bomba
24104509b3 Fixes for recurring invoice schema - auto_bill_enabled 2020-09-17 09:26:23 +10:00
David Bomba
7f825f9ed0 Fixes for paid_to_date formatting 2020-09-17 08:24:56 +10:00
David Bomba
6a0f958c2e Fixes for previewing email templates 2020-09-17 08:22:23 +10:00
Benjamin Beganović
0f791fdb7f page-break-inside avoid on footer elements 2020-09-16 12:18:34 +02:00
Benjamin Beganović
1dcc24d06b Fix $details_label & texts.thanks on Elegant design 2020-09-16 12:16:56 +02:00
David Bomba
03e9bf0bc7 Fixes for recurring 2020-09-16 20:08:51 +10:00
David Bomba
7e3dd1bf67 Fixes for create test data 2020-09-16 17:06:06 +10:00
David Bomba
8471c2689f Fix for user_confirmation code 2020-09-16 09:56:10 +10:00
David Bomba
71c3865bb5 Fix bug with recurring invoice factory not setting a client 2020-09-16 09:29:23 +10:00
David Bomba
69de2fc740 fixes for transformeR 2020-09-15 16:44:58 +10:00
David Bomba
766343d8b9 Recurring dates 2020-09-14 22:13:15 +10:00
David Bomba
bae82b56c1 Add license 2020-09-14 21:11:46 +10:00
David Bomba
aeeb099d40 Fixes for mailers 2020-09-14 15:14:37 +10:00
David Bomba
559a4d831f Show npm/node status in health check 2020-09-14 08:25:09 +10:00
David Bomba
14528280d8 Fixes for recurring transformer 2020-09-14 08:21:59 +10:00
David Bomba
5f896de3bd Add auto_bill to recurring invoice transformer 2020-09-13 21:55:06 +10:00
David Bomba
37bbe8f1e3 Fixes for validation on recurring 2020-09-13 21:46:03 +10:00
David Bomba
9c7dc24bd2 Recurring Dates 2020-09-13 20:20:11 +10:00
David Bomba
2b877d3414 Working on recurringDates Array 2020-09-12 20:33:12 +10:00
David Bomba
89dcd43e47 Fixes for contact password not sticking on update 2020-09-12 19:53:28 +10:00
Benjamin Beganović
3ac3f6006c footer logic for custom props 2020-09-11 16:46:49 +02:00
David Bomba
4f879c815d
Merge pull request #4058 from beganovich/v2-hide-gateway-fees-from-invoices-table 
Client portal: Hide "Gateway Fees" from invoices-table
 2020-09-11 19:11:12 +10:00
David Bomba
ce4b5098fc
Merge pull request #4057 from beganovich/v2-show-fees-on-pdfs 
Show taxes/fees on bottom of PDFs
 2020-09-11 19:10:52 +10:00
Benjamin Beganović
ed0fe053ec Hide Gateway Fees from invoices-table (cp) 2020-09-11 10:18:31 +02:00
Benjamin Beganović
6673d58b3a Show fees on bottom of PDFs 2020-09-11 10:07:59 +02:00
Benjamin Beganović
de6034f3d4 Don't skip items with type_id = 4 2020-09-11 09:23:16 +02:00
David Bomba
6e588f7925 Fixes for checkout.com 2020-09-11 16:31:49 +10:00
David Bomba
f0bd089acb
Merge pull request #4054 from turbo124/v2 
Gateway fees and payments.
 2020-09-11 16:15:53 +10:00
David Bomba
9eaa136cc3 Clean up 2020-09-11 10:14:51 +10:00
David Bomba
2f7e01c5a4 Fixes for paid invoices via gateways 2020-09-11 10:10:53 +10:00
David Bomba
0b56e8d4cb handle payments and gateway fee integration 2020-09-11 09:01:25 +10:00
David Bomba
c55f660f7f Generic handling page for unsuccessful payments 2020-09-11 08:30:12 +10:00
Benjamin Beganović
1b36dc5868 cleanup 2020-09-10 13:01:34 +02:00
Benjamin Beganović
207c9388b5 Fix migration issues 2020-09-10 13:01:10 +02:00
David Bomba
f7dc573551 Fixes for invoices 2020-09-10 15:20:13 +10:00
David Bomba
9beafcd73b
Merge pull request #4052 from turbo124/v2 
Fixes for Checkout.com
 2020-09-10 14:42:26 +10:00
David Bomba
f061fd49f9 fixes for checkout payment gateway 2020-09-10 14:41:56 +10:00
David Bomba
d071ed0d3b Attach payment_id to payment_hash 2020-09-10 11:52:17 +10:00
David Bomba
100ca67c5f Add reference to checkout gateways 2020-09-10 11:23:04 +10:00
David Bomba
0c015cb4bc Fixes for recurring invoices 2020-09-10 11:05:42 +10:00
David Bomba
519293c6dd
Merge pull request #4051 from beganovich/v2-design-improvements 
Design improvements
 2020-09-10 07:43:32 +10:00
Benjamin Beganović
3b7bf97dd8 Add $font-size variable & fix insert of designs 2020-09-09 17:14:55 +02:00
Benjamin Beganović
6288529907 - Accept every design as CUSTOM in PreviewController 
- Logic for excluding elements in table footer
- PdfMaker will now return plain HTML + str_replace filter
- HTMLEngine updated variables and aliases
- Added 'payment_due' translation
- Hipster: Updated variables
 2020-09-09 14:47:26 +02:00
David Bomba
6147cb1edc Fix for designs 2020-09-09 20:39:35 +10:00
David Bomba
c67fee3fff Fixes for base driver 2020-09-09 20:05:10 +10:00
=
1ee6e33bb7 Working on refactoring Checkout.com payment driver to extend BaseDriver 2020-09-09 10:58:35 +10:00
David Bomba
605f4d0b0c Fixes for migrations 2020-09-09 07:37:07 +10:00
David Bomba
b9c868d3ff Sort recurring / invoices transformers for comparison 2020-09-09 07:33:21 +10:00
Benjamin Beganović
3104f4ed06 Merge remote-tracking branch 'upstream/v2' into v2-design-tfoot 2020-09-08 14:37:37 +02:00
Benjamin Beganović
78503c4608 Fix footer position 2020-09-08 14:37:21 +02:00
Benjamin Beganović
2635b8c090 Fix logic for all_pages_header/footer 2020-09-08 14:26:13 +02:00
Benjamin Beganović
14dc3ea2aa Engine for editing templates 2020-09-08 13:21:07 +02:00