From 9983b1723fd62bdf879ff4c8d529750553665fc8 Mon Sep 17 00:00:00 2001
From: vAugagneur <vincent.augagneur@prestashop.com>
Date: Fri, 26 Apr 2013 10:30:17 +0200
Subject: [PATCH] [-] MO : fixed bug #PSCFV-7703 - Images for bank wire, cheque
 and cash payment missing on Order Summary

---
 modules/bankwire/bankwire.php                                | 1 +
 modules/bankwire/controllers/front/payment.php               | 1 +
 modules/bankwire/views/templates/front/payment_execution.tpl | 2 +-
 modules/bankwire/views/templates/hook/payment.tpl            | 2 +-
 modules/cashondelivery/cashondelivery.php                    | 3 ++-
 modules/cashondelivery/controllers/front/validation.php      | 3 ++-
 modules/cashondelivery/views/templates/front/validation.tpl  | 2 +-
 modules/cashondelivery/views/templates/hook/payment.tpl      | 2 +-
 modules/cheque/cheque.php                                    | 1 +
 modules/cheque/controllers/front/payment.php                 | 1 +
 modules/cheque/views/templates/front/payment_execution.tpl   | 2 +-
 modules/cheque/views/templates/hook/payment.tpl              | 2 +-
 12 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/modules/bankwire/bankwire.php b/modules/bankwire/bankwire.php
index 82cf6bf4c..cc659c6a9 100644
--- a/modules/bankwire/bankwire.php
+++ b/modules/bankwire/bankwire.php
@@ -177,6 +177,7 @@ class BankWire extends PaymentModule
 
 		$this->smarty->assign(array(
 			'this_path' => $this->_path,
+			'this_path_bw' => $this->_path,
 			'this_path_ssl' => Tools::getShopDomainSsl(true, true).__PS_BASE_URI__.'modules/'.$this->name.'/'
 		));
 		return $this->display(__FILE__, 'payment.tpl');
diff --git a/modules/bankwire/controllers/front/payment.php b/modules/bankwire/controllers/front/payment.php
index da5001c6c..58d61bdf1 100644
--- a/modules/bankwire/controllers/front/payment.php
+++ b/modules/bankwire/controllers/front/payment.php
@@ -49,6 +49,7 @@ class BankwirePaymentModuleFrontController extends ModuleFrontController
 			'currencies' => $this->module->getCurrency((int)$cart->id_currency),
 			'total' => $cart->getOrderTotal(true, Cart::BOTH),
 			'this_path' => $this->module->getPathUri(),
+			'this_path_bw' => $this->module->getPathUri(),
 			'this_path_ssl' => Tools::getShopDomainSsl(true, true).__PS_BASE_URI__.'modules/'.$this->module->name.'/'
 		));
 
diff --git a/modules/bankwire/views/templates/front/payment_execution.tpl b/modules/bankwire/views/templates/front/payment_execution.tpl
index e756cafab..bb4ec3698 100644
--- a/modules/bankwire/views/templates/front/payment_execution.tpl
+++ b/modules/bankwire/views/templates/front/payment_execution.tpl
@@ -38,7 +38,7 @@
 <h3>{l s='Bank-wire payment.' mod='bankwire'}</h3>
 <form action="{$link->getModuleLink('bankwire', 'validation', [], true)}" method="post">
 <p>
-	<img src="{$this_path}bankwire.jpg" alt="{l s='Bank wire' mod='bankwire'}" width="86" height="49" style="float:left; margin: 0px 10px 5px 0px;" />
+	<img src="{$this_path_bw}bankwire.jpg" alt="{l s='Bank wire' mod='bankwire'}" width="86" height="49" style="float:left; margin: 0px 10px 5px 0px;" />
 	{l s='You have chosen to pay by bank wire.' mod='bankwire'}
 	<br/><br />
 	{l s='Here is a short summary of your order:' mod='bankwire'}
diff --git a/modules/bankwire/views/templates/hook/payment.tpl b/modules/bankwire/views/templates/hook/payment.tpl
index ac1c66767..fce36997f 100644
--- a/modules/bankwire/views/templates/hook/payment.tpl
+++ b/modules/bankwire/views/templates/hook/payment.tpl
@@ -25,7 +25,7 @@
 
 <p class="payment_module">
 	<a href="{$link->getModuleLink('bankwire', 'payment')}" title="{l s='Pay by bank wire' mod='bankwire'}">
-		<img src="{$this_path}bankwire.jpg" alt="{l s='Pay by bank wire' mod='bankwire'}" width="86" height="49"/>
+		<img src="{$this_path_bw}bankwire.jpg" alt="{l s='Pay by bank wire' mod='bankwire'}" width="86" height="49"/>
 		{l s='Pay by bank wire (order process will be longer)' mod='bankwire'}
 	</a>
 </p>
\ No newline at end of file
diff --git a/modules/cashondelivery/cashondelivery.php b/modules/cashondelivery/cashondelivery.php
index cb0f0749f..38467d993 100755
--- a/modules/cashondelivery/cashondelivery.php
+++ b/modules/cashondelivery/cashondelivery.php
@@ -75,7 +75,8 @@ class CashOnDelivery extends PaymentModule
 		}
 
 		$smarty->assign(array(
-			'this_path' => $this->_path,
+			'this_path' => $this->_path, //keep for retro compat
+			'this_path_cod' => $this->_path,
 			'this_path_ssl' => Tools::getShopDomainSsl(true, true).__PS_BASE_URI__.'modules/'.$this->name.'/'
 		));
 		return $this->display(__FILE__, 'payment.tpl');
diff --git a/modules/cashondelivery/controllers/front/validation.php b/modules/cashondelivery/controllers/front/validation.php
index f85e1495e..e1f28f414 100644
--- a/modules/cashondelivery/controllers/front/validation.php
+++ b/modules/cashondelivery/controllers/front/validation.php
@@ -70,7 +70,8 @@ class CashondeliveryValidationModuleFrontController extends ModuleFrontControlle
 
 		$this->context->smarty->assign(array(
 			'total' => $this->context->cart->getOrderTotal(true, Cart::BOTH),
-			'this_path' => $this->module->getPathUri(),
+			'this_path' => $this->module->getPathUri(),//keep for retro compat
+			'this_path_cod' => $this->module->getPathUri(),
 			'this_path_ssl' => Tools::getShopDomainSsl(true, true).__PS_BASE_URI__.'modules/'.$this->module->name.'/'
 		));
 
diff --git a/modules/cashondelivery/views/templates/front/validation.tpl b/modules/cashondelivery/views/templates/front/validation.tpl
index 72c88cb4b..53542fd7a 100755
--- a/modules/cashondelivery/views/templates/front/validation.tpl
+++ b/modules/cashondelivery/views/templates/front/validation.tpl
@@ -36,7 +36,7 @@
 <form action="{$link->getModuleLink('cashondelivery', 'validation', [], true)}" method="post">
 	<input type="hidden" name="confirm" value="1" />
 	<p>
-		<img src="{$this_path}cashondelivery.jpg" alt="{l s='Cash on delivery (COD) payment' mod='cashondelivery'}" style="float:left; margin: 0px 10px 5px 0px;" />
+		<img src="{$this_path_cod}cashondelivery.jpg" alt="{l s='Cash on delivery (COD) payment' mod='cashondelivery'}" style="float:left; margin: 0px 10px 5px 0px;" />
 		{l s='You have chosen the cash on delivery method.' mod='cashondelivery'}
 		<br/><br />
 		{l s='The total amount of your order is' mod='cashondelivery'}
diff --git a/modules/cashondelivery/views/templates/hook/payment.tpl b/modules/cashondelivery/views/templates/hook/payment.tpl
index 45a3dc79e..3cbc0fabb 100755
--- a/modules/cashondelivery/views/templates/hook/payment.tpl
+++ b/modules/cashondelivery/views/templates/hook/payment.tpl
@@ -25,7 +25,7 @@
 
 <p class="payment_module">
 	<a href="{$link->getModuleLink('cashondelivery', 'validation', [], true)}" title="{l s='Pay with cash on delivery (COD)' mod='cashondelivery'}" rel="nofollow">
-		<img src="{$this_path}cashondelivery.gif" alt="{l s='Pay with cash on delivery (COD)' mod='cashondelivery'}" style="float:left;" />
+		<img src="{$this_path_cod}cashondelivery.gif" alt="{l s='Pay with cash on delivery (COD)' mod='cashondelivery'}" style="float:left;" />
 		<br />{l s='Pay with cash on delivery (COD)' mod='cashondelivery'}
 		<br />{l s='You pay for the merchandise upon delivery' mod='cashondelivery'}
 		<br style="clear:both;" />
diff --git a/modules/cheque/cheque.php b/modules/cheque/cheque.php
index 118b77cd4..c008e249d 100644
--- a/modules/cheque/cheque.php
+++ b/modules/cheque/cheque.php
@@ -162,6 +162,7 @@ class Cheque extends PaymentModule
 
 		$this->smarty->assign(array(
 			'this_path' => $this->_path,
+			'this_path_cheque' => $this->_path,
 			'this_path_ssl' => Tools::getShopDomainSsl(true, true).__PS_BASE_URI__.'modules/'.$this->name.'/'
 		));
 		return $this->display(__FILE__, 'payment.tpl');
diff --git a/modules/cheque/controllers/front/payment.php b/modules/cheque/controllers/front/payment.php
index ba9a03d2d..83f52fcab 100644
--- a/modules/cheque/controllers/front/payment.php
+++ b/modules/cheque/controllers/front/payment.php
@@ -52,6 +52,7 @@ class ChequePaymentModuleFrontController extends ModuleFrontController
 			'chequeName' => $this->module->chequeName,
 			'chequeAddress' => Tools::nl2br($this->module->address),
 			'this_path' => $this->module->getPathUri(),
+			'this_path_cheque' => $this->module->getPathUri(),
 			'this_path_ssl' => Tools::getShopDomainSsl(true, true).__PS_BASE_URI__.'modules/'.$this->module->name.'/'
 		));
 
diff --git a/modules/cheque/views/templates/front/payment_execution.tpl b/modules/cheque/views/templates/front/payment_execution.tpl
index e03a879b1..effc1b066 100644
--- a/modules/cheque/views/templates/front/payment_execution.tpl
+++ b/modules/cheque/views/templates/front/payment_execution.tpl
@@ -38,7 +38,7 @@
 <h3>{l s='Check payment' mod='cheque'}</h3>
 <form action="{$link->getModuleLink('cheque', 'validation', [], true)}" method="post">
 	<p>
-		<img src="{$this_path}cheque.jpg" alt="{l s='Check' mod='cheque'}" width="86" height="49" style="float:left; margin: 0px 10px 5px 0px;" />
+		<img src="{$this_path_cheque}cheque.jpg" alt="{l s='Check' mod='cheque'}" width="86" height="49" style="float:left; margin: 0px 10px 5px 0px;" />
 		{l s='You have chosen to pay by check.' mod='cheque'}
 		<br/><br />
 		{l s='Here is a short summary of your order:' mod='cheque'}
diff --git a/modules/cheque/views/templates/hook/payment.tpl b/modules/cheque/views/templates/hook/payment.tpl
index 24f4e538e..1c7654854 100644
--- a/modules/cheque/views/templates/hook/payment.tpl
+++ b/modules/cheque/views/templates/hook/payment.tpl
@@ -25,7 +25,7 @@
 
 <p class="payment_module">
 	<a href="{$link->getModuleLink('cheque', 'payment', [], true)}" title="{l s='Pay by check.' mod='cheque'}">
-		<img src="{$this_path}cheque.jpg" alt="{l s='Pay by check.' mod='cheque'}" width="86" height="49" />
+		<img src="{$this_path_cheque}cheque.jpg" alt="{l s='Pay by check.' mod='cheque'}" width="86" height="49" />
 		{l s='Pay by check (order processing will take more time).' mod='cheque'}
 	</a>
 </p>