diff --git a/core/lib/Thelia/Model/Base/Attribute.php b/core/lib/Thelia/Model/Base/Attribute.php
index 9995df65f..6fc82b13a 100755
--- a/core/lib/Thelia/Model/Base/Attribute.php
+++ b/core/lib/Thelia/Model/Base/Attribute.php
@@ -1839,10 +1839,10 @@ abstract class Attribute implements ActiveRecordInterface
* @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN)
* @return Collection|ChildAttributeCombination[] List of ChildAttributeCombination objects
*/
- public function getAttributeCombinationsJoinCombination($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN)
+ public function getAttributeCombinationsJoinStock($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN)
{
$query = ChildAttributeCombinationQuery::create(null, $criteria);
- $query->joinWith('Combination', $joinBehavior);
+ $query->joinWith('Stock', $joinBehavior);
return $this->getAttributeCombinations($query, $con);
}
diff --git a/core/lib/Thelia/Model/Base/AttributeAv.php b/core/lib/Thelia/Model/Base/AttributeAv.php
index be785f3e6..d5491f065 100755
--- a/core/lib/Thelia/Model/Base/AttributeAv.php
+++ b/core/lib/Thelia/Model/Base/AttributeAv.php
@@ -1628,10 +1628,10 @@ abstract class AttributeAv implements ActiveRecordInterface
* @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN)
* @return Collection|ChildAttributeCombination[] List of ChildAttributeCombination objects
*/
- public function getAttributeCombinationsJoinCombination($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN)
+ public function getAttributeCombinationsJoinStock($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN)
{
$query = ChildAttributeCombinationQuery::create(null, $criteria);
- $query->joinWith('Combination', $joinBehavior);
+ $query->joinWith('Stock', $joinBehavior);
return $this->getAttributeCombinations($query, $con);
}
diff --git a/core/lib/Thelia/Model/Base/AttributeCombination.php b/core/lib/Thelia/Model/Base/AttributeCombination.php
index 53e671777..e474c4340 100755
--- a/core/lib/Thelia/Model/Base/AttributeCombination.php
+++ b/core/lib/Thelia/Model/Base/AttributeCombination.php
@@ -22,8 +22,8 @@ use Thelia\Model\AttributeAvQuery as ChildAttributeAvQuery;
use Thelia\Model\AttributeCombination as ChildAttributeCombination;
use Thelia\Model\AttributeCombinationQuery as ChildAttributeCombinationQuery;
use Thelia\Model\AttributeQuery as ChildAttributeQuery;
-use Thelia\Model\Combination as ChildCombination;
-use Thelia\Model\CombinationQuery as ChildCombinationQuery;
+use Thelia\Model\Stock as ChildStock;
+use Thelia\Model\StockQuery as ChildStockQuery;
use Thelia\Model\Map\AttributeCombinationTableMap;
abstract class AttributeCombination implements ActiveRecordInterface
@@ -60,30 +60,24 @@ abstract class AttributeCombination implements ActiveRecordInterface
*/
protected $virtualColumns = array();
- /**
- * The value for the id field.
- * @var int
- */
- protected $id;
-
/**
* The value for the attribute_id field.
* @var int
*/
protected $attribute_id;
- /**
- * The value for the combination_id field.
- * @var int
- */
- protected $combination_id;
-
/**
* The value for the attribute_av_id field.
* @var int
*/
protected $attribute_av_id;
+ /**
+ * The value for the stock_id field.
+ * @var int
+ */
+ protected $stock_id;
+
/**
* The value for the created_at field.
* @var string
@@ -107,9 +101,9 @@ abstract class AttributeCombination implements ActiveRecordInterface
protected $aAttributeAv;
/**
- * @var Combination
+ * @var Stock
*/
- protected $aCombination;
+ protected $aStock;
/**
* Flag to prevent endless save loop, if this object is referenced
@@ -373,17 +367,6 @@ abstract class AttributeCombination implements ActiveRecordInterface
return array_keys(get_object_vars($this));
}
- /**
- * Get the [id] column value.
- *
- * @return int
- */
- public function getId()
- {
-
- return $this->id;
- }
-
/**
* Get the [attribute_id] column value.
*
@@ -395,17 +378,6 @@ abstract class AttributeCombination implements ActiveRecordInterface
return $this->attribute_id;
}
- /**
- * Get the [combination_id] column value.
- *
- * @return int
- */
- public function getCombinationId()
- {
-
- return $this->combination_id;
- }
-
/**
* Get the [attribute_av_id] column value.
*
@@ -417,6 +389,17 @@ abstract class AttributeCombination implements ActiveRecordInterface
return $this->attribute_av_id;
}
+ /**
+ * Get the [stock_id] column value.
+ *
+ * @return int
+ */
+ public function getStockId()
+ {
+
+ return $this->stock_id;
+ }
+
/**
* Get the [optionally formatted] temporal [created_at] column value.
*
@@ -457,27 +440,6 @@ abstract class AttributeCombination implements ActiveRecordInterface
}
}
- /**
- * Set the value of [id] column.
- *
- * @param int $v new value
- * @return \Thelia\Model\AttributeCombination The current object (for fluent API support)
- */
- public function setId($v)
- {
- if ($v !== null) {
- $v = (int) $v;
- }
-
- if ($this->id !== $v) {
- $this->id = $v;
- $this->modifiedColumns[] = AttributeCombinationTableMap::ID;
- }
-
-
- return $this;
- } // setId()
-
/**
* Set the value of [attribute_id] column.
*
@@ -503,31 +465,6 @@ abstract class AttributeCombination implements ActiveRecordInterface
return $this;
} // setAttributeId()
- /**
- * Set the value of [combination_id] column.
- *
- * @param int $v new value
- * @return \Thelia\Model\AttributeCombination The current object (for fluent API support)
- */
- public function setCombinationId($v)
- {
- if ($v !== null) {
- $v = (int) $v;
- }
-
- if ($this->combination_id !== $v) {
- $this->combination_id = $v;
- $this->modifiedColumns[] = AttributeCombinationTableMap::COMBINATION_ID;
- }
-
- if ($this->aCombination !== null && $this->aCombination->getId() !== $v) {
- $this->aCombination = null;
- }
-
-
- return $this;
- } // setCombinationId()
-
/**
* Set the value of [attribute_av_id] column.
*
@@ -553,6 +490,31 @@ abstract class AttributeCombination implements ActiveRecordInterface
return $this;
} // setAttributeAvId()
+ /**
+ * Set the value of [stock_id] column.
+ *
+ * @param int $v new value
+ * @return \Thelia\Model\AttributeCombination The current object (for fluent API support)
+ */
+ public function setStockId($v)
+ {
+ if ($v !== null) {
+ $v = (int) $v;
+ }
+
+ if ($this->stock_id !== $v) {
+ $this->stock_id = $v;
+ $this->modifiedColumns[] = AttributeCombinationTableMap::STOCK_ID;
+ }
+
+ if ($this->aStock !== null && $this->aStock->getId() !== $v) {
+ $this->aStock = null;
+ }
+
+
+ return $this;
+ } // setStockId()
+
/**
* Sets the value of [created_at] column to a normalized version of the date/time value specified.
*
@@ -632,25 +594,22 @@ abstract class AttributeCombination implements ActiveRecordInterface
try {
- $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : AttributeCombinationTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)];
- $this->id = (null !== $col) ? (int) $col : null;
-
- $col = $row[TableMap::TYPE_NUM == $indexType ? 1 + $startcol : AttributeCombinationTableMap::translateFieldName('AttributeId', TableMap::TYPE_PHPNAME, $indexType)];
+ $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : AttributeCombinationTableMap::translateFieldName('AttributeId', TableMap::TYPE_PHPNAME, $indexType)];
$this->attribute_id = (null !== $col) ? (int) $col : null;
- $col = $row[TableMap::TYPE_NUM == $indexType ? 2 + $startcol : AttributeCombinationTableMap::translateFieldName('CombinationId', TableMap::TYPE_PHPNAME, $indexType)];
- $this->combination_id = (null !== $col) ? (int) $col : null;
-
- $col = $row[TableMap::TYPE_NUM == $indexType ? 3 + $startcol : AttributeCombinationTableMap::translateFieldName('AttributeAvId', TableMap::TYPE_PHPNAME, $indexType)];
+ $col = $row[TableMap::TYPE_NUM == $indexType ? 1 + $startcol : AttributeCombinationTableMap::translateFieldName('AttributeAvId', TableMap::TYPE_PHPNAME, $indexType)];
$this->attribute_av_id = (null !== $col) ? (int) $col : null;
- $col = $row[TableMap::TYPE_NUM == $indexType ? 4 + $startcol : AttributeCombinationTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)];
+ $col = $row[TableMap::TYPE_NUM == $indexType ? 2 + $startcol : AttributeCombinationTableMap::translateFieldName('StockId', TableMap::TYPE_PHPNAME, $indexType)];
+ $this->stock_id = (null !== $col) ? (int) $col : null;
+
+ $col = $row[TableMap::TYPE_NUM == $indexType ? 3 + $startcol : AttributeCombinationTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)];
if ($col === '0000-00-00 00:00:00') {
$col = null;
}
$this->created_at = (null !== $col) ? PropelDateTime::newInstance($col, null, '\DateTime') : null;
- $col = $row[TableMap::TYPE_NUM == $indexType ? 5 + $startcol : AttributeCombinationTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)];
+ $col = $row[TableMap::TYPE_NUM == $indexType ? 4 + $startcol : AttributeCombinationTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)];
if ($col === '0000-00-00 00:00:00') {
$col = null;
}
@@ -663,7 +622,7 @@ abstract class AttributeCombination implements ActiveRecordInterface
$this->ensureConsistency();
}
- return $startcol + 6; // 6 = AttributeCombinationTableMap::NUM_HYDRATE_COLUMNS.
+ return $startcol + 5; // 5 = AttributeCombinationTableMap::NUM_HYDRATE_COLUMNS.
} catch (Exception $e) {
throw new PropelException("Error populating \Thelia\Model\AttributeCombination object", 0, $e);
@@ -688,12 +647,12 @@ abstract class AttributeCombination implements ActiveRecordInterface
if ($this->aAttribute !== null && $this->attribute_id !== $this->aAttribute->getId()) {
$this->aAttribute = null;
}
- if ($this->aCombination !== null && $this->combination_id !== $this->aCombination->getId()) {
- $this->aCombination = null;
- }
if ($this->aAttributeAv !== null && $this->attribute_av_id !== $this->aAttributeAv->getId()) {
$this->aAttributeAv = null;
}
+ if ($this->aStock !== null && $this->stock_id !== $this->aStock->getId()) {
+ $this->aStock = null;
+ }
} // ensureConsistency
/**
@@ -735,7 +694,7 @@ abstract class AttributeCombination implements ActiveRecordInterface
$this->aAttribute = null;
$this->aAttributeAv = null;
- $this->aCombination = null;
+ $this->aStock = null;
} // if (deep)
}
@@ -877,11 +836,11 @@ abstract class AttributeCombination implements ActiveRecordInterface
$this->setAttributeAv($this->aAttributeAv);
}
- if ($this->aCombination !== null) {
- if ($this->aCombination->isModified() || $this->aCombination->isNew()) {
- $affectedRows += $this->aCombination->save($con);
+ if ($this->aStock !== null) {
+ if ($this->aStock->isModified() || $this->aStock->isNew()) {
+ $affectedRows += $this->aStock->save($con);
}
- $this->setCombination($this->aCombination);
+ $this->setStock($this->aStock);
}
if ($this->isNew() || $this->isModified()) {
@@ -915,24 +874,17 @@ abstract class AttributeCombination implements ActiveRecordInterface
$modifiedColumns = array();
$index = 0;
- $this->modifiedColumns[] = AttributeCombinationTableMap::ID;
- if (null !== $this->id) {
- throw new PropelException('Cannot insert a value for auto-increment primary key (' . AttributeCombinationTableMap::ID . ')');
- }
// check the columns in natural order for more readable SQL queries
- if ($this->isColumnModified(AttributeCombinationTableMap::ID)) {
- $modifiedColumns[':p' . $index++] = 'ID';
- }
if ($this->isColumnModified(AttributeCombinationTableMap::ATTRIBUTE_ID)) {
$modifiedColumns[':p' . $index++] = 'ATTRIBUTE_ID';
}
- if ($this->isColumnModified(AttributeCombinationTableMap::COMBINATION_ID)) {
- $modifiedColumns[':p' . $index++] = 'COMBINATION_ID';
- }
if ($this->isColumnModified(AttributeCombinationTableMap::ATTRIBUTE_AV_ID)) {
$modifiedColumns[':p' . $index++] = 'ATTRIBUTE_AV_ID';
}
+ if ($this->isColumnModified(AttributeCombinationTableMap::STOCK_ID)) {
+ $modifiedColumns[':p' . $index++] = 'STOCK_ID';
+ }
if ($this->isColumnModified(AttributeCombinationTableMap::CREATED_AT)) {
$modifiedColumns[':p' . $index++] = 'CREATED_AT';
}
@@ -950,18 +902,15 @@ abstract class AttributeCombination implements ActiveRecordInterface
$stmt = $con->prepare($sql);
foreach ($modifiedColumns as $identifier => $columnName) {
switch ($columnName) {
- case 'ID':
- $stmt->bindValue($identifier, $this->id, PDO::PARAM_INT);
- break;
case 'ATTRIBUTE_ID':
$stmt->bindValue($identifier, $this->attribute_id, PDO::PARAM_INT);
break;
- case 'COMBINATION_ID':
- $stmt->bindValue($identifier, $this->combination_id, PDO::PARAM_INT);
- break;
case 'ATTRIBUTE_AV_ID':
$stmt->bindValue($identifier, $this->attribute_av_id, PDO::PARAM_INT);
break;
+ case 'STOCK_ID':
+ $stmt->bindValue($identifier, $this->stock_id, PDO::PARAM_INT);
+ break;
case 'CREATED_AT':
$stmt->bindValue($identifier, $this->created_at ? $this->created_at->format("Y-m-d H:i:s") : null, PDO::PARAM_STR);
break;
@@ -976,13 +925,6 @@ abstract class AttributeCombination implements ActiveRecordInterface
throw new PropelException(sprintf('Unable to execute INSERT statement [%s]', $sql), 0, $e);
}
- try {
- $pk = $con->lastInsertId();
- } catch (Exception $e) {
- throw new PropelException('Unable to get autoincrement id.', 0, $e);
- }
- $this->setId($pk);
-
$this->setNew(false);
}
@@ -1031,21 +973,18 @@ abstract class AttributeCombination implements ActiveRecordInterface
{
switch ($pos) {
case 0:
- return $this->getId();
- break;
- case 1:
return $this->getAttributeId();
break;
- case 2:
- return $this->getCombinationId();
- break;
- case 3:
+ case 1:
return $this->getAttributeAvId();
break;
- case 4:
+ case 2:
+ return $this->getStockId();
+ break;
+ case 3:
return $this->getCreatedAt();
break;
- case 5:
+ case 4:
return $this->getUpdatedAt();
break;
default:
@@ -1077,12 +1016,11 @@ abstract class AttributeCombination implements ActiveRecordInterface
$alreadyDumpedObjects['AttributeCombination'][serialize($this->getPrimaryKey())] = true;
$keys = AttributeCombinationTableMap::getFieldNames($keyType);
$result = array(
- $keys[0] => $this->getId(),
- $keys[1] => $this->getAttributeId(),
- $keys[2] => $this->getCombinationId(),
- $keys[3] => $this->getAttributeAvId(),
- $keys[4] => $this->getCreatedAt(),
- $keys[5] => $this->getUpdatedAt(),
+ $keys[0] => $this->getAttributeId(),
+ $keys[1] => $this->getAttributeAvId(),
+ $keys[2] => $this->getStockId(),
+ $keys[3] => $this->getCreatedAt(),
+ $keys[4] => $this->getUpdatedAt(),
);
$virtualColumns = $this->virtualColumns;
foreach($virtualColumns as $key => $virtualColumn)
@@ -1097,8 +1035,8 @@ abstract class AttributeCombination implements ActiveRecordInterface
if (null !== $this->aAttributeAv) {
$result['AttributeAv'] = $this->aAttributeAv->toArray($keyType, $includeLazyLoadColumns, $alreadyDumpedObjects, true);
}
- if (null !== $this->aCombination) {
- $result['Combination'] = $this->aCombination->toArray($keyType, $includeLazyLoadColumns, $alreadyDumpedObjects, true);
+ if (null !== $this->aStock) {
+ $result['Stock'] = $this->aStock->toArray($keyType, $includeLazyLoadColumns, $alreadyDumpedObjects, true);
}
}
@@ -1135,21 +1073,18 @@ abstract class AttributeCombination implements ActiveRecordInterface
{
switch ($pos) {
case 0:
- $this->setId($value);
- break;
- case 1:
$this->setAttributeId($value);
break;
- case 2:
- $this->setCombinationId($value);
- break;
- case 3:
+ case 1:
$this->setAttributeAvId($value);
break;
- case 4:
+ case 2:
+ $this->setStockId($value);
+ break;
+ case 3:
$this->setCreatedAt($value);
break;
- case 5:
+ case 4:
$this->setUpdatedAt($value);
break;
} // switch()
@@ -1176,12 +1111,11 @@ abstract class AttributeCombination implements ActiveRecordInterface
{
$keys = AttributeCombinationTableMap::getFieldNames($keyType);
- if (array_key_exists($keys[0], $arr)) $this->setId($arr[$keys[0]]);
- if (array_key_exists($keys[1], $arr)) $this->setAttributeId($arr[$keys[1]]);
- if (array_key_exists($keys[2], $arr)) $this->setCombinationId($arr[$keys[2]]);
- if (array_key_exists($keys[3], $arr)) $this->setAttributeAvId($arr[$keys[3]]);
- if (array_key_exists($keys[4], $arr)) $this->setCreatedAt($arr[$keys[4]]);
- if (array_key_exists($keys[5], $arr)) $this->setUpdatedAt($arr[$keys[5]]);
+ if (array_key_exists($keys[0], $arr)) $this->setAttributeId($arr[$keys[0]]);
+ if (array_key_exists($keys[1], $arr)) $this->setAttributeAvId($arr[$keys[1]]);
+ if (array_key_exists($keys[2], $arr)) $this->setStockId($arr[$keys[2]]);
+ if (array_key_exists($keys[3], $arr)) $this->setCreatedAt($arr[$keys[3]]);
+ if (array_key_exists($keys[4], $arr)) $this->setUpdatedAt($arr[$keys[4]]);
}
/**
@@ -1193,10 +1127,9 @@ abstract class AttributeCombination implements ActiveRecordInterface
{
$criteria = new Criteria(AttributeCombinationTableMap::DATABASE_NAME);
- if ($this->isColumnModified(AttributeCombinationTableMap::ID)) $criteria->add(AttributeCombinationTableMap::ID, $this->id);
if ($this->isColumnModified(AttributeCombinationTableMap::ATTRIBUTE_ID)) $criteria->add(AttributeCombinationTableMap::ATTRIBUTE_ID, $this->attribute_id);
- if ($this->isColumnModified(AttributeCombinationTableMap::COMBINATION_ID)) $criteria->add(AttributeCombinationTableMap::COMBINATION_ID, $this->combination_id);
if ($this->isColumnModified(AttributeCombinationTableMap::ATTRIBUTE_AV_ID)) $criteria->add(AttributeCombinationTableMap::ATTRIBUTE_AV_ID, $this->attribute_av_id);
+ if ($this->isColumnModified(AttributeCombinationTableMap::STOCK_ID)) $criteria->add(AttributeCombinationTableMap::STOCK_ID, $this->stock_id);
if ($this->isColumnModified(AttributeCombinationTableMap::CREATED_AT)) $criteria->add(AttributeCombinationTableMap::CREATED_AT, $this->created_at);
if ($this->isColumnModified(AttributeCombinationTableMap::UPDATED_AT)) $criteria->add(AttributeCombinationTableMap::UPDATED_AT, $this->updated_at);
@@ -1214,10 +1147,9 @@ abstract class AttributeCombination implements ActiveRecordInterface
public function buildPkeyCriteria()
{
$criteria = new Criteria(AttributeCombinationTableMap::DATABASE_NAME);
- $criteria->add(AttributeCombinationTableMap::ID, $this->id);
$criteria->add(AttributeCombinationTableMap::ATTRIBUTE_ID, $this->attribute_id);
- $criteria->add(AttributeCombinationTableMap::COMBINATION_ID, $this->combination_id);
$criteria->add(AttributeCombinationTableMap::ATTRIBUTE_AV_ID, $this->attribute_av_id);
+ $criteria->add(AttributeCombinationTableMap::STOCK_ID, $this->stock_id);
return $criteria;
}
@@ -1230,10 +1162,9 @@ abstract class AttributeCombination implements ActiveRecordInterface
public function getPrimaryKey()
{
$pks = array();
- $pks[0] = $this->getId();
- $pks[1] = $this->getAttributeId();
- $pks[2] = $this->getCombinationId();
- $pks[3] = $this->getAttributeAvId();
+ $pks[0] = $this->getAttributeId();
+ $pks[1] = $this->getAttributeAvId();
+ $pks[2] = $this->getStockId();
return $pks;
}
@@ -1246,10 +1177,9 @@ abstract class AttributeCombination implements ActiveRecordInterface
*/
public function setPrimaryKey($keys)
{
- $this->setId($keys[0]);
- $this->setAttributeId($keys[1]);
- $this->setCombinationId($keys[2]);
- $this->setAttributeAvId($keys[3]);
+ $this->setAttributeId($keys[0]);
+ $this->setAttributeAvId($keys[1]);
+ $this->setStockId($keys[2]);
}
/**
@@ -1259,7 +1189,7 @@ abstract class AttributeCombination implements ActiveRecordInterface
public function isPrimaryKeyNull()
{
- return (null === $this->getId()) && (null === $this->getAttributeId()) && (null === $this->getCombinationId()) && (null === $this->getAttributeAvId());
+ return (null === $this->getAttributeId()) && (null === $this->getAttributeAvId()) && (null === $this->getStockId());
}
/**
@@ -1276,13 +1206,12 @@ abstract class AttributeCombination implements ActiveRecordInterface
public function copyInto($copyObj, $deepCopy = false, $makeNew = true)
{
$copyObj->setAttributeId($this->getAttributeId());
- $copyObj->setCombinationId($this->getCombinationId());
$copyObj->setAttributeAvId($this->getAttributeAvId());
+ $copyObj->setStockId($this->getStockId());
$copyObj->setCreatedAt($this->getCreatedAt());
$copyObj->setUpdatedAt($this->getUpdatedAt());
if ($makeNew) {
$copyObj->setNew(true);
- $copyObj->setId(NULL); // this is a auto-increment column, so set to default value
}
}
@@ -1411,24 +1340,24 @@ abstract class AttributeCombination implements ActiveRecordInterface
}
/**
- * Declares an association between this object and a ChildCombination object.
+ * Declares an association between this object and a ChildStock object.
*
- * @param ChildCombination $v
+ * @param ChildStock $v
* @return \Thelia\Model\AttributeCombination The current object (for fluent API support)
* @throws PropelException
*/
- public function setCombination(ChildCombination $v = null)
+ public function setStock(ChildStock $v = null)
{
if ($v === null) {
- $this->setCombinationId(NULL);
+ $this->setStockId(NULL);
} else {
- $this->setCombinationId($v->getId());
+ $this->setStockId($v->getId());
}
- $this->aCombination = $v;
+ $this->aStock = $v;
// Add binding for other direction of this n:n relationship.
- // If this object has already been added to the ChildCombination object, it will not be re-added.
+ // If this object has already been added to the ChildStock object, it will not be re-added.
if ($v !== null) {
$v->addAttributeCombination($this);
}
@@ -1439,26 +1368,26 @@ abstract class AttributeCombination implements ActiveRecordInterface
/**
- * Get the associated ChildCombination object
+ * Get the associated ChildStock object
*
* @param ConnectionInterface $con Optional Connection object.
- * @return ChildCombination The associated ChildCombination object.
+ * @return ChildStock The associated ChildStock object.
* @throws PropelException
*/
- public function getCombination(ConnectionInterface $con = null)
+ public function getStock(ConnectionInterface $con = null)
{
- if ($this->aCombination === null && ($this->combination_id !== null)) {
- $this->aCombination = ChildCombinationQuery::create()->findPk($this->combination_id, $con);
+ if ($this->aStock === null && ($this->stock_id !== null)) {
+ $this->aStock = ChildStockQuery::create()->findPk($this->stock_id, $con);
/* The following can be used additionally to
guarantee the related object contains a reference
to this object. This level of coupling may, however, be
undesirable since it could result in an only partially populated collection
in the referenced object.
- $this->aCombination->addAttributeCombinations($this);
+ $this->aStock->addAttributeCombinations($this);
*/
}
- return $this->aCombination;
+ return $this->aStock;
}
/**
@@ -1466,10 +1395,9 @@ abstract class AttributeCombination implements ActiveRecordInterface
*/
public function clear()
{
- $this->id = null;
$this->attribute_id = null;
- $this->combination_id = null;
$this->attribute_av_id = null;
+ $this->stock_id = null;
$this->created_at = null;
$this->updated_at = null;
$this->alreadyInSave = false;
@@ -1495,7 +1423,7 @@ abstract class AttributeCombination implements ActiveRecordInterface
$this->aAttribute = null;
$this->aAttributeAv = null;
- $this->aCombination = null;
+ $this->aStock = null;
}
/**
diff --git a/core/lib/Thelia/Model/Base/AttributeCombinationQuery.php b/core/lib/Thelia/Model/Base/AttributeCombinationQuery.php
index 6ccd2fcba..808b3c2fd 100755
--- a/core/lib/Thelia/Model/Base/AttributeCombinationQuery.php
+++ b/core/lib/Thelia/Model/Base/AttributeCombinationQuery.php
@@ -21,17 +21,15 @@ use Thelia\Model\Map\AttributeCombinationTableMap;
*
*
*
- * @method ChildAttributeCombinationQuery orderById($order = Criteria::ASC) Order by the id column
* @method ChildAttributeCombinationQuery orderByAttributeId($order = Criteria::ASC) Order by the attribute_id column
- * @method ChildAttributeCombinationQuery orderByCombinationId($order = Criteria::ASC) Order by the combination_id column
* @method ChildAttributeCombinationQuery orderByAttributeAvId($order = Criteria::ASC) Order by the attribute_av_id column
+ * @method ChildAttributeCombinationQuery orderByStockId($order = Criteria::ASC) Order by the stock_id column
* @method ChildAttributeCombinationQuery orderByCreatedAt($order = Criteria::ASC) Order by the created_at column
* @method ChildAttributeCombinationQuery orderByUpdatedAt($order = Criteria::ASC) Order by the updated_at column
*
- * @method ChildAttributeCombinationQuery groupById() Group by the id column
* @method ChildAttributeCombinationQuery groupByAttributeId() Group by the attribute_id column
- * @method ChildAttributeCombinationQuery groupByCombinationId() Group by the combination_id column
* @method ChildAttributeCombinationQuery groupByAttributeAvId() Group by the attribute_av_id column
+ * @method ChildAttributeCombinationQuery groupByStockId() Group by the stock_id column
* @method ChildAttributeCombinationQuery groupByCreatedAt() Group by the created_at column
* @method ChildAttributeCombinationQuery groupByUpdatedAt() Group by the updated_at column
*
@@ -47,24 +45,22 @@ use Thelia\Model\Map\AttributeCombinationTableMap;
* @method ChildAttributeCombinationQuery rightJoinAttributeAv($relationAlias = null) Adds a RIGHT JOIN clause to the query using the AttributeAv relation
* @method ChildAttributeCombinationQuery innerJoinAttributeAv($relationAlias = null) Adds a INNER JOIN clause to the query using the AttributeAv relation
*
- * @method ChildAttributeCombinationQuery leftJoinCombination($relationAlias = null) Adds a LEFT JOIN clause to the query using the Combination relation
- * @method ChildAttributeCombinationQuery rightJoinCombination($relationAlias = null) Adds a RIGHT JOIN clause to the query using the Combination relation
- * @method ChildAttributeCombinationQuery innerJoinCombination($relationAlias = null) Adds a INNER JOIN clause to the query using the Combination relation
+ * @method ChildAttributeCombinationQuery leftJoinStock($relationAlias = null) Adds a LEFT JOIN clause to the query using the Stock relation
+ * @method ChildAttributeCombinationQuery rightJoinStock($relationAlias = null) Adds a RIGHT JOIN clause to the query using the Stock relation
+ * @method ChildAttributeCombinationQuery innerJoinStock($relationAlias = null) Adds a INNER JOIN clause to the query using the Stock relation
*
* @method ChildAttributeCombination findOne(ConnectionInterface $con = null) Return the first ChildAttributeCombination matching the query
* @method ChildAttributeCombination findOneOrCreate(ConnectionInterface $con = null) Return the first ChildAttributeCombination matching the query, or a new ChildAttributeCombination object populated from the query conditions when no match is found
*
- * @method ChildAttributeCombination findOneById(int $id) Return the first ChildAttributeCombination filtered by the id column
* @method ChildAttributeCombination findOneByAttributeId(int $attribute_id) Return the first ChildAttributeCombination filtered by the attribute_id column
- * @method ChildAttributeCombination findOneByCombinationId(int $combination_id) Return the first ChildAttributeCombination filtered by the combination_id column
* @method ChildAttributeCombination findOneByAttributeAvId(int $attribute_av_id) Return the first ChildAttributeCombination filtered by the attribute_av_id column
+ * @method ChildAttributeCombination findOneByStockId(int $stock_id) Return the first ChildAttributeCombination filtered by the stock_id column
* @method ChildAttributeCombination findOneByCreatedAt(string $created_at) Return the first ChildAttributeCombination filtered by the created_at column
* @method ChildAttributeCombination findOneByUpdatedAt(string $updated_at) Return the first ChildAttributeCombination filtered by the updated_at column
*
- * @method array findById(int $id) Return ChildAttributeCombination objects filtered by the id column
* @method array findByAttributeId(int $attribute_id) Return ChildAttributeCombination objects filtered by the attribute_id column
- * @method array findByCombinationId(int $combination_id) Return ChildAttributeCombination objects filtered by the combination_id column
* @method array findByAttributeAvId(int $attribute_av_id) Return ChildAttributeCombination objects filtered by the attribute_av_id column
+ * @method array findByStockId(int $stock_id) Return ChildAttributeCombination objects filtered by the stock_id column
* @method array findByCreatedAt(string $created_at) Return ChildAttributeCombination objects filtered by the created_at column
* @method array findByUpdatedAt(string $updated_at) Return ChildAttributeCombination objects filtered by the updated_at column
*
@@ -114,10 +110,10 @@ abstract class AttributeCombinationQuery extends ModelCriteria
* Go fast if the query is untouched.
*
*
- * $obj = $c->findPk(array(12, 34, 56, 78), $con);
+ * $obj = $c->findPk(array(12, 34, 56), $con);
*
*
- * @param array[$id, $attribute_id, $combination_id, $attribute_av_id] $key Primary key to use for the query
+ * @param array[$attribute_id, $attribute_av_id, $stock_id] $key Primary key to use for the query
* @param ConnectionInterface $con an optional connection object
*
* @return ChildAttributeCombination|array|mixed the result, formatted by the current formatter
@@ -127,7 +123,7 @@ abstract class AttributeCombinationQuery extends ModelCriteria
if ($key === null) {
return null;
}
- if ((null !== ($obj = AttributeCombinationTableMap::getInstanceFromPool(serialize(array((string) $key[0], (string) $key[1], (string) $key[2], (string) $key[3]))))) && !$this->formatter) {
+ if ((null !== ($obj = AttributeCombinationTableMap::getInstanceFromPool(serialize(array((string) $key[0], (string) $key[1], (string) $key[2]))))) && !$this->formatter) {
// the object is already in the instance pool
return $obj;
}
@@ -155,13 +151,12 @@ abstract class AttributeCombinationQuery extends ModelCriteria
*/
protected function findPkSimple($key, $con)
{
- $sql = 'SELECT ID, ATTRIBUTE_ID, COMBINATION_ID, ATTRIBUTE_AV_ID, CREATED_AT, UPDATED_AT FROM attribute_combination WHERE ID = :p0 AND ATTRIBUTE_ID = :p1 AND COMBINATION_ID = :p2 AND ATTRIBUTE_AV_ID = :p3';
+ $sql = 'SELECT ATTRIBUTE_ID, ATTRIBUTE_AV_ID, STOCK_ID, CREATED_AT, UPDATED_AT FROM attribute_combination WHERE ATTRIBUTE_ID = :p0 AND ATTRIBUTE_AV_ID = :p1 AND STOCK_ID = :p2';
try {
$stmt = $con->prepare($sql);
$stmt->bindValue(':p0', $key[0], PDO::PARAM_INT);
$stmt->bindValue(':p1', $key[1], PDO::PARAM_INT);
$stmt->bindValue(':p2', $key[2], PDO::PARAM_INT);
- $stmt->bindValue(':p3', $key[3], PDO::PARAM_INT);
$stmt->execute();
} catch (Exception $e) {
Propel::log($e->getMessage(), Propel::LOG_ERR);
@@ -171,7 +166,7 @@ abstract class AttributeCombinationQuery extends ModelCriteria
if ($row = $stmt->fetch(\PDO::FETCH_NUM)) {
$obj = new ChildAttributeCombination();
$obj->hydrate($row);
- AttributeCombinationTableMap::addInstanceToPool($obj, serialize(array((string) $key[0], (string) $key[1], (string) $key[2], (string) $key[3])));
+ AttributeCombinationTableMap::addInstanceToPool($obj, serialize(array((string) $key[0], (string) $key[1], (string) $key[2])));
}
$stmt->closeCursor();
@@ -230,10 +225,9 @@ abstract class AttributeCombinationQuery extends ModelCriteria
*/
public function filterByPrimaryKey($key)
{
- $this->addUsingAlias(AttributeCombinationTableMap::ID, $key[0], Criteria::EQUAL);
- $this->addUsingAlias(AttributeCombinationTableMap::ATTRIBUTE_ID, $key[1], Criteria::EQUAL);
- $this->addUsingAlias(AttributeCombinationTableMap::COMBINATION_ID, $key[2], Criteria::EQUAL);
- $this->addUsingAlias(AttributeCombinationTableMap::ATTRIBUTE_AV_ID, $key[3], Criteria::EQUAL);
+ $this->addUsingAlias(AttributeCombinationTableMap::ATTRIBUTE_ID, $key[0], Criteria::EQUAL);
+ $this->addUsingAlias(AttributeCombinationTableMap::ATTRIBUTE_AV_ID, $key[1], Criteria::EQUAL);
+ $this->addUsingAlias(AttributeCombinationTableMap::STOCK_ID, $key[2], Criteria::EQUAL);
return $this;
}
@@ -251,60 +245,17 @@ abstract class AttributeCombinationQuery extends ModelCriteria
return $this->add(null, '1<>1', Criteria::CUSTOM);
}
foreach ($keys as $key) {
- $cton0 = $this->getNewCriterion(AttributeCombinationTableMap::ID, $key[0], Criteria::EQUAL);
- $cton1 = $this->getNewCriterion(AttributeCombinationTableMap::ATTRIBUTE_ID, $key[1], Criteria::EQUAL);
+ $cton0 = $this->getNewCriterion(AttributeCombinationTableMap::ATTRIBUTE_ID, $key[0], Criteria::EQUAL);
+ $cton1 = $this->getNewCriterion(AttributeCombinationTableMap::ATTRIBUTE_AV_ID, $key[1], Criteria::EQUAL);
$cton0->addAnd($cton1);
- $cton2 = $this->getNewCriterion(AttributeCombinationTableMap::COMBINATION_ID, $key[2], Criteria::EQUAL);
+ $cton2 = $this->getNewCriterion(AttributeCombinationTableMap::STOCK_ID, $key[2], Criteria::EQUAL);
$cton0->addAnd($cton2);
- $cton3 = $this->getNewCriterion(AttributeCombinationTableMap::ATTRIBUTE_AV_ID, $key[3], Criteria::EQUAL);
- $cton0->addAnd($cton3);
$this->addOr($cton0);
}
return $this;
}
- /**
- * Filter the query on the id column
- *
- * Example usage:
- *
- * $query->filterById(1234); // WHERE id = 1234
- * $query->filterById(array(12, 34)); // WHERE id IN (12, 34)
- * $query->filterById(array('min' => 12)); // WHERE id > 12
- *
- *
- * @param mixed $id The value to use as filter.
- * Use scalar values for equality.
- * Use array values for in_array() equivalent.
- * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
- * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
- *
- * @return ChildAttributeCombinationQuery The current query, for fluid interface
- */
- public function filterById($id = null, $comparison = null)
- {
- if (is_array($id)) {
- $useMinMax = false;
- if (isset($id['min'])) {
- $this->addUsingAlias(AttributeCombinationTableMap::ID, $id['min'], Criteria::GREATER_EQUAL);
- $useMinMax = true;
- }
- if (isset($id['max'])) {
- $this->addUsingAlias(AttributeCombinationTableMap::ID, $id['max'], Criteria::LESS_EQUAL);
- $useMinMax = true;
- }
- if ($useMinMax) {
- return $this;
- }
- if (null === $comparison) {
- $comparison = Criteria::IN;
- }
- }
-
- return $this->addUsingAlias(AttributeCombinationTableMap::ID, $id, $comparison);
- }
-
/**
* Filter the query on the attribute_id column
*
@@ -348,49 +299,6 @@ abstract class AttributeCombinationQuery extends ModelCriteria
return $this->addUsingAlias(AttributeCombinationTableMap::ATTRIBUTE_ID, $attributeId, $comparison);
}
- /**
- * Filter the query on the combination_id column
- *
- * Example usage:
- *
- * $query->filterByCombinationId(1234); // WHERE combination_id = 1234
- * $query->filterByCombinationId(array(12, 34)); // WHERE combination_id IN (12, 34)
- * $query->filterByCombinationId(array('min' => 12)); // WHERE combination_id > 12
- *
- *
- * @see filterByCombination()
- *
- * @param mixed $combinationId The value to use as filter.
- * Use scalar values for equality.
- * Use array values for in_array() equivalent.
- * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
- * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
- *
- * @return ChildAttributeCombinationQuery The current query, for fluid interface
- */
- public function filterByCombinationId($combinationId = null, $comparison = null)
- {
- if (is_array($combinationId)) {
- $useMinMax = false;
- if (isset($combinationId['min'])) {
- $this->addUsingAlias(AttributeCombinationTableMap::COMBINATION_ID, $combinationId['min'], Criteria::GREATER_EQUAL);
- $useMinMax = true;
- }
- if (isset($combinationId['max'])) {
- $this->addUsingAlias(AttributeCombinationTableMap::COMBINATION_ID, $combinationId['max'], Criteria::LESS_EQUAL);
- $useMinMax = true;
- }
- if ($useMinMax) {
- return $this;
- }
- if (null === $comparison) {
- $comparison = Criteria::IN;
- }
- }
-
- return $this->addUsingAlias(AttributeCombinationTableMap::COMBINATION_ID, $combinationId, $comparison);
- }
-
/**
* Filter the query on the attribute_av_id column
*
@@ -434,6 +342,49 @@ abstract class AttributeCombinationQuery extends ModelCriteria
return $this->addUsingAlias(AttributeCombinationTableMap::ATTRIBUTE_AV_ID, $attributeAvId, $comparison);
}
+ /**
+ * Filter the query on the stock_id column
+ *
+ * Example usage:
+ *
+ * $query->filterByStockId(1234); // WHERE stock_id = 1234
+ * $query->filterByStockId(array(12, 34)); // WHERE stock_id IN (12, 34)
+ * $query->filterByStockId(array('min' => 12)); // WHERE stock_id > 12
+ *
+ *
+ * @see filterByStock()
+ *
+ * @param mixed $stockId The value to use as filter.
+ * Use scalar values for equality.
+ * Use array values for in_array() equivalent.
+ * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+ * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+ *
+ * @return ChildAttributeCombinationQuery The current query, for fluid interface
+ */
+ public function filterByStockId($stockId = null, $comparison = null)
+ {
+ if (is_array($stockId)) {
+ $useMinMax = false;
+ if (isset($stockId['min'])) {
+ $this->addUsingAlias(AttributeCombinationTableMap::STOCK_ID, $stockId['min'], Criteria::GREATER_EQUAL);
+ $useMinMax = true;
+ }
+ if (isset($stockId['max'])) {
+ $this->addUsingAlias(AttributeCombinationTableMap::STOCK_ID, $stockId['max'], Criteria::LESS_EQUAL);
+ $useMinMax = true;
+ }
+ if ($useMinMax) {
+ return $this;
+ }
+ if (null === $comparison) {
+ $comparison = Criteria::IN;
+ }
+ }
+
+ return $this->addUsingAlias(AttributeCombinationTableMap::STOCK_ID, $stockId, $comparison);
+ }
+
/**
* Filter the query on the created_at column
*
@@ -671,42 +622,42 @@ abstract class AttributeCombinationQuery extends ModelCriteria
}
/**
- * Filter the query by a related \Thelia\Model\Combination object
+ * Filter the query by a related \Thelia\Model\Stock object
*
- * @param \Thelia\Model\Combination|ObjectCollection $combination The related object(s) to use as filter
+ * @param \Thelia\Model\Stock|ObjectCollection $stock The related object(s) to use as filter
* @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
*
* @return ChildAttributeCombinationQuery The current query, for fluid interface
*/
- public function filterByCombination($combination, $comparison = null)
+ public function filterByStock($stock, $comparison = null)
{
- if ($combination instanceof \Thelia\Model\Combination) {
+ if ($stock instanceof \Thelia\Model\Stock) {
return $this
- ->addUsingAlias(AttributeCombinationTableMap::COMBINATION_ID, $combination->getId(), $comparison);
- } elseif ($combination instanceof ObjectCollection) {
+ ->addUsingAlias(AttributeCombinationTableMap::STOCK_ID, $stock->getId(), $comparison);
+ } elseif ($stock instanceof ObjectCollection) {
if (null === $comparison) {
$comparison = Criteria::IN;
}
return $this
- ->addUsingAlias(AttributeCombinationTableMap::COMBINATION_ID, $combination->toKeyValue('PrimaryKey', 'Id'), $comparison);
+ ->addUsingAlias(AttributeCombinationTableMap::STOCK_ID, $stock->toKeyValue('PrimaryKey', 'Id'), $comparison);
} else {
- throw new PropelException('filterByCombination() only accepts arguments of type \Thelia\Model\Combination or Collection');
+ throw new PropelException('filterByStock() only accepts arguments of type \Thelia\Model\Stock or Collection');
}
}
/**
- * Adds a JOIN clause to the query using the Combination relation
+ * Adds a JOIN clause to the query using the Stock relation
*
* @param string $relationAlias optional alias for the relation
* @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
*
* @return ChildAttributeCombinationQuery The current query, for fluid interface
*/
- public function joinCombination($relationAlias = null, $joinType = Criteria::INNER_JOIN)
+ public function joinStock($relationAlias = null, $joinType = Criteria::INNER_JOIN)
{
$tableMap = $this->getTableMap();
- $relationMap = $tableMap->getRelation('Combination');
+ $relationMap = $tableMap->getRelation('Stock');
// create a ModelJoin object for this join
$join = new ModelJoin();
@@ -721,14 +672,14 @@ abstract class AttributeCombinationQuery extends ModelCriteria
$this->addAlias($relationAlias, $relationMap->getRightTable()->getName());
$this->addJoinObject($join, $relationAlias);
} else {
- $this->addJoinObject($join, 'Combination');
+ $this->addJoinObject($join, 'Stock');
}
return $this;
}
/**
- * Use the Combination relation Combination object
+ * Use the Stock relation Stock object
*
* @see useQuery()
*
@@ -736,13 +687,13 @@ abstract class AttributeCombinationQuery extends ModelCriteria
* to be used as main alias in the secondary query
* @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
*
- * @return \Thelia\Model\CombinationQuery A secondary query class using the current class as primary query
+ * @return \Thelia\Model\StockQuery A secondary query class using the current class as primary query
*/
- public function useCombinationQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN)
+ public function useStockQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN)
{
return $this
- ->joinCombination($relationAlias, $joinType)
- ->useQuery($relationAlias ? $relationAlias : 'Combination', '\Thelia\Model\CombinationQuery');
+ ->joinStock($relationAlias, $joinType)
+ ->useQuery($relationAlias ? $relationAlias : 'Stock', '\Thelia\Model\StockQuery');
}
/**
@@ -755,11 +706,10 @@ abstract class AttributeCombinationQuery extends ModelCriteria
public function prune($attributeCombination = null)
{
if ($attributeCombination) {
- $this->addCond('pruneCond0', $this->getAliasedColName(AttributeCombinationTableMap::ID), $attributeCombination->getId(), Criteria::NOT_EQUAL);
- $this->addCond('pruneCond1', $this->getAliasedColName(AttributeCombinationTableMap::ATTRIBUTE_ID), $attributeCombination->getAttributeId(), Criteria::NOT_EQUAL);
- $this->addCond('pruneCond2', $this->getAliasedColName(AttributeCombinationTableMap::COMBINATION_ID), $attributeCombination->getCombinationId(), Criteria::NOT_EQUAL);
- $this->addCond('pruneCond3', $this->getAliasedColName(AttributeCombinationTableMap::ATTRIBUTE_AV_ID), $attributeCombination->getAttributeAvId(), Criteria::NOT_EQUAL);
- $this->combine(array('pruneCond0', 'pruneCond1', 'pruneCond2', 'pruneCond3'), Criteria::LOGICAL_OR);
+ $this->addCond('pruneCond0', $this->getAliasedColName(AttributeCombinationTableMap::ATTRIBUTE_ID), $attributeCombination->getAttributeId(), Criteria::NOT_EQUAL);
+ $this->addCond('pruneCond1', $this->getAliasedColName(AttributeCombinationTableMap::ATTRIBUTE_AV_ID), $attributeCombination->getAttributeAvId(), Criteria::NOT_EQUAL);
+ $this->addCond('pruneCond2', $this->getAliasedColName(AttributeCombinationTableMap::STOCK_ID), $attributeCombination->getStockId(), Criteria::NOT_EQUAL);
+ $this->combine(array('pruneCond0', 'pruneCond1', 'pruneCond2'), Criteria::LOGICAL_OR);
}
return $this;
diff --git a/core/lib/Thelia/Model/Base/Cart.php b/core/lib/Thelia/Model/Base/Cart.php
index 58b28ad6b..9d42de7cd 100644
--- a/core/lib/Thelia/Model/Base/Cart.php
+++ b/core/lib/Thelia/Model/Base/Cart.php
@@ -1963,10 +1963,10 @@ abstract class Cart implements ActiveRecordInterface
* @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN)
* @return Collection|ChildCartItem[] List of ChildCartItem objects
*/
- public function getCartItemsJoinCombination($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN)
+ public function getCartItemsJoinStock($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN)
{
$query = ChildCartItemQuery::create(null, $criteria);
- $query->joinWith('Combination', $joinBehavior);
+ $query->joinWith('Stock', $joinBehavior);
return $this->getCartItems($query, $con);
}
diff --git a/core/lib/Thelia/Model/Base/CartItem.php b/core/lib/Thelia/Model/Base/CartItem.php
index f5eea36fc..82c87ac1a 100644
--- a/core/lib/Thelia/Model/Base/CartItem.php
+++ b/core/lib/Thelia/Model/Base/CartItem.php
@@ -20,10 +20,10 @@ use Thelia\Model\Cart as ChildCart;
use Thelia\Model\CartItem as ChildCartItem;
use Thelia\Model\CartItemQuery as ChildCartItemQuery;
use Thelia\Model\CartQuery as ChildCartQuery;
-use Thelia\Model\Combination as ChildCombination;
-use Thelia\Model\CombinationQuery as ChildCombinationQuery;
use Thelia\Model\Product as ChildProduct;
use Thelia\Model\ProductQuery as ChildProductQuery;
+use Thelia\Model\Stock as ChildStock;
+use Thelia\Model\StockQuery as ChildStockQuery;
use Thelia\Model\Map\CartItemTableMap;
abstract class CartItem implements ActiveRecordInterface
@@ -86,10 +86,10 @@ abstract class CartItem implements ActiveRecordInterface
protected $quantity;
/**
- * The value for the combination_id field.
+ * The value for the stock_id field.
* @var int
*/
- protected $combination_id;
+ protected $stock_id;
/**
* The value for the created_at field.
@@ -114,9 +114,9 @@ abstract class CartItem implements ActiveRecordInterface
protected $aProduct;
/**
- * @var Combination
+ * @var Stock
*/
- protected $aCombination;
+ protected $aStock;
/**
* Flag to prevent endless save loop, if this object is referenced
@@ -438,14 +438,14 @@ abstract class CartItem implements ActiveRecordInterface
}
/**
- * Get the [combination_id] column value.
+ * Get the [stock_id] column value.
*
* @return int
*/
- public function getCombinationId()
+ public function getStockId()
{
- return $this->combination_id;
+ return $this->stock_id;
}
/**
@@ -581,29 +581,29 @@ abstract class CartItem implements ActiveRecordInterface
} // setQuantity()
/**
- * Set the value of [combination_id] column.
+ * Set the value of [stock_id] column.
*
* @param int $v new value
* @return \Thelia\Model\CartItem The current object (for fluent API support)
*/
- public function setCombinationId($v)
+ public function setStockId($v)
{
if ($v !== null) {
$v = (int) $v;
}
- if ($this->combination_id !== $v) {
- $this->combination_id = $v;
- $this->modifiedColumns[] = CartItemTableMap::COMBINATION_ID;
+ if ($this->stock_id !== $v) {
+ $this->stock_id = $v;
+ $this->modifiedColumns[] = CartItemTableMap::STOCK_ID;
}
- if ($this->aCombination !== null && $this->aCombination->getId() !== $v) {
- $this->aCombination = null;
+ if ($this->aStock !== null && $this->aStock->getId() !== $v) {
+ $this->aStock = null;
}
return $this;
- } // setCombinationId()
+ } // setStockId()
/**
* Sets the value of [created_at] column to a normalized version of the date/time value specified.
@@ -700,8 +700,8 @@ abstract class CartItem implements ActiveRecordInterface
$col = $row[TableMap::TYPE_NUM == $indexType ? 3 + $startcol : CartItemTableMap::translateFieldName('Quantity', TableMap::TYPE_PHPNAME, $indexType)];
$this->quantity = (null !== $col) ? (double) $col : null;
- $col = $row[TableMap::TYPE_NUM == $indexType ? 4 + $startcol : CartItemTableMap::translateFieldName('CombinationId', TableMap::TYPE_PHPNAME, $indexType)];
- $this->combination_id = (null !== $col) ? (int) $col : null;
+ $col = $row[TableMap::TYPE_NUM == $indexType ? 4 + $startcol : CartItemTableMap::translateFieldName('StockId', TableMap::TYPE_PHPNAME, $indexType)];
+ $this->stock_id = (null !== $col) ? (int) $col : null;
$col = $row[TableMap::TYPE_NUM == $indexType ? 5 + $startcol : CartItemTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)];
if ($col === '0000-00-00 00:00:00') {
@@ -750,8 +750,8 @@ abstract class CartItem implements ActiveRecordInterface
if ($this->aProduct !== null && $this->product_id !== $this->aProduct->getId()) {
$this->aProduct = null;
}
- if ($this->aCombination !== null && $this->combination_id !== $this->aCombination->getId()) {
- $this->aCombination = null;
+ if ($this->aStock !== null && $this->stock_id !== $this->aStock->getId()) {
+ $this->aStock = null;
}
} // ensureConsistency
@@ -794,7 +794,7 @@ abstract class CartItem implements ActiveRecordInterface
$this->aCart = null;
$this->aProduct = null;
- $this->aCombination = null;
+ $this->aStock = null;
} // if (deep)
}
@@ -936,11 +936,11 @@ abstract class CartItem implements ActiveRecordInterface
$this->setProduct($this->aProduct);
}
- if ($this->aCombination !== null) {
- if ($this->aCombination->isModified() || $this->aCombination->isNew()) {
- $affectedRows += $this->aCombination->save($con);
+ if ($this->aStock !== null) {
+ if ($this->aStock->isModified() || $this->aStock->isNew()) {
+ $affectedRows += $this->aStock->save($con);
}
- $this->setCombination($this->aCombination);
+ $this->setStock($this->aStock);
}
if ($this->isNew() || $this->isModified()) {
@@ -992,8 +992,8 @@ abstract class CartItem implements ActiveRecordInterface
if ($this->isColumnModified(CartItemTableMap::QUANTITY)) {
$modifiedColumns[':p' . $index++] = 'QUANTITY';
}
- if ($this->isColumnModified(CartItemTableMap::COMBINATION_ID)) {
- $modifiedColumns[':p' . $index++] = 'COMBINATION_ID';
+ if ($this->isColumnModified(CartItemTableMap::STOCK_ID)) {
+ $modifiedColumns[':p' . $index++] = 'STOCK_ID';
}
if ($this->isColumnModified(CartItemTableMap::CREATED_AT)) {
$modifiedColumns[':p' . $index++] = 'CREATED_AT';
@@ -1024,8 +1024,8 @@ abstract class CartItem implements ActiveRecordInterface
case 'QUANTITY':
$stmt->bindValue($identifier, $this->quantity, PDO::PARAM_STR);
break;
- case 'COMBINATION_ID':
- $stmt->bindValue($identifier, $this->combination_id, PDO::PARAM_INT);
+ case 'STOCK_ID':
+ $stmt->bindValue($identifier, $this->stock_id, PDO::PARAM_INT);
break;
case 'CREATED_AT':
$stmt->bindValue($identifier, $this->created_at ? $this->created_at->format("Y-m-d H:i:s") : null, PDO::PARAM_STR);
@@ -1108,7 +1108,7 @@ abstract class CartItem implements ActiveRecordInterface
return $this->getQuantity();
break;
case 4:
- return $this->getCombinationId();
+ return $this->getStockId();
break;
case 5:
return $this->getCreatedAt();
@@ -1149,7 +1149,7 @@ abstract class CartItem implements ActiveRecordInterface
$keys[1] => $this->getCartId(),
$keys[2] => $this->getProductId(),
$keys[3] => $this->getQuantity(),
- $keys[4] => $this->getCombinationId(),
+ $keys[4] => $this->getStockId(),
$keys[5] => $this->getCreatedAt(),
$keys[6] => $this->getUpdatedAt(),
);
@@ -1166,8 +1166,8 @@ abstract class CartItem implements ActiveRecordInterface
if (null !== $this->aProduct) {
$result['Product'] = $this->aProduct->toArray($keyType, $includeLazyLoadColumns, $alreadyDumpedObjects, true);
}
- if (null !== $this->aCombination) {
- $result['Combination'] = $this->aCombination->toArray($keyType, $includeLazyLoadColumns, $alreadyDumpedObjects, true);
+ if (null !== $this->aStock) {
+ $result['Stock'] = $this->aStock->toArray($keyType, $includeLazyLoadColumns, $alreadyDumpedObjects, true);
}
}
@@ -1216,7 +1216,7 @@ abstract class CartItem implements ActiveRecordInterface
$this->setQuantity($value);
break;
case 4:
- $this->setCombinationId($value);
+ $this->setStockId($value);
break;
case 5:
$this->setCreatedAt($value);
@@ -1252,7 +1252,7 @@ abstract class CartItem implements ActiveRecordInterface
if (array_key_exists($keys[1], $arr)) $this->setCartId($arr[$keys[1]]);
if (array_key_exists($keys[2], $arr)) $this->setProductId($arr[$keys[2]]);
if (array_key_exists($keys[3], $arr)) $this->setQuantity($arr[$keys[3]]);
- if (array_key_exists($keys[4], $arr)) $this->setCombinationId($arr[$keys[4]]);
+ if (array_key_exists($keys[4], $arr)) $this->setStockId($arr[$keys[4]]);
if (array_key_exists($keys[5], $arr)) $this->setCreatedAt($arr[$keys[5]]);
if (array_key_exists($keys[6], $arr)) $this->setUpdatedAt($arr[$keys[6]]);
}
@@ -1270,7 +1270,7 @@ abstract class CartItem implements ActiveRecordInterface
if ($this->isColumnModified(CartItemTableMap::CART_ID)) $criteria->add(CartItemTableMap::CART_ID, $this->cart_id);
if ($this->isColumnModified(CartItemTableMap::PRODUCT_ID)) $criteria->add(CartItemTableMap::PRODUCT_ID, $this->product_id);
if ($this->isColumnModified(CartItemTableMap::QUANTITY)) $criteria->add(CartItemTableMap::QUANTITY, $this->quantity);
- if ($this->isColumnModified(CartItemTableMap::COMBINATION_ID)) $criteria->add(CartItemTableMap::COMBINATION_ID, $this->combination_id);
+ if ($this->isColumnModified(CartItemTableMap::STOCK_ID)) $criteria->add(CartItemTableMap::STOCK_ID, $this->stock_id);
if ($this->isColumnModified(CartItemTableMap::CREATED_AT)) $criteria->add(CartItemTableMap::CREATED_AT, $this->created_at);
if ($this->isColumnModified(CartItemTableMap::UPDATED_AT)) $criteria->add(CartItemTableMap::UPDATED_AT, $this->updated_at);
@@ -1339,7 +1339,7 @@ abstract class CartItem implements ActiveRecordInterface
$copyObj->setCartId($this->getCartId());
$copyObj->setProductId($this->getProductId());
$copyObj->setQuantity($this->getQuantity());
- $copyObj->setCombinationId($this->getCombinationId());
+ $copyObj->setStockId($this->getStockId());
$copyObj->setCreatedAt($this->getCreatedAt());
$copyObj->setUpdatedAt($this->getUpdatedAt());
if ($makeNew) {
@@ -1473,24 +1473,24 @@ abstract class CartItem implements ActiveRecordInterface
}
/**
- * Declares an association between this object and a ChildCombination object.
+ * Declares an association between this object and a ChildStock object.
*
- * @param ChildCombination $v
+ * @param ChildStock $v
* @return \Thelia\Model\CartItem The current object (for fluent API support)
* @throws PropelException
*/
- public function setCombination(ChildCombination $v = null)
+ public function setStock(ChildStock $v = null)
{
if ($v === null) {
- $this->setCombinationId(NULL);
+ $this->setStockId(NULL);
} else {
- $this->setCombinationId($v->getId());
+ $this->setStockId($v->getId());
}
- $this->aCombination = $v;
+ $this->aStock = $v;
// Add binding for other direction of this n:n relationship.
- // If this object has already been added to the ChildCombination object, it will not be re-added.
+ // If this object has already been added to the ChildStock object, it will not be re-added.
if ($v !== null) {
$v->addCartItem($this);
}
@@ -1501,26 +1501,26 @@ abstract class CartItem implements ActiveRecordInterface
/**
- * Get the associated ChildCombination object
+ * Get the associated ChildStock object
*
* @param ConnectionInterface $con Optional Connection object.
- * @return ChildCombination The associated ChildCombination object.
+ * @return ChildStock The associated ChildStock object.
* @throws PropelException
*/
- public function getCombination(ConnectionInterface $con = null)
+ public function getStock(ConnectionInterface $con = null)
{
- if ($this->aCombination === null && ($this->combination_id !== null)) {
- $this->aCombination = ChildCombinationQuery::create()->findPk($this->combination_id, $con);
+ if ($this->aStock === null && ($this->stock_id !== null)) {
+ $this->aStock = ChildStockQuery::create()->findPk($this->stock_id, $con);
/* The following can be used additionally to
guarantee the related object contains a reference
to this object. This level of coupling may, however, be
undesirable since it could result in an only partially populated collection
in the referenced object.
- $this->aCombination->addCartItems($this);
+ $this->aStock->addCartItems($this);
*/
}
- return $this->aCombination;
+ return $this->aStock;
}
/**
@@ -1532,7 +1532,7 @@ abstract class CartItem implements ActiveRecordInterface
$this->cart_id = null;
$this->product_id = null;
$this->quantity = null;
- $this->combination_id = null;
+ $this->stock_id = null;
$this->created_at = null;
$this->updated_at = null;
$this->alreadyInSave = false;
@@ -1559,7 +1559,7 @@ abstract class CartItem implements ActiveRecordInterface
$this->aCart = null;
$this->aProduct = null;
- $this->aCombination = null;
+ $this->aStock = null;
}
/**
diff --git a/core/lib/Thelia/Model/Base/CartItemQuery.php b/core/lib/Thelia/Model/Base/CartItemQuery.php
index 8d96f435d..1e82cbf30 100644
--- a/core/lib/Thelia/Model/Base/CartItemQuery.php
+++ b/core/lib/Thelia/Model/Base/CartItemQuery.php
@@ -25,7 +25,7 @@ use Thelia\Model\Map\CartItemTableMap;
* @method ChildCartItemQuery orderByCartId($order = Criteria::ASC) Order by the cart_id column
* @method ChildCartItemQuery orderByProductId($order = Criteria::ASC) Order by the product_id column
* @method ChildCartItemQuery orderByQuantity($order = Criteria::ASC) Order by the quantity column
- * @method ChildCartItemQuery orderByCombinationId($order = Criteria::ASC) Order by the combination_id column
+ * @method ChildCartItemQuery orderByStockId($order = Criteria::ASC) Order by the stock_id column
* @method ChildCartItemQuery orderByCreatedAt($order = Criteria::ASC) Order by the created_at column
* @method ChildCartItemQuery orderByUpdatedAt($order = Criteria::ASC) Order by the updated_at column
*
@@ -33,7 +33,7 @@ use Thelia\Model\Map\CartItemTableMap;
* @method ChildCartItemQuery groupByCartId() Group by the cart_id column
* @method ChildCartItemQuery groupByProductId() Group by the product_id column
* @method ChildCartItemQuery groupByQuantity() Group by the quantity column
- * @method ChildCartItemQuery groupByCombinationId() Group by the combination_id column
+ * @method ChildCartItemQuery groupByStockId() Group by the stock_id column
* @method ChildCartItemQuery groupByCreatedAt() Group by the created_at column
* @method ChildCartItemQuery groupByUpdatedAt() Group by the updated_at column
*
@@ -49,9 +49,9 @@ use Thelia\Model\Map\CartItemTableMap;
* @method ChildCartItemQuery rightJoinProduct($relationAlias = null) Adds a RIGHT JOIN clause to the query using the Product relation
* @method ChildCartItemQuery innerJoinProduct($relationAlias = null) Adds a INNER JOIN clause to the query using the Product relation
*
- * @method ChildCartItemQuery leftJoinCombination($relationAlias = null) Adds a LEFT JOIN clause to the query using the Combination relation
- * @method ChildCartItemQuery rightJoinCombination($relationAlias = null) Adds a RIGHT JOIN clause to the query using the Combination relation
- * @method ChildCartItemQuery innerJoinCombination($relationAlias = null) Adds a INNER JOIN clause to the query using the Combination relation
+ * @method ChildCartItemQuery leftJoinStock($relationAlias = null) Adds a LEFT JOIN clause to the query using the Stock relation
+ * @method ChildCartItemQuery rightJoinStock($relationAlias = null) Adds a RIGHT JOIN clause to the query using the Stock relation
+ * @method ChildCartItemQuery innerJoinStock($relationAlias = null) Adds a INNER JOIN clause to the query using the Stock relation
*
* @method ChildCartItem findOne(ConnectionInterface $con = null) Return the first ChildCartItem matching the query
* @method ChildCartItem findOneOrCreate(ConnectionInterface $con = null) Return the first ChildCartItem matching the query, or a new ChildCartItem object populated from the query conditions when no match is found
@@ -60,7 +60,7 @@ use Thelia\Model\Map\CartItemTableMap;
* @method ChildCartItem findOneByCartId(int $cart_id) Return the first ChildCartItem filtered by the cart_id column
* @method ChildCartItem findOneByProductId(int $product_id) Return the first ChildCartItem filtered by the product_id column
* @method ChildCartItem findOneByQuantity(double $quantity) Return the first ChildCartItem filtered by the quantity column
- * @method ChildCartItem findOneByCombinationId(int $combination_id) Return the first ChildCartItem filtered by the combination_id column
+ * @method ChildCartItem findOneByStockId(int $stock_id) Return the first ChildCartItem filtered by the stock_id column
* @method ChildCartItem findOneByCreatedAt(string $created_at) Return the first ChildCartItem filtered by the created_at column
* @method ChildCartItem findOneByUpdatedAt(string $updated_at) Return the first ChildCartItem filtered by the updated_at column
*
@@ -68,7 +68,7 @@ use Thelia\Model\Map\CartItemTableMap;
* @method array findByCartId(int $cart_id) Return ChildCartItem objects filtered by the cart_id column
* @method array findByProductId(int $product_id) Return ChildCartItem objects filtered by the product_id column
* @method array findByQuantity(double $quantity) Return ChildCartItem objects filtered by the quantity column
- * @method array findByCombinationId(int $combination_id) Return ChildCartItem objects filtered by the combination_id column
+ * @method array findByStockId(int $stock_id) Return ChildCartItem objects filtered by the stock_id column
* @method array findByCreatedAt(string $created_at) Return ChildCartItem objects filtered by the created_at column
* @method array findByUpdatedAt(string $updated_at) Return ChildCartItem objects filtered by the updated_at column
*
@@ -159,7 +159,7 @@ abstract class CartItemQuery extends ModelCriteria
*/
protected function findPkSimple($key, $con)
{
- $sql = 'SELECT ID, CART_ID, PRODUCT_ID, QUANTITY, COMBINATION_ID, CREATED_AT, UPDATED_AT FROM cart_item WHERE ID = :p0';
+ $sql = 'SELECT ID, CART_ID, PRODUCT_ID, QUANTITY, STOCK_ID, CREATED_AT, UPDATED_AT FROM cart_item WHERE ID = :p0';
try {
$stmt = $con->prepare($sql);
$stmt->bindValue(':p0', $key, PDO::PARAM_INT);
@@ -417,18 +417,18 @@ abstract class CartItemQuery extends ModelCriteria
}
/**
- * Filter the query on the combination_id column
+ * Filter the query on the stock_id column
*
* Example usage:
*
- * $query->filterByCombinationId(1234); // WHERE combination_id = 1234
- * $query->filterByCombinationId(array(12, 34)); // WHERE combination_id IN (12, 34)
- * $query->filterByCombinationId(array('min' => 12)); // WHERE combination_id > 12
+ * $query->filterByStockId(1234); // WHERE stock_id = 1234
+ * $query->filterByStockId(array(12, 34)); // WHERE stock_id IN (12, 34)
+ * $query->filterByStockId(array('min' => 12)); // WHERE stock_id > 12
*
*
- * @see filterByCombination()
+ * @see filterByStock()
*
- * @param mixed $combinationId The value to use as filter.
+ * @param mixed $stockId The value to use as filter.
* Use scalar values for equality.
* Use array values for in_array() equivalent.
* Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
@@ -436,16 +436,16 @@ abstract class CartItemQuery extends ModelCriteria
*
* @return ChildCartItemQuery The current query, for fluid interface
*/
- public function filterByCombinationId($combinationId = null, $comparison = null)
+ public function filterByStockId($stockId = null, $comparison = null)
{
- if (is_array($combinationId)) {
+ if (is_array($stockId)) {
$useMinMax = false;
- if (isset($combinationId['min'])) {
- $this->addUsingAlias(CartItemTableMap::COMBINATION_ID, $combinationId['min'], Criteria::GREATER_EQUAL);
+ if (isset($stockId['min'])) {
+ $this->addUsingAlias(CartItemTableMap::STOCK_ID, $stockId['min'], Criteria::GREATER_EQUAL);
$useMinMax = true;
}
- if (isset($combinationId['max'])) {
- $this->addUsingAlias(CartItemTableMap::COMBINATION_ID, $combinationId['max'], Criteria::LESS_EQUAL);
+ if (isset($stockId['max'])) {
+ $this->addUsingAlias(CartItemTableMap::STOCK_ID, $stockId['max'], Criteria::LESS_EQUAL);
$useMinMax = true;
}
if ($useMinMax) {
@@ -456,7 +456,7 @@ abstract class CartItemQuery extends ModelCriteria
}
}
- return $this->addUsingAlias(CartItemTableMap::COMBINATION_ID, $combinationId, $comparison);
+ return $this->addUsingAlias(CartItemTableMap::STOCK_ID, $stockId, $comparison);
}
/**
@@ -696,42 +696,42 @@ abstract class CartItemQuery extends ModelCriteria
}
/**
- * Filter the query by a related \Thelia\Model\Combination object
+ * Filter the query by a related \Thelia\Model\Stock object
*
- * @param \Thelia\Model\Combination|ObjectCollection $combination The related object(s) to use as filter
+ * @param \Thelia\Model\Stock|ObjectCollection $stock The related object(s) to use as filter
* @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
*
* @return ChildCartItemQuery The current query, for fluid interface
*/
- public function filterByCombination($combination, $comparison = null)
+ public function filterByStock($stock, $comparison = null)
{
- if ($combination instanceof \Thelia\Model\Combination) {
+ if ($stock instanceof \Thelia\Model\Stock) {
return $this
- ->addUsingAlias(CartItemTableMap::COMBINATION_ID, $combination->getId(), $comparison);
- } elseif ($combination instanceof ObjectCollection) {
+ ->addUsingAlias(CartItemTableMap::STOCK_ID, $stock->getId(), $comparison);
+ } elseif ($stock instanceof ObjectCollection) {
if (null === $comparison) {
$comparison = Criteria::IN;
}
return $this
- ->addUsingAlias(CartItemTableMap::COMBINATION_ID, $combination->toKeyValue('PrimaryKey', 'Id'), $comparison);
+ ->addUsingAlias(CartItemTableMap::STOCK_ID, $stock->toKeyValue('PrimaryKey', 'Id'), $comparison);
} else {
- throw new PropelException('filterByCombination() only accepts arguments of type \Thelia\Model\Combination or Collection');
+ throw new PropelException('filterByStock() only accepts arguments of type \Thelia\Model\Stock or Collection');
}
}
/**
- * Adds a JOIN clause to the query using the Combination relation
+ * Adds a JOIN clause to the query using the Stock relation
*
* @param string $relationAlias optional alias for the relation
* @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
*
* @return ChildCartItemQuery The current query, for fluid interface
*/
- public function joinCombination($relationAlias = null, $joinType = Criteria::LEFT_JOIN)
+ public function joinStock($relationAlias = null, $joinType = Criteria::INNER_JOIN)
{
$tableMap = $this->getTableMap();
- $relationMap = $tableMap->getRelation('Combination');
+ $relationMap = $tableMap->getRelation('Stock');
// create a ModelJoin object for this join
$join = new ModelJoin();
@@ -746,14 +746,14 @@ abstract class CartItemQuery extends ModelCriteria
$this->addAlias($relationAlias, $relationMap->getRightTable()->getName());
$this->addJoinObject($join, $relationAlias);
} else {
- $this->addJoinObject($join, 'Combination');
+ $this->addJoinObject($join, 'Stock');
}
return $this;
}
/**
- * Use the Combination relation Combination object
+ * Use the Stock relation Stock object
*
* @see useQuery()
*
@@ -761,13 +761,13 @@ abstract class CartItemQuery extends ModelCriteria
* to be used as main alias in the secondary query
* @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
*
- * @return \Thelia\Model\CombinationQuery A secondary query class using the current class as primary query
+ * @return \Thelia\Model\StockQuery A secondary query class using the current class as primary query
*/
- public function useCombinationQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN)
+ public function useStockQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN)
{
return $this
- ->joinCombination($relationAlias, $joinType)
- ->useQuery($relationAlias ? $relationAlias : 'Combination', '\Thelia\Model\CombinationQuery');
+ ->joinStock($relationAlias, $joinType)
+ ->useQuery($relationAlias ? $relationAlias : 'Stock', '\Thelia\Model\StockQuery');
}
/**
diff --git a/core/lib/Thelia/Model/Base/Category.php b/core/lib/Thelia/Model/Base/Category.php
index 1af89e917..05838d1de 100755
--- a/core/lib/Thelia/Model/Base/Category.php
+++ b/core/lib/Thelia/Model/Base/Category.php
@@ -5035,20 +5035,6 @@ abstract class Category implements ActiveRecordInterface
return (string) $this->exportTo(CategoryTableMap::DEFAULT_STRING_FORMAT);
}
- // timestampable behavior
-
- /**
- * Mark the current object so that the update date doesn't get updated during next save
- *
- * @return ChildCategory The current object (for fluent API support)
- */
- public function keepUpdateDateUnchanged()
- {
- $this->modifiedColumns[] = CategoryTableMap::UPDATED_AT;
-
- return $this;
- }
-
// i18n behavior
/**
@@ -5528,6 +5514,20 @@ abstract class Category implements ActiveRecordInterface
return $this->getCategoryVersions($criteria, $con);
}
+ // timestampable behavior
+
+ /**
+ * Mark the current object so that the update date doesn't get updated during next save
+ *
+ * @return ChildCategory The current object (for fluent API support)
+ */
+ public function keepUpdateDateUnchanged()
+ {
+ $this->modifiedColumns[] = CategoryTableMap::UPDATED_AT;
+
+ return $this;
+ }
+
/**
* Code to be run before persisting the object
* @param ConnectionInterface $con
diff --git a/core/lib/Thelia/Model/Base/CategoryQuery.php b/core/lib/Thelia/Model/Base/CategoryQuery.php
index 0dc6ea4ef..c5b7156e4 100755
--- a/core/lib/Thelia/Model/Base/CategoryQuery.php
+++ b/core/lib/Thelia/Model/Base/CategoryQuery.php
@@ -1450,72 +1450,6 @@ abstract class CategoryQuery extends ModelCriteria
}
}
- // timestampable behavior
-
- /**
- * Filter by the latest updated
- *
- * @param int $nbDays Maximum age of the latest update in days
- *
- * @return ChildCategoryQuery The current query, for fluid interface
- */
- public function recentlyUpdated($nbDays = 7)
- {
- return $this->addUsingAlias(CategoryTableMap::UPDATED_AT, time() - $nbDays * 24 * 60 * 60, Criteria::GREATER_EQUAL);
- }
-
- /**
- * Filter by the latest created
- *
- * @param int $nbDays Maximum age of in days
- *
- * @return ChildCategoryQuery The current query, for fluid interface
- */
- public function recentlyCreated($nbDays = 7)
- {
- return $this->addUsingAlias(CategoryTableMap::CREATED_AT, time() - $nbDays * 24 * 60 * 60, Criteria::GREATER_EQUAL);
- }
-
- /**
- * Order by update date desc
- *
- * @return ChildCategoryQuery The current query, for fluid interface
- */
- public function lastUpdatedFirst()
- {
- return $this->addDescendingOrderByColumn(CategoryTableMap::UPDATED_AT);
- }
-
- /**
- * Order by update date asc
- *
- * @return ChildCategoryQuery The current query, for fluid interface
- */
- public function firstUpdatedFirst()
- {
- return $this->addAscendingOrderByColumn(CategoryTableMap::UPDATED_AT);
- }
-
- /**
- * Order by create date desc
- *
- * @return ChildCategoryQuery The current query, for fluid interface
- */
- public function lastCreatedFirst()
- {
- return $this->addDescendingOrderByColumn(CategoryTableMap::CREATED_AT);
- }
-
- /**
- * Order by create date asc
- *
- * @return ChildCategoryQuery The current query, for fluid interface
- */
- public function firstCreatedFirst()
- {
- return $this->addAscendingOrderByColumn(CategoryTableMap::CREATED_AT);
- }
-
// i18n behavior
/**
@@ -1601,4 +1535,70 @@ abstract class CategoryQuery extends ModelCriteria
self::$isVersioningEnabled = false;
}
+ // timestampable behavior
+
+ /**
+ * Filter by the latest updated
+ *
+ * @param int $nbDays Maximum age of the latest update in days
+ *
+ * @return ChildCategoryQuery The current query, for fluid interface
+ */
+ public function recentlyUpdated($nbDays = 7)
+ {
+ return $this->addUsingAlias(CategoryTableMap::UPDATED_AT, time() - $nbDays * 24 * 60 * 60, Criteria::GREATER_EQUAL);
+ }
+
+ /**
+ * Filter by the latest created
+ *
+ * @param int $nbDays Maximum age of in days
+ *
+ * @return ChildCategoryQuery The current query, for fluid interface
+ */
+ public function recentlyCreated($nbDays = 7)
+ {
+ return $this->addUsingAlias(CategoryTableMap::CREATED_AT, time() - $nbDays * 24 * 60 * 60, Criteria::GREATER_EQUAL);
+ }
+
+ /**
+ * Order by update date desc
+ *
+ * @return ChildCategoryQuery The current query, for fluid interface
+ */
+ public function lastUpdatedFirst()
+ {
+ return $this->addDescendingOrderByColumn(CategoryTableMap::UPDATED_AT);
+ }
+
+ /**
+ * Order by update date asc
+ *
+ * @return ChildCategoryQuery The current query, for fluid interface
+ */
+ public function firstUpdatedFirst()
+ {
+ return $this->addAscendingOrderByColumn(CategoryTableMap::UPDATED_AT);
+ }
+
+ /**
+ * Order by create date desc
+ *
+ * @return ChildCategoryQuery The current query, for fluid interface
+ */
+ public function lastCreatedFirst()
+ {
+ return $this->addDescendingOrderByColumn(CategoryTableMap::CREATED_AT);
+ }
+
+ /**
+ * Order by create date asc
+ *
+ * @return ChildCategoryQuery The current query, for fluid interface
+ */
+ public function firstCreatedFirst()
+ {
+ return $this->addAscendingOrderByColumn(CategoryTableMap::CREATED_AT);
+ }
+
} // CategoryQuery
diff --git a/core/lib/Thelia/Model/Base/Currency.php b/core/lib/Thelia/Model/Base/Currency.php
index 077fd972c..5e0de24b5 100755
--- a/core/lib/Thelia/Model/Base/Currency.php
+++ b/core/lib/Thelia/Model/Base/Currency.php
@@ -23,6 +23,8 @@ use Thelia\Model\Currency as ChildCurrency;
use Thelia\Model\CurrencyQuery as ChildCurrencyQuery;
use Thelia\Model\Order as ChildOrder;
use Thelia\Model\OrderQuery as ChildOrderQuery;
+use Thelia\Model\ProductPrice as ChildProductPrice;
+use Thelia\Model\ProductPriceQuery as ChildProductPriceQuery;
use Thelia\Model\Map\CurrencyTableMap;
abstract class Currency implements ActiveRecordInterface
@@ -119,6 +121,12 @@ abstract class Currency implements ActiveRecordInterface
protected $collCarts;
protected $collCartsPartial;
+ /**
+ * @var ObjectCollection|ChildProductPrice[] Collection to store aggregation of ChildProductPrice objects.
+ */
+ protected $collProductPrices;
+ protected $collProductPricesPartial;
+
/**
* Flag to prevent endless save loop, if this object is referenced
* by another object which falls in this transaction.
@@ -139,6 +147,12 @@ abstract class Currency implements ActiveRecordInterface
*/
protected $cartsScheduledForDeletion = null;
+ /**
+ * An array of objects scheduled for deletion.
+ * @var ObjectCollection
+ */
+ protected $productPricesScheduledForDeletion = null;
+
/**
* Initializes internal state of Thelia\Model\Base\Currency object.
*/
@@ -806,6 +820,8 @@ abstract class Currency implements ActiveRecordInterface
$this->collCarts = null;
+ $this->collProductPrices = null;
+
} // if (deep)
}
@@ -975,6 +991,23 @@ abstract class Currency implements ActiveRecordInterface
}
}
+ if ($this->productPricesScheduledForDeletion !== null) {
+ if (!$this->productPricesScheduledForDeletion->isEmpty()) {
+ \Thelia\Model\ProductPriceQuery::create()
+ ->filterByPrimaryKeys($this->productPricesScheduledForDeletion->getPrimaryKeys(false))
+ ->delete($con);
+ $this->productPricesScheduledForDeletion = null;
+ }
+ }
+
+ if ($this->collProductPrices !== null) {
+ foreach ($this->collProductPrices as $referrerFK) {
+ if (!$referrerFK->isDeleted() && ($referrerFK->isNew() || $referrerFK->isModified())) {
+ $affectedRows += $referrerFK->save($con);
+ }
+ }
+ }
+
$this->alreadyInSave = false;
}
@@ -1197,6 +1230,9 @@ abstract class Currency implements ActiveRecordInterface
if (null !== $this->collCarts) {
$result['Carts'] = $this->collCarts->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects);
}
+ if (null !== $this->collProductPrices) {
+ $result['ProductPrices'] = $this->collProductPrices->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects);
+ }
}
return $result;
@@ -1394,6 +1430,12 @@ abstract class Currency implements ActiveRecordInterface
}
}
+ foreach ($this->getProductPrices() as $relObj) {
+ if ($relObj !== $this) { // ensure that we don't try to copy a reference to ourselves
+ $copyObj->addProductPrice($relObj->copy($deepCopy));
+ }
+ }
+
} // if ($deepCopy)
if ($makeNew) {
@@ -1441,6 +1483,9 @@ abstract class Currency implements ActiveRecordInterface
if ('Cart' == $relationName) {
return $this->initCarts();
}
+ if ('ProductPrice' == $relationName) {
+ return $this->initProductPrices();
+ }
}
/**
@@ -2054,6 +2099,249 @@ abstract class Currency implements ActiveRecordInterface
return $this->getCarts($query, $con);
}
+ /**
+ * Clears out the collProductPrices collection
+ *
+ * This does not modify the database; however, it will remove any associated objects, causing
+ * them to be refetched by subsequent calls to accessor method.
+ *
+ * @return void
+ * @see addProductPrices()
+ */
+ public function clearProductPrices()
+ {
+ $this->collProductPrices = null; // important to set this to NULL since that means it is uninitialized
+ }
+
+ /**
+ * Reset is the collProductPrices collection loaded partially.
+ */
+ public function resetPartialProductPrices($v = true)
+ {
+ $this->collProductPricesPartial = $v;
+ }
+
+ /**
+ * Initializes the collProductPrices collection.
+ *
+ * By default this just sets the collProductPrices collection to an empty array (like clearcollProductPrices());
+ * however, you may wish to override this method in your stub class to provide setting appropriate
+ * to your application -- for example, setting the initial array to the values stored in database.
+ *
+ * @param boolean $overrideExisting If set to true, the method call initializes
+ * the collection even if it is not empty
+ *
+ * @return void
+ */
+ public function initProductPrices($overrideExisting = true)
+ {
+ if (null !== $this->collProductPrices && !$overrideExisting) {
+ return;
+ }
+ $this->collProductPrices = new ObjectCollection();
+ $this->collProductPrices->setModel('\Thelia\Model\ProductPrice');
+ }
+
+ /**
+ * Gets an array of ChildProductPrice objects which contain a foreign key that references this object.
+ *
+ * If the $criteria is not null, it is used to always fetch the results from the database.
+ * Otherwise the results are fetched from the database the first time, then cached.
+ * Next time the same method is called without $criteria, the cached collection is returned.
+ * If this ChildCurrency is new, it will return
+ * an empty collection or the current collection; the criteria is ignored on a new object.
+ *
+ * @param Criteria $criteria optional Criteria object to narrow the query
+ * @param ConnectionInterface $con optional connection object
+ * @return Collection|ChildProductPrice[] List of ChildProductPrice objects
+ * @throws PropelException
+ */
+ public function getProductPrices($criteria = null, ConnectionInterface $con = null)
+ {
+ $partial = $this->collProductPricesPartial && !$this->isNew();
+ if (null === $this->collProductPrices || null !== $criteria || $partial) {
+ if ($this->isNew() && null === $this->collProductPrices) {
+ // return empty collection
+ $this->initProductPrices();
+ } else {
+ $collProductPrices = ChildProductPriceQuery::create(null, $criteria)
+ ->filterByCurrency($this)
+ ->find($con);
+
+ if (null !== $criteria) {
+ if (false !== $this->collProductPricesPartial && count($collProductPrices)) {
+ $this->initProductPrices(false);
+
+ foreach ($collProductPrices as $obj) {
+ if (false == $this->collProductPrices->contains($obj)) {
+ $this->collProductPrices->append($obj);
+ }
+ }
+
+ $this->collProductPricesPartial = true;
+ }
+
+ $collProductPrices->getInternalIterator()->rewind();
+
+ return $collProductPrices;
+ }
+
+ if ($partial && $this->collProductPrices) {
+ foreach ($this->collProductPrices as $obj) {
+ if ($obj->isNew()) {
+ $collProductPrices[] = $obj;
+ }
+ }
+ }
+
+ $this->collProductPrices = $collProductPrices;
+ $this->collProductPricesPartial = false;
+ }
+ }
+
+ return $this->collProductPrices;
+ }
+
+ /**
+ * Sets a collection of ProductPrice objects related by a one-to-many relationship
+ * to the current object.
+ * It will also schedule objects for deletion based on a diff between old objects (aka persisted)
+ * and new objects from the given Propel collection.
+ *
+ * @param Collection $productPrices A Propel collection.
+ * @param ConnectionInterface $con Optional connection object
+ * @return ChildCurrency The current object (for fluent API support)
+ */
+ public function setProductPrices(Collection $productPrices, ConnectionInterface $con = null)
+ {
+ $productPricesToDelete = $this->getProductPrices(new Criteria(), $con)->diff($productPrices);
+
+
+ $this->productPricesScheduledForDeletion = $productPricesToDelete;
+
+ foreach ($productPricesToDelete as $productPriceRemoved) {
+ $productPriceRemoved->setCurrency(null);
+ }
+
+ $this->collProductPrices = null;
+ foreach ($productPrices as $productPrice) {
+ $this->addProductPrice($productPrice);
+ }
+
+ $this->collProductPrices = $productPrices;
+ $this->collProductPricesPartial = false;
+
+ return $this;
+ }
+
+ /**
+ * Returns the number of related ProductPrice objects.
+ *
+ * @param Criteria $criteria
+ * @param boolean $distinct
+ * @param ConnectionInterface $con
+ * @return int Count of related ProductPrice objects.
+ * @throws PropelException
+ */
+ public function countProductPrices(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null)
+ {
+ $partial = $this->collProductPricesPartial && !$this->isNew();
+ if (null === $this->collProductPrices || null !== $criteria || $partial) {
+ if ($this->isNew() && null === $this->collProductPrices) {
+ return 0;
+ }
+
+ if ($partial && !$criteria) {
+ return count($this->getProductPrices());
+ }
+
+ $query = ChildProductPriceQuery::create(null, $criteria);
+ if ($distinct) {
+ $query->distinct();
+ }
+
+ return $query
+ ->filterByCurrency($this)
+ ->count($con);
+ }
+
+ return count($this->collProductPrices);
+ }
+
+ /**
+ * Method called to associate a ChildProductPrice object to this object
+ * through the ChildProductPrice foreign key attribute.
+ *
+ * @param ChildProductPrice $l ChildProductPrice
+ * @return \Thelia\Model\Currency The current object (for fluent API support)
+ */
+ public function addProductPrice(ChildProductPrice $l)
+ {
+ if ($this->collProductPrices === null) {
+ $this->initProductPrices();
+ $this->collProductPricesPartial = true;
+ }
+
+ if (!in_array($l, $this->collProductPrices->getArrayCopy(), true)) { // only add it if the **same** object is not already associated
+ $this->doAddProductPrice($l);
+ }
+
+ return $this;
+ }
+
+ /**
+ * @param ProductPrice $productPrice The productPrice object to add.
+ */
+ protected function doAddProductPrice($productPrice)
+ {
+ $this->collProductPrices[]= $productPrice;
+ $productPrice->setCurrency($this);
+ }
+
+ /**
+ * @param ProductPrice $productPrice The productPrice object to remove.
+ * @return ChildCurrency The current object (for fluent API support)
+ */
+ public function removeProductPrice($productPrice)
+ {
+ if ($this->getProductPrices()->contains($productPrice)) {
+ $this->collProductPrices->remove($this->collProductPrices->search($productPrice));
+ if (null === $this->productPricesScheduledForDeletion) {
+ $this->productPricesScheduledForDeletion = clone $this->collProductPrices;
+ $this->productPricesScheduledForDeletion->clear();
+ }
+ $this->productPricesScheduledForDeletion[]= clone $productPrice;
+ $productPrice->setCurrency(null);
+ }
+
+ return $this;
+ }
+
+
+ /**
+ * If this collection has already been initialized with
+ * an identical criteria, it returns the collection.
+ * Otherwise if this Currency is new, it will return
+ * an empty collection; or if this Currency has previously
+ * been saved, it will retrieve related ProductPrices from storage.
+ *
+ * This method is protected by default in order to keep the public
+ * api reasonable. You can provide public methods for those you
+ * actually need in Currency.
+ *
+ * @param Criteria $criteria optional Criteria object to narrow the query
+ * @param ConnectionInterface $con optional connection object
+ * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN)
+ * @return Collection|ChildProductPrice[] List of ChildProductPrice objects
+ */
+ public function getProductPricesJoinStock($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN)
+ {
+ $query = ChildProductPriceQuery::create(null, $criteria);
+ $query->joinWith('Stock', $joinBehavior);
+
+ return $this->getProductPrices($query, $con);
+ }
+
/**
* Clears the current object and sets all attributes to their default values
*/
@@ -2096,6 +2384,11 @@ abstract class Currency implements ActiveRecordInterface
$o->clearAllReferences($deep);
}
}
+ if ($this->collProductPrices) {
+ foreach ($this->collProductPrices as $o) {
+ $o->clearAllReferences($deep);
+ }
+ }
} // if ($deep)
if ($this->collOrders instanceof Collection) {
@@ -2106,6 +2399,10 @@ abstract class Currency implements ActiveRecordInterface
$this->collCarts->clearIterator();
}
$this->collCarts = null;
+ if ($this->collProductPrices instanceof Collection) {
+ $this->collProductPrices->clearIterator();
+ }
+ $this->collProductPrices = null;
}
/**
diff --git a/core/lib/Thelia/Model/Base/CurrencyQuery.php b/core/lib/Thelia/Model/Base/CurrencyQuery.php
index 79c0dc7a1..0718e56c7 100755
--- a/core/lib/Thelia/Model/Base/CurrencyQuery.php
+++ b/core/lib/Thelia/Model/Base/CurrencyQuery.php
@@ -51,6 +51,10 @@ use Thelia\Model\Map\CurrencyTableMap;
* @method ChildCurrencyQuery rightJoinCart($relationAlias = null) Adds a RIGHT JOIN clause to the query using the Cart relation
* @method ChildCurrencyQuery innerJoinCart($relationAlias = null) Adds a INNER JOIN clause to the query using the Cart relation
*
+ * @method ChildCurrencyQuery leftJoinProductPrice($relationAlias = null) Adds a LEFT JOIN clause to the query using the ProductPrice relation
+ * @method ChildCurrencyQuery rightJoinProductPrice($relationAlias = null) Adds a RIGHT JOIN clause to the query using the ProductPrice relation
+ * @method ChildCurrencyQuery innerJoinProductPrice($relationAlias = null) Adds a INNER JOIN clause to the query using the ProductPrice relation
+ *
* @method ChildCurrency findOne(ConnectionInterface $con = null) Return the first ChildCurrency matching the query
* @method ChildCurrency findOneOrCreate(ConnectionInterface $con = null) Return the first ChildCurrency matching the query, or a new ChildCurrency object populated from the query conditions when no match is found
*
@@ -690,6 +694,79 @@ abstract class CurrencyQuery extends ModelCriteria
->useQuery($relationAlias ? $relationAlias : 'Cart', '\Thelia\Model\CartQuery');
}
+ /**
+ * Filter the query by a related \Thelia\Model\ProductPrice object
+ *
+ * @param \Thelia\Model\ProductPrice|ObjectCollection $productPrice the related object to use as filter
+ * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+ *
+ * @return ChildCurrencyQuery The current query, for fluid interface
+ */
+ public function filterByProductPrice($productPrice, $comparison = null)
+ {
+ if ($productPrice instanceof \Thelia\Model\ProductPrice) {
+ return $this
+ ->addUsingAlias(CurrencyTableMap::ID, $productPrice->getCurrencyId(), $comparison);
+ } elseif ($productPrice instanceof ObjectCollection) {
+ return $this
+ ->useProductPriceQuery()
+ ->filterByPrimaryKeys($productPrice->getPrimaryKeys())
+ ->endUse();
+ } else {
+ throw new PropelException('filterByProductPrice() only accepts arguments of type \Thelia\Model\ProductPrice or Collection');
+ }
+ }
+
+ /**
+ * Adds a JOIN clause to the query using the ProductPrice relation
+ *
+ * @param string $relationAlias optional alias for the relation
+ * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
+ *
+ * @return ChildCurrencyQuery The current query, for fluid interface
+ */
+ public function joinProductPrice($relationAlias = null, $joinType = Criteria::INNER_JOIN)
+ {
+ $tableMap = $this->getTableMap();
+ $relationMap = $tableMap->getRelation('ProductPrice');
+
+ // create a ModelJoin object for this join
+ $join = new ModelJoin();
+ $join->setJoinType($joinType);
+ $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias);
+ if ($previousJoin = $this->getPreviousJoin()) {
+ $join->setPreviousJoin($previousJoin);
+ }
+
+ // add the ModelJoin to the current object
+ if ($relationAlias) {
+ $this->addAlias($relationAlias, $relationMap->getRightTable()->getName());
+ $this->addJoinObject($join, $relationAlias);
+ } else {
+ $this->addJoinObject($join, 'ProductPrice');
+ }
+
+ return $this;
+ }
+
+ /**
+ * Use the ProductPrice relation ProductPrice object
+ *
+ * @see useQuery()
+ *
+ * @param string $relationAlias optional alias for the relation,
+ * to be used as main alias in the secondary query
+ * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
+ *
+ * @return \Thelia\Model\ProductPriceQuery A secondary query class using the current class as primary query
+ */
+ public function useProductPriceQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN)
+ {
+ return $this
+ ->joinProductPrice($relationAlias, $joinType)
+ ->useQuery($relationAlias ? $relationAlias : 'ProductPrice', '\Thelia\Model\ProductPriceQuery');
+ }
+
/**
* Exclude object from result
*
diff --git a/core/lib/Thelia/Model/Base/Product.php b/core/lib/Thelia/Model/Base/Product.php
index 96b3f45f0..eafdabba4 100755
--- a/core/lib/Thelia/Model/Base/Product.php
+++ b/core/lib/Thelia/Model/Base/Product.php
@@ -100,45 +100,6 @@ abstract class Product implements ActiveRecordInterface
*/
protected $ref;
- /**
- * The value for the price field.
- * @var double
- */
- protected $price;
-
- /**
- * The value for the price2 field.
- * @var double
- */
- protected $price2;
-
- /**
- * The value for the ecotax field.
- * @var double
- */
- protected $ecotax;
-
- /**
- * The value for the newness field.
- * Note: this column has a database default value of: 0
- * @var int
- */
- protected $newness;
-
- /**
- * The value for the promo field.
- * Note: this column has a database default value of: 0
- * @var int
- */
- protected $promo;
-
- /**
- * The value for the quantity field.
- * Note: this column has a database default value of: 0
- * @var int
- */
- protected $quantity;
-
/**
* The value for the visible field.
* Note: this column has a database default value of: 0
@@ -146,12 +107,6 @@ abstract class Product implements ActiveRecordInterface
*/
protected $visible;
- /**
- * The value for the weight field.
- * @var double
- */
- protected $weight;
-
/**
* The value for the position field.
* @var int
@@ -409,9 +364,6 @@ abstract class Product implements ActiveRecordInterface
*/
public function applyDefaultValues()
{
- $this->newness = 0;
- $this->promo = 0;
- $this->quantity = 0;
$this->visible = 0;
$this->version = 0;
}
@@ -705,72 +657,6 @@ abstract class Product implements ActiveRecordInterface
return $this->ref;
}
- /**
- * Get the [price] column value.
- *
- * @return double
- */
- public function getPrice()
- {
-
- return $this->price;
- }
-
- /**
- * Get the [price2] column value.
- *
- * @return double
- */
- public function getPrice2()
- {
-
- return $this->price2;
- }
-
- /**
- * Get the [ecotax] column value.
- *
- * @return double
- */
- public function getEcotax()
- {
-
- return $this->ecotax;
- }
-
- /**
- * Get the [newness] column value.
- *
- * @return int
- */
- public function getNewness()
- {
-
- return $this->newness;
- }
-
- /**
- * Get the [promo] column value.
- *
- * @return int
- */
- public function getPromo()
- {
-
- return $this->promo;
- }
-
- /**
- * Get the [quantity] column value.
- *
- * @return int
- */
- public function getQuantity()
- {
-
- return $this->quantity;
- }
-
/**
* Get the [visible] column value.
*
@@ -782,17 +668,6 @@ abstract class Product implements ActiveRecordInterface
return $this->visible;
}
- /**
- * Get the [weight] column value.
- *
- * @return double
- */
- public function getWeight()
- {
-
- return $this->weight;
- }
-
/**
* Get the [position] column value.
*
@@ -953,132 +828,6 @@ abstract class Product implements ActiveRecordInterface
return $this;
} // setRef()
- /**
- * Set the value of [price] column.
- *
- * @param double $v new value
- * @return \Thelia\Model\Product The current object (for fluent API support)
- */
- public function setPrice($v)
- {
- if ($v !== null) {
- $v = (double) $v;
- }
-
- if ($this->price !== $v) {
- $this->price = $v;
- $this->modifiedColumns[] = ProductTableMap::PRICE;
- }
-
-
- return $this;
- } // setPrice()
-
- /**
- * Set the value of [price2] column.
- *
- * @param double $v new value
- * @return \Thelia\Model\Product The current object (for fluent API support)
- */
- public function setPrice2($v)
- {
- if ($v !== null) {
- $v = (double) $v;
- }
-
- if ($this->price2 !== $v) {
- $this->price2 = $v;
- $this->modifiedColumns[] = ProductTableMap::PRICE2;
- }
-
-
- return $this;
- } // setPrice2()
-
- /**
- * Set the value of [ecotax] column.
- *
- * @param double $v new value
- * @return \Thelia\Model\Product The current object (for fluent API support)
- */
- public function setEcotax($v)
- {
- if ($v !== null) {
- $v = (double) $v;
- }
-
- if ($this->ecotax !== $v) {
- $this->ecotax = $v;
- $this->modifiedColumns[] = ProductTableMap::ECOTAX;
- }
-
-
- return $this;
- } // setEcotax()
-
- /**
- * Set the value of [newness] column.
- *
- * @param int $v new value
- * @return \Thelia\Model\Product The current object (for fluent API support)
- */
- public function setNewness($v)
- {
- if ($v !== null) {
- $v = (int) $v;
- }
-
- if ($this->newness !== $v) {
- $this->newness = $v;
- $this->modifiedColumns[] = ProductTableMap::NEWNESS;
- }
-
-
- return $this;
- } // setNewness()
-
- /**
- * Set the value of [promo] column.
- *
- * @param int $v new value
- * @return \Thelia\Model\Product The current object (for fluent API support)
- */
- public function setPromo($v)
- {
- if ($v !== null) {
- $v = (int) $v;
- }
-
- if ($this->promo !== $v) {
- $this->promo = $v;
- $this->modifiedColumns[] = ProductTableMap::PROMO;
- }
-
-
- return $this;
- } // setPromo()
-
- /**
- * Set the value of [quantity] column.
- *
- * @param int $v new value
- * @return \Thelia\Model\Product The current object (for fluent API support)
- */
- public function setQuantity($v)
- {
- if ($v !== null) {
- $v = (int) $v;
- }
-
- if ($this->quantity !== $v) {
- $this->quantity = $v;
- $this->modifiedColumns[] = ProductTableMap::QUANTITY;
- }
-
-
- return $this;
- } // setQuantity()
-
/**
* Set the value of [visible] column.
*
@@ -1100,27 +849,6 @@ abstract class Product implements ActiveRecordInterface
return $this;
} // setVisible()
- /**
- * Set the value of [weight] column.
- *
- * @param double $v new value
- * @return \Thelia\Model\Product The current object (for fluent API support)
- */
- public function setWeight($v)
- {
- if ($v !== null) {
- $v = (double) $v;
- }
-
- if ($this->weight !== $v) {
- $this->weight = $v;
- $this->modifiedColumns[] = ProductTableMap::WEIGHT;
- }
-
-
- return $this;
- } // setWeight()
-
/**
* Set the value of [position] column.
*
@@ -1257,18 +985,6 @@ abstract class Product implements ActiveRecordInterface
*/
public function hasOnlyDefaultValues()
{
- if ($this->newness !== 0) {
- return false;
- }
-
- if ($this->promo !== 0) {
- return false;
- }
-
- if ($this->quantity !== 0) {
- return false;
- }
-
if ($this->visible !== 0) {
return false;
}
@@ -1313,55 +1029,34 @@ abstract class Product implements ActiveRecordInterface
$col = $row[TableMap::TYPE_NUM == $indexType ? 2 + $startcol : ProductTableMap::translateFieldName('Ref', TableMap::TYPE_PHPNAME, $indexType)];
$this->ref = (null !== $col) ? (string) $col : null;
- $col = $row[TableMap::TYPE_NUM == $indexType ? 3 + $startcol : ProductTableMap::translateFieldName('Price', TableMap::TYPE_PHPNAME, $indexType)];
- $this->price = (null !== $col) ? (double) $col : null;
-
- $col = $row[TableMap::TYPE_NUM == $indexType ? 4 + $startcol : ProductTableMap::translateFieldName('Price2', TableMap::TYPE_PHPNAME, $indexType)];
- $this->price2 = (null !== $col) ? (double) $col : null;
-
- $col = $row[TableMap::TYPE_NUM == $indexType ? 5 + $startcol : ProductTableMap::translateFieldName('Ecotax', TableMap::TYPE_PHPNAME, $indexType)];
- $this->ecotax = (null !== $col) ? (double) $col : null;
-
- $col = $row[TableMap::TYPE_NUM == $indexType ? 6 + $startcol : ProductTableMap::translateFieldName('Newness', TableMap::TYPE_PHPNAME, $indexType)];
- $this->newness = (null !== $col) ? (int) $col : null;
-
- $col = $row[TableMap::TYPE_NUM == $indexType ? 7 + $startcol : ProductTableMap::translateFieldName('Promo', TableMap::TYPE_PHPNAME, $indexType)];
- $this->promo = (null !== $col) ? (int) $col : null;
-
- $col = $row[TableMap::TYPE_NUM == $indexType ? 8 + $startcol : ProductTableMap::translateFieldName('Quantity', TableMap::TYPE_PHPNAME, $indexType)];
- $this->quantity = (null !== $col) ? (int) $col : null;
-
- $col = $row[TableMap::TYPE_NUM == $indexType ? 9 + $startcol : ProductTableMap::translateFieldName('Visible', TableMap::TYPE_PHPNAME, $indexType)];
+ $col = $row[TableMap::TYPE_NUM == $indexType ? 3 + $startcol : ProductTableMap::translateFieldName('Visible', TableMap::TYPE_PHPNAME, $indexType)];
$this->visible = (null !== $col) ? (int) $col : null;
- $col = $row[TableMap::TYPE_NUM == $indexType ? 10 + $startcol : ProductTableMap::translateFieldName('Weight', TableMap::TYPE_PHPNAME, $indexType)];
- $this->weight = (null !== $col) ? (double) $col : null;
-
- $col = $row[TableMap::TYPE_NUM == $indexType ? 11 + $startcol : ProductTableMap::translateFieldName('Position', TableMap::TYPE_PHPNAME, $indexType)];
+ $col = $row[TableMap::TYPE_NUM == $indexType ? 4 + $startcol : ProductTableMap::translateFieldName('Position', TableMap::TYPE_PHPNAME, $indexType)];
$this->position = (null !== $col) ? (int) $col : null;
- $col = $row[TableMap::TYPE_NUM == $indexType ? 12 + $startcol : ProductTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)];
+ $col = $row[TableMap::TYPE_NUM == $indexType ? 5 + $startcol : ProductTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)];
if ($col === '0000-00-00 00:00:00') {
$col = null;
}
$this->created_at = (null !== $col) ? PropelDateTime::newInstance($col, null, '\DateTime') : null;
- $col = $row[TableMap::TYPE_NUM == $indexType ? 13 + $startcol : ProductTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)];
+ $col = $row[TableMap::TYPE_NUM == $indexType ? 6 + $startcol : ProductTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)];
if ($col === '0000-00-00 00:00:00') {
$col = null;
}
$this->updated_at = (null !== $col) ? PropelDateTime::newInstance($col, null, '\DateTime') : null;
- $col = $row[TableMap::TYPE_NUM == $indexType ? 14 + $startcol : ProductTableMap::translateFieldName('Version', TableMap::TYPE_PHPNAME, $indexType)];
+ $col = $row[TableMap::TYPE_NUM == $indexType ? 7 + $startcol : ProductTableMap::translateFieldName('Version', TableMap::TYPE_PHPNAME, $indexType)];
$this->version = (null !== $col) ? (int) $col : null;
- $col = $row[TableMap::TYPE_NUM == $indexType ? 15 + $startcol : ProductTableMap::translateFieldName('VersionCreatedAt', TableMap::TYPE_PHPNAME, $indexType)];
+ $col = $row[TableMap::TYPE_NUM == $indexType ? 8 + $startcol : ProductTableMap::translateFieldName('VersionCreatedAt', TableMap::TYPE_PHPNAME, $indexType)];
if ($col === '0000-00-00 00:00:00') {
$col = null;
}
$this->version_created_at = (null !== $col) ? PropelDateTime::newInstance($col, null, '\DateTime') : null;
- $col = $row[TableMap::TYPE_NUM == $indexType ? 16 + $startcol : ProductTableMap::translateFieldName('VersionCreatedBy', TableMap::TYPE_PHPNAME, $indexType)];
+ $col = $row[TableMap::TYPE_NUM == $indexType ? 9 + $startcol : ProductTableMap::translateFieldName('VersionCreatedBy', TableMap::TYPE_PHPNAME, $indexType)];
$this->version_created_by = (null !== $col) ? (string) $col : null;
$this->resetModified();
@@ -1371,7 +1066,7 @@ abstract class Product implements ActiveRecordInterface
$this->ensureConsistency();
}
- return $startcol + 17; // 17 = ProductTableMap::NUM_HYDRATE_COLUMNS.
+ return $startcol + 10; // 10 = ProductTableMap::NUM_HYDRATE_COLUMNS.
} catch (Exception $e) {
throw new PropelException("Error populating \Thelia\Model\Product object", 0, $e);
@@ -1940,30 +1635,9 @@ abstract class Product implements ActiveRecordInterface
if ($this->isColumnModified(ProductTableMap::REF)) {
$modifiedColumns[':p' . $index++] = 'REF';
}
- if ($this->isColumnModified(ProductTableMap::PRICE)) {
- $modifiedColumns[':p' . $index++] = 'PRICE';
- }
- if ($this->isColumnModified(ProductTableMap::PRICE2)) {
- $modifiedColumns[':p' . $index++] = 'PRICE2';
- }
- if ($this->isColumnModified(ProductTableMap::ECOTAX)) {
- $modifiedColumns[':p' . $index++] = 'ECOTAX';
- }
- if ($this->isColumnModified(ProductTableMap::NEWNESS)) {
- $modifiedColumns[':p' . $index++] = 'NEWNESS';
- }
- if ($this->isColumnModified(ProductTableMap::PROMO)) {
- $modifiedColumns[':p' . $index++] = 'PROMO';
- }
- if ($this->isColumnModified(ProductTableMap::QUANTITY)) {
- $modifiedColumns[':p' . $index++] = 'QUANTITY';
- }
if ($this->isColumnModified(ProductTableMap::VISIBLE)) {
$modifiedColumns[':p' . $index++] = 'VISIBLE';
}
- if ($this->isColumnModified(ProductTableMap::WEIGHT)) {
- $modifiedColumns[':p' . $index++] = 'WEIGHT';
- }
if ($this->isColumnModified(ProductTableMap::POSITION)) {
$modifiedColumns[':p' . $index++] = 'POSITION';
}
@@ -2002,30 +1676,9 @@ abstract class Product implements ActiveRecordInterface
case 'REF':
$stmt->bindValue($identifier, $this->ref, PDO::PARAM_STR);
break;
- case 'PRICE':
- $stmt->bindValue($identifier, $this->price, PDO::PARAM_STR);
- break;
- case 'PRICE2':
- $stmt->bindValue($identifier, $this->price2, PDO::PARAM_STR);
- break;
- case 'ECOTAX':
- $stmt->bindValue($identifier, $this->ecotax, PDO::PARAM_STR);
- break;
- case 'NEWNESS':
- $stmt->bindValue($identifier, $this->newness, PDO::PARAM_INT);
- break;
- case 'PROMO':
- $stmt->bindValue($identifier, $this->promo, PDO::PARAM_INT);
- break;
- case 'QUANTITY':
- $stmt->bindValue($identifier, $this->quantity, PDO::PARAM_INT);
- break;
case 'VISIBLE':
$stmt->bindValue($identifier, $this->visible, PDO::PARAM_INT);
break;
- case 'WEIGHT':
- $stmt->bindValue($identifier, $this->weight, PDO::PARAM_STR);
- break;
case 'POSITION':
$stmt->bindValue($identifier, $this->position, PDO::PARAM_INT);
break;
@@ -2116,45 +1769,24 @@ abstract class Product implements ActiveRecordInterface
return $this->getRef();
break;
case 3:
- return $this->getPrice();
- break;
- case 4:
- return $this->getPrice2();
- break;
- case 5:
- return $this->getEcotax();
- break;
- case 6:
- return $this->getNewness();
- break;
- case 7:
- return $this->getPromo();
- break;
- case 8:
- return $this->getQuantity();
- break;
- case 9:
return $this->getVisible();
break;
- case 10:
- return $this->getWeight();
- break;
- case 11:
+ case 4:
return $this->getPosition();
break;
- case 12:
+ case 5:
return $this->getCreatedAt();
break;
- case 13:
+ case 6:
return $this->getUpdatedAt();
break;
- case 14:
+ case 7:
return $this->getVersion();
break;
- case 15:
+ case 8:
return $this->getVersionCreatedAt();
break;
- case 16:
+ case 9:
return $this->getVersionCreatedBy();
break;
default:
@@ -2189,20 +1821,13 @@ abstract class Product implements ActiveRecordInterface
$keys[0] => $this->getId(),
$keys[1] => $this->getTaxRuleId(),
$keys[2] => $this->getRef(),
- $keys[3] => $this->getPrice(),
- $keys[4] => $this->getPrice2(),
- $keys[5] => $this->getEcotax(),
- $keys[6] => $this->getNewness(),
- $keys[7] => $this->getPromo(),
- $keys[8] => $this->getQuantity(),
- $keys[9] => $this->getVisible(),
- $keys[10] => $this->getWeight(),
- $keys[11] => $this->getPosition(),
- $keys[12] => $this->getCreatedAt(),
- $keys[13] => $this->getUpdatedAt(),
- $keys[14] => $this->getVersion(),
- $keys[15] => $this->getVersionCreatedAt(),
- $keys[16] => $this->getVersionCreatedBy(),
+ $keys[3] => $this->getVisible(),
+ $keys[4] => $this->getPosition(),
+ $keys[5] => $this->getCreatedAt(),
+ $keys[6] => $this->getUpdatedAt(),
+ $keys[7] => $this->getVersion(),
+ $keys[8] => $this->getVersionCreatedAt(),
+ $keys[9] => $this->getVersionCreatedBy(),
);
$virtualColumns = $this->virtualColumns;
foreach($virtualColumns as $key => $virtualColumn)
@@ -2294,45 +1919,24 @@ abstract class Product implements ActiveRecordInterface
$this->setRef($value);
break;
case 3:
- $this->setPrice($value);
- break;
- case 4:
- $this->setPrice2($value);
- break;
- case 5:
- $this->setEcotax($value);
- break;
- case 6:
- $this->setNewness($value);
- break;
- case 7:
- $this->setPromo($value);
- break;
- case 8:
- $this->setQuantity($value);
- break;
- case 9:
$this->setVisible($value);
break;
- case 10:
- $this->setWeight($value);
- break;
- case 11:
+ case 4:
$this->setPosition($value);
break;
- case 12:
+ case 5:
$this->setCreatedAt($value);
break;
- case 13:
+ case 6:
$this->setUpdatedAt($value);
break;
- case 14:
+ case 7:
$this->setVersion($value);
break;
- case 15:
+ case 8:
$this->setVersionCreatedAt($value);
break;
- case 16:
+ case 9:
$this->setVersionCreatedBy($value);
break;
} // switch()
@@ -2362,20 +1966,13 @@ abstract class Product implements ActiveRecordInterface
if (array_key_exists($keys[0], $arr)) $this->setId($arr[$keys[0]]);
if (array_key_exists($keys[1], $arr)) $this->setTaxRuleId($arr[$keys[1]]);
if (array_key_exists($keys[2], $arr)) $this->setRef($arr[$keys[2]]);
- if (array_key_exists($keys[3], $arr)) $this->setPrice($arr[$keys[3]]);
- if (array_key_exists($keys[4], $arr)) $this->setPrice2($arr[$keys[4]]);
- if (array_key_exists($keys[5], $arr)) $this->setEcotax($arr[$keys[5]]);
- if (array_key_exists($keys[6], $arr)) $this->setNewness($arr[$keys[6]]);
- if (array_key_exists($keys[7], $arr)) $this->setPromo($arr[$keys[7]]);
- if (array_key_exists($keys[8], $arr)) $this->setQuantity($arr[$keys[8]]);
- if (array_key_exists($keys[9], $arr)) $this->setVisible($arr[$keys[9]]);
- if (array_key_exists($keys[10], $arr)) $this->setWeight($arr[$keys[10]]);
- if (array_key_exists($keys[11], $arr)) $this->setPosition($arr[$keys[11]]);
- if (array_key_exists($keys[12], $arr)) $this->setCreatedAt($arr[$keys[12]]);
- if (array_key_exists($keys[13], $arr)) $this->setUpdatedAt($arr[$keys[13]]);
- if (array_key_exists($keys[14], $arr)) $this->setVersion($arr[$keys[14]]);
- if (array_key_exists($keys[15], $arr)) $this->setVersionCreatedAt($arr[$keys[15]]);
- if (array_key_exists($keys[16], $arr)) $this->setVersionCreatedBy($arr[$keys[16]]);
+ if (array_key_exists($keys[3], $arr)) $this->setVisible($arr[$keys[3]]);
+ if (array_key_exists($keys[4], $arr)) $this->setPosition($arr[$keys[4]]);
+ if (array_key_exists($keys[5], $arr)) $this->setCreatedAt($arr[$keys[5]]);
+ if (array_key_exists($keys[6], $arr)) $this->setUpdatedAt($arr[$keys[6]]);
+ if (array_key_exists($keys[7], $arr)) $this->setVersion($arr[$keys[7]]);
+ if (array_key_exists($keys[8], $arr)) $this->setVersionCreatedAt($arr[$keys[8]]);
+ if (array_key_exists($keys[9], $arr)) $this->setVersionCreatedBy($arr[$keys[9]]);
}
/**
@@ -2390,14 +1987,7 @@ abstract class Product implements ActiveRecordInterface
if ($this->isColumnModified(ProductTableMap::ID)) $criteria->add(ProductTableMap::ID, $this->id);
if ($this->isColumnModified(ProductTableMap::TAX_RULE_ID)) $criteria->add(ProductTableMap::TAX_RULE_ID, $this->tax_rule_id);
if ($this->isColumnModified(ProductTableMap::REF)) $criteria->add(ProductTableMap::REF, $this->ref);
- if ($this->isColumnModified(ProductTableMap::PRICE)) $criteria->add(ProductTableMap::PRICE, $this->price);
- if ($this->isColumnModified(ProductTableMap::PRICE2)) $criteria->add(ProductTableMap::PRICE2, $this->price2);
- if ($this->isColumnModified(ProductTableMap::ECOTAX)) $criteria->add(ProductTableMap::ECOTAX, $this->ecotax);
- if ($this->isColumnModified(ProductTableMap::NEWNESS)) $criteria->add(ProductTableMap::NEWNESS, $this->newness);
- if ($this->isColumnModified(ProductTableMap::PROMO)) $criteria->add(ProductTableMap::PROMO, $this->promo);
- if ($this->isColumnModified(ProductTableMap::QUANTITY)) $criteria->add(ProductTableMap::QUANTITY, $this->quantity);
if ($this->isColumnModified(ProductTableMap::VISIBLE)) $criteria->add(ProductTableMap::VISIBLE, $this->visible);
- if ($this->isColumnModified(ProductTableMap::WEIGHT)) $criteria->add(ProductTableMap::WEIGHT, $this->weight);
if ($this->isColumnModified(ProductTableMap::POSITION)) $criteria->add(ProductTableMap::POSITION, $this->position);
if ($this->isColumnModified(ProductTableMap::CREATED_AT)) $criteria->add(ProductTableMap::CREATED_AT, $this->created_at);
if ($this->isColumnModified(ProductTableMap::UPDATED_AT)) $criteria->add(ProductTableMap::UPDATED_AT, $this->updated_at);
@@ -2469,14 +2059,7 @@ abstract class Product implements ActiveRecordInterface
{
$copyObj->setTaxRuleId($this->getTaxRuleId());
$copyObj->setRef($this->getRef());
- $copyObj->setPrice($this->getPrice());
- $copyObj->setPrice2($this->getPrice2());
- $copyObj->setEcotax($this->getEcotax());
- $copyObj->setNewness($this->getNewness());
- $copyObj->setPromo($this->getPromo());
- $copyObj->setQuantity($this->getQuantity());
$copyObj->setVisible($this->getVisible());
- $copyObj->setWeight($this->getWeight());
$copyObj->setPosition($this->getPosition());
$copyObj->setCreatedAt($this->getCreatedAt());
$copyObj->setUpdatedAt($this->getUpdatedAt());
@@ -3423,31 +3006,6 @@ abstract class Product implements ActiveRecordInterface
return $this;
}
-
- /**
- * If this collection has already been initialized with
- * an identical criteria, it returns the collection.
- * Otherwise if this Product is new, it will return
- * an empty collection; or if this Product has previously
- * been saved, it will retrieve related Stocks from storage.
- *
- * This method is protected by default in order to keep the public
- * api reasonable. You can provide public methods for those you
- * actually need in Product.
- *
- * @param Criteria $criteria optional Criteria object to narrow the query
- * @param ConnectionInterface $con optional connection object
- * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN)
- * @return Collection|ChildStock[] List of ChildStock objects
- */
- public function getStocksJoinCombination($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN)
- {
- $query = ChildStockQuery::create(null, $criteria);
- $query->joinWith('Combination', $joinBehavior);
-
- return $this->getStocks($query, $con);
- }
-
/**
* Clears out the collContentAssocs collection
*
@@ -5291,10 +4849,10 @@ abstract class Product implements ActiveRecordInterface
* @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN)
* @return Collection|ChildCartItem[] List of ChildCartItem objects
*/
- public function getCartItemsJoinCombination($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN)
+ public function getCartItemsJoinStock($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN)
{
$query = ChildCartItemQuery::create(null, $criteria);
- $query->joinWith('Combination', $joinBehavior);
+ $query->joinWith('Stock', $joinBehavior);
return $this->getCartItems($query, $con);
}
@@ -6302,14 +5860,7 @@ abstract class Product implements ActiveRecordInterface
$this->id = null;
$this->tax_rule_id = null;
$this->ref = null;
- $this->price = null;
- $this->price2 = null;
- $this->ecotax = null;
- $this->newness = null;
- $this->promo = null;
- $this->quantity = null;
$this->visible = null;
- $this->weight = null;
$this->position = null;
$this->created_at = null;
$this->updated_at = null;
@@ -6750,14 +6301,7 @@ abstract class Product implements ActiveRecordInterface
$version->setId($this->getId());
$version->setTaxRuleId($this->getTaxRuleId());
$version->setRef($this->getRef());
- $version->setPrice($this->getPrice());
- $version->setPrice2($this->getPrice2());
- $version->setEcotax($this->getEcotax());
- $version->setNewness($this->getNewness());
- $version->setPromo($this->getPromo());
- $version->setQuantity($this->getQuantity());
$version->setVisible($this->getVisible());
- $version->setWeight($this->getWeight());
$version->setPosition($this->getPosition());
$version->setCreatedAt($this->getCreatedAt());
$version->setUpdatedAt($this->getUpdatedAt());
@@ -6804,14 +6348,7 @@ abstract class Product implements ActiveRecordInterface
$this->setId($version->getId());
$this->setTaxRuleId($version->getTaxRuleId());
$this->setRef($version->getRef());
- $this->setPrice($version->getPrice());
- $this->setPrice2($version->getPrice2());
- $this->setEcotax($version->getEcotax());
- $this->setNewness($version->getNewness());
- $this->setPromo($version->getPromo());
- $this->setQuantity($version->getQuantity());
$this->setVisible($version->getVisible());
- $this->setWeight($version->getWeight());
$this->setPosition($version->getPosition());
$this->setCreatedAt($version->getCreatedAt());
$this->setUpdatedAt($version->getUpdatedAt());
diff --git a/core/lib/Thelia/Model/Base/ProductPrice.php b/core/lib/Thelia/Model/Base/ProductPrice.php
new file mode 100644
index 000000000..ebf350a3b
--- /dev/null
+++ b/core/lib/Thelia/Model/Base/ProductPrice.php
@@ -0,0 +1,1611 @@
+modifiedColumns);
+ }
+
+ /**
+ * Has specified column been modified?
+ *
+ * @param string $col column fully qualified name (TableMap::TYPE_COLNAME), e.g. Book::AUTHOR_ID
+ * @return boolean True if $col has been modified.
+ */
+ public function isColumnModified($col)
+ {
+ return in_array($col, $this->modifiedColumns);
+ }
+
+ /**
+ * Get the columns that have been modified in this object.
+ * @return array A unique list of the modified column names for this object.
+ */
+ public function getModifiedColumns()
+ {
+ return array_unique($this->modifiedColumns);
+ }
+
+ /**
+ * Returns whether the object has ever been saved. This will
+ * be false, if the object was retrieved from storage or was created
+ * and then saved.
+ *
+ * @return true, if the object has never been persisted.
+ */
+ public function isNew()
+ {
+ return $this->new;
+ }
+
+ /**
+ * Setter for the isNew attribute. This method will be called
+ * by Propel-generated children and objects.
+ *
+ * @param boolean $b the state of the object.
+ */
+ public function setNew($b)
+ {
+ $this->new = (Boolean) $b;
+ }
+
+ /**
+ * Whether this object has been deleted.
+ * @return boolean The deleted state of this object.
+ */
+ public function isDeleted()
+ {
+ return $this->deleted;
+ }
+
+ /**
+ * Specify whether this object has been deleted.
+ * @param boolean $b The deleted state of this object.
+ * @return void
+ */
+ public function setDeleted($b)
+ {
+ $this->deleted = (Boolean) $b;
+ }
+
+ /**
+ * Sets the modified state for the object to be false.
+ * @param string $col If supplied, only the specified column is reset.
+ * @return void
+ */
+ public function resetModified($col = null)
+ {
+ if (null !== $col) {
+ while (false !== ($offset = array_search($col, $this->modifiedColumns))) {
+ array_splice($this->modifiedColumns, $offset, 1);
+ }
+ } else {
+ $this->modifiedColumns = array();
+ }
+ }
+
+ /**
+ * Compares this with another ProductPrice instance. If
+ * obj is an instance of ProductPrice, delegates to
+ * equals(ProductPrice). Otherwise, returns false.
+ *
+ * @param obj The object to compare to.
+ * @return Whether equal to the object specified.
+ */
+ public function equals($obj)
+ {
+ $thisclazz = get_class($this);
+ if (!is_object($obj) || !($obj instanceof $thisclazz)) {
+ return false;
+ }
+
+ if ($this === $obj) {
+ return true;
+ }
+
+ if (null === $this->getPrimaryKey()
+ || null === $obj->getPrimaryKey()) {
+ return false;
+ }
+
+ return $this->getPrimaryKey() === $obj->getPrimaryKey();
+ }
+
+ /**
+ * If the primary key is not null, return the hashcode of the
+ * primary key. Otherwise, return the hash code of the object.
+ *
+ * @return int Hashcode
+ */
+ public function hashCode()
+ {
+ if (null !== $this->getPrimaryKey()) {
+ return crc32(serialize($this->getPrimaryKey()));
+ }
+
+ return crc32(serialize(clone $this));
+ }
+
+ /**
+ * Get the associative array of the virtual columns in this object
+ *
+ * @param string $name The virtual column name
+ *
+ * @return array
+ */
+ public function getVirtualColumns()
+ {
+ return $this->virtualColumns;
+ }
+
+ /**
+ * Checks the existence of a virtual column in this object
+ *
+ * @return boolean
+ */
+ public function hasVirtualColumn($name)
+ {
+ return isset($this->virtualColumns[$name]);
+ }
+
+ /**
+ * Get the value of a virtual column in this object
+ *
+ * @return mixed
+ */
+ public function getVirtualColumn($name)
+ {
+ if (!$this->hasVirtualColumn($name)) {
+ throw new PropelException(sprintf('Cannot get value of inexistent virtual column %s.', $name));
+ }
+
+ return $this->virtualColumns[$name];
+ }
+
+ /**
+ * Set the value of a virtual column in this object
+ *
+ * @param string $name The virtual column name
+ * @param mixed $value The value to give to the virtual column
+ *
+ * @return ProductPrice The current object, for fluid interface
+ */
+ public function setVirtualColumn($name, $value)
+ {
+ $this->virtualColumns[$name] = $value;
+
+ return $this;
+ }
+
+ /**
+ * Logs a message using Propel::log().
+ *
+ * @param string $msg
+ * @param int $priority One of the Propel::LOG_* logging levels
+ * @return boolean
+ */
+ protected function log($msg, $priority = Propel::LOG_INFO)
+ {
+ return Propel::log(get_class($this) . ': ' . $msg, $priority);
+ }
+
+ /**
+ * Populate the current object from a string, using a given parser format
+ *
+ * $book = new Book();
+ * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}');
+ *
+ *
+ * @param mixed $parser A AbstractParser instance,
+ * or a format name ('XML', 'YAML', 'JSON', 'CSV')
+ * @param string $data The source data to import from
+ *
+ * @return ProductPrice The current object, for fluid interface
+ */
+ public function importFrom($parser, $data)
+ {
+ if (!$parser instanceof AbstractParser) {
+ $parser = AbstractParser::getParser($parser);
+ }
+
+ return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME);
+ }
+
+ /**
+ * Export the current object properties to a string, using a given parser format
+ *
+ * $book = BookQuery::create()->findPk(9012);
+ * echo $book->exportTo('JSON');
+ * => {"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}');
+ *
+ *
+ * @param mixed $parser A AbstractParser instance, or a format name ('XML', 'YAML', 'JSON', 'CSV')
+ * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy load(ed) columns. Defaults to TRUE.
+ * @return string The exported data
+ */
+ public function exportTo($parser, $includeLazyLoadColumns = true)
+ {
+ if (!$parser instanceof AbstractParser) {
+ $parser = AbstractParser::getParser($parser);
+ }
+
+ return $parser->fromArray($this->toArray(TableMap::TYPE_PHPNAME, $includeLazyLoadColumns, array(), true));
+ }
+
+ /**
+ * Clean up internal collections prior to serializing
+ * Avoids recursive loops that turn into segmentation faults when serializing
+ */
+ public function __sleep()
+ {
+ $this->clearAllReferences();
+
+ return array_keys(get_object_vars($this));
+ }
+
+ /**
+ * Get the [id] column value.
+ *
+ * @return int
+ */
+ public function getId()
+ {
+
+ return $this->id;
+ }
+
+ /**
+ * Get the [stock_id] column value.
+ *
+ * @return int
+ */
+ public function getStockId()
+ {
+
+ return $this->stock_id;
+ }
+
+ /**
+ * Get the [currency_id] column value.
+ *
+ * @return int
+ */
+ public function getCurrencyId()
+ {
+
+ return $this->currency_id;
+ }
+
+ /**
+ * Get the [price] column value.
+ *
+ * @return double
+ */
+ public function getPrice()
+ {
+
+ return $this->price;
+ }
+
+ /**
+ * Get the [promo_price] column value.
+ *
+ * @return double
+ */
+ public function getPromoPrice()
+ {
+
+ return $this->promo_price;
+ }
+
+ /**
+ * Get the [optionally formatted] temporal [created_at] column value.
+ *
+ *
+ * @param string $format The date/time format string (either date()-style or strftime()-style).
+ * If format is NULL, then the raw \DateTime object will be returned.
+ *
+ * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00
+ *
+ * @throws PropelException - if unable to parse/validate the date/time value.
+ */
+ public function getCreatedAt($format = NULL)
+ {
+ if ($format === null) {
+ return $this->created_at;
+ } else {
+ return $this->created_at !== null ? $this->created_at->format($format) : null;
+ }
+ }
+
+ /**
+ * Get the [optionally formatted] temporal [updated_at] column value.
+ *
+ *
+ * @param string $format The date/time format string (either date()-style or strftime()-style).
+ * If format is NULL, then the raw \DateTime object will be returned.
+ *
+ * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00
+ *
+ * @throws PropelException - if unable to parse/validate the date/time value.
+ */
+ public function getUpdatedAt($format = NULL)
+ {
+ if ($format === null) {
+ return $this->updated_at;
+ } else {
+ return $this->updated_at !== null ? $this->updated_at->format($format) : null;
+ }
+ }
+
+ /**
+ * Set the value of [id] column.
+ *
+ * @param int $v new value
+ * @return \Thelia\Model\ProductPrice The current object (for fluent API support)
+ */
+ public function setId($v)
+ {
+ if ($v !== null) {
+ $v = (int) $v;
+ }
+
+ if ($this->id !== $v) {
+ $this->id = $v;
+ $this->modifiedColumns[] = ProductPriceTableMap::ID;
+ }
+
+
+ return $this;
+ } // setId()
+
+ /**
+ * Set the value of [stock_id] column.
+ *
+ * @param int $v new value
+ * @return \Thelia\Model\ProductPrice The current object (for fluent API support)
+ */
+ public function setStockId($v)
+ {
+ if ($v !== null) {
+ $v = (int) $v;
+ }
+
+ if ($this->stock_id !== $v) {
+ $this->stock_id = $v;
+ $this->modifiedColumns[] = ProductPriceTableMap::STOCK_ID;
+ }
+
+ if ($this->aStock !== null && $this->aStock->getId() !== $v) {
+ $this->aStock = null;
+ }
+
+
+ return $this;
+ } // setStockId()
+
+ /**
+ * Set the value of [currency_id] column.
+ *
+ * @param int $v new value
+ * @return \Thelia\Model\ProductPrice The current object (for fluent API support)
+ */
+ public function setCurrencyId($v)
+ {
+ if ($v !== null) {
+ $v = (int) $v;
+ }
+
+ if ($this->currency_id !== $v) {
+ $this->currency_id = $v;
+ $this->modifiedColumns[] = ProductPriceTableMap::CURRENCY_ID;
+ }
+
+ if ($this->aCurrency !== null && $this->aCurrency->getId() !== $v) {
+ $this->aCurrency = null;
+ }
+
+
+ return $this;
+ } // setCurrencyId()
+
+ /**
+ * Set the value of [price] column.
+ *
+ * @param double $v new value
+ * @return \Thelia\Model\ProductPrice The current object (for fluent API support)
+ */
+ public function setPrice($v)
+ {
+ if ($v !== null) {
+ $v = (double) $v;
+ }
+
+ if ($this->price !== $v) {
+ $this->price = $v;
+ $this->modifiedColumns[] = ProductPriceTableMap::PRICE;
+ }
+
+
+ return $this;
+ } // setPrice()
+
+ /**
+ * Set the value of [promo_price] column.
+ *
+ * @param double $v new value
+ * @return \Thelia\Model\ProductPrice The current object (for fluent API support)
+ */
+ public function setPromoPrice($v)
+ {
+ if ($v !== null) {
+ $v = (double) $v;
+ }
+
+ if ($this->promo_price !== $v) {
+ $this->promo_price = $v;
+ $this->modifiedColumns[] = ProductPriceTableMap::PROMO_PRICE;
+ }
+
+
+ return $this;
+ } // setPromoPrice()
+
+ /**
+ * Sets the value of [created_at] column to a normalized version of the date/time value specified.
+ *
+ * @param mixed $v string, integer (timestamp), or \DateTime value.
+ * Empty strings are treated as NULL.
+ * @return \Thelia\Model\ProductPrice The current object (for fluent API support)
+ */
+ public function setCreatedAt($v)
+ {
+ $dt = PropelDateTime::newInstance($v, null, '\DateTime');
+ if ($this->created_at !== null || $dt !== null) {
+ if ($dt !== $this->created_at) {
+ $this->created_at = $dt;
+ $this->modifiedColumns[] = ProductPriceTableMap::CREATED_AT;
+ }
+ } // if either are not null
+
+
+ return $this;
+ } // setCreatedAt()
+
+ /**
+ * Sets the value of [updated_at] column to a normalized version of the date/time value specified.
+ *
+ * @param mixed $v string, integer (timestamp), or \DateTime value.
+ * Empty strings are treated as NULL.
+ * @return \Thelia\Model\ProductPrice The current object (for fluent API support)
+ */
+ public function setUpdatedAt($v)
+ {
+ $dt = PropelDateTime::newInstance($v, null, '\DateTime');
+ if ($this->updated_at !== null || $dt !== null) {
+ if ($dt !== $this->updated_at) {
+ $this->updated_at = $dt;
+ $this->modifiedColumns[] = ProductPriceTableMap::UPDATED_AT;
+ }
+ } // if either are not null
+
+
+ return $this;
+ } // setUpdatedAt()
+
+ /**
+ * Indicates whether the columns in this object are only set to default values.
+ *
+ * This method can be used in conjunction with isModified() to indicate whether an object is both
+ * modified _and_ has some values set which are non-default.
+ *
+ * @return boolean Whether the columns in this object are only been set with default values.
+ */
+ public function hasOnlyDefaultValues()
+ {
+ // otherwise, everything was equal, so return TRUE
+ return true;
+ } // hasOnlyDefaultValues()
+
+ /**
+ * Hydrates (populates) the object variables with values from the database resultset.
+ *
+ * An offset (0-based "start column") is specified so that objects can be hydrated
+ * with a subset of the columns in the resultset rows. This is needed, for example,
+ * for results of JOIN queries where the resultset row includes columns from two or
+ * more tables.
+ *
+ * @param array $row The row returned by DataFetcher->fetch().
+ * @param int $startcol 0-based offset column which indicates which restultset column to start with.
+ * @param boolean $rehydrate Whether this object is being re-hydrated from the database.
+ * @param string $indexType The index type of $row. Mostly DataFetcher->getIndexType().
+ One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
+ * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
+ *
+ * @return int next starting column
+ * @throws PropelException - Any caught Exception will be rewrapped as a PropelException.
+ */
+ public function hydrate($row, $startcol = 0, $rehydrate = false, $indexType = TableMap::TYPE_NUM)
+ {
+ try {
+
+
+ $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : ProductPriceTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)];
+ $this->id = (null !== $col) ? (int) $col : null;
+
+ $col = $row[TableMap::TYPE_NUM == $indexType ? 1 + $startcol : ProductPriceTableMap::translateFieldName('StockId', TableMap::TYPE_PHPNAME, $indexType)];
+ $this->stock_id = (null !== $col) ? (int) $col : null;
+
+ $col = $row[TableMap::TYPE_NUM == $indexType ? 2 + $startcol : ProductPriceTableMap::translateFieldName('CurrencyId', TableMap::TYPE_PHPNAME, $indexType)];
+ $this->currency_id = (null !== $col) ? (int) $col : null;
+
+ $col = $row[TableMap::TYPE_NUM == $indexType ? 3 + $startcol : ProductPriceTableMap::translateFieldName('Price', TableMap::TYPE_PHPNAME, $indexType)];
+ $this->price = (null !== $col) ? (double) $col : null;
+
+ $col = $row[TableMap::TYPE_NUM == $indexType ? 4 + $startcol : ProductPriceTableMap::translateFieldName('PromoPrice', TableMap::TYPE_PHPNAME, $indexType)];
+ $this->promo_price = (null !== $col) ? (double) $col : null;
+
+ $col = $row[TableMap::TYPE_NUM == $indexType ? 5 + $startcol : ProductPriceTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)];
+ if ($col === '0000-00-00 00:00:00') {
+ $col = null;
+ }
+ $this->created_at = (null !== $col) ? PropelDateTime::newInstance($col, null, '\DateTime') : null;
+
+ $col = $row[TableMap::TYPE_NUM == $indexType ? 6 + $startcol : ProductPriceTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)];
+ if ($col === '0000-00-00 00:00:00') {
+ $col = null;
+ }
+ $this->updated_at = (null !== $col) ? PropelDateTime::newInstance($col, null, '\DateTime') : null;
+ $this->resetModified();
+
+ $this->setNew(false);
+
+ if ($rehydrate) {
+ $this->ensureConsistency();
+ }
+
+ return $startcol + 7; // 7 = ProductPriceTableMap::NUM_HYDRATE_COLUMNS.
+
+ } catch (Exception $e) {
+ throw new PropelException("Error populating \Thelia\Model\ProductPrice object", 0, $e);
+ }
+ }
+
+ /**
+ * Checks and repairs the internal consistency of the object.
+ *
+ * This method is executed after an already-instantiated object is re-hydrated
+ * from the database. It exists to check any foreign keys to make sure that
+ * the objects related to the current object are correct based on foreign key.
+ *
+ * You can override this method in the stub class, but you should always invoke
+ * the base method from the overridden method (i.e. parent::ensureConsistency()),
+ * in case your model changes.
+ *
+ * @throws PropelException
+ */
+ public function ensureConsistency()
+ {
+ if ($this->aStock !== null && $this->stock_id !== $this->aStock->getId()) {
+ $this->aStock = null;
+ }
+ if ($this->aCurrency !== null && $this->currency_id !== $this->aCurrency->getId()) {
+ $this->aCurrency = null;
+ }
+ } // ensureConsistency
+
+ /**
+ * Reloads this object from datastore based on primary key and (optionally) resets all associated objects.
+ *
+ * This will only work if the object has been saved and has a valid primary key set.
+ *
+ * @param boolean $deep (optional) Whether to also de-associated any related objects.
+ * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use.
+ * @return void
+ * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db
+ */
+ public function reload($deep = false, ConnectionInterface $con = null)
+ {
+ if ($this->isDeleted()) {
+ throw new PropelException("Cannot reload a deleted object.");
+ }
+
+ if ($this->isNew()) {
+ throw new PropelException("Cannot reload an unsaved object.");
+ }
+
+ if ($con === null) {
+ $con = Propel::getServiceContainer()->getReadConnection(ProductPriceTableMap::DATABASE_NAME);
+ }
+
+ // We don't need to alter the object instance pool; we're just modifying this instance
+ // already in the pool.
+
+ $dataFetcher = ChildProductPriceQuery::create(null, $this->buildPkeyCriteria())->setFormatter(ModelCriteria::FORMAT_STATEMENT)->find($con);
+ $row = $dataFetcher->fetch();
+ $dataFetcher->close();
+ if (!$row) {
+ throw new PropelException('Cannot find matching row in the database to reload object values.');
+ }
+ $this->hydrate($row, 0, true, $dataFetcher->getIndexType()); // rehydrate
+
+ if ($deep) { // also de-associate any related objects?
+
+ $this->aStock = null;
+ $this->aCurrency = null;
+ } // if (deep)
+ }
+
+ /**
+ * Removes this object from datastore and sets delete attribute.
+ *
+ * @param ConnectionInterface $con
+ * @return void
+ * @throws PropelException
+ * @see ProductPrice::setDeleted()
+ * @see ProductPrice::isDeleted()
+ */
+ public function delete(ConnectionInterface $con = null)
+ {
+ if ($this->isDeleted()) {
+ throw new PropelException("This object has already been deleted.");
+ }
+
+ if ($con === null) {
+ $con = Propel::getServiceContainer()->getWriteConnection(ProductPriceTableMap::DATABASE_NAME);
+ }
+
+ $con->beginTransaction();
+ try {
+ $deleteQuery = ChildProductPriceQuery::create()
+ ->filterByPrimaryKey($this->getPrimaryKey());
+ $ret = $this->preDelete($con);
+ if ($ret) {
+ $deleteQuery->delete($con);
+ $this->postDelete($con);
+ $con->commit();
+ $this->setDeleted(true);
+ } else {
+ $con->commit();
+ }
+ } catch (Exception $e) {
+ $con->rollBack();
+ throw $e;
+ }
+ }
+
+ /**
+ * Persists this object to the database.
+ *
+ * If the object is new, it inserts it; otherwise an update is performed.
+ * All modified related objects will also be persisted in the doSave()
+ * method. This method wraps all precipitate database operations in a
+ * single transaction.
+ *
+ * @param ConnectionInterface $con
+ * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations.
+ * @throws PropelException
+ * @see doSave()
+ */
+ public function save(ConnectionInterface $con = null)
+ {
+ if ($this->isDeleted()) {
+ throw new PropelException("You cannot save an object that has been deleted.");
+ }
+
+ if ($con === null) {
+ $con = Propel::getServiceContainer()->getWriteConnection(ProductPriceTableMap::DATABASE_NAME);
+ }
+
+ $con->beginTransaction();
+ $isInsert = $this->isNew();
+ try {
+ $ret = $this->preSave($con);
+ if ($isInsert) {
+ $ret = $ret && $this->preInsert($con);
+ // timestampable behavior
+ if (!$this->isColumnModified(ProductPriceTableMap::CREATED_AT)) {
+ $this->setCreatedAt(time());
+ }
+ if (!$this->isColumnModified(ProductPriceTableMap::UPDATED_AT)) {
+ $this->setUpdatedAt(time());
+ }
+ } else {
+ $ret = $ret && $this->preUpdate($con);
+ // timestampable behavior
+ if ($this->isModified() && !$this->isColumnModified(ProductPriceTableMap::UPDATED_AT)) {
+ $this->setUpdatedAt(time());
+ }
+ }
+ if ($ret) {
+ $affectedRows = $this->doSave($con);
+ if ($isInsert) {
+ $this->postInsert($con);
+ } else {
+ $this->postUpdate($con);
+ }
+ $this->postSave($con);
+ ProductPriceTableMap::addInstanceToPool($this);
+ } else {
+ $affectedRows = 0;
+ }
+ $con->commit();
+
+ return $affectedRows;
+ } catch (Exception $e) {
+ $con->rollBack();
+ throw $e;
+ }
+ }
+
+ /**
+ * Performs the work of inserting or updating the row in the database.
+ *
+ * If the object is new, it inserts it; otherwise an update is performed.
+ * All related objects are also updated in this method.
+ *
+ * @param ConnectionInterface $con
+ * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations.
+ * @throws PropelException
+ * @see save()
+ */
+ protected function doSave(ConnectionInterface $con)
+ {
+ $affectedRows = 0; // initialize var to track total num of affected rows
+ if (!$this->alreadyInSave) {
+ $this->alreadyInSave = true;
+
+ // We call the save method on the following object(s) if they
+ // were passed to this object by their corresponding set
+ // method. This object relates to these object(s) by a
+ // foreign key reference.
+
+ if ($this->aStock !== null) {
+ if ($this->aStock->isModified() || $this->aStock->isNew()) {
+ $affectedRows += $this->aStock->save($con);
+ }
+ $this->setStock($this->aStock);
+ }
+
+ if ($this->aCurrency !== null) {
+ if ($this->aCurrency->isModified() || $this->aCurrency->isNew()) {
+ $affectedRows += $this->aCurrency->save($con);
+ }
+ $this->setCurrency($this->aCurrency);
+ }
+
+ if ($this->isNew() || $this->isModified()) {
+ // persist changes
+ if ($this->isNew()) {
+ $this->doInsert($con);
+ } else {
+ $this->doUpdate($con);
+ }
+ $affectedRows += 1;
+ $this->resetModified();
+ }
+
+ $this->alreadyInSave = false;
+
+ }
+
+ return $affectedRows;
+ } // doSave()
+
+ /**
+ * Insert the row in the database.
+ *
+ * @param ConnectionInterface $con
+ *
+ * @throws PropelException
+ * @see doSave()
+ */
+ protected function doInsert(ConnectionInterface $con)
+ {
+ $modifiedColumns = array();
+ $index = 0;
+
+ $this->modifiedColumns[] = ProductPriceTableMap::ID;
+ if (null !== $this->id) {
+ throw new PropelException('Cannot insert a value for auto-increment primary key (' . ProductPriceTableMap::ID . ')');
+ }
+
+ // check the columns in natural order for more readable SQL queries
+ if ($this->isColumnModified(ProductPriceTableMap::ID)) {
+ $modifiedColumns[':p' . $index++] = 'ID';
+ }
+ if ($this->isColumnModified(ProductPriceTableMap::STOCK_ID)) {
+ $modifiedColumns[':p' . $index++] = 'STOCK_ID';
+ }
+ if ($this->isColumnModified(ProductPriceTableMap::CURRENCY_ID)) {
+ $modifiedColumns[':p' . $index++] = 'CURRENCY_ID';
+ }
+ if ($this->isColumnModified(ProductPriceTableMap::PRICE)) {
+ $modifiedColumns[':p' . $index++] = 'PRICE';
+ }
+ if ($this->isColumnModified(ProductPriceTableMap::PROMO_PRICE)) {
+ $modifiedColumns[':p' . $index++] = 'PROMO_PRICE';
+ }
+ if ($this->isColumnModified(ProductPriceTableMap::CREATED_AT)) {
+ $modifiedColumns[':p' . $index++] = 'CREATED_AT';
+ }
+ if ($this->isColumnModified(ProductPriceTableMap::UPDATED_AT)) {
+ $modifiedColumns[':p' . $index++] = 'UPDATED_AT';
+ }
+
+ $sql = sprintf(
+ 'INSERT INTO product_price (%s) VALUES (%s)',
+ implode(', ', $modifiedColumns),
+ implode(', ', array_keys($modifiedColumns))
+ );
+
+ try {
+ $stmt = $con->prepare($sql);
+ foreach ($modifiedColumns as $identifier => $columnName) {
+ switch ($columnName) {
+ case 'ID':
+ $stmt->bindValue($identifier, $this->id, PDO::PARAM_INT);
+ break;
+ case 'STOCK_ID':
+ $stmt->bindValue($identifier, $this->stock_id, PDO::PARAM_INT);
+ break;
+ case 'CURRENCY_ID':
+ $stmt->bindValue($identifier, $this->currency_id, PDO::PARAM_INT);
+ break;
+ case 'PRICE':
+ $stmt->bindValue($identifier, $this->price, PDO::PARAM_STR);
+ break;
+ case 'PROMO_PRICE':
+ $stmt->bindValue($identifier, $this->promo_price, PDO::PARAM_STR);
+ break;
+ case 'CREATED_AT':
+ $stmt->bindValue($identifier, $this->created_at ? $this->created_at->format("Y-m-d H:i:s") : null, PDO::PARAM_STR);
+ break;
+ case 'UPDATED_AT':
+ $stmt->bindValue($identifier, $this->updated_at ? $this->updated_at->format("Y-m-d H:i:s") : null, PDO::PARAM_STR);
+ break;
+ }
+ }
+ $stmt->execute();
+ } catch (Exception $e) {
+ Propel::log($e->getMessage(), Propel::LOG_ERR);
+ throw new PropelException(sprintf('Unable to execute INSERT statement [%s]', $sql), 0, $e);
+ }
+
+ try {
+ $pk = $con->lastInsertId();
+ } catch (Exception $e) {
+ throw new PropelException('Unable to get autoincrement id.', 0, $e);
+ }
+ $this->setId($pk);
+
+ $this->setNew(false);
+ }
+
+ /**
+ * Update the row in the database.
+ *
+ * @param ConnectionInterface $con
+ *
+ * @return Integer Number of updated rows
+ * @see doSave()
+ */
+ protected function doUpdate(ConnectionInterface $con)
+ {
+ $selectCriteria = $this->buildPkeyCriteria();
+ $valuesCriteria = $this->buildCriteria();
+
+ return $selectCriteria->doUpdate($valuesCriteria, $con);
+ }
+
+ /**
+ * Retrieves a field from the object by name passed in as a string.
+ *
+ * @param string $name name
+ * @param string $type The type of fieldname the $name is of:
+ * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
+ * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
+ * Defaults to TableMap::TYPE_PHPNAME.
+ * @return mixed Value of field.
+ */
+ public function getByName($name, $type = TableMap::TYPE_PHPNAME)
+ {
+ $pos = ProductPriceTableMap::translateFieldName($name, $type, TableMap::TYPE_NUM);
+ $field = $this->getByPosition($pos);
+
+ return $field;
+ }
+
+ /**
+ * Retrieves a field from the object by Position as specified in the xml schema.
+ * Zero-based.
+ *
+ * @param int $pos position in xml schema
+ * @return mixed Value of field at $pos
+ */
+ public function getByPosition($pos)
+ {
+ switch ($pos) {
+ case 0:
+ return $this->getId();
+ break;
+ case 1:
+ return $this->getStockId();
+ break;
+ case 2:
+ return $this->getCurrencyId();
+ break;
+ case 3:
+ return $this->getPrice();
+ break;
+ case 4:
+ return $this->getPromoPrice();
+ break;
+ case 5:
+ return $this->getCreatedAt();
+ break;
+ case 6:
+ return $this->getUpdatedAt();
+ break;
+ default:
+ return null;
+ break;
+ } // switch()
+ }
+
+ /**
+ * Exports the object as an array.
+ *
+ * You can specify the key type of the array by passing one of the class
+ * type constants.
+ *
+ * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME,
+ * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
+ * Defaults to TableMap::TYPE_PHPNAME.
+ * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE.
+ * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion
+ * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE.
+ *
+ * @return array an associative array containing the field names (as keys) and field values
+ */
+ public function toArray($keyType = TableMap::TYPE_PHPNAME, $includeLazyLoadColumns = true, $alreadyDumpedObjects = array(), $includeForeignObjects = false)
+ {
+ if (isset($alreadyDumpedObjects['ProductPrice'][$this->getPrimaryKey()])) {
+ return '*RECURSION*';
+ }
+ $alreadyDumpedObjects['ProductPrice'][$this->getPrimaryKey()] = true;
+ $keys = ProductPriceTableMap::getFieldNames($keyType);
+ $result = array(
+ $keys[0] => $this->getId(),
+ $keys[1] => $this->getStockId(),
+ $keys[2] => $this->getCurrencyId(),
+ $keys[3] => $this->getPrice(),
+ $keys[4] => $this->getPromoPrice(),
+ $keys[5] => $this->getCreatedAt(),
+ $keys[6] => $this->getUpdatedAt(),
+ );
+ $virtualColumns = $this->virtualColumns;
+ foreach($virtualColumns as $key => $virtualColumn)
+ {
+ $result[$key] = $virtualColumn;
+ }
+
+ if ($includeForeignObjects) {
+ if (null !== $this->aStock) {
+ $result['Stock'] = $this->aStock->toArray($keyType, $includeLazyLoadColumns, $alreadyDumpedObjects, true);
+ }
+ if (null !== $this->aCurrency) {
+ $result['Currency'] = $this->aCurrency->toArray($keyType, $includeLazyLoadColumns, $alreadyDumpedObjects, true);
+ }
+ }
+
+ return $result;
+ }
+
+ /**
+ * Sets a field from the object by name passed in as a string.
+ *
+ * @param string $name
+ * @param mixed $value field value
+ * @param string $type The type of fieldname the $name is of:
+ * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
+ * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
+ * Defaults to TableMap::TYPE_PHPNAME.
+ * @return void
+ */
+ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME)
+ {
+ $pos = ProductPriceTableMap::translateFieldName($name, $type, TableMap::TYPE_NUM);
+
+ return $this->setByPosition($pos, $value);
+ }
+
+ /**
+ * Sets a field from the object by Position as specified in the xml schema.
+ * Zero-based.
+ *
+ * @param int $pos position in xml schema
+ * @param mixed $value field value
+ * @return void
+ */
+ public function setByPosition($pos, $value)
+ {
+ switch ($pos) {
+ case 0:
+ $this->setId($value);
+ break;
+ case 1:
+ $this->setStockId($value);
+ break;
+ case 2:
+ $this->setCurrencyId($value);
+ break;
+ case 3:
+ $this->setPrice($value);
+ break;
+ case 4:
+ $this->setPromoPrice($value);
+ break;
+ case 5:
+ $this->setCreatedAt($value);
+ break;
+ case 6:
+ $this->setUpdatedAt($value);
+ break;
+ } // switch()
+ }
+
+ /**
+ * Populates the object using an array.
+ *
+ * This is particularly useful when populating an object from one of the
+ * request arrays (e.g. $_POST). This method goes through the column
+ * names, checking to see whether a matching key exists in populated
+ * array. If so the setByName() method is called for that column.
+ *
+ * You can specify the key type of the array by additionally passing one
+ * of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME,
+ * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
+ * The default key type is the column's TableMap::TYPE_PHPNAME.
+ *
+ * @param array $arr An array to populate the object from.
+ * @param string $keyType The type of keys the array uses.
+ * @return void
+ */
+ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME)
+ {
+ $keys = ProductPriceTableMap::getFieldNames($keyType);
+
+ if (array_key_exists($keys[0], $arr)) $this->setId($arr[$keys[0]]);
+ if (array_key_exists($keys[1], $arr)) $this->setStockId($arr[$keys[1]]);
+ if (array_key_exists($keys[2], $arr)) $this->setCurrencyId($arr[$keys[2]]);
+ if (array_key_exists($keys[3], $arr)) $this->setPrice($arr[$keys[3]]);
+ if (array_key_exists($keys[4], $arr)) $this->setPromoPrice($arr[$keys[4]]);
+ if (array_key_exists($keys[5], $arr)) $this->setCreatedAt($arr[$keys[5]]);
+ if (array_key_exists($keys[6], $arr)) $this->setUpdatedAt($arr[$keys[6]]);
+ }
+
+ /**
+ * Build a Criteria object containing the values of all modified columns in this object.
+ *
+ * @return Criteria The Criteria object containing all modified values.
+ */
+ public function buildCriteria()
+ {
+ $criteria = new Criteria(ProductPriceTableMap::DATABASE_NAME);
+
+ if ($this->isColumnModified(ProductPriceTableMap::ID)) $criteria->add(ProductPriceTableMap::ID, $this->id);
+ if ($this->isColumnModified(ProductPriceTableMap::STOCK_ID)) $criteria->add(ProductPriceTableMap::STOCK_ID, $this->stock_id);
+ if ($this->isColumnModified(ProductPriceTableMap::CURRENCY_ID)) $criteria->add(ProductPriceTableMap::CURRENCY_ID, $this->currency_id);
+ if ($this->isColumnModified(ProductPriceTableMap::PRICE)) $criteria->add(ProductPriceTableMap::PRICE, $this->price);
+ if ($this->isColumnModified(ProductPriceTableMap::PROMO_PRICE)) $criteria->add(ProductPriceTableMap::PROMO_PRICE, $this->promo_price);
+ if ($this->isColumnModified(ProductPriceTableMap::CREATED_AT)) $criteria->add(ProductPriceTableMap::CREATED_AT, $this->created_at);
+ if ($this->isColumnModified(ProductPriceTableMap::UPDATED_AT)) $criteria->add(ProductPriceTableMap::UPDATED_AT, $this->updated_at);
+
+ return $criteria;
+ }
+
+ /**
+ * Builds a Criteria object containing the primary key for this object.
+ *
+ * Unlike buildCriteria() this method includes the primary key values regardless
+ * of whether or not they have been modified.
+ *
+ * @return Criteria The Criteria object containing value(s) for primary key(s).
+ */
+ public function buildPkeyCriteria()
+ {
+ $criteria = new Criteria(ProductPriceTableMap::DATABASE_NAME);
+ $criteria->add(ProductPriceTableMap::ID, $this->id);
+
+ return $criteria;
+ }
+
+ /**
+ * Returns the primary key for this object (row).
+ * @return int
+ */
+ public function getPrimaryKey()
+ {
+ return $this->getId();
+ }
+
+ /**
+ * Generic method to set the primary key (id column).
+ *
+ * @param int $key Primary key.
+ * @return void
+ */
+ public function setPrimaryKey($key)
+ {
+ $this->setId($key);
+ }
+
+ /**
+ * Returns true if the primary key for this object is null.
+ * @return boolean
+ */
+ public function isPrimaryKeyNull()
+ {
+
+ return null === $this->getId();
+ }
+
+ /**
+ * Sets contents of passed object to values from current object.
+ *
+ * If desired, this method can also make copies of all associated (fkey referrers)
+ * objects.
+ *
+ * @param object $copyObj An object of \Thelia\Model\ProductPrice (or compatible) type.
+ * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row.
+ * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new.
+ * @throws PropelException
+ */
+ public function copyInto($copyObj, $deepCopy = false, $makeNew = true)
+ {
+ $copyObj->setStockId($this->getStockId());
+ $copyObj->setCurrencyId($this->getCurrencyId());
+ $copyObj->setPrice($this->getPrice());
+ $copyObj->setPromoPrice($this->getPromoPrice());
+ $copyObj->setCreatedAt($this->getCreatedAt());
+ $copyObj->setUpdatedAt($this->getUpdatedAt());
+ if ($makeNew) {
+ $copyObj->setNew(true);
+ $copyObj->setId(NULL); // this is a auto-increment column, so set to default value
+ }
+ }
+
+ /**
+ * Makes a copy of this object that will be inserted as a new row in table when saved.
+ * It creates a new object filling in the simple attributes, but skipping any primary
+ * keys that are defined for the table.
+ *
+ * If desired, this method can also make copies of all associated (fkey referrers)
+ * objects.
+ *
+ * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row.
+ * @return \Thelia\Model\ProductPrice Clone of current object.
+ * @throws PropelException
+ */
+ public function copy($deepCopy = false)
+ {
+ // we use get_class(), because this might be a subclass
+ $clazz = get_class($this);
+ $copyObj = new $clazz();
+ $this->copyInto($copyObj, $deepCopy);
+
+ return $copyObj;
+ }
+
+ /**
+ * Declares an association between this object and a ChildStock object.
+ *
+ * @param ChildStock $v
+ * @return \Thelia\Model\ProductPrice The current object (for fluent API support)
+ * @throws PropelException
+ */
+ public function setStock(ChildStock $v = null)
+ {
+ if ($v === null) {
+ $this->setStockId(NULL);
+ } else {
+ $this->setStockId($v->getId());
+ }
+
+ $this->aStock = $v;
+
+ // Add binding for other direction of this n:n relationship.
+ // If this object has already been added to the ChildStock object, it will not be re-added.
+ if ($v !== null) {
+ $v->addProductPrice($this);
+ }
+
+
+ return $this;
+ }
+
+
+ /**
+ * Get the associated ChildStock object
+ *
+ * @param ConnectionInterface $con Optional Connection object.
+ * @return ChildStock The associated ChildStock object.
+ * @throws PropelException
+ */
+ public function getStock(ConnectionInterface $con = null)
+ {
+ if ($this->aStock === null && ($this->stock_id !== null)) {
+ $this->aStock = ChildStockQuery::create()->findPk($this->stock_id, $con);
+ /* The following can be used additionally to
+ guarantee the related object contains a reference
+ to this object. This level of coupling may, however, be
+ undesirable since it could result in an only partially populated collection
+ in the referenced object.
+ $this->aStock->addProductPrices($this);
+ */
+ }
+
+ return $this->aStock;
+ }
+
+ /**
+ * Declares an association between this object and a ChildCurrency object.
+ *
+ * @param ChildCurrency $v
+ * @return \Thelia\Model\ProductPrice The current object (for fluent API support)
+ * @throws PropelException
+ */
+ public function setCurrency(ChildCurrency $v = null)
+ {
+ if ($v === null) {
+ $this->setCurrencyId(NULL);
+ } else {
+ $this->setCurrencyId($v->getId());
+ }
+
+ $this->aCurrency = $v;
+
+ // Add binding for other direction of this n:n relationship.
+ // If this object has already been added to the ChildCurrency object, it will not be re-added.
+ if ($v !== null) {
+ $v->addProductPrice($this);
+ }
+
+
+ return $this;
+ }
+
+
+ /**
+ * Get the associated ChildCurrency object
+ *
+ * @param ConnectionInterface $con Optional Connection object.
+ * @return ChildCurrency The associated ChildCurrency object.
+ * @throws PropelException
+ */
+ public function getCurrency(ConnectionInterface $con = null)
+ {
+ if ($this->aCurrency === null && ($this->currency_id !== null)) {
+ $this->aCurrency = ChildCurrencyQuery::create()->findPk($this->currency_id, $con);
+ /* The following can be used additionally to
+ guarantee the related object contains a reference
+ to this object. This level of coupling may, however, be
+ undesirable since it could result in an only partially populated collection
+ in the referenced object.
+ $this->aCurrency->addProductPrices($this);
+ */
+ }
+
+ return $this->aCurrency;
+ }
+
+ /**
+ * Clears the current object and sets all attributes to their default values
+ */
+ public function clear()
+ {
+ $this->id = null;
+ $this->stock_id = null;
+ $this->currency_id = null;
+ $this->price = null;
+ $this->promo_price = null;
+ $this->created_at = null;
+ $this->updated_at = null;
+ $this->alreadyInSave = false;
+ $this->clearAllReferences();
+ $this->resetModified();
+ $this->setNew(true);
+ $this->setDeleted(false);
+ }
+
+ /**
+ * Resets all references to other model objects or collections of model objects.
+ *
+ * This method is a user-space workaround for PHP's inability to garbage collect
+ * objects with circular references (even in PHP 5.3). This is currently necessary
+ * when using Propel in certain daemon or large-volume/high-memory operations.
+ *
+ * @param boolean $deep Whether to also clear the references on all referrer objects.
+ */
+ public function clearAllReferences($deep = false)
+ {
+ if ($deep) {
+ } // if ($deep)
+
+ $this->aStock = null;
+ $this->aCurrency = null;
+ }
+
+ /**
+ * Return the string representation of this object
+ *
+ * @return string
+ */
+ public function __toString()
+ {
+ return (string) $this->exportTo(ProductPriceTableMap::DEFAULT_STRING_FORMAT);
+ }
+
+ // timestampable behavior
+
+ /**
+ * Mark the current object so that the update date doesn't get updated during next save
+ *
+ * @return ChildProductPrice The current object (for fluent API support)
+ */
+ public function keepUpdateDateUnchanged()
+ {
+ $this->modifiedColumns[] = ProductPriceTableMap::UPDATED_AT;
+
+ return $this;
+ }
+
+ /**
+ * Code to be run before persisting the object
+ * @param ConnectionInterface $con
+ * @return boolean
+ */
+ public function preSave(ConnectionInterface $con = null)
+ {
+ return true;
+ }
+
+ /**
+ * Code to be run after persisting the object
+ * @param ConnectionInterface $con
+ */
+ public function postSave(ConnectionInterface $con = null)
+ {
+
+ }
+
+ /**
+ * Code to be run before inserting to database
+ * @param ConnectionInterface $con
+ * @return boolean
+ */
+ public function preInsert(ConnectionInterface $con = null)
+ {
+ return true;
+ }
+
+ /**
+ * Code to be run after inserting to database
+ * @param ConnectionInterface $con
+ */
+ public function postInsert(ConnectionInterface $con = null)
+ {
+
+ }
+
+ /**
+ * Code to be run before updating the object in database
+ * @param ConnectionInterface $con
+ * @return boolean
+ */
+ public function preUpdate(ConnectionInterface $con = null)
+ {
+ return true;
+ }
+
+ /**
+ * Code to be run after updating the object in database
+ * @param ConnectionInterface $con
+ */
+ public function postUpdate(ConnectionInterface $con = null)
+ {
+
+ }
+
+ /**
+ * Code to be run before deleting the object in database
+ * @param ConnectionInterface $con
+ * @return boolean
+ */
+ public function preDelete(ConnectionInterface $con = null)
+ {
+ return true;
+ }
+
+ /**
+ * Code to be run after deleting the object in database
+ * @param ConnectionInterface $con
+ */
+ public function postDelete(ConnectionInterface $con = null)
+ {
+
+ }
+
+
+ /**
+ * Derived method to catches calls to undefined methods.
+ *
+ * Provides magic import/export method support (fromXML()/toXML(), fromYAML()/toYAML(), etc.).
+ * Allows to define default __call() behavior if you overwrite __call()
+ *
+ * @param string $name
+ * @param mixed $params
+ *
+ * @return array|string
+ */
+ public function __call($name, $params)
+ {
+ if (0 === strpos($name, 'get')) {
+ $virtualColumn = substr($name, 3);
+ if ($this->hasVirtualColumn($virtualColumn)) {
+ return $this->getVirtualColumn($virtualColumn);
+ }
+
+ $virtualColumn = lcfirst($virtualColumn);
+ if ($this->hasVirtualColumn($virtualColumn)) {
+ return $this->getVirtualColumn($virtualColumn);
+ }
+ }
+
+ if (0 === strpos($name, 'from')) {
+ $format = substr($name, 4);
+
+ return $this->importFrom($format, reset($params));
+ }
+
+ if (0 === strpos($name, 'to')) {
+ $format = substr($name, 2);
+ $includeLazyLoadColumns = isset($params[0]) ? $params[0] : true;
+
+ return $this->exportTo($format, $includeLazyLoadColumns);
+ }
+
+ throw new BadMethodCallException(sprintf('Call to undefined method: %s.', $name));
+ }
+
+}
diff --git a/core/lib/Thelia/Model/Base/ProductPriceQuery.php b/core/lib/Thelia/Model/Base/ProductPriceQuery.php
new file mode 100644
index 000000000..950c39125
--- /dev/null
+++ b/core/lib/Thelia/Model/Base/ProductPriceQuery.php
@@ -0,0 +1,849 @@
+setModelAlias($modelAlias);
+ }
+ if ($criteria instanceof Criteria) {
+ $query->mergeWith($criteria);
+ }
+
+ return $query;
+ }
+
+ /**
+ * Find object by primary key.
+ * Propel uses the instance pool to skip the database if the object exists.
+ * Go fast if the query is untouched.
+ *
+ *
+ * $obj = $c->findPk(12, $con);
+ *
+ *
+ * @param mixed $key Primary key to use for the query
+ * @param ConnectionInterface $con an optional connection object
+ *
+ * @return ChildProductPrice|array|mixed the result, formatted by the current formatter
+ */
+ public function findPk($key, $con = null)
+ {
+ if ($key === null) {
+ return null;
+ }
+ if ((null !== ($obj = ProductPriceTableMap::getInstanceFromPool((string) $key))) && !$this->formatter) {
+ // the object is already in the instance pool
+ return $obj;
+ }
+ if ($con === null) {
+ $con = Propel::getServiceContainer()->getReadConnection(ProductPriceTableMap::DATABASE_NAME);
+ }
+ $this->basePreSelect($con);
+ if ($this->formatter || $this->modelAlias || $this->with || $this->select
+ || $this->selectColumns || $this->asColumns || $this->selectModifiers
+ || $this->map || $this->having || $this->joins) {
+ return $this->findPkComplex($key, $con);
+ } else {
+ return $this->findPkSimple($key, $con);
+ }
+ }
+
+ /**
+ * Find object by primary key using raw SQL to go fast.
+ * Bypass doSelect() and the object formatter by using generated code.
+ *
+ * @param mixed $key Primary key to use for the query
+ * @param ConnectionInterface $con A connection object
+ *
+ * @return ChildProductPrice A model object, or null if the key is not found
+ */
+ protected function findPkSimple($key, $con)
+ {
+ $sql = 'SELECT ID, STOCK_ID, CURRENCY_ID, PRICE, PROMO_PRICE, CREATED_AT, UPDATED_AT FROM product_price WHERE ID = :p0';
+ try {
+ $stmt = $con->prepare($sql);
+ $stmt->bindValue(':p0', $key, PDO::PARAM_INT);
+ $stmt->execute();
+ } catch (Exception $e) {
+ Propel::log($e->getMessage(), Propel::LOG_ERR);
+ throw new PropelException(sprintf('Unable to execute SELECT statement [%s]', $sql), 0, $e);
+ }
+ $obj = null;
+ if ($row = $stmt->fetch(\PDO::FETCH_NUM)) {
+ $obj = new ChildProductPrice();
+ $obj->hydrate($row);
+ ProductPriceTableMap::addInstanceToPool($obj, (string) $key);
+ }
+ $stmt->closeCursor();
+
+ return $obj;
+ }
+
+ /**
+ * Find object by primary key.
+ *
+ * @param mixed $key Primary key to use for the query
+ * @param ConnectionInterface $con A connection object
+ *
+ * @return ChildProductPrice|array|mixed the result, formatted by the current formatter
+ */
+ protected function findPkComplex($key, $con)
+ {
+ // As the query uses a PK condition, no limit(1) is necessary.
+ $criteria = $this->isKeepQuery() ? clone $this : $this;
+ $dataFetcher = $criteria
+ ->filterByPrimaryKey($key)
+ ->doSelect($con);
+
+ return $criteria->getFormatter()->init($criteria)->formatOne($dataFetcher);
+ }
+
+ /**
+ * Find objects by primary key
+ *
+ * $objs = $c->findPks(array(12, 56, 832), $con);
+ *
+ * @param array $keys Primary keys to use for the query
+ * @param ConnectionInterface $con an optional connection object
+ *
+ * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter
+ */
+ public function findPks($keys, $con = null)
+ {
+ if (null === $con) {
+ $con = Propel::getServiceContainer()->getReadConnection($this->getDbName());
+ }
+ $this->basePreSelect($con);
+ $criteria = $this->isKeepQuery() ? clone $this : $this;
+ $dataFetcher = $criteria
+ ->filterByPrimaryKeys($keys)
+ ->doSelect($con);
+
+ return $criteria->getFormatter()->init($criteria)->format($dataFetcher);
+ }
+
+ /**
+ * Filter the query by primary key
+ *
+ * @param mixed $key Primary key to use for the query
+ *
+ * @return ChildProductPriceQuery The current query, for fluid interface
+ */
+ public function filterByPrimaryKey($key)
+ {
+
+ return $this->addUsingAlias(ProductPriceTableMap::ID, $key, Criteria::EQUAL);
+ }
+
+ /**
+ * Filter the query by a list of primary keys
+ *
+ * @param array $keys The list of primary key to use for the query
+ *
+ * @return ChildProductPriceQuery The current query, for fluid interface
+ */
+ public function filterByPrimaryKeys($keys)
+ {
+
+ return $this->addUsingAlias(ProductPriceTableMap::ID, $keys, Criteria::IN);
+ }
+
+ /**
+ * Filter the query on the id column
+ *
+ * Example usage:
+ *
+ * $query->filterById(1234); // WHERE id = 1234
+ * $query->filterById(array(12, 34)); // WHERE id IN (12, 34)
+ * $query->filterById(array('min' => 12)); // WHERE id > 12
+ *
+ *
+ * @param mixed $id The value to use as filter.
+ * Use scalar values for equality.
+ * Use array values for in_array() equivalent.
+ * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+ * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+ *
+ * @return ChildProductPriceQuery The current query, for fluid interface
+ */
+ public function filterById($id = null, $comparison = null)
+ {
+ if (is_array($id)) {
+ $useMinMax = false;
+ if (isset($id['min'])) {
+ $this->addUsingAlias(ProductPriceTableMap::ID, $id['min'], Criteria::GREATER_EQUAL);
+ $useMinMax = true;
+ }
+ if (isset($id['max'])) {
+ $this->addUsingAlias(ProductPriceTableMap::ID, $id['max'], Criteria::LESS_EQUAL);
+ $useMinMax = true;
+ }
+ if ($useMinMax) {
+ return $this;
+ }
+ if (null === $comparison) {
+ $comparison = Criteria::IN;
+ }
+ }
+
+ return $this->addUsingAlias(ProductPriceTableMap::ID, $id, $comparison);
+ }
+
+ /**
+ * Filter the query on the stock_id column
+ *
+ * Example usage:
+ *
+ * $query->filterByStockId(1234); // WHERE stock_id = 1234
+ * $query->filterByStockId(array(12, 34)); // WHERE stock_id IN (12, 34)
+ * $query->filterByStockId(array('min' => 12)); // WHERE stock_id > 12
+ *
+ *
+ * @see filterByStock()
+ *
+ * @param mixed $stockId The value to use as filter.
+ * Use scalar values for equality.
+ * Use array values for in_array() equivalent.
+ * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+ * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+ *
+ * @return ChildProductPriceQuery The current query, for fluid interface
+ */
+ public function filterByStockId($stockId = null, $comparison = null)
+ {
+ if (is_array($stockId)) {
+ $useMinMax = false;
+ if (isset($stockId['min'])) {
+ $this->addUsingAlias(ProductPriceTableMap::STOCK_ID, $stockId['min'], Criteria::GREATER_EQUAL);
+ $useMinMax = true;
+ }
+ if (isset($stockId['max'])) {
+ $this->addUsingAlias(ProductPriceTableMap::STOCK_ID, $stockId['max'], Criteria::LESS_EQUAL);
+ $useMinMax = true;
+ }
+ if ($useMinMax) {
+ return $this;
+ }
+ if (null === $comparison) {
+ $comparison = Criteria::IN;
+ }
+ }
+
+ return $this->addUsingAlias(ProductPriceTableMap::STOCK_ID, $stockId, $comparison);
+ }
+
+ /**
+ * Filter the query on the currency_id column
+ *
+ * Example usage:
+ *
+ * $query->filterByCurrencyId(1234); // WHERE currency_id = 1234
+ * $query->filterByCurrencyId(array(12, 34)); // WHERE currency_id IN (12, 34)
+ * $query->filterByCurrencyId(array('min' => 12)); // WHERE currency_id > 12
+ *
+ *
+ * @see filterByCurrency()
+ *
+ * @param mixed $currencyId The value to use as filter.
+ * Use scalar values for equality.
+ * Use array values for in_array() equivalent.
+ * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+ * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+ *
+ * @return ChildProductPriceQuery The current query, for fluid interface
+ */
+ public function filterByCurrencyId($currencyId = null, $comparison = null)
+ {
+ if (is_array($currencyId)) {
+ $useMinMax = false;
+ if (isset($currencyId['min'])) {
+ $this->addUsingAlias(ProductPriceTableMap::CURRENCY_ID, $currencyId['min'], Criteria::GREATER_EQUAL);
+ $useMinMax = true;
+ }
+ if (isset($currencyId['max'])) {
+ $this->addUsingAlias(ProductPriceTableMap::CURRENCY_ID, $currencyId['max'], Criteria::LESS_EQUAL);
+ $useMinMax = true;
+ }
+ if ($useMinMax) {
+ return $this;
+ }
+ if (null === $comparison) {
+ $comparison = Criteria::IN;
+ }
+ }
+
+ return $this->addUsingAlias(ProductPriceTableMap::CURRENCY_ID, $currencyId, $comparison);
+ }
+
+ /**
+ * Filter the query on the price column
+ *
+ * Example usage:
+ *
+ * $query->filterByPrice(1234); // WHERE price = 1234
+ * $query->filterByPrice(array(12, 34)); // WHERE price IN (12, 34)
+ * $query->filterByPrice(array('min' => 12)); // WHERE price > 12
+ *
+ *
+ * @param mixed $price The value to use as filter.
+ * Use scalar values for equality.
+ * Use array values for in_array() equivalent.
+ * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+ * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+ *
+ * @return ChildProductPriceQuery The current query, for fluid interface
+ */
+ public function filterByPrice($price = null, $comparison = null)
+ {
+ if (is_array($price)) {
+ $useMinMax = false;
+ if (isset($price['min'])) {
+ $this->addUsingAlias(ProductPriceTableMap::PRICE, $price['min'], Criteria::GREATER_EQUAL);
+ $useMinMax = true;
+ }
+ if (isset($price['max'])) {
+ $this->addUsingAlias(ProductPriceTableMap::PRICE, $price['max'], Criteria::LESS_EQUAL);
+ $useMinMax = true;
+ }
+ if ($useMinMax) {
+ return $this;
+ }
+ if (null === $comparison) {
+ $comparison = Criteria::IN;
+ }
+ }
+
+ return $this->addUsingAlias(ProductPriceTableMap::PRICE, $price, $comparison);
+ }
+
+ /**
+ * Filter the query on the promo_price column
+ *
+ * Example usage:
+ *
+ * $query->filterByPromoPrice(1234); // WHERE promo_price = 1234
+ * $query->filterByPromoPrice(array(12, 34)); // WHERE promo_price IN (12, 34)
+ * $query->filterByPromoPrice(array('min' => 12)); // WHERE promo_price > 12
+ *
+ *
+ * @param mixed $promoPrice The value to use as filter.
+ * Use scalar values for equality.
+ * Use array values for in_array() equivalent.
+ * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+ * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+ *
+ * @return ChildProductPriceQuery The current query, for fluid interface
+ */
+ public function filterByPromoPrice($promoPrice = null, $comparison = null)
+ {
+ if (is_array($promoPrice)) {
+ $useMinMax = false;
+ if (isset($promoPrice['min'])) {
+ $this->addUsingAlias(ProductPriceTableMap::PROMO_PRICE, $promoPrice['min'], Criteria::GREATER_EQUAL);
+ $useMinMax = true;
+ }
+ if (isset($promoPrice['max'])) {
+ $this->addUsingAlias(ProductPriceTableMap::PROMO_PRICE, $promoPrice['max'], Criteria::LESS_EQUAL);
+ $useMinMax = true;
+ }
+ if ($useMinMax) {
+ return $this;
+ }
+ if (null === $comparison) {
+ $comparison = Criteria::IN;
+ }
+ }
+
+ return $this->addUsingAlias(ProductPriceTableMap::PROMO_PRICE, $promoPrice, $comparison);
+ }
+
+ /**
+ * Filter the query on the created_at column
+ *
+ * Example usage:
+ *
+ * $query->filterByCreatedAt('2011-03-14'); // WHERE created_at = '2011-03-14'
+ * $query->filterByCreatedAt('now'); // WHERE created_at = '2011-03-14'
+ * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13'
+ *
+ *
+ * @param mixed $createdAt The value to use as filter.
+ * Values can be integers (unix timestamps), DateTime objects, or strings.
+ * Empty strings are treated as NULL.
+ * Use scalar values for equality.
+ * Use array values for in_array() equivalent.
+ * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+ * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+ *
+ * @return ChildProductPriceQuery The current query, for fluid interface
+ */
+ public function filterByCreatedAt($createdAt = null, $comparison = null)
+ {
+ if (is_array($createdAt)) {
+ $useMinMax = false;
+ if (isset($createdAt['min'])) {
+ $this->addUsingAlias(ProductPriceTableMap::CREATED_AT, $createdAt['min'], Criteria::GREATER_EQUAL);
+ $useMinMax = true;
+ }
+ if (isset($createdAt['max'])) {
+ $this->addUsingAlias(ProductPriceTableMap::CREATED_AT, $createdAt['max'], Criteria::LESS_EQUAL);
+ $useMinMax = true;
+ }
+ if ($useMinMax) {
+ return $this;
+ }
+ if (null === $comparison) {
+ $comparison = Criteria::IN;
+ }
+ }
+
+ return $this->addUsingAlias(ProductPriceTableMap::CREATED_AT, $createdAt, $comparison);
+ }
+
+ /**
+ * Filter the query on the updated_at column
+ *
+ * Example usage:
+ *
+ * $query->filterByUpdatedAt('2011-03-14'); // WHERE updated_at = '2011-03-14'
+ * $query->filterByUpdatedAt('now'); // WHERE updated_at = '2011-03-14'
+ * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13'
+ *
+ *
+ * @param mixed $updatedAt The value to use as filter.
+ * Values can be integers (unix timestamps), DateTime objects, or strings.
+ * Empty strings are treated as NULL.
+ * Use scalar values for equality.
+ * Use array values for in_array() equivalent.
+ * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+ * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+ *
+ * @return ChildProductPriceQuery The current query, for fluid interface
+ */
+ public function filterByUpdatedAt($updatedAt = null, $comparison = null)
+ {
+ if (is_array($updatedAt)) {
+ $useMinMax = false;
+ if (isset($updatedAt['min'])) {
+ $this->addUsingAlias(ProductPriceTableMap::UPDATED_AT, $updatedAt['min'], Criteria::GREATER_EQUAL);
+ $useMinMax = true;
+ }
+ if (isset($updatedAt['max'])) {
+ $this->addUsingAlias(ProductPriceTableMap::UPDATED_AT, $updatedAt['max'], Criteria::LESS_EQUAL);
+ $useMinMax = true;
+ }
+ if ($useMinMax) {
+ return $this;
+ }
+ if (null === $comparison) {
+ $comparison = Criteria::IN;
+ }
+ }
+
+ return $this->addUsingAlias(ProductPriceTableMap::UPDATED_AT, $updatedAt, $comparison);
+ }
+
+ /**
+ * Filter the query by a related \Thelia\Model\Stock object
+ *
+ * @param \Thelia\Model\Stock|ObjectCollection $stock The related object(s) to use as filter
+ * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+ *
+ * @return ChildProductPriceQuery The current query, for fluid interface
+ */
+ public function filterByStock($stock, $comparison = null)
+ {
+ if ($stock instanceof \Thelia\Model\Stock) {
+ return $this
+ ->addUsingAlias(ProductPriceTableMap::STOCK_ID, $stock->getId(), $comparison);
+ } elseif ($stock instanceof ObjectCollection) {
+ if (null === $comparison) {
+ $comparison = Criteria::IN;
+ }
+
+ return $this
+ ->addUsingAlias(ProductPriceTableMap::STOCK_ID, $stock->toKeyValue('PrimaryKey', 'Id'), $comparison);
+ } else {
+ throw new PropelException('filterByStock() only accepts arguments of type \Thelia\Model\Stock or Collection');
+ }
+ }
+
+ /**
+ * Adds a JOIN clause to the query using the Stock relation
+ *
+ * @param string $relationAlias optional alias for the relation
+ * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
+ *
+ * @return ChildProductPriceQuery The current query, for fluid interface
+ */
+ public function joinStock($relationAlias = null, $joinType = Criteria::INNER_JOIN)
+ {
+ $tableMap = $this->getTableMap();
+ $relationMap = $tableMap->getRelation('Stock');
+
+ // create a ModelJoin object for this join
+ $join = new ModelJoin();
+ $join->setJoinType($joinType);
+ $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias);
+ if ($previousJoin = $this->getPreviousJoin()) {
+ $join->setPreviousJoin($previousJoin);
+ }
+
+ // add the ModelJoin to the current object
+ if ($relationAlias) {
+ $this->addAlias($relationAlias, $relationMap->getRightTable()->getName());
+ $this->addJoinObject($join, $relationAlias);
+ } else {
+ $this->addJoinObject($join, 'Stock');
+ }
+
+ return $this;
+ }
+
+ /**
+ * Use the Stock relation Stock object
+ *
+ * @see useQuery()
+ *
+ * @param string $relationAlias optional alias for the relation,
+ * to be used as main alias in the secondary query
+ * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
+ *
+ * @return \Thelia\Model\StockQuery A secondary query class using the current class as primary query
+ */
+ public function useStockQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN)
+ {
+ return $this
+ ->joinStock($relationAlias, $joinType)
+ ->useQuery($relationAlias ? $relationAlias : 'Stock', '\Thelia\Model\StockQuery');
+ }
+
+ /**
+ * Filter the query by a related \Thelia\Model\Currency object
+ *
+ * @param \Thelia\Model\Currency|ObjectCollection $currency The related object(s) to use as filter
+ * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+ *
+ * @return ChildProductPriceQuery The current query, for fluid interface
+ */
+ public function filterByCurrency($currency, $comparison = null)
+ {
+ if ($currency instanceof \Thelia\Model\Currency) {
+ return $this
+ ->addUsingAlias(ProductPriceTableMap::CURRENCY_ID, $currency->getId(), $comparison);
+ } elseif ($currency instanceof ObjectCollection) {
+ if (null === $comparison) {
+ $comparison = Criteria::IN;
+ }
+
+ return $this
+ ->addUsingAlias(ProductPriceTableMap::CURRENCY_ID, $currency->toKeyValue('PrimaryKey', 'Id'), $comparison);
+ } else {
+ throw new PropelException('filterByCurrency() only accepts arguments of type \Thelia\Model\Currency or Collection');
+ }
+ }
+
+ /**
+ * Adds a JOIN clause to the query using the Currency relation
+ *
+ * @param string $relationAlias optional alias for the relation
+ * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
+ *
+ * @return ChildProductPriceQuery The current query, for fluid interface
+ */
+ public function joinCurrency($relationAlias = null, $joinType = Criteria::INNER_JOIN)
+ {
+ $tableMap = $this->getTableMap();
+ $relationMap = $tableMap->getRelation('Currency');
+
+ // create a ModelJoin object for this join
+ $join = new ModelJoin();
+ $join->setJoinType($joinType);
+ $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias);
+ if ($previousJoin = $this->getPreviousJoin()) {
+ $join->setPreviousJoin($previousJoin);
+ }
+
+ // add the ModelJoin to the current object
+ if ($relationAlias) {
+ $this->addAlias($relationAlias, $relationMap->getRightTable()->getName());
+ $this->addJoinObject($join, $relationAlias);
+ } else {
+ $this->addJoinObject($join, 'Currency');
+ }
+
+ return $this;
+ }
+
+ /**
+ * Use the Currency relation Currency object
+ *
+ * @see useQuery()
+ *
+ * @param string $relationAlias optional alias for the relation,
+ * to be used as main alias in the secondary query
+ * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
+ *
+ * @return \Thelia\Model\CurrencyQuery A secondary query class using the current class as primary query
+ */
+ public function useCurrencyQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN)
+ {
+ return $this
+ ->joinCurrency($relationAlias, $joinType)
+ ->useQuery($relationAlias ? $relationAlias : 'Currency', '\Thelia\Model\CurrencyQuery');
+ }
+
+ /**
+ * Exclude object from result
+ *
+ * @param ChildProductPrice $productPrice Object to remove from the list of results
+ *
+ * @return ChildProductPriceQuery The current query, for fluid interface
+ */
+ public function prune($productPrice = null)
+ {
+ if ($productPrice) {
+ $this->addUsingAlias(ProductPriceTableMap::ID, $productPrice->getId(), Criteria::NOT_EQUAL);
+ }
+
+ return $this;
+ }
+
+ /**
+ * Deletes all rows from the product_price table.
+ *
+ * @param ConnectionInterface $con the connection to use
+ * @return int The number of affected rows (if supported by underlying database driver).
+ */
+ public function doDeleteAll(ConnectionInterface $con = null)
+ {
+ if (null === $con) {
+ $con = Propel::getServiceContainer()->getWriteConnection(ProductPriceTableMap::DATABASE_NAME);
+ }
+ $affectedRows = 0; // initialize var to track total num of affected rows
+ try {
+ // use transaction because $criteria could contain info
+ // for more than one table or we could emulating ON DELETE CASCADE, etc.
+ $con->beginTransaction();
+ $affectedRows += parent::doDeleteAll($con);
+ // Because this db requires some delete cascade/set null emulation, we have to
+ // clear the cached instance *after* the emulation has happened (since
+ // instances get re-added by the select statement contained therein).
+ ProductPriceTableMap::clearInstancePool();
+ ProductPriceTableMap::clearRelatedInstancePool();
+
+ $con->commit();
+ } catch (PropelException $e) {
+ $con->rollBack();
+ throw $e;
+ }
+
+ return $affectedRows;
+ }
+
+ /**
+ * Performs a DELETE on the database, given a ChildProductPrice or Criteria object OR a primary key value.
+ *
+ * @param mixed $values Criteria or ChildProductPrice object or primary key or array of primary keys
+ * which is used to create the DELETE statement
+ * @param ConnectionInterface $con the connection to use
+ * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows
+ * if supported by native driver or if emulated using Propel.
+ * @throws PropelException Any exceptions caught during processing will be
+ * rethrown wrapped into a PropelException.
+ */
+ public function delete(ConnectionInterface $con = null)
+ {
+ if (null === $con) {
+ $con = Propel::getServiceContainer()->getWriteConnection(ProductPriceTableMap::DATABASE_NAME);
+ }
+
+ $criteria = $this;
+
+ // Set the correct dbName
+ $criteria->setDbName(ProductPriceTableMap::DATABASE_NAME);
+
+ $affectedRows = 0; // initialize var to track total num of affected rows
+
+ try {
+ // use transaction because $criteria could contain info
+ // for more than one table or we could emulating ON DELETE CASCADE, etc.
+ $con->beginTransaction();
+
+
+ ProductPriceTableMap::removeInstanceFromPool($criteria);
+
+ $affectedRows += ModelCriteria::delete($con);
+ ProductPriceTableMap::clearRelatedInstancePool();
+ $con->commit();
+
+ return $affectedRows;
+ } catch (PropelException $e) {
+ $con->rollBack();
+ throw $e;
+ }
+ }
+
+ // timestampable behavior
+
+ /**
+ * Filter by the latest updated
+ *
+ * @param int $nbDays Maximum age of the latest update in days
+ *
+ * @return ChildProductPriceQuery The current query, for fluid interface
+ */
+ public function recentlyUpdated($nbDays = 7)
+ {
+ return $this->addUsingAlias(ProductPriceTableMap::UPDATED_AT, time() - $nbDays * 24 * 60 * 60, Criteria::GREATER_EQUAL);
+ }
+
+ /**
+ * Filter by the latest created
+ *
+ * @param int $nbDays Maximum age of in days
+ *
+ * @return ChildProductPriceQuery The current query, for fluid interface
+ */
+ public function recentlyCreated($nbDays = 7)
+ {
+ return $this->addUsingAlias(ProductPriceTableMap::CREATED_AT, time() - $nbDays * 24 * 60 * 60, Criteria::GREATER_EQUAL);
+ }
+
+ /**
+ * Order by update date desc
+ *
+ * @return ChildProductPriceQuery The current query, for fluid interface
+ */
+ public function lastUpdatedFirst()
+ {
+ return $this->addDescendingOrderByColumn(ProductPriceTableMap::UPDATED_AT);
+ }
+
+ /**
+ * Order by update date asc
+ *
+ * @return ChildProductPriceQuery The current query, for fluid interface
+ */
+ public function firstUpdatedFirst()
+ {
+ return $this->addAscendingOrderByColumn(ProductPriceTableMap::UPDATED_AT);
+ }
+
+ /**
+ * Order by create date desc
+ *
+ * @return ChildProductPriceQuery The current query, for fluid interface
+ */
+ public function lastCreatedFirst()
+ {
+ return $this->addDescendingOrderByColumn(ProductPriceTableMap::CREATED_AT);
+ }
+
+ /**
+ * Order by create date asc
+ *
+ * @return ChildProductPriceQuery The current query, for fluid interface
+ */
+ public function firstCreatedFirst()
+ {
+ return $this->addAscendingOrderByColumn(ProductPriceTableMap::CREATED_AT);
+ }
+
+} // ProductPriceQuery
diff --git a/core/lib/Thelia/Model/Base/ProductQuery.php b/core/lib/Thelia/Model/Base/ProductQuery.php
index 8ded7703f..38ab71e33 100755
--- a/core/lib/Thelia/Model/Base/ProductQuery.php
+++ b/core/lib/Thelia/Model/Base/ProductQuery.php
@@ -25,14 +25,7 @@ use Thelia\Model\Map\ProductTableMap;
* @method ChildProductQuery orderById($order = Criteria::ASC) Order by the id column
* @method ChildProductQuery orderByTaxRuleId($order = Criteria::ASC) Order by the tax_rule_id column
* @method ChildProductQuery orderByRef($order = Criteria::ASC) Order by the ref column
- * @method ChildProductQuery orderByPrice($order = Criteria::ASC) Order by the price column
- * @method ChildProductQuery orderByPrice2($order = Criteria::ASC) Order by the price2 column
- * @method ChildProductQuery orderByEcotax($order = Criteria::ASC) Order by the ecotax column
- * @method ChildProductQuery orderByNewness($order = Criteria::ASC) Order by the newness column
- * @method ChildProductQuery orderByPromo($order = Criteria::ASC) Order by the promo column
- * @method ChildProductQuery orderByQuantity($order = Criteria::ASC) Order by the quantity column
* @method ChildProductQuery orderByVisible($order = Criteria::ASC) Order by the visible column
- * @method ChildProductQuery orderByWeight($order = Criteria::ASC) Order by the weight column
* @method ChildProductQuery orderByPosition($order = Criteria::ASC) Order by the position column
* @method ChildProductQuery orderByCreatedAt($order = Criteria::ASC) Order by the created_at column
* @method ChildProductQuery orderByUpdatedAt($order = Criteria::ASC) Order by the updated_at column
@@ -43,14 +36,7 @@ use Thelia\Model\Map\ProductTableMap;
* @method ChildProductQuery groupById() Group by the id column
* @method ChildProductQuery groupByTaxRuleId() Group by the tax_rule_id column
* @method ChildProductQuery groupByRef() Group by the ref column
- * @method ChildProductQuery groupByPrice() Group by the price column
- * @method ChildProductQuery groupByPrice2() Group by the price2 column
- * @method ChildProductQuery groupByEcotax() Group by the ecotax column
- * @method ChildProductQuery groupByNewness() Group by the newness column
- * @method ChildProductQuery groupByPromo() Group by the promo column
- * @method ChildProductQuery groupByQuantity() Group by the quantity column
* @method ChildProductQuery groupByVisible() Group by the visible column
- * @method ChildProductQuery groupByWeight() Group by the weight column
* @method ChildProductQuery groupByPosition() Group by the position column
* @method ChildProductQuery groupByCreatedAt() Group by the created_at column
* @method ChildProductQuery groupByUpdatedAt() Group by the updated_at column
@@ -120,14 +106,7 @@ use Thelia\Model\Map\ProductTableMap;
* @method ChildProduct findOneById(int $id) Return the first ChildProduct filtered by the id column
* @method ChildProduct findOneByTaxRuleId(int $tax_rule_id) Return the first ChildProduct filtered by the tax_rule_id column
* @method ChildProduct findOneByRef(string $ref) Return the first ChildProduct filtered by the ref column
- * @method ChildProduct findOneByPrice(double $price) Return the first ChildProduct filtered by the price column
- * @method ChildProduct findOneByPrice2(double $price2) Return the first ChildProduct filtered by the price2 column
- * @method ChildProduct findOneByEcotax(double $ecotax) Return the first ChildProduct filtered by the ecotax column
- * @method ChildProduct findOneByNewness(int $newness) Return the first ChildProduct filtered by the newness column
- * @method ChildProduct findOneByPromo(int $promo) Return the first ChildProduct filtered by the promo column
- * @method ChildProduct findOneByQuantity(int $quantity) Return the first ChildProduct filtered by the quantity column
* @method ChildProduct findOneByVisible(int $visible) Return the first ChildProduct filtered by the visible column
- * @method ChildProduct findOneByWeight(double $weight) Return the first ChildProduct filtered by the weight column
* @method ChildProduct findOneByPosition(int $position) Return the first ChildProduct filtered by the position column
* @method ChildProduct findOneByCreatedAt(string $created_at) Return the first ChildProduct filtered by the created_at column
* @method ChildProduct findOneByUpdatedAt(string $updated_at) Return the first ChildProduct filtered by the updated_at column
@@ -138,14 +117,7 @@ use Thelia\Model\Map\ProductTableMap;
* @method array findById(int $id) Return ChildProduct objects filtered by the id column
* @method array findByTaxRuleId(int $tax_rule_id) Return ChildProduct objects filtered by the tax_rule_id column
* @method array findByRef(string $ref) Return ChildProduct objects filtered by the ref column
- * @method array findByPrice(double $price) Return ChildProduct objects filtered by the price column
- * @method array findByPrice2(double $price2) Return ChildProduct objects filtered by the price2 column
- * @method array findByEcotax(double $ecotax) Return ChildProduct objects filtered by the ecotax column
- * @method array findByNewness(int $newness) Return ChildProduct objects filtered by the newness column
- * @method array findByPromo(int $promo) Return ChildProduct objects filtered by the promo column
- * @method array findByQuantity(int $quantity) Return ChildProduct objects filtered by the quantity column
* @method array findByVisible(int $visible) Return ChildProduct objects filtered by the visible column
- * @method array findByWeight(double $weight) Return ChildProduct objects filtered by the weight column
* @method array findByPosition(int $position) Return ChildProduct objects filtered by the position column
* @method array findByCreatedAt(string $created_at) Return ChildProduct objects filtered by the created_at column
* @method array findByUpdatedAt(string $updated_at) Return ChildProduct objects filtered by the updated_at column
@@ -247,7 +219,7 @@ abstract class ProductQuery extends ModelCriteria
*/
protected function findPkSimple($key, $con)
{
- $sql = 'SELECT ID, TAX_RULE_ID, REF, PRICE, PRICE2, ECOTAX, NEWNESS, PROMO, QUANTITY, VISIBLE, WEIGHT, POSITION, CREATED_AT, UPDATED_AT, VERSION, VERSION_CREATED_AT, VERSION_CREATED_BY FROM product WHERE ID = :p0';
+ $sql = 'SELECT ID, TAX_RULE_ID, REF, VISIBLE, POSITION, CREATED_AT, UPDATED_AT, VERSION, VERSION_CREATED_AT, VERSION_CREATED_BY FROM product WHERE ID = :p0';
try {
$stmt = $con->prepare($sql);
$stmt->bindValue(':p0', $key, PDO::PARAM_INT);
@@ -449,252 +421,6 @@ abstract class ProductQuery extends ModelCriteria
return $this->addUsingAlias(ProductTableMap::REF, $ref, $comparison);
}
- /**
- * Filter the query on the price column
- *
- * Example usage:
- *
- * $query->filterByPrice(1234); // WHERE price = 1234
- * $query->filterByPrice(array(12, 34)); // WHERE price IN (12, 34)
- * $query->filterByPrice(array('min' => 12)); // WHERE price > 12
- *
- *
- * @param mixed $price The value to use as filter.
- * Use scalar values for equality.
- * Use array values for in_array() equivalent.
- * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
- * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
- *
- * @return ChildProductQuery The current query, for fluid interface
- */
- public function filterByPrice($price = null, $comparison = null)
- {
- if (is_array($price)) {
- $useMinMax = false;
- if (isset($price['min'])) {
- $this->addUsingAlias(ProductTableMap::PRICE, $price['min'], Criteria::GREATER_EQUAL);
- $useMinMax = true;
- }
- if (isset($price['max'])) {
- $this->addUsingAlias(ProductTableMap::PRICE, $price['max'], Criteria::LESS_EQUAL);
- $useMinMax = true;
- }
- if ($useMinMax) {
- return $this;
- }
- if (null === $comparison) {
- $comparison = Criteria::IN;
- }
- }
-
- return $this->addUsingAlias(ProductTableMap::PRICE, $price, $comparison);
- }
-
- /**
- * Filter the query on the price2 column
- *
- * Example usage:
- *
- * $query->filterByPrice2(1234); // WHERE price2 = 1234
- * $query->filterByPrice2(array(12, 34)); // WHERE price2 IN (12, 34)
- * $query->filterByPrice2(array('min' => 12)); // WHERE price2 > 12
- *
- *
- * @param mixed $price2 The value to use as filter.
- * Use scalar values for equality.
- * Use array values for in_array() equivalent.
- * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
- * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
- *
- * @return ChildProductQuery The current query, for fluid interface
- */
- public function filterByPrice2($price2 = null, $comparison = null)
- {
- if (is_array($price2)) {
- $useMinMax = false;
- if (isset($price2['min'])) {
- $this->addUsingAlias(ProductTableMap::PRICE2, $price2['min'], Criteria::GREATER_EQUAL);
- $useMinMax = true;
- }
- if (isset($price2['max'])) {
- $this->addUsingAlias(ProductTableMap::PRICE2, $price2['max'], Criteria::LESS_EQUAL);
- $useMinMax = true;
- }
- if ($useMinMax) {
- return $this;
- }
- if (null === $comparison) {
- $comparison = Criteria::IN;
- }
- }
-
- return $this->addUsingAlias(ProductTableMap::PRICE2, $price2, $comparison);
- }
-
- /**
- * Filter the query on the ecotax column
- *
- * Example usage:
- *
- * $query->filterByEcotax(1234); // WHERE ecotax = 1234
- * $query->filterByEcotax(array(12, 34)); // WHERE ecotax IN (12, 34)
- * $query->filterByEcotax(array('min' => 12)); // WHERE ecotax > 12
- *
- *
- * @param mixed $ecotax The value to use as filter.
- * Use scalar values for equality.
- * Use array values for in_array() equivalent.
- * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
- * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
- *
- * @return ChildProductQuery The current query, for fluid interface
- */
- public function filterByEcotax($ecotax = null, $comparison = null)
- {
- if (is_array($ecotax)) {
- $useMinMax = false;
- if (isset($ecotax['min'])) {
- $this->addUsingAlias(ProductTableMap::ECOTAX, $ecotax['min'], Criteria::GREATER_EQUAL);
- $useMinMax = true;
- }
- if (isset($ecotax['max'])) {
- $this->addUsingAlias(ProductTableMap::ECOTAX, $ecotax['max'], Criteria::LESS_EQUAL);
- $useMinMax = true;
- }
- if ($useMinMax) {
- return $this;
- }
- if (null === $comparison) {
- $comparison = Criteria::IN;
- }
- }
-
- return $this->addUsingAlias(ProductTableMap::ECOTAX, $ecotax, $comparison);
- }
-
- /**
- * Filter the query on the newness column
- *
- * Example usage:
- *
- * $query->filterByNewness(1234); // WHERE newness = 1234
- * $query->filterByNewness(array(12, 34)); // WHERE newness IN (12, 34)
- * $query->filterByNewness(array('min' => 12)); // WHERE newness > 12
- *
- *
- * @param mixed $newness The value to use as filter.
- * Use scalar values for equality.
- * Use array values for in_array() equivalent.
- * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
- * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
- *
- * @return ChildProductQuery The current query, for fluid interface
- */
- public function filterByNewness($newness = null, $comparison = null)
- {
- if (is_array($newness)) {
- $useMinMax = false;
- if (isset($newness['min'])) {
- $this->addUsingAlias(ProductTableMap::NEWNESS, $newness['min'], Criteria::GREATER_EQUAL);
- $useMinMax = true;
- }
- if (isset($newness['max'])) {
- $this->addUsingAlias(ProductTableMap::NEWNESS, $newness['max'], Criteria::LESS_EQUAL);
- $useMinMax = true;
- }
- if ($useMinMax) {
- return $this;
- }
- if (null === $comparison) {
- $comparison = Criteria::IN;
- }
- }
-
- return $this->addUsingAlias(ProductTableMap::NEWNESS, $newness, $comparison);
- }
-
- /**
- * Filter the query on the promo column
- *
- * Example usage:
- *
- * $query->filterByPromo(1234); // WHERE promo = 1234
- * $query->filterByPromo(array(12, 34)); // WHERE promo IN (12, 34)
- * $query->filterByPromo(array('min' => 12)); // WHERE promo > 12
- *
- *
- * @param mixed $promo The value to use as filter.
- * Use scalar values for equality.
- * Use array values for in_array() equivalent.
- * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
- * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
- *
- * @return ChildProductQuery The current query, for fluid interface
- */
- public function filterByPromo($promo = null, $comparison = null)
- {
- if (is_array($promo)) {
- $useMinMax = false;
- if (isset($promo['min'])) {
- $this->addUsingAlias(ProductTableMap::PROMO, $promo['min'], Criteria::GREATER_EQUAL);
- $useMinMax = true;
- }
- if (isset($promo['max'])) {
- $this->addUsingAlias(ProductTableMap::PROMO, $promo['max'], Criteria::LESS_EQUAL);
- $useMinMax = true;
- }
- if ($useMinMax) {
- return $this;
- }
- if (null === $comparison) {
- $comparison = Criteria::IN;
- }
- }
-
- return $this->addUsingAlias(ProductTableMap::PROMO, $promo, $comparison);
- }
-
- /**
- * Filter the query on the quantity column
- *
- * Example usage:
- *
- * $query->filterByQuantity(1234); // WHERE quantity = 1234
- * $query->filterByQuantity(array(12, 34)); // WHERE quantity IN (12, 34)
- * $query->filterByQuantity(array('min' => 12)); // WHERE quantity > 12
- *
- *
- * @param mixed $quantity The value to use as filter.
- * Use scalar values for equality.
- * Use array values for in_array() equivalent.
- * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
- * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
- *
- * @return ChildProductQuery The current query, for fluid interface
- */
- public function filterByQuantity($quantity = null, $comparison = null)
- {
- if (is_array($quantity)) {
- $useMinMax = false;
- if (isset($quantity['min'])) {
- $this->addUsingAlias(ProductTableMap::QUANTITY, $quantity['min'], Criteria::GREATER_EQUAL);
- $useMinMax = true;
- }
- if (isset($quantity['max'])) {
- $this->addUsingAlias(ProductTableMap::QUANTITY, $quantity['max'], Criteria::LESS_EQUAL);
- $useMinMax = true;
- }
- if ($useMinMax) {
- return $this;
- }
- if (null === $comparison) {
- $comparison = Criteria::IN;
- }
- }
-
- return $this->addUsingAlias(ProductTableMap::QUANTITY, $quantity, $comparison);
- }
-
/**
* Filter the query on the visible column
*
@@ -736,47 +462,6 @@ abstract class ProductQuery extends ModelCriteria
return $this->addUsingAlias(ProductTableMap::VISIBLE, $visible, $comparison);
}
- /**
- * Filter the query on the weight column
- *
- * Example usage:
- *
- * $query->filterByWeight(1234); // WHERE weight = 1234
- * $query->filterByWeight(array(12, 34)); // WHERE weight IN (12, 34)
- * $query->filterByWeight(array('min' => 12)); // WHERE weight > 12
- *
- *
- * @param mixed $weight The value to use as filter.
- * Use scalar values for equality.
- * Use array values for in_array() equivalent.
- * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
- * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
- *
- * @return ChildProductQuery The current query, for fluid interface
- */
- public function filterByWeight($weight = null, $comparison = null)
- {
- if (is_array($weight)) {
- $useMinMax = false;
- if (isset($weight['min'])) {
- $this->addUsingAlias(ProductTableMap::WEIGHT, $weight['min'], Criteria::GREATER_EQUAL);
- $useMinMax = true;
- }
- if (isset($weight['max'])) {
- $this->addUsingAlias(ProductTableMap::WEIGHT, $weight['max'], Criteria::LESS_EQUAL);
- $useMinMax = true;
- }
- if ($useMinMax) {
- return $this;
- }
- if (null === $comparison) {
- $comparison = Criteria::IN;
- }
- }
-
- return $this->addUsingAlias(ProductTableMap::WEIGHT, $weight, $comparison);
- }
-
/**
* Filter the query on the position column
*
diff --git a/core/lib/Thelia/Model/Base/ProductVersion.php b/core/lib/Thelia/Model/Base/ProductVersion.php
index 4351460a5..1779cee20 100755
--- a/core/lib/Thelia/Model/Base/ProductVersion.php
+++ b/core/lib/Thelia/Model/Base/ProductVersion.php
@@ -73,45 +73,6 @@ abstract class ProductVersion implements ActiveRecordInterface
*/
protected $ref;
- /**
- * The value for the price field.
- * @var double
- */
- protected $price;
-
- /**
- * The value for the price2 field.
- * @var double
- */
- protected $price2;
-
- /**
- * The value for the ecotax field.
- * @var double
- */
- protected $ecotax;
-
- /**
- * The value for the newness field.
- * Note: this column has a database default value of: 0
- * @var int
- */
- protected $newness;
-
- /**
- * The value for the promo field.
- * Note: this column has a database default value of: 0
- * @var int
- */
- protected $promo;
-
- /**
- * The value for the quantity field.
- * Note: this column has a database default value of: 0
- * @var int
- */
- protected $quantity;
-
/**
* The value for the visible field.
* Note: this column has a database default value of: 0
@@ -119,12 +80,6 @@ abstract class ProductVersion implements ActiveRecordInterface
*/
protected $visible;
- /**
- * The value for the weight field.
- * @var double
- */
- protected $weight;
-
/**
* The value for the position field.
* @var int
@@ -183,9 +138,6 @@ abstract class ProductVersion implements ActiveRecordInterface
*/
public function applyDefaultValues()
{
- $this->newness = 0;
- $this->promo = 0;
- $this->quantity = 0;
$this->visible = 0;
$this->version = 0;
}
@@ -479,72 +431,6 @@ abstract class ProductVersion implements ActiveRecordInterface
return $this->ref;
}
- /**
- * Get the [price] column value.
- *
- * @return double
- */
- public function getPrice()
- {
-
- return $this->price;
- }
-
- /**
- * Get the [price2] column value.
- *
- * @return double
- */
- public function getPrice2()
- {
-
- return $this->price2;
- }
-
- /**
- * Get the [ecotax] column value.
- *
- * @return double
- */
- public function getEcotax()
- {
-
- return $this->ecotax;
- }
-
- /**
- * Get the [newness] column value.
- *
- * @return int
- */
- public function getNewness()
- {
-
- return $this->newness;
- }
-
- /**
- * Get the [promo] column value.
- *
- * @return int
- */
- public function getPromo()
- {
-
- return $this->promo;
- }
-
- /**
- * Get the [quantity] column value.
- *
- * @return int
- */
- public function getQuantity()
- {
-
- return $this->quantity;
- }
-
/**
* Get the [visible] column value.
*
@@ -556,17 +442,6 @@ abstract class ProductVersion implements ActiveRecordInterface
return $this->visible;
}
- /**
- * Get the [weight] column value.
- *
- * @return double
- */
- public function getWeight()
- {
-
- return $this->weight;
- }
-
/**
* Get the [position] column value.
*
@@ -727,132 +602,6 @@ abstract class ProductVersion implements ActiveRecordInterface
return $this;
} // setRef()
- /**
- * Set the value of [price] column.
- *
- * @param double $v new value
- * @return \Thelia\Model\ProductVersion The current object (for fluent API support)
- */
- public function setPrice($v)
- {
- if ($v !== null) {
- $v = (double) $v;
- }
-
- if ($this->price !== $v) {
- $this->price = $v;
- $this->modifiedColumns[] = ProductVersionTableMap::PRICE;
- }
-
-
- return $this;
- } // setPrice()
-
- /**
- * Set the value of [price2] column.
- *
- * @param double $v new value
- * @return \Thelia\Model\ProductVersion The current object (for fluent API support)
- */
- public function setPrice2($v)
- {
- if ($v !== null) {
- $v = (double) $v;
- }
-
- if ($this->price2 !== $v) {
- $this->price2 = $v;
- $this->modifiedColumns[] = ProductVersionTableMap::PRICE2;
- }
-
-
- return $this;
- } // setPrice2()
-
- /**
- * Set the value of [ecotax] column.
- *
- * @param double $v new value
- * @return \Thelia\Model\ProductVersion The current object (for fluent API support)
- */
- public function setEcotax($v)
- {
- if ($v !== null) {
- $v = (double) $v;
- }
-
- if ($this->ecotax !== $v) {
- $this->ecotax = $v;
- $this->modifiedColumns[] = ProductVersionTableMap::ECOTAX;
- }
-
-
- return $this;
- } // setEcotax()
-
- /**
- * Set the value of [newness] column.
- *
- * @param int $v new value
- * @return \Thelia\Model\ProductVersion The current object (for fluent API support)
- */
- public function setNewness($v)
- {
- if ($v !== null) {
- $v = (int) $v;
- }
-
- if ($this->newness !== $v) {
- $this->newness = $v;
- $this->modifiedColumns[] = ProductVersionTableMap::NEWNESS;
- }
-
-
- return $this;
- } // setNewness()
-
- /**
- * Set the value of [promo] column.
- *
- * @param int $v new value
- * @return \Thelia\Model\ProductVersion The current object (for fluent API support)
- */
- public function setPromo($v)
- {
- if ($v !== null) {
- $v = (int) $v;
- }
-
- if ($this->promo !== $v) {
- $this->promo = $v;
- $this->modifiedColumns[] = ProductVersionTableMap::PROMO;
- }
-
-
- return $this;
- } // setPromo()
-
- /**
- * Set the value of [quantity] column.
- *
- * @param int $v new value
- * @return \Thelia\Model\ProductVersion The current object (for fluent API support)
- */
- public function setQuantity($v)
- {
- if ($v !== null) {
- $v = (int) $v;
- }
-
- if ($this->quantity !== $v) {
- $this->quantity = $v;
- $this->modifiedColumns[] = ProductVersionTableMap::QUANTITY;
- }
-
-
- return $this;
- } // setQuantity()
-
/**
* Set the value of [visible] column.
*
@@ -874,27 +623,6 @@ abstract class ProductVersion implements ActiveRecordInterface
return $this;
} // setVisible()
- /**
- * Set the value of [weight] column.
- *
- * @param double $v new value
- * @return \Thelia\Model\ProductVersion The current object (for fluent API support)
- */
- public function setWeight($v)
- {
- if ($v !== null) {
- $v = (double) $v;
- }
-
- if ($this->weight !== $v) {
- $this->weight = $v;
- $this->modifiedColumns[] = ProductVersionTableMap::WEIGHT;
- }
-
-
- return $this;
- } // setWeight()
-
/**
* Set the value of [position] column.
*
@@ -1031,18 +759,6 @@ abstract class ProductVersion implements ActiveRecordInterface
*/
public function hasOnlyDefaultValues()
{
- if ($this->newness !== 0) {
- return false;
- }
-
- if ($this->promo !== 0) {
- return false;
- }
-
- if ($this->quantity !== 0) {
- return false;
- }
-
if ($this->visible !== 0) {
return false;
}
@@ -1087,55 +803,34 @@ abstract class ProductVersion implements ActiveRecordInterface
$col = $row[TableMap::TYPE_NUM == $indexType ? 2 + $startcol : ProductVersionTableMap::translateFieldName('Ref', TableMap::TYPE_PHPNAME, $indexType)];
$this->ref = (null !== $col) ? (string) $col : null;
- $col = $row[TableMap::TYPE_NUM == $indexType ? 3 + $startcol : ProductVersionTableMap::translateFieldName('Price', TableMap::TYPE_PHPNAME, $indexType)];
- $this->price = (null !== $col) ? (double) $col : null;
-
- $col = $row[TableMap::TYPE_NUM == $indexType ? 4 + $startcol : ProductVersionTableMap::translateFieldName('Price2', TableMap::TYPE_PHPNAME, $indexType)];
- $this->price2 = (null !== $col) ? (double) $col : null;
-
- $col = $row[TableMap::TYPE_NUM == $indexType ? 5 + $startcol : ProductVersionTableMap::translateFieldName('Ecotax', TableMap::TYPE_PHPNAME, $indexType)];
- $this->ecotax = (null !== $col) ? (double) $col : null;
-
- $col = $row[TableMap::TYPE_NUM == $indexType ? 6 + $startcol : ProductVersionTableMap::translateFieldName('Newness', TableMap::TYPE_PHPNAME, $indexType)];
- $this->newness = (null !== $col) ? (int) $col : null;
-
- $col = $row[TableMap::TYPE_NUM == $indexType ? 7 + $startcol : ProductVersionTableMap::translateFieldName('Promo', TableMap::TYPE_PHPNAME, $indexType)];
- $this->promo = (null !== $col) ? (int) $col : null;
-
- $col = $row[TableMap::TYPE_NUM == $indexType ? 8 + $startcol : ProductVersionTableMap::translateFieldName('Quantity', TableMap::TYPE_PHPNAME, $indexType)];
- $this->quantity = (null !== $col) ? (int) $col : null;
-
- $col = $row[TableMap::TYPE_NUM == $indexType ? 9 + $startcol : ProductVersionTableMap::translateFieldName('Visible', TableMap::TYPE_PHPNAME, $indexType)];
+ $col = $row[TableMap::TYPE_NUM == $indexType ? 3 + $startcol : ProductVersionTableMap::translateFieldName('Visible', TableMap::TYPE_PHPNAME, $indexType)];
$this->visible = (null !== $col) ? (int) $col : null;
- $col = $row[TableMap::TYPE_NUM == $indexType ? 10 + $startcol : ProductVersionTableMap::translateFieldName('Weight', TableMap::TYPE_PHPNAME, $indexType)];
- $this->weight = (null !== $col) ? (double) $col : null;
-
- $col = $row[TableMap::TYPE_NUM == $indexType ? 11 + $startcol : ProductVersionTableMap::translateFieldName('Position', TableMap::TYPE_PHPNAME, $indexType)];
+ $col = $row[TableMap::TYPE_NUM == $indexType ? 4 + $startcol : ProductVersionTableMap::translateFieldName('Position', TableMap::TYPE_PHPNAME, $indexType)];
$this->position = (null !== $col) ? (int) $col : null;
- $col = $row[TableMap::TYPE_NUM == $indexType ? 12 + $startcol : ProductVersionTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)];
+ $col = $row[TableMap::TYPE_NUM == $indexType ? 5 + $startcol : ProductVersionTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)];
if ($col === '0000-00-00 00:00:00') {
$col = null;
}
$this->created_at = (null !== $col) ? PropelDateTime::newInstance($col, null, '\DateTime') : null;
- $col = $row[TableMap::TYPE_NUM == $indexType ? 13 + $startcol : ProductVersionTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)];
+ $col = $row[TableMap::TYPE_NUM == $indexType ? 6 + $startcol : ProductVersionTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)];
if ($col === '0000-00-00 00:00:00') {
$col = null;
}
$this->updated_at = (null !== $col) ? PropelDateTime::newInstance($col, null, '\DateTime') : null;
- $col = $row[TableMap::TYPE_NUM == $indexType ? 14 + $startcol : ProductVersionTableMap::translateFieldName('Version', TableMap::TYPE_PHPNAME, $indexType)];
+ $col = $row[TableMap::TYPE_NUM == $indexType ? 7 + $startcol : ProductVersionTableMap::translateFieldName('Version', TableMap::TYPE_PHPNAME, $indexType)];
$this->version = (null !== $col) ? (int) $col : null;
- $col = $row[TableMap::TYPE_NUM == $indexType ? 15 + $startcol : ProductVersionTableMap::translateFieldName('VersionCreatedAt', TableMap::TYPE_PHPNAME, $indexType)];
+ $col = $row[TableMap::TYPE_NUM == $indexType ? 8 + $startcol : ProductVersionTableMap::translateFieldName('VersionCreatedAt', TableMap::TYPE_PHPNAME, $indexType)];
if ($col === '0000-00-00 00:00:00') {
$col = null;
}
$this->version_created_at = (null !== $col) ? PropelDateTime::newInstance($col, null, '\DateTime') : null;
- $col = $row[TableMap::TYPE_NUM == $indexType ? 16 + $startcol : ProductVersionTableMap::translateFieldName('VersionCreatedBy', TableMap::TYPE_PHPNAME, $indexType)];
+ $col = $row[TableMap::TYPE_NUM == $indexType ? 9 + $startcol : ProductVersionTableMap::translateFieldName('VersionCreatedBy', TableMap::TYPE_PHPNAME, $indexType)];
$this->version_created_by = (null !== $col) ? (string) $col : null;
$this->resetModified();
@@ -1145,7 +840,7 @@ abstract class ProductVersion implements ActiveRecordInterface
$this->ensureConsistency();
}
- return $startcol + 17; // 17 = ProductVersionTableMap::NUM_HYDRATE_COLUMNS.
+ return $startcol + 10; // 10 = ProductVersionTableMap::NUM_HYDRATE_COLUMNS.
} catch (Exception $e) {
throw new PropelException("Error populating \Thelia\Model\ProductVersion object", 0, $e);
@@ -1375,30 +1070,9 @@ abstract class ProductVersion implements ActiveRecordInterface
if ($this->isColumnModified(ProductVersionTableMap::REF)) {
$modifiedColumns[':p' . $index++] = 'REF';
}
- if ($this->isColumnModified(ProductVersionTableMap::PRICE)) {
- $modifiedColumns[':p' . $index++] = 'PRICE';
- }
- if ($this->isColumnModified(ProductVersionTableMap::PRICE2)) {
- $modifiedColumns[':p' . $index++] = 'PRICE2';
- }
- if ($this->isColumnModified(ProductVersionTableMap::ECOTAX)) {
- $modifiedColumns[':p' . $index++] = 'ECOTAX';
- }
- if ($this->isColumnModified(ProductVersionTableMap::NEWNESS)) {
- $modifiedColumns[':p' . $index++] = 'NEWNESS';
- }
- if ($this->isColumnModified(ProductVersionTableMap::PROMO)) {
- $modifiedColumns[':p' . $index++] = 'PROMO';
- }
- if ($this->isColumnModified(ProductVersionTableMap::QUANTITY)) {
- $modifiedColumns[':p' . $index++] = 'QUANTITY';
- }
if ($this->isColumnModified(ProductVersionTableMap::VISIBLE)) {
$modifiedColumns[':p' . $index++] = 'VISIBLE';
}
- if ($this->isColumnModified(ProductVersionTableMap::WEIGHT)) {
- $modifiedColumns[':p' . $index++] = 'WEIGHT';
- }
if ($this->isColumnModified(ProductVersionTableMap::POSITION)) {
$modifiedColumns[':p' . $index++] = 'POSITION';
}
@@ -1437,30 +1111,9 @@ abstract class ProductVersion implements ActiveRecordInterface
case 'REF':
$stmt->bindValue($identifier, $this->ref, PDO::PARAM_STR);
break;
- case 'PRICE':
- $stmt->bindValue($identifier, $this->price, PDO::PARAM_STR);
- break;
- case 'PRICE2':
- $stmt->bindValue($identifier, $this->price2, PDO::PARAM_STR);
- break;
- case 'ECOTAX':
- $stmt->bindValue($identifier, $this->ecotax, PDO::PARAM_STR);
- break;
- case 'NEWNESS':
- $stmt->bindValue($identifier, $this->newness, PDO::PARAM_INT);
- break;
- case 'PROMO':
- $stmt->bindValue($identifier, $this->promo, PDO::PARAM_INT);
- break;
- case 'QUANTITY':
- $stmt->bindValue($identifier, $this->quantity, PDO::PARAM_INT);
- break;
case 'VISIBLE':
$stmt->bindValue($identifier, $this->visible, PDO::PARAM_INT);
break;
- case 'WEIGHT':
- $stmt->bindValue($identifier, $this->weight, PDO::PARAM_STR);
- break;
case 'POSITION':
$stmt->bindValue($identifier, $this->position, PDO::PARAM_INT);
break;
@@ -1544,45 +1197,24 @@ abstract class ProductVersion implements ActiveRecordInterface
return $this->getRef();
break;
case 3:
- return $this->getPrice();
- break;
- case 4:
- return $this->getPrice2();
- break;
- case 5:
- return $this->getEcotax();
- break;
- case 6:
- return $this->getNewness();
- break;
- case 7:
- return $this->getPromo();
- break;
- case 8:
- return $this->getQuantity();
- break;
- case 9:
return $this->getVisible();
break;
- case 10:
- return $this->getWeight();
- break;
- case 11:
+ case 4:
return $this->getPosition();
break;
- case 12:
+ case 5:
return $this->getCreatedAt();
break;
- case 13:
+ case 6:
return $this->getUpdatedAt();
break;
- case 14:
+ case 7:
return $this->getVersion();
break;
- case 15:
+ case 8:
return $this->getVersionCreatedAt();
break;
- case 16:
+ case 9:
return $this->getVersionCreatedBy();
break;
default:
@@ -1617,20 +1249,13 @@ abstract class ProductVersion implements ActiveRecordInterface
$keys[0] => $this->getId(),
$keys[1] => $this->getTaxRuleId(),
$keys[2] => $this->getRef(),
- $keys[3] => $this->getPrice(),
- $keys[4] => $this->getPrice2(),
- $keys[5] => $this->getEcotax(),
- $keys[6] => $this->getNewness(),
- $keys[7] => $this->getPromo(),
- $keys[8] => $this->getQuantity(),
- $keys[9] => $this->getVisible(),
- $keys[10] => $this->getWeight(),
- $keys[11] => $this->getPosition(),
- $keys[12] => $this->getCreatedAt(),
- $keys[13] => $this->getUpdatedAt(),
- $keys[14] => $this->getVersion(),
- $keys[15] => $this->getVersionCreatedAt(),
- $keys[16] => $this->getVersionCreatedBy(),
+ $keys[3] => $this->getVisible(),
+ $keys[4] => $this->getPosition(),
+ $keys[5] => $this->getCreatedAt(),
+ $keys[6] => $this->getUpdatedAt(),
+ $keys[7] => $this->getVersion(),
+ $keys[8] => $this->getVersionCreatedAt(),
+ $keys[9] => $this->getVersionCreatedBy(),
);
$virtualColumns = $this->virtualColumns;
foreach($virtualColumns as $key => $virtualColumn)
@@ -1686,45 +1311,24 @@ abstract class ProductVersion implements ActiveRecordInterface
$this->setRef($value);
break;
case 3:
- $this->setPrice($value);
- break;
- case 4:
- $this->setPrice2($value);
- break;
- case 5:
- $this->setEcotax($value);
- break;
- case 6:
- $this->setNewness($value);
- break;
- case 7:
- $this->setPromo($value);
- break;
- case 8:
- $this->setQuantity($value);
- break;
- case 9:
$this->setVisible($value);
break;
- case 10:
- $this->setWeight($value);
- break;
- case 11:
+ case 4:
$this->setPosition($value);
break;
- case 12:
+ case 5:
$this->setCreatedAt($value);
break;
- case 13:
+ case 6:
$this->setUpdatedAt($value);
break;
- case 14:
+ case 7:
$this->setVersion($value);
break;
- case 15:
+ case 8:
$this->setVersionCreatedAt($value);
break;
- case 16:
+ case 9:
$this->setVersionCreatedBy($value);
break;
} // switch()
@@ -1754,20 +1358,13 @@ abstract class ProductVersion implements ActiveRecordInterface
if (array_key_exists($keys[0], $arr)) $this->setId($arr[$keys[0]]);
if (array_key_exists($keys[1], $arr)) $this->setTaxRuleId($arr[$keys[1]]);
if (array_key_exists($keys[2], $arr)) $this->setRef($arr[$keys[2]]);
- if (array_key_exists($keys[3], $arr)) $this->setPrice($arr[$keys[3]]);
- if (array_key_exists($keys[4], $arr)) $this->setPrice2($arr[$keys[4]]);
- if (array_key_exists($keys[5], $arr)) $this->setEcotax($arr[$keys[5]]);
- if (array_key_exists($keys[6], $arr)) $this->setNewness($arr[$keys[6]]);
- if (array_key_exists($keys[7], $arr)) $this->setPromo($arr[$keys[7]]);
- if (array_key_exists($keys[8], $arr)) $this->setQuantity($arr[$keys[8]]);
- if (array_key_exists($keys[9], $arr)) $this->setVisible($arr[$keys[9]]);
- if (array_key_exists($keys[10], $arr)) $this->setWeight($arr[$keys[10]]);
- if (array_key_exists($keys[11], $arr)) $this->setPosition($arr[$keys[11]]);
- if (array_key_exists($keys[12], $arr)) $this->setCreatedAt($arr[$keys[12]]);
- if (array_key_exists($keys[13], $arr)) $this->setUpdatedAt($arr[$keys[13]]);
- if (array_key_exists($keys[14], $arr)) $this->setVersion($arr[$keys[14]]);
- if (array_key_exists($keys[15], $arr)) $this->setVersionCreatedAt($arr[$keys[15]]);
- if (array_key_exists($keys[16], $arr)) $this->setVersionCreatedBy($arr[$keys[16]]);
+ if (array_key_exists($keys[3], $arr)) $this->setVisible($arr[$keys[3]]);
+ if (array_key_exists($keys[4], $arr)) $this->setPosition($arr[$keys[4]]);
+ if (array_key_exists($keys[5], $arr)) $this->setCreatedAt($arr[$keys[5]]);
+ if (array_key_exists($keys[6], $arr)) $this->setUpdatedAt($arr[$keys[6]]);
+ if (array_key_exists($keys[7], $arr)) $this->setVersion($arr[$keys[7]]);
+ if (array_key_exists($keys[8], $arr)) $this->setVersionCreatedAt($arr[$keys[8]]);
+ if (array_key_exists($keys[9], $arr)) $this->setVersionCreatedBy($arr[$keys[9]]);
}
/**
@@ -1782,14 +1379,7 @@ abstract class ProductVersion implements ActiveRecordInterface
if ($this->isColumnModified(ProductVersionTableMap::ID)) $criteria->add(ProductVersionTableMap::ID, $this->id);
if ($this->isColumnModified(ProductVersionTableMap::TAX_RULE_ID)) $criteria->add(ProductVersionTableMap::TAX_RULE_ID, $this->tax_rule_id);
if ($this->isColumnModified(ProductVersionTableMap::REF)) $criteria->add(ProductVersionTableMap::REF, $this->ref);
- if ($this->isColumnModified(ProductVersionTableMap::PRICE)) $criteria->add(ProductVersionTableMap::PRICE, $this->price);
- if ($this->isColumnModified(ProductVersionTableMap::PRICE2)) $criteria->add(ProductVersionTableMap::PRICE2, $this->price2);
- if ($this->isColumnModified(ProductVersionTableMap::ECOTAX)) $criteria->add(ProductVersionTableMap::ECOTAX, $this->ecotax);
- if ($this->isColumnModified(ProductVersionTableMap::NEWNESS)) $criteria->add(ProductVersionTableMap::NEWNESS, $this->newness);
- if ($this->isColumnModified(ProductVersionTableMap::PROMO)) $criteria->add(ProductVersionTableMap::PROMO, $this->promo);
- if ($this->isColumnModified(ProductVersionTableMap::QUANTITY)) $criteria->add(ProductVersionTableMap::QUANTITY, $this->quantity);
if ($this->isColumnModified(ProductVersionTableMap::VISIBLE)) $criteria->add(ProductVersionTableMap::VISIBLE, $this->visible);
- if ($this->isColumnModified(ProductVersionTableMap::WEIGHT)) $criteria->add(ProductVersionTableMap::WEIGHT, $this->weight);
if ($this->isColumnModified(ProductVersionTableMap::POSITION)) $criteria->add(ProductVersionTableMap::POSITION, $this->position);
if ($this->isColumnModified(ProductVersionTableMap::CREATED_AT)) $criteria->add(ProductVersionTableMap::CREATED_AT, $this->created_at);
if ($this->isColumnModified(ProductVersionTableMap::UPDATED_AT)) $criteria->add(ProductVersionTableMap::UPDATED_AT, $this->updated_at);
@@ -1869,14 +1459,7 @@ abstract class ProductVersion implements ActiveRecordInterface
$copyObj->setId($this->getId());
$copyObj->setTaxRuleId($this->getTaxRuleId());
$copyObj->setRef($this->getRef());
- $copyObj->setPrice($this->getPrice());
- $copyObj->setPrice2($this->getPrice2());
- $copyObj->setEcotax($this->getEcotax());
- $copyObj->setNewness($this->getNewness());
- $copyObj->setPromo($this->getPromo());
- $copyObj->setQuantity($this->getQuantity());
$copyObj->setVisible($this->getVisible());
- $copyObj->setWeight($this->getWeight());
$copyObj->setPosition($this->getPosition());
$copyObj->setCreatedAt($this->getCreatedAt());
$copyObj->setUpdatedAt($this->getUpdatedAt());
@@ -1969,14 +1552,7 @@ abstract class ProductVersion implements ActiveRecordInterface
$this->id = null;
$this->tax_rule_id = null;
$this->ref = null;
- $this->price = null;
- $this->price2 = null;
- $this->ecotax = null;
- $this->newness = null;
- $this->promo = null;
- $this->quantity = null;
$this->visible = null;
- $this->weight = null;
$this->position = null;
$this->created_at = null;
$this->updated_at = null;
diff --git a/core/lib/Thelia/Model/Base/ProductVersionQuery.php b/core/lib/Thelia/Model/Base/ProductVersionQuery.php
index 47f94eb9c..1b43f7e66 100755
--- a/core/lib/Thelia/Model/Base/ProductVersionQuery.php
+++ b/core/lib/Thelia/Model/Base/ProductVersionQuery.php
@@ -24,14 +24,7 @@ use Thelia\Model\Map\ProductVersionTableMap;
* @method ChildProductVersionQuery orderById($order = Criteria::ASC) Order by the id column
* @method ChildProductVersionQuery orderByTaxRuleId($order = Criteria::ASC) Order by the tax_rule_id column
* @method ChildProductVersionQuery orderByRef($order = Criteria::ASC) Order by the ref column
- * @method ChildProductVersionQuery orderByPrice($order = Criteria::ASC) Order by the price column
- * @method ChildProductVersionQuery orderByPrice2($order = Criteria::ASC) Order by the price2 column
- * @method ChildProductVersionQuery orderByEcotax($order = Criteria::ASC) Order by the ecotax column
- * @method ChildProductVersionQuery orderByNewness($order = Criteria::ASC) Order by the newness column
- * @method ChildProductVersionQuery orderByPromo($order = Criteria::ASC) Order by the promo column
- * @method ChildProductVersionQuery orderByQuantity($order = Criteria::ASC) Order by the quantity column
* @method ChildProductVersionQuery orderByVisible($order = Criteria::ASC) Order by the visible column
- * @method ChildProductVersionQuery orderByWeight($order = Criteria::ASC) Order by the weight column
* @method ChildProductVersionQuery orderByPosition($order = Criteria::ASC) Order by the position column
* @method ChildProductVersionQuery orderByCreatedAt($order = Criteria::ASC) Order by the created_at column
* @method ChildProductVersionQuery orderByUpdatedAt($order = Criteria::ASC) Order by the updated_at column
@@ -42,14 +35,7 @@ use Thelia\Model\Map\ProductVersionTableMap;
* @method ChildProductVersionQuery groupById() Group by the id column
* @method ChildProductVersionQuery groupByTaxRuleId() Group by the tax_rule_id column
* @method ChildProductVersionQuery groupByRef() Group by the ref column
- * @method ChildProductVersionQuery groupByPrice() Group by the price column
- * @method ChildProductVersionQuery groupByPrice2() Group by the price2 column
- * @method ChildProductVersionQuery groupByEcotax() Group by the ecotax column
- * @method ChildProductVersionQuery groupByNewness() Group by the newness column
- * @method ChildProductVersionQuery groupByPromo() Group by the promo column
- * @method ChildProductVersionQuery groupByQuantity() Group by the quantity column
* @method ChildProductVersionQuery groupByVisible() Group by the visible column
- * @method ChildProductVersionQuery groupByWeight() Group by the weight column
* @method ChildProductVersionQuery groupByPosition() Group by the position column
* @method ChildProductVersionQuery groupByCreatedAt() Group by the created_at column
* @method ChildProductVersionQuery groupByUpdatedAt() Group by the updated_at column
@@ -71,14 +57,7 @@ use Thelia\Model\Map\ProductVersionTableMap;
* @method ChildProductVersion findOneById(int $id) Return the first ChildProductVersion filtered by the id column
* @method ChildProductVersion findOneByTaxRuleId(int $tax_rule_id) Return the first ChildProductVersion filtered by the tax_rule_id column
* @method ChildProductVersion findOneByRef(string $ref) Return the first ChildProductVersion filtered by the ref column
- * @method ChildProductVersion findOneByPrice(double $price) Return the first ChildProductVersion filtered by the price column
- * @method ChildProductVersion findOneByPrice2(double $price2) Return the first ChildProductVersion filtered by the price2 column
- * @method ChildProductVersion findOneByEcotax(double $ecotax) Return the first ChildProductVersion filtered by the ecotax column
- * @method ChildProductVersion findOneByNewness(int $newness) Return the first ChildProductVersion filtered by the newness column
- * @method ChildProductVersion findOneByPromo(int $promo) Return the first ChildProductVersion filtered by the promo column
- * @method ChildProductVersion findOneByQuantity(int $quantity) Return the first ChildProductVersion filtered by the quantity column
* @method ChildProductVersion findOneByVisible(int $visible) Return the first ChildProductVersion filtered by the visible column
- * @method ChildProductVersion findOneByWeight(double $weight) Return the first ChildProductVersion filtered by the weight column
* @method ChildProductVersion findOneByPosition(int $position) Return the first ChildProductVersion filtered by the position column
* @method ChildProductVersion findOneByCreatedAt(string $created_at) Return the first ChildProductVersion filtered by the created_at column
* @method ChildProductVersion findOneByUpdatedAt(string $updated_at) Return the first ChildProductVersion filtered by the updated_at column
@@ -89,14 +68,7 @@ use Thelia\Model\Map\ProductVersionTableMap;
* @method array findById(int $id) Return ChildProductVersion objects filtered by the id column
* @method array findByTaxRuleId(int $tax_rule_id) Return ChildProductVersion objects filtered by the tax_rule_id column
* @method array findByRef(string $ref) Return ChildProductVersion objects filtered by the ref column
- * @method array findByPrice(double $price) Return ChildProductVersion objects filtered by the price column
- * @method array findByPrice2(double $price2) Return ChildProductVersion objects filtered by the price2 column
- * @method array findByEcotax(double $ecotax) Return ChildProductVersion objects filtered by the ecotax column
- * @method array findByNewness(int $newness) Return ChildProductVersion objects filtered by the newness column
- * @method array findByPromo(int $promo) Return ChildProductVersion objects filtered by the promo column
- * @method array findByQuantity(int $quantity) Return ChildProductVersion objects filtered by the quantity column
* @method array findByVisible(int $visible) Return ChildProductVersion objects filtered by the visible column
- * @method array findByWeight(double $weight) Return ChildProductVersion objects filtered by the weight column
* @method array findByPosition(int $position) Return ChildProductVersion objects filtered by the position column
* @method array findByCreatedAt(string $created_at) Return ChildProductVersion objects filtered by the created_at column
* @method array findByUpdatedAt(string $updated_at) Return ChildProductVersion objects filtered by the updated_at column
@@ -191,7 +163,7 @@ abstract class ProductVersionQuery extends ModelCriteria
*/
protected function findPkSimple($key, $con)
{
- $sql = 'SELECT ID, TAX_RULE_ID, REF, PRICE, PRICE2, ECOTAX, NEWNESS, PROMO, QUANTITY, VISIBLE, WEIGHT, POSITION, CREATED_AT, UPDATED_AT, VERSION, VERSION_CREATED_AT, VERSION_CREATED_BY FROM product_version WHERE ID = :p0 AND VERSION = :p1';
+ $sql = 'SELECT ID, TAX_RULE_ID, REF, VISIBLE, POSITION, CREATED_AT, UPDATED_AT, VERSION, VERSION_CREATED_AT, VERSION_CREATED_BY FROM product_version WHERE ID = :p0 AND VERSION = :p1';
try {
$stmt = $con->prepare($sql);
$stmt->bindValue(':p0', $key[0], PDO::PARAM_INT);
@@ -405,252 +377,6 @@ abstract class ProductVersionQuery extends ModelCriteria
return $this->addUsingAlias(ProductVersionTableMap::REF, $ref, $comparison);
}
- /**
- * Filter the query on the price column
- *
- * Example usage:
- *
- * $query->filterByPrice(1234); // WHERE price = 1234
- * $query->filterByPrice(array(12, 34)); // WHERE price IN (12, 34)
- * $query->filterByPrice(array('min' => 12)); // WHERE price > 12
- *
- *
- * @param mixed $price The value to use as filter.
- * Use scalar values for equality.
- * Use array values for in_array() equivalent.
- * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
- * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
- *
- * @return ChildProductVersionQuery The current query, for fluid interface
- */
- public function filterByPrice($price = null, $comparison = null)
- {
- if (is_array($price)) {
- $useMinMax = false;
- if (isset($price['min'])) {
- $this->addUsingAlias(ProductVersionTableMap::PRICE, $price['min'], Criteria::GREATER_EQUAL);
- $useMinMax = true;
- }
- if (isset($price['max'])) {
- $this->addUsingAlias(ProductVersionTableMap::PRICE, $price['max'], Criteria::LESS_EQUAL);
- $useMinMax = true;
- }
- if ($useMinMax) {
- return $this;
- }
- if (null === $comparison) {
- $comparison = Criteria::IN;
- }
- }
-
- return $this->addUsingAlias(ProductVersionTableMap::PRICE, $price, $comparison);
- }
-
- /**
- * Filter the query on the price2 column
- *
- * Example usage:
- *
- * $query->filterByPrice2(1234); // WHERE price2 = 1234
- * $query->filterByPrice2(array(12, 34)); // WHERE price2 IN (12, 34)
- * $query->filterByPrice2(array('min' => 12)); // WHERE price2 > 12
- *
- *
- * @param mixed $price2 The value to use as filter.
- * Use scalar values for equality.
- * Use array values for in_array() equivalent.
- * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
- * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
- *
- * @return ChildProductVersionQuery The current query, for fluid interface
- */
- public function filterByPrice2($price2 = null, $comparison = null)
- {
- if (is_array($price2)) {
- $useMinMax = false;
- if (isset($price2['min'])) {
- $this->addUsingAlias(ProductVersionTableMap::PRICE2, $price2['min'], Criteria::GREATER_EQUAL);
- $useMinMax = true;
- }
- if (isset($price2['max'])) {
- $this->addUsingAlias(ProductVersionTableMap::PRICE2, $price2['max'], Criteria::LESS_EQUAL);
- $useMinMax = true;
- }
- if ($useMinMax) {
- return $this;
- }
- if (null === $comparison) {
- $comparison = Criteria::IN;
- }
- }
-
- return $this->addUsingAlias(ProductVersionTableMap::PRICE2, $price2, $comparison);
- }
-
- /**
- * Filter the query on the ecotax column
- *
- * Example usage:
- *
- * $query->filterByEcotax(1234); // WHERE ecotax = 1234
- * $query->filterByEcotax(array(12, 34)); // WHERE ecotax IN (12, 34)
- * $query->filterByEcotax(array('min' => 12)); // WHERE ecotax > 12
- *
- *
- * @param mixed $ecotax The value to use as filter.
- * Use scalar values for equality.
- * Use array values for in_array() equivalent.
- * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
- * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
- *
- * @return ChildProductVersionQuery The current query, for fluid interface
- */
- public function filterByEcotax($ecotax = null, $comparison = null)
- {
- if (is_array($ecotax)) {
- $useMinMax = false;
- if (isset($ecotax['min'])) {
- $this->addUsingAlias(ProductVersionTableMap::ECOTAX, $ecotax['min'], Criteria::GREATER_EQUAL);
- $useMinMax = true;
- }
- if (isset($ecotax['max'])) {
- $this->addUsingAlias(ProductVersionTableMap::ECOTAX, $ecotax['max'], Criteria::LESS_EQUAL);
- $useMinMax = true;
- }
- if ($useMinMax) {
- return $this;
- }
- if (null === $comparison) {
- $comparison = Criteria::IN;
- }
- }
-
- return $this->addUsingAlias(ProductVersionTableMap::ECOTAX, $ecotax, $comparison);
- }
-
- /**
- * Filter the query on the newness column
- *
- * Example usage:
- *
- * $query->filterByNewness(1234); // WHERE newness = 1234
- * $query->filterByNewness(array(12, 34)); // WHERE newness IN (12, 34)
- * $query->filterByNewness(array('min' => 12)); // WHERE newness > 12
- *
- *
- * @param mixed $newness The value to use as filter.
- * Use scalar values for equality.
- * Use array values for in_array() equivalent.
- * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
- * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
- *
- * @return ChildProductVersionQuery The current query, for fluid interface
- */
- public function filterByNewness($newness = null, $comparison = null)
- {
- if (is_array($newness)) {
- $useMinMax = false;
- if (isset($newness['min'])) {
- $this->addUsingAlias(ProductVersionTableMap::NEWNESS, $newness['min'], Criteria::GREATER_EQUAL);
- $useMinMax = true;
- }
- if (isset($newness['max'])) {
- $this->addUsingAlias(ProductVersionTableMap::NEWNESS, $newness['max'], Criteria::LESS_EQUAL);
- $useMinMax = true;
- }
- if ($useMinMax) {
- return $this;
- }
- if (null === $comparison) {
- $comparison = Criteria::IN;
- }
- }
-
- return $this->addUsingAlias(ProductVersionTableMap::NEWNESS, $newness, $comparison);
- }
-
- /**
- * Filter the query on the promo column
- *
- * Example usage:
- *
- * $query->filterByPromo(1234); // WHERE promo = 1234
- * $query->filterByPromo(array(12, 34)); // WHERE promo IN (12, 34)
- * $query->filterByPromo(array('min' => 12)); // WHERE promo > 12
- *
- *
- * @param mixed $promo The value to use as filter.
- * Use scalar values for equality.
- * Use array values for in_array() equivalent.
- * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
- * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
- *
- * @return ChildProductVersionQuery The current query, for fluid interface
- */
- public function filterByPromo($promo = null, $comparison = null)
- {
- if (is_array($promo)) {
- $useMinMax = false;
- if (isset($promo['min'])) {
- $this->addUsingAlias(ProductVersionTableMap::PROMO, $promo['min'], Criteria::GREATER_EQUAL);
- $useMinMax = true;
- }
- if (isset($promo['max'])) {
- $this->addUsingAlias(ProductVersionTableMap::PROMO, $promo['max'], Criteria::LESS_EQUAL);
- $useMinMax = true;
- }
- if ($useMinMax) {
- return $this;
- }
- if (null === $comparison) {
- $comparison = Criteria::IN;
- }
- }
-
- return $this->addUsingAlias(ProductVersionTableMap::PROMO, $promo, $comparison);
- }
-
- /**
- * Filter the query on the quantity column
- *
- * Example usage:
- *
- * $query->filterByQuantity(1234); // WHERE quantity = 1234
- * $query->filterByQuantity(array(12, 34)); // WHERE quantity IN (12, 34)
- * $query->filterByQuantity(array('min' => 12)); // WHERE quantity > 12
- *
- *
- * @param mixed $quantity The value to use as filter.
- * Use scalar values for equality.
- * Use array values for in_array() equivalent.
- * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
- * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
- *
- * @return ChildProductVersionQuery The current query, for fluid interface
- */
- public function filterByQuantity($quantity = null, $comparison = null)
- {
- if (is_array($quantity)) {
- $useMinMax = false;
- if (isset($quantity['min'])) {
- $this->addUsingAlias(ProductVersionTableMap::QUANTITY, $quantity['min'], Criteria::GREATER_EQUAL);
- $useMinMax = true;
- }
- if (isset($quantity['max'])) {
- $this->addUsingAlias(ProductVersionTableMap::QUANTITY, $quantity['max'], Criteria::LESS_EQUAL);
- $useMinMax = true;
- }
- if ($useMinMax) {
- return $this;
- }
- if (null === $comparison) {
- $comparison = Criteria::IN;
- }
- }
-
- return $this->addUsingAlias(ProductVersionTableMap::QUANTITY, $quantity, $comparison);
- }
-
/**
* Filter the query on the visible column
*
@@ -692,47 +418,6 @@ abstract class ProductVersionQuery extends ModelCriteria
return $this->addUsingAlias(ProductVersionTableMap::VISIBLE, $visible, $comparison);
}
- /**
- * Filter the query on the weight column
- *
- * Example usage:
- *
- * $query->filterByWeight(1234); // WHERE weight = 1234
- * $query->filterByWeight(array(12, 34)); // WHERE weight IN (12, 34)
- * $query->filterByWeight(array('min' => 12)); // WHERE weight > 12
- *
- *
- * @param mixed $weight The value to use as filter.
- * Use scalar values for equality.
- * Use array values for in_array() equivalent.
- * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
- * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
- *
- * @return ChildProductVersionQuery The current query, for fluid interface
- */
- public function filterByWeight($weight = null, $comparison = null)
- {
- if (is_array($weight)) {
- $useMinMax = false;
- if (isset($weight['min'])) {
- $this->addUsingAlias(ProductVersionTableMap::WEIGHT, $weight['min'], Criteria::GREATER_EQUAL);
- $useMinMax = true;
- }
- if (isset($weight['max'])) {
- $this->addUsingAlias(ProductVersionTableMap::WEIGHT, $weight['max'], Criteria::LESS_EQUAL);
- $useMinMax = true;
- }
- if ($useMinMax) {
- return $this;
- }
- if (null === $comparison) {
- $comparison = Criteria::IN;
- }
- }
-
- return $this->addUsingAlias(ProductVersionTableMap::WEIGHT, $weight, $comparison);
- }
-
/**
* Filter the query on the position column
*
diff --git a/core/lib/Thelia/Model/Base/Stock.php b/core/lib/Thelia/Model/Base/Stock.php
index 73942ce83..c4d465e66 100755
--- a/core/lib/Thelia/Model/Base/Stock.php
+++ b/core/lib/Thelia/Model/Base/Stock.php
@@ -10,15 +10,20 @@ use Propel\Runtime\ActiveQuery\Criteria;
use Propel\Runtime\ActiveQuery\ModelCriteria;
use Propel\Runtime\ActiveRecord\ActiveRecordInterface;
use Propel\Runtime\Collection\Collection;
+use Propel\Runtime\Collection\ObjectCollection;
use Propel\Runtime\Connection\ConnectionInterface;
use Propel\Runtime\Exception\BadMethodCallException;
use Propel\Runtime\Exception\PropelException;
use Propel\Runtime\Map\TableMap;
use Propel\Runtime\Parser\AbstractParser;
use Propel\Runtime\Util\PropelDateTime;
-use Thelia\Model\Combination as ChildCombination;
-use Thelia\Model\CombinationQuery as ChildCombinationQuery;
+use Thelia\Model\AttributeCombination as ChildAttributeCombination;
+use Thelia\Model\AttributeCombinationQuery as ChildAttributeCombinationQuery;
+use Thelia\Model\CartItem as ChildCartItem;
+use Thelia\Model\CartItemQuery as ChildCartItemQuery;
use Thelia\Model\Product as ChildProduct;
+use Thelia\Model\ProductPrice as ChildProductPrice;
+use Thelia\Model\ProductPriceQuery as ChildProductPriceQuery;
use Thelia\Model\ProductQuery as ChildProductQuery;
use Thelia\Model\Stock as ChildStock;
use Thelia\Model\StockQuery as ChildStockQuery;
@@ -88,6 +93,26 @@ abstract class Stock implements ActiveRecordInterface
*/
protected $quantity;
+ /**
+ * The value for the promo field.
+ * Note: this column has a database default value of: 0
+ * @var int
+ */
+ protected $promo;
+
+ /**
+ * The value for the newness field.
+ * Note: this column has a database default value of: 0
+ * @var int
+ */
+ protected $newness;
+
+ /**
+ * The value for the weight field.
+ * @var double
+ */
+ protected $weight;
+
/**
* The value for the created_at field.
* @var string
@@ -100,16 +125,29 @@ abstract class Stock implements ActiveRecordInterface
*/
protected $updated_at;
- /**
- * @var Combination
- */
- protected $aCombination;
-
/**
* @var Product
*/
protected $aProduct;
+ /**
+ * @var ObjectCollection|ChildAttributeCombination[] Collection to store aggregation of ChildAttributeCombination objects.
+ */
+ protected $collAttributeCombinations;
+ protected $collAttributeCombinationsPartial;
+
+ /**
+ * @var ObjectCollection|ChildCartItem[] Collection to store aggregation of ChildCartItem objects.
+ */
+ protected $collCartItems;
+ protected $collCartItemsPartial;
+
+ /**
+ * @var ObjectCollection|ChildProductPrice[] Collection to store aggregation of ChildProductPrice objects.
+ */
+ protected $collProductPrices;
+ protected $collProductPricesPartial;
+
/**
* Flag to prevent endless save loop, if this object is referenced
* by another object which falls in this transaction.
@@ -118,11 +156,43 @@ abstract class Stock implements ActiveRecordInterface
*/
protected $alreadyInSave = false;
+ /**
+ * An array of objects scheduled for deletion.
+ * @var ObjectCollection
+ */
+ protected $attributeCombinationsScheduledForDeletion = null;
+
+ /**
+ * An array of objects scheduled for deletion.
+ * @var ObjectCollection
+ */
+ protected $cartItemsScheduledForDeletion = null;
+
+ /**
+ * An array of objects scheduled for deletion.
+ * @var ObjectCollection
+ */
+ protected $productPricesScheduledForDeletion = null;
+
+ /**
+ * Applies default values to this object.
+ * This method should be called from the object's constructor (or
+ * equivalent initialization method).
+ * @see __construct()
+ */
+ public function applyDefaultValues()
+ {
+ $this->promo = 0;
+ $this->newness = 0;
+ }
+
/**
* Initializes internal state of Thelia\Model\Base\Stock object.
+ * @see applyDefaults()
*/
public function __construct()
{
+ $this->applyDefaultValues();
}
/**
@@ -427,6 +497,39 @@ abstract class Stock implements ActiveRecordInterface
return $this->quantity;
}
+ /**
+ * Get the [promo] column value.
+ *
+ * @return int
+ */
+ public function getPromo()
+ {
+
+ return $this->promo;
+ }
+
+ /**
+ * Get the [newness] column value.
+ *
+ * @return int
+ */
+ public function getNewness()
+ {
+
+ return $this->newness;
+ }
+
+ /**
+ * Get the [weight] column value.
+ *
+ * @return double
+ */
+ public function getWeight()
+ {
+
+ return $this->weight;
+ }
+
/**
* Get the [optionally formatted] temporal [created_at] column value.
*
@@ -505,10 +608,6 @@ abstract class Stock implements ActiveRecordInterface
$this->modifiedColumns[] = StockTableMap::COMBINATION_ID;
}
- if ($this->aCombination !== null && $this->aCombination->getId() !== $v) {
- $this->aCombination = null;
- }
-
return $this;
} // setCombinationId()
@@ -580,6 +679,69 @@ abstract class Stock implements ActiveRecordInterface
return $this;
} // setQuantity()
+ /**
+ * Set the value of [promo] column.
+ *
+ * @param int $v new value
+ * @return \Thelia\Model\Stock The current object (for fluent API support)
+ */
+ public function setPromo($v)
+ {
+ if ($v !== null) {
+ $v = (int) $v;
+ }
+
+ if ($this->promo !== $v) {
+ $this->promo = $v;
+ $this->modifiedColumns[] = StockTableMap::PROMO;
+ }
+
+
+ return $this;
+ } // setPromo()
+
+ /**
+ * Set the value of [newness] column.
+ *
+ * @param int $v new value
+ * @return \Thelia\Model\Stock The current object (for fluent API support)
+ */
+ public function setNewness($v)
+ {
+ if ($v !== null) {
+ $v = (int) $v;
+ }
+
+ if ($this->newness !== $v) {
+ $this->newness = $v;
+ $this->modifiedColumns[] = StockTableMap::NEWNESS;
+ }
+
+
+ return $this;
+ } // setNewness()
+
+ /**
+ * Set the value of [weight] column.
+ *
+ * @param double $v new value
+ * @return \Thelia\Model\Stock The current object (for fluent API support)
+ */
+ public function setWeight($v)
+ {
+ if ($v !== null) {
+ $v = (double) $v;
+ }
+
+ if ($this->weight !== $v) {
+ $this->weight = $v;
+ $this->modifiedColumns[] = StockTableMap::WEIGHT;
+ }
+
+
+ return $this;
+ } // setWeight()
+
/**
* Sets the value of [created_at] column to a normalized version of the date/time value specified.
*
@@ -632,6 +794,14 @@ abstract class Stock implements ActiveRecordInterface
*/
public function hasOnlyDefaultValues()
{
+ if ($this->promo !== 0) {
+ return false;
+ }
+
+ if ($this->newness !== 0) {
+ return false;
+ }
+
// otherwise, everything was equal, so return TRUE
return true;
} // hasOnlyDefaultValues()
@@ -674,13 +844,22 @@ abstract class Stock implements ActiveRecordInterface
$col = $row[TableMap::TYPE_NUM == $indexType ? 4 + $startcol : StockTableMap::translateFieldName('Quantity', TableMap::TYPE_PHPNAME, $indexType)];
$this->quantity = (null !== $col) ? (double) $col : null;
- $col = $row[TableMap::TYPE_NUM == $indexType ? 5 + $startcol : StockTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)];
+ $col = $row[TableMap::TYPE_NUM == $indexType ? 5 + $startcol : StockTableMap::translateFieldName('Promo', TableMap::TYPE_PHPNAME, $indexType)];
+ $this->promo = (null !== $col) ? (int) $col : null;
+
+ $col = $row[TableMap::TYPE_NUM == $indexType ? 6 + $startcol : StockTableMap::translateFieldName('Newness', TableMap::TYPE_PHPNAME, $indexType)];
+ $this->newness = (null !== $col) ? (int) $col : null;
+
+ $col = $row[TableMap::TYPE_NUM == $indexType ? 7 + $startcol : StockTableMap::translateFieldName('Weight', TableMap::TYPE_PHPNAME, $indexType)];
+ $this->weight = (null !== $col) ? (double) $col : null;
+
+ $col = $row[TableMap::TYPE_NUM == $indexType ? 8 + $startcol : StockTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)];
if ($col === '0000-00-00 00:00:00') {
$col = null;
}
$this->created_at = (null !== $col) ? PropelDateTime::newInstance($col, null, '\DateTime') : null;
- $col = $row[TableMap::TYPE_NUM == $indexType ? 6 + $startcol : StockTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)];
+ $col = $row[TableMap::TYPE_NUM == $indexType ? 9 + $startcol : StockTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)];
if ($col === '0000-00-00 00:00:00') {
$col = null;
}
@@ -693,7 +872,7 @@ abstract class Stock implements ActiveRecordInterface
$this->ensureConsistency();
}
- return $startcol + 7; // 7 = StockTableMap::NUM_HYDRATE_COLUMNS.
+ return $startcol + 10; // 10 = StockTableMap::NUM_HYDRATE_COLUMNS.
} catch (Exception $e) {
throw new PropelException("Error populating \Thelia\Model\Stock object", 0, $e);
@@ -715,9 +894,6 @@ abstract class Stock implements ActiveRecordInterface
*/
public function ensureConsistency()
{
- if ($this->aCombination !== null && $this->combination_id !== $this->aCombination->getId()) {
- $this->aCombination = null;
- }
if ($this->aProduct !== null && $this->product_id !== $this->aProduct->getId()) {
$this->aProduct = null;
}
@@ -760,8 +936,13 @@ abstract class Stock implements ActiveRecordInterface
if ($deep) { // also de-associate any related objects?
- $this->aCombination = null;
$this->aProduct = null;
+ $this->collAttributeCombinations = null;
+
+ $this->collCartItems = null;
+
+ $this->collProductPrices = null;
+
} // if (deep)
}
@@ -889,13 +1070,6 @@ abstract class Stock implements ActiveRecordInterface
// method. This object relates to these object(s) by a
// foreign key reference.
- if ($this->aCombination !== null) {
- if ($this->aCombination->isModified() || $this->aCombination->isNew()) {
- $affectedRows += $this->aCombination->save($con);
- }
- $this->setCombination($this->aCombination);
- }
-
if ($this->aProduct !== null) {
if ($this->aProduct->isModified() || $this->aProduct->isNew()) {
$affectedRows += $this->aProduct->save($con);
@@ -914,6 +1088,57 @@ abstract class Stock implements ActiveRecordInterface
$this->resetModified();
}
+ if ($this->attributeCombinationsScheduledForDeletion !== null) {
+ if (!$this->attributeCombinationsScheduledForDeletion->isEmpty()) {
+ \Thelia\Model\AttributeCombinationQuery::create()
+ ->filterByPrimaryKeys($this->attributeCombinationsScheduledForDeletion->getPrimaryKeys(false))
+ ->delete($con);
+ $this->attributeCombinationsScheduledForDeletion = null;
+ }
+ }
+
+ if ($this->collAttributeCombinations !== null) {
+ foreach ($this->collAttributeCombinations as $referrerFK) {
+ if (!$referrerFK->isDeleted() && ($referrerFK->isNew() || $referrerFK->isModified())) {
+ $affectedRows += $referrerFK->save($con);
+ }
+ }
+ }
+
+ if ($this->cartItemsScheduledForDeletion !== null) {
+ if (!$this->cartItemsScheduledForDeletion->isEmpty()) {
+ \Thelia\Model\CartItemQuery::create()
+ ->filterByPrimaryKeys($this->cartItemsScheduledForDeletion->getPrimaryKeys(false))
+ ->delete($con);
+ $this->cartItemsScheduledForDeletion = null;
+ }
+ }
+
+ if ($this->collCartItems !== null) {
+ foreach ($this->collCartItems as $referrerFK) {
+ if (!$referrerFK->isDeleted() && ($referrerFK->isNew() || $referrerFK->isModified())) {
+ $affectedRows += $referrerFK->save($con);
+ }
+ }
+ }
+
+ if ($this->productPricesScheduledForDeletion !== null) {
+ if (!$this->productPricesScheduledForDeletion->isEmpty()) {
+ \Thelia\Model\ProductPriceQuery::create()
+ ->filterByPrimaryKeys($this->productPricesScheduledForDeletion->getPrimaryKeys(false))
+ ->delete($con);
+ $this->productPricesScheduledForDeletion = null;
+ }
+ }
+
+ if ($this->collProductPrices !== null) {
+ foreach ($this->collProductPrices as $referrerFK) {
+ if (!$referrerFK->isDeleted() && ($referrerFK->isNew() || $referrerFK->isModified())) {
+ $affectedRows += $referrerFK->save($con);
+ }
+ }
+ }
+
$this->alreadyInSave = false;
}
@@ -955,6 +1180,15 @@ abstract class Stock implements ActiveRecordInterface
if ($this->isColumnModified(StockTableMap::QUANTITY)) {
$modifiedColumns[':p' . $index++] = 'QUANTITY';
}
+ if ($this->isColumnModified(StockTableMap::PROMO)) {
+ $modifiedColumns[':p' . $index++] = 'PROMO';
+ }
+ if ($this->isColumnModified(StockTableMap::NEWNESS)) {
+ $modifiedColumns[':p' . $index++] = 'NEWNESS';
+ }
+ if ($this->isColumnModified(StockTableMap::WEIGHT)) {
+ $modifiedColumns[':p' . $index++] = 'WEIGHT';
+ }
if ($this->isColumnModified(StockTableMap::CREATED_AT)) {
$modifiedColumns[':p' . $index++] = 'CREATED_AT';
}
@@ -987,6 +1221,15 @@ abstract class Stock implements ActiveRecordInterface
case 'QUANTITY':
$stmt->bindValue($identifier, $this->quantity, PDO::PARAM_STR);
break;
+ case 'PROMO':
+ $stmt->bindValue($identifier, $this->promo, PDO::PARAM_INT);
+ break;
+ case 'NEWNESS':
+ $stmt->bindValue($identifier, $this->newness, PDO::PARAM_INT);
+ break;
+ case 'WEIGHT':
+ $stmt->bindValue($identifier, $this->weight, PDO::PARAM_STR);
+ break;
case 'CREATED_AT':
$stmt->bindValue($identifier, $this->created_at ? $this->created_at->format("Y-m-d H:i:s") : null, PDO::PARAM_STR);
break;
@@ -1071,9 +1314,18 @@ abstract class Stock implements ActiveRecordInterface
return $this->getQuantity();
break;
case 5:
- return $this->getCreatedAt();
+ return $this->getPromo();
break;
case 6:
+ return $this->getNewness();
+ break;
+ case 7:
+ return $this->getWeight();
+ break;
+ case 8:
+ return $this->getCreatedAt();
+ break;
+ case 9:
return $this->getUpdatedAt();
break;
default:
@@ -1110,8 +1362,11 @@ abstract class Stock implements ActiveRecordInterface
$keys[2] => $this->getProductId(),
$keys[3] => $this->getIncrease(),
$keys[4] => $this->getQuantity(),
- $keys[5] => $this->getCreatedAt(),
- $keys[6] => $this->getUpdatedAt(),
+ $keys[5] => $this->getPromo(),
+ $keys[6] => $this->getNewness(),
+ $keys[7] => $this->getWeight(),
+ $keys[8] => $this->getCreatedAt(),
+ $keys[9] => $this->getUpdatedAt(),
);
$virtualColumns = $this->virtualColumns;
foreach($virtualColumns as $key => $virtualColumn)
@@ -1120,12 +1375,18 @@ abstract class Stock implements ActiveRecordInterface
}
if ($includeForeignObjects) {
- if (null !== $this->aCombination) {
- $result['Combination'] = $this->aCombination->toArray($keyType, $includeLazyLoadColumns, $alreadyDumpedObjects, true);
- }
if (null !== $this->aProduct) {
$result['Product'] = $this->aProduct->toArray($keyType, $includeLazyLoadColumns, $alreadyDumpedObjects, true);
}
+ if (null !== $this->collAttributeCombinations) {
+ $result['AttributeCombinations'] = $this->collAttributeCombinations->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects);
+ }
+ if (null !== $this->collCartItems) {
+ $result['CartItems'] = $this->collCartItems->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects);
+ }
+ if (null !== $this->collProductPrices) {
+ $result['ProductPrices'] = $this->collProductPrices->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects);
+ }
}
return $result;
@@ -1176,9 +1437,18 @@ abstract class Stock implements ActiveRecordInterface
$this->setQuantity($value);
break;
case 5:
- $this->setCreatedAt($value);
+ $this->setPromo($value);
break;
case 6:
+ $this->setNewness($value);
+ break;
+ case 7:
+ $this->setWeight($value);
+ break;
+ case 8:
+ $this->setCreatedAt($value);
+ break;
+ case 9:
$this->setUpdatedAt($value);
break;
} // switch()
@@ -1210,8 +1480,11 @@ abstract class Stock implements ActiveRecordInterface
if (array_key_exists($keys[2], $arr)) $this->setProductId($arr[$keys[2]]);
if (array_key_exists($keys[3], $arr)) $this->setIncrease($arr[$keys[3]]);
if (array_key_exists($keys[4], $arr)) $this->setQuantity($arr[$keys[4]]);
- if (array_key_exists($keys[5], $arr)) $this->setCreatedAt($arr[$keys[5]]);
- if (array_key_exists($keys[6], $arr)) $this->setUpdatedAt($arr[$keys[6]]);
+ if (array_key_exists($keys[5], $arr)) $this->setPromo($arr[$keys[5]]);
+ if (array_key_exists($keys[6], $arr)) $this->setNewness($arr[$keys[6]]);
+ if (array_key_exists($keys[7], $arr)) $this->setWeight($arr[$keys[7]]);
+ if (array_key_exists($keys[8], $arr)) $this->setCreatedAt($arr[$keys[8]]);
+ if (array_key_exists($keys[9], $arr)) $this->setUpdatedAt($arr[$keys[9]]);
}
/**
@@ -1228,6 +1501,9 @@ abstract class Stock implements ActiveRecordInterface
if ($this->isColumnModified(StockTableMap::PRODUCT_ID)) $criteria->add(StockTableMap::PRODUCT_ID, $this->product_id);
if ($this->isColumnModified(StockTableMap::INCREASE)) $criteria->add(StockTableMap::INCREASE, $this->increase);
if ($this->isColumnModified(StockTableMap::QUANTITY)) $criteria->add(StockTableMap::QUANTITY, $this->quantity);
+ if ($this->isColumnModified(StockTableMap::PROMO)) $criteria->add(StockTableMap::PROMO, $this->promo);
+ if ($this->isColumnModified(StockTableMap::NEWNESS)) $criteria->add(StockTableMap::NEWNESS, $this->newness);
+ if ($this->isColumnModified(StockTableMap::WEIGHT)) $criteria->add(StockTableMap::WEIGHT, $this->weight);
if ($this->isColumnModified(StockTableMap::CREATED_AT)) $criteria->add(StockTableMap::CREATED_AT, $this->created_at);
if ($this->isColumnModified(StockTableMap::UPDATED_AT)) $criteria->add(StockTableMap::UPDATED_AT, $this->updated_at);
@@ -1297,8 +1573,37 @@ abstract class Stock implements ActiveRecordInterface
$copyObj->setProductId($this->getProductId());
$copyObj->setIncrease($this->getIncrease());
$copyObj->setQuantity($this->getQuantity());
+ $copyObj->setPromo($this->getPromo());
+ $copyObj->setNewness($this->getNewness());
+ $copyObj->setWeight($this->getWeight());
$copyObj->setCreatedAt($this->getCreatedAt());
$copyObj->setUpdatedAt($this->getUpdatedAt());
+
+ if ($deepCopy) {
+ // important: temporarily setNew(false) because this affects the behavior of
+ // the getter/setter methods for fkey referrer objects.
+ $copyObj->setNew(false);
+
+ foreach ($this->getAttributeCombinations() as $relObj) {
+ if ($relObj !== $this) { // ensure that we don't try to copy a reference to ourselves
+ $copyObj->addAttributeCombination($relObj->copy($deepCopy));
+ }
+ }
+
+ foreach ($this->getCartItems() as $relObj) {
+ if ($relObj !== $this) { // ensure that we don't try to copy a reference to ourselves
+ $copyObj->addCartItem($relObj->copy($deepCopy));
+ }
+ }
+
+ foreach ($this->getProductPrices() as $relObj) {
+ if ($relObj !== $this) { // ensure that we don't try to copy a reference to ourselves
+ $copyObj->addProductPrice($relObj->copy($deepCopy));
+ }
+ }
+
+ } // if ($deepCopy)
+
if ($makeNew) {
$copyObj->setNew(true);
$copyObj->setId(NULL); // this is a auto-increment column, so set to default value
@@ -1327,57 +1632,6 @@ abstract class Stock implements ActiveRecordInterface
return $copyObj;
}
- /**
- * Declares an association between this object and a ChildCombination object.
- *
- * @param ChildCombination $v
- * @return \Thelia\Model\Stock The current object (for fluent API support)
- * @throws PropelException
- */
- public function setCombination(ChildCombination $v = null)
- {
- if ($v === null) {
- $this->setCombinationId(NULL);
- } else {
- $this->setCombinationId($v->getId());
- }
-
- $this->aCombination = $v;
-
- // Add binding for other direction of this n:n relationship.
- // If this object has already been added to the ChildCombination object, it will not be re-added.
- if ($v !== null) {
- $v->addStock($this);
- }
-
-
- return $this;
- }
-
-
- /**
- * Get the associated ChildCombination object
- *
- * @param ConnectionInterface $con Optional Connection object.
- * @return ChildCombination The associated ChildCombination object.
- * @throws PropelException
- */
- public function getCombination(ConnectionInterface $con = null)
- {
- if ($this->aCombination === null && ($this->combination_id !== null)) {
- $this->aCombination = ChildCombinationQuery::create()->findPk($this->combination_id, $con);
- /* The following can be used additionally to
- guarantee the related object contains a reference
- to this object. This level of coupling may, however, be
- undesirable since it could result in an only partially populated collection
- in the referenced object.
- $this->aCombination->addStocks($this);
- */
- }
-
- return $this->aCombination;
- }
-
/**
* Declares an association between this object and a ChildProduct object.
*
@@ -1429,6 +1683,810 @@ abstract class Stock implements ActiveRecordInterface
return $this->aProduct;
}
+
+ /**
+ * Initializes a collection based on the name of a relation.
+ * Avoids crafting an 'init[$relationName]s' method name
+ * that wouldn't work when StandardEnglishPluralizer is used.
+ *
+ * @param string $relationName The name of the relation to initialize
+ * @return void
+ */
+ public function initRelation($relationName)
+ {
+ if ('AttributeCombination' == $relationName) {
+ return $this->initAttributeCombinations();
+ }
+ if ('CartItem' == $relationName) {
+ return $this->initCartItems();
+ }
+ if ('ProductPrice' == $relationName) {
+ return $this->initProductPrices();
+ }
+ }
+
+ /**
+ * Clears out the collAttributeCombinations collection
+ *
+ * This does not modify the database; however, it will remove any associated objects, causing
+ * them to be refetched by subsequent calls to accessor method.
+ *
+ * @return void
+ * @see addAttributeCombinations()
+ */
+ public function clearAttributeCombinations()
+ {
+ $this->collAttributeCombinations = null; // important to set this to NULL since that means it is uninitialized
+ }
+
+ /**
+ * Reset is the collAttributeCombinations collection loaded partially.
+ */
+ public function resetPartialAttributeCombinations($v = true)
+ {
+ $this->collAttributeCombinationsPartial = $v;
+ }
+
+ /**
+ * Initializes the collAttributeCombinations collection.
+ *
+ * By default this just sets the collAttributeCombinations collection to an empty array (like clearcollAttributeCombinations());
+ * however, you may wish to override this method in your stub class to provide setting appropriate
+ * to your application -- for example, setting the initial array to the values stored in database.
+ *
+ * @param boolean $overrideExisting If set to true, the method call initializes
+ * the collection even if it is not empty
+ *
+ * @return void
+ */
+ public function initAttributeCombinations($overrideExisting = true)
+ {
+ if (null !== $this->collAttributeCombinations && !$overrideExisting) {
+ return;
+ }
+ $this->collAttributeCombinations = new ObjectCollection();
+ $this->collAttributeCombinations->setModel('\Thelia\Model\AttributeCombination');
+ }
+
+ /**
+ * Gets an array of ChildAttributeCombination objects which contain a foreign key that references this object.
+ *
+ * If the $criteria is not null, it is used to always fetch the results from the database.
+ * Otherwise the results are fetched from the database the first time, then cached.
+ * Next time the same method is called without $criteria, the cached collection is returned.
+ * If this ChildStock is new, it will return
+ * an empty collection or the current collection; the criteria is ignored on a new object.
+ *
+ * @param Criteria $criteria optional Criteria object to narrow the query
+ * @param ConnectionInterface $con optional connection object
+ * @return Collection|ChildAttributeCombination[] List of ChildAttributeCombination objects
+ * @throws PropelException
+ */
+ public function getAttributeCombinations($criteria = null, ConnectionInterface $con = null)
+ {
+ $partial = $this->collAttributeCombinationsPartial && !$this->isNew();
+ if (null === $this->collAttributeCombinations || null !== $criteria || $partial) {
+ if ($this->isNew() && null === $this->collAttributeCombinations) {
+ // return empty collection
+ $this->initAttributeCombinations();
+ } else {
+ $collAttributeCombinations = ChildAttributeCombinationQuery::create(null, $criteria)
+ ->filterByStock($this)
+ ->find($con);
+
+ if (null !== $criteria) {
+ if (false !== $this->collAttributeCombinationsPartial && count($collAttributeCombinations)) {
+ $this->initAttributeCombinations(false);
+
+ foreach ($collAttributeCombinations as $obj) {
+ if (false == $this->collAttributeCombinations->contains($obj)) {
+ $this->collAttributeCombinations->append($obj);
+ }
+ }
+
+ $this->collAttributeCombinationsPartial = true;
+ }
+
+ $collAttributeCombinations->getInternalIterator()->rewind();
+
+ return $collAttributeCombinations;
+ }
+
+ if ($partial && $this->collAttributeCombinations) {
+ foreach ($this->collAttributeCombinations as $obj) {
+ if ($obj->isNew()) {
+ $collAttributeCombinations[] = $obj;
+ }
+ }
+ }
+
+ $this->collAttributeCombinations = $collAttributeCombinations;
+ $this->collAttributeCombinationsPartial = false;
+ }
+ }
+
+ return $this->collAttributeCombinations;
+ }
+
+ /**
+ * Sets a collection of AttributeCombination objects related by a one-to-many relationship
+ * to the current object.
+ * It will also schedule objects for deletion based on a diff between old objects (aka persisted)
+ * and new objects from the given Propel collection.
+ *
+ * @param Collection $attributeCombinations A Propel collection.
+ * @param ConnectionInterface $con Optional connection object
+ * @return ChildStock The current object (for fluent API support)
+ */
+ public function setAttributeCombinations(Collection $attributeCombinations, ConnectionInterface $con = null)
+ {
+ $attributeCombinationsToDelete = $this->getAttributeCombinations(new Criteria(), $con)->diff($attributeCombinations);
+
+
+ //since at least one column in the foreign key is at the same time a PK
+ //we can not just set a PK to NULL in the lines below. We have to store
+ //a backup of all values, so we are able to manipulate these items based on the onDelete value later.
+ $this->attributeCombinationsScheduledForDeletion = clone $attributeCombinationsToDelete;
+
+ foreach ($attributeCombinationsToDelete as $attributeCombinationRemoved) {
+ $attributeCombinationRemoved->setStock(null);
+ }
+
+ $this->collAttributeCombinations = null;
+ foreach ($attributeCombinations as $attributeCombination) {
+ $this->addAttributeCombination($attributeCombination);
+ }
+
+ $this->collAttributeCombinations = $attributeCombinations;
+ $this->collAttributeCombinationsPartial = false;
+
+ return $this;
+ }
+
+ /**
+ * Returns the number of related AttributeCombination objects.
+ *
+ * @param Criteria $criteria
+ * @param boolean $distinct
+ * @param ConnectionInterface $con
+ * @return int Count of related AttributeCombination objects.
+ * @throws PropelException
+ */
+ public function countAttributeCombinations(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null)
+ {
+ $partial = $this->collAttributeCombinationsPartial && !$this->isNew();
+ if (null === $this->collAttributeCombinations || null !== $criteria || $partial) {
+ if ($this->isNew() && null === $this->collAttributeCombinations) {
+ return 0;
+ }
+
+ if ($partial && !$criteria) {
+ return count($this->getAttributeCombinations());
+ }
+
+ $query = ChildAttributeCombinationQuery::create(null, $criteria);
+ if ($distinct) {
+ $query->distinct();
+ }
+
+ return $query
+ ->filterByStock($this)
+ ->count($con);
+ }
+
+ return count($this->collAttributeCombinations);
+ }
+
+ /**
+ * Method called to associate a ChildAttributeCombination object to this object
+ * through the ChildAttributeCombination foreign key attribute.
+ *
+ * @param ChildAttributeCombination $l ChildAttributeCombination
+ * @return \Thelia\Model\Stock The current object (for fluent API support)
+ */
+ public function addAttributeCombination(ChildAttributeCombination $l)
+ {
+ if ($this->collAttributeCombinations === null) {
+ $this->initAttributeCombinations();
+ $this->collAttributeCombinationsPartial = true;
+ }
+
+ if (!in_array($l, $this->collAttributeCombinations->getArrayCopy(), true)) { // only add it if the **same** object is not already associated
+ $this->doAddAttributeCombination($l);
+ }
+
+ return $this;
+ }
+
+ /**
+ * @param AttributeCombination $attributeCombination The attributeCombination object to add.
+ */
+ protected function doAddAttributeCombination($attributeCombination)
+ {
+ $this->collAttributeCombinations[]= $attributeCombination;
+ $attributeCombination->setStock($this);
+ }
+
+ /**
+ * @param AttributeCombination $attributeCombination The attributeCombination object to remove.
+ * @return ChildStock The current object (for fluent API support)
+ */
+ public function removeAttributeCombination($attributeCombination)
+ {
+ if ($this->getAttributeCombinations()->contains($attributeCombination)) {
+ $this->collAttributeCombinations->remove($this->collAttributeCombinations->search($attributeCombination));
+ if (null === $this->attributeCombinationsScheduledForDeletion) {
+ $this->attributeCombinationsScheduledForDeletion = clone $this->collAttributeCombinations;
+ $this->attributeCombinationsScheduledForDeletion->clear();
+ }
+ $this->attributeCombinationsScheduledForDeletion[]= clone $attributeCombination;
+ $attributeCombination->setStock(null);
+ }
+
+ return $this;
+ }
+
+
+ /**
+ * If this collection has already been initialized with
+ * an identical criteria, it returns the collection.
+ * Otherwise if this Stock is new, it will return
+ * an empty collection; or if this Stock has previously
+ * been saved, it will retrieve related AttributeCombinations from storage.
+ *
+ * This method is protected by default in order to keep the public
+ * api reasonable. You can provide public methods for those you
+ * actually need in Stock.
+ *
+ * @param Criteria $criteria optional Criteria object to narrow the query
+ * @param ConnectionInterface $con optional connection object
+ * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN)
+ * @return Collection|ChildAttributeCombination[] List of ChildAttributeCombination objects
+ */
+ public function getAttributeCombinationsJoinAttribute($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN)
+ {
+ $query = ChildAttributeCombinationQuery::create(null, $criteria);
+ $query->joinWith('Attribute', $joinBehavior);
+
+ return $this->getAttributeCombinations($query, $con);
+ }
+
+
+ /**
+ * If this collection has already been initialized with
+ * an identical criteria, it returns the collection.
+ * Otherwise if this Stock is new, it will return
+ * an empty collection; or if this Stock has previously
+ * been saved, it will retrieve related AttributeCombinations from storage.
+ *
+ * This method is protected by default in order to keep the public
+ * api reasonable. You can provide public methods for those you
+ * actually need in Stock.
+ *
+ * @param Criteria $criteria optional Criteria object to narrow the query
+ * @param ConnectionInterface $con optional connection object
+ * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN)
+ * @return Collection|ChildAttributeCombination[] List of ChildAttributeCombination objects
+ */
+ public function getAttributeCombinationsJoinAttributeAv($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN)
+ {
+ $query = ChildAttributeCombinationQuery::create(null, $criteria);
+ $query->joinWith('AttributeAv', $joinBehavior);
+
+ return $this->getAttributeCombinations($query, $con);
+ }
+
+ /**
+ * Clears out the collCartItems collection
+ *
+ * This does not modify the database; however, it will remove any associated objects, causing
+ * them to be refetched by subsequent calls to accessor method.
+ *
+ * @return void
+ * @see addCartItems()
+ */
+ public function clearCartItems()
+ {
+ $this->collCartItems = null; // important to set this to NULL since that means it is uninitialized
+ }
+
+ /**
+ * Reset is the collCartItems collection loaded partially.
+ */
+ public function resetPartialCartItems($v = true)
+ {
+ $this->collCartItemsPartial = $v;
+ }
+
+ /**
+ * Initializes the collCartItems collection.
+ *
+ * By default this just sets the collCartItems collection to an empty array (like clearcollCartItems());
+ * however, you may wish to override this method in your stub class to provide setting appropriate
+ * to your application -- for example, setting the initial array to the values stored in database.
+ *
+ * @param boolean $overrideExisting If set to true, the method call initializes
+ * the collection even if it is not empty
+ *
+ * @return void
+ */
+ public function initCartItems($overrideExisting = true)
+ {
+ if (null !== $this->collCartItems && !$overrideExisting) {
+ return;
+ }
+ $this->collCartItems = new ObjectCollection();
+ $this->collCartItems->setModel('\Thelia\Model\CartItem');
+ }
+
+ /**
+ * Gets an array of ChildCartItem objects which contain a foreign key that references this object.
+ *
+ * If the $criteria is not null, it is used to always fetch the results from the database.
+ * Otherwise the results are fetched from the database the first time, then cached.
+ * Next time the same method is called without $criteria, the cached collection is returned.
+ * If this ChildStock is new, it will return
+ * an empty collection or the current collection; the criteria is ignored on a new object.
+ *
+ * @param Criteria $criteria optional Criteria object to narrow the query
+ * @param ConnectionInterface $con optional connection object
+ * @return Collection|ChildCartItem[] List of ChildCartItem objects
+ * @throws PropelException
+ */
+ public function getCartItems($criteria = null, ConnectionInterface $con = null)
+ {
+ $partial = $this->collCartItemsPartial && !$this->isNew();
+ if (null === $this->collCartItems || null !== $criteria || $partial) {
+ if ($this->isNew() && null === $this->collCartItems) {
+ // return empty collection
+ $this->initCartItems();
+ } else {
+ $collCartItems = ChildCartItemQuery::create(null, $criteria)
+ ->filterByStock($this)
+ ->find($con);
+
+ if (null !== $criteria) {
+ if (false !== $this->collCartItemsPartial && count($collCartItems)) {
+ $this->initCartItems(false);
+
+ foreach ($collCartItems as $obj) {
+ if (false == $this->collCartItems->contains($obj)) {
+ $this->collCartItems->append($obj);
+ }
+ }
+
+ $this->collCartItemsPartial = true;
+ }
+
+ $collCartItems->getInternalIterator()->rewind();
+
+ return $collCartItems;
+ }
+
+ if ($partial && $this->collCartItems) {
+ foreach ($this->collCartItems as $obj) {
+ if ($obj->isNew()) {
+ $collCartItems[] = $obj;
+ }
+ }
+ }
+
+ $this->collCartItems = $collCartItems;
+ $this->collCartItemsPartial = false;
+ }
+ }
+
+ return $this->collCartItems;
+ }
+
+ /**
+ * Sets a collection of CartItem objects related by a one-to-many relationship
+ * to the current object.
+ * It will also schedule objects for deletion based on a diff between old objects (aka persisted)
+ * and new objects from the given Propel collection.
+ *
+ * @param Collection $cartItems A Propel collection.
+ * @param ConnectionInterface $con Optional connection object
+ * @return ChildStock The current object (for fluent API support)
+ */
+ public function setCartItems(Collection $cartItems, ConnectionInterface $con = null)
+ {
+ $cartItemsToDelete = $this->getCartItems(new Criteria(), $con)->diff($cartItems);
+
+
+ $this->cartItemsScheduledForDeletion = $cartItemsToDelete;
+
+ foreach ($cartItemsToDelete as $cartItemRemoved) {
+ $cartItemRemoved->setStock(null);
+ }
+
+ $this->collCartItems = null;
+ foreach ($cartItems as $cartItem) {
+ $this->addCartItem($cartItem);
+ }
+
+ $this->collCartItems = $cartItems;
+ $this->collCartItemsPartial = false;
+
+ return $this;
+ }
+
+ /**
+ * Returns the number of related CartItem objects.
+ *
+ * @param Criteria $criteria
+ * @param boolean $distinct
+ * @param ConnectionInterface $con
+ * @return int Count of related CartItem objects.
+ * @throws PropelException
+ */
+ public function countCartItems(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null)
+ {
+ $partial = $this->collCartItemsPartial && !$this->isNew();
+ if (null === $this->collCartItems || null !== $criteria || $partial) {
+ if ($this->isNew() && null === $this->collCartItems) {
+ return 0;
+ }
+
+ if ($partial && !$criteria) {
+ return count($this->getCartItems());
+ }
+
+ $query = ChildCartItemQuery::create(null, $criteria);
+ if ($distinct) {
+ $query->distinct();
+ }
+
+ return $query
+ ->filterByStock($this)
+ ->count($con);
+ }
+
+ return count($this->collCartItems);
+ }
+
+ /**
+ * Method called to associate a ChildCartItem object to this object
+ * through the ChildCartItem foreign key attribute.
+ *
+ * @param ChildCartItem $l ChildCartItem
+ * @return \Thelia\Model\Stock The current object (for fluent API support)
+ */
+ public function addCartItem(ChildCartItem $l)
+ {
+ if ($this->collCartItems === null) {
+ $this->initCartItems();
+ $this->collCartItemsPartial = true;
+ }
+
+ if (!in_array($l, $this->collCartItems->getArrayCopy(), true)) { // only add it if the **same** object is not already associated
+ $this->doAddCartItem($l);
+ }
+
+ return $this;
+ }
+
+ /**
+ * @param CartItem $cartItem The cartItem object to add.
+ */
+ protected function doAddCartItem($cartItem)
+ {
+ $this->collCartItems[]= $cartItem;
+ $cartItem->setStock($this);
+ }
+
+ /**
+ * @param CartItem $cartItem The cartItem object to remove.
+ * @return ChildStock The current object (for fluent API support)
+ */
+ public function removeCartItem($cartItem)
+ {
+ if ($this->getCartItems()->contains($cartItem)) {
+ $this->collCartItems->remove($this->collCartItems->search($cartItem));
+ if (null === $this->cartItemsScheduledForDeletion) {
+ $this->cartItemsScheduledForDeletion = clone $this->collCartItems;
+ $this->cartItemsScheduledForDeletion->clear();
+ }
+ $this->cartItemsScheduledForDeletion[]= clone $cartItem;
+ $cartItem->setStock(null);
+ }
+
+ return $this;
+ }
+
+
+ /**
+ * If this collection has already been initialized with
+ * an identical criteria, it returns the collection.
+ * Otherwise if this Stock is new, it will return
+ * an empty collection; or if this Stock has previously
+ * been saved, it will retrieve related CartItems from storage.
+ *
+ * This method is protected by default in order to keep the public
+ * api reasonable. You can provide public methods for those you
+ * actually need in Stock.
+ *
+ * @param Criteria $criteria optional Criteria object to narrow the query
+ * @param ConnectionInterface $con optional connection object
+ * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN)
+ * @return Collection|ChildCartItem[] List of ChildCartItem objects
+ */
+ public function getCartItemsJoinCart($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN)
+ {
+ $query = ChildCartItemQuery::create(null, $criteria);
+ $query->joinWith('Cart', $joinBehavior);
+
+ return $this->getCartItems($query, $con);
+ }
+
+
+ /**
+ * If this collection has already been initialized with
+ * an identical criteria, it returns the collection.
+ * Otherwise if this Stock is new, it will return
+ * an empty collection; or if this Stock has previously
+ * been saved, it will retrieve related CartItems from storage.
+ *
+ * This method is protected by default in order to keep the public
+ * api reasonable. You can provide public methods for those you
+ * actually need in Stock.
+ *
+ * @param Criteria $criteria optional Criteria object to narrow the query
+ * @param ConnectionInterface $con optional connection object
+ * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN)
+ * @return Collection|ChildCartItem[] List of ChildCartItem objects
+ */
+ public function getCartItemsJoinProduct($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN)
+ {
+ $query = ChildCartItemQuery::create(null, $criteria);
+ $query->joinWith('Product', $joinBehavior);
+
+ return $this->getCartItems($query, $con);
+ }
+
+ /**
+ * Clears out the collProductPrices collection
+ *
+ * This does not modify the database; however, it will remove any associated objects, causing
+ * them to be refetched by subsequent calls to accessor method.
+ *
+ * @return void
+ * @see addProductPrices()
+ */
+ public function clearProductPrices()
+ {
+ $this->collProductPrices = null; // important to set this to NULL since that means it is uninitialized
+ }
+
+ /**
+ * Reset is the collProductPrices collection loaded partially.
+ */
+ public function resetPartialProductPrices($v = true)
+ {
+ $this->collProductPricesPartial = $v;
+ }
+
+ /**
+ * Initializes the collProductPrices collection.
+ *
+ * By default this just sets the collProductPrices collection to an empty array (like clearcollProductPrices());
+ * however, you may wish to override this method in your stub class to provide setting appropriate
+ * to your application -- for example, setting the initial array to the values stored in database.
+ *
+ * @param boolean $overrideExisting If set to true, the method call initializes
+ * the collection even if it is not empty
+ *
+ * @return void
+ */
+ public function initProductPrices($overrideExisting = true)
+ {
+ if (null !== $this->collProductPrices && !$overrideExisting) {
+ return;
+ }
+ $this->collProductPrices = new ObjectCollection();
+ $this->collProductPrices->setModel('\Thelia\Model\ProductPrice');
+ }
+
+ /**
+ * Gets an array of ChildProductPrice objects which contain a foreign key that references this object.
+ *
+ * If the $criteria is not null, it is used to always fetch the results from the database.
+ * Otherwise the results are fetched from the database the first time, then cached.
+ * Next time the same method is called without $criteria, the cached collection is returned.
+ * If this ChildStock is new, it will return
+ * an empty collection or the current collection; the criteria is ignored on a new object.
+ *
+ * @param Criteria $criteria optional Criteria object to narrow the query
+ * @param ConnectionInterface $con optional connection object
+ * @return Collection|ChildProductPrice[] List of ChildProductPrice objects
+ * @throws PropelException
+ */
+ public function getProductPrices($criteria = null, ConnectionInterface $con = null)
+ {
+ $partial = $this->collProductPricesPartial && !$this->isNew();
+ if (null === $this->collProductPrices || null !== $criteria || $partial) {
+ if ($this->isNew() && null === $this->collProductPrices) {
+ // return empty collection
+ $this->initProductPrices();
+ } else {
+ $collProductPrices = ChildProductPriceQuery::create(null, $criteria)
+ ->filterByStock($this)
+ ->find($con);
+
+ if (null !== $criteria) {
+ if (false !== $this->collProductPricesPartial && count($collProductPrices)) {
+ $this->initProductPrices(false);
+
+ foreach ($collProductPrices as $obj) {
+ if (false == $this->collProductPrices->contains($obj)) {
+ $this->collProductPrices->append($obj);
+ }
+ }
+
+ $this->collProductPricesPartial = true;
+ }
+
+ $collProductPrices->getInternalIterator()->rewind();
+
+ return $collProductPrices;
+ }
+
+ if ($partial && $this->collProductPrices) {
+ foreach ($this->collProductPrices as $obj) {
+ if ($obj->isNew()) {
+ $collProductPrices[] = $obj;
+ }
+ }
+ }
+
+ $this->collProductPrices = $collProductPrices;
+ $this->collProductPricesPartial = false;
+ }
+ }
+
+ return $this->collProductPrices;
+ }
+
+ /**
+ * Sets a collection of ProductPrice objects related by a one-to-many relationship
+ * to the current object.
+ * It will also schedule objects for deletion based on a diff between old objects (aka persisted)
+ * and new objects from the given Propel collection.
+ *
+ * @param Collection $productPrices A Propel collection.
+ * @param ConnectionInterface $con Optional connection object
+ * @return ChildStock The current object (for fluent API support)
+ */
+ public function setProductPrices(Collection $productPrices, ConnectionInterface $con = null)
+ {
+ $productPricesToDelete = $this->getProductPrices(new Criteria(), $con)->diff($productPrices);
+
+
+ $this->productPricesScheduledForDeletion = $productPricesToDelete;
+
+ foreach ($productPricesToDelete as $productPriceRemoved) {
+ $productPriceRemoved->setStock(null);
+ }
+
+ $this->collProductPrices = null;
+ foreach ($productPrices as $productPrice) {
+ $this->addProductPrice($productPrice);
+ }
+
+ $this->collProductPrices = $productPrices;
+ $this->collProductPricesPartial = false;
+
+ return $this;
+ }
+
+ /**
+ * Returns the number of related ProductPrice objects.
+ *
+ * @param Criteria $criteria
+ * @param boolean $distinct
+ * @param ConnectionInterface $con
+ * @return int Count of related ProductPrice objects.
+ * @throws PropelException
+ */
+ public function countProductPrices(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null)
+ {
+ $partial = $this->collProductPricesPartial && !$this->isNew();
+ if (null === $this->collProductPrices || null !== $criteria || $partial) {
+ if ($this->isNew() && null === $this->collProductPrices) {
+ return 0;
+ }
+
+ if ($partial && !$criteria) {
+ return count($this->getProductPrices());
+ }
+
+ $query = ChildProductPriceQuery::create(null, $criteria);
+ if ($distinct) {
+ $query->distinct();
+ }
+
+ return $query
+ ->filterByStock($this)
+ ->count($con);
+ }
+
+ return count($this->collProductPrices);
+ }
+
+ /**
+ * Method called to associate a ChildProductPrice object to this object
+ * through the ChildProductPrice foreign key attribute.
+ *
+ * @param ChildProductPrice $l ChildProductPrice
+ * @return \Thelia\Model\Stock The current object (for fluent API support)
+ */
+ public function addProductPrice(ChildProductPrice $l)
+ {
+ if ($this->collProductPrices === null) {
+ $this->initProductPrices();
+ $this->collProductPricesPartial = true;
+ }
+
+ if (!in_array($l, $this->collProductPrices->getArrayCopy(), true)) { // only add it if the **same** object is not already associated
+ $this->doAddProductPrice($l);
+ }
+
+ return $this;
+ }
+
+ /**
+ * @param ProductPrice $productPrice The productPrice object to add.
+ */
+ protected function doAddProductPrice($productPrice)
+ {
+ $this->collProductPrices[]= $productPrice;
+ $productPrice->setStock($this);
+ }
+
+ /**
+ * @param ProductPrice $productPrice The productPrice object to remove.
+ * @return ChildStock The current object (for fluent API support)
+ */
+ public function removeProductPrice($productPrice)
+ {
+ if ($this->getProductPrices()->contains($productPrice)) {
+ $this->collProductPrices->remove($this->collProductPrices->search($productPrice));
+ if (null === $this->productPricesScheduledForDeletion) {
+ $this->productPricesScheduledForDeletion = clone $this->collProductPrices;
+ $this->productPricesScheduledForDeletion->clear();
+ }
+ $this->productPricesScheduledForDeletion[]= clone $productPrice;
+ $productPrice->setStock(null);
+ }
+
+ return $this;
+ }
+
+
+ /**
+ * If this collection has already been initialized with
+ * an identical criteria, it returns the collection.
+ * Otherwise if this Stock is new, it will return
+ * an empty collection; or if this Stock has previously
+ * been saved, it will retrieve related ProductPrices from storage.
+ *
+ * This method is protected by default in order to keep the public
+ * api reasonable. You can provide public methods for those you
+ * actually need in Stock.
+ *
+ * @param Criteria $criteria optional Criteria object to narrow the query
+ * @param ConnectionInterface $con optional connection object
+ * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN)
+ * @return Collection|ChildProductPrice[] List of ChildProductPrice objects
+ */
+ public function getProductPricesJoinCurrency($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN)
+ {
+ $query = ChildProductPriceQuery::create(null, $criteria);
+ $query->joinWith('Currency', $joinBehavior);
+
+ return $this->getProductPrices($query, $con);
+ }
+
/**
* Clears the current object and sets all attributes to their default values
*/
@@ -1439,10 +2497,14 @@ abstract class Stock implements ActiveRecordInterface
$this->product_id = null;
$this->increase = null;
$this->quantity = null;
+ $this->promo = null;
+ $this->newness = null;
+ $this->weight = null;
$this->created_at = null;
$this->updated_at = null;
$this->alreadyInSave = false;
$this->clearAllReferences();
+ $this->applyDefaultValues();
$this->resetModified();
$this->setNew(true);
$this->setDeleted(false);
@@ -1460,9 +2522,35 @@ abstract class Stock implements ActiveRecordInterface
public function clearAllReferences($deep = false)
{
if ($deep) {
+ if ($this->collAttributeCombinations) {
+ foreach ($this->collAttributeCombinations as $o) {
+ $o->clearAllReferences($deep);
+ }
+ }
+ if ($this->collCartItems) {
+ foreach ($this->collCartItems as $o) {
+ $o->clearAllReferences($deep);
+ }
+ }
+ if ($this->collProductPrices) {
+ foreach ($this->collProductPrices as $o) {
+ $o->clearAllReferences($deep);
+ }
+ }
} // if ($deep)
- $this->aCombination = null;
+ if ($this->collAttributeCombinations instanceof Collection) {
+ $this->collAttributeCombinations->clearIterator();
+ }
+ $this->collAttributeCombinations = null;
+ if ($this->collCartItems instanceof Collection) {
+ $this->collCartItems->clearIterator();
+ }
+ $this->collCartItems = null;
+ if ($this->collProductPrices instanceof Collection) {
+ $this->collProductPrices->clearIterator();
+ }
+ $this->collProductPrices = null;
$this->aProduct = null;
}
diff --git a/core/lib/Thelia/Model/Base/StockQuery.php b/core/lib/Thelia/Model/Base/StockQuery.php
index 6a11b591d..4a8637c28 100755
--- a/core/lib/Thelia/Model/Base/StockQuery.php
+++ b/core/lib/Thelia/Model/Base/StockQuery.php
@@ -26,6 +26,9 @@ use Thelia\Model\Map\StockTableMap;
* @method ChildStockQuery orderByProductId($order = Criteria::ASC) Order by the product_id column
* @method ChildStockQuery orderByIncrease($order = Criteria::ASC) Order by the increase column
* @method ChildStockQuery orderByQuantity($order = Criteria::ASC) Order by the quantity column
+ * @method ChildStockQuery orderByPromo($order = Criteria::ASC) Order by the promo column
+ * @method ChildStockQuery orderByNewness($order = Criteria::ASC) Order by the newness column
+ * @method ChildStockQuery orderByWeight($order = Criteria::ASC) Order by the weight column
* @method ChildStockQuery orderByCreatedAt($order = Criteria::ASC) Order by the created_at column
* @method ChildStockQuery orderByUpdatedAt($order = Criteria::ASC) Order by the updated_at column
*
@@ -34,6 +37,9 @@ use Thelia\Model\Map\StockTableMap;
* @method ChildStockQuery groupByProductId() Group by the product_id column
* @method ChildStockQuery groupByIncrease() Group by the increase column
* @method ChildStockQuery groupByQuantity() Group by the quantity column
+ * @method ChildStockQuery groupByPromo() Group by the promo column
+ * @method ChildStockQuery groupByNewness() Group by the newness column
+ * @method ChildStockQuery groupByWeight() Group by the weight column
* @method ChildStockQuery groupByCreatedAt() Group by the created_at column
* @method ChildStockQuery groupByUpdatedAt() Group by the updated_at column
*
@@ -41,14 +47,22 @@ use Thelia\Model\Map\StockTableMap;
* @method ChildStockQuery rightJoin($relation) Adds a RIGHT JOIN clause to the query
* @method ChildStockQuery innerJoin($relation) Adds a INNER JOIN clause to the query
*
- * @method ChildStockQuery leftJoinCombination($relationAlias = null) Adds a LEFT JOIN clause to the query using the Combination relation
- * @method ChildStockQuery rightJoinCombination($relationAlias = null) Adds a RIGHT JOIN clause to the query using the Combination relation
- * @method ChildStockQuery innerJoinCombination($relationAlias = null) Adds a INNER JOIN clause to the query using the Combination relation
- *
* @method ChildStockQuery leftJoinProduct($relationAlias = null) Adds a LEFT JOIN clause to the query using the Product relation
* @method ChildStockQuery rightJoinProduct($relationAlias = null) Adds a RIGHT JOIN clause to the query using the Product relation
* @method ChildStockQuery innerJoinProduct($relationAlias = null) Adds a INNER JOIN clause to the query using the Product relation
*
+ * @method ChildStockQuery leftJoinAttributeCombination($relationAlias = null) Adds a LEFT JOIN clause to the query using the AttributeCombination relation
+ * @method ChildStockQuery rightJoinAttributeCombination($relationAlias = null) Adds a RIGHT JOIN clause to the query using the AttributeCombination relation
+ * @method ChildStockQuery innerJoinAttributeCombination($relationAlias = null) Adds a INNER JOIN clause to the query using the AttributeCombination relation
+ *
+ * @method ChildStockQuery leftJoinCartItem($relationAlias = null) Adds a LEFT JOIN clause to the query using the CartItem relation
+ * @method ChildStockQuery rightJoinCartItem($relationAlias = null) Adds a RIGHT JOIN clause to the query using the CartItem relation
+ * @method ChildStockQuery innerJoinCartItem($relationAlias = null) Adds a INNER JOIN clause to the query using the CartItem relation
+ *
+ * @method ChildStockQuery leftJoinProductPrice($relationAlias = null) Adds a LEFT JOIN clause to the query using the ProductPrice relation
+ * @method ChildStockQuery rightJoinProductPrice($relationAlias = null) Adds a RIGHT JOIN clause to the query using the ProductPrice relation
+ * @method ChildStockQuery innerJoinProductPrice($relationAlias = null) Adds a INNER JOIN clause to the query using the ProductPrice relation
+ *
* @method ChildStock findOne(ConnectionInterface $con = null) Return the first ChildStock matching the query
* @method ChildStock findOneOrCreate(ConnectionInterface $con = null) Return the first ChildStock matching the query, or a new ChildStock object populated from the query conditions when no match is found
*
@@ -57,6 +71,9 @@ use Thelia\Model\Map\StockTableMap;
* @method ChildStock findOneByProductId(int $product_id) Return the first ChildStock filtered by the product_id column
* @method ChildStock findOneByIncrease(double $increase) Return the first ChildStock filtered by the increase column
* @method ChildStock findOneByQuantity(double $quantity) Return the first ChildStock filtered by the quantity column
+ * @method ChildStock findOneByPromo(int $promo) Return the first ChildStock filtered by the promo column
+ * @method ChildStock findOneByNewness(int $newness) Return the first ChildStock filtered by the newness column
+ * @method ChildStock findOneByWeight(double $weight) Return the first ChildStock filtered by the weight column
* @method ChildStock findOneByCreatedAt(string $created_at) Return the first ChildStock filtered by the created_at column
* @method ChildStock findOneByUpdatedAt(string $updated_at) Return the first ChildStock filtered by the updated_at column
*
@@ -65,6 +82,9 @@ use Thelia\Model\Map\StockTableMap;
* @method array findByProductId(int $product_id) Return ChildStock objects filtered by the product_id column
* @method array findByIncrease(double $increase) Return ChildStock objects filtered by the increase column
* @method array findByQuantity(double $quantity) Return ChildStock objects filtered by the quantity column
+ * @method array findByPromo(int $promo) Return ChildStock objects filtered by the promo column
+ * @method array findByNewness(int $newness) Return ChildStock objects filtered by the newness column
+ * @method array findByWeight(double $weight) Return ChildStock objects filtered by the weight column
* @method array findByCreatedAt(string $created_at) Return ChildStock objects filtered by the created_at column
* @method array findByUpdatedAt(string $updated_at) Return ChildStock objects filtered by the updated_at column
*
@@ -155,7 +175,7 @@ abstract class StockQuery extends ModelCriteria
*/
protected function findPkSimple($key, $con)
{
- $sql = 'SELECT ID, COMBINATION_ID, PRODUCT_ID, INCREASE, QUANTITY, CREATED_AT, UPDATED_AT FROM stock WHERE ID = :p0';
+ $sql = 'SELECT ID, COMBINATION_ID, PRODUCT_ID, INCREASE, QUANTITY, PROMO, NEWNESS, WEIGHT, CREATED_AT, UPDATED_AT FROM stock WHERE ID = :p0';
try {
$stmt = $con->prepare($sql);
$stmt->bindValue(':p0', $key, PDO::PARAM_INT);
@@ -295,8 +315,6 @@ abstract class StockQuery extends ModelCriteria
* $query->filterByCombinationId(array('min' => 12)); // WHERE combination_id > 12
*
*
- * @see filterByCombination()
- *
* @param mixed $combinationId The value to use as filter.
* Use scalar values for equality.
* Use array values for in_array() equivalent.
@@ -453,6 +471,129 @@ abstract class StockQuery extends ModelCriteria
return $this->addUsingAlias(StockTableMap::QUANTITY, $quantity, $comparison);
}
+ /**
+ * Filter the query on the promo column
+ *
+ * Example usage:
+ *
+ * $query->filterByPromo(1234); // WHERE promo = 1234
+ * $query->filterByPromo(array(12, 34)); // WHERE promo IN (12, 34)
+ * $query->filterByPromo(array('min' => 12)); // WHERE promo > 12
+ *
+ *
+ * @param mixed $promo The value to use as filter.
+ * Use scalar values for equality.
+ * Use array values for in_array() equivalent.
+ * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+ * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+ *
+ * @return ChildStockQuery The current query, for fluid interface
+ */
+ public function filterByPromo($promo = null, $comparison = null)
+ {
+ if (is_array($promo)) {
+ $useMinMax = false;
+ if (isset($promo['min'])) {
+ $this->addUsingAlias(StockTableMap::PROMO, $promo['min'], Criteria::GREATER_EQUAL);
+ $useMinMax = true;
+ }
+ if (isset($promo['max'])) {
+ $this->addUsingAlias(StockTableMap::PROMO, $promo['max'], Criteria::LESS_EQUAL);
+ $useMinMax = true;
+ }
+ if ($useMinMax) {
+ return $this;
+ }
+ if (null === $comparison) {
+ $comparison = Criteria::IN;
+ }
+ }
+
+ return $this->addUsingAlias(StockTableMap::PROMO, $promo, $comparison);
+ }
+
+ /**
+ * Filter the query on the newness column
+ *
+ * Example usage:
+ *
+ * $query->filterByNewness(1234); // WHERE newness = 1234
+ * $query->filterByNewness(array(12, 34)); // WHERE newness IN (12, 34)
+ * $query->filterByNewness(array('min' => 12)); // WHERE newness > 12
+ *
+ *
+ * @param mixed $newness The value to use as filter.
+ * Use scalar values for equality.
+ * Use array values for in_array() equivalent.
+ * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+ * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+ *
+ * @return ChildStockQuery The current query, for fluid interface
+ */
+ public function filterByNewness($newness = null, $comparison = null)
+ {
+ if (is_array($newness)) {
+ $useMinMax = false;
+ if (isset($newness['min'])) {
+ $this->addUsingAlias(StockTableMap::NEWNESS, $newness['min'], Criteria::GREATER_EQUAL);
+ $useMinMax = true;
+ }
+ if (isset($newness['max'])) {
+ $this->addUsingAlias(StockTableMap::NEWNESS, $newness['max'], Criteria::LESS_EQUAL);
+ $useMinMax = true;
+ }
+ if ($useMinMax) {
+ return $this;
+ }
+ if (null === $comparison) {
+ $comparison = Criteria::IN;
+ }
+ }
+
+ return $this->addUsingAlias(StockTableMap::NEWNESS, $newness, $comparison);
+ }
+
+ /**
+ * Filter the query on the weight column
+ *
+ * Example usage:
+ *
+ * $query->filterByWeight(1234); // WHERE weight = 1234
+ * $query->filterByWeight(array(12, 34)); // WHERE weight IN (12, 34)
+ * $query->filterByWeight(array('min' => 12)); // WHERE weight > 12
+ *
+ *
+ * @param mixed $weight The value to use as filter.
+ * Use scalar values for equality.
+ * Use array values for in_array() equivalent.
+ * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+ * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+ *
+ * @return ChildStockQuery The current query, for fluid interface
+ */
+ public function filterByWeight($weight = null, $comparison = null)
+ {
+ if (is_array($weight)) {
+ $useMinMax = false;
+ if (isset($weight['min'])) {
+ $this->addUsingAlias(StockTableMap::WEIGHT, $weight['min'], Criteria::GREATER_EQUAL);
+ $useMinMax = true;
+ }
+ if (isset($weight['max'])) {
+ $this->addUsingAlias(StockTableMap::WEIGHT, $weight['max'], Criteria::LESS_EQUAL);
+ $useMinMax = true;
+ }
+ if ($useMinMax) {
+ return $this;
+ }
+ if (null === $comparison) {
+ $comparison = Criteria::IN;
+ }
+ }
+
+ return $this->addUsingAlias(StockTableMap::WEIGHT, $weight, $comparison);
+ }
+
/**
* Filter the query on the created_at column
*
@@ -539,81 +680,6 @@ abstract class StockQuery extends ModelCriteria
return $this->addUsingAlias(StockTableMap::UPDATED_AT, $updatedAt, $comparison);
}
- /**
- * Filter the query by a related \Thelia\Model\Combination object
- *
- * @param \Thelia\Model\Combination|ObjectCollection $combination The related object(s) to use as filter
- * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
- *
- * @return ChildStockQuery The current query, for fluid interface
- */
- public function filterByCombination($combination, $comparison = null)
- {
- if ($combination instanceof \Thelia\Model\Combination) {
- return $this
- ->addUsingAlias(StockTableMap::COMBINATION_ID, $combination->getId(), $comparison);
- } elseif ($combination instanceof ObjectCollection) {
- if (null === $comparison) {
- $comparison = Criteria::IN;
- }
-
- return $this
- ->addUsingAlias(StockTableMap::COMBINATION_ID, $combination->toKeyValue('PrimaryKey', 'Id'), $comparison);
- } else {
- throw new PropelException('filterByCombination() only accepts arguments of type \Thelia\Model\Combination or Collection');
- }
- }
-
- /**
- * Adds a JOIN clause to the query using the Combination relation
- *
- * @param string $relationAlias optional alias for the relation
- * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
- *
- * @return ChildStockQuery The current query, for fluid interface
- */
- public function joinCombination($relationAlias = null, $joinType = Criteria::LEFT_JOIN)
- {
- $tableMap = $this->getTableMap();
- $relationMap = $tableMap->getRelation('Combination');
-
- // create a ModelJoin object for this join
- $join = new ModelJoin();
- $join->setJoinType($joinType);
- $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias);
- if ($previousJoin = $this->getPreviousJoin()) {
- $join->setPreviousJoin($previousJoin);
- }
-
- // add the ModelJoin to the current object
- if ($relationAlias) {
- $this->addAlias($relationAlias, $relationMap->getRightTable()->getName());
- $this->addJoinObject($join, $relationAlias);
- } else {
- $this->addJoinObject($join, 'Combination');
- }
-
- return $this;
- }
-
- /**
- * Use the Combination relation Combination object
- *
- * @see useQuery()
- *
- * @param string $relationAlias optional alias for the relation,
- * to be used as main alias in the secondary query
- * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
- *
- * @return \Thelia\Model\CombinationQuery A secondary query class using the current class as primary query
- */
- public function useCombinationQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN)
- {
- return $this
- ->joinCombination($relationAlias, $joinType)
- ->useQuery($relationAlias ? $relationAlias : 'Combination', '\Thelia\Model\CombinationQuery');
- }
-
/**
* Filter the query by a related \Thelia\Model\Product object
*
@@ -689,6 +755,225 @@ abstract class StockQuery extends ModelCriteria
->useQuery($relationAlias ? $relationAlias : 'Product', '\Thelia\Model\ProductQuery');
}
+ /**
+ * Filter the query by a related \Thelia\Model\AttributeCombination object
+ *
+ * @param \Thelia\Model\AttributeCombination|ObjectCollection $attributeCombination the related object to use as filter
+ * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+ *
+ * @return ChildStockQuery The current query, for fluid interface
+ */
+ public function filterByAttributeCombination($attributeCombination, $comparison = null)
+ {
+ if ($attributeCombination instanceof \Thelia\Model\AttributeCombination) {
+ return $this
+ ->addUsingAlias(StockTableMap::ID, $attributeCombination->getStockId(), $comparison);
+ } elseif ($attributeCombination instanceof ObjectCollection) {
+ return $this
+ ->useAttributeCombinationQuery()
+ ->filterByPrimaryKeys($attributeCombination->getPrimaryKeys())
+ ->endUse();
+ } else {
+ throw new PropelException('filterByAttributeCombination() only accepts arguments of type \Thelia\Model\AttributeCombination or Collection');
+ }
+ }
+
+ /**
+ * Adds a JOIN clause to the query using the AttributeCombination relation
+ *
+ * @param string $relationAlias optional alias for the relation
+ * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
+ *
+ * @return ChildStockQuery The current query, for fluid interface
+ */
+ public function joinAttributeCombination($relationAlias = null, $joinType = Criteria::INNER_JOIN)
+ {
+ $tableMap = $this->getTableMap();
+ $relationMap = $tableMap->getRelation('AttributeCombination');
+
+ // create a ModelJoin object for this join
+ $join = new ModelJoin();
+ $join->setJoinType($joinType);
+ $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias);
+ if ($previousJoin = $this->getPreviousJoin()) {
+ $join->setPreviousJoin($previousJoin);
+ }
+
+ // add the ModelJoin to the current object
+ if ($relationAlias) {
+ $this->addAlias($relationAlias, $relationMap->getRightTable()->getName());
+ $this->addJoinObject($join, $relationAlias);
+ } else {
+ $this->addJoinObject($join, 'AttributeCombination');
+ }
+
+ return $this;
+ }
+
+ /**
+ * Use the AttributeCombination relation AttributeCombination object
+ *
+ * @see useQuery()
+ *
+ * @param string $relationAlias optional alias for the relation,
+ * to be used as main alias in the secondary query
+ * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
+ *
+ * @return \Thelia\Model\AttributeCombinationQuery A secondary query class using the current class as primary query
+ */
+ public function useAttributeCombinationQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN)
+ {
+ return $this
+ ->joinAttributeCombination($relationAlias, $joinType)
+ ->useQuery($relationAlias ? $relationAlias : 'AttributeCombination', '\Thelia\Model\AttributeCombinationQuery');
+ }
+
+ /**
+ * Filter the query by a related \Thelia\Model\CartItem object
+ *
+ * @param \Thelia\Model\CartItem|ObjectCollection $cartItem the related object to use as filter
+ * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+ *
+ * @return ChildStockQuery The current query, for fluid interface
+ */
+ public function filterByCartItem($cartItem, $comparison = null)
+ {
+ if ($cartItem instanceof \Thelia\Model\CartItem) {
+ return $this
+ ->addUsingAlias(StockTableMap::ID, $cartItem->getStockId(), $comparison);
+ } elseif ($cartItem instanceof ObjectCollection) {
+ return $this
+ ->useCartItemQuery()
+ ->filterByPrimaryKeys($cartItem->getPrimaryKeys())
+ ->endUse();
+ } else {
+ throw new PropelException('filterByCartItem() only accepts arguments of type \Thelia\Model\CartItem or Collection');
+ }
+ }
+
+ /**
+ * Adds a JOIN clause to the query using the CartItem relation
+ *
+ * @param string $relationAlias optional alias for the relation
+ * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
+ *
+ * @return ChildStockQuery The current query, for fluid interface
+ */
+ public function joinCartItem($relationAlias = null, $joinType = Criteria::INNER_JOIN)
+ {
+ $tableMap = $this->getTableMap();
+ $relationMap = $tableMap->getRelation('CartItem');
+
+ // create a ModelJoin object for this join
+ $join = new ModelJoin();
+ $join->setJoinType($joinType);
+ $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias);
+ if ($previousJoin = $this->getPreviousJoin()) {
+ $join->setPreviousJoin($previousJoin);
+ }
+
+ // add the ModelJoin to the current object
+ if ($relationAlias) {
+ $this->addAlias($relationAlias, $relationMap->getRightTable()->getName());
+ $this->addJoinObject($join, $relationAlias);
+ } else {
+ $this->addJoinObject($join, 'CartItem');
+ }
+
+ return $this;
+ }
+
+ /**
+ * Use the CartItem relation CartItem object
+ *
+ * @see useQuery()
+ *
+ * @param string $relationAlias optional alias for the relation,
+ * to be used as main alias in the secondary query
+ * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
+ *
+ * @return \Thelia\Model\CartItemQuery A secondary query class using the current class as primary query
+ */
+ public function useCartItemQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN)
+ {
+ return $this
+ ->joinCartItem($relationAlias, $joinType)
+ ->useQuery($relationAlias ? $relationAlias : 'CartItem', '\Thelia\Model\CartItemQuery');
+ }
+
+ /**
+ * Filter the query by a related \Thelia\Model\ProductPrice object
+ *
+ * @param \Thelia\Model\ProductPrice|ObjectCollection $productPrice the related object to use as filter
+ * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+ *
+ * @return ChildStockQuery The current query, for fluid interface
+ */
+ public function filterByProductPrice($productPrice, $comparison = null)
+ {
+ if ($productPrice instanceof \Thelia\Model\ProductPrice) {
+ return $this
+ ->addUsingAlias(StockTableMap::ID, $productPrice->getStockId(), $comparison);
+ } elseif ($productPrice instanceof ObjectCollection) {
+ return $this
+ ->useProductPriceQuery()
+ ->filterByPrimaryKeys($productPrice->getPrimaryKeys())
+ ->endUse();
+ } else {
+ throw new PropelException('filterByProductPrice() only accepts arguments of type \Thelia\Model\ProductPrice or Collection');
+ }
+ }
+
+ /**
+ * Adds a JOIN clause to the query using the ProductPrice relation
+ *
+ * @param string $relationAlias optional alias for the relation
+ * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
+ *
+ * @return ChildStockQuery The current query, for fluid interface
+ */
+ public function joinProductPrice($relationAlias = null, $joinType = Criteria::INNER_JOIN)
+ {
+ $tableMap = $this->getTableMap();
+ $relationMap = $tableMap->getRelation('ProductPrice');
+
+ // create a ModelJoin object for this join
+ $join = new ModelJoin();
+ $join->setJoinType($joinType);
+ $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias);
+ if ($previousJoin = $this->getPreviousJoin()) {
+ $join->setPreviousJoin($previousJoin);
+ }
+
+ // add the ModelJoin to the current object
+ if ($relationAlias) {
+ $this->addAlias($relationAlias, $relationMap->getRightTable()->getName());
+ $this->addJoinObject($join, $relationAlias);
+ } else {
+ $this->addJoinObject($join, 'ProductPrice');
+ }
+
+ return $this;
+ }
+
+ /**
+ * Use the ProductPrice relation ProductPrice object
+ *
+ * @see useQuery()
+ *
+ * @param string $relationAlias optional alias for the relation,
+ * to be used as main alias in the secondary query
+ * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
+ *
+ * @return \Thelia\Model\ProductPriceQuery A secondary query class using the current class as primary query
+ */
+ public function useProductPriceQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN)
+ {
+ return $this
+ ->joinProductPrice($relationAlias, $joinType)
+ ->useQuery($relationAlias ? $relationAlias : 'ProductPrice', '\Thelia\Model\ProductPriceQuery');
+ }
+
/**
* Exclude object from result
*
diff --git a/core/lib/Thelia/Model/Map/AttributeCombinationTableMap.php b/core/lib/Thelia/Model/Map/AttributeCombinationTableMap.php
index b3e3584a4..881b0eed2 100755
--- a/core/lib/Thelia/Model/Map/AttributeCombinationTableMap.php
+++ b/core/lib/Thelia/Model/Map/AttributeCombinationTableMap.php
@@ -57,7 +57,7 @@ class AttributeCombinationTableMap extends TableMap
/**
* The total number of columns
*/
- const NUM_COLUMNS = 6;
+ const NUM_COLUMNS = 5;
/**
* The number of lazy-loaded columns
@@ -67,28 +67,23 @@ class AttributeCombinationTableMap extends TableMap
/**
* The number of columns to hydrate (NUM_COLUMNS - NUM_LAZY_LOAD_COLUMNS)
*/
- const NUM_HYDRATE_COLUMNS = 6;
-
- /**
- * the column name for the ID field
- */
- const ID = 'attribute_combination.ID';
+ const NUM_HYDRATE_COLUMNS = 5;
/**
* the column name for the ATTRIBUTE_ID field
*/
const ATTRIBUTE_ID = 'attribute_combination.ATTRIBUTE_ID';
- /**
- * the column name for the COMBINATION_ID field
- */
- const COMBINATION_ID = 'attribute_combination.COMBINATION_ID';
-
/**
* the column name for the ATTRIBUTE_AV_ID field
*/
const ATTRIBUTE_AV_ID = 'attribute_combination.ATTRIBUTE_AV_ID';
+ /**
+ * the column name for the STOCK_ID field
+ */
+ const STOCK_ID = 'attribute_combination.STOCK_ID';
+
/**
* the column name for the CREATED_AT field
*/
@@ -111,12 +106,12 @@ class AttributeCombinationTableMap extends TableMap
* e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
*/
protected static $fieldNames = array (
- self::TYPE_PHPNAME => array('Id', 'AttributeId', 'CombinationId', 'AttributeAvId', 'CreatedAt', 'UpdatedAt', ),
- self::TYPE_STUDLYPHPNAME => array('id', 'attributeId', 'combinationId', 'attributeAvId', 'createdAt', 'updatedAt', ),
- self::TYPE_COLNAME => array(AttributeCombinationTableMap::ID, AttributeCombinationTableMap::ATTRIBUTE_ID, AttributeCombinationTableMap::COMBINATION_ID, AttributeCombinationTableMap::ATTRIBUTE_AV_ID, AttributeCombinationTableMap::CREATED_AT, AttributeCombinationTableMap::UPDATED_AT, ),
- self::TYPE_RAW_COLNAME => array('ID', 'ATTRIBUTE_ID', 'COMBINATION_ID', 'ATTRIBUTE_AV_ID', 'CREATED_AT', 'UPDATED_AT', ),
- self::TYPE_FIELDNAME => array('id', 'attribute_id', 'combination_id', 'attribute_av_id', 'created_at', 'updated_at', ),
- self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, )
+ self::TYPE_PHPNAME => array('AttributeId', 'AttributeAvId', 'StockId', 'CreatedAt', 'UpdatedAt', ),
+ self::TYPE_STUDLYPHPNAME => array('attributeId', 'attributeAvId', 'stockId', 'createdAt', 'updatedAt', ),
+ self::TYPE_COLNAME => array(AttributeCombinationTableMap::ATTRIBUTE_ID, AttributeCombinationTableMap::ATTRIBUTE_AV_ID, AttributeCombinationTableMap::STOCK_ID, AttributeCombinationTableMap::CREATED_AT, AttributeCombinationTableMap::UPDATED_AT, ),
+ self::TYPE_RAW_COLNAME => array('ATTRIBUTE_ID', 'ATTRIBUTE_AV_ID', 'STOCK_ID', 'CREATED_AT', 'UPDATED_AT', ),
+ self::TYPE_FIELDNAME => array('attribute_id', 'attribute_av_id', 'stock_id', 'created_at', 'updated_at', ),
+ self::TYPE_NUM => array(0, 1, 2, 3, 4, )
);
/**
@@ -126,12 +121,12 @@ class AttributeCombinationTableMap extends TableMap
* e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0
*/
protected static $fieldKeys = array (
- self::TYPE_PHPNAME => array('Id' => 0, 'AttributeId' => 1, 'CombinationId' => 2, 'AttributeAvId' => 3, 'CreatedAt' => 4, 'UpdatedAt' => 5, ),
- self::TYPE_STUDLYPHPNAME => array('id' => 0, 'attributeId' => 1, 'combinationId' => 2, 'attributeAvId' => 3, 'createdAt' => 4, 'updatedAt' => 5, ),
- self::TYPE_COLNAME => array(AttributeCombinationTableMap::ID => 0, AttributeCombinationTableMap::ATTRIBUTE_ID => 1, AttributeCombinationTableMap::COMBINATION_ID => 2, AttributeCombinationTableMap::ATTRIBUTE_AV_ID => 3, AttributeCombinationTableMap::CREATED_AT => 4, AttributeCombinationTableMap::UPDATED_AT => 5, ),
- self::TYPE_RAW_COLNAME => array('ID' => 0, 'ATTRIBUTE_ID' => 1, 'COMBINATION_ID' => 2, 'ATTRIBUTE_AV_ID' => 3, 'CREATED_AT' => 4, 'UPDATED_AT' => 5, ),
- self::TYPE_FIELDNAME => array('id' => 0, 'attribute_id' => 1, 'combination_id' => 2, 'attribute_av_id' => 3, 'created_at' => 4, 'updated_at' => 5, ),
- self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, )
+ self::TYPE_PHPNAME => array('AttributeId' => 0, 'AttributeAvId' => 1, 'StockId' => 2, 'CreatedAt' => 3, 'UpdatedAt' => 4, ),
+ self::TYPE_STUDLYPHPNAME => array('attributeId' => 0, 'attributeAvId' => 1, 'stockId' => 2, 'createdAt' => 3, 'updatedAt' => 4, ),
+ self::TYPE_COLNAME => array(AttributeCombinationTableMap::ATTRIBUTE_ID => 0, AttributeCombinationTableMap::ATTRIBUTE_AV_ID => 1, AttributeCombinationTableMap::STOCK_ID => 2, AttributeCombinationTableMap::CREATED_AT => 3, AttributeCombinationTableMap::UPDATED_AT => 4, ),
+ self::TYPE_RAW_COLNAME => array('ATTRIBUTE_ID' => 0, 'ATTRIBUTE_AV_ID' => 1, 'STOCK_ID' => 2, 'CREATED_AT' => 3, 'UPDATED_AT' => 4, ),
+ self::TYPE_FIELDNAME => array('attribute_id' => 0, 'attribute_av_id' => 1, 'stock_id' => 2, 'created_at' => 3, 'updated_at' => 4, ),
+ self::TYPE_NUM => array(0, 1, 2, 3, 4, )
);
/**
@@ -148,12 +143,11 @@ class AttributeCombinationTableMap extends TableMap
$this->setPhpName('AttributeCombination');
$this->setClassName('\\Thelia\\Model\\AttributeCombination');
$this->setPackage('Thelia.Model');
- $this->setUseIdGenerator(true);
+ $this->setUseIdGenerator(false);
// columns
- $this->addPrimaryKey('ID', 'Id', 'INTEGER', true, null, null);
$this->addForeignPrimaryKey('ATTRIBUTE_ID', 'AttributeId', 'INTEGER' , 'attribute', 'ID', true, null, null);
- $this->addForeignPrimaryKey('COMBINATION_ID', 'CombinationId', 'INTEGER' , 'combination', 'ID', true, null, null);
$this->addForeignPrimaryKey('ATTRIBUTE_AV_ID', 'AttributeAvId', 'INTEGER' , 'attribute_av', 'ID', true, null, null);
+ $this->addForeignPrimaryKey('STOCK_ID', 'StockId', 'INTEGER' , 'stock', 'ID', true, null, null);
$this->addColumn('CREATED_AT', 'CreatedAt', 'TIMESTAMP', false, null, null);
$this->addColumn('UPDATED_AT', 'UpdatedAt', 'TIMESTAMP', false, null, null);
} // initialize()
@@ -165,7 +159,7 @@ class AttributeCombinationTableMap extends TableMap
{
$this->addRelation('Attribute', '\\Thelia\\Model\\Attribute', RelationMap::MANY_TO_ONE, array('attribute_id' => 'id', ), 'CASCADE', 'RESTRICT');
$this->addRelation('AttributeAv', '\\Thelia\\Model\\AttributeAv', RelationMap::MANY_TO_ONE, array('attribute_av_id' => 'id', ), 'CASCADE', 'RESTRICT');
- $this->addRelation('Combination', '\\Thelia\\Model\\Combination', RelationMap::MANY_TO_ONE, array('combination_id' => 'id', ), 'CASCADE', 'RESTRICT');
+ $this->addRelation('Stock', '\\Thelia\\Model\\Stock', RelationMap::MANY_TO_ONE, array('stock_id' => 'id', ), null, null);
} // buildRelations()
/**
@@ -196,7 +190,7 @@ class AttributeCombinationTableMap extends TableMap
{
if (Propel::isInstancePoolingEnabled()) {
if (null === $key) {
- $key = serialize(array((string) $obj->getId(), (string) $obj->getAttributeId(), (string) $obj->getCombinationId(), (string) $obj->getAttributeAvId()));
+ $key = serialize(array((string) $obj->getAttributeId(), (string) $obj->getAttributeAvId(), (string) $obj->getStockId()));
} // if key === null
self::$instances[$key] = $obj;
}
@@ -216,11 +210,11 @@ class AttributeCombinationTableMap extends TableMap
{
if (Propel::isInstancePoolingEnabled() && null !== $value) {
if (is_object($value) && $value instanceof \Thelia\Model\AttributeCombination) {
- $key = serialize(array((string) $value->getId(), (string) $value->getAttributeId(), (string) $value->getCombinationId(), (string) $value->getAttributeAvId()));
+ $key = serialize(array((string) $value->getAttributeId(), (string) $value->getAttributeAvId(), (string) $value->getStockId()));
- } elseif (is_array($value) && count($value) === 4) {
+ } elseif (is_array($value) && count($value) === 3) {
// assume we've been passed a primary key";
- $key = serialize(array((string) $value[0], (string) $value[1], (string) $value[2], (string) $value[3]));
+ $key = serialize(array((string) $value[0], (string) $value[1], (string) $value[2]));
} elseif ($value instanceof Criteria) {
self::$instances = [];
@@ -248,11 +242,11 @@ class AttributeCombinationTableMap extends TableMap
public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
{
// If the PK cannot be derived from the row, return NULL.
- if ($row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)] === null && $row[TableMap::TYPE_NUM == $indexType ? 1 + $offset : static::translateFieldName('AttributeId', TableMap::TYPE_PHPNAME, $indexType)] === null && $row[TableMap::TYPE_NUM == $indexType ? 2 + $offset : static::translateFieldName('CombinationId', TableMap::TYPE_PHPNAME, $indexType)] === null && $row[TableMap::TYPE_NUM == $indexType ? 3 + $offset : static::translateFieldName('AttributeAvId', TableMap::TYPE_PHPNAME, $indexType)] === null) {
+ if ($row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('AttributeId', TableMap::TYPE_PHPNAME, $indexType)] === null && $row[TableMap::TYPE_NUM == $indexType ? 1 + $offset : static::translateFieldName('AttributeAvId', TableMap::TYPE_PHPNAME, $indexType)] === null && $row[TableMap::TYPE_NUM == $indexType ? 2 + $offset : static::translateFieldName('StockId', TableMap::TYPE_PHPNAME, $indexType)] === null) {
return null;
}
- return serialize(array((string) $row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)], (string) $row[TableMap::TYPE_NUM == $indexType ? 1 + $offset : static::translateFieldName('AttributeId', TableMap::TYPE_PHPNAME, $indexType)], (string) $row[TableMap::TYPE_NUM == $indexType ? 2 + $offset : static::translateFieldName('CombinationId', TableMap::TYPE_PHPNAME, $indexType)], (string) $row[TableMap::TYPE_NUM == $indexType ? 3 + $offset : static::translateFieldName('AttributeAvId', TableMap::TYPE_PHPNAME, $indexType)]));
+ return serialize(array((string) $row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('AttributeId', TableMap::TYPE_PHPNAME, $indexType)], (string) $row[TableMap::TYPE_NUM == $indexType ? 1 + $offset : static::translateFieldName('AttributeAvId', TableMap::TYPE_PHPNAME, $indexType)], (string) $row[TableMap::TYPE_NUM == $indexType ? 2 + $offset : static::translateFieldName('StockId', TableMap::TYPE_PHPNAME, $indexType)]));
}
/**
@@ -368,17 +362,15 @@ class AttributeCombinationTableMap extends TableMap
public static function addSelectColumns(Criteria $criteria, $alias = null)
{
if (null === $alias) {
- $criteria->addSelectColumn(AttributeCombinationTableMap::ID);
$criteria->addSelectColumn(AttributeCombinationTableMap::ATTRIBUTE_ID);
- $criteria->addSelectColumn(AttributeCombinationTableMap::COMBINATION_ID);
$criteria->addSelectColumn(AttributeCombinationTableMap::ATTRIBUTE_AV_ID);
+ $criteria->addSelectColumn(AttributeCombinationTableMap::STOCK_ID);
$criteria->addSelectColumn(AttributeCombinationTableMap::CREATED_AT);
$criteria->addSelectColumn(AttributeCombinationTableMap::UPDATED_AT);
} else {
- $criteria->addSelectColumn($alias . '.ID');
$criteria->addSelectColumn($alias . '.ATTRIBUTE_ID');
- $criteria->addSelectColumn($alias . '.COMBINATION_ID');
$criteria->addSelectColumn($alias . '.ATTRIBUTE_AV_ID');
+ $criteria->addSelectColumn($alias . '.STOCK_ID');
$criteria->addSelectColumn($alias . '.CREATED_AT');
$criteria->addSelectColumn($alias . '.UPDATED_AT');
}
@@ -439,10 +431,9 @@ class AttributeCombinationTableMap extends TableMap
$values = array($values);
}
foreach ($values as $value) {
- $criterion = $criteria->getNewCriterion(AttributeCombinationTableMap::ID, $value[0]);
- $criterion->addAnd($criteria->getNewCriterion(AttributeCombinationTableMap::ATTRIBUTE_ID, $value[1]));
- $criterion->addAnd($criteria->getNewCriterion(AttributeCombinationTableMap::COMBINATION_ID, $value[2]));
- $criterion->addAnd($criteria->getNewCriterion(AttributeCombinationTableMap::ATTRIBUTE_AV_ID, $value[3]));
+ $criterion = $criteria->getNewCriterion(AttributeCombinationTableMap::ATTRIBUTE_ID, $value[0]);
+ $criterion->addAnd($criteria->getNewCriterion(AttributeCombinationTableMap::ATTRIBUTE_AV_ID, $value[1]));
+ $criterion->addAnd($criteria->getNewCriterion(AttributeCombinationTableMap::STOCK_ID, $value[2]));
$criteria->addOr($criterion);
}
}
@@ -490,10 +481,6 @@ class AttributeCombinationTableMap extends TableMap
$criteria = $criteria->buildCriteria(); // build Criteria from AttributeCombination object
}
- if ($criteria->containsKey(AttributeCombinationTableMap::ID) && $criteria->keyContainsValue(AttributeCombinationTableMap::ID) ) {
- throw new PropelException('Cannot insert a value for auto-increment primary key ('.AttributeCombinationTableMap::ID.')');
- }
-
// Set the correct dbName
$query = AttributeCombinationQuery::create()->mergeWith($criteria);
diff --git a/core/lib/Thelia/Model/Map/CartItemTableMap.php b/core/lib/Thelia/Model/Map/CartItemTableMap.php
index c496e85c8..ae1bd590b 100644
--- a/core/lib/Thelia/Model/Map/CartItemTableMap.php
+++ b/core/lib/Thelia/Model/Map/CartItemTableMap.php
@@ -90,9 +90,9 @@ class CartItemTableMap extends TableMap
const QUANTITY = 'cart_item.QUANTITY';
/**
- * the column name for the COMBINATION_ID field
+ * the column name for the STOCK_ID field
*/
- const COMBINATION_ID = 'cart_item.COMBINATION_ID';
+ const STOCK_ID = 'cart_item.STOCK_ID';
/**
* the column name for the CREATED_AT field
@@ -116,11 +116,11 @@ class CartItemTableMap extends TableMap
* e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
*/
protected static $fieldNames = array (
- self::TYPE_PHPNAME => array('Id', 'CartId', 'ProductId', 'Quantity', 'CombinationId', 'CreatedAt', 'UpdatedAt', ),
- self::TYPE_STUDLYPHPNAME => array('id', 'cartId', 'productId', 'quantity', 'combinationId', 'createdAt', 'updatedAt', ),
- self::TYPE_COLNAME => array(CartItemTableMap::ID, CartItemTableMap::CART_ID, CartItemTableMap::PRODUCT_ID, CartItemTableMap::QUANTITY, CartItemTableMap::COMBINATION_ID, CartItemTableMap::CREATED_AT, CartItemTableMap::UPDATED_AT, ),
- self::TYPE_RAW_COLNAME => array('ID', 'CART_ID', 'PRODUCT_ID', 'QUANTITY', 'COMBINATION_ID', 'CREATED_AT', 'UPDATED_AT', ),
- self::TYPE_FIELDNAME => array('id', 'cart_id', 'product_id', 'quantity', 'combination_id', 'created_at', 'updated_at', ),
+ self::TYPE_PHPNAME => array('Id', 'CartId', 'ProductId', 'Quantity', 'StockId', 'CreatedAt', 'UpdatedAt', ),
+ self::TYPE_STUDLYPHPNAME => array('id', 'cartId', 'productId', 'quantity', 'stockId', 'createdAt', 'updatedAt', ),
+ self::TYPE_COLNAME => array(CartItemTableMap::ID, CartItemTableMap::CART_ID, CartItemTableMap::PRODUCT_ID, CartItemTableMap::QUANTITY, CartItemTableMap::STOCK_ID, CartItemTableMap::CREATED_AT, CartItemTableMap::UPDATED_AT, ),
+ self::TYPE_RAW_COLNAME => array('ID', 'CART_ID', 'PRODUCT_ID', 'QUANTITY', 'STOCK_ID', 'CREATED_AT', 'UPDATED_AT', ),
+ self::TYPE_FIELDNAME => array('id', 'cart_id', 'product_id', 'quantity', 'stock_id', 'created_at', 'updated_at', ),
self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, )
);
@@ -131,11 +131,11 @@ class CartItemTableMap extends TableMap
* e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0
*/
protected static $fieldKeys = array (
- self::TYPE_PHPNAME => array('Id' => 0, 'CartId' => 1, 'ProductId' => 2, 'Quantity' => 3, 'CombinationId' => 4, 'CreatedAt' => 5, 'UpdatedAt' => 6, ),
- self::TYPE_STUDLYPHPNAME => array('id' => 0, 'cartId' => 1, 'productId' => 2, 'quantity' => 3, 'combinationId' => 4, 'createdAt' => 5, 'updatedAt' => 6, ),
- self::TYPE_COLNAME => array(CartItemTableMap::ID => 0, CartItemTableMap::CART_ID => 1, CartItemTableMap::PRODUCT_ID => 2, CartItemTableMap::QUANTITY => 3, CartItemTableMap::COMBINATION_ID => 4, CartItemTableMap::CREATED_AT => 5, CartItemTableMap::UPDATED_AT => 6, ),
- self::TYPE_RAW_COLNAME => array('ID' => 0, 'CART_ID' => 1, 'PRODUCT_ID' => 2, 'QUANTITY' => 3, 'COMBINATION_ID' => 4, 'CREATED_AT' => 5, 'UPDATED_AT' => 6, ),
- self::TYPE_FIELDNAME => array('id' => 0, 'cart_id' => 1, 'product_id' => 2, 'quantity' => 3, 'combination_id' => 4, 'created_at' => 5, 'updated_at' => 6, ),
+ self::TYPE_PHPNAME => array('Id' => 0, 'CartId' => 1, 'ProductId' => 2, 'Quantity' => 3, 'StockId' => 4, 'CreatedAt' => 5, 'UpdatedAt' => 6, ),
+ self::TYPE_STUDLYPHPNAME => array('id' => 0, 'cartId' => 1, 'productId' => 2, 'quantity' => 3, 'stockId' => 4, 'createdAt' => 5, 'updatedAt' => 6, ),
+ self::TYPE_COLNAME => array(CartItemTableMap::ID => 0, CartItemTableMap::CART_ID => 1, CartItemTableMap::PRODUCT_ID => 2, CartItemTableMap::QUANTITY => 3, CartItemTableMap::STOCK_ID => 4, CartItemTableMap::CREATED_AT => 5, CartItemTableMap::UPDATED_AT => 6, ),
+ self::TYPE_RAW_COLNAME => array('ID' => 0, 'CART_ID' => 1, 'PRODUCT_ID' => 2, 'QUANTITY' => 3, 'STOCK_ID' => 4, 'CREATED_AT' => 5, 'UPDATED_AT' => 6, ),
+ self::TYPE_FIELDNAME => array('id' => 0, 'cart_id' => 1, 'product_id' => 2, 'quantity' => 3, 'stock_id' => 4, 'created_at' => 5, 'updated_at' => 6, ),
self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, )
);
@@ -159,7 +159,7 @@ class CartItemTableMap extends TableMap
$this->addForeignKey('CART_ID', 'CartId', 'INTEGER', 'cart', 'ID', true, null, null);
$this->addForeignKey('PRODUCT_ID', 'ProductId', 'INTEGER', 'product', 'ID', true, null, null);
$this->addColumn('QUANTITY', 'Quantity', 'FLOAT', false, null, 1);
- $this->addForeignKey('COMBINATION_ID', 'CombinationId', 'INTEGER', 'combination', 'ID', false, null, null);
+ $this->addForeignKey('STOCK_ID', 'StockId', 'INTEGER', 'stock', 'ID', true, null, null);
$this->addColumn('CREATED_AT', 'CreatedAt', 'TIMESTAMP', false, null, null);
$this->addColumn('UPDATED_AT', 'UpdatedAt', 'TIMESTAMP', false, null, null);
} // initialize()
@@ -171,7 +171,7 @@ class CartItemTableMap extends TableMap
{
$this->addRelation('Cart', '\\Thelia\\Model\\Cart', RelationMap::MANY_TO_ONE, array('cart_id' => 'id', ), null, null);
$this->addRelation('Product', '\\Thelia\\Model\\Product', RelationMap::MANY_TO_ONE, array('product_id' => 'id', ), null, null);
- $this->addRelation('Combination', '\\Thelia\\Model\\Combination', RelationMap::MANY_TO_ONE, array('combination_id' => 'id', ), null, null);
+ $this->addRelation('Stock', '\\Thelia\\Model\\Stock', RelationMap::MANY_TO_ONE, array('stock_id' => 'id', ), null, null);
} // buildRelations()
/**
@@ -329,7 +329,7 @@ class CartItemTableMap extends TableMap
$criteria->addSelectColumn(CartItemTableMap::CART_ID);
$criteria->addSelectColumn(CartItemTableMap::PRODUCT_ID);
$criteria->addSelectColumn(CartItemTableMap::QUANTITY);
- $criteria->addSelectColumn(CartItemTableMap::COMBINATION_ID);
+ $criteria->addSelectColumn(CartItemTableMap::STOCK_ID);
$criteria->addSelectColumn(CartItemTableMap::CREATED_AT);
$criteria->addSelectColumn(CartItemTableMap::UPDATED_AT);
} else {
@@ -337,7 +337,7 @@ class CartItemTableMap extends TableMap
$criteria->addSelectColumn($alias . '.CART_ID');
$criteria->addSelectColumn($alias . '.PRODUCT_ID');
$criteria->addSelectColumn($alias . '.QUANTITY');
- $criteria->addSelectColumn($alias . '.COMBINATION_ID');
+ $criteria->addSelectColumn($alias . '.STOCK_ID');
$criteria->addSelectColumn($alias . '.CREATED_AT');
$criteria->addSelectColumn($alias . '.UPDATED_AT');
}
diff --git a/core/lib/Thelia/Model/Map/CategoryTableMap.php b/core/lib/Thelia/Model/Map/CategoryTableMap.php
index 1bade771c..0a7247fee 100755
--- a/core/lib/Thelia/Model/Map/CategoryTableMap.php
+++ b/core/lib/Thelia/Model/Map/CategoryTableMap.php
@@ -213,9 +213,9 @@ class CategoryTableMap extends TableMap
public function getBehaviors()
{
return array(
- 'timestampable' => array('create_column' => 'created_at', 'update_column' => 'updated_at', ),
'i18n' => array('i18n_table' => '%TABLE%_i18n', 'i18n_phpname' => '%PHPNAME%I18n', 'i18n_columns' => 'title, description, chapo, postscriptum', 'locale_column' => 'locale', 'locale_length' => '5', 'default_locale' => '', 'locale_alias' => '', ),
'versionable' => array('version_column' => 'version', 'version_table' => '', 'log_created_at' => 'true', 'log_created_by' => 'true', 'log_comment' => 'false', 'version_created_at_column' => 'version_created_at', 'version_created_by_column' => 'version_created_by', 'version_comment_column' => 'version_comment', ),
+ 'timestampable' => array('create_column' => 'created_at', 'update_column' => 'updated_at', ),
);
} // getBehaviors()
/**
diff --git a/core/lib/Thelia/Model/Map/CurrencyTableMap.php b/core/lib/Thelia/Model/Map/CurrencyTableMap.php
index 8d2ca54ec..f3b6e5a27 100755
--- a/core/lib/Thelia/Model/Map/CurrencyTableMap.php
+++ b/core/lib/Thelia/Model/Map/CurrencyTableMap.php
@@ -177,6 +177,7 @@ class CurrencyTableMap extends TableMap
{
$this->addRelation('Order', '\\Thelia\\Model\\Order', RelationMap::ONE_TO_MANY, array('id' => 'currency_id', ), 'SET NULL', 'RESTRICT', 'Orders');
$this->addRelation('Cart', '\\Thelia\\Model\\Cart', RelationMap::ONE_TO_MANY, array('id' => 'currency_id', ), null, null, 'Carts');
+ $this->addRelation('ProductPrice', '\\Thelia\\Model\\ProductPrice', RelationMap::ONE_TO_MANY, array('id' => 'currency_id', ), null, null, 'ProductPrices');
} // buildRelations()
/**
diff --git a/core/lib/Thelia/Model/Map/ProductPriceTableMap.php b/core/lib/Thelia/Model/Map/ProductPriceTableMap.php
new file mode 100644
index 000000000..d04c44f22
--- /dev/null
+++ b/core/lib/Thelia/Model/Map/ProductPriceTableMap.php
@@ -0,0 +1,464 @@
+ array('Id', 'StockId', 'CurrencyId', 'Price', 'PromoPrice', 'CreatedAt', 'UpdatedAt', ),
+ self::TYPE_STUDLYPHPNAME => array('id', 'stockId', 'currencyId', 'price', 'promoPrice', 'createdAt', 'updatedAt', ),
+ self::TYPE_COLNAME => array(ProductPriceTableMap::ID, ProductPriceTableMap::STOCK_ID, ProductPriceTableMap::CURRENCY_ID, ProductPriceTableMap::PRICE, ProductPriceTableMap::PROMO_PRICE, ProductPriceTableMap::CREATED_AT, ProductPriceTableMap::UPDATED_AT, ),
+ self::TYPE_RAW_COLNAME => array('ID', 'STOCK_ID', 'CURRENCY_ID', 'PRICE', 'PROMO_PRICE', 'CREATED_AT', 'UPDATED_AT', ),
+ self::TYPE_FIELDNAME => array('id', 'stock_id', 'currency_id', 'price', 'promo_price', 'created_at', 'updated_at', ),
+ self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, )
+ );
+
+ /**
+ * holds an array of keys for quick access to the fieldnames array
+ *
+ * first dimension keys are the type constants
+ * e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0
+ */
+ protected static $fieldKeys = array (
+ self::TYPE_PHPNAME => array('Id' => 0, 'StockId' => 1, 'CurrencyId' => 2, 'Price' => 3, 'PromoPrice' => 4, 'CreatedAt' => 5, 'UpdatedAt' => 6, ),
+ self::TYPE_STUDLYPHPNAME => array('id' => 0, 'stockId' => 1, 'currencyId' => 2, 'price' => 3, 'promoPrice' => 4, 'createdAt' => 5, 'updatedAt' => 6, ),
+ self::TYPE_COLNAME => array(ProductPriceTableMap::ID => 0, ProductPriceTableMap::STOCK_ID => 1, ProductPriceTableMap::CURRENCY_ID => 2, ProductPriceTableMap::PRICE => 3, ProductPriceTableMap::PROMO_PRICE => 4, ProductPriceTableMap::CREATED_AT => 5, ProductPriceTableMap::UPDATED_AT => 6, ),
+ self::TYPE_RAW_COLNAME => array('ID' => 0, 'STOCK_ID' => 1, 'CURRENCY_ID' => 2, 'PRICE' => 3, 'PROMO_PRICE' => 4, 'CREATED_AT' => 5, 'UPDATED_AT' => 6, ),
+ self::TYPE_FIELDNAME => array('id' => 0, 'stock_id' => 1, 'currency_id' => 2, 'price' => 3, 'promo_price' => 4, 'created_at' => 5, 'updated_at' => 6, ),
+ self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, )
+ );
+
+ /**
+ * Initialize the table attributes and columns
+ * Relations are not initialized by this method since they are lazy loaded
+ *
+ * @return void
+ * @throws PropelException
+ */
+ public function initialize()
+ {
+ // attributes
+ $this->setName('product_price');
+ $this->setPhpName('ProductPrice');
+ $this->setClassName('\\Thelia\\Model\\ProductPrice');
+ $this->setPackage('Thelia.Model');
+ $this->setUseIdGenerator(true);
+ // columns
+ $this->addPrimaryKey('ID', 'Id', 'INTEGER', true, null, null);
+ $this->addForeignKey('STOCK_ID', 'StockId', 'INTEGER', 'stock', 'ID', true, null, null);
+ $this->addForeignKey('CURRENCY_ID', 'CurrencyId', 'INTEGER', 'currency', 'ID', true, null, null);
+ $this->addColumn('PRICE', 'Price', 'FLOAT', true, null, null);
+ $this->addColumn('PROMO_PRICE', 'PromoPrice', 'FLOAT', false, null, null);
+ $this->addColumn('CREATED_AT', 'CreatedAt', 'TIMESTAMP', false, null, null);
+ $this->addColumn('UPDATED_AT', 'UpdatedAt', 'TIMESTAMP', false, null, null);
+ } // initialize()
+
+ /**
+ * Build the RelationMap objects for this table relationships
+ */
+ public function buildRelations()
+ {
+ $this->addRelation('Stock', '\\Thelia\\Model\\Stock', RelationMap::MANY_TO_ONE, array('stock_id' => 'id', ), null, null);
+ $this->addRelation('Currency', '\\Thelia\\Model\\Currency', RelationMap::MANY_TO_ONE, array('currency_id' => 'id', ), null, null);
+ } // buildRelations()
+
+ /**
+ *
+ * Gets the list of behaviors registered for this table
+ *
+ * @return array Associative array (name => parameters) of behaviors
+ */
+ public function getBehaviors()
+ {
+ return array(
+ 'timestampable' => array('create_column' => 'created_at', 'update_column' => 'updated_at', ),
+ );
+ } // getBehaviors()
+
+ /**
+ * Retrieves a string version of the primary key from the DB resultset row that can be used to uniquely identify a row in this table.
+ *
+ * For tables with a single-column primary key, that simple pkey value will be returned. For tables with
+ * a multi-column primary key, a serialize()d version of the primary key will be returned.
+ *
+ * @param array $row resultset row.
+ * @param int $offset The 0-based offset for reading from the resultset row.
+ * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
+ * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM
+ */
+ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
+ {
+ // If the PK cannot be derived from the row, return NULL.
+ if ($row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)] === null) {
+ return null;
+ }
+
+ return (string) $row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)];
+ }
+
+ /**
+ * Retrieves the primary key from the DB resultset row
+ * For tables with a single-column primary key, that simple pkey value will be returned. For tables with
+ * a multi-column primary key, an array of the primary key columns will be returned.
+ *
+ * @param array $row resultset row.
+ * @param int $offset The 0-based offset for reading from the resultset row.
+ * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
+ * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM
+ *
+ * @return mixed The primary key of the row
+ */
+ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
+ {
+
+ return (int) $row[
+ $indexType == TableMap::TYPE_NUM
+ ? 0 + $offset
+ : self::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)
+ ];
+ }
+
+ /**
+ * The class that the tableMap will make instances of.
+ *
+ * If $withPrefix is true, the returned path
+ * uses a dot-path notation which is translated into a path
+ * relative to a location on the PHP include_path.
+ * (e.g. path.to.MyClass -> 'path/to/MyClass.php')
+ *
+ * @param boolean $withPrefix Whether or not to return the path with the class name
+ * @return string path.to.ClassName
+ */
+ public static function getOMClass($withPrefix = true)
+ {
+ return $withPrefix ? ProductPriceTableMap::CLASS_DEFAULT : ProductPriceTableMap::OM_CLASS;
+ }
+
+ /**
+ * Populates an object of the default type or an object that inherit from the default.
+ *
+ * @param array $row row returned by DataFetcher->fetch().
+ * @param int $offset The 0-based offset for reading from the resultset row.
+ * @param string $indexType The index type of $row. Mostly DataFetcher->getIndexType().
+ One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
+ * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
+ *
+ * @throws PropelException Any exceptions caught during processing will be
+ * rethrown wrapped into a PropelException.
+ * @return array (ProductPrice object, last column rank)
+ */
+ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
+ {
+ $key = ProductPriceTableMap::getPrimaryKeyHashFromRow($row, $offset, $indexType);
+ if (null !== ($obj = ProductPriceTableMap::getInstanceFromPool($key))) {
+ // We no longer rehydrate the object, since this can cause data loss.
+ // See http://www.propelorm.org/ticket/509
+ // $obj->hydrate($row, $offset, true); // rehydrate
+ $col = $offset + ProductPriceTableMap::NUM_HYDRATE_COLUMNS;
+ } else {
+ $cls = ProductPriceTableMap::OM_CLASS;
+ $obj = new $cls();
+ $col = $obj->hydrate($row, $offset, false, $indexType);
+ ProductPriceTableMap::addInstanceToPool($obj, $key);
+ }
+
+ return array($obj, $col);
+ }
+
+ /**
+ * The returned array will contain objects of the default type or
+ * objects that inherit from the default.
+ *
+ * @param DataFetcherInterface $dataFetcher
+ * @return array
+ * @throws PropelException Any exceptions caught during processing will be
+ * rethrown wrapped into a PropelException.
+ */
+ public static function populateObjects(DataFetcherInterface $dataFetcher)
+ {
+ $results = array();
+
+ // set the class once to avoid overhead in the loop
+ $cls = static::getOMClass(false);
+ // populate the object(s)
+ while ($row = $dataFetcher->fetch()) {
+ $key = ProductPriceTableMap::getPrimaryKeyHashFromRow($row, 0, $dataFetcher->getIndexType());
+ if (null !== ($obj = ProductPriceTableMap::getInstanceFromPool($key))) {
+ // We no longer rehydrate the object, since this can cause data loss.
+ // See http://www.propelorm.org/ticket/509
+ // $obj->hydrate($row, 0, true); // rehydrate
+ $results[] = $obj;
+ } else {
+ $obj = new $cls();
+ $obj->hydrate($row);
+ $results[] = $obj;
+ ProductPriceTableMap::addInstanceToPool($obj, $key);
+ } // if key exists
+ }
+
+ return $results;
+ }
+ /**
+ * Add all the columns needed to create a new object.
+ *
+ * Note: any columns that were marked with lazyLoad="true" in the
+ * XML schema will not be added to the select list and only loaded
+ * on demand.
+ *
+ * @param Criteria $criteria object containing the columns to add.
+ * @param string $alias optional table alias
+ * @throws PropelException Any exceptions caught during processing will be
+ * rethrown wrapped into a PropelException.
+ */
+ public static function addSelectColumns(Criteria $criteria, $alias = null)
+ {
+ if (null === $alias) {
+ $criteria->addSelectColumn(ProductPriceTableMap::ID);
+ $criteria->addSelectColumn(ProductPriceTableMap::STOCK_ID);
+ $criteria->addSelectColumn(ProductPriceTableMap::CURRENCY_ID);
+ $criteria->addSelectColumn(ProductPriceTableMap::PRICE);
+ $criteria->addSelectColumn(ProductPriceTableMap::PROMO_PRICE);
+ $criteria->addSelectColumn(ProductPriceTableMap::CREATED_AT);
+ $criteria->addSelectColumn(ProductPriceTableMap::UPDATED_AT);
+ } else {
+ $criteria->addSelectColumn($alias . '.ID');
+ $criteria->addSelectColumn($alias . '.STOCK_ID');
+ $criteria->addSelectColumn($alias . '.CURRENCY_ID');
+ $criteria->addSelectColumn($alias . '.PRICE');
+ $criteria->addSelectColumn($alias . '.PROMO_PRICE');
+ $criteria->addSelectColumn($alias . '.CREATED_AT');
+ $criteria->addSelectColumn($alias . '.UPDATED_AT');
+ }
+ }
+
+ /**
+ * Returns the TableMap related to this object.
+ * This method is not needed for general use but a specific application could have a need.
+ * @return TableMap
+ * @throws PropelException Any exceptions caught during processing will be
+ * rethrown wrapped into a PropelException.
+ */
+ public static function getTableMap()
+ {
+ return Propel::getServiceContainer()->getDatabaseMap(ProductPriceTableMap::DATABASE_NAME)->getTable(ProductPriceTableMap::TABLE_NAME);
+ }
+
+ /**
+ * Add a TableMap instance to the database for this tableMap class.
+ */
+ public static function buildTableMap()
+ {
+ $dbMap = Propel::getServiceContainer()->getDatabaseMap(ProductPriceTableMap::DATABASE_NAME);
+ if (!$dbMap->hasTable(ProductPriceTableMap::TABLE_NAME)) {
+ $dbMap->addTableObject(new ProductPriceTableMap());
+ }
+ }
+
+ /**
+ * Performs a DELETE on the database, given a ProductPrice or Criteria object OR a primary key value.
+ *
+ * @param mixed $values Criteria or ProductPrice object or primary key or array of primary keys
+ * which is used to create the DELETE statement
+ * @param ConnectionInterface $con the connection to use
+ * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows
+ * if supported by native driver or if emulated using Propel.
+ * @throws PropelException Any exceptions caught during processing will be
+ * rethrown wrapped into a PropelException.
+ */
+ public static function doDelete($values, ConnectionInterface $con = null)
+ {
+ if (null === $con) {
+ $con = Propel::getServiceContainer()->getWriteConnection(ProductPriceTableMap::DATABASE_NAME);
+ }
+
+ if ($values instanceof Criteria) {
+ // rename for clarity
+ $criteria = $values;
+ } elseif ($values instanceof \Thelia\Model\ProductPrice) { // it's a model object
+ // create criteria based on pk values
+ $criteria = $values->buildPkeyCriteria();
+ } else { // it's a primary key, or an array of pks
+ $criteria = new Criteria(ProductPriceTableMap::DATABASE_NAME);
+ $criteria->add(ProductPriceTableMap::ID, (array) $values, Criteria::IN);
+ }
+
+ $query = ProductPriceQuery::create()->mergeWith($criteria);
+
+ if ($values instanceof Criteria) { ProductPriceTableMap::clearInstancePool();
+ } elseif (!is_object($values)) { // it's a primary key, or an array of pks
+ foreach ((array) $values as $singleval) { ProductPriceTableMap::removeInstanceFromPool($singleval);
+ }
+ }
+
+ return $query->delete($con);
+ }
+
+ /**
+ * Deletes all rows from the product_price table.
+ *
+ * @param ConnectionInterface $con the connection to use
+ * @return int The number of affected rows (if supported by underlying database driver).
+ */
+ public static function doDeleteAll(ConnectionInterface $con = null)
+ {
+ return ProductPriceQuery::create()->doDeleteAll($con);
+ }
+
+ /**
+ * Performs an INSERT on the database, given a ProductPrice or Criteria object.
+ *
+ * @param mixed $criteria Criteria or ProductPrice object containing data that is used to create the INSERT statement.
+ * @param ConnectionInterface $con the ConnectionInterface connection to use
+ * @return mixed The new primary key.
+ * @throws PropelException Any exceptions caught during processing will be
+ * rethrown wrapped into a PropelException.
+ */
+ public static function doInsert($criteria, ConnectionInterface $con = null)
+ {
+ if (null === $con) {
+ $con = Propel::getServiceContainer()->getWriteConnection(ProductPriceTableMap::DATABASE_NAME);
+ }
+
+ if ($criteria instanceof Criteria) {
+ $criteria = clone $criteria; // rename for clarity
+ } else {
+ $criteria = $criteria->buildCriteria(); // build Criteria from ProductPrice object
+ }
+
+ if ($criteria->containsKey(ProductPriceTableMap::ID) && $criteria->keyContainsValue(ProductPriceTableMap::ID) ) {
+ throw new PropelException('Cannot insert a value for auto-increment primary key ('.ProductPriceTableMap::ID.')');
+ }
+
+
+ // Set the correct dbName
+ $query = ProductPriceQuery::create()->mergeWith($criteria);
+
+ try {
+ // use transaction because $criteria could contain info
+ // for more than one table (I guess, conceivably)
+ $con->beginTransaction();
+ $pk = $query->doInsert($con);
+ $con->commit();
+ } catch (PropelException $e) {
+ $con->rollBack();
+ throw $e;
+ }
+
+ return $pk;
+ }
+
+} // ProductPriceTableMap
+// This is the static code needed to register the TableMap for this table with the main Propel class.
+//
+ProductPriceTableMap::buildTableMap();
diff --git a/core/lib/Thelia/Model/Map/ProductTableMap.php b/core/lib/Thelia/Model/Map/ProductTableMap.php
index 61c56dc8c..dd2971d16 100755
--- a/core/lib/Thelia/Model/Map/ProductTableMap.php
+++ b/core/lib/Thelia/Model/Map/ProductTableMap.php
@@ -57,7 +57,7 @@ class ProductTableMap extends TableMap
/**
* The total number of columns
*/
- const NUM_COLUMNS = 17;
+ const NUM_COLUMNS = 10;
/**
* The number of lazy-loaded columns
@@ -67,7 +67,7 @@ class ProductTableMap extends TableMap
/**
* The number of columns to hydrate (NUM_COLUMNS - NUM_LAZY_LOAD_COLUMNS)
*/
- const NUM_HYDRATE_COLUMNS = 17;
+ const NUM_HYDRATE_COLUMNS = 10;
/**
* the column name for the ID field
@@ -84,46 +84,11 @@ class ProductTableMap extends TableMap
*/
const REF = 'product.REF';
- /**
- * the column name for the PRICE field
- */
- const PRICE = 'product.PRICE';
-
- /**
- * the column name for the PRICE2 field
- */
- const PRICE2 = 'product.PRICE2';
-
- /**
- * the column name for the ECOTAX field
- */
- const ECOTAX = 'product.ECOTAX';
-
- /**
- * the column name for the NEWNESS field
- */
- const NEWNESS = 'product.NEWNESS';
-
- /**
- * the column name for the PROMO field
- */
- const PROMO = 'product.PROMO';
-
- /**
- * the column name for the QUANTITY field
- */
- const QUANTITY = 'product.QUANTITY';
-
/**
* the column name for the VISIBLE field
*/
const VISIBLE = 'product.VISIBLE';
- /**
- * the column name for the WEIGHT field
- */
- const WEIGHT = 'product.WEIGHT';
-
/**
* the column name for the POSITION field
*/
@@ -175,12 +140,12 @@ class ProductTableMap extends TableMap
* e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
*/
protected static $fieldNames = array (
- self::TYPE_PHPNAME => array('Id', 'TaxRuleId', 'Ref', 'Price', 'Price2', 'Ecotax', 'Newness', 'Promo', 'Quantity', 'Visible', 'Weight', 'Position', 'CreatedAt', 'UpdatedAt', 'Version', 'VersionCreatedAt', 'VersionCreatedBy', ),
- self::TYPE_STUDLYPHPNAME => array('id', 'taxRuleId', 'ref', 'price', 'price2', 'ecotax', 'newness', 'promo', 'quantity', 'visible', 'weight', 'position', 'createdAt', 'updatedAt', 'version', 'versionCreatedAt', 'versionCreatedBy', ),
- self::TYPE_COLNAME => array(ProductTableMap::ID, ProductTableMap::TAX_RULE_ID, ProductTableMap::REF, ProductTableMap::PRICE, ProductTableMap::PRICE2, ProductTableMap::ECOTAX, ProductTableMap::NEWNESS, ProductTableMap::PROMO, ProductTableMap::QUANTITY, ProductTableMap::VISIBLE, ProductTableMap::WEIGHT, ProductTableMap::POSITION, ProductTableMap::CREATED_AT, ProductTableMap::UPDATED_AT, ProductTableMap::VERSION, ProductTableMap::VERSION_CREATED_AT, ProductTableMap::VERSION_CREATED_BY, ),
- self::TYPE_RAW_COLNAME => array('ID', 'TAX_RULE_ID', 'REF', 'PRICE', 'PRICE2', 'ECOTAX', 'NEWNESS', 'PROMO', 'QUANTITY', 'VISIBLE', 'WEIGHT', 'POSITION', 'CREATED_AT', 'UPDATED_AT', 'VERSION', 'VERSION_CREATED_AT', 'VERSION_CREATED_BY', ),
- self::TYPE_FIELDNAME => array('id', 'tax_rule_id', 'ref', 'price', 'price2', 'ecotax', 'newness', 'promo', 'quantity', 'visible', 'weight', 'position', 'created_at', 'updated_at', 'version', 'version_created_at', 'version_created_by', ),
- self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, )
+ self::TYPE_PHPNAME => array('Id', 'TaxRuleId', 'Ref', 'Visible', 'Position', 'CreatedAt', 'UpdatedAt', 'Version', 'VersionCreatedAt', 'VersionCreatedBy', ),
+ self::TYPE_STUDLYPHPNAME => array('id', 'taxRuleId', 'ref', 'visible', 'position', 'createdAt', 'updatedAt', 'version', 'versionCreatedAt', 'versionCreatedBy', ),
+ self::TYPE_COLNAME => array(ProductTableMap::ID, ProductTableMap::TAX_RULE_ID, ProductTableMap::REF, ProductTableMap::VISIBLE, ProductTableMap::POSITION, ProductTableMap::CREATED_AT, ProductTableMap::UPDATED_AT, ProductTableMap::VERSION, ProductTableMap::VERSION_CREATED_AT, ProductTableMap::VERSION_CREATED_BY, ),
+ self::TYPE_RAW_COLNAME => array('ID', 'TAX_RULE_ID', 'REF', 'VISIBLE', 'POSITION', 'CREATED_AT', 'UPDATED_AT', 'VERSION', 'VERSION_CREATED_AT', 'VERSION_CREATED_BY', ),
+ self::TYPE_FIELDNAME => array('id', 'tax_rule_id', 'ref', 'visible', 'position', 'created_at', 'updated_at', 'version', 'version_created_at', 'version_created_by', ),
+ self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, )
);
/**
@@ -190,12 +155,12 @@ class ProductTableMap extends TableMap
* e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0
*/
protected static $fieldKeys = array (
- self::TYPE_PHPNAME => array('Id' => 0, 'TaxRuleId' => 1, 'Ref' => 2, 'Price' => 3, 'Price2' => 4, 'Ecotax' => 5, 'Newness' => 6, 'Promo' => 7, 'Quantity' => 8, 'Visible' => 9, 'Weight' => 10, 'Position' => 11, 'CreatedAt' => 12, 'UpdatedAt' => 13, 'Version' => 14, 'VersionCreatedAt' => 15, 'VersionCreatedBy' => 16, ),
- self::TYPE_STUDLYPHPNAME => array('id' => 0, 'taxRuleId' => 1, 'ref' => 2, 'price' => 3, 'price2' => 4, 'ecotax' => 5, 'newness' => 6, 'promo' => 7, 'quantity' => 8, 'visible' => 9, 'weight' => 10, 'position' => 11, 'createdAt' => 12, 'updatedAt' => 13, 'version' => 14, 'versionCreatedAt' => 15, 'versionCreatedBy' => 16, ),
- self::TYPE_COLNAME => array(ProductTableMap::ID => 0, ProductTableMap::TAX_RULE_ID => 1, ProductTableMap::REF => 2, ProductTableMap::PRICE => 3, ProductTableMap::PRICE2 => 4, ProductTableMap::ECOTAX => 5, ProductTableMap::NEWNESS => 6, ProductTableMap::PROMO => 7, ProductTableMap::QUANTITY => 8, ProductTableMap::VISIBLE => 9, ProductTableMap::WEIGHT => 10, ProductTableMap::POSITION => 11, ProductTableMap::CREATED_AT => 12, ProductTableMap::UPDATED_AT => 13, ProductTableMap::VERSION => 14, ProductTableMap::VERSION_CREATED_AT => 15, ProductTableMap::VERSION_CREATED_BY => 16, ),
- self::TYPE_RAW_COLNAME => array('ID' => 0, 'TAX_RULE_ID' => 1, 'REF' => 2, 'PRICE' => 3, 'PRICE2' => 4, 'ECOTAX' => 5, 'NEWNESS' => 6, 'PROMO' => 7, 'QUANTITY' => 8, 'VISIBLE' => 9, 'WEIGHT' => 10, 'POSITION' => 11, 'CREATED_AT' => 12, 'UPDATED_AT' => 13, 'VERSION' => 14, 'VERSION_CREATED_AT' => 15, 'VERSION_CREATED_BY' => 16, ),
- self::TYPE_FIELDNAME => array('id' => 0, 'tax_rule_id' => 1, 'ref' => 2, 'price' => 3, 'price2' => 4, 'ecotax' => 5, 'newness' => 6, 'promo' => 7, 'quantity' => 8, 'visible' => 9, 'weight' => 10, 'position' => 11, 'created_at' => 12, 'updated_at' => 13, 'version' => 14, 'version_created_at' => 15, 'version_created_by' => 16, ),
- self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, )
+ self::TYPE_PHPNAME => array('Id' => 0, 'TaxRuleId' => 1, 'Ref' => 2, 'Visible' => 3, 'Position' => 4, 'CreatedAt' => 5, 'UpdatedAt' => 6, 'Version' => 7, 'VersionCreatedAt' => 8, 'VersionCreatedBy' => 9, ),
+ self::TYPE_STUDLYPHPNAME => array('id' => 0, 'taxRuleId' => 1, 'ref' => 2, 'visible' => 3, 'position' => 4, 'createdAt' => 5, 'updatedAt' => 6, 'version' => 7, 'versionCreatedAt' => 8, 'versionCreatedBy' => 9, ),
+ self::TYPE_COLNAME => array(ProductTableMap::ID => 0, ProductTableMap::TAX_RULE_ID => 1, ProductTableMap::REF => 2, ProductTableMap::VISIBLE => 3, ProductTableMap::POSITION => 4, ProductTableMap::CREATED_AT => 5, ProductTableMap::UPDATED_AT => 6, ProductTableMap::VERSION => 7, ProductTableMap::VERSION_CREATED_AT => 8, ProductTableMap::VERSION_CREATED_BY => 9, ),
+ self::TYPE_RAW_COLNAME => array('ID' => 0, 'TAX_RULE_ID' => 1, 'REF' => 2, 'VISIBLE' => 3, 'POSITION' => 4, 'CREATED_AT' => 5, 'UPDATED_AT' => 6, 'VERSION' => 7, 'VERSION_CREATED_AT' => 8, 'VERSION_CREATED_BY' => 9, ),
+ self::TYPE_FIELDNAME => array('id' => 0, 'tax_rule_id' => 1, 'ref' => 2, 'visible' => 3, 'position' => 4, 'created_at' => 5, 'updated_at' => 6, 'version' => 7, 'version_created_at' => 8, 'version_created_by' => 9, ),
+ self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, )
);
/**
@@ -217,14 +182,7 @@ class ProductTableMap extends TableMap
$this->addPrimaryKey('ID', 'Id', 'INTEGER', true, null, null);
$this->addForeignKey('TAX_RULE_ID', 'TaxRuleId', 'INTEGER', 'tax_rule', 'ID', false, null, null);
$this->addColumn('REF', 'Ref', 'VARCHAR', true, 255, null);
- $this->addColumn('PRICE', 'Price', 'FLOAT', true, null, null);
- $this->addColumn('PRICE2', 'Price2', 'FLOAT', false, null, null);
- $this->addColumn('ECOTAX', 'Ecotax', 'FLOAT', false, null, null);
- $this->addColumn('NEWNESS', 'Newness', 'TINYINT', false, null, 0);
- $this->addColumn('PROMO', 'Promo', 'TINYINT', false, null, 0);
- $this->addColumn('QUANTITY', 'Quantity', 'INTEGER', false, null, 0);
$this->addColumn('VISIBLE', 'Visible', 'TINYINT', true, null, 0);
- $this->addColumn('WEIGHT', 'Weight', 'FLOAT', false, null, null);
$this->addColumn('POSITION', 'Position', 'INTEGER', true, null, null);
$this->addColumn('CREATED_AT', 'CreatedAt', 'TIMESTAMP', false, null, null);
$this->addColumn('UPDATED_AT', 'UpdatedAt', 'TIMESTAMP', false, null, null);
@@ -430,14 +388,7 @@ class ProductTableMap extends TableMap
$criteria->addSelectColumn(ProductTableMap::ID);
$criteria->addSelectColumn(ProductTableMap::TAX_RULE_ID);
$criteria->addSelectColumn(ProductTableMap::REF);
- $criteria->addSelectColumn(ProductTableMap::PRICE);
- $criteria->addSelectColumn(ProductTableMap::PRICE2);
- $criteria->addSelectColumn(ProductTableMap::ECOTAX);
- $criteria->addSelectColumn(ProductTableMap::NEWNESS);
- $criteria->addSelectColumn(ProductTableMap::PROMO);
- $criteria->addSelectColumn(ProductTableMap::QUANTITY);
$criteria->addSelectColumn(ProductTableMap::VISIBLE);
- $criteria->addSelectColumn(ProductTableMap::WEIGHT);
$criteria->addSelectColumn(ProductTableMap::POSITION);
$criteria->addSelectColumn(ProductTableMap::CREATED_AT);
$criteria->addSelectColumn(ProductTableMap::UPDATED_AT);
@@ -448,14 +399,7 @@ class ProductTableMap extends TableMap
$criteria->addSelectColumn($alias . '.ID');
$criteria->addSelectColumn($alias . '.TAX_RULE_ID');
$criteria->addSelectColumn($alias . '.REF');
- $criteria->addSelectColumn($alias . '.PRICE');
- $criteria->addSelectColumn($alias . '.PRICE2');
- $criteria->addSelectColumn($alias . '.ECOTAX');
- $criteria->addSelectColumn($alias . '.NEWNESS');
- $criteria->addSelectColumn($alias . '.PROMO');
- $criteria->addSelectColumn($alias . '.QUANTITY');
$criteria->addSelectColumn($alias . '.VISIBLE');
- $criteria->addSelectColumn($alias . '.WEIGHT');
$criteria->addSelectColumn($alias . '.POSITION');
$criteria->addSelectColumn($alias . '.CREATED_AT');
$criteria->addSelectColumn($alias . '.UPDATED_AT');
diff --git a/core/lib/Thelia/Model/Map/ProductVersionTableMap.php b/core/lib/Thelia/Model/Map/ProductVersionTableMap.php
index fb285a6db..d3e69b16f 100755
--- a/core/lib/Thelia/Model/Map/ProductVersionTableMap.php
+++ b/core/lib/Thelia/Model/Map/ProductVersionTableMap.php
@@ -57,7 +57,7 @@ class ProductVersionTableMap extends TableMap
/**
* The total number of columns
*/
- const NUM_COLUMNS = 17;
+ const NUM_COLUMNS = 10;
/**
* The number of lazy-loaded columns
@@ -67,7 +67,7 @@ class ProductVersionTableMap extends TableMap
/**
* The number of columns to hydrate (NUM_COLUMNS - NUM_LAZY_LOAD_COLUMNS)
*/
- const NUM_HYDRATE_COLUMNS = 17;
+ const NUM_HYDRATE_COLUMNS = 10;
/**
* the column name for the ID field
@@ -84,46 +84,11 @@ class ProductVersionTableMap extends TableMap
*/
const REF = 'product_version.REF';
- /**
- * the column name for the PRICE field
- */
- const PRICE = 'product_version.PRICE';
-
- /**
- * the column name for the PRICE2 field
- */
- const PRICE2 = 'product_version.PRICE2';
-
- /**
- * the column name for the ECOTAX field
- */
- const ECOTAX = 'product_version.ECOTAX';
-
- /**
- * the column name for the NEWNESS field
- */
- const NEWNESS = 'product_version.NEWNESS';
-
- /**
- * the column name for the PROMO field
- */
- const PROMO = 'product_version.PROMO';
-
- /**
- * the column name for the QUANTITY field
- */
- const QUANTITY = 'product_version.QUANTITY';
-
/**
* the column name for the VISIBLE field
*/
const VISIBLE = 'product_version.VISIBLE';
- /**
- * the column name for the WEIGHT field
- */
- const WEIGHT = 'product_version.WEIGHT';
-
/**
* the column name for the POSITION field
*/
@@ -166,12 +131,12 @@ class ProductVersionTableMap extends TableMap
* e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
*/
protected static $fieldNames = array (
- self::TYPE_PHPNAME => array('Id', 'TaxRuleId', 'Ref', 'Price', 'Price2', 'Ecotax', 'Newness', 'Promo', 'Quantity', 'Visible', 'Weight', 'Position', 'CreatedAt', 'UpdatedAt', 'Version', 'VersionCreatedAt', 'VersionCreatedBy', ),
- self::TYPE_STUDLYPHPNAME => array('id', 'taxRuleId', 'ref', 'price', 'price2', 'ecotax', 'newness', 'promo', 'quantity', 'visible', 'weight', 'position', 'createdAt', 'updatedAt', 'version', 'versionCreatedAt', 'versionCreatedBy', ),
- self::TYPE_COLNAME => array(ProductVersionTableMap::ID, ProductVersionTableMap::TAX_RULE_ID, ProductVersionTableMap::REF, ProductVersionTableMap::PRICE, ProductVersionTableMap::PRICE2, ProductVersionTableMap::ECOTAX, ProductVersionTableMap::NEWNESS, ProductVersionTableMap::PROMO, ProductVersionTableMap::QUANTITY, ProductVersionTableMap::VISIBLE, ProductVersionTableMap::WEIGHT, ProductVersionTableMap::POSITION, ProductVersionTableMap::CREATED_AT, ProductVersionTableMap::UPDATED_AT, ProductVersionTableMap::VERSION, ProductVersionTableMap::VERSION_CREATED_AT, ProductVersionTableMap::VERSION_CREATED_BY, ),
- self::TYPE_RAW_COLNAME => array('ID', 'TAX_RULE_ID', 'REF', 'PRICE', 'PRICE2', 'ECOTAX', 'NEWNESS', 'PROMO', 'QUANTITY', 'VISIBLE', 'WEIGHT', 'POSITION', 'CREATED_AT', 'UPDATED_AT', 'VERSION', 'VERSION_CREATED_AT', 'VERSION_CREATED_BY', ),
- self::TYPE_FIELDNAME => array('id', 'tax_rule_id', 'ref', 'price', 'price2', 'ecotax', 'newness', 'promo', 'quantity', 'visible', 'weight', 'position', 'created_at', 'updated_at', 'version', 'version_created_at', 'version_created_by', ),
- self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, )
+ self::TYPE_PHPNAME => array('Id', 'TaxRuleId', 'Ref', 'Visible', 'Position', 'CreatedAt', 'UpdatedAt', 'Version', 'VersionCreatedAt', 'VersionCreatedBy', ),
+ self::TYPE_STUDLYPHPNAME => array('id', 'taxRuleId', 'ref', 'visible', 'position', 'createdAt', 'updatedAt', 'version', 'versionCreatedAt', 'versionCreatedBy', ),
+ self::TYPE_COLNAME => array(ProductVersionTableMap::ID, ProductVersionTableMap::TAX_RULE_ID, ProductVersionTableMap::REF, ProductVersionTableMap::VISIBLE, ProductVersionTableMap::POSITION, ProductVersionTableMap::CREATED_AT, ProductVersionTableMap::UPDATED_AT, ProductVersionTableMap::VERSION, ProductVersionTableMap::VERSION_CREATED_AT, ProductVersionTableMap::VERSION_CREATED_BY, ),
+ self::TYPE_RAW_COLNAME => array('ID', 'TAX_RULE_ID', 'REF', 'VISIBLE', 'POSITION', 'CREATED_AT', 'UPDATED_AT', 'VERSION', 'VERSION_CREATED_AT', 'VERSION_CREATED_BY', ),
+ self::TYPE_FIELDNAME => array('id', 'tax_rule_id', 'ref', 'visible', 'position', 'created_at', 'updated_at', 'version', 'version_created_at', 'version_created_by', ),
+ self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, )
);
/**
@@ -181,12 +146,12 @@ class ProductVersionTableMap extends TableMap
* e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0
*/
protected static $fieldKeys = array (
- self::TYPE_PHPNAME => array('Id' => 0, 'TaxRuleId' => 1, 'Ref' => 2, 'Price' => 3, 'Price2' => 4, 'Ecotax' => 5, 'Newness' => 6, 'Promo' => 7, 'Quantity' => 8, 'Visible' => 9, 'Weight' => 10, 'Position' => 11, 'CreatedAt' => 12, 'UpdatedAt' => 13, 'Version' => 14, 'VersionCreatedAt' => 15, 'VersionCreatedBy' => 16, ),
- self::TYPE_STUDLYPHPNAME => array('id' => 0, 'taxRuleId' => 1, 'ref' => 2, 'price' => 3, 'price2' => 4, 'ecotax' => 5, 'newness' => 6, 'promo' => 7, 'quantity' => 8, 'visible' => 9, 'weight' => 10, 'position' => 11, 'createdAt' => 12, 'updatedAt' => 13, 'version' => 14, 'versionCreatedAt' => 15, 'versionCreatedBy' => 16, ),
- self::TYPE_COLNAME => array(ProductVersionTableMap::ID => 0, ProductVersionTableMap::TAX_RULE_ID => 1, ProductVersionTableMap::REF => 2, ProductVersionTableMap::PRICE => 3, ProductVersionTableMap::PRICE2 => 4, ProductVersionTableMap::ECOTAX => 5, ProductVersionTableMap::NEWNESS => 6, ProductVersionTableMap::PROMO => 7, ProductVersionTableMap::QUANTITY => 8, ProductVersionTableMap::VISIBLE => 9, ProductVersionTableMap::WEIGHT => 10, ProductVersionTableMap::POSITION => 11, ProductVersionTableMap::CREATED_AT => 12, ProductVersionTableMap::UPDATED_AT => 13, ProductVersionTableMap::VERSION => 14, ProductVersionTableMap::VERSION_CREATED_AT => 15, ProductVersionTableMap::VERSION_CREATED_BY => 16, ),
- self::TYPE_RAW_COLNAME => array('ID' => 0, 'TAX_RULE_ID' => 1, 'REF' => 2, 'PRICE' => 3, 'PRICE2' => 4, 'ECOTAX' => 5, 'NEWNESS' => 6, 'PROMO' => 7, 'QUANTITY' => 8, 'VISIBLE' => 9, 'WEIGHT' => 10, 'POSITION' => 11, 'CREATED_AT' => 12, 'UPDATED_AT' => 13, 'VERSION' => 14, 'VERSION_CREATED_AT' => 15, 'VERSION_CREATED_BY' => 16, ),
- self::TYPE_FIELDNAME => array('id' => 0, 'tax_rule_id' => 1, 'ref' => 2, 'price' => 3, 'price2' => 4, 'ecotax' => 5, 'newness' => 6, 'promo' => 7, 'quantity' => 8, 'visible' => 9, 'weight' => 10, 'position' => 11, 'created_at' => 12, 'updated_at' => 13, 'version' => 14, 'version_created_at' => 15, 'version_created_by' => 16, ),
- self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, )
+ self::TYPE_PHPNAME => array('Id' => 0, 'TaxRuleId' => 1, 'Ref' => 2, 'Visible' => 3, 'Position' => 4, 'CreatedAt' => 5, 'UpdatedAt' => 6, 'Version' => 7, 'VersionCreatedAt' => 8, 'VersionCreatedBy' => 9, ),
+ self::TYPE_STUDLYPHPNAME => array('id' => 0, 'taxRuleId' => 1, 'ref' => 2, 'visible' => 3, 'position' => 4, 'createdAt' => 5, 'updatedAt' => 6, 'version' => 7, 'versionCreatedAt' => 8, 'versionCreatedBy' => 9, ),
+ self::TYPE_COLNAME => array(ProductVersionTableMap::ID => 0, ProductVersionTableMap::TAX_RULE_ID => 1, ProductVersionTableMap::REF => 2, ProductVersionTableMap::VISIBLE => 3, ProductVersionTableMap::POSITION => 4, ProductVersionTableMap::CREATED_AT => 5, ProductVersionTableMap::UPDATED_AT => 6, ProductVersionTableMap::VERSION => 7, ProductVersionTableMap::VERSION_CREATED_AT => 8, ProductVersionTableMap::VERSION_CREATED_BY => 9, ),
+ self::TYPE_RAW_COLNAME => array('ID' => 0, 'TAX_RULE_ID' => 1, 'REF' => 2, 'VISIBLE' => 3, 'POSITION' => 4, 'CREATED_AT' => 5, 'UPDATED_AT' => 6, 'VERSION' => 7, 'VERSION_CREATED_AT' => 8, 'VERSION_CREATED_BY' => 9, ),
+ self::TYPE_FIELDNAME => array('id' => 0, 'tax_rule_id' => 1, 'ref' => 2, 'visible' => 3, 'position' => 4, 'created_at' => 5, 'updated_at' => 6, 'version' => 7, 'version_created_at' => 8, 'version_created_by' => 9, ),
+ self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, )
);
/**
@@ -208,14 +173,7 @@ class ProductVersionTableMap extends TableMap
$this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'product', 'ID', true, null, null);
$this->addColumn('TAX_RULE_ID', 'TaxRuleId', 'INTEGER', false, null, null);
$this->addColumn('REF', 'Ref', 'VARCHAR', true, 255, null);
- $this->addColumn('PRICE', 'Price', 'FLOAT', true, null, null);
- $this->addColumn('PRICE2', 'Price2', 'FLOAT', false, null, null);
- $this->addColumn('ECOTAX', 'Ecotax', 'FLOAT', false, null, null);
- $this->addColumn('NEWNESS', 'Newness', 'TINYINT', false, null, 0);
- $this->addColumn('PROMO', 'Promo', 'TINYINT', false, null, 0);
- $this->addColumn('QUANTITY', 'Quantity', 'INTEGER', false, null, 0);
$this->addColumn('VISIBLE', 'Visible', 'TINYINT', true, null, 0);
- $this->addColumn('WEIGHT', 'Weight', 'FLOAT', false, null, null);
$this->addColumn('POSITION', 'Position', 'INTEGER', true, null, null);
$this->addColumn('CREATED_AT', 'CreatedAt', 'TIMESTAMP', false, null, null);
$this->addColumn('UPDATED_AT', 'UpdatedAt', 'TIMESTAMP', false, null, null);
@@ -299,11 +257,11 @@ class ProductVersionTableMap extends TableMap
public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
{
// If the PK cannot be derived from the row, return NULL.
- if ($row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)] === null && $row[TableMap::TYPE_NUM == $indexType ? 14 + $offset : static::translateFieldName('Version', TableMap::TYPE_PHPNAME, $indexType)] === null) {
+ if ($row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)] === null && $row[TableMap::TYPE_NUM == $indexType ? 7 + $offset : static::translateFieldName('Version', TableMap::TYPE_PHPNAME, $indexType)] === null) {
return null;
}
- return serialize(array((string) $row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)], (string) $row[TableMap::TYPE_NUM == $indexType ? 14 + $offset : static::translateFieldName('Version', TableMap::TYPE_PHPNAME, $indexType)]));
+ return serialize(array((string) $row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)], (string) $row[TableMap::TYPE_NUM == $indexType ? 7 + $offset : static::translateFieldName('Version', TableMap::TYPE_PHPNAME, $indexType)]));
}
/**
@@ -422,14 +380,7 @@ class ProductVersionTableMap extends TableMap
$criteria->addSelectColumn(ProductVersionTableMap::ID);
$criteria->addSelectColumn(ProductVersionTableMap::TAX_RULE_ID);
$criteria->addSelectColumn(ProductVersionTableMap::REF);
- $criteria->addSelectColumn(ProductVersionTableMap::PRICE);
- $criteria->addSelectColumn(ProductVersionTableMap::PRICE2);
- $criteria->addSelectColumn(ProductVersionTableMap::ECOTAX);
- $criteria->addSelectColumn(ProductVersionTableMap::NEWNESS);
- $criteria->addSelectColumn(ProductVersionTableMap::PROMO);
- $criteria->addSelectColumn(ProductVersionTableMap::QUANTITY);
$criteria->addSelectColumn(ProductVersionTableMap::VISIBLE);
- $criteria->addSelectColumn(ProductVersionTableMap::WEIGHT);
$criteria->addSelectColumn(ProductVersionTableMap::POSITION);
$criteria->addSelectColumn(ProductVersionTableMap::CREATED_AT);
$criteria->addSelectColumn(ProductVersionTableMap::UPDATED_AT);
@@ -440,14 +391,7 @@ class ProductVersionTableMap extends TableMap
$criteria->addSelectColumn($alias . '.ID');
$criteria->addSelectColumn($alias . '.TAX_RULE_ID');
$criteria->addSelectColumn($alias . '.REF');
- $criteria->addSelectColumn($alias . '.PRICE');
- $criteria->addSelectColumn($alias . '.PRICE2');
- $criteria->addSelectColumn($alias . '.ECOTAX');
- $criteria->addSelectColumn($alias . '.NEWNESS');
- $criteria->addSelectColumn($alias . '.PROMO');
- $criteria->addSelectColumn($alias . '.QUANTITY');
$criteria->addSelectColumn($alias . '.VISIBLE');
- $criteria->addSelectColumn($alias . '.WEIGHT');
$criteria->addSelectColumn($alias . '.POSITION');
$criteria->addSelectColumn($alias . '.CREATED_AT');
$criteria->addSelectColumn($alias . '.UPDATED_AT');
diff --git a/core/lib/Thelia/Model/Map/StockTableMap.php b/core/lib/Thelia/Model/Map/StockTableMap.php
index c724c9d09..d3ce93225 100755
--- a/core/lib/Thelia/Model/Map/StockTableMap.php
+++ b/core/lib/Thelia/Model/Map/StockTableMap.php
@@ -57,7 +57,7 @@ class StockTableMap extends TableMap
/**
* The total number of columns
*/
- const NUM_COLUMNS = 7;
+ const NUM_COLUMNS = 10;
/**
* The number of lazy-loaded columns
@@ -67,7 +67,7 @@ class StockTableMap extends TableMap
/**
* The number of columns to hydrate (NUM_COLUMNS - NUM_LAZY_LOAD_COLUMNS)
*/
- const NUM_HYDRATE_COLUMNS = 7;
+ const NUM_HYDRATE_COLUMNS = 10;
/**
* the column name for the ID field
@@ -94,6 +94,21 @@ class StockTableMap extends TableMap
*/
const QUANTITY = 'stock.QUANTITY';
+ /**
+ * the column name for the PROMO field
+ */
+ const PROMO = 'stock.PROMO';
+
+ /**
+ * the column name for the NEWNESS field
+ */
+ const NEWNESS = 'stock.NEWNESS';
+
+ /**
+ * the column name for the WEIGHT field
+ */
+ const WEIGHT = 'stock.WEIGHT';
+
/**
* the column name for the CREATED_AT field
*/
@@ -116,12 +131,12 @@ class StockTableMap extends TableMap
* e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
*/
protected static $fieldNames = array (
- self::TYPE_PHPNAME => array('Id', 'CombinationId', 'ProductId', 'Increase', 'Quantity', 'CreatedAt', 'UpdatedAt', ),
- self::TYPE_STUDLYPHPNAME => array('id', 'combinationId', 'productId', 'increase', 'quantity', 'createdAt', 'updatedAt', ),
- self::TYPE_COLNAME => array(StockTableMap::ID, StockTableMap::COMBINATION_ID, StockTableMap::PRODUCT_ID, StockTableMap::INCREASE, StockTableMap::QUANTITY, StockTableMap::CREATED_AT, StockTableMap::UPDATED_AT, ),
- self::TYPE_RAW_COLNAME => array('ID', 'COMBINATION_ID', 'PRODUCT_ID', 'INCREASE', 'QUANTITY', 'CREATED_AT', 'UPDATED_AT', ),
- self::TYPE_FIELDNAME => array('id', 'combination_id', 'product_id', 'increase', 'quantity', 'created_at', 'updated_at', ),
- self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, )
+ self::TYPE_PHPNAME => array('Id', 'CombinationId', 'ProductId', 'Increase', 'Quantity', 'Promo', 'Newness', 'Weight', 'CreatedAt', 'UpdatedAt', ),
+ self::TYPE_STUDLYPHPNAME => array('id', 'combinationId', 'productId', 'increase', 'quantity', 'promo', 'newness', 'weight', 'createdAt', 'updatedAt', ),
+ self::TYPE_COLNAME => array(StockTableMap::ID, StockTableMap::COMBINATION_ID, StockTableMap::PRODUCT_ID, StockTableMap::INCREASE, StockTableMap::QUANTITY, StockTableMap::PROMO, StockTableMap::NEWNESS, StockTableMap::WEIGHT, StockTableMap::CREATED_AT, StockTableMap::UPDATED_AT, ),
+ self::TYPE_RAW_COLNAME => array('ID', 'COMBINATION_ID', 'PRODUCT_ID', 'INCREASE', 'QUANTITY', 'PROMO', 'NEWNESS', 'WEIGHT', 'CREATED_AT', 'UPDATED_AT', ),
+ self::TYPE_FIELDNAME => array('id', 'combination_id', 'product_id', 'increase', 'quantity', 'promo', 'newness', 'weight', 'created_at', 'updated_at', ),
+ self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, )
);
/**
@@ -131,12 +146,12 @@ class StockTableMap extends TableMap
* e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0
*/
protected static $fieldKeys = array (
- self::TYPE_PHPNAME => array('Id' => 0, 'CombinationId' => 1, 'ProductId' => 2, 'Increase' => 3, 'Quantity' => 4, 'CreatedAt' => 5, 'UpdatedAt' => 6, ),
- self::TYPE_STUDLYPHPNAME => array('id' => 0, 'combinationId' => 1, 'productId' => 2, 'increase' => 3, 'quantity' => 4, 'createdAt' => 5, 'updatedAt' => 6, ),
- self::TYPE_COLNAME => array(StockTableMap::ID => 0, StockTableMap::COMBINATION_ID => 1, StockTableMap::PRODUCT_ID => 2, StockTableMap::INCREASE => 3, StockTableMap::QUANTITY => 4, StockTableMap::CREATED_AT => 5, StockTableMap::UPDATED_AT => 6, ),
- self::TYPE_RAW_COLNAME => array('ID' => 0, 'COMBINATION_ID' => 1, 'PRODUCT_ID' => 2, 'INCREASE' => 3, 'QUANTITY' => 4, 'CREATED_AT' => 5, 'UPDATED_AT' => 6, ),
- self::TYPE_FIELDNAME => array('id' => 0, 'combination_id' => 1, 'product_id' => 2, 'increase' => 3, 'quantity' => 4, 'created_at' => 5, 'updated_at' => 6, ),
- self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, )
+ self::TYPE_PHPNAME => array('Id' => 0, 'CombinationId' => 1, 'ProductId' => 2, 'Increase' => 3, 'Quantity' => 4, 'Promo' => 5, 'Newness' => 6, 'Weight' => 7, 'CreatedAt' => 8, 'UpdatedAt' => 9, ),
+ self::TYPE_STUDLYPHPNAME => array('id' => 0, 'combinationId' => 1, 'productId' => 2, 'increase' => 3, 'quantity' => 4, 'promo' => 5, 'newness' => 6, 'weight' => 7, 'createdAt' => 8, 'updatedAt' => 9, ),
+ self::TYPE_COLNAME => array(StockTableMap::ID => 0, StockTableMap::COMBINATION_ID => 1, StockTableMap::PRODUCT_ID => 2, StockTableMap::INCREASE => 3, StockTableMap::QUANTITY => 4, StockTableMap::PROMO => 5, StockTableMap::NEWNESS => 6, StockTableMap::WEIGHT => 7, StockTableMap::CREATED_AT => 8, StockTableMap::UPDATED_AT => 9, ),
+ self::TYPE_RAW_COLNAME => array('ID' => 0, 'COMBINATION_ID' => 1, 'PRODUCT_ID' => 2, 'INCREASE' => 3, 'QUANTITY' => 4, 'PROMO' => 5, 'NEWNESS' => 6, 'WEIGHT' => 7, 'CREATED_AT' => 8, 'UPDATED_AT' => 9, ),
+ self::TYPE_FIELDNAME => array('id' => 0, 'combination_id' => 1, 'product_id' => 2, 'increase' => 3, 'quantity' => 4, 'promo' => 5, 'newness' => 6, 'weight' => 7, 'created_at' => 8, 'updated_at' => 9, ),
+ self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, )
);
/**
@@ -156,10 +171,13 @@ class StockTableMap extends TableMap
$this->setUseIdGenerator(true);
// columns
$this->addPrimaryKey('ID', 'Id', 'INTEGER', true, null, null);
- $this->addForeignKey('COMBINATION_ID', 'CombinationId', 'INTEGER', 'combination', 'ID', false, null, null);
+ $this->addColumn('COMBINATION_ID', 'CombinationId', 'INTEGER', false, null, null);
$this->addForeignKey('PRODUCT_ID', 'ProductId', 'INTEGER', 'product', 'ID', true, null, null);
$this->addColumn('INCREASE', 'Increase', 'FLOAT', false, null, null);
$this->addColumn('QUANTITY', 'Quantity', 'FLOAT', true, null, null);
+ $this->addColumn('PROMO', 'Promo', 'TINYINT', false, null, 0);
+ $this->addColumn('NEWNESS', 'Newness', 'TINYINT', false, null, 0);
+ $this->addColumn('WEIGHT', 'Weight', 'FLOAT', false, null, null);
$this->addColumn('CREATED_AT', 'CreatedAt', 'TIMESTAMP', false, null, null);
$this->addColumn('UPDATED_AT', 'UpdatedAt', 'TIMESTAMP', false, null, null);
} // initialize()
@@ -169,8 +187,10 @@ class StockTableMap extends TableMap
*/
public function buildRelations()
{
- $this->addRelation('Combination', '\\Thelia\\Model\\Combination', RelationMap::MANY_TO_ONE, array('combination_id' => 'id', ), 'SET NULL', 'RESTRICT');
$this->addRelation('Product', '\\Thelia\\Model\\Product', RelationMap::MANY_TO_ONE, array('product_id' => 'id', ), 'CASCADE', 'RESTRICT');
+ $this->addRelation('AttributeCombination', '\\Thelia\\Model\\AttributeCombination', RelationMap::ONE_TO_MANY, array('id' => 'stock_id', ), null, null, 'AttributeCombinations');
+ $this->addRelation('CartItem', '\\Thelia\\Model\\CartItem', RelationMap::ONE_TO_MANY, array('id' => 'stock_id', ), null, null, 'CartItems');
+ $this->addRelation('ProductPrice', '\\Thelia\\Model\\ProductPrice', RelationMap::ONE_TO_MANY, array('id' => 'stock_id', ), null, null, 'ProductPrices');
} // buildRelations()
/**
@@ -329,6 +349,9 @@ class StockTableMap extends TableMap
$criteria->addSelectColumn(StockTableMap::PRODUCT_ID);
$criteria->addSelectColumn(StockTableMap::INCREASE);
$criteria->addSelectColumn(StockTableMap::QUANTITY);
+ $criteria->addSelectColumn(StockTableMap::PROMO);
+ $criteria->addSelectColumn(StockTableMap::NEWNESS);
+ $criteria->addSelectColumn(StockTableMap::WEIGHT);
$criteria->addSelectColumn(StockTableMap::CREATED_AT);
$criteria->addSelectColumn(StockTableMap::UPDATED_AT);
} else {
@@ -337,6 +360,9 @@ class StockTableMap extends TableMap
$criteria->addSelectColumn($alias . '.PRODUCT_ID');
$criteria->addSelectColumn($alias . '.INCREASE');
$criteria->addSelectColumn($alias . '.QUANTITY');
+ $criteria->addSelectColumn($alias . '.PROMO');
+ $criteria->addSelectColumn($alias . '.NEWNESS');
+ $criteria->addSelectColumn($alias . '.WEIGHT');
$criteria->addSelectColumn($alias . '.CREATED_AT');
$criteria->addSelectColumn($alias . '.UPDATED_AT');
}
diff --git a/core/lib/Thelia/Model/ProductPrice.php b/core/lib/Thelia/Model/ProductPrice.php
new file mode 100644
index 000000000..04222a721
--- /dev/null
+++ b/core/lib/Thelia/Model/ProductPrice.php
@@ -0,0 +1,10 @@
+
-
@@ -17,19 +16,13 @@
+
-
-
-
-
-
-
-
@@ -242,24 +235,18 @@
-
-
-
+
-
-
+
+
@@ -267,8 +254,8 @@
-
-
+
+
@@ -278,15 +265,12 @@
-
-
-
+
+
+
-
-
-
@@ -977,15 +961,15 @@
-
+
-
-
+
+
@@ -993,8 +977,28 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+