diff --git a/app/Services/Invoice/ApplyPayment.php b/app/Services/Invoice/ApplyPayment.php index de4e5791b594..580e6f1cc9ef 100644 --- a/app/Services/Invoice/ApplyPayment.php +++ b/app/Services/Invoice/ApplyPayment.php @@ -35,40 +35,41 @@ class ApplyPayment extends AbstractService $amount_paid = $this->payment_amount * -1; - $this->invoice->service()->clearPartial()->setDueDate()->setStatus(Invoice::STATUS_PARTIAL)->updateBalance($amount_paid)->save(); + $this->invoice->service()->clearPartial()->setDueDate()->setStatus(Invoice::STATUS_PARTIAL)->updateBalance($amount_paid)->updatePaidToDate($amount_paid*-1)->save(); } elseif ($this->invoice->partial > 0 && $this->invoice->partial > $this->payment_amount) { //partial amount exists, but the amount is less than the partial amount $amount_paid = $this->payment_amount * -1; - $this->invoice->service()->updatePartial($amount_paid)->updateBalance($amount_paid)->save(); + $this->invoice->service()->updatePartial($amount_paid)->updateBalance($amount_paid)->updatePaidToDate($amount_paid*-1)->save(); } elseif ($this->invoice->partial > 0 && $this->invoice->partial < $this->payment_amount) { //partial exists and the amount paid is GREATER than the partial amount $amount_paid = $this->payment_amount * -1; - $this->invoice->service()->clearPartial()->setDueDate()->setStatus(Invoice::STATUS_PARTIAL)->updateBalance($amount_paid)->save(); + $this->invoice->service()->clearPartial()->setDueDate()->setStatus(Invoice::STATUS_PARTIAL)->updateBalance($amount_paid)->updatePaidToDate($amount_paid*-1)->save(); } } else { if ($this->payment_amount == $this->invoice->balance) { $amount_paid = $this->payment_amount * -1; - $this->invoice->service()->clearPartial()->setStatus(Invoice::STATUS_PAID)->updateBalance($amount_paid)->save(); + $this->invoice->service()->clearPartial()->setStatus(Invoice::STATUS_PAID)->updateBalance($amount_paid)->updatePaidToDate($amount_paid*-1)->save(); } elseif ($this->payment_amount < $this->invoice->balance) { //partial invoice payment made $amount_paid = $this->payment_amount * -1; - $this->invoice->service()->clearPartial()->setStatus(Invoice::STATUS_PARTIAL)->updateBalance($amount_paid)->save(); + $this->invoice->service()->clearPartial()->setStatus(Invoice::STATUS_PARTIAL)->updateBalance($amount_paid)->updatePaidToDate($amount_paid*-1)->save(); } elseif ($this->payment_amount > $this->invoice->balance) { //partial invoice payment made $amount_paid = $this->invoice->balance * -1; - $this->invoice->service()->clearPartial()->setStatus(Invoice::STATUS_PAID)->updateBalance($amount_paid)->save(); + $this->invoice->service()->clearPartial()->setStatus(Invoice::STATUS_PAID)->updateBalance($amount_paid)->updatePaidToDate($amount_paid*-1)->save(); } } + nlog($this->invoice->id. " " . $this->invoice->paid_to_date); $this->payment ->ledger() ->updatePaymentBalance($amount_paid); @@ -81,22 +82,23 @@ class ApplyPayment extends AbstractService ->updateBalance($amount_paid) ->save(); - /* Update Pivot Record amount */ - $this->payment->invoices->each(function ($inv) use ($amount_paid) { - if ($inv->id == $this->invoice->id) { - // $inv->pivot->amount = ($amount_paid * -1); - // $inv->pivot->save(); - //25-06-2023 - $inv->paid_to_date += floatval($amount_paid * -1); - $inv->save(); - } - }); + // /* Update Pivot Record amount */ + // $this->payment->invoices->each(function ($inv) use ($amount_paid) { + // if ($inv->id == $this->invoice->id) { + // // $inv->pivot->amount = ($amount_paid * -1); + // // $inv->pivot->save(); + // //25-06-2023 + // nlog($inv); + // nlog($amount_paid); + // $inv->paid_to_date += floatval($amount_paid * -1); + // $inv->save(); + // } + // }); $this->invoice ->service() ->applyNumber() ->workFlow() - // ->deletePdf() ->save(); return $this->invoice;