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

468 Commits

Author SHA1 Message Date
David Bomba
9e3b28f6ac
Merge pull request #4668 from turbo124/v5-develop
Fixes for recurring invoice cron query
2021-01-12 08:20:52 +11:00
Benjamin Beganović
50203f56a1 - Fix issue with & not appending correctly
- Bump snappdf
2021-01-11 13:34:54 +01:00
David Bomba
6098700823 Fix partially refunded status 2021-01-11 21:51:54 +11:00
David Bomba
ceb8637310 fix for type 2021-01-07 17:24:02 +11:00
David Bomba
3d9755b906
Merge pull request #4624 from beganovich/v5-refactor-calcGatewayFee
(v5) Refactor calcGatewayFee
2021-01-07 07:29:10 +11:00
Benjamin Beganović
132f9da3ff Pass GatewayType from gateway_type_id on token 2021-01-06 13:06:18 +01:00
David Bomba
47f42b804d Fixes for partial credit payments" 2021-01-06 16:54:04 +11:00
David Bomba
3ee3f67c8c Fixes for over payments 2021-01-06 16:14:20 +11:00
Benjamin Beganović
4ca96b4136 Toggle this hiding behaviour based on settings 2021-01-05 17:55:57 +01:00
Benjamin Beganović
ae534b146b Inject Javascript that'll filter for hidden columns 2021-01-05 17:48:06 +01:00
Benjamin Beganović
329c72128c Set all elements to be hidden by default 2021-01-05 17:47:50 +01:00
Benjamin Beganović
4b6257da3b Remove task hours calculation from the invocie 2021-01-04 14:38:56 +01:00
Benjamin Beganović
5833df9850 Refactor calcGatewayFee:
- Remove default GatewayType::CREDIT_CARD
- Swapped spaces for taxes & gateway type
2021-01-04 14:07:50 +01:00
David Bomba
934610a01c Update copyright + version bump + set canadian dollar symbol to $ 2021-01-04 08:54:54 +11:00
Benjamin Beganović
3d5730d653 pass inclusive taxes 2020-12-31 11:55:09 +01:00
Benjamin Beganović
03cdb516c7 fix issue with gateway type id not being passed 2020-12-31 11:29:40 +01:00
Benjamin Beganović
b43b52519f Show $product.quantity & product.discount based on settings 2020-12-25 13:45:37 +01:00
Benjamin Beganović
972099d89f fix product key 2020-12-23 15:51:29 +01:00
Benjamin Beganović
16edac3738 add support for multiline text 2020-12-23 13:49:25 +01:00
Benjamin Beganović
8fd560dcce process custom columns 2020-12-22 13:56:09 +01:00
Benjamin Beganović
5a8dfd85eb Apply php-cs-fixer 2020-12-21 11:46:46 +01:00
David Bomba
f45588d26e
Merge pull request #4522 from turbo124/v5-develop
Handle invoice numbers on restore
2020-12-18 07:12:17 +11:00
David Bomba
adab53ed97 Handle restoring a deleted invoice 2020-12-18 07:11:31 +11:00
Benjamin Beganović
220c7f080a Provide action selectors to match PDF elements:
- Add ext-libxml to composer.json
- Support outputting the PDF in CreateEntityPdf.php & GenerateDeliveryNote.php
- Add reference names to Design.php
2020-12-17 15:44:01 +01:00
Benjamin Beganović
eadcff544f Support for multiline entity public notes. 2020-12-17 14:03:07 +01:00
David Bomba
6f451b8924 Remove redundant info() Change document download route 2020-12-13 20:46:29 +11:00
David Bomba
d440d4421d Fix for doubling client balance erroneously on emailing" 2020-12-13 11:04:56 +11:00
Benjamin Beganović
0f62c6c2f2 remove info() 2020-12-08 16:15:36 +01:00
Benjamin Beganović
53525dc93f rename task.service to task.product key 2020-12-08 16:10:29 +01:00
Benjamin Beganović
bdedec19db remove balance due & total from delivery note pdf 2020-12-08 13:19:38 +01:00
Benjamin Beganović
1f2c3f2823 update pagination links & apply php-cs-fixer 2020-12-05 14:24:21 +01:00
David Bomba
d8efdc6817 Tests for deleting and restoring an invoice 2020-12-05 09:10:32 +11:00
David Bomba
4f0776a323 Working on tests for deleted invoice 2020-12-05 09:08:10 +11:00
David Bomba
bc621aa01a fixes for directories 2020-12-04 08:24:34 +11:00
David Bomba
34463eac64
Merge branch 'v5-develop' into v5-develop 2020-12-04 07:41:36 +11:00
Benjamin Beganović
4959917b7e fix issue with multiple companies switching 2020-12-03 15:33:18 +01:00
David Bomba
02c810633a Working on invoice delete restore refactor 2020-12-03 21:46:49 +11:00
David Bomba
fceaab9e40 Working on invoice delete restore refactor 2020-12-03 21:46:36 +11:00
David Bomba
f96bde6fca Refactor invoice delete/restore 2020-12-03 15:20:39 +11:00
David Bomba
73c9474912 Working on invoice delete refactor 2020-12-03 14:56:00 +11:00
David Bomba
48f2f469d3 refactor for invoice deletion 2020-12-03 14:11:24 +11:00
David Bomba
bcb21fb234 Working on invoice deletion 2020-12-02 22:01:50 +11:00
David Bomba
b63972e250 fixes for payment refunds 2020-12-02 11:56:29 +11:00
Benjamin Beganović
9198cf5175 support tasks as of same day 2020-12-01 15:52:12 +01:00
Benjamin Beganović
e5af99d884 fix issue with client date formatc 2020-12-01 15:25:48 +01:00
Benjamin Beganović
1a066f2f9f add alias to task searvice from task product 2020-12-01 15:18:48 +01:00
Benjamin Beganović
ae88d5e08e php-cs-fixer format 2020-11-25 15:19:52 +01:00
David Bomba
b5fe5070b5 Working on migrations 2020-11-23 23:55:04 +11:00
Benjamin Beganović
18312b9583 always show invoice.totals 2020-11-20 14:31:47 +01:00
Benjamin Beganović
1b70f24dbc Update logic for rendering task hours 2020-11-17 14:47:32 +01:00
Benjamin Beganović
3112efcded Support for .description 2020-11-17 14:46:22 +01:00
David Bomba
68a6ea4d22
Merge branch 'v5-develop' into v5-develop 2020-11-16 12:20:44 +11:00
Benjamin Beganović
f9b55dcd72 fix pdfmaker issues with special chars 2020-11-16 00:49:44 +01:00
David Bomba
4b240b05ca Add deleted_at column to paymentables 2020-11-16 08:23:20 +11:00
David Bomba
a1119f9bbe Fix edge cases with cloning invoice 2020-11-15 19:24:57 +11:00
David Bomba
7af791a4c4 Working on from, replyTo and bcc emails 2020-11-12 12:43:32 +11:00
David Bomba
28cbd75fcb Fixes for credit PDF 2020-11-11 11:13:39 +11:00
David Bomba
c5643bea7b
Merge pull request #4287 from turbo124/v5-develop
Fixes for reminder templates
2020-11-10 19:32:44 +11:00
David Bomba
7977b2a1e7 Remove stale classes 2020-11-10 08:04:57 +11:00
Benjamin Beganović
f02826deed Don't render delivery-not-table on products/tasks 2020-11-09 16:10:47 +01:00
Benjamin Beganović
8adab67251 - Pass $invoice to the getInvoiceDeliveryNote() in InvoiceService
- GenerateDeliveryNote action for InvoiceService
- New delivery-note-table element in the \Services\PdfMaker\Design.php
- $item & $description variables in the HtmlEngine
2020-11-09 14:30:50 +01:00
David Bomba
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