tim/invoiceninja
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix adjustment when deleting failed payment

Browse source
This commit is contained in:
Hillel Coren 2016-08-28 14:55:53 +03:00
parent d09bb3b851
commit 2a195db798
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/Listeners/ActivityListener.php
View file

@ -389,8 +389,8 @@ class ActivityListener
$this->activityRepo->create(
$payment,
ACTIVITY_TYPE_DELETE_PAYMENT,
$payment->getCompletedAmount(),
$payment->getCompletedAmount() * -1
$payment->isFailedOrVoided() ? 0 : $payment->getCompletedAmount(),
$payment->isFailedOrVoided() ? 0 : $payment->getCompletedAmount() * -1
);
}
@ -419,8 +419,8 @@ class ActivityListener
$this->activityRepo->create(
$payment,
ACTIVITY_TYPE_VOIDED_PAYMENT,
$payment->amount,
$payment->amount * -1
$payment->is_deleted ? 0 : $payment->getCompletedAmount(),
$payment->is_deleted ? 0 : $payment->getCompletedAmount() * -1
);
}
@ -434,8 +434,8 @@ class ActivityListener
$this->activityRepo->create(
$payment,
ACTIVITY_TYPE_FAILED_PAYMENT,
$payment->getCompletedAmount(),
$payment->getCompletedAmount() * -1
$payment->is_deleted ? 0 : $payment->getCompletedAmount(),
$payment->is_deleted ? 0 : $payment->getCompletedAmount() * -1
);
}

5
app/Models/Payment.php
View file

@ -184,6 +184,11 @@ class Payment extends EntityModel
return $this->payment_status_id == PAYMENT_STATUS_VOIDED;
}
public function isFailedOrVoided()
{
return $this->isFailed() || $this->isVoided();
}
/**
* @param null $amount
* @return bool