Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-17 16:42:48 +01:00
Code Issues Releases Activity
5,826 Commits 7 Branches 926 Tags 2 GiB
8b860f7314
Commit Graph

3544 Commits

Author SHA1 Message Date
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