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

517 Commits

Author SHA1 Message Date
David Bomba
aa852930e6 refactor from email names to use config() values 2020-12-02 14:08:35 +11:00
David Bomba
a8958f4b09 Minor fixes for batch migrations 2020-11-30 18:43:33 +11:00
David Bomba
1210a81a09 Minor changes to migration 2020-11-30 09:58:31 +11:00
David Bomba
f2f8837269 Merge branch 'v5-stable' of https://github.com/turbo124/invoiceninja into v5-stable 2020-11-30 08:32:27 +11:00
David Bomba
d7dd592d18 Fixes for migration file location 2020-11-30 08:28:12 +11:00
David Bomba
9aee129737 Fixes for import 2020-11-28 17:22:43 +11:00
David Bomba
d07dedf264 Add tax_rates relation to company_user 2020-11-27 08:05:30 +11:00
Benjamin Beganović
ae88d5e08e php-cs-fixer format 2020-11-25 15:19:52 +01:00
David Bomba
79e8f096fe Fix for custom_values breaking invoicesum 2020-11-25 20:53:50 +11:00
David Bomba
c2b07c3ebc Fixes for migration data checks 2020-11-25 13:59:23 +11:00
David Bomba
2f4b46e435 Refactor webhook handler 2020-11-25 11:23:39 +11: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
6f1b4d4548 Change JSON parser 2020-11-24 08:33:37 +11:00
David Bomba
8cbaac53c6 Fixes for projects in migration 2020-11-24 08:00:59 +11:00
David Bomba
b5fe5070b5 Working on migrations 2020-11-23 23:55:04 +11:00
David Bomba
0991dbf8d7 Fixes for migrations 2020-11-23 14:51:49 +11:00
David Bomba
388c0e8467 Add withTrashed() for queries in migration 2020-11-23 08:25:29 +11:00
David Bomba
9f420ba084
Merge pull request #4346 from turbo124/v5-develop
Change default queue to Database.
2020-11-22 22:22:52 +11:00
David Bomba
e55de0fb1b Change default queue to database 2020-11-22 22:14:49 +11:00
Benjamin Beganović
c434d6313c start database migration with correct key 2020-11-20 10:34:54 +01:00
David Bomba
e82d8e0d8d Fail gracefully if cannot upload logo 2020-11-19 22:33:14 +11:00
David Bomba
7fb9877eca Fixes for currency seeder 2020-11-18 21:46:36 +11:00
David Bomba
e91c82aa8b Fixes for bulk import 2020-11-18 20:35:09 +11:00
David Bomba
6376d5fa98
Merge pull request #4325 from turbo124/v5-develop
Minor fixes for client portal
2020-11-18 08:00:02 +11:00
Benjamin Beganović
501f3c9b0e injecting signatures into entity invitations 2020-11-17 16:57:34 +01:00
David Bomba
3f9bea3f91 Minor fixes for tests 2020-11-17 20:53:32 +11:00
David Bomba
a182c5a8ca minor fixes for imports 2020-11-17 10:04:10 +11:00
David Bomba
5a6d543e34 Minor fixes for imports 2020-11-17 08:56:52 +11:00
David Bomba
77929a6bc3 Minor fixes for bulk import 2020-11-16 15:40:52 +11:00
David Bomba
a8f186c921 Remove redundant entity notification 2020-11-16 13:41:43 +11:00
David Bomba
861c4ef4e7
Merge pull request #4296 from beganovich/v5-migration-fixes
(v5) (wip) (no-merge) Refactor accepting new migrations
2020-11-14 17:03:26 +11:00
David Bomba
f1c1243146 Fixes for mail 2020-11-12 20:41:19 +11:00
Benjamin Beganović
952b6a7e4f Fix the way we process migration 2020-11-12 10:24:59 +01:00
David Bomba
ef9043db44 error handling for mail 2020-11-12 15:37:50 +11:00
David Bomba
5cd2ae0dbe payment listeners 2020-11-12 14:04:27 +11:00
David Bomba
7af791a4c4 Working on from, replyTo and bcc emails 2020-11-12 12:43:32 +11:00
David Bomba
42c1f8fe5f Minor fixes 2020-11-12 07:42:20 +11:00
David Bomba
28cbd75fcb Fixes for credit PDF 2020-11-11 11:13:39 +11:00
David Bomba
ade0148d67 custom translations 2020-11-10 15:06:46 +11:00
David Bomba
b329d317ef Custom labels 2020-11-10 15:04:53 +11:00
David Bomba
7977b2a1e7 Remove stale classes 2020-11-10 08:04:57 +11:00
David Bomba
af39d5e50c Fixes for payment notifications 2020-11-09 21:26:36 +11:00
David Bomba
9174b7e628 Fixes for emails and reminders 2020-11-09 21:17:20 +11:00
David Bomba
2e8cb84570 Payment emails 2020-11-09 13:57:34 +11:00
David Bomba
fcef2c72b3 Working on payment emails 2020-11-09 13:39:42 +11:00
=
cd0bbbe096 Remove redundant classes 2020-11-08 21:53:47 +11:00
David Bomba
0d4ad91cd4 Fixes for reminder template emails 2020-11-08 08:17:30 +11:00
=
3a7a35c845 Fixes for import 2020-11-07 21:13:04 +11:00
=
2cf97caaaf Fixes for import 2020-11-07 20:08:21 +11: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
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
David Bomba
5c5102baeb Working on reminders 2020-11-04 20:32:49 +11:00
David Bomba
d598aeeb03 Working on reminders 2020-11-04 19:43:20 +11:00
David Bomba
37aaa1fc5b Fixes for importing company logo 2020-11-04 11:32:18 +11:00
David Bomba
a3acc6a019 Update or Create product 2020-11-04 09:47:06 +11:00
David Bomba
f98e7d15da fixes for updating products 2020-11-04 00:57:48 +11:00
David Bomba
f6b53d27e6 is_disabled for recurring invoices 2020-11-01 21:29:34 +11:00
David Bomba
f911d17a6b Fix for migration 2020-11-01 20:41:49 +11:00
David Bomba
685b7e25c2 Fixes for queries 2020-11-01 16:18:40 +11:00
=
e4b326c423 Removing is_migrating 2020-11-01 14:21:39 +11:00
=
dfb55dbd8b remove is_migrating 2020-11-01 14:19:03 +11:00
David Bomba
6a54bb8c45 Fixes for migrations Vendor Contacts 2020-10-31 16:35:05 +11:00
David Bomba
afcbb870bf Fixes for migration 2020-10-31 11:46:00 +11:00
David Bomba
a18b1b431e working on migration for vendors, expenses, tasks 2020-10-31 08:13:02 +11:00
David Bomba
f5c03fee6e Process Expenses 2020-10-30 23:22:32 +11:00
David Bomba
98d81d09fa Fixes for task status types" 2020-10-30 23:16:19 +11:00
David Bomba
c289a8252a Migration of expenses and tasks 2020-10-30 23:01:30 +11:00
David Bomba
a283f1dcf7 Working on migration for expenses and tasks 2020-10-30 20:17:29 +11:00
David Bomba
afa5f2338c Fixes for account plan 2020-10-30 07:59:47 +11:00
David Bomba
c21ad042ce fixes for payment notifications 2020-10-29 15:47:44 +11:00
David Bomba
9aeb2d7a5b Psalm cleanup 2020-10-28 21:10:49 +11:00
David Bomba
adeda5526e Add Psalm, code cleanup! 2020-10-28 17:58:15 +11:00
David Bomba
d7930e4c14 Remove redundant classes 2020-10-28 17:27:10 +11:00
David Bomba
946b1d6396
Merge pull request #4219 from Striffly/fix/company-logo
Fix logo upload, keep png alpha
2020-10-28 10:43:27 +11:00
Clément Gayot
0df7e59d89 🐛 Fix logo upload, keep png alpha 2020-10-28 00:22:24 +01:00
David Bomba
0a02323792 Quote email engine 2020-10-28 10:02:32 +11:00
David Bomba
3135139f90 Remove logging 2020-10-27 23:19:26 +11:00
David Bomba
f6435ab030 Working on emails 2020-10-27 22:57:12 +11:00
David Bomba
417562b80d Fixes for phantom JS view invitation 2020-10-27 15:26:04 +11:00
David Bomba
1de7a693cc Refactor Phantom JS building HTML 2020-10-27 14:09:13 +11:00
David Bomba
e17f5438ee Working on generic entity emailer 2020-10-27 11:05:42 +11:00
David Bomba
0df672baaa remove white space and carriage returns from version 2020-10-27 07:46:06 +11:00
David Bomba
8f53424017 Fixes 2020-10-27 06:10:04 +11:00
David Bomba
0453c989eb PDF Entity generation tests 2020-10-26 20:13:00 +11:00
David Bomba
8d508bb1f9 Refactor pdf generation 2020-10-26 15:06:58 +11:00
David Bomba
1b2922b57c credit payment type 2020-10-26 11:58:08 +11:00
David Bomba
2d0e1a53f2 Fixes for autobill 2020-10-23 15:18:16 +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
Benjamin Beganović
1de6f94f10 fix custom1234 2020-10-20 13:01:07 +02:00
David Bomba
90494547c5 Fix for whitelabel getter 2020-10-20 13:23:48 +11:00
David Bomba
e129419644 recurring logging 2020-10-20 11:57:58 +11:00
David Bomba
bc2b0f4aae Fix for recurring number collisions - use dispatchNow() 2020-10-20 11:53:54 +11:00
David Bomba
840696ad3c Fixes for email invoice 2020-10-20 10:37:33 +11:00
David Bomba
f0e4a94bee Task Statuses 2020-10-20 10:01:59 +11:00
David Bomba
6f1f0ecebe Adjust the way we import credits from V4 to V5 - refactor check data script to reflect changes 2020-10-18 20:25:32 +11:00
David Bomba
708db5a991 Improve eager loading - first load 2020-10-18 18:46:10 +11:00
David Bomba
407304d3c6 Console commands for small test data batches 2020-10-10 14:32:10 +11:00
David Bomba
cd0dce3816
Merge pull request #4138 from turbo124/v2
Projects API
2020-10-08 09:31:37 +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
d4e2a0071a Analytics 2020-10-07 14:56:35 +11:00
David Bomba
b8b3149582 Working on recurring & analytics 2020-10-07 14:00:32 +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
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
David Bomba
45b6c1bcc2 Recurring migration 2020-10-05 22:32:56 +11:00
David Bomba
1390e739e3 recurring 2020-10-02 16:33:55 +10:00
David Bomba
2c4cfa409a Recurring invoice migrations 2020-10-02 08:19:42 +10:00
David Bomba
16b731d010 Bump laravel to version 8 2020-10-01 15:33:38 +10:00
David Bomba
5c0776cf14 Working on Delete user bug 2020-09-28 12:56:11 +10:00
David Bomba
3c4bc4a516 Fixes for recurring scheduling 2020-09-26 09:48:42 +10:00
David Bomba
4cf56d5138 Working on recurring schedules 2020-09-24 21:03:59 +10:00
David Bomba
0338a30a48 Fixes for generic email templates 2020-09-21 08:17:57 +10:00
David Bomba
4b00d3a82a Improve eager loading 2020-09-19 20:05:29 +10:00
Benjamin Beganović
99d31207e1 Fix quote generating 2020-09-18 10:45:26 +02:00
David Bomba
24104509b3 Fixes for recurring invoice schema - auto_bill_enabled 2020-09-17 09:26:23 +10:00
David Bomba
aeeb099d40 Fixes for mailers 2020-09-14 15:14:37 +10:00
David Bomba
f0bd089acb
Merge pull request #4054 from turbo124/v2
Gateway fees and payments.
2020-09-11 16:15:53 +10:00
Benjamin Beganović
1b36dc5868 cleanup 2020-09-10 13:01:34 +02:00
Benjamin Beganović
207c9388b5 Fix migration issues 2020-09-10 13:01:10 +02:00
David Bomba
f7dc573551 Fixes for invoices 2020-09-10 15:20:13 +10:00
David Bomba
c67fee3fff Fixes for base driver 2020-09-09 20:05:10 +10:00
David Bomba
f8f8da830e Working on recurring invoices + reminders 2020-09-08 21:01:55 +10:00
David Bomba
f5eecf0eb6 Working on recurring 2020-09-08 20:34:14 +10:00
David Bomba
d909b4939c Minor fixes for PayPal 2020-09-07 13:14:43 +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
David Bomba
bb4aac1aeb
Merge pull request #4025 from turbo124/v2
Gateway fees implementation
2020-08-31 17:58:43 +10: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
Benjamin Beganović
53cb0fc076 Fix entity on quote 2020-08-27 10:06:08 +02:00
Benjamin Beganović
af7995815c Rename all_page_* to all_pages_* for dynamic header/footer 2020-08-27 08:47:51 +02:00
David Bomba
044c35266e Fixes for zapier 2020-08-24 21:53:22 +10:00
David Bomba
e6de7c9661 Logging for webhook handler 2020-08-24 21:16:35 +10: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
David Bomba
b2d5a8b070 Fixes for bulk emailing quotes 2020-08-19 12:55:58 +10:00
Benjamin Beganović
0a493c275e Enable is_public for document uploads 2020-08-18 16:12:46 +02:00
David Bomba
5daeab3895 allow total columns to be customized in PDF 2020-08-14 13:59:14 +10:00
David Bomba
3ac9cc5158 Add reminder fields to entities 2020-08-14 08:08:10 +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
Benjamin Beganović
0ba6a4351e Integrate new PdfMaker for CreateQuotePdf 2020-08-12 19:21:29 +02:00