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-01-25 15:51:47 +00:00
parent ee416c51fe
commit 0896d93e2c
6 changed files with 88 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/order/OrderSlip.php
+15 -15
View File
@@ -28,34 +28,34 @@
class OrderSlipCore extends ObjectModel
{
/** @var integer */
public $id;
public $id;
/** @var integer */
public $id_customer;
public $id_customer;
/** @var integer */
public $id_order;
public $id_order;
/** @var float */
public $conversion_rate;
public $conversion_rate;
/** @var integer */
public $amount;
public $amount;
/** @var integer */
public $shipping_cost;
public $shipping_cost;
/** @var integer */
public $shipping_cost_amount;
public $shipping_cost_amount;
/** @var integer */
public $partial;
public $partial;
/** @var string Object creation date */
public $date_add;
public $date_add;
/** @var string Object last modification date */
public $date_upd;
public $date_upd;
/**
* @see ObjectModel::$definition
@@ -124,7 +124,7 @@ class OrderSlipCore extends ObjectModel
{
$resTab[$key] = $product;
$resTab[$key]['product_quantity'] = $tmp[$product['id_order_detail']];
if (sizeof($cart_rules))
if (count($cart_rules))
{
$order->setProductPrices($product);
$realProductPrice = $resTab[$key]['product_price'];
@@ -152,7 +152,7 @@ class OrderSlipCore extends ObjectModel
$order = new Order($this->id_order);
$products = array();
foreach ($result AS $row)
foreach ($result as $row)
{
$order->setProductPrices($row);
$products[] = $row;
@@ -169,7 +169,7 @@ class OrderSlipCore extends ObjectModel
ORDER BY `date_add` ASC');
$slips = array();
foreach ($result AS $slip)
foreach ($result as $slip)
$slips[] = (int)$slip['id_order_slip'];
return $slips;
}
@@ -177,7 +177,7 @@ class OrderSlipCore extends ObjectModel
public static function createOrderSlip($order, $productList, $qtyList, $shipping_cost = false)
{
$currency = new Currency($order->id_currency);
$orderSlip = new OrderSlip();
$orderSlip = new OrderSlip();
$orderSlip->id_customer = (int)($order->id_customer);
$orderSlip->id_order = (int)($order->id);
$orderSlip->shipping_cost = (int)($shipping_cost);
@@ -193,7 +193,7 @@ class OrderSlipCore extends ObjectModel
public static function createPartialOrderSlip($order, $amount, $shipping_cost_amount, $order_detail_list)
{
$currency = new Currency($order->id_currency);
$orderSlip = new OrderSlip();
$orderSlip = new OrderSlip();
$orderSlip->id_customer = (int)($order->id_customer);
$orderSlip->id_order = (int)($order->id);
$orderSlip->amount = (float)($amount);