ECO-961 edge case of wrong payment processing fix

spryker-eco · Nov 2, 2017 · e81e582 · e81e582
1 parent af6e31f
commit e81e582
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 8 deletions.
diff --git a/...erEco/Zed/Amazonpay/Business/Payment/Handler/Transaction/AbstractAmazonpayTransaction.php b/...erEco/Zed/Amazonpay/Business/Payment/Handler/Transaction/AbstractAmazonpayTransaction.php
@@ -179,4 +179,16 @@ protected function allowPartialProcessing()
     {
         return true;
     }
+
+    /**
+     * @param \Generated\Shared\Transfer\AmazonpayCallTransfer $payment
+     *
+     * @return bool
+     */
+    protected function isPaymentSuccess(AmazonpayCallTransfer $payment)
+    {
+        return $payment->getAmazonpayPayment()
+            && $payment->getAmazonpayPayment()->getResponseHeader()
+            && $payment->getAmazonpayPayment()->getResponseHeader()->getIsSuccess();
+    }
 }
diff --git a/...ed/Amazonpay/Business/Payment/Handler/Transaction/AuthorizeOrderIfRequiredTransaction.php b/...ed/Amazonpay/Business/Payment/Handler/Transaction/AuthorizeOrderIfRequiredTransaction.php
@@ -32,7 +32,7 @@ public function execute(AmazonpayCallTransfer $amazonpayCallTransfer)
 
         $amazonpayCallTransfer = parent::execute($amazonpayCallTransfer);
 
-        if (!$amazonpayCallTransfer->getAmazonpayPayment()->getResponseHeader()->getIsSuccess()) {
+        if (!$this->isPaymentSuccess($amazonpayCallTransfer)) {
             return $amazonpayCallTransfer;
         }
 

diff --git a/src/SprykerEco/Zed/Amazonpay/Business/Payment/Handler/Transaction/AuthorizeTransaction.php b/src/SprykerEco/Zed/Amazonpay/Business/Payment/Handler/Transaction/AuthorizeTransaction.php
@@ -27,7 +27,7 @@ public function execute(AmazonpayCallTransfer $amazonpayCallTransfer)
 
         $amazonpayCallTransfer = parent::execute($amazonpayCallTransfer);
 
-        if (!$amazonpayCallTransfer->getAmazonpayPayment()->getResponseHeader()->getIsSuccess()) {
+        if (!$this->isPaymentSuccess($amazonpayCallTransfer)) {
             return $amazonpayCallTransfer;
         }
 

diff --git a/...SprykerEco/Zed/Amazonpay/Business/Payment/Handler/Transaction/CaptureOrderTransaction.php b/...SprykerEco/Zed/Amazonpay/Business/Payment/Handler/Transaction/CaptureOrderTransaction.php
@@ -39,7 +39,7 @@ public function execute(AmazonpayCallTransfer $amazonpayCallTransfer)
 
         $amazonpayCallTransfer = parent::execute($amazonpayCallTransfer);
 
-        if (!$amazonpayCallTransfer->getAmazonpayPayment()->getResponseHeader()->getIsSuccess()) {
+        if (!$this->isPaymentSuccess($amazonpayCallTransfer)) {
             return $amazonpayCallTransfer;
         }
 

diff --git a/...ed/Amazonpay/Business/Payment/Handler/Transaction/GetOrderReferenceDetailsTransaction.php b/...ed/Amazonpay/Business/Payment/Handler/Transaction/GetOrderReferenceDetailsTransaction.php
@@ -22,7 +22,7 @@ public function execute(AmazonpayCallTransfer $amazonpayCallTransfer)
     {
         $amazonpayCallTransfer = parent::execute($amazonpayCallTransfer);
 
-        if ($amazonpayCallTransfer->getAmazonpayPayment()->getResponseHeader()->getIsSuccess()) {
+        if ($this->isPaymentSuccess($amazonpayCallTransfer)) {
             $amazonpayCallTransfer->setShippingAddress($this->apiResponse->getShippingAddress());
 
             if ($this->apiResponse->getBillingAddress()) {

diff --git a/...zonpay/Business/Payment/Handler/Transaction/UpdateOrderAuthorizationStatusTransaction.php b/...zonpay/Business/Payment/Handler/Transaction/UpdateOrderAuthorizationStatusTransaction.php
@@ -28,11 +28,11 @@ public function execute(AmazonpayCallTransfer $amazonpayCallTransfer)
 
         $amazonpayCallTransfer = parent::execute($amazonpayCallTransfer);
 
-        $amazonPayment = $amazonpayCallTransfer->getAmazonpayPayment();
-
-        if (!$amazonPayment->getResponseHeader()->getIsSuccess()) {
+        if (!$this->isPaymentSuccess($amazonpayCallTransfer)) {
             return $amazonpayCallTransfer;
         }
+
+        $amazonPayment = $amazonpayCallTransfer->getAmazonpayPayment();
         $status = $amazonPayment->getAuthorizationDetails()->getAuthorizationStatus();
 
         if ($amazonPayment->getAuthorizationDetails()->getIdList()) {

diff --git a/src/SprykerEco/Zed/Amazonpay/Communication/Plugin/Oms/Command/CaptureCommandPlugin.php b/src/SprykerEco/Zed/Amazonpay/Communication/Plugin/Oms/Command/CaptureCommandPlugin.php
@@ -8,6 +8,7 @@
 namespace SprykerEco\Zed\Amazonpay\Communication\Plugin\Oms\Command;
 
 use ArrayObject;
+use Generated\Shared\Transfer\AmazonpayCallTransfer;
 use Orm\Zed\Sales\Persistence\SpySalesOrder;
 use Spryker\Zed\Oms\Business\Util\ReadOnlyArrayObject;
 use SprykerEco\Shared\Amazonpay\AmazonpayConfig;
@@ -29,7 +30,7 @@ public function run(array $salesOrderItems, SpySalesOrder $orderEntity, ReadOnly
             );
             $result = $this->getFacade()->captureOrder($amazonpayCallTransfer);
 
-            if ($result->getAmazonpayPayment()->getResponseHeader()->getIsSuccess()) {
+            if ($this->isPaymentSuccess($result)) {
                 $wasSuccessful = true;
             }
         }
@@ -56,4 +57,16 @@ protected function getAffectingRequestedAmountItemsStateFlag()
     {
         return AmazonpayConfig::OMS_FLAG_NOT_CAPTURED;
     }
+
+    /**
+     * @param \Generated\Shared\Transfer\AmazonpayCallTransfer $payment
+     *
+     * @return bool
+     */
+    protected function isPaymentSuccess(AmazonpayCallTransfer $payment)
+    {
+        return $payment->getAmazonpayPayment() &&
+        $payment->getAmazonpayPayment()->getResponseHeader() &&
+        $payment->getAmazonpayPayment()->getResponseHeader()->getIsSuccess();
+    }
 }