From 9301c9819baca46b957ec752baf48b070a5fc659 Mon Sep 17 00:00:00 2001
From: Jacqueline Rinnhofer <jacqueline.rinnhofer@partner.wirecard.com>
Date: Wed, 22 Mar 2017 16:00:01 +0100
Subject: [PATCH 1/2] # Add Iframe build for maestro

---
 .../responsive/frontend/_public/src/js/wirecard_seamless.js   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Frontend/WirecardCheckoutSeamless/Views/responsive/frontend/_public/src/js/wirecard_seamless.js b/Frontend/WirecardCheckoutSeamless/Views/responsive/frontend/_public/src/js/wirecard_seamless.js
index 70503ed..bd9de4f 100644
--- a/Frontend/WirecardCheckoutSeamless/Views/responsive/frontend/_public/src/js/wirecard_seamless.js
+++ b/Frontend/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';

From b7029e34c385d83d10aedcc7f4f74d1ac9442040 Mon Sep 17 00:00:00 2001
From: jakubpolomsky <jakub.polomsky@partner.wirecard.com>
Date: Thu, 23 Mar 2017 13:41:40 +0100
Subject: [PATCH 2/2] #47 add own maestro type

- save pending progress even if the pending mail is not sent
---
 Frontend/WirecardCheckoutSeamless/Bootstrap.php             | 2 +-
 .../Controllers/Frontend/WirecardCheckoutSeamless.php       | 6 +++---
 Frontend/WirecardCheckoutSeamless/Models/Config.php         | 2 +-
 .../frontend/_resources/javascript/wirecard_seamless.js     | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Frontend/WirecardCheckoutSeamless/Bootstrap.php b/Frontend/WirecardCheckoutSeamless/Bootstrap.php
index 47208ca..804db6b 100644
--- 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
index 0da6219..b32dd1e 100644
--- 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
index 00010a9..cde19af 100644
--- 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
index d510790..864d084 100644
--- 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';