954 Commits

Author	SHA1	Message	Date
David Bomba	f7cf6b521f	Merge pull request #5321 from turbo124/v5-develop ... fixes for subscriptions	2021-04-02 10:19:37 +11:00
David Bomba	c3eb46d0b7	fixes for subscriptions	2021-04-02 09:09:01 +11:00
Benjamin Beganović	08b317f7b8	allow cancellation under specific conditions	2021-04-01 16:38:46 +02:00
David Bomba	1e83b729d5	Minor fixes for subscriptions	2021-04-01 20:33:50 +11:00
David Bomba	c279cf013e	add per_seat_enabled to fillable	2021-04-01 07:04:53 +11:00
David Bomba	f5c6847a36	Minor fixes for subscription types	2021-03-30 20:41:58 +11:00
David Bomba	96c191daf0	Add system logs to first load	2021-03-30 09:32:33 +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	2c83abe432	Subscriptions	2021-03-27 07:28:56 +11:00
David Bomba	fc3889671e	Fixes for HTMLEngine	2021-03-27 06:30:46 +11:00
David Bomba	c47318df1e	Fixes for company presenter	2021-03-27 06:21:47 +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	8eb8f6e098	Fixes for tests	2021-03-26 06:42:25 +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
=	7173ba2931	catch project exceptions	2021-03-20 11:16:29 +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ć	c320b6bfbb	Merge branch 'v5-develop' into v5-1103-billing-landing-page	2021-03-17 17:14:55 +01: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
David Bomba	c95e0c3d7e	Tuning company settings for missing properties	2021-03-17 20:28:44 +11:00
David Bomba	b762ea37d2	Throw 400's on incorrect 2FA data	2021-03-17 00:40:58 +11:00
David Bomba	8f37a06e24	Fixes for 2FA	2021-03-15 08:40:07 +11:00
David Bomba	00eefcd781	Client Subscription scaffolding	2021-03-10 11:08:58 +11:00
David Bomba	b91fcf1b34	Merge branch 'v5-develop' into billing_subscriptions	2021-03-10 09:27:28 +11:00
David Bomba	599a1626a7	Fix for logo	2021-03-10 07:56:23 +11:00
Benjamin Beganović	868b6efd8e	Add currency_id to billing_subscriptions table	2021-03-09 14:24:31 +01:00
David Bomba	d7d0768eae	Minor fixes	2021-03-09 21:34:39 +11:00
David Bomba	053c1ca5fa	billing_subscriptions cleanup	2021-03-09 08:29:59 +11:00
David Bomba	31d92a3dc0	add russian language	2021-03-09 08:05:20 +11:00
David Bomba	45104f6ae5	Merge branch 'billing_subscriptions' into billing_subscription_scaffold	2021-03-09 07:43:30 +11:00
Benjamin Beganović	420d904551	Client subscriptions: Model	2021-03-08 15:18:48 +01:00
Benjamin Beganović	9c1a3368e9	Billing subscriptions: Database schema & model	2021-03-08 15:18:34 +01:00
=	f4d1917f32	Hosted feature implementation	2021-03-07 21:14:53 +11:00
David Bomba	1599711dee	Observers and policy scaffold	2021-03-05 21:18:28 +11:00
David Bomba	609cb1ee8d	Merge pull request #5022 from turbo124/v5-develop ... Fixes for user management	2021-03-04 13:51:03 +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
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
=	c23b9b147d	Fixes for attaching a user to different companies	2021-03-03 18:22:14 +11:00
David Bomba	ab5fb7c376	Fixes for company logo	2021-03-02 07:15:28 +11:00
David Bomba	2ab76e9098	v5.1.12	2021-03-01 22:00:07 +11:00
David Bomba	e668e7fd5a	Fixes for Quotes not attaching to emails	2021-02-28 13:12:55 +11:00
=	5f14cc0c5d	Working on task range overlap	2021-02-27 21:08:39 +11:00
=	c94c3fa373	Add project relationships across all entities	2021-02-27 08:37:56 +11:00
=	57e3b59b91	Add project relationship to recurring invoice	2021-02-27 07:48:49 +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	f54c482010	Postmark webhooks	2021-02-24 09:56:23 +11:00
David Bomba	c20d2eedbc	remove redundant method	2021-02-23 23:45:50 +11:00
David Bomba	62feba5a51	Localizing Dates	2021-02-23 21:04:39 +11:00
David Bomba	db0e684ff8	Translated dates	2021-02-23 16:15:23 +11:00
David Bomba	c7cb299d1c	Fixes for fillable properties	2021-02-23 12:17:46 +11:00
David Bomba	55b673241b	Fixes for fillable properties	2021-02-23 12:17:09 +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	c7048e8cb1	Fixes for user present name	2021-02-22 20:54:46 +11:00
David Bomba	9a46a886a1	fixes for surcharge tax calculations and also implemented Zero % tax rates	2021-02-21 20:36:34 +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
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
David Bomba	4612379811	Fixes for file upload on dedicated routes	2021-02-16 20:02:33 +11:00
David Bomba	181902fece	Additional company table properties	2021-02-16 08:52:38 +11:00
Benjamin Beganović	aacc3b6602	wip	2021-02-15 15:52:13 +01:00
David Bomba	120d2c21ab	Refactor password reset for admin users	2021-02-15 10:39:40 +11:00
David Bomba	08e280e651	Refactor password reset - clientcontact	2021-02-15 09:54:27 +11:00
Joshua Dwire	ac99b0039d	Import functionality updates	2021-02-12 19:20:15 -05:00
David Bomba	e115536b8c	Add quote() relation to activity	2021-02-09 07:13:16 +11:00
David Bomba	d48756ea79	Improvements to migration email	2021-01-31 16:07:45 +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
David Bomba	9b72acf506	Payment notifications for autobilling	2021-01-27 21:56:50 +11:00
David Bomba	b4bf6cc760	Add document list view	2021-01-27 21:38:28 +11:00
David Bomba	78d726a483	Fixes for system logging custom payment drivers	2021-01-27 16:10:05 +11:00
David Bomba	b5ff2d8a02	Fixes for company gateway payment method resolution	2021-01-27 12:06:25 +11:00
David Bomba	458dd1fa4a	Soft delete/restore tokens in sync with CompanyGateway"	2021-01-27 09:17:27 +11:00
David Bomba	6540a25531	Refactor client numbering	2021-01-25 21:34:12 +11:00
David Bomba	24dfbe48dc	working on paid_to_date fields and calculations	2021-01-24 17:44:14 +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	e9e4c39f17	Add support for QR code variables	2021-01-21 23:34:21 +11:00
David Bomba	62bc55cf0b	Fixes for client authentication to client portal	2021-01-21 10:01:13 +11:00
David Bomba	cfc144b6ec	Group Document defaults	2021-01-20 07:22:14 +11:00
David Bomba	f20db94b62	Fixes for how we auth a client contact	2021-01-19 07:29:36 +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	8c8509ca40	Merge pull request #4703 from turbo124/v5-develop ... Refactor alternateSave() in BaseRepo	2021-01-16 08:45:37 +11:00
Benjamin Beganović	bc584c387c	merge upstream/v5-develop	2021-01-15 11:03:40 +01:00
David Bomba	1b551796c5	Recurring PDF Dependencies	2021-01-15 14:10:35 +11:00
David Bomba	2f58096872	Fixes for displaying Recurring Invoice PDF	2021-01-15 13:02:55 +11:00
David Bomba	f64a798ca5	Merge pull request #4689 from beganovich/v5-0114-hide-drafts-from-quote-tables ... (v5) Client portal: Remove drafts from the quotes table	2021-01-15 08:33:01 +11:00
Roman Miniv	b20594dc43	Deleted fillable duplicates.	2021-01-14 23:01:31 +02:00
Benjamin Beganović	a43d756068	missing break	2021-01-14 14:24:43 +01:00
Benjamin Beganović	ab4ed1f2b0	add status converted	2021-01-14 14:22:01 +01:00
Benjamin Beganović	c70eb17c16	fix jpg issues in the documents-table	2021-01-14 10:25:39 +01: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	97180508e8	Remove stale invoice_type_id properties	2021-01-14 07:35:52 +11:00
David Bomba	7f03a1900e	Refactor notifications to be more specific, ie. Invoice -> Reminder 1 template	2021-01-13 18:20:46 +11:00
David Bomba	249c0e8b2b	fix for presenting company logo in portal	2021-01-13 12:15:04 +11:00
David Bomba	b2b464fb9e	Check PhantomJS response is valid PDF	2021-01-13 10:25:33 +11:00
David Bomba	43626c92a2	Tests for PDF mime	2021-01-13 10:12:01 +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	9e3b28f6ac	Merge pull request #4668 from turbo124/v5-develop ... Fixes for recurring invoice cron query	2021-01-12 08:20:52 +11:00
Benjamin Beganović	2f17f7011a	Show "Apply credits" only	2021-01-11 15:21:17 +01:00
David Bomba	df55785df9	fix for calculating invoice payments (include partial and full refunds).	2021-01-11 21:45:38 +11:00
David Bomba	fe457537b6	Change the way company logos are stored in the settings	2021-01-11 19:27:11 +11:00
David Bomba	c82d6fa270	additional column on company and expenses table	2021-01-08 21:27:49 +11:00
David Bomba	0797c8e4af	fix for fee label	2021-01-08 14:43:29 +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	31dd8b2d77	Merge pull request #4643 from turbo124/v5-develop ... Fixes for tax precision	2021-01-07 17:09:08 +11:00
David Bomba	5a840201da	Move field from company table to settings	2021-01-07 17:08:34 +11:00
David Bomba	996355a738	Add system_logs to company gateway transformer	2021-01-07 08:27:59 +11:00
David Bomba	3d9755b906	Merge pull request #4624 from beganovich/v5-refactor-calcGatewayFee ... (v5) Refactor calcGatewayFee	2021-01-07 07:29:10 +11:00
Benjamin Beganović	b6d55ceea0	php-cs-fixer	2021-01-06 13:06:42 +01:00
David Bomba	47f42b804d	Fixes for partial credit payments"	2021-01-06 16:54:04 +11:00
David Bomba	c132e9ace8	Fixes for tasks, and migrations	2021-01-06 10:36:20 +11:00
David Bomba	f267408029	Merge pull request #4629 from turbo124/v5-develop ... update decimal precision	2021-01-05 17:19:41 +11:00
David Bomba	13e9197ae5	Tests for task sorting	2021-01-05 15:41:43 +11:00
David Bomba	0c74a4601f	Change decimal resolution	2021-01-05 13:24:32 +11:00
Benjamin Beganović	5833df9850	Refactor calcGatewayFee: ... - Remove default GatewayType::CREDIT_CARD - Swapped spaces for taxes & gateway type	2021-01-04 14:07:50 +01:00
Benjamin Beganović	603f7baa58	apply php-cs-fixeR	2021-01-04 13:38:00 +01:00
David Bomba	2dd7e07c82	Fix for expense documents	2021-01-04 22:22:48 +11:00
David Bomba	ad57469ee4	Flutter Service Worker	2021-01-04 20:53:58 +11:00
David Bomba	934610a01c	Update copyright + version bump + set canadian dollar symbol to $	2021-01-04 08:54:54 +11:00
David Bomba	e791741efa	Fixes for displaying recurring invoices in the client portal	2021-01-03 18:56:42 +11:00
David Bomba	34e04ce31b	Fixes for recurring invoice daily recurring	2021-01-03 18:08:08 +11:00
=	0dbf1f1dfd	Fix for missing Daily Recurring const	2021-01-02 10:01:33 +11:00
=	ba8fcb0de0	Fixes for next_send_date when updating a recurring invoice	2021-01-02 09:52:42 +11:00
=	564e1aefe1	Fixes for next_send_date when updating a recurring invoice	2021-01-02 09:51:13 +11:00
=	1a87b05b96	Display client name if contact is not present	2021-01-01 11:52:42 +11:00
=	02e535b5a1	Fix for recurring invoice null next_send_date	2020-12-31 09:18:29 +11:00
=	53ff009d74	fix for company.users.company_user	2020-12-26 19:03:24 +11:00
David Bomba	feb78a63f2	Add service worker back in	2020-12-17 21:53:20 +11:00
Benjamin Beganović	20c010448a	apply php-cs-fixer	2020-12-16 12:52:40 +01:00
David Bomba	864892a7d2	Migrate white label license	2020-12-15 08:52:14 +11:00
David Bomba	6f451b8924	Remove redundant info() Change document download route	2020-12-13 20:46:29 +11:00
David Bomba	f49faf8f16	Fix for custom gateway query	2020-12-11 08:10:50 +11:00
David Bomba	763fa6ef08	Fix for custom gateway query	2020-12-11 08:09:04 +11:00
David Bomba	bb1ca556c4	wire up custom gateway	2020-12-10 21:20:12 +11:00
David Bomba	7ba78cc342	Reduce notification emails to one per entity	2020-12-09 20:52:08 +11:00
David Bomba	594dda9b65	fixes for delivery notes{	2020-12-08 20:18:17 +11:00
David Bomba	269fff3fc8	Changes for counters	2020-12-07 21:43:21 +11:00
Benjamin Beganović	0aff363f5d	php-cs-fixer	2020-11-27 12:08:42 +01:00
David Bomba	d07dedf264	Add tax_rates relation to company_user	2020-11-27 08:05:30 +11:00
Benjamin Beganović	ae88d5e08e	php-cs-fixer format	2020-11-25 15:19:52 +01:00
David Bomba	b0740b46dd	fixes for tests	2020-11-25 20:21:26 +11:00
David Bomba	2f4b46e435	Refactor webhook handler	2020-11-25 11:23:39 +11:00
David Bomba	63cc567244	Working on migrations	2020-11-24 21:12:05 +11:00
David Bomba	4b240b05ca	Add deleted_at column to paymentables	2020-11-16 08:23:20 +11:00
David Bomba	fe5218fd2c	Fixes for resolving company_user from user object	2020-11-13 21:42:06 +11:00
David Bomba	3bec5a4044	Refactor login routes	2020-11-13 20:09:20 +11:00
David Bomba	58c6cb415e	Merge pull request #4302 from turbo124/v5-develop ... Mail exceptions	2020-11-13 07:22:28 +11:00
David Bomba	d8bb01430f	Fixes for renaming company gateway columns	2020-11-12 22:09:31 +11:00
David Roizenman	039544e753	Use correct formula when adjust_fee_percent=true	2020-11-12 02:53:25 -08:00
David Bomba	28cbd75fcb	Fixes for credit PDF	2020-11-11 11:13:39 +11:00
David Bomba	be2f83cfea	Endless reminder activity	2020-11-09 16:00:15 +11:00
David Bomba	fcef2c72b3	Working on payment emails	2020-11-09 13:39:42 +11:00
David Bomba	087c442a64	Add custom values to payments table	2020-11-09 08:21:52 +11:00
David Bomba	5c5102baeb	Working on reminders	2020-11-04 20:32:49 +11:00
David Bomba	870a41a93e	Fix for removing company logo from storage	2020-11-04 10:56:29 +11:00
David Bomba	bbf240be2d	New fields for company gateway	2020-11-04 07:19:59 +11:00
David Bomba	6eb9f0f6a6	Event testing	2020-11-03 21:04:15 +11:00
David Bomba	e7a1e4c4db	Working on activities	2020-11-03 16:44:50 +11:00
David Bomba	9bbffea260	Fixes for setup	2020-11-02 11:23:02 +11:00
David Bomba	ae44b9c032	Version bump + linking tasks expenses with invoices	2020-11-01 18:53:43 +11:00
David Bomba	685b7e25c2	Fixes for queries	2020-11-01 16:18:40 +11:00
=	6479b2fd3e	Fix for laravel 8 route file regression + psalm cleanup	2020-11-01 16:09:09 +11:00
=	dfb55dbd8b	remove is_migrating	2020-11-01 14:19:03 +11:00
David Bomba	6a54bb8c45	Fixes for migrations Vendor Contacts	2020-10-31 16:35:05 +11:00
David Bomba	a283f1dcf7	Working on migration for expenses and tasks	2020-10-30 20:17:29 +11:00
David Bomba	8cf55010c6	Fixes for tasks	2020-10-29 20:56:37 +11:00
David Bomba	c1c8b6c14e	Change start_time datatype	2020-10-29 20:40:13 +11:00
David Bomba	bc688985e1	Set next_send_date to null when balance == 0	2020-10-29 14:34:29 +11:00
David Bomba	73802c3647	Task duration / start time helpers	2020-10-29 13:24:12 +11:00
David Bomba	dbcfce8bb9	Fixes for missing fields in transformers / fillable for vendors and expenses	2020-10-29 11:17:10 +11:00
David Bomba	85eb1a990a	Fixes for non sticking fields in project	2020-10-29 11:09:51 +11:00
David Bomba	d123840bfa	Fix for fillable fields	2020-10-29 10:11:52 +11:00
David Bomba	9aeb2d7a5b	Psalm cleanup	2020-10-28 21:10:49 +11:00
David Bomba	d7930e4c14	Remove redundant classes	2020-10-28 17:27:10 +11:00
David Bomba	a07f04e1df	Refactor Template Engine	2020-10-28 16:50:06 +11:00
David Bomba	d211fb3afa	Merge pull request #4218 from turbo124/v5-develop ... Email / Credit Email engine	2020-10-28 10:30:21 +11:00
David Bomba	7aed55178c	Refactor HTML generation in activities	2020-10-28 10:29:54 +11:00
David Bomba	0a02323792	Quote email engine	2020-10-28 10:02:32 +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
David Bomba	073caab09b	Merge pull request #4216 from turbo124/v5-develop ... Refactor HTMLEngine	2020-10-28 06:17:49 +11:00
Benjamin Beganović	e78aacdcfc	Password reset e-mai l& fix for button	2020-10-27 16:04:28 +01:00
David Bomba	97db2ad3b6	Merge pull request #4202 from beganovich/v2-checkout-refactor ... (v5) Checkout.com refactor	2020-10-27 23:18:42 +11:00
David Bomba	3bef11c87e	Add invoice_documents field to tasks	2020-10-27 13:27:38 +11:00
David Bomba	0df672baaa	remove white space and carriage returns from version	2020-10-27 07:46:06 +11:00
David Bomba	8f53424017	Fixes	2020-10-27 06:10:04 +11:00
David Bomba	8d508bb1f9	Refactor pdf generation	2020-10-26 15:06:58 +11:00
David Bomba	1b2922b57c	credit payment type	2020-10-26 11:58:08 +11:00
David Bomba	b00e0b5a04	Fixes for first_load includes	2020-10-26 07:56:02 +11:00
David Bomba	50eaf0cc78	Fix for date localization	2020-10-24 14:38:53 +11:00