1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-13 22:54:25 +01:00
Commit Graph

272 Commits

Author SHA1 Message Date
Benjamin Beganović
9b383b525b Filter images 2021-11-09 17:30:17 +01:00
Benjamin Beganović
f0d101fba4 Logic for generating markup for entity images 2021-11-08 21:20:55 +01:00
David Bomba
64aa4fe00f Fixes for adding users to hosted 2021-11-08 20:53:11 +11:00
Benjamin Beganović
8552431678 Use font from the settings 2021-10-27 16:45:50 +02:00
Benjamin Beganović
dda391bb3a Resolving fonts 2021-10-27 14:51:43 +02:00
David Bomba
fb7f44615d Minor fixes 2021-10-13 15:47:56 +11:00
David Bomba
cf4316b5ab Allow disconnect from Stripe Connect 2021-10-09 18:07:05 +11:00
David Bomba
9c18ab7230 Improve query efficiency 2021-10-08 15:00:17 +11:00
David Bomba
eb7de25e64 payment links 2021-10-06 15:05:16 +11:00
David Bomba
a7a76e806c Minor fixes 2021-09-30 08:13:48 +10:00
David Bomba
cf8a555e4b Minor fixes 2021-09-26 12:13:03 +10:00
Benjamin Beganović
9f5e3ea454 Add statement_amount variable 2021-09-24 11:56:10 +02:00
=
61868d19d5 minor fixes for htmlengine 2021-09-24 18:05:20 +10:00
David Bomba
b326f73059
Merge pull request #6707 from turbo124/v5-develop
Adding currencies
2021-09-24 08:52:07 +10:00
David Bomba
026d3e17a7 Additional currencieS 2021-09-23 22:07:07 +10:00
Benjamin Beganović
65b1feddbe Parse line breaks for terms, public notes & footer 2021-09-22 13:21:00 +02:00
Benjamin Beganović
b1860acbf5 Variables update 2021-09-21 18:19:13 +02:00
David Bomba
f572b61d61
Merge pull request #6687 from turbo124/v5-develop
Add inline download capability
2021-09-21 08:37:52 +10:00
=
6b9b12d723 Add 2021-09-20 21:19:03 +10:00
Benjamin Beganović
672c832b9b Hipster: Show statement label 2021-09-17 20:06:41 +02:00
Benjamin Beganović
926a599e8d Push $amount as last column 2021-09-17 19:49:40 +02:00
David Bomba
618027dcd8 Add gross line and subtotals 2021-09-15 10:00:29 +10:00
David Bomba
33c05b1ad0 Add exclusive taxes to line items 2021-09-15 09:02:25 +10:00
David Bomba
f168895507 Add first/last names for available fields 2021-09-13 08:02:10 +10:00
=
57602952e9 Set partial labels on invoices 2021-09-07 21:58:17 +10:00
David Bomba
ff130ae8a2 Hosted Migration Console Command 2021-09-05 19:40:50 +10:00
Benjamin Beganović
a5f8d8c042 Rename $payment_date to $payment.date 2021-08-24 15:37:16 +02:00
Benjamin Beganović
053f951fef Add payment_date and method variables to HtmlEngine 2021-08-23 14:22:22 +02:00
Benjamin Beganović
2553297edd Add $statement_date variable (wip) 2021-08-20 15:39:54 +02:00
Benjamin Beganović
80b72ac8d7 Add $number_short for entity numbers 2021-08-18 12:38:03 +02:00
Benjamin Beganović
790c8690cd Add $dir & $dir_text_align variables 2021-08-16 11:11:34 +02:00
David Bomba
c9bb67cafe Fixes for net subtotal when using exclusive taxes 2021-08-13 07:29:36 +10:00
David Bomba
f474273ced Add $client.city 2021-08-12 21:33:05 +10:00
David Bomba
fa6fa0e6ef Additional payment variables 2021-08-06 08:51:47 +10:00
Benjamin Beganović
575d58e6f0 Update company logo to resolve from logo_base64() 2021-07-26 11:09:11 +02:00
Jonathan Starck
2f13a8a323 Added own language label for net_subtotal and already included it in the English and German translation 2021-07-23 01:47:47 +02:00
David Bomba
53f6aeb9d3 Add net_subtotal option 2021-07-18 18:57:26 +10:00
David Bomba
21636e21b2 Always show balance due when in draft mode. 2021-07-12 20:43:41 +10:00
David Bomba
77432954d3 V4 -> V5 compatiblity improvements 2021-06-24 07:55:29 +10:00
David Bomba
36f6cbbcc9 Update license in codebase 2021-06-16 16:58:16 +10:00
=
c67998219e invoice_total_raw 2021-06-13 22:56:33 +10:00
David Bomba
9fad98017b Update fr_CA langs 2021-06-07 08:41:04 +10:00
David Bomba
e631a72fb4 Fixes for test 2021-06-06 19:27:15 +10:00
David Bomba
ec6bf52b43 Add specific route for disabling 2FA 2021-06-06 19:21:05 +10:00
Benjamin Beganović
a55142acd9 Don't parse markdown for footer, public notes & terms 2021-06-04 13:28:12 +02:00
David Bomba
b75c01d6d4 Minor fixes 2021-06-04 17:41:12 +10:00
David Bomba
efbd33a23b
Merge pull request #5905 from turbo124/v5-develop
Fixes for deleting and reusing design names
2021-06-03 08:02:46 +10:00
David Bomba
214396fa43 Fixes for deleting and reusing design names 2021-06-03 08:02:30 +10:00
Benjamin Beganović
27582c02ca
Merge pull request #5840 from beganovich/v5-2705-photo-design
(v5) Photo design
2021-06-02 17:22:14 +02:00
Benjamin Beganović
f5d218197a Markdown support for entity footer, public notes & terms 2021-05-31 12:19:56 +02:00
Benjamin Beganović
ac696d4d65 Hero image resolving 2021-05-27 15:12:52 +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
25fe52ab18 Add portal_url variable 2021-04-19 11:19:00 +10:00
David Bomba
bb0d91a30f Fixes for HTMLEngine 2021-04-14 14:49:53 +10:00
Benjamin Beganović
1ba9e44e2e wip 2021-04-10 13:33:56 +02:00
Benjamin Beganović
c17893f9a8 Add $page_size & $page_layout 2021-04-08 17:49:28 +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
Benjamin Beganović
6af83a8675 wip 2021-03-30 15:50:39 +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
Benjamin Beganović
500fa38a29 Remove nl2br for public notes 2021-03-22 12:08:59 +01:00
David Bomba
255643d7dc Fixes for connected account 2021-03-14 21:32:09 +11:00
David Bomba
9c2e5c2de4 Fixes for blank company name 2021-03-08 15:20:02 +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
David Bomba
29b4e6d1b7 minor fixes 2021-02-25 21:41:18 +11: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ć
75bd911b66 Fixes for   in public notes 2021-02-22 11:52:55 +01:00
David Bomba
9a46a886a1 fixes for surcharge tax calculations and also implemented Zero % tax rates 2021-02-21 20:36:34 +11:00
Benjamin Beganović
a081f966f8 wip 2021-02-16 14:57:37 +01:00
David Bomba
bd6e3db554 Fix for entity footer 2021-02-12 08:00:42 +11:00
Benjamin Beganović
6607442740 wip 2021-02-10 12:31:14 +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
e9e4c39f17 Add support for QR code variables 2021-01-21 23:34:21 +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
aae2f1d198 Add .datetime variable for invoice designs 2021-01-08 13:15:55 +11:00
David Bomba
934610a01c Update copyright + version bump + set canadian dollar symbol to $ 2021-01-04 08:54:54 +11:00
Benjamin Beganović
f3f76e9644 remove duplicate methods 2020-12-25 12:30:40 +01:00
Benjamin Beganović
ebfbfb6e10 htmlengine: refactor makeCustomField to helpers 2020-12-25 12:27:23 +01:00
Benjamin Beganović
2f18ab1eeb htmlengine: refactor formatCustomFieldValue 2020-12-25 12:12:43 +01:00
Benjamin Beganović
f98627e47f Rename product.product_key to product.item 2020-12-23 14:25:12 +01:00
Benjamin Beganović
eb5ad3a4ea html engine, new $product1-4 variables 2020-12-22 13:55:40 +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ć
eadcff544f Support for multiline entity public notes. 2020-12-17 14:03:07 +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ć
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
6ee4e45d1e Add custom variables 2020-12-11 17:50:54 +11:00
Benjamin Beganović
23a64562c9 fix issue with setup & apply php-cs-fixer 2020-12-09 13:38:22 +01:00
Benjamin Beganović
ef0584b442 add entity_string in htmlengine 2020-12-08 16:44:35 +01:00
Benjamin Beganović
4bf46a45b1 Update reference on balance due 2020-12-08 13:57:31 +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
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
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
100207f4cb
Merge pull request #4267 from turbo124/v5-develop
Company Settings Implmentation
2020-11-05 07:49:10 +11: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
529ef5d686 Working on settings implementation 2020-11-04 16:22:51 +11:00
David Bomba
53fad7eb40 Fixes for composer 2020-11-02 13:13:31 +11:00
=
6479b2fd3e Fix for laravel 8 route file regression + psalm cleanup 2020-11-01 16:09:09 +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
f6435ab030 Working on emails 2020-10-27 22:57:12 +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
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
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
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
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
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
fd67a48c91 Bug fixes 2020-09-27 20:39:13 +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
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
Benjamin Beganović
6673d58b3a Show fees on bottom of PDFs 2020-09-11 10:07:59 +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
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