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

Merge branch 'master' of github.com:thelia/thelia

Browse Source
This commit is contained in:
Etienne Roudeix
2013-10-31 11:20:42 +01:00
parent f90df03f7d 5be233c079
commit e5f5570d2b
44 changed files with 1059 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/lib/Thelia/Model/Attribute.php
View File

@@ -20,7 +20,7 @@ class Attribute extends BaseAttribute {
$this->dispatchEvent(TheliaEvents::BEFORE_CREATEATTRIBUTE, new AttributeEvent($this));
// Set the current position for the new object
//$this->setPosition($this->getNextPosition());
$this->setPosition($this->getNextPosition());
return true;
}

2
core/lib/Thelia/Model/Feature.php
View File

@@ -20,7 +20,7 @@ class Feature extends BaseFeature {
$this->dispatchEvent(TheliaEvents::BEFORE_CREATEFEATURE, new FeatureEvent($this));
// Set the current position for the new object
//$this->setPosition($this->getNextPosition());
$this->setPosition($this->getNextPosition());
return true;
}

15
core/lib/Thelia/Model/Product.php
View File

@@ -167,7 +167,7 @@ class Product extends BaseProduct
$this->setTaxRuleId($taxRuleId);
// Create the default product sale element of this product
$sale_elements = $this->createDefaultProductSaleElement($con, $baseWeight, $basePrice, $priceCurrencyId, true);
$sale_elements = $this->createProductSaleElement($con, $baseWeight, $basePrice, $basePrice, $priceCurrencyId, true);
// Store all the stuff !
$con->commit();
@@ -185,19 +185,20 @@ class Product extends BaseProduct
/**
* Create a basic product sale element attached to this product.
*/
public function createDefaultProductSaleElement(ConnectionInterface $con, $weight, $basePrice, $currencyId, $isDefault) {
public function createProductSaleElement(ConnectionInterface $con, $weight, $basePrice, $salePrice, $currencyId, $isDefault, $isPromo = false, $isNew = false, $quantity = 0, $eanCode = '', $ref = false) {
// Create an empty product sale element
$sale_elements = new ProductSaleElements();
$sale_elements
->setProduct($this)
->setRef($this->getRef())
->setPromo(0)
->setNewness(0)
->setRef($ref == false ? $this->getRef() : $ref)
->setPromo($isPromo)
->setNewness($isNew)
->setWeight($weight)
->setIsDefault($isDefault)
->setEanCode('')
->setEanCode($eanCode)
->setQuantity($quantity)
->save($con)
;
@@ -206,7 +207,7 @@ class Product extends BaseProduct
$product_price
->setProductSaleElements($sale_elements)
->setPromoPrice($basePrice)
->setPromoPrice($salePrice)
->setPrice($basePrice)
->setCurrencyId($currencyId)
->save($con)