1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-14 07:02:34 +01:00
Commit Graph

1044 Commits

Author SHA1 Message Date
David Bomba
fd3993d84e Fixes for subscriptions 2021-06-04 07:43:22 +10:00
David Bomba
6e564a20db Minor fixes 2021-06-02 20:14:00 +10:00
David Bomba
fc444b7c39 Fixes for billing portal 2021-06-02 18:55:33 +10:00
Benjamin Beganović
bd97b916e4
Merge branch 'v5-develop' into v5-2805-tracking-campaign-source 2021-06-01 13:38:36 +02:00
Benjamin Beganović
64830df3da
Merge pull request #5863 from beganovich/v5-3105-pdf-markdown-support
(v5) Markdown support on PDFs
2021-06-01 13:37:47 +02:00
David Bomba
cd594914b7 fixes for password reset screen 2021-06-01 09:02:30 +10:00
David Bomba
c3946f44b0 Fixes for custom payment method name 2021-06-01 08:09:38 +10:00
Benjamin Beganović
d701125bf1 Markdown parsing for line items 2021-05-31 14:08:24 +02:00
Benjamin Beganović
c9334daa3f Note for settings-controlled parsing of markdown 2021-05-31 13:47:22 +02:00
Benjamin Beganović
c7739e64ec Update logic for checking if webhook configuration is present 2021-05-29 13:16:22 +02:00
David Bomba
1f4493f191 Bug fixes 2021-05-28 11:02:43 +10:00
David Bomba
e76567f337 Fixes for creating an account using OAuth 2021-05-26 16:14:47 +10:00
David Bomba
fb17dd7e0b Force stripe amount to int 2021-05-26 16:04:38 +10:00
David Bomba
7618666c4b Fixes for tests 2021-05-26 12:37:16 +10:00
David Bomba
ba672f6fdd Fixes for test 2021-05-26 11:32:01 +10:00
David Bomba
e254a9ad73 Refactor reminders 2021-05-26 10:35:39 +10:00
David Bomba
4e8ed1e32d Force deletes from local storage also 2021-05-24 20:58:37 +10:00
David Bomba
9652c55834 Enable previewing Recurring invoice pdfs 2021-05-22 13:09:28 +10:00
David Bomba
8970f6415b Fixes for reminder scheduling 2021-05-21 23:29:59 +10:00
David Bomba
4183c1a2ae
Merge pull request #5769 from turbo124/v5-develop
v5.1.63
2021-05-21 18:01:14 +10:00
David Bomba
0b7891e24f Fixes for restore invoice numbering 2021-05-21 07:58:46 +10:00
Benjamin Beganović
9d7089b5b5 Change shared elements with delivery_note table 2021-05-20 15:04:24 +02:00
David Bomba
69b496f8b4 Fixes for refresh route - firstload/mini_loader 2021-05-19 20:42:35 +10:00
David Bomba
52c3d63349 Refactor system logger to enable multidb 2021-05-19 11:12:23 +10:00
Benjamin Beganović
b15012b984 Drop the logic for the ordering items 2021-05-17 13:28:33 +02:00
David Bomba
4727d0cea7 Fixes for custom payment methods - and their fees and limits object 2021-05-16 17:07:07 +10:00
David Bomba
2079b3e4ba Fixes for custom payment methods - and their fees and limits object 2021-05-16 17:06:04 +10:00
David Bomba
b0d1b7e1a1 Fixes for delivering PDFs over the wire 2021-05-16 16:26:55 +10:00
David Bomba
8f996d9a93 Fixes for gateway fees less that 2021-05-16 08:18:43 +10:00
David Bomba
b97e72d587 Fixes for quotes and credit paths 2021-05-15 12:31:17 +10:00
David Bomba
c52311bcde Fixes for PDF file paths 2021-05-15 12:19:36 +10:00
David Bomba
7756ca7436 Don't store PDFs 2021-05-14 21:15:11 +10:00
David Bomba
1bfa0f709e Fixes for typo 2021-05-14 19:50:33 +10:00
David Bomba
de8fb374ab Fixes for S3 storage and delivery notes 2021-05-14 19:43:06 +10:00
David Bomba
8c4fecaa2c enforce object over array 2021-05-11 21:47:19 +10:00
David Bomba
87ddad6670 Working on PDF generator flags 2021-05-09 21:30:31 +10:00
David Bomba
85c05f7c30 Fixes for VarEvents 2021-05-07 07:12:07 +10:00
David Bomba
5510993d13 Fixes for gateway fees 2021-05-03 21:51:00 +10:00
David Bomba
aba280d9ab Fixes for recurring 2021-04-30 09:01:56 +10:00
Benjamin Beganović
52f75e5fc6 Fix Javascript loading with repeating headers & footers 2021-04-25 15:52:00 +02:00
Benjamin Beganović
f0255d4ed9 Show $entity.public_notes in the totalsTable & remove $entity_footer 2021-04-25 15:20:23 +02:00
David Bomba
f62518f63b Stripe Connect 2021-04-22 20:38:22 +10:00
David Bomba
7cef74350d Fix for accounting error when deleting a refunded payment 2021-04-22 09:35:31 +10:00
David Bomba
82892a6349 Fixes for stateless events 2021-04-21 07:26:04 +10:00
David Bomba
e6c083cf29 Stripe Connect 2021-04-20 21:30:52 +10:00
Benjamin Beganović
873fe6ce07
Merge branch 'v5-develop' into v5-1304-emails 2021-04-19 16:59:23 +02:00
Benjamin Beganović
88acfbfecb Show public notes outside of totals table 2021-04-19 13:51:00 +02:00
=
9b77789c8a v5.1.47 2021-04-18 21:16:32 +10:00
David Bomba
cba4a361ce Integrate credit payments into Subscriptions 2021-04-16 14:47:11 +10:00
David Bomba
464d810a70 Clean up for subscriptions 2021-04-16 13:58:14 +10:00
David Bomba
c04afa5127 Code cleanup and documentation of subscriptions 2021-04-16 12:11:04 +10:00
David Bomba
a994e6f916 Clean up subscription service 2021-04-16 08:58:57 +10:00
David Bomba
84ea66493c Clean up Subscription service class 2021-04-16 08:32:38 +10:00
David Bomba
cac8056832 Refund subscriptions 2021-04-15 15:46:50 +10:00
David Bomba
0b1569d6d9 refund subscriptions in cancellation window 2021-04-15 15:36:50 +10:00
David Bomba
7c8bf53951 updgrade and downgrade 2021-04-15 13:40:03 +10:00
David Bomba
bb6a1c6b27 Working on downgrading subscriptions 2021-04-15 12:28:31 +10:00
David Bomba
bc56112d10 Subscriptions upgrade and downgrade 2021-04-15 11:03:12 +10:00
=
4cd83ba27a Working on subscriptions 2021-04-14 21:26:45 +10:00
=
d0cb09d094 Minor fixes for task controller 2021-04-14 19:55:43 +10:00
David Bomba
aabe5683e1 Refactoring subscriptions 2021-04-14 14:41:04 +10:00
David Bomba
2237939491 Subscriptions 2021-04-14 12:40:16 +10:00
David Bomba
5c1eb7f7eb Update texts 2021-04-14 07:40:07 +10:00
Benjamin Beganović
dba330bcb3 wip 2021-04-13 16:43:35 +02:00
David Bomba
a386a33a7e
Merge branch 'v5-develop' into v5-develop 2021-04-13 19:35:44 +10:00
David Bomba
f2342e640a Subscriptions 2021-04-13 19:34:59 +10:00
David Bomba
7e3a9205b9 Add event listeners for Subscriptions + fix user actioning the event() 2021-04-13 09:52:17 +10:00
David Bomba
bde5166827 Subscriptions 2021-04-12 21:56:08 +10:00
Benjamin Beganović
c319dedf75
Merge pull request #5395 from beganovich/v5-0904-decode-html-on-frontend
(v5) Switch decoding HTML from backend to Javascript
2021-04-12 11:40:20 +01:00
David Bomba
477aa691a9 Add custom exceptions 2021-04-12 14:36:51 +10:00
David Bomba
f5092e8cf4 Fixes for custom email templates 2021-04-11 13:46:40 +10:00
David Bomba
d91e8c438e Working on Pro Rata Refunds 2021-04-10 14:53:16 +10:00
David Bomba
62401555cd Working on pro rata refunds 2021-04-10 14:07:08 +10:00
Benjamin Beganović
d44691c613 wip 2021-04-09 13:11:28 +02:00
Benjamin Beganović
7799b34346 wip 2021-04-09 13:06:14 +02:00
=
e7707a919b Delete invoice when payments are applied 2021-04-09 19:51:17 +10:00
Benjamin Beganović
c0f5780172 wip 2021-04-08 17:11:14 +02:00
Benjamin Beganović
ec1d4e05c1 - Rename: $target_subscription to $target and all references
- Ability to pay for the upgrade
2021-04-08 16:53:54 +02:00
David Bomba
d9d042724e Add daily reset 2021-04-08 20:38:31 +10:00
David Bomba
8f91969c49 bug fixes for subscriptions 2021-04-08 12:43:31 +10:00
Benjamin Beganović
71d28e691b wip 2021-04-07 14:23:14 +02:00
Benjamin Beganović
43e6ba2ec6 Check if payment is eligible to process 2021-04-07 13:26:50 +02:00
David Bomba
c1b6e2043e Fixes for subscriptions 2021-04-07 21:05:09 +10:00
David Bomba
3a3ddc031c Working on subscriptions 2021-04-07 18:06:50 +10:00
David Bomba
73e7aadaad Working on pro plan; 2021-04-07 08:56:36 +10:00
David Bomba
048405decc check object prior to testing properties 2021-04-06 22:38:59 +10:00
David Bomba
161f20fae7 Fixes for paths to s3 type storage 2021-04-06 22:36:50 +10:00
David Bomba
69f6179e6a 5.1.36 2021-04-06 20:38:56 +10:00
David Bomba
fcac89a92c Subscription service 2021-04-06 17:55:18 +10:00
David Bomba
06c5cf0519 add response to system logger for subscription API calls 2021-04-06 17:14:30 +10:00
David Bomba
6b9001684e Fixes for tests 2021-04-06 17:11:58 +10:00
David Bomba
fe7b3c79e7 Working on subscriptions 2021-04-06 16:07:35 +10:00
David Bomba
b1e6325ef8 Fixes for tests 2021-04-06 08:19:27 +10:00
David Bomba
d293c28a55
Merge pull request #5339 from turbo124/v5-develop
Subscriptions
2021-04-05 22:59:27 +10:00
David Bomba
660dca561b subscriptions 2021-04-05 22:37:25 +10:00
Benjamin Beganović
2cd3ceed2e Allow expenses to be part of products table 2021-04-05 14:21:49 +02:00
Benjamin Beganović
5ac1ae16ff Fixes #5314 (https://github.com/invoiceninja/invoiceninja/issues/5314) 2021-04-05 13:22:21 +02:00
Benjamin Beganović
c1a92bfb52 Fixes #5312 (https://github.com/invoiceninja/invoiceninja/issues/5312) 2021-04-05 11:04:33 +02:00
David Bomba
8d4fa8cb42 Working on subs 2021-04-05 12:42:49 +10:00
David Bomba
fcaabace7f Subscriptions 2021-04-05 09:21:54 +10:00
David Bomba
51c7a16423 Subscriptions 2021-04-05 09:08:16 +10:00
David Bomba
c814a754c3 Subscriptions 2021-04-05 08:37:01 +10:00
=
bf71acfe2d Fixes for tests 2021-04-04 22:47:59 +10:00
=
858c99e09d Working on subscriptions 2021-04-04 22:14:33 +10:00
David Bomba
f1f8201683 fixes for delivery note generation 2021-04-02 22:44:44 +11:00
Benjamin Beganović
e67b5acbe9
Merge pull request #5313 from beganovich/v5-0104-tax-column-hiding-fix
(v5) Alias the $task.rate to $task.cost for column support
2021-04-01 16:44:05 +02:00
Benjamin Beganović
6af6668ba6 remove price() from subscriptionservice 2021-04-01 16:10:26 +02:00
Benjamin Beganović
ecbe6494c6 Alias the $task.rate to $task.cost for column support 2021-04-01 15:00:09 +02:00
David Bomba
3a770361aa Set valid until when a quote is marked as sent 2021-04-01 19:07:32 +11:00
David Bomba
61489ca7d3 fixes for service methods 2021-04-01 13:24:05 +11:00
David Bomba
be648230de Working on subscriptions 2021-04-01 12:58:12 +11:00
David Bomba
6cbfe6b1bf rename method for subcsriptions 2021-03-31 11:14:19 +11:00
David Bomba
f5c6847a36 Minor fixes for subscription types 2021-03-30 20:41:58 +11:00
David Bomba
f1ece9ab6b Subscriptions 2021-03-29 21:43:42 +11:00
David Bomba
3183186d4d Working on subscriptions 2021-03-29 21:19:30 +11:00
David Bomba
db7df69db7 Recurring services - trial phase' 2021-03-29 14:49:29 +11:00
David Bomba
d7bf927549 Set exchange rates on invoices 2021-03-29 13:14:55 +11:00
David Bomba
6489d73ad6 Fixes for subscriptions 2021-03-28 09:15:12 +11:00
David Bomba
2e139a633b Validation rules for subscriptions 2021-03-28 08:45:46 +11:00
=
9fd40f55c6 Exchange rates 2021-03-27 14:51:34 +11:00
=
3479c127fd Fixes for subscription refactor 2021-03-27 14:22:19 +11:00
=
83c636aa55 update todos 2021-03-27 09:05:37 +11:00
=
46a525f04d Create invoice for subscription 2021-03-27 08:55:04 +11:00
David Bomba
750da31021 Transform id's correctly 2021-03-26 20:38:51 +11:00
David Bomba
b3863581ae Stubs for products / recurring products and subscription price 2021-03-26 20:20:37 +11:00
David Bomba
98e314b6c0 Fixes for calculating the correct gateway fee depending on the payment method 2021-03-26 19:18:25 +11:00
David Bomba
abd3a89bc9
Subscriptions (#5248)
* Fixes for converting quote to invoice

* Fixes for naming PDFs

* Refresh entity prior to sending

* Fixes for subscriptions

* Add in required use

* Fixes for notifications

* Fixes for notifications

* Add with trasheD

* Rename BillingSubscriptions to Subscriptions

* Refactoring subscriptions
2021-03-25 21:55:59 +11:00
David Bomba
cb7f27462b
Client subscriptions + bug fixes (#5238)
* Fixes for converting quote to invoice

* Fixes for naming PDFs

* Refresh entity prior to sending

* Fixes for subscriptions

* Add in required use

* Fixes for notifications

* Fixes for notifications
2021-03-24 20:14:30 +11:00
=
ae9e927039 Working on client subs 2021-03-23 23:35:48 +11:00
=
3d375e4148 Workig on client subscriptions 2021-03-23 23:17:28 +11:00
David Bomba
3b72fa343f complete purchase - billing subscription 2021-03-23 14:26:21 +11:00
David Bomba
3ebe533fc8 include Account clas 2021-03-23 07:09:42 +11:00
=
932185e6c2 Working on client subscriptions 2021-03-21 20:26:30 +11:00
David Bomba
c7d7916b04 Update defaults 2021-03-21 16:35:09 +11:00
=
2eb7de95ad Add invoie_id to client subs 2021-03-20 14:39:30 +11:00
David Bomba
6be79ad022 Billing Subs 2021-03-20 13:57:03 +11:00
David Bomba
ba91c96c40 update texts 2021-03-20 13:49:45 +11:00
Benjamin Beganović
c75e4e678f Set min-width for designs when using repeating headers/footers 2021-03-18 12:12:44 +01:00
David Bomba
ea1156cc81
Merge pull request #5172 from turbo124/v5-develop
Small fix for new PDF generator
2021-03-18 20:58:36 +11:00
David Bomba
ac6feb706e Small fix for new PDF generator 2021-03-18 20:57:55 +11:00
Benjamin Beganović
d706d226e8 Disable automatic custom column processing on the PDF 2021-03-18 09:32:11 +01:00
David Bomba
086189a1ea Hosted PDFs by invoice ninja 2021-03-18 11:53:08 +11:00
David Bomba
7fbe4ceb5d
Merge pull request #5162 from turbo124/v5-develop
Remove illegal characters from pdf file names
2021-03-18 08:19:56 +11:00
Benjamin Beganović
127c6cb3cd wip 2021-03-17 16:12:25 +01:00
David Bomba
f52fb31ced Remove illegal characters from pdf file names 2021-03-17 22:29:20 +11:00
Benjamin Beganović
81f5808bf6 - Use user from $billing_subscription to create client
- Disable generating the cache for temporary state
- Generate the blank invoice based on the product
2021-03-17 12:06:58 +01:00
David Bomba
c95e0c3d7e Tuning company settings for missing properties 2021-03-17 20:28:44 +11:00
David Bomba
1012c8df4b Working on billing subscriptions 2021-03-17 13:21:06 +11:00
David Bomba
1e72f20c3d Fix for invite resend permission 2021-03-16 07:35:19 +11:00
David Bomba
6a2332526b Biling Subscription Service 2021-03-15 08:42:05 +11:00
=
e2bc086f75 Type check on custom fields 2021-03-13 19:36:00 +11:00
David Bomba
f67652cf88
Merge pull request #5100 from beganovich/v5-1003-company-custom-fields
(v5) Support for custom company fields on the PDF
2021-03-13 15:07:08 +11:00
Benjamin Beganović
7c01b3bb64 Support for custom fields in company details section 2021-03-10 16:55:49 +01:00
David Bomba
b9c9874533 Improve PDF creation performance 2021-03-10 21:00:18 +11:00
David Bomba
9888d7acb9 Improve delete pdf performance 2021-03-10 13:28:35 +11:00
David Bomba
18e8934e70 Delete pdf in service rather than child job 2021-03-10 12:28:12 +11:00
David Bomba
7dae7cb326 Fixes for mailer 2021-03-04 19:42:22 +11:00
David Bomba
07aca3d8c0 Fixes for tests 2021-03-04 10:34:18 +11:00
David Bomba
1780db52bd Invite user route 2021-03-04 09:39:24 +11:00
Benjamin Beganović
2ab76adfad Reduce default white label logo size 2021-03-03 08:49:02 +01:00
=
b57d4bfb7c Fixes for recurring invoice number not being prefixed 2021-03-02 21:57:14 +11:00
David Bomba
d238d53b26 Delete PDF helper 2021-03-01 10:40:18 +11:00
Benjamin Beganović
da9e2e1759 Prevent word breaking from unit costs & task rates 2021-02-26 07:47:04 +01:00
Benjamin Beganović
b7a9700f90 Fix issue with entity footer items causing 500 error 2021-02-18 10:12:57 +01:00
David Bomba
704477f803 Imports 2021-02-18 14:37:17 +11:00
David Bomba
64afdc20fa Fixes for payment failure mailer 2021-02-18 10:51:56 +11:00
Benjamin Beganović
deb0cd345a
Merge pull request #4923 from beganovich/v5-1602-invoice-footer-variable-parsing
(v5) PDF: Support for dynamic variables in invoice footer, public notes & terms
2021-02-17 11:25:28 +01:00
Benjamin Beganović
001b6902f2 wip 2021-02-16 14:42:35 +01:00
David Bomba
0b8bf4fbf1 Remove invoice deletion observer 2021-02-17 00:31:00 +11:00
Benjamin Beganović
5f443116f3
Merge pull request #4909 from beganovich/v5-1502-alias-task-as-service
(v5) PDF: Alias task.product key for task.service
2021-02-15 13:17:54 +01:00
Benjamin Beganović
a593ecc48d wip 2021-02-15 13:16:47 +01:00
David Bomba
4ff96c0f58
Merge pull request #4908 from turbo124/v5-develop
Refactoring emails
2021-02-15 22:40:12 +11:00
David Bomba
7bf6d7c48a Document route for clients / company 2021-02-15 21:52:50 +11:00
Benjamin Beganović
29e4566be8 Inject signature on PDfs 2021-02-12 13:03:46 +01:00
David Bomba
ac2c7b2bbe Fixes for deleting a payment 2021-02-12 09:01:39 +11:00
David Bomba
3c23d5e31f Add updateBalance method to credit service 2021-02-12 08:16:43 +11:00
Benjamin Beganović
6607442740 wip 2021-02-10 12:31:14 +01:00
Benjamin Beganović
d8c6d40cab wip 2021-02-09 16:47:41 +01:00
David Bomba
e56a37a718 Return object not null if you have to return early!! 2021-02-08 00:03:59 +11:00
David Bomba
47eabf5434 Invoice Actions 2021-02-05 16:03:34 +11:00
David Bomba
55839d66ed Auto archive invoice - Mark Paid 2021-02-05 16:02:38 +11:00
David Bomba
0ae2c6db27 Fix for pausing recurring invoices 2021-02-02 07:14:38 +11:00
Benjamin Beganović
84f7e14d11
Merge pull request #4781 from beganovich/v5-2701-checkout-autobill
(v5) Checkout.com auto-billing
2021-01-29 12:01:54 +01:00
Benjamin Beganović
dbade2f497 wip 2021-01-29 12:00:30 +01:00
Benjamin Beganović
1727f3948e Fix issue with 2021-01-28 16:57:32 +01:00
Benjamin Beganović
874732f55d fix translation reference 2021-01-28 15:42:11 +01:00
David Bomba
756f421319 Add gateway fees for autobill 2021-01-28 08:31:31 +11:00
David Bomba
9d27480f2d Fixes for getPaymentMethods 2021-01-27 16:18:30 +11:00
David Bomba
b5ff2d8a02 Fixes for company gateway payment method resolution 2021-01-27 12:06:25 +11:00
Benjamin Beganović
c5ad3a94eb hide empty columns now pulling from settings 2021-01-26 17:41:36 +01:00
David Bomba
f950f84b61 Fix for 500 on updating quote by removing contacts 2021-01-25 21:54:36 +11:00
David Bomba
8e06644fac Track payment ID with Activity 54 2021-01-25 07:55:04 +11:00
David Bomba
3fa8158bc3 Fixes for refunds 2021-01-24 20:53:45 +11:00
David Bomba
cecee6cbfe Fixes for tests 2021-01-24 20:28:18 +11:00
David Bomba
0f8ee2d101 Tests for paid_to_date 2021-01-24 20:08:57 +11:00
David Bomba
6170dfae12 Fixes for tests 2021-01-24 20:00:45 +11:00
David Bomba
24dfbe48dc working on paid_to_date fields and calculations 2021-01-24 17:44:14 +11:00
David Bomba
c173fdcc5b Fixes for ledger 2021-01-21 15:42:30 +11:00
David Bomba
05ea7f092a Fixes for ledger adjustments 2021-01-21 15:05:05 +11:00
David Bomba
ff4f2f3953 Checks on Company Ledger sanity 2021-01-21 12:33:39 +11:00
David Bomba
db9e8ff830 Add rules preventing overpayment on invoices 2021-01-21 10:53:02 +11:00
David Bomba
e054894ffa Working on payments 2021-01-20 21:59:24 +11:00
David Bomba
5ce2a035da Fixes for approve / convert quotes 2021-01-20 08:30:04 +11:00
David Bomba
63eae6000a fixes for service methods 2021-01-19 07:04:13 +11:00
David Bomba
40f336c469 Fixes for defaults 2021-01-19 07:02:32 +11:00
David Bomba
1a4b5ed51d Add public notes to invoices 2021-01-18 22:08:18 +11:00
David Bomba
69bc2f0183 Fixes for getPaymentMethods 2021-01-18 13:12:48 +11:00
David Bomba
bd5defe455 Refactor getPaymentMethods() 2021-01-18 12:36:13 +11:00
David Bomba
a33c781919 Payment notifications for online payments to the client 2021-01-18 08:31:49 +11:00
David Bomba
13be9c5ad6 Fixes for autobill 2021-01-17 21:33:05 +11:00
David Bomba
af86d1e69f Fix for import 2021-01-17 20:35:01 +11:00
David Bomba
8c8509ca40
Merge pull request #4703 from turbo124/v5-develop
Refactor alternateSave() in BaseRepo
2021-01-16 08:45:37 +11:00
Benjamin Beganović
8df374c9db add data-refs to taxes 2021-01-15 12:56:05 +01:00
Benjamin Beganović
d43daeaddb hide terms label if terms are empty 2021-01-15 12:44:37 +01:00
David Bomba
1b551796c5 Recurring PDF Dependencies 2021-01-15 14:10:35 +11:00
David Bomba
2f58096872 Fixes for displaying Recurring Invoice PDF 2021-01-15 13:02:55 +11:00
David Bomba
af1a458b1e
Merge pull request #4691 from beganovich/v5-0114-show-terms
(v5) Support for entity terms
2021-01-15 08:32:54 +11:00
Benjamin Beganović
3bcc9a2d74 show partial due 2021-01-14 16:49:24 +01:00
Benjamin Beganović
c92ae4d86f Support for invoice terms 2021-01-14 16:38:40 +01:00
David Bomba
ae5f5ac30a Fixes for invitation creation 2021-01-14 10:00:32 +11:00
David Bomba
3b02dd56e0 Save documents to Company Entity 2021-01-13 21:12:14 +11:00
David Bomba
a6121295c2 Fix for retrieving quote PDF 2021-01-13 19:58:01 +11:00
David Bomba
7f03a1900e Refactor notifications to be more specific, ie. Invoice -> Reminder 1 template 2021-01-13 18:20:46 +11:00
David Bomba
f0bf26ad14 Fixes for system logging successful gateway responses" 2021-01-12 20:35:47 +11:00
David Bomba
51cd6f71fd fixes for tests which handle remote disks 2021-01-12 19:04:05 +11:00
David Bomba
e3f0493c48 Cleanup for emails 2021-01-12 10:21:17 +11:00
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
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