From 7de0cd99f1a015711499f4e9b684dbf0c91b4850 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Tue, 7 Nov 2023 17:39:56 +1100 Subject: [PATCH] Fixes for tests --- app/Http/Requests/Payment/StorePaymentRequest.php | 2 +- app/Jobs/Ledger/UpdateLedger.php | 4 ++++ tests/Feature/MultiPaymentDeleteTest.php | 1 + tests/Feature/PaymentTest.php | 2 +- 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app/Http/Requests/Payment/StorePaymentRequest.php b/app/Http/Requests/Payment/StorePaymentRequest.php index c57a3e0c37ab..4c2788908b9a 100644 --- a/app/Http/Requests/Payment/StorePaymentRequest.php +++ b/app/Http/Requests/Payment/StorePaymentRequest.php @@ -97,7 +97,7 @@ class StorePaymentRequest extends Request } if (! isset($input['idempotency_key'])) { - $input['idempotency_key'] = substr(sha1(json_encode($input)).time()."{$input['date']}{$input['amount']}{$input['client_id']}{$user->id}",0,64); + $input['idempotency_key'] = substr(sha1(json_encode($input)).time()."{$input['date']}{$input['amount']}{$user->id}",0,64); } $this->replace($input); diff --git a/app/Jobs/Ledger/UpdateLedger.php b/app/Jobs/Ledger/UpdateLedger.php index aa870bde4b68..68eefe13afa1 100644 --- a/app/Jobs/Ledger/UpdateLedger.php +++ b/app/Jobs/Ledger/UpdateLedger.php @@ -45,6 +45,10 @@ class UpdateLedger implements ShouldQueue MultiDB::setDb($this->db); $cl = CompanyLedger::find($this->company_ledger_id); + + if(!$cl) + return; + $entity = $cl->company_ledgerable; $balance = $entity->calc()->getBalance(); $cl->adjustment = $balance - $this->start_amount; diff --git a/tests/Feature/MultiPaymentDeleteTest.php b/tests/Feature/MultiPaymentDeleteTest.php index 62df515c697e..8a13b2ec5f25 100644 --- a/tests/Feature/MultiPaymentDeleteTest.php +++ b/tests/Feature/MultiPaymentDeleteTest.php @@ -223,6 +223,7 @@ class MultiPaymentDeleteTest extends TestCase $data = [ 'amount' => 162.0, + 'transaction_reference' => 'something', 'client_id' => $this->encodePrimaryKey($client->id), 'invoices' => [ [ diff --git a/tests/Feature/PaymentTest.php b/tests/Feature/PaymentTest.php index fa05a5624fee..c51af9b87ad5 100644 --- a/tests/Feature/PaymentTest.php +++ b/tests/Feature/PaymentTest.php @@ -83,7 +83,7 @@ class PaymentTest extends TestCase ], ], 'date' => '2020/12/11', - 'idempotency_key' => 'dsjafhajklsfhlaksjdhlkajsdjdfjdfljasdfhkjlsafhljfkfhsjlfhiuwayerfiuwaskjgbzmvnjzxnjcbgfkjhdgfoiwwrasdfasdfkashjdfkaskfjdasfda' + 'idempotency_key' => sha1(time()).\Illuminate\Support\Str::uuid()->toString() ];