TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update changelog and fix cs

Browse Source
This commit is contained in:
Manuel Raynaud
2014-02-22 19:01:37 +01:00
parent b833b4a5b6
commit a5cfcf91ca
590 changed files with 21397 additions and 24262 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
core/lib/Thelia/Model/CartItem.php
View File

@@ -37,7 +37,6 @@ class CartItem extends BaseCartItem
}
}
/**
* @param $value
* @return $this
@@ -46,16 +45,14 @@ class CartItem extends BaseCartItem
{
$currentQuantity = $this->getQuantity();
if($value <= 0)
{
if ($value <= 0) {
$value = $currentQuantity;
}
if(ConfigQuery::checkAvailableStock())
{
if (ConfigQuery::checkAvailableStock()) {
$productSaleElements = $this->getProductSaleElements();
if($productSaleElements->getQuantity() < $value) {
if ($productSaleElements->getQuantity() < $value) {
$value = $currentQuantity;
}
}
@@ -70,16 +67,14 @@ class CartItem extends BaseCartItem
$currentQuantity = $this->getQuantity();
$newQuantity = $currentQuantity + $value;
if($value <= 0)
{
if ($value <= 0) {
$value = $currentQuantity;
}
if(ConfigQuery::checkAvailableStock())
{
if (ConfigQuery::checkAvailableStock()) {
$productSaleElements = $this->getProductSaleElements();
if($productSaleElements->getQuantity() < $newQuantity) {
if ($productSaleElements->getQuantity() < $newQuantity) {
$newQuantity = $currentQuantity;
}
}
@@ -102,12 +97,14 @@ class CartItem extends BaseCartItem
public function getTaxedPrice(Country $country)
{
$taxCalculator = new Calculator();
return round($taxCalculator->load($this->getProduct(), $country)->getTaxedPrice($this->getPrice()), 2);
}
public function getTaxedPromoPrice(Country $country)
{
$taxCalculator = new Calculator();
return round($taxCalculator->load($this->getProduct(), $country)->getTaxedPrice($this->getPromoPrice()), 2);
}
}