Afterpay Release v4.2.1

Api/Data/TokenInterface.php

@@ -0,0 +1,10 @@
+<?php
+namespace Afterpay\Afterpay\Api\Data;
+
+interface TokenInterface
+{
+    public const LOG_ID_FIELD = 'log_id';
+    public const ORDER_ID_FIELD = 'order_id';
+    public const TOKEN_FIELD = 'token';
+    public const EXPIRATION_DATE_FIELD = 'expiration_date';
+}

Controller/Express/PlaceOrder.php

@@ -21,21 +21,24 @@ class PlaceOrder implements HttpPostActionInterface
     private $placeOrderProcessor;
     private $syncCheckoutDataCommand;
     private $storeManager;
+    private $messageManager;
 
     public function __construct(
         RequestInterface      $request,
         Session               $checkoutSession,
         JsonFactory           $jsonFactory,
         PlaceOrderProcessor   $placeOrderProcessor,
         CommandInterface      $syncCheckoutDataCommand,
-        StoreManagerInterface $storeManager
+        StoreManagerInterface $storeManager,
+        ManagerInterface      $messageManager
     ) {
         $this->request = $request;
         $this->checkoutSession = $checkoutSession;
         $this->jsonFactory = $jsonFactory;
         $this->placeOrderProcessor = $placeOrderProcessor;
         $this->syncCheckoutDataCommand = $syncCheckoutDataCommand;
         $this->storeManager = $storeManager;
+        $this->messageManager = $messageManager;
     }
 
     public function execute()
@@ -74,6 +77,8 @@ public function execute()
             ]);
         }
 
+        $this->messageManager->addSuccessMessage((string)__('Afterpay Transaction Completed.'));
+
         return $jsonResult->setData(['redirectUrl' => $this->storeManager->getStore()->getUrl('checkout/onepage/success')]);
     }
 }

Controller/Payment/Capture.php

@@ -2,11 +2,20 @@
 
 namespace Afterpay\Afterpay\Controller\Payment;
 
-class Capture implements \Magento\Framework\App\Action\HttpGetActionInterface
+use Afterpay\Afterpay\Model\Payment\Capture\PlaceOrderProcessor;
+use Magento\Checkout\Model\Session;
+use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\Controller\Result\RedirectFactory;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Message\ManagerInterface;
+use Magento\Payment\Gateway\CommandInterface;
+use Magento\Store\Model\StoreManagerInterface;
+
+class Capture implements HttpGetActionInterface
 {
     const CHECKOUT_STATUS_CANCELLED = 'CANCELLED';
     const CHECKOUT_STATUS_SUCCESS = 'SUCCESS';
-
     private $request;
     private $session;
     private $redirectFactory;
@@ -16,13 +25,13 @@ class Capture implements \Magento\Framework\App\Action\HttpGetActionInterface
     private $storeManager;
 
     public function __construct(
-        \Magento\Framework\App\RequestInterface $request,
-        \Magento\Checkout\Model\Session $session,
-        \Magento\Framework\Controller\Result\RedirectFactory $redirectFactory,
-        \Magento\Framework\Message\ManagerInterface $messageManager,
-        \Afterpay\Afterpay\Model\Payment\Capture\PlaceOrderProcessor $placeOrderProcessor,
-        \Magento\Payment\Gateway\CommandInterface $validateCheckoutDataCommand,
-        \Magento\Store\Model\StoreManagerInterface $storeManager
+        RequestInterface      $request,
+        Session               $session,
+        RedirectFactory       $redirectFactory,
+        ManagerInterface      $messageManager,
+        PlaceOrderProcessor   $placeOrderProcessor,
+        CommandInterface      $validateCheckoutDataCommand,
+        StoreManagerInterface $storeManager
     ) {
         $this->request = $request;
         $this->session = $session;
@@ -39,6 +48,7 @@ public function execute()
             $this->messageManager->addErrorMessage(
                 (string)__('You have cancelled your Afterpay payment. Please select an alternative payment method.')
             );
+
             return $this->redirectFactory->create()->setPath('checkout/cart', [
                 '_scope' => $this->storeManager->getStore()
             ]);
@@ -47,6 +57,7 @@ public function execute()
             $this->messageManager->addErrorMessage(
                 (string)__('Afterpay payment is declined. Please select an alternative payment method.')
             );
+
             return $this->redirectFactory->create()->setPath('checkout/cart', [
                 '_scope' => $this->storeManager->getStore()
             ]);
@@ -57,16 +68,18 @@ public function execute()
             $afterpayOrderToken = $this->request->getParam('orderToken');
             $this->placeOrderProcessor->execute($quote, $this->validateCheckoutDataCommand, $afterpayOrderToken);
         } catch (\Throwable $e) {
-            $errorMessage = $e instanceof \Magento\Framework\Exception\LocalizedException
+            $errorMessage = $e instanceof LocalizedException
                 ? $e->getMessage()
                 : (string)__('Afterpay payment is declined. Please select an alternative payment method.');
             $this->messageManager->addErrorMessage($errorMessage);
+
             return $this->redirectFactory->create()->setPath('checkout/cart', [
                 '_scope' => $this->storeManager->getStore()
             ]);
         }
 
-        $this->messageManager->addSuccessMessage((string)__('Afterpay Transaction Completed'));
+        $this->messageManager->addSuccessMessage((string)__('Afterpay Transaction Completed.'));
+
         return $this->redirectFactory->create()->setPath('checkout/onepage/success');
     }
 }

Model/Checks/PaymentMethod.php

@@ -4,7 +4,7 @@
 
 class PaymentMethod implements PaymentMethodInterface
 {
-    public function isAfterPayMethod(\Magento\Sales\Model\Order\Payment $payment): bool
+    public function isAfterPayMethod($payment): bool
     {
         return $payment->getMethod() == \Afterpay\Afterpay\Gateway\Config\Config::CODE;
     }

Model/Checks/PaymentMethodInterface.php

@@ -1,8 +1,12 @@
 <?php
-
 namespace Afterpay\Afterpay\Model\Checks;
 
 interface PaymentMethodInterface
 {
-    public function isAfterPayMethod(\Magento\Sales\Model\Order\Payment $payment): bool;
+    /**
+     * @param \Magento\Sales\Api\Data\OrderPaymentInterface|\Magento\Quote\Api\Data\PaymentInterface $payment
+     *
+     * @return bool
+     */
+    public function isAfterPayMethod($payment): bool;
 }

Model/Config.php

@@ -407,7 +407,7 @@ public function websiteHasOwnConfig(int $websiteId): bool
             return true;
         }
         $connection = $this->resourceConnection->getConnection();
-        $coreConfigData = $connection->getTableName('core_config_data');
+        $coreConfigData = $this->resourceConnection->getTableName('core_config_data');
         $configsExistToCheck = array_merge(
             \Afterpay\Afterpay\Observer\Adminhtml\ConfigSaveAfter::AFTERPAY_CONFIGS,
             \Afterpay\Afterpay\Observer\Adminhtml\ConfigSaveAfter::CONFIGS_PATHS_TO_TRACK
@@ -556,9 +556,9 @@ public function setConsumerLendingMinAmount(string $value, int $scopeId = 0): se
         return $this;
     }
 
-    public function getConsumerLendingMinAmount(?int $scopeCode = null): bool
+    public function getConsumerLendingMinAmount(?int $scopeCode = null): float
     {
-        return (bool)$this->scopeConfig->getValue(
+        return (float)$this->scopeConfig->getValue(
             self::XML_PATH_CONSUMER_LENDING_MIN_AMOUNT,
             ScopeInterface::SCOPE_WEBSITE,
             $scopeCode

Model/Order/CreditMemo/OrdersRetriever.php

@@ -2,100 +2,76 @@
 
 namespace Afterpay\Afterpay\Model\Order\CreditMemo;
 
-use Afterpay\Afterpay\Model\Payment\AdditionalInformationInterface;
+use Afterpay\Afterpay\Api\Data\TokenInterface;
+use Afterpay\Afterpay\Model\ResourceModel\Token\CollectionFactory;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Stdlib\DateTime\DateTime;
+use Magento\Sales\Api\Data\OrderInterface;
+use Magento\Sales\Api\Data\OrderPaymentInterface;
+use Magento\Sales\Model\Order;
+use Magento\Sales\Model\ResourceModel\Order\Collection;
+use Magento\Sales\Model\ResourceModel\Order\CollectionFactory as OrderCollectionFactory;
 
 class OrdersRetriever
 {
     private $orderCollectionFactory;
     private $resourceConnection;
-    private $serializer;
-    private $logger;
+    private $tokensCollectionFactory;
+    private $dateTime;
 
     public function __construct(
-        \Magento\Framework\Serialize\SerializerInterface $serializer,
-        \Magento\Sales\Model\ResourceModel\Order\CollectionFactory $orderCollectionFactory,
-        \Magento\Framework\App\ResourceConnection $resourceConnection,
-        \Psr\Log\LoggerInterface $logger
+        OrderCollectionFactory $orderCollectionFactory,
+        ResourceConnection     $resourceConnection,
+        CollectionFactory      $tokensCollectionFactory,
+        DateTime               $dateTime
     ) {
-        $this->serializer = $serializer;
         $this->orderCollectionFactory = $orderCollectionFactory;
         $this->resourceConnection = $resourceConnection;
-        $this->logger = $logger;
+        $this->tokensCollectionFactory = $tokensCollectionFactory;
+        $this->dateTime = $dateTime;
     }
 
     /**
-     * @return \Magento\Sales\Model\Order[]
+     * @return Order[]
      */
     public function getAfterpayOrders(): array
     {
-        $orderCollection = $this->orderCollectionFactory->create();
-        $orderCollection
+        $tokensCollection = $this->tokensCollectionFactory->create()
+            ->addFieldToSelect(TokenInterface::ORDER_ID_FIELD)
+            ->addFieldToFilter(TokenInterface::EXPIRATION_DATE_FIELD, ['notnull' => true])
             ->addFieldToFilter(
-                'state',
-                ['eq' => \Magento\Sales\Model\Order::STATE_PROCESSING]
+                TokenInterface::EXPIRATION_DATE_FIELD,
+                [
+                    'date' => true,
+                    'from' => $this->dateTime->date('Y-m-d H:i:s', '-90 days'),
+                    'to'   => $this->dateTime->date('Y-m-d H:i:s')
+                ]
             );
+        $ids = $tokensCollection->getColumnValues(TokenInterface::ORDER_ID_FIELD);
+
+        $orderCollection = $this->orderCollectionFactory->create();
+        $orderCollection->addFieldToFilter(
+            OrderInterface::ENTITY_ID,
+            ['in' => $ids]
+        )->addFieldToFilter(
+            OrderInterface::STATE,
+            ['eq' => Order::STATE_PROCESSING]
+        );
         $orderCollection = $this->joinAfterpayPaymentAdditionalInfo($orderCollection);
-        /** @var \Magento\Sales\Model\Order[] $items */
-        $items = $orderCollection->getItems();
-        $items = $this->getItemsWithAdditionalInfo($items);
-        return $items;
-    }
 
-    /**
-     * @var \Magento\Sales\Model\Order[] $items
-     * @return \Magento\Sales\Model\Order[]
-     */
-    private function getItemsWithAdditionalInfo(array $items): array
-    {
-        $itemsWithJsonAdditionalInfo = [];
-        foreach ($items as $item) {
-            $additionalInformation = $item->getData(
-                \Magento\Sales\Api\Data\OrderPaymentInterface::ADDITIONAL_INFORMATION
-            );
-            try {
-                $unserializedInfo = $this->serializer->unserialize($additionalInformation);
-                if (!is_array($unserializedInfo)) {
-                    continue;
-                }
-                /** @var array $unserializedInfo */
-                $item->setData(
-                    \Magento\Sales\Api\Data\OrderPaymentInterface::ADDITIONAL_INFORMATION,
-                    $unserializedInfo
-                );
-                $isAdditionalInfoFull =
-                    isset($unserializedInfo[AdditionalInformationInterface::AFTERPAY_PAYMENT_STATE]) &&
-                    isset($unserializedInfo[AdditionalInformationInterface::AFTERPAY_OPEN_TO_CAPTURE_AMOUNT]) &&
-                    isset($unserializedInfo[AdditionalInformationInterface::AFTERPAY_AUTH_EXPIRY_DATE]);
-                if ($isAdditionalInfoFull) {
-                    $itemsWithJsonAdditionalInfo[] = $item;
-                }
-            } catch (\InvalidArgumentException $e) {
-                $this->logger->warning($e->getMessage());
-            }
-        }
-        return $itemsWithJsonAdditionalInfo;
+        return $orderCollection->getItems();
     }
 
     private function joinAfterpayPaymentAdditionalInfo(
-        \Magento\Sales\Model\ResourceModel\Order\Collection $orderCollection
-    ): \Magento\Sales\Model\ResourceModel\Order\Collection {
-        $salesOrderPaymentTable = $this->resourceConnection->getConnection()->getTableName('sales_order_payment');
+        Collection $orderCollection
+    ): Collection {
+        $salesOrderPaymentTable = $this->resourceConnection->getTableName('sales_order_payment');
         $orderCollection->join(
             ['sop' => $salesOrderPaymentTable],
             'sop.parent_id = main_table.entity_id',
-            \Magento\Sales\Api\Data\OrderPaymentInterface::ADDITIONAL_INFORMATION
+            OrderPaymentInterface::ADDITIONAL_INFORMATION
         );
-        $selectSql = $orderCollection->getSelectSql();
-        /** @var \Magento\Framework\DB\Select $selectSql */
-        $selectSql
-            ->where(
-                'sop.method = ?',
-                \Afterpay\Afterpay\Gateway\Config\Config::CODE
-            )
-            ->where(
-                'sop.additional_information like ?',
-                '%' . AdditionalInformationInterface::AFTERPAY_AUTH_EXPIRY_DATE . '%'
-            );
+
         return $orderCollection;
     }
 }

Model/Order/Payment/Auth/TokenSaver.php

@@ -0,0 +1,25 @@
+<?php declare(strict_types=1);
+
+namespace Afterpay\Afterpay\Model\Order\Payment\Auth;
+
+use Afterpay\Afterpay\Model\ResourceModel\Token;
+use Magento\Framework\Stdlib\DateTime;
+
+class TokenSaver
+{
+    private $tokensResource;
+    private $dateTime;
+
+    public function __construct(
+        Token    $tokensResource,
+        DateTime $dateTime
+    ) {
+        $this->tokensResource = $tokensResource;
+        $this->dateTime = $dateTime;
+    }
+
+    public function execute(int $orderId, string $token, ?string $expiryDate): bool
+    {
+        return (bool)$this->tokensResource->insertNewToken($orderId, $token, $this->dateTime->formatDate($expiryDate));
+    }
+}

Model/Order/Payment/Auth/TokenValidator.php

@@ -2,29 +2,24 @@
 
 namespace Afterpay\Afterpay\Model\Order\Payment\Auth;
 
-use Afterpay\Afterpay\Api\Data\CheckoutInterface;
-use Afterpay\Afterpay\Gateway\Config\Config;
-use Magento\Framework\App\ResourceConnection;
+use Afterpay\Afterpay\Model\ResourceModel\Token;
 
 class TokenValidator
 {
-    private $resourceConnection;
+    private $results = [];
+    private $tokensResource;
 
-    public function __construct(ResourceConnection $resourceConnection)
+    public function __construct(Token $tokensResource)
     {
-        $this->resourceConnection = $resourceConnection;
+        $this->tokensResource = $tokensResource;
     }
 
     public function checkIsUsed(string $token): bool
     {
-        $salesOrderPaymentTable = $this->resourceConnection->getConnection()->getTableName('sales_order_payment');
-        $checkSelect = $this->resourceConnection->getConnection()->select()
-            ->from($salesOrderPaymentTable)
-            ->where('method = ?', Config::CODE)
-            ->where('base_amount_paid_online IS NOT NULL')
-            ->where('last_trans_id IS NOT NULL')
-            ->where('additional_information like ?', '%"' . CheckoutInterface::AFTERPAY_TOKEN . '":"' . $token . '%');
+        if (!isset($this->results[$token])) {
+            $this->results[$token] = (bool)$this->tokensResource->selectByToken($token);
+        }
 
-        return (bool)$this->resourceConnection->getConnection()->fetchOne($checkSelect);
+        return $this->results[$token];
     }
 }