Merge pull request #35 from SwedbankPay/feature/remove-phone-number

Feature/remove phone number
SwedbankPay · Mar 3, 2021 · 1cf3523 · 1cf3523
2 parents 247a4aa + 053966c
commit 1cf3523
Show file tree

Hide file tree

Showing 19 changed files with 149 additions and 30 deletions.
diff --git a/Api/Data/OrderInterface.php b/Api/Data/OrderInterface.php
@@ -8,6 +8,7 @@ interface OrderInterface extends ExtensibleDataInterface
 {
     const ID = 'id';
     const PAYMENT_ORDER_ID = 'payment_order_id';
+    const PAYMENT_ORDER_ID_PATH = 'payment_order_id_path';
     const DESCRIPTION = 'description';
     const OPERATION = 'operation';
     const INTENT = 'intent';
@@ -45,6 +46,17 @@ public function getPaymentOrderId();
      */
     public function setPaymentOrderId($paymentOrderId);
 
+    /**
+     * @return string|null
+     */
+    public function getPaymentOrderIdPath();
+
+    /**
+     * @param string $paymentIdPath
+     * @return void
+     */
+    public function setPaymentOrderIdPath($paymentIdPath);
+
     /**
      * @return string
      */

diff --git a/Api/Data/QuoteInterface.php b/Api/Data/QuoteInterface.php
@@ -8,6 +8,7 @@ interface QuoteInterface extends ExtensibleDataInterface
 {
     const ID = 'id';
     const PAYMENT_ORDER_ID = 'payment_order_id';
+    const PAYMENT_ORDER_ID_PATH = 'payment_order_id_path';
     const DESCRIPTION = 'description';
     const OPERATION = 'operation';
     const STATE = 'state';
@@ -45,6 +46,17 @@ public function getPaymentOrderId();
      */
     public function setPaymentOrderId($paymentOrderId);
 
+    /**
+     * @return string|null
+     */
+    public function getPaymentOrderIdPath();
+
+    /**
+     * @param string $paymentIdPath
+     * @return void
+     */
+    public function setPaymentOrderIdPath($paymentIdPath);
+
     /**
      * @return string
      */

diff --git a/Gateway/Command/Cancel.php b/Gateway/Command/Cancel.php
@@ -104,10 +104,12 @@ public function execute(array $commandSubject)
         $transactionObject = new TransactionObject();
         $transactionObject->setTransaction($transaction);
 
-        $cancelRequest = $this->getRequestService('Paymentorder/Transaction', 'TransactionCancel', $transactionObject);
-        $cancelRequest->setRequestEndpointVars(
-            $this->getSwedbankPayPaymentResourceId($paymentOrder->getPaymentOrderId())
+        $cancelRequest = $this->getRequestService(
+            'Paymentorder/Transaction',
+            'TransactionCancel',
+            $transactionObject
         );
+        $cancelRequest->setPaymentOrderId($paymentOrder->getPaymentOrderIdPath());
 
         /** @var ResponseInterface $cancelResponse */
         $cancelResponse = $cancelRequest->send();

diff --git a/Gateway/Command/Capture.php b/Gateway/Command/Capture.php
@@ -175,9 +175,7 @@ public function execute(array $commandSubject)
             'TransactionCapture',
             $transactionObject
         );
-        $captureRequest->setRequestEndpointVars(
-            $this->getSwedbankPayPaymentResourceId($paymentOrder->getPaymentOrderId())
-        );
+        $captureRequest->setPaymentOrderId($paymentOrder->getPaymentOrderIdPath());
 
         /** @var ResponseInterface $captureResponse */
         $captureResponse = $captureRequest->send();

diff --git a/Gateway/Command/Refund.php b/Gateway/Command/Refund.php
@@ -116,9 +116,7 @@ public function execute(array $commandSubject)
             'TransactionReversal',
             $transactionObject
         );
-        $reversalRequest->setRequestEndpointVars(
-            $this->getSwedbankPayPaymentResourceId($paymentOrder->getPaymentOrderId())
-        );
+        $reversalRequest->setPaymentOrderId($paymentOrder->getPaymentOrderIdPath());
 
         /** @var ResponseInterface $reversalResponse */
         $reversalResponse = $reversalRequest->send();

diff --git a/Helper/Factory/PayerFactory.php b/Helper/Factory/PayerFactory.php
@@ -34,7 +34,6 @@ public function create(Quote $quote)
 
         $payer = new PaymentorderPayer();
         $payer->setEmail($quote->getShippingAddress()->getEmail())
-            ->setMsisdn($quote->getShippingAddress()->getTelephone())
             ->setShippingAddress($shippingAddress);
 
         return $payer;

diff --git a/Helper/PaymentData.php b/Helper/PaymentData.php
@@ -93,7 +93,10 @@ public function getByPaymentOrderId($paymentOrderId)
         try {
             $paymentData = $this->paymentOrderRepo->getByPaymentOrderId($paymentOrderId);
         } catch (NoSuchEntityException $e) {
-            $this->logger->debug(sprintf('SwedbankPay Order not found with ID # %s', $paymentOrderId));
+            $this->logger->debug(sprintf(
+                'No SwedbankPay Order record has been created yet with Payment Order ID: %s',
+                $paymentOrderId
+            ));
         }
 
         if ($paymentData instanceof PaymentOrderInterface) {
@@ -103,14 +106,20 @@ public function getByPaymentOrderId($paymentOrderId)
         try {
             $paymentData = $this->paymentQuoteRepo->getByPaymentOrderId($paymentOrderId);
         } catch (NoSuchEntityException $e) {
-            $this->logger->debug(sprintf('SwedbankPay Quote not found with ID # %s', $paymentOrderId));
+            $this->logger->debug(sprintf(
+                'SwedbankPay Quote not found with Payment Order ID: %s',
+                $paymentOrderId
+            ));
         }
 
         if ($paymentData instanceof PaymentQuoteInterface) {
             return $paymentData;
         }
 
-        $errorMessage = sprintf("Unable to find a SwedbankPay payment matching Payment ID:\n%s", $paymentOrderId);
+        $errorMessage = sprintf(
+            "Unable to find a SwedbankPay payment matching Payment Order ID:\n%s",
+            $paymentOrderId
+        );
 
         $this->logger->error(
             $errorMessage
@@ -151,18 +160,20 @@ public function update($payment)
      */
     public function updateRemainingAmounts($command, $amount, $order)
     {
+        $amountInSubUnit = (int) round($amount * 100);
+
         switch ($command) {
             case 'capture':
-                $order->setRemainingCapturingAmount($order->getRemainingCapturingAmount() - ($amount * 100));
+                $order->setRemainingCapturingAmount($order->getRemainingCapturingAmount() - $amountInSubUnit);
                 $order->setRemainingCancellationAmount($order->getRemainingCapturingAmount());
-                $order->setRemainingReversalAmount($order->getRemainingReversalAmount() + ($amount * 100));
+                $order->setRemainingReversalAmount($order->getRemainingReversalAmount() + $amountInSubUnit);
                 break;
             case 'cancel':
-                $order->setRemainingCancellationAmount($order->getRemainingCancellationAmount() - ($amount * 100));
+                $order->setRemainingCancellationAmount($order->getRemainingCancellationAmount() - $amountInSubUnit);
                 $order->setRemainingCapturingAmount($order->getRemainingCancellationAmount());
                 break;
             case 'refund':
-                $order->setRemainingReversalAmount($order->getRemainingReversalAmount() - ($amount * 100));
+                $order->setRemainingReversalAmount($order->getRemainingReversalAmount() - $amountInSubUnit);
                 break;
         }
 

diff --git a/Helper/Paymentorder.php b/Helper/Paymentorder.php
@@ -437,6 +437,7 @@ public function saveQuoteToDB($response)
         }
 
         $quote->setPaymentOrderId($this->getSwedbankPayPaymentorderId($response['payment_order']['id']));
+        $quote->setPaymentOrderIdPath($response['payment_order']['id']);
         $quote->setDescription($response['payment_order']['description']);
         $quote->setOperation($response['payment_order']['operation']);
         $quote->setState($response['payment_order']['state']);

diff --git a/Model/Order.php b/Model/Order.php
@@ -53,6 +53,23 @@ public function setPaymentOrderId($paymentOrderId)
         $this->setData(self::PAYMENT_ORDER_ID, $paymentOrderId);
     }
 
+    /**
+     * @return string|null
+     */
+    public function getPaymentOrderIdPath()
+    {
+        return $this->_getData(self::PAYMENT_ORDER_ID_PATH);
+    }
+
+    /**
+     * @param string $paymentIdPath
+     * @return void
+     */
+    public function setPaymentOrderIdPath($paymentIdPath)
+    {
+        $this->setData(self::PAYMENT_ORDER_ID_PATH, $paymentIdPath);
+    }
+
     /**
      * @return string
      */

diff --git a/Model/Quote.php b/Model/Quote.php
@@ -53,6 +53,23 @@ public function setPaymentOrderId($paymentOrderId)
         $this->setData(self::PAYMENT_ORDER_ID, $paymentOrderId);
     }
 
+    /**
+     * @return string|null
+     */
+    public function getPaymentOrderIdPath()
+    {
+        return $this->_getData(self::PAYMENT_ORDER_ID_PATH);
+    }
+
+    /**
+     * @param string $paymentIdPath
+     * @return void
+     */
+    public function setPaymentOrderIdPath($paymentIdPath)
+    {
+        $this->setData(self::PAYMENT_ORDER_ID_PATH, $paymentIdPath);
+    }
+
     /**
      * @return string
      */

diff --git a/Observer/AfterCheckoutSubmitObserver.php b/Observer/AfterCheckoutSubmitObserver.php
@@ -3,10 +3,10 @@
 namespace SwedbankPay\Checkout\Observer;
 
 use Exception;
-use Magento\Framework\Exception\InputException;
-use Magento\Framework\Exception\AlreadyExistsException;
 use Magento\Framework\Event\Observer;
 use Magento\Framework\Event\ObserverInterface;
+use Magento\Framework\Exception\AlreadyExistsException;
+use Magento\Framework\Exception\InputException;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Sales\Api\Data\OrderPaymentInterface;
@@ -17,6 +17,7 @@
 use SwedbankPay\Checkout\Api\Data\OrderInterface as PaymentOrderInterface;
 use SwedbankPay\Checkout\Helper\Config as ConfigHelper;
 use SwedbankPay\Checkout\Helper\PaymentData;
+use SwedbankPay\Checkout\Model\ConsumerSession;
 use SwedbankPay\Checkout\Model\Ui\ConfigProvider;
 use SwedbankPay\Core\Helper\Order as OrderHelper;
 use SwedbankPay\Core\Logger\Logger;
@@ -42,6 +43,11 @@ class AfterCheckoutSubmitObserver implements ObserverInterface
      */
     protected $clientService;
 
+    /**
+     * @var ConsumerSession
+     */
+    protected $consumerSession;
+
     /**
      * @var OrderHelper
      */
@@ -61,13 +67,15 @@ public function __construct(
         ConfigHelper $configHelper,
         PaymentData $paymentData,
         ClientService $clientService,
+        ConsumerSession $consumerSession,
         OrderHelper $orderHelper,
         OrderRepository $orderRepository,
         Logger $logger
     ) {
         $this->configHelper = $configHelper;
         $this->paymentData = $paymentData;
         $this->clientService = $clientService;
+        $this->consumerSession = $consumerSession;
         $this->orderHelper = $orderHelper;
         $this->orderRepository = $orderRepository;
         $this->logger = $logger;
@@ -111,13 +119,16 @@ public function execute(Observer $observer)
 
         /** @var GetCurrentPayment $currentPaymentRequest */
         $currentPaymentRequest = $this->clientService->init('Paymentorder', 'GetCurrentPayment');
-        $currentPaymentRequest->setRequestEndpointVars($paymentData->getPaymentOrderId());
+        $this->logger->debug('Payment Order ID: '. $paymentData->getPaymentOrderIdPath());
+        $currentPaymentRequest->setPaymentOrderId($paymentData->getPaymentOrderIdPath());
 
         /** @var GetCurrentPaymentInterface $currentPayment */
         $currentPayment = $currentPaymentRequest->send()->getResponseResource();
         $paymentData->setIntent($currentPayment->getPayment()->getIntent());
         $this->paymentData->update($paymentData);
 
+        $this->consumerSession->setViewOperation(false);
+
         if ($paymentData->getIntent() == 'Sale') {
             $this->saveTransactionNumber($order, $currentPayment);
 

diff --git a/Plugin/OrderRepositoryPlugin.php b/Plugin/OrderRepositoryPlugin.php
@@ -96,14 +96,19 @@ public function afterSave(
                 return $mageOrder;
             }
         } catch (Exception $e) {
-            $this->logger->debug(sprintf('SwedbankPay Order not found with ID # %s', $mageOrder->getEntityId()));
+            $this->logger->debug(sprintf(
+                'No SwedbankPay Order record has been created yet with ID # %s',
+                $mageOrder->getEntityId()
+            ));
+            $this->logger->debug('Creating new SwedbankPay Order...');
         }
 
         /** @var \SwedbankPay\Checkout\Model\Order $swedbankPayOrder */
         $swedbankPayOrder = $this->orderFactory->create();
 
         $swedbankPayOrder->setState($swedbankPayQuote->getState());
         $swedbankPayOrder->setPaymentOrderId($swedbankPayQuote->getPaymentOrderId());
+        $swedbankPayOrder->setPaymentOrderIdPath($swedbankPayQuote->getPaymentOrderIdPath());
         $swedbankPayOrder->setCreatedAt($swedbankPayQuote->getCreatedAt());
         $swedbankPayOrder->setUpdatedAt($swedbankPayQuote->getUpdatedAt());
         $swedbankPayOrder->setOperation($swedbankPayQuote->getOperation());

diff --git a/Plugin/QuoteRepositoryPlugin.php b/Plugin/QuoteRepositoryPlugin.php
@@ -115,9 +115,13 @@ public function aroundSave(
             $swedbankPayQuote->setRemainingReversalAmount(0);
 
             $this->quoteRepository->save($swedbankPayQuote);
-
         } catch (NoSuchEntityException $e) {
-            $this->logger->debug(sprintf('SwedbankPay Quote not found with ID # %s', $quote->getId()));
+            $this->logger->debug(sprintf(
+                'No SwedbankPay Quote record has been created yet with ID # %s',
+                $quote->getId()
+            ));
+
+            $this->logger->debug(sprintf('SwedbankPay Quote update skipped!'));
         }
 
         return $returnValue;
@@ -130,11 +134,13 @@ public function aroundSave(
      */
     public function updatePaymentorder(MageQuote $mageQuote, SwedbankPayQuote $swedbankPayQuote)
     {
+        $quoteTotal = (int) round($mageQuote->getGrandTotal() * 100);
+
         $this->logger->debug('UpdateOrder request is called');
         $this->logger->debug('SwedbankPayQuote Total: ' . $swedbankPayQuote->getAmount());
-        $this->logger->debug('Quote Grand Total: ' . $mageQuote->getGrandTotal() * 100);
+        $this->logger->debug('Quote Grand Total: ' . $quoteTotal);
 
-        if ($swedbankPayQuote->getAmount() == ($mageQuote->getGrandTotal() * 100)) {
+        if ($swedbankPayQuote->getAmount() == $quoteTotal) {
             $this->logger->debug('UpdateOrder operation is skipped as the amount is unchanged');
             return;
         }
@@ -147,7 +153,7 @@ public function updatePaymentorder(MageQuote $mageQuote, SwedbankPayQuote $swedb
         $paymentOrderObject = $this->paymentorder->createPaymentorderUpdateObject($mageQuote);
 
         $updateRequest = $this->service->init('Paymentorder', 'updateOrder', $paymentOrderObject);
-        $updateRequest->setRequestEndpointVars($swedbankPayQuote->getPaymentOrderId());
+        $updateRequest->setPaymentOrderId($swedbankPayQuote->getPaymentOrderIdPath());
         $updateRequest->send();
     }
 

diff --git a/Setup/UpgradeSchema.php b/Setup/UpgradeSchema.php
@@ -49,6 +49,35 @@ public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $con
                 );
         }
 
+        $swedbankPayQuoteTable = 'swedbank_pay_quotes';
+        $swedbankPayOrderTable = 'swedbank_pay_orders';
+
+        if (version_compare($context->getVersion(), "1.3.0", "<")) {
+            // Swedbank Pay Quotes table
+            $setup->getConnection()
+                ->addColumn(
+                    $setup->getTable($swedbankPayQuoteTable),
+                    'payment_order_id_path',
+                    [
+                        'type' => \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
+                        'length' => 255,
+                        'comment' =>'SwedbankPay Payment Order ID Path'
+                    ]
+                );
+
+            // Swedbank Pay Orders table
+            $setup->getConnection()
+                ->addColumn(
+                    $setup->getTable($swedbankPayOrderTable),
+                    'payment_order_id_path',
+                    [
+                        'type' => \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
+                        'length' => 255,
+                        'comment' =>'SwedbankPay Payment Order ID Path'
+                    ]
+                );
+        }
+
         $setup->endSetup();
     }
 }
diff --git a/Test/Unit/PaymentDataTest.php b/Test/Unit/PaymentDataTest.php
@@ -67,7 +67,7 @@ public function testGetByPaymentOrderIdThrowsException()
 
         $this->expectException(NoSuchEntityException::class);
         $this->expectExceptionMessage(
-            sprintf("Unable to find a SwedbankPay payment matching Payment ID:\n%s", $paymentOrderId)
+            sprintf("Unable to find a SwedbankPay payment matching Payment Order ID:\n%s", $paymentOrderId)
         );
 
         $this->paymentData->getByPaymentOrderId($paymentOrderId);

diff --git a/Test/Unit/QuoteRepositoryPluginTest.php b/Test/Unit/QuoteRepositoryPluginTest.php
@@ -178,7 +178,7 @@ public function testUpdateOrderRequestWasSent()
             ->willReturn($paymentOrderId);
 
         $this->service->expects($this->once())->method('init')->willReturn($this->updateRequest);
-        $this->updateRequest->expects($this->once())->method('setRequestEndpointVars');
+        $this->updateRequest->expects($this->once())->method('setPaymentOrderId');
         $this->updateRequest->expects($this->once())->method('send');
 
         $this->quoteRepositoryPlugin->updatePaymentorder($this->mageQuote, $this->swedbankPayQuote);