Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-10 21:22:58 +01:00
Code Issues Releases Activity
2,325 Commits 7 Branches 917 Tags 2 GiB
ad6ae61996
Commit Graph

2325 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Bomba
ad6ae61996
Merge pull request #4005 from beganovich/v2-pdfmaker-design-improvements 
Update DesignSeeders with new designs
 2020-09-05 06:53:32 +10:00
hillelcoren
99062318c9 New admin portal build 2020-09-04 11:23:06 +00: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ć
0962177252 Remove old designs 2020-09-04 13:18:17 +02:00
Benjamin Beganović
219666f765 Generating PDFs using new templates 2020-09-04 13:17:30 +02:00
Benjamin Beganović
52dea9c665 Assign element ids in templates 2020-09-04 13:16:05 +02:00
Benjamin Beganović
4b6c2bff4c Added footer to designs 2020-09-04 10:18:58 +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
Benjamin Beganović
5b67a547d9 Update new designs 2020-09-04 08:42:58 +02:00
David Bomba
50d38997e5
Merge pull request #4036 from turbo124/v2 
Refactor payments for gateway fees
 2020-09-04 08:37:15 +10:00
David Bomba
5eacb1abf8 Working on token billing with gateway fees 2020-09-04 08:01:17 +10:00
hillelcoren
256503a6ba New admin portal build 2020-09-03 21:35:28 +00:00
David Bomba
9dce4c3de1 Refator payments and gateway fees 2020-09-04 07:23:34 +10:00
David Bomba
9fdbed4472
Merge pull request #4034 from turbo124/v2 
update invoice PDF when a payment is applied
 2020-09-03 21:37:24 +10:00
David Bomba
6b45317bf3 update invoice PDF when a payment is applied 2020-09-03 21:37:02 +10:00
David Bomba
2c74b5a3ba
Merge pull request #4033 from turbo124/v2 
Fixes for authorize.net
 2020-09-03 21:23:52 +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
6c8e106959 cleaning up logging in tests 2020-09-03 21:01:04 +10:00
David Bomba
607a47ffd9 Working on gateway fees to authorize.net 2020-09-03 20:55:33 +10:00
David Bomba
dc4f6d0d5c
Merge pull request #4029 from beganovich/v2-show-payment-fees-in-invoice-table 
Show gateway fees status for invoices
 2020-09-03 20:10:08 +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
34d244ff8b
Merge pull request #4026 from turbo124/v2 
Company gateway / Bug fixes
 2020-09-02 19:49:44 +10: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
hillelcoren
3098f8c5bd New admin portal build 2020-08-31 08:15:47 +00:00
David Bomba
bb4aac1aeb
Merge pull request #4025 from turbo124/v2 
Gateway fees implementation
 2020-08-31 17:58:43 +10:00
David Bomba
93a886db08 fixes for tests 2020-08-31 17:51:33 +10:00
David Bomba
217d3be2cb Fixes for tests 2020-08-31 17:48:30 +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
hillelcoren
26d3cc27b1 New admin portal build 2020-08-30 07:27:10 +00:00
hillelcoren
ac87c48b13 New admin portal build 2020-08-30 07:20:30 +00: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
David Bomba
ccdb55223c Fixes for conflict 2020-08-29 22:17:47 +10:00
David Bomba
6dea2fe7d2 Add test mode flag to company gateways 2020-08-29 22:16:23 +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