From 0991dbf8d7d48b0ce9acbfdcaf5520fa7e27e9e0 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Mon, 23 Nov 2020 14:51:49 +1100 Subject: [PATCH] Fixes for migrations --- app/Http/Controllers/MigrationController.php | 2 +- app/Jobs/Util/Import.php | 4 ++-- app/Jobs/Util/StartMigration.php | 4 ++-- app/Repositories/Migration/PaymentMigrationRepository.php | 4 +++- app/Repositories/PaymentRepository.php | 4 ++-- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/app/Http/Controllers/MigrationController.php b/app/Http/Controllers/MigrationController.php index e6c82fcd1a..de7e14fa95 100644 --- a/app/Http/Controllers/MigrationController.php +++ b/app/Http/Controllers/MigrationController.php @@ -249,7 +249,7 @@ class MigrationController extends BaseController if ($checks['existing_company'] == true && $checks['force'] == false) { info('Migrating: Existing company without force. (CASE_01)'); - MailRouter::dispatch(new ExistingMigration(), $company, $user); + MailRouter::dispatch(new ExistingMigration(), $existing_company, $user); return response()->json([ '_id' => Str::uuid(), diff --git a/app/Jobs/Util/Import.php b/app/Jobs/Util/Import.php index 2d4afab85f..e265634314 100644 --- a/app/Jobs/Util/Import.php +++ b/app/Jobs/Util/Import.php @@ -150,9 +150,9 @@ class Import implements ShouldQueue public $tries = 1; - public $timeout = 86400; + public $timeout = 864000; - public $backoff = 86430; + // public $backoff = 86430; // public $maxExceptions = 2; /** diff --git a/app/Jobs/Util/StartMigration.php b/app/Jobs/Util/StartMigration.php index f8ed9db36a..b3cb4e6540 100644 --- a/app/Jobs/Util/StartMigration.php +++ b/app/Jobs/Util/StartMigration.php @@ -53,11 +53,11 @@ class StartMigration implements ShouldQueue */ public $tries = 1; - public $timeout = 86400; + public $timeout = 864000; // public $maxExceptions = 2; - //public $backoff = 86430; + public $backoff = 86430; public function __construct($filepath, User $user, Company $company) { diff --git a/app/Repositories/Migration/PaymentMigrationRepository.php b/app/Repositories/Migration/PaymentMigrationRepository.php index 1fbd8d86b6..6e2a435e5f 100644 --- a/app/Repositories/Migration/PaymentMigrationRepository.php +++ b/app/Repositories/Migration/PaymentMigrationRepository.php @@ -102,13 +102,15 @@ class PaymentMigrationRepository extends BaseRepository /*Iterate through invoices and apply payments*/ if (array_key_exists('invoices', $data) && is_array($data['invoices']) && count($data['invoices']) > 0) { $invoice_totals = array_sum(array_column($data['invoices'], 'amount')); + $refund_totals = array_sum(array_column($data['invoices'], 'refunded')); $invoices = Invoice::whereIn('id', array_column($data['invoices'], 'invoice_id'))->get(); $payment->invoices()->saveMany($invoices); - $payment->invoices->each(function ($inv) use ($invoice_totals) { + $payment->invoices->each(function ($inv) use ($invoice_totals, $refund_totals) { $inv->pivot->amount = $invoice_totals; + $inv->pivot->refunded = $refund_totals; $inv->pivot->save(); }); } diff --git a/app/Repositories/PaymentRepository.php b/app/Repositories/PaymentRepository.php index 3578c22363..38f816c4e3 100644 --- a/app/Repositories/PaymentRepository.php +++ b/app/Repositories/PaymentRepository.php @@ -72,7 +72,7 @@ class PaymentRepository extends BaseRepository $this->processExchangeRates($data, $payment); $is_existing_payment = false; - $client = Client::find($data['client_id']); + $client = Client::find($data['client_id'])->withTrashed(); /*We only update the paid to date ONCE per payment*/ if (array_key_exists('invoices', $data) && is_array($data['invoices']) && count($data['invoices']) > 0) { @@ -146,7 +146,7 @@ class PaymentRepository extends BaseRepository //todo optimize into a single query foreach ($data['credits'] as $paid_credit) { - $credit = Credit::find($this->decodePrimaryKey($paid_credit['credit_id'])); + $credit = Credit::find($this->decodePrimaryKey($paid_credit['credit_id']))->withTrashed(); if ($credit) { ApplyCreditPayment::dispatchNow($credit, $payment, $paid_credit['amount'], $credit->company);