Merge pull request #89 from Adyen/develop

Release v2.1.0

Api/Data/ExpressDataInterface.php

@@ -8,6 +8,7 @@ interface ExpressDataInterface
     public const MASKED_QUOTE_ID = 'masked_quote_id';
     public const ADYEN_PAYMENT_METHODS = 'adyen_payment_methods';
     public const TOTALS = 'totals';
+    public const IS_VIRTUAL_QUOTE = 'is_virtual_quote';
 
     /**
      * Get Masked Quote ID
@@ -59,4 +60,21 @@ public function getTotals(): ?\Magento\Quote\Api\Data\TotalsInterface;
     public function setTotals(
         \Magento\Quote\Api\Data\TotalsInterface $totals
     ): void;
+
+    /**
+     * Is quote virtual
+     *
+     * @return bool|null
+     */
+    public function getIsVirtualQuote(): ?bool;
+
+    /**
+     * Set is quote virtual
+     *
+     * @param bool $isVirtual
+     * @return void
+     */
+    public function setIsVirtualQuote(
+        bool $isVirtual
+    ): void;
 }

Model/ExpressData.php

@@ -7,7 +7,6 @@
 use Adyen\ExpressCheckout\Api\Data\ExpressDataInterface;
 use Magento\Framework\DataObject;
 use Magento\Quote\Api\Data\TotalsInterface;
-use Magento\Quote\Model\Quote\Address\Total;
 
 class ExpressData extends DataObject implements ExpressDataInterface
 {
@@ -94,4 +93,28 @@ public function setTotals(TotalsInterface $totals): void
             $totals
         );
     }
+
+    /**
+     * @return bool|null
+     */
+    public function getIsVirtualQuote(): ?bool
+    {
+        $isVirtual = $this->getData(self::IS_VIRTUAL_QUOTE);
+
+        return $isVirtual ?
+            (bool) $isVirtual :
+            null;
+    }
+
+    /**
+     * @param bool $isVirtual
+     * @return void
+     */
+    public function setIsVirtualQuote(bool $isVirtual): void
+    {
+        $this->setData(
+            self::IS_VIRTUAL_QUOTE,
+            $isVirtual
+        );
+    }
 }

Model/ExpressDataBuilder.php

@@ -175,6 +175,7 @@ public function execute(
         $expressData->setAdyenPaymentMethods($adyenPaymentMethods);
         $maskedQuoteId = $this->getMaskedQuoteId($quote);
         $expressData->setMaskedQuoteId($maskedQuoteId);
+        $expressData->setIsVirtualQuote($quote->isVirtual());
         $cartTotals = $this->cartTotalRepository->get(
             $quote->getId()
         );

composer.json

@@ -2,7 +2,7 @@
   "name": "adyen/adyen-magento2-expresscheckout",
   "description": "Official Adyen Magento2 plugin to add express payment method shortcuts.",
   "type": "magento2-module",
-  "version": "2.0.2",
+  "version": "2.1.0",
   "license": "MIT",
   "repositories": [
     {

etc/module.xml

@@ -11,7 +11,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Adyen_ExpressCheckout" setup_version="2.0.2">
+    <module name="Adyen_ExpressCheckout" setup_version="2.1.0">
         <sequence>
             <module name="Adyen_Payment"/>
         </sequence>

view/frontend/web/js/actions/getPaymentStatus.js

@@ -0,0 +1,39 @@
+define([
+    'mage/storage',
+    'Adyen_ExpressCheckout/js/helpers/getIsLoggedIn',
+    'Adyen_ExpressCheckout/js/model/maskedId',
+    'Adyen_ExpressCheckout/js/model/config',
+    'Adyen_ExpressCheckout/js/helpers/getMaskedIdFromCart'
+], function (
+    storage,
+    isLoggedIn,
+    maskedIdModel,
+    configModel,
+    getMaskedIdFromCart
+) {
+    'use strict';
+
+    return function (orderId, isProductView) {
+
+        return new Promise(function (resolve, reject) {
+            const maskedId = isProductView
+                ? maskedIdModel().getMaskedId()
+                : getMaskedIdFromCart();
+
+            const config = configModel().getConfig();
+
+            let url = isLoggedIn()
+                ? 'rest/' + config.storeCode + '/V1/adyen/orders/carts/mine/payment-status'
+                : 'rest/' + config.storeCode + '/V1/adyen/orders/guest-carts/' + maskedId + '/payment-status';
+
+            let payload = {
+                orderId: orderId
+            }
+
+            storage.post(
+                url,
+                JSON.stringify(payload)
+            ).done(resolve).fail(reject);
+        });
+    };
+});

view/frontend/web/js/actions/setBillingAddress.js

@@ -0,0 +1,13 @@
+define([
+    'mage/storage',
+    'Adyen_ExpressCheckout/js/helpers/getApiUrl'
+], function (storage, getApiUrl) {
+    'use strict';
+
+    return function (payload, isProductView) {
+        return storage.post(
+            getApiUrl('billing-address', isProductView),
+            JSON.stringify(payload)
+        );
+    };
+});