1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-11 05:32:39 +01:00
Commit Graph

2338 Commits

Author SHA1 Message Date
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
David Bomba
f8f8da830e Working on recurring invoices + reminders 2020-09-08 21:01:55 +10:00
David Bomba
84ec6b35cd Add additional fields to company settings auto_bill_date + client_portal_under_payment_minimum 2020-09-08 20:53:16 +10: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
Benjamin Beganović
2e66a4df83 Update designs @page margin 2020-09-08 12:40:04 +02:00
Benjamin Beganović
0902b903a7 Insert elements as span 2020-09-08 14:30:20 +02:00
David Bomba
f5eecf0eb6 Working on recurring 2020-09-08 20:34:14 +10:00
David Bomba
c389ff49f2 Add missing data fields from HtmlEngine 2020-09-08 14:06:46 +10:00
David Bomba
77119e69fe Add primary/secondary_color to companysettings 2020-09-08 14:02:00 +10:00
David Bomba
a384db6ee8 Fix for composer --no-dev 2020-09-08 07:01:53 +10:00
David Bomba
9740edc091
Merge pull request #4042 from turbo124/v2
Clean up for improvements to composer
2020-09-07 20:19:52 +10:00
David Bomba
884f8f186a Clean up for improvements to composer 2020-09-07 20:18:56 +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
4a85081f3a Composer install 2020-09-07 20:03:47 +10:00
David Bomba
94508a30b3 Composer install 2020-09-07 20:00:20 +10:00
David Bomba
18282acbd7 Allow circumvention of client portal passwords using designated hash 2020-09-07 14:49:57 +10:00
David Bomba
d909b4939c Minor fixes for PayPal 2020-09-07 13:14:43 +10:00
David Bomba
f98319a1c1 Fixes for phpunit 2020-09-07 09:29:46 +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
David Bomba
08de7be767 Fixes for tesats 2020-09-05 08:31:24 +10: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ć
4cdf9b334f Remove old designs classes 2020-09-04 13:18:50 +02:00
Benjamin Beganović
219666f765 Generating PDFs using new templates 2020-09-04 13:17:30 +02:00
Benjamin Beganović
50c37a8719 Update logic to support only one dynamic design class:
- New Design.php class that will act as master template
- PdfMaker->design() now accepts design object instead of string
- PdfMaker: Skip elements if no id|tag provided
- PdfMaker: 'content' property is now optional
- config/ninja.php now contains base_path for templates
- Refactored tests to be :green: ✔
- Removed PdfMakerDesignsTest since content is same for each template now
2020-09-04 10:18:41 +02:00
David Bomba
5eacb1abf8 Working on token billing with gateway fees 2020-09-04 08:01:17 +10:00
David Bomba
9dce4c3de1 Refator payments and gateway fees 2020-09-04 07:23:34 +10:00
David Bomba
6b45317bf3 update invoice PDF when a payment is applied 2020-09-03 21:37:02 +10:00
David Bomba
4bb02f4f61 Fixes for authorize.net 2020-09-03 21:22:49 +10:00
David Bomba
7315b70983
Merge pull request #4032 from turbo124/v2
Working on Gateway fees & Online Payments
2020-09-03 21:01:32 +10:00
David Bomba
607a47ffd9 Working on gateway fees to authorize.net 2020-09-03 20:55:33 +10:00
Benjamin Beganović
1bbf7392ad Refactor invoice-table for simple model bind & support for gateway-fees 2020-09-03 11:45:47 +02:00
Benjamin Beganović
1f77b87331 Refactor quotes-table for simple model bind 2020-09-03 11:14:24 +02:00
David Bomba
6517d67601 Refactor of payments to include payment hash 2020-09-03 13:22:05 +10:00
Benjamin Beganović
60ae138e11 Show gateway fees status for invoices 2020-09-02 22:08:12 +02:00
David Bomba
a8bbb7035f Fixes for random data seeder 2020-09-02 19:36:32 +10:00
David Bomba
2f478158e9 Fixes for company gateways 2020-09-02 11:11:01 +10:00
David Bomba
455e9a8e1d fix for company gateways if properties not set 2020-09-02 08:11:59 +10:00
David Bomba
3d8ddb23cf fix for types 2020-09-01 12:32:36 +10:00
David Bomba
2bd8581592 Fixes for payments with gateway fees 2020-09-01 09:28:37 +10:00
David Bomba
e342c02063 fixes for quote activities 2020-09-01 07:13:00 +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
a4d0e7759e Gateway fees 2020-08-30 20:47:32 +10:00
David Bomba
1bc71fb5d8 Working on gateway fees 2020-08-30 08:00:57 +10:00
David Bomba
32e987a1b2 Remove require NPM/NODE from setup checks 2020-08-29 23:32:11 +10:00
David Bomba
3dde9e5eee TestS 2020-08-29 23:21:38 +10:00
Benjamin Beganović
f5cc1f0d22 Preview logic for editing designs 2020-08-28 09:51:02 +02:00