1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-09-22 09:21:34 +02:00
Commit Graph

1627 Commits

Author SHA1 Message Date
David Bomba
f7cf6b521f
Merge pull request #5321 from turbo124/v5-develop
fixes for subscriptions
2021-04-02 10:19:37 +11:00
David Bomba
c3eb46d0b7 fixes for subscriptions 2021-04-02 09:09:01 +11:00
Benjamin Beganović
08b317f7b8 allow cancellation under specific conditions 2021-04-01 16:38:46 +02:00
David Bomba
404ee307fd Magic link maker 2021-03-31 11:07:54 +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
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ć
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
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
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
fd24449f95 Fixes for deleting / restoring / removing users 2021-03-26 19:07:43 +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ć
77fdb25304
Merge branch 'v5-develop' into v5-2203-billing-portal 2021-03-23 16:23:56 +01:00
=
f74368e869 Set first user to gmail after first authorization 2021-03-23 17:19:06 +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
David Bomba
5700da5323 Fixes for password protection 2021-03-22 22:18:57 +11:00
David Bomba
5d28271df9 Fixes for default timeouts 2021-03-22 22:12:12 +11:00
David Bomba
793247e0f7 Fixes for default timeouts 2021-03-22 21:55:09 +11:00
Benjamin Beganović
187be058f7
Merge branch 'v5-develop' into v5-1803-billing 2021-03-22 09:38:34 +01: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
=
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
=
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
Benjamin Beganović
3bcb65efc2 Set locale from query parameter 2021-03-18 15:41:26 +01:00
David Bomba
10f7b1a309 Fixes for 2fa 2021-03-18 22:46:58 +11:00
David Bomba
ac6feb706e Small fix for new PDF generator 2021-03-18 20:57:55 +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ć
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ć
eb2cfde303 Merge remote-tracking branch 'upstream/v5-develop' into v5-1103-billing-landing-page 2021-03-17 07:34:23 +01:00
David Bomba
b762ea37d2 Throw 400's on incorrect 2FA data 2021-03-17 00:40:58 +11: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
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
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
=
0bf8b9c9e5 Fixes for setup flow 2021-03-13 17:45:41 +11: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
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
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
David Bomba
b9c9874533 Improve PDF creation performance 2021-03-10 21:00:18 +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
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
9290873b8b Fixes for qr code" 2021-03-09 21:53:25 +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
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
4e9b92c2da Minor fix for 2fa method name 2021-03-09 07:46:30 +11:00
Benjamin Beganović
780ab6885b Billing subscriptions: Controller 2021-03-08 15:19:04 +01:00
David Bomba
e39ce7491b Feature permissions for hosted 2021-03-08 08:32:38 +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
1780db52bd Invite user route 2021-03-04 09:39:24 +11:00
David Bomba
bfbde2ba51 Fixes 2021-03-03 21:04:10 +11:00
=
c23b9b147d Fixes for attaching a user to different companies 2021-03-03 18:22: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
92f729c10d Catch if an OAuth user doesn't exist and attempts to login 2021-02-28 19:54:14 +11:00
David Bomba
c063aee812 enums for email delivery 2021-02-26 08:06:43 +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
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
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
David Bomba
67d0f525af Postmark webhooks 2021-02-22 20:46:01 +11:00
David Bomba
c72fcfed64 Mail listeners to harvest message ids 2021-02-22 11:18:52 +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
=
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
2735efedd2 Remove BaseMailerJob 2021-02-19 07:57:10 +11: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
David Bomba
704477f803 Imports 2021-02-18 14:37:17 +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
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
David Bomba
4612379811 Fixes for file upload on dedicated routes 2021-02-16 20:02:33 +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
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
David Bomba
120d2c21ab Refactor password reset for admin users 2021-02-15 10:39:40 +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
Joshua Dwire
ac99b0039d Import functionality updates 2021-02-12 19:20:15 -05:00
David Bomba
bd6e3db554 Fix for entity footer 2021-02-12 08:00:42 +11:00
=
85df91a6e8 Add redirect URI to google auth requests 2021-02-10 21:43:32 +11:00
Benjamin Beganović
3653c7901a Update rules for under payments 2021-02-09 12:48:22 +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ć
9e08ce7415 escape hash 2021-02-02 14:52:21 +01:00
David Bomba
fb8bf55e5c Clean up logging 2021-01-31 17:49:28 +11:00
David Bomba
65ee07b8ec Remove Spatie Ray - poor error handling 2021-01-30 12:13:32 +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ć
3b31953d14
Merge branch 'v5-develop' into v5-2701-payable-draft-invoices 2021-01-28 15:44:22 +01:00
David Bomba
e0758e587f Add logging for migrations 2021-01-28 13:53:40 +11: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
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ć
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
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
David Bomba
af523a6346 detach payment method from authorize gateway 2021-01-25 23:16:43 +11:00
David Bomba
6540a25531 Refactor client numbering 2021-01-25 21:34:12 +11: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
24dfbe48dc working on paid_to_date fields and calculations 2021-01-24 17:44:14 +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
05ea7f092a Fixes for ledger adjustments 2021-01-21 15:05:05 +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
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
cfc144b6ec Group Document defaults 2021-01-20 07:22:14 +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
81da8e169d Add documents to groups 2021-01-18 22:06:26 +11:00
David Bomba
cbd6f212b5 deprecate old getPaymentMethods() 2021-01-18 13:59:06 +11:00
David Bomba
c4bfb33dbf Add destroy() methods in all controllers 2021-01-17 15:28:03 +11:00
David Bomba
cbce8c8a46 minor fixes for client portal 2021-01-15 22:19:34 +11:00
David Bomba
2f58096872 Fixes for displaying Recurring Invoice PDF 2021-01-15 13:02:55 +11:00
Benjamin Beganović
2a193c97ea Show quotes/invoices in full-screen by default 2021-01-14 13:29:46 +01:00
David Bomba
8b22fa5a47 Fixes for user events 2021-01-14 15:31:45 +11:00
David Bomba
7d46ec489a User Activities 2021-01-14 14:44:52 +11:00
David Bomba
20b13d131b Return expense response when using delete route 2021-01-14 07:33:45 +11:00
David Bomba
976f610158 fixes for validation 2021-01-13 23:20:15 +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
7f03a1900e Refactor notifications to be more specific, ie. Invoice -> Reminder 1 template 2021-01-13 18:20:46 +11:00
David Bomba
e804e083a0 Add slight delay to mailer 2021-01-12 20:54:45 +11:00
David Bomba
e3f0493c48 Cleanup for emails 2021-01-12 10:21:17 +11:00
David Bomba
b76e404401 Adjust use credits functionality 2021-01-12 08:42:30 +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
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
Benjamin Beganović
fe4f01d98a Wrap processPaymentView & processPaymentRequest into try-catch 2021-01-08 13:45:08 +01:00
David Bomba
a5290e067e Fix for suming amounts payable 2021-01-08 14:25:54 +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
31dd8b2d77
Merge pull request #4643 from turbo124/v5-develop
Fixes for tax precision
2021-01-07 17:09:08 +11:00
David Bomba
2cd5d2d68a Minor fixes for credit_payments in CP 2021-01-07 10:18:57 +11:00
Benjamin Beganović
e1df465883 Show the message if invoice is unpayable 2021-01-06 14:22:48 +01: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
c132e9ace8 Fixes for tasks, and migrations 2021-01-06 10:36:20 +11: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
934610a01c Update copyright + version bump + set canadian dollar symbol to $ 2021-01-04 08:54:54 +11:00
David Bomba
e791741efa Fixes for displaying recurring invoices in the client portal 2021-01-03 18:56:42 +11:00
Benjamin Beganović
8df80ddab0 fixes for paypal redirecting to stripe 2020-12-30 12:02:04 +01:00
=
7a058c9ae6 Move logging to nlog 2020-12-30 08:10:03 +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ć
9f58ccb028 Add support for custom Chromium path (ie. support for Windows & Mac) 2020-12-25 14:15:57 +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
Benjamin Beganović
ada4f3065c fixes for tests 2020-12-23 11:41:57 +01:00
Benjamin Beganović
95c1f60674 Install beganovich/snappdf package 2020-12-21 16:32:04 +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ć
92d2a514ca Supprot Stripe for webhooks 2020-12-19 13:11:42 +01:00
David Bomba
df30f0cbc5 Fixes for github actions 2020-12-18 11:31:27 +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
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
Benjamin Beganović
d8405710e7
Merge pull request #4513 from beganovich/v5-webhooks-refactor
(wip) (v5) Webhooks refactor
2020-12-17 11:56:16 +01:00
Benjamin Beganović
c78a03b095 Remove trailing slash from URLs on setup 2020-12-17 11:10:47 +01:00
David Bomba
831d1e0816 revert to exec() to composer install 2020-12-17 10:23:54 +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
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
57ee54032f Import CSV 2020-12-15 09:59:41 +11: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
d115609d3c Import | Exports 2020-12-14 15:59:15 +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
1913318124 bump the import cache timeout from 10 minutes to 60 minutes 2020-12-13 07:54:25 +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
Benjamin Beganović
e6890e5430
Merge branch 'v5-develop' into v5-custom-payment-driver 2020-12-10 12:40:27 +01: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
6a03bcc546
Merge branch 'v5-develop' into v5-develop 2020-12-09 07:25:16 +11: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ć
3505c89e2d remove fallback to log driver 2020-12-08 14:20:24 +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
Benjamin Beganović
c548bc2e0d refactor paymentwebhook suite with new methods 2020-12-07 14:49:30 +01:00
David Bomba
34463eac64
Merge branch 'v5-develop' into v5-develop 2020-12-04 07:41:36 +11:00
Benjamin Beganović
458e207fe3 fixes for smtp testing on setup 2020-12-03 14:10:40 +01:00
Benjamin Beganović
d84f5bc5bb Fixes for Checkout.com refunding 2020-12-03 13:38:57 +01:00
David Bomba
fceaab9e40 Working on invoice delete restore refactor 2020-12-03 21:46:36 +11:00
David Bomba
1210a81a09 Minor changes to migration 2020-11-30 09:58:31 +11:00
David Bomba
d7dd592d18 Fixes for migration file location 2020-11-30 08:28:12 +11:00
Benjamin Beganović
0aff363f5d php-cs-fixer 2020-11-27 12:08:42 +01:00
David Bomba
9f4979095b Temp routes" 2020-11-27 20:21:18 +11:00
David Bomba
5a3c93bb3c Temp routes" 2020-11-27 20:14:01 +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
d07dedf264 Add tax_rates relation to company_user 2020-11-27 08:05:30 +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
efbf8069b5
Merge pull request #4360 from turbo124/v5-develop
Fixes for migrations
2020-11-25 20:24:06 +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
Benjamin Beganović
3b765d32c1 log as an option for mail driver 2020-11-24 11:12:44 +01: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
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
David Bomba
4b240b05ca Add deleted_at column to paymentables 2020-11-16 08:23:20 +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
d8bb01430f Fixes for renaming company gateway columns 2020-11-12 22:09:31 +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
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ć
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
9174b7e628 Fixes for emails and reminders 2020-11-09 21:17:20 +11:00
David Bomba
fcef2c72b3 Working on payment emails 2020-11-09 13:39:42 +11:00
=
cd0bbbe096 Remove redundant classes 2020-11-08 21:53:47 +11:00
David Bomba
60a141d529 Fixes for reminders 2020-11-06 15:43:10 +11:00
David Bomba
09fbc9762a Fixes for custom emails. 2020-11-05 21:14:30 +11:00
David Bomba
d598aeeb03 Working on reminders 2020-11-04 19:43:20 +11:00
David Bomba
5fe85ca3f0 Working on company settings implmentation 2020-11-04 17:02:15 +11:00
David Bomba
c995ac5f44 Add API Documentation to repo 2020-11-04 12:27:07 +11:00
David Bomba
870a41a93e Fix for removing company logo from storage 2020-11-04 10:56:29 +11:00
David Bomba
64b703513d Refactor company gateway schema for required fields 2020-11-04 08:26:28 +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
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ć
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
3434d5dd70 Add events for payments 2020-11-02 15:58:43 +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
Benjamin Beganović
7f3c4ada5a Merge remote-tracking branch 'upstream/v5-develop' into v2-frontend-refactor 2020-11-01 19:26:43 +01:00
Benjamin Beganović
1ae2649be6 Stripe ACH authorization & verification 2020-11-01 18:47:48 +01:00
=
39f084c030 Clean setupcontroller and .env.example variables 2020-11-01 14:25:55 +11:00
David Bomba
6a54bb8c45 Fixes for migrations Vendor Contacts 2020-10-31 16:35:05 +11:00
David Bomba
de48512908 Activity record when quote is approved 2020-10-30 08:43:23 +11:00
David Bomba
86d472fa05 Project numbers 2020-10-29 22:01:37 +11:00
David Bomba
59291b799c Fixes for tasks status column 2020-10-29 09:48:05 +11:00
David Bomba
9aeb2d7a5b Psalm cleanup 2020-10-28 21:10:49 +11:00
David Bomba
adeda5526e Add Psalm, code cleanup! 2020-10-28 17:58:15 +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
0a02323792 Quote email engine 2020-10-28 10:02:32 +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
073caab09b
Merge pull request #4216 from turbo124/v5-develop
Refactor HTMLEngine
2020-10-28 06:17:49 +11:00
Benjamin Beganović
8270762311 Fix setup issue with opening new PDFs 2020-10-27 14:02:36 +01: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
8f53424017 Fixes 2020-10-27 06:10:04 +11:00
David Bomba
8d508bb1f9 Refactor pdf generation 2020-10-26 15:06:58 +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
b00e0b5a04 Fixes for first_load includes 2020-10-26 07:56:02 +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
Clément Gayot
5458bf83b0 🐛 Fix invoice preview with custom designs 2020-10-22 01:19:33 +02: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
3d59717776 Fixes for credit payments 2020-10-21 15:03:22 +11:00
Benjamin Beganović
1de6f94f10 fix custom1234 2020-10-20 13:01:07 +02: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
f0e4a94bee Task Statuses 2020-10-20 10:01:59 +11:00
David Bomba
a3afa8ede9 Remove project name unique constraint 2020-10-19 21:59:58 +11:00
David Bomba
708db5a991 Improve eager loading - first load 2020-10-18 18:46:10 +11:00
David Bomba
07cbb6a71a Fixes for showing recurring invoices in the client portal 2020-10-16 07:35:15 +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
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
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
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
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
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
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
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
Benjamin Beganović
f33e6768c0 Use invoice 'balance' when comparing with over & under payments. 2020-10-09 16:08:12 +02:00
Benjamin Beganović
f2390de9b3 Change text on test PDF 2020-10-09 15:12:50 +02:00
David Bomba
5cd1acd484
Merge pull request #4143 from turbo124/v2
Gateway fixes
2020-10-09 22:13:58 +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
cf7ee6338e Working on templates 2020-10-09 12:59:59 +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
David Bomba
d4e2a0071a Analytics 2020-10-07 14:56:35 +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
1264486bb9 Working on recurring migration 2020-10-06 08:46:47 +11:00
Benjamin Beganović
c0f3576d55 Fix imports 2020-10-05 10:16:36 +02:00
David Bomba
fccc98caa7 Fixes for model factories -> invoice designs 2020-10-04 20:34:08 +11:00
David Bomba
15320500c0
Merge pull request #4126 from turbo124/v2
Laravel 8 support
2020-10-01 21:47:07 +10:00
David Bomba
3fa336946f Fixes for Laravel 8 2020-10-01 21:34:05 +10:00
=
09399b3aaa Delete invoice PDF on invoice update! 2020-09-30 19:10:02 +10:00
Benjamin Beganović
a210790a57 Fix overpayments 2020-09-29 14:16:01 +02: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
fd67a48c91 Bug fixes 2020-09-27 20:39:13 +10:00
David Bomba
7e85ee0be3
Merge branch 'v2' into v2 2020-09-24 21:37:17 +10:00
David Bomba
4cf56d5138 Working on recurring schedules 2020-09-24 21:03:59 +10: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
4db72d11e1 Actions for recurring invoices 2020-09-24 10:57:44 +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
78848fff4f fixes 2020-09-21 16:27:02 +10:00
David Bomba
4b00d3a82a Improve eager loading 2020-09-19 20:05:29 +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
Benjamin Beganović
a1e11cf161 invoices-table fix for balance due 2020-09-18 14:47:36 +02:00
Benjamin Beganović
020005d20d Update PaymentMethodController:destroy() with generic gateway detach 2020-09-18 09:48:39 +02:00
David Bomba
8471c2689f Fix for user_confirmation code 2020-09-16 09:56:10 +10:00
David Bomba
aeeb099d40 Fixes for mailers 2020-09-14 15:14:37 +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
0c015cb4bc Fixes for recurring invoices 2020-09-10 11:05:42 +10: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
Benjamin Beganović
3104f4ed06 Merge remote-tracking branch 'upstream/v2' into v2-design-tfoot 2020-09-08 14:37:37 +02:00
Benjamin Beganović
14dc3ea2aa Engine for editing templates 2020-09-08 13:21:07 +02:00
David Bomba
857fa8a57f Force admin only permissions on system logs 2020-09-08 20:49:17 +10:00
David Bomba
3083ab6237 Set unique on Group Settings Name 2020-09-08 20:44:32 +10:00
David Bomba
ca34e77530
Merge pull request #4041 from turbo124/v2
Improve update process
2020-09-07 20:05:39 +10:00
David Bomba
18282acbd7 Allow circumvention of client portal passwords using designated hash 2020-09-07 14:49:57 +10:00
Benjamin Beganović
0bf39c739d
Merge branch 'v2' into v2-fix-setup-issues 2020-09-07 00:15:45 +02:00
David Bomba
ba75a44eb8
Laravel 7.x Shift (#40)
* Adopt Laravel coding style

The Laravel framework adopts the PSR-2 coding style with some additions.
Laravel apps *should* adopt this coding style as well.

However, Shift allows you to customize the adopted coding style by
adding your own [PHP CS Fixer][1] `.php_cs` config to your project.

You may use [Shift's .php_cs][2] file as a base.

[1]: https://github.com/FriendsOfPHP/PHP-CS-Fixer
[2]: https://gist.github.com/laravel-shift/cab527923ed2a109dda047b97d53c200

* Shift bindings

PHP 5.5.9+ adds the new static `class` property which provides the fully qualified class name. This is preferred over using class name strings as these references are checked by the parser.

* Shift core files

* Shift to Throwable

* Add laravel/ui dependency

* Unindent vendor mail templates

* Shift config files

* Default config files

In an effort to make upgrading the constantly changing config files
easier, Shift defaulted them so you can review the commit diff for
changes. Moving forward, you should use ENV variables or create a
separate config file to allow the core config files to remain
automatically upgradeable.

* Shift Laravel dependencies

* Shift cleanup

* Upgrade to Laravel 7

Co-authored-by: Laravel Shift <shift@laravelshift.com>
2020-09-06 19:38:10 +10:00
Benjamin Beganović
7a5027f1b4 Enable sandboxing with PDFs & fix setup page issues 2020-09-06 04:23:04 +02:00
Benjamin Beganović
1a66f1835f Merge remote-tracking branch 'upstream/v2' into v2-pdfmaker-design-improvements 2020-09-04 13:20:39 +02:00
Benjamin Beganović
219666f765 Generating PDFs using new templates 2020-09-04 13:17:30 +02:00
David Bomba
2f478158e9 Fixes for company gateways 2020-09-02 11:11:01 +10:00
David Bomba
bb4aac1aeb
Merge pull request #4025 from turbo124/v2
Gateway fees implementation
2020-08-31 17:58:43 +10:00
David Bomba
1bd3deca4f Invoice payments with gateway fees 2020-08-31 14:27:47 +10:00
David Bomba
eb867522df Working on invoice payments with gateway fees 2020-08-31 12:00:43 +10:00
David Bomba
ac08a146a1 Working on gateway fees 2020-08-30 22:00:19 +10:00
David Bomba
1bc71fb5d8 Working on gateway fees 2020-08-30 08:00:57 +10:00
Benjamin Beganović
f5cc1f0d22 Preview logic for editing designs 2020-08-28 09:51:02 +02:00
Benjamin Beganović
d508d9b8f2
Merge branch 'v2' into v2-pdfmaker-design-improvements 2020-08-28 08:17:46 +02:00
David Bomba
36c54d8cc3 Working on fees 2020-08-28 11:06:46 +10:00
David Bomba
1a7d0d3cbd Working on gateway fees across multiple invoices 2020-08-27 22:12:39 +10:00
David Bomba
ff5d8ad871 Fixes for gateway fees 2020-08-26 11:14:15 +10:00
David Bomba
d57f0f9236 Refactoring client payments 2020-08-26 10:53:11 +10:00
David Bomba
79e0fa56e2 Convert currency string to float 2020-08-26 10:47:50 +10:00
David Bomba
37c5a7adb5 Test for gateway fees appending to invoice 2020-08-26 08:10:49 +10:00
David Bomba
1c55b529a0 Refactor payments 2020-08-25 23:18:17 +10:00
David Bomba
979916adb5 Refactor payments 2020-08-25 23:06:38 +10:00
Benjamin Beganović
5a03d81112 Fix blank page when downloading invoices 2020-08-25 08:55:55 +02:00
David Bomba
4c3f466d58 Tests for system log routes 2020-08-24 20:28:47 +10:00
David Bomba
d7dd544271 System logs 2020-08-24 19:51:19 +10:00
David Bomba
66499a9a31 System Logs 2020-08-24 15:08:49 +10:00
David Bomba
ffdfaefd80 Working on system logs 2020-08-24 12:45:53 +10:00
David Bomba
0d9df1f290 Fixes for incorrect name spacing of validation rules 2020-08-24 08:20:57 +10:00
David Bomba
0f501bc936 fixes for quote controller 2020-08-23 11:08:18 +10:00
David Bomba
dbe22cf5fa First or fail for company record in short 2020-08-23 07:46:43 +10:00
Benjamin Beganović
13e70e24d5 wip 2020-08-21 16:47:17 +02:00
Benjamin Beganović
0530204b08 Update copyright 2020-08-20 03:17:29 +02:00
Benjamin Beganović
f4698c0108 Support multiple downloads 2020-08-20 03:10:04 +02:00
David Bomba
c9d94804de
Merge pull request #4002 from turbo124/v2
Tests for gateway fees
2020-08-20 07:40:33 +10:00
Benjamin Beganović
9b524f22e6 Download files with original name 2020-08-19 18:06:26 +02:00
David Bomba
7b2e60a0d5 Add amount column to history table 2020-08-19 12:44:25 +10:00
David Bomba
ba3f3e6989
Merge branch 'v2' into v2 2020-08-19 07:59:19 +10:00
Benjamin Beganović
0a493c275e Enable is_public for document uploads 2020-08-18 16:12:46 +02:00
Benjamin Beganović
4eb376e830 Enabe client uploads 2020-08-18 16:01:25 +02:00
Benjamin Beganović
acdd9c936c Fix route model binding 2020-08-18 14:38:46 +02:00
Benjamin Beganović
d55cfc42cf Separate page for download 2020-08-17 16:18:49 +02:00
Benjamin Beganović
814dfb0346 Merge remote-tracking branch 'upstream/v2' into v2-1408-cp-downloads 2020-08-17 14:01:56 +02:00
David Bomba
d6e169a891 Working on tests for fees and limits 2020-08-17 13:03:21 +10:00
David Bomba
713d967e8e fixes for payment drivers 2020-08-17 08:58:52 +10:00
Benjamin Beganović
4eb5490984 Enable downloads for the client 2020-08-14 17:29:26 +02:00
David Bomba
dffb9be189 Fixes for purge company and preserve settings 2020-08-14 10:40:59 +10:00
David Bomba
3ac9cc5158 Add reminder fields to entities 2020-08-14 08:08:10 +10:00
David Bomba
fd38a964e7 Fixes for company purging 2020-08-14 07:15:15 +10:00
David Bomba
181c343594 Minor fixes for authorize.net 2020-08-13 12:30:45 +10:00
David Bomba
d11cc1784d Fixes for tests 2020-08-13 11:55:58 +10:00
David Bomba
e347c5ad51 Document permissions 2020-08-12 13:13:39 +10:00
David Bomba
de24d00315 Error handling for emails 2020-08-12 12:16:44 +10:00
David Bomba
941e790a95 More activities 2020-08-12 12:02:21 +10:00
David Bomba
bcd69dadc8 Change invoice -> entity 2020-08-12 10:41:26 +10:00
David Bomba
ee0aa891bb Fixes for activity backups"
git push
2020-08-12 10:13:34 +10:00
David Bomba
928a9d46af Download historical invoice 2020-08-12 10:01:27 +10:00
David Bomba
cb508e1daa Add client gateways to first-load array 2020-08-12 09:04:39 +10:00
David Bomba
3514491300 Changing error structure, regression fixes for shop/client route 2020-08-12 08:59:28 +10:00
David Bomba
7feae1fd45 Add is_deleted to client_gateway_tokens table 2020-08-12 08:17:32 +10:00
David Bomba
71449392de Fix for regression 2020-08-11 20:57:45 +10:00
David Bomba
c195f5b8a5 Add middleware to destroy document 2020-08-11 13:21:43 +10:00
=
731001baf5 Refactor refresh route resolution of company_user 2020-08-08 10:32:47 +10:00
=
1be45a4e38 Wind back changes to login route 2020-08-08 09:58:10 +10:00
=
6751654216 Refactor login route 2020-08-08 09:50:32 +10:00
David Bomba
2fdf351be3 Customize bulk templates 2020-08-05 22:18:29 +10:00
David Bomba
13cf06b0cd Test for new shop routes" 2020-08-05 12:21:26 +10:00
David Bomba
e183238b8e Add Shop Profile Route 2020-08-05 12:12:38 +10:00
David Bomba
b89ee61bba return appropriate response from within catch 2020-08-04 23:53:33 +10:00
David Bomba
a094c23937 Add PhantomJS tests on setup screen 2020-08-04 23:30:27 +10:00
David Bomba
d7dbde3789 Implement PhantomJS 2020-08-04 21:00:19 +10:00
David Bomba
374fd90df1 Fixes for Invoice Preview route 2020-08-04 18:37:28 +10:00
David Bomba
f544f7ac23 fix for archiving tax rates 2020-08-04 18:17:12 +10:00
David Bomba
81a34f3446 Fixes for email templates not displaying css correctly 2020-08-02 19:59:32 +10:00
David Bomba
b780be3995 Ensure group settings can be archived + tests! 2020-08-02 16:31:55 +10:00
David Bomba
7318eb19d8 OPENAPI docs 2020-07-30 13:27:00 +10:00
David Bomba
1db8b53128 OPENApi documentation 2020-07-30 12:50:45 +10:00
David Bomba
a6967892ea system health route 2020-07-30 10:30:49 +10:00