Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-13 22:54:25 +01:00
Code Issues Releases Activity
10,555 Commits 9 Branches 921 Tags 2 GiB
08372d0d95
Commit Graph

810 Commits

Author SHA1 Message Date
David Bomba
2d6e2e5976 Fixes for tests 2021-08-01 08:44:04 +10:00
David Bomba
9acc02a7df Tets 2021-07-31 19:59:04 +10: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
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
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
4f940e41b0 fixes for defaults when converting quotes to invoices 2021-07-25 18:05:53 +10:00
David Bomba
dbb60c029e Fixes for reminderS 2021-07-20 14:49:04 +10:00
=
643e05212b Fixes for reminders 2021-07-18 21:49:25 +10:00
David Bomba
0f10c4b8dd minor fixes 2021-07-18 08:43:07 +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
46bc8fa495 Fixes for subscription webhooks 2021-07-15 11:06:14 +10:00
=
ecf7f66cfe Working on actions when a subscription invoice is paid 2021-07-14 21:20:41 +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
9941d72d31 Fixes for Github Actions 2021-07-14 09:31:01 +10:00
David Bomba
75d012af06 Set date on credit generated from an invoice reversal 2021-07-11 10:21:24 +10:00
David Bomba
d1aae93c08 Fixes for Download Recurring Invoice 2021-07-09 09:49:01 +10:00
David Bomba
05ca393678 Fixes for payments with credits 2021-07-08 20:56:21 +10:00
David Bomba
9fd3bff97d Autoarchive quotes on convert 2021-07-08 11:48:11 +10:00
David Bomba
32036a8569 Fixes for PDF paths 2021-07-07 21:39:49 +10:00
David Bomba
7fb41b7d60 Fixes for mime types 2021-07-06 07:53:32 +10:00
David Bomba
5c1b9d5b2d Fixes for client credits 2021-07-04 09:02:16 +10:00
David Bomba
cf5ddfad81 Fixes for credit query 2021-07-04 07:48:16 +10:00
David Bomba
e8a1df16cd Fixes for credit query 2021-07-02 16:36:14 +10:00
David Bomba
84dd24c070 Tests for credit balances 2021-07-02 09:48:11 +10:00
David Bomba
8e43eaa99d minor fixes 2021-06-29 17:26:21 +10:00
David Bomba
ac842d0d83 Fixes for subscriptions 2021-06-29 16:05:03 +10:00
David Bomba
6a1df87c0b Fixes for subscriptions 2021-06-29 15:36:22 +10:00
David Bomba
a9ca93f723 Fixes for restored user activity 2021-06-29 14:02:24 +10:00
David Bomba
5e39127581 Fixes for subscriptions 2021-06-29 12:41:41 +10:00
David Bomba
ec817f1d3c Fixes for subscriptions 2021-06-29 12:18:12 +10:00
David Bomba
1739c69b85 Fixes for subscriptions 2021-06-29 11:41:30 +10:00
David Bomba
9f2dea57f1 Minor fixes for subscription service 2021-06-28 22:05:34 +10:00
Benjamin Beganović
d69f3dd0d0 Show correct variables for credits PDF 2021-06-28 12:11:57 +02:00
David Bomba
d7e551fc95 Fixes for subscriptions 2021-06-27 21:55:15 +10:00
=
34bd341182 Fixes for endless reminder pulling in the wrong scheduled interval 2021-06-27 12:12:39 +10:00
Benjamin Beganović
61eea4fde2 Fix issue with duplicated company fields 2021-06-24 17:18:02 +02:00
David Bomba
f696f4926a
Merge pull request #6119 from turbo124/v5-develop 
V4 -> V5 compatiblity improvements
 2021-06-24 07:56:16 +10:00
Benjamin Beganović
71fff59e8e Fixes for signature & surcharge fields 2021-06-23 11:54:59 +02:00
David Bomba
98aaf3028b Change payment exchange_currency_id from the clients currency to the company currency 2021-06-23 16:49:40 +10:00
David Bomba
b56b5c1ec9 Fixes for Two Factor 2021-06-23 14:55:12 +10:00
David Bomba
a3a406b122 Set Exchange Rates on invoice when marked as paid 2021-06-22 08:41:15 +10:00
David Bomba
823d23df24 Set exchange rates on invoices/payments when marking as paid 2021-06-22 08:39:08 +10:00
David Bomba
1b303f9559 Fixes for subscription service 2021-06-21 20:53:34 +10:00
David Bomba
5535ce8faf Allow archived invoices to be paid. 2021-06-20 08:14:56 +10:00
David Bomba
7e1d4376a2 Fixes for create invitations 2021-06-19 13:09:22 +10:00
Benjamin Beganović
85ebc15065 Remove deprecated method from SubscriptionService 2021-06-16 16:31:56 +02:00
Benjamin Beganović
fc51a89dcb Hide custom surcharges if they're 0 2021-06-16 16:09:30 +02:00
David Bomba
36f6cbbcc9 Update license in codebase 2021-06-16 16:58:16 +10:00
David Bomba
31c8eb1a19 Fixes for stripe import customers 2021-06-15 11:09:12 +10:00
David Bomba
887bc3d4a6 Fixes for reminders 2021-06-15 08:06:01 +10:00
David Bomba
59fcbfe52c Don't delete the PDF prior to sending 2021-06-13 14:19:40 +10:00
David Bomba
0a0ea46851 Declare disk for storage 2021-06-13 14:09:33 +10:00
David Bomba
7709bd32d1 Ensure directories are created prior to PDF generation 2021-06-13 10:18:07 +10:00
=
afdfddd7e9 Refactor for entity paths 2021-06-12 21:50:01 +10:00
David Bomba
edf2dfcc80 Minor fixes 2021-06-12 19:40:28 +10:00
David Bomba
c367ea60ae Timezone Offset implementation 2021-06-11 08:20:46 +10:00
David Bomba
4675cc92b5 Inject delays in emails to allow enough time for attachment resources to upload when using S3 type storage 2021-06-10 19:01:30 +10:00
David Bomba
a5054f87a5 Fixes for endless reminders 2021-06-10 11:15:21 +10:00
David Bomba
a753d6ca5a Create Ninja User on hosted platform 2021-06-09 12:24:32 +10:00
Benjamin Beganović
a52cdca1e3 Parse break lines inputs from user 2021-06-04 13:26:32 +02:00
Benjamin Beganović
bb45b5f55b Disable markdown processing for line items 2021-06-04 13:26:06 +02:00
David Bomba
c77660495c Fixes for subscriptions 2021-06-04 08:16:18 +10:00
David Bomba
fd3993d84e Fixes for subscriptions 2021-06-04 07:43:22 +10:00
David Bomba
6e564a20db Minor fixes 2021-06-02 20:14:00 +10:00
David Bomba
fc444b7c39 Fixes for billing portal 2021-06-02 18:55:33 +10:00
Benjamin Beganović
bd97b916e4
Merge branch 'v5-develop' into v5-2805-tracking-campaign-source 2021-06-01 13:38:36 +02:00
Benjamin Beganović
64830df3da
Merge pull request #5863 from beganovich/v5-3105-pdf-markdown-support 
(v5) Markdown support on PDFs
 2021-06-01 13:37:47 +02:00
David Bomba
cd594914b7 fixes for password reset screen 2021-06-01 09:02:30 +10:00
David Bomba
c3946f44b0 Fixes for custom payment method name 2021-06-01 08:09:38 +10:00
Benjamin Beganović
d701125bf1 Markdown parsing for line items 2021-05-31 14:08:24 +02:00
Benjamin Beganović
c9334daa3f Note for settings-controlled parsing of markdown 2021-05-31 13:47:22 +02:00
Benjamin Beganović
c7739e64ec Update logic for checking if webhook configuration is present 2021-05-29 13:16:22 +02:00
David Bomba
1f4493f191 Bug fixes 2021-05-28 11:02:43 +10:00
David Bomba
e76567f337 Fixes for creating an account using OAuth 2021-05-26 16:14:47 +10:00
David Bomba
fb17dd7e0b Force stripe amount to int 2021-05-26 16:04:38 +10:00
David Bomba
7618666c4b Fixes for tests 2021-05-26 12:37:16 +10:00
David Bomba
ba672f6fdd Fixes for test 2021-05-26 11:32:01 +10:00
David Bomba
e254a9ad73 Refactor reminders 2021-05-26 10:35:39 +10:00
David Bomba
4e8ed1e32d Force deletes from local storage also 2021-05-24 20:58:37 +10:00
David Bomba
9652c55834 Enable previewing Recurring invoice pdfs 2021-05-22 13:09:28 +10:00
David Bomba
8970f6415b Fixes for reminder scheduling 2021-05-21 23:29:59 +10:00
David Bomba
4183c1a2ae
Merge pull request #5769 from turbo124/v5-develop 
v5.1.63
 2021-05-21 18:01:14 +10:00
David Bomba
0b7891e24f Fixes for restore invoice numbering 2021-05-21 07:58:46 +10:00
Benjamin Beganović
9d7089b5b5 Change shared elements with delivery_note table 2021-05-20 15:04:24 +02:00
David Bomba
69b496f8b4 Fixes for refresh route - firstload/mini_loader 2021-05-19 20:42:35 +10:00
David Bomba
52c3d63349 Refactor system logger to enable multidb 2021-05-19 11:12:23 +10:00
Benjamin Beganović
b15012b984 Drop the logic for the ordering items 2021-05-17 13:28:33 +02:00
David Bomba
4727d0cea7 Fixes for custom payment methods - and their fees and limits object 2021-05-16 17:07:07 +10:00
David Bomba
2079b3e4ba Fixes for custom payment methods - and their fees and limits object 2021-05-16 17:06:04 +10:00
David Bomba
b0d1b7e1a1 Fixes for delivering PDFs over the wire 2021-05-16 16:26:55 +10:00
David Bomba
8f996d9a93 Fixes for gateway fees less that 2021-05-16 08:18:43 +10:00
David Bomba
b97e72d587 Fixes for quotes and credit paths 2021-05-15 12:31:17 +10:00
David Bomba
c52311bcde Fixes for PDF file paths 2021-05-15 12:19:36 +10:00
David Bomba
7756ca7436 Don't store PDFs 2021-05-14 21:15:11 +10:00
David Bomba
1bfa0f709e Fixes for typo 2021-05-14 19:50:33 +10:00
David Bomba
de8fb374ab Fixes for S3 storage and delivery notes 2021-05-14 19:43:06 +10:00
David Bomba
8c4fecaa2c enforce object over array 2021-05-11 21:47:19 +10:00
David Bomba
87ddad6670 Working on PDF generator flags 2021-05-09 21:30:31 +10:00
David Bomba
85c05f7c30 Fixes for VarEvents 2021-05-07 07:12:07 +10:00
David Bomba
5510993d13 Fixes for gateway fees 2021-05-03 21:51:00 +10:00
David Bomba
aba280d9ab Fixes for recurring 2021-04-30 09:01:56 +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
f62518f63b Stripe Connect 2021-04-22 20:38:22 +10:00
David Bomba
7cef74350d Fix for accounting error when deleting a refunded payment 2021-04-22 09:35:31 +10:00
David Bomba
82892a6349 Fixes for stateless events 2021-04-21 07:26:04 +10:00
David Bomba
e6c083cf29 Stripe Connect 2021-04-20 21:30:52 +10:00
Benjamin Beganović
873fe6ce07
Merge branch 'v5-develop' into v5-1304-emails 2021-04-19 16:59:23 +02:00
Benjamin Beganović
88acfbfecb Show public notes outside of totals table 2021-04-19 13:51:00 +02:00
=
9b77789c8a v5.1.47 2021-04-18 21:16:32 +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
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
=
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
aabe5683e1 Refactoring subscriptions 2021-04-14 14:41:04 +10:00
David Bomba
2237939491 Subscriptions 2021-04-14 12:40:16 +10:00
David Bomba
5c1eb7f7eb Update texts 2021-04-14 07:40:07 +10: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
7e3a9205b9 Add event listeners for Subscriptions + fix user actioning the event() 2021-04-13 09:52:17 +10:00
David Bomba
bde5166827 Subscriptions 2021-04-12 21:56:08 +10: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
477aa691a9 Add custom exceptions 2021-04-12 14:36:51 +10:00
David Bomba
f5092e8cf4 Fixes for custom email templates 2021-04-11 13:46:40 +10: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
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
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
d9d042724e Add daily reset 2021-04-08 20:38:31 +10:00
David Bomba
8f91969c49 bug fixes for subscriptions 2021-04-08 12:43:31 +10: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
73e7aadaad Working on pro plan; 2021-04-07 08:56:36 +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
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
b1e6325ef8 Fixes for tests 2021-04-06 08:19:27 +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ć
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
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
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ć
6af6668ba6 remove price() from subscriptionservice 2021-04-01 16:10:26 +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
3a770361aa Set valid until when a quote is marked as sent 2021-04-01 19:07:32 +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
6cbfe6b1bf rename method for subcsriptions 2021-03-31 11:14:19 +11:00
David Bomba
f5c6847a36 Minor fixes for subscription types 2021-03-30 20:41:58 +11:00
David Bomba
f1ece9ab6b Subscriptions 2021-03-29 21:43:42 +11:00
David Bomba
3183186d4d Working on subscriptions 2021-03-29 21:19:30 +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
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
=
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
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
98e314b6c0 Fixes for calculating the correct gateway fee depending on the payment method 2021-03-26 19:18:25 +11: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
=
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
David Bomba
3b72fa343f complete purchase - billing subscription 2021-03-23 14:26:21 +11:00
David Bomba
3ebe533fc8 include Account clas 2021-03-23 07:09:42 +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