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

// Normalize

Browse Source
This commit is contained in:
rMalie
2012-03-09 09:19:30 +00:00
parent 724c96fbde
commit 50a44277db
54 changed files with 297 additions and 320 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/order/Order.php
+1 -1
View File
@@ -1395,7 +1395,7 @@ class OrderCore extends ObjectModel
*/
public function getShipping()
{
return Db::getInstance()->ExecuteS('
return Db::getInstance()->executeS('
SELECT DISTINCT oc.`id_order_invoice`, oc.`weight`, oc.`shipping_cost_tax_excl`, oc.`shipping_cost_tax_incl`, c.`url`, oc.`id_carrier`, c.`name` as `state_name`, oc.`date_add`, "Delivery" as `type`, "true" as `can_edit`, oc.`tracking_number`, oc.`id_order_carrier`
FROM `'._DB_PREFIX_.'orders` o
LEFT JOIN `'._DB_PREFIX_.'order_history` oh
classes/order/OrderInvoice.php
+2 -2
View File
@@ -361,7 +361,7 @@ class OrderInvoiceCore extends ObjectModel
*/
public static function getByDateInterval($date_from, $date_to)
{
$order_invoice_list = Db::getInstance()->ExecuteS('
$order_invoice_list = Db::getInstance()->executeS('
SELECT oi.*
FROM `'._DB_PREFIX_.'order_invoice` oi
LEFT JOIN `'._DB_PREFIX_.'orders` o ON (o.`id_order` = oi.`id_order`)
@@ -409,7 +409,7 @@ class OrderInvoiceCore extends ObjectModel
*/
public static function getByDeliveryDateInterval($date_from, $date_to)
{
$order_invoice_list = Db::getInstance()->ExecuteS('
$order_invoice_list = Db::getInstance()->executeS('
SELECT oi.*
FROM `'._DB_PREFIX_.'order_invoice` oi
LEFT JOIN `'._DB_PREFIX_.'orders` o ON (o.`id_order` = oi.`id_order`)
classes/order/OrderPayment.php
+1 -1
View File
@@ -79,7 +79,7 @@ class OrderPaymentCore extends ObjectModel
*/
public static function getByOrderId($id_order)
{
return Db::getInstance()->ExecuteS('
return Db::getInstance()->executeS('
SELECT *
FROM `'._DB_PREFIX_.'order_payment`
WHERE `id_order` = '.(int)$id_order);