Merge pull request #48 from wirecard/pciIframeMaestro

Pciiframemaestro
qenta-cee · Mar 27, 2017 · 77501f5 · 77501f5
2 parents 769dd3e + b7029e3
commit 77501f5
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/Frontend/WirecardCheckoutSeamless/Bootstrap.php b/Frontend/WirecardCheckoutSeamless/Bootstrap.php
@@ -64,7 +64,7 @@ public function getCapabilities()
      */
     public function getVersion()
     {
-        return '1.9.1';
+        return '1.9.2';
     }
 
     /**

diff --git a/Frontend/WirecardCheckoutSeamless/Controllers/Frontend/WirecardCheckoutSeamless.php b/Frontend/WirecardCheckoutSeamless/Controllers/Frontend/WirecardCheckoutSeamless.php
@@ -431,9 +431,9 @@ public function confirmAction()
                                 $variables['confirmMailDeliveryFailed'] = true;
                                 Shopware()->Session()->offsetSet('sOrderVariables', $variables);
                             }
-                            if (Shopware()->WirecardCheckoutSeamless()->Config()->saveReturnValues() > 1) {
-                                $this->saveComments($return , $orderId);
-                            }
+                        }
+                        if (Shopware()->WirecardCheckoutSeamless()->Config()->saveReturnValues() > 1) {
+                            $this->saveComments($return , $orderId);
                         }
                     }
                     break;

diff --git a/Frontend/WirecardCheckoutSeamless/Models/Config.php b/Frontend/WirecardCheckoutSeamless/Models/Config.php
@@ -615,7 +615,7 @@ public function getPaymentMethods()
             'name' => 'maestro',
             'description' => 'Maestro SecureCode',
             'template' => '',
-            'call' => WirecardCEE_QMore_PaymentType::CCARD,
+            'call' => WirecardCEE_QMore_PaymentType::MAESTRO,
             'translation' => Array('description' => 'Wirecard Maestro SecureCode', 'additionalDescription' => '')
         );
         $pm[] = array(

diff --git a/Frontend/WirecardCheckoutSeamless/Views/frontend/_resources/javascript/wirecard_seamless.js b/Frontend/WirecardCheckoutSeamless/Views/frontend/_resources/javascript/wirecard_seamless.js
@@ -23,7 +23,7 @@ var wirecardPayment = {
     {
         var paymentInformation = {};
         $("#wd_payment_fields").find(":input").each(function() {
-            if(this.name == "paymentType" && ($(this).val() == 'maestro' || $(this).val() == 'ccard-moto'))
+            if(this.name == "paymentType" && $(this).val() == 'ccard-moto')
             {
                 //overwrite paymentType with ccard
                 paymentInformation[this.name] = 'ccard';

diff --git a/...nd/WirecardCheckoutSeamless/Views/responsive/frontend/_public/src/js/wirecard_seamless.js b/...nd/WirecardCheckoutSeamless/Views/responsive/frontend/_public/src/js/wirecard_seamless.js
@@ -47,6 +47,8 @@ var wirecardPayment = {
                 this.pci3Iframes.ccard = wdcee.buildIframeCreditCard('wirecardccardIframeContainer', '700px', '200px');
             } else if ($('#wirecardccard-motoIframeContainer').length > 0) {
                 this.pci3Iframes.ccard = wdcee.buildIframeCreditCard('wirecardccard-motoIframeContainer', '700px', '200px');
+            } else if ($('#wirecardmaestroIframeContainer').length > 0) {
+                this.pci3Iframes.maestro = wdcee.buildIframeMaestro('wirecardmaestroIframeContainer', '700px', '200px');
             }
         }
     },
@@ -117,7 +119,7 @@ var wirecardPayment = {
     {
         var paymentInformation = {};
         $("#wd_payment_fields").find(":input").each(function() {
-            if(this.name == "paymentType" && ($(this).val() == 'maestro' || $(this).val() == 'ccard-moto'))
+            if(this.name == "paymentType" && $(this).val() == 'ccard-moto')
             {
                 //overwrite paymentType with ccard
                 paymentInformation[this.name] = 'ccard';
-Original file line number
+Diff line change
@@ Expand Up / @@ -64,7 +64,7 @@ public function getCapabilities() @@
          */
         public function getVersion()
         {
-            return '1.9.1';
+            return '1.9.2';
         }
         /**
@@ Expand Down @@