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

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

Browse Source
This commit is contained in:
vAugagneur
2012-12-17 15:26:00 +01:00
parent 20b87785e3 35013b82fe
commit 4785acb7f9
5 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/tax/TaxRulesTaxManager.php
+1 -1
View File
@@ -83,7 +83,7 @@ class TaxRulesTaxManagerCore implements TaxManagerInterface
WHERE `id_country` = '.(int)$this->address->id_country.'
AND `id_tax_rules_group` = '.(int)$this->type.'
AND `id_state` IN (0, '.(int)$this->address->id_state.')
AND (\''.pSQL($postcode).'\' BETWEEN `zipcode_from` AND `zipcode_to` OR `zipcode_from` = 0 OR `zipcode_from` = \''.pSQL($postcode).'\')
AND (\''.pSQL($postcode).'\' BETWEEN `zipcode_from` AND `zipcode_to` OR (`zipcode_to` = 0 AND `zipcode_from` IN(0, \''.pSQL($postcode).'\')))
ORDER BY `zipcode_from` DESC, `zipcode_to` DESC, `id_state` DESC, `id_country` DESC');
$behavior = 0;
controllers/admin/AdminCartsController.php
+1 -1
View File
@@ -462,7 +462,7 @@ class AdminCartsControllerCore extends AdminController
{
$cart_rule = new CartRule();
$cart_rule->code = 'BO_ORDER_'.(int)$this->context->cart->id;
$cart_rule->name = array(Configuration::get('PS_LANG_DEFAULT') => $this->l('Free Shipping'));
$cart_rule->name = array(Configuration::get('PS_LANG_DEFAULT') => $this->l('Free Shipping', 'AdminTab', false, false));
$cart_rule->id_customer = (int)$this->context->cart->id_customer;
$cart_rule->free_shipping = true;
$cart_rule->quantity = 1;
controllers/admin/AdminTaxRulesGroupController.php
+1 -1
View File
@@ -298,7 +298,7 @@ class AdminTaxRulesGroupControllerCore extends AdminController
'id' => 'id_tax',
'name' => 'name',
'default' => array(
'value' => 'name',
'value' => 0,
'label' => $this->l('No Tax')
)
),
install-dev/data/db_structure.sql
+1 -1
View File
@@ -1177,7 +1177,7 @@ CREATE TABLE `PREFIX_order_cart_rule` (
`id_order` int(10) unsigned NOT NULL,
`id_cart_rule` int(10) unsigned NOT NULL,
`id_order_invoice` int(10) unsigned DEFAULT 0,
`name` varchar(32) NOT NULL,
`name` varchar(254) NOT NULL,
`value` decimal(17,2) NOT NULL default '0.00',
`value_tax_excl` decimal(17,2) NOT NULL default '0.00',
PRIMARY KEY (`id_order_cart_rule`),
install-dev/upgrade/sql/1.5.3.0.sql
+3 -1
View File
@@ -18,4 +18,6 @@ UPDATE `PREFIX_order_state_lang` SET `template` = 'payment' WHERE `id_order_stat
DELETE FROM `PREFIX_configuration` WHERE `name`= 'PS_HIGH_HTML_THEME_COMPRESSION';
INSERT INTO `PREFIX_configuration`(`name`, `value`, `date_add`, `date_upd`) VALUES ('PS_MAIL_COLOR', '#db3484', NOW(), NOW());
INSERT INTO `PREFIX_configuration`(`name`, `value`, `date_add`, `date_upd`) VALUES ('PS_MAIL_COLOR', '#db3484', NOW(), NOW());
ALTER TABLE `PREFIX_order_cart_rule` CHANGE `name` `name` VARCHAR(254);