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
=
559ff0ed40
Fixes for signature not showing
2021-03-13 23:34:53 +11:00
=
0bf8b9c9e5
Fixes for setup flow
2021-03-13 17:45:41 +11:00
=
487cf555b9
Fix for displaying logo
2021-03-13 16:56:52 +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ć
efca2f0cf0
Fix translation for "I agree"
2021-03-10 14:54:16 +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
David Bomba
0ee6ebb03f
Merge pull request #5063 from turbo124/v5-develop
...
Add russian language
2021-03-09 09:54:32 +11:00
David Bomba
31d92a3dc0
add russian language
2021-03-09 08:05:20 +11:00
Benjamin Beganović
d20e5a0ebf
Update Javascript to use new URLs from meta tags
2021-03-08 10:00:11 +01: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
David Bomba
44d83bd6e3
Missing Translations
2021-03-05 20:31:33 +11:00
David Bomba
5d2c09b3b9
Missing translations
2021-03-05 20:28:53 +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
Benjamin Beganović
fe2bfc3c84
Change default scale to .75 for mobile PDF viewing
2021-03-03 08:51:10 +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
David Bomba
71d643070b
Update texts
2021-02-15 07:55:09 +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
