1037 Commits

Author	SHA1	Message	Date
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
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	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	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
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
=	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	de48512908	Activity record when quote is approved	2020-10-30 08:43:23 +11:00
David Bomba	86d472fa05	Project numbers	2020-10-29 22:01:37 +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
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
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	3d59717776	Fixes for credit payments	2020-10-21 15:03:22 +11:00
Benjamin Beganović	1de6f94f10	fix custom1234	2020-10-20 13:01:07 +02:00
David Bomba	bc2b0f4aae	Fix for recurring number collisions - use dispatchNow()	2020-10-20 11:53:54 +11:00
David Bomba	686f12261d	Project number	2020-10-20 10:55:14 +11:00
David Bomba	f0e4a94bee	Task Statuses	2020-10-20 10:01:59 +11:00
David Bomba	a3afa8ede9	Remove project name unique constraint	2020-10-19 21:59:58 +11:00
David Bomba	708db5a991	Improve eager loading - first load	2020-10-18 18:46:10 +11:00
David Bomba	07cbb6a71a	Fixes for showing recurring invoices in the client portal	2020-10-16 07:35:15 +11:00
David Bomba	901f7c4117	Working on credit payments	2020-10-15 14:35:35 +11:00
David Bomba	0d17b299a0	Refactor payments for credits	2020-10-15 11:37:16 +11:00
David Bomba	1e10f0297b	Merge pull request #4162 from beganovich/v2-fix-setup-buttons ... (v5) Setup fixes & improvements	2020-10-15 08:15:31 +11:00
David Bomba	3dca6ff171	Add projects to all entities - fixes for gateway casts	2020-10-15 07:58:20 +11:00
Benjamin Beganović	1d89656bad	Setup changes: ... - Return actual SQL error when connection is failing - Update buttons on setup with correct color	2020-10-14 13:40:00 +02:00
David Bomba	60c29a95c9	Merge pull request #4161 from turbo124/v2 ... Expense Categories + Tasks API	2020-10-14 21:46:04 +11:00
David Bomba	a5555cc434	Working on credit payments"	2020-10-14 10:53:20 +11:00
Clément Gayot	c21c79b8be	✨ Add ability to use Browsershot with NODE_PATH & NPM_PATH .env variables	2020-10-13 14:42:54 +02:00
David Bomba	080c82770e	Working on credit payments	2020-10-13 23:28:30 +11:00
David Bomba	96750d5fdb	Refactor for payments via client portal	2020-10-13 21:32:15 +11:00
David Bomba	5b2a43bd9a	Fixes for expense categories	2020-10-13 16:02:12 +11:00
David Bomba	28f140ee37	Expense categories	2020-10-13 15:14:13 +11:00
David Bomba	05caec8aef	expense categories	2020-10-13 15:08:56 +11:00
David Bomba	57faf6eeb5	Use credits for payments in client portal	2020-10-13 14:25:51 +11:00
David Bomba	b7292a0432	Update email validation	2020-10-13 08:27:42 +11:00
David Bomba	71535c0e41	Add tasks to API	2020-10-13 07:42:02 +11:00
David Bomba	1eadbde544	working on refactor of company gateway fees	2020-10-12 22:02:02 +11:00
David Bomba	65a1f150d5	Fixes for tests	2020-10-12 20:38:55 +11:00
David Bomba	8b48f26c79	Fixes for calcuting gateway fees and for removing unpaid gateway fees appropriately	2020-10-11 08:31:50 +11:00
David Bomba	965b7691fd	Fixes for docs	2020-10-10 23:29:00 +11:00
David Bomba	a13b97b0cb	Fixes for api docs	2020-10-10 23:07:52 +11:00
David Bomba	61646ec55c	Merge pull request #4151 from turbo124/v2 ... Console commands for small test data batches	2020-10-10 14:32:49 +11:00
David Bomba	407304d3c6	Console commands for small test data batches	2020-10-10 14:32:10 +11:00
David Bomba	14bcc07da6	Merge pull request #4145 from beganovich/v2-change-text-on-test-pdf ... (v5) Update text on test PDF	2020-10-10 07:37:09 +11:00
Benjamin Beganović	f33e6768c0	Use invoice 'balance' when comparing with over & under payments.	2020-10-09 16:08:12 +02:00
Benjamin Beganović	f2390de9b3	Change text on test PDF	2020-10-09 15:12:50 +02:00
David Bomba	5cd1acd484	Merge pull request #4143 from turbo124/v2 ... Gateway fixes	2020-10-09 22:13:58 +11:00
Benjamin Beganović	4f26a868a7	Add findOrFail()	2020-10-09 12:44:57 +02:00
David Bomba	44d31ce326	Move cache clearance to base controller	2020-10-09 17:55:03 +11:00
David Bomba	cf7ee6338e	Working on templates	2020-10-09 12:59:59 +11:00
David Bomba	cd0dce3816	Merge pull request #4138 from turbo124/v2 ... Projects API	2020-10-08 09:31:37 +11:00
David Bomba	dd4d14d128	Implement Projects API	2020-10-08 09:25:39 +11:00
David Bomba	4bbdeef539	Merge pull request #4136 from beganovich/v2-products-table-in-invoices ... (v5) Support for custom products table columns	2020-10-08 06:59:16 +11:00
David Bomba	d4e2a0071a	Analytics	2020-10-07 14:56:35 +11:00
Benjamin Beganović	76695b8462	- Add new "product" key to $context of Design ... - Add custom products table body handling in Design.php	2020-10-06 12:49:00 +02:00
David Bomba	1264486bb9	Working on recurring migration	2020-10-06 08:46:47 +11:00
Benjamin Beganović	c0f3576d55	Fix imports	2020-10-05 10:16:36 +02:00
David Bomba	fccc98caa7	Fixes for model factories -> invoice designs	2020-10-04 20:34:08 +11:00
David Bomba	15320500c0	Merge pull request #4126 from turbo124/v2 ... Laravel 8 support	2020-10-01 21:47:07 +10:00
David Bomba	3fa336946f	Fixes for Laravel 8	2020-10-01 21:34:05 +10:00
=	09399b3aaa	Delete invoice PDF on invoice update!	2020-09-30 19:10:02 +10:00
Benjamin Beganović	a210790a57	Fix overpayments	2020-09-29 14:16:01 +02:00
Benjamin Beganović	4e9bc0552d	Rename "Downloads" to "Documents": ... - Remove Livewire auto-publish from composer.json - Replace old DocumentController with DownloadsController - Rename DownloadsTable & downloads-table to DocumentsTable & documents-table - New ShowDocumentRequest for displaying documents - Change authorize() with DownloadMultipleDocumentsRequest - Change route in PortalComposer - Update Livewire assets - Remove old documents routes	2020-09-28 12:04:34 +02:00
David Bomba	fd67a48c91	Bug fixes	2020-09-27 20:39:13 +10:00
David Bomba	7e85ee0be3	Merge branch 'v2' into v2	2020-09-24 21:37:17 +10:00
David Bomba	4cf56d5138	Working on recurring schedules	2020-09-24 21:03:59 +10:00
Benjamin Beganović	24685db429	Merge branch 'v2' into v2-editable-invoice-amount	2020-09-24 11:33:01 +02:00
Benjamin Beganović	0216286efc	Support for over & under payments	2020-09-24 11:29:47 +02:00
David Bomba	4db72d11e1	Actions for recurring invoices	2020-09-24 10:57:44 +10:00
David Bomba	0e5199e052	Working on contact auth using contact key	2020-09-23 11:45:07 +10:00
David Bomba	81ef541d2e	Expense API Endpoints	2020-09-23 10:46:35 +10:00
David Bomba	ab0ec5e2cb	Vendor API endpoints	2020-09-23 10:16:19 +10:00
David Bomba	78848fff4f	fixes	2020-09-21 16:27:02 +10:00
David Bomba	4b00d3a82a	Improve eager loading	2020-09-19 20:05:29 +10:00
=	20e4c4b1ad	Improve eager loading	2020-09-19 12:05:54 +10:00
=	88eb05786e	Fixes for updateinvoicepayment	2020-09-19 11:20:14 +10:00
Benjamin Beganović	a1e11cf161	invoices-table fix for balance due	2020-09-18 14:47:36 +02:00
Benjamin Beganović	020005d20d	Update PaymentMethodController:destroy() with generic gateway detach	2020-09-18 09:48:39 +02:00
David Bomba	8471c2689f	Fix for user_confirmation code	2020-09-16 09:56:10 +10:00
David Bomba	aeeb099d40	Fixes for mailers	2020-09-14 15:14:37 +10:00
David Bomba	9beafcd73b	Merge pull request #4052 from turbo124/v2 ... Fixes for Checkout.com	2020-09-10 14:42:26 +10:00
David Bomba	0c015cb4bc	Fixes for recurring invoices	2020-09-10 11:05:42 +10:00
Benjamin Beganović	6288529907	- Accept every design as CUSTOM in PreviewController ... - Logic for excluding elements in table footer - PdfMaker will now return plain HTML + str_replace filter - HTMLEngine updated variables and aliases - Added 'payment_due' translation - Hipster: Updated variables	2020-09-09 14:47:26 +02:00
Benjamin Beganović	3104f4ed06	Merge remote-tracking branch 'upstream/v2' into v2-design-tfoot	2020-09-08 14:37:37 +02:00
Benjamin Beganović	14dc3ea2aa	Engine for editing templates	2020-09-08 13:21:07 +02:00
David Bomba	857fa8a57f	Force admin only permissions on system logs	2020-09-08 20:49:17 +10:00
David Bomba	3083ab6237	Set unique on Group Settings Name	2020-09-08 20:44:32 +10:00
David Bomba	ca34e77530	Merge pull request #4041 from turbo124/v2 ... Improve update process	2020-09-07 20:05:39 +10:00
David Bomba	18282acbd7	Allow circumvention of client portal passwords using designated hash	2020-09-07 14:49:57 +10:00
Benjamin Beganović	0bf39c739d	Merge branch 'v2' into v2-fix-setup-issues	2020-09-07 00:15:45 +02:00
David Bomba	ba75a44eb8	Laravel 7.x Shift (#40) ... * Adopt Laravel coding style The Laravel framework adopts the PSR-2 coding style with some additions. Laravel apps *should* adopt this coding style as well. However, Shift allows you to customize the adopted coding style by adding your own [PHP CS Fixer][1] `.php_cs` config to your project. You may use [Shift's .php_cs][2] file as a base. [1]: https://github.com/FriendsOfPHP/PHP-CS-Fixer [2]: https://gist.github.com/laravel-shift/cab527923ed2a109dda047b97d53c200 * Shift bindings PHP 5.5.9+ adds the new static `class` property which provides the fully qualified class name. This is preferred over using class name strings as these references are checked by the parser. * Shift core files * Shift to Throwable * Add laravel/ui dependency * Unindent vendor mail templates * Shift config files * Default config files In an effort to make upgrading the constantly changing config files easier, Shift defaulted them so you can review the commit diff for changes. Moving forward, you should use ENV variables or create a separate config file to allow the core config files to remain automatically upgradeable. * Shift Laravel dependencies * Shift cleanup * Upgrade to Laravel 7 Co-authored-by: Laravel Shift <shift@laravelshift.com>	2020-09-06 19:38:10 +10:00
Benjamin Beganović	7a5027f1b4	Enable sandboxing with PDFs & fix setup page issues	2020-09-06 04:23:04 +02:00
Benjamin Beganović	1a66f1835f	Merge remote-tracking branch 'upstream/v2' into v2-pdfmaker-design-improvements	2020-09-04 13:20:39 +02:00
Benjamin Beganović	219666f765	Generating PDFs using new templates	2020-09-04 13:17:30 +02:00
David Bomba	2f478158e9	Fixes for company gateways	2020-09-02 11:11:01 +10:00
David Bomba	bb4aac1aeb	Merge pull request #4025 from turbo124/v2 ... Gateway fees implementation	2020-08-31 17:58:43 +10:00
David Bomba	1bd3deca4f	Invoice payments with gateway fees	2020-08-31 14:27:47 +10:00
David Bomba	eb867522df	Working on invoice payments with gateway fees	2020-08-31 12:00:43 +10:00
David Bomba	ac08a146a1	Working on gateway fees	2020-08-30 22:00:19 +10:00
David Bomba	1bc71fb5d8	Working on gateway fees	2020-08-30 08:00:57 +10:00
Benjamin Beganović	f5cc1f0d22	Preview logic for editing designs	2020-08-28 09:51:02 +02:00
Benjamin Beganović	d508d9b8f2	Merge branch 'v2' into v2-pdfmaker-design-improvements	2020-08-28 08:17:46 +02:00
David Bomba	36c54d8cc3	Working on fees	2020-08-28 11:06:46 +10:00
David Bomba	1a7d0d3cbd	Working on gateway fees across multiple invoices	2020-08-27 22:12:39 +10:00
David Bomba	ff5d8ad871	Fixes for gateway fees	2020-08-26 11:14:15 +10:00
David Bomba	d57f0f9236	Refactoring client payments	2020-08-26 10:53:11 +10:00
David Bomba	79e0fa56e2	Convert currency string to float	2020-08-26 10:47:50 +10:00
David Bomba	37c5a7adb5	Test for gateway fees appending to invoice	2020-08-26 08:10:49 +10:00
David Bomba	1c55b529a0	Refactor payments	2020-08-25 23:18:17 +10:00
David Bomba	979916adb5	Refactor payments	2020-08-25 23:06:38 +10:00
Benjamin Beganović	5a03d81112	Fix blank page when downloading invoices	2020-08-25 08:55:55 +02:00
David Bomba	4c3f466d58	Tests for system log routes	2020-08-24 20:28:47 +10:00
David Bomba	d7dd544271	System logs	2020-08-24 19:51:19 +10:00
David Bomba	66499a9a31	System Logs	2020-08-24 15:08:49 +10:00
David Bomba	ffdfaefd80	Working on system logs	2020-08-24 12:45:53 +10:00
David Bomba	0d9df1f290	Fixes for incorrect name spacing of validation rules	2020-08-24 08:20:57 +10:00
David Bomba	0f501bc936	fixes for quote controller	2020-08-23 11:08:18 +10:00
David Bomba	dbe22cf5fa	First or fail for company record in short	2020-08-23 07:46:43 +10:00
Benjamin Beganović	13e70e24d5	wip	2020-08-21 16:47:17 +02:00
Benjamin Beganović	0530204b08	Update copyright	2020-08-20 03:17:29 +02:00
Benjamin Beganović	f4698c0108	Support multiple downloads	2020-08-20 03:10:04 +02:00
David Bomba	c9d94804de	Merge pull request #4002 from turbo124/v2 ... Tests for gateway fees	2020-08-20 07:40:33 +10:00
Benjamin Beganović	9b524f22e6	Download files with original name	2020-08-19 18:06:26 +02:00
David Bomba	7b2e60a0d5	Add amount column to history table	2020-08-19 12:44:25 +10:00
David Bomba	ba3f3e6989	Merge branch 'v2' into v2	2020-08-19 07:59:19 +10:00
Benjamin Beganović	0a493c275e	Enable is_public for document uploads	2020-08-18 16:12:46 +02:00
Benjamin Beganović	4eb376e830	Enabe client uploads	2020-08-18 16:01:25 +02:00
Benjamin Beganović	acdd9c936c	Fix route model binding	2020-08-18 14:38:46 +02:00
Benjamin Beganović	d55cfc42cf	Separate page for download	2020-08-17 16:18:49 +02:00
Benjamin Beganović	814dfb0346	Merge remote-tracking branch 'upstream/v2' into v2-1408-cp-downloads	2020-08-17 14:01:56 +02:00
David Bomba	d6e169a891	Working on tests for fees and limits	2020-08-17 13:03:21 +10:00
David Bomba	713d967e8e	fixes for payment drivers	2020-08-17 08:58:52 +10:00
Benjamin Beganović	4eb5490984	Enable downloads for the client	2020-08-14 17:29:26 +02:00
David Bomba	dffb9be189	Fixes for purge company and preserve settings	2020-08-14 10:40:59 +10:00
David Bomba	3ac9cc5158	Add reminder fields to entities	2020-08-14 08:08:10 +10:00
David Bomba	fd38a964e7	Fixes for company purging	2020-08-14 07:15:15 +10:00
David Bomba	181c343594	Minor fixes for authorize.net	2020-08-13 12:30:45 +10:00
David Bomba	d11cc1784d	Fixes for tests	2020-08-13 11:55:58 +10:00
David Bomba	e347c5ad51	Document permissions	2020-08-12 13:13:39 +10:00
David Bomba	de24d00315	Error handling for emails	2020-08-12 12:16:44 +10:00
David Bomba	941e790a95	More activities	2020-08-12 12:02:21 +10:00
David Bomba	bcd69dadc8	Change invoice -> entity	2020-08-12 10:41:26 +10:00
David Bomba	ee0aa891bb	Fixes for activity backups" ... git push	2020-08-12 10:13:34 +10:00
David Bomba	928a9d46af	Download historical invoice	2020-08-12 10:01:27 +10:00
David Bomba	cb508e1daa	Add client gateways to first-load array	2020-08-12 09:04:39 +10:00
David Bomba	3514491300	Changing error structure, regression fixes for shop/client route	2020-08-12 08:59:28 +10:00
David Bomba	7feae1fd45	Add is_deleted to client_gateway_tokens table	2020-08-12 08:17:32 +10:00
David Bomba	71449392de	Fix for regression	2020-08-11 20:57:45 +10:00
David Bomba	c195f5b8a5	Add middleware to destroy document	2020-08-11 13:21:43 +10:00
=	731001baf5	Refactor refresh route resolution of company_user	2020-08-08 10:32:47 +10:00
=	1be45a4e38	Wind back changes to login route	2020-08-08 09:58:10 +10:00
=	6751654216	Refactor login route	2020-08-08 09:50:32 +10:00
David Bomba	2fdf351be3	Customize bulk templates	2020-08-05 22:18:29 +10:00
David Bomba	13cf06b0cd	Test for new shop routes"	2020-08-05 12:21:26 +10:00
David Bomba	e183238b8e	Add Shop Profile Route	2020-08-05 12:12:38 +10:00