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

[-] Classes : all classes and controllers now use their name in static calls instead of self (improve override) #PSFV-376

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12552 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2012-01-19 10:14:10 +00:00
parent 81832703f2
commit 6887541bdd
82 changed files with 432 additions and 431 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/order/Order.php
+1 -1
View File
@@ -1041,7 +1041,7 @@ class OrderCore extends ObjectModel
if ($order_invoice->number)
Configuration::updateValue('PS_INVOICE_START_NUMBER', false);
else
$order_invoice->number = self::getLastInvoiceNumber() + 1;
$order_invoice->number = Order::getLastInvoiceNumber() + 1;
$order_invoice->total_discount_tax_excl = $this->total_discounts_tax_excl;
$order_invoice->total_discount_tax_incl = $this->total_discounts_tax_incl;
classes/order/OrderReturn.php
+3 -3
View File
@@ -86,10 +86,10 @@ class OrderReturnCore extends ObjectModel
die(Tools::displayError());
$products = $order->getProducts();
/* Products already returned */
$order_return = self::getOrdersReturn($order->id_customer, $order->id, true);
$order_return = OrderReturn::getOrdersReturn($order->id_customer, $order->id, true);
foreach ($order_return AS $or)
{
$order_return_products = self::getOrdersReturnProducts($or['id_order_return'], $order);
$order_return_products = OrderReturn::getOrdersReturnProducts($or['id_order_return'], $order);
foreach ($order_return_products AS $key => $orp)
$products[$key]['product_quantity'] -= (int)($orp['product_quantity']);
}
@@ -159,7 +159,7 @@ class OrderReturnCore extends ObjectModel
public static function getOrdersReturnProducts($orderReturnId, $order)
{
$productsRet = self::getOrdersReturnDetail($orderReturnId);
$productsRet = OrderReturn::getOrdersReturnDetail($orderReturnId);
$products = $order->getProducts();
$tmp = array();
foreach ($productsRet AS $return_detail)
classes/order/OrderSlip.php
+1 -1
View File
@@ -108,7 +108,7 @@ class OrderSlipCore extends ObjectModel
public static function getOrdersSlipProducts($orderSlipId, $order)
{
$cart_rules = $order->getCartRules(true);
$productsRet = self::getOrdersSlipDetail($orderSlipId);
$productsRet = OrderSlip::getOrdersSlipDetail($orderSlipId);
$products = $order->getProductsDetail();
$tmp = array();