1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-14 23:22:52 +01:00
Commit Graph

417 Commits

Author SHA1 Message Date
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
David Bomba
191a31e0a5 Fixes for tests 2020-08-02 20:34:16 +10:00
David Bomba
b780be3995 Ensure group settings can be archived + tests! 2020-08-02 16:31:55 +10:00
Benjamin Beganović
184f60785f wip with table bodies & footer 2020-07-30 17:47:40 +02:00
Benjamin Beganović
70ee476193 wip 2020-07-30 16:43:57 +02:00
Benjamin Beganović
cb4efc8c61 wip 2020-07-29 14:53:58 +02:00
Benjamin Beganović
2e3179d83e Extract variables from the HtmlEngine 2020-07-29 13:37:05 +02:00
David Bomba
0f5eb27a03 Tests for POST routes on clients and invoices shop routes 2020-07-29 08:11:51 +10:00
David Bomba
089ededb7f Tests for shop route 2020-07-29 08:07:58 +10:00
David Bomba
fd97aff3f1 Fixes for routes"
git push
2020-07-28 23:24:01 +10:00
David Bomba
de78ea1506 Shop 2020-07-28 22:05:17 +10:00
David Bomba
d36fdb4025 Fixes for refresh query 2020-07-25 09:02:32 +10:00
Benjamin Beganović
cb055e85d0 Make tests green 2020-07-22 14:40:49 +02:00
Benjamin Beganović
02d1c54d87 Skip design tests 2020-07-22 14:36:53 +02:00
Benjamin Beganović
a9debacce2 Make PdfMakerTest green 2020-07-22 14:34:15 +02:00
Benjamin Beganović
60a73fada3 Move PdfMaker to Services/ folder & update namespaces 2020-07-22 14:30:55 +02:00
David Bomba
8688625931 Validation for locked invoices 2020-07-22 09:54:39 +10:00
Benjamin Beganović
ed06ae96ab Update creative to Creative for autoload 2020-07-21 22:24:54 +02:00
Benjamin Beganović
4caa1f95b1 Playful 2020-07-21 19:00:17 +02:00
Benjamin Beganović
0c6b661f5e Creative 2020-07-21 18:29:20 +02:00
Benjamin Beganović
56e11ac499 Elegant 2020-07-21 18:03:14 +02:00
Benjamin Beganović
8b0cda0c6e Hipster 2020-07-21 16:59:30 +02:00
Benjamin Beganović
5c1bf92bf1 Plain 2020-07-20 17:41:07 +02:00
Benjamin Beganović
c4873e790e Bold design 2020-07-20 17:03:52 +02:00
Benjamin Beganović
8411a1a314 modern: fix table width 2020-07-20 16:26:30 +02:00
Benjamin Beganović
15d8877d48 Modern 2020-07-20 15:05:57 +02:00
Benjamin Beganović
1f8ddc0642 Clean design & filters 2020-07-20 14:10:33 +02:00
Benjamin Beganović
b7bdf3b341 Support $ instead of # for variables 2020-07-20 13:02:30 +02:00
Benjamin Beganović
80df24bb2f Business HTML design 2020-07-15 18:03:54 +02:00
Benjamin Beganović
f25bfbc8ef scaffold test & tailwindcss 2020-07-15 14:27:52 +02:00
Benjamin Beganović
141d82b925 Include example table html 2020-07-14 15:13:46 +02:00
Benjamin Beganović
b774a07e30 Fix sorting children 2020-07-14 15:05:29 +02:00
Benjamin Beganović
bfbe31b185 enable sorting between children elements 2020-07-14 14:35:27 +02:00
Benjamin Beganović
ceecddb8a2 Tests for hidding elements 2020-07-14 14:02:02 +02:00
Benjamin Beganović
5307569bba wrap up engine for setting properties on elements 2020-07-14 13:50:00 +02:00
Benjamin Beganović
2be39a4756 Generating template elements recursively 2020-07-13 17:49:28 +02:00
Benjamin Beganović
66d23cd816 Refactor logic for replacing variables 2020-07-13 14:16:18 +02:00
Benjamin Beganović
92b2295db1 Adjust state & make tests green 2020-07-13 13:51:54 +02:00
Benjamin Beganović
94976054dd (preview) New table/pdf generation system 2020-07-09 16:05:17 +02:00
David Bomba
3ec593f7ef Fixes for tests 2020-07-08 10:18:13 +10:00
David Bomba
5698a8a8d1 Tests for fees and limits 2020-07-08 01:11:54 +10:00
David Bomba
6a11fae857 Working on Autobill 2020-07-08 00:50:51 +10:00
David Bomba
4c321d41c3 Change subscriptions to webhooks 2020-07-06 21:22:36 +10:00
David Bomba
bd0c523b59 Add ability to set country_id by country code and currency_id by currency code 2020-07-02 20:55:31 +10:00
David Bomba
bd02554dd7 Fixes for tesytS 2020-07-02 12:12:42 +10:00
David Bomba
e216def2ff Use separate repo's for migrations 2020-07-01 14:37:05 +10:00
David Bomba
ae8a61cbcd Fixes for tests 2020-06-27 14:09:16 +10:00
David Bomba
e6bc63b2c2 fixes for tests 2020-06-27 12:35:11 +10:00
David Bomba
1ce5b7ad8e fixes for refunds 2020-06-27 10:20:27 +10:00
David Bomba
fe995ca878 Refactor refunds 2020-06-27 10:05:31 +10:00
David Bomba
08d196e6c0 Fixes for tests 2020-06-26 08:29:24 +10:00
David Bomba
f927e08d41 Fixes for tests 2020-06-25 21:52:04 +10:00
David Bomba
666a2395d1 Implement Bulk actions for designs 2020-06-23 08:11:39 +10:00
David Bomba
c2211bf2f0 FIxes for tests 2020-06-22 13:07:58 +10:00
David Bomba
06a8ee1215 Fix throttling with tests 2020-06-01 17:04:07 +10:00
David Bomba
3abd0e0b17 Fixes for tests 2020-06-01 14:18:33 +10:00
David Bomba
c99c339fab Implement new refund methods 2020-06-01 13:16:06 +10:00
David Bomba
4e84d83db1 Api routes upate 2020-06-01 09:59:26 +10:00
David Bomba
970c9bb87d
Payment Terms (#3737)
* Fixes for converting a quote to invoice

* Fixes for deleting an invoice

* Payment Terms CRUD

* Payment Terms

* Push PaymentTerms back into the DB

* Payment Terms

* Payment Terms

* Create api docs for payment terms
2020-05-23 13:28:24 +10:00
David Bomba
659af63b5c
Add Quotes to RandomDataSeeder (#3714)
* Skip preview tests

* Fixes for product test

* Fixes for tests

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Fixes for incorrect payment types

* Refactor class nameS

* Entity Notification refactor

* Entity Notifications

* Add Quotes to randomdataseederr
2020-05-19 08:22:18 +10:00
David Bomba
84a64773a6
Adjustments for OAuth (#3707)
* Fixes for null values in custom values

* Refactor mailing

* Working on send emails from GMail API

* Fixes for tests

* Test for GMail

* Adjustments for storing oauth token
2020-05-16 20:26:16 +10:00
David Bomba
d05bd7d2c1
Test for Gmail (#3706)
* Fixes for null values in custom values

* Refactor mailing

* Working on send emails from GMail API

* Fixes for tests

* Test for GMail
2020-05-16 12:04:24 +10:00
David Bomba
d3b29d8ae2
Fixes for Stripe (#3702)
* Fixes for tests

* Fixes for Stripe

* Mail jobs
2020-05-14 21:33:29 +10:00
David Bomba
a0eecdd755
Fixes for tests (#3701)
* Update Exchange rate Data once a day

* Tests for currency conversions

* Fixes for tests

* Fix for adding blank product keys

* Class for logging emails sent

* Fixes for tests

* Fixes for testS

* Include credits in first_load=true

* Fixes for tests

* fixes for tests

* Fixes for tests:

* Fixes for tests

* Fixes for tests
2020-05-14 19:08:49 +10:00
David Bomba
6d0d6c10cd
Working on OAuth (#3686)
* Update Exchange rate Data once a day

* Tests for currency conversions

* Fixes for tests

* Fix for adding blank product keys

* Class for logging emails sent

* fixes for oauth
2020-05-12 19:56:30 +10:00
David Bomba
aa690578e3
Implement Currency Conversion library. (#3643)
* Fixes for testS

* Fixes for migration

* Fixes for migratin

* Query performance improvements

* Check Data Script

* Currency Conversion API

* Implement currency conversion

* Currency Conversions
2020-04-19 20:29:58 +10:00
David Bomba
74a6c4f2ee
Reminders (#3630)
* Performance improvements moving from str_replace to strtr

* Remove legacy docs

* Clean up credit transformer

* Working on invoice emails

* Clean up for invoice designs

* Tests for light and dark theme emails

* Working on reminder scheduling

* Reminder Job Class

* Fixes for github actions

* PHP CS

* Test for reminders

* Test for reminders
2020-04-15 10:30:52 +10:00
David Bomba
afee58f746
Google Analytics (#3610)
* Working on google analytics

* google analytics implementation
2020-04-09 22:04:26 +10:00
David Bomba
05443d69ec
Implement CompanyToken and Subscriptions CRUD (#3609)
* Working on Tokens CRUD

* Fixes for company filters

* Working on Token CRUD

* Tests for tokens

* Fixes for OPENApi

* Subscriptions

* Subscriptions
2020-04-09 20:48:04 +10:00
David Bomba
213df6451f
Invoice Cancellation (#3605)
* Ensure release build sets correct file and directory permissions

* Invoice Cancellation

* Invoice Cancellations
2020-04-08 23:31:22 +10:00
David Bomba
2fd3229efd
Implementation of Invoice Reversal (#3602)
* Version bump 0.0.2

* code cleanup

* Working on reversing an invoice

* Working on reversing an invoice

* Working on refunding invoice

* Reversing invoices

* Test for invoice reversals

* Invoice Reversal
2020-04-08 20:48:31 +10:00
David Bomba
6d7b7ca9a3
Invoice Deletion - Ledger (#3590)
* Fixes when implementing

* php_cs

* Clean up

* Clean up

* Working on adjusting ledger when an invoice is deleted
2020-04-04 21:32:42 +11:00
David Bomba
eba0c19824
Fixes for Migration (#3572)
* Remove \Log::, fixes for tests, and fixes for migration

* Debugging migration

* Fixes for Migration
2020-04-01 19:54:22 +11:00
David Bomba
91cf1cc1f2
Debugging migrations (#3570)
* Remove \Log::, fixes for tests, and fixes for migration

* Debugging migration
2020-03-31 22:52:21 +11:00
David Bomba
8b0fe63eb5
Send Generic entity email. (#3560)
* Enable identifying a user who submits a report to sentry for tracking purposes

* Minor fix for setup page

* Fixes for Tests

* Fixes for tests

* Generic Entity Emailer

* Fixes for emailing a generic entity
2020-03-29 23:22:14 +11:00
David Bomba
90cb69f8a5
Performance improvements - PDF generation (#3521)
* Improve performance of PDF building

* Clean up

* Fixes for tests

* Minor fixes
2020-03-25 00:25:20 +11:00
David Bomba
cdc3ef12c2
Include Horizon (#3519)
* Fixes for white label

* Include Laravel Horizon

* Add Account ID to user table AND ensure a user cannot create an invoice across companies

* restart horison after an update

* Fixes for app setup

* Minor fixes

* Fixes for client routes

* Fixes for tests

* minor fixes
2020-03-24 20:15:30 +11:00
David Bomba
43e57d0117
Fixes for self-update (#3514)
* minor fix for payment notifications

* styleci

* Limit Self updating to self hosters only
:

* Fixes for designs

* Minor fixes for self-update
2020-03-21 16:37:30 +11:00
David Bomba
0e12b63c95
Design Changes (#3504)
* Fixes for tests

* Working on PDF tables

* Fixes for null values in designs

* Refactoring entity variables for PDF

* Fixes for pdf variables

* Minor fixes for designs

* Working on variable replacement for tables

* Refactoring designs

* Refactoring designs

* Refactoring design implementation

* Working on refactoring designs

* Serve tailwind locally

* Design changes
2020-03-16 21:12:10 +11:00
David Bomba
93056ea815
Fixes for preview controller (#3486)
* fixes for user model

* Remove stale css

* Working on previewing designs

* Fixes for design previews

* fixes for preview controller

* Fixes for setting company on login

* fixes for preview
2020-03-12 22:04:53 +11:00
David Bomba
a151789d9c
Fixes for invoice previews (#3485)
* Remove stale css

* Working on previewing designs

* Fixes for design previews

* fixes for preview controller
2020-03-12 21:50:40 +11:00
David Bomba
dc8ecbeeed
Fixes for company_user (#3477)
* Minor fixes for user delete

* Working on notifications

* Refactor for notifications

* Fix for checking settings withe negative integers

* Set payment id to 0

* Move pdf download to client side routes

* fixes for company_user

* Fixes for company_user
2020-03-11 22:05:05 +11:00
David Bomba
9d3c6cb0ef
Fixes for PreviewController (#3460)
* Fixes for previewcontroller

* Fixes for previewcontroller

* Logging for invoices
2020-03-09 21:47:17 +11:00
David Bomba
9e39f42aa8
Remove JSON types (#3457)
* Remove backup column from schema

* Add slack webhooks to company user table

* Preview route

* remove json column from company gateway

* fixes for testS

* Fixes for typos

* Remove json types
2020-03-09 20:45:59 +11:00
David Bomba
7d39969a3b
Preview Route (#3456)
* Remove backup column from schema

* Add slack webhooks to company user table

* Preview route

* remove json column from company gateway

* fixes for testS

* Fixes for typos
2020-03-09 20:38:15 +11:00
David Bomba
d13ab48d86
Refactor Designs (#3449)
* Refactor custom invoice HTML generation

* remove table_styles() method from designs

* Refactor designs

* Clean up designs
2020-03-07 17:31:26 +11:00
David Bomba
f0176b6e37
Fixes for quote transformer (#3434)
* remove jobs table

* Working on notifications

* Working on notifications

* Fix for pdf_variables

* Fixes for notification

* Fixes for viewing invoice with NO company custom_fields

* Fixes for company settings object creation

* Working on group settings

* Fixes for storing the correct currency_id on client creation

* Fix for invoicetransformer

* fix for store client

* Update PaymentAppliedValidAmount.php (#38)

* update company schema descriptions

* Update PaymentAppliedValidAmount.php

Co-authored-by: David Bomba <turbo124@gmail.com>

* Cast invoice designs to the Hashes

* Fixes for setting invoice/credit/design_ids to hashed

* Fixes for quote transformer

Co-authored-by: michael-hampton <michaelhamptondesign@yahoo.com>
2020-03-06 22:10:59 +11:00
David Bomba
db88d6a50d
Fixes for V2 (#3408)
* Refactor for user

* payment notifications

* Fixes for contact request

* Fix validation for contacts

* Fixes for base repo

* Fixes for Invoice Repo

* hide password field on clientcontact
2020-03-02 21:22:37 +11:00
David Bomba
0ff14c97fd
Minors Fixes (#3405)
* Tests for client contact passwords

* test for client API

* Client Tests for password quality

* Final tests for client contact password

* Implement feature permissions

* Minor fixes
2020-03-01 21:18:13 +11:00
David Bomba
e2ed1fad8b
Enable client contact password to be set via API. (#3402)
* Tests for client contact passwords

* test for client API

* Client Tests for password quality

* Final tests for client contact password
2020-03-01 16:00:54 +11:00
David Bomba
0f1c685bfa
Fixes for updating company user (#3401)
* update company schema descriptions

* Fixes for company user controlleR
2020-03-01 08:03:43 +11:00
David Bomba
f8ea4c0d0f
Implement Design API (#3400)
* Working on CompanyUser route

* CompanyUser update route

* tests for updating a company user

* Fixes for exchange currency rate

* Move slack and google analytics fields into company table

* implement Design API
2020-02-29 08:57:47 +11:00
David Bomba
0061da2600
Update Company User Route (#3398)
* Working on CompanyUser route

* CompanyUser update route

* tests for updating a company user
2020-02-28 23:11:56 +11:00
David Bomba
abe3376c48
Validate invoices in a payment (#3397)
* Payment Scenarios:

* Fixes for duplicate invoice-ids in a payment
2020-02-28 19:18:34 +11:00
David Bomba
08ce375fbc
Fixes for payments with invoices from different clients (#3396) 2020-02-28 12:58:49 +11:00
David Bomba
b2f4e51b55
V2 (#3385)
* Fixes for payment number

* Fixes for tests
2020-02-26 21:46:35 +11:00
David Bomba
f20b0f7720
Fixes for company tokens. (#3375)
* Testing Company Ledger

* Fixes for company ledger

* Fixes for company ledger

* Company ledger testS

* Fixes for user / client / contacts transformers

* Fixes for tests

* Fixes for tokens
2020-02-26 14:26:07 +11:00