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

737 Commits

Author SHA1 Message Date
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