Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-10-25 23:02:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6300 from turbo124/v5-develop

Browse Source 
Fixes for queries
This commit is contained in:
David Bomba 2021-07-20 19:58:57 +10:00 committed by GitHub
commit f9ffe7e76e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/ValidationRules/Payment/ValidRefundableRequest.php
View File

@ -46,7 +46,7 @@ class ValidRefundableRequest implements Rule
return false;
}
$payment = Payment::whereId($this->input['id'])->first();
$payment = Payment::whereId($this->input['id'])->withTrashed()->first();
if (! $payment) {
$this->error_msg = ctrans('texts.unable_to_retrieve_payment');
@ -77,7 +77,7 @@ class ValidRefundableRequest implements Rule
private function checkInvoiceIsPaymentable($invoice, $payment)
{
$invoice = Invoice::whereId($invoice['invoice_id'])->whereCompanyId($payment->company_id)->first();
$invoice = Invoice::whereId($invoice['invoice_id'])->whereCompanyId($payment->company_id)->withTrashed()->first();
if ($payment->invoices()->exists()) {
$paymentable_invoice = $payment->invoices->where('id', $invoice->id)->first();