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

Allow archived invoices to be paid.

Browse Source
This commit is contained in:
David Bomba 2021-06-20 08:14:56 +10:00
parent 0772c05e66
commit 5535ce8faf
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -89,6 +89,7 @@ class InvoiceController extends Controller
{ {
$invoices = Invoice::whereIn('id', $ids) $invoices = Invoice::whereIn('id', $ids)
->whereClientId(auth()->user()->client->id) ->whereClientId(auth()->user()->client->id)
->withTrashed()
->get(); ->get();
//filter invoices which are payable //filter invoices which are payable

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

@ -95,7 +95,7 @@ class PaymentController extends Controller
*/ */
$payable_invoices = collect($request->payable_invoices); $payable_invoices = collect($request->payable_invoices);
$invoices = Invoice::whereIn('id', $this->transformKeys($payable_invoices->pluck('invoice_id')->toArray()))->get(); $invoices = Invoice::whereIn('id', $this->transformKeys($payable_invoices->pluck('invoice_id')->toArray()))->withTrashed()->get();
$invoices->each(function($invoice){ $invoices->each(function($invoice){
$invoice->service()->removeUnpaidGatewayFees()->save(); $invoice->service()->removeUnpaidGatewayFees()->save();

2
app/PaymentDrivers/BaseDriver.php
View File

@ -188,7 +188,7 @@ class BaseDriver extends AbstractPaymentDriver
public function attachInvoices(Payment $payment, PaymentHash $payment_hash): Payment public function attachInvoices(Payment $payment, PaymentHash $payment_hash): Payment
{ {
$paid_invoices = $payment_hash->invoices(); $paid_invoices = $payment_hash->invoices();
$invoices = Invoice::whereIn('id', $this->transformKeys(array_column($paid_invoices, 'invoice_id')))->get(); $invoices = Invoice::whereIn('id', $this->transformKeys(array_column($paid_invoices, 'invoice_id')))->withTrashed()->get();
$payment->invoices()->sync($invoices); $payment->invoices()->sync($invoices);
$invoices->each(function ($invoice) use ($payment) { $invoices->each(function ($invoice) use ($payment) {

2
app/Services/Payment/UpdateInvoicePayment.php
View File

@ -37,7 +37,7 @@ class UpdateInvoicePayment
{ {
$paid_invoices = $this->payment_hash->invoices(); $paid_invoices = $this->payment_hash->invoices();
$invoices = Invoice::whereIn('id', $this->transformKeys(array_column($paid_invoices, 'invoice_id')))->get(); $invoices = Invoice::whereIn('id', $this->transformKeys(array_column($paid_invoices, 'invoice_id')))->withTrashed()->get();
collect($paid_invoices)->each(function ($paid_invoice) use ($invoices) { collect($paid_invoices)->each(function ($paid_invoice) use ($invoices) {