diff --git a/core/lib/Thelia/Action/Order.php b/core/lib/Thelia/Action/Order.php
index 6cf9ff277..17d8327c0 100755
--- a/core/lib/Thelia/Action/Order.php
+++ b/core/lib/Thelia/Action/Order.php
@@ -25,7 +25,6 @@ namespace Thelia\Action;
use Propel\Runtime\ActiveQuery\ModelCriteria;
use Propel\Runtime\ActiveRecord\ActiveRecordInterface;
-use Propel\Runtime\Exception\PropelException;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
use Thelia\Core\Event\OrderEvent;
@@ -35,9 +34,8 @@ use Thelia\Model\AttributeAvI18n;
use Thelia\Model\AttributeAvI18nQuery;
use Thelia\Model\AttributeI18n;
use Thelia\Model\AttributeI18nQuery;
-use Thelia\Model\AttributeQuery;
use Thelia\Model\AddressQuery;
-use Thelia\Model\OrderAttributeCombination;
+use Thelia\Model\OrderProductAttributeCombination;
use Thelia\Model\ProductI18nQuery;
use Thelia\Model\Lang;
use Thelia\Model\ModuleQuery;
@@ -226,7 +224,7 @@ class Order extends BaseAction implements EventSubscriberInterface
$attribute = $this->getI18n(AttributeI18nQuery::create(), new AttributeI18n(), $attributeCombination->getAttributeId());
$attributeAv = $this->getI18n(AttributeAvI18nQuery::create(), new AttributeAvI18n(), $attributeCombination->getAttributeAvId());
- $orderAttributeCombination = new OrderAttributeCombination();
+ $orderAttributeCombination = new OrderProductAttributeCombination();
$orderAttributeCombination
->setOrderProductId($orderProduct->getId())
->setAttributeTitle($attribute->getTitle())
diff --git a/core/lib/Thelia/Model/Base/OrderAttributeCombination.php b/core/lib/Thelia/Model/Base/OrderAttributeCombination.php
deleted file mode 100644
index 09bd77c28..000000000
--- a/core/lib/Thelia/Model/Base/OrderAttributeCombination.php
+++ /dev/null
@@ -1,1824 +0,0 @@
-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 OrderAttributeCombination instance. If
- * obj is an instance of OrderAttributeCombination, delegates to
- * equals(OrderAttributeCombination). 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 array_key_exists($name, $this->virtualColumns);
- }
-
- /**
- * 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 OrderAttributeCombination 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 OrderAttributeCombination 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 [order_product_id] column value.
- *
- * @return int
- */
- public function getOrderProductId()
- {
-
- return $this->order_product_id;
- }
-
- /**
- * Get the [attribute_title] column value.
- *
- * @return string
- */
- public function getAttributeTitle()
- {
-
- return $this->attribute_title;
- }
-
- /**
- * Get the [attribute_chapo] column value.
- *
- * @return string
- */
- public function getAttributeChapo()
- {
-
- return $this->attribute_chapo;
- }
-
- /**
- * Get the [attribute_description] column value.
- *
- * @return string
- */
- public function getAttributeDescription()
- {
-
- return $this->attribute_description;
- }
-
- /**
- * Get the [attribute_postscriptumn] column value.
- *
- * @return string
- */
- public function getAttributePostscriptumn()
- {
-
- return $this->attribute_postscriptumn;
- }
-
- /**
- * Get the [attribute_av_title] column value.
- *
- * @return string
- */
- public function getAttributeAvTitle()
- {
-
- return $this->attribute_av_title;
- }
-
- /**
- * Get the [attribute_av_chapo] column value.
- *
- * @return string
- */
- public function getAttributeAvChapo()
- {
-
- return $this->attribute_av_chapo;
- }
-
- /**
- * Get the [attribute_av_description] column value.
- *
- * @return string
- */
- public function getAttributeAvDescription()
- {
-
- return $this->attribute_av_description;
- }
-
- /**
- * Get the [attribute_av_postscriptum] column value.
- *
- * @return string
- */
- public function getAttributeAvPostscriptum()
- {
-
- return $this->attribute_av_postscriptum;
- }
-
- /**
- * 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\OrderAttributeCombination 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[] = OrderAttributeCombinationTableMap::ID;
- }
-
-
- return $this;
- } // setId()
-
- /**
- * Set the value of [order_product_id] column.
- *
- * @param int $v new value
- * @return \Thelia\Model\OrderAttributeCombination The current object (for fluent API support)
- */
- public function setOrderProductId($v)
- {
- if ($v !== null) {
- $v = (int) $v;
- }
-
- if ($this->order_product_id !== $v) {
- $this->order_product_id = $v;
- $this->modifiedColumns[] = OrderAttributeCombinationTableMap::ORDER_PRODUCT_ID;
- }
-
- if ($this->aOrderProduct !== null && $this->aOrderProduct->getId() !== $v) {
- $this->aOrderProduct = null;
- }
-
-
- return $this;
- } // setOrderProductId()
-
- /**
- * Set the value of [attribute_title] column.
- *
- * @param string $v new value
- * @return \Thelia\Model\OrderAttributeCombination The current object (for fluent API support)
- */
- public function setAttributeTitle($v)
- {
- if ($v !== null) {
- $v = (string) $v;
- }
-
- if ($this->attribute_title !== $v) {
- $this->attribute_title = $v;
- $this->modifiedColumns[] = OrderAttributeCombinationTableMap::ATTRIBUTE_TITLE;
- }
-
-
- return $this;
- } // setAttributeTitle()
-
- /**
- * Set the value of [attribute_chapo] column.
- *
- * @param string $v new value
- * @return \Thelia\Model\OrderAttributeCombination The current object (for fluent API support)
- */
- public function setAttributeChapo($v)
- {
- if ($v !== null) {
- $v = (string) $v;
- }
-
- if ($this->attribute_chapo !== $v) {
- $this->attribute_chapo = $v;
- $this->modifiedColumns[] = OrderAttributeCombinationTableMap::ATTRIBUTE_CHAPO;
- }
-
-
- return $this;
- } // setAttributeChapo()
-
- /**
- * Set the value of [attribute_description] column.
- *
- * @param string $v new value
- * @return \Thelia\Model\OrderAttributeCombination The current object (for fluent API support)
- */
- public function setAttributeDescription($v)
- {
- if ($v !== null) {
- $v = (string) $v;
- }
-
- if ($this->attribute_description !== $v) {
- $this->attribute_description = $v;
- $this->modifiedColumns[] = OrderAttributeCombinationTableMap::ATTRIBUTE_DESCRIPTION;
- }
-
-
- return $this;
- } // setAttributeDescription()
-
- /**
- * Set the value of [attribute_postscriptumn] column.
- *
- * @param string $v new value
- * @return \Thelia\Model\OrderAttributeCombination The current object (for fluent API support)
- */
- public function setAttributePostscriptumn($v)
- {
- if ($v !== null) {
- $v = (string) $v;
- }
-
- if ($this->attribute_postscriptumn !== $v) {
- $this->attribute_postscriptumn = $v;
- $this->modifiedColumns[] = OrderAttributeCombinationTableMap::ATTRIBUTE_POSTSCRIPTUMN;
- }
-
-
- return $this;
- } // setAttributePostscriptumn()
-
- /**
- * Set the value of [attribute_av_title] column.
- *
- * @param string $v new value
- * @return \Thelia\Model\OrderAttributeCombination The current object (for fluent API support)
- */
- public function setAttributeAvTitle($v)
- {
- if ($v !== null) {
- $v = (string) $v;
- }
-
- if ($this->attribute_av_title !== $v) {
- $this->attribute_av_title = $v;
- $this->modifiedColumns[] = OrderAttributeCombinationTableMap::ATTRIBUTE_AV_TITLE;
- }
-
-
- return $this;
- } // setAttributeAvTitle()
-
- /**
- * Set the value of [attribute_av_chapo] column.
- *
- * @param string $v new value
- * @return \Thelia\Model\OrderAttributeCombination The current object (for fluent API support)
- */
- public function setAttributeAvChapo($v)
- {
- if ($v !== null) {
- $v = (string) $v;
- }
-
- if ($this->attribute_av_chapo !== $v) {
- $this->attribute_av_chapo = $v;
- $this->modifiedColumns[] = OrderAttributeCombinationTableMap::ATTRIBUTE_AV_CHAPO;
- }
-
-
- return $this;
- } // setAttributeAvChapo()
-
- /**
- * Set the value of [attribute_av_description] column.
- *
- * @param string $v new value
- * @return \Thelia\Model\OrderAttributeCombination The current object (for fluent API support)
- */
- public function setAttributeAvDescription($v)
- {
- if ($v !== null) {
- $v = (string) $v;
- }
-
- if ($this->attribute_av_description !== $v) {
- $this->attribute_av_description = $v;
- $this->modifiedColumns[] = OrderAttributeCombinationTableMap::ATTRIBUTE_AV_DESCRIPTION;
- }
-
-
- return $this;
- } // setAttributeAvDescription()
-
- /**
- * Set the value of [attribute_av_postscriptum] column.
- *
- * @param string $v new value
- * @return \Thelia\Model\OrderAttributeCombination The current object (for fluent API support)
- */
- public function setAttributeAvPostscriptum($v)
- {
- if ($v !== null) {
- $v = (string) $v;
- }
-
- if ($this->attribute_av_postscriptum !== $v) {
- $this->attribute_av_postscriptum = $v;
- $this->modifiedColumns[] = OrderAttributeCombinationTableMap::ATTRIBUTE_AV_POSTSCRIPTUM;
- }
-
-
- return $this;
- } // setAttributeAvPostscriptum()
-
- /**
- * 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\OrderAttributeCombination 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[] = OrderAttributeCombinationTableMap::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\OrderAttributeCombination 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[] = OrderAttributeCombinationTableMap::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 : OrderAttributeCombinationTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)];
- $this->id = (null !== $col) ? (int) $col : null;
-
- $col = $row[TableMap::TYPE_NUM == $indexType ? 1 + $startcol : OrderAttributeCombinationTableMap::translateFieldName('OrderProductId', TableMap::TYPE_PHPNAME, $indexType)];
- $this->order_product_id = (null !== $col) ? (int) $col : null;
-
- $col = $row[TableMap::TYPE_NUM == $indexType ? 2 + $startcol : OrderAttributeCombinationTableMap::translateFieldName('AttributeTitle', TableMap::TYPE_PHPNAME, $indexType)];
- $this->attribute_title = (null !== $col) ? (string) $col : null;
-
- $col = $row[TableMap::TYPE_NUM == $indexType ? 3 + $startcol : OrderAttributeCombinationTableMap::translateFieldName('AttributeChapo', TableMap::TYPE_PHPNAME, $indexType)];
- $this->attribute_chapo = (null !== $col) ? (string) $col : null;
-
- $col = $row[TableMap::TYPE_NUM == $indexType ? 4 + $startcol : OrderAttributeCombinationTableMap::translateFieldName('AttributeDescription', TableMap::TYPE_PHPNAME, $indexType)];
- $this->attribute_description = (null !== $col) ? (string) $col : null;
-
- $col = $row[TableMap::TYPE_NUM == $indexType ? 5 + $startcol : OrderAttributeCombinationTableMap::translateFieldName('AttributePostscriptumn', TableMap::TYPE_PHPNAME, $indexType)];
- $this->attribute_postscriptumn = (null !== $col) ? (string) $col : null;
-
- $col = $row[TableMap::TYPE_NUM == $indexType ? 6 + $startcol : OrderAttributeCombinationTableMap::translateFieldName('AttributeAvTitle', TableMap::TYPE_PHPNAME, $indexType)];
- $this->attribute_av_title = (null !== $col) ? (string) $col : null;
-
- $col = $row[TableMap::TYPE_NUM == $indexType ? 7 + $startcol : OrderAttributeCombinationTableMap::translateFieldName('AttributeAvChapo', TableMap::TYPE_PHPNAME, $indexType)];
- $this->attribute_av_chapo = (null !== $col) ? (string) $col : null;
-
- $col = $row[TableMap::TYPE_NUM == $indexType ? 8 + $startcol : OrderAttributeCombinationTableMap::translateFieldName('AttributeAvDescription', TableMap::TYPE_PHPNAME, $indexType)];
- $this->attribute_av_description = (null !== $col) ? (string) $col : null;
-
- $col = $row[TableMap::TYPE_NUM == $indexType ? 9 + $startcol : OrderAttributeCombinationTableMap::translateFieldName('AttributeAvPostscriptum', TableMap::TYPE_PHPNAME, $indexType)];
- $this->attribute_av_postscriptum = (null !== $col) ? (string) $col : null;
-
- $col = $row[TableMap::TYPE_NUM == $indexType ? 10 + $startcol : OrderAttributeCombinationTableMap::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 ? 11 + $startcol : OrderAttributeCombinationTableMap::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 + 12; // 12 = OrderAttributeCombinationTableMap::NUM_HYDRATE_COLUMNS.
-
- } catch (Exception $e) {
- throw new PropelException("Error populating \Thelia\Model\OrderAttributeCombination 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->aOrderProduct !== null && $this->order_product_id !== $this->aOrderProduct->getId()) {
- $this->aOrderProduct = 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(OrderAttributeCombinationTableMap::DATABASE_NAME);
- }
-
- // We don't need to alter the object instance pool; we're just modifying this instance
- // already in the pool.
-
- $dataFetcher = ChildOrderAttributeCombinationQuery::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->aOrderProduct = null;
- } // if (deep)
- }
-
- /**
- * Removes this object from datastore and sets delete attribute.
- *
- * @param ConnectionInterface $con
- * @return void
- * @throws PropelException
- * @see OrderAttributeCombination::setDeleted()
- * @see OrderAttributeCombination::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(OrderAttributeCombinationTableMap::DATABASE_NAME);
- }
-
- $con->beginTransaction();
- try {
- $deleteQuery = ChildOrderAttributeCombinationQuery::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(OrderAttributeCombinationTableMap::DATABASE_NAME);
- }
-
- $con->beginTransaction();
- $isInsert = $this->isNew();
- try {
- $ret = $this->preSave($con);
- if ($isInsert) {
- $ret = $ret && $this->preInsert($con);
- // timestampable behavior
- if (!$this->isColumnModified(OrderAttributeCombinationTableMap::CREATED_AT)) {
- $this->setCreatedAt(time());
- }
- if (!$this->isColumnModified(OrderAttributeCombinationTableMap::UPDATED_AT)) {
- $this->setUpdatedAt(time());
- }
- } else {
- $ret = $ret && $this->preUpdate($con);
- // timestampable behavior
- if ($this->isModified() && !$this->isColumnModified(OrderAttributeCombinationTableMap::UPDATED_AT)) {
- $this->setUpdatedAt(time());
- }
- }
- if ($ret) {
- $affectedRows = $this->doSave($con);
- if ($isInsert) {
- $this->postInsert($con);
- } else {
- $this->postUpdate($con);
- }
- $this->postSave($con);
- OrderAttributeCombinationTableMap::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->aOrderProduct !== null) {
- if ($this->aOrderProduct->isModified() || $this->aOrderProduct->isNew()) {
- $affectedRows += $this->aOrderProduct->save($con);
- }
- $this->setOrderProduct($this->aOrderProduct);
- }
-
- 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[] = OrderAttributeCombinationTableMap::ID;
- if (null !== $this->id) {
- throw new PropelException('Cannot insert a value for auto-increment primary key (' . OrderAttributeCombinationTableMap::ID . ')');
- }
-
- // check the columns in natural order for more readable SQL queries
- if ($this->isColumnModified(OrderAttributeCombinationTableMap::ID)) {
- $modifiedColumns[':p' . $index++] = 'ID';
- }
- if ($this->isColumnModified(OrderAttributeCombinationTableMap::ORDER_PRODUCT_ID)) {
- $modifiedColumns[':p' . $index++] = 'ORDER_PRODUCT_ID';
- }
- if ($this->isColumnModified(OrderAttributeCombinationTableMap::ATTRIBUTE_TITLE)) {
- $modifiedColumns[':p' . $index++] = 'ATTRIBUTE_TITLE';
- }
- if ($this->isColumnModified(OrderAttributeCombinationTableMap::ATTRIBUTE_CHAPO)) {
- $modifiedColumns[':p' . $index++] = 'ATTRIBUTE_CHAPO';
- }
- if ($this->isColumnModified(OrderAttributeCombinationTableMap::ATTRIBUTE_DESCRIPTION)) {
- $modifiedColumns[':p' . $index++] = 'ATTRIBUTE_DESCRIPTION';
- }
- if ($this->isColumnModified(OrderAttributeCombinationTableMap::ATTRIBUTE_POSTSCRIPTUMN)) {
- $modifiedColumns[':p' . $index++] = 'ATTRIBUTE_POSTSCRIPTUMN';
- }
- if ($this->isColumnModified(OrderAttributeCombinationTableMap::ATTRIBUTE_AV_TITLE)) {
- $modifiedColumns[':p' . $index++] = 'ATTRIBUTE_AV_TITLE';
- }
- if ($this->isColumnModified(OrderAttributeCombinationTableMap::ATTRIBUTE_AV_CHAPO)) {
- $modifiedColumns[':p' . $index++] = 'ATTRIBUTE_AV_CHAPO';
- }
- if ($this->isColumnModified(OrderAttributeCombinationTableMap::ATTRIBUTE_AV_DESCRIPTION)) {
- $modifiedColumns[':p' . $index++] = 'ATTRIBUTE_AV_DESCRIPTION';
- }
- if ($this->isColumnModified(OrderAttributeCombinationTableMap::ATTRIBUTE_AV_POSTSCRIPTUM)) {
- $modifiedColumns[':p' . $index++] = 'ATTRIBUTE_AV_POSTSCRIPTUM';
- }
- if ($this->isColumnModified(OrderAttributeCombinationTableMap::CREATED_AT)) {
- $modifiedColumns[':p' . $index++] = 'CREATED_AT';
- }
- if ($this->isColumnModified(OrderAttributeCombinationTableMap::UPDATED_AT)) {
- $modifiedColumns[':p' . $index++] = 'UPDATED_AT';
- }
-
- $sql = sprintf(
- 'INSERT INTO order_attribute_combination (%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 'ORDER_PRODUCT_ID':
- $stmt->bindValue($identifier, $this->order_product_id, PDO::PARAM_INT);
- break;
- case 'ATTRIBUTE_TITLE':
- $stmt->bindValue($identifier, $this->attribute_title, PDO::PARAM_STR);
- break;
- case 'ATTRIBUTE_CHAPO':
- $stmt->bindValue($identifier, $this->attribute_chapo, PDO::PARAM_STR);
- break;
- case 'ATTRIBUTE_DESCRIPTION':
- $stmt->bindValue($identifier, $this->attribute_description, PDO::PARAM_STR);
- break;
- case 'ATTRIBUTE_POSTSCRIPTUMN':
- $stmt->bindValue($identifier, $this->attribute_postscriptumn, PDO::PARAM_STR);
- break;
- case 'ATTRIBUTE_AV_TITLE':
- $stmt->bindValue($identifier, $this->attribute_av_title, PDO::PARAM_STR);
- break;
- case 'ATTRIBUTE_AV_CHAPO':
- $stmt->bindValue($identifier, $this->attribute_av_chapo, PDO::PARAM_STR);
- break;
- case 'ATTRIBUTE_AV_DESCRIPTION':
- $stmt->bindValue($identifier, $this->attribute_av_description, PDO::PARAM_STR);
- break;
- case 'ATTRIBUTE_AV_POSTSCRIPTUM':
- $stmt->bindValue($identifier, $this->attribute_av_postscriptum, 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 = OrderAttributeCombinationTableMap::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->getOrderProductId();
- break;
- case 2:
- return $this->getAttributeTitle();
- break;
- case 3:
- return $this->getAttributeChapo();
- break;
- case 4:
- return $this->getAttributeDescription();
- break;
- case 5:
- return $this->getAttributePostscriptumn();
- break;
- case 6:
- return $this->getAttributeAvTitle();
- break;
- case 7:
- return $this->getAttributeAvChapo();
- break;
- case 8:
- return $this->getAttributeAvDescription();
- break;
- case 9:
- return $this->getAttributeAvPostscriptum();
- break;
- case 10:
- return $this->getCreatedAt();
- break;
- case 11:
- 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['OrderAttributeCombination'][$this->getPrimaryKey()])) {
- return '*RECURSION*';
- }
- $alreadyDumpedObjects['OrderAttributeCombination'][$this->getPrimaryKey()] = true;
- $keys = OrderAttributeCombinationTableMap::getFieldNames($keyType);
- $result = array(
- $keys[0] => $this->getId(),
- $keys[1] => $this->getOrderProductId(),
- $keys[2] => $this->getAttributeTitle(),
- $keys[3] => $this->getAttributeChapo(),
- $keys[4] => $this->getAttributeDescription(),
- $keys[5] => $this->getAttributePostscriptumn(),
- $keys[6] => $this->getAttributeAvTitle(),
- $keys[7] => $this->getAttributeAvChapo(),
- $keys[8] => $this->getAttributeAvDescription(),
- $keys[9] => $this->getAttributeAvPostscriptum(),
- $keys[10] => $this->getCreatedAt(),
- $keys[11] => $this->getUpdatedAt(),
- );
- $virtualColumns = $this->virtualColumns;
- foreach($virtualColumns as $key => $virtualColumn)
- {
- $result[$key] = $virtualColumn;
- }
-
- if ($includeForeignObjects) {
- if (null !== $this->aOrderProduct) {
- $result['OrderProduct'] = $this->aOrderProduct->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 = OrderAttributeCombinationTableMap::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->setOrderProductId($value);
- break;
- case 2:
- $this->setAttributeTitle($value);
- break;
- case 3:
- $this->setAttributeChapo($value);
- break;
- case 4:
- $this->setAttributeDescription($value);
- break;
- case 5:
- $this->setAttributePostscriptumn($value);
- break;
- case 6:
- $this->setAttributeAvTitle($value);
- break;
- case 7:
- $this->setAttributeAvChapo($value);
- break;
- case 8:
- $this->setAttributeAvDescription($value);
- break;
- case 9:
- $this->setAttributeAvPostscriptum($value);
- break;
- case 10:
- $this->setCreatedAt($value);
- break;
- case 11:
- $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 = OrderAttributeCombinationTableMap::getFieldNames($keyType);
-
- if (array_key_exists($keys[0], $arr)) $this->setId($arr[$keys[0]]);
- if (array_key_exists($keys[1], $arr)) $this->setOrderProductId($arr[$keys[1]]);
- if (array_key_exists($keys[2], $arr)) $this->setAttributeTitle($arr[$keys[2]]);
- if (array_key_exists($keys[3], $arr)) $this->setAttributeChapo($arr[$keys[3]]);
- if (array_key_exists($keys[4], $arr)) $this->setAttributeDescription($arr[$keys[4]]);
- if (array_key_exists($keys[5], $arr)) $this->setAttributePostscriptumn($arr[$keys[5]]);
- if (array_key_exists($keys[6], $arr)) $this->setAttributeAvTitle($arr[$keys[6]]);
- if (array_key_exists($keys[7], $arr)) $this->setAttributeAvChapo($arr[$keys[7]]);
- if (array_key_exists($keys[8], $arr)) $this->setAttributeAvDescription($arr[$keys[8]]);
- if (array_key_exists($keys[9], $arr)) $this->setAttributeAvPostscriptum($arr[$keys[9]]);
- if (array_key_exists($keys[10], $arr)) $this->setCreatedAt($arr[$keys[10]]);
- if (array_key_exists($keys[11], $arr)) $this->setUpdatedAt($arr[$keys[11]]);
- }
-
- /**
- * 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(OrderAttributeCombinationTableMap::DATABASE_NAME);
-
- if ($this->isColumnModified(OrderAttributeCombinationTableMap::ID)) $criteria->add(OrderAttributeCombinationTableMap::ID, $this->id);
- if ($this->isColumnModified(OrderAttributeCombinationTableMap::ORDER_PRODUCT_ID)) $criteria->add(OrderAttributeCombinationTableMap::ORDER_PRODUCT_ID, $this->order_product_id);
- if ($this->isColumnModified(OrderAttributeCombinationTableMap::ATTRIBUTE_TITLE)) $criteria->add(OrderAttributeCombinationTableMap::ATTRIBUTE_TITLE, $this->attribute_title);
- if ($this->isColumnModified(OrderAttributeCombinationTableMap::ATTRIBUTE_CHAPO)) $criteria->add(OrderAttributeCombinationTableMap::ATTRIBUTE_CHAPO, $this->attribute_chapo);
- if ($this->isColumnModified(OrderAttributeCombinationTableMap::ATTRIBUTE_DESCRIPTION)) $criteria->add(OrderAttributeCombinationTableMap::ATTRIBUTE_DESCRIPTION, $this->attribute_description);
- if ($this->isColumnModified(OrderAttributeCombinationTableMap::ATTRIBUTE_POSTSCRIPTUMN)) $criteria->add(OrderAttributeCombinationTableMap::ATTRIBUTE_POSTSCRIPTUMN, $this->attribute_postscriptumn);
- if ($this->isColumnModified(OrderAttributeCombinationTableMap::ATTRIBUTE_AV_TITLE)) $criteria->add(OrderAttributeCombinationTableMap::ATTRIBUTE_AV_TITLE, $this->attribute_av_title);
- if ($this->isColumnModified(OrderAttributeCombinationTableMap::ATTRIBUTE_AV_CHAPO)) $criteria->add(OrderAttributeCombinationTableMap::ATTRIBUTE_AV_CHAPO, $this->attribute_av_chapo);
- if ($this->isColumnModified(OrderAttributeCombinationTableMap::ATTRIBUTE_AV_DESCRIPTION)) $criteria->add(OrderAttributeCombinationTableMap::ATTRIBUTE_AV_DESCRIPTION, $this->attribute_av_description);
- if ($this->isColumnModified(OrderAttributeCombinationTableMap::ATTRIBUTE_AV_POSTSCRIPTUM)) $criteria->add(OrderAttributeCombinationTableMap::ATTRIBUTE_AV_POSTSCRIPTUM, $this->attribute_av_postscriptum);
- if ($this->isColumnModified(OrderAttributeCombinationTableMap::CREATED_AT)) $criteria->add(OrderAttributeCombinationTableMap::CREATED_AT, $this->created_at);
- if ($this->isColumnModified(OrderAttributeCombinationTableMap::UPDATED_AT)) $criteria->add(OrderAttributeCombinationTableMap::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(OrderAttributeCombinationTableMap::DATABASE_NAME);
- $criteria->add(OrderAttributeCombinationTableMap::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\OrderAttributeCombination (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->setOrderProductId($this->getOrderProductId());
- $copyObj->setAttributeTitle($this->getAttributeTitle());
- $copyObj->setAttributeChapo($this->getAttributeChapo());
- $copyObj->setAttributeDescription($this->getAttributeDescription());
- $copyObj->setAttributePostscriptumn($this->getAttributePostscriptumn());
- $copyObj->setAttributeAvTitle($this->getAttributeAvTitle());
- $copyObj->setAttributeAvChapo($this->getAttributeAvChapo());
- $copyObj->setAttributeAvDescription($this->getAttributeAvDescription());
- $copyObj->setAttributeAvPostscriptum($this->getAttributeAvPostscriptum());
- $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\OrderAttributeCombination 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 ChildOrderProduct object.
- *
- * @param ChildOrderProduct $v
- * @return \Thelia\Model\OrderAttributeCombination The current object (for fluent API support)
- * @throws PropelException
- */
- public function setOrderProduct(ChildOrderProduct $v = null)
- {
- if ($v === null) {
- $this->setOrderProductId(NULL);
- } else {
- $this->setOrderProductId($v->getId());
- }
-
- $this->aOrderProduct = $v;
-
- // Add binding for other direction of this n:n relationship.
- // If this object has already been added to the ChildOrderProduct object, it will not be re-added.
- if ($v !== null) {
- $v->addOrderAttributeCombination($this);
- }
-
-
- return $this;
- }
-
-
- /**
- * Get the associated ChildOrderProduct object
- *
- * @param ConnectionInterface $con Optional Connection object.
- * @return ChildOrderProduct The associated ChildOrderProduct object.
- * @throws PropelException
- */
- public function getOrderProduct(ConnectionInterface $con = null)
- {
- if ($this->aOrderProduct === null && ($this->order_product_id !== null)) {
- $this->aOrderProduct = ChildOrderProductQuery::create()->findPk($this->order_product_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->aOrderProduct->addOrderAttributeCombinations($this);
- */
- }
-
- return $this->aOrderProduct;
- }
-
- /**
- * Clears the current object and sets all attributes to their default values
- */
- public function clear()
- {
- $this->id = null;
- $this->order_product_id = null;
- $this->attribute_title = null;
- $this->attribute_chapo = null;
- $this->attribute_description = null;
- $this->attribute_postscriptumn = null;
- $this->attribute_av_title = null;
- $this->attribute_av_chapo = null;
- $this->attribute_av_description = null;
- $this->attribute_av_postscriptum = 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->aOrderProduct = null;
- }
-
- /**
- * Return the string representation of this object
- *
- * @return string
- */
- public function __toString()
- {
- return (string) $this->exportTo(OrderAttributeCombinationTableMap::DEFAULT_STRING_FORMAT);
- }
-
- // timestampable behavior
-
- /**
- * Mark the current object so that the update date doesn't get updated during next save
- *
- * @return ChildOrderAttributeCombination The current object (for fluent API support)
- */
- public function keepUpdateDateUnchanged()
- {
- $this->modifiedColumns[] = OrderAttributeCombinationTableMap::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/OrderAttributeCombinationQuery.php b/core/lib/Thelia/Model/Base/OrderAttributeCombinationQuery.php
deleted file mode 100644
index 0c7e7bfd8..000000000
--- a/core/lib/Thelia/Model/Base/OrderAttributeCombinationQuery.php
+++ /dev/null
@@ -1,897 +0,0 @@
-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 ChildOrderAttributeCombination|array|mixed the result, formatted by the current formatter
- */
- public function findPk($key, $con = null)
- {
- if ($key === null) {
- return null;
- }
- if ((null !== ($obj = OrderAttributeCombinationTableMap::getInstanceFromPool((string) $key))) && !$this->formatter) {
- // the object is already in the instance pool
- return $obj;
- }
- if ($con === null) {
- $con = Propel::getServiceContainer()->getReadConnection(OrderAttributeCombinationTableMap::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 ChildOrderAttributeCombination A model object, or null if the key is not found
- */
- protected function findPkSimple($key, $con)
- {
- $sql = 'SELECT ID, ORDER_PRODUCT_ID, ATTRIBUTE_TITLE, ATTRIBUTE_CHAPO, ATTRIBUTE_DESCRIPTION, ATTRIBUTE_POSTSCRIPTUMN, ATTRIBUTE_AV_TITLE, ATTRIBUTE_AV_CHAPO, ATTRIBUTE_AV_DESCRIPTION, ATTRIBUTE_AV_POSTSCRIPTUM, CREATED_AT, UPDATED_AT FROM order_attribute_combination 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 ChildOrderAttributeCombination();
- $obj->hydrate($row);
- OrderAttributeCombinationTableMap::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 ChildOrderAttributeCombination|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 ChildOrderAttributeCombinationQuery The current query, for fluid interface
- */
- public function filterByPrimaryKey($key)
- {
-
- return $this->addUsingAlias(OrderAttributeCombinationTableMap::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 ChildOrderAttributeCombinationQuery The current query, for fluid interface
- */
- public function filterByPrimaryKeys($keys)
- {
-
- return $this->addUsingAlias(OrderAttributeCombinationTableMap::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 ChildOrderAttributeCombinationQuery 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(OrderAttributeCombinationTableMap::ID, $id['min'], Criteria::GREATER_EQUAL);
- $useMinMax = true;
- }
- if (isset($id['max'])) {
- $this->addUsingAlias(OrderAttributeCombinationTableMap::ID, $id['max'], Criteria::LESS_EQUAL);
- $useMinMax = true;
- }
- if ($useMinMax) {
- return $this;
- }
- if (null === $comparison) {
- $comparison = Criteria::IN;
- }
- }
-
- return $this->addUsingAlias(OrderAttributeCombinationTableMap::ID, $id, $comparison);
- }
-
- /**
- * Filter the query on the order_product_id column
- *
- * Example usage:
- *
- * $query->filterByOrderProductId(1234); // WHERE order_product_id = 1234
- * $query->filterByOrderProductId(array(12, 34)); // WHERE order_product_id IN (12, 34)
- * $query->filterByOrderProductId(array('min' => 12)); // WHERE order_product_id > 12
- *
- *
- * @see filterByOrderProduct()
- *
- * @param mixed $orderProductId 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 ChildOrderAttributeCombinationQuery The current query, for fluid interface
- */
- public function filterByOrderProductId($orderProductId = null, $comparison = null)
- {
- if (is_array($orderProductId)) {
- $useMinMax = false;
- if (isset($orderProductId['min'])) {
- $this->addUsingAlias(OrderAttributeCombinationTableMap::ORDER_PRODUCT_ID, $orderProductId['min'], Criteria::GREATER_EQUAL);
- $useMinMax = true;
- }
- if (isset($orderProductId['max'])) {
- $this->addUsingAlias(OrderAttributeCombinationTableMap::ORDER_PRODUCT_ID, $orderProductId['max'], Criteria::LESS_EQUAL);
- $useMinMax = true;
- }
- if ($useMinMax) {
- return $this;
- }
- if (null === $comparison) {
- $comparison = Criteria::IN;
- }
- }
-
- return $this->addUsingAlias(OrderAttributeCombinationTableMap::ORDER_PRODUCT_ID, $orderProductId, $comparison);
- }
-
- /**
- * Filter the query on the attribute_title column
- *
- * Example usage:
- *
- * $query->filterByAttributeTitle('fooValue'); // WHERE attribute_title = 'fooValue'
- * $query->filterByAttributeTitle('%fooValue%'); // WHERE attribute_title LIKE '%fooValue%'
- *
- *
- * @param string $attributeTitle The value to use as filter.
- * Accepts wildcards (* and % trigger a LIKE)
- * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
- *
- * @return ChildOrderAttributeCombinationQuery The current query, for fluid interface
- */
- public function filterByAttributeTitle($attributeTitle = null, $comparison = null)
- {
- if (null === $comparison) {
- if (is_array($attributeTitle)) {
- $comparison = Criteria::IN;
- } elseif (preg_match('/[\%\*]/', $attributeTitle)) {
- $attributeTitle = str_replace('*', '%', $attributeTitle);
- $comparison = Criteria::LIKE;
- }
- }
-
- return $this->addUsingAlias(OrderAttributeCombinationTableMap::ATTRIBUTE_TITLE, $attributeTitle, $comparison);
- }
-
- /**
- * Filter the query on the attribute_chapo column
- *
- * Example usage:
- *
- * $query->filterByAttributeChapo('fooValue'); // WHERE attribute_chapo = 'fooValue'
- * $query->filterByAttributeChapo('%fooValue%'); // WHERE attribute_chapo LIKE '%fooValue%'
- *
- *
- * @param string $attributeChapo The value to use as filter.
- * Accepts wildcards (* and % trigger a LIKE)
- * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
- *
- * @return ChildOrderAttributeCombinationQuery The current query, for fluid interface
- */
- public function filterByAttributeChapo($attributeChapo = null, $comparison = null)
- {
- if (null === $comparison) {
- if (is_array($attributeChapo)) {
- $comparison = Criteria::IN;
- } elseif (preg_match('/[\%\*]/', $attributeChapo)) {
- $attributeChapo = str_replace('*', '%', $attributeChapo);
- $comparison = Criteria::LIKE;
- }
- }
-
- return $this->addUsingAlias(OrderAttributeCombinationTableMap::ATTRIBUTE_CHAPO, $attributeChapo, $comparison);
- }
-
- /**
- * Filter the query on the attribute_description column
- *
- * Example usage:
- *
- * $query->filterByAttributeDescription('fooValue'); // WHERE attribute_description = 'fooValue'
- * $query->filterByAttributeDescription('%fooValue%'); // WHERE attribute_description LIKE '%fooValue%'
- *
- *
- * @param string $attributeDescription The value to use as filter.
- * Accepts wildcards (* and % trigger a LIKE)
- * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
- *
- * @return ChildOrderAttributeCombinationQuery The current query, for fluid interface
- */
- public function filterByAttributeDescription($attributeDescription = null, $comparison = null)
- {
- if (null === $comparison) {
- if (is_array($attributeDescription)) {
- $comparison = Criteria::IN;
- } elseif (preg_match('/[\%\*]/', $attributeDescription)) {
- $attributeDescription = str_replace('*', '%', $attributeDescription);
- $comparison = Criteria::LIKE;
- }
- }
-
- return $this->addUsingAlias(OrderAttributeCombinationTableMap::ATTRIBUTE_DESCRIPTION, $attributeDescription, $comparison);
- }
-
- /**
- * Filter the query on the attribute_postscriptumn column
- *
- * Example usage:
- *
- * $query->filterByAttributePostscriptumn('fooValue'); // WHERE attribute_postscriptumn = 'fooValue'
- * $query->filterByAttributePostscriptumn('%fooValue%'); // WHERE attribute_postscriptumn LIKE '%fooValue%'
- *
- *
- * @param string $attributePostscriptumn The value to use as filter.
- * Accepts wildcards (* and % trigger a LIKE)
- * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
- *
- * @return ChildOrderAttributeCombinationQuery The current query, for fluid interface
- */
- public function filterByAttributePostscriptumn($attributePostscriptumn = null, $comparison = null)
- {
- if (null === $comparison) {
- if (is_array($attributePostscriptumn)) {
- $comparison = Criteria::IN;
- } elseif (preg_match('/[\%\*]/', $attributePostscriptumn)) {
- $attributePostscriptumn = str_replace('*', '%', $attributePostscriptumn);
- $comparison = Criteria::LIKE;
- }
- }
-
- return $this->addUsingAlias(OrderAttributeCombinationTableMap::ATTRIBUTE_POSTSCRIPTUMN, $attributePostscriptumn, $comparison);
- }
-
- /**
- * Filter the query on the attribute_av_title column
- *
- * Example usage:
- *
- * $query->filterByAttributeAvTitle('fooValue'); // WHERE attribute_av_title = 'fooValue'
- * $query->filterByAttributeAvTitle('%fooValue%'); // WHERE attribute_av_title LIKE '%fooValue%'
- *
- *
- * @param string $attributeAvTitle The value to use as filter.
- * Accepts wildcards (* and % trigger a LIKE)
- * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
- *
- * @return ChildOrderAttributeCombinationQuery The current query, for fluid interface
- */
- public function filterByAttributeAvTitle($attributeAvTitle = null, $comparison = null)
- {
- if (null === $comparison) {
- if (is_array($attributeAvTitle)) {
- $comparison = Criteria::IN;
- } elseif (preg_match('/[\%\*]/', $attributeAvTitle)) {
- $attributeAvTitle = str_replace('*', '%', $attributeAvTitle);
- $comparison = Criteria::LIKE;
- }
- }
-
- return $this->addUsingAlias(OrderAttributeCombinationTableMap::ATTRIBUTE_AV_TITLE, $attributeAvTitle, $comparison);
- }
-
- /**
- * Filter the query on the attribute_av_chapo column
- *
- * Example usage:
- *
- * $query->filterByAttributeAvChapo('fooValue'); // WHERE attribute_av_chapo = 'fooValue'
- * $query->filterByAttributeAvChapo('%fooValue%'); // WHERE attribute_av_chapo LIKE '%fooValue%'
- *
- *
- * @param string $attributeAvChapo The value to use as filter.
- * Accepts wildcards (* and % trigger a LIKE)
- * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
- *
- * @return ChildOrderAttributeCombinationQuery The current query, for fluid interface
- */
- public function filterByAttributeAvChapo($attributeAvChapo = null, $comparison = null)
- {
- if (null === $comparison) {
- if (is_array($attributeAvChapo)) {
- $comparison = Criteria::IN;
- } elseif (preg_match('/[\%\*]/', $attributeAvChapo)) {
- $attributeAvChapo = str_replace('*', '%', $attributeAvChapo);
- $comparison = Criteria::LIKE;
- }
- }
-
- return $this->addUsingAlias(OrderAttributeCombinationTableMap::ATTRIBUTE_AV_CHAPO, $attributeAvChapo, $comparison);
- }
-
- /**
- * Filter the query on the attribute_av_description column
- *
- * Example usage:
- *
- * $query->filterByAttributeAvDescription('fooValue'); // WHERE attribute_av_description = 'fooValue'
- * $query->filterByAttributeAvDescription('%fooValue%'); // WHERE attribute_av_description LIKE '%fooValue%'
- *
- *
- * @param string $attributeAvDescription The value to use as filter.
- * Accepts wildcards (* and % trigger a LIKE)
- * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
- *
- * @return ChildOrderAttributeCombinationQuery The current query, for fluid interface
- */
- public function filterByAttributeAvDescription($attributeAvDescription = null, $comparison = null)
- {
- if (null === $comparison) {
- if (is_array($attributeAvDescription)) {
- $comparison = Criteria::IN;
- } elseif (preg_match('/[\%\*]/', $attributeAvDescription)) {
- $attributeAvDescription = str_replace('*', '%', $attributeAvDescription);
- $comparison = Criteria::LIKE;
- }
- }
-
- return $this->addUsingAlias(OrderAttributeCombinationTableMap::ATTRIBUTE_AV_DESCRIPTION, $attributeAvDescription, $comparison);
- }
-
- /**
- * Filter the query on the attribute_av_postscriptum column
- *
- * Example usage:
- *
- * $query->filterByAttributeAvPostscriptum('fooValue'); // WHERE attribute_av_postscriptum = 'fooValue'
- * $query->filterByAttributeAvPostscriptum('%fooValue%'); // WHERE attribute_av_postscriptum LIKE '%fooValue%'
- *
- *
- * @param string $attributeAvPostscriptum The value to use as filter.
- * Accepts wildcards (* and % trigger a LIKE)
- * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
- *
- * @return ChildOrderAttributeCombinationQuery The current query, for fluid interface
- */
- public function filterByAttributeAvPostscriptum($attributeAvPostscriptum = null, $comparison = null)
- {
- if (null === $comparison) {
- if (is_array($attributeAvPostscriptum)) {
- $comparison = Criteria::IN;
- } elseif (preg_match('/[\%\*]/', $attributeAvPostscriptum)) {
- $attributeAvPostscriptum = str_replace('*', '%', $attributeAvPostscriptum);
- $comparison = Criteria::LIKE;
- }
- }
-
- return $this->addUsingAlias(OrderAttributeCombinationTableMap::ATTRIBUTE_AV_POSTSCRIPTUM, $attributeAvPostscriptum, $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 ChildOrderAttributeCombinationQuery 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(OrderAttributeCombinationTableMap::CREATED_AT, $createdAt['min'], Criteria::GREATER_EQUAL);
- $useMinMax = true;
- }
- if (isset($createdAt['max'])) {
- $this->addUsingAlias(OrderAttributeCombinationTableMap::CREATED_AT, $createdAt['max'], Criteria::LESS_EQUAL);
- $useMinMax = true;
- }
- if ($useMinMax) {
- return $this;
- }
- if (null === $comparison) {
- $comparison = Criteria::IN;
- }
- }
-
- return $this->addUsingAlias(OrderAttributeCombinationTableMap::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 ChildOrderAttributeCombinationQuery 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(OrderAttributeCombinationTableMap::UPDATED_AT, $updatedAt['min'], Criteria::GREATER_EQUAL);
- $useMinMax = true;
- }
- if (isset($updatedAt['max'])) {
- $this->addUsingAlias(OrderAttributeCombinationTableMap::UPDATED_AT, $updatedAt['max'], Criteria::LESS_EQUAL);
- $useMinMax = true;
- }
- if ($useMinMax) {
- return $this;
- }
- if (null === $comparison) {
- $comparison = Criteria::IN;
- }
- }
-
- return $this->addUsingAlias(OrderAttributeCombinationTableMap::UPDATED_AT, $updatedAt, $comparison);
- }
-
- /**
- * Filter the query by a related \Thelia\Model\OrderProduct object
- *
- * @param \Thelia\Model\OrderProduct|ObjectCollection $orderProduct The related object(s) to use as filter
- * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
- *
- * @return ChildOrderAttributeCombinationQuery The current query, for fluid interface
- */
- public function filterByOrderProduct($orderProduct, $comparison = null)
- {
- if ($orderProduct instanceof \Thelia\Model\OrderProduct) {
- return $this
- ->addUsingAlias(OrderAttributeCombinationTableMap::ORDER_PRODUCT_ID, $orderProduct->getId(), $comparison);
- } elseif ($orderProduct instanceof ObjectCollection) {
- if (null === $comparison) {
- $comparison = Criteria::IN;
- }
-
- return $this
- ->addUsingAlias(OrderAttributeCombinationTableMap::ORDER_PRODUCT_ID, $orderProduct->toKeyValue('PrimaryKey', 'Id'), $comparison);
- } else {
- throw new PropelException('filterByOrderProduct() only accepts arguments of type \Thelia\Model\OrderProduct or Collection');
- }
- }
-
- /**
- * Adds a JOIN clause to the query using the OrderProduct relation
- *
- * @param string $relationAlias optional alias for the relation
- * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
- *
- * @return ChildOrderAttributeCombinationQuery The current query, for fluid interface
- */
- public function joinOrderProduct($relationAlias = null, $joinType = Criteria::INNER_JOIN)
- {
- $tableMap = $this->getTableMap();
- $relationMap = $tableMap->getRelation('OrderProduct');
-
- // 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, 'OrderProduct');
- }
-
- return $this;
- }
-
- /**
- * Use the OrderProduct relation OrderProduct 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\OrderProductQuery A secondary query class using the current class as primary query
- */
- public function useOrderProductQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN)
- {
- return $this
- ->joinOrderProduct($relationAlias, $joinType)
- ->useQuery($relationAlias ? $relationAlias : 'OrderProduct', '\Thelia\Model\OrderProductQuery');
- }
-
- /**
- * Exclude object from result
- *
- * @param ChildOrderAttributeCombination $orderAttributeCombination Object to remove from the list of results
- *
- * @return ChildOrderAttributeCombinationQuery The current query, for fluid interface
- */
- public function prune($orderAttributeCombination = null)
- {
- if ($orderAttributeCombination) {
- $this->addUsingAlias(OrderAttributeCombinationTableMap::ID, $orderAttributeCombination->getId(), Criteria::NOT_EQUAL);
- }
-
- return $this;
- }
-
- /**
- * Deletes all rows from the order_attribute_combination 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(OrderAttributeCombinationTableMap::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).
- OrderAttributeCombinationTableMap::clearInstancePool();
- OrderAttributeCombinationTableMap::clearRelatedInstancePool();
-
- $con->commit();
- } catch (PropelException $e) {
- $con->rollBack();
- throw $e;
- }
-
- return $affectedRows;
- }
-
- /**
- * Performs a DELETE on the database, given a ChildOrderAttributeCombination or Criteria object OR a primary key value.
- *
- * @param mixed $values Criteria or ChildOrderAttributeCombination 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(OrderAttributeCombinationTableMap::DATABASE_NAME);
- }
-
- $criteria = $this;
-
- // Set the correct dbName
- $criteria->setDbName(OrderAttributeCombinationTableMap::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();
-
-
- OrderAttributeCombinationTableMap::removeInstanceFromPool($criteria);
-
- $affectedRows += ModelCriteria::delete($con);
- OrderAttributeCombinationTableMap::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 ChildOrderAttributeCombinationQuery The current query, for fluid interface
- */
- public function recentlyUpdated($nbDays = 7)
- {
- return $this->addUsingAlias(OrderAttributeCombinationTableMap::UPDATED_AT, time() - $nbDays * 24 * 60 * 60, Criteria::GREATER_EQUAL);
- }
-
- /**
- * Filter by the latest created
- *
- * @param int $nbDays Maximum age of in days
- *
- * @return ChildOrderAttributeCombinationQuery The current query, for fluid interface
- */
- public function recentlyCreated($nbDays = 7)
- {
- return $this->addUsingAlias(OrderAttributeCombinationTableMap::CREATED_AT, time() - $nbDays * 24 * 60 * 60, Criteria::GREATER_EQUAL);
- }
-
- /**
- * Order by update date desc
- *
- * @return ChildOrderAttributeCombinationQuery The current query, for fluid interface
- */
- public function lastUpdatedFirst()
- {
- return $this->addDescendingOrderByColumn(OrderAttributeCombinationTableMap::UPDATED_AT);
- }
-
- /**
- * Order by update date asc
- *
- * @return ChildOrderAttributeCombinationQuery The current query, for fluid interface
- */
- public function firstUpdatedFirst()
- {
- return $this->addAscendingOrderByColumn(OrderAttributeCombinationTableMap::UPDATED_AT);
- }
-
- /**
- * Order by create date desc
- *
- * @return ChildOrderAttributeCombinationQuery The current query, for fluid interface
- */
- public function lastCreatedFirst()
- {
- return $this->addDescendingOrderByColumn(OrderAttributeCombinationTableMap::CREATED_AT);
- }
-
- /**
- * Order by create date asc
- *
- * @return ChildOrderAttributeCombinationQuery The current query, for fluid interface
- */
- public function firstCreatedFirst()
- {
- return $this->addAscendingOrderByColumn(OrderAttributeCombinationTableMap::CREATED_AT);
- }
-
-} // OrderAttributeCombinationQuery
diff --git a/core/lib/Thelia/Model/Base/OrderProduct.php b/core/lib/Thelia/Model/Base/OrderProduct.php
index 3d72eee6e..6ff03d427 100644
--- a/core/lib/Thelia/Model/Base/OrderProduct.php
+++ b/core/lib/Thelia/Model/Base/OrderProduct.php
@@ -18,10 +18,12 @@ use Propel\Runtime\Map\TableMap;
use Propel\Runtime\Parser\AbstractParser;
use Propel\Runtime\Util\PropelDateTime;
use Thelia\Model\Order as ChildOrder;
-use Thelia\Model\OrderAttributeCombination as ChildOrderAttributeCombination;
-use Thelia\Model\OrderAttributeCombinationQuery as ChildOrderAttributeCombinationQuery;
use Thelia\Model\OrderProduct as ChildOrderProduct;
+use Thelia\Model\OrderProductAttributeCombination as ChildOrderProductAttributeCombination;
+use Thelia\Model\OrderProductAttributeCombinationQuery as ChildOrderProductAttributeCombinationQuery;
use Thelia\Model\OrderProductQuery as ChildOrderProductQuery;
+use Thelia\Model\OrderProductTax as ChildOrderProductTax;
+use Thelia\Model\OrderProductTaxQuery as ChildOrderProductTaxQuery;
use Thelia\Model\OrderQuery as ChildOrderQuery;
use Thelia\Model\Map\OrderProductTableMap;
@@ -144,10 +146,16 @@ abstract class OrderProduct implements ActiveRecordInterface
protected $weight;
/**
- * The value for the tax field.
- * @var double
+ * The value for the tax_rule_title field.
+ * @var string
*/
- protected $tax;
+ protected $tax_rule_title;
+
+ /**
+ * The value for the tax_rule_description field.
+ * @var string
+ */
+ protected $tax_rule_description;
/**
* The value for the parent field.
@@ -173,10 +181,16 @@ abstract class OrderProduct implements ActiveRecordInterface
protected $aOrder;
/**
- * @var ObjectCollection|ChildOrderAttributeCombination[] Collection to store aggregation of ChildOrderAttributeCombination objects.
+ * @var ObjectCollection|ChildOrderProductAttributeCombination[] Collection to store aggregation of ChildOrderProductAttributeCombination objects.
*/
- protected $collOrderAttributeCombinations;
- protected $collOrderAttributeCombinationsPartial;
+ protected $collOrderProductAttributeCombinations;
+ protected $collOrderProductAttributeCombinationsPartial;
+
+ /**
+ * @var ObjectCollection|ChildOrderProductTax[] Collection to store aggregation of ChildOrderProductTax objects.
+ */
+ protected $collOrderProductTaxes;
+ protected $collOrderProductTaxesPartial;
/**
* Flag to prevent endless save loop, if this object is referenced
@@ -190,7 +204,13 @@ abstract class OrderProduct implements ActiveRecordInterface
* An array of objects scheduled for deletion.
* @var ObjectCollection
*/
- protected $orderAttributeCombinationsScheduledForDeletion = null;
+ protected $orderProductAttributeCombinationsScheduledForDeletion = null;
+
+ /**
+ * An array of objects scheduled for deletion.
+ * @var ObjectCollection
+ */
+ protected $orderProductTaxesScheduledForDeletion = null;
/**
* Initializes internal state of Thelia\Model\Base\OrderProduct object.
@@ -601,14 +621,25 @@ abstract class OrderProduct implements ActiveRecordInterface
}
/**
- * Get the [tax] column value.
+ * Get the [tax_rule_title] column value.
*
- * @return double
+ * @return string
*/
- public function getTax()
+ public function getTaxRuleTitle()
{
- return $this->tax;
+ return $this->tax_rule_title;
+ }
+
+ /**
+ * Get the [tax_rule_description] column value.
+ *
+ * @return string
+ */
+ public function getTaxRuleDescription()
+ {
+
+ return $this->tax_rule_description;
}
/**
@@ -961,25 +992,46 @@ abstract class OrderProduct implements ActiveRecordInterface
} // setWeight()
/**
- * Set the value of [tax] column.
+ * Set the value of [tax_rule_title] column.
*
- * @param double $v new value
+ * @param string $v new value
* @return \Thelia\Model\OrderProduct The current object (for fluent API support)
*/
- public function setTax($v)
+ public function setTaxRuleTitle($v)
{
if ($v !== null) {
- $v = (double) $v;
+ $v = (string) $v;
}
- if ($this->tax !== $v) {
- $this->tax = $v;
- $this->modifiedColumns[] = OrderProductTableMap::TAX;
+ if ($this->tax_rule_title !== $v) {
+ $this->tax_rule_title = $v;
+ $this->modifiedColumns[] = OrderProductTableMap::TAX_RULE_TITLE;
}
return $this;
- } // setTax()
+ } // setTaxRuleTitle()
+
+ /**
+ * Set the value of [tax_rule_description] column.
+ *
+ * @param string $v new value
+ * @return \Thelia\Model\OrderProduct The current object (for fluent API support)
+ */
+ public function setTaxRuleDescription($v)
+ {
+ if ($v !== null) {
+ $v = (string) $v;
+ }
+
+ if ($this->tax_rule_description !== $v) {
+ $this->tax_rule_description = $v;
+ $this->modifiedColumns[] = OrderProductTableMap::TAX_RULE_DESCRIPTION;
+ }
+
+
+ return $this;
+ } // setTaxRuleDescription()
/**
* Set the value of [parent] column.
@@ -1123,19 +1175,22 @@ abstract class OrderProduct implements ActiveRecordInterface
$col = $row[TableMap::TYPE_NUM == $indexType ? 13 + $startcol : OrderProductTableMap::translateFieldName('Weight', TableMap::TYPE_PHPNAME, $indexType)];
$this->weight = (null !== $col) ? (string) $col : null;
- $col = $row[TableMap::TYPE_NUM == $indexType ? 14 + $startcol : OrderProductTableMap::translateFieldName('Tax', TableMap::TYPE_PHPNAME, $indexType)];
- $this->tax = (null !== $col) ? (double) $col : null;
+ $col = $row[TableMap::TYPE_NUM == $indexType ? 14 + $startcol : OrderProductTableMap::translateFieldName('TaxRuleTitle', TableMap::TYPE_PHPNAME, $indexType)];
+ $this->tax_rule_title = (null !== $col) ? (string) $col : null;
- $col = $row[TableMap::TYPE_NUM == $indexType ? 15 + $startcol : OrderProductTableMap::translateFieldName('Parent', TableMap::TYPE_PHPNAME, $indexType)];
+ $col = $row[TableMap::TYPE_NUM == $indexType ? 15 + $startcol : OrderProductTableMap::translateFieldName('TaxRuleDescription', TableMap::TYPE_PHPNAME, $indexType)];
+ $this->tax_rule_description = (null !== $col) ? (string) $col : null;
+
+ $col = $row[TableMap::TYPE_NUM == $indexType ? 16 + $startcol : OrderProductTableMap::translateFieldName('Parent', TableMap::TYPE_PHPNAME, $indexType)];
$this->parent = (null !== $col) ? (int) $col : null;
- $col = $row[TableMap::TYPE_NUM == $indexType ? 16 + $startcol : OrderProductTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)];
+ $col = $row[TableMap::TYPE_NUM == $indexType ? 17 + $startcol : OrderProductTableMap::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 ? 17 + $startcol : OrderProductTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)];
+ $col = $row[TableMap::TYPE_NUM == $indexType ? 18 + $startcol : OrderProductTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)];
if ($col === '0000-00-00 00:00:00') {
$col = null;
}
@@ -1148,7 +1203,7 @@ abstract class OrderProduct implements ActiveRecordInterface
$this->ensureConsistency();
}
- return $startcol + 18; // 18 = OrderProductTableMap::NUM_HYDRATE_COLUMNS.
+ return $startcol + 19; // 19 = OrderProductTableMap::NUM_HYDRATE_COLUMNS.
} catch (Exception $e) {
throw new PropelException("Error populating \Thelia\Model\OrderProduct object", 0, $e);
@@ -1213,7 +1268,9 @@ abstract class OrderProduct implements ActiveRecordInterface
if ($deep) { // also de-associate any related objects?
$this->aOrder = null;
- $this->collOrderAttributeCombinations = null;
+ $this->collOrderProductAttributeCombinations = null;
+
+ $this->collOrderProductTaxes = null;
} // if (deep)
}
@@ -1360,17 +1417,34 @@ abstract class OrderProduct implements ActiveRecordInterface
$this->resetModified();
}
- if ($this->orderAttributeCombinationsScheduledForDeletion !== null) {
- if (!$this->orderAttributeCombinationsScheduledForDeletion->isEmpty()) {
- \Thelia\Model\OrderAttributeCombinationQuery::create()
- ->filterByPrimaryKeys($this->orderAttributeCombinationsScheduledForDeletion->getPrimaryKeys(false))
+ if ($this->orderProductAttributeCombinationsScheduledForDeletion !== null) {
+ if (!$this->orderProductAttributeCombinationsScheduledForDeletion->isEmpty()) {
+ \Thelia\Model\OrderProductAttributeCombinationQuery::create()
+ ->filterByPrimaryKeys($this->orderProductAttributeCombinationsScheduledForDeletion->getPrimaryKeys(false))
->delete($con);
- $this->orderAttributeCombinationsScheduledForDeletion = null;
+ $this->orderProductAttributeCombinationsScheduledForDeletion = null;
}
}
- if ($this->collOrderAttributeCombinations !== null) {
- foreach ($this->collOrderAttributeCombinations as $referrerFK) {
+ if ($this->collOrderProductAttributeCombinations !== null) {
+ foreach ($this->collOrderProductAttributeCombinations as $referrerFK) {
+ if (!$referrerFK->isDeleted() && ($referrerFK->isNew() || $referrerFK->isModified())) {
+ $affectedRows += $referrerFK->save($con);
+ }
+ }
+ }
+
+ if ($this->orderProductTaxesScheduledForDeletion !== null) {
+ if (!$this->orderProductTaxesScheduledForDeletion->isEmpty()) {
+ \Thelia\Model\OrderProductTaxQuery::create()
+ ->filterByPrimaryKeys($this->orderProductTaxesScheduledForDeletion->getPrimaryKeys(false))
+ ->delete($con);
+ $this->orderProductTaxesScheduledForDeletion = null;
+ }
+ }
+
+ if ($this->collOrderProductTaxes !== null) {
+ foreach ($this->collOrderProductTaxes as $referrerFK) {
if (!$referrerFK->isDeleted() && ($referrerFK->isNew() || $referrerFK->isModified())) {
$affectedRows += $referrerFK->save($con);
}
@@ -1445,8 +1519,11 @@ abstract class OrderProduct implements ActiveRecordInterface
if ($this->isColumnModified(OrderProductTableMap::WEIGHT)) {
$modifiedColumns[':p' . $index++] = 'WEIGHT';
}
- if ($this->isColumnModified(OrderProductTableMap::TAX)) {
- $modifiedColumns[':p' . $index++] = 'TAX';
+ if ($this->isColumnModified(OrderProductTableMap::TAX_RULE_TITLE)) {
+ $modifiedColumns[':p' . $index++] = 'TAX_RULE_TITLE';
+ }
+ if ($this->isColumnModified(OrderProductTableMap::TAX_RULE_DESCRIPTION)) {
+ $modifiedColumns[':p' . $index++] = 'TAX_RULE_DESCRIPTION';
}
if ($this->isColumnModified(OrderProductTableMap::PARENT)) {
$modifiedColumns[':p' . $index++] = 'PARENT';
@@ -1510,8 +1587,11 @@ abstract class OrderProduct implements ActiveRecordInterface
case 'WEIGHT':
$stmt->bindValue($identifier, $this->weight, PDO::PARAM_STR);
break;
- case 'TAX':
- $stmt->bindValue($identifier, $this->tax, PDO::PARAM_STR);
+ case 'TAX_RULE_TITLE':
+ $stmt->bindValue($identifier, $this->tax_rule_title, PDO::PARAM_STR);
+ break;
+ case 'TAX_RULE_DESCRIPTION':
+ $stmt->bindValue($identifier, $this->tax_rule_description, PDO::PARAM_STR);
break;
case 'PARENT':
$stmt->bindValue($identifier, $this->parent, PDO::PARAM_INT);
@@ -1627,15 +1707,18 @@ abstract class OrderProduct implements ActiveRecordInterface
return $this->getWeight();
break;
case 14:
- return $this->getTax();
+ return $this->getTaxRuleTitle();
break;
case 15:
- return $this->getParent();
+ return $this->getTaxRuleDescription();
break;
case 16:
- return $this->getCreatedAt();
+ return $this->getParent();
break;
case 17:
+ return $this->getCreatedAt();
+ break;
+ case 18:
return $this->getUpdatedAt();
break;
default:
@@ -1681,10 +1764,11 @@ abstract class OrderProduct implements ActiveRecordInterface
$keys[11] => $this->getWasNew(),
$keys[12] => $this->getWasInPromo(),
$keys[13] => $this->getWeight(),
- $keys[14] => $this->getTax(),
- $keys[15] => $this->getParent(),
- $keys[16] => $this->getCreatedAt(),
- $keys[17] => $this->getUpdatedAt(),
+ $keys[14] => $this->getTaxRuleTitle(),
+ $keys[15] => $this->getTaxRuleDescription(),
+ $keys[16] => $this->getParent(),
+ $keys[17] => $this->getCreatedAt(),
+ $keys[18] => $this->getUpdatedAt(),
);
$virtualColumns = $this->virtualColumns;
foreach($virtualColumns as $key => $virtualColumn)
@@ -1696,8 +1780,11 @@ abstract class OrderProduct implements ActiveRecordInterface
if (null !== $this->aOrder) {
$result['Order'] = $this->aOrder->toArray($keyType, $includeLazyLoadColumns, $alreadyDumpedObjects, true);
}
- if (null !== $this->collOrderAttributeCombinations) {
- $result['OrderAttributeCombinations'] = $this->collOrderAttributeCombinations->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects);
+ if (null !== $this->collOrderProductAttributeCombinations) {
+ $result['OrderProductAttributeCombinations'] = $this->collOrderProductAttributeCombinations->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects);
+ }
+ if (null !== $this->collOrderProductTaxes) {
+ $result['OrderProductTaxes'] = $this->collOrderProductTaxes->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects);
}
}
@@ -1776,15 +1863,18 @@ abstract class OrderProduct implements ActiveRecordInterface
$this->setWeight($value);
break;
case 14:
- $this->setTax($value);
+ $this->setTaxRuleTitle($value);
break;
case 15:
- $this->setParent($value);
+ $this->setTaxRuleDescription($value);
break;
case 16:
- $this->setCreatedAt($value);
+ $this->setParent($value);
break;
case 17:
+ $this->setCreatedAt($value);
+ break;
+ case 18:
$this->setUpdatedAt($value);
break;
} // switch()
@@ -1825,10 +1915,11 @@ abstract class OrderProduct implements ActiveRecordInterface
if (array_key_exists($keys[11], $arr)) $this->setWasNew($arr[$keys[11]]);
if (array_key_exists($keys[12], $arr)) $this->setWasInPromo($arr[$keys[12]]);
if (array_key_exists($keys[13], $arr)) $this->setWeight($arr[$keys[13]]);
- if (array_key_exists($keys[14], $arr)) $this->setTax($arr[$keys[14]]);
- if (array_key_exists($keys[15], $arr)) $this->setParent($arr[$keys[15]]);
- if (array_key_exists($keys[16], $arr)) $this->setCreatedAt($arr[$keys[16]]);
- if (array_key_exists($keys[17], $arr)) $this->setUpdatedAt($arr[$keys[17]]);
+ if (array_key_exists($keys[14], $arr)) $this->setTaxRuleTitle($arr[$keys[14]]);
+ if (array_key_exists($keys[15], $arr)) $this->setTaxRuleDescription($arr[$keys[15]]);
+ if (array_key_exists($keys[16], $arr)) $this->setParent($arr[$keys[16]]);
+ if (array_key_exists($keys[17], $arr)) $this->setCreatedAt($arr[$keys[17]]);
+ if (array_key_exists($keys[18], $arr)) $this->setUpdatedAt($arr[$keys[18]]);
}
/**
@@ -1854,7 +1945,8 @@ abstract class OrderProduct implements ActiveRecordInterface
if ($this->isColumnModified(OrderProductTableMap::WAS_NEW)) $criteria->add(OrderProductTableMap::WAS_NEW, $this->was_new);
if ($this->isColumnModified(OrderProductTableMap::WAS_IN_PROMO)) $criteria->add(OrderProductTableMap::WAS_IN_PROMO, $this->was_in_promo);
if ($this->isColumnModified(OrderProductTableMap::WEIGHT)) $criteria->add(OrderProductTableMap::WEIGHT, $this->weight);
- if ($this->isColumnModified(OrderProductTableMap::TAX)) $criteria->add(OrderProductTableMap::TAX, $this->tax);
+ if ($this->isColumnModified(OrderProductTableMap::TAX_RULE_TITLE)) $criteria->add(OrderProductTableMap::TAX_RULE_TITLE, $this->tax_rule_title);
+ if ($this->isColumnModified(OrderProductTableMap::TAX_RULE_DESCRIPTION)) $criteria->add(OrderProductTableMap::TAX_RULE_DESCRIPTION, $this->tax_rule_description);
if ($this->isColumnModified(OrderProductTableMap::PARENT)) $criteria->add(OrderProductTableMap::PARENT, $this->parent);
if ($this->isColumnModified(OrderProductTableMap::CREATED_AT)) $criteria->add(OrderProductTableMap::CREATED_AT, $this->created_at);
if ($this->isColumnModified(OrderProductTableMap::UPDATED_AT)) $criteria->add(OrderProductTableMap::UPDATED_AT, $this->updated_at);
@@ -1934,7 +2026,8 @@ abstract class OrderProduct implements ActiveRecordInterface
$copyObj->setWasNew($this->getWasNew());
$copyObj->setWasInPromo($this->getWasInPromo());
$copyObj->setWeight($this->getWeight());
- $copyObj->setTax($this->getTax());
+ $copyObj->setTaxRuleTitle($this->getTaxRuleTitle());
+ $copyObj->setTaxRuleDescription($this->getTaxRuleDescription());
$copyObj->setParent($this->getParent());
$copyObj->setCreatedAt($this->getCreatedAt());
$copyObj->setUpdatedAt($this->getUpdatedAt());
@@ -1944,9 +2037,15 @@ abstract class OrderProduct implements ActiveRecordInterface
// the getter/setter methods for fkey referrer objects.
$copyObj->setNew(false);
- foreach ($this->getOrderAttributeCombinations() as $relObj) {
+ foreach ($this->getOrderProductAttributeCombinations() as $relObj) {
if ($relObj !== $this) { // ensure that we don't try to copy a reference to ourselves
- $copyObj->addOrderAttributeCombination($relObj->copy($deepCopy));
+ $copyObj->addOrderProductAttributeCombination($relObj->copy($deepCopy));
+ }
+ }
+
+ foreach ($this->getOrderProductTaxes() as $relObj) {
+ if ($relObj !== $this) { // ensure that we don't try to copy a reference to ourselves
+ $copyObj->addOrderProductTax($relObj->copy($deepCopy));
}
}
@@ -2042,37 +2141,40 @@ abstract class OrderProduct implements ActiveRecordInterface
*/
public function initRelation($relationName)
{
- if ('OrderAttributeCombination' == $relationName) {
- return $this->initOrderAttributeCombinations();
+ if ('OrderProductAttributeCombination' == $relationName) {
+ return $this->initOrderProductAttributeCombinations();
+ }
+ if ('OrderProductTax' == $relationName) {
+ return $this->initOrderProductTaxes();
}
}
/**
- * Clears out the collOrderAttributeCombinations collection
+ * Clears out the collOrderProductAttributeCombinations 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 addOrderAttributeCombinations()
+ * @see addOrderProductAttributeCombinations()
*/
- public function clearOrderAttributeCombinations()
+ public function clearOrderProductAttributeCombinations()
{
- $this->collOrderAttributeCombinations = null; // important to set this to NULL since that means it is uninitialized
+ $this->collOrderProductAttributeCombinations = null; // important to set this to NULL since that means it is uninitialized
}
/**
- * Reset is the collOrderAttributeCombinations collection loaded partially.
+ * Reset is the collOrderProductAttributeCombinations collection loaded partially.
*/
- public function resetPartialOrderAttributeCombinations($v = true)
+ public function resetPartialOrderProductAttributeCombinations($v = true)
{
- $this->collOrderAttributeCombinationsPartial = $v;
+ $this->collOrderProductAttributeCombinationsPartial = $v;
}
/**
- * Initializes the collOrderAttributeCombinations collection.
+ * Initializes the collOrderProductAttributeCombinations collection.
*
- * By default this just sets the collOrderAttributeCombinations collection to an empty array (like clearcollOrderAttributeCombinations());
+ * By default this just sets the collOrderProductAttributeCombinations collection to an empty array (like clearcollOrderProductAttributeCombinations());
* 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.
*
@@ -2081,17 +2183,17 @@ abstract class OrderProduct implements ActiveRecordInterface
*
* @return void
*/
- public function initOrderAttributeCombinations($overrideExisting = true)
+ public function initOrderProductAttributeCombinations($overrideExisting = true)
{
- if (null !== $this->collOrderAttributeCombinations && !$overrideExisting) {
+ if (null !== $this->collOrderProductAttributeCombinations && !$overrideExisting) {
return;
}
- $this->collOrderAttributeCombinations = new ObjectCollection();
- $this->collOrderAttributeCombinations->setModel('\Thelia\Model\OrderAttributeCombination');
+ $this->collOrderProductAttributeCombinations = new ObjectCollection();
+ $this->collOrderProductAttributeCombinations->setModel('\Thelia\Model\OrderProductAttributeCombination');
}
/**
- * Gets an array of ChildOrderAttributeCombination objects which contain a foreign key that references this object.
+ * Gets an array of ChildOrderProductAttributeCombination 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.
@@ -2101,109 +2203,109 @@ abstract class OrderProduct implements ActiveRecordInterface
*
* @param Criteria $criteria optional Criteria object to narrow the query
* @param ConnectionInterface $con optional connection object
- * @return Collection|ChildOrderAttributeCombination[] List of ChildOrderAttributeCombination objects
+ * @return Collection|ChildOrderProductAttributeCombination[] List of ChildOrderProductAttributeCombination objects
* @throws PropelException
*/
- public function getOrderAttributeCombinations($criteria = null, ConnectionInterface $con = null)
+ public function getOrderProductAttributeCombinations($criteria = null, ConnectionInterface $con = null)
{
- $partial = $this->collOrderAttributeCombinationsPartial && !$this->isNew();
- if (null === $this->collOrderAttributeCombinations || null !== $criteria || $partial) {
- if ($this->isNew() && null === $this->collOrderAttributeCombinations) {
+ $partial = $this->collOrderProductAttributeCombinationsPartial && !$this->isNew();
+ if (null === $this->collOrderProductAttributeCombinations || null !== $criteria || $partial) {
+ if ($this->isNew() && null === $this->collOrderProductAttributeCombinations) {
// return empty collection
- $this->initOrderAttributeCombinations();
+ $this->initOrderProductAttributeCombinations();
} else {
- $collOrderAttributeCombinations = ChildOrderAttributeCombinationQuery::create(null, $criteria)
+ $collOrderProductAttributeCombinations = ChildOrderProductAttributeCombinationQuery::create(null, $criteria)
->filterByOrderProduct($this)
->find($con);
if (null !== $criteria) {
- if (false !== $this->collOrderAttributeCombinationsPartial && count($collOrderAttributeCombinations)) {
- $this->initOrderAttributeCombinations(false);
+ if (false !== $this->collOrderProductAttributeCombinationsPartial && count($collOrderProductAttributeCombinations)) {
+ $this->initOrderProductAttributeCombinations(false);
- foreach ($collOrderAttributeCombinations as $obj) {
- if (false == $this->collOrderAttributeCombinations->contains($obj)) {
- $this->collOrderAttributeCombinations->append($obj);
+ foreach ($collOrderProductAttributeCombinations as $obj) {
+ if (false == $this->collOrderProductAttributeCombinations->contains($obj)) {
+ $this->collOrderProductAttributeCombinations->append($obj);
}
}
- $this->collOrderAttributeCombinationsPartial = true;
+ $this->collOrderProductAttributeCombinationsPartial = true;
}
- $collOrderAttributeCombinations->getInternalIterator()->rewind();
+ $collOrderProductAttributeCombinations->getInternalIterator()->rewind();
- return $collOrderAttributeCombinations;
+ return $collOrderProductAttributeCombinations;
}
- if ($partial && $this->collOrderAttributeCombinations) {
- foreach ($this->collOrderAttributeCombinations as $obj) {
+ if ($partial && $this->collOrderProductAttributeCombinations) {
+ foreach ($this->collOrderProductAttributeCombinations as $obj) {
if ($obj->isNew()) {
- $collOrderAttributeCombinations[] = $obj;
+ $collOrderProductAttributeCombinations[] = $obj;
}
}
}
- $this->collOrderAttributeCombinations = $collOrderAttributeCombinations;
- $this->collOrderAttributeCombinationsPartial = false;
+ $this->collOrderProductAttributeCombinations = $collOrderProductAttributeCombinations;
+ $this->collOrderProductAttributeCombinationsPartial = false;
}
}
- return $this->collOrderAttributeCombinations;
+ return $this->collOrderProductAttributeCombinations;
}
/**
- * Sets a collection of OrderAttributeCombination objects related by a one-to-many relationship
+ * Sets a collection of OrderProductAttributeCombination 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 $orderAttributeCombinations A Propel collection.
+ * @param Collection $orderProductAttributeCombinations A Propel collection.
* @param ConnectionInterface $con Optional connection object
* @return ChildOrderProduct The current object (for fluent API support)
*/
- public function setOrderAttributeCombinations(Collection $orderAttributeCombinations, ConnectionInterface $con = null)
+ public function setOrderProductAttributeCombinations(Collection $orderProductAttributeCombinations, ConnectionInterface $con = null)
{
- $orderAttributeCombinationsToDelete = $this->getOrderAttributeCombinations(new Criteria(), $con)->diff($orderAttributeCombinations);
+ $orderProductAttributeCombinationsToDelete = $this->getOrderProductAttributeCombinations(new Criteria(), $con)->diff($orderProductAttributeCombinations);
- $this->orderAttributeCombinationsScheduledForDeletion = $orderAttributeCombinationsToDelete;
+ $this->orderProductAttributeCombinationsScheduledForDeletion = $orderProductAttributeCombinationsToDelete;
- foreach ($orderAttributeCombinationsToDelete as $orderAttributeCombinationRemoved) {
- $orderAttributeCombinationRemoved->setOrderProduct(null);
+ foreach ($orderProductAttributeCombinationsToDelete as $orderProductAttributeCombinationRemoved) {
+ $orderProductAttributeCombinationRemoved->setOrderProduct(null);
}
- $this->collOrderAttributeCombinations = null;
- foreach ($orderAttributeCombinations as $orderAttributeCombination) {
- $this->addOrderAttributeCombination($orderAttributeCombination);
+ $this->collOrderProductAttributeCombinations = null;
+ foreach ($orderProductAttributeCombinations as $orderProductAttributeCombination) {
+ $this->addOrderProductAttributeCombination($orderProductAttributeCombination);
}
- $this->collOrderAttributeCombinations = $orderAttributeCombinations;
- $this->collOrderAttributeCombinationsPartial = false;
+ $this->collOrderProductAttributeCombinations = $orderProductAttributeCombinations;
+ $this->collOrderProductAttributeCombinationsPartial = false;
return $this;
}
/**
- * Returns the number of related OrderAttributeCombination objects.
+ * Returns the number of related OrderProductAttributeCombination objects.
*
* @param Criteria $criteria
* @param boolean $distinct
* @param ConnectionInterface $con
- * @return int Count of related OrderAttributeCombination objects.
+ * @return int Count of related OrderProductAttributeCombination objects.
* @throws PropelException
*/
- public function countOrderAttributeCombinations(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null)
+ public function countOrderProductAttributeCombinations(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null)
{
- $partial = $this->collOrderAttributeCombinationsPartial && !$this->isNew();
- if (null === $this->collOrderAttributeCombinations || null !== $criteria || $partial) {
- if ($this->isNew() && null === $this->collOrderAttributeCombinations) {
+ $partial = $this->collOrderProductAttributeCombinationsPartial && !$this->isNew();
+ if (null === $this->collOrderProductAttributeCombinations || null !== $criteria || $partial) {
+ if ($this->isNew() && null === $this->collOrderProductAttributeCombinations) {
return 0;
}
if ($partial && !$criteria) {
- return count($this->getOrderAttributeCombinations());
+ return count($this->getOrderProductAttributeCombinations());
}
- $query = ChildOrderAttributeCombinationQuery::create(null, $criteria);
+ $query = ChildOrderProductAttributeCombinationQuery::create(null, $criteria);
if ($distinct) {
$query->distinct();
}
@@ -2213,53 +2315,271 @@ abstract class OrderProduct implements ActiveRecordInterface
->count($con);
}
- return count($this->collOrderAttributeCombinations);
+ return count($this->collOrderProductAttributeCombinations);
}
/**
- * Method called to associate a ChildOrderAttributeCombination object to this object
- * through the ChildOrderAttributeCombination foreign key attribute.
+ * Method called to associate a ChildOrderProductAttributeCombination object to this object
+ * through the ChildOrderProductAttributeCombination foreign key attribute.
*
- * @param ChildOrderAttributeCombination $l ChildOrderAttributeCombination
+ * @param ChildOrderProductAttributeCombination $l ChildOrderProductAttributeCombination
* @return \Thelia\Model\OrderProduct The current object (for fluent API support)
*/
- public function addOrderAttributeCombination(ChildOrderAttributeCombination $l)
+ public function addOrderProductAttributeCombination(ChildOrderProductAttributeCombination $l)
{
- if ($this->collOrderAttributeCombinations === null) {
- $this->initOrderAttributeCombinations();
- $this->collOrderAttributeCombinationsPartial = true;
+ if ($this->collOrderProductAttributeCombinations === null) {
+ $this->initOrderProductAttributeCombinations();
+ $this->collOrderProductAttributeCombinationsPartial = true;
}
- if (!in_array($l, $this->collOrderAttributeCombinations->getArrayCopy(), true)) { // only add it if the **same** object is not already associated
- $this->doAddOrderAttributeCombination($l);
+ if (!in_array($l, $this->collOrderProductAttributeCombinations->getArrayCopy(), true)) { // only add it if the **same** object is not already associated
+ $this->doAddOrderProductAttributeCombination($l);
}
return $this;
}
/**
- * @param OrderAttributeCombination $orderAttributeCombination The orderAttributeCombination object to add.
+ * @param OrderProductAttributeCombination $orderProductAttributeCombination The orderProductAttributeCombination object to add.
*/
- protected function doAddOrderAttributeCombination($orderAttributeCombination)
+ protected function doAddOrderProductAttributeCombination($orderProductAttributeCombination)
{
- $this->collOrderAttributeCombinations[]= $orderAttributeCombination;
- $orderAttributeCombination->setOrderProduct($this);
+ $this->collOrderProductAttributeCombinations[]= $orderProductAttributeCombination;
+ $orderProductAttributeCombination->setOrderProduct($this);
}
/**
- * @param OrderAttributeCombination $orderAttributeCombination The orderAttributeCombination object to remove.
+ * @param OrderProductAttributeCombination $orderProductAttributeCombination The orderProductAttributeCombination object to remove.
* @return ChildOrderProduct The current object (for fluent API support)
*/
- public function removeOrderAttributeCombination($orderAttributeCombination)
+ public function removeOrderProductAttributeCombination($orderProductAttributeCombination)
{
- if ($this->getOrderAttributeCombinations()->contains($orderAttributeCombination)) {
- $this->collOrderAttributeCombinations->remove($this->collOrderAttributeCombinations->search($orderAttributeCombination));
- if (null === $this->orderAttributeCombinationsScheduledForDeletion) {
- $this->orderAttributeCombinationsScheduledForDeletion = clone $this->collOrderAttributeCombinations;
- $this->orderAttributeCombinationsScheduledForDeletion->clear();
+ if ($this->getOrderProductAttributeCombinations()->contains($orderProductAttributeCombination)) {
+ $this->collOrderProductAttributeCombinations->remove($this->collOrderProductAttributeCombinations->search($orderProductAttributeCombination));
+ if (null === $this->orderProductAttributeCombinationsScheduledForDeletion) {
+ $this->orderProductAttributeCombinationsScheduledForDeletion = clone $this->collOrderProductAttributeCombinations;
+ $this->orderProductAttributeCombinationsScheduledForDeletion->clear();
}
- $this->orderAttributeCombinationsScheduledForDeletion[]= clone $orderAttributeCombination;
- $orderAttributeCombination->setOrderProduct(null);
+ $this->orderProductAttributeCombinationsScheduledForDeletion[]= clone $orderProductAttributeCombination;
+ $orderProductAttributeCombination->setOrderProduct(null);
+ }
+
+ return $this;
+ }
+
+ /**
+ * Clears out the collOrderProductTaxes 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 addOrderProductTaxes()
+ */
+ public function clearOrderProductTaxes()
+ {
+ $this->collOrderProductTaxes = null; // important to set this to NULL since that means it is uninitialized
+ }
+
+ /**
+ * Reset is the collOrderProductTaxes collection loaded partially.
+ */
+ public function resetPartialOrderProductTaxes($v = true)
+ {
+ $this->collOrderProductTaxesPartial = $v;
+ }
+
+ /**
+ * Initializes the collOrderProductTaxes collection.
+ *
+ * By default this just sets the collOrderProductTaxes collection to an empty array (like clearcollOrderProductTaxes());
+ * 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 initOrderProductTaxes($overrideExisting = true)
+ {
+ if (null !== $this->collOrderProductTaxes && !$overrideExisting) {
+ return;
+ }
+ $this->collOrderProductTaxes = new ObjectCollection();
+ $this->collOrderProductTaxes->setModel('\Thelia\Model\OrderProductTax');
+ }
+
+ /**
+ * Gets an array of ChildOrderProductTax 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 ChildOrderProduct 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|ChildOrderProductTax[] List of ChildOrderProductTax objects
+ * @throws PropelException
+ */
+ public function getOrderProductTaxes($criteria = null, ConnectionInterface $con = null)
+ {
+ $partial = $this->collOrderProductTaxesPartial && !$this->isNew();
+ if (null === $this->collOrderProductTaxes || null !== $criteria || $partial) {
+ if ($this->isNew() && null === $this->collOrderProductTaxes) {
+ // return empty collection
+ $this->initOrderProductTaxes();
+ } else {
+ $collOrderProductTaxes = ChildOrderProductTaxQuery::create(null, $criteria)
+ ->filterByOrderProduct($this)
+ ->find($con);
+
+ if (null !== $criteria) {
+ if (false !== $this->collOrderProductTaxesPartial && count($collOrderProductTaxes)) {
+ $this->initOrderProductTaxes(false);
+
+ foreach ($collOrderProductTaxes as $obj) {
+ if (false == $this->collOrderProductTaxes->contains($obj)) {
+ $this->collOrderProductTaxes->append($obj);
+ }
+ }
+
+ $this->collOrderProductTaxesPartial = true;
+ }
+
+ $collOrderProductTaxes->getInternalIterator()->rewind();
+
+ return $collOrderProductTaxes;
+ }
+
+ if ($partial && $this->collOrderProductTaxes) {
+ foreach ($this->collOrderProductTaxes as $obj) {
+ if ($obj->isNew()) {
+ $collOrderProductTaxes[] = $obj;
+ }
+ }
+ }
+
+ $this->collOrderProductTaxes = $collOrderProductTaxes;
+ $this->collOrderProductTaxesPartial = false;
+ }
+ }
+
+ return $this->collOrderProductTaxes;
+ }
+
+ /**
+ * Sets a collection of OrderProductTax 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 $orderProductTaxes A Propel collection.
+ * @param ConnectionInterface $con Optional connection object
+ * @return ChildOrderProduct The current object (for fluent API support)
+ */
+ public function setOrderProductTaxes(Collection $orderProductTaxes, ConnectionInterface $con = null)
+ {
+ $orderProductTaxesToDelete = $this->getOrderProductTaxes(new Criteria(), $con)->diff($orderProductTaxes);
+
+
+ $this->orderProductTaxesScheduledForDeletion = $orderProductTaxesToDelete;
+
+ foreach ($orderProductTaxesToDelete as $orderProductTaxRemoved) {
+ $orderProductTaxRemoved->setOrderProduct(null);
+ }
+
+ $this->collOrderProductTaxes = null;
+ foreach ($orderProductTaxes as $orderProductTax) {
+ $this->addOrderProductTax($orderProductTax);
+ }
+
+ $this->collOrderProductTaxes = $orderProductTaxes;
+ $this->collOrderProductTaxesPartial = false;
+
+ return $this;
+ }
+
+ /**
+ * Returns the number of related OrderProductTax objects.
+ *
+ * @param Criteria $criteria
+ * @param boolean $distinct
+ * @param ConnectionInterface $con
+ * @return int Count of related OrderProductTax objects.
+ * @throws PropelException
+ */
+ public function countOrderProductTaxes(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null)
+ {
+ $partial = $this->collOrderProductTaxesPartial && !$this->isNew();
+ if (null === $this->collOrderProductTaxes || null !== $criteria || $partial) {
+ if ($this->isNew() && null === $this->collOrderProductTaxes) {
+ return 0;
+ }
+
+ if ($partial && !$criteria) {
+ return count($this->getOrderProductTaxes());
+ }
+
+ $query = ChildOrderProductTaxQuery::create(null, $criteria);
+ if ($distinct) {
+ $query->distinct();
+ }
+
+ return $query
+ ->filterByOrderProduct($this)
+ ->count($con);
+ }
+
+ return count($this->collOrderProductTaxes);
+ }
+
+ /**
+ * Method called to associate a ChildOrderProductTax object to this object
+ * through the ChildOrderProductTax foreign key attribute.
+ *
+ * @param ChildOrderProductTax $l ChildOrderProductTax
+ * @return \Thelia\Model\OrderProduct The current object (for fluent API support)
+ */
+ public function addOrderProductTax(ChildOrderProductTax $l)
+ {
+ if ($this->collOrderProductTaxes === null) {
+ $this->initOrderProductTaxes();
+ $this->collOrderProductTaxesPartial = true;
+ }
+
+ if (!in_array($l, $this->collOrderProductTaxes->getArrayCopy(), true)) { // only add it if the **same** object is not already associated
+ $this->doAddOrderProductTax($l);
+ }
+
+ return $this;
+ }
+
+ /**
+ * @param OrderProductTax $orderProductTax The orderProductTax object to add.
+ */
+ protected function doAddOrderProductTax($orderProductTax)
+ {
+ $this->collOrderProductTaxes[]= $orderProductTax;
+ $orderProductTax->setOrderProduct($this);
+ }
+
+ /**
+ * @param OrderProductTax $orderProductTax The orderProductTax object to remove.
+ * @return ChildOrderProduct The current object (for fluent API support)
+ */
+ public function removeOrderProductTax($orderProductTax)
+ {
+ if ($this->getOrderProductTaxes()->contains($orderProductTax)) {
+ $this->collOrderProductTaxes->remove($this->collOrderProductTaxes->search($orderProductTax));
+ if (null === $this->orderProductTaxesScheduledForDeletion) {
+ $this->orderProductTaxesScheduledForDeletion = clone $this->collOrderProductTaxes;
+ $this->orderProductTaxesScheduledForDeletion->clear();
+ }
+ $this->orderProductTaxesScheduledForDeletion[]= clone $orderProductTax;
+ $orderProductTax->setOrderProduct(null);
}
return $this;
@@ -2284,7 +2604,8 @@ abstract class OrderProduct implements ActiveRecordInterface
$this->was_new = null;
$this->was_in_promo = null;
$this->weight = null;
- $this->tax = null;
+ $this->tax_rule_title = null;
+ $this->tax_rule_description = null;
$this->parent = null;
$this->created_at = null;
$this->updated_at = null;
@@ -2307,17 +2628,26 @@ abstract class OrderProduct implements ActiveRecordInterface
public function clearAllReferences($deep = false)
{
if ($deep) {
- if ($this->collOrderAttributeCombinations) {
- foreach ($this->collOrderAttributeCombinations as $o) {
+ if ($this->collOrderProductAttributeCombinations) {
+ foreach ($this->collOrderProductAttributeCombinations as $o) {
+ $o->clearAllReferences($deep);
+ }
+ }
+ if ($this->collOrderProductTaxes) {
+ foreach ($this->collOrderProductTaxes as $o) {
$o->clearAllReferences($deep);
}
}
} // if ($deep)
- if ($this->collOrderAttributeCombinations instanceof Collection) {
- $this->collOrderAttributeCombinations->clearIterator();
+ if ($this->collOrderProductAttributeCombinations instanceof Collection) {
+ $this->collOrderProductAttributeCombinations->clearIterator();
}
- $this->collOrderAttributeCombinations = null;
+ $this->collOrderProductAttributeCombinations = null;
+ if ($this->collOrderProductTaxes instanceof Collection) {
+ $this->collOrderProductTaxes->clearIterator();
+ }
+ $this->collOrderProductTaxes = null;
$this->aOrder = null;
}
diff --git a/core/lib/Thelia/Model/Base/OrderProductQuery.php b/core/lib/Thelia/Model/Base/OrderProductQuery.php
index b471fc359..f28102dfb 100644
--- a/core/lib/Thelia/Model/Base/OrderProductQuery.php
+++ b/core/lib/Thelia/Model/Base/OrderProductQuery.php
@@ -35,7 +35,8 @@ use Thelia\Model\Map\OrderProductTableMap;
* @method ChildOrderProductQuery orderByWasNew($order = Criteria::ASC) Order by the was_new column
* @method ChildOrderProductQuery orderByWasInPromo($order = Criteria::ASC) Order by the was_in_promo column
* @method ChildOrderProductQuery orderByWeight($order = Criteria::ASC) Order by the weight column
- * @method ChildOrderProductQuery orderByTax($order = Criteria::ASC) Order by the tax column
+ * @method ChildOrderProductQuery orderByTaxRuleTitle($order = Criteria::ASC) Order by the tax_rule_title column
+ * @method ChildOrderProductQuery orderByTaxRuleDescription($order = Criteria::ASC) Order by the tax_rule_description column
* @method ChildOrderProductQuery orderByParent($order = Criteria::ASC) Order by the parent column
* @method ChildOrderProductQuery orderByCreatedAt($order = Criteria::ASC) Order by the created_at column
* @method ChildOrderProductQuery orderByUpdatedAt($order = Criteria::ASC) Order by the updated_at column
@@ -54,7 +55,8 @@ use Thelia\Model\Map\OrderProductTableMap;
* @method ChildOrderProductQuery groupByWasNew() Group by the was_new column
* @method ChildOrderProductQuery groupByWasInPromo() Group by the was_in_promo column
* @method ChildOrderProductQuery groupByWeight() Group by the weight column
- * @method ChildOrderProductQuery groupByTax() Group by the tax column
+ * @method ChildOrderProductQuery groupByTaxRuleTitle() Group by the tax_rule_title column
+ * @method ChildOrderProductQuery groupByTaxRuleDescription() Group by the tax_rule_description column
* @method ChildOrderProductQuery groupByParent() Group by the parent column
* @method ChildOrderProductQuery groupByCreatedAt() Group by the created_at column
* @method ChildOrderProductQuery groupByUpdatedAt() Group by the updated_at column
@@ -67,9 +69,13 @@ use Thelia\Model\Map\OrderProductTableMap;
* @method ChildOrderProductQuery rightJoinOrder($relationAlias = null) Adds a RIGHT JOIN clause to the query using the Order relation
* @method ChildOrderProductQuery innerJoinOrder($relationAlias = null) Adds a INNER JOIN clause to the query using the Order relation
*
- * @method ChildOrderProductQuery leftJoinOrderAttributeCombination($relationAlias = null) Adds a LEFT JOIN clause to the query using the OrderAttributeCombination relation
- * @method ChildOrderProductQuery rightJoinOrderAttributeCombination($relationAlias = null) Adds a RIGHT JOIN clause to the query using the OrderAttributeCombination relation
- * @method ChildOrderProductQuery innerJoinOrderAttributeCombination($relationAlias = null) Adds a INNER JOIN clause to the query using the OrderAttributeCombination relation
+ * @method ChildOrderProductQuery leftJoinOrderProductAttributeCombination($relationAlias = null) Adds a LEFT JOIN clause to the query using the OrderProductAttributeCombination relation
+ * @method ChildOrderProductQuery rightJoinOrderProductAttributeCombination($relationAlias = null) Adds a RIGHT JOIN clause to the query using the OrderProductAttributeCombination relation
+ * @method ChildOrderProductQuery innerJoinOrderProductAttributeCombination($relationAlias = null) Adds a INNER JOIN clause to the query using the OrderProductAttributeCombination relation
+ *
+ * @method ChildOrderProductQuery leftJoinOrderProductTax($relationAlias = null) Adds a LEFT JOIN clause to the query using the OrderProductTax relation
+ * @method ChildOrderProductQuery rightJoinOrderProductTax($relationAlias = null) Adds a RIGHT JOIN clause to the query using the OrderProductTax relation
+ * @method ChildOrderProductQuery innerJoinOrderProductTax($relationAlias = null) Adds a INNER JOIN clause to the query using the OrderProductTax relation
*
* @method ChildOrderProduct findOne(ConnectionInterface $con = null) Return the first ChildOrderProduct matching the query
* @method ChildOrderProduct findOneOrCreate(ConnectionInterface $con = null) Return the first ChildOrderProduct matching the query, or a new ChildOrderProduct object populated from the query conditions when no match is found
@@ -88,7 +94,8 @@ use Thelia\Model\Map\OrderProductTableMap;
* @method ChildOrderProduct findOneByWasNew(int $was_new) Return the first ChildOrderProduct filtered by the was_new column
* @method ChildOrderProduct findOneByWasInPromo(int $was_in_promo) Return the first ChildOrderProduct filtered by the was_in_promo column
* @method ChildOrderProduct findOneByWeight(string $weight) Return the first ChildOrderProduct filtered by the weight column
- * @method ChildOrderProduct findOneByTax(double $tax) Return the first ChildOrderProduct filtered by the tax column
+ * @method ChildOrderProduct findOneByTaxRuleTitle(string $tax_rule_title) Return the first ChildOrderProduct filtered by the tax_rule_title column
+ * @method ChildOrderProduct findOneByTaxRuleDescription(string $tax_rule_description) Return the first ChildOrderProduct filtered by the tax_rule_description column
* @method ChildOrderProduct findOneByParent(int $parent) Return the first ChildOrderProduct filtered by the parent column
* @method ChildOrderProduct findOneByCreatedAt(string $created_at) Return the first ChildOrderProduct filtered by the created_at column
* @method ChildOrderProduct findOneByUpdatedAt(string $updated_at) Return the first ChildOrderProduct filtered by the updated_at column
@@ -107,7 +114,8 @@ use Thelia\Model\Map\OrderProductTableMap;
* @method array findByWasNew(int $was_new) Return ChildOrderProduct objects filtered by the was_new column
* @method array findByWasInPromo(int $was_in_promo) Return ChildOrderProduct objects filtered by the was_in_promo column
* @method array findByWeight(string $weight) Return ChildOrderProduct objects filtered by the weight column
- * @method array findByTax(double $tax) Return ChildOrderProduct objects filtered by the tax column
+ * @method array findByTaxRuleTitle(string $tax_rule_title) Return ChildOrderProduct objects filtered by the tax_rule_title column
+ * @method array findByTaxRuleDescription(string $tax_rule_description) Return ChildOrderProduct objects filtered by the tax_rule_description column
* @method array findByParent(int $parent) Return ChildOrderProduct objects filtered by the parent column
* @method array findByCreatedAt(string $created_at) Return ChildOrderProduct objects filtered by the created_at column
* @method array findByUpdatedAt(string $updated_at) Return ChildOrderProduct objects filtered by the updated_at column
@@ -199,7 +207,7 @@ abstract class OrderProductQuery extends ModelCriteria
*/
protected function findPkSimple($key, $con)
{
- $sql = 'SELECT ID, ORDER_ID, PRODUCT_REF, PRODUCT_SALE_ELEMENTS_REF, TITLE, CHAPO, DESCRIPTION, POSTSCRIPTUM, QUANTITY, PRICE, PROMO_PRICE, WAS_NEW, WAS_IN_PROMO, WEIGHT, TAX, PARENT, CREATED_AT, UPDATED_AT FROM order_product WHERE ID = :p0';
+ $sql = 'SELECT ID, ORDER_ID, PRODUCT_REF, PRODUCT_SALE_ELEMENTS_REF, TITLE, CHAPO, DESCRIPTION, POSTSCRIPTUM, QUANTITY, PRICE, PROMO_PRICE, WAS_NEW, WAS_IN_PROMO, WEIGHT, TAX_RULE_TITLE, TAX_RULE_DESCRIPTION, PARENT, CREATED_AT, UPDATED_AT FROM order_product WHERE ID = :p0';
try {
$stmt = $con->prepare($sql);
$stmt->bindValue(':p0', $key, PDO::PARAM_INT);
@@ -769,44 +777,61 @@ abstract class OrderProductQuery extends ModelCriteria
}
/**
- * Filter the query on the tax column
+ * Filter the query on the tax_rule_title column
*
* Example usage:
*
- * $query->filterByTax(1234); // WHERE tax = 1234
- * $query->filterByTax(array(12, 34)); // WHERE tax IN (12, 34)
- * $query->filterByTax(array('min' => 12)); // WHERE tax > 12
+ * $query->filterByTaxRuleTitle('fooValue'); // WHERE tax_rule_title = 'fooValue'
+ * $query->filterByTaxRuleTitle('%fooValue%'); // WHERE tax_rule_title LIKE '%fooValue%'
*
*
- * @param mixed $tax 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 $taxRuleTitle The value to use as filter.
+ * Accepts wildcards (* and % trigger a LIKE)
* @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
*
* @return ChildOrderProductQuery The current query, for fluid interface
*/
- public function filterByTax($tax = null, $comparison = null)
+ public function filterByTaxRuleTitle($taxRuleTitle = null, $comparison = null)
{
- if (is_array($tax)) {
- $useMinMax = false;
- if (isset($tax['min'])) {
- $this->addUsingAlias(OrderProductTableMap::TAX, $tax['min'], Criteria::GREATER_EQUAL);
- $useMinMax = true;
- }
- if (isset($tax['max'])) {
- $this->addUsingAlias(OrderProductTableMap::TAX, $tax['max'], Criteria::LESS_EQUAL);
- $useMinMax = true;
- }
- if ($useMinMax) {
- return $this;
- }
- if (null === $comparison) {
+ if (null === $comparison) {
+ if (is_array($taxRuleTitle)) {
$comparison = Criteria::IN;
+ } elseif (preg_match('/[\%\*]/', $taxRuleTitle)) {
+ $taxRuleTitle = str_replace('*', '%', $taxRuleTitle);
+ $comparison = Criteria::LIKE;
}
}
- return $this->addUsingAlias(OrderProductTableMap::TAX, $tax, $comparison);
+ return $this->addUsingAlias(OrderProductTableMap::TAX_RULE_TITLE, $taxRuleTitle, $comparison);
+ }
+
+ /**
+ * Filter the query on the tax_rule_description column
+ *
+ * Example usage:
+ *
+ * $query->filterByTaxRuleDescription('fooValue'); // WHERE tax_rule_description = 'fooValue'
+ * $query->filterByTaxRuleDescription('%fooValue%'); // WHERE tax_rule_description LIKE '%fooValue%'
+ *
+ *
+ * @param string $taxRuleDescription The value to use as filter.
+ * Accepts wildcards (* and % trigger a LIKE)
+ * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+ *
+ * @return ChildOrderProductQuery The current query, for fluid interface
+ */
+ public function filterByTaxRuleDescription($taxRuleDescription = null, $comparison = null)
+ {
+ if (null === $comparison) {
+ if (is_array($taxRuleDescription)) {
+ $comparison = Criteria::IN;
+ } elseif (preg_match('/[\%\*]/', $taxRuleDescription)) {
+ $taxRuleDescription = str_replace('*', '%', $taxRuleDescription);
+ $comparison = Criteria::LIKE;
+ }
+ }
+
+ return $this->addUsingAlias(OrderProductTableMap::TAX_RULE_DESCRIPTION, $taxRuleDescription, $comparison);
}
/**
@@ -1012,40 +1037,40 @@ abstract class OrderProductQuery extends ModelCriteria
}
/**
- * Filter the query by a related \Thelia\Model\OrderAttributeCombination object
+ * Filter the query by a related \Thelia\Model\OrderProductAttributeCombination object
*
- * @param \Thelia\Model\OrderAttributeCombination|ObjectCollection $orderAttributeCombination the related object to use as filter
+ * @param \Thelia\Model\OrderProductAttributeCombination|ObjectCollection $orderProductAttributeCombination the related object to use as filter
* @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
*
* @return ChildOrderProductQuery The current query, for fluid interface
*/
- public function filterByOrderAttributeCombination($orderAttributeCombination, $comparison = null)
+ public function filterByOrderProductAttributeCombination($orderProductAttributeCombination, $comparison = null)
{
- if ($orderAttributeCombination instanceof \Thelia\Model\OrderAttributeCombination) {
+ if ($orderProductAttributeCombination instanceof \Thelia\Model\OrderProductAttributeCombination) {
return $this
- ->addUsingAlias(OrderProductTableMap::ID, $orderAttributeCombination->getOrderProductId(), $comparison);
- } elseif ($orderAttributeCombination instanceof ObjectCollection) {
+ ->addUsingAlias(OrderProductTableMap::ID, $orderProductAttributeCombination->getOrderProductId(), $comparison);
+ } elseif ($orderProductAttributeCombination instanceof ObjectCollection) {
return $this
- ->useOrderAttributeCombinationQuery()
- ->filterByPrimaryKeys($orderAttributeCombination->getPrimaryKeys())
+ ->useOrderProductAttributeCombinationQuery()
+ ->filterByPrimaryKeys($orderProductAttributeCombination->getPrimaryKeys())
->endUse();
} else {
- throw new PropelException('filterByOrderAttributeCombination() only accepts arguments of type \Thelia\Model\OrderAttributeCombination or Collection');
+ throw new PropelException('filterByOrderProductAttributeCombination() only accepts arguments of type \Thelia\Model\OrderProductAttributeCombination or Collection');
}
}
/**
- * Adds a JOIN clause to the query using the OrderAttributeCombination relation
+ * Adds a JOIN clause to the query using the OrderProductAttributeCombination relation
*
* @param string $relationAlias optional alias for the relation
* @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
*
* @return ChildOrderProductQuery The current query, for fluid interface
*/
- public function joinOrderAttributeCombination($relationAlias = null, $joinType = Criteria::INNER_JOIN)
+ public function joinOrderProductAttributeCombination($relationAlias = null, $joinType = Criteria::INNER_JOIN)
{
$tableMap = $this->getTableMap();
- $relationMap = $tableMap->getRelation('OrderAttributeCombination');
+ $relationMap = $tableMap->getRelation('OrderProductAttributeCombination');
// create a ModelJoin object for this join
$join = new ModelJoin();
@@ -1060,14 +1085,14 @@ abstract class OrderProductQuery extends ModelCriteria
$this->addAlias($relationAlias, $relationMap->getRightTable()->getName());
$this->addJoinObject($join, $relationAlias);
} else {
- $this->addJoinObject($join, 'OrderAttributeCombination');
+ $this->addJoinObject($join, 'OrderProductAttributeCombination');
}
return $this;
}
/**
- * Use the OrderAttributeCombination relation OrderAttributeCombination object
+ * Use the OrderProductAttributeCombination relation OrderProductAttributeCombination object
*
* @see useQuery()
*
@@ -1075,13 +1100,86 @@ abstract class OrderProductQuery 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\OrderAttributeCombinationQuery A secondary query class using the current class as primary query
+ * @return \Thelia\Model\OrderProductAttributeCombinationQuery A secondary query class using the current class as primary query
*/
- public function useOrderAttributeCombinationQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN)
+ public function useOrderProductAttributeCombinationQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN)
{
return $this
- ->joinOrderAttributeCombination($relationAlias, $joinType)
- ->useQuery($relationAlias ? $relationAlias : 'OrderAttributeCombination', '\Thelia\Model\OrderAttributeCombinationQuery');
+ ->joinOrderProductAttributeCombination($relationAlias, $joinType)
+ ->useQuery($relationAlias ? $relationAlias : 'OrderProductAttributeCombination', '\Thelia\Model\OrderProductAttributeCombinationQuery');
+ }
+
+ /**
+ * Filter the query by a related \Thelia\Model\OrderProductTax object
+ *
+ * @param \Thelia\Model\OrderProductTax|ObjectCollection $orderProductTax the related object to use as filter
+ * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+ *
+ * @return ChildOrderProductQuery The current query, for fluid interface
+ */
+ public function filterByOrderProductTax($orderProductTax, $comparison = null)
+ {
+ if ($orderProductTax instanceof \Thelia\Model\OrderProductTax) {
+ return $this
+ ->addUsingAlias(OrderProductTableMap::ID, $orderProductTax->getOrderProductId(), $comparison);
+ } elseif ($orderProductTax instanceof ObjectCollection) {
+ return $this
+ ->useOrderProductTaxQuery()
+ ->filterByPrimaryKeys($orderProductTax->getPrimaryKeys())
+ ->endUse();
+ } else {
+ throw new PropelException('filterByOrderProductTax() only accepts arguments of type \Thelia\Model\OrderProductTax or Collection');
+ }
+ }
+
+ /**
+ * Adds a JOIN clause to the query using the OrderProductTax relation
+ *
+ * @param string $relationAlias optional alias for the relation
+ * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
+ *
+ * @return ChildOrderProductQuery The current query, for fluid interface
+ */
+ public function joinOrderProductTax($relationAlias = null, $joinType = Criteria::INNER_JOIN)
+ {
+ $tableMap = $this->getTableMap();
+ $relationMap = $tableMap->getRelation('OrderProductTax');
+
+ // 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, 'OrderProductTax');
+ }
+
+ return $this;
+ }
+
+ /**
+ * Use the OrderProductTax relation OrderProductTax 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\OrderProductTaxQuery A secondary query class using the current class as primary query
+ */
+ public function useOrderProductTaxQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN)
+ {
+ return $this
+ ->joinOrderProductTax($relationAlias, $joinType)
+ ->useQuery($relationAlias ? $relationAlias : 'OrderProductTax', '\Thelia\Model\OrderProductTaxQuery');
}
/**
diff --git a/core/lib/Thelia/Model/Map/OrderAttributeCombinationTableMap.php b/core/lib/Thelia/Model/Map/OrderAttributeCombinationTableMap.php
deleted file mode 100644
index f87e8d59e..000000000
--- a/core/lib/Thelia/Model/Map/OrderAttributeCombinationTableMap.php
+++ /dev/null
@@ -1,503 +0,0 @@
- array('Id', 'OrderProductId', 'AttributeTitle', 'AttributeChapo', 'AttributeDescription', 'AttributePostscriptumn', 'AttributeAvTitle', 'AttributeAvChapo', 'AttributeAvDescription', 'AttributeAvPostscriptum', 'CreatedAt', 'UpdatedAt', ),
- self::TYPE_STUDLYPHPNAME => array('id', 'orderProductId', 'attributeTitle', 'attributeChapo', 'attributeDescription', 'attributePostscriptumn', 'attributeAvTitle', 'attributeAvChapo', 'attributeAvDescription', 'attributeAvPostscriptum', 'createdAt', 'updatedAt', ),
- self::TYPE_COLNAME => array(OrderAttributeCombinationTableMap::ID, OrderAttributeCombinationTableMap::ORDER_PRODUCT_ID, OrderAttributeCombinationTableMap::ATTRIBUTE_TITLE, OrderAttributeCombinationTableMap::ATTRIBUTE_CHAPO, OrderAttributeCombinationTableMap::ATTRIBUTE_DESCRIPTION, OrderAttributeCombinationTableMap::ATTRIBUTE_POSTSCRIPTUMN, OrderAttributeCombinationTableMap::ATTRIBUTE_AV_TITLE, OrderAttributeCombinationTableMap::ATTRIBUTE_AV_CHAPO, OrderAttributeCombinationTableMap::ATTRIBUTE_AV_DESCRIPTION, OrderAttributeCombinationTableMap::ATTRIBUTE_AV_POSTSCRIPTUM, OrderAttributeCombinationTableMap::CREATED_AT, OrderAttributeCombinationTableMap::UPDATED_AT, ),
- self::TYPE_RAW_COLNAME => array('ID', 'ORDER_PRODUCT_ID', 'ATTRIBUTE_TITLE', 'ATTRIBUTE_CHAPO', 'ATTRIBUTE_DESCRIPTION', 'ATTRIBUTE_POSTSCRIPTUMN', 'ATTRIBUTE_AV_TITLE', 'ATTRIBUTE_AV_CHAPO', 'ATTRIBUTE_AV_DESCRIPTION', 'ATTRIBUTE_AV_POSTSCRIPTUM', 'CREATED_AT', 'UPDATED_AT', ),
- self::TYPE_FIELDNAME => array('id', 'order_product_id', 'attribute_title', 'attribute_chapo', 'attribute_description', 'attribute_postscriptumn', 'attribute_av_title', 'attribute_av_chapo', 'attribute_av_description', 'attribute_av_postscriptum', 'created_at', 'updated_at', ),
- self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, )
- );
-
- /**
- * 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, 'OrderProductId' => 1, 'AttributeTitle' => 2, 'AttributeChapo' => 3, 'AttributeDescription' => 4, 'AttributePostscriptumn' => 5, 'AttributeAvTitle' => 6, 'AttributeAvChapo' => 7, 'AttributeAvDescription' => 8, 'AttributeAvPostscriptum' => 9, 'CreatedAt' => 10, 'UpdatedAt' => 11, ),
- self::TYPE_STUDLYPHPNAME => array('id' => 0, 'orderProductId' => 1, 'attributeTitle' => 2, 'attributeChapo' => 3, 'attributeDescription' => 4, 'attributePostscriptumn' => 5, 'attributeAvTitle' => 6, 'attributeAvChapo' => 7, 'attributeAvDescription' => 8, 'attributeAvPostscriptum' => 9, 'createdAt' => 10, 'updatedAt' => 11, ),
- self::TYPE_COLNAME => array(OrderAttributeCombinationTableMap::ID => 0, OrderAttributeCombinationTableMap::ORDER_PRODUCT_ID => 1, OrderAttributeCombinationTableMap::ATTRIBUTE_TITLE => 2, OrderAttributeCombinationTableMap::ATTRIBUTE_CHAPO => 3, OrderAttributeCombinationTableMap::ATTRIBUTE_DESCRIPTION => 4, OrderAttributeCombinationTableMap::ATTRIBUTE_POSTSCRIPTUMN => 5, OrderAttributeCombinationTableMap::ATTRIBUTE_AV_TITLE => 6, OrderAttributeCombinationTableMap::ATTRIBUTE_AV_CHAPO => 7, OrderAttributeCombinationTableMap::ATTRIBUTE_AV_DESCRIPTION => 8, OrderAttributeCombinationTableMap::ATTRIBUTE_AV_POSTSCRIPTUM => 9, OrderAttributeCombinationTableMap::CREATED_AT => 10, OrderAttributeCombinationTableMap::UPDATED_AT => 11, ),
- self::TYPE_RAW_COLNAME => array('ID' => 0, 'ORDER_PRODUCT_ID' => 1, 'ATTRIBUTE_TITLE' => 2, 'ATTRIBUTE_CHAPO' => 3, 'ATTRIBUTE_DESCRIPTION' => 4, 'ATTRIBUTE_POSTSCRIPTUMN' => 5, 'ATTRIBUTE_AV_TITLE' => 6, 'ATTRIBUTE_AV_CHAPO' => 7, 'ATTRIBUTE_AV_DESCRIPTION' => 8, 'ATTRIBUTE_AV_POSTSCRIPTUM' => 9, 'CREATED_AT' => 10, 'UPDATED_AT' => 11, ),
- self::TYPE_FIELDNAME => array('id' => 0, 'order_product_id' => 1, 'attribute_title' => 2, 'attribute_chapo' => 3, 'attribute_description' => 4, 'attribute_postscriptumn' => 5, 'attribute_av_title' => 6, 'attribute_av_chapo' => 7, 'attribute_av_description' => 8, 'attribute_av_postscriptum' => 9, 'created_at' => 10, 'updated_at' => 11, ),
- self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, )
- );
-
- /**
- * 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('order_attribute_combination');
- $this->setPhpName('OrderAttributeCombination');
- $this->setClassName('\\Thelia\\Model\\OrderAttributeCombination');
- $this->setPackage('Thelia.Model');
- $this->setUseIdGenerator(true);
- // columns
- $this->addPrimaryKey('ID', 'Id', 'INTEGER', true, null, null);
- $this->addForeignKey('ORDER_PRODUCT_ID', 'OrderProductId', 'INTEGER', 'order_product', 'ID', true, null, null);
- $this->addColumn('ATTRIBUTE_TITLE', 'AttributeTitle', 'VARCHAR', true, 255, null);
- $this->addColumn('ATTRIBUTE_CHAPO', 'AttributeChapo', 'LONGVARCHAR', false, null, null);
- $this->addColumn('ATTRIBUTE_DESCRIPTION', 'AttributeDescription', 'CLOB', false, null, null);
- $this->addColumn('ATTRIBUTE_POSTSCRIPTUMN', 'AttributePostscriptumn', 'LONGVARCHAR', false, null, null);
- $this->addColumn('ATTRIBUTE_AV_TITLE', 'AttributeAvTitle', 'VARCHAR', true, 255, null);
- $this->addColumn('ATTRIBUTE_AV_CHAPO', 'AttributeAvChapo', 'LONGVARCHAR', false, null, null);
- $this->addColumn('ATTRIBUTE_AV_DESCRIPTION', 'AttributeAvDescription', 'CLOB', false, null, null);
- $this->addColumn('ATTRIBUTE_AV_POSTSCRIPTUM', 'AttributeAvPostscriptum', 'LONGVARCHAR', 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('OrderProduct', '\\Thelia\\Model\\OrderProduct', RelationMap::MANY_TO_ONE, array('order_product_id' => 'id', ), 'CASCADE', 'RESTRICT');
- } // 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 ? OrderAttributeCombinationTableMap::CLASS_DEFAULT : OrderAttributeCombinationTableMap::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 (OrderAttributeCombination object, last column rank)
- */
- public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
- {
- $key = OrderAttributeCombinationTableMap::getPrimaryKeyHashFromRow($row, $offset, $indexType);
- if (null !== ($obj = OrderAttributeCombinationTableMap::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 + OrderAttributeCombinationTableMap::NUM_HYDRATE_COLUMNS;
- } else {
- $cls = OrderAttributeCombinationTableMap::OM_CLASS;
- $obj = new $cls();
- $col = $obj->hydrate($row, $offset, false, $indexType);
- OrderAttributeCombinationTableMap::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 = OrderAttributeCombinationTableMap::getPrimaryKeyHashFromRow($row, 0, $dataFetcher->getIndexType());
- if (null !== ($obj = OrderAttributeCombinationTableMap::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;
- OrderAttributeCombinationTableMap::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(OrderAttributeCombinationTableMap::ID);
- $criteria->addSelectColumn(OrderAttributeCombinationTableMap::ORDER_PRODUCT_ID);
- $criteria->addSelectColumn(OrderAttributeCombinationTableMap::ATTRIBUTE_TITLE);
- $criteria->addSelectColumn(OrderAttributeCombinationTableMap::ATTRIBUTE_CHAPO);
- $criteria->addSelectColumn(OrderAttributeCombinationTableMap::ATTRIBUTE_DESCRIPTION);
- $criteria->addSelectColumn(OrderAttributeCombinationTableMap::ATTRIBUTE_POSTSCRIPTUMN);
- $criteria->addSelectColumn(OrderAttributeCombinationTableMap::ATTRIBUTE_AV_TITLE);
- $criteria->addSelectColumn(OrderAttributeCombinationTableMap::ATTRIBUTE_AV_CHAPO);
- $criteria->addSelectColumn(OrderAttributeCombinationTableMap::ATTRIBUTE_AV_DESCRIPTION);
- $criteria->addSelectColumn(OrderAttributeCombinationTableMap::ATTRIBUTE_AV_POSTSCRIPTUM);
- $criteria->addSelectColumn(OrderAttributeCombinationTableMap::CREATED_AT);
- $criteria->addSelectColumn(OrderAttributeCombinationTableMap::UPDATED_AT);
- } else {
- $criteria->addSelectColumn($alias . '.ID');
- $criteria->addSelectColumn($alias . '.ORDER_PRODUCT_ID');
- $criteria->addSelectColumn($alias . '.ATTRIBUTE_TITLE');
- $criteria->addSelectColumn($alias . '.ATTRIBUTE_CHAPO');
- $criteria->addSelectColumn($alias . '.ATTRIBUTE_DESCRIPTION');
- $criteria->addSelectColumn($alias . '.ATTRIBUTE_POSTSCRIPTUMN');
- $criteria->addSelectColumn($alias . '.ATTRIBUTE_AV_TITLE');
- $criteria->addSelectColumn($alias . '.ATTRIBUTE_AV_CHAPO');
- $criteria->addSelectColumn($alias . '.ATTRIBUTE_AV_DESCRIPTION');
- $criteria->addSelectColumn($alias . '.ATTRIBUTE_AV_POSTSCRIPTUM');
- $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(OrderAttributeCombinationTableMap::DATABASE_NAME)->getTable(OrderAttributeCombinationTableMap::TABLE_NAME);
- }
-
- /**
- * Add a TableMap instance to the database for this tableMap class.
- */
- public static function buildTableMap()
- {
- $dbMap = Propel::getServiceContainer()->getDatabaseMap(OrderAttributeCombinationTableMap::DATABASE_NAME);
- if (!$dbMap->hasTable(OrderAttributeCombinationTableMap::TABLE_NAME)) {
- $dbMap->addTableObject(new OrderAttributeCombinationTableMap());
- }
- }
-
- /**
- * Performs a DELETE on the database, given a OrderAttributeCombination or Criteria object OR a primary key value.
- *
- * @param mixed $values Criteria or OrderAttributeCombination 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(OrderAttributeCombinationTableMap::DATABASE_NAME);
- }
-
- if ($values instanceof Criteria) {
- // rename for clarity
- $criteria = $values;
- } elseif ($values instanceof \Thelia\Model\OrderAttributeCombination) { // 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(OrderAttributeCombinationTableMap::DATABASE_NAME);
- $criteria->add(OrderAttributeCombinationTableMap::ID, (array) $values, Criteria::IN);
- }
-
- $query = OrderAttributeCombinationQuery::create()->mergeWith($criteria);
-
- if ($values instanceof Criteria) { OrderAttributeCombinationTableMap::clearInstancePool();
- } elseif (!is_object($values)) { // it's a primary key, or an array of pks
- foreach ((array) $values as $singleval) { OrderAttributeCombinationTableMap::removeInstanceFromPool($singleval);
- }
- }
-
- return $query->delete($con);
- }
-
- /**
- * Deletes all rows from the order_attribute_combination 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 OrderAttributeCombinationQuery::create()->doDeleteAll($con);
- }
-
- /**
- * Performs an INSERT on the database, given a OrderAttributeCombination or Criteria object.
- *
- * @param mixed $criteria Criteria or OrderAttributeCombination 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(OrderAttributeCombinationTableMap::DATABASE_NAME);
- }
-
- if ($criteria instanceof Criteria) {
- $criteria = clone $criteria; // rename for clarity
- } else {
- $criteria = $criteria->buildCriteria(); // build Criteria from OrderAttributeCombination object
- }
-
- if ($criteria->containsKey(OrderAttributeCombinationTableMap::ID) && $criteria->keyContainsValue(OrderAttributeCombinationTableMap::ID) ) {
- throw new PropelException('Cannot insert a value for auto-increment primary key ('.OrderAttributeCombinationTableMap::ID.')');
- }
-
-
- // Set the correct dbName
- $query = OrderAttributeCombinationQuery::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;
- }
-
-} // OrderAttributeCombinationTableMap
-// This is the static code needed to register the TableMap for this table with the main Propel class.
-//
-OrderAttributeCombinationTableMap::buildTableMap();
diff --git a/core/lib/Thelia/Model/Map/OrderProductTableMap.php b/core/lib/Thelia/Model/Map/OrderProductTableMap.php
index 3820ad081..8144f23a7 100644
--- a/core/lib/Thelia/Model/Map/OrderProductTableMap.php
+++ b/core/lib/Thelia/Model/Map/OrderProductTableMap.php
@@ -57,7 +57,7 @@ class OrderProductTableMap extends TableMap
/**
* The total number of columns
*/
- const NUM_COLUMNS = 18;
+ const NUM_COLUMNS = 19;
/**
* The number of lazy-loaded columns
@@ -67,7 +67,7 @@ class OrderProductTableMap extends TableMap
/**
* The number of columns to hydrate (NUM_COLUMNS - NUM_LAZY_LOAD_COLUMNS)
*/
- const NUM_HYDRATE_COLUMNS = 18;
+ const NUM_HYDRATE_COLUMNS = 19;
/**
* the column name for the ID field
@@ -140,9 +140,14 @@ class OrderProductTableMap extends TableMap
const WEIGHT = 'order_product.WEIGHT';
/**
- * the column name for the TAX field
+ * the column name for the TAX_RULE_TITLE field
*/
- const TAX = 'order_product.TAX';
+ const TAX_RULE_TITLE = 'order_product.TAX_RULE_TITLE';
+
+ /**
+ * the column name for the TAX_RULE_DESCRIPTION field
+ */
+ const TAX_RULE_DESCRIPTION = 'order_product.TAX_RULE_DESCRIPTION';
/**
* the column name for the PARENT field
@@ -171,12 +176,12 @@ class OrderProductTableMap extends TableMap
* e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
*/
protected static $fieldNames = array (
- self::TYPE_PHPNAME => array('Id', 'OrderId', 'ProductRef', 'ProductSaleElementsRef', 'Title', 'Chapo', 'Description', 'Postscriptum', 'Quantity', 'Price', 'PromoPrice', 'WasNew', 'WasInPromo', 'Weight', 'Tax', 'Parent', 'CreatedAt', 'UpdatedAt', ),
- self::TYPE_STUDLYPHPNAME => array('id', 'orderId', 'productRef', 'productSaleElementsRef', 'title', 'chapo', 'description', 'postscriptum', 'quantity', 'price', 'promoPrice', 'wasNew', 'wasInPromo', 'weight', 'tax', 'parent', 'createdAt', 'updatedAt', ),
- self::TYPE_COLNAME => array(OrderProductTableMap::ID, OrderProductTableMap::ORDER_ID, OrderProductTableMap::PRODUCT_REF, OrderProductTableMap::PRODUCT_SALE_ELEMENTS_REF, OrderProductTableMap::TITLE, OrderProductTableMap::CHAPO, OrderProductTableMap::DESCRIPTION, OrderProductTableMap::POSTSCRIPTUM, OrderProductTableMap::QUANTITY, OrderProductTableMap::PRICE, OrderProductTableMap::PROMO_PRICE, OrderProductTableMap::WAS_NEW, OrderProductTableMap::WAS_IN_PROMO, OrderProductTableMap::WEIGHT, OrderProductTableMap::TAX, OrderProductTableMap::PARENT, OrderProductTableMap::CREATED_AT, OrderProductTableMap::UPDATED_AT, ),
- self::TYPE_RAW_COLNAME => array('ID', 'ORDER_ID', 'PRODUCT_REF', 'PRODUCT_SALE_ELEMENTS_REF', 'TITLE', 'CHAPO', 'DESCRIPTION', 'POSTSCRIPTUM', 'QUANTITY', 'PRICE', 'PROMO_PRICE', 'WAS_NEW', 'WAS_IN_PROMO', 'WEIGHT', 'TAX', 'PARENT', 'CREATED_AT', 'UPDATED_AT', ),
- self::TYPE_FIELDNAME => array('id', 'order_id', 'product_ref', 'product_sale_elements_ref', 'title', 'chapo', 'description', 'postscriptum', 'quantity', 'price', 'promo_price', 'was_new', 'was_in_promo', 'weight', 'tax', 'parent', 'created_at', 'updated_at', ),
- self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, )
+ self::TYPE_PHPNAME => array('Id', 'OrderId', 'ProductRef', 'ProductSaleElementsRef', 'Title', 'Chapo', 'Description', 'Postscriptum', 'Quantity', 'Price', 'PromoPrice', 'WasNew', 'WasInPromo', 'Weight', 'TaxRuleTitle', 'TaxRuleDescription', 'Parent', 'CreatedAt', 'UpdatedAt', ),
+ self::TYPE_STUDLYPHPNAME => array('id', 'orderId', 'productRef', 'productSaleElementsRef', 'title', 'chapo', 'description', 'postscriptum', 'quantity', 'price', 'promoPrice', 'wasNew', 'wasInPromo', 'weight', 'taxRuleTitle', 'taxRuleDescription', 'parent', 'createdAt', 'updatedAt', ),
+ self::TYPE_COLNAME => array(OrderProductTableMap::ID, OrderProductTableMap::ORDER_ID, OrderProductTableMap::PRODUCT_REF, OrderProductTableMap::PRODUCT_SALE_ELEMENTS_REF, OrderProductTableMap::TITLE, OrderProductTableMap::CHAPO, OrderProductTableMap::DESCRIPTION, OrderProductTableMap::POSTSCRIPTUM, OrderProductTableMap::QUANTITY, OrderProductTableMap::PRICE, OrderProductTableMap::PROMO_PRICE, OrderProductTableMap::WAS_NEW, OrderProductTableMap::WAS_IN_PROMO, OrderProductTableMap::WEIGHT, OrderProductTableMap::TAX_RULE_TITLE, OrderProductTableMap::TAX_RULE_DESCRIPTION, OrderProductTableMap::PARENT, OrderProductTableMap::CREATED_AT, OrderProductTableMap::UPDATED_AT, ),
+ self::TYPE_RAW_COLNAME => array('ID', 'ORDER_ID', 'PRODUCT_REF', 'PRODUCT_SALE_ELEMENTS_REF', 'TITLE', 'CHAPO', 'DESCRIPTION', 'POSTSCRIPTUM', 'QUANTITY', 'PRICE', 'PROMO_PRICE', 'WAS_NEW', 'WAS_IN_PROMO', 'WEIGHT', 'TAX_RULE_TITLE', 'TAX_RULE_DESCRIPTION', 'PARENT', 'CREATED_AT', 'UPDATED_AT', ),
+ self::TYPE_FIELDNAME => array('id', 'order_id', 'product_ref', 'product_sale_elements_ref', 'title', 'chapo', 'description', 'postscriptum', 'quantity', 'price', 'promo_price', 'was_new', 'was_in_promo', 'weight', 'tax_rule_title', 'tax_rule_description', 'parent', 'created_at', 'updated_at', ),
+ self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, )
);
/**
@@ -186,12 +191,12 @@ class OrderProductTableMap extends TableMap
* e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0
*/
protected static $fieldKeys = array (
- self::TYPE_PHPNAME => array('Id' => 0, 'OrderId' => 1, 'ProductRef' => 2, 'ProductSaleElementsRef' => 3, 'Title' => 4, 'Chapo' => 5, 'Description' => 6, 'Postscriptum' => 7, 'Quantity' => 8, 'Price' => 9, 'PromoPrice' => 10, 'WasNew' => 11, 'WasInPromo' => 12, 'Weight' => 13, 'Tax' => 14, 'Parent' => 15, 'CreatedAt' => 16, 'UpdatedAt' => 17, ),
- self::TYPE_STUDLYPHPNAME => array('id' => 0, 'orderId' => 1, 'productRef' => 2, 'productSaleElementsRef' => 3, 'title' => 4, 'chapo' => 5, 'description' => 6, 'postscriptum' => 7, 'quantity' => 8, 'price' => 9, 'promoPrice' => 10, 'wasNew' => 11, 'wasInPromo' => 12, 'weight' => 13, 'tax' => 14, 'parent' => 15, 'createdAt' => 16, 'updatedAt' => 17, ),
- self::TYPE_COLNAME => array(OrderProductTableMap::ID => 0, OrderProductTableMap::ORDER_ID => 1, OrderProductTableMap::PRODUCT_REF => 2, OrderProductTableMap::PRODUCT_SALE_ELEMENTS_REF => 3, OrderProductTableMap::TITLE => 4, OrderProductTableMap::CHAPO => 5, OrderProductTableMap::DESCRIPTION => 6, OrderProductTableMap::POSTSCRIPTUM => 7, OrderProductTableMap::QUANTITY => 8, OrderProductTableMap::PRICE => 9, OrderProductTableMap::PROMO_PRICE => 10, OrderProductTableMap::WAS_NEW => 11, OrderProductTableMap::WAS_IN_PROMO => 12, OrderProductTableMap::WEIGHT => 13, OrderProductTableMap::TAX => 14, OrderProductTableMap::PARENT => 15, OrderProductTableMap::CREATED_AT => 16, OrderProductTableMap::UPDATED_AT => 17, ),
- self::TYPE_RAW_COLNAME => array('ID' => 0, 'ORDER_ID' => 1, 'PRODUCT_REF' => 2, 'PRODUCT_SALE_ELEMENTS_REF' => 3, 'TITLE' => 4, 'CHAPO' => 5, 'DESCRIPTION' => 6, 'POSTSCRIPTUM' => 7, 'QUANTITY' => 8, 'PRICE' => 9, 'PROMO_PRICE' => 10, 'WAS_NEW' => 11, 'WAS_IN_PROMO' => 12, 'WEIGHT' => 13, 'TAX' => 14, 'PARENT' => 15, 'CREATED_AT' => 16, 'UPDATED_AT' => 17, ),
- self::TYPE_FIELDNAME => array('id' => 0, 'order_id' => 1, 'product_ref' => 2, 'product_sale_elements_ref' => 3, 'title' => 4, 'chapo' => 5, 'description' => 6, 'postscriptum' => 7, 'quantity' => 8, 'price' => 9, 'promo_price' => 10, 'was_new' => 11, 'was_in_promo' => 12, 'weight' => 13, 'tax' => 14, 'parent' => 15, 'created_at' => 16, 'updated_at' => 17, ),
- self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, )
+ self::TYPE_PHPNAME => array('Id' => 0, 'OrderId' => 1, 'ProductRef' => 2, 'ProductSaleElementsRef' => 3, 'Title' => 4, 'Chapo' => 5, 'Description' => 6, 'Postscriptum' => 7, 'Quantity' => 8, 'Price' => 9, 'PromoPrice' => 10, 'WasNew' => 11, 'WasInPromo' => 12, 'Weight' => 13, 'TaxRuleTitle' => 14, 'TaxRuleDescription' => 15, 'Parent' => 16, 'CreatedAt' => 17, 'UpdatedAt' => 18, ),
+ self::TYPE_STUDLYPHPNAME => array('id' => 0, 'orderId' => 1, 'productRef' => 2, 'productSaleElementsRef' => 3, 'title' => 4, 'chapo' => 5, 'description' => 6, 'postscriptum' => 7, 'quantity' => 8, 'price' => 9, 'promoPrice' => 10, 'wasNew' => 11, 'wasInPromo' => 12, 'weight' => 13, 'taxRuleTitle' => 14, 'taxRuleDescription' => 15, 'parent' => 16, 'createdAt' => 17, 'updatedAt' => 18, ),
+ self::TYPE_COLNAME => array(OrderProductTableMap::ID => 0, OrderProductTableMap::ORDER_ID => 1, OrderProductTableMap::PRODUCT_REF => 2, OrderProductTableMap::PRODUCT_SALE_ELEMENTS_REF => 3, OrderProductTableMap::TITLE => 4, OrderProductTableMap::CHAPO => 5, OrderProductTableMap::DESCRIPTION => 6, OrderProductTableMap::POSTSCRIPTUM => 7, OrderProductTableMap::QUANTITY => 8, OrderProductTableMap::PRICE => 9, OrderProductTableMap::PROMO_PRICE => 10, OrderProductTableMap::WAS_NEW => 11, OrderProductTableMap::WAS_IN_PROMO => 12, OrderProductTableMap::WEIGHT => 13, OrderProductTableMap::TAX_RULE_TITLE => 14, OrderProductTableMap::TAX_RULE_DESCRIPTION => 15, OrderProductTableMap::PARENT => 16, OrderProductTableMap::CREATED_AT => 17, OrderProductTableMap::UPDATED_AT => 18, ),
+ self::TYPE_RAW_COLNAME => array('ID' => 0, 'ORDER_ID' => 1, 'PRODUCT_REF' => 2, 'PRODUCT_SALE_ELEMENTS_REF' => 3, 'TITLE' => 4, 'CHAPO' => 5, 'DESCRIPTION' => 6, 'POSTSCRIPTUM' => 7, 'QUANTITY' => 8, 'PRICE' => 9, 'PROMO_PRICE' => 10, 'WAS_NEW' => 11, 'WAS_IN_PROMO' => 12, 'WEIGHT' => 13, 'TAX_RULE_TITLE' => 14, 'TAX_RULE_DESCRIPTION' => 15, 'PARENT' => 16, 'CREATED_AT' => 17, 'UPDATED_AT' => 18, ),
+ self::TYPE_FIELDNAME => array('id' => 0, 'order_id' => 1, 'product_ref' => 2, 'product_sale_elements_ref' => 3, 'title' => 4, 'chapo' => 5, 'description' => 6, 'postscriptum' => 7, 'quantity' => 8, 'price' => 9, 'promo_price' => 10, 'was_new' => 11, 'was_in_promo' => 12, 'weight' => 13, 'tax_rule_title' => 14, 'tax_rule_description' => 15, 'parent' => 16, 'created_at' => 17, 'updated_at' => 18, ),
+ self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, )
);
/**
@@ -224,7 +229,8 @@ class OrderProductTableMap extends TableMap
$this->addColumn('WAS_NEW', 'WasNew', 'TINYINT', true, null, null);
$this->addColumn('WAS_IN_PROMO', 'WasInPromo', 'TINYINT', true, null, null);
$this->addColumn('WEIGHT', 'Weight', 'VARCHAR', false, 45, null);
- $this->addColumn('TAX', 'Tax', 'FLOAT', false, null, null);
+ $this->addColumn('TAX_RULE_TITLE', 'TaxRuleTitle', 'VARCHAR', false, 255, null);
+ $this->addColumn('TAX_RULE_DESCRIPTION', 'TaxRuleDescription', 'CLOB', false, null, null);
$this->addColumn('PARENT', 'Parent', 'INTEGER', false, null, null);
$this->addColumn('CREATED_AT', 'CreatedAt', 'TIMESTAMP', false, null, null);
$this->addColumn('UPDATED_AT', 'UpdatedAt', 'TIMESTAMP', false, null, null);
@@ -236,7 +242,8 @@ class OrderProductTableMap extends TableMap
public function buildRelations()
{
$this->addRelation('Order', '\\Thelia\\Model\\Order', RelationMap::MANY_TO_ONE, array('order_id' => 'id', ), 'CASCADE', 'RESTRICT');
- $this->addRelation('OrderAttributeCombination', '\\Thelia\\Model\\OrderAttributeCombination', RelationMap::ONE_TO_MANY, array('id' => 'order_product_id', ), 'CASCADE', 'RESTRICT', 'OrderAttributeCombinations');
+ $this->addRelation('OrderProductAttributeCombination', '\\Thelia\\Model\\OrderProductAttributeCombination', RelationMap::ONE_TO_MANY, array('id' => 'order_product_id', ), 'CASCADE', 'RESTRICT', 'OrderProductAttributeCombinations');
+ $this->addRelation('OrderProductTax', '\\Thelia\\Model\\OrderProductTax', RelationMap::ONE_TO_MANY, array('id' => 'order_product_id', ), 'CASCADE', 'RESTRICT', 'OrderProductTaxes');
} // buildRelations()
/**
@@ -258,7 +265,8 @@ class OrderProductTableMap extends TableMap
{
// Invalidate objects in ".$this->getClassNameFromBuilder($joinedTableTableMapBuilder)." instance pool,
// since one or more of them may be deleted by ON DELETE CASCADE/SETNULL rule.
- OrderAttributeCombinationTableMap::clearInstancePool();
+ OrderProductAttributeCombinationTableMap::clearInstancePool();
+ OrderProductTaxTableMap::clearInstancePool();
}
/**
@@ -413,7 +421,8 @@ class OrderProductTableMap extends TableMap
$criteria->addSelectColumn(OrderProductTableMap::WAS_NEW);
$criteria->addSelectColumn(OrderProductTableMap::WAS_IN_PROMO);
$criteria->addSelectColumn(OrderProductTableMap::WEIGHT);
- $criteria->addSelectColumn(OrderProductTableMap::TAX);
+ $criteria->addSelectColumn(OrderProductTableMap::TAX_RULE_TITLE);
+ $criteria->addSelectColumn(OrderProductTableMap::TAX_RULE_DESCRIPTION);
$criteria->addSelectColumn(OrderProductTableMap::PARENT);
$criteria->addSelectColumn(OrderProductTableMap::CREATED_AT);
$criteria->addSelectColumn(OrderProductTableMap::UPDATED_AT);
@@ -432,7 +441,8 @@ class OrderProductTableMap extends TableMap
$criteria->addSelectColumn($alias . '.WAS_NEW');
$criteria->addSelectColumn($alias . '.WAS_IN_PROMO');
$criteria->addSelectColumn($alias . '.WEIGHT');
- $criteria->addSelectColumn($alias . '.TAX');
+ $criteria->addSelectColumn($alias . '.TAX_RULE_TITLE');
+ $criteria->addSelectColumn($alias . '.TAX_RULE_DESCRIPTION');
$criteria->addSelectColumn($alias . '.PARENT');
$criteria->addSelectColumn($alias . '.CREATED_AT');
$criteria->addSelectColumn($alias . '.UPDATED_AT');
diff --git a/core/lib/Thelia/Model/Map/TaxI18nTableMap.php b/core/lib/Thelia/Model/Map/TaxI18nTableMap.php
index a06230c37..c50a30c90 100644
--- a/core/lib/Thelia/Model/Map/TaxI18nTableMap.php
+++ b/core/lib/Thelia/Model/Map/TaxI18nTableMap.php
@@ -143,7 +143,7 @@ class TaxI18nTableMap extends TableMap
$this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'tax', 'ID', true, null, null);
$this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US');
$this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null);
- $this->addColumn('DESCRIPTION', 'Description', 'LONGVARCHAR', false, null, null);
+ $this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null);
} // initialize()
/**
diff --git a/core/lib/Thelia/Model/Map/TaxRuleI18nTableMap.php b/core/lib/Thelia/Model/Map/TaxRuleI18nTableMap.php
index 012ad2e72..24f8a41d7 100644
--- a/core/lib/Thelia/Model/Map/TaxRuleI18nTableMap.php
+++ b/core/lib/Thelia/Model/Map/TaxRuleI18nTableMap.php
@@ -143,7 +143,7 @@ class TaxRuleI18nTableMap extends TableMap
$this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'tax_rule', 'ID', true, null, null);
$this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US');
$this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null);
- $this->addColumn('DESCRIPTION', 'Description', 'LONGVARCHAR', false, null, null);
+ $this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null);
} // initialize()
/**
diff --git a/core/lib/Thelia/Model/OrderAttributeCombination.php b/core/lib/Thelia/Model/OrderAttributeCombination.php
deleted file mode 100644
index 896cda895..000000000
--- a/core/lib/Thelia/Model/OrderAttributeCombination.php
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
+
@@ -110,7 +110,7 @@
-
+
@@ -607,7 +607,8 @@
-
+
+
@@ -632,7 +633,7 @@
-
+
@@ -643,10 +644,10 @@
-
+
-
+
@@ -1236,4 +1237,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+