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

Added getCompletedAmount to payments

Browse Source
This commit is contained in:
Hillel Coren 2016-05-17 14:55:53 +03:00
parent 38866ff6f0
commit e5e65c0349
2 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/Listeners/ActivityListener.php
View File

@ -307,8 +307,8 @@ class ActivityListener
$this->activityRepo->create( $this->activityRepo->create(
$payment, $payment,
ACTIVITY_TYPE_DELETE_PAYMENT, ACTIVITY_TYPE_DELETE_PAYMENT,
$payment->amount - $payment->refunded, $payment->getCompletedAmount(),
($payment->amount - $payment->refunded) * -1 $payment->getCompletedAmount() * -1
); );
} }
@ -343,8 +343,8 @@ class ActivityListener
$this->activityRepo->create( $this->activityRepo->create(
$payment, $payment,
ACTIVITY_TYPE_FAILED_PAYMENT, ACTIVITY_TYPE_FAILED_PAYMENT,
($payment->amount - $payment->refunded), $payment->getCompletedAmount(),
($payment->amount - $payment->refunded) * -1 $payment->getCompletedAmount() * -1
); );
} }
@ -367,8 +367,8 @@ class ActivityListener
$this->activityRepo->create( $this->activityRepo->create(
$payment, $payment,
ACTIVITY_TYPE_RESTORE_PAYMENT, ACTIVITY_TYPE_RESTORE_PAYMENT,
$event->fromDeleted ? ($payment->amount - $payment->refunded) * -1 : 0, $event->fromDeleted ? $payment->getCompletedAmount() * -1 : 0,
$event->fromDeleted ? ($payment->amount - $payment->refunded) : 0 $event->fromDeleted ? $payment->getCompletedAmount() : 0
); );
} }
} }

5
app/Models/Payment.php
View File

@ -167,6 +167,11 @@ class Payment extends EntityModel
return ENTITY_PAYMENT; return ENTITY_PAYMENT;
} }
public function getCompletedAmount()
{
return $this->amount - $this->refunded;
}
public function getBankDataAttribute() public function getBankDataAttribute()
{ {
if (!$this->routing_number) { if (!$this->routing_number) {