Merge pull request #40 from mundipagg/develop

merge Develop into master
mundipagg · Jan 30, 2019 · 0a1f3ba · 0a1f3ba
2 parents 7752e1c + daa6852
commit 0a1f3ba
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 52 deletions.
diff --git a/Concrete/Magento2DataService.php b/Concrete/Magento2DataService.php
@@ -3,6 +3,7 @@
 namespace MundiPagg\MundiPagg\Concrete;
 
 use Magento\Framework\App\ObjectManager;
+use Magento\Sales\Model\Order\Payment\Transaction\Repository;
 use Mundipagg\Core\Kernel\Abstractions\AbstractDataService;
 use Mundipagg\Core\Kernel\Aggregates\Order;
 use Mundipagg\Core\Kernel\ValueObjects\Id\ChargeId;
@@ -14,7 +15,7 @@ public function updateAcquirerData(Order $order)
         $platformOrder = $order->getPlatformOrder()->getPlatformOrder();
 
         $objectManager = ObjectManager::getInstance();
-        $transactionRepository = $objectManager->get('Magento\Sales\Model\Order\Payment\Transaction\Repository');
+        $transactionRepository = $objectManager->get(Repository::class);
         $lastTransId = $platformOrder->getPayment()->getLastTransId();
         $paymentId = $platformOrder->getPayment()->getEntityId();
         $orderId = $platformOrder->getPayment()->getParentId();
@@ -25,18 +26,7 @@ public function updateAcquirerData(Order $order)
             $orderId
         );
 
-        $transactionCapture = $transactionRepository->getByTransactionId(
-            $lastTransId,
-            $paymentId,
-            $orderId
-        );
-
-        //to prevent overwriting auth transaction
-        if ($transactionAuth->getTxnId() === $transactionCapture->getTxnId())
-        {
-            return;
-        }
-
+        $additionalInfo = [];
         if ($transactionAuth !== false) {
             $currentCharges = $order->getCharges();
 
@@ -48,43 +38,33 @@ public function updateAcquirerData(Order $order)
 
                 $lastMundipaggTransaction = $charge->getLastTransaction();
 
-                $transactionCapture->setAdditionalInformation(
-                    $baseKey . '_acquirer_nsu',
-                    $lastMundipaggTransaction->getAcquirerNsu()
-                );
-
-                $transactionCapture->setAdditionalInformation(
-                    $baseKey . '_acquirer_tid',
-                    $lastMundipaggTransaction->getAcquirerTid()
-                );
-
-                $transactionCapture->setAdditionalInformation(
-                    $baseKey . '_acquirer_auth_code',
-                    $lastMundipaggTransaction->getAcquirerAuthCode()
-                );
-
-                $transactionCapture->setAdditionalInformation(
-                    $baseKey . '_acquirer_name',
-                    $lastMundipaggTransaction->getAcquirerName()
-                );
-
-                $transactionCapture->setAdditionalInformation(
-                    $baseKey . '_acquirer_message',
-                    $lastMundipaggTransaction->getAcquirerMessage()
-                );
-
-                $transactionCapture->setAdditionalInformation(
-                    $baseKey . '_brand',
-                    $lastMundipaggTransaction->getBrand()
-                );
-
-                $transactionCapture->setAdditionalInformation(
-                    $baseKey . '_installments',
-                    $lastMundipaggTransaction->getInstallments()
-                );
+                $additionalInfo[$baseKey . '_acquirer_nsu'] =
+                    $lastMundipaggTransaction->getAcquirerNsu();
+
+                $additionalInfo[$baseKey . '_acquirer_tid'] =
+                    $lastMundipaggTransaction->getAcquirerTid();
+
+                $additionalInfo[$baseKey . '_acquirer_auth_code'] =
+                    $lastMundipaggTransaction->getAcquirerAuthCode();
+
+                $additionalInfo[$baseKey . '_acquirer_name'] =
+                    $lastMundipaggTransaction->getAcquirerName();
+
+                $additionalInfo[$baseKey . '_acquirer_message'] =
+                    $lastMundipaggTransaction->getAcquirerMessage();
+
+                $additionalInfo[$baseKey . '_brand'] =
+                    $lastMundipaggTransaction->getBrand();
+
+                $additionalInfo[$baseKey . '_installments'] =
+                    $lastMundipaggTransaction->getInstallments();
             }
 
-            $transactionCapture->save();
+            $this->createCaptureTransaction(
+                $platformOrder,
+                $transactionAuth,
+                $additionalInfo
+            );
         }
     }
 
@@ -129,4 +109,29 @@ private function getChargeBaseKey($transactionAuth, $charge)
 
         return null;
     }
+
+    private function createCaptureTransaction($order, $transactionAuth, $additionalInformation)
+    {
+        $objectManager = ObjectManager::getInstance();
+        $transactionRepository = $objectManager->get(Repository::class);
+
+        /** @var Order\Payment $payment */
+        $payment = $order->getPayment();
+
+        $transaction = $transactionRepository->create();
+        $transaction->setParentId($transactionAuth->getTransactionId());
+        $transaction->setOrderId($order->getEntityId());
+        $transaction->setPaymentId($payment->getEntityId());
+        $transaction->setTxnId($transactionAuth->getTxnId() . '-capture');
+        $transaction->setParentTxnId($transactionAuth->getTxnId(), $transactionAuth->getTxnId() . '-capture');
+        $transaction->setTxnType('capture');
+        $transaction->setIsClosed(true);
+
+
+        foreach ( $additionalInformation as $key => $value ) {
+            $transaction->setAdditionalInformation($key, $value);
+        }
+
+        $transactionRepository->save($transaction);
+    }
 }
diff --git a/Concrete/Magento2PlatformInvoiceDecorator.php b/Concrete/Magento2PlatformInvoiceDecorator.php
@@ -38,9 +38,9 @@ public function prepareFor(PlatformOrderInterface $order)
 
     public function createFor(PlatformOrderInterface $order)
     {
-        $this->platformInvoice = $this->createInvoice($order->getPlatformOrder());
+        //$this->platformInvoice = $this->createInvoice($order->getPlatformOrder());
 
-        return;
+        //return;
 
         //@deprecated code
         $this->prepareFor($order);

diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "mundipagg/mundipagg-magento2-module",
     "license": "MIT",
-    "version": "1.4.5",
+    "version": "1.4.6",
     "type": "magento2-module",
     "description": "Magento 2 Module Mundipagg",
     "require": {

diff --git a/etc/module.xml b/etc/module.xml
@@ -9,7 +9,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="MundiPagg_MundiPagg" setup_version="1.4.5">
+    <module name="MundiPagg_MundiPagg" setup_version="1.4.6">
         <sequence>
             <module name="Magento_Sales" />
             <module name="Magento_Payment" />