Merge pull request #41 from pagantis/INT-942

Int 942

.circleci/config.yml

@@ -95,13 +95,6 @@ commands:
           name: Buy Unregistered
           command: |
             vendor/bin/phpunit --group magento-buy-unregistered -d magentoVersion -d ${VERSION}
-  magento_register:
-    description: "Register Test"
-    steps:
-      - run:
-          name: Register Test
-          command: |
-            vendor/bin/phpunit --group magento-register -d magentoVersion -d ${VERSION}
   magento_buy_registered:
     description: "Buy Registered Test"
     steps:
@@ -127,7 +120,6 @@ jobs:
       - basic_test
       - magento_install
       - magento_buy_unregistered
-      - magento_register
       - magento_buy_registered
   test-magento-23:
     environment:
@@ -146,7 +138,6 @@ jobs:
       - basic_test
       - magento_install
       - magento_buy_unregistered
-      - magento_register
       - magento_buy_registered
 workflows:
   version: 2

Block/Product/Simulator.php

@@ -114,11 +114,6 @@ class Simulator extends Template
      */
     protected $decimalSeparator;
 
-    /**
-     * @var String
-     */
-    protected $separator;
-
     /**
      * Simulator constructor.
      *
@@ -157,7 +152,6 @@ public function __construct(
         $this->promotedMessage = $this->extraConfig['PAGANTIS_PROMOTION_EXTRA'];
         $this->thousandSeparator = $this->extraConfig['PAGANTIS_SIMULATOR_THOUSANDS_SEPARATOR'];
         $this->decimalSeparator = $this->extraConfig['PAGANTIS_SIMULATOR_DECIMAL_SEPARATOR'];
-        $this->separator = __('ó');
 
         $this->promoted = $this->isProductInPromotion();
     }
@@ -439,22 +433,6 @@ public function setDecimalSeparator($decimalSeparator)
         $this->decimalSeparator = $decimalSeparator;
     }
 
-    /**
-     * @return String
-     */
-    public function getSeparator()
-    {
-        return $this->separator;
-    }
-
-    /**
-     * @param String $separator
-     */
-    public function setSeparator($separator)
-    {
-        $this->separator = $separator;
-    }
-
     /**
      * @return bool
      */

Model/Ui/ConfigProvider.php

@@ -102,7 +102,7 @@ public function getConfig()
                     'thousandSeparator' => $this->extraConfig['PAGANTIS_SIMULATOR_THOUSANDS_SEPARATOR'],
                     'decimalSeparator' => $this->extraConfig['PAGANTIS_SIMULATOR_DECIMAL_SEPARATOR'],
                     'quotesStart' => $this->extraConfig['PAGANTIS_SIMULATOR_START_INSTALLMENTS'],
-                    'type'      => $this->extraConfig['PAGANTIS_SIMULATOR_DISPLAY_TYPE'],
+                    'type'      => $this->extraConfig['PAGANTIS_SIMULATOR_DISPLAY_TYPE_CHECKOUT'],
                     'skin'      => $this->extraConfig['PAGANTIS_SIMULATOR_DISPLAY_SKIN'],
                     'position'  => $positionSelector
                 ],

Setup/InstallData.php

@@ -17,7 +17,8 @@ class InstallData implements InstallDataInterface
      */
     public $defaultConfigs = array(
        'PAGANTIS_TITLE'=>'Pago en cuotas',
-       'PAGANTIS_SIMULATOR_DISPLAY_TYPE'=>'sdk.simulator.types.SELECTABLE_TEXT_CUSTOM',
+       'PAGANTIS_SIMULATOR_DISPLAY_TYPE'=>'sdk.simulator.types.PRODUCT_PAGE',
+       'PAGANTIS_SIMULATOR_DISPLAY_TYPE_CHECKOUT'=>'sdk.simulator.types.CHECKOUT_PAGE',
        'PAGANTIS_SIMULATOR_DISPLAY_SKIN'=>'sdk.simulator.skins.BLUE',
        'PAGANTIS_SIMULATOR_DISPLAY_POSITION'=>'hookDisplayProductButtons',
        'PAGANTIS_SIMULATOR_START_INSTALLMENTS'=>3,

Setup/UpgradeData.php

@@ -63,6 +63,22 @@ public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface
             }
         }
 
+        if (version_compare($context->getVersion(), '8.3.2') < 0) {
+            $newConfigs = array(
+                /* INSERT NEW CONFIGS PARAMS HERE:'config'=>'<value>'*/
+                'PAGANTIS_SIMULATOR_DISPLAY_TYPE_CHECKOUT' => 'sdk.simulator.types.CHECKOUT_PAGE'
+            );
+            foreach ($newConfigs as $config => $value) {
+                $setup->getConnection()->insert(self::CONFIG_TABLE, array('config'=>$config, 'value'=>$value));
+            }
+            $setup->getConnection()->update(
+                self::CONFIG_TABLE,
+                array('value' => 'sdk.simulator.types.PRODUCT_PAGE'),
+                "config='PAGANTIS_SIMULATOR_DISPLAY_TYPE'"
+            );
+
+        }
+
         $eavSetup = $this->eavSetupFactory->create(['setup' => $setup]);
         $eavSetup->addAttribute(
             \Magento\Catalog\Model\Product::ENTITY,

composer.json

@@ -1,6 +1,6 @@
 {
   "name": "pagantis/magento-2x",
-  "version": "8.3.1",
+  "version": "8.3.2",
   "description": "Pagantis Magento 2 module",
   "type": "magento2-module",
   "keywords": [

etc/module.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Pagantis_Pagantis" setup_version="8.3.1">
+    <module name="Pagantis_Pagantis" setup_version="8.3.2">
         <sequence>
             <module name="Magento_Sales"/>
             <module name="Magento_Payment"/>

view/frontend/templates/product/simulator.phtml

@@ -42,20 +42,10 @@ if($block->isEnabled()==='1' && $block->getProductSimulator()==='1' && $block->g
                     return simulatorLoaded;
                 }
 
-                function prependSeparator()
-                {
-                    var node = document.querySelector(findPositionSelector());
-                    var textnode = document.createTextNode("<?php echo $block->getSeparator();?>");
-                    var spannode = document.createElement("span");
-                    spannode.style.cssText = 'margin-right:5px; margin-top: 5px';
-                    spannode.appendChild(textnode);
-                    node.prepend(spannode);
-                    return true;
-                }
-
                 function moveToPrice()
                 {
-                    if (simulatorType === 'sdk.simulator.types.SELECTABLE_TEXT_CUSTOM') {
+                    if (simulatorType === 'sdk.simulator.types.SELECTABLE_TEXT_CUSTOM' ||
+                        simulatorType === 'sdk.simulator.types.PRODUCT_PAGE') {
                         var simnode = document.querySelector(findPositionSelector());
 
                         var detailnode = document.getElementsByClassName('product-add-form');
@@ -142,7 +132,6 @@ if($block->isEnabled()==='1' && $block->getProductSimulator()==='1' && $block->g
                         window.MGSimulatorId = window.sdk.simulator.init(simulator_options);
                         if(window.MGSimulatorId != '') {
                             moveToPrice();
-                            prependSeparator();
                         }
                         return false;
                     }

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

@@ -16,7 +16,7 @@ define(
     function ($, Component, url, customerData, errorProcessor, fullScreenLoader, quote, pgSDK, selectPaymentMethodAction, checkoutData, totals, priceUtils) {
         'use strict';
 
-        window.checkoutConfig.payment.pagantis.guestEmail = quote.guestEmail;
+        window.checkoutConfig.payment.pagantis.fullQuote = quote;
 
         return Component.extend({
             defaults: {
@@ -72,7 +72,10 @@ define(
 
             placeOrder: function () {
                 var paymentUrl = url.build('pagantis/Payment');
-                $.post(paymentUrl, { email: window.checkoutConfig.payment.pagantis.guestEmail }, 'json')
+
+                var guestEmail = window.checkoutConfig.payment.pagantis.fullQuote.guestEmail;
+
+                $.post(paymentUrl, { email: guestEmail }, 'json')
                     .done(function (response) {
                         window.location.replace(response);
                     })