1406 Commits

Author	SHA1	Message	Date
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
David Bomba	b3cdb19b4d	Merge pull request #4362 from beganovich/v5-gateways-required-fields ... (v5) Support for pre-checking gateway requirements	2020-11-26 06:57:48 +11:00
Benjamin Beganović	ae88d5e08e	php-cs-fixer format	2020-11-25 15:19:52 +01: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ć	549fd92671	wrap into try catch	2020-11-24 11:52:01 +01:00
Benjamin Beganović	242d48cd1a	update variables for .env instead of writing completely new file	2020-11-24 11:45:27 +01:00
Benjamin Beganović	3b765d32c1	log as an option for mail driver	2020-11-24 11:12:44 +01:00
David Bomba	0991dbf8d7	Fixes for migrations	2020-11-23 14:51:49 +11:00
David Bomba	4b1aabbac7	Fixes for migration	2020-11-23 12:46:16 +11:00
David Bomba	388c0e8467	Add withTrashed() for queries in migration	2020-11-23 08:25:29 +11: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ć	d64308fdd1	production builds	2020-11-17 16:57:42 +01:00
Benjamin Beganović	501f3c9b0e	injecting signatures into entity invitations	2020-11-17 16:57:34 +01:00
Benjamin Beganović	1bf6f34c7c	Add task to PortalComposer	2020-11-17 15:01:28 +01:00
David Bomba	4b240b05ca	Add deleted_at column to paymentables	2020-11-16 08:23:20 +11:00
David Bomba	a1119f9bbe	Fix edge cases with cloning invoice	2020-11-15 19:24:57 +11:00
David Bomba	8d62b704e6	Merge pull request #4304 from turbo124/v5-develop ... Refactor login route response.	2020-11-14 17:04:46 +11:00
David Bomba	861c4ef4e7	Merge pull request #4296 from beganovich/v5-migration-fixes ... (v5) (wip) (no-merge) Refactor accepting new migrations	2020-11-14 17:03:26 +11:00
David Bomba	b1591632d8	Refactor defaults for invoice PDF	2020-11-13 22:52:11 +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	d8bb01430f	Fixes for renaming company gateway columns	2020-11-12 22:09:31 +11:00
David Bomba	42c1f8fe5f	Minor fixes	2020-11-12 07:42:20 +11:00
Benjamin Beganović	d503f1ee58	Refactor accepting new migrations: ... - Remove {company} parameter from /migration/start - Refactor logic for startMigration	2020-11-11 18:26:17 +01:00
David Bomba	ddaba5a953	Fix for refresh query	2020-11-11 19:55:53 +11:00
David Bomba	28cbd75fcb	Fixes for credit PDF	2020-11-11 11:13:39 +11:00
David Bomba	c5643bea7b	Merge pull request #4287 from turbo124/v5-develop ... Fixes for reminder templates	2020-11-10 19:32:44 +11:00
David Bomba	58ef5240cd	Custom Translations	2020-11-10 14:36:16 +11:00
David Bomba	284bb9be9f	Merge pull request #4283 from beganovich/v5-fix-quote-approval-status ... (v5) Fix quotes approval process in client portal	2020-11-10 07:29:14 +11:00
Benjamin Beganović	4dc3443d16	fix quotes not approving	2020-11-09 16:37:53 +01:00
Benjamin Beganović	8adab67251	- Pass $invoice to the getInvoiceDeliveryNote() in InvoiceService ... - GenerateDeliveryNote action for InvoiceService - New delivery-note-table element in the \Services\PdfMaker\Design.php - $item & $description variables in the HtmlEngine	2020-11-09 14:30:50 +01:00
David Bomba	9174b7e628	Fixes for emails and reminders	2020-11-09 21:17:20 +11:00
David Bomba	fcef2c72b3	Working on payment emails	2020-11-09 13:39:42 +11:00
=	cd0bbbe096	Remove redundant classes	2020-11-08 21:53:47 +11:00
David Bomba	60a141d529	Fixes for reminders	2020-11-06 15:43:10 +11:00
David Bomba	09fbc9762a	Fixes for custom emails.	2020-11-05 21:14:30 +11:00
David Bomba	d598aeeb03	Working on reminders	2020-11-04 19:43:20 +11:00
David Bomba	5fe85ca3f0	Working on company settings implmentation	2020-11-04 17:02:15 +11:00
David Bomba	c995ac5f44	Add API Documentation to repo	2020-11-04 12:27:07 +11:00
David Bomba	870a41a93e	Fix for removing company logo from storage	2020-11-04 10:56:29 +11:00
David Bomba	64b703513d	Refactor company gateway schema for required fields	2020-11-04 08:26:28 +11:00
David Bomba	552ac4ee8f	Merge pull request #4257 from turbo124/v5-develop ... Event Tests	2020-11-03 23:45:04 +11:00
David Bomba	6e6a24359c	Expense events	2020-11-03 23:39:41 +11:00
David Bomba	14fd4a5af4	Event Tests	2020-11-03 23:35:05 +11:00
David Bomba	5c13e1681b	Tests for events	2020-11-03 21:19:32 +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	9717424ce1	Payment Tests	2020-11-03 08:18:02 +11:00
Benjamin Beganović	0942169d4f	Handle Alipay payments ... - Refactored main Alipay class - Added new N/A translation - Fixed issue with alipay.js	2020-11-02 16:20:38 +01:00
David Bomba	3434d5dd70	Add events for payments	2020-11-02 15:58:43 +11:00
David Bomba	30bfd0b808	Validation rules for credits and payments	2020-11-02 12:11:49 +11:00
David Bomba	9bbffea260	Fixes for setup	2020-11-02 11:23:02 +11:00
David Bomba	a829db9890	Fixes for setup	2020-11-02 09:51:56 +11:00
David Bomba	ae361ed22f	Update composer	2020-11-02 08:49:58 +11: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ć	1ae2649be6	Stripe ACH authorization & verification	2020-11-01 18:47:48 +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ć	d15701b4b3	Checkout.com with credit card	2020-11-01 15:08:47 +01:00
David Bomba	ae44b9c032	Version bump + linking tasks expenses with invoices	2020-11-01 18:53:43 +11:00
=	6479b2fd3e	Fix for laravel 8 route file regression + psalm cleanup	2020-11-01 16:09:09 +11:00
=	39f084c030	Clean setupcontroller and .env.example variables	2020-11-01 14:25:55 +11:00
David Bomba	6a54bb8c45	Fixes for migrations Vendor Contacts	2020-10-31 16:35:05 +11:00
David Bomba	e455ec47e6	Fixes for unique task number "	2020-10-30 22:47:12 +11:00
David Bomba	de48512908	Activity record when quote is approved	2020-10-30 08:43:23 +11:00
David Bomba	ba6c45c08a	fix task status id on update	2020-10-30 08:00:35 +11:00
David Bomba	86d472fa05	Project numbers	2020-10-29 22:01:37 +11:00
David Bomba	86ee5f477b	Fixes for expense numbers	2020-10-29 21:48:56 +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	85eb1a990a	Fixes for non sticking fields in project	2020-10-29 11:09:51 +11:00
David Bomba	59291b799c	Fixes for tasks status column	2020-10-29 09:48:05 +11:00
David Bomba	9aeb2d7a5b	Psalm cleanup	2020-10-28 21:10:49 +11:00
David Bomba	adeda5526e	Add Psalm, code cleanup!	2020-10-28 17:58:15 +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	0a02323792	Quote email engine	2020-10-28 10:02:32 +11:00
David Bomba	7a67b8ded0	Merge pull request #4214 from beganovich/v5-fix-setup-javascript ... (v5) Fix setup issue with opening new PDFs	2020-10-28 09:36:41 +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ć	8270762311	Fix setup issue with opening new PDFs	2020-10-27 14:02:36 +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	f6435ab030	Working on emails	2020-10-27 22:57:12 +11:00
Benjamin Beganović	223ae4cb5b	- Extract $payment_hash property onto BaseDriver ... - Handle internally failed payments inside BaseDriver - Add SYSTEM_LOG_TYPE property on CheckoutComPaymentDriver - Remove resolving of $payment_hash inside of payment methods	2020-10-27 12:53:35 +01: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	8b3fafa19c	Fixes for first_load	2020-10-26 08:16:07 +11:00
David Bomba	b00e0b5a04	Fixes for first_load includes	2020-10-26 07:56:02 +11:00
David Bomba	73b3c11d80	Fixes for update expenses	2020-10-23 08:00:49 +11:00
Benjamin Beganović	dcb48297fb	wip refactor	2020-10-22 15:24:18 +02:00
David Bomba	c8e2d94b3f	Fixes for tests + remove swoole	2020-10-22 21:14:14 +11:00
David Bomba	b346ed714b	Fix rate limiting	2020-10-22 20:27:53 +11:00
David Bomba	004c07f1e6	Merge branch 'v5-develop' into v5-stable	2020-10-22 20:26:20 +11:00
David Bomba	4ac554607c	implement swoole	2020-10-22 20:25:36 +11:00
David Bomba	1e3617b27a	Merge pull request #4195 from Striffly/fix/invoice-preview ... Fix invoice preview with custom designs	2020-10-22 20:13:41 +11:00
David Bomba	6c1b952111	Refactor requests to use generics (#41) ... * Validation rules for expenses * Tests * Tests	2020-10-22 17:46:02 +11:00
Clément Gayot	5458bf83b0	🐛 Fix invoice preview with custom designs	2020-10-22 01:19:33 +02:00
David Bomba	d881e7cea1	Merge pull request #4193 from turbo124/v5-develop ... Credit payments and general fixes	2020-10-21 15:14:25 +11:00
David Bomba	8ddc14c4d0	Working on check data script	2020-10-21 15:12:54 +11:00
David Bomba	3d59717776	Fixes for credit payments	2020-10-21 15:03:22 +11:00
=	aa0735bb3d	Working on credit payments	2020-10-21 10:47:12 +11:00