From 49edd830c720230b5f4a5b5a5e79b5e96bc2f13a Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sun, 29 Sep 2024 18:23:50 +1000 Subject: [PATCH] Small fixes for removing gateway fees --- app/Services/Invoice/InvoiceService.php | 10 +--------- tests/Unit/LateFeeTest.php | 4 ++-- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/app/Services/Invoice/InvoiceService.php b/app/Services/Invoice/InvoiceService.php index 43bc48591972..a012dba324e7 100644 --- a/app/Services/Invoice/InvoiceService.php +++ b/app/Services/Invoice/InvoiceService.php @@ -446,20 +446,12 @@ class InvoiceService $pre_count = count((array)$this->invoice->line_items); - // $items = collect((array)$this->invoice->line_items) - // ->reject(function ($item) { - // return $item->type_id == '3'; - // })->toArray(); - - $items = collect((array)$this->invoice->line_items) ->filter(function ($item) { return $item->type_id != '3'; })->toArray(); - $this->invoice->line_items = $items; - - // $this->invoice->line_items = array_values($items); + $this->invoice->line_items = array_values($items); $this->invoice = $this->invoice->calc()->getInvoice(); diff --git a/tests/Unit/LateFeeTest.php b/tests/Unit/LateFeeTest.php index d116e1586f48..5e4116093cd4 100644 --- a/tests/Unit/LateFeeTest.php +++ b/tests/Unit/LateFeeTest.php @@ -150,7 +150,7 @@ class LateFeeTest extends TestCase $ids = $invoices->pluck('id'); - $invoices = $i->map(function ($invoice) { + $i->each(function ($invoice) { $line_items = $invoice->line_items; @@ -172,7 +172,7 @@ class LateFeeTest extends TestCase $invoice->line_items = $line_items; $invoice->saveQuietly(); - return $invoice; + // return $invoice; }); $invoices = Invoice::whereIn('id', $ids)->cursor()->map(function ($invoice) {