Merge pull request #76 from checkout/dev

Plugin improvement

Author: nicolas-maalouf-cko

Controller/Payment/PaymentToken.php

@@ -0,0 +1,55 @@
+<?php
+/**
+ * Checkout.com Magento 2 Payment module (https://www.checkout.com)
+ *
+ * Copyright (c) 2017 Checkout.com (https://www.checkout.com)
+ * Author: David Fiaty | [email protected]
+ *
+ * License GNU/GPL V3 https://www.gnu.org/licenses/gpl-3.0.en.html
+ */
+
+namespace CheckoutCom\Magento2\Controller\Payment;
+
+use Magento\Framework\Controller\Result\JsonFactory;
+use Magento\Framework\App\Action\Context;
+use CheckoutCom\Magento2\Model\Service\PaymentTokenService;
+use CheckoutCom\Magento2\Gateway\Config\Config as GatewayConfig;
+
+class PaymentToken extends AbstractAction {
+
+    /**
+     * @var PaymentTokenService
+     */
+    protected $paymentTokenService;
+
+    /**
+     * @var JsonFactory
+     */
+    protected $resultJsonFactory;
+
+    /**
+     * PaymentToken constructor.
+     * @param PaymentTokenService $paymentTokenService
+     * @param JsonFactory $resultJsonFactory
+     */
+    public function __construct(
+        Context $context, 
+        PaymentTokenService $paymentTokenService,
+        JsonFactory $resultJsonFactory,
+        GatewayConfig $gatewayConfig
+    ) 
+    {
+        parent::__construct($context, $gatewayConfig);
+        $this->paymentTokenService  = $paymentTokenService;
+        $this->resultJsonFactory    = $resultJsonFactory;
+    }
+
+    /**
+     * Handles the controller method.
+     */
+    public function execute() {
+        return $this->resultJsonFactory->create()->setData([
+            'payment_token' => $this->paymentTokenService->getToken()
+        ]);
+    }
+}

Model/Ui/ConfigProvider.php

@@ -15,7 +15,6 @@
 use Magento\Store\Model\StoreManagerInterface;
 use CheckoutCom\Magento2\Gateway\Config\Config;
 use CheckoutCom\Magento2\Model\Adapter\ChargeAmountAdapter;
-use CheckoutCom\Magento2\Model\Service\PaymentTokenService;
 
 class ConfigProvider implements ConfigProviderInterface {
 
@@ -35,11 +34,6 @@ class ConfigProvider implements ConfigProviderInterface {
      */
     protected $checkoutSession;
 
-    /**
-     * @var PaymentTokenService
-     */
-    protected $paymentTokenService;
-
     /**
      * @var StoreManagerInterface
      */
@@ -48,13 +42,11 @@ class ConfigProvider implements ConfigProviderInterface {
     /**
      * ConfigProvider constructor.
      * @param Config $config
-     * @param PaymentTokenService $paymentTokenService
      * @param Session $checkoutSession
      * @param StoreManagerInterface $storeManager
      */
-    public function __construct(Config $config, PaymentTokenService $paymentTokenService, Session $checkoutSession, StoreManagerInterface $storeManager) {
+    public function __construct(Config $config, Session $checkoutSession, StoreManagerInterface $storeManager) {
         $this->config = $config;
-        $this->paymentTokenService  = $paymentTokenService;
         $this->checkoutSession = $checkoutSession;
         $this->storeManager = $storeManager;
     }
@@ -92,7 +84,6 @@ public function getConfig() {
                     'design_settings' => $this->config->getDesignSettings(),
                     'accepted_currencies' => $this->config->getAcceptedCurrencies(),
                     'payment_mode' => $this->config->getPaymentMode(),
-                    'payment_token' => $isActive ? $this->getPaymentToken() : '',
                     'quote_value' => $this->getQuoteValue(),
                     'quote_currency' => $this->getQuoteCurrency(),
                     'embedded_theme' => $this->config->getEmbeddedTheme(),
@@ -107,15 +98,6 @@ public function getConfig() {
         ];
     }
 
-    /**
-     * Get a payment token.
-     *
-     * @return string
-     */
-    public function getPaymentToken() {
-        return $this->paymentTokenService->getToken();
-    }
-
     /**
      * Get a quote value.
      *

composer.json

@@ -11,7 +11,7 @@
         "magento/module-vault": "*"
     },
     "type": "magento2-module",
-    "version": "1.0.32",
+    "version": "1.0.33",
     "autoload": {
         "files": [
             "registration.php"

view/frontend/web/js/view/payment/method-renderer/hosted.js

@@ -58,7 +58,16 @@ define(
              * @returns {string}
              */
             getPaymentToken: function() {                
-                return CheckoutCom.getPaymentConfig()['payment_token'];
+                // Send the request
+                var ajaxRequest = $.ajax({
+                    url: url.build('checkout_com/payment/paymentToken'),
+                    type: "post"
+                });
+
+                // Process the payment token response
+                ajaxRequest.done(function (response, textStatus, jqXHR) {
+                    $('#paymentToken').val(response.payment_token);
+                });
             },
 
             /**

view/frontend/web/template/payment/hosted.html

@@ -48,7 +48,7 @@
             <input name="logoUrl" data-bind="attr: {value: getDesignSettings()['hosted']['logo_url']}">
             <!-- /ko -->
             <!-- ko if: (getPaymentMode() === "localpayments" || getPaymentMode() === "mixed") -->
-            <input name="paymentToken" data-bind="attr: {value: getPaymentToken()}">
+            <input id ="paymentToken" name="paymentToken" data-bind="attr: {value: getPaymentToken()}">
             <!-- /ko -->
         </form>