diff --git a/classes/Smarty/SmartyCustom.php b/classes/Smarty/SmartyCustom.php index ab022a0bb..70c5bb991 100644 --- a/classes/Smarty/SmartyCustom.php +++ b/classes/Smarty/SmartyCustom.php @@ -24,297 +24,20 @@ * International Registered Trademark & Property of PrestaShop SA */ -class SmartyCustomCore extends Smarty +class SmartyCustomCore extends SmartyDev { + public $display_comments = false; public function __construct() { parent::__construct(); $this->template_class = 'Smarty_Custom_Template'; } - - /** - * Delete compiled template file (lazy delete if resource_name is not specified) - * - * @param string $resource_name template name - * @param string $compile_id compile id - * @param int $exp_time expiration time - * - * @return int number of template files deleted - */ - public function clearCompiledTemplate($resource_name = null, $compile_id = null, $exp_time = null) - { - if ($resource_name == null) { - Db::getInstance()->execute('REPLACE INTO `'._DB_PREFIX_.'smarty_last_flush` (`type`, `last_flush`) VALUES (\'compile\', FROM_UNIXTIME('.time().'))'); - return 0; - } else { - return parent::clearCompiledTemplate($resource_name, $compile_id, $exp_time); - } - } - - /** - * Mark all template files to be regenerated - * - * @param int $exp_time expiration time - * @param string $type resource type - * - * @return int number of cache files which needs to be updated - */ - public function clearAllCache($exp_time = null, $type = null) - { - Db::getInstance()->execute('REPLACE INTO `'._DB_PREFIX_.'smarty_last_flush` (`type`, `last_flush`) VALUES (\'template\', FROM_UNIXTIME('.time().'))'); - return $this->delete_from_lazy_cache(null, null, null); - } - - /** - * Mark file to be regenerated for a specific template - * - * @param string $template_name template name - * @param string $cache_id cache id - * @param string $compile_id compile id - * @param int $exp_time expiration time - * @param string $type resource type - * - * @return int number of cache files which needs to be updated - */ - public function clearCache($template_name, $cache_id = null, $compile_id = null, $exp_time = null, $type = null) - { - return $this->delete_from_lazy_cache($template_name, $cache_id, $compile_id); - } - - /** - * Check the compile cache needs to be invalidated (multi front + local cache compatible) - */ - public function check_compile_cache_invalidation() - { - static $last_flush = null; - if (!file_exists($this->getCompileDir().'last_flush')) { - @touch($this->getCompileDir().'last_flush', time()); - } elseif (defined('_DB_PREFIX_')) { - if ($last_flush === null) { - $sql = 'SELECT UNIX_TIMESTAMP(last_flush) as last_flush FROM `'._DB_PREFIX_.'smarty_last_flush` WHERE type=\'compile\''; - $last_flush = Db::getInstance()->getValue($sql, false); - } - if ((int)$last_flush && @filemtime($this->getCompileDir().'last_flush') < $last_flush) { - @touch($this->getCompileDir().'last_flush', time()); - parent::clearCompiledTemplate(); - } - } - } - - /** - * {@inheritDoc} - */ - public function fetch($template = null, $cache_id = null, $compile_id = null, $parent = null, $display = false, $merge_tpl_vars = true, $no_output_filter = false) - { - $this->check_compile_cache_invalidation(); - return parent::fetch($template, $cache_id, $compile_id, $parent, $display, $merge_tpl_vars, $no_output_filter); - } - - /** - * {@inheritDoc} - */ - public function createTemplate($template, $cache_id = null, $compile_id = null, $parent = null, $do_clone = true) - { - $this->check_compile_cache_invalidation(); - if ($this->caching) { - $this->check_template_invalidation($template, $cache_id, $compile_id); - return parent::createTemplate($template, $cache_id, $compile_id, $parent, $do_clone); - } else { - return parent::createTemplate($template, $cache_id, $compile_id, $parent, $do_clone); - } - } - - /** - * Handle the lazy template cache invalidation - * - * @param string $template template name - * @param string $cache_id cache id - * @param string $compile_id compile id - */ - public function check_template_invalidation($template, $cache_id, $compile_id) - { - static $last_flush = null; - if (!file_exists($this->getCacheDir().'last_template_flush')) { - @touch($this->getCacheDir().'last_template_flush', time()); - } elseif (defined('_DB_PREFIX_')) { - if ($last_flush === null) { - $sql = 'SELECT UNIX_TIMESTAMP(last_flush) as last_flush FROM `'._DB_PREFIX_.'smarty_last_flush` WHERE type=\'template\''; - $last_flush = Db::getInstance()->getValue($sql, false); - } - - if ((int)$last_flush && @filemtime($this->getCacheDir().'last_template_flush') < $last_flush) { - @touch($this->getCacheDir().'last_template_flush', time()); - parent::clearAllCache(); - } else { - if ($cache_id !== null && (is_object($cache_id) || is_array($cache_id))) { - $cache_id = null; - } - - if ($this->is_in_lazy_cache($template, $cache_id, $compile_id) === false) { - // insert in cache before the effective cache creation to avoid nasty race condition - $this->insert_in_lazy_cache($template, $cache_id, $compile_id); - parent::clearCache($template, $cache_id, $compile_id); - } - } - } - } - - /** - * Store the cache file path - * - * @param string $filepath cache file path - * @param string $template template name - * @param string $cache_id cache id - * @param string $compile_id compile id - */ - public function update_filepath($filepath, $template, $cache_id, $compile_id) - { - $template_md5 = md5($template); - $sql = 'UPDATE `'._DB_PREFIX_.'smarty_lazy_cache` - SET filepath=\''.pSQL($filepath).'\' - WHERE `template_hash`=\''.pSQL($template_md5).'\''; - - $sql .= ' AND cache_id="'.pSQL((string)$cache_id).'"'; - - if (strlen($compile_id) > 32) { - $compile_id = md5($compile_id); - } - $sql .= ' AND compile_id="'.pSQL((string)$compile_id).'"'; - Db::getInstance()->execute($sql, false); - } - - /** - * Check if the current template is stored in the lazy cache - * Entry in the lazy cache = no need to regenerate the template - * - * @param string $template template name - * @param string $cache_id cache id - * @param string $compile_id compile id - * - * @return bool - */ - public function is_in_lazy_cache($template, $cache_id, $compile_id) - { - static $is_in_lazy_cache = array(); - $template_md5 = md5($template); - - if (strlen($compile_id) > 32) { - $compile_id = md5($compile_id); - } - - $key = md5($template_md5.'-'.$cache_id.'-'.$compile_id); - - if (isset($is_in_lazy_cache[$key])) { - return $is_in_lazy_cache[$key]; - } else { - $sql = 'SELECT UNIX_TIMESTAMP(last_update) as last_update, filepath FROM `'._DB_PREFIX_.'smarty_lazy_cache` - WHERE `template_hash`=\''.pSQL($template_md5).'\''; - $sql .= ' AND cache_id="'.pSQL((string)$cache_id).'"'; - $sql .= ' AND compile_id="'.pSQL((string)$compile_id).'"'; - - $result = Db::getInstance()->getRow($sql, false); - // If the filepath is not yet set, it means the cache update is in progress in another process. - // In this case do not try to clear the cache again and tell to use the existing cache, if any - if ($result !== false && $result['filepath'] == '') { - // If the cache update is stalled for more than 1min, something should be wrong, - // remove the entry from the lazy cache - if ($result['last_update'] < time() - 60) { - $this->delete_from_lazy_cache($template, $cache_id, $compile_id); - } - - $return = true; - } else { - if ($result === false - || @filemtime($this->getCacheDir().$result['filepath']) < $result['last_update']) { - $return = false; - } else { - $return = $result['filepath']; - } - } - $is_in_lazy_cache[$key] = $return; - } - return $return; - } - - /** - * Insert the current template in the lazy cache - * - * @param string $template template name - * @param string $cache_id cache id - * @param string $compile_id compile id - * - * @return bool - */ - public function insert_in_lazy_cache($template, $cache_id, $compile_id) - { - $template_md5 = md5($template); - $sql = 'INSERT IGNORE INTO `'._DB_PREFIX_.'smarty_lazy_cache` - (`template_hash`, `cache_id`, `compile_id`, `last_update`) - VALUES (\''.pSQL($template_md5).'\''; - - $sql .= ',"'.pSQL((string)$cache_id).'"'; - - if (strlen($compile_id) > 32) { - $compile_id = md5($compile_id); - } - $sql .= ',"'.pSQL((string)$compile_id).'"'; - $sql .= ', FROM_UNIXTIME('.time().'))'; - - return Db::getInstance()->execute($sql, false); - } - - /** - * Delete the current template from the lazy cache or the whole cache if no template name is given - * - * @param string $template template name - * @param string $cache_id cache id - * @param string $compile_id compile id - * - * @return bool - */ - public function delete_from_lazy_cache($template, $cache_id, $compile_id) - { - if (!$template) { - return Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'smarty_lazy_cache`', false); - } - - $template_md5 = md5($template); - $sql = 'DELETE FROM `'._DB_PREFIX_.'smarty_lazy_cache` - WHERE template_hash=\''.pSQL($template_md5).'\''; - - if ($cache_id != null) { - $sql .= ' AND cache_id LIKE "'.pSQL((string)$cache_id).'%"'; - } - - if ($compile_id != null) { - if (strlen($compile_id) > 32) { - $compile_id = md5($compile_id); - } - $sql .= ' AND compile_id="'.pSQL((string)$compile_id).'"'; - } - Db::getInstance()->execute($sql, false); - return Db::getInstance()->Affected_Rows(); - } } -class Smarty_Custom_Template extends Smarty_Internal_Template +class Smarty_Custom_Template extends Smarty_Dev_Template { /** @var SmartyCustom|null */ public $smarty = null; + public $display_comments = false; - public function fetch($template = null, $cache_id = null, $compile_id = null, $parent = null, $display = false, $merge_tpl_vars = true, $no_output_filter = false) - { - if ($this->smarty->caching) { - $tpl = parent::fetch($template, $cache_id, $compile_id, $parent, $display, $merge_tpl_vars, $no_output_filter); - if (property_exists($this, 'cached')) { - $filepath = str_replace($this->smarty->getCacheDir(), '', $this->cached->filepath); - if ($this->smarty->is_in_lazy_cache($this->template_resource, $this->cache_id, $this->compile_id) != $filepath) { - $this->smarty->update_filepath($filepath, $this->template_resource, $this->cache_id, $this->compile_id); - } - } - return $tpl; - } else { - return parent::fetch($template, $cache_id, $compile_id, $parent, $display, $merge_tpl_vars, $no_output_filter); - } - } } diff --git a/classes/Smarty/SmartyDev.php b/classes/Smarty/SmartyDev.php index e51458ac1..230c50197 100644 --- a/classes/Smarty/SmartyDev.php +++ b/classes/Smarty/SmartyDev.php @@ -37,9 +37,18 @@ class SmartyDev extends Smarty */ public function fetch($template = null, $cache_id = null, $compile_id = null, $parent = null, $display = false, $merge_tpl_vars = true, $no_output_filter = false) { - return "\n\n" - .parent::fetch($template, $cache_id, $compile_id, $parent, $display, $merge_tpl_vars, $no_output_filter) - ."\n\n"; + if (($overrideTemplate = Hook::exec('displayOverrideTemplate', array('default_template' => $template, 'controller' => Context::getContext()->controller))) + && file_exists($overrideTemplate) + ) { + $template = $overrideTemplate; + } + + $response = parent::fetch($template, $cache_id, $compile_id, $parent, $display, $merge_tpl_vars, $no_output_filter); + if (!isset($this->display_comments) || $this->display_comments) { + $response = "\n\n".$response."\n\n"; + } + + return $response; } } @@ -56,8 +65,22 @@ class Smarty_Dev_Template extends Smarty_Internal_Template $tpl = $this->template_resource; } - return "\n\n" - .parent::fetch($template, $cache_id, $compile_id, $parent, $display, $merge_tpl_vars, $no_output_filter) - ."\n\n"; + if (($overrideTemplate = Hook::exec('displayOverrideTemplate', array('default_template' => $tpl, 'controller' => Context::getContext()->controller))) + && file_exists($overrideTemplate) + ) { + $tpl = $overrideTemplate; + if (!is_null($template)) { + $template = Context::getContext()->smarty->createTemplate($tpl); + } else { + $template = $tpl; + } + } + + $response = parent::fetch($template, $cache_id, $compile_id, $parent, $display, $merge_tpl_vars, $no_output_filter); + if (!isset($this->display_comments) || $this->display_comments) { + $response = "\n\n".$response."\n\n"; + } + + return $response; } } diff --git a/classes/controller/FrontController.php b/classes/controller/FrontController.php index d30d831c1..c3d116e54 100644 --- a/classes/controller/FrontController.php +++ b/classes/controller/FrontController.php @@ -1624,28 +1624,10 @@ class FrontControllerCore extends Controller if ($this->useMobileTheme()) { $this->setMobileTemplate($default_template); } else { - $template = $this->getOverrideTemplate(); - if ($template) { - parent::setTemplate($template); - } else { - parent::setTemplate($default_template); - } + parent::setTemplate($default_template); } } - /** - * Returns an overridden template path (if any) for this controller. - * If not overridden, will return false. This method can be easily overriden in a - * specific controller. - * - * @since 1.5.0.13 - * @return string|bool - */ - public function getOverrideTemplate() - { - return Hook::exec('DisplayOverrideTemplate', array('controller' => $this)); - } - /** * Checks if mobile theme is active and in use. * diff --git a/config/smarty.config.inc.php b/config/smarty.config.inc.php index e4f2a1944..e350e1780 100644 --- a/config/smarty.config.inc.php +++ b/config/smarty.config.inc.php @@ -34,7 +34,7 @@ if (Configuration::get('PS_SMARTY_LOCAL')) { } elseif (_PS_MODE_DEV_ && !defined('_PS_ADMIN_DIR_')) { $smarty = new SmartyDev(); } else { - $smarty = new Smarty(); + $smarty = new SmartyCustom(); } $smarty->setCompileDir(_PS_CACHE_DIR_.'smarty/compile'); diff --git a/modules/blockcart/blockcart.tpl b/modules/blockcart/blockcart.tpl index bcb9ca6a5..527c8e64d 100644 --- a/modules/blockcart/blockcart.tpl +++ b/modules/blockcart/blockcart.tpl @@ -22,427 +22,442 @@ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} - -{if isset($blockcart_top) && $blockcart_top} -
-{/if} -
- - - {$total_products_in_cart} - - - - {if $cart_qties > 0} - {if $priceDisplay == 1} - {assign var='blockcart_cart_flag' value='Cart::BOTH_WITHOUT_SHIPPING'|constant} - {convertPrice price=$cart->getOrderTotal(false, $blockcart_cart_flag)} - {else} - {assign var='blockcart_cart_flag' value='Cart::BOTH_WITHOUT_SHIPPING'|constant} - {convertPrice price=$cart->getOrderTotal(true, $blockcart_cart_flag)} + +{block name='block_cart_content'} + + {block name='block_cart_shopping_cart'} + {if isset($blockcart_top) && $blockcart_top} +
+ {/if} +
+ + + {$total_products_in_cart} + + + + {if $cart_qties > 0} + {if $priceDisplay == 1} + {assign var='blockcart_cart_flag' value='Cart::BOTH_WITHOUT_SHIPPING'|constant} + {convertPrice price=$cart->getOrderTotal(false, $blockcart_cart_flag)} + {else} + {assign var='blockcart_cart_flag' value='Cart::BOTH_WITHOUT_SHIPPING'|constant} + {convertPrice price=$cart->getOrderTotal(true, $blockcart_cart_flag)} + {/if} + {/if} + + 0 + {if $ajax_allowed && isset($blockcart_top) && !$blockcart_top} +   +   {/if} - {/if} - - 0 - {if $ajax_allowed && isset($blockcart_top) && !$blockcart_top} -   -   - {/if} - - {if !$PS_CATALOG_MODE} -
-
- - - {/if} - - {if isset($product.attributes_small)} -
+ id_address_delivery) || !$cart->id_address_delivery)} class="unvisible"{/if}> + {l s='Shipping' mod='blockcart'} + +
+ {if $show_wrapping} +
+ {assign var='cart_flag' value='Cart::ONLY_WRAPPING'|constant} + + {if $priceDisplay == 1} + {convertPrice price=$cart->getOrderTotal(false, $cart_flag)}{else}{convertPrice price=$cart->getOrderTotal(true, $cart_flag)} + {/if} + + + {l s='Wrapping' mod='blockcart'} + +
+ {/if} --> + {if $show_tax && $use_tax} +
+ {$tax_cost} + {l s='Tax' mod='blockcart'} +
{/if} - - {if isset($customizedDatas.$productId.$productAttributeId[$product.id_address_delivery])} - {if !isset($product.attributes_small)} -
- {/if} -
    - {foreach from=$customizedDatas.$productId.$productAttributeId[$product.id_address_delivery] key='id_customization' item='customization' name='customizations'} -
  • -
    -   -
    - {if isset($customization.datas.$CUSTOMIZE_TEXTFIELD.0)} - {$customization.datas.$CUSTOMIZE_TEXTFIELD.0.value|replace:"
    ":" "|truncate:28:'...'|escape:'html':'UTF-8'} - {else} - {l s='Customization #%d:' sprintf=$id_customization|intval mod='blockcart'} - {/if} -
    • - {/foreach} -
- {if !isset($product.attributes_small)}
{/if} + {if isset($total_convenience_fee)} +
+ {convertPrice price=$total_convenience_fee} + {l s='Convenience Fees' mod='blockcart'} +
+ {/if} +
+ {$total} + {l s='Total' mod='blockcart'} +
+ {if $use_taxes && $display_tax_label == 1 && $show_tax} +

+ {if $priceDisplay == 0} + {l s='Prices are tax included' mod='blockcart'} + {elseif $priceDisplay == 1} + {l s='Prices are tax excluded' mod='blockcart'} + {/if} +

+ {/if} +
+

+ + + {l s='Check out' mod='blockcart'} + + +

+
+
+
+ {/if} + {/block} +
+ {if isset($blockcart_top) && $blockcart_top} + + {/if} + {/block} + {block name='block_cart_layer_cart'} + {counter name=active_overlay assign=active_overlay} + {if !$PS_CATALOG_MODE && $active_overlay == 1} +
+
+ {block name='block_cart_layer_cart_product'} +
+ +

+ {l s='Room successfully added to your cart' mod='blockcart'} +

+

+ {l s='Item successfully added to your cart' mod='blockcart'} +

+
+
+
+ + +
+ {l s='Time Duration' mod='blockcart'}  -  + +
+
+ {if isset($occupancy_required_for_booking) && $occupancy_required_for_booking}{l s='Room occupancy' mod='blockcart'}{else}{l s='Rooms quantity added' mod='blockcart'}{/if}  -  + {l s='Quantity' mod='blockcart'}  -  + +
+
+ {l s='Room type cost' mod='blockcart'}  -  + {l s='Total' mod='blockcart'}  -  + +
+
+
+ {/block} + {block name='block_cart_layer_cart_cart'} +
+

+ + + {l s='There are [1]%d[/1] item(s) in your cart.' mod='blockcart' sprintf=[$cart_qties] tags=['']} + + + + + {l s='1 item in your cart.' mod='blockcart'} + +

+ +
+ + {l s='Total Rooms Cost in cart' mod='blockcart'} + {if $display_tax_label} + {if $priceDisplay == 1} + {l s='(tax excl.)' mod='blockcart'} + {else} + {l s='(tax incl.)' mod='blockcart'} {/if} - {if isset($product.attributes_small)}{/if} {/if} - {/foreach} - - {/if} -

- {l s='No products' mod='blockcart'} -

- {if $discounts|@count > 0} - - {foreach from=$discounts item=discount} - {if $discount.value_real > 0} - - - - - - + + + {if $cart_qties > 0} + {convertPrice price=$cart->getOrderTotal(false, Cart::ONLY_PRODUCTS)} {/if} - {/foreach} -
1x - {$discount.name|truncate:18:'...'|escape:'html':'UTF-8'} - - -{if $priceDisplay == 1}{convertPrice price=$discount.value_tax_exc}{else}{convertPrice price=$discount.value_real}{/if} - - {if strlen($discount.code)} - - - - {/if} -
- {/if} -
- + - {if $show_tax && $use_tax} -
- {$tax_cost} - {l s='Tax' mod='blockcart'} -
- {/if} +
--> {if isset($total_convenience_fee)} -
- {convertPrice price=$total_convenience_fee} - {l s='Convenience Fees' mod='blockcart'} +
+ {l s='Convenience Fees' mod='blockcart'} + {convertPrice price=$total_convenience_fee}
{/if} -
- {$total} - {l s='Total' mod='blockcart'} -
- {if $use_taxes && $display_tax_label == 1 && $show_tax} -

- {if $priceDisplay == 0} - {l s='Prices are tax included' mod='blockcart'} - {elseif $priceDisplay == 1} - {l s='Prices are tax excluded' mod='blockcart'} - {/if} -

+ {if $show_tax && $use_tax} +
+ {l s='Tax' mod='blockcart'} + {$tax_cost} +
{/if} -
-

- - - {l s='Check out' mod='blockcart'} +

+ + {l s='Total' mod='blockcart'} + {if $display_tax_label} + {if $priceDisplay == 1} + {l s='(tax excl.)' mod='blockcart'} + {else} + {l s='(tax incl.)' mod='blockcart'} + {/if} + {/if} + + + {if $cart_qties > 0} + {if $priceDisplay == 1} + {convertPrice price=$cart->getOrderTotal(false)} + {else} + {convertPrice price=$cart->getOrderTotal(true)} + {/if} + {/if} - -

-
+
+
+ + + {l s='Continue browsing' mod='blockcart'} + + + + + {l s='Proceed to checkout' mod='blockcart'} + + +
+
+ {/block}
-
+
+ +
{/if} - -{if isset($blockcart_top) && $blockcart_top} - -{/if} -{counter name=active_overlay assign=active_overlay} -{if !$PS_CATALOG_MODE && $active_overlay == 1} -
-
-
- -

- {l s='Room successfully added to your cart' mod='blockcart'} -

-

- {l s='Item successfully added to your cart' mod='blockcart'} -

-
-
-
- - -
- {l s='Time Duration' mod='blockcart'}  -  - -
-
- {if isset($occupancy_required_for_booking) && $occupancy_required_for_booking}{l s='Room occupancy' mod='blockcart'}{else}{l s='Rooms quantity added' mod='blockcart'}{/if}  -  - {l s='Quantity' mod='blockcart'}  -  - -
-
- {l s='Room type cost' mod='blockcart'}  -  - {l s='Total' mod='blockcart'}  -  - -
-
-
-
-

- - - {l s='There are [1]%d[/1] item(s) in your cart.' mod='blockcart' sprintf=[$cart_qties] tags=['']} - + {/block} +{/block} +{block name='block_cart_js_vars'} + {strip} + {addJsDefL name=someErrorCondition}{l s='Some Error occured.Please try again.' mod='blockcart' js=1}{/addJsDefL} + {addJsDef CUSTOMIZE_TEXTFIELD=$CUSTOMIZE_TEXTFIELD} + {addJsDef img_dir=$img_dir|escape:'quotes':'UTF-8'} + {addJsDef generated_date=$smarty.now|intval} + {addJsDef ajax_allowed=$ajax_allowed|boolval} + {addJsDef hasDeliveryAddress=(isset($cart->id_address_delivery) && $cart->id_address_delivery)} - - - {l s='1 item in your cart.' mod='blockcart'} - -

+ {addJsDefL name=customizationIdMessage}{l s='Customization #' mod='blockcart' js=1}{/addJsDefL} + {addJsDefL name=removingLinkText}{l s='remove this product from my cart' mod='blockcart' js=1}{/addJsDefL} + {addJsDefL name=freeShippingTranslation}{l s='Free shipping!' mod='blockcart' js=1}{/addJsDefL} + {addJsDefL name=freeProductTranslation}{l s='Free!' mod='blockcart' js=1}{/addJsDefL} + {addJsDefL name=delete_txt}{l s='Delete' mod='blockcart' js=1}{/addJsDefL} + {addJsDefL name=toBeDetermined}{l s='To be determined' mod='blockcart' js=1}{/addJsDefL} + {/strip} + {* MODULE Block cart -
- - {l s='Total Rooms Cost in cart' mod='blockcart'} - {if $display_tax_label} - {if $priceDisplay == 1} - {l s='(tax excl.)' mod='blockcart'} - {else} - {l s='(tax incl.)' mod='blockcart'} - {/if} - {/if} - - - {if $cart_qties > 0} - {convertPrice price=$cart->getOrderTotal(false, Cart::ONLY_PRODUCTS)} - {/if} - -
+ ################################################################### + By webkul to send needed variable in ajax-cart.js + ################################################################### *} + {addJsDef module_dir=$module_dir} + {addJsDef currency_sign = $currency->sign} + {addJsDef room_warning_num = $warning_num} + {addJsDef currency_format = $currency->format} + {addJsDef currency_blank = $currency->blank} + {addJsDefL name=adults_txt}{l s='Adults' mod='blockcart' js=1}{/addJsDefL} + {addJsDefL name=children_txt}{l s='Children' mod='blockcart' js=1}{/addJsDefL} + {addJsDefL name=price_txt}{l s='Price' mod='blockcart' js=1}{/addJsDefL} + {addJsDefL name=total_qty_txt}{l s='Total Qty.' mod='blockcart' js=1}{/addJsDefL} + {addJsDefL name=qty_txt}{l s='Qty' mod='blockcart' js=1}{/addJsDefL} + {addJsDefL name=duration_txt}{l s='Duration' mod='blockcart' js=1}{/addJsDefL} + {addJsDefL name=capacity_txt}{l s='Capacity' mod='blockcart' js=1}{/addJsDefL} + {addJsDefL name=remove_rm_title}{l s='Remove this room from my cart' mod='blockcart' js=1}{/addJsDefL} + {addJsDefL name=no_internet_txt}{l s='No internet. Please check your internet connection.' mod='blockcart' js=1}{/addJsDefL} - - - {if isset($total_convenience_fee)} -
- {l s='Convenience Fees' mod='blockcart'} - {convertPrice price=$total_convenience_fee} -
- {/if} - {if $show_tax && $use_tax} -
- {l s='Tax' mod='blockcart'} - {$tax_cost} -
- {/if} -
- - {l s='Total' mod='blockcart'} - {if $display_tax_label} - {if $priceDisplay == 1} - {l s='(tax excl.)' mod='blockcart'} - {else} - {l s='(tax incl.)' mod='blockcart'} - {/if} - {/if} - - - {if $cart_qties > 0} - {if $priceDisplay == 1} - {convertPrice price=$cart->getOrderTotal(false)} - {else} - {convertPrice price=$cart->getOrderTotal(true)} - {/if} - {/if} - -
-
- - - {l s='Continue browsing' mod='blockcart'} - - - - - {l s='Proceed to checkout' mod='blockcart'} - - -
-
-
-
-
-
-{/if} -{strip} -{addJsDefL name=someErrorCondition}{l s='Some Error occured.Please try again.' mod='blockcart' js=1}{/addJsDefL} -{addJsDef CUSTOMIZE_TEXTFIELD=$CUSTOMIZE_TEXTFIELD} -{addJsDef img_dir=$img_dir|escape:'quotes':'UTF-8'} -{addJsDef generated_date=$smarty.now|intval} -{addJsDef ajax_allowed=$ajax_allowed|boolval} -{addJsDef hasDeliveryAddress=(isset($cart->id_address_delivery) && $cart->id_address_delivery)} - -{addJsDefL name=customizationIdMessage}{l s='Customization #' mod='blockcart' js=1}{/addJsDefL} -{addJsDefL name=removingLinkText}{l s='remove this product from my cart' mod='blockcart' js=1}{/addJsDefL} -{addJsDefL name=freeShippingTranslation}{l s='Free shipping!' mod='blockcart' js=1}{/addJsDefL} -{addJsDefL name=freeProductTranslation}{l s='Free!' mod='blockcart' js=1}{/addJsDefL} -{addJsDefL name=delete_txt}{l s='Delete' mod='blockcart' js=1}{/addJsDefL} -{addJsDefL name=toBeDetermined}{l s='To be determined' mod='blockcart' js=1}{/addJsDefL} -{/strip} - {* MODULE Block cart - - ################################################################### - By webkul to send needed variable in ajax-cart.js - ################################################################### *} -{addJsDef module_dir=$module_dir} -{addJsDef currency_sign = $currency->sign} -{addJsDef room_warning_num = $warning_num} -{addJsDef currency_format = $currency->format} -{addJsDef currency_blank = $currency->blank} -{addJsDefL name=adults_txt}{l s='Adults' mod='blockcart' js=1}{/addJsDefL} -{addJsDefL name=children_txt}{l s='Children' mod='blockcart' js=1}{/addJsDefL} -{addJsDefL name=price_txt}{l s='Price' mod='blockcart' js=1}{/addJsDefL} -{addJsDefL name=total_qty_txt}{l s='Total Qty.' mod='blockcart' js=1}{/addJsDefL} -{addJsDefL name=qty_txt}{l s='Qty' mod='blockcart' js=1}{/addJsDefL} -{addJsDefL name=duration_txt}{l s='Duration' mod='blockcart' js=1}{/addJsDefL} -{addJsDefL name=capacity_txt}{l s='Capacity' mod='blockcart' js=1}{/addJsDefL} -{addJsDefL name=remove_rm_title}{l s='Remove this room from my cart' mod='blockcart' js=1}{/addJsDefL} -{addJsDefL name=no_internet_txt}{l s='No internet. Please check your internet connection.' mod='blockcart' js=1}{/addJsDefL} - -{addJsDef rm_avail_process_lnk = $link->getModuleLink('blockcart', 'checkroomavailabilityajaxprocess')} -{addJsDef pagename = $current_page} -{/strip} -{* ################################################################### -End -################################################################### *} \ No newline at end of file + {addJsDef rm_avail_process_lnk = $link->getModuleLink('blockcart', 'checkroomavailabilityajaxprocess')} + {addJsDef pagename = $current_page} + {/strip} + {* ################################################################### + End + ################################################################### *} +{/block} \ No newline at end of file diff --git a/modules/blockcurrencies/views/templates/hook/blockcurrencies.tpl b/modules/blockcurrencies/views/templates/hook/blockcurrencies.tpl index a5d774526..8f8df4c21 100644 --- a/modules/blockcurrencies/views/templates/hook/blockcurrencies.tpl +++ b/modules/blockcurrencies/views/templates/hook/blockcurrencies.tpl @@ -23,30 +23,32 @@ * International Registered Trademark & Property of PrestaShop SA *} -{if count($currencies) > 1} - -{/if} + {/if} +{/block} diff --git a/modules/blocknavigationmenu/views/templates/hook/navigationMenuBlock.tpl b/modules/blocknavigationmenu/views/templates/hook/navigationMenuBlock.tpl index 74977e778..bc6e7cf70 100644 --- a/modules/blocknavigationmenu/views/templates/hook/navigationMenuBlock.tpl +++ b/modules/blocknavigationmenu/views/templates/hook/navigationMenuBlock.tpl @@ -17,33 +17,39 @@ * @license https://store.webkul.com/license.html *} -
- -
+{block name='navigation_menu_content'} +
+ +
-