From 715998e67a196e0c1fee1d1c6b1aa1c621af485e Mon Sep 17 00:00:00 2001 From: David Bomba Date: Mon, 23 Nov 2020 23:55:17 +1100 Subject: [PATCH] Reorder migrations --- app/Http/Controllers/Migration/StepsController.php | 2 +- app/Traits/GenerateMigrationResources.php | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/app/Http/Controllers/Migration/StepsController.php b/app/Http/Controllers/Migration/StepsController.php index 890b6f0e0c28..9e15ad0d9adc 100644 --- a/app/Http/Controllers/Migration/StepsController.php +++ b/app/Http/Controllers/Migration/StepsController.php @@ -233,10 +233,10 @@ class StepsController extends BaseController 'vendors' => $this->getVendors(), 'projects' => $this->getProjects(), 'products' => $this->getProducts(), + 'credits' => $this->getCreditsNotes(), 'invoices' => $this->getInvoices(), 'recurring_invoices' => $this->getRecurringInvoices(), 'quotes' => $this->getQuotes(), - 'credits' => $this->getCreditsNotes(), 'payments' => array_merge($this->getPayments(), $this->getCredits()), 'documents' => $this->getDocuments(), 'company_gateways' => $this->getCompanyGateways(), diff --git a/app/Traits/GenerateMigrationResources.php b/app/Traits/GenerateMigrationResources.php index 63cd88fd6742..a1c99bce05af 100644 --- a/app/Traits/GenerateMigrationResources.php +++ b/app/Traits/GenerateMigrationResources.php @@ -1189,7 +1189,6 @@ trait GenerateMigrationResources foreach ($tasks as $task) { - if(!($task->deleted_at instanceof Carbon)) $task->deleted_at = Carbon::parse($task->deleted_at);