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

513 Commits

Author SHA1 Message Date
David Bomba
e8da728428
Merge pull request #4946 from joshuadwire/v5-develop
Update import process to handle new data format
2021-02-20 11:57:36 +11:00
Joshua Dwire
4aae7c0b1a Update import process to handle new data format 2021-02-19 19:50:17 -05:00
David Bomba
7241430ce5 Improve coverage for CSV imports 2021-02-19 07:20:23 +11:00
David Bomba
78363f120d Fixes for testsg 2021-02-18 14:39:29 +11:00
David Bomba
704477f803 Imports 2021-02-18 14:37:17 +11:00
Joshua Dwire
e11e71514a Add tests; block sending payment emails during an import. 2021-02-17 22:05:33 -05:00
David Bomba
222cd28836 Fix for mail refactor 2021-02-18 11:12:49 +11:00
David Bomba
9fa043afdd Fixes for tests 2021-01-30 00:06:29 +11:00
David Bomba
b5ff2d8a02 Fixes for company gateway payment method resolution 2021-01-27 12:06:25 +11:00
David Bomba
0f8ee2d101 Tests for paid_to_date 2021-01-24 20:08:57 +11:00
David Bomba
6170dfae12 Fixes for tests 2021-01-24 20:00:45 +11:00
David Bomba
1ff29a2d55 Fix for usercreated event 2021-01-14 20:31:27 +11:00
David Bomba
8b22fa5a47 Fixes for user events 2021-01-14 15:31:45 +11:00
David Bomba
30cc2956a1 Fixes for tests 2021-01-11 22:29:21 +11:00
David Bomba
b5606c1524 Fixes for task statuses and tests 2021-01-08 09:25:00 +11:00
Benjamin Beganović
b6d55ceea0 php-cs-fixer 2021-01-06 13:06:42 +01:00
Benjamin Beganović
5833df9850 Refactor calcGatewayFee:
- Remove default GatewayType::CREDIT_CARD
- Swapped spaces for taxes & gateway type
2021-01-04 14:07:50 +01:00
David Bomba
934610a01c Update copyright + version bump + set canadian dollar symbol to $ 2021-01-04 08:54:54 +11:00
=
7a058c9ae6 Move logging to nlog 2020-12-30 08:10:03 +11:00
=
4129dba08b Test for HTML output for preview controller 2020-12-26 20:26:19 +11:00
Benjamin Beganović
0bbd910490 apply php-cs-fixer 2020-12-25 12:29:42 +01:00
=
445bf451bf Fixes for tests and throwing correct failure 2020-12-23 09:04:19 +11:00
Benjamin Beganović
69bc664457
Merge pull request #4549 from beganovich/v5-snappdf-integration
(v5) snappdf support
2020-12-22 09:31:22 +01:00
Benjamin Beganović
85d241e15e update global margin 2020-12-21 16:55:47 +01:00
Benjamin Beganović
5a8dfd85eb Apply php-cs-fixer 2020-12-21 11:46:46 +01:00
David Bomba
5aae89d9ea Fixes for tests 2020-12-20 20:13:40 +11:00
David Bomba
ccde0eaced Working on importing CSV Invoices 2020-12-20 18:02:58 +11:00
David Bomba
4df646f93b Fixes for tests 2020-12-20 12:21:40 +11:00
David Bomba
09c2c40903 Fixes for import test 2020-12-18 15:34:40 +11:00
David Bomba
f476a090bc mark csv test skipped 2020-12-18 12:01:45 +11:00
David Bomba
df30f0cbc5 Fixes for github actions 2020-12-18 11:31:27 +11:00
Benjamin Beganović
f9d65941d8 Fixes for tests 2020-12-17 13:44:44 +01:00
Benjamin Beganović
942652b668 Update webhooks to support Checkout.com & apply php-cs-fixer 2020-12-17 12:27:15 +01:00
David Bomba
7353687c04 Working on client import 2020-12-16 21:06:20 +11: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
David Bomba
64b9f94299 Working on Import / Export 2020-12-14 21:43:07 +11:00
David Bomba
3419d7900f Tests for importing CSV files 2020-12-12 21:35:42 +11:00
David Bomba
584bef52fc Working on import 2020-12-12 21:01:53 +11:00
Benjamin Beganović
1f2c3f2823 update pagination links & apply php-cs-fixer 2020-12-05 14:24:21 +01:00
David Bomba
4f0776a323 Working on tests for deleted invoice 2020-12-05 09:08:10 +11:00
David Bomba
91fcba628f Tests for invoice deletion 2020-12-05 08:10:31 +11:00
David Bomba
de5a5300a2 Working on tests for deleted invoice 2020-12-04 20:58:54 +11:00
David Bomba
cb19234d9e Working on tests for delete invoice refactor 2020-12-04 17:40:59 +11:00
Benjamin Beganović
ae88d5e08e php-cs-fixer format 2020-11-25 15:19:52 +01:00
David Bomba
8255ffc0cf Minor tests for client portal 2020-11-17 21:26:45 +11:00
David Bomba
fe5218fd2c Fixes for resolving company_user from user object 2020-11-13 21:42:06 +11:00
=
cd0bbbe096 Remove redundant classes 2020-11-08 21:53:47 +11:00
=
3a7a35c845 Fixes for import 2020-11-07 21:13:04 +11:00
David Bomba
3d67483607 Fixes for tests 2020-11-04 09:19:31 +11:00
David Bomba
4d58188da4 Refactor company gateway schema for required fields 2020-11-04 08:29:53 +11:00
David Bomba
64b703513d Refactor company gateway schema for required fields 2020-11-04 08:26:28 +11:00
David Bomba
e7a1e4c4db Working on activities 2020-11-03 16:44:50 +11:00
David Bomba
9717424ce1 Payment Tests 2020-11-03 08:18: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
David Bomba
86ee5f477b Fixes for expense numbers 2020-10-29 21:48:56 +11:00
David Bomba
fa92dd76e4 Tests for starting and stopping tasks 2020-10-29 21:44:05 +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
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
0453c989eb PDF Entity generation tests 2020-10-26 20:13:00 +11:00
David Bomba
c8e2d94b3f Fixes for tests + remove swoole 2020-10-22 21:14:14 +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
David Bomba
f0e4a94bee Task Statuses 2020-10-20 10:01:59 +11:00
David Bomba
f0b532847d Fixes for testsg 2020-10-16 08:45:46 +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
71535c0e41 Add tasks to API 2020-10-13 07:42:02 +11:00
David Bomba
d89b4fcbc3 Refactor for gateway fee calculations 2020-10-12 22:25:27 +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
f063337ec4 Refactoring gateway fees and limits 2020-10-12 15:58:07 +11:00
David Bomba
046805995a Recalculating gateway fees depending on gateway type 2020-10-12 15:30:53 +11:00
David Bomba
f1c5f37189 Documents for tasks 2020-10-12 08:36:59 +11:00
David Bomba
4c08187bf1 tests for documents 2020-10-12 08:34:02 +11:00
David Bomba
dd4d14d128 Implement Projects API 2020-10-08 09:25:39 +11:00
David Bomba
70a575386c Fixes for designs in migration: 2020-10-07 10:16:57 +11:00
David Bomba
ee67911afb Fixes for tests 2020-10-06 22:32:07 +11:00
David Bomba
3fa336946f Fixes for Laravel 8 2020-10-01 21:34:05 +10:00
David Bomba
c65950672d Fixes for model factories for L8 2020-10-01 20:49:47 +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
23c22dd9dc Fixes for tests 2020-09-19 10:17:13 +10:00
David Bomba
712b8991e2 Fixes for versions 2020-09-18 17:21:42 +10:00
David Bomba
bae82b56c1 Add license 2020-09-14 21:11:46 +10:00
David Bomba
3083ab6237 Set unique on Group Settings Name 2020-09-08 20:44:32 +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
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ć
4b6c2bff4c Added footer to designs 2020-09-04 10:18:58 +02:00
Benjamin Beganović
50c37a8719 Update logic to support only one dynamic design class:
- New Design.php class that will act as master template
- PdfMaker->design() now accepts design object instead of string
- PdfMaker: Skip elements if no id|tag provided
- PdfMaker: 'content' property is now optional
- config/ninja.php now contains base_path for templates
- Refactored tests to be :green: ✔
- Removed PdfMakerDesignsTest since content is same for each template now
2020-09-04 10:18:41 +02:00
David Bomba
6c8e106959 cleaning up logging in tests 2020-09-03 21:01:04 +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
93a886db08 fixes for tests 2020-08-31 17:51:33 +10:00
David Bomba
217d3be2cb Fixes for tests 2020-08-31 17:48:30 +10:00
David Bomba
1bd3deca4f Invoice payments with gateway fees 2020-08-31 14:27:47 +10:00
David Bomba
1bc71fb5d8 Working on gateway fees 2020-08-30 08:00:57 +10:00
David Bomba
6dea2fe7d2 Add test mode flag to company gateways 2020-08-29 22:16:23 +10:00
Benjamin Beganović
d508d9b8f2
Merge branch 'v2' into v2-pdfmaker-design-improvements 2020-08-28 08:17:46 +02:00
Benjamin Beganović
af7995815c Rename all_page_* to all_pages_* for dynamic header/footer 2020-08-27 08:47:51 +02:00
Benjamin Beganović
c893a547ef Fixes for tests 2020-08-27 08:41:38 +02:00
Benjamin Beganović
edbadabab4 Support for separate variable: all_page_header && all_page_footer 2020-08-27 08:39:14 +02:00
Benjamin Beganović
e965aded06 engine for repeating headers 2020-08-26 09:02:38 +02:00
David Bomba
37c5a7adb5 Test for gateway fees appending to invoice 2020-08-26 08:10:49 +10:00
Benjamin Beganović
234beee61b Enable injecting print CSS into document 2020-08-25 10:51:49 +02:00
David Bomba
4c3f466d58 Tests for system log routes 2020-08-24 20:28:47 +10:00
Benjamin Beganović
13e70e24d5 wip 2020-08-21 16:47:17 +02:00
Benjamin Beganović
23577a5f0f Refactor context['product-table-columns'] to generic pdf_variables:
- Pass 'pdf_variables' to CreateQuotePdf & CreateInvoicPdf
- Update Playful & Plain to support new variable engine
- Update DesignHelpers trait to support new variable engine
- Make tests pass for ExampleIntegrationTest
2020-08-21 11:59:39 +02:00
Benjamin Beganović
ba41e22b3b Make tests for PdfMaker green 2020-08-21 11:12:42 +02:00
David Bomba
021b741e56 Tests for gateway fees 2020-08-19 08:33:58 +10:00
David Bomba
8e622c81fa More test cases 2020-08-17 16:23:12 +10:00
David Bomba
4172f60002 Fixes for tests 2020-08-17 14:27:21 +10:00
David Bomba
2ebb62648d TestS 2020-08-17 13:51:16 +10:00
David Bomba
d6e169a891 Working on tests for fees and limits 2020-08-17 13:03:21 +10:00
David Bomba
d53418f041 Fixes for tests 2020-08-15 20:44:05 +10:00
David Bomba
5bfcdc80b2
Merge pull request #3972 from beganovich/v2-0708-pdfmaker-integration
(wip) End-to-end PDF Maker integration
2020-08-14 06:53:00 +10:00
David Bomba
e21e70bdcd Fixes for tests 2020-08-13 10:57:06 +10:00
David Bomba
56b29939bb Fixes for tests 2020-08-12 20:12:55 +10:00
David Bomba
b113859690 Work on validation for unique invoice numbers 2020-08-12 20:11:13 +10:00
David Bomba
c2a32e48df Fixes for tests 2020-08-12 16:48:09 +10:00
Benjamin Beganović
e99bd59aa0 Implement getting raw HTML out of sections 2020-08-11 17:19:52 +02:00
Benjamin Beganović
8a23ed35ea Fixes for global tests 2020-08-10 18:40:04 +02:00
Benjamin Beganović
b5f2ae6d6b Fixes for PdfMaker tests 2020-08-10 18:06:12 +02:00
Benjamin Beganović
f7408e1fb3 Added new labels & update designs 2020-08-07 17:47:17 +02:00
Benjamin Beganović
8381d37431 Update entity type:
- Default entity type is 'product'
- Added type check
- Fixed double slash in design path
2020-08-07 16:11:10 +02:00
Benjamin Beganović
007ec3a85a Plain:
- Extract table footer into tableFooter()
- Add all footer elements
2020-08-07 14:30:56 +02:00
Benjamin Beganović
00fcb1dd32 Modern:
- Extract table footer into tableFooter()
- Add all footer elements
2020-08-07 14:28:36 +02:00
Benjamin Beganović
80b6512df4 Hipster:
- Extract table footer into tableFooter()
- Add all footer elements
2020-08-07 14:25:43 +02:00
Benjamin Beganović
fe1cef3d62 Elegant:
- Extract table footer into tableFooter()
- Add all footer elements
2020-08-07 14:22:18 +02:00
Benjamin Beganović
6cdcf0d914 Creative:
- Extract table footer into tableFooter()
- Add all footer elements
2020-08-07 14:17:55 +02:00
Benjamin Beganović
9ee8a1658e Clean:
- Extract table footer into tableFooter()
- Add all footer elements
2020-08-07 14:05:40 +02:00
Benjamin Beganović
0597b01847 Business:
- Extract table footer into tableFooter()
- Add all footer elements
2020-08-07 14:03:25 +02:00
Benjamin Beganović
da74ecba6e Bold:
- Extract table footer into tableFooter()
- Add all footer elements
2020-08-07 14:00:23 +02:00
Benjamin Beganović
b438309736 Playful:
- Extract table footer into tableFooter()
- Add all footer elements
2020-08-07 13:55:02 +02:00
David Bomba
2dff1f44d2 skip tests 2020-08-07 16:34:34 +10:00
David Bomba
c220108168 Add documents as default includes 2020-08-06 13:04:09 +10:00
David Bomba
f773356f70
Merge pull request #3951 from beganovich/v2-pdfmaker-integration
Designs integration with new PDF Maker
2020-08-06 07:57:56 +10:00
Benjamin Beganović
6676cab698 Playful 2020-08-05 15:40:57 +02:00
Benjamin Beganović
4f69a874cf Modern design 2020-08-05 15:17:45 +02:00
Benjamin Beganović
7a9c8ca9a0 Hipster design 2020-08-05 15:02:32 +02:00
Benjamin Beganović
66ff55cddf Elegant 2020-08-05 14:43:51 +02:00
Benjamin Beganović
b1b42f5919 Creative 2020-08-05 14:34:22 +02:00
Benjamin Beganović
1876b228ed Clean 2020-08-05 14:24:10 +02:00
David Bomba
a5d2ac2cb9 Fixes for fees and settings object 2020-08-05 21:48:53 +10:00
Benjamin Beganović
2333a78775 Business design 2020-08-05 12:35:38 +02:00
Benjamin Beganović
d63678435f Bold design 2020-08-05 12:13:48 +02:00
Benjamin Beganović
438054744e refactor invoice to entity 2020-08-05 11:52:01 +02:00
Benjamin Beganović
ad2ff79336 Complete Plain.php 2020-08-04 17:32:28 +02:00
David Bomba
5b59efa437 Fixes for payments with credits 2020-08-04 15:09:07 +10:00