1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-16 08:02:40 +01:00
Commit Graph

143 Commits

Author SHA1 Message Date
David Bomba
b6ef517d93 Fixes for fee calculations 2022-03-16 20:14:40 +11:00
David Bomba
8890df9e7e Fixes for fee calculations 2022-03-16 19:02:53 +11:00
David Bomba
92b490043c Handle 100% gateway fees 2022-01-08 14:54:02 +11:00
David Bomba
8109ef3c50 Company gateway Filters 2022-01-03 12:35:31 +11:00
David Bomba
2e19d1e4a9 Fixes for handling payment drivers that do not exist in v5 2021-12-31 09:23:54 +11:00
David Bomba
74b60e44ab mindor fixes for check data scripts 2021-11-03 20:37:17 +11:00
David Bomba
6641320567 Refactor for payment failure mailers 2021-10-17 21:40:40 +11:00
David Bomba
bc81043973 Fixes for Molli 2021-08-11 16:43:20 +10:00
Benjamin Beganović
d3cc6d6014 Allow $client in driver() (CompanyGateway) to be nullable 2021-08-02 14:47:34 +02:00
David Bomba
c0287085b5 Scaffolding Paytrace 2021-07-20 21:26:24 +10:00
David Bomba
620ad57d50 merging v5-dev 2021-07-05 09:00:46 +10:00
David Bomba
71e0ec9b60 Fixes for company gateway system logs 2021-07-04 08:22:33 +10:00
David Bomba
15bdb3ff3c Payfast 2021-06-24 15:46:10 +10:00
David Bomba
36f6cbbcc9 Update license in codebase 2021-06-16 16:58:16 +10:00
David Bomba
8f996d9a93 Fixes for gateway fees less that 2021-05-16 08:18:43 +10:00
David Bomba
349d6daa07 Fixes for company gateway contsts 2021-05-04 18:56:01 +10:00
David Bomba
34ba510d80 Fixes for company gateway edge case 2021-05-04 17:00:05 +10:00
David Bomba
ac3b0dfad3 Fixes for gateway fees 2021-04-23 15:26:58 +10:00
David Bomba
78d726a483 Fixes for system logging custom payment drivers 2021-01-27 16:10:05 +11:00
David Bomba
b5ff2d8a02 Fixes for company gateway payment method resolution 2021-01-27 12:06:25 +11:00
David Bomba
458dd1fa4a Soft delete/restore tokens in sync with CompanyGateway" 2021-01-27 09:17:27 +11:00
David Bomba
4b87df07b7 Check that a company gateway always has at least one fee and limits object 2021-01-22 08:36:25 +11:00
David Bomba
0797c8e4af fix for fee label 2021-01-08 14:43:29 +11:00
David Bomba
31dd8b2d77
Merge pull request #4643 from turbo124/v5-develop
Fixes for tax precision
2021-01-07 17:09:08 +11:00
David Bomba
996355a738 Add system_logs to company gateway transformer 2021-01-07 08:27:59 +11: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
Benjamin Beganović
20c010448a apply php-cs-fixer 2020-12-16 12:52:40 +01:00
David Bomba
6f451b8924 Remove redundant info() Change document download route 2020-12-13 20:46:29 +11:00
David Bomba
bb1ca556c4 wire up custom gateway 2020-12-10 21:20:12 +11:00
Benjamin Beganović
ae88d5e08e php-cs-fixer format 2020-11-25 15:19:52 +01:00
David Bomba
58c6cb415e
Merge pull request #4302 from turbo124/v5-develop
Mail exceptions
2020-11-13 07:22:28 +11:00
David Bomba
d8bb01430f Fixes for renaming company gateway columns 2020-11-12 22:09:31 +11:00
David Roizenman
039544e753
Use correct formula when adjust_fee_percent=true 2020-11-12 02:53:25 -08:00
David Bomba
bbf240be2d New fields for company gateway 2020-11-04 07:19:59 +11:00
=
6479b2fd3e Fix for laravel 8 route file regression + psalm cleanup 2020-11-01 16:09:09 +11:00
David Bomba
9aeb2d7a5b Psalm cleanup 2020-10-28 21:10:49 +11:00
David Bomba
0d17b299a0 Refactor payments for credits 2020-10-15 11:37:16 +11:00
David Bomba
96750d5fdb Refactor for payments via client portal 2020-10-13 21:32:15 +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
c8770f09ca Refactor for determining gateway fees 2020-10-12 15:10:34 +11:00
David Bomba
5072d63436 Set visible to boolean cast 2020-10-12 10:21:24 +11:00
David Bomba
b6bea31646 Working on gateway fee slippage 2020-10-10 21:57:28 +11: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
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
32e987a1b2 Remove require NPM/NODE from setup checks 2020-08-29 23:32:11 +10:00
David Bomba
36c54d8cc3 Working on fees 2020-08-28 11:06:46 +10:00
David Bomba
a5248f7a93 Test mode for company gateway 2020-08-28 07:34:15 +10:00
David Bomba
23a8acccc2 Doc todo 2020-08-27 23:10:04 +10:00
David Bomba
1a7d0d3cbd Working on gateway fees across multiple invoices 2020-08-27 22:12:39 +10:00
David Bomba
37c5a7adb5 Test for gateway fees appending to invoice 2020-08-26 08:10:49 +10:00
David Bomba
fde50b308a Merge branch 'v2' of https://github.com/turbo124/invoiceninja into v2 2020-08-25 07:09:54 +10:00
David Bomba
7951087c47 Add label to fillable 2020-08-25 07:09:27 +10:00
Benjamin Beganović
f8c1a0c031 Fix $this->fees_and_limits 2020-08-24 07:47:16 +02:00
David Bomba
77ecca3035 fixes for tests 2020-08-19 16:11:57 +10:00
David Bomba
021b741e56 Tests for gateway fees 2020-08-19 08:33:58 +10:00
David Bomba
0e601a364d Add TODO 2020-08-17 16:38:33 +10:00
David Bomba
d6e169a891 Working on tests for fees and limits 2020-08-17 13:03:21 +10:00
David Bomba
ce3696257f Fixes for base repo invitations 2020-07-23 13:55:11 +10:00
David Bomba
41b85b3fb3 Ensure models are touched appropriately" 2020-07-16 21:01:39 +10:00
David Bomba
5dc0fcca0d Working on token billing 2020-07-13 14:46:16 +10:00
David Bomba
4864f8bd84 Add SoftDeletes trait to companygateway model 2020-06-05 07:21:30 +10:00
David Bomba
b3eb2ae3b4
Fix companygatewaytransformer (#3677)
* Working on subscriptions

* Implement return type in models

* Subscription implementation

* Improvements to handling importation of large accountS

* Loggin imports

* Activate collector

* Improve memory usage of import script

* Appen Tags into emails - fix companygatewaytransformer
2020-05-06 21:49:42 +10:00
David Bomba
c8e3c7ae68
Fix regression where .env file was being deleted erroneously (#3515)
* Fixes for tests

* Fixes for self updates
2020-03-23 07:45:16 +11:00
David Bomba
957ac9f5d8
Fix for password protected authorization (#3198)
* Remove unnecessary save() on invoice

* Update copyright

* Working on Credit Repository

* Implement credits as a paymentable entity

* Add credit_id to transformer

* fix rules for update payment

* Fix random deleted_at keys in transformers

* Fix for password_protect check
2020-01-07 11:13:47 +11:00
David Bomba
f712b789ca
Fixes for tests (#3184)
* fix typo

* php-cs traits

* CS fixer pass

* Password protect User routes

* Implement checks to prevent editing a deleted record

* Clean up payment flows

* Fixes for tests
2019-12-31 08:59:12 +11:00
David Bomba
b6cb0172c3
Add custom values to user and companygateway transformer (#3157) 2019-12-17 21:57:15 +11:00
David Bomba
2ce89e5f48
Fixes for actions (#3056)
* Update API docs

* cleaning up migrations

* Fixes for tests

* fixes for tests

* Delete client contacts when soft deleting a client

* Fixes for actions
2019-11-12 15:41:02 +11:00
David Bomba
e4c18e734a
Implement fees and limits map for company gateways (#3053)
* Add ability to remove group settings level company logo

* Company Gateway Fees and Limits

* Validation tests for FeesAndLimits

* Working on company gateways

* Working on transforming fees_and_limits in transformer

* Implement fees and limits map for company gateways
2019-11-11 23:21:19 +11:00
David Bomba
a60613aa26
Track signup platform (#3014)
* update company settings and OpenAPI definitions

* Fixes for tests

* Add extra variables to company settings

* Track signup platform when new account signup processed
2019-10-24 15:46:24 +11:00
David Bomba
fbc03aa9f7 Update setting fields 2019-10-17 19:26:46 +11:00
David Bomba
16cd98980b Company Gateway Tests 2019-10-03 20:59:19 +10:00
David Bomba
b41966d41e working on company gateway API endpoint 2019-10-03 11:13:25 +10:00
David Bomba
b243ce4643 Log system events 2019-10-02 13:00:51 +10:00
David Bomba
f59b74b01b Refactors for gateways - using keys instead of Pkeys 2019-09-24 21:22:41 +10:00
David Bomba
89cc4170d6 Fixes 2019-09-18 22:43:37 +10:00
David Bomba
0331575197 Working on card authorisation for Stripe 2019-09-16 14:59:59 +10:00
David Bomba
6b8cbe4e7c Working on preauth credit card stripe 2019-09-16 12:05:30 +10:00
David Bomba
8944727d6b Working on client payment methods 2019-09-15 21:40:46 +10:00
David Bomba
cbb1ca7660 Working on updating credit card 2019-09-14 22:34:05 +10:00
David Bomba
ac19a4bb12 Working on cascading settings 2019-09-11 15:32:47 +10:00
David Bomba
e329c24879 Fixes for tests 2019-09-11 12:01:49 +10:00
David Bomba
5f7a0b96d7 Tests tests and more tests 2019-09-09 21:05:53 +10:00
David Bomba
2ffca37e74 Working on gateways and gateway fees 2019-09-09 14:54:39 +10:00
David Bomba
c7512f1572 Working on gateway fees 2019-09-09 13:27:16 +10:00
David Bomba
0b0f0759f1 Working on Gateways 2019-09-08 20:39:13 +10:00
David Bomba
f8734db1b6 Working on Stripe payment driver 2019-09-05 22:42:26 +10:00
David Bomba
d02e62e46f Padding out Company Gateways - Default gateways per company and per client 2019-08-22 11:58:42 +10:00
David Bomba
bad61e8984 Payment Gateways - padding 2019-08-22 08:34:20 +10:00