Merge pull request #26 from wirecard/TPWDCEE-652

Tpwdcee 652
qenta-cee · Jan 9, 2018 · 12dee89 · 12dee89
2 parents 0e72b0a + 6b5981e
commit 12dee89
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 50 deletions.
diff --git a/wirecardceecheckoutseamless/models/Wirecard/CheckoutSeamless/Payment.php b/wirecardceecheckoutseamless/models/Wirecard/CheckoutSeamless/Payment.php
@@ -867,4 +867,14 @@ public function getPayolutionLink()
             return $this->module->getPaymentTranslations()['consent'];
         }
     }
+
+    /**
+     * return payment method
+     *
+     * @return string
+     */
+    public function getPaymentMethod()
+    {
+        return $this->paymentMethod;
+    }
 }
diff --git a/wirecardceecheckoutseamless/models/Wirecard/CheckoutSeamless/Payment/Quick.php b/wirecardceecheckoutseamless/models/Wirecard/CheckoutSeamless/Payment/Quick.php
diff --git a/wirecardceecheckoutseamless/translations/de.php b/wirecardceecheckoutseamless/translations/de.php
@@ -103,7 +103,6 @@
 $_MODULE['<{wirecardceecheckoutseamless}prestashop>wirecardceecheckoutseamless_ffe0b676beb70ae97ad71df7fa9321d1'] = 'Skrill Direct';
 $_MODULE['<{wirecardceecheckoutseamless}prestashop>wirecardceecheckoutseamless_c590349d782553f4011343e642d2cd08'] = 'Alternative Zahlungsmittel';
 $_MODULE['<{wirecardceecheckoutseamless}prestashop>wirecardceecheckoutseamless_6abcd8eecb4f2abb6ccfe36ef7046ba0'] = 'paysafecard';
-$_MODULE['<{wirecardceecheckoutseamless}prestashop>wirecardceecheckoutseamless_a41cdeba95dd125a6efea489c114a4f9'] = '@Quick';
 $_MODULE['<{wirecardceecheckoutseamless}prestashop>wirecardceecheckoutseamless_9248c264c15a45f741eeba6b28a17fc5'] = 'ePay.bg';
 $_MODULE['<{wirecardceecheckoutseamless}prestashop>wirecardceecheckoutseamless_1badcb6bf3c9f9a61b9221344ccdc53c'] = 'moneta.ru';
 $_MODULE['<{wirecardceecheckoutseamless}prestashop>wirecardceecheckoutseamless_1525848c624bf1a02dfce01c9e8145cf'] = 'Skrill Digital Wallet';

diff --git a/wirecardceecheckoutseamless/wirecardceecheckoutseamless.php b/wirecardceecheckoutseamless/wirecardceecheckoutseamless.php
@@ -120,7 +120,7 @@ public function __construct()
         $this->config = $this->config();
         $this->name = 'wirecardceecheckoutseamless';
         $this->tab = 'payments_gateways';
-        $this->version = '2.0.3';
+        $this->version = '2.0.4';
         $this->author = 'Wirecard';
         $this->controllers = array(
             'confirm',
@@ -760,13 +760,6 @@ protected function config()
                         'class' => 'Paysafecard',
                         'logo' => 'paysafecard.png'
                     ),
-                    array(
-                        'name' => 'quick',
-                        'label' => $this->l('@Quick'),
-                        'type' => 'onoff',
-                        'class' => 'Quick',
-                        'logo' => 'quick.png'
-                    ),
                     array(
                         'name' => 'epaybg',
                         'label' => $this->l('ePay.bg'),
@@ -2270,7 +2263,11 @@ function ($e) {
             }
         }
 
-        Tools::redirect($this->context->link->getModuleLink($this->name, 'paymentIFrame'));
+        if ($this->getPaymentType($paymentTypeName)->getPaymentMethod() == WirecardCEE_Stdlib_PaymentTypeAbstract::SOFORTUEBERWEISUNG) {
+            Tools::redirect($this->context->cookie->wcsRedirectUrl);
+        } else {
+            Tools::redirect($this->context->link->getModuleLink($this->name, 'paymentIFrame'));
+        }
     }
 
     /**