1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-11 21:52:35 +01:00
Commit Graph

949 Commits

Author SHA1 Message Date
David Bomba
85c05f7c30 Fixes for VarEvents 2021-05-07 07:12:07 +10:00
Benjamin Beganović
5f14c0a541 Fixing the 500 when using negative taxes 2021-05-06 12:46:02 +02:00
Benjamin Beganović
0c1ed84080 Use translated country names for company on PDF 2021-05-06 10:23:12 +02:00
Benjamin Beganović
62e980ca08 Use translated country names for client on PDF 2021-05-05 17:58:59 +02:00
David Bomba
e7526cb4dc Fixes for reset of counters 2021-05-05 10:58:18 +10:00
David Bomba
83da701646 Fixes for company domain 2021-04-28 13:58:37 +10:00
David Bomba
300cc9fb9e Fixes for Checkout.com 2021-04-22 23:32:34 +10:00
Benjamin Beganović
b9ee87b124 wip 2021-04-22 13:03:30 +02:00
Benjamin Beganović
6d0c2ec5ca wip 2021-04-22 12:29:00 +02:00
Benjamin Beganović
ca15b03eda wip 2021-04-21 17:56:18 +02:00
David Bomba
d892e0b6ed Fixes for counter 2021-04-21 19:57:59 +10:00
Benjamin Beganović
cc7bdf15fe wip 2021-04-20 13:31:21 +02:00
David Bomba
06f08adaf2
Merge pull request #5475 from turbo124/v5-develop
v5.1.48
2021-04-20 07:28:40 +10:00
Benjamin Beganović
873fe6ce07
Merge branch 'v5-develop' into v5-1304-emails 2021-04-19 16:59:23 +02:00
Benjamin Beganović
417260e25d wip 2021-04-19 11:41:56 +02:00
David Bomba
25fe52ab18 Add portal_url variable 2021-04-19 11:19:00 +10:00
Benjamin Beganović
875c7ba950 - Dark mode 2021-04-18 17:35:33 +02:00
Benjamin Beganović
b9528d09c0 - Add support for centering the content
- Load styles from the master branch
2021-04-18 17:09:44 +02:00
David Bomba
7026dbd8f2 Add custom translations to email preview and sent emails 2021-04-16 16:22:42 +10:00
Benjamin Beganović
331b49ff04 wip 2021-04-15 15:56:20 +02:00
Benjamin Beganović
df6718a31e wip 2021-04-14 16:09:37 +02:00
David Bomba
bb0d91a30f Fixes for HTMLEngine 2021-04-14 14:49:53 +10:00
David Bomba
aabe5683e1 Refactoring subscriptions 2021-04-14 14:41:04 +10:00
David Bomba
1e663afba4 Remove commonmark implementation 2021-04-14 07:40:58 +10:00
David Bomba
5c1eb7f7eb Update texts 2021-04-14 07:40:07 +10:00
Benjamin Beganović
325d39736f wip 2021-04-13 17:07:34 +02: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
7e3a9205b9 Add event listeners for Subscriptions + fix user actioning the event() 2021-04-13 09:52:17 +10:00
David Bomba
477aa691a9 Add custom exceptions 2021-04-12 14:36:51 +10:00
Benjamin Beganović
1ba9e44e2e wip 2021-04-10 13:33:56 +02:00
David Bomba
7372aecb1a Remove logging 2021-04-10 12:15:37 +10:00
David Bomba
1696c63ba4 fixes for endless recursion 2021-04-10 12:01:36 +10:00
Benjamin Beganović
c17893f9a8 Add $page_size & $page_layout 2021-04-08 17:49:28 +02:00
David Bomba
d9d042724e Add daily reset 2021-04-08 20:38:31 +10: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
23206d7a67 Add licenses table 2021-04-07 00:00:24 +10:00
David Bomba
fac1eebd2c PHP 8.0 suppotr 2021-04-06 10:43:56 +10:00
Benjamin Beganović
2cd3ceed2e Allow expenses to be part of products table 2021-04-05 14:21:49 +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
1e83b729d5 Minor fixes for subscriptions 2021-04-01 20:33:50 +11:00
David Bomba
9bf9bc35ad
Merge pull request #5305 from turbo124/v5-develop
Payment mailer fixes
2021-04-01 08:29:12 +11:00
Benjamin Beganović
c300ffc4d9 passwordless login 2021-03-31 18:10:44 +02:00
David Bomba
9c4a223923 Fixes for notification gates 2021-03-31 13:28:03 +11:00
David Bomba
404ee307fd Magic link maker 2021-03-31 11:07:54 +11:00
Benjamin Beganović
1e618dcbad
Merge pull request #5287 from beganovich/v5-3003-locale-fixes-for-literal
(v5) Show "literal" months using locale on PDFs
2021-03-30 16:30:07 +02:00
Benjamin Beganović
6af83a8675 wip 2021-03-30 15:50:39 +02:00
Benjamin Beganović
eb0aed513f wip 2021-03-30 14:44:33 +02:00
David Bomba
caf7ad5998 Minor fixes for self updater - more verbose messaging after self update 2021-03-30 18:01:20 +11:00
David Bomba
de99ed2ba4 Fixes for quote numbering 2021-03-29 21:00:22 +11:00
David Bomba
fc3889671e Fixes for HTMLEngine 2021-03-27 06:30:46 +11:00
David Bomba
c47318df1e Fixes for company presenter 2021-03-27 06:21:47 +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
=
3d375e4148 Workig on client subscriptions 2021-03-23 23:17:28 +11:00
Benjamin Beganović
500fa38a29 Remove nl2br for public notes 2021-03-22 12:08:59 +01:00
=
5b290b1770 Small fix for usernotifies 2021-03-21 08:57:11 +11:00
David Bomba
34b9877868 Minor fixes 2021-03-19 23:37:57 +11:00
David Bomba
10f7b1a309 Fixes for 2fa 2021-03-18 22:46:58 +11:00
David Bomba
ac6feb706e Small fix for new PDF generator 2021-03-18 20:57:55 +11: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ć
c320b6bfbb
Merge branch 'v5-develop' into v5-1103-billing-landing-page 2021-03-17 17:14:55 +01: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
David Bomba
f00c1f95c0 Add new counter settings 2021-03-17 21:06:08 +11:00
David Bomba
c95e0c3d7e Tuning company settings for missing properties 2021-03-17 20:28:44 +11:00
David Bomba
059cec705d Small fix for user notifications 2021-03-17 11:13:29 +11:00
David Bomba
db03dccbaf Limit reminders for free plans 2021-03-17 08:15:43 +11:00
David Bomba
255643d7dc Fixes for connected account 2021-03-14 21:32:09 +11:00
=
487cf555b9 Fix for displaying logo 2021-03-13 16:56:52 +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
Joshua Dwire
a844afd128 Support pre-configured installs where setup doesn't allow changing DB info 2021-03-11 19:48:41 -05:00
Benjamin Beganović
b88533d3d2 Catch possible invalid format exception & return "Invalid date!" 2021-03-10 16:56:17 +01:00
David Bomba
e7e455667d Fixes for company logo in emails 2021-03-10 12:51:08 +11:00
David Bomba
9c2e5c2de4 Fixes for blank company name 2021-03-08 15:20:02 +11:00
David Bomba
7a50032b35 Logging 2021-03-07 08:50:14 +11:00
David Bomba
86673a6c66 Fixes for client address 2021-03-05 21:27:36 +11:00
David Bomba
f99195c07a Small fixes 2021-03-05 11:16:38 +11:00
David Bomba
9b3ea22c22
Merge pull request #5018 from turbo124/v5-develop
Fixes for attaching a user to different companies
2021-03-03 21:11:12 +11:00
David Bomba
bfbde2ba51 Fixes 2021-03-03 21:04:10 +11:00
Benjamin Beganović
a04b075956 Update entity labels on PDF 2021-03-02 15:42:42 +01:00
Benjamin Beganović
7543ab33ff Update white label logo 2021-03-02 14:26:34 +01:00
=
b57d4bfb7c Fixes for recurring invoice number not being prefixed 2021-03-02 21:57:14 +11:00
David Bomba
c887d81dd6
Merge pull request #5000 from turbo124/v5-develop
Fixes for archived invoice not emailing
2021-02-27 11:32:50 +11:00
David Bomba
cc883f0926 Fixes for archived invoice not emailing 2021-02-26 22:20:17 +11:00
Benjamin Beganović
441db23414 Format quantity output using formatValue() 2021-02-26 07:05:44 +01:00
David Bomba
4b3c7ec771
Merge pull request #4991 from turbo124/v5-develop
User verified middleware
2021-02-26 08:18:59 +11:00
Benjamin Beganović
c074aa9aca
Merge pull request #4790 from beganovich/v5-2701-dynamic-dates-for-recurring
(v5) PDF: Support for dynamic keywords in items description
2021-02-25 12:01:04 +01:00
Benjamin Beganović
81dfb25f5f Use translated format of months based on locale 2021-02-25 12:00:01 +01:00
David Bomba
29b4e6d1b7 minor fixes 2021-02-25 21:41:18 +11:00
David Bomba
90b33ef063 clean up 2021-02-24 11:48:32 +11:00
Benjamin Beganović
7319d073c8 wip 2021-02-23 14:56:16 +01:00
David Bomba
62feba5a51 Localizing Dates 2021-02-23 21:04:39 +11:00
David Bomba
ffd9c10ef6
Merge pull request #4968 from turbo124/v5-develop
Fixes for fillable properties + other minor fixes"
2021-02-23 12:18:11 +11:00
David Bomba
55b673241b Fixes for fillable properties 2021-02-23 12:17:09 +11:00
David Bomba
47a2ff7df3 Fixes for tests 2021-02-23 09:47:54 +11:00
Benjamin Beganović
b22825bf17 wip 2021-02-22 17:01:01 +01:00
Benjamin Beganović
8e3875da96 Merge remote-tracking branch 'upstream/v5-develop' into v5-2701-dynamic-dates-for-recurring 2021-02-22 13:15:37 +01:00
Benjamin Beganović
75bd911b66 Fixes for   in public notes 2021-02-22 11:52:55 +01:00
David Bomba
c0d49fff40 Fixes for casts 2021-02-22 21:35:00 +11:00
David Bomba
84d3ca8738 Fixes for casts 2021-02-22 21:30:28 +11:00
David Bomba
9a46a886a1 fixes for surcharge tax calculations and also implemented Zero % tax rates 2021-02-21 20:36:34 +11:00
=
633210e281 Fixes for PHP 8 2021-02-20 21:51:33 +11:00
Benjamin Beganović
a081f966f8 wip 2021-02-16 14:57:37 +01:00
David Bomba
5ad5606ea2 Request cancellation notification refactor 2021-02-15 09:12:14 +11:00
David Bomba
2b31b3bd8c Notification types 2021-02-15 08:32:59 +11:00
David Bomba
bd6e3db554 Fix for entity footer 2021-02-12 08:00:42 +11:00
David Bomba
1eb396f300 Fixes for attachments 2021-02-11 19:04:40 +11:00
David Bomba
e11592e172 Fixes for gmail attachments 2021-02-11 18:58:37 +11:00
David Bomba
a36cfb99b8 GMail attachments 2021-02-11 14:43:48 +11:00
Benjamin Beganović
6607442740 wip 2021-02-10 12:31:14 +01:00
David Bomba
fc79835ed6
Merge pull request #4825 from turbo124/v5-develop
Working on migrations.
2021-02-03 23:30:31 +11:00
David Bomba
2e2843c27d Fixes for migrations 2021-02-03 23:29:44 +11:00
David Bomba
7711a21429
Merge pull request #4820 from turbo124/v5-develop
Generic payment failure notifications.
2021-02-03 09:26:16 +11:00
Benjamin Beganović
9e08ce7415 escape hash 2021-02-02 14:52:21 +01:00
=
a20fcaf299 Add logging to Phantom JS 2021-02-02 20:33:02 +11:00
David Bomba
58970fab99 payment failure emails 2021-02-01 23:41:11 +11:00
David Bomba
2ab99e8132 AutoBilling failure mailer 2021-02-01 22:26:42 +11:00
David Bomba
c14d34350f Working on payment failure emails 2021-02-01 16:30:28 +11:00
David Bomba
dc231bc8b5 Fixes for PhantomJS displaying Recurring Invoice 2021-01-30 12:23:43 +11:00
David Bomba
3c72a15707 Fix for phantom displaying Recurring Invoices 2021-01-30 11:19:43 +11:00
David Bomba
af472b21c1 Working on filtering responses based on user permissions 2021-01-29 23:05:03 +11:00
David Bomba
e213203ed9 Fixes for generates counteR" 2021-01-29 18:36:22 +11:00
David Bomba
dbfee7d519 Refactor for invoice number generator 2021-01-29 16:41:19 +11:00
David Bomba
e669718adb Fixes for client counter across entities 2021-01-29 13:18:21 +11:00
Benjamin Beganović
6d77cce1a9 wip 2021-01-28 15:18:18 +01:00
Benjamin Beganović
76a327bb01 wip 2021-01-27 18:01:47 +01:00
David Bomba
9b72acf506 Payment notifications for autobilling 2021-01-27 21:56:50 +11:00
David Bomba
6540a25531 Refactor client numbering 2021-01-25 21:34:12 +11:00
David Bomba
45cc39a3f1 Add alias for public_notes 2021-01-25 07:50:40 +11:00
David Bomba
3d468e5f40 Company Gateway cleanup 2021-01-22 07:45:00 +11:00
David Bomba
e9e4c39f17 Add support for QR code variables 2021-01-21 23:34:21 +11:00
Benjamin Beganović
e5c7fc4416 E-mail improvements:
- Removed injection of Tailwind CSS in the TemplateEngine.php
- Removed tailwindcss@1.4.6.css & tailwind-1.2.0.css
- Updated master template of e-mails for greeting, signature & footer sections
- Updated generic template for emails
- Updated footer (clean up)
- Fixed EntitySentObject.php class name
- Removed css-inliner.php config file
- Updated button component for e-mails
2021-01-20 13:18:17 +01:00
Benjamin Beganović
5dd38421e7
Merge pull request #4709 from beganovich/v5-1801-refactor-email-templates
(v5) Refactor email templates
2021-01-19 11:07:39 +01:00
David Bomba
7907eae103 raw subject and raw body 2021-01-19 11:46:00 +11:00
Benjamin Beganović
9471305021 Add class button to view links 2021-01-18 23:29:20 +01:00
David Bomba
2f58096872 Fixes for displaying Recurring Invoice PDF 2021-01-15 13:02:55 +11:00
Benjamin Beganović
1c5c7250ee Unified margin across designs 2021-01-14 15:57:14 +01:00
David Bomba
502b8f336f HTMLEngine clean up 2021-01-14 13:20:26 +11:00
David Bomba
95e5b89641 fixes for validation of line_items 2021-01-14 08:16:07 +11:00
David Bomba
b5807d8d9c Fixes for document upload from company 2021-01-13 21:18:39 +11:00
David Bomba
eb7cee706d Fixes for displaying company logo in email templates 2021-01-13 12:22:23 +11:00
David Bomba
b2b464fb9e Check PhantomJS response is valid PDF 2021-01-13 10:25:33 +11:00
David Bomba
b0c5cb3f46 Fix for DateTime 2021-01-12 18:40:18 +11:00
David Bomba
6222a1386c Fixes for timezones 2021-01-12 18:38:16 +11:00
David Bomba
e3f0493c48 Cleanup for emails 2021-01-12 10:21:17 +11:00
David Bomba
fe457537b6 Change the way company logos are stored in the settings 2021-01-11 19:27:11 +11:00
David Bomba
d26d26fccf Fixes for client counteR 2021-01-10 21:45:02 +11:00
David Bomba
aae2f1d198 Add .datetime variable for invoice designs 2021-01-08 13:15:55 +11:00
David Bomba
e42cb6f4d3 display tax rates with no trailing precision 2021-01-07 09:43:08 +11:00
Benjamin Beganović
603f7baa58 apply php-cs-fixeR 2021-01-04 13:38:00 +01:00
Benjamin Beganović
14efcc77e6 Support for database port on the setup 2021-01-04 13:36:47 +01:00
David Bomba
934610a01c Update copyright + version bump + set canadian dollar symbol to $ 2021-01-04 08:54:54 +11:00
=
0f70579b72 Fixes for client_id_number placeholder for generatescounter 2021-01-02 09:32:58 +11:00
Benjamin Beganović
6f7ec1c188
Merge pull request #4574 from beganovich/v5-makeCustomField-refactor
(v5) Refactor methods for custom fields
2020-12-25 17:19:02 +01:00
Benjamin Beganović
9f58ccb028 Add support for custom Chromium path (ie. support for Windows & Mac) 2020-12-25 14:15:57 +01:00
Benjamin Beganović
f3f76e9644 remove duplicate methods 2020-12-25 12:30:40 +01:00
Benjamin Beganović
0bbd910490 apply php-cs-fixer 2020-12-25 12:29:42 +01:00
Benjamin Beganović
491d080ab4 add new makeCustomField (centralised refactor) 2020-12-25 12:27:37 +01:00
Benjamin Beganović
ebfbfb6e10 htmlengine: refactor makeCustomField to helpers 2020-12-25 12:27:23 +01:00
Benjamin Beganović
83ec60cf70 Remove unused makeCustomFieldKeyValuePair() method 2020-12-25 12:25:28 +01:00
Benjamin Beganović
710c08cdef update formatCustomField value to accept nullable client 2020-12-25 12:12:56 +01:00
Benjamin Beganović
2f18ab1eeb htmlengine: refactor formatCustomFieldValue 2020-12-25 12:12:43 +01:00
Benjamin Beganović
751b355576
Merge pull request #4565 from beganovich/v5-cleanup-browsershot
(v5) Removing Browsershot & Puppeteer
2020-12-23 18:10:43 +01:00
Benjamin Beganović
4c351f6658 remove node/npm requirement 2020-12-23 16:32:56 +01:00
Benjamin Beganović
972099d89f fix product key 2020-12-23 15:51:29 +01:00
Benjamin Beganović
f98627e47f Rename product.product_key to product.item 2020-12-23 14:25:12 +01:00
Benjamin Beganović
ada4f3065c fixes for tests 2020-12-23 11:41:57 +01:00
Benjamin Beganović
a907933d57 transformlineitems -> switch 2020-12-23 11:17:14 +01:00
Benjamin Beganović
eb5ad3a4ea html engine, new $product1-4 variables 2020-12-22 13:55:40 +01:00
Benjamin Beganović
3b4c2ba5b0 add $custom_value in makeinvoicevalues 2020-12-22 13:55:29 +01:00
Benjamin Beganović
f3c57e87f1 Set default margin to standard A4 printing 2020-12-22 09:43:14 +01:00
Benjamin Beganović
85d241e15e update global margin 2020-12-21 16:55:47 +01:00
Benjamin Beganović
95c1f60674 Install beganovich/snappdf package 2020-12-21 16:32:04 +01:00
David Bomba
950a057496
Merge pull request #4545 from turbo124/v5-develop
Fix for preview
2020-12-21 20:59:17 +11:00
Benjamin Beganović
75902c6d3f Fixes for client number formatting 2020-12-21 09:08:12 +01:00
David Bomba
caa30da38d Ignore HTTPS errors in browsershop 2020-12-21 10:11:33 +11:00
David Bomba
c1edc905db Importing invoices 2020-12-20 20:02:10 +11:00
David Bomba
ccde0eaced Working on importing CSV Invoices 2020-12-20 18:02:58 +11:00
=
7285c78afb remove GMP extension requirements 2020-12-19 08:29:32 +11:00
David Bomba
df30f0cbc5 Fixes for github actions 2020-12-18 11:31:27 +11:00
Benjamin Beganović
eadcff544f Support for multiline entity public notes. 2020-12-17 14:03:07 +01:00
Benjamin Beganović
20c010448a apply php-cs-fixer 2020-12-16 12:52:40 +01:00
Benjamin Beganović
7ccd10adf9 - Change $global-margin to $global_margin to keep consistency
- Update designs accordingly
- Update ChromiumPdf version
- Apply php-cs-fixer
2020-12-15 11:45:04 +01:00
Benjamin Beganović
3b5c592f25
Merge pull request #4492 from beganovich/v5-experimental-chromiumpdf-support
Experimental PDF rendering
2020-12-15 10:47:39 +01:00
David Bomba
ed20f2c4bc Null safety in translations 2020-12-15 07:53:31 +11:00
Benjamin Beganović
dcd6574b2d Experimental PDF rendering:
- Added experimental flag in ninja.php
- Added experimental rendering in PdfMaker.php
- Added dynamic $global-margin for 1cm/0cm based on PDF method
2020-12-14 17:23:04 +01:00
David Bomba
0f861554f0 Fixes for exec and open_basedir checks 2020-12-13 08:06:47 +11:00
David Bomba
6ee4e45d1e Add custom variables 2020-12-11 17:50:54 +11:00
David Bomba
44fdadff07 Return NPM String error rather than bool 2020-12-11 07:24:43 +11:00
David Bomba
22cd6cdff0 Fixes for NPM/NODE status 2020-12-10 21:06:24 +11:00
David Bomba
91f90c94e3
Merge pull request #4454 from turbo124/v5-develop
Notifications clean up.
2020-12-10 07:58:08 +11:00
Benjamin Beganović
23a64562c9 fix issue with setup & apply php-cs-fixer 2020-12-09 13:38:22 +01:00
David Bomba
7ba78cc342 Reduce notification emails to one per entity 2020-12-09 20:52:08 +11:00
David Bomba
dc2e5706c6 Fixes for how to display CHF currency 2020-12-09 07:35:26 +11:00
David Bomba
6a03bcc546
Merge branch 'v5-develop' into v5-develop 2020-12-09 07:25:16 +11:00
Benjamin Beganović
829d4feaff
Merge pull request #4445 from beganovich/v5-task-product-key-to-service
(v5) Rename task.product_key to taks.service
2020-12-08 16:53:03 +01:00
Benjamin Beganović
ef0584b442 add entity_string in htmlengine 2020-12-08 16:44:35 +01:00
Benjamin Beganović
53525dc93f rename task.service to task.product key 2020-12-08 16:10:29 +01:00
Benjamin Beganović
0155907b27 php-cs-fixer 2020-12-08 15:05:05 +01:00
Benjamin Beganović
1d0f5b2ad7 add post-submit checks to smtp & db 2020-12-08 15:04:07 +01:00
Benjamin Beganović
68a84df0dd prefix all smtp fields with mail_ 2020-12-08 14:29:15 +01:00
Benjamin Beganović
3ffb600117 prefix all db field with db_ 2020-12-08 14:21:00 +01:00
Benjamin Beganović
4bf46a45b1 Update reference on balance due 2020-12-08 13:57:31 +01:00
David Bomba
594dda9b65 fixes for delivery notes{ 2020-12-08 20:18:17 +11:00
David Bomba
8107a49677 remove trailing slash from app url 2020-12-08 07:21:08 +11:00
David Bomba
269fff3fc8 Changes for counters 2020-12-07 21:43:21 +11:00
David Bomba
bc621aa01a fixes for directories 2020-12-04 08:24:34 +11:00
Benjamin Beganović
458e207fe3 fixes for smtp testing on setup 2020-12-03 14:10:40 +01:00
Benjamin Beganović
1a066f2f9f add alias to task searvice from task product 2020-12-01 15:18:48 +01:00
Benjamin Beganović
b373a3df52 fix stripe refunding & apply php-cs-fixer 2020-12-01 13:46:09 +01:00
Benjamin Beganović
d888780ed8 update quotes logic 2020-11-29 14:20:47 +01:00
Benjamin Beganović
ba6c157128 Surround multiple words with quotes in env file 2020-11-29 13:54:12 +01:00
Benjamin Beganović
0aff363f5d php-cs-fixer 2020-11-27 12:08:42 +01:00
David Bomba
9f4979095b Temp routes" 2020-11-27 20:21:18 +11:00
David Bomba
3a78326a83 Temp routes" 2020-11-27 20:19:23 +11:00
David Bomba
78e5a91175 Temp routes" 2020-11-27 20:17:47 +11:00
David Bomba
5a3c93bb3c Temp routes" 2020-11-27 20:14:01 +11:00
David Bomba
e410a99f91 Phantom adjustment for preview 2020-11-27 13:31:21 +11:00
David Bomba
b5840f8e45 Phantom adjustment for preview 2020-11-27 13:30:37 +11:00
David Bomba
3cdd5bc544 Phantom adjustment for preview 2020-11-27 13:29:46 +11:00
David Bomba
b593cb0ff3 Fixes for preview PDF using phantom js 2020-11-27 13:02:05 +11:00
David Bomba
2c2d1b50f4 Fix for invitation resolution with PhantomJS 2020-11-27 08:24:25 +11:00
David Bomba
f1e1fa0b82 Fix for invitation resolution with PhantomJS 2020-11-27 08:22:28 +11:00
David Bomba
d07dedf264 Add tax_rates relation to company_user 2020-11-27 08:05:30 +11:00
David Bomba
1181f9de62
Merge branch 'v5-develop' into authorize_refactor 2020-11-26 22:43:25 +11:00
David Bomba
5e0bcfbc88 working on authorize 2020-11-26 20:39:35 +11:00
Benjamin Beganović
ae88d5e08e php-cs-fixer format 2020-11-25 15:19:52 +01:00
David Bomba
137231c95e cs-fixer 2020-11-25 21:30:00 +11:00
David Bomba
efbf8069b5
Merge pull request #4360 from turbo124/v5-develop
Fixes for migrations
2020-11-25 20:24:06 +11:00
Benjamin Beganović
242d48cd1a update variables for .env instead of writing completely new file 2020-11-24 11:45:27 +01:00
Benjamin Beganović
3b765d32c1 log as an option for mail driver 2020-11-24 11:12:44 +01:00
David Bomba
63cc567244 Working on migrations 2020-11-24 21:12:05 +11:00
David Bomba
0c9f982bdf Fixes for imports 2020-11-24 16:11:20 +11:00
David Bomba
b5fe5070b5 Working on migrations 2020-11-23 23:55:04 +11:00
David Bomba
4b1aabbac7 Fixes for migration 2020-11-23 12:46:16 +11:00
David Bomba
388c0e8467 Add withTrashed() for queries in migration 2020-11-23 08:25:29 +11:00
David Bomba
6eaf78a1d5 Fix for casting line items 2020-11-22 16:34:05 +11:00
David Bomba
68a6ea4d22
Merge branch 'v5-develop' into v5-develop 2020-11-16 12:20:44 +11:00
Benjamin Beganović
956e1fe287 notes => description, cost => unit_cost 2020-11-16 00:42:21 +01:00
David Bomba
a1119f9bbe Fix edge cases with cloning invoice 2020-11-15 19:24:57 +11:00
David Bomba
b1591632d8 Refactor defaults for invoice PDF 2020-11-13 22:52:11 +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
58ef5240cd Custom Translations 2020-11-10 14:36:16 +11: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
9174b7e628 Fixes for emails and reminders 2020-11-09 21:17:20 +11:00
=
2cf97caaaf Fixes for import 2020-11-07 20:08:21 +11:00
David Bomba
07af666ca4
Merge pull request #4273 from turbo124/v5-develop
Reminders
2020-11-07 07:03:57 +11:00
Benjamin Beganović
3768add8a0 pass $task_id inside of row item 2020-11-06 13:13:13 +01:00
David Bomba
60a141d529 Fixes for reminders 2020-11-06 15:43:10 +11:00
David Bomba
3928ab3e39 Merge branch 'v5-develop' of https://github.com/turbo124/invoiceninja into v5-develop 2020-11-06 07:53:43 +11:00
David Bomba
67741010f0 Refactoring remindersg 2020-11-05 21:36:55 +11:00
David Bomba
09fbc9762a Fixes for custom emails. 2020-11-05 21:14:30 +11:00
David Bomba
cd08367ce6 Working on reminders 2020-11-05 13:59:19 +11:00
David Bomba
8e2cea7129 Working on reminders 2020-11-05 12:33:31 +11:00
David Bomba
4784e80859 Working on templates / reminders and late fees 2020-11-05 09:48:46 +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ć
14b11ecbbd Refactor total table columns:
- $task.cost => $task.rate
- $task.quantity => $task.hours
2020-11-04 11:22:43 +01:00
David Bomba
5c5102baeb Working on reminders 2020-11-04 20:32:49 +11:00
David Bomba
529ef5d686 Working on settings implementation 2020-11-04 16:22:51 +11:00
David Bomba
37aaa1fc5b Fixes for importing company logo 2020-11-04 11:32:18 +11:00
David Bomba
870a41a93e Fix for removing company logo from storage 2020-11-04 10:56:29 +11:00
David Bomba
53fad7eb40 Fixes for composer 2020-11-02 13:13:31 +11:00
David Bomba
9bbffea260 Fixes for setup 2020-11-02 11:23:02 +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
86d472fa05 Project numbers 2020-10-29 22:01:37 +11:00
David Bomba
c1c8b6c14e Change start_time datatype 2020-10-29 20:40:13 +11:00
David Bomba
9aeb2d7a5b Psalm cleanup 2020-10-28 21:10:49 +11:00
David Bomba
7886482fb5 Localize dates in entities 2020-10-28 19:32:14 +11:00
David Bomba
d7930e4c14 Remove redundant classes 2020-10-28 17:27:10 +11:00
David Bomba
a07f04e1df Refactor Template Engine 2020-10-28 16:50:06 +11:00
David Bomba
f6435ab030 Working on emails 2020-10-27 22:57:12 +11:00
David Bomba
6650f5404f Fixes for camelcase Invitation names 2020-10-27 15:26:56 +11:00
David Bomba
417562b80d Fixes for phantom JS view invitation 2020-10-27 15:26:04 +11:00
David Bomba
1de7a693cc Refactor Phantom JS building HTML 2020-10-27 14:09:13 +11:00
David Bomba
8f53424017 Fixes 2020-10-27 06:10:04 +11:00
David Bomba
0453c989eb PDF Entity generation tests 2020-10-26 20:13:00 +11:00
David Bomba
8d508bb1f9 Refactor pdf generation 2020-10-26 15:06:58 +11:00
David Bomba
5ffd2b4678 Add sort order to task status 2020-10-26 08:05:33 +11:00
David Bomba
f26a20dbbd working on date formatting 2020-10-26 06:15:03 +11:00
David Bomba
3e21c301a5 Fix for custom values 2020-10-24 18:01:07 +11:00
David Bomba
50eaf0cc78 Fix for date localization 2020-10-24 14:38:53 +11:00
David Bomba
bc2b0f4aae Fix for recurring number collisions - use dispatchNow() 2020-10-20 11:53:54 +11:00
David Bomba
686f12261d Project number 2020-10-20 10:55:14 +11:00
David Bomba
f0e4a94bee Task Statuses 2020-10-20 10:01:59 +11:00
David Bomba
93ea785131 Fix for incorrect company country being displayed 2020-10-19 08:21:14 +11:00
David Bomba
3d40df6264 Fixes for ledger id in transformer 2020-10-16 08:55:24 +11:00
David Bomba
07cbb6a71a Fixes for showing recurring invoices in the client portal 2020-10-16 07:35:15 +11:00
Benjamin Beganović
1d89656bad Setup changes:
- Return actual SQL error when connection is failing
- Update buttons on setup with correct color
2020-10-14 13:40:00 +02:00
David Bomba
b7292a0432 Update email validation 2020-10-13 08:27:42 +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
6e00b09065 Add partial payment template 2020-10-10 07:31:24 +11:00
Benjamin Beganović
b0c383f75b Show empty string if country is not set:
- Replace "No country set" with empty string in HtmlEngine.php
- Allow country_id & shipping_country_id to be null in shipping-address.blade.php & personal-address.blade.php
2020-10-09 16:03:27 +02:00
David Bomba
9187946760 Fixes for gateway 2020-10-09 22:13:33 +11:00
David Bomba
44d31ce326 Move cache clearance to base controller 2020-10-09 17:55:03 +11:00
David Bomba
c48b02a690 Static template data 2020-10-09 13:28:33 +11:00
David Bomba
b8b3149582 Working on recurring & analytics 2020-10-07 14:00:32 +11:00
David Bomba
70a575386c Fixes for designs in migration: 2020-10-07 10:16:57 +11:00
David Bomba
3aa5e2e4eb Minor release 2020-10-06 21:06:14 +11:00
David Bomba
484b28d3ce Fixes for recurring migratoin 2020-10-06 11:52:16 +11:00
David Bomba
be388ba493 Fixes for tests 2020-10-05 08:37:12 +11:00
David Bomba
f6ac4a8201 Add mysqlnd requirement to systemhealth check 2020-10-04 19:52:58 +11:00
David Bomba
ee8ae09314 Fixes for no invitation 2020-10-03 18:09:48 +10:00
David Bomba
a4ddcc90fa Fixes for Email preview with blank entity 2020-10-02 07:29:11 +10:00
David Bomba
15320500c0
Merge pull request #4126 from turbo124/v2
Laravel 8 support
2020-10-01 21:47:07 +10:00
David Bomba
92c65f73da
Merge pull request #4125 from beganovich/v2-fix-font-size-variable
Rename $font-size to $font_size & remove all comments from designs
2020-10-01 21:45:00 +10:00
David Bomba
b94bfacc19 Fixes for demo mode in l8 2020-10-01 21:41:23 +10:00
Benjamin Beganović
b40d2bc50b Replace $font-size with $font_size 2020-10-01 13:37:34 +02:00
Benjamin Beganović
5e773a03c8 Add $primary_color & $seconday_color to variables list 2020-10-01 13:20:32 +02:00
David Bomba
8756a89885 Allow login using contact_key or client_hash 2020-09-30 08:42:55 +10:00
David Bomba
e310118bf4 Fixes for cleanly deleting and restoring users 2020-09-29 08:08:44 +10:00
Benjamin Beganović
69b24f95c4 Centralised variables:
- New Helpers.php with sharedEmailVariables
- Merged settings from TemplateEngine
- @isset check for $whitelabel in the master.blade
2020-09-28 12:36:51 +02:00
David Bomba
7b926980f1
Merge pull request #4111 from turbo124/v2
Only show implemented gateways
2020-09-28 20:34:52 +10:00
David Bomba
fd67a48c91 Bug fixes 2020-09-27 20:39:13 +10:00
Benjamin Beganović
c5fcb56ca6 Add whitelabel to e-mail 2020-09-25 13:57:02 +02:00
David Bomba
b906e1e92f Fixes for hasrecurrence trait 2020-09-24 13:40:13 +10:00
David Bomba
a43688fd30 Append DELETED to invoice number on delete action 2020-09-23 20:52:54 +10:00
David Bomba
2627ec8894 PHP Cli version 2020-09-23 14:11:34 +10:00
David Bomba
ab0ec5e2cb Vendor API endpoints 2020-09-23 10:16:19 +10:00
David Bomba
617a923894 Fixes for notifications: 2020-09-21 20:54:58 +10:00
Benjamin Beganović
792f9717f7 Dynamic primary color borders on e-mails 2020-09-18 14:27:20 +02: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
7f825f9ed0 Fixes for paid_to_date formatting 2020-09-17 08:24:56 +10:00
David Bomba
6a0f958c2e Fixes for previewing email templates 2020-09-17 08:22:23 +10:00
Benjamin Beganović
1dcc24d06b Fix $details_label & texts.thanks on Elegant design 2020-09-16 12:16:56 +02:00
David Bomba
766343d8b9 Recurring dates 2020-09-14 22:13:15 +10:00
David Bomba
bae82b56c1 Add license 2020-09-14 21:11:46 +10:00
David Bomba
559a4d831f Show npm/node status in health check 2020-09-14 08:25:09 +10:00
David Bomba
ce4b5098fc
Merge pull request #4057 from beganovich/v2-show-fees-on-pdfs
Show taxes/fees on bottom of PDFs
2020-09-11 19:10:52 +10:00
Benjamin Beganović
6673d58b3a Show fees on bottom of PDFs 2020-09-11 10:07:59 +02:00
Benjamin Beganović
de6034f3d4 Don't skip items with type_id = 4 2020-09-11 09:23:16 +02:00
David Bomba
c55f660f7f Generic handling page for unsuccessful payments 2020-09-11 08:30:12 +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
David Bomba
c389ff49f2 Add missing data fields from HtmlEngine 2020-09-08 14:06:46 +10:00
David Bomba
77119e69fe Add primary/secondary_color to companysettings 2020-09-08 14:02:00 +10:00
Benjamin Beganović
0bf39c739d
Merge branch 'v2' into v2-fix-setup-issues 2020-09-07 00:15:45 +02: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
Benjamin Beganović
7a5027f1b4 Enable sandboxing with PDFs & fix setup page issues 2020-09-06 04:23:04 +02: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ć
219666f765 Generating PDFs using new templates 2020-09-04 13:17:30 +02:00
David Bomba
bb4aac1aeb
Merge pull request #4025 from turbo124/v2
Gateway fees implementation
2020-08-31 17:58:43 +10:00
David Bomba
32e987a1b2 Remove require NPM/NODE from setup checks 2020-08-29 23:32:11 +10:00
Benjamin Beganović
c8ff06e61d Update designs with new margins & paddings 2020-08-27 13:01:19 +02:00
David Bomba
79e0fa56e2 Convert currency string to float 2020-08-26 10:47:50 +10:00