[bug-fix] resolve Captures differently

Author: Fabian Pechstein

src/PayoneBundle/Ecommerce/PaymentManager/BsPayone.php

@@ -208,7 +208,7 @@ class BsPayone extends AbstractPayment implements \Pimcore\Bundle\EcommerceFrame
      * @param ServerToServerServiceInterface $serverService
      * @throws \Exception
      */
-    public function __construct(array $options, EngineInterface $templatingEngine, LoggerInterface $logger, IRegistry $registry, ServerToServerServiceInterface $serverService)
+    public function __construct(array $options, EngineInterface $templatingEngine, LoggerInterface $logger, IRegistry $registry, ServerToServerServiceInterface $serverService, CaptureQueueInterface $captureQueue)
     {
 
         $this->processOptions(
@@ -220,6 +220,7 @@ public function __construct(array $options, EngineInterface $templatingEngine, L
         $this->logger = $logger;
         $this->registry = $registry;
         $this->serverService = $serverService;
+        $this->captureQueue = $captureQueue;
     }
 
     /**
@@ -963,7 +964,7 @@ public function handleResponse($response)
             } else if ($response['reference'] !== null && (($response['txaction'] == 'paid'))) {
                 $paymentStatus = StatusInterface::STATUS_CLEARED;
                 // resolve capture
-                //$this->captureQueue->resolveCapture($response['txid']);
+                $this->captureQueue->resolveCapture($response['txid'], $this);
             } else if ($response['reference'] !== null && (($response['txaction'] == 'capture'))) {
                 $paymentStatus = StatusInterface::STATUS_CLEARED;
             } else if ($response['reference'] !== null && (($response['txaction'] == 'cancelation'))) {

src/PayoneBundle/Registry/CaptureHandler.php

@@ -76,12 +76,14 @@ public function addCapture(string $txid,string  $reference,string  $amount,strin
 
     /**
      * @param $txid
+     * @param BsPayone $payone
+     * @return mixed
+     *
      * @throws \GuzzleHttp\Exception\GuzzleException
      */
-    public function resolveCapture($txid)
+    public function resolveCapture($txid, BsPayone $payone)
     {
 
-        $this->payone = Factory::getInstance()->getPaymentManager()->getProvider('bspayone');
         $db = Db::get();
         $result = $db->fetchRow(
             "SELECT * FROM " . self::LOG_TABLE_NAME . " WHERE `" . self::COLUMN_TXID . "` = ?",
@@ -93,7 +95,7 @@ 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));
+            $params = $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'] );

src/PayoneBundle/Registry/CaptureQueueInterface.php

@@ -11,6 +11,9 @@
 namespace PayoneBundle\Registry;
 
 
+use PayoneBundle\Ecommerce\PaymentManager\BsPayone;
+use Pimcore\Bundle\EcommerceFrameworkBundle\PaymentManager\PaymentManagerInterface;
+
 interface CaptureQueueInterface
 {
 
@@ -25,8 +28,9 @@ public function addCapture(string $txid,string  $reference,string  $amount,strin
 
     /**
      * @param $txid
+     * @param BsPayone $payone
      * @return mixed
      */
-    public function resolveCapture($txid);
+    public function resolveCapture($txid, BsPayone $payone);
 
 }

src/PayoneBundle/Resources/config/services.yml

@@ -25,7 +25,7 @@ services:
       $options: []
       $templatingEngine: '@templating.engine.delegating'
       $serverService: '@PayoneBundle\Service\ServerToServerServiceInterface'
-#      $captureQueue: '@PayoneBundle\Registry\CaptureQueueInterface'
+      $captureQueue: '@PayoneBundle\Registry\CaptureQueueInterface'
 
 
   # The migration installer needs the bundle it is operating on upon construction to be able to build its migration configuration.