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

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

Browse Source
This commit is contained in:
Kevin Granger
2013-11-08 16:18:38 +01:00
parent b214ea68ff 64c166c311
commit 034565bc6a
4 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminCurrenciesController.php
+1 -1
View File
@@ -340,7 +340,7 @@ class AdminCurrenciesControllerCore extends AdminController
if (Tools::isSubmit('submitAddcurrency') && !Tools::getValue('id_currency') && Currency::exists(Tools::getValue('iso_code'), Tools::getValue('iso_code_num')))
$this->errors[] = Tools::displayError('This currency already exists.');
if (Tools::isSubmit('submitAddcurrency') && (float)Tools::getValue('conversion_rate') <= 0)
$this->errors[] = Tools::displayError('This currency conversion rate can not be equal to 0.');
$this->errors[] = Tools::displayError('The currency conversion rate can not be equal to 0.');
parent::initProcess();
}
controllers/admin/AdminSpecificPriceRuleController.php
+1 -1
View File
@@ -121,7 +121,7 @@ class AdminSpecificPriceRuleControllerCore extends AdminController
if (empty($this->display))
$this->page_header_toolbar_btn['new_specific_price_rule'] = array(
'href' => self::$currentIndex.'&amp;addspecific_price_rule&amp;token='.$this->token,
'desc' => $this->l('Add new specific rule'),
'desc' => $this->l('Add new catalog price rule'),
'icon' => 'process-icon-new'
);
themes/default-bootstrap/pagination.tpl
+6 -1
View File
@@ -123,7 +123,12 @@
{else}
{assign var='productShowingStart' value=$n*$p-$n+1}
{/if}
{l s='Showing'} {$productShowingStart} - {$productShowing} {l s='of'} {$nb_products}{if $nb_products > 1} {l s='items'}{else} {l s='item'}{/if}
{if $nb_products > 1}
{l s='Showing %1$d - %2$d of %3$d items' sprintf=[$productShowingStart, $productShowing, $nb_products]}
{else}
{l s='Showing %1$d - %2$d of 1 item' sprintf=[$productShowingStart, $productShowing]}
{/if}
</div>
<!-- /Pagination -->
{/if}
themes/default-bootstrap/product.tpl
+9 -1
View File
@@ -626,7 +626,15 @@ var contentOnly = {if $content_only}true{else}false{/if}
{/if}
</td>
<td>
<span>{l s='Up to'} $300</span>
<span>{l s='Up to'}</span>
{if $quantity_discount.price >= 0 OR $quantity_discount.reduction_type == 'amount'}
{$discountPrice=$productPrice-$quantity_discount.real_value|floatval}
{else}
{$discountPrice=$productPrice-($productPrice*$quantity_discount.reduction)|floatval}
{/if}
{$discountPrice=$discountPrice*$quantity_discount.quantity}
{$qtyProductPrice = $productPrice*$quantity_discount.quantity}
{convertPrice price=$qtyProductPrice-$discountPrice}
</td>
</tr>
{/foreach}