Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-09-22 09:21:34 +02:00
Code Issues Releases Activity
15,442 Commits 7 Branches 902 Tags 2 GiB
61237f0475
Commit Graph

290 Commits

Author SHA1 Message Date
David Bomba
dc116013d9 Fixes for observers 2021-10-14 17:54:38 +11:00
David Bomba
62058e910d Return fresh model instance 2021-10-13 09:10:44 +11:00
David Bomba
8ce94012fb Credits fix 2021-10-05 13:49:15 +11:00
David Bomba
980f538e28 Fixes for displaying valid credits 2021-10-05 13:12:21 +11:00
David Bomba
16c88bc2cd
Merge pull request #6744 from beganovich/v5-gocardless-ach 
GoCardless
 2021-10-05 00:50:04 +11:00
David Bomba
e09bbfaaea Minor fixes 2021-10-04 09:36:30 +11:00
Benjamin Beganović
f4ddc5a974 Hide archived payment methods 2021-09-30 08:02:58 +02:00
Benjamin Beganović
0043471008 Hide recurring invoices with is_deleted 2021-09-27 18:46:52 +02:00
Benjamin Beganović
2621c6af0c Remove Statement component 2021-09-21 14:10:02 +02:00
Benjamin Beganović
7be7d2a9da Rendering PDF stream in client portal 2021-09-15 17:23:07 +02:00
Benjamin Beganović
121e763e1a Scaffold components 2021-09-14 20:57:33 +02:00
David Bomba
0d088df863
Merge pull request #6624 from beganovich/v5-681 
Show archived resources in the client portal
 2021-09-11 08:45:41 +10:00
Benjamin Beganović
a95f9e608a Show archived tasks 2021-09-10 21:50:23 +02:00
Benjamin Beganović
ec4fb0ae9d Show archived subscriptions 2021-09-10 21:49:44 +02:00
Benjamin Beganović
2d9730191f Show trashed documents 2021-09-10 21:49:17 +02:00
Benjamin Beganović
e6474b2d07 Show archived payment methods 2021-09-10 21:48:35 +02:00
Benjamin Beganović
b81f247de3 Show archived credits table 2021-09-10 21:48:09 +02:00
Benjamin Beganović
a41c77ffba Show archived quotes 2021-09-10 21:47:48 +02:00
Benjamin Beganović
fb21b6c423 Show archived recurring invoices 2021-09-10 21:47:28 +02:00
Benjamin Beganović
4aad406ab0 Hide invoices with "Cancelled" status 2021-09-10 21:42:46 +02:00
David Bomba
63e638f931
Merge pull request #6591 from beganovich/v5-672 
Show archived payments in client portal
 2021-09-07 07:06:59 +10:00
Benjamin Beganović
50b447dd20 Show archived payments 2021-09-06 18:14:00 +02:00
Benjamin Beganović
6ee51e87bc Tasks 2021-09-06 17:39:25 +02:00
Benjamin Beganović
f179831e06 Recurring invoices 2021-09-06 17:38:45 +02:00
Benjamin Beganović
d5326f4873 Quotes 2021-09-06 17:36:58 +02:00
Benjamin Beganović
bb8bee0304 Projects 2021-09-06 17:36:22 +02:00
Benjamin Beganović
218cf81922 Payments 2021-09-06 17:35:15 +02:00
Benjamin Beganović
778a48a699 Invoices 2021-09-06 17:34:27 +02:00
Benjamin Beganović
9acff982cc Expenses 2021-09-06 17:28:04 +02:00
Benjamin Beganović
a93fcdc588 My documents & credits 2021-09-06 17:26:42 +02:00
David Bomba
04f8a89d75 Fixes for auto bill 2021-08-31 07:44:05 +10:00
Benjamin Beganović
c25c7b3370 Add option to copy billing details on the client check page 2021-08-05 17:36:24 +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ć
3ee859a258 Profile settings: Updating contact details 2021-07-06 15:20:36 +02:00
David Bomba
f6aebc5a8b Fixes for credits 2021-07-04 07:46:25 +10:00
David Bomba
e8a1df16cd Fixes for credit query 2021-07-02 16:36:14 +10:00
Benjamin Beganović
d0e59e1d27 Show only credits with due_date <= now() 2021-07-01 19:20:46 +02:00
Benjamin Beganović
1c05d51c7e
Merge pull request #6161 from beganovich/v5-2906-tasks-controlled-by-setting 
(v5) Show tasks based on setting in the client portal
 2021-06-30 02:01:06 +02:00
Benjamin Beganović
1c96b358bf Show tasks based on setting in the client portal 2021-06-29 11:47:38 +02:00
David Bomba
a48328b90c Fixes for email translations 2021-06-29 19:46:40 +10:00
David Bomba
d7e551fc95 Fixes for subscriptions 2021-06-27 21:55:15 +10:00
Benjamin Beganović
eb34cd81b1 Ability to toggle auto_bill_enabled on client side 2021-06-25 10:09:57 +02:00
Benjamin Beganović
cca78a9d38 Ability to select primary payment method 2021-06-25 09:15:57 +02:00
David Bomba
f258ccec16 force token_billing=always for system created gateways 2021-06-22 08:01:50 +10:00
David Bomba
c9778463f6 Fixes for AAL license 2021-06-21 15:10:20 +10:00
David Bomba
172604a1a0 WePay 2021-06-20 22:10:22 +10:00
David Bomba
2adb1728ea Fixes for license 2021-06-16 20:34:30 +10:00
David Bomba
36f6cbbcc9 Update license in codebase 2021-06-16 16:58:16 +10:00
Benjamin Beganović
dfdb4b1cd9 Merge remote-tracking branch 'upstream/v5-develop' into v5-update-email-templates 2021-06-15 15:45:14 +02:00
David Bomba
95c9eb03a9 merge v5-dev 2021-06-14 20:47:03 +10:00
=
0bc3ec111d Authorize WePAy 2021-06-13 22:49:43 +10:00
David Bomba
b111483ef1 We Pay Account Signup 2021-06-11 17:39:51 +10:00
Benjamin Beganović
15acba27dd app/Mail/ContactPasswordlessLogin.php 2021-06-09 17:07:41 +02:00
David Bomba
8a985c6954 Make all livewire components MultiDB aware 2021-06-07 11:06:31 +10:00
David Bomba
97205032a2 Fixes for subscriptions 2021-06-04 07:57:24 +10:00
David Bomba
fd3993d84e Fixes for subscriptions 2021-06-04 07:43:22 +10:00
David Bomba
14994c0e5b Fixes for subscrpitions 2021-06-03 15:55:37 +10:00
David Bomba
43c52ab753 Bug fixes 2021-06-03 15:47:09 +10:00
David Bomba
520e354a93 Bux fixes 2021-06-03 11:43:14 +10:00
David Bomba
3b14074c0b Fixes for magic links 2021-06-03 09:50:31 +10:00
David Bomba
fc444b7c39 Fixes for billing portal 2021-06-02 18:55:33 +10:00
David Bomba
d9e923e978
Merge pull request #5886 from turbo124/v5-develop 
Fixes for CORS
 2021-06-02 10:02:55 +10:00
David Bomba
980a687322 Fixes for CORS 2021-06-02 10:02:05 +10:00
Benjamin Beganović
f64b0b3d19 Passing data about campaign into billing components 2021-05-29 13:16:45 +02:00
David Bomba
c62b2bec7d Constrain by company_id 2021-05-24 08:25:14 +10:00
Benjamin Beganović
1eaecdd8c6
Merge pull request #5700 from beganovich/v5-1405-client-portal-settings 
(v5) Update client settings to match the one's at the admin panel
 2021-05-18 12:05:59 +02:00
Benjamin Beganović
567fcd8e30 Update client settings to match the one's at the admin panel 2021-05-14 10:18:26 +02:00
Benjamin Beganović
5a84fb6990 Tasks module in the client portal 2021-05-12 16:39:29 +02:00
David Bomba
899784cf45 Do not show deleted invoices 2021-05-11 22:03:44 +10:00
Benjamin Beganović
3764389e04 Pass 'client_postal_code' when emitting 'passed-required-field-check' 2021-05-10 13:01:40 +02:00
David Bomba
1740f11715 We Pay 2021-05-08 16:46:14 +10:00
=
31db5b44c1 WePay 2021-05-07 18:03:37 +10:00
David Bomba
bdda63a214 We Pay 2021-05-07 17:07:49 +10:00
David Bomba
3c9b096f01 WePay 2021-05-07 15:39:45 +10:00
David Bomba
1a947d720d we pay 2021-05-06 19:39:24 +10:00
David Bomba
2b8d7c26da Fixes for checkout gateway 2021-05-06 15:38:39 +10:00
David Bomba
eff664a586 WePayg 2021-05-06 14:39:18 +10:00
=
d3f14887e1 WePay 2021-05-05 20:50:36 +10:00
David Bomba
8c00bce71b We Pay signup 2021-05-05 14:29:58 +10:00
Benjamin Beganović
de5b6473bb wip 2021-04-19 16:57:25 +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
c2990a21d0 Fixes for tests 2021-04-14 16:48:32 +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
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
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ć
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ć
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ć
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ć
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
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
Benjamin Beganović
b230680e8f Allow prefilling the client/contact fields over query parameters 2021-04-05 10:43:25 +02:00
Benjamin Beganović
83844652e5 show og price when discount is applied 2021-04-01 17:02:11 +02:00
Benjamin Beganović
b25f79f4e1 carry coupon over magic link 2021-04-01 16:20:31 +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ć
c300ffc4d9 passwordless login 2021-03-31 18:10:44 +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ć
97d92cd127 wip 2021-03-29 12:25:29 +02: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
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
=
3d375e4148 Workig on client subscriptions 2021-03-23 23:17:28 +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
Benjamin Beganović
44bf716fc9
Merge branch 'v5-develop' into v5-2003-fix-billing-subscription-integration 2021-03-22 11:12:14 +01:00
Benjamin Beganović
fdd1601120 wip 2021-03-20 23:15:26 +01: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
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
Benjamin Beganović
127c6cb3cd wip 2021-03-17 16:12:25 +01: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
Benjamin Beganović
851a31b3c0 Proof of concept for billing page 2021-03-16 14:35:57 +01:00
Benjamin Beganović
4350816804 wip 2021-03-15 17:33:27 +01:00
Benjamin Beganović
b9bea02b68 wip 2021-03-13 14:51:01 +01:00
Benjamin Beganović
908678cdc4 wip 2021-03-12 15:00:33 +01:00
Benjamin Beganović
d546c4711c wip 2021-03-11 17:20:30 +01:00
Benjamin Beganović
7990ca22ec Centralize "Pay now" button 2021-02-18 13:37:27 +01:00
Benjamin Beganović
aacc3b6602 wip 2021-02-15 15:52:13 +01:00
Benjamin Beganović
6afed935db Hide draft credits from client 2021-02-11 14:14:11 +01:00
Benjamin Beganović
3c4e779585 add mount to requiredfields 2021-01-25 10:07:12 +01:00
Benjamin Beganović
617cc54de9 - Pass instance of AuthorizePaymentDriver.php as $gateway instead of CompanyGateway record 
- Define required fields for AuthorizePaymentDriver.php
- Update references to $gateway (CompanyGateway)
- Pass $countries to required-client-info.blade.php
- Handle country submission for required-client-info.blade.php
- Only show non-filled fields in RequiredClientInfo.php
 2021-01-19 14:36:07 +01:00
Benjamin Beganović
3970ee3450 only require email in settings 2021-01-15 14:07:33 +01:00
Benjamin Beganović
72b509dfe2 only require postal_code for billing address 2021-01-15 13:27:46 +01:00
David Bomba
b72a4567db
Merge pull request #4688 from beganovich/v5-0114-remove-url-in-settings 
(v5) Client portal: Remove URL validation from the website
 2021-01-15 08:33:09 +11:00
Benjamin Beganović
f8e57f57a5 Remove drafts from the quotes-table 2021-01-14 14:17:39 +01:00