diff --git a/modules/authorizeaim/authorizeaim.tpl b/modules/authorizeaim/authorizeaim.tpl index 3a58d2eb4..41009157c 100755 --- a/modules/authorizeaim/authorizeaim.tpl +++ b/modules/authorizeaim/authorizeaim.tpl @@ -31,7 +31,7 @@ {/if}
- + {if $cards.visa == 1} {l s='visa logo' mod='authorizeaim'} diff --git a/modules/bankwire/bankwire.jpg b/modules/bankwire/bankwire.jpg index 03ee65083..8d11f391a 100644 Binary files a/modules/bankwire/bankwire.jpg and b/modules/bankwire/bankwire.jpg differ diff --git a/modules/bankwire/payment.tpl b/modules/bankwire/payment.tpl index b05c9d828..1f1be2df8 100644 --- a/modules/bankwire/payment.tpl +++ b/modules/bankwire/payment.tpl @@ -26,7 +26,7 @@

- {l s='Pay by bank wire' mod='bankwire'} - {l s='Pay by bank wire (order process will be longer)' mod='bankwire'} + {l s='Pay by bank wire' mod='bankwire'} + {l s='Pay by bank wire (order process will be longer)' mod='bankwire'}

\ No newline at end of file diff --git a/modules/blockbestsellers/blockbestsellers.php b/modules/blockbestsellers/blockbestsellers.php index 52eaa4211..979ac15bd 100644 --- a/modules/blockbestsellers/blockbestsellers.php +++ b/modules/blockbestsellers/blockbestsellers.php @@ -114,7 +114,7 @@ class BlockBestSellers extends Module $this->context->smarty->assign(array( 'best_sellers' => $best_sellers, - 'smallSize' => Image::getSize('small'), + 'mediumSize' => Image::getSize('medium'), )); return $this->display(__FILE__, 'blockbestsellers.tpl'); } diff --git a/modules/blockbestsellers/blockbestsellers.tpl b/modules/blockbestsellers/blockbestsellers.tpl index b10369218..eb89140b5 100644 --- a/modules/blockbestsellers/blockbestsellers.tpl +++ b/modules/blockbestsellers/blockbestsellers.tpl @@ -19,31 +19,26 @@ * * @author PrestaShop SA * @copyright 2007-2011 PrestaShop SA -* @version Release: $Revision: 6594 $ +* @version Release: $Revision: 7077 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *}
-

{l s='Top sellers' mod='blockbestsellers'}

+

{l s='Top sellers' mod='blockbestsellers'}

{if $best_sellers|@count > 0} -

»{l s='All best sellers' mod='blockbestsellers'}

+
+ {foreach from=$best_sellers item=product name=myLoop} +
{$product.name|strip_tags:'UTF-8'|escape:'htmlall':'UTF-8'}
+ {/foreach} +
+

{l s='All best sellers' mod='blockbestsellers'}

{else}

{l s='No best sellers at this time' mod='blockbestsellers'}

{/if} diff --git a/modules/blockcart/ajax-cart.js b/modules/blockcart/ajax-cart.js index d86d5d248..09fc09a00 100644 --- a/modules/blockcart/ajax-cart.js +++ b/modules/blockcart/ajax-cart.js @@ -626,26 +626,5 @@ $(document).ready(function(){ }); ajaxCart.overrideButtonsInThePage(); ajaxCart.refresh(); - - /* roll over cart */ - $("#shopping_cart").mouseover(function(){ - $("#cart_block").slideDown(450).addClass("cart_block_hover"); - }); - - $("#cart_block").mouseleave(function(){ - $("#cart_block").removeClass("cart_block_hover"); - if(!$("#cart_block").hasClass("cart_block_hover")) - $("#cart_block").slideUp(450); - }); - $("#header_logo").mouseover(function(){ - $("#cart_block").removeClass("cart_block_hover"); - if(!$("#cart_block").hasClass("cart_block_hover")) - $("#cart_block").slideUp(450); - }); - $("#messWelcome").mouseover(function(){ - $("#cart_block").removeClass("cart_block_hover"); - if(!$("#cart_block").hasClass("cart_block_hover")) - $("#cart_block").slideUp(450); - }); }); diff --git a/modules/blockcart/blockcart.php b/modules/blockcart/blockcart.php index ba5db04cc..324bc0658 100644 --- a/modules/blockcart/blockcart.php +++ b/modules/blockcart/blockcart.php @@ -83,8 +83,8 @@ class BlockCart extends Module $smarty->assign(array( 'products' => $products, 'customizedDatas' => Product::getAllCustomizedDatas((int)($params['cart']->id)), - 'CUSTOMIZE_FILE' => Product::CUSTOMIZE_FILE, - 'CUSTOMIZE_TEXTFIELD' => Product::CUSTOMIZE_TEXTFIELD, + 'CUSTOMIZE_FILE' => _CUSTOMIZE_FILE_, + 'CUSTOMIZE_TEXTFIELD' => _CUSTOMIZE_TEXTFIELD_, 'discounts' => $params['cart']->getDiscounts(false, Tools::isSubmit('id_product')), 'nb_total_products' => (int)($nbTotalProducts), 'shipping_cost' => Tools::displayPrice($params['cart']->getOrderTotal($useTax, Cart::ONLY_SHIPPING), $currency), @@ -187,10 +187,5 @@ class BlockCart extends Module if ((int)(Configuration::get('PS_BLOCK_CART_AJAX'))) $this->context->controller->addJS(($this->_path).'ajax-cart.js'); } - - public function hookTop($params) - { - return $this->hookRightColumn($params); - } } diff --git a/modules/blockmyaccount/blockmyaccount.php b/modules/blockmyaccount/blockmyaccount.php index b19c5acb5..56a43a0c8 100644 --- a/modules/blockmyaccount/blockmyaccount.php +++ b/modules/blockmyaccount/blockmyaccount.php @@ -86,17 +86,6 @@ class BlockMyAccount extends Module { $this->context->controller->addCSS(($this->_path).'blockmyaccount.css', 'all'); } - public function hookFooter($params) - { - global $smarty; - - $smarty->assign(array( - 'voucherAllowed' => (int)(Configuration::get('PS_VOUCHERS')), - 'returnAllowed' => (int)(Configuration::get('PS_ORDER_RETURN')), - 'HOOK_BLOCK_MY_ACCOUNT' => Module::hookExec('myAccountBlock') - )); - return $this->display(__FILE__, $this->name.'.tpl'); - } } diff --git a/modules/cheque/cheque.jpg b/modules/cheque/cheque.jpg index 71195385f..555f1f31c 100644 Binary files a/modules/cheque/cheque.jpg and b/modules/cheque/cheque.jpg differ diff --git a/modules/cheque/payment.tpl b/modules/cheque/payment.tpl index 12487b4d3..ce487ff65 100644 --- a/modules/cheque/payment.tpl +++ b/modules/cheque/payment.tpl @@ -26,7 +26,7 @@

- {l s='Pay by cheque' mod='cheque'} - {l s='Pay by cheque (order process will be longer)' mod='cheque'} + {l s='Pay by cheque' mod='cheque'} + {l s='Pay by cheque (order process will be longer)' mod='cheque'}