Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-08 22:04:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

Small fixes for removing gateway fees

Browse Source
This commit is contained in:
David Bomba 2024-09-29 18:23:50 +10:00
parent 0a4d00158c
commit 49edd830c7
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/Services/Invoice/InvoiceService.php
View File

@ -446,20 +446,12 @@ class InvoiceService
$pre_count = count((array)$this->invoice->line_items); $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) $items = collect((array)$this->invoice->line_items)
->filter(function ($item) { ->filter(function ($item) {
return $item->type_id != '3'; return $item->type_id != '3';
})->toArray(); })->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(); $this->invoice = $this->invoice->calc()->getInvoice();

4
tests/Unit/LateFeeTest.php
View File

@ -150,7 +150,7 @@ class LateFeeTest extends TestCase
$ids = $invoices->pluck('id'); $ids = $invoices->pluck('id');
$invoices = $i->map(function ($invoice) { $i->each(function ($invoice) {
$line_items = $invoice->line_items; $line_items = $invoice->line_items;
@ -172,7 +172,7 @@ class LateFeeTest extends TestCase
$invoice->line_items = $line_items; $invoice->line_items = $line_items;
$invoice->saveQuietly(); $invoice->saveQuietly();
return $invoice; // return $invoice;
}); });
$invoices = Invoice::whereIn('id', $ids)->cursor()->map(function ($invoice) { $invoices = Invoice::whereIn('id', $ids)->cursor()->map(function ($invoice) {