Merge pull request #75 from checkout/dev

3DS and T&C validation check

Author: nicolas-maalouf-cko

Controller/Payment/PlaceOrder.php

@@ -139,12 +139,15 @@ public function createOrder($params) {
         try {
             // Create an order from the quote
             $this->validateQuote($params['quote']);
-            //$this->orderService->execute($params['quote'], $params['cardToken'], $params['agreement']);
-            // Temporary workaround for a M2 code T&C checkbox issue not sending data
+            
+            /**
+             *  Temporary workaround for a M2 code T&C checkbox issue not sending data.
+             *  The last parameter should be $params['agreement']
+             */
             $this->orderService->execute($params['quote'], $params['cardToken'], array(true));
 
             // 3D Secure redirection if needed
-            if($this->gatewayConfig->isVerify3DSecure()) {
+            if ($this->gatewayConfig->isVerify3DSecure()) {
                 $this->place3DSecureRedirectUrl();
                 exit();
             }

Controller/Payment/Verify.php

@@ -15,7 +15,6 @@
 use Magento\Customer\Model\Session as CustomerSession;
 use Magento\Framework\Exception\LocalizedException;
 use CheckoutCom\Magento2\Gateway\Config\Config as GatewayConfig;
-use CheckoutCom\Magento2\Model\Service\OrderService;
 use CheckoutCom\Magento2\Model\Service\VerifyPaymentService;
 use CheckoutCom\Magento2\Model\Service\StoreCardService;
 use CheckoutCom\Magento2\Model\Factory\VaultTokenFactory;
@@ -37,11 +36,6 @@ class Verify extends AbstractAction {
      */
     protected $verifyPaymentService;
 
-    /**
-     * @var OrderService
-     */
-    protected $orderService;
-
     /**
      * @var StoreCardService 
      */
@@ -88,7 +82,6 @@ class Verify extends AbstractAction {
      * @param Session $session
      * @param GatewayConfig $gatewayConfig
      * @param VerifyPaymentService $verifyPaymentService
-     * @param OrderService $orderService
      * @param StoreCardService $storeCardService
      * @param CustomerSession $customerSession
      * @param VaultTokenFactory $vaultTokenFactory
@@ -101,7 +94,6 @@ public function __construct(
         Session $session, 
         GatewayConfig $gatewayConfig, 
         VerifyPaymentService $verifyPaymentService, 
-        OrderService $orderService, 
         StoreCardService $storeCardService, 
         CustomerSession $customerSession, 
         VaultTokenFactory $vaultTokenFactory, 
@@ -116,7 +108,6 @@ public function __construct(
         $this->session                  = $session;
         $this->gatewayConfig            = $gatewayConfig;
         $this->verifyPaymentService     = $verifyPaymentService;
-        $this->orderService             = $orderService;
         $this->storeCardService         = $storeCardService;
         $this->customerSession          = $customerSession;
         $this->vaultTokenFactory        = $vaultTokenFactory;

Model/Service/OrderService.php

@@ -130,9 +130,13 @@ public function __construct(
      * @throws LocalizedException
      */
     public function execute(Quote $quote, $cardToken, array $agreement) {
-        if (!$this->agreementsValidator->isValid($agreement)) {
-            throw new LocalizedException(__('Please agree to all the terms and conditions before placing the order.'));
-        }
+        /**
+         *  Temporary workaround for a M2 code T&C checkbox issue not sending data.
+         *  The last parameter should be $params['agreement']
+         */
+        //if (!$this->agreementsValidator->isValid($agreement)) {
+            //throw new LocalizedException(__('Please agree to all the terms and conditions before placing the order.'));
+        //}
 
         if ($this->getCheckoutMethod($quote) === Onepage::METHOD_GUEST) {
             $this->prepareGuestQuote($quote);

composer.json

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