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
+72 -62
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
+53 -50
View File
@@ -62,8 +62,7 @@ $(document).ready(function() {
vat_number(); vat_number();
}); });
vat_number(); vat_number();
function vat_number() function vat_number() {
{
if ($('#company').val() != '') if ($('#company').val() != '')
$('#vat_number').show(); $('#vat_number').show();
else else
@@ -87,8 +86,7 @@ $(document).ready(function() {
return false; return false;
}); });
}); });
function submitFunction() function submitFunction() {
{
$('#create_account_error').html('').hide(); $('#create_account_error').html('').hide();
//send the ajax request to the server //send the ajax request to the server
$.ajax({ $.ajax({
@@ -105,10 +103,8 @@ $(document).ready(function() {
back: $('input[name=back]').val(), back: $('input[name=back]').val(),
token: token token: token
}, },
success: function(jsonData) success: function(jsonData) {
{ if (jsonData.hasError) {
if (jsonData.hasError)
{
var errors = ''; var errors = '';
for(error in jsonData.errors) for(error in jsonData.errors)
//IE6 bug fix //IE6 bug fix
@@ -116,8 +112,7 @@ $(document).ready(function() {
errors += '<li>'+jsonData.errors[error]+'</li>'; errors += '<li>'+jsonData.errors[error]+'</li>';
$('#create_account_error').html('<ol>'+errors+'</ol>').show(); $('#create_account_error').html('<ol>'+errors+'</ol>').show();
} }
else else {
{
// adding a div to display a transition // adding a div to display a transition
$('#center_column').html('<div id="noSlide">'+$('#center_column').html()+'</div>'); $('#center_column').html('<div id="noSlide">'+$('#center_column').html()+'</div>');
$('#noSlide').fadeOut('slow', function(){ $('#noSlide').fadeOut('slow', function(){
@@ -131,8 +126,7 @@ $(document).ready(function() {
}); });
} }
}, },
error: function(XMLHttpRequest, textStatus, errorThrown) error: function(XMLHttpRequest, textStatus, errorThrown) {
{
alert("TECHNICAL ERROR: unable to load form.\n\nDetails:\nError thrown: " + XMLHttpRequest + "\n" + 'Text status: ' + textStatus); alert("TECHNICAL ERROR: unable to load form.\n\nDetails:\nError thrown: " + XMLHttpRequest + "\n" + 'Text status: ' + textStatus);
} }
}); });
@@ -156,8 +150,6 @@ $(document).ready(function() {
<div class="row"> <div class="row">
<div class="col-xs-12 col-sm-6"> <div class="col-xs-12 col-sm-6">
<form action="{$link->getPageLink('authentication', true)|escape:'html'}" method="post" id="create-account_form" class="box"> <form action="{$link->getPageLink('authentication', true)|escape:'html'}" method="post" id="create-account_form" class="box">
<fieldset>
<h3 class="page-subheading">{l s='Create an account'}</h3> <h3 class="page-subheading">{l s='Create an account'}</h3>
<div class="form_content clearfix"> <div class="form_content clearfix">
<p>{l s='Please enter your email address to create an account.'}</p> <p>{l s='Please enter your email address to create an account.'}</p>
@@ -168,16 +160,19 @@ $(document).ready(function() {
</div> </div>
<div class="submit"> <div class="submit">
{if isset($back)}<input type="hidden" class="hidden" name="back" value="{$back|escape:'html':'UTF-8'}" />{/if} {if isset($back)}<input type="hidden" class="hidden" name="back" value="{$back|escape:'html':'UTF-8'}" />{/if}
<button class="btn btn-default button button-medium exclusive" type="submit" id="SubmitCreate" name="SubmitCreate"><span><i class="icon-user left"></i>{l s='Create an account'}</span></button> <button class="btn btn-default button button-medium exclusive" type="submit" id="SubmitCreate" name="SubmitCreate">
<span>
<i class="icon-user left"></i>
{l s='Create an account'}
</span>
</button>
<input type="hidden" class="hidden" name="SubmitCreate" value="{l s='Create an account'}" /> <input type="hidden" class="hidden" name="SubmitCreate" value="{l s='Create an account'}" />
</div> </div>
</div> </div>
</fieldset>
</form> </form>
</div> </div>
<div class="col-xs-12 col-sm-6"> <div class="col-xs-12 col-sm-6">
<form action="{$link->getPageLink('authentication', true)|escape:'html'}" method="post" id="login_form" class="box"> <form action="{$link->getPageLink('authentication', true)|escape:'html'}" method="post" id="login_form" class="box">
<fieldset>
<h3 class="page-subheading">{l s='Already registered?'}</h3> <h3 class="page-subheading">{l s='Already registered?'}</h3>
<div class="form_content clearfix"> <div class="form_content clearfix">
<div class="form-group"> <div class="form-group">
@@ -191,17 +186,21 @@ $(document).ready(function() {
<p class="lost_password form-group"><a href="{$link->getPageLink('password')|escape:'html'}" title="{l s='Recover your forgotten password'}" rel="nofollow">{l s='Forgot your password?'}</a></p> <p class="lost_password form-group"><a href="{$link->getPageLink('password')|escape:'html'}" title="{l s='Recover your forgotten password'}" rel="nofollow">{l s='Forgot your password?'}</a></p>
<p class="submit"> <p class="submit">
{if isset($back)}<input type="hidden" class="hidden" name="back" value="{$back|escape:'html':'UTF-8'}" />{/if} {if isset($back)}<input type="hidden" class="hidden" name="back" value="{$back|escape:'html':'UTF-8'}" />{/if}
<button type="submit" id="SubmitLogin" name="SubmitLogin" class="button btn btn-default button-medium"><span><i class="icon-lock left"></i>{l s='Sign in'}</span></button> <button type="submit" id="SubmitLogin" name="SubmitLogin" class="button btn btn-default button-medium">
<span>
<i class="icon-lock left"></i>
{l s='Sign in'}
</span>
</button>
</p> </p>
</div> </div>
</fieldset>
</form> </form>
</div> </div>
</div> </div>
{if isset($inOrderProcess) && $inOrderProcess && $PS_GUEST_CHECKOUT_ENABLED} {if isset($inOrderProcess) && $inOrderProcess && $PS_GUEST_CHECKOUT_ENABLED}
<form action="{$link->getPageLink('authentication', true, NULL, "back=$back")|escape:'html'}" method="post" id="new_account_form" class="std clearfix"> <form action="{$link->getPageLink('authentication', true, NULL, "back=$back")|escape:'html'}" method="post" id="new_account_form" class="std clearfix">
<div class="box"> <div class="box">
<fieldset> <div>
<div id="opc_account_form" style="display: block; "> <div id="opc_account_form" style="display: block; ">
<h3 class="page-heading bottom-indent">{l s='Instant checkout'}</h3> <h3 class="page-heading bottom-indent">{l s='Instant checkout'}</h3>
<!-- Account --> <!-- Account -->
@@ -215,7 +214,8 @@ $(document).ready(function() {
<div class="radio-inline"> <div class="radio-inline">
<label for="id_gender{$gender->id}" class="top"> <label for="id_gender{$gender->id}" class="top">
<input type="radio" name="id_gender" id="id_gender{$gender->id}" value="{$gender->id}"{if isset($smarty.post.id_gender) && $smarty.post.id_gender == $gender->id} checked="checked"{/if} /> <input type="radio" name="id_gender" id="id_gender{$gender->id}" value="{$gender->id}"{if isset($smarty.post.id_gender) && $smarty.post.id_gender == $gender->id} checked="checked"{/if} />
{$gender->name}</label> {$gender->name}
</label>
</div> </div>
{/foreach} {/foreach}
</div> </div>
@@ -275,12 +275,12 @@ $(document).ready(function() {
{if isset($newsletter) && $newsletter} {if isset($newsletter) && $newsletter}
<div class="checkbox"> <div class="checkbox">
<label for="newsletter"> <label for="newsletter">
<input type="checkbox" name="newsletter" id="newsletter" value="1" {if isset($smarty.post.newsletter) && $smarty.post.newsletter == '1'}checked="checked"{/if} autocomplete="off"/> <input type="checkbox" name="newsletter" id="newsletter" value="1" {if isset($smarty.post.newsletter) && $smarty.post.newsletter == '1'}checked="checked"{/if} />
{l s='Sign up for our newsletter!'}</label> {l s='Sign up for our newsletter!'}</label>
</div> </div>
<div class="checkbox"> <div class="checkbox">
<label for="optin"> <label for="optin">
<input type="checkbox" name="optin" id="optin" value="1" {if isset($smarty.post.optin) && $smarty.post.optin == '1'}checked="checked"{/if} autocomplete="off"/> <input type="checkbox" name="optin" id="optin" value="1" {if isset($smarty.post.optin) && $smarty.post.optin == '1'}checked="checked"{/if} />
{l s='Receive special offers from our partners!'}</label> {l s='Receive special offers from our partners!'}</label>
</div> </div>
{/if} {/if}
@@ -294,8 +294,8 @@ $(document).ready(function() {
{elseif $field_name eq "vat_number"} {elseif $field_name eq "vat_number"}
<div id="vat_number" style="display:none;"> <div id="vat_number" style="display:none;">
<div class="text form-group"> <div class="text form-group">
<label for="vat_number">{l s='VAT number'}</label> <label for="vat-number">{l s='VAT number'}</label>
<input type="text" class="text form-control" name="vat_number" value="{if isset($smarty.post.vat_number)}{$smarty.post.vat_number}{/if}" /> <input id="vat-number" type="text" class="text form-control" name="vat_number" value="{if isset($smarty.post.vat_number)}{$smarty.post.vat_number}{/if}" />
</div> </div>
</div> </div>
{elseif $field_name eq "address1"} {elseif $field_name eq "address1"}
@@ -314,10 +314,7 @@ $(document).ready(function() {
<label for="city">{l s='City'} <sup>*</sup></label> <label for="city">{l s='City'} <sup>*</sup></label>
<input type="text" class="form-control" name="city" id="city" value="{if isset($smarty.post.city)}{$smarty.post.city}{/if}" /> <input type="text" class="form-control" name="city" id="city" value="{if isset($smarty.post.city)}{$smarty.post.city}{/if}" />
</div> </div>
<!-- <!-- if customer hasn't update his layout address, country has to be verified but it's deprecated -->
if customer hasn't update his layout address, country has to be verified
but it's deprecated
-->
{elseif $field_name eq "Country:name" || $field_name eq "country"} {elseif $field_name eq "Country:name" || $field_name eq "country"}
<div class="required select form-group"> <div class="required select form-group">
<label for="id_country">{l s='Country'} <sup>*</sup></label> <label for="id_country">{l s='Country'} <sup>*</sup></label>
@@ -360,21 +357,26 @@ $(document).ready(function() {
<input type="hidden" name="is_new_customer" id="is_new_customer" value="0" /> <input type="hidden" name="is_new_customer" id="is_new_customer" value="0" />
<!-- END Account --> <!-- END Account -->
</div> </div>
</fieldset> </div>
<fieldset class="account_creation dni"> <div class="account_creation dni">
<h3 class="page-subheading">{l s='Tax identification'}</h3> <h3 class="page-subheading">{l s='Tax identification'}</h3>
<p class="required text form-group"> <p class="required text form-group">
<label for="dni">{l s='Identification number'}</label> <label for="dni">{l s='Identification number'}</label>
<input type="text" class="text form-control" name="dni" id="dni" value="{if isset($smarty.post.dni)}{$smarty.post.dni}{/if}" /> <input type="text" class="text form-control" name="dni" id="dni" value="{if isset($smarty.post.dni)}{$smarty.post.dni}{/if}" />
<span class="form_info">{l s='DNI / NIF / NIE'}</span> <span class="form_info">{l s='DNI / NIF / NIE'}</span>
</p> </p>
</fieldset> </div>
{$HOOK_CREATE_ACCOUNT_FORM} {$HOOK_CREATE_ACCOUNT_FORM}
</div> </div>
<p class="cart_navigation required submit clearfix"> <p class="cart_navigation required submit clearfix">
<span><sup>*</sup>{l s='Required field'}</span> <span><sup>*</sup>{l s='Required field'}</span>
<input type="hidden" name="display_guest_checkout" value="1" /> <input type="hidden" name="display_guest_checkout" value="1" />
<button type="submit" class="button btn btn-default button-medium" name="submitGuestAccount" id="submitGuestAccount"><span>{l s='Proceed to checkout'}<i class="icon-chevron-right right"></i></span></button> <button type="submit" class="button btn btn-default button-medium" name="submitGuestAccount" id="submitGuestAccount">
<span>
{l s='Proceed to checkout'}
<i class="icon-chevron-right right"></i>
</span>
</button>
</p> </p>
</form> </form>
{/if} {/if}
@@ -395,15 +397,17 @@ $(document).ready(function() {
{/if}--> {/if}-->
<form action="{$link->getPageLink('authentication', true)|escape:'html'}" method="post" id="account-creation_form" class="std box"> <form action="{$link->getPageLink('authentication', true)|escape:'html'}" method="post" id="account-creation_form" class="std box">
{$HOOK_CREATE_ACCOUNT_TOP} {$HOOK_CREATE_ACCOUNT_TOP}
<fieldset class="account_creation"> <div class="account_creation">
<h3 class="page-subheading">{l s='Your personal information'}</h3> <h3 class="page-subheading">{l s='Your personal information'}</h3>
<div class="clearfix"> <div class="clearfix">
<label>{l s='Title'}</label><br /> <label>{l s='Title'}</label>
<br />
{foreach from=$genders key=k item=gender} {foreach from=$genders key=k item=gender}
<div class="radio-inline"> <div class="radio-inline">
<label for="id_gender{$gender->id}" class="top"> <label for="id_gender{$gender->id}" class="top">
<input type="radio" name="id_gender" id="id_gender{$gender->id}" value="{$gender->id}" {if isset($smarty.post.id_gender) && $smarty.post.id_gender == $gender->id}checked="checked"{/if} /> <input type="radio" name="id_gender" id="id_gender{$gender->id}" value="{$gender->id}" {if isset($smarty.post.id_gender) && $smarty.post.id_gender == $gender->id}checked="checked"{/if} />
{$gender->name}</label> {$gender->name}
</label>
</div> </div>
{/foreach} {/foreach}
</div> </div>
@@ -469,17 +473,17 @@ $(document).ready(function() {
</div> </div>
{if $newsletter} {if $newsletter}
<div class="checkbox"> <div class="checkbox">
<input type="checkbox" name="newsletter" id="newsletter" value="1" {if isset($smarty.post.newsletter) AND $smarty.post.newsletter == 1} checked="checked"{/if} autocomplete="off"/> <input type="checkbox" name="newsletter" id="newsletter" value="1" {if isset($smarty.post.newsletter) AND $smarty.post.newsletter == 1} checked="checked"{/if} />
<label for="newsletter">{l s='Sign up for our newsletter!'}</label> <label for="newsletter">{l s='Sign up for our newsletter!'}</label>
</div> </div>
<div class="checkbox"> <div class="checkbox">
<input type="checkbox"name="optin" id="optin" value="1" {if isset($smarty.post.optin) AND $smarty.post.optin == 1} checked="checked"{/if} autocomplete="off"/> <input type="checkbox"name="optin" id="optin" value="1" {if isset($smarty.post.optin) AND $smarty.post.optin == 1} checked="checked"{/if} />
<label for="optin">{l s='Receive special offers from our partners!'}</label> <label for="optin">{l s='Receive special offers from our partners!'}</label>
</div> </div>
{/if} {/if}
</fieldset> </div>
{if $b2b_enable} {if $b2b_enable}
<fieldset class="account_creation"> <div class="account_creation">
<h3 class="page-subheading">{l s='Your company information'}</h3> <h3 class="page-subheading">{l s='Your company information'}</h3>
<p class="form-group"> <p class="form-group">
<label for="">{l s='Company'}</label> <label for="">{l s='Company'}</label>
@@ -497,10 +501,10 @@ $(document).ready(function() {
<label for="website">{l s='Website'}</label> <label for="website">{l s='Website'}</label>
<input type="text" class="form-control" id="website" name="website" value="{if isset($smarty.post.website)}{$smarty.post.website}{/if}" /> <input type="text" class="form-control" id="website" name="website" value="{if isset($smarty.post.website)}{$smarty.post.website}{/if}" />
</p> </p>
</fieldset> </div>
{/if} {/if}
{if isset($PS_REGISTRATION_PROCESS_TYPE) && $PS_REGISTRATION_PROCESS_TYPE} {if isset($PS_REGISTRATION_PROCESS_TYPE) && $PS_REGISTRATION_PROCESS_TYPE}
<fieldset class="account_creation"> <div class="account_creation">
<h3 class="page-subheading">{l s='Your address'}</h3> <h3 class="page-subheading">{l s='Your address'}</h3>
{foreach from=$dlv_all_fields item=field_name} {foreach from=$dlv_all_fields item=field_name}
{if $field_name eq "company"} {if $field_name eq "company"}
@@ -550,10 +554,7 @@ $(document).ready(function() {
<label for="city">{l s='City'} <sup>*</sup></label> <label for="city">{l s='City'} <sup>*</sup></label>
<input type="text" class="form-control" name="city" id="city" value="{if isset($smarty.post.city)}{$smarty.post.city}{/if}" /> <input type="text" class="form-control" name="city" id="city" value="{if isset($smarty.post.city)}{$smarty.post.city}{/if}" />
</p> </p>
<!-- <!-- if customer hasn't update his layout address, country has to be verified but it's deprecated -->
if customer hasn't update his layout address, country has to be verified
but it's deprecated
-->
{elseif $field_name eq "Country:name" || $field_name eq "country"} {elseif $field_name eq "Country:name" || $field_name eq "country"}
<p class="required select form-group"> <p class="required select form-group">
<label for="id_country">{l s='Country'} <sup>*</sup></label> <label for="id_country">{l s='Country'} <sup>*</sup></label>
@@ -607,22 +608,24 @@ $(document).ready(function() {
<label for="alias">{l s='Assign an address alias for future reference.'} <sup>*</sup></label> <label for="alias">{l s='Assign an address alias for future reference.'} <sup>*</sup></label>
<input type="text" class="form-control" name="alias" id="alias" value="{if isset($smarty.post.alias)}{$smarty.post.alias}{else}{l s='My address'}{/if}" /> <input type="text" class="form-control" name="alias" id="alias" value="{if isset($smarty.post.alias)}{$smarty.post.alias}{else}{l s='My address'}{/if}" />
</p> </p>
</fieldset> </div>
<fieldset class="account_creation dni"> <div class="account_creation dni">
<h3 class="page-subheading">{l s='Tax identification'}</h3> <h3 class="page-subheading">{l s='Tax identification'}</h3>
<p class="required form-group"> <p class="required form-group">
<label for="dni">{l s='Identification number'} <sup>*</sup></label> <label for="dni">{l s='Identification number'} <sup>*</sup></label>
<input type="text" class="form-control" name="dni" id="dni" value="{if isset($smarty.post.dni)}{$smarty.post.dni}{/if}" /> <input type="text" class="form-control" name="dni" id="dni" value="{if isset($smarty.post.dni)}{$smarty.post.dni}{/if}" />
<span class="form_info">{l s='DNI / NIF / NIE'}</span> <span class="form_info">{l s='DNI / NIF / NIE'}</span>
</p> </p>
</fieldset> </div>
{/if} {/if}
{$HOOK_CREATE_ACCOUNT_FORM} {$HOOK_CREATE_ACCOUNT_FORM}
<div class="submit clearfix"> <div class="submit clearfix">
<input type="hidden" name="email_create" value="1" /> <input type="hidden" name="email_create" value="1" />
<input type="hidden" name="is_new_customer" value="1" /> <input type="hidden" name="is_new_customer" value="1" />
{if isset($back)}<input type="hidden" class="hidden" name="back" value="{$back|escape:'html':'UTF-8'}" />{/if} {if isset($back)}<input type="hidden" class="hidden" name="back" value="{$back|escape:'html':'UTF-8'}" />{/if}
<button type="submit" name="submitAccount" id="submitAccount" class="btn btn-default button button-medium"><span>{l s='Register'}<i class="icon-chevron-right right"></i></span></button> <button type="submit" name="submitAccount" id="submitAccount" class="btn btn-default button button-medium">
<span>{l s='Register'}<i class="icon-chevron-right right"></i></span>
</button>
<p class="pull-right required"><span><sup>*</sup>{l s='Required field'}</span></p> <p class="pull-right required"><span><sup>*</sup>{l s='Required field'}</span></p>
</div> </div>
</form> </form>
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
+13 -7
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">
@@ -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>