dinislage/PrestaShop
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6

Browse Source
This commit is contained in:
sLorenzini committed 2013-12-06 15:57:50 +01:00
2 parents ff08c1311b 74b16defa8
commit 97937a8aa1
7 files changed
+650 -640
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

controllers/front/ProductController.php
+1
View File
@@ -261,6 +261,7 @@ class ProductControllerCore extends FrontController
'HOOK_PRODUCT_ACTIONS' => Hook::exec('displayProductButtons', array('product' => $this->product)), 'HOOK_PRODUCT_ACTIONS' => Hook::exec('displayProductButtons', array('product' => $this->product)),
'HOOK_PRODUCT_TAB' => Hook::exec('displayProductTab', array('product' => $this->product)), 'HOOK_PRODUCT_TAB' => Hook::exec('displayProductTab', array('product' => $this->product)),
'HOOK_PRODUCT_TAB_CONTENT' => Hook::exec('displayProductTabContent', array('product' => $this->product)), 'HOOK_PRODUCT_TAB_CONTENT' => Hook::exec('displayProductTabContent', array('product' => $this->product)),
'HOOK_PRODUCT_CONTENT' => Hook::exec('displayProductContent', array('product' => $this->product)),
'display_qties' => (int)Configuration::get('PS_DISPLAY_QTIES'), 'display_qties' => (int)Configuration::get('PS_DISPLAY_QTIES'),
'display_ht' => !Tax::excludeTaxeOption(), 'display_ht' => !Tax::excludeTaxeOption(),
'currencySign' => $this->context->currency->sign, 'currencySign' => $this->context->currency->sign,
modules/themeconfigurator/themeconfigurator.php
+2 -2
View File
@@ -130,7 +130,7 @@ class ThemeConfigurator extends Module
\'0\', \'0\',
\'home\', \'home\',
\'\', \'\',
\'\', \'0\',
\'banner-img'.$i.'.jpg\', \'banner-img'.$i.'.jpg\',
\'\', \'\',
\'\', \'\',
@@ -152,7 +152,7 @@ class ThemeConfigurator extends Module
\'0\', \'0\',
\'top\', \'top\',
\'\', \'\',
\'\', \'0\',
\'banner-img'.$i.'.jpg\', \'banner-img'.$i.'.jpg\',
\'\', \'\',
\'\', \'\',
themes/default-bootstrap/authentication.tpl
+554 -551
View File
File diff suppressed because it is too large. Load diff
themes/default-bootstrap/modules/blockbestsellers/tab.tpl
+1 -1
View File
@@ -24,5 +24,5 @@
*} *}
{if is_array($best_sellers) && count($best_sellers)} {if is_array($best_sellers) && count($best_sellers)}
<li><a data-toggle="tab" href=".blockbestsellers" class="blockbestsellers">{l s='Best Sellers' mod='blockbestsellers'}</a></li> <li><a data-toggle="tab" href="{$link->getPageLink('best-sales')|escape:'html'}" class="blockbestsellers">{l s='Best Sellers' mod='blockbestsellers'}</a></li>
{/if} {/if}
themes/default-bootstrap/modules/blocknewproducts/tab.tpl
+1 -1
View File
@@ -22,4 +22,4 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA * International Registered Trademark & Property of PrestaShop SA
*} *}
<li class="active"><a data-toggle="tab" href=".blocknewproducts" class="blocknewproducts">{l s='New arrivals' mod='blocknewproducts'}</a></li> <li class="active"><a data-toggle="tab" href="{$link->getPageLink('new-products')|escape:'html'} class="blocknewproducts">{l s='New arrivals' mod='blocknewproducts'}</a></li>
themes/default-bootstrap/modules/homefeatured/tab.tpl
+1 -1
View File
@@ -22,4 +22,4 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA * International Registered Trademark & Property of PrestaShop SA
*} *}
<li><a data-toggle="tab" href=".homefeatured" class="homefeatured">{l s='Popular' mod='homefeatured'}</a></li> <li><a data-toggle="tab" href="{$link->getPageLink('index')|escape:'html'}" class="homefeatured">{l s='Popular' mod='homefeatured'}</a></li>
themes/default-bootstrap/shopping-cart.tpl
+90 -84
View File
@@ -26,7 +26,11 @@
{capture name=path}{l s='Your shopping cart'}{/capture} {capture name=path}{l s='Your shopping cart'}{/capture}
<h1 id="cart_title" class="page-heading">{l s='Shopping-cart summary'} <h1 id="cart_title" class="page-heading">{l s='Shopping-cart summary'}
{if !isset($empty) && !$PS_CATALOG_MODE}<span class="heading-counter">{l s='Your shopping cart contains:'} <span id="summary_products_quantity">{$productNumber} {if $productNumber == 1}{l s='product'}{else}{l s='products'}{/if}</span></span>{/if} {if !isset($empty) && !$PS_CATALOG_MODE}
<span class="heading-counter">{l s='Your shopping cart contains:'}
<span id="summary_products_quantity">{$productNumber} {if $productNumber == 1}{l s='product'}{else}{l s='products'}{/if}</span>
</span>
{/if}
</h1> </h1>
{if isset($account_created)} {if isset($account_created)}
@@ -101,7 +105,7 @@
{if $use_taxes} {if $use_taxes}
{if $priceDisplay} {if $priceDisplay}
<tr class="cart_total_price"> <tr class="cart_total_price">
<td rowspan="{3+$total_discounts_num+$use_show_taxes+$total_wrapping_taxes_num}" colspan="2" id="cart_voucher" class="cart_voucher"> <td rowspan="{5+$total_discounts_num+$use_show_taxes+$total_wrapping_taxes_num}" colspan="2" id="cart_voucher" class="cart_voucher">
{if $voucherAllowed} {if $voucherAllowed}
{if isset($errors_discount) && $errors_discount} {if isset($errors_discount) && $errors_discount}
<ul class="alert alert-danger"> <ul class="alert alert-danger">
@@ -122,7 +126,9 @@
<p id="title" class="title-offers">{l s='Take advantage of our exclusive offers:'}</p> <p id="title" class="title-offers">{l s='Take advantage of our exclusive offers:'}</p>
<div id="display_cart_vouchers"> <div id="display_cart_vouchers">
{foreach $displayVouchers as $voucher} {foreach $displayVouchers as $voucher}
{if $voucher.code != ''}<span onclick="$('#discount_name').val('{$voucher.code}');return false;" class="voucher_name">{$voucher.code}</span> - {/if}{$voucher.name}<br /> {if $voucher.code != ''}<span onclick="$('#discount_name').val('{$voucher.code}');return false;" class="voucher_name">{$voucher.code}</span> - {/if}
{$voucher.name}
<br />
{/foreach} {/foreach}
</div> </div>
{/if} {/if}
@@ -133,7 +139,7 @@
</tr> </tr>
{else} {else}
<tr class="cart_total_price"> <tr class="cart_total_price">
<td rowspan="{3+$total_discounts_num+$use_show_taxes+$total_wrapping_taxes_num}" colspan="2" id="cart_voucher" class="cart_voucher"> <td rowspan="{5+$total_discounts_num+$use_show_taxes+$total_wrapping_taxes_num}" colspan="2" id="cart_voucher" class="cart_voucher">
{if $voucherAllowed} {if $voucherAllowed}
{if isset($errors_discount) && $errors_discount} {if isset($errors_discount) && $errors_discount}
<ul class="alert alert-danger"> <ul class="alert alert-danger">
@@ -170,7 +176,7 @@
{/if} {/if}
{else} {else}
<tr class="cart_total_price"> <tr class="cart_total_price">
<td rowspan="{3+$total_discounts_num+$use_show_taxes+$total_wrapping_taxes_num}" colspan="2" id="cart_voucher" class="cart_voucher"> <td rowspan="{5+$total_discounts_num+$use_show_taxes+$total_wrapping_taxes_num}" colspan="2" id="cart_voucher" class="cart_voucher">
{if $voucherAllowed} {if $voucherAllowed}
{if isset($errors_discount) && $errors_discount} {if isset($errors_discount) && $errors_discount}
<ul class="alert alert-danger"> <ul class="alert alert-danger">
@@ -206,96 +212,96 @@
<td colspan="2" class="price" id="total_product">{displayPrice price=$total_products}</td> <td colspan="2" class="price" id="total_product">{displayPrice price=$total_products}</td>
</tr> </tr>
{/if} {/if}
<tr{if $total_wrapping == 0} style="display: none;"{/if}> <tr{if $total_wrapping == 0} style="display: none;"{/if}>
<td colspan="3" class="text-right"> <td colspan="3" class="text-right">
{if $use_taxes} {if $use_taxes}
{if $display_tax_label}{l s='Total gift wrapping (tax incl.):'}{else}{l s='Total gift-wrapping cost:'}{/if} {if $display_tax_label}{l s='Total gift wrapping (tax incl.):'}{else}{l s='Total gift-wrapping cost:'}{/if}
{else} {else}
{l s='Total gift-wrapping cost:'} {l s='Total gift-wrapping cost:'}
{/if} {/if}
</td> </td>
<td colspan="2" class="price-discount price" id="total_wrapping"> <td colspan="2" class="price-discount price" id="total_wrapping">
{if $use_taxes} {if $use_taxes}
{if $priceDisplay}
{displayPrice price=$total_wrapping_tax_exc}
{else}
{displayPrice price=$total_wrapping}
{/if}
{else}
{displayPrice price=$total_wrapping_tax_exc}
{/if}
</td>
</tr>
{if $total_shipping_tax_exc <= 0 && !isset($virtualCart)}
<tr class="cart_total_delivery" style="{if !isset($carrier->id) || is_null($carrier->id)}display:none;{/if}">
<td colspan="3" class="text-right">{l s='Shipping'}</td>
<td colspan="2" class="price" id="total_shipping">{l s='Free Shipping!'}</td>
</tr>
{else}
{if $use_taxes && $total_shipping_tax_exc != $total_shipping}
{if $priceDisplay} {if $priceDisplay}
<tr class="cart_total_delivery" {if $total_shipping_tax_exc <= 0} style="display:none;"{/if}> {displayPrice price=$total_wrapping_tax_exc}
<td colspan="3" class="text-right">{if $display_tax_label}{l s='Total shipping (tax excl.)'}{else}{l s='Total shipping'}{/if}</td>
<td colspan="2" class="price" id="total_shipping">{displayPrice price=$total_shipping_tax_exc}</td>
</tr>
{else} {else}
<tr class="cart_total_delivery"{if $total_shipping <= 0} style="display:none;"{/if}> {displayPrice price=$total_wrapping}
<td colspan="3" class="text-right">{if $display_tax_label}{l s='Total shipping (tax incl.)'}{else}{l s='Total shipping'}{/if}</td>
<td colspan="2" class="price" id="total_shipping" >{displayPrice price=$total_shipping}</td>
</tr>
{/if} {/if}
{else} {else}
<tr class="cart_total_delivery"{if $total_shipping_tax_exc <= 0} style="display:none;"{/if}> {displayPrice price=$total_wrapping_tax_exc}
<td colspan="3" class="text-right">{l s='Total shipping'}</td> {/if}
<td colspan="2" class="price" id="total_shipping" >{displayPrice price=$total_shipping_tax_exc}</td> </td>
</tr>
{if $total_shipping_tax_exc <= 0 && !isset($virtualCart)}
<tr class="cart_total_delivery" style="{if !isset($carrier->id) || is_null($carrier->id)}display:none;{/if}">
<td colspan="3" class="text-right">{l s='Shipping'}</td>
<td colspan="2" class="price" id="total_shipping">{l s='Free Shipping!'}</td>
</tr>
{else}
{if $use_taxes && $total_shipping_tax_exc != $total_shipping}
{if $priceDisplay}
<tr class="cart_total_delivery" {if $total_shipping_tax_exc <= 0} style="display:none;"{/if}>
<td colspan="3" class="text-right">{if $display_tax_label}{l s='Total shipping (tax excl.)'}{else}{l s='Total shipping'}{/if}</td>
<td colspan="2" class="price" id="total_shipping">{displayPrice price=$total_shipping_tax_exc}</td>
</tr>
{else}
<tr class="cart_total_delivery"{if $total_shipping <= 0} style="display:none;"{/if}>
<td colspan="3" class="text-right">{if $display_tax_label}{l s='Total shipping (tax incl.)'}{else}{l s='Total shipping'}{/if}</td>
<td colspan="2" class="price" id="total_shipping" >{displayPrice price=$total_shipping}</td>
</tr> </tr>
{/if} {/if}
{else}
<tr class="cart_total_delivery"{if $total_shipping_tax_exc <= 0} style="display:none;"{/if}>
<td colspan="3" class="text-right">{l s='Total shipping'}</td>
<td colspan="2" class="price" id="total_shipping" >{displayPrice price=$total_shipping_tax_exc}</td>
</tr>
{/if} {/if}
<tr class="cart_total_voucher" {if $total_discounts == 0}style="display:none"{/if}> {/if}
<td colspan="3" class="text-right"> <tr class="cart_total_voucher" {if $total_discounts == 0}style="display:none"{/if}>
{if $display_tax_label} <td colspan="3" class="text-right">
{if $use_taxes && $priceDisplay == 0} {if $display_tax_label}
{l s='Total vouchers (tax incl.):'}
{else}
{l s='Total vouchers (tax excl.)'}
{/if}
{else}
{l s='Total vouchers'}
{/if}
</td>
<td colspan="2" class="price-discount price" id="total_discount">
{if $use_taxes && $priceDisplay == 0} {if $use_taxes && $priceDisplay == 0}
{assign var='total_discounts_negative' value=$total_discounts * -1} {l s='Total vouchers (tax incl.):'}
{else} {else}
{assign var='total_discounts_negative' value=$total_discounts_tax_exc * -1} {l s='Total vouchers (tax excl.)'}
{/if} {/if}
{displayPrice price=$total_discounts_negative}
</td>
</tr>
{if $use_taxes && $show_taxes}
<tr class="cart_total_price">
<td colspan="3" class="text-right">{l s='Total (tax excl.)'}</td>
<td colspan="2" class="price" id="total_price_without_tax">{displayPrice price=$total_price_without_tax}</td>
</tr>
<tr class="cart_total_tax">
<td colspan="3" class="text-right">{l s='Total tax'}</td>
<td colspan="2" class="price" id="total_tax">{displayPrice price=$total_tax}</td>
</tr>
{/if}
<tr class="cart_total_price">
<td colspan="3" class="total_price_container text-right">
<span>{l s='Total'}</span>
</td>
{if $use_taxes}
<td colspan="2" class="price" id="total_price_container">
<span id="total_price">{displayPrice price=$total_price}</span>
</td>
{else} {else}
<td colspan="2" class="price" id="total_price_container"> {l s='Total vouchers'}
<span id="total_price">{displayPrice price=$total_price_without_tax}</span>
</td>
{/if} {/if}
</td>
<td colspan="2" class="price-discount price" id="total_discount">
{if $use_taxes && $priceDisplay == 0}
{assign var='total_discounts_negative' value=$total_discounts * -1}
{else}
{assign var='total_discounts_negative' value=$total_discounts_tax_exc * -1}
{/if}
{displayPrice price=$total_discounts_negative}
</td>
</tr>
{if $use_taxes && $show_taxes}
<tr class="cart_total_price">
<td colspan="3" class="text-right">{l s='Total (tax excl.)'}</td>
<td colspan="2" class="price" id="total_price_without_tax">{displayPrice price=$total_price_without_tax}</td>
</tr> </tr>
<tr class="cart_total_tax">
<td colspan="3" class="text-right">{l s='Total tax'}</td>
<td colspan="2" class="price" id="total_tax">{displayPrice price=$total_tax}</td>
</tr>
{/if}
<tr class="cart_total_price">
<td colspan="3" class="total_price_container text-right">
<span>{l s='Total'}</span>
</td>
{if $use_taxes}
<td colspan="2" class="price" id="total_price_container">
<span id="total_price">{displayPrice price=$total_price}</span>
</td>
{else}
<td colspan="2" class="price" id="total_price_container">
<span id="total_price">{displayPrice price=$total_price_without_tax}</span>
</td>
{/if}
</tr>
</tfoot> </tfoot>
<tbody> <tbody>
{assign var='odd' value=0} {assign var='odd' value=0}
@@ -545,14 +551,14 @@
<p class="cart_navigation clearfix"> <p class="cart_navigation clearfix">
{if !$opc} {if !$opc}
<a <a
href="{if $back}{$link->getPageLink('order', true, NULL, 'step=1&amp;back={$back}')}{else}{$link->getPageLink('order', true, NULL, 'step=1')}{/if}" href="{if $back}{$link->getPageLink('order', true, NULL, 'step=1&amp;back={$back}')|escape:html:'UTF-8'}{else}{$link->getPageLink('order', true, NULL, 'step=1')|escape:html:'UTF-8'}{/if}"
class="button btn btn-default standard-checkout button-medium" class="button btn btn-default standard-checkout button-medium"
title="{l s='Proceed to checkout'}"> title="{l s='Proceed to checkout'}">
<span>{l s='Proceed to checkout'}<i class="icon-chevron-right right"></i></span> <span>{l s='Proceed to checkout'}<i class="icon-chevron-right right"></i></span>
</a> </a>
{if Configuration::get('PS_ALLOW_MULTISHIPPING')} {if Configuration::get('PS_ALLOW_MULTISHIPPING')}
<a <a
href="{if $back}{$link->getPageLink('order', true, NULL, 'step=1&amp;back={$back}')}{else}{$link->getPageLink('order', true, NULL, 'step=1')}{/if}&amp;multi-shipping=1" href="{if $back}{$link->getPageLink('order', true, NULL, 'step=1&amp;back={$back}')|escape:html:'UTF-8'}{else}{$link->getPageLink('order', true, NULL, 'step=1')|escape:html:'UTF-8'}{/if}&amp;multi-shipping=1"
class="multishipping-button multishipping-checkout button btn btn-default button-medium" class="multishipping-button multishipping-checkout button btn btn-default button-medium"
title="{l s='Proceed to checkout'}"> title="{l s='Proceed to checkout'}">
<span>{l s='Proceed to checkout'}<i class="icon-chevron-right right"></i></span> <span>{l s='Proceed to checkout'}<i class="icon-chevron-right right"></i></span>