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

Fixes for pivots

Browse Source
This commit is contained in:
David Bomba 2023-06-25 00:52:58 +10:00
parent 89f22dc034
commit 29558dac2c
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Repositories/Migration/PaymentMigrationRepository.php
View File

@ -122,7 +122,7 @@ class PaymentMigrationRepository extends BaseRepository
$invoices = Invoice::whereIn('id', array_column($data['invoices'], 'invoice_id'))->withTrashed()->get(); $invoices = Invoice::whereIn('id', array_column($data['invoices'], 'invoice_id'))->withTrashed()->get();
$payment->invoices()->saveMany($invoices); $payment->invoices()->saveMany($invoices); // 1:1 relationship so this is ok
$payment->invoices->each(function ($inv) use ($invoice_totals, $refund_totals, $payment) { $payment->invoices->each(function ($inv) use ($invoice_totals, $refund_totals, $payment) {
if ($payment->status_id != Payment::STATUS_CANCELLED || ! $payment->is_deleted) { if ($payment->status_id != Payment::STATUS_CANCELLED || ! $payment->is_deleted) {

10
app/Repositories/PaymentRepository.php
View File

@ -139,7 +139,7 @@ class PaymentRepository extends BaseRepository
$invoices = Invoice::withTrashed()->whereIn('id', array_column($data['invoices'], 'invoice_id'))->get(); $invoices = Invoice::withTrashed()->whereIn('id', array_column($data['invoices'], 'invoice_id'))->get();
// $payment->invoices()->saveMany($invoices); // $payment->invoices()->saveMany($invoices); //25-06-2023
//todo optimize this into a single query //todo optimize this into a single query
foreach ($data['invoices'] as $paid_invoice) { foreach ($data['invoices'] as $paid_invoice) {
@ -148,6 +148,8 @@ class PaymentRepository extends BaseRepository
if ($invoice) { if ($invoice) {
//25-06-2023
$paymentable = new Paymentable(); $paymentable = new Paymentable();
$paymentable->payment_id = $payment->id; $paymentable->payment_id = $payment->id;
$paymentable->paymentable_id = $invoice->id; $paymentable->paymentable_id = $invoice->id;
@ -162,9 +164,7 @@ class PaymentRepository extends BaseRepository
} }
} }
} else { } else {
//payment is made, but not to any invoice, therefore we are applying the payment to the clients paid_to_date only
//01-07-2020 i think we were duplicating the paid to date here.
//$payment->client->service()->updatePaidToDate($payment->amount)->save();
} }
if (array_key_exists('credits', $data) && is_array($data['credits'])) { if (array_key_exists('credits', $data) && is_array($data['credits'])) {
@ -176,7 +176,7 @@ class PaymentRepository extends BaseRepository
//todo optimize into a single query //todo optimize into a single query
foreach ($data['credits'] as $paid_credit) { foreach ($data['credits'] as $paid_credit) {
// $credit = Credit::withTrashed()->find($paid_credit['credit_id']);
$credit = $credits->firstWhere('id', $paid_credit['credit_id']); $credit = $credits->firstWhere('id', $paid_credit['credit_id']);
if ($credit) { if ($credit) {

2
app/Services/Invoice/ApplyPayment.php
View File

@ -86,7 +86,7 @@ class ApplyPayment extends AbstractService
if ($inv->id == $this->invoice->id) { if ($inv->id == $this->invoice->id) {
// $inv->pivot->amount = ($amount_paid * -1); // $inv->pivot->amount = ($amount_paid * -1);
// $inv->pivot->save(); // $inv->pivot->save();
//25-06-2023
$inv->paid_to_date += floatval($amount_paid * -1); $inv->paid_to_date += floatval($amount_paid * -1);
$inv->save(); $inv->save();
} }