Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-13 06:32:40 +01:00
Code Issues Releases Activity
8,387 Commits 8 Branches 921 Tags 2 GiB
16ba8c0554
Commit Graph

4759 Commits

Author SHA1 Message Date
Benjamin Beganović
ec518b23e7
Merge pull request #6376 from beganovich/v5-610 
(v5) Process markdown on global level instead of line items
 2021-08-03 11:59:44 +02:00
Benjamin Beganović
3a30a527ed Process markdown on global level instead of line items 2021-08-03 11:56:50 +02:00
David Bomba
4f4ae1b48e Stripe Connect Fees and Limits 2021-08-03 07:57:56 +10:00
David Bomba
98e82f3ea6 slow down web hook requests if the are too fast for usgit status 2021-08-03 07:40:42 +10:00
David Bomba
c64e9cc739 place check whether a recurring invoice should be automatically sent 2021-08-03 07:01:28 +10:00
Benjamin Beganović
804c666f3b Refunds 2021-08-02 16:33:37 +02:00
Benjamin Beganović
8217065f6c Remove comment 2021-08-02 15:49:59 +02:00
Benjamin Beganović
d7577b001c Extract convertToMolieAmount method 2021-08-02 15:49:50 +02:00
Benjamin Beganović
b144d1e031 Mollie webhook implementation 2021-08-02 14:53:44 +02:00
Benjamin Beganović
d3cc6d6014 Allow $client in driver() (CompanyGateway) to be nullable 2021-08-02 14:47:34 +02:00
Benjamin Beganović
99d686a845 Cleanup PaymentWebhookController 2021-08-02 14:47:20 +02:00
David Bomba
efe3f51778 Notify end user to connect with Stripe Connect on hosted platform 2021-08-02 13:12:33 +10:00
David Bomba
413719b72c Fixes for correct include for Design 2021-08-02 11:08:03 +10:00
David Bomba
bce7667aa5 Fix translations for import email 2021-08-02 09:20:38 +10:00
David Bomba
1d58a87a24 dispatchNow inside email entity 2021-08-02 07:41:46 +10:00
=
70b4529076 Tests for merging clients 2021-08-01 21:03:30 +10:00
=
b95b80fc32 Merging Clients 2021-08-01 17:21:08 +10:00
=
6efe373c55 Client merge 2021-08-01 15:46:40 +10:00
David Bomba
408503ef8a Fixes for import 2021-08-01 11:11:57 +10:00
David Bomba
2d6e2e5976 Fixes for tests 2021-08-01 08:44:04 +10:00
Benjamin Beganović
b3aa7877b9 Revoking the manadate when deleting 2021-07-31 13:26:00 +02:00
=
d2e56b9803 Adjustments for import 2021-07-31 20:43:56 +10:00
David Bomba
9acc02a7df Tets 2021-07-31 19:59:04 +10:00
Benjamin Beganović
541a1a825f Pay with saved credit card 2021-07-30 16:04:26 +02:00
Benjamin Beganović
8af3cfe737 Pay with credit card and save for future use 2021-07-30 14:36:14 +02:00
Benjamin Beganović
e306278547 Update authentication page 2021-07-30 14:09:29 +02:00
David Bomba
75b2fcbc08
Merge pull request #6365 from turbo124/v5-develop 
fixes for live preview - flutter
 2021-07-30 17:38:16 +10:00
David Bomba
0837252c47 Working on deleted invoice accounting 2021-07-30 15:55:02 +10:00
David Bomba
c298ab40fa Fixes for bulk invoice downloads 2021-07-30 10:37:32 +10:00
David Bomba
055e40ccc6 Add currencies to payments by default 2021-07-30 08:11:40 +10:00
Benjamin Beganović
202cc9d670 wip 2021-07-29 16:15:27 +02:00
Benjamin Beganović
1e2e55c9e4 Credit card 3ds processing 2021-07-29 15:13:38 +02:00
Benjamin Beganović
d1ad3bcb26
Merge pull request #6360 from beganovich/v5-601-commonmark 
(v5) Markdown support on line items
 2021-07-29 12:56:25 +02:00
Benjamin Beganović
1073e70f70 Hide $oustanding from Quotes' PDF 2021-07-29 12:55:30 +02:00
David Bomba
e5260df7d4 minor fixes for handle reversal 2021-07-29 20:31:20 +10:00
David Bomba
22036654a5 minor fixes for handle reversal 2021-07-29 20:30:45 +10:00
David Bomba
8e41c801c8 minor fixes for handle reversal 2021-07-29 20:30:02 +10:00
Benjamin Beganović
5b8d685a52 Enable markdown processing on line items 2021-07-29 11:35:07 +02:00
David Bomba
6d8ac6aa35 Minor fixes 2021-07-29 13:37:23 +10:00
David Bomba
f7a31f9ed2 Merge branch 'v5-develop' of https://github.com/turbo124/invoiceninja into v5-develop 2021-07-29 12:20:05 +10:00
David Bomba
b91af0dc69 Client Contact password reset links 2021-07-29 12:19:56 +10:00
David Bomba
e490b26dbc Fixes for locking 2021-07-28 16:14:10 +10:00
David Bomba
b57c35d5e1 Fixes for locking 2021-07-28 16:12:07 +10:00
David Bomba
b87421f769 Fixes for locking 2021-07-28 16:01:30 +10:00
David Bomba
9f2945e58d Logging for WePay 2021-07-28 13:54:11 +10:00
David Bomba
7fab6e05a4 Fixes for locked invoices 2021-07-28 12:29:51 +10:00
David Bomba
815c4a9660 Fixes for actioning user in activity logs" 2021-07-28 12:16:54 +10:00
David Bomba
1fa93ebb60 Metrics for live previews 2021-07-28 11:49:13 +10:00
David Bomba
b506c293ed Fixes for live preview 2021-07-28 08:54:40 +10:00
David Bomba
8b588a55a5 Fixes for live preview 2021-07-28 08:09:30 +10:00
David Bomba
cf7dfd5618 Fixes for connected accounts 2021-07-28 08:01:26 +10:00
Benjamin Beganović
b7c248eec5
PayTrace improvements (#43) 
* Refactor credit card payment JavaScript

* CreditCard.php: Rename $paytrace_driver to $paytrace

* Credit card: Support for token billing (frontend)

* Fixes for "save card" label

* Credit card: Authorize

* Allow PayTrace to be seeded from CreateSingleAccount

* Add PayTrace decrypted config to ninja.testvars

* Extract to separate JavaScript

* Scaffold Dusk test

* CreditCard -> CreditCardTest

* CreditCard -> CreditCardTest

* Scaffold pay with new card test

* Fixes for gateway_key in CreateSingleAccount

* Production builds
 2021-07-28 07:59:44 +10:00
David Bomba
f644a2b460 Fixes for live preview 2021-07-27 22:20:32 +10:00
Benjamin Beganović
3d12fd80e8 wip 2021-07-27 11:46:12 +02:00
David Bomba
284203401b Fixes for live preview 2021-07-27 19:38:40 +10:00
David Bomba
efad096dfb Fixes for live preview 2021-07-27 18:32:29 +10:00
David Bomba
f21a60c159 Fixes for live preview 2021-07-27 18:04:46 +10:00
David Bomba
0fe892a292 Sort order of system log 2021-07-27 09:02:14 +10:00
David Bomba
9401c25cca Set preview number to null 2021-07-27 08:57:20 +10:00
David Bomba
f90115aa8e Fixes for incorrect confirmation codes 2021-07-27 08:45:46 +10:00
David Bomba
fe4cf32fa1 Unset confirmation codes 2021-07-27 08:41:53 +10:00
David Bomba
bc5b9ca2e6 Prevent connected accounts being linked to existing users 2021-07-27 08:33:44 +10:00
David Bomba
8bec600fdf Minor fixes for entity sent description 2021-07-27 07:53:42 +10:00
Benjamin Beganović
548405c4d8 Refactor payment with credit card 2021-07-26 17:03:40 +02:00
Benjamin Beganović
2501654fec Add withData() to PaymentHash 2021-07-26 17:03:28 +02:00
Benjamin Beganović
7dd7a6e4b1 Scaffold Mollie3dsController 2021-07-26 17:03:15 +02:00
David Bomba
27d6dd1248 Fixes for IP and TOKEN insertion into activities 2021-07-26 22:11:53 +10:00
David Bomba
39d82f1c42 Additional filters 2021-07-26 21:09:16 +10:00
David Bomba
dd70223652 Fixes for filters 2021-07-26 20:29:41 +10:00
David Bomba
42de43b574 Fixes for client queries 2021-07-26 20:25:07 +10:00
David Bomba
65b7420d26
Merge pull request #6337 from turbo124/v5-develop 
Invoice Activity notifications
 2021-07-26 19:56:23 +10:00
David Bomba
052fb222d5 Minor fixes for invoice notifications 2021-07-26 19:55:54 +10:00
Benjamin Beganović
575d58e6f0 Update company logo to resolve from logo_base64() 2021-07-26 11:09:11 +02:00
David Bomba
0df3e4e5e7 Clean up 2021-07-26 09:57:55 +10:00
David Bomba
a28aa9f7ec Fixes for client portal enabled and content type 2021-07-26 08:22:29 +10:00
David Bomba
438180daca Reponse type 2021-07-25 22:44:29 +10:00
David Bomba
8cf9576496 Merge branch 'v5-develop' of https://github.com/turbo124/invoiceninja into v5-develop 2021-07-25 22:42:15 +10:00
David Bomba
60452278b5 Minor fixes 2021-07-25 22:42:03 +10:00
=
8ea34e4f7f Protected subdomains 2021-07-25 21:51:41 +10:00
David Bomba
4f940e41b0 fixes for defaults when converting quotes to invoices 2021-07-25 18:05:53 +10:00
David Bomba
8a4230c81c Working on live preview 2021-07-25 16:23:10 +10:00
David Bomba
465fb71962 Remove time delays 2021-07-24 17:43:40 +10:00
David Bomba
8ff01a97a2 Remove base 64 encoding 2021-07-24 17:43:16 +10:00
David Bomba
0365fb35af Minor fixes 2021-07-24 17:37:19 +10:00
David Bomba
23a7cb2057 Alternate company logo presenter 2021-07-24 17:29:33 +10:00
David Bomba
176fb66391 Tweak email delays 2021-07-24 11:34:09 +10:00
David Bomba
56e925f40f fixes for company gateyway validation 2021-07-24 11:05:00 +10:00
David Bomba
b5a8c60db5 Improve Company Gateway validation 2021-07-24 10:25:48 +10:00
Benjamin Beganović
4818ea81bc Credit card: Pay with new credit card 2021-07-23 16:17:32 +02:00
Benjamin Beganović
a29d4f2075 wip 2021-07-23 14:43:32 +02:00
Benjamin Beganović
99d0259365 Scaffold MolliePaymentDriver 2021-07-23 13:47:01 +02:00
Benjamin Beganović
b324c4292b Inject Mollie in CreateSingleAccount & ninja config 2021-07-23 13:42:13 +02:00
David Bomba
982216355f MInor fixes 2021-07-23 19:38:30 +10:00
David Bomba
5ea07be358
Merge pull request #6317 from turbo124/paytrace 
Paytrace
 2021-07-23 17:31:23 +10:00
David Bomba
540e1a53cf
Merge pull request #6316 from turbo124/v5-develop 
Fixes for notifications
 2021-07-23 17:28:08 +10:00
David Bomba
86ca60afa7 Fixes for pay trace integration 2021-07-23 14:15:51 +10:00
David Bomba
429570227d Confirmed paytrace working EXCEPT pay page 2021-07-23 12:12:42 +10:00
David Bomba
5729578926 minor fixes 2021-07-23 11:25:33 +10:00
David Bomba
d5d6c47d75 Minor fixes for reminder job 2021-07-23 10:31:30 +10:00
David Bomba
8ac7ec8ef4 Fixes for validation rule 2021-07-23 10:16:59 +10:00
David Bomba
62359e4097 minor fixes for wepay 2021-07-23 09:51:55 +10:00
Jonathan Starck
2f13a8a323 Added own language label for net_subtotal and already included it in the English and German translation 2021-07-23 01:47:47 +02:00
David Bomba
da7e368d63 Fixes for notifications 2021-07-23 08:04:01 +10:00
David Bomba
dc3cf85e2c Fixes for Notifications 2021-07-22 20:15:41 +10:00
David Bomba
ce696f7950
Merge pull request #6311 from turbo124/v5-develop 
Fixes for reminders
 2021-07-22 18:33:51 +10:00
David Bomba
5f5a33bac9 Fixes for Notifications 2021-07-22 18:33:25 +10:00
David Bomba
c8e4fdd3bd Fixes for ReminderJob 2021-07-22 11:31:07 +10:00
David Bomba
c6ed151813 Fixes for ACH 2021-07-22 08:44:03 +10:00
Benjamin Beganović
ff5769ef78 Allow type_id=5 for invoice items 2021-07-21 15:07:01 +02:00
Benjamin Beganović
6e40e2fab5 Fix missing required fields for Checkout.com 2021-07-21 15:05:37 +02:00
David Bomba
00d1273bd9 Fixes for gateway abilities 2021-07-21 20:35:22 +10:00
David Bomba
40bbad8eca Minor fixes 2021-07-21 20:30:21 +10:00
David Bomba
8bcb997c0b Fixes for test mail server 2021-07-21 20:00:42 +10:00
David Bomba
78270a9147 token billing and refunds with paytrace 2021-07-21 18:18:14 +10:00
David Bomba
1affdd7754 Pay with CC paytrace 2021-07-21 17:44:35 +10:00
David Bomba
211e6560fc Paytrace payment proces 2021-07-21 17:04:44 +10:00
David Bomba
15dd0970d2 Paytrace 2021-07-21 16:27:02 +10:00
David Bomba
f0b232c1a2 Authorize a card with Paytrace 2021-07-21 15:34:20 +10:00
David Bomba
87e1ba48e9 Paytrace integration 2021-07-21 14:23:33 +10:00
David Bomba
feedaa479f Minor fix for entity created object 2021-07-21 10:53:18 +10:00
David Bomba
0d52d57d41 Paytrace 2021-07-21 10:43:39 +10:00
David Bomba
9ecbaea186 Minor fixes 2021-07-21 09:21:46 +10:00
David Bomba
75ac7ec48c minor fixes 2021-07-21 09:21:32 +10:00
David Bomba
27d4b9d349 Merge branch 'v5-develop' into paytrace 2021-07-21 09:20:31 +10:00
David Bomba
f417b27e55 Minor fixes for first account creation 2021-07-21 08:07:19 +10:00
David Bomba
c0287085b5 Scaffolding Paytrace 2021-07-20 21:26:24 +10:00
David Bomba
11ae85732b Fixes for queries 2021-07-20 19:45:54 +10:00
David Bomba
b4698b1919 Fixes for import 2021-07-20 17:23:31 +10:00
David Bomba
6dbba38a49 Merge branch 'paytrace' into v5-develop 2021-07-20 17:18:50 +10:00
David Bomba
29006a2da0 Fixes for client - country codes 2021-07-20 15:09:02 +10:00
David Bomba
aff6eb2701 Fixes for bad country codes in client request 2021-07-20 14:53:43 +10:00
David Bomba
dbb60c029e Fixes for reminderS 2021-07-20 14:49:04 +10:00
David Bomba
a8d148b0dc Fixes for invoices which are not payable if archived 2021-07-20 09:30:12 +10:00
David Bomba
48c5c56a4a Fixes for webhook bug 2021-07-20 08:39:04 +10:00
David Bomba
46852794aa return 200 HTTP code on webhook response from payfast. 2021-07-20 07:58:40 +10:00
David Bomba
055cacbfa7 Fixes for support message 2021-07-19 20:46:18 +10:00
David Bomba
74551c2caf Add delete company email 2021-07-19 15:38:07 +10:00
David Bomba
d82491d163 Email user when another user is added into the system 2021-07-19 14:17:58 +10:00
David Bomba
bcc286e537 Handle base64 encoded passwords 2021-07-19 10:57:13 +10:00
David Bomba
856e3b846b Fixes for viewed entity notifications 2021-07-19 07:50:22 +10:00
=
643e05212b Fixes for reminders 2021-07-18 21:49:25 +10:00
=
5a198af0d1 Mark designs as free 2021-07-18 20:10:55 +10:00
David Bomba
53f6aeb9d3 Add net_subtotal option 2021-07-18 18:57:26 +10:00
David Bomba
13004e249b Fixes for line items for PaypalExpressPaymentDriver 2021-07-18 17:47:34 +10:00
David Bomba
edff2881eb Import Stripe Customers 2021-07-18 17:30:29 +10:00
David Bomba
d1c4da1d64 Do no add duplicate Task Statuses if they already exist 2021-07-18 14:05:33 +10:00
David Bomba
0f10c4b8dd minor fixes 2021-07-18 08:43:07 +10:00
David Bomba
a1e9de5807 Minor Clean up 2021-07-17 22:01:00 +10:00
David Bomba
0a77e571fe Fixes for uses_inclusive_taxes 2021-07-17 20:36:51 +10:00
David Bomba
3605b18d2a Fixes for hosted experience 2021-07-17 18:59:06 +10:00
David Bomba
8554c6cceb Working on improving hosted migration experience 2021-07-17 17:38:59 +10:00
=
a38dcbdd87 Streamline Hosted Migrations 2021-07-17 15:58:37 +10:00
David Bomba
a4c1829257 Fixes for shared counterS 2021-07-16 23:33:53 +10:00
David Bomba
4555859936 Fixes for shared counterS 2021-07-16 23:10:27 +10:00
=
1c410b0a95 Minor fixes 2021-07-16 22:00:21 +10:00
David Bomba
ba5d2f8fc3 Fixes for importing payments with non-transformed invoices 2021-07-16 17:47:44 +10:00
David Bomba
673f188100 Ensure the client is saved prior to getting a number back 2021-07-16 15:40:38 +10:00
David Bomba
52d2172953 Fixes for checking constraints 2021-07-16 08:51:01 +10:00
David Bomba
da177661ec Fixes for subscriptions 2021-07-15 21:00:24 +10:00
David Bomba
7c83f9d04e Updating subscriptions 2021-07-15 14:35:22 +10:00
David Bomba
97885557bd
Merge pull request #6272 from turbo124/v5-develop 
Tests for settings
 2021-07-15 13:04:05 +10:00
David Bomba
a04f2be3b4 Minor Fixes 2021-07-15 13:03:24 +10:00
David Bomba
6a771de80c Fixes for recurring invoice subscription ID passing 2021-07-15 11:31:11 +10:00
David Bomba
46bc8fa495 Fixes for subscription webhooks 2021-07-15 11:06:14 +10:00
Benjamin Beganović
033e74da7d Show 'No quotes avialable for download' instead of blank page 2021-07-14 14:33:17 +02:00
Benjamin Beganović
a9ac73264e Quotes page: Show message when trying to approve non-approvable quotes 2021-07-14 14:13:37 +02:00
=
ecf7f66cfe Working on actions when a subscription invoice is paid 2021-07-14 21:20:41 +10:00
Benjamin Beganović
f852640083
Merge pull request #6192 from beganovich/v5-client-portal-tests-dusk 
Reworking client portal tests
 2021-07-14 13:08:57 +02:00
David Bomba
d448ae1119 fixes for trial_started 2021-07-14 17:15:59 +10:00
David Bomba
45dce736ba Fixes for fillables 2021-07-14 17:07:02 +10:00
David Bomba
96a088ead1 Remove design conditional 2021-07-14 16:53:45 +10:00
David Bomba
332d376486 Fixes for Stripe ConnecT 2021-07-14 15:34:29 +10:00
David Bomba
5946fac405 Update support message subject format 2021-07-14 14:57:43 +10:00
David Bomba
e808cc62a8 Fixes for Client - Paid To Date updating when a payment with no invoices is generated 2021-07-14 12:22:37 +10:00
David Bomba
bfd6cf876b Fixes for tests 2021-07-14 10:31:07 +10:00
David Bomba
9941d72d31 Fixes for Github Actions 2021-07-14 09:31:01 +10:00
David Bomba
fcbef56e46 Fixes for schema migrations and always set default country on clients 2021-07-14 09:11:42 +10:00
David Bomba
8d9950ebbd Add company country as default if none is set 2021-07-14 08:39:30 +10:00
David Bomba
293a187618 Fixes for support messages 2021-07-13 21:25:17 +10:00
David Bomba
4086203a81 Minor fixes for product and client bulk actions 2021-07-13 19:26:59 +10:00
David Bomba
15c3e826c2 Fixes client balance 2021-07-13 19:09:02 +10:00
David Bomba
313dbd4da3
Merge pull request #6255 from turbo124/v5-develop 
FIxes for Hosted Channel
 2021-07-13 18:53:00 +10:00
David Bomba
41b1555fe1 Improve authorize.net add payment method 2021-07-13 11:07:10 +10:00
David Bomba
8f5afaacd4 Minor fixeS 2021-07-13 08:07:09 +10:00
Benjamin Beganović
45b90a41ab Pass correct message to EntityPaidObject 2021-07-12 17:22:29 +02:00
Benjamin Beganović
2be806bb8e Merge remote-tracking branch 'upstream/v5-develop' into v5-client-portal-tests-dusk 2021-07-12 15:58:53 +02:00
Benjamin Beganović
d8d2aae5e2 Gateways: WePay: Credit card: Pay with new card 2021-07-12 13:30:23 +02:00
David Bomba
21636e21b2 Always show balance due when in draft mode. 2021-07-12 20:43:41 +10:00
David Bomba
71e35b77d9 Additional Logging for import 2021-07-12 20:34:01 +10:00
David Bomba
6e7ff0abfb Fixes for WePay 2021-07-12 19:52:43 +10:00
David Bomba
dc47e81c63 Fixes for expense CSV import 2021-07-12 18:53:35 +10:00
David Bomba
105025dd57 All client.phone import 2021-07-12 08:18:17 +10:00
David Bomba
a2d0965ed5 Fixes for plan_expires type casting 2021-07-11 14:54:57 +10:00
David Bomba
75d012af06 Set date on credit generated from an invoice reversal 2021-07-11 10:21:24 +10:00
David Bomba
ad0b2b8ec3 Prevent ninja company from being deleted 2021-07-11 10:16:27 +10:00
David Bomba
6edfa0a966 Fixes for User model 2021-07-10 18:59:55 +10:00
David Bomba
9c2e02d47e Activate payfast payment driver 2021-07-10 18:59:19 +10:00
David Bomba
d7e39cff14 Minor fixes for Payfast 2021-07-10 17:01:12 +10:00
David Bomba
24b8233a2f Minor fixes for Payfast 2021-07-10 16:48:20 +10:00
David Bomba
1e03070e9e Minor fixes for Payfast 2021-07-10 16:39:14 +10:00