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

2208 Commits

Author SHA1 Message Date
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
2e8cb84570 Payment emails 2020-11-09 13:57:34 +11:00
David Bomba
fcef2c72b3 Working on payment emails 2020-11-09 13:39:42 +11:00
=
cd0bbbe096 Remove redundant classes 2020-11-08 21:53:47 +11:00
David Bomba
07af666ca4
Merge pull request #4273 from turbo124/v5-develop 
Reminders
 2020-11-07 07:03:57 +11:00
Benjamin Beganović
a601702a0e geTaskTimeLogs() helper 2020-11-06 13:13:04 +01:00
Benjamin Beganović
892c440ea4 fix items count() & add support for task times 2020-11-06 13:12:51 +01:00
David Bomba
09fbc9762a Fixes for custom emails. 2020-11-05 21:14:30 +11:00
David Bomba
3d11639cb4 Fixes for tests 2020-11-05 07:50:39 +11:00
David Bomba
100207f4cb
Merge pull request #4267 from turbo124/v5-develop 
Company Settings Implmentation
 2020-11-05 07:49:10 +11:00
Benjamin Beganović
5c2bfaa8ce Alpha testing on tasks: 
- Change 'products' to '$product' with design within: CreateEntityPdf, ActivityRepository, HtmlGenerationTest, Phantom
- New 'task-table' element in the Services\PdfMaker\Design.php
- buildTableHeader & buildTableBody are now more generic
- processTaxColumns() now requires $type to be specified
 2020-11-04 14:56:08 +01:00
Benjamin Beganović
e222aa8620 Refactor 'product-table-footer' to 'table-totals' 2020-11-04 11:23:06 +01:00
David Bomba
5c5102baeb Working on reminders 2020-11-04 20:32:49 +11:00
David Bomba
d598aeeb03 Working on reminders 2020-11-04 19:43:20 +11:00
David Bomba
697fa568db Working on company settings implementation 2020-11-04 18:57:16 +11:00
David Bomba
5fe85ca3f0 Working on company settings implmentation 2020-11-04 17:02:15 +11:00
David Bomba
c995ac5f44 Add API Documentation to repo 2020-11-04 12:27:07 +11:00
David Bomba
5089f2183b
Merge pull request #4263 from turbo124/v5-develop 
Fix for removing company logo from storage
 2020-11-04 10:57:22 +11:00
Clément Gayot
92b4df729b
Support PDF design with UTF-8 characters 2020-11-03 16:18:07 +01:00
David Bomba
13a00fc897 Redundant code cleanup 2020-11-04 00:27:41 +11:00
David Bomba
14fd4a5af4 Event Tests 2020-11-03 23:35:05 +11:00
David Bomba
ae44b9c032 Version bump + linking tasks expenses with invoices 2020-11-01 18:53:43 +11:00
=
6479b2fd3e Fix for laravel 8 route file regression + psalm cleanup 2020-11-01 16:09:09 +11:00
=
dfb55dbd8b remove is_migrating 2020-11-01 14:19:03 +11:00
David Bomba
e891238db0 Set next_send_date to null when balance == 0 2020-10-29 13:55:26 +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
946b1d6396
Merge pull request #4219 from Striffly/fix/company-logo 
Fix logo upload, keep png alpha
 2020-10-28 10:43:27 +11:00
David Bomba
0a02323792 Quote email engine 2020-10-28 10:02:32 +11:00
Clément Gayot
ed3ba8020a 🐛 Remove blank lines from pdf content when designated pdf variables are empty 2020-10-27 23:51:39 +01:00
David Bomba
f6435ab030 Working on emails 2020-10-27 22:57:12 +11:00
David Bomba
4561ed41f2 Minor fixes for email template 2020-10-27 08:54:59 +11: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
651a1a6cbe Add credit gateway type id 2020-10-26 13:06:24 +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
c8e2d94b3f Fixes for tests + remove swoole 2020-10-22 21:14:14 +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
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
90494547c5 Fix for whitelabel getter 2020-10-20 13:23:48 +11:00
Clément Gayot
675e211e33
Support PDF variables with UTF-8 characters 2020-10-17 02:24:02 +02:00
David Bomba
2f948b603b Using Credits for payment 2020-10-15 20:41:59 +11:00
David Bomba
27f678bd8c working on credit payments 2020-10-15 15:07:42 +11:00
David Bomba
0d17b299a0 Refactor payments for credits 2020-10-15 11:37:16 +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
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
57faf6eeb5 Use credits for payments in client portal 2020-10-13 14:25:51 +11:00
David Bomba
d89b4fcbc3 Refactor for gateway fee calculations 2020-10-12 22:25:27 +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
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
Benjamin Beganović
b8b2ae527c Support for HTML in line items 2020-10-09 15:05:57 +02:00
David Bomba
cf7ee6338e Working on templates 2020-10-09 12:59:59 +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
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
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
4a4c61f1cf recurring 2020-10-06 15:11:48 +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
d3fdb57233 Working on recurring migration 2020-10-05 08:55:52 +11: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ć
f6263fd59e Disable unused methods from RefundPayment 2020-09-24 12:21:17 +02: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
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
624f8db661 Improve payments page for client portal and fix invoice status after payment made 2020-09-19 20:33:59 +10:00
=
88eb05786e Fixes for updateinvoicepayment 2020-09-19 11:20:14 +10:00
David Bomba
083e834400
Merge pull request #4082 from turbo124/v2 
Working on recurring invoices
 2020-09-18 17:05:05 +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
Benjamin Beganović
0f791fdb7f page-break-inside avoid on footer elements 2020-09-16 12:18:34 +02:00
David Bomba
aeeb099d40 Fixes for mailers 2020-09-14 15:14:37 +10:00
Benjamin Beganović
3ac3f6006c footer logic for custom props 2020-09-11 16:46:49 +02:00
Benjamin Beganović
6673d58b3a Show fees on bottom of PDFs 2020-09-11 10:07:59 +02:00
David Bomba
2f7e01c5a4 Fixes for paid invoices via gateways 2020-09-11 10:10:53 +10:00
David Bomba
c55f660f7f Generic handling page for unsuccessful payments 2020-09-11 08:30:12 +10: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
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
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
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
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
David Bomba
659af63b5c
Add Quotes to RandomDataSeeder (#3714) 
* Skip preview tests

* Fixes for product test

* Fixes for tests

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Fixes for incorrect payment types

* Refactor class nameS

* Entity Notification refactor

* Entity Notifications

* Add Quotes to randomdataseederr
 2020-05-19 08:22:18 +10:00
David Bomba
d9d2e21f93
Subscriptions (#3682) 
* Working on subscriptions

* Implement return type in models

* Subscription implementation

* Improvements to handling importation of large accountS

* Loggin imports

* Activate collector

* Improve memory usage of import script

* Quote actions

* Send Quotes

* Fixes for seg faults!

* Minor fixes

* Fixes for client contact scopes
 2020-05-09 08:35:49 +10:00
David Bomba
c503d58505
Adjust email quotas - Hosted plan. (#3663) 
* Fixes for invitations not being created in RandomDataSeeder

* Resend failed/quota exceeded emails

* Queue email tests

* Refund a client for a ninja account

* Adjust email quotas - hosted plan
 2020-04-30 21:45:47 +10:00
David Bomba
e5a230e0c7
Performance improvements (#3634) 
* Adjustments for tests

* Implement handling of temp downloading resources

* Refactor paths

* Refactors for file paths

* Refactor paths

* Add in S3 adapter

* Refactor company Documment URL

* Refactor for entity pdf performance

* Refactors for invoice generation

* Enhancements for emails invoices

* Emails

* Fixes for client portal queries
 2020-04-16 18:41:25 +10:00
David Bomba
74a6c4f2ee
Reminders (#3630) 
* Performance improvements moving from str_replace to strtr

* Remove legacy docs

* Clean up credit transformer

* Working on invoice emails

* Clean up for invoice designs

* Tests for light and dark theme emails

* Working on reminder scheduling

* Reminder Job Class

* Fixes for github actions

* PHP CS

* Test for reminders

* Test for reminders
 2020-04-15 10:30:52 +10:00
David Bomba
ba55cc32e1
v5.0.4 (#3620) 
* Version bump

* Refactors for refunds / credits

* Working on Company Ledger

* Company Ledger OpenAPI Documentation

* Version Bump

* Fixes for internal composer update
 2020-04-11 21:19:05 +10:00
David Bomba
2103758d36
Invoice Activities (#3608) 
* Version bump

* reverse and cancelled activities

* Invoice reversal/cancellation activities
 2020-04-09 09:35:40 +10:00
David Bomba
213df6451f
Invoice Cancellation (#3605) 
* Ensure release build sets correct file and directory permissions

* Invoice Cancellation

* Invoice Cancellations
 2020-04-08 23:31:22 +10:00
David Bomba
7d41759468
Version bump, fixes for queue:work on setup. (#3603) 
* Fixes for scheduler and queues

* Version Bump
 2020-04-08 20:55:28 +10:00
David Bomba
2fd3229efd
Implementation of Invoice Reversal (#3602) 
* Version bump 0.0.2

* code cleanup

* Working on reversing an invoice

* Working on reversing an invoice

* Working on refunding invoice

* Reversing invoices

* Test for invoice reversals

* Invoice Reversal
 2020-04-08 20:48:31 +10:00
David Bomba
8cffccb3bc
Fixes for composer 2 (#3593) 
* Add privacy link to setup page

* Italics

* Tests for invoice actions

* Fixes for autoloading
 2020-04-06 22:32:27 +10:00
David Bomba
6d7b7ca9a3
Invoice Deletion - Ledger (#3590) 
* Fixes when implementing

* php_cs

* Clean up

* Clean up

* Working on adjusting ledger when an invoice is deleted
 2020-04-04 21:32:42 +11:00
David Bomba
43e57d0117
Fixes for self-update (#3514) 
* minor fix for payment notifications

* styleci

* Limit Self updating to self hosters only
:

* Fixes for designs

* Minor fixes for self-update
 2020-03-21 16:37:30 +11:00
David Bomba
70a560c474
Fixes for invoice status with partial payment (#3472) 
* Fixes for UserPolicy

* Improve notifications

* Company quantities

* Fixes for invoice status with partial payments
 2020-03-11 09:20:09 +11:00
David Bomba
aad117a67d
Fix casts for permissions (#3467) 
* Fix cast for permissions

* Notification Types

* Working on notification logic
 2020-03-10 23:54:20 +11:00
David Bomba
37f295d49e
Improve notification performance (#3452) 
* Improve notification performance

* Cascade deletes

* Fixes for company deletes

* Fixes for formatting

* todos for company

* Set currency id on payment

* Minor fixes for payment controller
 2020-03-08 16:59:06 +11:00
David Bomba
a8c15ef1c9
Version checking (#3451) 
* Ensure NINJA_ENVIRONMENT variable is present  in .env file

* Implement version checking in app

* Remove password protection from check version route
 2020-03-08 09:15:11 +11:00
David Bomba
5a7986c23b
Bug Fixes (#3450) 
* Convert quote to invoice workflow

* minor fixes

* checks for createaccount

* Bug Fixes

* Bug fixes
 2020-03-07 23:46:45 +11:00
David Bomba
7c00c68bf3
Create route for invoice/credit/quote PDF download (#3441) 2020-03-07 00:41:15 +11:00
David Bomba
b157ee3917
Fixes for Credit PDF generation (#3417) 
* Fix for design GET route

* Fixes for Credit PDF creation
 2020-03-04 10:51:50 +11:00
David Bomba
2085fa38dc
Missing files (#3412) 2020-03-03 20:51:05 +11:00
David Bomba
1393179160
Multiple fixes and features (#3411) 
* Performance improvements for seeding

* Differentiating between system notification and user notifications

* Remove hard coded webhook url

* Working on system and user notifications

* notifications

* Set the currency on client if blank

* Refactor for inserting invoice defaults

* Refactor Default Invoice/Quote/Credit objects

* working on credits

* Implement mark_sent for quotes and credits
 2020-03-03 20:44:26 +11:00
David Bomba
9ac66661ba
Fixes for tests (#3389) 
* Fixes for tests

* payment
 2020-02-27 17:29:40 +11:00
Benjamin Beganović
200b26d809
Refactor save() method to apply DRY for invoices, Quotes & Credits (#3387) 
* Refactor save() method to apply DRY

* Update BaseRepository.php
 2020-02-27 08:21:12 +11:00
David Bomba
b2f4e51b55
V2 (#3385) 
* Fixes for payment number

* Fixes for tests
 2020-02-26 21:46:35 +11:00
David Bomba
0b2435af2a
Fixes for payment numbers (#3384) 2020-02-26 21:06:08 +11:00
David Bomba
f20b0f7720
Fixes for company tokens. (#3375) 
* Testing Company Ledger

* Fixes for company ledger

* Fixes for company ledger

* Company ledger testS

* Fixes for user / client / contacts transformers

* Fixes for tests

* Fixes for tokens
 2020-02-26 14:26:07 +11:00
David Bomba
1ac2a73b2a
Update CORS fields (#3371) 
* Working on invoice invitations

* Credit invitations

* Update CORS
 2020-02-25 19:33:53 +11:00
David Bomba
3d31f810c0
Set Invitations as a default include for invoices (#3362) 
* Working on importing company gateways

* Fix for companyuser settings object

* Migrate client_gateway_tokens

* Working on Notificaitons

* Working on notifications

* Failsafe for user-company

* unlink files

* Set DB for jobs

* Always have a fallback for company_id

* Fixes for user model

* Formatting for MultiDB

* Working on Company Ledger Tests

* Fixes for contact request

* Set Invitations as a default include for invoices
 2020-02-24 21:15:30 +11:00
David Bomba
c1d3fd12a8
Import (#3360) 
* Fixes for test data

* Fixes for tests

* Remove legacy vue components

* Add routing number to client gateway tokens

* working on important documents and company gateways

* Import fixes
 2020-02-22 13:25:49 +11:00
David Bomba
4eebaf7eb4
Migrate to services (#3358) 
* Working on ledger

* Migrate to services

* Refactor to services

* Migrate to services

* Jobs cleanup
 2020-02-21 08:05:01 +11:00
David Bomba
9e9cd37b87
Modifications to Designs (#3353) 
* Working on Quotes

* Naming refactor for Quotes

* Quote Actions

* Quote Pdfs

* Quote PDFs

* Refunds in Stripe

* Fixes tests

* Company Ledger work
 2020-02-20 07:44:12 +11:00
David Bomba
4a41685e94
Fix Credit Service Methods (#3350) 2020-02-19 07:56:21 +11:00
David Bomba
0690d615dd
Fixes for Send Email (#3347) 
* fixes for travis

* Fixes for OpenAPI docs

* Fixes for send -> send_email
 2020-02-18 08:08:27 +11:00
David Bomba
69cc88e33f
Improve error handling (#3344) 
* Fixes for travis

* Minor Fixes

* Improve Error Handling
 2020-02-18 06:07:31 +11:00
David Bomba
f57339f185
Fixes and Refactors for Invoice Emails. (#3339) 
* Working on emailing invoices

* Working on emailing and displaying email

* Working on emailing and displaying email

* Email invoices

* Fixes for html emails

* Ensure valid client prior to store

* Ensure client exists when storing an entity

* Update variable name send -> send_email for client_contacts

* Mailable download files

* Extend timeouts of password protected routes when a protected route is hit

* Add default portal design to company settings

* Minor fixes

* Fixes for Tests

* Fixes for invoicing emails

* Refactors for InvoiceEmail

* Implement abstractservice

* Refactors for services

* Refactors for emails

* Fixes for Invoice Emails
 2020-02-17 20:37:44 +11:00
David Bomba
1e35c90ee6
Fixes for Tests, MultiDB (#3334) 
* refactor send_invoice to generic -> send

* Code cleanup

* Fixes for tests and multidb
 2020-02-15 23:27:24 +11:00
michael-hampton
bd8a6b462a
Update CreateInvitations.php (#3331) 2020-02-15 22:51:29 +11:00
David Bomba
1e0111d519
Minor refactors for emails (#3333) 2020-02-15 22:49:31 +11:00
David Bomba
a79c7bf60d
Code Cleanup 
* Working on emailing invoices

* Working on emailing and displaying email

* Working on emailing and displaying email

* Email invoices

* Fixes for html emails

* Ensure valid client prior to store

* Ensure client exists when storing an entity

* refactor for emails

* Design Transformer

* Include designs in first_load response

* Code cleanup
 2020-02-15 20:06:30 +11:00
michael-hampton
f7650d0692
Ft email (#3326) 
* Emails

* change to user service

* refactor emails

* refactor emails

* refactor emails

* refactor emails

* emails

* emails

* emails

* emails

* emails

* emails

* emails

* emails

* emails

* emails

* Update EmailPayment.php

* Update SendEmail.php

* Update SendEmail.php

* Update SendEmail.php

* Update and rename BuildEmail.php to EmailBuilder.php

* Create InvoiceEmail

* Create QuoteEmail.php

* Rename InvoiceEmail to InvoiceEmail.php

* Create PaymentEmail.php

* Update SendEmail.php

* Update SendEmail.php

* Update SendEmail.php

* Update SendEmail.php

* Update InvoiceEmail.php

* Update EmailInvoice.php

* Update SendEmail.php

* Update TemplateEmail.php

* Update EmailBuilder.php

* Update InvoiceEmail.php

* Update QuoteEmail.php

* Update PaymentEmail.php

* Update InvoiceEmail.php

* Update QuoteEmail.php

* Update QuoteInvitation.php

* Update EmailQuote.php

* Update SendEmail.php

* Update SendEmail.php

* Update PaymentService.php

* Update PaymentEmail.php

* Update PaymentEmail.php

* Update PaymentEmail.php

* Update EmailBuilder.php

* Update PaymentEmail.php

* Update EmailPayment.php

* Update SendEmail.php

* Update InvoiceService.php

* Update SendEmail.php

* Update PaymentService.php

* Update SendEmail.php

* Update QuoteService.php

* Update EmailPayment.php

Co-authored-by: David Bomba <turbo124@gmail.com>
 2020-02-15 20:01:15 +11:00
Benjamin Beganović
7dd6f814ac
Change 'Quote' & 'Invoice' service implementation (#3327) 
* Change '__invoke' to 'run' for Invoice services

*  Change '__invoke' to 'run' for Quote services
 2020-02-14 14:32:22 +11:00
David Bomba
4a3d37a42b
Flutter Client ! (#3325) 
* Working on emailing invoices

* Working on emailing and displaying email

* Working on emailing and displaying email

* Email invoices

* Fixes for html emails

* Restart queue after self-update

* Email Invoices

* Push Flutter Web Clientgit statusgit status!
 2020-02-13 22:27:42 +11:00
David Bomba
162580bcd3
Fixes for ClientContact CRUD (#3317) 
* Fixes for downloading invoice PDF

* Fixes for client contact CRUD
 2020-02-12 20:18:56 +11:00
David Bomba
be3ade65f1
Download Invoice by Invitation (#3312) 
* style cs

* Style CS

* Throw Record not found exception if invalid primary key hash is provided

* Improve error handling

* Create abstract implementation for designs

* working on custom designs

* Add Design Model

* invoice services

* Download Invoice by Invitation
 2020-02-12 11:41:17 +11:00
michael-hampton
dee99b1a62
Ft quote services (#3310) 
* Quote service

* convert quote

* Update Quote.php

* Update Quote.php

* Update MarkApproved.php
 2020-02-12 07:57:25 +11:00
David Bomba
3ec996ee5d
Invoice Designer (#3283) 
* Working self-updater package

* Fixes for travis

* Working on invoice designs

* Working on invoice builder

* Tests for invoice design

* Working on invoice designs

* Minor fixes

* Minor fixes for randomdataseeder
 2020-02-05 15:06:03 +11:00
michael-hampton
c2524f55da
Update MarkPaid.php (#3282) 2020-02-05 09:47:54 +11:00
David Bomba
cda534e996
Explicitly call the service() method, rather than obfuscate. (#3281) 
* Include fix as describe by @michael-hampton here #3280

* Refactor createinvitations away from jobs

* Clean up

* Fixes for service() refactoring

* Fixes for services refactor
 2020-02-04 18:51:44 +11:00
David Bomba
c25de936ed
Refactor - moving away from jobs. (#3279) 
* Implement Services

* implement service pattern

* Service patterns

* Refactoring invoice paid

* refactoring invoice

* Refactor jobs

* Refactor - remove jobs

* Refactor jobs

* Refactoring jobs

* Refactoring away from jobs

* Refactoring jobs

* Add Credits to test data
 2020-02-03 21:33:07 +11:00