From 2a195db798c75b603a2a3326e246951da792e5f2 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sun, 28 Aug 2016 14:55:53 +0300
Subject: [PATCH] Fix adjustment when deleting failed payment

---
 app/Listeners/ActivityListener.php | 12 ++++++------
 app/Models/Payment.php             |  5 +++++
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/app/Listeners/ActivityListener.php b/app/Listeners/ActivityListener.php
index 191325960b95..91e327454db7 100644
--- a/app/Listeners/ActivityListener.php
+++ b/app/Listeners/ActivityListener.php
@@ -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
         );
     }
 
diff --git a/app/Models/Payment.php b/app/Models/Payment.php
index fbca9dce8317..aa98e24d7960 100644
--- a/app/Models/Payment.php
+++ b/app/Models/Payment.php
@@ -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