Benjamin Beganović
08b317f7b8
allow cancellation under specific conditions
2021-04-01 16:38:46 +02:00
David Bomba
404ee307fd
Magic link maker
2021-03-31 11:07:54 +11:00
David Bomba
32fd16dfb7
Merge pull request #5284 from turbo124/v5-develop
...
Subscriptions
2021-03-30 20:37:28 +11:00
David Bomba
caf7ad5998
Minor fixes for self updater - more verbose messaging after self update
2021-03-30 18:01:20 +11:00
David Bomba
96c191daf0
Add system logs to first load
2021-03-30 09:32:33 +11:00
David Bomba
878f00b375
add additional query filter for recurring invoices
2021-03-30 09:30:41 +11: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
David Bomba
db7df69db7
Recurring services - trial phase'
2021-03-29 14:49:29 +11:00
David Bomba
d7bf927549
Set exchange rates on invoices
2021-03-29 13:14:55 +11:00
Benjamin Beganović
8e3508a2b1
Merge pull request #5253 from beganovich/v5-2503-billing-portal
...
(v5) 25.03: Billing page
2021-03-26 15:05:08 +01:00
David Bomba
fd24449f95
Fixes for deleting / restoring / removing users
2021-03-26 19:07:43 +11:00
Benjamin Beganović
ed4fff2385
- Bundle qty without ability to increment/decrement value ✅
...
- One time & subs ✅
- A table with all products included in subscription (qty, price, notes) ✅
- Two tables, one for subscriptions, one for one-time purchases ✅
- If no products, no table ✅
- Remove quantity from cached data that is being sent ✅
- Remove "billing_subscription_id" from data sent ✅
2021-03-25 16:52:03 +01:00
David Bomba
abd3a89bc9
Subscriptions ( #5248 )
...
* Fixes for converting quote to invoice
* Fixes for naming PDFs
* Refresh entity prior to sending
* Fixes for subscriptions
* Add in required use
* Fixes for notifications
* Fixes for notifications
* Add with trasheD
* Rename BillingSubscriptions to Subscriptions
* Refactoring subscriptions
2021-03-25 21:55:59 +11:00
David Bomba
cb7f27462b
Client subscriptions + bug fixes ( #5238 )
...
* Fixes for converting quote to invoice
* Fixes for naming PDFs
* Refresh entity prior to sending
* Fixes for subscriptions
* Add in required use
* Fixes for notifications
* Fixes for notifications
2021-03-24 20:14:30 +11:00
Benjamin Beganović
77fdb25304
Merge branch 'v5-develop' into v5-2203-billing-portal
2021-03-23 16:23:56 +01:00
=
f74368e869
Set first user to gmail after first authorization
2021-03-23 17:19:06 +11:00
David Bomba
3ebe533fc8
include Account clas
2021-03-23 07:09:42 +11:00
Benjamin Beganović
e78fb7e891
Update quering the language/locale using Cache instead of DB
2021-03-22 14:09:29 +01:00
David Bomba
5700da5323
Fixes for password protection
2021-03-22 22:18:57 +11:00
David Bomba
5d28271df9
Fixes for default timeouts
2021-03-22 22:12:12 +11:00
David Bomba
793247e0f7
Fixes for default timeouts
2021-03-22 21:55:09 +11:00
Benjamin Beganović
187be058f7
Merge branch 'v5-develop' into v5-1803-billing
2021-03-22 09:38:34 +01:00
David Bomba
0c5b551ce1
Connected Gmail Account
2021-03-22 10:48:00 +11:00
David Bomba
c97dea08d2
Connected Gmail Account
2021-03-22 09:52:39 +11:00
David Bomba
24c8325fb1
Connected Gmail Account
2021-03-22 09:02:22 +11:00
David Bomba
32b8575ce1
Connected Gmail Account
2021-03-22 08:06:26 +11:00
=
4285b5f6fc
Minor fixes for oauth login
2021-03-21 21:38:57 +11:00
=
42ae8d53dd
Working on client subscriptions
2021-03-21 20:45:30 +11:00
=
e2314359b9
Pass back the correct entity!
2021-03-20 11:54:47 +11:00
=
5288893220
Small fixes for 2FA
2021-03-20 11:46:42 +11:00
=
b158fb430f
Small fixes for 2FA
2021-03-20 11:41:41 +11:00
Benjamin Beganović
3bcb65efc2
Set locale from query parameter
2021-03-18 15:41:26 +01:00
David Bomba
10f7b1a309
Fixes for 2fa
2021-03-18 22:46:58 +11:00
David Bomba
ac6feb706e
Small fix for new PDF generator
2021-03-18 20:57:55 +11:00
David Bomba
7fbe4ceb5d
Merge pull request #5162 from turbo124/v5-develop
...
Remove illegal characters from pdf file names
2021-03-18 08:19:56 +11:00
Benjamin Beganović
127c6cb3cd
wip
2021-03-17 16:12:25 +01:00
David Bomba
f52fb31ced
Remove illegal characters from pdf file names
2021-03-17 22:29:20 +11: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
b762ea37d2
Throw 400's on incorrect 2FA data
2021-03-17 00:40:58 +11:00
David Bomba
0422c95e13
Cache password protection on login
2021-03-16 23:10:15 +11:00
David Bomba
ae62bf63c6
Fixes for 2FA
2021-03-16 22:47:14 +11:00
David Bomba
aef2270f05
Fixes for connected account
2021-03-16 22:44:10 +11:00
David Bomba
816ea281ff
Fixes for connected account
2021-03-16 22:33:48 +11:00
David Bomba
591bfb9e9d
Fixes for connected account
2021-03-16 22:30:33 +11:00
David Bomba
6bb71dc33b
Fixes for connected account
2021-03-16 22:29:16 +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
David Bomba
8f37a06e24
Fixes for 2FA
2021-03-15 08:40:07 +11:00
David Bomba
e176be086a
Fixes for 2FA
2021-03-15 07:18:53 +11:00
David Bomba
255643d7dc
Fixes for connected account
2021-03-14 21:32:09 +11:00
Benjamin Beganović
0b9c6e782d
merge upstream/v5-develop
2021-03-13 14:55:13 +01:00
=
0bf8b9c9e5
Fixes for setup flow
2021-03-13 17:45:41 +11:00
Benjamin Beganović
908678cdc4
wip
2021-03-12 15:00:33 +01:00
David Bomba
aef31d8193
Merge pull request #5104 from joshuadwire/v5-develop
...
Support pre-configured installs where setup doesn't allow changing DB config
2021-03-12 21:00:58 +11:00
Joshua Dwire
a844afd128
Support pre-configured installs where setup doesn't allow changing DB info
2021-03-11 19:48:41 -05:00
David Bomba
57ef1c9b78
Return user for /connected_account
2021-03-12 07:07:52 +11:00
Benjamin Beganović
d546c4711c
wip
2021-03-11 17:20:30 +01:00
Benjamin Beganović
3696b06566
Scaffold landing page for billing, controller & endpoint
2021-03-11 14:05:23 +01:00
David Bomba
b9c9874533
Improve PDF creation performance
2021-03-10 21:00:18 +11:00
David Bomba
ed8c880750
add reconfirm route
2021-03-10 20:15:24 +11:00
David Bomba
9888d7acb9
Improve delete pdf performance
2021-03-10 13:28:35 +11:00
David Bomba
00eefcd781
Client Subscription scaffolding
2021-03-10 11:08:58 +11:00
David Bomba
e0b169b64b
Fixes for billing subscriptions
2021-03-10 09:56:59 +11:00
David Bomba
b91fcf1b34
Merge branch 'v5-develop' into billing_subscriptions
2021-03-10 09:27:28 +11:00
David Bomba
90b3b25849
Fixes for tests - changed listResponse to itemResponse
2021-03-10 09:23:13 +11:00
David Bomba
9290873b8b
Fixes for qr code"
2021-03-09 21:53:25 +11:00
David Bomba
cd48ae78f9
Minor fixes
2021-03-09 21:30:34 +11:00
David Bomba
0a3b5e0665
minor fixes
2021-03-09 17:06:03 +11:00
David Bomba
67cedb8348
minor fixes
2021-03-09 17:03:22 +11:00
David Bomba
4baa89382b
Minor fix for connected account
2021-03-09 09:55:31 +11:00
David Bomba
68f0e99f26
Fixes for connected account
2021-03-09 09:53:04 +11:00
David Bomba
053c1ca5fa
billing_subscriptions cleanup
2021-03-09 08:29:59 +11:00
David Bomba
4e9b92c2da
Minor fix for 2fa method name
2021-03-09 07:46:30 +11:00
Benjamin Beganović
780ab6885b
Billing subscriptions: Controller
2021-03-08 15:19:04 +01:00
David Bomba
e39ce7491b
Feature permissions for hosted
2021-03-08 08:32:38 +11:00
David Bomba
8d6f6d9eb5
Fixes for 2FA
2021-03-08 07:49:33 +11:00
=
f4d1917f32
Hosted feature implementation
2021-03-07 21:14:53 +11:00
=
616dea2c9d
Add webcron support
2021-03-07 17:45:48 +11:00
=
6360f62ef3
Integrate phantom js secret default value into config
2021-03-07 17:27:44 +11:00
David Bomba
1780db52bd
Invite user route
2021-03-04 09:39:24 +11:00
David Bomba
bfbde2ba51
Fixes
2021-03-03 21:04:10 +11:00
=
c23b9b147d
Fixes for attaching a user to different companies
2021-03-03 18:22:14 +11:00
=
7a2cea1d9c
One Time Token
2021-03-02 19:54:23 +11:00
=
aa290172ae
One Time Token Requests
2021-03-02 19:03:01 +11:00
=
18fa537791
Add one time token functionality
2021-03-02 18:52:25 +11:00
David Bomba
92f729c10d
Catch if an OAuth user doesn't exist and attempts to login
2021-02-28 19:54:14 +11:00
David Bomba
c063aee812
enums for email delivery
2021-02-26 08:06:43 +11:00
David Bomba
f7e4bca5a5
Update task status_order on update()
2021-02-24 13:12:23 +11:00
David Bomba
90b33ef063
clean up
2021-02-24 11:48:32 +11:00
David Bomba
ab54f9f75c
Custom reply to and from name
2021-02-24 10:39:37 +11:00
David Bomba
d1044a861e
Bug fix for TwoFactorController
2021-02-24 10:00:51 +11:00
David Bomba
f54c482010
Postmark webhooks
2021-02-24 09:56:23 +11:00
David Bomba
47a2ff7df3
Fixes for tests
2021-02-23 09:47:54 +11:00
David Bomba
1b3a9e6398
Fixes for updating products
2021-02-23 09:08:43 +11:00
David Bomba
67d0f525af
Postmark webhooks
2021-02-22 20:46:01 +11:00
David Bomba
c72fcfed64
Mail listeners to harvest message ids
2021-02-22 11:18:52 +11:00
David Bomba
53f79440c0
Connected accounts
2021-02-22 08:27:00 +11:00
David Bomba
9a46a886a1
fixes for surcharge tax calculations and also implemented Zero % tax rates
2021-02-21 20:36:34 +11:00
David Bomba
1b19b3d0a9
Merge pull request #4950 from turbo124/v5-develop
...
Update dependencies
2021-02-20 23:13:53 +11:00
=
087129788b
Working on 2FA
2021-02-20 11:45:20 +11:00
=
4b1030f881
Add former email address for rollbacks
2021-02-20 08:42:29 +11:00
Benjamin Beganović
8ecc33087a
Merge pull request #4940 from beganovich/v5-1902-streamline-client-portal
...
(v5) Streamline client portal (centralised pay now button)
2021-02-19 16:53:21 +01:00
David Bomba
2735efedd2
Remove BaseMailerJob
2021-02-19 07:57:10 +11: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
David Bomba
8346875f88
Fixes for mails
2021-02-18 21:33:54 +11:00
David Bomba
704477f803
Imports
2021-02-18 14:37:17 +11:00
David Bomba
06bc49b0d6
Refactoring emails
2021-02-18 10:30:31 +11:00
Benjamin Beganović
10733418c6
Allow default company registration without company key in the URL
2021-02-17 12:13:27 +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
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
Joshua Dwire
68c2246e64
Remove dispatchNow used for testing
2021-02-16 18:17:41 -05:00
David Bomba
4612379811
Fixes for file upload on dedicated routes
2021-02-16 20:02:33 +11:00
David Bomba
6edaf5d557
Entity upload routes + reorder api.php routes file
2021-02-16 08:14:30 +11:00
David Bomba
e546764e29
Upload documents route
2021-02-16 07:58:19 +11:00
Benjamin Beganović
aacc3b6602
wip
2021-02-15 15:52:13 +01:00
David Bomba
292c7b8068
Invoice upload document route
2021-02-15 22:34:05 +11:00
David Bomba
dedc7c2cb3
Expense document uploads
2021-02-15 22:07:47 +11:00
David Bomba
afb2306598
Credit upload route
2021-02-15 22:00:02 +11:00
David Bomba
7bf6d7c48a
Document route for clients / company
2021-02-15 21:52:50 +11:00
David Bomba
120d2c21ab
Refactor password reset for admin users
2021-02-15 10:39:40 +11:00
David Bomba
5ad5606ea2
Request cancellation notification refactor
2021-02-15 09:12:14 +11:00
David Bomba
2b31b3bd8c
Notification types
2021-02-15 08:32:59 +11:00
Joshua Dwire
ac99b0039d
Import functionality updates
2021-02-12 19:20:15 -05:00
David Bomba
bd6e3db554
Fix for entity footer
2021-02-12 08:00:42 +11:00
=
85df91a6e8
Add redirect URI to google auth requests
2021-02-10 21:43:32 +11:00
Benjamin Beganović
3653c7901a
Update rules for under payments
2021-02-09 12:48:22 +01:00
David Bomba
fc79835ed6
Merge pull request #4825 from turbo124/v5-develop
...
Working on migrations.
2021-02-03 23:30:31 +11:00
David Bomba
2e2843c27d
Fixes for migrations
2021-02-03 23:29:44 +11:00
Benjamin Beganović
9e08ce7415
escape hash
2021-02-02 14:52:21 +01:00
David Bomba
fb8bf55e5c
Clean up logging
2021-01-31 17:49:28 +11:00
David Bomba
65ee07b8ec
Remove Spatie Ray - poor error handling
2021-01-30 12:13:32 +11:00
David Bomba
6d278a9c05
Add flag when permissions change
2021-01-29 23:29:42 +11:00
David Bomba
af472b21c1
Working on filtering responses based on user permissions
2021-01-29 23:05:03 +11:00
Benjamin Beganović
3b31953d14
Merge branch 'v5-develop' into v5-2701-payable-draft-invoices
2021-01-28 15:44:22 +01:00
David Bomba
e0758e587f
Add logging for migrations
2021-01-28 13:53:40 +11: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
David Bomba
d492d6c12f
Merge pull request #4774 from turbo124/v5-develop
...
Payment notifications for autobilling
2021-01-27 21:57:16 +11:00
David Bomba
9b72acf506
Payment notifications for autobilling
2021-01-27 21:56:50 +11:00
Benjamin Beganović
130714f457
Throw PaymentFailed exception if something goes wrong with response
2021-01-27 11:54:29 +01:00
David Bomba
b4bf6cc760
Add document list view
2021-01-27 21:38:28 +11: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
David Bomba
af523a6346
detach payment method from authorize gateway
2021-01-25 23:16:43 +11:00
David Bomba
6540a25531
Refactor client numbering
2021-01-25 21:34:12 +11:00
David Bomba
269f83f317
Translations
2021-01-25 11:57:49 +11:00
David Bomba
af19afedb5
Translations
2021-01-25 10:04:50 +11:00
David Bomba
a0d0c77630
translations
2021-01-25 09:24:13 +11:00
David Bomba
24dfbe48dc
working on paid_to_date fields and calculations
2021-01-24 17:44:14 +11:00