Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-09-22 17:31:35 +02:00
Code Issues Releases Activity
6,770 Commits 7 Branches 902 Tags 2 GiB
01a5421bab
Commit Graph

436 Commits

Author SHA1 Message Date
Benjamin Beganović
85822c45ac Merge upstream/v5-develop 2021-05-10 11:50:05 +02:00
Benjamin Beganović
78f87a8da0 PayPal authorize page message 2021-05-04 17:25:30 +02:00
Benjamin Beganović
0e905371c5 Extract PayPal's frontend into separate Javascript 2021-05-04 17:22:52 +02:00
Benjamin Beganović
a3099b5cde Fixes for tests 2021-05-03 17:25:03 +02:00
Benjamin Beganović
6992216117 wip 2021-05-03 14:10:46 +02:00
Benjamin Beganović
bc23de2ce2 Extract credit cards to separate Javascript 2021-04-29 16:51:28 +02:00
Benjamin Beganović
2ab65b12fa Ability to pay with token 2021-04-29 16:43:59 +02: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
aefd515b4e Fixes for stripe 2021-04-29 18:36:04 +10:00
David Bomba
2039fd0ef5 fixes for stripe 2021-04-29 18:29:03 +10:00
David Bomba
f825b72540 Fixes for stripe 2021-04-29 18:27:06 +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
Benjamin Beganović
ef2f825346 Show proper translation for terms modal 2021-04-25 15:57:55 +02:00
David Bomba
20ea334106 Landing page for existing stripe connect acccounts 2021-04-22 23:51:18 +10:00
David Bomba
f62518f63b Stripe Connect 2021-04-22 20:38:22 +10:00
Benjamin Beganović
255d25d6a6 wip 2021-04-21 16:36:46 +02:00
Benjamin Beganović
bdc564092e wip 2021-04-21 16:36:08 +02:00
David Bomba
1bd1b2ed7c JS Fixes 2021-04-20 22:17:44 +10:00
David Bomba
464d810a70 Clean up for subscriptions 2021-04-16 13:58:14 +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
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
803818b53c Subscriptions 2021-04-13 15:04:53 +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ć
3753f46f71
Merge pull request #5407 from beganovich/v5-1004-disable-signatures-if-no-feature 
(v5) Control showing the signature with hasFeature
 2021-04-12 11:52:30 +01:00
Benjamin Beganović
b7d49e352d wip 2021-04-10 14:07:00 +02:00
Benjamin Beganović
e9531d5d73 wip 2021-04-10 14:03:50 +02:00
Benjamin Beganović
7bf33e64b4 wip 2021-04-10 14:01:32 +02:00
Benjamin Beganović
18b5348815 wip 2021-04-10 14:01:25 +02: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ć
c4dac18af7 Control showing the signature with hasFeature 2021-04-10 11:05:50 +02:00
David Bomba
62401555cd Working on pro rata refunds 2021-04-10 14:07:08 +10:00
Benjamin Beganović
41f37fc189 wip 2021-04-08 17:13:16 +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ć
6b73d78abe Show product notes only 2021-04-07 13:27:16 +02:00
Benjamin Beganović
43e6ba2ec6 Check if payment is eligible to process 2021-04-07 13:26:50 +02:00
Benjamin Beganović
2ba543248a Show the signature if account has feature 2021-04-05 17:12:18 +02:00
Benjamin Beganović
43ea49c251 Show product description under product key 2021-04-05 13:57:51 +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ć
08b317f7b8 allow cancellation under specific conditions 2021-04-01 16:38:46 +02:00
Benjamin Beganović
45c23cbaf5 remove blue badges on the top 2021-04-01 16:09:52 +02:00
Benjamin Beganović
0b2613146b Show spinner after clicking payment method 2021-04-01 16:09:30 +02:00
Benjamin Beganović
124490ab48 wip 2021-04-01 01:55:46 +02:00
Benjamin Beganović
c300ffc4d9 passwordless login 2021-03-31 18:10:44 +02:00
David Bomba
3eb9688a83 fix subscriptions schema 2021-03-30 21:08:02 +11:00
Benjamin Beganović
9a67ff6f2c wip 2021-03-29 16:32:23 +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
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
Benjamin Beganović
e04ed7c2bf Show per year per month as recurring_invoice frequency is defined using RecurringInvoice method helper 2021-03-22 14:01:36 +01:00
Benjamin Beganović
6e714747bd Update price per quantity 2021-03-22 13:53:34 +01:00
Benjamin Beganović
edbcb0690e Remove /unit from product quantity 2021-03-22 13:38:01 +01:00
Benjamin Beganović
b2c7226057 Hide coupon if trial is enabled 2021-03-22 13:37:26 +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ć
546619a498 Wrap quantity if per_seat_enabled 2021-03-22 13:24:58 +01:00
Benjamin Beganović
5aa30ca582 Add border on stripe elements 2021-03-22 13:13:54 +01:00
Benjamin Beganović
c8666efafd wip 2021-03-22 11:06:42 +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
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ć
908678cdc4 wip 2021-03-12 15:00:33 +01:00
Benjamin Beganović
d546c4711c wip 2021-03-11 17:20:30 +01:00
David Bomba
9000117e83 Minor fixes for company logo displaying in the client portal 2021-03-10 13:02:12 +11:00
David Bomba
59d3cd8921 Minor fixes for company logo displaying in the client portal 2021-03-10 13:00:49 +11:00
Benjamin Beganović
722a416839 Layout: Add urls for PDF, SMTP & database checking 2021-03-08 09:59:45 +01:00
David Bomba
9a1a5b4796 Fixes for subdirectory installation 2021-03-05 23:59:26 +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ć
3cf168d67d Update classes for mobile PDF viewing (proper hiding cases) 2021-03-03 08:51:32 +01:00
=
c23b9b147d Fixes for attaching a user to different companies 2021-03-03 18:22:14 +11:00
Benjamin Beganović
dd71f28f87 Invoices: Removed superfluous text under the invoice number 2021-03-02 18:30:44 +01:00
Benjamin Beganović
9b227010b2 Quotes: Remove "drafts" 2021-03-02 18:29:44 +01:00
Benjamin Beganović
51be97d981 - Quotes: Waiting for approval -> Pending Approval 
- Quotes: Remove superfluous text under Waiting for approval
 2021-03-02 16:29:24 +01:00
Benjamin Beganović
4f95e39c28 Credits table: Add credit number column 2021-03-02 16:27:06 +01:00
Benjamin Beganović
168f08abba Credits table: Public notes -> Notes 2021-03-02 16:24:15 +01:00
Benjamin Beganović
9278c1966a Add example URL for the Website field in the client portal settings page 2021-03-02 16:22:40 +01:00
Benjamin Beganović
05118ad880 Client profile settings page: Remove sub-instructional text 2021-03-02 16:20:27 +01:00
Benjamin Beganović
f27645062c Add "Secure 256-Bit Encryption" on the payment pages 2021-03-02 15:53:13 +01:00
Benjamin Beganović
463f16d14a Update the invoice terms label text (By clicking "Next step" you accept terms -> Click "Agree" to accept terms) 2021-03-02 15:32:20 +01:00
Benjamin Beganović
dfee4d718b Change "Overdue" to "Past due" in invoices table 2021-03-02 13:43:41 +01:00