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

// Fixes to upgrader upgrade scripts

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11620 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
tDidierjean
2011-12-22 15:31:23 +00:00
parent e3a5d7fe37
commit b48bdb0ff6
5 changed files with 28 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install-dev/php/migrate_orders.php
+3 -3
View File
@@ -25,7 +25,7 @@
* International Registered Trademark & Property of PrestaShop SA * International Registered Trademark & Property of PrestaShop SA
*/ */
public function migrate_orders() function migrate_orders()
{ {
if (!defined('PS_TAX_EXC')) if (!defined('PS_TAX_EXC'))
define('PS_TAX_EXC', 1); define('PS_TAX_EXC', 1);
@@ -84,10 +84,10 @@ public function migrate_orders()
$wrapping_tax_rate = 1 + ((float)Configuration::get('PS_GIFT_WRAPPING_TAX') / 100); $wrapping_tax_rate = 1 + ((float)Configuration::get('PS_GIFT_WRAPPING_TAX') / 100);
$carrier_tax_rate = 1 + ((float)$order['carrier_tax_rate'] / 100); $carrier_tax_rate = 1 + ((float)$order['carrier_tax_rate'] / 100);
$total_discount_tax_excl = $order['total_discount'] / $average_tax_used; $total_discount_tax_excl = $order['total_discounts'] / $average_tax_used;
$sql = 'UPDATE `'._DB_PREFIX_.'orders` $sql = 'UPDATE `'._DB_PREFIX_.'orders`
SET `total_discount_tax_incl` = '.(float)$order['total_discount'].', SET `total_discount_tax_incl` = '.(float)$order['total_discounts'].',
`total_discount_tax_excl` = '.(float)$total_discount_tax_excl.', `total_discount_tax_excl` = '.(float)$total_discount_tax_excl.',
`total_paid_tax_incl` = '.(float)$order['total_paid'].', `total_paid_tax_incl` = '.(float)$order['total_paid'].',
`total_paid_tax_excl` = '.(float)$order['total_paid'].', `total_paid_tax_excl` = '.(float)$order['total_paid'].',
install-dev/php/update_stock_mvt_reason.php
+17 -15
View File
@@ -82,25 +82,27 @@ function update_stock_mvt_reason()
"); ");
//Add custom movements //Add custom movements
foreach ($mvts as $mvt) if (is_array($mvts))
{ {
Db::getInstance()->execute(' foreach ($mvts as $mvt)
INSERT INTO `PREFIX_stock_mvt_reason` (`sign`, `date_add`, `date_upd`)
VALUES ("'.(int)$mvt['sign'].'", "'.pSQL($mvt['date_add']).'", "'.pSQL($mvt['date_upd']).'")
');
$row_id = Db::getInstance()->Insert_ID();
foreach ($mvts_lang as $mvt_lang)
{ {
if ($mvt_lang['id_stock_mvt_reason'] != $mvt['id'])
continue;
Db::getInstance()->execute(' Db::getInstance()->execute('
INSERT INTO `PREFIX_stock_mvt_reason_lang` (`id_stock_mvt_reason`, `id_lang`, `name`) INSERT INTO `PREFIX_stock_mvt_reason` (`sign`, `date_add`, `date_upd`)
VALUES ("'.(int)$row_id.'", "'.(int)$mvt_lang['id_lang'].'", "'.pSQL($mvt_lang['name']).'") VALUES ("'.(int)$mvt['sign'].'", "'.pSQL($mvt['date_add']).'", "'.pSQL($mvt['date_upd']).'")
'); ');
$row_id = Db::getInstance()->Insert_ID();
foreach ($mvts_lang as $mvt_lang)
{
if ($mvt_lang['id_stock_mvt_reason'] != $mvt['id'])
continue;
Db::getInstance()->execute('
INSERT INTO `PREFIX_stock_mvt_reason_lang` (`id_stock_mvt_reason`, `id_lang`, `name`)
VALUES ("'.(int)$row_id.'", "'.(int)$mvt_lang['id_lang'].'", "'.pSQL($mvt_lang['name']).'")
');
}
} }
} }
} }
install-dev/sql/upgrade/1.5.0.1.sql
+1 -1
View File
@@ -234,7 +234,7 @@ INSERT INTO `PREFIX_module_access` (`id_profile`, `id_module`, `configure`, `vie
ALTER TABLE `PREFIX_carrier` ADD `position` INT( 10 ) UNSIGNED NOT NULL DEFAULT '0'; ALTER TABLE `PREFIX_carrier` ADD `position` INT( 10 ) UNSIGNED NOT NULL DEFAULT '0';
/* PHP:add_carrier_position();*/ /* PHP:add_carrier_position();*/;
ALTER TABLE `PREFIX_order_state` ADD COLUMN `shipped` TINYINT(1) UNSIGNED NOT NULL DEFAULT 0 AFTER `delivery`; ALTER TABLE `PREFIX_order_state` ADD COLUMN `shipped` TINYINT(1) UNSIGNED NOT NULL DEFAULT 0 AFTER `delivery`;
UPDATE `PREFIX_order_state` SET `shipped` = 1 WHERE id_order_states IN (4, 5); UPDATE `PREFIX_order_state` SET `shipped` = 1 WHERE id_order_states IN (4, 5);
install-dev/sql/upgrade/1.5.0.2.sql
+2 -2
View File
@@ -286,7 +286,7 @@ ALTER TABLE `PREFIX_stock_mvt_reason` ADD COLUMN `deleted` tinyint(1) unsigned N
ALTER TABLE `PREFIX_product` ADD COLUMN `advanced_stock_management` tinyint(1) default '0' NOT NULL; ALTER TABLE `PREFIX_product` ADD COLUMN `advanced_stock_management` tinyint(1) default '0' NOT NULL;
/* Update records after alter tables */ /* Update records after alter tables */
/* PHP:update_stock_mvt_reasons(); */; /* PHP:update_stock_mvt_reason(); */;
DELETE FROM `PREFIX_configuration` WHERE `name` = 'PS_PDF_ENCODING'; DELETE FROM `PREFIX_configuration` WHERE `name` = 'PS_PDF_ENCODING';
DELETE FROM `PREFIX_configuration` WHERE `name` = 'PS_PDF_FONT'; DELETE FROM `PREFIX_configuration` WHERE `name` = 'PS_PDF_FONT';
@@ -394,7 +394,7 @@ INSERT INTO `PREFIX_configuration` (`name`, `value`, `date_add`, `date_upd`) VAL
('PS_SMARTY_CONSOLE', '0', NOW(), NOW(),('PS_INVOICE_MODEL', 'invoice', NOW(), NOW()); ('PS_SMARTY_CONSOLE', '0', NOW(), NOW(),('PS_INVOICE_MODEL', 'invoice', NOW(), NOW());
ALTER TABLE `PREFIX_specific_price` ADD `id_cart` INT(11) UNSIGNED NOT NULL AFTER `id_specific_price_rule`; ALTER TABLE `PREFIX_specific_price` ADD `id_cart` INT(11) UNSIGNED NOT NULL AFTER `id_specific_price_rule`;
ALTER TABLE `PREFIX_specific_price` ADD INDEX `id_cart` (`id_cart`); ALTER TABLE `PREFIX_specific_price` ADD INDEX `id_cart` (`id_cart`);
/* PHP:update_modules_multishop.php; */; /* PHP:update_modules_multishop(); */;
UPDATE `PREFIX_tab` UPDATE `PREFIX_tab`
SET `position` = ( SET `position` = (
install-dev/xml/doUpgrade.php
+5
View File
@@ -156,6 +156,11 @@ require_once(_PS_INSTALLER_PHP_UPGRADE_DIR_.'add_default_restrictions_modules_gr
require_once(_PS_INSTALLER_PHP_UPGRADE_DIR_.'add_carrier_position.php'); require_once(_PS_INSTALLER_PHP_UPGRADE_DIR_.'add_carrier_position.php');
require_once(_PS_INSTALLER_PHP_UPGRADE_DIR_.'add_new_groups.php'); require_once(_PS_INSTALLER_PHP_UPGRADE_DIR_.'add_new_groups.php');
require_once(_PS_INSTALLER_PHP_UPGRADE_DIR_.'add_stock_tab.php'); require_once(_PS_INSTALLER_PHP_UPGRADE_DIR_.'add_stock_tab.php');
require_once(_PS_INSTALLER_PHP_UPGRADE_DIR_.'set_stock_available.php');
require_once(_PS_INSTALLER_PHP_UPGRADE_DIR_.'set_product_suppliers.php');
require_once(_PS_INSTALLER_PHP_UPGRADE_DIR_.'update_stock_mvt_reason.php');
require_once(_PS_INSTALLER_PHP_UPGRADE_DIR_.'update_modules_multishop.php');
//old version detection //old version detection
global $oldversion, $logger; global $oldversion, $logger;