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

// 2 bug fixes for the cart rules

Browse Source
This commit is contained in:
dMetzger committed 2011-11-23 13:24:15 +00:00
1 parent 583ca741da
commit 7bc1e78453
3 files changed
+3 -3
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

admin-dev/themes/template/cart_rules/conditions.tpl
+1 -1
View File
@@ -134,7 +134,7 @@
</table> </table>
</div> </div>
{/if} {/if}
{if $cart_rules.unselected|@count + $cart_rules.selected|@count > 1} {if $cart_rules.unselected|@count + $cart_rules.selected|@count > 0}
<br /> <br />
<input type="checkbox" id="cart_rule_restriction" name="cart_rule_restriction" value="1" {if $cart_rules.unselected|@count}checked="checked"{/if} /> <strong>{l s='Other cart rules compatibility'}</strong> <input type="checkbox" id="cart_rule_restriction" name="cart_rule_restriction" value="1" {if $cart_rules.unselected|@count}checked="checked"{/if} /> <strong>{l s='Other cart rules compatibility'}</strong>
<div id="cart_rule_restriction_div" style="border:1px solid #AAAAAA;margin-top:10px;padding:0 10px 10px 10px;background-color:#FFF5D3"> <div id="cart_rule_restriction_div" style="border:1px solid #AAAAAA;margin-top:10px;padding:0 10px 10px 10px;background-color:#FFF5D3">
install-dev/sql/db.sql
+1 -1
View File
@@ -214,7 +214,7 @@ CREATE TABLE `PREFIX_cart_rule` (
`cart_rule_restriction` tinyint(1) unsigned NOT NULL default 0, `cart_rule_restriction` tinyint(1) unsigned NOT NULL default 0,
`product_restriction` tinyint(1) unsigned NOT NULL default 0, `product_restriction` tinyint(1) unsigned NOT NULL default 0,
`free_shipping` tinyint(1) NOT NULL default 0, `free_shipping` tinyint(1) NOT NULL default 0,
`reduction_percent` decimal(4,2) NOT NULL default 0, `reduction_percent` decimal(5,2) NOT NULL default 0,
`reduction_amount` decimal(17,2) NOT NULL default 0, `reduction_amount` decimal(17,2) NOT NULL default 0,
`reduction_tax` tinyint(1) unsigned NOT NULL default 0, `reduction_tax` tinyint(1) unsigned NOT NULL default 0,
`reduction_currency` int(10) unsigned NOT NULL default 0, `reduction_currency` int(10) unsigned NOT NULL default 0,
install-dev/sql/upgrade/1.5.0.1.sql
+1 -1
View File
@@ -285,7 +285,7 @@ CREATE TABLE `PREFIX_cart_rule` (
`cart_rule_restriction` tinyint(1) unsigned NOT NULL default 0, `cart_rule_restriction` tinyint(1) unsigned NOT NULL default 0,
`product_restriction` tinyint(1) unsigned NOT NULL default 0, `product_restriction` tinyint(1) unsigned NOT NULL default 0,
`free_shipping` tinyint(1) NOT NULL default 0, `free_shipping` tinyint(1) NOT NULL default 0,
`reduction_percent` decimal(4,2) NOT NULL default 0, `reduction_percent` decimal(5,2) NOT NULL default 0,
`reduction_amount` decimal(17,2) NOT NULL default 0, `reduction_amount` decimal(17,2) NOT NULL default 0,
`reduction_tax` tinyint(1) unsigned NOT NULL default 0, `reduction_tax` tinyint(1) unsigned NOT NULL default 0,
`reduction_currency` int(10) unsigned NOT NULL default 0, `reduction_currency` int(10) unsigned NOT NULL default 0,