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

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

Browse Source
This commit is contained in:
Gregory Roussac
2013-01-21 15:31:44 +01:00
parent 00702ba1e2 f56cbc9fa8
commit b6c2532c8f
56 changed files with 1185 additions and 1289 deletions
Download Patch File Download Diff File Expand all files Collapse all files
themes/default/address.tpl
+4 -4
View File
@@ -25,10 +25,10 @@
<script type="text/javascript">
// <![CDATA[
idSelectedCountry = {if isset($smarty.post.id_state)}{$smarty.post.id_state|intval}{else}{if isset($address->id_state)}{$address->id_state|intval}{else}false{/if}{/if};
countries = new Array();
countriesNeedIDNumber = new Array();
countriesNeedZipCode = new Array();
var idSelectedCountry = {if isset($smarty.post.id_state)}{$smarty.post.id_state|intval}{else}{if isset($address->id_state)}{$address->id_state|intval}{else}false{/if}{/if};
var countries = new Array();
var countriesNeedIDNumber = new Array();
var countriesNeedZipCode = new Array();
{foreach from=$countries item='country'}
{if isset($country.states) && $country.contains_states}
countries[{$country.id_country|intval}] = new Array();
themes/default/css/global.css
+9 -2
View File
@@ -748,9 +748,13 @@ table#cart_summary tr ul {
table#cart_summary .cart_product {
width:80px;
text-align:center
}table#cart_summary tbody tr:last-child td {
}
table#cart_summary tbody tr:last-child td {
border-bottom: 1px solid #999;
}
table#cart_summary tbody tr td.cart_discount_delete {
padding-left: 34px;
}
table#cart_summary .cart_product img {border:1px solid #ccc}
table#cart_summary .cart_description {
width:230px;
@@ -812,6 +816,8 @@ table#cart_summary #total_price_container {
font-size:13px
}
.cart_voucher p {padding-bottom:0;}
.cart_voucher p.discount_name_block {float:left;}
.cart_voucher #display_cart_vouchers {
clear:both;
line-height: 20px;
@@ -1445,7 +1451,8 @@ form#add_adress {}
width:360px;/* 370 */
border:1px solid #ccc;
font-size: 12px;
color:#666
color:#666;
line-height:22px
}
#add_adress p.checkbox input {
margin-left:260px;
themes/default/discount.tpl
+1 -4
View File
@@ -50,7 +50,7 @@
{if $discountDetail.id_discount_type == 1}
{$discountDetail.value|escape:'htmlall':'UTF-8'}%
{elseif $discountDetail.id_discount_type == 2}
{convertPrice price=$discountDetail.value}
{convertPrice price=$discountDetail.value} ({if $discountDetail.reduction_tax == 1}{l s='Tax included'}{else}{l s='Tax excluded'}{/if})
{elseif $discountDetail.id_discount_type == 3}
{l s='Free shipping'}
{else}
@@ -76,9 +76,6 @@
{/foreach}
</tbody>
</table>
<p>
*{l s='Tax included'}
</p>
{else}
<p class="warning">{l s='You do not have any vouchers.'}</p>
{/if}
themes/default/mobile/shopping-cart.tpl
+7 -7
View File
@@ -171,13 +171,13 @@
<p><span class="price" id="total_shipping">{displayPrice price=$total_shipping_tax_exc}</span></p>
</div>
{/if}
<h3>{l s='Total (tax excl.):'}</h3>
<p><span class="price" id="total_price_without_tax">{displayPrice price=$total_price_without_tax}</span></p>
<h3>{l s='Total tax:'}</h3>
<p><span class="price" id="total_tax">{displayPrice price=$total_tax}</span></p>
{if $use_taxes}
<h3>{l s='Total (tax excl.):'}</h3>
<p><span class="price" id="total_price_without_tax">{displayPrice price=$total_price_without_tax}</span></p>
<h3>{l s='Total tax:'}</h3>
<p><span class="price" id="total_tax">{displayPrice price=$total_tax}</span></p>
{/if}
<h3>{l s='Total:'}</h3>
{if $use_taxes}
<p><span class="price" id="total_price">{displayPrice price=$total_price}</span></p>
themes/default/product.tpl
+7 -1
View File
@@ -397,7 +397,13 @@ var fieldRequired = '{l s='Please fill in all the required fields before saving
{/if}
</div>
<p id="reduction_percent" {if !$product->specificPrice OR $product->specificPrice.reduction_type != 'percentage'} style="display:none;"{/if}><span id="reduction_percent_display">{if $product->specificPrice AND $product->specificPrice.reduction_type == 'percentage'}-{$product->specificPrice.reduction*100}%{/if}</span></p>
<p id="reduction_amount" {if !$product->specificPrice OR $product->specificPrice.reduction_type != 'amount' && $product->specificPrice.reduction|intval ==0} style="display:none"{/if}><span id="reduction_amount_display">{if $product->specificPrice AND $product->specificPrice.reduction_type == 'amount' && $product->specificPrice.reduction|intval !=0}-{convertPrice price=$product->specificPrice.reduction|floatval}{/if}</span></p>
<p id="reduction_amount" {if !$product->specificPrice OR $product->specificPrice.reduction_type != 'amount' && $product->specificPrice.reduction|intval ==0} style="display:none"{/if}>
<span id="reduction_amount_display">
{if $product->specificPrice AND $product->specificPrice.reduction_type == 'amount' AND $product->specificPrice.reduction|intval !=0}
-{convertPrice price=$productPriceWithoutReduction-$productPrice|floatval}
{/if}
</span>
</p>
{if $product->specificPrice AND $product->specificPrice.reduction}
<p id="old_price"><span class="bold">
{if $priceDisplay >= 0 && $priceDisplay <= 2}
themes/default/shopping-cart.tpl
+1 -1
View File
@@ -185,7 +185,7 @@
<form action="{if $opc}{$link->getPageLink('order-opc', true)}{else}{$link->getPageLink('order', true)}{/if}" method="post" id="voucher">
<fieldset>
<p class="title_block"><label for="discount_name">{l s='Vouchers'}</label></p>
<p>
<p class="discount_name_block">
<input type="text" class="discount_name" id="discount_name" name="discount_name" value="{if isset($discount_name) && $discount_name}{$discount_name}{/if}" />
</p>
<p class="submit"><input type="hidden" name="submitDiscount" /><input type="submit" name="submitAddDiscount" value="{l s='OK'}" class="button" /></p>