Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-09-21 17:01:33 +02:00
Code Issues Releases Activity
2,994 Commits 7 Branches 902 Tags 2 GiB
8e2cea7129
Commit Graph

300 Commits

Author SHA1 Message Date
David Bomba
f5eecf0eb6 Working on recurring 2020-09-08 20:34:14 +10: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
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
6b45317bf3 update invoice PDF when a payment is applied 2020-09-03 21:37:02 +10:00
David Bomba
2f478158e9 Fixes for company gateways 2020-09-02 11:11:01 +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
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
Benjamin Beganović
d508d9b8f2
Merge branch 'v2' into v2-pdfmaker-design-improvements 2020-08-28 08:17:46 +02:00
Benjamin Beganović
af7995815c Rename all_page_* to all_pages_* for dynamic header/footer 2020-08-27 08:47:51 +02:00
Benjamin Beganović
edbadabab4 Support for separate variable: all_page_header && all_page_footer 2020-08-27 08:39:14 +02:00
Benjamin Beganović
971a723607 Create support for recursive copying of DOM 2020-08-26 12:52:20 +02:00
Benjamin Beganović
e965aded06 engine for repeating headers 2020-08-26 09:02:38 +02:00
David Bomba
37c5a7adb5 Test for gateway fees appending to invoice 2020-08-26 08:10:49 +10:00
David Bomba
979916adb5 Refactor payments 2020-08-25 23:06:38 +10:00
Benjamin Beganović
234beee61b Enable injecting print CSS into document 2020-08-25 10:51:49 +02:00
Benjamin Beganović
e2963b48ff Update elements to use new $total_columns 2020-08-21 17:47:04 +02:00
Benjamin Beganović
169eb4a766 Update rest of the designs with new $pdf_variables key 2020-08-21 12:07:33 +02:00
Benjamin Beganović
23577a5f0f Refactor context['product-table-columns'] to generic pdf_variables: 
- Pass 'pdf_variables' to CreateQuotePdf & CreateInvoicPdf
- Update Playful & Plain to support new variable engine
- Update DesignHelpers trait to support new variable engine
- Make tests pass for ExampleIntegrationTest
 2020-08-21 11:59:39 +02:00
Benjamin Beganović
0a38a52617 Fix serialization issue 2020-08-20 17:48:10 +02:00
David Bomba
b2d5a8b070 Fixes for bulk emailing quotes 2020-08-19 12:55:58 +10:00
David Bomba
713d967e8e fixes for payment drivers 2020-08-17 08:58:52 +10:00
Benjamin Beganović
f42c76d8a8 Update templates with new check for entity variables 2020-08-14 14:54:06 +02:00
Benjamin Beganović
da3a86381e Add logic for checking empty entity variables 2020-08-14 14:53:55 +02:00
David Bomba
5bfcdc80b2
Merge pull request #3972 from beganovich/v2-0708-pdfmaker-integration 
(wip) End-to-end PDF Maker integration
 2020-08-14 06:53:00 +10:00
Benjamin Beganović
4769aeac67 Reduce logo size & update balance due string for invoices 2020-08-13 13:46:53 +02:00
Benjamin Beganović
a29e3b83ae Variables improvements: 
- Update $balance_due
- Update $total
 2020-08-13 13:10:59 +02:00
David Bomba
181c343594 Minor fixes for authorize.net 2020-08-13 12:30:45 +10:00
David Bomba
152e9b88f6 Activity for paid invoice 2020-08-12 11:45:40 +10:00
David Bomba
7feae1fd45 Add is_deleted to client_gateway_tokens table 2020-08-12 08:17:32 +10:00
Benjamin Beganović
2de19a4bb1 Fix design 'hidden' properties 2020-08-11 18:50:00 +02:00
Benjamin Beganović
5ebe60c78e Update DesignUpdate with new namespace 2020-08-11 18:36:56 +02:00
Benjamin Beganović
1d7e4fd6c9 Implement footer signature & white-label logo 2020-08-11 17:57:35 +02:00
Benjamin Beganović
9c1cfd2e86 Shared footer elements 2020-08-11 17:53:11 +02:00
Benjamin Beganović
e99bd59aa0 Implement getting raw HTML out of sections 2020-08-11 17:19:52 +02:00
Benjamin Beganović
347ec1d441 Check if $entity is App\Models\Quote to make sure right variables are passed 2020-08-10 17:31:23 +02:00
Benjamin Beganović
950d6d3693 Rename TableHelpers to DesignHelpers 2020-08-10 17:07:30 +02:00
Benjamin Beganović
3d477b2ed1 Conditionally show footer items 2020-08-10 17:04:51 +02:00
Benjamin Beganović
20591bc251 Added rule for "hidden" field 2020-08-10 16:43:25 +02:00
Benjamin Beganović
84e618d1b6 Remove string requirement from toggleHiddenProperty 2020-08-10 12:57:53 +02:00
Benjamin Beganović
085d08bbcb (wip) Conditionally display tfoot items 2020-08-07 18:30:04 +02:00
Benjamin Beganović
f7408e1fb3 Added new labels & update designs 2020-08-07 17:47:17 +02:00
Benjamin Beganović
8381d37431 Update entity type: 
- Default entity type is 'product'
- Added type check
- Fixed double slash in design path
 2020-08-07 16:11:10 +02:00
Benjamin Beganović
a531019e3e Update remaining colspans on design files 2020-08-07 16:02:37 +02:00
Benjamin Beganović
7870985aa8 Logic for calculating remaning spaces for colspans 2020-08-07 15:58:05 +02:00
Benjamin Beganović
007ec3a85a Plain: 
- Extract table footer into tableFooter()
- Add all footer elements
 2020-08-07 14:30:56 +02:00
Benjamin Beganović
00fcb1dd32 Modern: 
- Extract table footer into tableFooter()
- Add all footer elements
 2020-08-07 14:28:36 +02:00
Benjamin Beganović
80b6512df4 Hipster: 
- Extract table footer into tableFooter()
- Add all footer elements
 2020-08-07 14:25:43 +02:00
Benjamin Beganović
fe1cef3d62 Elegant: 
- Extract table footer into tableFooter()
- Add all footer elements
 2020-08-07 14:22:18 +02:00
Benjamin Beganović
6cdcf0d914 Creative: 
- Extract table footer into tableFooter()
- Add all footer elements
 2020-08-07 14:17:55 +02:00
Benjamin Beganović
9ee8a1658e Clean: 
- Extract table footer into tableFooter()
- Add all footer elements
 2020-08-07 14:05:40 +02:00
Benjamin Beganović
0597b01847 Business: 
- Extract table footer into tableFooter()
- Add all footer elements
 2020-08-07 14:03:25 +02:00
Benjamin Beganović
da74ecba6e Bold: 
- Extract table footer into tableFooter()
- Add all footer elements
 2020-08-07 14:00:23 +02:00
Benjamin Beganović
b438309736 Playful: 
- Extract table footer into tableFooter()
- Add all footer elements
 2020-08-07 13:55:02 +02:00
David Bomba
f773356f70
Merge pull request #3951 from beganovich/v2-pdfmaker-integration 
Designs integration with new PDF Maker
 2020-08-06 07:57:56 +10:00
Benjamin Beganović
6676cab698 Playful 2020-08-05 15:40:57 +02:00
Benjamin Beganović
4f69a874cf Modern design 2020-08-05 15:17:45 +02:00
Benjamin Beganović
7a9c8ca9a0 Hipster design 2020-08-05 15:02:32 +02:00
Benjamin Beganović
66ff55cddf Elegant 2020-08-05 14:43:51 +02:00
Benjamin Beganović
b1b42f5919 Creative 2020-08-05 14:34:22 +02:00
Benjamin Beganović
1876b228ed Clean 2020-08-05 14:24:10 +02:00
Benjamin Beganović
2333a78775 Business design 2020-08-05 12:35:38 +02:00
Benjamin Beganović
d63678435f Bold design 2020-08-05 12:13:48 +02:00
Benjamin Beganović
438054744e refactor invoice to entity 2020-08-05 11:52:01 +02:00
Benjamin Beganović
17858dae45 Implement base design class & remove design interface 2020-08-05 11:47:32 +02:00
Benjamin Beganović
ad2ff79336 Complete Plain.php 2020-08-04 17:32:28 +02:00
Benjamin Beganović
e5defd870b implement design interface 2020-08-04 16:56:17 +02:00
Benjamin Beganović
7c4d2cf96f change from isset to in_array 2020-08-04 16:41:18 +02:00
Benjamin Beganović
96fdf787de add comments 2020-08-04 13:37:51 +02:00
Benjamin Beganović
ee6da44a94 Extract helpers for tax calculations into another file 2020-08-04 13:33:38 +02:00
Benjamin Beganović
efd698c9c5 wip with table body 2020-08-03 13:29:57 +02:00
Benjamin Beganović
184f60785f wip with table bodies & footer 2020-07-30 17:47:40 +02:00
Benjamin Beganović
70ee476193 wip 2020-07-30 16:43:57 +02:00
Benjamin Beganović
cb4efc8c61 wip 2020-07-29 14:53:58 +02:00
Benjamin Beganović
2e3179d83e Extract variables from the HtmlEngine 2020-07-29 13:37:05 +02:00
David Bomba
b457cbfe15 Fix is_manual when marking an invoice as paid 2020-07-29 08:20:40 +10:00
David Bomba
d36fdb4025 Fixes for refresh query 2020-07-25 09:02:32 +10:00
David Bomba
5349fc012c
Merge pull request #3927 from turbo124/v2 
Fixes for base repo invitations
 2020-07-23 20:56:38 +10:00
David Bomba
ce3696257f Fixes for base repo invitations 2020-07-23 13:55:11 +10:00
David Bomba
3f1d877273
Merge pull request #3925 from beganovich/v2-2207-pdfmaker-changes 
Moving PdfMaker out of tests folder
 2020-07-23 07:41:11 +10:00
Benjamin Beganović
3b2e4c68e9 Update static html design paths 2020-07-22 14:43:07 +02:00
Benjamin Beganović
60a73fada3 Move PdfMaker to Services/ folder & update namespaces 2020-07-22 14:30:55 +02:00
=
a367c64278 Send change of email to both old and new email address 2020-07-22 13:03:33 +10:00
David Bomba
5e6fdef935 Working on payment terms 2020-07-20 16:10:14 +10:00
David Bomba
fec8e8b520 Fix bug where restoring a credit wouldn't work 2020-07-20 07:54:10 +10:00
David Bomba
439424b933 Fix for activity repo 2020-07-17 19:47:17 +10:00
David Bomba
b4ad18bfe9 Don't include drafts when checking data 2020-07-16 13:54:26 +10:00
David Bomba
cab6f313fe Fix for paid invoice emails 2020-07-15 17:03:35 +10:00
David Bomba
018340cd03 Working on autobill payments 2020-07-15 16:08:57 +10:00
David Bomba
cd4856e8db Helpers for gateway fees 2020-07-15 15:05:02 +10:00
David Bomba
d8a13e6cb2 Auto billing for stripe 2020-07-14 22:50:16 +10:00
David Bomba
5dc0fcca0d Working on token billing 2020-07-13 14:46:16 +10:00
David Bomba
583a92d5bc Tweak payment dates in demo data 2020-07-13 13:35:28 +10:00
David Bomba
b96e2aa78b Bulk actions for tax rates 2020-07-13 09:29:44 +10:00
David Bomba
0cd3b6925e fixes for autobill invoice 2020-07-13 08:28:19 +10:00
David Bomba
f3572a5d11 Refactor for events 2020-07-08 22:02:16 +10:00
David Bomba
a476034bd0 Add token_id to activity table 2020-07-08 16:54:16 +10:00
David Bomba
2e03b1e6d2 Fixes for reminder templates 2020-07-08 13:17:25 +10:00
David Bomba
6718915a9c Add gateway fees to invoice 2020-07-08 13:07:07 +10:00
David Bomba
4b81e209c4 Working on unattended token billing 2020-07-08 12:20:44 +10:00
David Bomba
3ec593f7ef Fixes for tests 2020-07-08 10:18:13 +10:00
David Bomba
6a11fae857 Working on Autobill 2020-07-08 00:50:51 +10:00
David Bomba
83fc30f7e7 Working on fees and limits 2020-07-07 22:33:11 +10:00
David Bomba
89d15f1e2a Fixes for API Documentation 2020-07-07 20:56:28 +10:00
David Bomba
4c321d41c3 Change subscriptions to webhooks 2020-07-06 21:22:36 +10:00
David Bomba
1deb503929 Fixes for Quote PDF servicE 2020-07-06 14:16:24 +10:00
David Bomba
d6b58fe5b8 Fixes for testS 2020-07-06 14:12:04 +10:00
David Bomba
f4a66dd75b Triggered actions 2020-07-06 13:12:08 +10:00
David Bomba
94a98f744e Triggered actions on invoice 2020-07-06 09:34:25 +10:00
David Bomba
920bbf8b75 Adjust client balance when deleting payment 2020-07-05 20:24:13 +10:00
=
e3b8651211 RecurringService 2020-07-01 11:06:40 +10:00
David Bomba
16bc04c2ed Check Data 2020-06-30 21:18:16 +10:00
David Bomba
245980ce4b Send company with all events 2020-06-30 09:35:17 +10:00
David Bomba
f36bbf75b8 Delete payment workflow 2020-06-28 13:05:58 +10:00
David Bomba
8eed07b8f5 Additional fields for entities 2020-06-28 08:24:08 +10:00
David Bomba
7dbdc292e5 Fixes for refunds 2020-06-27 11:43:45 +10:00
David Bomba
1ce5b7ad8e fixes for refunds 2020-06-27 10:20:27 +10:00
David Bomba
fe995ca878 Refactor refunds 2020-06-27 10:05:31 +10:00
David Bomba
03d80d6006 Tweaks for refunding 2020-06-26 13:32:09 +10:00
Benjamin Beganović
b4d3498ac3 Checkout.com payments & refunds improvements: 
- Fix refunding & exception handling
- Fix capturing the payments with Checkout SDK
- Update credit note balance after refunding
 2020-06-25 17:08:15 +02:00
Benjamin Beganović
be61945c93 Merge remote-tracking branch 'upstream/v2' into v2-2306-payments 2020-06-24 17:35:13 +02:00
Benjamin Beganović
24a3cc36fc Record activity and update payment value after refunding 2020-06-24 17:18:03 +02:00
David Bomba
b3c2d7e11e Authorize .net refund implementation 2020-06-24 15:20:33 +10:00
David Bomba
889ac65f26 Bulk actions on groups 2020-06-24 09:39:49 +10:00
David Bomba
a7e05cb3bd Fix for applied amount when using credits to pay invoices 2020-06-18 13:19:38 +10:00
David Bomba
9acbac7402 Add invoice id to credit 2020-06-18 09:43:28 +10:00
David Bomba
70c5913f1d fixes for currency type 2020-06-15 16:06:32 +10:00
David Bomba
6af50df3df Reverse a cancellation 2020-06-15 09:53:57 +10:00
David Bomba
4846c9bccc Working on reversing an invoice cancellation 2020-06-15 09:34:18 +10:00
David Bomba
4dca7da070 Fixes for payment side of ledger 2020-06-06 11:07:31 +10:00
David Bomba
fa19c70855 Create a status for Quote -> Completed 2020-06-02 20:19:29 +10:00
David Bomba
3abd0e0b17 Fixes for tests 2020-06-01 14:18:33 +10:00
David Bomba
c99c339fab Implement new refund methods 2020-06-01 13:16:06 +10:00
David Bomba
e163135f1f Fixes for refunding 2020-06-01 08:29:53 +10:00
David Bomba
6fce752de4 Refunable refactor 2020-05-29 16:24:41 +10:00
David Bomba
45dee9f7f9 Refactoring for refundable 2020-05-29 08:21:47 +10:00
David Bomba
b28cdd488b Set due date when invoice is marked as sent 2020-05-28 14:18:34 +10:00
David Bomba
0485ffe912 fixes for invoices not generating invoice numbers on payment 2020-05-28 10:59:33 +10:00
David Bomba
41b19c20c1 Place checks on quote 'isConvertable()' 2020-05-27 14:54:47 +10:00
David Bomba
c72d38ca4f
Allow conversion of quotes to invoices (#3760) 2020-05-27 14:46:19 +10:00
David Bomba
afbb605af5
Fixes for converting a quote to invoice (#3727) 2020-05-20 17:45:03 +10:00