Merge pull request #5 from wirecard/prestashop-1.7_update

#4 add compatibility with 1.7

README.md

@@ -1,9 +1,8 @@
 # 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.2-green.svg)](https://www.prestashop.com/)
-[![PHP v5.3](https://img.shields.io/badge/php-v5.3-yellow.svg)](http://www.php.net)
+[![PrestaShop](https://img.shields.io/badge/PrestaShop-v1.7.0.3-green.svg)](https://www.prestashop.com/)
+[![PHP v5.6](https://img.shields.io/badge/php-v5.3-yellow.svg)](http://www.php.net)
 
 Wirecard Checkout Page plugin for PrestaShop. 
 

wirecardceecheckoutpage/config.xml

@@ -2,7 +2,7 @@
         <module>
             <name>wirecardceecheckoutpage</name>
             <displayName><![CDATA[Wirecard Checkout Page]]></displayName>
-            <version><![CDATA[1.4.1]]></version>
+            <version><![CDATA[2.0.0]]></version>
             <description><![CDATA[Wirecard Checkout Page payment module]]></description>
             <author><![CDATA[Wirecard CEE]]></author>
             <tab><![CDATA[payments_gateways]]></tab>

wirecardceecheckoutpage/controllers/front/paymentIFrame.php

@@ -51,8 +51,7 @@ public function initContent()
             'windowName' => $this->module->getWindowName()
         ));
 
+        $this->setTemplate('module:wirecardceecheckoutpage/views/templates/front/payment_iframe.tpl');
         unset($this->context->cookie->qpayRedirectUrl);
-
-        $this->setTemplate('payment_iframe.tpl');
     }
 }

wirecardceecheckoutpage/css/style.css

@@ -1,3 +1,30 @@
+.payment-option.clearfix {
+    position:relative;
+    padding-bottom:7px;
+    border-bottom:1px dotted #d3d3d3;
+}
+
+.payment-option label {
+    position:absolute;
+    display: block !important;
+    top:0;
+    left:40px;
+    right:0;
+    bottom:-8px;
+}
+
+.payment-option label span {
+    float: left;
+}
+
+.payment-option label img {
+    float: right;
+    height: 20px;
+}
+
+#payment_form .alert span {
+    clear:both;
+}
 
 p.payment_module a.pt_wirecard:after {
     display: block;
@@ -11,116 +38,4 @@ p.payment_module a.pt_wirecard:after {
     height: 22px;
     width: 14px;
     color: #777;
-}
-
-a.pt_checkoutpage {
-    background: url(../img/payment_types/checkoutpage.png) 15px 15px no-repeat #fbfbfb;
-}
-
-a.pt_ccard {
-    background: url(../img/payment_types/ccard.png) 15px 15px no-repeat #fbfbfb;
-}
-
-a.pt_ccard-moto {
-    background: url(../img/payment_types/ccard-moto.png) 15px 15px no-repeat #fbfbfb;
-}
-
-a.pt_maestro {
-    background: url(../img/payment_types/maestro.png) 15px 15px no-repeat #fbfbfb;
-}
-
-a.pt_eps {
-    background: url(../img/payment_types/eps.png) 15px 15px no-repeat #fbfbfb;
-}
-
-a.pt_idl {
-    background: url(../img/payment_types/idl.png) 15px 15px no-repeat #fbfbfb;
-}
-
-a.pt_giropay {
-    background: url(../img/payment_types/giropay.png) 15px 15px no-repeat #fbfbfb;
-}
-
-a.pt_tatrapay {
-    background: url(../img/payment_types/tatrapay.png) 15px 15px no-repeat #fbfbfb;
-}
-
-a.pt_sofortueberweisung {
-    background: url(../img/payment_types/sofortueberweisung.png) 15px 15px no-repeat #fbfbfb;
-}
-
-a.pt_pbx {
-    background: url(../img/payment_types/pbx.png) 15px 15px no-repeat #fbfbfb;
-}
-
-a.pt_psc {
-    background: url(../img/payment_types/psc.png) 15px 15px no-repeat #fbfbfb;
-}
-
-a.pt_quick {
-    background: url(../img/payment_types/quick.png) 15px 15px no-repeat #fbfbfb;
-}
-
-a.pt_paypal {
-    background: url(../img/payment_types/paypal.png) 15px 15px no-repeat #fbfbfb;
-}
-
-a.pt_epay_bg {
-    background: url(../img/payment_types/epay-bg.png) 15px 15px no-repeat #fbfbfb;
-}
-
-a.pt_sepa-dd {
-    background: url(../img/payment_types/sepa-dd.png) 15px 15px no-repeat #fbfbfb;
-}
-
-a.pt_trustpay {
-    background: url(../img/payment_types/trustpay.png) 15px 15px no-repeat #fbfbfb;
-}
-
-a.pt_invoice {
-    background: url(../img/payment_types/invoice.png) 15px 15px no-repeat #fbfbfb;
-}
-
-a.pt_installment {
-    background: url(../img/payment_types/installment.png) 15px 15px no-repeat #fbfbfb;
-}
-
-a.pt_bancontact_mistercash {
-    background: url(../img/payment_types/bancontact_mistercash.png) 15px 15px no-repeat #fbfbfb;
-}
-
-a.pt_przelewy24 {
-    background: url(../img/payment_types/przelewy24.png) 15px 15px no-repeat #fbfbfb;
-}
-
-a.pt_moneta {
-    background: url(../img/payment_types/moneta.png) 15px 15px no-repeat #fbfbfb;
-}
-
-a.pt_poli {
-    background: url(../img/payment_types/poli.png) 15px 15px no-repeat #fbfbfb;
-}
-
-a.pt_ekonto {
-    background: url(../img/payment_types/ekonto.png) 15px 15px no-repeat #fbfbfb;
-}
-
-a.pt_trustly {
-    background: url(../img/payment_types/trustly.png) 15px 15px no-repeat #fbfbfb;
-}
-
-a.pt_mpass {
-    background: url(../img/payment_types/mpass.png) 15px 15px no-repeat #fbfbfb;
-}
-
-a.pt_skrilldirect {
-    background: url(../img/payment_types/skrilldirect.png) 15px 15px no-repeat #fbfbfb;
-}
-
-a.pt_skrillwallet {
-    background: url(../img/payment_types/skrillwallet.png) 15px 15px no-repeat #fbfbfb;
-}
-
-a.pt_voucher {
-    background: url(../img/payment_types/voucher.png) 15px 15px no-repeat #fbfbfb;
-}
+}

wirecardceecheckoutpage/views/templates/front/payment_iframe.tpl

@@ -28,8 +28,20 @@
  * By installing the plugin into the shop system the customer agrees to these terms of use.
  * Please do not use the plugin if you do not agree to these terms of use!
  *}
+{extends file='page.tpl'}
+{block name='content'}
+	<section id="content">
+		<div class="card card-block">
+			<div class="row">
+				<div class="col-xs-12">
 
-{capture name=path}
-	{l s='Pay with Wirecard Checkout Page' mod='wirecardceecheckoutpage'}
-{/capture}
-<iframe src="{$redirectUrl}" width="100%" height="840" name="{$windowName}" border="0" frameborder="0"></iframe>
+					{if isset($nbProducts) && $nbProducts <= 0}
+						<p class="alert alert-warning">{l s='Your shopping cart is empty.' mod='wirecardceecheckoutseamless'}</p>
+					{else}
+						<iframe width="100%" height="640px" frameborder="0" name="{$windowName}" src="{$redirectUrl}"></iframe>
+					{/if}
+				</div>
+			</div>
+		</div>
+	</section>
+{/block}