Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-14 15:13:29 +01:00
Code Issues Releases Activity
12,019 Commits 9 Branches 923 Tags 2 GiB
cc63bad4e7
Commit Graph

1552 Commits

Author SHA1 Message Date
Benjamin Beganović
1af12ea585 Profile settings: Updating shipping address 2021-07-06 15:30:19 +02:00
Benjamin Beganović
a716330bcb Profile settings: Updating billing address 2021-07-06 15:28:55 +02:00
Benjamin Beganović
3ee859a258 Profile settings: Updating contact details 2021-07-06 15:20:36 +02:00
Benjamin Beganović
6e5a085787 Profile settings: Page loads 2021-07-06 14:13:18 +02:00
David Bomba
71cb3b5a7a Payment response 2021-07-05 21:15:35 +10:00
David Bomba
d24047374b Minor fixes 2021-07-05 20:50:02 +10:00
David Bomba
6d8aba49d7 Payfast payments 2021-07-05 15:47:27 +10:00
David Bomba
a7076be746 Payment Payment 2021-07-05 15:13:04 +10:00
David Bomba
812b2450ee Fixes for base driver 2021-07-05 14:19:17 +10:00
David Bomba
620ad57d50 merging v5-dev 2021-07-05 09:00:46 +10:00
Benjamin Beganović
d763382d87
Merge pull request #6177 from beganovich/v5-3006-company-logo-login 
Show logo on the login screen if account whitelabel or official subdomain
 2021-07-02 02:23:51 +02:00
Benjamin Beganović
342ef656f0 Remove comment 2021-07-01 19:00:01 +02:00
Benjamin Beganović
12611647bc Initialize Javascript with the postcode after fields checking 2021-07-01 18:59:36 +02:00
Benjamin Beganović
e9d2d7d7f2 Show logo on the login screen if account whitelabel or official subdomain 2021-07-01 18:29:32 +02:00
Benjamin Beganović
aeef084bc5 Show attachments on recurring invoices page 2021-06-30 20:41:11 +02:00
Benjamin Beganović
1bf94ad452 Show attachments on quotes page 2021-06-30 20:41:06 +02:00
Benjamin Beganović
9804db7988 Show attachments on invoices page 2021-06-30 20:41:03 +02:00
Benjamin Beganović
2d6027d137 Show attachments on credits page 2021-06-30 20:40:58 +02:00
Benjamin Beganović
684b21e124 Extract attachments component 2021-06-30 20:40:51 +02:00
Benjamin Beganović
5bf942a77e Preselect the first token on WePay ACH payment page 2021-06-28 14:29:54 +02:00
Benjamin Beganović
0187e32654 Limit content height within popups 2021-06-28 12:48:24 +02:00
Benjamin Beganović
77513de2a5 Make terms/privacy policy checkbox required if fields are present 2021-06-28 12:31:23 +02:00
David Bomba
d7e551fc95 Fixes for subscriptions 2021-06-27 21:55:15 +10:00
David Bomba
021761d33d Make navigating subscriptions easier 2021-06-27 19:20:56 +10:00
David Bomba
7da27b5955 Fixes for duplicated register header 2021-06-27 07:32:44 +10:00
David Bomba
96014fd815 minor fixes for migration emails 2021-06-26 12:38:56 +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
Benjamin Beganović
1d6e64673f
Merge pull request #6121 from Klievan/v5-develop 
Update 'Clean' PDF Design
 2021-06-24 16:16:32 +02:00
Benjamin Beganović
a6fecf0a38 Billing page: Resize container 2021-06-24 16:11:27 +02:00
Benjamin Beganović
fa4aa83638
Merge pull request #6118 from beganovich/v5-2306-ach-improvements 
Add "complete verification" button in the ACH verification email
 2021-06-24 14:40:58 +02:00
David Bomba
3baa0e3d9a PayFast Webhook URL listener 2021-06-24 19:45:45 +10:00
David Bomba
94c424a15b Fixes for payfast driver 2021-06-24 18:49:53 +10:00
David Bomba
f04291826c Fixes for payfast driver 2021-06-24 18:45:44 +10:00
Ivan Herrera
dc84949970
Update 'Clean' PDF Design 
The span-selector in #company-details seems incorrect here, and the selector should be a p-selector as children of #company-details seem to be paragraphs. I've verified and tested this on the stable-branch.
 2021-06-24 10:35:14 +02:00
David Bomba
6f1593a35e Padding our DriverTemplate 2021-06-24 15:51:30 +10:00
David Bomba
15bdb3ff3c Payfast 2021-06-24 15:46:10 +10:00
David Bomba
50749cd2bb Payfast 2021-06-24 14:43:14 +10:00
Benjamin Beganović
28463ca565 Add "complete verification" button in the ACH verification email 2021-06-23 14:52:54 +02:00
Benjamin Beganović
bd2e05d3ac Insert signature into bottom section of client emails instead of generic text 2021-06-23 10:47:41 +02:00
Benjamin Beganović
b748412f6f
Merge pull request #6095 from beganovich/v5-2106-jsify-wepay 
(v5) Standardize Javascript for WePay
 2021-06-22 09:38:14 +02:00
David Bomba
e4fdfaef45 Fixes for support messages 2021-06-22 07:29:04 +10:00
Benjamin Beganović
db06cca338 Bank account: Authorize 2021-06-21 14:21:38 +02:00
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
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
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
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
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ć
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
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
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
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
=
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
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
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
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
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
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
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ć
c8666efafd wip 2021-03-22 11:06:42 +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
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
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
=
559ff0ed40 Fixes for signature not showing 2021-03-13 23:34:53 +11:00
David Bomba
f67652cf88
Merge pull request #5100 from beganovich/v5-1003-company-custom-fields 
(v5) Support for custom company fields on the PDF
 2021-03-13 15:07:08 +11:00
Benjamin Beganović
908678cdc4 wip 2021-03-12 15:00:33 +01:00
Joshua Dwire
a844afd128 Support pre-configured installs where setup doesn't allow changing DB info 2021-03-11 19:48:41 -05:00
Benjamin Beganović
d546c4711c wip 2021-03-11 17:20:30 +01:00
Benjamin Beganović
9db7d2e5ca Fix "Plain" design not showing company-details section 2021-03-10 16:56:41 +01:00
Benjamin Beganović
ec5077b72d Open terms of service & privacy policy in new tab 2021-03-10 14:54:31 +01:00
Benjamin Beganović
653973c826 Align content to left by default 2021-03-10 14:32:17 +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
David Bomba
e7e455667d Fixes for company logo in emails 2021-03-10 12:51:08 +11:00
David Bomba
f38c069883 Translate migration email 2021-03-09 22:46:33 +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ć
d96d2887c6 Hipster: Push the company logo to top right edge 2021-03-02 14:40:43 +01:00
Benjamin Beganović
5870d8c241 Modern: Add borders between header columns (for product, tasks & delivery notes table) 2021-03-02 14:28:33 +01:00
Benjamin Beganović
cb0231a1ec Business: Reduce padding in client & company details section 2021-03-02 14:06:42 +01:00
Benjamin Beganović
dfee4d718b Change "Overdue" to "Past due" in invoices table 2021-03-02 13:43:41 +01:00
Benjamin Beganović
4992da6270 Highlight & make links in terms pop up clickable 2021-03-02 13:42:25 +01:00
Benjamin Beganović
8254aa231b E-mails: Replace primary-color variable with real value 2021-02-22 11:32:52 +01:00
Benjamin Beganović
7990ca22ec Centralize "Pay now" button 2021-02-18 13:37:27 +01:00
Benjamin Beganović
40bf73cd9a Remove redundant views 2021-02-18 13:20:26 +01:00
Benjamin Beganović
3cb6d07c20 Change default full-screen view for invoices & quotes: 
- New $url property for file_path() for invoices & quotes
- "Full screen" mode now returns raw file
- Show default browser viewer for desktop devices
 2021-02-18 13:18:41 +01:00
Benjamin Beganović
b52cb6def1 Fix last_name field 2021-02-17 12:19:16 +01:00
Benjamin Beganović
82412684fa Fix padding & spacing issue for mobile devices 2021-02-17 11:49:21 +01:00
Benjamin Beganović
5ba725d5e4 approve quote with one click, instead of pushing to another page 2021-02-17 11:39:22 +01:00
Benjamin Beganović
6872057207
Merge pull request #4912 from beganovich/v5-1502-client-portal-documents 
(v5) Client portal: "Documents" improvements & bug fixes
 2021-02-17 11:26:08 +01:00
Benjamin Beganović
deb0cd345a
Merge pull request #4923 from beganovich/v5-1602-invoice-footer-variable-parsing 
(v5) PDF: Support for dynamic variables in invoice footer, public notes & terms
 2021-02-17 11:25:28 +01:00
Joshua Dwire
10462cdeb4 Merge remote-tracking branch 'origin/v5-develop' into v5-develop 
# Conflicts:
#	resources/views/email/import/completed.blade.php
 2021-02-16 18:20:27 -05:00
Benjamin Beganović
001b6902f2 wip 2021-02-16 14:42:35 +01:00
Benjamin Beganović
e7e65e128a wip 2021-02-16 13:24:09 +01:00
Benjamin Beganović
22bd29f8fc wip 2021-02-16 13:16:22 +01:00
Benjamin Beganović
aacc3b6602 wip 2021-02-15 15:52:13 +01:00
Benjamin Beganović
63060cd878 Stripe: Show required fields if enabled in admin panel 2021-02-15 14:58:25 +01:00
Benjamin Beganović
f8403addd6 fix endless for -1 2021-02-15 13:21:52 +01:00
David Bomba
4ff96c0f58
Merge pull request #4908 from turbo124/v5-develop 
Refactoring emails
 2021-02-15 22:40:12 +11:00
David Bomba
120d2c21ab Refactor password reset for admin users 2021-02-15 10:39:40 +11:00
Joshua Dwire
ac99b0039d Import functionality updates 2021-02-12 19:20:15 -05:00
Benjamin Beganović
72cdc3fc5c Hide payment methods button if not gateways 2021-02-12 12:38:31 +01:00
Benjamin Beganović
9bc03ced3b show favicon if no whitelabel 2021-02-11 14:26:37 +01:00
Benjamin Beganović
4969b32ccd Add target=_blank to social links 2021-02-11 14:21:58 +01:00
Benjamin Beganović
c4d5004df8
Merge pull request #4868 from beganovich/v5-0902-design-updates 
(v5) PDF design updates
 2021-02-10 13:51:24 +01:00
Benjamin Beganović
6607442740 wip 2021-02-10 12:31:14 +01:00
David Bomba
7981093d97 Working on migration email notifications 2021-02-10 17:08:16 +11:00
David Bomba
313488dc60 Working on handling check data within migrations" 2021-02-10 12:59:30 +11:00
Benjamin Beganović
d8c6d40cab wip 2021-02-09 16:47:41 +01:00
Benjamin Beganović
e13bebf5e7 Change quotes.balance to quotes.amount in quotes table & approve page 2021-02-09 11:50:26 +01:00
Benjamin Beganović
91e9321049 wip 2021-02-05 13:06:47 +01:00
Benjamin Beganović
66c81d9b51 wip 2021-02-04 17:19:28 +01:00
Benjamin Beganović
aec701040a
Merge pull request #4828 from beganovich/v5-0302-cypress-checkout 
(v5) Fixes & tests for gateways
 2021-02-03 17:02:09 +01:00
Benjamin Beganović
6a972ba378 wip 2021-02-03 16:49:29 +01:00
David Bomba
fc79835ed6
Merge pull request #4825 from turbo124/v5-develop 
Working on migrations.
 2021-02-03 23:30:31 +11:00
Benjamin Beganović
83a42cf410 wip 2021-02-03 12:36:10 +01:00
David Bomba
d26e347d6d Working on migrations 2021-02-03 10:59:58 +11:00
David Bomba
7711a21429
Merge pull request #4820 from turbo124/v5-develop 
Generic payment failure notifications.
 2021-02-03 09:26:16 +11:00
Benjamin Beganović
862bbec4f5 -1 to ♾ 2021-02-02 14:59:10 +01:00
=
545ebd40dd Fixes for generic blade 2021-02-02 21:45:21 +11:00
David Bomba
1797cac1a9 Refactoring email 2021-02-02 16:11:33 +11:00
David Bomba
2474507790 Working on generic payment failure notification 2021-02-02 12:04:52 +11:00
David Bomba
d48756ea79 Improvements to migration email 2021-01-31 16:07:45 +11:00
Benjamin Beganović
e2d1c7ac43
Merge pull request #4778 from beganovich/v5-2701-ach-blank-screen 
(v5) ACH: Fix blank screen after payment
 2021-01-28 15:45:14 +01:00
Benjamin Beganović
3b31953d14
Merge branch 'v5-develop' into v5-2701-payable-draft-invoices 2021-01-28 15:44:22 +01:00
Benjamin Beganović
615ef1e780 Allow payments of draft invoices: 
- Remove processing overlay scripts
- Add flash message to clean layout
- Remove $balance > 0 check from filtered invoices
- Only show the payment methods if total is bigger than 0
- Change flash message from "warning" to "message"
- Show message for $1 payments
 2021-01-27 14:10:24 +01:00
Benjamin Beganović
0ff531fafa ACH: Fix white screen 
- Pass token hashed_id instead of token value
 2021-01-27 13:07:01 +01:00
Benjamin Beganović
84e888863f Authorize.net: Throw a PaymentFailed exception if token not found 
Checkout.com: Throw a PaymentFailed exception if token not found
- Show "Client portal" button even when invoice is paid
- Authorize.net: Pass token hashed_id instead of token to frontend
- Checkout.com: Pass token hashed_id instead of token to frontend
- Show "Paid" label for paid invoices
- Translation for not found token
 2021-01-27 12:45:38 +01:00
Benjamin Beganović
e6b6175ee5
Merge pull request #4770 from beganovich/v5-2601-show-save-card-programatically 
(v5) Show save card if token billing isn't always
 2021-01-27 11:55:18 +01:00
David Bomba
af47c504e4 Working on payment failed emails 2021-01-27 19:45:55 +11:00
Benjamin Beganović
9f8df64289 - Only show save card component if token billing isn't always 
- Only show "Refunded" if amount is > 0
- Stripe: Grab only :checked checkbox
 2021-01-26 17:21:12 +01:00
Benjamin Beganović
d537d012a1 fix instance 2021-01-26 13:29:27 +01:00
Benjamin Beganović
64e6dad248
Merge branch 'v5-develop' into v5-2001-gateways-and-new-tokens 2021-01-25 16:47:58 +01:00
Benjamin Beganović
fb66bfbe71 wip 2021-01-25 16:46:40 +01:00
Benjamin Beganović
f5f257292c wip 2021-01-25 16:12:21 +01:00
David Bomba
c4db674fae Translate migration email 2021-01-25 08:08:29 +11:00
Benjamin Beganović
4930b7b658 wip 2021-01-22 22:49:26 +01:00
Benjamin Beganović
713a95d3b2 ACH (Stripe): 
- Pass instance of $gateway to authorize page for fields  verification
- Support for multiple tokens
 2021-01-21 15:53:37 +01:00
Benjamin Beganović
056bee1c47 Credit card (Stripe): 
- Wrapped Stripe card widget into div
- Default intent option is setup_future_use now
- Support for token billing
 2021-01-21 14:03:38 +01:00
Benjamin Beganović
f27f5f8e97 remove from passed data 2021-01-21 10:41:05 +01:00
David Bomba
62bc55cf0b Fixes for client authentication to client portal 2021-01-21 10:01:13 +11:00
David Bomba
cb959fd3a3
Merge branch 'v5-develop' into v5-develop 2021-01-21 07:58:58 +11:00
Benjamin Beganović
2fccfe2df1 - Rewrite of checkout-credit-card.js 
- Fixed bug with detach() on driver class
- Changed the way token checking works from frontend
- Support for multiple payment methods on payment page
- Changed save card label to "Save payment method details"
- Updated relevant Javascript assets
 2021-01-20 16:19:01 +01:00
Benjamin Beganović
c4defd55d8 Change quotes terminology: 
- Changed "balance" to "amount" in approve page & quotes-table
 2021-01-20 13:32:49 +01:00
Benjamin Beganović
e5c7fc4416 E-mail improvements: 
- Removed injection of Tailwind CSS in the TemplateEngine.php
- Removed tailwindcss@1.4.6.css & tailwind-1.2.0.css
- Updated master template of e-mails for greeting, signature & footer sections
- Updated generic template for emails
- Updated footer (clean up)
- Fixed EntitySentObject.php class name
- Removed css-inliner.php config file
- Updated button component for e-mails
 2021-01-20 13:18:17 +01:00
David Bomba
ea20c55468
Merge pull request #4726 from louis-lau/v5-fix-smtp-tls-wording 
Fix mail TLS options wording
 2021-01-20 20:15:36 +11:00
Benjamin Beganović
52d4911042
Merge pull request #4723 from beganovich/v5-1901-cp-messages 
(v5) Client portal: Set a background & center a header message
 2021-01-20 09:54:29 +01:00
David Bomba
a021bd83d9 Clean up emails 2021-01-20 14:49:22 +11:00
Louis Laureys
50ec039f3e Fix mail TLS options wording 2021-01-19 21:31:39 +01:00
Benjamin Beganović
4413580b39 Add authorize view for SOFORT 2021-01-19 16:07:58 +01:00
Benjamin Beganović
c1bf3e5044 double-check 2021-01-19 15:27:35 +01:00
Benjamin Beganović
ee8e75e8f7 Set a background & center a header message 2021-01-19 15:23:10 +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ć
8ed701519b Change views to authorize.blade & pay.blade 
Change structure to use the new one
Add $data to pay now button
 2021-01-19 14:03:18 +01:00
Benjamin Beganović
6295a2647d refactor authorize.blade.php 2021-01-19 13:43:03 +01:00
Benjamin Beganović
bc8d77fec2 design fixes 2021-01-19 12:37:27 +01:00
Benjamin Beganović
b8d8f977cc Update e-mail templates 
Removed fedeisas/laravel-mail-css-inliner
 2021-01-19 11:05:47 +01:00
Benjamin Beganović
ad76bb561e master 2021-01-18 15:27:32 +01:00
Benjamin Beganović
4c34bc2177 Refactor emails to plain CSS + table structure 2021-01-18 15:25:51 +01:00
Benjamin Beganović
4cfc2384c2 Only show the verification screen if method exists 2021-01-17 23:54:56 +01:00
Benjamin Beganović
bc584c387c merge upstream/v5-develop 2021-01-15 11:03:40 +01:00
David Bomba
fc6384f051
Merge pull request #4690 from beganovich/v5-0114-design-improvements 
(v5) Invoices/quotes design improvements
 2021-01-15 08:34:03 +11:00
David Bomba
e9b9ea642c
Merge pull request #4686 from beganovich/v5-0114-show-required-gateway 
(v5) Change the way required fields are displayed
 2021-01-15 08:33:20 +11:00
Benjamin Beganović
ec80d925a4 change task-duration to task-time-details 2021-01-14 15:58:29 +01:00
Benjamin Beganović
1c5c7250ee Unified margin across designs 2021-01-14 15:57:14 +01:00
Benjamin Beganović
2a193c97ea Show quotes/invoices in full-screen by default 2021-01-14 13:29:46 +01:00
Benjamin Beganović
59fd38fc3d change the way required fields are displayed 2021-01-14 12:24:45 +01:00
Benjamin Beganović
d0000de269 add todo 2021-01-14 11:08:15 +01:00
Benjamin Beganović
a5995546bc increase upload space 2021-01-14 10:37:45 +01:00
David Bomba
c49fbedcde Add entity number to header on client portal 2021-01-14 13:57:05 +11:00
David Bomba
435365b32b Add youtube channel to client portal 2021-01-14 13:43:08 +11:00
David Bomba
a140870473 Clean up dashboard message 2021-01-14 08:17:47 +11:00
David Bomba
ee85a6487c
Merge pull request #4670 from beganovich/v5-jan12-required-fields 
(v5) Required fields for gateways
 2021-01-14 07:55:27 +11:00
David Bomba
c7375decf3
Merge pull request #4679 from beganovich/v5-0113-show-refunded-amount 
(v5) Client portal: Show refunded amount
 2021-01-14 07:54:33 +11:00
David Bomba
eebfa3e949
Merge pull request #4677 from beganovich/v5-0113-fullscreen-invoices 
(v5) Change default view for invoices as full-screen
 2021-01-14 07:54:12 +11:00
Benjamin Beganović
d1e3f8f274 show refunded amount 2021-01-13 16:20:19 +01:00
Benjamin Beganović
6526e5e378 Show default view as full-screen for invoices 2021-01-13 14:46:41 +01:00
Benjamin Beganović
0d0e3510db fix issue with button 2021-01-13 14:31:28 +01:00
Benjamin Beganović
b014aecc7d - Add getClientRequiredFields in BaseDriver.php 
- Pass $fields in @required-client-info
- Don't show form if fields are satisfied
- Remove $gateway reference in RequiredClientInfo.php
- StripePaymentDriver.php required fields
- Removed old-redirect logic for required fields
 2021-01-13 13:31:00 +01:00
David Bomba
c18c9e5a66 Update copyright + remove minor text from footer 2021-01-13 19:22:36 +11:00
David Bomba
75081cf95a Fix for displaying company logo in portal 2021-01-13 18:32:35 +11:00
David Bomba
eb7cee706d Fixes for displaying company logo in email templates 2021-01-13 12:22:23 +11:00
David Bomba
249c0e8b2b fix for presenting company logo in portal 2021-01-13 12:15:04 +11:00
Benjamin Beganović
cdd62f7e2a wip 2021-01-12 16:23:39 +01:00
Benjamin Beganović
ff3ee60cf9 wip 2021-01-12 15:43:07 +01:00
Benjamin Beganović
9b9c9434db - Show currency on the invoices/payment page 
- Disable form submitting with enter
 2021-01-11 15:34:46 +01:00
David Bomba
13420a93b9 Fixes for validation 2021-01-08 21:19:26 +11:00
David Bomba
5fc9a89009
Merge pull request #4625 from beganovich/v5-fix-issue-with-remaining-cylces 
(v5) Show endless for recurring invoices with -1 cycles
 2021-01-05 09:16:06 +11:00
Benjamin Beganović
cb928833c5 Show endless for recurring invoices with -1 cycles 2021-01-04 14:24:30 +01:00
Benjamin Beganović
b266def75b Remove debug from the setup page 2021-01-04 13:42:31 +01:00
Benjamin Beganović
14efcc77e6 Support for database port on the setup 2021-01-04 13:36:47 +01:00
David Bomba
15b2ee6642 Add additional mimes 2021-01-04 21:49:28 +11:00
David Bomba
ad57469ee4 Flutter Service Worker 2021-01-04 20:53:58 +11:00
Benjamin Beganović
0e57869a15
Merge pull request #4588 from beganovich/v5-app-url-prefix-on-setup 
(v5) Require https?://  format for the APP_URL value
 2020-12-30 11:05:56 +01:00
Benjamin Beganović
06dbb1dcf2 Break words on e-mail 2020-12-29 15:14:42 +01:00
Benjamin Beganović
6b34bb551f Require https?:// format for the APP_URL value 2020-12-29 11:35:22 +01:00
David Bomba
309bead374 completed email for import 2020-12-21 13:24:09 +11:00
David Bomba
ea360cead4 Import notifications 2020-12-21 12:52:33 +11:00
David Bomba
2347b9db7a Import notification 2020-12-21 12:16:26 +11:00
Benjamin Beganović
e51b220295 Add a note about PhantomJSCloud 2020-12-16 16:55:33 +01:00
Benjamin Beganović
75b28e8799 Update setup to show step by step before letting user submit everything 2020-12-15 16:10:50 +01:00
Benjamin Beganović
7ccd10adf9 - Change $global-margin to $global_margin to keep consistency 
- Update designs accordingly
- Update ChromiumPdf version
- Apply php-cs-fixer
 2020-12-15 11:45:04 +01:00
Benjamin Beganović
dcd6574b2d Experimental PDF rendering: 
- Added experimental flag in ninja.php
- Added experimental rendering in PdfMaker.php
- Added dynamic $global-margin for 1cm/0cm based on PDF method
 2020-12-14 17:23:04 +01:00
Benjamin Beganović
5c776d4911 show custom driver with its label 2020-12-10 12:38:07 +01:00
Benjamin Beganović
37f79247ac remove payment options from custom driver 2020-12-10 12:19:13 +01:00
Benjamin Beganović
d45571d7f9 wip 2020-12-09 15:17:48 +01:00
David Bomba
6a03bcc546
Merge branch 'v5-develop' into v5-develop 2020-12-09 07:25:16 +11:00
Benjamin Beganović
5d1349393a update designs to suppport entity string 2020-12-08 16:45:24 +01:00
Benjamin Beganović
3ffb600117 prefix all db field with db_ 2020-12-08 14:21:00 +01:00
David Bomba
8107a49677 remove trailing slash from app url 2020-12-08 07:21:08 +11:00
Benjamin Beganović
1f2c3f2823 update pagination links & apply php-cs-fixer 2020-12-05 14:24:21 +01:00
Benjamin Beganović
3b9e813751 bump alpinejs version 2020-12-05 13:55:29 +01:00
Benjamin Beganović
d84f5bc5bb Fixes for Checkout.com refunding 2020-12-03 13:38:57 +01:00
Benjamin Beganović
00ab670d71 Checkout.com migration to Frames: 
- Changed cardToken to token in CreditCard reference
- Updated checkout.com.js
- Added "Pay" translation
- Fix issue with switching between token & credt card
 2020-12-02 15:33:43 +01:00
David Bomba
66fc75bb83
Merge pull request #4410 from turbo124/v5-develop 
V5 develop
 2020-12-02 08:32:45 +11:00
Benjamin Beganović
35fe90fc9f update whitelabeling partials 2020-12-01 14:44:35 +01:00
David Bomba
704ed8349e Fix for flutter path 2020-11-30 21:04:41 +11:00
Benjamin Beganović
2618a1d3b8 add ability to edit client's phone 2020-11-27 12:08:39 +01:00
Benjamin Beganović
372ab5cdd9 fix word-brekaing 2020-11-27 11:38:22 +01:00
Benjamin Beganović
6420abd429
Merge pull request #4366 from beganovich/v5-fix-confirmation-page 
(v5) Fix buttons on user pages
 2020-11-26 12:43:48 +01:00
David Bomba
1181f9de62
Merge branch 'v5-develop' into authorize_refactor 2020-11-26 22:43:25 +11:00
Benjamin Beganović
1aeae756fa blue background for buttons 2020-11-26 12:42:20 +01:00
David Bomba
a8daa31167 Fixes for authorize 2020-11-26 21:12:36 +11:00
Benjamin Beganović
169e5ba93e support for checking requirements based on gateway 2020-11-25 14:38:49 +01:00
David Bomba
efbf8069b5
Merge pull request #4360 from turbo124/v5-develop 
Fixes for migrations
 2020-11-25 20:24:06 +11:00
Benjamin Beganović
3b765d32c1 log as an option for mail driver 2020-11-24 11:12:44 +01:00
David Bomba
b5fe5070b5 Working on migrations 2020-11-23 23:55:04 +11:00
Benjamin Beganović
7e750cd510 set dynamic margin 2020-11-19 15:03:18 +01:00
Benjamin Beganović
458535a46d fix designs border 2020-11-19 15:02:29 +01:00
Benjamin Beganović
014652cf1c cookies 👨‍🍳🍪 2020-11-19 13:41:19 +01:00
Benjamin Beganović
b9598d6321 short 2020-11-18 15:14:59 +01:00
Benjamin Beganović
748a083dda invert image to white for dark templates 2020-11-18 15:12:52 +01:00
Benjamin Beganović
de15e9d1ce render terms & policy under conidition 2020-11-18 14:55:46 +01:00
David Bomba
6376d5fa98
Merge pull request #4325 from turbo124/v5-develop 
Minor fixes for client portal
 2020-11-18 08:00:02 +11:00
Benjamin Beganović
e4eb70ab1a remove referneces to gateway in cp 2020-11-17 17:23:58 +01:00
Benjamin Beganović
a4de32482c fix translation for authroize buttons 2020-11-17 17:17:28 +01:00
Benjamin Beganović
f81526af2d
Merge pull request #4322 from beganovich/v5-display-signature-and-terms-on-quotes 
(v5) Display signatures & accepting terms for invoices & quotes
 2020-11-17 17:00:59 +01:00
Benjamin Beganović
fef76271d2 beautify signature template 2020-11-17 16:56:59 +01:00
Benjamin Beganović
d9c430423a accept entities in array 2020-11-17 16:56:44 +01:00
Benjamin Beganović
0357b041e1 adapt payment & approve views for new terms component 2020-11-17 16:56:36 +01:00
Benjamin Beganović
8a6873354f fix flashing cancellation modal & user dropdwon 2020-11-17 15:52:40 +01:00
David Bomba
8255ffc0cf Minor tests for client portal 2020-11-17 21:26:45 +11:00
Benjamin Beganović
52c51f34af
Merge pull request #4310 from beganovich/v5-cp-terms-and-privacy 
(v5) Support for client portal terms & privacy policy
 2020-11-16 22:19:54 +01:00
Benjamin Beganović
8080dffa85 show custom messages in cp 2020-11-16 15:37:09 +01:00
Benjamin Beganović
134fe6bfee support for privacy policy & temrs in cp 2020-11-16 13:06:26 +01:00
David Bomba
0e8bfa18a9 Use full namespace when calling from resources 2020-11-16 09:21:38 +11:00
David Bomba
87ca437d1a Fix for company logo not displaying in emails 2020-11-16 08:31:38 +11:00
David Bomba
b1591632d8 Refactor defaults for invoice PDF 2020-11-13 22:52:11 +11:00
David Bomba
a160efc6e5
Merge pull request #4298 from beganovich/v5-display-credit-pdfs 
(v5) Show credit's PDF in the client portal
 2020-11-13 07:18:39 +11:00
Benjamin Beganović
8324724df0 Client Portal Custom Inclusions 2020-11-12 12:29:16 +01:00
Benjamin Beganović
7937dd7df4 Show credit's PDF in the client portal 2020-11-12 12:17:49 +01:00
Benjamin Beganović
1be0d2435b Fix designs' tag 2020-11-09 16:23:27 +01:00
Benjamin Beganović
0751a44d21 Update designs to support delivery-notes 2020-11-09 15:44:21 +01:00
Benjamin Beganović
40b3a45642 update the designs & fix huge gap between tables 2020-11-06 13:12:28 +01:00
Benjamin Beganović
fd8ea38580 plain 2020-11-05 14:47:28 +01:00
Benjamin Beganović
d9f915bb37 modern 2020-11-05 14:47:24 +01:00
Benjamin Beganović
bb76cec267 hipster 2020-11-05 14:47:20 +01:00
Benjamin Beganović
054998ff06 elegant 2020-11-05 14:47:17 +01:00
Benjamin Beganović
64ec10279c creative 2020-11-05 14:47:14 +01:00
Benjamin Beganović
4ee36307f9 playful 2020-11-05 14:47:09 +01:00
Benjamin Beganović
100898e530 clean 2020-11-05 14:25:48 +01:00
Benjamin Beganović
88f881faf7 business 2020-11-05 14:13:28 +01:00
Benjamin Beganović
6bd28ebbfb bold 2020-11-05 13:33:43 +01:00
David Bomba
100207f4cb
Merge pull request #4267 from turbo124/v5-develop 
Company Settings Implmentation
 2020-11-05 07:49:10 +11:00
Benjamin Beganović
a01c57bd61 Plain: Update references to #task-table 2020-11-04 14:42:29 +01:00
Benjamin Beganović
e222aa8620 Refactor 'product-table-footer' to 'table-totals' 2020-11-04 11:23:06 +01:00
David Bomba
c995ac5f44 Add API Documentation to repo 2020-11-04 12:27:07 +11:00
Benjamin Beganović
f50bbd1900 Fix issue with the form 2020-11-02 16:29:02 +01:00
Benjamin Beganović
7f3c4ada5a Merge remote-tracking branch 'upstream/v5-develop' into v2-frontend-refactor 2020-11-01 19:26:43 +01:00
Benjamin Beganović
4c27652545 ACH payments 2020-11-01 19:21:31 +01:00
Benjamin Beganović
1ae2649be6 Stripe ACH authorization & verification 2020-11-01 18:47:48 +01:00
Benjamin Beganović
99c30846ad Stripe: Payments with tokens & error handling 2020-11-01 16:52:37 +01:00
Benjamin Beganović
7e30093429 Checkout.com payments with token: 
- Convert "true" from frontend to boolean in PaymentResponseRequest
- Reference correct 'transaction_reference' in BaseDriver & Checkout\Utilities
- Frontend switching between token & credit card when making payments with Checkout.com
- New 'pay_with' translation string
- Added 'save-card--container' to save card partial
- Ensure we show whole transaction reference string in payments/show.blade
 2020-11-01 15:56:17 +01:00
Benjamin Beganović
d2e677cb9d Merge remote-tracking branch 'origin/v5-stripe-backend-refactor' into v2-frontend-refactor 2020-11-01 14:49:11 +01:00
David Bomba
b267353ced Fixes for credits view in portal 2020-10-29 21:19:10 +11:00
David Bomba
d555796418
Merge pull request #4213 from beganovich/v5-checkout-token-billing 
(v5) Checkout.com payments using token
 2020-10-28 09:37:00 +11:00
David Bomba
f855ba7231
Merge pull request #4215 from beganovich/v5-remove-deprecated-design-classes 
(v5) Remove old invoice/quotes/tasks design classes & client portal theme
 2020-10-28 09:36:16 +11:00
Benjamin Beganović
e78aacdcfc Password reset e-mai l& fix for button 2020-10-27 16:04:28 +01:00
Benjamin Beganović
99bfadc0dc Remove old designs & old bootstrap theme 2020-10-27 14:44:12 +01:00
Benjamin Beganović
88b428aae0 checkout.com payments using token 2020-10-27 13:44:16 +01:00