Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-23 13:00:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

Minor fixes

Browse Source
This commit is contained in:
David Bomba 2023-11-02 16:23:33 +11:00
parent a6c044bf4f
commit da1fde0976
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/Http/Controllers/ClientPortal/InvoiceController.php
View File

@ -181,6 +181,16 @@ class InvoiceController extends Controller
->with('message', ctrans('texts.no_payable_invoices_selected')); ->with('message', ctrans('texts.no_payable_invoices_selected'));
} }
//ensure all stale fees are removed.
$invoices->each(function ($invoice) {
$invoice->service()
->markSent()
->removeUnpaidGatewayFees()
->save();
});
$invoices = $invoices->fresh();
//iterate and sum the payable amounts either partial or balance //iterate and sum the payable amounts either partial or balance
$total = 0; $total = 0;
foreach ($invoices as $invoice) { foreach ($invoices as $invoice) {

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

@ -442,7 +442,6 @@ class InvoiceService
$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();
$this->deleteEInvoice(); //@deprecated
/* 24-03-2022 */ /* 24-03-2022 */
$new_balance = $this->invoice->balance; $new_balance = $this->invoice->balance;