Release version 5.0.1

afterpay · May 19, 2022 · ea33c5f · ea33c5f
1 parent 7ce79e0
commit ea33c5f
Show file tree

Hide file tree

Showing 38 changed files with 455 additions and 130 deletions.
diff --git a/...inhtml/System/Config/Fieldset/Payment.php → ...stem/Config/Fieldset/AllowedByCountry.php b/...inhtml/System/Config/Fieldset/Payment.php → ...stem/Config/Fieldset/AllowedByCountry.php
@@ -2,10 +2,11 @@
 
 namespace Afterpay\Afterpay\Block\Adminhtml\System\Config\Fieldset;
 
-class Payment extends \Magento\Config\Block\System\Config\Form\Fieldset
+class AllowedByCountry extends \Magento\Config\Block\System\Config\Form\Fieldset
 {
     private \Magento\Payment\Model\MethodInterface $afterpay;
     private \Afterpay\Afterpay\Model\Config $config;
+    private string $allowedCountriesConfigPath;
 
     public function __construct(
         \Magento\Backend\Block\Context $context,
@@ -14,16 +15,18 @@ public function __construct(
         \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer,
         \Magento\Payment\Model\MethodInterface $afterpay,
         \Afterpay\Afterpay\Model\Config $config,
+        string $allowedCountriesConfigPath = '',
         array $data = []
     ) {
         parent::__construct($context, $authSession, $jsHelper, $data, $secureRenderer);
         $this->afterpay = $afterpay;
         $this->config = $config;
+        $this->allowedCountriesConfigPath = $allowedCountriesConfigPath;
     }
 
     public function render(\Magento\Framework\Data\Form\Element\AbstractElement $element): string
     {
-        $allowedMerchantCountries = explode(',', $this->afterpay->getConfigData('allowed_merchant_countries'));
+        $allowedMerchantCountries = explode(',', $this->afterpay->getConfigData($this->allowedCountriesConfigPath));
         if (in_array($this->getMerchantCountry(), $allowedMerchantCountries)) {
             return parent::render($element);
         }

diff --git a/Controller/Adminhtml/MerchantConfiguration/Update.php b/Controller/Adminhtml/MerchantConfiguration/Update.php
@@ -40,6 +40,8 @@ public function execute()
                 (string)__('Afterpay merchant configuration fetching is failed. See logs.')
             );
         }
-        return $this->resultJsonFactory->create();
+        return $this->resultJsonFactory->create()->setData([
+            'done' => true
+        ]);
     }
 }
diff --git a/Controller/Express/PlaceOrder.php b/Controller/Express/PlaceOrder.php
@@ -54,7 +54,7 @@ public function execute()
                 ? $e->getMessage()
                 : (string)__('Payment is failed');
             $this->messageManager->addErrorMessage($errorMessage);
-            return $jsonResult;
+            return $jsonResult->setData(['redirectUrl' => $this->url->getUrl('checkout/cart')]);
         }
 
         return $jsonResult->setData(['redirectUrl' => $this->url->getUrl('checkout/onepage/success')]);

diff --git a/Gateway/Command/GetMerchantConfigurationCommandWrapper.php b/Gateway/Command/GetMerchantConfigurationCommandWrapper.php
@@ -47,10 +47,12 @@ public function execute(array $commandSubject)
                 return null;
             }
             $this->checkCountry($scope, $websiteId);
+            $this->checkCurrency($scope, $websiteId);
             $this->debugLogger->setForceDebug($this->afterpayConfig->getIsDebug($websiteId));
             return $this->merchantConfigurationCommand->execute($commandSubject);
         } catch (\Magento\Payment\Gateway\Command\CommandException $e) {
             $this->eraseMerchantConfiguration($websiteId, $websiteHasOwnConfig);
+            $this->logger->notice($e->getMessage());
             throw $e;
         } catch (\Exception $e) {
             $this->logger->critical($e->getMessage());
@@ -83,7 +85,26 @@ private function checkCountry(string $scope, int $websiteId): void
         if (!in_array($merchantCountry, $allowedCountries)) {
             throw new \Magento\Payment\Gateway\Command\CommandException(
             // @codingStandardsIgnoreLine
-                __('Unable to fetch Afterpay merchant configuration due to unsupported merchant country. Supported countries: AU, CA, NZ, US.')
+                __('Unable to fetch Afterpay merchant configuration due to unsupported merchant country. Supported countries: %1.', implode(', ', $allowedCountries))
+            );
+        }
+    }
+
+    /**
+     * @throws \Magento\Payment\Gateway\Command\CommandException
+     */
+    private function checkCurrency(string $scope, int $websiteId): void
+    {
+
+        $merchantCurrency = $this->afterpayConfig->getMerchantCurrency(
+            $scope,
+            $websiteId
+        );
+        $allowedCurrencies = $this->afterpayConfig->getAllowedCurrencies($websiteId);
+        if (!in_array($merchantCurrency, $allowedCurrencies)) {
+            throw new \Magento\Payment\Gateway\Command\CommandException(
+            // @codingStandardsIgnoreLine
+                __('Unable to fetch Afterpay merchant configuration due to unsupported merchant currency. Supported currencies: %1.', implode(', ', $allowedCurrencies))
             );
         }
     }

diff --git a/Gateway/Request/Checkout/CheckoutDataBuilder.php b/Gateway/Request/Checkout/CheckoutDataBuilder.php
@@ -39,7 +39,8 @@ public function build(array $buildSubject): array
             'consumer' => [
                 'givenNames' => $quote->getCustomerFirstname() ?: $billingAddress->getFirstname(),
                 'surname' => $quote->getCustomerLastname() ?: $billingAddress->getLastname(),
-                'email' => $quote->getCustomerEmail() ?: $billingAddress->getEmail()
+                'email' => $quote->getCustomerEmail() ?: $billingAddress->getEmail(),
+                'phoneNumber' => $billingAddress->getTelephone()
             ],
             'billing' => [
                 'name' => $billingAddress->getFirstname() . ' ' . $billingAddress->getLastname(),
@@ -48,7 +49,8 @@ public function build(array $buildSubject): array
                 'area1' => $billingAddress->getCity(),
                 'region' => $billingAddress->getRegion(),
                 'postcode' => $billingAddress->getPostcode(),
-                'countryCode' => $billingAddress->getCountryId()
+                'countryCode' => $billingAddress->getCountryId(),
+                'phoneNumber' => $billingAddress->getTelephone()
             ],
             'items' => $this->getItems($quote),
             'merchant' => [
@@ -61,7 +63,8 @@ public function build(array $buildSubject): array
                     $billingAddress->getBaseTaxAmount() ?: $shippingAddress->getBaseTaxAmount()
                 ),
                 'currency' => $quote->getBaseCurrencyCode()
-            ]
+            ],
+            'purchaseCountry' => $billingAddress->getCountryId()
         ];
 
         if ($shippingAddress = $this->getShippingAddress($quote)) {
@@ -129,9 +132,7 @@ protected function getItemsImages(array $items): array
             ->create();
         $products = $this->productRepository->getList($searchCriteria)->getItems();
 
-        foreach ($items as $item) {
-            /** @var \Magento\Catalog\Model\Product $product */
-            $product = $products[$item->getProduct()->getId()];
+        foreach ($products as $product) {
             $medialGalleryImages = $product->getMediaGalleryImages();
             $itemsImages[$product->getId()] = $medialGalleryImages->getFirstItem();
         }
@@ -151,7 +152,8 @@ protected function getShippingAddress(\Magento\Quote\Model\Quote $quote): ?array
             'area1' => $shippingAddress->getCity(),
             'region' => $shippingAddress->getRegion(),
             'postcode' => $shippingAddress->getPostcode(),
-            'countryCode' => $shippingAddress->getCountryId()
+            'countryCode' => $shippingAddress->getCountryId(),
+            'phoneNumber' => $shippingAddress->getTelephone()
         ];
     }
 

diff --git a/Gateway/Request/PaymentAction/AuthCaptureDataBuilder.php b/Gateway/Request/PaymentAction/AuthCaptureDataBuilder.php
@@ -24,7 +24,7 @@ public function build(array $buildSubject): array
             'orderId' => $afterpayOrderId,
             'amount' => [
                 'amount' => $this->formatPrice(SubjectReader::readAmount($buildSubject)),
-                'currency' => $payment->getOrder()->getOrderCurrencyCode()
+                'currency' => $payment->getOrder()->getBaseCurrencyCode()
             ]
         ];
     }

diff --git a/Gateway/Request/PaymentAction/CaptureDataBuilder.php b/Gateway/Request/PaymentAction/CaptureDataBuilder.php
@@ -18,7 +18,7 @@ public function build(array $buildSubject): array
         if ($payment->getAdditionalInformation('afterpay_express')) {
             $data['amount'] = [
                 'amount' => \Magento\Payment\Gateway\Helper\SubjectReader::readAmount($buildSubject),
-                'currency' => $payment->getOrder()->getOrderCurrencyCode()
+                'currency' => $payment->getOrder()->getBaseCurrencyCode()
             ];
         }
 

diff --git a/Gateway/Response/Checkout/CheckoutDataToQuoteHandler.php b/Gateway/Response/Checkout/CheckoutDataToQuoteHandler.php
@@ -53,7 +53,9 @@ public function handle(array $handlingSubject, array $response): void
 
         $shippingInformation->setBillingAddress($address);
         if (!$quote->isVirtual()) {
-            [$carrierCode, $methodCode] = explode('_', $response['shippingOptionIdentifier']);
+            $explodedShippingOption = explode('_', $response['shippingOptionIdentifier']);
+            $carrierCode = array_shift($explodedShippingOption);
+            $methodCode = implode('_', $explodedShippingOption);
             $shippingInformation->setShippingAddress($address);
             $shippingInformation->setShippingCarrierCode($carrierCode);
             $shippingInformation->setShippingMethodCode($methodCode);

diff --git a/Gateway/Response/Checkout/CheckoutItemsAmountValidationHandler.php b/Gateway/Response/Checkout/CheckoutItemsAmountValidationHandler.php
@@ -11,7 +11,7 @@ public function handle(array $handlingSubject, array $response)
         /** @var \Magento\Quote\Model\Quote $quote */
         $quote = $paymentDO->getPayment()->getQuote();
 
-        if (round($quote->getBaseGrandTotal(), 2) != round($response['amount']['amount'], 2)) {
+        if (round(1 * $quote->getBaseGrandTotal(), 2) != round(1 * $response['amount']['amount'], 2)) {
             throw new \Magento\Framework\Exception\LocalizedException(
                 __('There are issues when processing your payment. Invalid Amount')
             );

diff --git a/Gateway/Validator/StockItemsValidator.php b/Gateway/Validator/StockItemsValidator.php
@@ -0,0 +1,54 @@
+<?php declare(strict_types=1);
+
+namespace Afterpay\Afterpay\Gateway\Validator;
+
+class StockItemsValidator implements \Afterpay\Afterpay\Model\Spi\StockItemsValidatorInterface
+{
+    private \Magento\InventoryCatalogApi\Model\IsSingleSourceModeInterface $isSingleSourceMode;
+    private \Magento\InventorySourceDeductionApi\Model\SourceDeductionServiceInterface $sourceValidatorService;
+    private \Magento\InventoryShipping\Model\SourceDeductionRequestFromShipmentFactory $sourceDeductionRequestFromShipmentFactory;
+    private \Magento\InventoryShipping\Model\GetItemsToDeductFromShipment $getItemsToDeductFromShipment;
+    private \Magento\InventoryCatalogApi\Api\DefaultSourceProviderInterface $defaultSourceProvider;
+
+    public function __construct(
+        \Magento\InventoryCatalogApi\Model\IsSingleSourceModeInterface $isSingleSourceMode,
+        \Magento\InventoryCatalogApi\Api\DefaultSourceProviderInterface $defaultSourceProvider,
+        \Magento\InventoryShipping\Model\GetItemsToDeductFromShipment $getItemsToDeductFromShipment,
+        \Magento\InventoryShipping\Model\SourceDeductionRequestFromShipmentFactory $sourceDeductionRequestFromShipmentFactory,
+        \Magento\InventorySourceDeductionApi\Model\SourceDeductionServiceInterface $sourceValidatorService
+    ) {
+        $this->isSingleSourceMode = $isSingleSourceMode;
+        $this->defaultSourceProvider = $defaultSourceProvider;
+        $this->getItemsToDeductFromShipment = $getItemsToDeductFromShipment;
+        $this->sourceDeductionRequestFromShipmentFactory = $sourceDeductionRequestFromShipmentFactory;
+        $this->sourceValidatorService = $sourceValidatorService;
+    }
+
+    /**
+     * @inheridoc
+     */
+    public function validate(\Magento\Sales\Model\Order\Shipment $shipment): void
+    {
+        if ($shipment->getOrigData('entity_id')) {
+            return;
+        }
+
+        if (!empty($shipment->getExtensionAttributes())
+            && !empty($shipment->getExtensionAttributes()->getSourceCode())) {
+            $sourceCode = $shipment->getExtensionAttributes()->getSourceCode();
+        } elseif ($this->isSingleSourceMode->execute()) {
+            $sourceCode = $this->defaultSourceProvider->getCode();
+        }
+
+        $shipmentItems = $this->getItemsToDeductFromShipment->execute($shipment);
+
+        if (!empty($shipmentItems)) {
+            $sourceDeductionRequest = $this->sourceDeductionRequestFromShipmentFactory->execute(
+                $shipment,
+                $sourceCode,
+                $shipmentItems
+            );
+            $this->sourceValidatorService->execute($sourceDeductionRequest);
+        }
+    }
+}
diff --git a/Model/CheckoutConfigProvider.php b/Model/CheckoutConfigProvider.php
@@ -0,0 +1,25 @@
+<?php declare(strict_types=1);
+
+namespace Afterpay\Afterpay\Model;
+
+class CheckoutConfigProvider implements \Magento\Checkout\Model\ConfigProviderInterface
+{
+    private \Magento\Framework\Locale\Resolver $localeResolver;
+
+    public function __construct(
+        \Magento\Framework\Locale\Resolver $localeResolver
+    ) {
+        $this->localeResolver = $localeResolver;
+    }
+
+    public function getConfig(): array
+    {
+        return [
+            'payment' => [
+                'afterpay' => [
+                    'locale' => $this->localeResolver->getLocale()
+                ]
+            ]
+        ];
+    }
+}
diff --git a/Model/Config.php b/Model/Config.php
@@ -26,6 +26,7 @@ class Config
     const XML_PATH_ALLOW_SPECIFIC_COUNTRIES  = 'payment/afterpay/allowspecific';
     const XML_PATH_SPECIFIC_COUNTRIES  = 'payment/afterpay/specificcountry';
     const XML_PATH_ALLOWED_MERCHANT_COUNTRIES  = 'payment/afterpay/allowed_merchant_countries';
+    const XML_PATH_ALLOWED_MERCHANT_CURRENCIES  = 'payment/afterpay/allowed_merchant_currencies';
     const XML_PATH_PAYPAL_MERCHANT_COUNTRY  = 'paypal/general/merchant_country';
 
     private \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig;
@@ -241,6 +242,22 @@ public function getAllowedCountries(?int $scopeCode = null): array
         return [];
     }
 
+    /**
+     * @return string[]
+     */
+    public function getAllowedCurrencies(?int $scopeCode = null): array
+    {
+        $specificCountries = $this->scopeConfig->getValue(
+            self::XML_PATH_ALLOWED_MERCHANT_CURRENCIES,
+            ScopeInterface::SCOPE_WEBSITE,
+            $scopeCode
+        );
+        if ($specificCountries != null) {
+            return explode(",", $specificCountries);
+        }
+        return [];
+    }
+
     /**
      * @return string[]
      */
@@ -301,6 +318,17 @@ public function getMerchantCountry(
         return null;
     }
 
+    public function getMerchantCurrency(
+        string $scope = ScopeInterface::SCOPE_WEBSITES,
+        ?int $scopeCode = null
+    ): ?string {
+        return $this->scopeConfig->getValue(
+            \Magento\Directory\Model\Currency::XML_PATH_CURRENCY_BASE,
+            $scope,
+            $scopeCode
+        );
+    }
+
     public function getByConfigPath(?string $path, ?int $scopeCode = null): ?string
     {
         if (!$path) {

diff --git a/Model/Order/Shipment/CaptureProcessor.php b/Model/Order/Shipment/CaptureProcessor.php
@@ -11,16 +11,19 @@ class CaptureProcessor
     private \Magento\Payment\Gateway\Data\PaymentDataObjectFactoryInterface $paymentDataObjectFactory;
     private \Afterpay\Afterpay\Model\Order\Payment\Auth\ExpiryDate $authExpiryDate;
     private \Afterpay\Afterpay\Model\Payment\AmountProcessor\Shipment $shipmentAmountProcessor;
+    private \Afterpay\Afterpay\Model\Spi\StockItemsValidatorInterface $stockItemsValidator;
 
     public function __construct(
         \Magento\Payment\Gateway\CommandInterface $authCaptureCommand,
         \Magento\Payment\Gateway\Data\PaymentDataObjectFactoryInterface $paymentDataObjectFactory,
         \Afterpay\Afterpay\Model\Order\Payment\Auth\ExpiryDate $authExpiryDate,
+        \Afterpay\Afterpay\Model\Spi\StockItemsValidatorInterface $stockItemsValidator,
         \Afterpay\Afterpay\Model\Payment\AmountProcessor\Shipment $shipmentAmountProcessor
     ) {
         $this->authCaptureCommand = $authCaptureCommand;
         $this->paymentDataObjectFactory = $paymentDataObjectFactory;
         $this->authExpiryDate = $authExpiryDate;
+        $this->stockItemsValidator = $stockItemsValidator;
         $this->shipmentAmountProcessor = $shipmentAmountProcessor;
     }
 
@@ -43,7 +46,7 @@ public function execute(\Magento\Sales\Model\Order\Shipment $shipment): void
 
         if ($amountToCaptureExists && $correctStateForAuthCapture) {
             $this->validateAuthExpiryDate($additionalInfo[AdditionalInformationInterface::AFTERPAY_AUTH_EXPIRY_DATE]);
-
+            $this->stockItemsValidator->validate($shipment);
             $amountToCapture = $this->shipmentAmountProcessor->process($shipment->getItemsCollection(), $payment);
 
             if ($amountToCapture > 0) {

diff --git a/Model/Payment/AmountProcessor/CreditMemo.php b/Model/Payment/AmountProcessor/CreditMemo.php
@@ -160,7 +160,7 @@ private function processRolloverDiscountForVoidAmount(
     private function calculateItemPrice(\Magento\Sales\Model\Order\Creditmemo\Item $item, float $qty): float
     {
         $discountPerItem = $item->getBaseDiscountAmount() / $item->getQty();
-        $pricePerItem = $item->getBaseRowTotalInclTax() / $item->getQty();
+        $pricePerItem = ($item->getBaseRowTotal() + $item->getBaseTaxAmount()) / $item->getQty();
         return $qty * ($pricePerItem - $discountPerItem);
     }
 

diff --git a/Model/Payment/AmountProcessor/Order.php b/Model/Payment/AmountProcessor/Order.php
@@ -23,7 +23,7 @@ public function process(array $items, \Magento\Sales\Model\Order\Payment $paymen
     protected function calculateItemPrice(\Magento\Sales\Model\Order\Item $item, float $qty): float
     {
         $discountPerItem = $item->getBaseDiscountAmount() / $item->getQtyOrdered();
-        $pricePerItem =  $item->getBaseRowTotalInclTax() / $item->getQtyOrdered();
+        $pricePerItem =  ($item->getBaseRowTotal() + $item->getBaseTaxAmount()) / $item->getQtyOrdered();
         return $qty * ($pricePerItem - $discountPerItem);
     }