Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-09-23 01:41:34 +02:00
Code Issues Releases Activity
3,257 Commits 7 Branches 902 Tags 2 GiB
6a21da8aba
Commit Graph

1165 Commits

Author SHA1 Message Date
David Bomba
004c07f1e6 Merge branch 'v5-develop' into v5-stable 2020-10-22 20:26:20 +11:00
David Bomba
4ac554607c implement swoole 2020-10-22 20:25:36 +11:00
David Bomba
1e3617b27a
Merge pull request #4195 from Striffly/fix/invoice-preview 
Fix invoice preview with custom designs
 2020-10-22 20:13:41 +11:00
David Bomba
6c1b952111
Refactor requests to use generics (#41) 
* Validation rules for expenses

* Tests

* Tests
 2020-10-22 17:46:02 +11:00
Clément Gayot
5458bf83b0 🐛 Fix invoice preview with custom designs 2020-10-22 01:19:33 +02: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
David Bomba
8ddc14c4d0 Working on check data script 2020-10-21 15:12:54 +11:00
David Bomba
3d59717776 Fixes for credit payments 2020-10-21 15:03:22 +11:00
=
aa0735bb3d Working on credit payments 2020-10-21 10:47:12 +11:00
Benjamin Beganović
1de6f94f10 fix custom1234 2020-10-20 13:01:07 +02:00
David Bomba
fd19e9dc2c Working on credit payments 2020-10-20 16:14:11 +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
8b49c83a67 Fixes for required expense fields 2020-10-20 08:31:19 +11:00
David Bomba
a3afa8ede9 Remove project name unique constraint 2020-10-19 21:59:58 +11:00
David Bomba
93ea785131 Fix for incorrect company country being displayed 2020-10-19 08:21:14 +11:00
David Bomba
708db5a991 Improve eager loading - first load 2020-10-18 18:46:10 +11:00
David Bomba
0717744c5a Valid projects with clients validation 2020-10-16 20:12:37 +11:00
David Bomba
c7d7e71e78 Validation for project clients 2020-10-16 16:17:36 +11:00
David Bomba
62fe99c2d5 Project name should be required 2020-10-16 08:19:55 +11:00
David Bomba
d5ccb17624 Validation rules for Recurring 2020-10-16 08:17:50 +11:00
David Bomba
79e625d8f2 Fixes for recurring number rules and assigned_user_id stickiness for Vendors 2020-10-16 08:17:31 +11:00
David Bomba
07cbb6a71a Fixes for showing recurring invoices in the client portal 2020-10-16 07:35:15 +11:00
David Bomba
901f7c4117 Working on credit payments 2020-10-15 14:35:35 +11:00
David Bomba
0d17b299a0 Refactor payments for credits 2020-10-15 11:37:16 +11:00
David Bomba
1e10f0297b
Merge pull request #4162 from beganovich/v2-fix-setup-buttons 
(v5) Setup fixes & improvements
 2020-10-15 08:15:31 +11:00
David Bomba
3dca6ff171 Add projects to all entities - fixes for gateway casts 2020-10-15 07:58:20 +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
60c29a95c9
Merge pull request #4161 from turbo124/v2 
Expense Categories + Tasks API
 2020-10-14 21:46:04 +11:00
David Bomba
0ec89c18ac Fixes for autobill 2020-10-14 21:45:26 +11:00
David Bomba
a5555cc434 Working on credit payments" 2020-10-14 10:53:20 +11:00
Clément Gayot
c21c79b8be ✨ Add ability to use Browsershot with NODE_PATH & NPM_PATH .env variables 2020-10-13 14:42:54 +02: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
f58ba0b502 Fixes for name validation for expense categories 2020-10-13 19:05:12 +11:00
David Bomba
5b2a43bd9a Fixes for expense categories 2020-10-13 16:02:12 +11:00
David Bomba
28f140ee37 Expense categories 2020-10-13 15:14:13 +11:00
David Bomba
05caec8aef expense categories 2020-10-13 15:08:56 +11:00
David Bomba
57faf6eeb5 Use credits for payments in client portal 2020-10-13 14:25:51 +11:00
David Bomba
b7292a0432 Update email validation 2020-10-13 08:27:42 +11:00
David Bomba
71535c0e41 Add tasks to API 2020-10-13 07:42:02 +11:00
David Bomba
1eadbde544 working on refactor of company gateway fees 2020-10-12 22:02:02 +11:00
David Bomba
65a1f150d5 Fixes for tests 2020-10-12 20:38:55 +11:00
David Bomba
8b48f26c79 Fixes for calcuting gateway fees and for removing unpaid gateway fees appropriately 2020-10-11 08:31:50 +11:00
David Bomba
965b7691fd Fixes for docs 2020-10-10 23:29:00 +11:00
David Bomba
a13b97b0cb Fixes for api docs 2020-10-10 23:07:52 +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
David Bomba
14bcc07da6
Merge pull request #4145 from beganovich/v2-change-text-on-test-pdf 
(v5) Update text on test PDF
 2020-10-10 07:37:09 +11:00
David Bomba
3702f68f32
Merge pull request #4146 from beganovich/v2-update-countries-in-cp 
(v5) Show empty string on PDF if country is not set
 2020-10-10 07:36:56 +11:00
Benjamin Beganović
f33e6768c0 Use invoice 'balance' when comparing with over & under payments. 2020-10-09 16:08:12 +02: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
Benjamin Beganović
f2390de9b3 Change text on test PDF 2020-10-09 15:12:50 +02:00
David Bomba
5cd1acd484
Merge pull request #4143 from turbo124/v2 
Gateway fixes
 2020-10-09 22:13:58 +11:00
Benjamin Beganović
4f26a868a7 Add findOrFail() 2020-10-09 12:44:57 +02: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
cf7ee6338e Working on templates 2020-10-09 12:59:59 +11:00
David Bomba
cd0dce3816
Merge pull request #4138 from turbo124/v2 
Projects API
 2020-10-08 09:31:37 +11:00
David Bomba
dd4d14d128 Implement Projects API 2020-10-08 09:25:39 +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
David Bomba
c41fb6e00f Auto bill flag enable/disable auto_bill_enabled 2020-10-07 17:33:16 +11:00
David Bomba
d4e2a0071a Analytics 2020-10-07 14:56:35 +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
3aa5e2e4eb Minor release 2020-10-06 21:06:14 +11:00
David Bomba
4fe1c29751 Working on recurring 2020-10-06 12:36:25 +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
Benjamin Beganović
c0f3576d55 Fix imports 2020-10-05 10:16:36 +02:00
David Bomba
06b7dfa291 Fixes for Recurring 2020-10-04 21:24:55 +11:00
David Bomba
fccc98caa7 Fixes for model factories -> invoice designs 2020-10-04 20:34:08 +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
3fa336946f Fixes for Laravel 8 2020-10-01 21:34:05 +10:00
David Bomba
6d779030dc Trust proxies setup 2020-10-01 09:32:27 +10:00
=
09399b3aaa Delete invoice PDF on invoice update! 2020-09-30 19:10:02 +10:00
David Bomba
8756a89885 Allow login using contact_key or client_hash 2020-09-30 08:42:55 +10:00
Benjamin Beganović
a210790a57 Fix overpayments 2020-09-29 14:16:01 +02:00
Benjamin Beganović
4e9bc0552d Rename "Downloads" to "Documents": 
- Remove Livewire auto-publish from composer.json
- Replace old DocumentController with DownloadsController
- Rename DownloadsTable & downloads-table to DocumentsTable & documents-table
- New ShowDocumentRequest for displaying documents
- Change authorize() with DownloadMultipleDocumentsRequest
- Change route in PortalComposer
- Update Livewire assets
- Remove old documents routes
 2020-09-28 12:04:34 +02:00
David Bomba
7b926980f1
Merge pull request #4111 from turbo124/v2 
Only show implemented gateways
 2020-09-28 20:34:52 +10:00
Benjamin Beganović
69b5ec1705 Change Downloads translation to Documents in CP 2020-09-28 11:45:22 +02:00
David Bomba
fd67a48c91 Bug fixes 2020-09-27 20:39:13 +10:00
David Bomba
c965e8d08b Fixes for injecting settings object into email blade templates 2020-09-27 19:22:34 +10:00
David Bomba
951188b39e
Merge pull request #4102 from beganovich/v2-profile-settings-in-livewire 
Profile settings updates
 2020-09-25 07:23:31 +10:00
Benjamin Beganović
35ed396323 Profile settings: Shipping address 2020-09-24 14:40:27 +02:00
Benjamin Beganović
b06c9c18fc Update country_id for personal country id 2020-09-24 14:40:20 +02:00
Benjamin Beganović
2f089707f4 Use Hash:: to encrypt passwords 2020-09-24 14:40:06 +02:00
Benjamin Beganović
554e595211 Profile settings: Shipping address 2020-09-24 14:23:05 +02:00
Benjamin Beganović
e5183dee56 Profile section: Name, website, logo 2020-09-24 13:44:56 +02:00
David Bomba
7e85ee0be3
Merge branch 'v2' into v2 2020-09-24 21:37:17 +10:00
Benjamin Beganović
a9e40aab37 Profile section: General informatioon 2020-09-24 13:29:41 +02:00
David Bomba
4cf56d5138 Working on recurring schedules 2020-09-24 21:03:59 +10:00
Benjamin Beganović
24685db429
Merge branch 'v2' into v2-editable-invoice-amount 2020-09-24 11:33:01 +02:00
Benjamin Beganović
0216286efc Support for over & under payments 2020-09-24 11:29:47 +02:00
David Bomba
b906e1e92f Fixes for hasrecurrence trait 2020-09-24 13:40:13 +10:00
David Bomba
4db72d11e1 Actions for recurring invoices 2020-09-24 10:57:44 +10:00
David Bomba
2627ec8894 PHP Cli version 2020-09-23 14:11:34 +10:00
David Bomba
c59e6a2141 Client contact authentication using contact_key 2020-09-23 13:56:56 +10:00
David Bomba
0e5199e052 Working on contact auth using contact key 2020-09-23 11:45:07 +10:00
David Bomba
81ef541d2e Expense API Endpoints 2020-09-23 10:46:35 +10:00
David Bomba
ab0ec5e2cb Vendor API endpoints 2020-09-23 10:16:19 +10:00
David Bomba
78848fff4f fixes 2020-09-21 16:27:02 +10:00
David Bomba
4b00d3a82a Improve eager loading 2020-09-19 20:05:29 +10:00
David Bomba
8dd8b83fd3 Fixes for passing settings object into all mail templates 2020-09-19 15:02:34 +10:00
=
83be13c049 fixes for types 2020-09-19 12:15:38 +10:00
=
20e4c4b1ad Improve eager loading 2020-09-19 12:05:54 +10:00
=
88eb05786e Fixes for updateinvoicepayment 2020-09-19 11:20:14 +10:00
David Bomba
23c22dd9dc Fixes for tests 2020-09-19 10:17:13 +10:00
Benjamin Beganović
a1e11cf161 invoices-table fix for balance due 2020-09-18 14:47:36 +02:00
Benjamin Beganović
020005d20d Update PaymentMethodController:destroy() with generic gateway detach 2020-09-18 09:48:39 +02:00
David Bomba
8471c2689f Fix for user_confirmation code 2020-09-16 09:56:10 +10:00
David Bomba
aeeb099d40 Fixes for mailers 2020-09-14 15:14:37 +10:00
David Bomba
37bbe8f1e3 Fixes for validation on recurring 2020-09-13 21:46:03 +10:00
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