Merge remote-tracking branch 'origin/prestashop-1.7'

README.md

@@ -1,17 +1,10 @@
 # Wirecard Checkout Page plugin for PrestaShop
 
 [![License](https://img.shields.io/badge/license-GPLv2-blue.svg)](https://raw.githubusercontent.com/wirecard/prestashop-wcp/master/LICENSE)
-[![PrestaShop](https://img.shields.io/badge/PrestaShop-v1.5.6.2-green.svg)](https://www.prestashop.com/)
-[![PrestaShop](https://img.shields.io/badge/PrestaShop-v1.6.1.9-green.svg)](https://www.prestashop.com/)
+[![PrestaShop](https://img.shields.io/badge/PrestaShop-v1.7.5.0-green.svg)](https://www.prestashop.com/)
 [![PHP v5.6](https://img.shields.io/badge/php-v5.6-yellow.svg)](http://www.php.net)
-
-----
-**IMPORTANT INFORMATION**  
-You are visiting a shop extension which will become obsolete in the near future. It has been replaced by a new one with new features and enhanced functionality.   
-Please use our new shop extension available on [prestashop.wirecard.com](https://prestashop.wirecard.com), which will be maintained, updated and supported on a regular basis.  
-If you have any questions, please contact [email protected]
-
-----
+[![PHP v7.0](https://img.shields.io/badge/php-v7.0-yellow.svg)](http://www.php.net)
+[![PHP v7.1](https://img.shields.io/badge/php-v7.1-yellow.svg)](http://www.php.net)
 
 Wirecard Checkout Page plugin for PrestaShop. 
 

wirecardceecheckoutpage/config.xml

@@ -2,9 +2,9 @@
         <module>
             <name>wirecardceecheckoutpage</name>
             <displayName><![CDATA[Wirecard Checkout Page]]></displayName>
-            <version><![CDATA[1.5.1]]></version>
+            <version>2.1.5</version>
             <description><![CDATA[Wirecard Checkout Page payment module]]></description>
-            <author><![CDATA[Wirecard CEE]]></author>
+            <author>Wirecard</author>
             <tab><![CDATA[payments_gateways]]></tab>
             <confirmUninstall>Are you sure you want to delete these details?</confirmUninstall>
             <is_configurable>1</is_configurable>

wirecardceecheckoutpage/controllers/front/payment.php

@@ -36,11 +36,15 @@ public function postProcess()
     {
         $cart = $this->context->cart;
 
-        if ($cart->id_customer == 0 || $cart->id_address_delivery == 0 || $cart->id_address_invoice == 0 || !$this->module->active) {
+        if ($cart->id_customer == 0
+            || $cart->id_address_delivery == 0
+            || $cart->id_address_invoice == 0
+            || !$this->module->active) {
             Tools::redirect('index.php?controller=order&step=1');
         }
 
-        // Check that this payment option is still available in case the customer changed his address just before the end of the checkout process
+        // Check that this payment option is still available in case the customer
+        // changed his address just before the end of the checkout process
         $authorized = false;
         foreach (Module::getPaymentModules() as $module) {
             if ($module['name'] == 'wirecardceecheckoutpage') {
@@ -60,7 +64,11 @@ public function postProcess()
         }
 
         try {
-            $this->module->initiatePayment(Tools::getValue('paymentType'));
+            $additionalData = array();
+            if (Tools::strlen(Tools::getValue('financialInstitution', ''))) {
+                $additionalData['financialinstitution'] = Tools::getValue('financialInstitution');
+            }
+            $this->module->initiatePayment(Tools::getValue('paymentType'), $additionalData);
         } catch (Zend_Exception $e) {
             echo $this->module->displayError($e->getMessage());
         }

wirecardceecheckoutpage/controllers/front/paymentIFrame.php

@@ -44,15 +44,12 @@ public function initContent()
         $this->display_column_left = false;
         parent::initContent();
 
-        $cart = $this->context->cart;
-
         $this->context->smarty->assign(array(
             'redirectUrl' => $this->context->cookie->qpayRedirectUrl,
             'windowName' => $this->module->getWindowName()
         ));
 
+        $this->setTemplate('module:wirecardceecheckoutpage/views/templates/front/payment_iframe.tpl');
         unset($this->context->cookie->qpayRedirectUrl);
-
-        $this->setTemplate('payment_iframe.tpl');
     }
 }