diff --git a/admin-dev/themes/template/cart_rules/conditions.tpl b/admin-dev/themes/template/cart_rules/conditions.tpl index 9bcbdbe76..c3bd43426 100644 --- a/admin-dev/themes/template/cart_rules/conditions.tpl +++ b/admin-dev/themes/template/cart_rules/conditions.tpl @@ -134,7 +134,7 @@ {/if} -{if $cart_rules.unselected|@count + $cart_rules.selected|@count > 1} +{if $cart_rules.unselected|@count + $cart_rules.selected|@count > 0}
{l s='Other cart rules compatibility'}
diff --git a/install-dev/sql/db.sql b/install-dev/sql/db.sql index 4e84ec195..8dce4aeec 100644 --- a/install-dev/sql/db.sql +++ b/install-dev/sql/db.sql @@ -214,7 +214,7 @@ CREATE TABLE `PREFIX_cart_rule` ( `cart_rule_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, - `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_tax` tinyint(1) unsigned NOT NULL default 0, `reduction_currency` int(10) unsigned NOT NULL default 0, diff --git a/install-dev/sql/upgrade/1.5.0.1.sql b/install-dev/sql/upgrade/1.5.0.1.sql index d93f8dc6b..c970471d2 100644 --- a/install-dev/sql/upgrade/1.5.0.1.sql +++ b/install-dev/sql/upgrade/1.5.0.1.sql @@ -285,7 +285,7 @@ CREATE TABLE `PREFIX_cart_rule` ( `cart_rule_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, - `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_tax` tinyint(1) unsigned NOT NULL default 0, `reduction_currency` int(10) unsigned NOT NULL default 0,