Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-14 07:02:34 +01:00
Code Issues Releases Activity
9,010 Commits 9 Branches 921 Tags 2 GiB
e0e8c4eed4
Commit Graph

1407 Commits

Author SHA1 Message Date
Benjamin Beganović
f160b7e1a9 Credit card: Authorize 2021-06-21 14:04:29 +02:00
Benjamin Beganović
9e146b7ef8 Credit card: Pay 2021-06-21 14:04:24 +02:00
David Bomba
172604a1a0 WePay 2021-06-20 22:10:22 +10:00
David Bomba
4173cb6903 WePay 2021-06-20 20:24:11 +10:00
David Bomba
2075c4e8c1 Testing WePay payment with Credit Card 2021-06-20 13:36:58 +10:00
David Bomba
1cea863e77 Fixes for credit card payment 2021-06-20 13:06:17 +10:00
David Bomba
e63a7f9875 WePay checkout 2021-06-19 17:31:05 +10:00
David Bomba
d90b884922 WePay process credit/card 2021-06-19 14:58:45 +10:00
David Bomba
3911a58d98 WePay JS 2021-06-19 14:05:45 +10:00
=
6435725d0f Payment layout for wepay credit card 2021-06-19 11:18:57 +10:00
Benjamin Beganović
e9c92ee858 wip 2021-06-18 15:14:44 +02:00
Benjamin Beganović
502288fe0c wip 2021-06-18 15:14:00 +02:00
Benjamin Beganović
37601a09da wip 2021-06-18 15:10:09 +02:00
Benjamin Beganović
afb2593d16 Show signature if its presented on client generic.blade.php 2021-06-18 13:44:33 +02:00
Benjamin Beganović
bc28a473a7 Show company copyright if whitelabel 2021-06-18 13:43:29 +02:00
Benjamin Beganović
46bd985910 Push button to the right 2021-06-17 17:12:43 +02:00
Benjamin Beganović
bffcca9b04 Show project name in the tasks table 2021-06-17 16:24:33 +02:00
Benjamin Beganović
bf79603c42 Make registration form wider 2021-06-16 16:26:08 +02:00
Benjamin Beganović
a8ea2f9639 Add translation for recurring_invoice_due_date 2021-06-16 15:54:37 +02:00
David Bomba
c076998366 Wepay Payments 2021-06-16 20:12:04 +10:00
David Bomba
43ff685543 WePay authorize for Bank Transfer 2021-06-16 16:41:29 +10:00
David Bomba
d4f27bb3ee WePay authorize for Bank Transfer 2021-06-16 13:26:33 +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
Benjamin Beganović
01e7e3271e Adapt templates for dynamic emails 2021-06-15 15:42:37 +02:00
David Bomba
8fd4a3f202 Authorize credit card 2021-06-15 21:37:16 +10:00
David Bomba
177a4ce58f Working on authorization for WePay 2021-06-15 15:56:23 +10:00
David Bomba
8a217358a8 Fixes for model binding in livewire 2021-06-15 09:47:10 +10:00
David Bomba
95c9eb03a9 merge v5-dev 2021-06-14 20:47:03 +10:00
David Bomba
dc7f4507cd Update .env vars for wepay 2021-06-14 08:33:56 +10:00
=
0bc3ec111d Authorize WePAy 2021-06-13 22:49:43 +10:00
=
62811d968b WePay 2021-06-13 20:37:37 +10:00
Benjamin Beganović
3dafb34d8f Update client to follow primary color 2021-06-12 23:44:02 +02:00
Benjamin Beganović
abad83231b Update admin to follow primary color 2021-06-12 23:42:56 +02:00
Benjamin Beganović
a967c3b9bd Update icons on admin template 2021-06-12 23:40:18 +02:00
Benjamin Beganović
a2fe0cbb6a SupportMessageSent 2021-06-12 23:19:56 +02:00
Benjamin Beganović
fef1c604bc QuoteWasApproved 2021-06-12 23:17:43 +02:00
Benjamin Beganović
8493b2e4d6 ImportCompleted email 2021-06-12 23:14:28 +02:00
Benjamin Beganović
5af9cc828f Passwordless login 2021-06-12 23:12:06 +02:00
Benjamin Beganović
5a458a8588 Update password-reset 2021-06-12 23:09:12 +02:00
Benjamin Beganović
f35d1b7e7d Update generic to accept $content and $slot 2021-06-12 23:09:01 +02:00
Benjamin Beganović
3977b4e662 Refactor generic_email 2021-06-12 23:02:12 +02:00
Benjamin Beganović
4cba96d973 ACHVerificationNotification: 
- Pass $company into view
- Update view to use client layout
- Fixes for client layout / whitelabel handling
 2021-06-11 15:52:28 +02:00
David Bomba
a441b3f79e Working on authorization 2021-06-11 18:30:39 +10:00
David Bomba
b111483ef1 We Pay Account Signup 2021-06-11 17:39:51 +10:00
Benjamin Beganović
fd58f1cadb Construct client template & ClientContactResetPasswordObject.php 2021-06-10 11:23:10 +02:00
Benjamin Beganović
e70effd404 app/Mail/MigrationFailed.php 2021-06-09 17:25:59 +02:00
Benjamin Beganović
32fc72913b app/Mail/ExistingMigration.php 2021-06-09 17:16:16 +02:00
Benjamin Beganović
e86463a27e app/Mail/DownloadInvoices.php 2021-06-09 17:14:27 +02:00
Benjamin Beganović
795a666885 app/Mail/DownloadBackup.php 2021-06-09 17:09:46 +02:00
Benjamin Beganović
15acba27dd app/Mail/ContactPasswordlessLogin.php 2021-06-09 17:07:41 +02:00
Benjamin Beganović
9c45111a4e app/Mail/User/UserLoggedIn.php 2021-06-09 16:57:16 +02:00
Benjamin Beganović
f086ceb5e1 app/Mail/Migration/MaxCompanies.php 2021-06-09 16:48:58 +02:00
Benjamin Beganović
973bdfcb35 app/Mail/Import/ImportCompleted.php 2021-06-09 16:47:11 +02:00
Benjamin Beganović
ae66496711 app/Mail/Gateways/ACHVerificationNotification.php 2021-06-09 16:38:24 +02:00
Benjamin Beganović
0757cbddda Refactor generic template 2021-06-09 16:09:05 +02:00
David Bomba
c8df3f1298 Migration failed messaging 2021-06-09 21:10:22 +10:00
Benjamin Beganović
a7a4bcc19d Merge admin light/dark master template into one file 2021-06-09 12:25:48 +02:00
David Bomba
ca4fbabf7d Fixes for company import mailer 2021-06-08 11:02:32 +10:00
David Bomba
b29c9f25e3 Company Import mailer 2021-06-08 07:23:20 +10:00
Benjamin Beganović
eb1616387f Admin: support / message.blade.php 2021-06-07 18:14:06 +02:00
Benjamin Beganović
e6d19b77f6 Admin: support / cancellation.blade.php 2021-06-07 18:13:29 +02:00
Benjamin Beganović
3aa18916bd Admin: migration / max_companies.blade.php 2021-06-07 18:12:11 +02:00
Benjamin Beganović
456222eda8 Admin: migration / failed.blade.php 2021-06-07 18:11:58 +02:00
Benjamin Beganović
690acec7f8 Admin: migration / existing.blade.php 2021-06-07 18:11:23 +02:00
Benjamin Beganović
ba6af55be6 Admin: migration / completed.blade.php 2021-06-07 18:10:18 +02:00
Benjamin Beganović
0e3a87a762 Admin: import / completed.blade.php 2021-06-07 18:08:47 +02:00
Benjamin Beganović
105951321d Admin: auth / verify.blade.php 2021-06-07 18:06:34 +02:00
Benjamin Beganović
f870cc71ed Admin: auth / password-reset.blade.php 2021-06-07 18:05:59 +02:00
Benjamin Beganović
22f2b2c095 Admin: notification.blade.php 2021-06-07 18:04:29 +02:00
Benjamin Beganović
8b568d6147 Admin: DownloadInvoices / download_files.blade.php 2021-06-07 18:02:44 +02:00
Benjamin Beganović
3f5feacf16 Make light version for admin side 2021-06-07 17:54:19 +02:00
David Bomba
8a985c6954 Make all livewire components MultiDB aware 2021-06-07 11:06:31 +10:00
David Bomba
9fad98017b Update fr_CA langs 2021-06-07 08:41:04 +10:00
David Bomba
c77660495c Fixes for subscriptions 2021-06-04 08:16:18 +10:00
David Bomba
3b14074c0b Fixes for magic links 2021-06-03 09:50:31 +10:00
Benjamin Beganović
27582c02ca
Merge pull request #5840 from beganovich/v5-2705-photo-design 
(v5) Photo design
 2021-06-02 17:22:14 +02:00
Benjamin Beganović
50b533a938 Update client portal images 2021-06-02 17:20:47 +02:00
Benjamin Beganović
c61a94f2d1
Merge pull request #5853 from beganovich/v5-2805-tracking-campaign-source 
(v5) Passing campaign data into payment flow
 2021-06-01 16:32:34 +02:00
Benjamin Beganović
23e23918b4 Show register link on the login page 2021-06-01 14:06:47 +02:00
Benjamin Beganović
bd97b916e4
Merge branch 'v5-develop' into v5-2805-tracking-campaign-source 2021-06-01 13:38:36 +02:00
David Bomba
e69cd0699e Fixes for CORS 2021-06-01 20:51:38 +10:00
Benjamin Beganović
54effdc009 Update client portal login image 2021-05-31 16:45:20 +02:00
Benjamin Beganović
23a7426e9d Make spacing & grid resizing better for medium devices (iPad-like) 2021-05-29 13:55:04 +02:00
Benjamin Beganović
0e0adc3333 Registration: Make country default to none 2021-05-29 13:47:03 +02:00
Benjamin Beganović
bd8127807c Make balance due/outstanding value follow primary color 2021-05-29 13:39:20 +02:00
Benjamin Beganović
945250dab8 Hide "Save payment method" on Stripe credit card authorize page 2021-05-29 13:35:06 +02:00
Benjamin Beganović
f64b0b3d19 Passing data about campaign into billing components 2021-05-29 13:16:45 +02:00
Benjamin Beganović
ac696d4d65 Hero image resolving 2021-05-27 15:12:52 +02:00
Benjamin Beganović
b4f0bb1028 Tech design 2021-05-27 15:03:35 +02:00
David Bomba
0a0c7d5f62
Merge pull request #5835 from turbo124/v5-develop 
Fixes for tests
 2021-05-27 09:17:10 +10:00
David Bomba
c125dca154 Fixes for client portal login/auth/register pages 2021-05-27 09:14:21 +10:00
Benjamin Beganović
f86c165253 Update modern.html 2021-05-26 13:09:37 +02:00
Benjamin Beganović
369e028b53 Update bold.html 2021-05-26 13:03:27 +02:00
David Bomba
6cb340ddad Better error messaging 2021-05-26 13:17:22 +10:00
David Bomba
86f17ed96c Better error messaging 2021-05-26 13:02:40 +10:00
David Bomba
68047bf84d Fixes for failed migration blade 2021-05-26 13:01:55 +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
Benjamin Beganović
a5fec384a8 Swap balance & amount in invoices-table.blade.php 2021-05-25 18:19:07 +02:00
Benjamin Beganović
918a604ed1 wip 2021-05-25 01:37:06 +02:00
Benjamin Beganović
78a820c54c wip 2021-05-25 01:06:33 +02:00
Benjamin Beganović
72463045cb wip 2021-05-24 18:07:23 +02:00
David Bomba
e6531a68eb Fixes for language files 2021-05-24 20:45:31 +10:00
Benjamin Beganović
24f76b3b35 wip 2021-05-21 13:18:03 +02:00
Benjamin Beganović
69a7cd9bfc wip 2021-05-21 13:11:01 +02:00
Benjamin Beganović
89f634bc34 Improve paddings & margins: Playful 2021-05-20 15:03:54 +02:00
Benjamin Beganović
c5de2f6e65 Improve paddings & margins: Hipster 2021-05-20 15:02:44 +02:00
Benjamin Beganović
54a480360e Improve paddings & margins: Elegant 2021-05-20 15:02:00 +02:00
Benjamin Beganović
cc6e4c85db Improve paddings & margins: Creative 2021-05-20 15:01:13 +02:00
Benjamin Beganović
5b194239a7 Improve paddings & margins: Business 2021-05-20 14:58:01 +02:00
Benjamin Beganović
b44d8eb62b Improve paddings & margins: Modern 2021-05-20 14:57:21 +02:00
Benjamin Beganović
cd2ce9ffe2 Improve paddings & margins: Bold 2021-05-20 14:56:21 +02:00
Benjamin Beganović
020c767360 Improve paddings & margins: Clean 2021-05-20 14:56:01 +02:00
Benjamin Beganović
8d2e564c18 Improve paddings & margins: Plain 2021-05-20 14:55:32 +02:00
Benjamin Beganović
1e1b223d93 Update title for contact passwordless login 2021-05-20 13:37:50 +02:00
Benjamin Beganović
ee50d896bc Update labels on payment page 2021-05-20 13:22:08 +02:00
Benjamin Beganović
2b9d619867 Change zoom property for the .company-logo 2021-05-19 16:44:57 +02:00
Benjamin Beganović
6f7afabbc3 wip 2021-05-19 14:19:34 +02:00
Benjamin Beganović
42f2065f8a Update mobile sidebar to white 2021-05-19 13:28:06 +02:00
Benjamin Beganović
05ca8fe062 Update branding on the emails 2021-05-18 14:02:23 +02:00
Benjamin Beganović
d04b48f7d2 Fixes for logo, header wrappers 2021-05-18 13:14:09 +02: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ć
cd2a104fbc Fullscreen view for credits 2021-05-18 12:03:06 +02:00
Benjamin Beganović
638a2a9230 Update credit's view page, removing redundant information 2021-05-18 12:01:23 +02:00
Benjamin Beganović
2bf46fccb5 Show empty text when no public_notes is present 2021-05-18 11:53:24 +02:00
Benjamin Beganović
9dc418ec5b
Merge pull request #5691 from beganovich/v5-1204-tasks 
(v5) Client portal: Tasks
 2021-05-18 11:08:46 +02:00
Benjamin Beganović
708073a83e
Merge branch 'v5-develop' into v5-1405-client-portal-settings 2021-05-18 10:57:26 +02:00
David Bomba
9599c8de4f Refactor for Stripe Connect 2021-05-18 12:13:00 +10:00
David Bomba
e29265550a Remove reference to invoiceninja in form 2021-05-16 09:43:11 +10:00
David Bomba
7bf74e012c Fixes for PDF display latency 2021-05-16 09:41:12 +10:00
David Bomba
ae74f5a9d8 Fixes for client portal PDF display 2021-05-15 17:14:31 +10:00
David Bomba
d7d76ae6ea MultiDB domain resolution for client portals 2021-05-15 13:31:41 +10:00
Benjamin Beganović
567fcd8e30 Update client settings to match the one's at the admin panel 2021-05-14 10:18:26 +02:00
David Bomba
97b49f8df6 Fixes for download export button 2021-05-14 13:32:37 +10:00
David Bomba
777c2dd24a Reorder middleware to allow route model binding to be delayed 2021-05-13 22:41:32 +10:00
David Bomba
cd6e1fe5c6 Update views to include Invoice Ninja Logo 2021-05-13 20:49:28 +10:00
=
daff65de01 Working on password reset throttling 2021-05-13 19:13:51 +10:00
David Bomba
4251a57d87
Merge pull request #5693 from turbo124/v5-develop 
Fixes for attaching documents and pdfs
 2021-05-13 16:18:31 +10:00
David Bomba
e4fabfbf2d Export data 2021-05-13 16:01:12 +10:00
Benjamin Beganović
46a15812fb Host client portal login image locally 2021-05-12 16:51:18 +02:00
Benjamin Beganović
5a84fb6990 Tasks module in the client portal 2021-05-12 16:39:29 +02:00
David Bomba
a4fd595d38 Allow HTML to be displayed for products in Subscriptions npage 2021-05-12 17:01:14 +10:00
David Bomba
f60b9c30eb Add new login notification 2021-05-12 16:18:32 +10:00
David Bomba
ed21217c9b Fixes for Stripe Connect 2021-05-12 00:40:55 +10:00
David Bomba
7d245f5ac3 Fixes for Stripe Connect 2021-05-12 00:09:22 +10:00
David Bomba
de02dd810e Fixes for Stripe 2021-05-11 23:44:14 +10:00
David Bomba
e7e8922c31
Merge pull request #5670 from turbo124/v5-develop 
Fixes for stripe authorize card
 2021-05-11 23:31:18 +10:00
David Bomba
3b55161506 Fixes for stripe authorize card 2021-05-11 23:30:56 +10:00
Benjamin Beganović
1f6596e835 Make "Pay now" button follow primary-color 2021-05-11 15:27:13 +02:00
David Bomba
940c44292d Do no show publishable key if using stripe connect 2021-05-11 23:09:21 +10:00
Benjamin Beganović
4803cef69b Show the payment number in the client portal 2021-05-11 15:02:52 +02:00
David Bomba
899784cf45 Do not show deleted invoices 2021-05-11 22:03:44 +10:00
David Bomba
334ab5f809 Fixes for stripe authorize card 2021-05-11 21:59:49 +10:00
David Bomba
6bfaa11f59
Merge branch 'v5-develop' into v5-2804-braintree 2021-05-11 21:14:54 +10:00
David Bomba
3fca12f970
Merge pull request #5661 from turbo124/v5-develop 
Disable client portal
 2021-05-11 14:37:22 +10:00
David Bomba
ad2742a0d6 Disable client portal 2021-05-11 11:55:47 +10:00
Benjamin Beganović
f07c911f8b
Merge branch 'v5-develop' into v5-2804-braintree 2021-05-10 16:55:04 +02:00
Benjamin Beganović
3fb202be2c
Merge pull request #5656 from beganovich/v5-1005-stripe-hiding-cvv 
(v5) Prefill the postal code with Stripe Elements
 2021-05-10 14:54:21 +02:00
Benjamin Beganović
5b89b1b710
Merge pull request #5658 from beganovich/v5-1005-quote-flow 
(v5) Client portal: Sync the quotes approval flow
 2021-05-10 14:54:08 +02:00
Benjamin Beganović
580628b7f9 Show quotes 2021-05-10 13:28:31 +02:00
Benjamin Beganović
604f074dfa Show invoices full screen 2021-05-10 13:26:13 +02:00
Benjamin Beganović
271606fabc Sync the quotes flow for signatures & terms 2021-05-10 13:17:46 +02:00
David Bomba
4979ed94de Minor fixes 2021-05-10 21:05:44 +10:00
Benjamin Beganović
98fa636e26 Prefill the postal code for Stripe Elements 2021-05-10 13:01:59 +02:00
David Bomba
16c5665cc6 Recurring Invoice history / activities 2021-05-10 20:20:52 +10:00
Benjamin Beganović
85822c45ac Merge upstream/v5-develop 2021-05-10 11:50:05 +02:00
David Bomba
76dfb475ad We Pay 2021-05-08 12:07:42 +10:00
David Bomba
3c9b096f01 WePay 2021-05-07 15:39:45 +10:00
Benjamin Beganović
7fbb9c9f0f - Set body class on the body 
- Show the Canada specific output
 2021-05-06 12:03:32 +02:00
Benjamin Beganović
28363013ee PayPal: Storing payment method checkbox 2021-05-05 16:59:50 +02:00
=
d3f14887e1 WePay 2021-05-05 20:50:36 +10:00
=
b6c538564e Background 2021-05-05 19:06:55 +10:00
David Bomba
eb54e0705a We Pay logo 2021-05-05 16:51:45 +10:00
David Bomba
d61e7f57a2 Fixes for wepay 2021-05-05 16:21:37 +10:00
David Bomba
8c00bce71b We Pay signup 2021-05-05 14:29:58 +10: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ć
6c80243987 "New account" translation 2021-05-04 17:01:47 +02:00
David Bomba
148f0466ed FIxes for Entity Created messageS" 2021-05-04 18:43:16 +10:00
David Bomba
f7257e4335 Migration emails 2021-05-04 12:40:28 +10: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
David Bomba
d12fcf7b35 remove wasm 2021-04-29 08:07:50 +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
David Bomba
810ed113c7 Invoice / Quote / Credit created notification 2021-04-28 10:02:31 +10:00
Benjamin Beganović
ef2f825346 Show proper translation for terms modal 2021-04-25 15:57:55 +02:00
Benjamin Beganović
0651ddaff0 Update CSS for the 2021-04-25 15:22:29 +02:00
Benjamin Beganović
540b184888 Put in the #footer of templates 2021-04-25 15:17:47 +02:00
David Bomba
20ea334106 Landing page for existing stripe connect acccounts 2021-04-22 23:51:18 +10:00
David Bomba
300cc9fb9e Fixes for Checkout.com 2021-04-22 23:32:34 +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
f62518f63b Stripe Connect 2021-04-22 20:38:22 +10:00
Benjamin Beganović
ca15b03eda wip 2021-04-21 17:56:18 +02: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
03b19e27f7 Add client gateway tokens 2021-04-20 14:26:16 +10:00
David Bomba
8d35d4d2df Add Russian translations 2021-04-20 11:42:44 +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
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
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
Benjamin Beganović
df6718a31e wip 2021-04-14 16:09:37 +02: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
803818b53c Subscriptions 2021-04-13 15:04:53 +10:00
David Bomba
7e3a9205b9 Add event listeners for Subscriptions + fix user actioning the event() 2021-04-13 09:52:17 +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ć
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
David Bomba
f5092e8cf4 Fixes for custom email templates 2021-04-11 13:46:40 +10: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
Benjamin Beganović
7e1cc64247 Send ACH notification e-mail after connecting bank account 2021-04-10 10:44:06 +02:00
David Bomba
62401555cd Working on pro rata refunds 2021-04-10 14:07:08 +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ć
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
David Bomba
0225526756 Set password for new users 2021-04-08 14:35:02 +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ć
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ć
d109113004
Merge pull request #5341 from beganovich/v5-0504-disable-invoice-signatures-if-feature-not-present 
(v5) Client portal: Show the signature if account has feature
 2021-04-05 17:13:34 +02:00
Benjamin Beganović
2ba543248a Show the signature if account has feature 2021-04-05 17:12:18 +02:00
David Bomba
d293c28a55
Merge pull request #5339 from turbo124/v5-develop 
Subscriptions
 2021-04-05 22:59:27 +10: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
David Bomba
f1f8201683 fixes for delivery note generation 2021-04-02 22:44:44 +11:00
David Roizenman
5ea8d7ee5e
fix email header background color in gmail 2021-04-02 00:21:56 -07: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ć
e69e9f7620 update text on passwordless login 2021-04-01 16:11:09 +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
David Bomba
7cb4806a65
Merge pull request #5308 from turbo124/v5-develop 
if/else blocks for flutter canvas build
 2021-04-01 19:40:19 +11:00
Benjamin Beganović
124490ab48 wip 2021-04-01 01:55:46 +02:00
David Bomba
97aec846ff if/else blocks for flutter canvas build 2021-04-01 10:10:31 +11:00
Benjamin Beganović
c300ffc4d9 passwordless login 2021-03-31 18:10:44 +02: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
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ć
ac547fa9a6 wip 2021-03-22 11:31:57 +01:00
Benjamin Beganović
c8666efafd wip 2021-03-22 11:06:42 +01:00
Benjamin Beganović
187be058f7
Merge branch 'v5-develop' into v5-1803-billing 2021-03-22 09:38:34 +01:00
David Bomba
ba91c96c40 update texts 2021-03-20 13:49:45 +11: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
Benjamin Beganović
28bc608d4f Fix labels on Playful design 2021-03-18 08:45:24 +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ć
eb2cfde303 Merge remote-tracking branch 'upstream/v5-develop' into v5-1103-billing-landing-page 2021-03-17 07:34:23 +01:00
David Bomba
35bca3d7b6 Fixes for signature line breaks / HTML formatting 2021-03-17 11:35:41 +11:00
Benjamin Beganović
851a31b3c0 Proof of concept for billing page 2021-03-16 14:35:57 +01:00
David Bomba
203ae3b3ff Texts translations 2021-03-16 15:45:59 +11:00
David Bomba
05b008ca60 Fixes for 2FA 2021-03-16 09:33:55 +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ć
66e8aa9c13 fix query 2021-03-15 11:28:30 +01:00
Benjamin Beganović
0b9c6e782d merge upstream/v5-develop 2021-03-13 14:55:13 +01:00