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

950 Commits

Author SHA1 Message Date
David Bomba
9c7dc24bd2 Recurring Dates 2020-09-13 20:20:11 +10:00
David Bomba
89dcd43e47 Fixes for contact password not sticking on update 2020-09-12 19:53:28 +10:00
Benjamin Beganović
ed0fe053ec Hide Gateway Fees from invoices-table (cp) 2020-09-11 10:18:31 +02: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
0c015cb4bc Fixes for recurring invoices 2020-09-10 11:05:42 +10:00
David Bomba
519293c6dd
Merge pull request #4051 from beganovich/v2-design-improvements
Design improvements
2020-09-10 07:43:32 +10: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
6147cb1edc Fix for designs 2020-09-09 20:39:35 +10:00
David Bomba
c67fee3fff Fixes for base driver 2020-09-09 20:05:10 +10:00
Benjamin Beganović
3104f4ed06 Merge remote-tracking branch 'upstream/v2' into v2-design-tfoot 2020-09-08 14:37:37 +02:00
Benjamin Beganović
14dc3ea2aa Engine for editing templates 2020-09-08 13:21:07 +02:00
David Bomba
857fa8a57f Force admin only permissions on system logs 2020-09-08 20:49:17 +10:00
David Bomba
3083ab6237 Set unique on Group Settings Name 2020-09-08 20:44:32 +10:00
David Bomba
77119e69fe Add primary/secondary_color to companysettings 2020-09-08 14:02:00 +10:00
David Bomba
ca34e77530
Merge pull request #4041 from turbo124/v2
Improve update process
2020-09-07 20:05:39 +10:00
David Bomba
94508a30b3 Composer install 2020-09-07 20:00:20 +10:00
David Bomba
18282acbd7 Allow circumvention of client portal passwords using designated hash 2020-09-07 14:49:57 +10:00
David Bomba
f98319a1c1 Fixes for phpunit 2020-09-07 09:29:46 +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
Benjamin Beganović
1bbf7392ad Refactor invoice-table for simple model bind & support for gateway-fees 2020-09-03 11:45:47 +02:00
Benjamin Beganović
1f77b87331 Refactor quotes-table for simple model bind 2020-09-03 11:14:24 +02:00
Benjamin Beganović
60ae138e11 Show gateway fees status for invoices 2020-09-02 22:08:12 +02:00
David Bomba
2f478158e9 Fixes for company gateways 2020-09-02 11:11:01 +10:00
David Bomba
455e9a8e1d fix for company gateways if properties not set 2020-09-02 08:11:59 +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
1bc71fb5d8 Working on gateway fees 2020-08-30 08:00:57 +10:00
Benjamin Beganović
f5cc1f0d22 Preview logic for editing designs 2020-08-28 09:51:02 +02:00
Benjamin Beganović
d508d9b8f2
Merge branch 'v2' into v2-pdfmaker-design-improvements 2020-08-28 08:17:46 +02:00
David Bomba
36c54d8cc3 Working on fees 2020-08-28 11:06:46 +10:00
David Bomba
1a7d0d3cbd Working on gateway fees across multiple invoices 2020-08-27 22:12:39 +10:00
David Bomba
ff5d8ad871 Fixes for gateway fees 2020-08-26 11:14:15 +10:00
David Bomba
d57f0f9236 Refactoring client payments 2020-08-26 10:53:11 +10:00
David Bomba
79e0fa56e2 Convert currency string to float 2020-08-26 10:47:50 +10:00
David Bomba
37c5a7adb5 Test for gateway fees appending to invoice 2020-08-26 08:10:49 +10:00
David Bomba
1c55b529a0 Refactor payments 2020-08-25 23:18:17 +10:00
David Bomba
979916adb5 Refactor payments 2020-08-25 23:06:38 +10:00
Benjamin Beganović
5a03d81112 Fix blank page when downloading invoices 2020-08-25 08:55:55 +02:00
David Bomba
4c3f466d58 Tests for system log routes 2020-08-24 20:28:47 +10:00
David Bomba
d7dd544271 System logs 2020-08-24 19:51:19 +10:00
David Bomba
66499a9a31 System Logs 2020-08-24 15:08:49 +10:00
David Bomba
ffdfaefd80 Working on system logs 2020-08-24 12:45:53 +10:00
David Bomba
0d9df1f290 Fixes for incorrect name spacing of validation rules 2020-08-24 08:20:57 +10:00
David Bomba
0f501bc936 fixes for quote controller 2020-08-23 11:08:18 +10:00