[bug-fix] update CaptureQueueInterface, some state changes

Author: Fabian Pechstein

src/PayoneBundle/Ecommerce/PaymentManager/BsPayone.php

@@ -20,12 +20,13 @@
 use Pimcore\Bundle\EcommerceFrameworkBundle\CartManager\Cart;
 use Pimcore\Bundle\EcommerceFrameworkBundle\CartManager\ICart;
 use Pimcore\Bundle\EcommerceFrameworkBundle\Factory;
+use Pimcore\Bundle\EcommerceFrameworkBundle\Model\AbstractOrder;
 use Pimcore\Bundle\EcommerceFrameworkBundle\Model\AbstractPaymentInformation;
 use Pimcore\Bundle\EcommerceFrameworkBundle\Model\Currency;
 use Pimcore\Bundle\EcommerceFrameworkBundle\OrderManager\OrderAgentInterface;
-use Pimcore\Bundle\EcommerceFrameworkBundle\PaymentManager\IStatus;
 use Pimcore\Bundle\EcommerceFrameworkBundle\PaymentManager\Payment\AbstractPayment;
 use Pimcore\Bundle\EcommerceFrameworkBundle\PaymentManager\Status;
+use Pimcore\Bundle\EcommerceFrameworkBundle\PaymentManager\StatusInterface;
 use Pimcore\Bundle\EcommerceFrameworkBundle\PaymentManager\V7\Payment\StartPaymentRequest\AbstractRequest;
 use Pimcore\Bundle\EcommerceFrameworkBundle\PaymentManager\V7\Payment\StartPaymentResponse\SnippetResponse;
 use Pimcore\Bundle\EcommerceFrameworkBundle\PaymentManager\V7\Payment\StartPaymentResponse\StartPaymentResponseInterface;
@@ -888,7 +889,7 @@ private function setupPostParametersFor($paymentType, $cart, $orderIdent, $confi
     /**
      * @param mixed $response
      *
-     * @return IStatus
+     * @return StatusInterface
      *
      * @throws \Exception
      */
@@ -931,7 +932,7 @@ public function handleResponse($response)
                 $orderIdent,
                 $response['reference'],
                 $response['errormessage'],
-                IStatus::STATUS_CANCELLED,
+                StatusInterface::STATUS_CANCELLED,
                 [
                     'response' => json_encode($response)
                 ]
@@ -943,10 +944,10 @@ public function handleResponse($response)
             return $status;
         }
 
-        $paymentStatus = IStatus::STATUS_CANCELLED;
+        $paymentStatus = StatusInterface::STATUS_CANCELLED;
 
         //this will throw an exception if there is no such entry in the DB!
-        $logData = $this->registry->findTranslationLogsForPayoneReference($response['reference']);
+        $logData = $this->registry->findTransactionLogsForPayoneReference($response['reference']);
 
         $response['clearingtype'] = $logData[Registry::COLUMN_METHOD];
 
@@ -961,9 +962,12 @@ public function handleResponse($response)
 
             $price = new Price(Decimal::create($authorizedData['price']), new Currency($authorizedData['currency']));
 
+            $this->registry->logTransaction($response['reference'], $response['txid'],$response['txaction'], $response);
 
-            if ($response['reference'] !== null && (($response['txaction'] == 'appointed') || ($response['txaction'] == 'paid'))) {
-                $paymentStatus = IStatus::STATUS_CLEARED;
+            if ($response['reference'] !== null && (($response['txaction'] == 'appointed') )) {
+                $paymentStatus = StatusInterface::STATUS_AUTHORIZED;
+            }else if ($response['reference'] !== null && (($response['txaction'] == 'paid'))) {
+                $paymentStatus = StatusInterface::STATUS_CLEARED;
             }
 
             $status = new Status(
@@ -992,7 +996,7 @@ public function handleResponse($response)
 
 
         if ($orderIdent !== null && (($response['status'] == 'APPROVED'))) {
-            $paymentStatus = IStatus::STATUS_AUTHORIZED;
+            $paymentStatus = StatusInterface::STATUS_AUTHORIZED;
             $authorizedData = array_intersect_key($response, $authorizedData);
             $authorizedData['response'] = var_export($response, true);
 
@@ -1001,7 +1005,11 @@ public function handleResponse($response)
 
             $this->setAuthorizedData($authorizedData);
         }
-
+        else {
+            // failed
+            $paymentStatus = AbstractOrder::ORDER_STATE_ABORTED;
+            $message = $response['errorDetail'];
+        }
 
         $status = new Status(
             $orderIdent,
@@ -1012,7 +1020,6 @@ public function handleResponse($response)
                 'userId' => $response['userid'],
                 'txid' => $response['txid'],
                 'response' => print_r($response, true),
-
             ]
         );
 
@@ -1047,7 +1054,7 @@ public function setAuthorizedData(array $authorizedData)
      * @param IPrice $price
      * @param string $reference
      *
-     * @return IStatus
+     * @return StatusInterface
      */
     public function executeDebit(PriceInterface $price = null, $reference = null)
     {
@@ -1061,7 +1068,7 @@ public function executeDebit(PriceInterface $price = null, $reference = null)
      * @param string $reference
      * @param $transactionId
      *
-     * @return IStatus
+     * @return StatusInterface
      */
     public function executeCredit(PriceInterface $price, $reference, $transactionId)
     {

src/PayoneBundle/Registry/CaptureHandler.php

@@ -47,13 +47,13 @@ public function __construct( ServerToServerServiceInterface $serverService)
     }
 
     /**
-     * @param $txid
-     * @param $reference
-     * @param $amount
-     * @param $currency
+     * @param string $txid
+     * @param string $reference
+     * @param string $amount
+     * @param string $currency
      * @param array $options
      */
-    public function addCapture($txid, $reference, $amount, $currency, array $options): void
+    public function addCapture(string $txid,string  $reference,string  $amount,string  $currency, array $options): void
     {
 
         Lock::acquire(self::LOG_LOCK_KEY);
@@ -93,10 +93,13 @@ public function resolveCapture($txid)
         }
 
         Lock::acquire(self::LOG_LOCK_KEY);
+        $now = CarbonImmutable::now();
         //build request and send it! updated processed to current timestamp
         $params = $this->payone->buildCaptureRequest($txid, $result[self::COLUMN_AMOUNT], $result[self::COLUMN_CURRENCY], json_decode($result[self::COLUMN_DATA], true));
         $this->serverService->serverToServerRequest($params);
 
+        $db->updateWhere(self::LOG_TABLE_NAME, [self::COLUMN_PROCESSED=> $now ], "id = ". $result['id'] );
+
         Lock::release(self::LOG_LOCK_KEY);
     }
 }

src/PayoneBundle/Registry/CaptureQueueInterface.php

@@ -15,13 +15,13 @@ interface CaptureQueueInterface
 {
 
     /**
-     * @param $txid
-     * @param $reference
-     * @param $amount
-     * @param $currency
+     * @param string $txid
+     * @param string $reference
+     * @param string $amount
+     * @param string $currency
      * @param array $options
      */
-    public function addCapture($txid, $reference, $amount, $currency, array $options): void;
+    public function addCapture(string $txid,string  $reference,string  $amount,string  $currency, array $options): void;
 
     /**
      * @param $txid

src/PayoneBundle/Registry/IRegistry.php

@@ -59,6 +59,6 @@ public  function findTransactionLogsForInternalId($internalReference);
      * @return array|mixed|null
      * @throws \Exception
      */
-    public  function findTranslationLogsForPayoneReference($payoneReference);
+    public  function findTransactionLogsForPayoneReference($payoneReference);
 
 }

src/PayoneBundle/Registry/Registry.php

@@ -156,12 +156,12 @@ public function findTransactionLogsForInternalId($internalReference)
      * @return array|mixed|null
      * @throws \Exception
      */
-    public function findTranslationLogsForPayoneReference($payoneReference)
+    public function findTransactionLogsForPayoneReference($payoneReference)
     {
 
         $db = Db::get();
         $result = $db->fetchRow(
-            "SELECT * FROM " . self::LOG_TABLE_NAME . " WHERE `" . self::COLUMN__PAYONE_REFERENCE . "` = ?",
+            "SELECT * FROM " . self::LOG_TABLE_NAME . " WHERE `" . self::COLUMN__PAYONE_REFERENCE . "` = ? AND (`method` = 'preauthorization' OR `method` = 'authorization') ",
             [$payoneReference]
         );