// Fix some bad php doc
This commit is contained in:
+14
-13
@@ -1146,11 +1146,6 @@ class CartCore extends ObjectModel
|
||||
}
|
||||
}
|
||||
|
||||
// If product from the cart are not in any warehouse, return false
|
||||
//foreach ($warehouse_count_by_address as $warehouse_count)
|
||||
// if (empty($warehouse_count))
|
||||
// return false;
|
||||
|
||||
arsort($warehouse_count_by_address);
|
||||
|
||||
// Step 2 : Group product by warehouse
|
||||
@@ -1794,9 +1789,7 @@ class CartCore extends ObjectModel
|
||||
$free_fees_price = 0;
|
||||
if (isset($configuration['PS_SHIPPING_FREE_PRICE']))
|
||||
$free_fees_price = Tools::convertPrice((float)($configuration['PS_SHIPPING_FREE_PRICE']), Currency::getCurrencyInstance((int)($this->id_currency)));
|
||||
// $orderTotalwithDiscounts = $this->getOrderTotal(true, Cart::BOTH_WITHOUT_SHIPPING);
|
||||
// if ($orderTotalwithDiscounts >= (float)($free_fees_price) AND (float)($free_fees_price) > 0)
|
||||
// return $shipping_cost;
|
||||
|
||||
if (isset($configuration['PS_SHIPPING_FREE_WEIGHT']) && $this->getTotalWeight() >= (float)($configuration['PS_SHIPPING_FREE_WEIGHT']) && (float)($configuration['PS_SHIPPING_FREE_WEIGHT']) > 0)
|
||||
return $shipping_cost;
|
||||
|
||||
@@ -2003,8 +1996,8 @@ class CartCore extends ObjectModel
|
||||
|
||||
/**
|
||||
* Check if cart contains only virtual products
|
||||
* @return boolean true if is a virtual cart or false
|
||||
*
|
||||
* @return boolean true if is a virtual cart or false
|
||||
*/
|
||||
public function isVirtualCart($strict = false)
|
||||
{
|
||||
@@ -2051,9 +2044,14 @@ class CartCore extends ObjectModel
|
||||
return $result['id_cart'];
|
||||
}
|
||||
|
||||
/*
|
||||
/**
|
||||
* Add customer's text
|
||||
*
|
||||
* @params int $id_product
|
||||
* @params int $index
|
||||
* @params int $type
|
||||
* @params string $textValue
|
||||
*
|
||||
* @return bool Always true
|
||||
*/
|
||||
public function addTextFieldToProduct($id_product, $index, $type, $textValue)
|
||||
@@ -2064,7 +2062,7 @@ class CartCore extends ObjectModel
|
||||
return $this->_addCustomization($id_product, 0, $index, $type, $textValue, 0);
|
||||
}
|
||||
|
||||
/*
|
||||
/**
|
||||
* Add customer's pictures
|
||||
*
|
||||
* @return bool Always true
|
||||
@@ -2074,9 +2072,11 @@ class CartCore extends ObjectModel
|
||||
return $this->_addCustomization($id_product, 0, $index, $type, $file, 0);
|
||||
}
|
||||
|
||||
/*
|
||||
/**
|
||||
* Remove a customer's customization
|
||||
*
|
||||
* @param int $id_product
|
||||
* @param int $index
|
||||
* @return bool
|
||||
*/
|
||||
public function deleteCustomizationToProduct($id_product, $index)
|
||||
@@ -2529,7 +2529,8 @@ class CartCore extends ObjectModel
|
||||
}
|
||||
|
||||
/**
|
||||
* Return false is some product from the cart are out of stock
|
||||
* @since 1.5.0
|
||||
* @return bool false is some product from the cart are out of stock
|
||||
*/
|
||||
public function isAllProductsInStock()
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user