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

Fixes for multi payments

Browse Source
This commit is contained in:
David Bomba 2021-01-07 18:21:49 +11:00
parent f84d6d436f
commit 5d302ad450
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/Http/Controllers/ClientPortal/PaymentController.php
View File

@ -167,7 +167,13 @@ class PaymentController extends Controller
/*Iterate through invoices and add gateway fees and other payment metadata*/ /*Iterate through invoices and add gateway fees and other payment metadata*/
$payable_invoices = $payable_invoices->map(function ($payable_invoice) use ($invoices, $settings) { //$payable_invoices = $payable_invoices->map(function ($payable_invoice) use ($invoices, $settings) {
$payable_invoice_collection = collect();
foreach($payable_invoices as $payable_invoice)
{
nlog($payable_invoice);
$payable_invoice['amount'] = Number::parseFloat($payable_invoice['amount']); $payable_invoice['amount'] = Number::parseFloat($payable_invoice['amount']);
$invoice = $invoices->first(function ($inv) use ($payable_invoice) { $invoice = $invoices->first(function ($inv) use ($payable_invoice) {
@ -190,8 +196,9 @@ class PaymentController extends Controller
$payable_invoice['additional_info'] = $additional_info; $payable_invoice['additional_info'] = $additional_info;
return $payable_invoice; $payable_invoice_collection->push($payable_invoice);
}); }
//});
if (request()->has('signature') && !is_null(request()->signature) && !empty(request()->signature)) { if (request()->has('signature') && !is_null(request()->signature) && !empty(request()->signature)) {
$invoices->each(function ($invoice) use ($request) { $invoices->each(function ($invoice) use ($request) {
@ -199,15 +206,14 @@ class PaymentController extends Controller
}); });
} }
$payable_invoices = $payable_invoice_collection;
$payment_method_id = $request->input('payment_method_id'); $payment_method_id = $request->input('payment_method_id');
$invoice_totals = $payable_invoices->sum('amount'); $invoice_totals = $payable_invoices->sum('amount');
$first_invoice = $invoices->first(); $first_invoice = $invoices->first();
$credit_totals = $first_invoice->client->getSetting('use_credits_payment') == 'off' ? 0 : $first_invoice->client->service()->getCreditBalance(); $credit_totals = $first_invoice->client->getSetting('use_credits_payment') == 'off' ? 0 : $first_invoice->client->service()->getCreditBalance();
$starting_invoice_amount = $first_invoice->amount; $starting_invoice_amount = $first_invoice->amount;
nlog($credit_totals);
nlog($first_invoice->client->getSetting('use_credits_payment'));
if ($gateway) { if ($gateway) {
$first_invoice->service()->addGatewayFee($gateway, $payment_method_id, $invoice_totals)->save(); $first_invoice->service()->addGatewayFee($gateway, $payment_method_id, $invoice_totals)->save();
} }