// speed improvements
This commit is contained in:
fBrignoli
@@ -28,95 +28,146 @@
|
|||||||
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);
|
||||||
|
|
||||||
if (!defined('PS_TAX_INC'))
|
if (!defined('PS_TAX_INC'))
|
||||||
define('PS_TAX_INC', 0);
|
define('PS_TAX_INC', 0);
|
||||||
|
|
||||||
$sql = 'SELECT *
|
Db::getInstance()->execute('DROP TABLE `ps_orders_2`');
|
||||||
FROM `'._DB_PREFIX_.'orders`';
|
Db::getInstance()->execute('DROP TABLE `ps_order_detail_2`');
|
||||||
|
|
||||||
$orders = Db::getInstance()->executeS($sql);
|
$values_order_detail = array();
|
||||||
|
$insert_order_detail = 'INSERT INTO `'._DB_PREFIX_.'order_detail_2`
|
||||||
|
(`id_order_detail`, `id_order`, `id_order_invoice`, `id_warehouse`, `product_id`, `product_attribute_id`, `product_name`, `product_quantity`, `product_quantity_in_stock`, `product_quantity_refunded`, `product_quantity_return`, `product_quantity_reinjected`, `product_price`, `reduction_percent`, `reduction_amount`, `reduction_amount_tax_incl`, `reduction_amount_tax_excl`, `group_reduction`, `product_quantity_discount`, `product_ean13`, `product_upc`, `product_reference`, `product_supplier_reference`, `product_weight`, `tax_computation_method`, `tax_name`, `tax_rate`, `ecotax`, `ecotax_tax_rate`, `discount_quantity_applied`, `download_hash`, `download_nb`, `download_deadline`, `total_price_tax_incl`, `total_price_tax_excl`, `unit_price_tax_incl`, `unit_price_tax_excl`, `total_shipping_price_tax_incl`, `total_shipping_price_tax_excl`, `purchase_supplier_price`, `original_product_price`)
|
||||||
|
VALUES ';
|
||||||
|
|
||||||
foreach ($orders as $order)
|
$values_order = array();
|
||||||
|
$insert_order = 'INSERT INTO `'._DB_PREFIX_.'orders_2` (`id_order`, `reference`, `id_group_shop`, `id_shop`, `id_carrier`, `id_lang`, `id_customer`, `id_cart`, `id_currency`, `id_address_delivery`, `id_address_invoice`, `secure_key`, `payment`, `conversion_rate`, `module`, `recyclable`, `gift`, `gift_message`, `shipping_number`, `total_discounts`, `total_discount_tax_incl`, `total_discount_tax_excl`, `total_paid`, `total_paid_tax_incl`, `total_paid_tax_excl`, `total_paid_real`, `total_products`, `total_products_wt`, `total_shipping`, `total_shipping_tax_incl`, `total_shipping_tax_excl`, `carrier_tax_rate`, `total_wrapping`, `total_wrapping_tax_incl`, `total_wrapping_tax_excl`, `invoice_number`, `delivery_number`, `invoice_date`, `delivery_date`, `valid`, `date_add`, `date_upd`) VALUES ';
|
||||||
|
|
||||||
|
// create temporary tables
|
||||||
|
mo_duplicateTables();
|
||||||
|
|
||||||
|
$order_res = Db::getInstance()->execute(
|
||||||
|
'SELECT *
|
||||||
|
FROM `'._DB_PREFIX_.'orders`');
|
||||||
|
|
||||||
|
$cpt = 0;
|
||||||
|
$flush_limit = 1000;
|
||||||
|
while ($order = Db::getInstance()->nextRow($order_res))
|
||||||
{
|
{
|
||||||
$sum_total_products = 0;
|
$sum_total_products = 0;
|
||||||
$sum_tax_amount = 0;
|
$sum_tax_amount = 0;
|
||||||
$default_group_id = getCustomerDefaultGroup((int)$order['id_customer']);
|
$default_group_id = mo_getCustomerDefaultGroup((int)$order['id_customer']);
|
||||||
$price_display_method = getPriceDisplayMethod((int)$default_group_id);
|
$price_display_method = mo_getPriceDisplayMethod((int)$default_group_id);
|
||||||
|
|
||||||
$order_details_list = Db::getInstance()->executeS('
|
$order_details_list = Db::getInstance()->executeS('
|
||||||
SELECT *
|
SELECT *
|
||||||
FROM `'._DB_PREFIX_.'order_detail` od
|
FROM `'._DB_PREFIX_.'order_detail` od
|
||||||
LEFT JOIN `'._DB_PREFIX_.'product` p
|
LEFT JOIN `'._DB_PREFIX_.'product` p
|
||||||
ON p.id_product = od.product_id
|
ON p.id_product = od.product_id
|
||||||
WHERE od.`id_order` = '.(int)($order['id_order']));
|
WHERE od.`id_order` = '.(int)($order['id_order']));
|
||||||
|
|
||||||
foreach ($order_details_list as $order_details)
|
foreach ($order_details_list as $order_details)
|
||||||
{
|
{
|
||||||
// we don't want to erase order_details data in order to create the insert query
|
// we don't want to erase order_details data in order to create the insert query
|
||||||
$products = setProductPrices($order_details, $price_display_method);
|
$products = mo_setProductPrices($order_details, $price_display_method);
|
||||||
|
$tax_rate = 1 + ((float)$products['tax_rate'] / 100);
|
||||||
|
$reduction_amount_tax_incl = (float)$products['reduction_amount'];
|
||||||
|
|
||||||
$tax_rate = 1 + ((float)$products['tax_rate'] / 100);
|
// cart::getTaxesAverageUsed equivalent
|
||||||
$reduction_amount_tax_incl = (float)$products['reduction_amount'];
|
$sum_total_products += $products['total_wt'];
|
||||||
|
$sum_tax_amount += $products['total_wt'] - $products['total_price'];
|
||||||
|
|
||||||
// cart::getTaxesAverageUsed equivalent
|
$order_details['reduction_amount_tax_incl']= $reduction_amount_tax_incl;
|
||||||
$sum_total_products += $products['total_wt'];
|
$order_details['reduction_amount_tax_excl']= (float)Tools::ps_round($reduction_amount_tax_incl / $tax_rate, 2);
|
||||||
$sum_tax_amount += $products['total_wt'] - $products['total_price'];
|
$order_details['total_price_tax_incl']= (float)$products['total_wt'];
|
||||||
|
$order_details['total_price_tax_excl']= (float)$products['total_price'];
|
||||||
|
$order_details['unit_price_tax_incl']= (float)$products['product_price_wt'];
|
||||||
|
$order_details['unit_price_tax_excl']= (float)$products['product_price'];
|
||||||
|
$values_order_detail[] = '(\''.$order_details['id_order_detail'].'\', \''.$order_details['id_order'].'\', \''.$order_details['id_order_invoice'].'\', \''.$order_details['id_warehouse'].'\', \''.$order_details['product_id'].'\', \''.$order_details['product_attribute_id'].'\', \''.$order_details['product_name'].'\', \''.$order_details['product_quantity'].'\', \''.$order_details['product_quantity_in_stock'].'\', \''.$order_details['product_quantity_refunded'].'\', \''.$order_details['product_quantity_return'].'\', \''.$order_details['product_quantity_reinjected'].'\', \''.$order_details['product_price'].'\', \''.$order_details['reduction_percent'].'\', \''.$order_details['reduction_amount'].'\', \''.$order_details['reduction_amount_tax_incl'].'\', \''.$order_details['reduction_amount_tax_excl'].'\', \''.$order_details['group_reduction'].'\', \''.$order_details['product_quantity_discount'].'\', \''.$order_details['product_ean13'].'\', \''.$order_details['product_upc'].'\', \''.$order_details['product_reference'].'\', \''.$order_details['product_supplier_reference'].'\', \''.$order_details['product_weight'].'\', \''.$order_details['tax_computation_method'].'\', \''.$order_details['tax_name'].'\', \''.$order_details['tax_rate'].'\', \''.$order_details['ecotax'].'\', \''.$order_details['ecotax_tax_rate'].'\', \''.$order_details['discount_quantity_applied'].'\', \''.$order_details['download_hash'].'\', \''.$order_details['download_nb'].'\', \''.$order_details['download_deadline'].'\', \''.$order_details['total_price_tax_incl'].'\', \''.$order_details['total_price_tax_excl'].'\', \''.$order_details['unit_price_tax_incl'].'\', \''.$order_details['unit_price_tax_excl'].'\', \''.$order_details['total_shipping_price_tax_incl'].'\', \''.$order_details['total_shipping_price_tax_excl'].'\', \''.$order_details['purchase_supplier_price'].'\', \''.$order_details['original_product_price'].'\')';
|
||||||
|
}
|
||||||
|
|
||||||
$sql = 'UPDATE `'._DB_PREFIX_.'order_detail`
|
$average_tax_used = 1;
|
||||||
SET `reduction_amount_tax_incl` = '.$reduction_amount_tax_incl.',
|
if ($sum_total_products > 0)
|
||||||
`reduction_amount_tax_excl` = '.(float)Tools::ps_round($reduction_amount_tax_incl / $tax_rate, 2).',
|
$average_tax_used += ($sum_tax_amount / $sum_total_products) * 0.01;
|
||||||
`total_price_tax_incl` = '.(float)$products['total_wt'].',
|
|
||||||
`total_price_tax_excl` = '.(float)$products['total_price'].',
|
|
||||||
`unit_price_tax_incl` = '.(float)$products['product_price_wt'].',
|
|
||||||
`unit_price_tax_excl` = '.(float)$products['product_price'].'
|
|
||||||
WHERE `id_order_detail` = '.(int)$products['id_order_detail'];
|
|
||||||
|
|
||||||
Db::getInstance()->execute($sql);
|
// this was done like that previously
|
||||||
}
|
$wrapping_tax_rate = 1 + ((float)Configuration::get('PS_GIFT_WRAPPING_TAX') / 100);
|
||||||
|
$carrier_tax_rate = 1 + ((float)$order['carrier_tax_rate'] / 100);
|
||||||
|
|
||||||
$average_tax_used = 1;
|
$total_discount_tax_excl = $order['total_discounts'] / $average_tax_used;
|
||||||
if ($sum_total_products > 0)
|
|
||||||
$average_tax_used += ($sum_tax_amount / $sum_total_products) * 0.01;
|
|
||||||
|
|
||||||
// this was done like that previously
|
$order['total_discount_tax_incl'] = (float)$order['total_discounts'];
|
||||||
$wrapping_tax_rate = 1 + ((float)Configuration::get('PS_GIFT_WRAPPING_TAX') / 100);
|
$order['total_discount_tax_excl'] = (float)$total_discount_tax_excl;
|
||||||
$carrier_tax_rate = 1 + ((float)$order['carrier_tax_rate'] / 100);
|
$order['total_paid_tax_incl'] = (float)$order['total_paid'];
|
||||||
|
$order['total_paid_tax_excl'] = (float)$order['total_paid'];
|
||||||
$total_discount_tax_excl = $order['total_discounts'] / $average_tax_used;
|
$order['total_shipping_tax_incl'] = (float)$order['total_shipping'];
|
||||||
|
$order['total_shipping_tax_excl'] = (float)($order['total_shipping'] / $carrier_tax_rate);
|
||||||
$sql = 'UPDATE `'._DB_PREFIX_.'orders`
|
$order['total_wrapping_tax_incl'] = (float)$order['total_wrapping'];
|
||||||
SET `total_discount_tax_incl` = '.(float)$order['total_discounts'].',
|
$order['total_wrapping_tax_excl'] = ((float)$order['total_wrapping'] / $wrapping_tax_rate);
|
||||||
`total_discount_tax_excl` = '.(float)$total_discount_tax_excl.',
|
$values_order[] = '(\''.$order['id_order'].'\', \''.$order['reference'].'\', \''.$order['id_group_shop'].'\', \''.$order['id_shop'].'\', \''.$order['id_carrier'].'\', \''.$order['id_lang'].'\', \''.$order['id_customer'].'\', \''.$order['id_cart'].'\', \''.$order['id_currency'].'\', \''.$order['id_address_delivery'].'\', \''.$order['id_address_invoice'].'\', \''.$order['secure_key'].'\', \''.$order['payment'].'\', \''.$order['conversion_rate'].'\', \''.$order['module'].'\', \''.$order['recyclable'].'\', \''.$order['gift'].'\', \''.$order['gift_message'].'\', \''.$order['shipping_number'].'\', \''.$order['total_discounts'].'\', \''.$order['total_discount_tax_incl'].'\', \''.$order['total_discount_tax_excl'].'\', \''.$order['total_paid'].'\', \''.$order['total_paid_tax_incl'].'\', \''.$order['total_paid_tax_excl'].'\', \''.$order['total_paid_real'].'\', \''.$order['total_products'].'\', \''.$order['total_products_wt'].'\', \''.$order['total_shipping'].'\', \''.$order['total_shipping_tax_incl'].'\', \''.$order['total_shipping_tax_excl'].'\', \''.$order['carrier_tax_rate'].'\', \''.$order['total_wrapping'].'\', \''.$order['total_wrapping_tax_incl'].'\', \''.$order['total_wrapping_tax_excl'].'\', \''.$order['invoice_number'].'\', \''.$order['delivery_number'].'\', \''.$order['invoice_date'].'\', \''.$order['delivery_date'].'\', \''.$order['valid'].'\', \''.$order['date_add'].'\', \''.$order['date_upd'].'\')';
|
||||||
`total_paid_tax_incl` = '.(float)$order['total_paid'].',
|
|
||||||
`total_paid_tax_excl` = '.(float)$order['total_paid'].',
|
|
||||||
`total_shipping_tax_incl` = '.(float)$order['total_shipping'].',
|
|
||||||
`total_shipping_tax_excl` = '.(float)($order['total_shipping'] / $carrier_tax_rate).',
|
|
||||||
`total_wrapping_tax_incl` = '.(float)$order['total_wrapping'].',
|
|
||||||
`total_wrapping_tax_excl` = '.((float)$order['total_wrapping'] / $wrapping_tax_rate).'
|
|
||||||
WHERE `id_order` = '.(int)$order['id_order'];
|
|
||||||
|
|
||||||
Db::getInstance()->execute($sql);
|
|
||||||
|
|
||||||
unset($order);
|
unset($order);
|
||||||
|
$cpt++;
|
||||||
|
|
||||||
|
if ($cpt >= $flush_limit)
|
||||||
|
{
|
||||||
|
$cpt = 0;
|
||||||
|
Db::getInstance()->execute($insert_order_detail. implode(',', $values_order_detail));
|
||||||
|
Db::getInstance()->execute($insert_order. implode(',', $values_order));
|
||||||
|
$values_order = array();
|
||||||
|
$values_order_detail = array();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ($cpt> 0)
|
||||||
|
{
|
||||||
|
Db::getInstance()->execute($insert_order_detail. implode(',', $values_order_detail));
|
||||||
|
Db::getInstance()->execute($insert_order. implode(',', $values_order));
|
||||||
|
}
|
||||||
|
|
||||||
|
mo_renameTables();
|
||||||
}
|
}
|
||||||
|
|
||||||
function getCustomerDefaultGroup($id_customer)
|
|
||||||
|
function mo_duplicateTables()
|
||||||
{
|
{
|
||||||
Db::getInstance()->getValue('SELECT `id_default_group` FROM `'._DB_PREFIX_.'customer` WHERE `id_customer` = '.(int)$id_customer);
|
Db::getInstance()->execute('CREATE TABLE `'._DB_PREFIX_.'orders_2` LIKE `'._DB_PREFIX_.'orders`');
|
||||||
|
Db::getInstance()->execute('CREATE TABLE `'._DB_PREFIX_.'order_detail_2` LIKE `'._DB_PREFIX_.'order_detail`');
|
||||||
}
|
}
|
||||||
|
|
||||||
function getPriceDisplayMethod($id_group)
|
function mo_renameTables()
|
||||||
{
|
{
|
||||||
return Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue('
|
Db::getInstance()->execute('DROP TABLE `'._DB_PREFIX_.'orders`');
|
||||||
|
Db::getInstance()->execute('DROP TABLE `'._DB_PREFIX_.'order_detail`');
|
||||||
|
|
||||||
|
Db::getInstance()->execute('RENAME TABLE `'._DB_PREFIX_.'orders_2` TO `'._DB_PREFIX_.'orders`');
|
||||||
|
Db::getInstance()->execute('RENAME TABLE `'._DB_PREFIX_.'order_detail_2` TO `'._DB_PREFIX_.'order_detail`');
|
||||||
|
}
|
||||||
|
|
||||||
|
function mo_getCustomerDefaultGroup($id_customer)
|
||||||
|
{
|
||||||
|
static $cache;
|
||||||
|
if (!isset($cache[$id_customer]))
|
||||||
|
$cache[$id_customer] = Db::getInstance()->getValue('SELECT `id_default_group` FROM `'._DB_PREFIX_.'customer` WHERE `id_customer` = '.(int)$id_customer);
|
||||||
|
|
||||||
|
return $cache[$id_customer];
|
||||||
|
}
|
||||||
|
|
||||||
|
function mo_getPriceDisplayMethod($id_group)
|
||||||
|
{
|
||||||
|
static $cache;
|
||||||
|
|
||||||
|
if (!isset($cache[$id_group]))
|
||||||
|
$cache[$id_group] = Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue('
|
||||||
SELECT `price_display_method`
|
SELECT `price_display_method`
|
||||||
FROM `'._DB_PREFIX_.'group`
|
FROM `'._DB_PREFIX_.'group`
|
||||||
WHERE `id_group` = '.(int)$id_group);
|
WHERE `id_group` = '.(int)$id_group);
|
||||||
|
|
||||||
|
return $cache[$id_group];
|
||||||
}
|
}
|
||||||
|
|
||||||
function setProductPrices($row, $tax_calculation_method)
|
function mo_setProductPrices($row, $tax_calculation_method)
|
||||||
{
|
{
|
||||||
if ($tax_calculation_method == PS_TAX_EXC)
|
if ($tax_calculation_method == PS_TAX_EXC)
|
||||||
$row['product_price'] = Tools::ps_round($row['product_price'], 2);
|
$row['product_price'] = Tools::ps_round($row['product_price'], 2);
|
||||||
@@ -171,4 +222,3 @@ function setProductPrices($row, $tax_calculation_method)
|
|||||||
return $row;
|
return $row;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user