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

// missing values for shipping, wrapping, discounts

Browse Source
This commit is contained in:
fBrignoli
2011-11-21 09:07:57 +00:00
parent c4506a2916
commit 7cd70cc654
1 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/order/Order.php
+22 -14
View File
@@ -141,7 +141,7 @@ class OrderCore extends ObjectModel
/** @var string Object last modification date */ /** @var string Object last modification date */
public $date_upd; public $date_upd;
/** @var string Order reference /** @var string Order reference
* This reference is not unique, but unique for a payment * This reference is not unique, but unique for a payment
*/ */
@@ -170,13 +170,21 @@ class OrderCore extends ObjectModel
'gift' => 'isBool', 'gift' => 'isBool',
'gift_message' => 'isMessage', 'gift_message' => 'isMessage',
'total_discounts' => 'isPrice', 'total_discounts' => 'isPrice',
'total_discounts_tax_incl' => 'isPrice',
'total_discounts_tax_excl' => 'isPrice',
'total_paid' => 'isPrice', 'total_paid' => 'isPrice',
'total_paid_tax_incl' => 'isPrice',
'total_paid_tax_excl' => 'isPrice',
'total_paid_real' => 'isPrice', 'total_paid_real' => 'isPrice',
'total_products' => 'isPrice', 'total_products' => 'isPrice',
'total_products_wt' => 'isPrice', 'total_products_wt' => 'isPrice',
'total_shipping' => 'isPrice', 'total_shipping' => 'isPrice',
'total_shipping_tax_incl' => 'isPrice',
'total_shipping_tax_excl' => 'isPrice',
'carrier_tax_rate' => 'isFloat', 'carrier_tax_rate' => 'isFloat',
'total_wrapping' => 'isPrice', 'total_wrapping' => 'isPrice',
'total_wrapping_tax_incl' => 'isPrice',
'total_wrapping_tax_excl' => 'isPrice',
'shipping_number' => 'isUrl', 'shipping_number' => 'isUrl',
'conversion_rate' => 'isFloat' 'conversion_rate' => 'isFloat'
); );
@@ -1176,11 +1184,11 @@ class OrderCore extends ObjectModel
{ {
return OrderDetail::getList($this->id); return OrderDetail::getList($this->id);
} }
/** /**
* Gennerate a unique reference for orders generated with the same cart id * Gennerate a unique reference for orders generated with the same cart id
* This references, is usefull for check payment * This references, is usefull for check payment
* *
* @return String * @return String
*/ */
public static function generateReference() public static function generateReference()
@@ -1189,12 +1197,12 @@ class OrderCore extends ObjectModel
// This number is a rand concated with the current timestamp // This number is a rand concated with the current timestamp
$rand = (int)(microtime(true) * 100 % 10000000000).rand(10, 1000); $rand = (int)(microtime(true) * 100 % 10000000000).rand(10, 1000);
$reference = ''; $reference = '';
do { do {
$reference .= chr(65 + $rand % 26); $reference .= chr(65 + $rand % 26);
$rand = (int)($rand / 26); $rand = (int)($rand / 26);
} while ($rand > 26); } while ($rand > 26);
// Check if semi-random string generated is not already used // Check if semi-random string generated is not already used
// /!\ Here we CANNOT/MUSTN'T use _PS_USE_SQL_SLAVE_ // /!\ Here we CANNOT/MUSTN'T use _PS_USE_SQL_SLAVE_
if (Db::getInstance()->getValue(' if (Db::getInstance()->getValue('
@@ -1202,10 +1210,10 @@ class OrderCore extends ObjectModel
FROM '._DB_PREFIX_.'orders FROM '._DB_PREFIX_.'orders
WHERE reference = \''.$reference.'\'') > 0) WHERE reference = \''.$reference.'\'') > 0)
return self::generateReference(); // If the reference already exists, generate a new one return self::generateReference(); // If the reference already exists, generate a new one
return $reference; return $reference;
} }
public function orderContainProduct($id_product) public function orderContainProduct($id_product)
{ {
$product_list = $this->getOrderDetailList(); $product_list = $this->getOrderDetailList();
@@ -1215,11 +1223,11 @@ class OrderCore extends ObjectModel
return false; return false;
} }
/** /**
* This method returns true if at least one order details uses the * This method returns true if at least one order details uses the
* One After Another tax computation method. * One After Another tax computation method.
* *
* @since 1.5.0.1 * @since 1.5.0.1
* @return boolean * @return boolean
*/ */
public function useOneAfterAnotherTaxComputationMethod() public function useOneAfterAnotherTaxComputationMethod()
{ {
@@ -1236,10 +1244,10 @@ class OrderCore extends ObjectModel
/** /**
* Returns the correct product taxes breakdown. * Returns the correct product taxes breakdown.
* *
* @since 1.5.0.1 * @since 1.5.0.1
* @return array * @return array
*/ */
public function getProductTaxesBreakdown() public function getProductTaxesBreakdown()
{ {
@@ -1299,7 +1307,7 @@ class OrderCore extends ObjectModel
* *
* @since 1.5.0.1 * @since 1.5.0.1
* @return array * @return array
*/ */
public function getShippingTaxesBreakdown() public function getShippingTaxesBreakdown()
{ {
$taxes_breakdown = array(); $taxes_breakdown = array();
@@ -1321,7 +1329,7 @@ class OrderCore extends ObjectModel
* @since 1.5.0.1 * @since 1.5.0.1
* @return array * @return array
*/ */
public function getWrappingTaxesBreakdown() public function getWrappingTaxesBreakdown()
{ {
$taxes_breakdown = array(); $taxes_breakdown = array();
@@ -1333,7 +1341,7 @@ class OrderCore extends ObjectModel
* *
* @since 1.5.0.1 * @since 1.5.0.1
* @return array * @return array
*/ */
public function getEcoTaxTaxesBreakdown() public function getEcoTaxTaxesBreakdown()
{ {
return Db::getInstance()->executeS(' return Db::getInstance()->executeS('