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

Fix for deleting/restoring failed payment

Browse Source
This commit is contained in:
Hillel Coren 2017-10-22 10:12:32 +03:00
parent 0c2a53345d
commit 002665b2db
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Listeners/ActivityListener.php
View File

@ -483,8 +483,8 @@ class ActivityListener
$this->activityRepo->create( $this->activityRepo->create(
$payment, $payment,
ACTIVITY_TYPE_RESTORE_PAYMENT, ACTIVITY_TYPE_RESTORE_PAYMENT,
$event->fromDeleted ? $payment->getCompletedAmount() * -1 : 0, $event->fromDeleted && ! $payment->isFailedOrVoided() ? $payment->getCompletedAmount() * -1 : 0,
$event->fromDeleted ? $payment->getCompletedAmount() : 0 $event->fromDeleted && ! $payment->isFailedOrVoided() ? $payment->getCompletedAmount() : 0
); );
} }

10
app/Listeners/InvoiceListener.php
View File

@ -87,6 +87,11 @@ class InvoiceListener
public function deletedPayment(PaymentWasDeleted $event) public function deletedPayment(PaymentWasDeleted $event)
{ {
$payment = $event->payment; $payment = $event->payment;
if ($payment->isFailedOrVoided()) {
return;
}
$invoice = $payment->invoice; $invoice = $payment->invoice;
$adjustment = $payment->getCompletedAmount(); $adjustment = $payment->getCompletedAmount();
@ -143,6 +148,11 @@ class InvoiceListener
} }
$payment = $event->payment; $payment = $event->payment;
if ($payment->isFailedOrVoided()) {
return;
}
$invoice = $payment->invoice; $invoice = $payment->invoice;
$adjustment = $payment->getCompletedAmount() * -1; $adjustment = $payment->getCompletedAmount() * -1;