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

// Adding the OrderCarrier class to handle carriers in an order

Browse Source
This commit is contained in:
vChabot
2011-12-08 15:12:23 +00:00
parent bad2f9fc5c
commit 2fa317af08
8 changed files with 139 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install-dev/php/add_order_carrier.php
+2 -2
View File
@@ -35,9 +35,9 @@ function add_order_carrier()
if (count($orders) && is_array($orders))
{
$i = 0;
$sql = 'INSERT INTO `'._DB_PREFIX_.'order_carrier` (`id_order`, `id_carrier`, `id_order_invoice`, `weight`, `shipping_cost_tax_excl`, `shipping_cost_tax_incl`, `date_add`) VALUES ';
$sql = 'INSERT INTO `'._DB_PREFIX_.'order_carrier` (`id_order_carrier`, `id_order`, `id_carrier`, `id_order_invoice`, `weight`, `shipping_cost_tax_excl`, `shipping_cost_tax_incl`, `date_add`) VALUES ';
foreach ($orders as $order)
$sql .= '('.(int)$order['id_order'].', '.(int)$order['id_carrier'].', '.(int)$order['id_order_invoice'].', '.(float)$order['product_weight'].', '.(float)$order['total_shipping_tax_excl'].', '.(float)$order['total_shipping_tax_incl'].', "'.pSQL($order['date_add']).'"),';
$sql .= '(NULL, '.(int)$order['id_order'].', '.(int)$order['id_carrier'].', '.(int)$order['id_order_invoice'].', '.(float)$order['product_weight'].', '.(float)$order['total_shipping_tax_excl'].', '.(float)$order['total_shipping_tax_incl'].', "'.pSQL($order['date_add']).'"),';
// removing last comma to avoid SQL error
$sql = substr($sql, 0, strlen($sql) - 1);
Db::getInstance()->execute($sql);
install-dev/sql/db.sql
+5 -3
View File
@@ -2276,15 +2276,17 @@ CREATE TABLE `PREFIX_accounting_product_zone_shop` (
) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
CREATE TABLE `PREFIX_order_carrier` (
`id_order_carrier` int(11) NOT NULL AUTO_INCREMENT,
`id_order` int(11) unsigned NOT NULL,
`id_carrier` int(11) unsigned NOT NULL,
`id_order_invoice` int(11) unsigned DEFAULT NULL,
`weight` float DEFAULT NULL,
`shipping_cost_tax_excl` decimal(20,6) DEFAULT NULL,
`shipping_cost_tax_incl` decimal(20,6) DEFAULT NULL,
`tracking_number` int(11) unsigned DEFAULT NULL,
`tracking_number` varchar(64) DEFAULT NULL,
`date_add` datetime NOT NULL,
KEY `id_order` (`id_order`,`id_carrier`),
KEY `id_order_2` (`id_order`),
PRIMARY KEY (`id_order_carrier`),
KEY `id_order` (`id_order`),
KEY `id_carrier` (`id_carrier`),
KEY `id_order_invoice` (`id_order_invoice`)
) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
install-dev/sql/db_settings_extends.sql
+2 -2
View File
@@ -1546,8 +1546,8 @@ INSERT INTO `ps_stock_available` (`id_stock_available`, `id_product`, `id_produc
(33, 7, 22, 1, 0, 40, 0, 0),
(34, 7, 23, 1, 0, 40, 0, 0);
INSERT INTO `PREFIX_order_carrier` (`id_order`, `id_carrier`, `date_add`) VALUES
(1, 2, NOW());
INSERT INTO `PREFIX_order_carrier` (`id_order_carrier`, `id_order`, `id_carrier`, `date_add`) VALUES
(1, 1, 2, NOW());
/* new theme, need to be checked */
install-dev/sql/upgrade/1.5.0.1.sql
+5 -3
View File
@@ -610,16 +610,18 @@ UPDATE `PREFIX_tab` SET `class_name` = 'AdminCmsCategories' WHERE `class_name` =
UPDATE `PREFIX_tab` SET `class_name` = 'AdminPdf' WHERE `class_name` = 'AdminPDF';
CREATE TABLE `PREFIX_order_carrier` (
`id_order_carrier` int(11) NOT NULL AUTO_INCREMENT,
`id_order` int(11) unsigned NOT NULL,
`id_carrier` int(11) unsigned NOT NULL,
`id_order_invoice` int(11) unsigned DEFAULT NULL,
`weight` float DEFAULT NULL,
`shipping_cost_tax_excl` decimal(20,6) DEFAULT NULL,
`shipping_cost_tax_incl` decimal(20,6) DEFAULT NULL,
`tracking_number` int(11) unsigned DEFAULT NULL,
`tracking_number` varchar(64) DEFAULT NULL,
`date_add` datetime NOT NULL,
KEY `id_order` (`id_order`,`id_carrier`),
KEY `id_order_2` (`id_order`),
PRIMARY KEY (`id_order_carrier`),
KEY `id_order` (`id_order`),
KEY `id_carrier` (`id_carrier`),
KEY `id_order_invoice` (`id_order_invoice`)
) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;