Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-09-28 20:27:13 +02:00
Code Issues Releases Activity
7,374 Commits 8 Branches 902 Tags 2 GiB
694a704d89
Commit Graph

4236 Commits

Author SHA1 Message Date
David Bomba
eff664a586 WePayg 2021-05-06 14:39:18 +10:00
David Bomba
24f935e277 Merge branch 'wepay' of https://github.com/turbo124/invoiceninja into wepay 2021-05-06 13:44:25 +10:00
David Bomba
e9b21af5b0
Merge pull request #5625 from turbo124/v5-develop 
Add default include for mini_load
 2021-05-06 13:34:16 +10:00
David Bomba
97afe55923 Can null value 2021-05-06 13:32:13 +10:00
David Bomba
3c670592b9 Add default include for mini_load 2021-05-06 13:29:59 +10:00
David Bomba
875bd24220
Merge pull request #5624 from turbo124/v5-develop 
email_receipt flag for payment receipt emails
 2021-05-06 13:23:25 +10:00
David Bomba
2805e1cc96 email_receipt flag 2021-05-06 13:22:55 +10:00
David Bomba
eaeb47090a Load designs for mini load 2021-05-06 08:42:18 +10:00
Benjamin Beganović
62e980ca08 Use translated country names for client on PDF 2021-05-05 17:58:59 +02:00
Benjamin Beganović
e3a6f223d0 Refunds wip 2021-05-05 17:24:31 +02:00
=
d3f14887e1 WePay 2021-05-05 20:50:36 +10:00
=
194b347c29 Fixes for migration timestamps 2021-05-05 19:46:51 +10:00
=
46d5b84fb7 Fixes for created_at and updated_at timestamps in migration 2021-05-05 19:45:31 +10:00
David Bomba
991fa7079e Fixes for password protection 2021-05-05 16:44:31 +10:00
David Bomba
a7abc2cd1b Fixes for password protection 2021-05-05 16:30:12 +10:00
David Bomba
d61e7f57a2 Fixes for wepay 2021-05-05 16:21:37 +10:00
David Bomba
23f7a74e2c Fixes for password protection 2021-05-05 16:11:40 +10:00
David Bomba
b9fece424f Minor fixes for password protection cache 2021-05-05 15:56:54 +10:00
David Bomba
ab3e635447 Fixes for user updating their own record 2021-05-05 15:33:52 +10:00
David Bomba
8c00bce71b We Pay signup 2021-05-05 14:29:58 +10:00
David Bomba
e7526cb4dc Fixes for reset of counters 2021-05-05 10:58:18 +10:00
David Bomba
2655ba679b Fixes for Task properties, drop column on company_user table 2021-05-05 09:53:35 +10:00
David Bomba
430e31c1ad Minor fixes for self updater 2021-05-05 08:28:55 +10:00
Benjamin Beganović
78f87a8da0 PayPal authorize page message 2021-05-04 17:25:30 +02:00
Benjamin Beganović
54a12235b4 PayPal integration 2021-05-04 17:02:14 +02:00
Benjamin Beganović
e0f83af653 Corret class instantiate 2021-05-04 14:56:30 +02:00
David Bomba
ff7799b0bf Fixes for eager loading 2021-05-04 22:20:55 +10:00
David Bomba
4703496c7c Fixes for PSR loading 2021-05-04 22:04:07 +10:00
David Bomba
bd22dc3314 Fixes for Historical PDF generation 2021-05-04 19:56:15 +10:00
David Bomba
349d6daa07 Fixes for company gateway contsts 2021-05-04 18:56:01 +10:00
David Bomba
148f0466ed FIxes for Entity Created messageS" 2021-05-04 18:43:16 +10:00
David Bomba
9a0d8afafc Update task statuses on migration 2021-05-04 18:33:36 +10:00
David Bomba
34ba510d80 Fixes for company gateway edge case 2021-05-04 17:00:05 +10:00
David Bomba
2f9e9dc81f Port Mobile Localization 2021-05-04 14:47:37 +10:00
David Bomba
382dd88e02 Do not update/create products from migration 2021-05-04 13:54:28 +10:00
David Bomba
b2439bced8 Email Analytics 2021-05-04 13:46:45 +10:00
David Bomba
e8d6d29f17 Track bounced and spam mail 2021-05-04 12:49:32 +10:00
David Bomba
f7257e4335 Migration emails 2021-05-04 12:40:28 +10:00
Benjamin Beganović
e6697e183c Crypress: Payment with new card 2021-05-03 15:48:53 +02:00
David Bomba
a9aeb906c3 Fixes for migration 2021-05-03 22:25:45 +10:00
Benjamin Beganović
6992216117 wip 2021-05-03 14:10:46 +02:00
David Bomba
5510993d13 Fixes for gateway fees 2021-05-03 21:51:00 +10:00
David Bomba
b0835ed361 5.1.59 2021-05-03 20:50:08 +10:00
David Bomba
bbe301a903 fixes for null email_status 2021-05-03 14:55:37 +10:00
David Bomba
778a458242 Add fallback for replyto name 2021-05-03 14:50:55 +10:00
David Bomba
cc40b52d67 Add fallback for replyto name 2021-05-03 14:49:15 +10:00
David Bomba
f9083ff490 Return string for email_status 2021-05-03 14:46:38 +10:00
David Bomba
bd88640436 Fixes for invitations in migration 2021-05-03 14:02:55 +10:00
David Bomba
d68f96fb98 Minor fixes for migrations 2021-05-03 11:46:46 +10:00
=
ef4079c3f0 Add domain queue 2021-05-02 22:07:17 +10:00
=
e53d5dcb13 fixes for logging 2021-05-02 21:40:15 +10:00
=
a76d584ae4 Clean up company request 2021-05-02 20:15:11 +10:00
=
01cb9a091e Fixes for namespaces 2021-05-02 19:14:42 +10:00
=
ff62fb54df Merge branch 'v5-develop' of https://github.com/turbo124/invoiceninja into v5-develop 2021-05-02 18:38:10 +10:00
=
ffea966bbc Add observer information for Hosted platform 2021-05-02 18:38:00 +10:00
David Bomba
ac046688c3 Fix for recurring design id, not translating to invoice 2021-05-02 13:14:28 +10:00
Benjamin Beganović
15beb26700 Auto billing feature for credit cards using Braintree 2021-05-01 22:03:28 +02:00
Benjamin Beganović
1d4e2bcabe Fix passing correct amount to PaymentFailureMailer 2021-05-01 22:03:07 +02:00
Benjamin Beganović
f1c4b1cdb3 wip 2021-05-01 17:53:39 +02:00
David Bomba
130f0e5749 Fixes for no account in version check 2021-05-01 10:48:36 +10:00
David Bomba
e6e8b21c5e Fixes for deleting tokens from /logout route 2021-05-01 10:13:48 +10:00
David Bomba
2eae22221f Clean up update 2021-04-30 14:29:27 +10:00
David Bomba
dab7f5afba explicitly define the unwritable file 2021-04-30 14:22:36 +10:00
David Bomba
93ace021c0 do not repeat recurring crons even on failure 2021-04-30 12:51:38 +10:00
David Bomba
aba280d9ab Fixes for recurring 2021-04-30 09:01:56 +10:00
Benjamin Beganović
2ab65b12fa Ability to pay with token 2021-04-29 16:43:59 +02:00
Benjamin Beganović
77733ffd0a Saving & tokenizing the credit card 2021-04-29 15:05:45 +02:00
=
7d01858b3a Current_company=true 2021-04-29 21:36:34 +10:00
=
bdbcacb872 Add current_company filter on refresh route 2021-04-29 21:29:10 +10:00
=
460e0afb39 Add no-cache headers to prevent aggressive browser caching of assets 2021-04-29 21:07:05 +10:00
Benjamin Beganović
6cab52fc9f Show "Save card" option for credit card 2021-04-29 11:59:18 +02:00
Benjamin Beganović
d4c51871ef - Update Braintree credit card to use amount_with_fee 
- Add amount_with_fee to payment hash
 2021-04-29 11:29:28 +02:00
David Bomba
9cb2fa4263 Add parameter to reduce query burden 2021-04-29 18:57:13 +10:00
David Bomba
d26ff60258 catch all for company_user.settings 2021-04-29 17:34:30 +10:00
David Bomba
592aba6bb0 analytics 2021-04-29 13:43:40 +10:00
David Bomba
003303a83b Output results on exec() 2021-04-29 13:15:39 +10:00
David Bomba
342b383115 Minor fixes for imports 2021-04-29 12:12:44 +10:00
David Bomba
deb55dd6c8 Add in constrained queries 2021-04-29 11:31:04 +10:00
David Bomba
7fabda0ea1 fix for typo 2021-04-29 10:39:56 +10:00
David Bomba
d35cef02c3 Fixes for analytics 2021-04-29 10:02:09 +10:00
David Bomba
f26948b76f Log query analytics 2021-04-29 09:19:00 +10:00
David Bomba
61828d412a Customize the login return request 2021-04-29 08:44:40 +10:00
Benjamin Beganović
7d8c135ba7 wip 2021-04-28 15:03:22 +02:00
Benjamin Beganović
9c97421a55 wip 2021-04-28 14:54:50 +02:00
Benjamin Beganović
e77c3492ed wip 2021-04-28 12:54:27 +02:00
=
6ccaf5dad9 Minor fixes for migration 2021-04-28 20:25:21 +10:00
David Bomba
4c2df3e1ff Fixes for company sub domain 2021-04-28 14:19:32 +10:00
David Bomba
83da701646 Fixes for company domain 2021-04-28 13:58:37 +10:00
David Bomba
8a4b1a11b3 Fixes for company domain 2021-04-28 13:40:11 +10:00
David Bomba
ee94ed6ac9 Fixes for company validation rules 2021-04-28 13:21:27 +10:00
David Bomba
207e5b4d4e Fixes for protected lists 2021-04-28 13:13:39 +10:00
David Bomba
f501a42e35 Fixes for domain validation 2021-04-28 13:12:51 +10:00
David Bomba
b3ccb0f861 v5.1.55: 2021-04-28 11:27:44 +10:00
David Bomba
73bcaae3f6 Allow invoice balances to change - but do no allow them to go negative 2021-04-28 11:18:27 +10:00
David Bomba
c90bac152d Fixes for user activities 2021-04-28 10:24:37 +10:00
David Bomba
810ed113c7 Invoice / Quote / Credit created notification 2021-04-28 10:02:31 +10:00
David Bomba
ac3c1f349e Minor fixes for self update 2021-04-27 20:39:10 +10:00
David Bomba
d2bb8d6d81 Minor fixes for impmort 2021-04-27 20:38:34 +10:00
David Bomba
b0f5ca8638 Logout Controller 2021-04-27 16:03:21 +10:00
David Bomba
48da709d6e Fixes for broken DBs 2021-04-27 09:44:20 +10:00
David Bomba
1bcfa1b19d Add ability to logout all tokens from company 2021-04-27 09:34:35 +10:00
David Bomba
7a141f2631 cleanup 2021-04-26 15:47:54 +10:00
David Bomba
3e66320d8b
Merge pull request #5536 from turbo124/v5-develop 
Delete migration directory after Import
 2021-04-26 13:31:58 +10:00
David Bomba
75e833aab3 Fixes for listeners: 2021-04-26 13:01:59 +10:00
Benjamin Beganović
52f75e5fc6 Fix Javascript loading with repeating headers & footers 2021-04-25 15:52:00 +02:00
Benjamin Beganović
f0255d4ed9 Show $entity.public_notes in the totalsTable & remove $entity_footer 2021-04-25 15:20:23 +02:00
David Bomba
1f87ca6ca2 Delete migration directory after Import 2021-04-25 21:04:48 +10:00
David Bomba
a09de38f35 Default mailer middleware 2021-04-25 20:22:24 +10:00
David Bomba
f2562dcec9 Add required include for ConnectAccountController 2021-04-25 19:00:11 +10:00
David Bomba
47ad8e1394 Set default values 2021-04-25 14:45:16 +10:00
David Bomba
28caa315a5 Fixes for Analytics 2021-04-25 14:36:22 +10:00
David Bomba
da99471e15 Fixes for Analytics 2021-04-25 13:09:44 +10:00
David Bomba
727c0abaa5 Fixes for string length in analyticS 2021-04-25 10:56:33 +10:00
David Bomba
6ad597177f Fix for typo in company object 2021-04-25 08:33:25 +10:00
David Bomba
f98c618548 Analytics 2021-04-25 08:18:35 +10:00
David Bomba
e844d4715b Fixes for post mark mailer 2021-04-25 01:09:38 +10:00
David Bomba
47050adb57 Fixes for initializaing PostMark 2021-04-25 00:37:54 +10:00
David Bomba
e7e298c917
Merge branch 'v5-develop' into db 2021-04-24 23:28:02 +10:00
David Bomba
b4945220e8 Analytics 2021-04-24 23:19:46 +10:00
David Bomba
ac3b0dfad3 Fixes for gateway fees 2021-04-23 15:26:58 +10:00
David Bomba
74631e39e4 new clear cache route 2021-04-23 00:03:21 +10:00
David Bomba
20ea334106 Landing page for existing stripe connect acccounts 2021-04-22 23:51:18 +10:00
David Bomba
90d786211c Fixes for Stripe Connect 2021-04-22 23:40:36 +10:00
David Bomba
300cc9fb9e Fixes for Checkout.com 2021-04-22 23:32:34 +10:00
David Bomba
d6bd19e6c0 Fixes for stripe connect 2021-04-22 22:56:00 +10:00
David Bomba
bbaecb3c06 Fixes for routes file" 2021-04-22 21:53:21 +10:00
David Bomba
b3f6ff10fb
Merge pull request #5506 from turbo124/v5-develop 
Fixes for Stripe Connect
 2021-04-22 21:25:27 +10:00
David Bomba
067c3cad62 Fixes for Stripe Connect 2021-04-22 21:22:55 +10:00
Benjamin Beganović
3c5a70cd21
Merge pull request #5505 from beganovich/v5-2104-emails 
(v5) Fixes for emails
 2021-04-22 13:05:37 +02:00
Benjamin Beganović
b9ee87b124 wip 2021-04-22 13:03:30 +02:00
David Bomba
5d4bba2609 Remove dead wood 2021-04-22 20:42:12 +10:00
David Bomba
f62518f63b Stripe Connect 2021-04-22 20:38:22 +10:00
Benjamin Beganović
6d0c2ec5ca wip 2021-04-22 12:29:00 +02:00
Benjamin Beganović
75da6df4fa wip 2021-04-22 11:55:19 +02:00
Lee Ween Jiann
062fe152f5 Updated SetupController.php 2021-04-22 11:12:48 +08:00
David Bomba
7cef74350d Fix for accounting error when deleting a refunded payment 2021-04-22 09:35:31 +10:00
Benjamin Beganović
ca15b03eda wip 2021-04-21 17:56:18 +02:00
Benjamin Beganović
bdc564092e wip 2021-04-21 16:36:08 +02:00
=
fc223e3432 Fixes for invoice status 2021-04-21 22:27:08 +10:00
David Bomba
af7939b002 Small fixes for one time tokens 2021-04-21 20:57:34 +10:00
David Bomba
d892e0b6ed Fixes for counter 2021-04-21 19:57:59 +10:00
David Bomba
033e221d2f Adjustments for recurring invoice cron 2021-04-21 13:54:10 +10:00
David Bomba
d879d1080b Fixes for stripe connecT 2021-04-21 08:38:50 +10:00
David Bomba
d33eb77fad
Merge pull request #5488 from turbo124/v5-develop 
v5.1.49
 2021-04-21 07:43:31 +10:00
Benjamin Beganović
e58d5291e7
Merge branch 'stripe-connect' into v5-2004-stripe-connect 2021-04-20 23:42:34 +02:00
David Bomba
9388e75f77 Fixes for purge company data 2021-04-21 07:35:54 +10:00
David Bomba
82892a6349 Fixes for stateless events 2021-04-21 07:26:04 +10:00
Benjamin Beganović
eef9065f08 wip 2021-04-20 16:08:33 +02:00
David Bomba
b33df0746e Check white label license periodically 2021-04-20 22:45:35 +10:00
Benjamin Beganović
15fa60d780 wip 2021-04-20 13:32:25 +02:00
Benjamin Beganović
cc7bdf15fe wip 2021-04-20 13:31:21 +02:00
David Bomba
e6c083cf29 Stripe Connect 2021-04-20 21:30:52 +10:00
David Bomba
68ddc6e7b1 Tests for ClientGatewayToken routes 2021-04-20 16:03:14 +10:00
David Bomba
03b19e27f7 Add client gateway tokens 2021-04-20 14:26:16 +10:00
David Bomba
81c90fb1a8 Work flow for connect 2021-04-20 08:41:14 +10:00
David Bomba
d40648ba27 Minor fixes 2021-04-20 07:47:50 +10:00
David Bomba
06f08adaf2
Merge pull request #5475 from turbo124/v5-develop 
v5.1.48
 2021-04-20 07:28:40 +10:00
Benjamin Beganović
873fe6ce07
Merge branch 'v5-develop' into v5-1304-emails 2021-04-19 16:59:23 +02:00
Benjamin Beganović
de5b6473bb wip 2021-04-19 16:57:25 +02:00
Benjamin Beganović
88acfbfecb Show public notes outside of totals table 2021-04-19 13:51:00 +02:00
David Bomba
fadfdca2af fxies for tests 2021-04-19 19:59:11 +10:00
Benjamin Beganović
417260e25d wip 2021-04-19 11:41:56 +02:00
David Bomba
060404cd6c set a default task_status for orphaned tasks 2021-04-19 15:33:49 +10:00
David Bomba
25fe52ab18 Add portal_url variable 2021-04-19 11:19:00 +10:00
David Bomba
a1494a25d0 improve self updater 2021-04-19 10:54:16 +10:00
Benjamin Beganović
875c7ba950 - Dark mode 2021-04-18 17:35:33 +02:00
Benjamin Beganović
b9528d09c0 - Add support for centering the content 
- Load styles from the master branch
 2021-04-18 17:09:44 +02:00
=
9b77789c8a v5.1.47 2021-04-18 21:16:32 +10:00
=
3cfabd88d7 Reset task statuses on delete/archive 2021-04-18 19:50:06 +10:00
=
6eaff79544 Remove taxes from demo data set 2021-04-18 09:04:40 +10:00
David Bomba
d47a0e1392 Small fixes 2021-04-18 07:06:12 +10:00
David Bomba
b4afd1419e Update API definitions 2021-04-17 16:51:24 +10:00
David Bomba
af26285577 Log Task status 2021-04-17 08:57:07 +10:00
David Bomba
bc9ff3efae Log Task status 2021-04-17 08:51:24 +10:00
David Bomba
dd87bbd0e7 Log Task status 2021-04-17 08:40:27 +10:00
David Bomba
c329d1302f Return response 2021-04-17 08:35:36 +10:00
David Bomba
797d0597aa SortRequest 2021-04-17 08:32:34 +10:00
David Bomba
5df313b9fd SortRequest 2021-04-17 08:31:24 +10:00
David Bomba
115637d4fa Sort tasks 2021-04-17 08:28:19 +10:00
David Bomba
7f1da78b92 small fixes for bulk actions for payments 2021-04-17 07:42:39 +10:00
David Bomba
4fba838ee8 Minor fixes for initializing the mail malier 2021-04-16 17:16:32 +10:00
David Bomba
c90fe87388 Adjust initialization of mail service provider 2021-04-16 16:54:07 +10:00
David Bomba
7026dbd8f2 Add custom translations to email preview and sent emails 2021-04-16 16:22:42 +10:00
David Bomba
18cf8110b5 Change from singleton to binding 2021-04-16 16:03:09 +10:00
David Bomba
cba4a361ce Integrate credit payments into Subscriptions 2021-04-16 14:47:11 +10:00
David Bomba
464d810a70 Clean up for subscriptions 2021-04-16 13:58:14 +10:00
David Bomba
c04afa5127 Code cleanup and documentation of subscriptions 2021-04-16 12:11:04 +10:00
David Bomba
a994e6f916 Clean up subscription service 2021-04-16 08:58:57 +10:00
David Bomba
84ea66493c Clean up Subscription service class 2021-04-16 08:32:38 +10:00
David Bomba
0426b6c941 Add payment notification on manual payment creation 2021-04-16 07:58:34 +10:00
Benjamin Beganović
331b49ff04 wip 2021-04-15 15:56:20 +02:00
David Bomba
cac8056832 Refund subscriptions 2021-04-15 15:46:50 +10:00
David Bomba
0b1569d6d9 refund subscriptions in cancellation window 2021-04-15 15:36:50 +10:00
David Bomba
7c8bf53951 updgrade and downgrade 2021-04-15 13:40:03 +10:00
David Bomba
bb6a1c6b27 Working on downgrading subscriptions 2021-04-15 12:28:31 +10:00
David Bomba
bc56112d10 Subscriptions upgrade and downgrade 2021-04-15 11:03:12 +10:00
David Bomba
218aa6de73 Checks for partial/deposit greater than amount/balance 2021-04-15 08:09:36 +10:00
Benjamin Beganović
df6718a31e wip 2021-04-14 16:09:37 +02:00
=
4cd83ba27a Working on subscriptions 2021-04-14 21:26:45 +10:00
=
d0cb09d094 Minor fixes for task controller 2021-04-14 19:55:43 +10:00
David Bomba
c2990a21d0 Fixes for tests 2021-04-14 16:48:32 +10:00
David Bomba
3b112952d6 Minor fixes 2021-04-14 15:28:05 +10:00
David Bomba
bb0d91a30f Fixes for HTMLEngine 2021-04-14 14:49:53 +10:00
David Bomba
aabe5683e1 Refactoring subscriptions 2021-04-14 14:41:04 +10:00
David Bomba
986e7fee86 Add validation rules for recurring productS 2021-04-14 12:51:22 +10:00
David Bomba
2237939491 Subscriptions 2021-04-14 12:40:16 +10:00
David Bomba
1e663afba4 Remove commonmark implementation 2021-04-14 07:40:58 +10:00
David Bomba
5c1eb7f7eb Update texts 2021-04-14 07:40:07 +10:00
Benjamin Beganović
325d39736f wip 2021-04-13 17:07:34 +02:00
Benjamin Beganović
dba330bcb3 wip 2021-04-13 16:43:35 +02:00
David Bomba
a386a33a7e
Merge branch 'v5-develop' into v5-develop 2021-04-13 19:35:44 +10:00
David Bomba
f2342e640a Subscriptions 2021-04-13 19:34:59 +10:00
David Bomba
803818b53c Subscriptions 2021-04-13 15:04:53 +10:00
David Bomba
527d21bdc0 Subscription events 2021-04-13 13:09:47 +10:00
David Bomba
7e3a9205b9 Add event listeners for Subscriptions + fix user actioning the event() 2021-04-13 09:52:17 +10:00
David Bomba
9222b72c7e Test for truth 2021-04-12 22:16:17 +10:00
David Bomba
9d8ee8a44e Test for truth 2021-04-12 22:15:34 +10:00
David Bomba
fa602ef0cd Fixes for setting default database 2021-04-12 22:12:50 +10:00
David Bomba
bde5166827 Subscriptions 2021-04-12 21:56:08 +10:00
Benjamin Beganović
9a0417c1ba
Merge pull request #5412 from beganovich/v5-1004-billing-portal 
(v5) Billing portal
 2021-04-12 11:53:23 +01:00
Benjamin Beganović
b860dde7c6
Merge pull request #5411 from beganovich/v5-1004-show-error-from-api-billing 
(v5) Billing: Show message from eligible service
 2021-04-12 11:53:01 +01:00
Benjamin Beganović
e2b762fa75
Merge pull request #5410 from beganovich/v5-1004-custom-fields-for-quotes 
(v5) Resolve custom fields for quotes on PDF
 2021-04-12 11:52:52 +01:00
Benjamin Beganović
94a7515244
Merge pull request #5408 from beganovich/v5-1004-desc-sort-invoices 
(v5) Client portal: Sort invoices in descending order
 2021-04-12 11:52:39 +01:00
Benjamin Beganović
24d6705b7f
Merge pull request #5406 from beganovich/v5-1004-add-with-trashed-for-invoices 
(v5) Add withTrashed() for invoices table
 2021-04-12 11:52:08 +01:00
Benjamin Beganović
84e930e971
Merge pull request #5405 from beganovich/v5-1004-ach-message 
(v5) Send ACH notification e-mail after connecting bank account
 2021-04-12 11:51:55 +01:00
Benjamin Beganović
c319dedf75
Merge pull request #5395 from beganovich/v5-0904-decode-html-on-frontend 
(v5) Switch decoding HTML from backend to Javascript
 2021-04-12 11:40:20 +01:00
David Bomba
3b7c4d64f5 Stripe Connect Stubbed 2021-04-12 20:11:08 +10:00
David Bomba
477aa691a9 Add custom exceptions 2021-04-12 14:36:51 +10:00
David Bomba
4ede6bd41e Add subscription delete routes 2021-04-11 13:52:37 +10:00
David Bomba
f5092e8cf4 Fixes for custom email templates 2021-04-11 13:46:40 +10:00
Benjamin Beganović
8a93cda5ff wip 2021-04-10 14:01:09 +02:00
Benjamin Beganović
cb9bfe02c2 Show message from eligible service 2021-04-10 13:56:29 +02:00
Benjamin Beganović
1ba9e44e2e wip 2021-04-10 13:33:56 +02:00
Benjamin Beganović
bb7f9c64d5 Sort invoices in descending order 2021-04-10 12:48:51 +02:00
Benjamin Beganović
b345e12678 Add withTrashed for invoices table 2021-04-10 10:56:48 +02:00
Benjamin Beganović
7e1cc64247 Send ACH notification e-mail after connecting bank account 2021-04-10 10:44:06 +02:00
David Bomba
d91e8c438e Working on Pro Rata Refunds 2021-04-10 14:53:16 +10:00
David Bomba
62401555cd Working on pro rata refunds 2021-04-10 14:07:08 +10:00
David Bomba
ccaa5c1d31 Improve mock data quality: 2021-04-10 12:47:47 +10:00
David Bomba
7372aecb1a Remove logging 2021-04-10 12:15:37 +10:00
David Bomba
1696c63ba4 fixes for endless recursion 2021-04-10 12:01:36 +10:00
David Bomba
5279888d6d Clean logging out 2021-04-10 10:27:04 +10:00
David Bomba
48f610d43f Fixes for surcharge tax totals 2021-04-10 09:59:19 +10:00
David Bomba
fa9815ea48 Fixes for self-updater 2021-04-10 08:41:36 +10:00
David Bomba
c16b2c193a Fixes for white label 2021-04-10 08:27:02 +10:00
Benjamin Beganović
d44691c613 wip 2021-04-09 13:11:28 +02:00
Benjamin Beganović
7799b34346 wip 2021-04-09 13:06:14 +02:00
=
e7707a919b Delete invoice when payments are applied 2021-04-09 19:51:17 +10:00
=
045fd56304 Change default pdf column properties 2021-04-09 17:44:17 +10:00
=
2ab00ed2d8 Remove redundant packages 2021-04-09 17:39:52 +10:00
David Bomba
5be620ccde Refactor self updater 2021-04-09 15:53:12 +10:00
David Bomba
b6d26fa7c9 Refactor self updater 2021-04-09 15:03:06 +10:00
David Bomba
c77faa746d refactor self updating 2021-04-09 11:22:11 +10:00
David Bomba
a6e12ee95b Working on new self updater 2021-04-09 10:33:54 +10:00
David Bomba
17a36fd14b minor fixes 2021-04-09 08:37:03 +10:00
David Bomba
5f7f18840f v5.1.42 2021-04-09 07:57:01 +10:00
Benjamin Beganović
6b8b29536a
Merge pull request #5385 from beganovich/v5-0804-page-size 
(v5) PDFs: Add $page_size & $page_layout
 2021-04-08 17:54:15 +02:00
Benjamin Beganović
c17893f9a8 Add $page_size & $page_layout 2021-04-08 17:49:28 +02:00
Benjamin Beganović
c0f5780172 wip 2021-04-08 17:11:14 +02:00
Benjamin Beganović
ec1d4e05c1 - Rename: $target_subscription to $target and all references 
- Ability to pay for the upgrade
 2021-04-08 16:53:54 +02:00
David Bomba
8e327d3a75 v5.1.41 2021-04-08 21:08:29 +10:00
David Bomba
47113da4fa Fixes for invoice properties 2021-04-08 20:50:53 +10:00
David Bomba
d9d042724e Add daily reset 2021-04-08 20:38:31 +10:00
David Bomba
084c3b78a6 Add update route 2021-04-08 20:01:00 +10:00
David Bomba
0225526756 Set password for new users 2021-04-08 14:35:02 +10:00
David Bomba
8f91969c49 bug fixes for subscriptions 2021-04-08 12:43:31 +10:00
David Bomba
fbec084e9d
Merge pull request #5374 from turbo124/v5-develop 
Suppress optimize on shared hosting
 2021-04-08 10:33:31 +10:00
David Bomba
3857b1dc3e Test for recurring updates 2021-04-08 09:21:09 +10:00
David Bomba
c2b4210241 Suppress optimize on shared hosting 2021-04-08 08:42:23 +10:00
David Bomba
4c56d7328c Add page layout option 2021-04-08 08:19:36 +10:00
Benjamin Beganović
969d9f03dc wip 2021-04-07 18:08:26 +02:00
Benjamin Beganović
71d28e691b wip 2021-04-07 14:23:14 +02:00
Benjamin Beganović
43e6ba2ec6 Check if payment is eligible to process 2021-04-07 13:26:50 +02:00
David Bomba
c1b6e2043e Fixes for subscriptions 2021-04-07 21:05:09 +10:00
David Bomba
3a3ddc031c Working on subscriptions 2021-04-07 18:06:50 +10:00
David Bomba
498d8e4efc Subscription Crons 2021-04-07 13:35:16 +10:00
David Bomba
38a648866c Account cleanup 2021-04-07 12:40:48 +10:00
David Bomba
73e7aadaad Working on pro plan; 2021-04-07 08:56:36 +10:00
David Bomba
23206d7a67 Add licenses table 2021-04-07 00:00:24 +10:00
David Bomba
048405decc check object prior to testing properties 2021-04-06 22:38:59 +10:00
David Bomba
161f20fae7 Fixes for paths to s3 type storage 2021-04-06 22:36:50 +10:00
David Bomba
69f6179e6a 5.1.36 2021-04-06 20:38:56 +10:00
David Bomba
db5e896e46 5.1.35 2021-04-06 19:07:21 +10:00
David Bomba
fcac89a92c Subscription service 2021-04-06 17:55:18 +10:00
David Bomba
06c5cf0519 add response to system logger for subscription API calls 2021-04-06 17:14:30 +10:00
David Bomba
6b9001684e Fixes for tests 2021-04-06 17:11:58 +10:00
David Bomba
fe7b3c79e7 Working on subscriptions 2021-04-06 16:07:35 +10:00
David Bomba
355d0ae7b5 Testing Permissions 2021-04-06 14:02:27 +10:00
David Bomba
6d1d950c4e Ninja Feature Tests 2021-04-06 13:05:40 +10:00
David Bomba
fac1eebd2c PHP 8.0 suppotr 2021-04-06 10:43:56 +10:00
David Bomba
378cf1c60c Fixes for localizing emails 2021-04-06 08:35:27 +10:00
David Bomba
9cb8e865fc Fixes for assigned_user_id and group_id not sticking to subscriptions 2021-04-06 08:21:55 +10:00
David Bomba
b1e6325ef8 Fixes for tests 2021-04-06 08:19:27 +10:00
David Bomba
40335c0d92 Add rest method and headers to webhooks 2021-04-06 07:41:51 +10:00
David Bomba
d9047b413a Disable product price updating if currencies do not match 2021-04-06 07:36:20 +10:00
David Bomba
d293c28a55
Merge pull request #5339 from turbo124/v5-develop 
Subscriptions
 2021-04-05 22:59:27 +10:00
David Bomba
660dca561b subscriptions 2021-04-05 22:37:25 +10:00
Benjamin Beganović
2cd3ceed2e Allow expenses to be part of products table 2021-04-05 14:21:49 +02:00
Benjamin Beganović
4738920475
Merge pull request #5333 from beganovich/v5-0504-fillables-fields-over-queries 
(v5) Billing portal: Allow prefilling the client/contact fields over query parameters
 2021-04-05 13:24:45 +02:00
Benjamin Beganović
5ac1ae16ff Fixes #5314 (https://github.com/invoiceninja/invoiceninja/issues/5314) 2021-04-05 13:22:21 +02:00
Benjamin Beganović
c1a92bfb52 Fixes #5312 (https://github.com/invoiceninja/invoiceninja/issues/5312) 2021-04-05 11:04:33 +02:00
Benjamin Beganović
b230680e8f Allow prefilling the client/contact fields over query parameters 2021-04-05 10:43:25 +02:00
David Bomba
8d4fa8cb42 Working on subs 2021-04-05 12:42:49 +10:00
David Bomba
fcaabace7f Subscriptions 2021-04-05 09:21:54 +10:00
David Bomba
51c7a16423 Subscriptions 2021-04-05 09:08:16 +10:00
David Bomba
c814a754c3 Subscriptions 2021-04-05 08:37:01 +10:00
=
bf71acfe2d Fixes for tests 2021-04-04 22:47:59 +10:00
=
858c99e09d Working on subscriptions 2021-04-04 22:14:33 +10:00
David Bomba
f1f8201683 fixes for delivery note generation 2021-04-02 22:44:44 +11:00
David Bomba
f7cf6b521f
Merge pull request #5321 from turbo124/v5-develop 
fixes for subscriptions
 2021-04-02 10:19:37 +11:00
David Bomba
c3eb46d0b7 fixes for subscriptions 2021-04-02 09:09:01 +11:00
Benjamin Beganović
9ce4a787e9
Merge pull request #5318 from beganovich/v5-0104-billing-portal 
(v5) Billing portal: Show OG price when discount is applied
 2021-04-01 17:03:43 +02:00
Benjamin Beganović
83844652e5 show og price when discount is applied 2021-04-01 17:02:11 +02:00
Benjamin Beganović
e67b5acbe9
Merge pull request #5313 from beganovich/v5-0104-tax-column-hiding-fix 
(v5) Alias the $task.rate to $task.cost for column support
 2021-04-01 16:44:05 +02:00
Benjamin Beganović
08b317f7b8 allow cancellation under specific conditions 2021-04-01 16:38:46 +02:00
Benjamin Beganović
b25f79f4e1 carry coupon over magic link 2021-04-01 16:20:31 +02:00
Benjamin Beganović
6af6668ba6 remove price() from subscriptionservice 2021-04-01 16:10:26 +02:00
Benjamin Beganović
0b2613146b Show spinner after clicking payment method 2021-04-01 16:09:30 +02:00
Benjamin Beganović
30d3c8a92e pull the initial price from the model itself 2021-04-01 16:04:22 +02:00
Benjamin Beganović
ecbe6494c6 Alias the $task.rate to $task.cost for column support 2021-04-01 15:00:09 +02:00
David Bomba
a2e0fd0849 Unique subscription nameS 2021-04-01 20:56:50 +11:00
David Bomba
1e83b729d5 Minor fixes for subscriptions 2021-04-01 20:33:50 +11:00
David Bomba
3a770361aa Set valid until when a quote is marked as sent 2021-04-01 19:07:32 +11:00
David Bomba
3b9ffb431f Fixes for tests 2021-04-01 19:02:28 +11:00
David Bomba
61489ca7d3 fixes for service methods 2021-04-01 13:24:05 +11:00
David Bomba
be648230de Working on subscriptions 2021-04-01 12:58:12 +11:00
David Bomba
9bf9bc35ad
Merge pull request #5305 from turbo124/v5-develop 
Payment mailer fixes
 2021-04-01 08:29:12 +11:00
David Bomba
c78feb80e8 Fixes for payment mailer 2021-04-01 08:28:51 +11:00
David Bomba
c279cf013e add per_seat_enabled to fillable 2021-04-01 07:04:53 +11:00
Benjamin Beganović
c300ffc4d9 passwordless login 2021-03-31 18:10:44 +02:00
David Bomba
b9e56a271d Add expense type id for invoice items 2021-03-31 21:41:17 +11:00
David Bomba
9c4a223923 Fixes for notification gates 2021-03-31 13:28:03 +11:00
David Bomba
89a271e59c Improve custom label replacements in emails 2021-03-31 12:55:33 +11:00
David Bomba
e453030b4b Fixes for subscriptions repo naming 2021-03-31 11:20:41 +11:00
David Bomba
6cbfe6b1bf rename method for subcsriptions 2021-03-31 11:14:19 +11:00
David Bomba
404ee307fd Magic link maker 2021-03-31 11:07:54 +11:00
David Bomba
ffdd81ab6b
Merge pull request #5296 from turbo124/v5-develop 
Fixes for subscriptions
 2021-03-31 10:08:29 +11:00
David Bomba
f1131c07fe Fixes 2021-03-31 10:03:18 +11:00
David Bomba
8e2c07b0df Fixes 2021-03-31 09:58:50 +11:00
David Bomba
b5e0276b1c Mark approved quotes as sent 2021-03-31 08:57:14 +11:00
Benjamin Beganović
eec902429a
Merge pull request #5286 from beganovich/v5-3003-company-user-registration 
(v5) Fix acessing client register route without company instance
 2021-03-30 16:30:16 +02:00
Benjamin Beganović
1e618dcbad
Merge pull request #5287 from beganovich/v5-3003-locale-fixes-for-literal 
(v5) Show "literal" months using locale on PDFs
 2021-03-30 16:30:07 +02:00
Benjamin Beganović
6af83a8675 wip 2021-03-30 15:50:39 +02:00
Benjamin Beganović
eb0aed513f wip 2021-03-30 14:44:33 +02:00
Benjamin Beganović
d5109af225 wip 2021-03-30 14:07:31 +02:00
David Bomba
3eb9688a83 fix subscriptions schema 2021-03-30 21:08:02 +11:00
David Bomba
f5c6847a36 Minor fixes for subscription types 2021-03-30 20:41:58 +11:00
David Bomba
32fd16dfb7
Merge pull request #5284 from turbo124/v5-develop 
Subscriptions
 2021-03-30 20:37:28 +11:00
David Bomba
caf7ad5998 Minor fixes for self updater - more verbose messaging after self update 2021-03-30 18:01:20 +11:00
David Bomba
1af565abd3 minor fixes for texts 2021-03-30 16:10:31 +11:00
David Bomba
9377b9cae4 Fixes for authorize credit cards 2021-03-30 12:28:49 +11:00
David Bomba
96c191daf0 Add system logs to first load 2021-03-30 09:32:33 +11:00
David Bomba
878f00b375 add additional query filter for recurring invoices 2021-03-30 09:30:41 +11:00
Benjamin Beganović
972c1ef56e wip 2021-03-29 15:51:03 +02:00
Benjamin Beganović
05cbd30bef wip 2021-03-29 15:50:36 +02:00
Benjamin Beganović
c4ff24132e wip 2021-03-29 14:35:27 +02:00
Benjamin Beganović
d37d727d2c - Fix typo in BaseController.php 
- Add labels on top of billing page (one-time, or/and subscription)
- Show products
- Pull the price from the service
 2021-03-29 12:58:03 +02:00
David Bomba
f1ece9ab6b Subscriptions 2021-03-29 21:43:42 +11:00
Benjamin Beganović
97d92cd127 wip 2021-03-29 12:25:29 +02:00
David Bomba
3183186d4d Working on subscriptions 2021-03-29 21:19:30 +11:00
David Bomba
de99ed2ba4 Fixes for quote numbering 2021-03-29 21:00:22 +11:00
David Bomba
db7df69db7 Recurring services - trial phase' 2021-03-29 14:49:29 +11:00
David Bomba
d7bf927549 Set exchange rates on invoices 2021-03-29 13:14:55 +11:00
=
646130a104 Fixes for tests 2021-03-28 13:26:46 +11:00
=
40dc8efd46 limit logging conditionally 2021-03-28 13:19:44 +11:00
=
6e813e233e Fix missing USE in CreditWasViewed event 2021-03-28 13:09:47 +11:00
David Bomba
6489d73ad6 Fixes for subscriptions 2021-03-28 09:15:12 +11:00
David Bomba
2e139a633b Validation rules for subscriptions 2021-03-28 08:45:46 +11:00
David Bomba
8dedfa4cb5
Merge pull request #5266 from turbo124/v5-develop 
Subscriptions
 2021-03-27 20:26:53 +11:00
=
9fd40f55c6 Exchange rates 2021-03-27 14:51:34 +11:00
=
3479c127fd Fixes for subscription refactor 2021-03-27 14:22:19 +11:00
=
83c636aa55 update todos 2021-03-27 09:05:37 +11:00
=
46a525f04d Create invoice for subscription 2021-03-27 08:55:04 +11:00
=
95749b4822 Subscriptions - invoice generation logic 2021-03-27 08:39:08 +11:00
David Bomba
2c83abe432 Subscriptions 2021-03-27 07:28:56 +11:00
David Bomba
f067290462 Update rules for updating an entity 2021-03-27 06:43:52 +11:00
David Bomba
fc3889671e Fixes for HTMLEngine 2021-03-27 06:30:46 +11:00
David Bomba
c47318df1e Fixes for company presenter 2021-03-27 06:21:47 +11:00
Benjamin Beganović
8e3508a2b1
Merge pull request #5253 from beganovich/v5-2503-billing-portal 
(v5) 25.03: Billing page
 2021-03-26 15:05:08 +01:00
David Bomba
750da31021 Transform id's correctly 2021-03-26 20:38:51 +11:00
David Bomba
b3863581ae Stubs for products / recurring products and subscription price 2021-03-26 20:20:37 +11:00
David Bomba
b40751a2b9 Auto optimize after composer install 2021-03-26 19:34:39 +11:00
David Bomba
98e314b6c0 Fixes for calculating the correct gateway fee depending on the payment method 2021-03-26 19:18:25 +11:00
David Bomba
fd24449f95 Fixes for deleting / restoring / removing users 2021-03-26 19:07:43 +11:00
David Bomba
8eb8f6e098 Fixes for tests 2021-03-26 06:42:25 +11:00
Benjamin Beganović
ed4fff2385 - Bundle qty without ability to increment/decrement value ✅ 
- One time & subs ✅
- A table with all products included in subscription (qty, price, notes) ✅
- Two tables, one for subscriptions, one for one-time purchases ✅
- If no products, no table ✅
- Remove quantity from cached data that is being sent ✅
- Remove "billing_subscription_id" from data sent ✅
 2021-03-25 16:52:03 +01:00
David Bomba
abd3a89bc9
Subscriptions (#5248) 
* Fixes for converting quote to invoice

* Fixes for naming PDFs

* Refresh entity prior to sending

* Fixes for subscriptions

* Add in required use

* Fixes for notifications

* Fixes for notifications

* Add with trasheD

* Rename BillingSubscriptions to Subscriptions

* Refactoring subscriptions
 2021-03-25 21:55:59 +11:00
David Bomba
cb7f27462b
Client subscriptions + bug fixes (#5238) 
* Fixes for converting quote to invoice

* Fixes for naming PDFs

* Refresh entity prior to sending

* Fixes for subscriptions

* Add in required use

* Fixes for notifications

* Fixes for notifications
 2021-03-24 20:14:30 +11:00
Benjamin Beganović
49c4707e38
Update BillingPortalPurchase.php 2021-03-23 16:27:30 +01:00
Benjamin Beganović
77fdb25304
Merge branch 'v5-develop' into v5-2203-billing-portal 2021-03-23 16:23:56 +01:00
=
ae9e927039 Working on client subs 2021-03-23 23:35:48 +11:00
=
3d375e4148 Workig on client subscriptions 2021-03-23 23:17:28 +11:00
=
f74368e869 Set first user to gmail after first authorization 2021-03-23 17:19:06 +11:00
David Bomba
3ed8479411 Improve user migrations 2021-03-23 14:53:10 +11:00
David Bomba
3b72fa343f complete purchase - billing subscription 2021-03-23 14:26:21 +11:00
David Bomba
417ed6c13d Fixes for recurring 2021-03-23 08:24:05 +11:00
David Bomba
3ebe533fc8 include Account clas 2021-03-23 07:09:42 +11:00
Benjamin Beganović
e78fb7e891 Update quering the language/locale using Cache instead of DB 2021-03-22 14:09:29 +01:00
Benjamin Beganović
535d9ae471 Update data passed to startTrial 2021-03-22 14:03:32 +01:00
Benjamin Beganović
d5ad6088f6 Create data mapper for cached data / billing context 2021-03-22 13:56:26 +01:00
Benjamin Beganović
6e714747bd Update price per quantity 2021-03-22 13:53:34 +01:00
Benjamin Beganović
8bc4896daa Hide/show coupon code field if promo code configured in billing tableclear 2021-03-22 13:34:59 +01:00
Benjamin Beganović
8839bfabd3 Hide quantity if max_seats_limit = 1 2021-03-22 13:32:29 +01:00
David Bomba
5700da5323 Fixes for password protection 2021-03-22 22:18:57 +11:00
David Bomba
a74e38902b
Merge pull request #5222 from turbo124/v5-develop 
Fixes for default timeouts
 2021-03-22 22:12:28 +11:00
David Bomba
5d28271df9 Fixes for default timeouts 2021-03-22 22:12:12 +11:00
Benjamin Beganović
296d3046e8 Add margins between items 2021-03-22 12:10:53 +01:00
Benjamin Beganović
500fa38a29 Remove nl2br for public notes 2021-03-22 12:08:59 +01:00
David Bomba
22f81a036f
Merge pull request #5220 from turbo124/v5-develop 
Fixes for default timeouts
 2021-03-22 21:55:25 +11:00
David Bomba
793247e0f7 Fixes for default timeouts 2021-03-22 21:55:09 +11:00
Benjamin Beganović
540f5b647a uncomment the initialization of billing service 2021-03-22 11:14:56 +01:00
Benjamin Beganović
44bf716fc9
Merge branch 'v5-develop' into v5-2003-fix-billing-subscription-integration 2021-03-22 11:12:14 +01:00
Benjamin Beganović
187be058f7
Merge branch 'v5-develop' into v5-1803-billing 2021-03-22 09:38:34 +01:00
David Bomba
cfdcf889ad Small type check fix 2021-03-22 17:46:59 +11:00
David Bomba
56b0452d2e Add oauth user token 2021-03-22 12:54:50 +11:00
David Bomba
0c5b551ce1 Connected Gmail Account 2021-03-22 10:48:00 +11:00
David Bomba
c97dea08d2 Connected Gmail Account 2021-03-22 09:52:39 +11:00
David Bomba
24c8325fb1 Connected Gmail Account 2021-03-22 09:02:22 +11:00
David Bomba
32b8575ce1 Connected Gmail Account 2021-03-22 08:06:26 +11:00
David Bomba
f80179814d fix conflicts 2021-03-22 07:22:20 +11:00
David Bomba
1b5d6d44f2 Set default time out 2021-03-22 07:21:51 +11:00
=
4285b5f6fc Minor fixes for oauth login 2021-03-21 21:38:57 +11:00
=
42ae8d53dd Working on client subscriptions 2021-03-21 20:45:30 +11:00
=
932185e6c2 Working on client subscriptions 2021-03-21 20:26:30 +11:00
David Bomba
c7d7916b04 Update defaults 2021-03-21 16:35:09 +11:00
David Bomba
8d490200b6 Merge branch 'v5-develop' of https://github.com/turbo124/invoiceninja into v5-develop 2021-03-21 13:51:45 +11:00
David Bomba
58aee4250e Fixes for task policy 2021-03-21 13:51:28 +11:00
Benjamin Beganović
fdd1601120 wip 2021-03-20 23:15:26 +01:00
=
5b290b1770 Small fix for usernotifies 2021-03-21 08:57:11 +11:00
=
36ffeb9344 bug fixes 2021-03-21 08:53:33 +11:00
=
2eb7de95ad Add invoie_id to client subs 2021-03-20 14:39:30 +11:00
David Bomba
6be79ad022 Billing Subs 2021-03-20 13:57:03 +11:00
David Bomba
ba91c96c40 update texts 2021-03-20 13:49:45 +11:00
=
e2314359b9 Pass back the correct entity! 2021-03-20 11:54:47 +11:00
=
5288893220 Small fixes for 2FA 2021-03-20 11:46:42 +11:00
=
b158fb430f Small fixes for 2FA 2021-03-20 11:41:41 +11:00
=
7173ba2931 catch project exceptions 2021-03-20 11:16:29 +11:00
David Bomba
9e0328757a Tests for number validation across entities 2021-03-20 10:06:44 +11:00
David Bomba
451e4e1bbe Ensure better unique rules 2021-03-20 09:51:52 +11:00
David Bomba
b841fe7000 Working on unique rules for numbers 2021-03-20 09:29:20 +11:00
David Bomba
422fd4f88c
Merge pull request #5182 from turbo124/v5-develop 
Minor fixes
 2021-03-19 23:40:05 +11:00
David Bomba
34b9877868 Minor fixes 2021-03-19 23:37:57 +11:00
Benjamin Beganović
d98165a8dd Set client language_id if locale is present 2021-03-18 16:01:13 +01:00
Benjamin Beganović
3bcb65efc2 Set locale from query parameter 2021-03-18 15:41:26 +01:00
Benjamin Beganović
69eecbf281 Qty 2021-03-18 15:22:22 +01:00
Benjamin Beganović
415ea81eec Support for "Start Free Trial" 2021-03-18 14:14:10 +01:00
Benjamin Beganović
85c09ecf11 Show the message about coupon code/discount under the input field 2021-03-18 13:51:10 +01:00
David Bomba
2a89a12b69
Merge pull request #5175 from turbo124/v5-develop 
Fixes for 2fa
 2021-03-18 22:47:31 +11:00
David Bomba
10f7b1a309 Fixes for 2fa 2021-03-18 22:46:58 +11:00
Benjamin Beganović
c75e4e678f Set min-width for designs when using repeating headers/footers 2021-03-18 12:12:44 +01:00
David Bomba
ea1156cc81
Merge pull request #5172 from turbo124/v5-develop 
Small fix for new PDF generator
 2021-03-18 20:58:36 +11:00
David Bomba
ac6feb706e Small fix for new PDF generator 2021-03-18 20:57:55 +11:00
Benjamin Beganović
d706d226e8 Disable automatic custom column processing on the PDF 2021-03-18 09:32:11 +01:00
David Bomba
9ca9736de6 resolved conflicts' 2021-03-18 12:00:01 +11:00
David Bomba
ee15ea9434 v5.1.27 2021-03-18 11:58:10 +11:00
David Bomba
086189a1ea Hosted PDFs by invoice ninja 2021-03-18 11:53:08 +11:00
David Bomba
7fbe4ceb5d
Merge pull request #5162 from turbo124/v5-develop 
Remove illegal characters from pdf file names
 2021-03-18 08:19:56 +11:00
Benjamin Beganović
c320b6bfbb
Merge branch 'v5-develop' into v5-1103-billing-landing-page 2021-03-17 17:14:55 +01:00
Benjamin Beganović
127c6cb3cd wip 2021-03-17 16:12:25 +01:00
David Bomba
f52fb31ced Remove illegal characters from pdf file names 2021-03-17 22:29:20 +11:00
Benjamin Beganović
81f5808bf6 - Use user from $billing_subscription to create client 
- Disable generating the cache for temporary state
- Generate the blank invoice based on the product
 2021-03-17 12:06:58 +01:00
David Bomba
dc4980a8b2 Update demo data 2021-03-17 21:26:02 +11:00
David Bomba
f00c1f95c0 Add new counter settings 2021-03-17 21:06:08 +11:00
David Bomba
c95e0c3d7e Tuning company settings for missing properties 2021-03-17 20:28:44 +11:00
Benjamin Beganović
eb2cfde303 Merge remote-tracking branch 'upstream/v5-develop' into v5-1103-billing-landing-page 2021-03-17 07:34:23 +01:00
David Bomba
1012c8df4b Working on billing subscriptions 2021-03-17 13:21:06 +11:00
David Bomba
86ea2f0709 Fixes for free plan invoice designs - default to clean 2021-03-17 12:04:54 +11:00
David Bomba
059cec705d Small fix for user notifications 2021-03-17 11:13:29 +11:00
David Bomba
db03dccbaf Limit reminders for free plans 2021-03-17 08:15:43 +11:00
David Bomba
5ef6afdc28 Limit attachment features on free plan 2021-03-17 08:08:23 +11:00
David Bomba
b762ea37d2 Throw 400's on incorrect 2FA data 2021-03-17 00:40:58 +11:00
Benjamin Beganović
851a31b3c0 Proof of concept for billing page 2021-03-16 14:35:57 +01:00
David Bomba
0422c95e13 Cache password protection on login 2021-03-16 23:10:15 +11:00
David Bomba
ae62bf63c6 Fixes for 2FA 2021-03-16 22:47:14 +11:00
David Bomba
aef2270f05 Fixes for connected account 2021-03-16 22:44:10 +11:00
David Bomba
816ea281ff Fixes for connected account 2021-03-16 22:33:48 +11:00
David Bomba
591bfb9e9d Fixes for connected account 2021-03-16 22:30:33 +11:00
David Bomba
6bb71dc33b Fixes for connected account 2021-03-16 22:29:16 +11:00
David Bomba
05b008ca60 Fixes for 2FA 2021-03-16 09:33:55 +11:00
David Bomba
eb70c7c2ed
Merge pull request #5139 from turbo124/v5-develop 
Fix for invite resend
 2021-03-16 07:35:47 +11:00
David Bomba
1e72f20c3d Fix for invite resend permission 2021-03-16 07:35:19 +11:00
Benjamin Beganović
4350816804 wip 2021-03-15 17:33:27 +01:00
Benjamin Beganović
dade7bad0a Merge upstream/v5-develop 2021-03-15 13:08:43 +01:00
Benjamin Beganović
4918423124 use ->getData() 2021-03-15 11:14:09 +01:00
Benjamin Beganović
b07eedb755 PayPal fixes for loggin 2021-03-15 11:12:01 +01:00
David Bomba
6a2332526b Biling Subscription Service 2021-03-15 08:42:05 +11:00
David Bomba
8f37a06e24 Fixes for 2FA 2021-03-15 08:40:07 +11:00
David Bomba
e176be086a Fixes for 2FA 2021-03-15 07:18:53 +11:00
David Bomba
255643d7dc Fixes for connected account 2021-03-14 21:32:09 +11:00
Benjamin Beganović
0b9c6e782d merge upstream/v5-develop 2021-03-13 14:55:13 +01:00
Benjamin Beganović
b9bea02b68 wip 2021-03-13 14:51:01 +01:00
=
e2bc086f75 Type check on custom fields 2021-03-13 19:36:00 +11:00
=
94b1e59535 Improvements in Setup workflow 2021-03-13 17:55:18 +11:00
=
0bf8b9c9e5 Fixes for setup flow 2021-03-13 17:45:41 +11:00
=
487cf555b9 Fix for displaying logo 2021-03-13 16:56:52 +11:00
David Bomba
f67652cf88
Merge pull request #5100 from beganovich/v5-1003-company-custom-fields 
(v5) Support for custom company fields on the PDF
 2021-03-13 15:07:08 +11:00
David Bomba
d01b97104a
Merge pull request #5111 from joshuadwire/v5-develop 
Fix request validation for preconfigured installs
 2021-03-13 14:58:23 +11:00
Joshua Dwire
941132133c Fix request validation for preconfigured installs 2021-03-12 18:46:56 -05:00
Benjamin Beganović
908678cdc4 wip 2021-03-12 15:00:33 +01:00
David Bomba
aef31d8193
Merge pull request #5104 from joshuadwire/v5-develop 
Support pre-configured installs where setup doesn't allow changing DB config
 2021-03-12 21:00:58 +11:00
David Bomba
4f626ca90d
Merge pull request #5105 from turbo124/v5-develop 
Improve PDF creation performance
 2021-03-12 15:00:50 +11:00
Joshua Dwire
a844afd128 Support pre-configured installs where setup doesn't allow changing DB info 2021-03-11 19:48:41 -05:00
David Bomba
ff2f43d8fc Do no add value from custom_value to invoice total 2021-03-12 07:24:09 +11:00
David Bomba
57ef1c9b78 Return user for /connected_account 2021-03-12 07:07:52 +11:00
Benjamin Beganović
d546c4711c wip 2021-03-11 17:20:30 +01:00
Benjamin Beganović
3696b06566 Scaffold landing page for billing, controller & endpoint 2021-03-11 14:05:23 +01:00
Benjamin Beganović
b88533d3d2 Catch possible invalid format exception & return "Invalid date!" 2021-03-10 16:56:17 +01:00
Benjamin Beganović
7c01b3bb64 Support for custom fields in company details section 2021-03-10 16:55:49 +01:00
Benjamin Beganović
653973c826 Align content to left by default 2021-03-10 14:32:17 +01:00
David Bomba
b9c9874533 Improve PDF creation performance 2021-03-10 21:00:18 +11:00
David Bomba
64c483befe Code cleanup 2021-03-10 20:42:39 +11:00
David Bomba
76a27f3946 Fix for null design column 2021-03-10 20:41:18 +11:00
David Bomba
e54562b6d4 Only one confirmation per user signup 2021-03-10 20:32:38 +11:00
David Bomba
ed8c880750 add reconfirm route 2021-03-10 20:15:24 +11:00
David Bomba
9888d7acb9 Improve delete pdf performance 2021-03-10 13:28:35 +11:00
David Bomba
e7e455667d Fixes for company logo in emails 2021-03-10 12:51:08 +11:00
David Bomba
18e8934e70 Delete pdf in service rather than child job 2021-03-10 12:28:12 +11:00
David Bomba
839a5c49d3 Fixes for billing subs cron 2021-03-10 11:14:05 +11:00
David Bomba
11de159458 Commit event for client subs 2021-03-10 11:11:05 +11:00
David Bomba
00eefcd781 Client Subscription scaffolding 2021-03-10 11:08:58 +11:00
David Bomba
e0b169b64b Fixes for billing subscriptions 2021-03-10 09:56:59 +11:00
David Bomba
b91fcf1b34
Merge branch 'v5-develop' into billing_subscriptions 2021-03-10 09:27:28 +11:00
David Bomba
90b3b25849 Fixes for tests - changed listResponse to itemResponse 2021-03-10 09:23:13 +11:00
David Bomba
599a1626a7 Fix for logo 2021-03-10 07:56:23 +11:00
Benjamin Beganović
737020eeed Fix wrong variable in the BillingSubscriptionTransformer.php 2021-03-09 15:25:11 +01:00
Benjamin Beganović
83b23956f6 Update authorize methods on billing subscription requests 2021-03-09 14:29:57 +01:00
Benjamin Beganović
868b6efd8e Add currency_id to billing_subscriptions table 2021-03-09 14:24:31 +01:00
David Bomba
9290873b8b Fixes for qr code" 2021-03-09 21:53:25 +11:00
David Bomba
59beb9dd39 Customize the password protect timeout 2021-03-09 21:52:48 +11:00
David Bomba
d7d0768eae Minor fixes 2021-03-09 21:34:39 +11:00
David Bomba
cd48ae78f9 Minor fixes 2021-03-09 21:30:34 +11:00
David Bomba
0a3b5e0665 minor fixes 2021-03-09 17:06:03 +11:00
David Bomba
67cedb8348 minor fixes 2021-03-09 17:03:22 +11:00
David Bomba
9a15d2c6cf Minor fixes 2021-03-09 15:43:54 +11:00
David Bomba
4baa89382b Minor fix for connected account 2021-03-09 09:55:31 +11:00
David Bomba
68f0e99f26 Fixes for connected account 2021-03-09 09:53:04 +11:00
David Bomba
053c1ca5fa billing_subscriptions cleanup 2021-03-09 08:29:59 +11:00
David Bomba
31d92a3dc0 add russian language 2021-03-09 08:05:20 +11:00
David Bomba
4e9b92c2da Minor fix for 2fa method name 2021-03-09 07:46:30 +11:00
David Bomba
45104f6ae5
Merge branch 'billing_subscriptions' into billing_subscription_scaffold 2021-03-09 07:43:30 +11:00
David Bomba
b21714c00c Merge branch 'v5-develop' of https://github.com/turbo124/invoiceninja into v5-develop 2021-03-09 05:57:34 +11:00
David Bomba
38e5a14172 Bug fix for reconfirm useR 2021-03-09 05:47:49 +11:00
Benjamin Beganović
2660b8fa58 Billing subscriptions: Requests for crud endpoints 2021-03-08 15:19:45 +01:00
Benjamin Beganović
29922a24a0 Billing subscriptions: Event for created 2021-03-08 15:19:23 +01:00
Benjamin Beganović
780ab6885b Billing subscriptions: Controller 2021-03-08 15:19:04 +01:00
Benjamin Beganović
420d904551 Client subscriptions: Model 2021-03-08 15:18:48 +01:00
Benjamin Beganović
9c1a3368e9 Billing subscriptions: Database schema & model 2021-03-08 15:18:34 +01:00
Benjamin Beganović
ea5117ecbe Billing subscriptions: Factory, repository & transformer 2021-03-08 15:18:14 +01:00
David Bomba
9c2e5c2de4 Fixes for blank company name 2021-03-08 15:20:02 +11:00
David Bomba
d83073ad91 Validation rule for recurring frequency 2021-03-08 12:31:00 +11:00
David Bomba
e39ce7491b Feature permissions for hosted 2021-03-08 08:32:38 +11:00
David Bomba
2595d3d2a4 Fixes for typo in password protection 2021-03-08 07:56:44 +11:00
David Bomba
8d6f6d9eb5 Fixes for 2FA 2021-03-08 07:49:33 +11:00
=
f4d1917f32 Hosted feature implementation 2021-03-07 21:14:53 +11:00
=
616dea2c9d Add webcron support 2021-03-07 17:45:48 +11:00
=
6360f62ef3 Integrate phantom js secret default value into config 2021-03-07 17:27:44 +11:00
David Bomba
7a50032b35 Logging 2021-03-07 08:50:14 +11:00
=
93493116ed Scaffolds for billing_subscriptions 2021-03-06 17:19:57 +11:00
=
097d9ac1b8 Padding out functionality 2021-03-06 11:47:05 +11:00
David Bomba
86673a6c66 Fixes for client address 2021-03-05 21:27:36 +11:00
David Bomba
1599711dee Observers and policy scaffold 2021-03-05 21:18:28 +11:00
David Bomba
f99195c07a Small fixes 2021-03-05 11:16:38 +11:00
David Bomba
7dae7cb326 Fixes for mailer 2021-03-04 19:42:22 +11:00
David Bomba
20440189d2 Fixes for password protection middleware 2021-03-04 16:03:28 +11:00
David Bomba
609cb1ee8d
Merge pull request #5022 from turbo124/v5-develop 
Fixes for user management
 2021-03-04 13:51:03 +11:00
David Bomba
11ad2cd57e Fixes for caching protection route 2021-03-04 12:17:29 +11:00
David Bomba
07aca3d8c0 Fixes for tests 2021-03-04 10:34:18 +11:00
David Bomba
365c190cca Remove return type for User Service 2021-03-04 10:12:34 +11:00
David Bomba
1780db52bd Invite user route 2021-03-04 09:39:24 +11:00
David Bomba
a6282cee56 Create single account from command line 2021-03-04 08:30:11 +11:00
Benjamin Beganović
c69b424928
Merge pull request #5020 from beganovich/v5-0303-payment-methods-fix-blinking-modal 
Payment methods improvements
 2021-03-03 11:54:57 +01:00
Benjamin Beganović
c48dafa962 wip 2021-03-03 11:38:59 +01:00
David Bomba
9b3ea22c22
Merge pull request #5018 from turbo124/v5-develop 
Fixes for attaching a user to different companies
 2021-03-03 21:11:12 +11:00
David Bomba
bfbde2ba51 Fixes 2021-03-03 21:04:10 +11:00
Benjamin Beganović
2ab76adfad Reduce default white label logo size 2021-03-03 08:49:02 +01:00
=
c23b9b147d Fixes for attaching a user to different companies 2021-03-03 18:22:14 +11:00
Benjamin Beganović
a04b075956 Update entity labels on PDF 2021-03-02 15:42:42 +01:00
Benjamin Beganović
7543ab33ff Update white label logo 2021-03-02 14:26:34 +01:00
=
b57d4bfb7c Fixes for recurring invoice number not being prefixed 2021-03-02 21:57:14 +11:00
=
7a2cea1d9c One Time Token 2021-03-02 19:54:23 +11:00
=
aa290172ae One Time Token Requests 2021-03-02 19:03:01 +11:00
=
18fa537791 Add one time token functionality 2021-03-02 18:52:25 +11:00
David Bomba
c37c441d92 Associate a user with multiple companies 2021-03-02 09:18:19 +11:00
David Bomba
edc25c1342 Associate a user with multiple companies 2021-03-02 09:08:57 +11:00
David Bomba
ab5fb7c376 Fixes for company logo 2021-03-02 07:15:28 +11:00
David Bomba
bf326e6d26 Working on adding user to another company 2021-03-01 23:06:24 +11:00
David Bomba
2ab76e9098 v5.1.12 2021-03-01 22:00:07 +11:00
David Bomba
9a2160c325 Verified users only for hosted platform 2021-03-01 13:51:00 +11:00
David Bomba
d238d53b26 Delete PDF helper 2021-03-01 10:40:18 +11:00
David Bomba
92f729c10d Catch if an OAuth user doesn't exist and attempts to login 2021-02-28 19:54:14 +11:00
David Bomba
e668e7fd5a Fixes for Quotes not attaching to emails 2021-02-28 13:12:55 +11:00
=
5f14cc0c5d Working on task range overlap 2021-02-27 21:08:39 +11:00
David Bomba
c887d81dd6
Merge pull request #5000 from turbo124/v5-develop 
Fixes for archived invoice not emailing
 2021-02-27 11:32:50 +11:00
=
4b147ca77a Fixes for migration mailer 2021-02-27 11:32:10 +11:00
=
c94c3fa373 Add project relationships across all entities 2021-02-27 08:37:56 +11:00
=
57e3b59b91 Add project relationship to recurring invoice 2021-02-27 07:48:49 +11:00
David Bomba
cc883f0926 Fixes for archived invoice not emailing 2021-02-26 22:20:17 +11:00
Benjamin Beganović
6284b3a9ea
Merge pull request #4996 from beganovich/v5-2602-currency-fixes 
(v5) Prevent word breaking from unit costs & task rates
 2021-02-26 07:48:19 +01:00
Benjamin Beganović
da9e2e1759 Prevent word breaking from unit costs & task rates 2021-02-26 07:47:04 +01:00
Benjamin Beganović
441db23414 Format quantity output using formatValue() 2021-02-26 07:05:44 +01:00
David Bomba
4b3c7ec771
Merge pull request #4991 from turbo124/v5-develop 
User verified middleware
 2021-02-26 08:18:59 +11:00
David Bomba
4884b039df User verified middleware 2021-02-26 08:18:14 +11:00
David Bomba
c063aee812 enums for email delivery 2021-02-26 08:06:43 +11:00
Benjamin Beganović
786f4095d8 Add invoices as description for Stripe payment 2021-02-25 12:57:12 +01:00
Benjamin Beganović
c074aa9aca
Merge pull request #4790 from beganovich/v5-2701-dynamic-dates-for-recurring 
(v5) PDF: Support for dynamic keywords in items description
 2021-02-25 12:01:04 +01:00
Benjamin Beganović
81dfb25f5f Use translated format of months based on locale 2021-02-25 12:00:01 +01:00
David Bomba
29b4e6d1b7 minor fixes 2021-02-25 21:41:18 +11:00
David Bomba
661fc8ea00 Fixes for first account - verify user email! 2021-02-25 11:09:06 +11:00
David Bomba
f7e4bca5a5 Update task status_order on update() 2021-02-24 13:12:23 +11:00
David Bomba
90b33ef063 clean up 2021-02-24 11:48:32 +11:00
David Bomba
717fcc4b20 Fix for Reply To Name 2021-02-24 11:07:09 +11:00
David Bomba
d18e1d7436 fixes for BCC 2021-02-24 10:43:08 +11:00
David Bomba
ab54f9f75c Custom reply to and from name 2021-02-24 10:39:37 +11:00
David Bomba
d1044a861e Bug fix for TwoFactorController 2021-02-24 10:00:51 +11:00
David Bomba
f54c482010 Postmark webhooks 2021-02-24 09:56:23 +11:00
David Bomba
9b1b677e8e Working on OAuth password protection routes 2021-02-24 08:12:23 +11:00
Benjamin Beganović
7319d073c8 wip 2021-02-23 14:56:16 +01:00
David Bomba
c20d2eedbc remove redundant method 2021-02-23 23:45:50 +11:00
David Bomba
62feba5a51 Localizing Dates 2021-02-23 21:04:39 +11:00
David Bomba
db0e684ff8 Translated dates 2021-02-23 16:15:23 +11:00
David Bomba
ffd9c10ef6
Merge pull request #4968 from turbo124/v5-develop 
Fixes for fillable properties + other minor fixes"
 2021-02-23 12:18:11 +11:00
David Bomba
c7cb299d1c Fixes for fillable properties 2021-02-23 12:17:46 +11:00
David Bomba
55b673241b Fixes for fillable properties 2021-02-23 12:17:09 +11:00
David Bomba
47a2ff7df3 Fixes for tests 2021-02-23 09:47:54 +11:00
David Bomba
1b3a9e6398 Fixes for updating products 2021-02-23 09:08:43 +11:00
Benjamin Beganović
b22825bf17 wip 2021-02-22 17:01:01 +01:00
Benjamin Beganović
8e3875da96 Merge remote-tracking branch 'upstream/v5-develop' into v5-2701-dynamic-dates-for-recurring 2021-02-22 13:15:37 +01:00
Benjamin Beganović
75bd911b66 Fixes for   in public notes 2021-02-22 11:52:55 +01:00
David Bomba
c0d49fff40 Fixes for casts 2021-02-22 21:35:00 +11:00
David Bomba
84d3ca8738 Fixes for casts 2021-02-22 21:30:28 +11:00
David Bomba
c7048e8cb1 Fixes for user present name 2021-02-22 20:54:46 +11:00
David Bomba
67d0f525af Postmark webhooks 2021-02-22 20:46:01 +11:00
David Bomba
55a0d596e0 Fixes for newer postmark driver 2021-02-22 14:39:53 +11:00
David Bomba
0317bae985 Harvest message ID from postmark 2021-02-22 11:57:54 +11:00
David Bomba
c72fcfed64 Mail listeners to harvest message ids 2021-02-22 11:18:52 +11:00
David Bomba
e8d40d2fde Fixes for tests 2021-02-22 08:29:39 +11:00
David Bomba
53f79440c0 Connected accounts 2021-02-22 08:27:00 +11:00
David Bomba
9a46a886a1 fixes for surcharge tax calculations and also implemented Zero % tax rates 2021-02-21 20:36:34 +11:00
David Bomba
1b19b3d0a9
Merge pull request #4950 from turbo124/v5-develop 
Update dependencies
 2021-02-20 23:13:53 +11:00
=
633210e281 Fixes for PHP 8 2021-02-20 21:51:33 +11:00
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
=
087129788b Working on 2FA 2021-02-20 11:45:20 +11:00
=
4b1030f881 Add former email address for rollbacks 2021-02-20 08:42:29 +11:00
Benjamin Beganović
8ecc33087a
Merge pull request #4940 from beganovich/v5-1902-streamline-client-portal 
(v5) Streamline client portal (centralised pay now button)
 2021-02-19 16:53:21 +01:00
David Bomba
ce5338dbdf Fixes for tests 2021-02-19 09:20:09 +11:00
David Bomba
8c52df6158 Dynamic from name 2021-02-19 08:43:47 +11:00
David Bomba
2735efedd2 Remove BaseMailerJob 2021-02-19 07:57:10 +11:00
David Bomba
7241430ce5 Improve coverage for CSV imports 2021-02-19 07:20:23 +11:00
Benjamin Beganović
7990ca22ec Centralize "Pay now" button 2021-02-18 13:37:27 +01:00