1905 Commits

Author	SHA1	Message	Date
David Bomba	404ee307fd	Magic link maker	2021-03-31 11:07:54 +11:00
David Bomba	ffdd81ab6b	Merge pull request #5296 from turbo124/v5-develop ... Fixes for subscriptions	2021-03-31 10:08:29 +11: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
Benjamin Beganović	d5109af225	wip	2021-03-30 14:07:31 +02:00
David Bomba	f5c6847a36	Minor fixes for subscription types	2021-03-30 20:41:58 +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ć	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
David Bomba	f1ece9ab6b	Subscriptions	2021-03-29 21:43:42 +11:00
Benjamin Beganović	97d92cd127	wip	2021-03-29 12:25:29 +02:00
David Bomba	de99ed2ba4	Fixes for quote numbering	2021-03-29 21:00:22 +11: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
David Bomba	2e139a633b	Validation rules for subscriptions	2021-03-28 08:45:46 +11:00
David Bomba	8dedfa4cb5	Merge pull request #5266 from turbo124/v5-develop ... Subscriptions	2021-03-27 20:26:53 +11:00
David Bomba	f067290462	Update rules for updating an entity	2021-03-27 06:43:52 +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ć	49c4707e38	Update BillingPortalPurchase.php	2021-03-23 16:27:30 +01:00
Benjamin Beganović	77fdb25304	Merge branch 'v5-develop' into v5-2203-billing-portal	2021-03-23 16:23:56 +01:00
=	3d375e4148	Workig on client subscriptions	2021-03-23 23:17:28 +11:00
=	f74368e869	Set first user to gmail after first authorization	2021-03-23 17:19:06 +11:00
David Bomba	417ed6c13d	Fixes for recurring	2021-03-23 08:24:05 +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
Benjamin Beganović	535d9ae471	Update data passed to startTrial	2021-03-22 14:03:32 +01:00
Benjamin Beganović	d5ad6088f6	Create data mapper for cached data / billing context	2021-03-22 13:56:26 +01:00
Benjamin Beganović	6e714747bd	Update price per quantity	2021-03-22 13:53:34 +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
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	22f81a036f	Merge pull request #5220 from turbo124/v5-develop ... Fixes for default timeouts	2021-03-22 21:55:25 +11:00
David Bomba	793247e0f7	Fixes for default timeouts	2021-03-22 21:55:09 +11:00
Benjamin Beganović	44bf716fc9	Merge branch 'v5-develop' into v5-2003-fix-billing-subscription-integration	2021-03-22 11:12:14 +01: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
David Bomba	f80179814d	fix conflicts	2021-03-22 07:22:20 +11:00
David Bomba	1b5d6d44f2	Set default time out	2021-03-22 07:21:51 +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
Benjamin Beganović	fdd1601120	wip	2021-03-20 23:15:26 +01: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
=	7173ba2931	catch project exceptions	2021-03-20 11:16:29 +11:00
David Bomba	9e0328757a	Tests for number validation across entities	2021-03-20 10:06:44 +11:00
David Bomba	451e4e1bbe	Ensure better unique rules	2021-03-20 09:51:52 +11:00
David Bomba	b841fe7000	Working on unique rules for numbers	2021-03-20 09:29:20 +11:00
David Bomba	34b9877868	Minor fixes	2021-03-19 23:37:57 +11:00
Benjamin Beganović	d98165a8dd	Set client language_id if locale is present	2021-03-18 16:01:13 +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
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	9ca9736de6	resolved conflicts'	2021-03-18 12:00:01 +11:00
David Bomba	ee15ea9434	v5.1.27	2021-03-18 11:58:10 +11:00
David Bomba	086189a1ea	Hosted PDFs by invoice ninja	2021-03-18 11:53:08 +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ć	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	b762ea37d2	Throw 400's on incorrect 2FA data	2021-03-17 00:40:58 +11:00
Benjamin Beganović	851a31b3c0	Proof of concept for billing page	2021-03-16 14:35:57 +01: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
David Bomba	1e72f20c3d	Fix for invite resend permission	2021-03-16 07:35:19 +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
Benjamin Beganović	b9bea02b68	wip	2021-03-13 14:51:01 +01:00
=	0bf8b9c9e5	Fixes for setup flow	2021-03-13 17:45:41 +11:00
David Bomba	d01b97104a	Merge pull request #5111 from joshuadwire/v5-develop ... Fix request validation for preconfigured installs	2021-03-13 14:58:23 +11:00
Joshua Dwire	941132133c	Fix request validation for preconfigured installs	2021-03-12 18:46:56 -05: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	76a27f3946	Fix for null design column	2021-03-10 20:41: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
Benjamin Beganović	83b23956f6	Update authorize methods on billing subscription requests	2021-03-09 14:29:57 +01:00
David Bomba	9290873b8b	Fixes for qr code"	2021-03-09 21:53:25 +11:00
David Bomba	59beb9dd39	Customize the password protect timeout	2021-03-09 21:52:48 +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	9a15d2c6cf	Minor fixes	2021-03-09 15:43:54 +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
David Bomba	b21714c00c	Merge branch 'v5-develop' of https://github.com/turbo124/invoiceninja into v5-develop	2021-03-09 05:57:34 +11:00
David Bomba	38e5a14172	Bug fix for reconfirm useR	2021-03-09 05:47:49 +11:00
Benjamin Beganović	2660b8fa58	Billing subscriptions: Requests for crud endpoints	2021-03-08 15:19:45 +01:00
Benjamin Beganović	780ab6885b	Billing subscriptions: Controller	2021-03-08 15:19:04 +01:00
David Bomba	d83073ad91	Validation rule for recurring frequency	2021-03-08 12:31:00 +11:00
David Bomba	e39ce7491b	Feature permissions for hosted	2021-03-08 08:32:38 +11:00
David Bomba	2595d3d2a4	Fixes for typo in password protection	2021-03-08 07:56:44 +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	7a50032b35	Logging	2021-03-07 08:50:14 +11:00
David Bomba	20440189d2	Fixes for password protection middleware	2021-03-04 16:03:28 +11:00
David Bomba	11ad2cd57e	Fixes for caching protection route	2021-03-04 12:17:29 +11:00
David Bomba	365c190cca	Remove return type for User Service	2021-03-04 10:12:34 +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	c37c441d92	Associate a user with multiple companies	2021-03-02 09:18:19 +11:00
David Bomba	edc25c1342	Associate a user with multiple companies	2021-03-02 09:08:57 +11:00
David Bomba	bf326e6d26	Working on adding user to another company	2021-03-01 23:06:24 +11:00
David Bomba	9a2160c325	Verified users only for hosted platform	2021-03-01 13:51:00 +11:00
David Bomba	d238d53b26	Delete PDF helper	2021-03-01 10:40:18 +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	e668e7fd5a	Fixes for Quotes not attaching to emails	2021-02-28 13:12:55 +11:00
David Bomba	cc883f0926	Fixes for archived invoice not emailing	2021-02-26 22:20:17 +11:00
David Bomba	4884b039df	User verified middleware	2021-02-26 08:18:14 +11:00
David Bomba	c063aee812	enums for email delivery	2021-02-26 08:06:43 +11:00
David Bomba	29b4e6d1b7	minor fixes	2021-02-25 21:41:18 +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	9b1b677e8e	Working on OAuth password protection routes	2021-02-24 08:12: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ć	7990ca22ec	Centralize "Pay now" button	2021-02-18 13:37:27 +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
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
Joshua Dwire	ff27f351c7	Bug fixes; add support for other platform imports	2021-02-16 18:15:42 -05:00
Benjamin Beganović	22bd29f8fc	wip	2021-02-16 13:16:22 +01: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	d870bb5a87	Merge pull request #4887 from turbo124/v5-develop ... Fix for entity footer	2021-02-12 08:01:07 +11:00
David Bomba	bd6e3db554	Fix for entity footer	2021-02-12 08:00:42 +11:00
Benjamin Beganović	6afed935db	Hide draft credits from client	2021-02-11 14:14:11 +01: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	337afe5220	Merge pull request #4758 from turbo124/v5-develop ... Fix for updating quote	2021-01-25 22:23:35 +11:00
David Bomba	f950f84b61	Fix for 500 on updating quote by removing contacts	2021-01-25 21:54:36 +11:00
David Bomba	6540a25531	Refactor client numbering	2021-01-25 21:34:12 +11:00
Benjamin Beganović	324fcc287c	wip	2021-01-25 10:07:42 +01:00
Benjamin Beganović	3c4e779585	add mount to requiredfields	2021-01-25 10:07:12 +01: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
=	04d1a43dfe	Remove strings and replace with translations	2021-01-24 22:48:09 +11:00
David Bomba	24dfbe48dc	working on paid_to_date fields and calculations	2021-01-24 17:44:14 +11:00
David Bomba	272a089c38	Fixes for task and task status order	2021-01-22 21:55:03 +11:00
David Bomba	4b87df07b7	Check that a company gateway always has at least one fee and limits object	2021-01-22 08:36:25 +11:00
David Bomba	3d468e5f40	Company Gateway cleanup	2021-01-22 07:45:00 +11:00
David Bomba	05ea7f092a	Fixes for ledger adjustments	2021-01-21 15:05:05 +11:00
David Bomba	f06fc9f720	Minor fix for payment validations'	2021-01-21 10:58:54 +11:00
David Bomba	db9e8ff830	Add rules preventing overpayment on invoices	2021-01-21 10:53:02 +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
David Bomba	a021bd83d9	Clean up emails	2021-01-20 14:49:22 +11:00
David Bomba	92e5465679	Entity mail failure email	2021-01-20 12:59:39 +11:00
David Bomba	656d7941cb	Merge pull request #4727 from turbo124/v5-develop ... Fixes for Migration	2021-01-20 09:41:53 +11:00
David Bomba	cfc144b6ec	Group Document defaults	2021-01-20 07:22:14 +11: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
David Bomba	f20db94b62	Fixes for how we auth a client contact	2021-01-19 07:29:36 +11:00
David Bomba	63eae6000a	fixes for service methods	2021-01-19 07:04:13 +11:00
David Bomba	40f336c469	Fixes for defaults	2021-01-19 07:02:32 +11:00
David Bomba	81da8e169d	Add documents to groups	2021-01-18 22:06:26 +11:00
David Bomba	cbd6f212b5	deprecate old getPaymentMethods()	2021-01-18 13:59:06 +11:00
David Bomba	c4bfb33dbf	Add destroy() methods in all controllers	2021-01-17 15:28:03 +11:00
David Bomba	8c8509ca40	Merge pull request #4703 from turbo124/v5-develop ... Refactor alternateSave() in BaseRepo	2021-01-16 08:45:37 +11:00
Benjamin Beganović	3970ee3450	only require email in settings	2021-01-15 14:07:33 +01:00
Benjamin Beganović	72b509dfe2	only require postal_code for billing address	2021-01-15 13:27:46 +01:00
David Bomba	cbce8c8a46	minor fixes for client portal	2021-01-15 22:19:34 +11:00
David Bomba	2f58096872	Fixes for displaying Recurring Invoice PDF	2021-01-15 13:02:55 +11:00
David Bomba	7b1f7b7bbd	Merge pull request #4687 from beganovich/v5-0114-change-default-pdf-viewer ... (v5) Show quotes/invoices in full-screen by default	2021-01-15 08:33:14 +11:00
David Bomba	b72a4567db	Merge pull request #4688 from beganovich/v5-0114-remove-url-in-settings ... (v5) Client portal: Remove URL validation from the website	2021-01-15 08:33:09 +11:00
Benjamin Beganović	f8e57f57a5	Remove drafts from the quotes-table	2021-01-14 14:17:39 +01:00
Benjamin Beganović	6f9bedd7f1	remove url validation from settings/website	2021-01-14 14:15:09 +01:00
Benjamin Beganović	2a193c97ea	Show quotes/invoices in full-screen by default	2021-01-14 13:29:46 +01:00
David Bomba	8b22fa5a47	Fixes for user events	2021-01-14 15:31:45 +11:00
David Bomba	7d46ec489a	User Activities	2021-01-14 14:44:52 +11:00
David Bomba	95e5b89641	fixes for validation of line_items	2021-01-14 08:16:07 +11:00
David Bomba	4ad3e7fc8a	Fix for group_settings_id being dropped in certain edge cases	2021-01-14 08:01:27 +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	20b13d131b	Return expense response when using delete route	2021-01-14 07:33:45 +11:00
Benjamin Beganović	9516f877f6	Skip showing the page if no fields	2021-01-13 13:39:34 +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	976f610158	fixes for validation	2021-01-13 23:20:15 +11:00
David Bomba	4ff0108c5c	fixes for validation	2021-01-13 22:52:30 +11:00
David Bomba	e3efa5790f	Email validation	2021-01-13 22:47:36 +11:00
David Bomba	3b02dd56e0	Save documents to Company Entity	2021-01-13 21:12:14 +11:00
David Bomba	a6121295c2	Fix for retrieving quote PDF	2021-01-13 19:58:01 +11:00
David Bomba	989d2fe574	Default show dashboard to false	2021-01-13 18:47:14 +11:00
David Bomba	ccf65f1c7c	Fix for Hide/Show Client Portal Dashboard	2021-01-13 18:43:26 +11:00
David Bomba	7f03a1900e	Refactor notifications to be more specific, ie. Invoice -> Reminder 1 template	2021-01-13 18:20:46 +11:00
Benjamin Beganović	0b4e85957c	wip	2021-01-12 16:30:11 +01: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
David Bomba	e804e083a0	Add slight delay to mailer	2021-01-12 20:54:45 +11:00
David Bomba	e3f0493c48	Cleanup for emails	2021-01-12 10:21:17 +11:00
David Bomba	7d69f5eba3	Changes to schema for expenses, drop redundant columns from company table	2021-01-12 08:57:48 +11:00
David Bomba	b76e404401	Adjust use credits functionality	2021-01-12 08:42:30 +11:00
David Bomba	df55785df9	fix for calculating invoice payments (include partial and full refunds).	2021-01-11 21:45:38 +11:00
David Bomba	7c1d751e56	Merge pull request #4659 from turbo124/v5-develop ... Version bump	2021-01-10 09:15:47 +11:00
David Bomba	7285a6df03	Mark invoice as sent if viewed in portal as Draft	2021-01-10 09:13:48 +11:00
Benjamin Beganović	fe4f01d98a	Wrap processPaymentView & processPaymentRequest into try-catch	2021-01-08 13:45:08 +01:00
David Bomba	13420a93b9	Fixes for validation	2021-01-08 21:19:26 +11:00
David Bomba	a5290e067e	Fix for suming amounts payable	2021-01-08 14:25:54 +11:00
David Bomba	b5606c1524	Fixes for task statuses and tests	2021-01-08 09:25:00 +11:00
David Bomba	2e499adea6	Fix for task status null color value	2021-01-08 09:03:29 +11:00
=	56bcaf0785	Fix for custom payment driver label	2021-01-07 21:09:24 +11:00
David Bomba	5d302ad450	Fixes for multi payments	2021-01-07 18:21:49 +11:00
David Bomba	31dd8b2d77	Merge pull request #4643 from turbo124/v5-develop ... Fixes for tax precision	2021-01-07 17:09:08 +11:00
David Bomba	2cd5d2d68a	Minor fixes for credit_payments in CP	2021-01-07 10:18:57 +11:00
Benjamin Beganović	e1df465883	Show the message if invoice is unpayable	2021-01-06 14:22:48 +01:00
David Bomba	04d8bcccb1	Fix for error handling in PayPal driver	2021-01-06 20:28:48 +11:00
David Bomba	65afd70b38	Always ensure the client has a currency set	2021-01-06 19:50:13 +11:00
David Bomba	47f42b804d	Fixes for partial credit payments"	2021-01-06 16:54:04 +11:00
David Bomba	3ee3f67c8c	Fixes for over payments	2021-01-06 16:14:20 +11:00
David Bomba	c132e9ace8	Fixes for tasks, and migrations	2021-01-06 10:36:20 +11:00
Benjamin Beganović	fd1c655c34	Set debug default to 'false'	2021-01-04 13:43:13 +01:00
Benjamin Beganović	b266def75b	Remove debug from the setup page	2021-01-04 13:42:31 +01:00
Benjamin Beganović	603f7baa58	apply php-cs-fixeR	2021-01-04 13:38:00 +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	934610a01c	Update copyright + version bump + set canadian dollar symbol to $	2021-01-04 08:54:54 +11:00
David Bomba	8653cc6114	Fixes for unique taxrate constraint on update	2021-01-04 08:22:42 +11:00
David Bomba	e791741efa	Fixes for displaying recurring invoices in the client portal	2021-01-03 18:56:42 +11:00
=	6c098160df	Allow a user to change only their own password	2021-01-01 20:11:21 +11:00
Benjamin Beganović	8df80ddab0	fixes for paypal redirecting to stripe	2020-12-30 12:02:04 +01:00
=	7a058c9ae6	Move logging to nlog	2020-12-30 08:10:03 +11:00
=	4129dba08b	Test for HTML output for preview controller	2020-12-26 20:26:19 +11:00
David Bomba	b3962986fb	Merge pull request #4577 from turbo124/v5-develop ... Fix for company.users.company_user	2020-12-26 19:04:03 +11:00
=	53ff009d74	fix for company.users.company_user	2020-12-26 19:03:24 +11:00
Benjamin Beganović	9f58ccb028	Add support for custom Chromium path (ie. support for Windows & Mac)	2020-12-25 14:15:57 +01:00
Benjamin Beganović	77a8771c78	Setup improvements: ... - Disable Test PDF button while network request loading - Return correct public/test.pdf file path	2020-12-24 12:25:22 +01:00
Benjamin Beganović	ada4f3065c	fixes for tests	2020-12-23 11:41:57 +01:00
Benjamin Beganović	69bc664457	Merge pull request #4549 from beganovich/v5-snappdf-integration ... (v5) snappdf support	2020-12-22 09:31:22 +01:00
Benjamin Beganović	6009d49330	Merge pull request #4546 from beganovich/v5-amount-with-fee ... (v5) Change amount_with_fee source location	2020-12-22 09:26:24 +01:00
Benjamin Beganović	95c1f60674	Install beganovich/snappdf package	2020-12-21 16:32:04 +01:00
Benjamin Beganović	940c5c77f3	find and setup db by company key in webhook request	2020-12-21 12:19:48 +01:00
Benjamin Beganović	09a5ab4fad	Merge remote-tracking branch 'upstream/v5-develop' into v5-amount-with-fee	2020-12-21 12:14:43 +01:00
Benjamin Beganović	5a8dfd85eb	Apply php-cs-fixer	2020-12-21 11:46:46 +01:00
David Bomba	950a057496	Merge pull request #4545 from turbo124/v5-develop ... Fix for preview	2020-12-21 20:59:17 +11:00
David Bomba	95455f732b	Minor fix for preview	2020-12-21 20:58:55 +11:00
Benjamin Beganović	6f32fd6c4b	Merge pull request #4527 from beganovich/v5-stripe-webhook-support ... (v5) Stripe support for webhooks	2020-12-21 08:14:00 +01:00
David Bomba	c1edc905db	Importing invoices	2020-12-20 20:02:10 +11:00
David Bomba	ccde0eaced	Working on importing CSV Invoices	2020-12-20 18:02:58 +11:00
David Bomba	4df646f93b	Fixes for tests	2020-12-20 12:21:40 +11:00
Benjamin Beganović	92d2a514ca	Supprot Stripe for webhooks	2020-12-19 13:11:42 +01:00
David Bomba	6b02d51080	Invoice Import	2020-12-19 18:28:58 +11:00
David Bomba	df30f0cbc5	Fixes for github actions	2020-12-18 11:31:27 +11:00
David Bomba	3ad3d0a418	Fix for editting invoice where number in pending state	2020-12-18 07:14:46 +11:00
David Bomba	f45588d26e	Merge pull request #4522 from turbo124/v5-develop ... Handle invoice numbers on restore	2020-12-18 07:12:17 +11:00
David Bomba	d3cdfd670f	Product import	2020-12-17 23:00:32 +11:00
Benjamin Beganović	6fa90c7060	Change webhook order	2020-12-17 12:47:46 +01:00
Benjamin Beganović	79c6cc474a	Merge pull request #4515 from beganovich/v5-checkout-webhooks-update ... (v5) Support for Checkout @ webhooks	2020-12-17 12:33:01 +01:00
Benjamin Beganović	5ea07fde66	Merge pull request #4512 from beganovich/v5-remove-trailing-slash-from-setup ... (v5) Remove trailing slash from URLs on setup	2020-12-17 12:32:47 +01:00
Benjamin Beganović	942652b668	Update webhooks to support Checkout.com & apply php-cs-fixer	2020-12-17 12:27:15 +01:00
Benjamin Beganović	d8405710e7	Merge pull request #4513 from beganovich/v5-webhooks-refactor ... (wip) (v5) Webhooks refactor	2020-12-17 11:56:16 +01:00
Benjamin Beganović	c78a03b095	Remove trailing slash from URLs on setup	2020-12-17 11:10:47 +01:00
David Bomba	831d1e0816	revert to exec() to composer install	2020-12-17 10:23:54 +11:00
Benjamin Beganović	d3033c902d	wip	2020-12-16 15:25:42 +01:00
Benjamin Beganović	9662d9af92	Update webhooks for Checkout: ... - Update api.php -> gateway_key => company_gateway_id - Pass correct reference to url in CreditCard.php - Update PaymentWebhookController.php to support new company_gateway_id - Update PaymentWebhookRequest.php to resolve company gateway from correct input	2020-12-16 13:47:10 +01:00
Benjamin Beganović	20c010448a	apply php-cs-fixer	2020-12-16 12:52:40 +01:00
Benjamin Beganović	9f4481d35f	Enable support for ChromiumPdf on setup ... Add test.pdf to .gitignore	2020-12-16 12:51:41 +01:00
David Bomba	7353687c04	Working on client import	2020-12-16 21:06:20 +11:00
David Bomba	8df553c4cc	Working on CSV imports	2020-12-16 11:01:15 +11:00
David Bomba	57ee54032f	Import CSV	2020-12-15 09:59:41 +11:00
David Bomba	141f45f402	Minor fixes for currency in expenses	2020-12-14 22:18:54 +11:00
David Bomba	05f4572454	Merge branch 'v5-develop' into v5-develop	2020-12-14 21:44:01 +11:00
David Bomba	64b9f94299	Working on Import / Export	2020-12-14 21:43:07 +11:00
Benjamin Beganović	79570b6118	Merge pull request #4453 from beganovich/v5-custom-payment-driver ... (v5) Custom payment driver	2020-12-14 10:12:56 +01:00
David Bomba	d115609d3c	Import | Exports	2020-12-14 15:59:15 +11:00
David Bomba	8b808c97fa	Fixes for expense currency not setting default	2020-12-14 07:58:18 +11:00
David Bomba	6f451b8924	Remove redundant info() Change document download route	2020-12-13 20:46:29 +11:00
David Bomba	d440d4421d	Fix for doubling client balance erroneously on emailing"	2020-12-13 11:04:56 +11:00
David Bomba	8abce54d7e	Fixes for customised language options for Preview Controller	2020-12-13 10:20:03 +11:00
David Bomba	1913318124	bump the import cache timeout from 10 minutes to 60 minutes	2020-12-13 07:54:25 +11:00
David Bomba	2a1a9e2a16	Working on import	2020-12-12 21:47:52 +11:00
David Bomba	3419d7900f	Tests for importing CSV files	2020-12-12 21:35:42 +11:00
David Bomba	584bef52fc	Working on import	2020-12-12 21:01:53 +11:00
David Bomba	aa1a788d6e	Public document download route	2020-12-12 19:46:28 +11:00
David Bomba	f6ed7be0da	Fixes for expense and project numbers	2020-12-12 07:51:10 +11:00
David Bomba	23f07a901b	Version bump to 5.0.35	2020-12-11 23:20:46 +11:00
Benjamin Beganović	e6890e5430	Merge branch 'v5-develop' into v5-custom-payment-driver	2020-12-10 12:40:27 +01:00
David Bomba	3fc8374cb5	Fixes for attempting to create a user with duplicate email	2020-12-10 21:28:19 +11:00
David Bomba	8c46e140af	Also factor in optin and optout for auto_enabled	2020-12-10 19:51:00 +11:00
David Bomba	894481989c	Also factor in optin and optout for auto_enabled	2020-12-10 19:47:17 +11:00
David Bomba	91f90c94e3	Merge pull request #4454 from turbo124/v5-develop ... Notifications clean up.	2020-12-10 07:58:08 +11:00
Benjamin Beganović	d45571d7f9	wip	2020-12-09 15:17:48 +01:00
Benjamin Beganović	23a64562c9	fix issue with setup & apply php-cs-fixer	2020-12-09 13:38:22 +01:00
David Bomba	df9fe5677d	Notification for quotes credits and invoices	2020-12-09 21:05:26 +11:00
David Bomba	7ba78cc342	Reduce notification emails to one per entity	2020-12-09 20:52:08 +11:00
David Bomba	6a03bcc546	Merge branch 'v5-develop' into v5-develop	2020-12-09 07:25:16 +11:00
Benjamin Beganović	82bbe5b389	php-cs-fixer	2020-12-08 15:04:45 +01:00
Benjamin Beganović	1d0f5b2ad7	add post-submit checks to smtp & db	2020-12-08 15:04:07 +01:00
Benjamin Beganović	68a84df0dd	prefix all smtp fields with mail_	2020-12-08 14:29:15 +01:00
Benjamin Beganović	3ffb600117	prefix all db field with db_	2020-12-08 14:21:00 +01:00
Benjamin Beganović	3505c89e2d	remove fallback to log driver	2020-12-08 14:20:24 +01:00
Benjamin Beganović	812824100c	wrap getting file into try-catch	2020-12-08 13:10:27 +01:00
David Bomba	634e5cadcc	remove redundant code	2020-12-08 21:49:23 +11:00
David Bomba	beccfd00c7	Only send email changed notification if new and old emails are different.	2020-12-08 20:32:17 +11:00
David Bomba	594dda9b65	fixes for delivery notes{	2020-12-08 20:18:17 +11:00
David Bomba	e765bcce08	Fixes for swagger	2020-12-08 07:25:56 +11:00
Benjamin Beganović	a92d38ae06	php-cs-fixer	2020-12-07 14:56:23 +01:00
Benjamin Beganović	c548bc2e0d	refactor paymentwebhook suite with new methods	2020-12-07 14:49:30 +01:00
Benjamin Beganović	1f2c3f2823	update pagination links & apply php-cs-fixer	2020-12-05 14:24:21 +01:00
David Bomba	34463eac64	Merge branch 'v5-develop' into v5-develop	2020-12-04 07:41:36 +11:00
Benjamin Beganović	4959917b7e	fix issue with multiple companies switching	2020-12-03 15:33:18 +01:00
Benjamin Beganović	458e207fe3	fixes for smtp testing on setup	2020-12-03 14:10:40 +01:00
Benjamin Beganović	8ad5d14659	Merge pull request #4419 from beganovich/v5-checkout-frames ... (v5) Checkout.com migration to Frames	2020-12-03 13:49:52 +01:00
Benjamin Beganović	d84f5bc5bb	Fixes for Checkout.com refunding	2020-12-03 13:38:57 +01:00
David Bomba	fceaab9e40	Working on invoice delete restore refactor	2020-12-03 21:46:36 +11:00
David Bomba	bc0a925f39	Fixes for include	2020-12-02 19:59:45 +11:00
David Bomba	9623dba2c8	fix for showinvoicerequest	2020-12-01 21:22:48 +11:00
David Bomba	1210a81a09	Minor changes to migration	2020-11-30 09:58:31 +11:00
David Bomba	d7dd592d18	Fixes for migration file location	2020-11-30 08:28:12 +11:00
Benjamin Beganović	0aff363f5d	php-cs-fixer	2020-11-27 12:08:42 +01:00
Benjamin Beganović	2618a1d3b8	add ability to edit client's phone	2020-11-27 12:08:39 +01:00
David Bomba	9f4979095b	Temp routes"	2020-11-27 20:21:18 +11:00
David Bomba	5a3c93bb3c	Temp routes"	2020-11-27 20:14:01 +11:00
David Bomba	2d80e12457	Phantom adjustment for preview	2020-11-27 13:24:13 +11:00
David Bomba	a99f871fb7	Phantom adjustment for preview	2020-11-27 13:23:02 +11:00
David Bomba	b593cb0ff3	Fixes for preview PDF using phantom js	2020-11-27 13:02:05 +11:00
David Bomba	d07dedf264	Add tax_rates relation to company_user	2020-11-27 08:05:30 +11:00