diff --git a/core/lib/Thelia/Model/Base/Attribute.php b/core/lib/Thelia/Model/Base/Attribute.php index efe4a631d..2f04404d4 100644 --- a/core/lib/Thelia/Model/Base/Attribute.php +++ b/core/lib/Thelia/Model/Base/Attribute.php @@ -132,7 +132,7 @@ abstract class Attribute implements ActiveRecordInterface * Current locale * @var string */ - protected $currentLocale = 'en_US'; + protected $currentLocale = 'en_EN'; /** * Current translation objects @@ -2554,7 +2554,7 @@ abstract class Attribute implements ActiveRecordInterface } // if ($deep) // i18n behavior - $this->currentLocale = 'en_US'; + $this->currentLocale = 'en_EN'; $this->currentTranslations = null; if ($this->collAttributeAvs instanceof Collection) { @@ -2612,7 +2612,7 @@ abstract class Attribute implements ActiveRecordInterface * * @return ChildAttribute The current object (for fluent API support) */ - public function setLocale($locale = 'en_US') + public function setLocale($locale = 'en_EN') { $this->currentLocale = $locale; @@ -2636,7 +2636,7 @@ abstract class Attribute implements ActiveRecordInterface * @param ConnectionInterface $con an optional connection object * * @return ChildAttributeI18n */ - public function getTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function getTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!isset($this->currentTranslations[$locale])) { if (null !== $this->collAttributeI18ns) { @@ -2671,7 +2671,7 @@ abstract class Attribute implements ActiveRecordInterface * * @return ChildAttribute The current object (for fluent API support) */ - public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function removeTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!$this->isNew()) { ChildAttributeI18nQuery::create() diff --git a/core/lib/Thelia/Model/Base/AttributeAv.php b/core/lib/Thelia/Model/Base/AttributeAv.php index 43a1be294..ab39577bd 100644 --- a/core/lib/Thelia/Model/Base/AttributeAv.php +++ b/core/lib/Thelia/Model/Base/AttributeAv.php @@ -122,7 +122,7 @@ abstract class AttributeAv implements ActiveRecordInterface * Current locale * @var string */ - protected $currentLocale = 'en_US'; + protected $currentLocale = 'en_EN'; /** * Current translation objects @@ -1903,7 +1903,7 @@ abstract class AttributeAv implements ActiveRecordInterface } // if ($deep) // i18n behavior - $this->currentLocale = 'en_US'; + $this->currentLocale = 'en_EN'; $this->currentTranslations = null; if ($this->collAttributeCombinations instanceof Collection) { @@ -1950,7 +1950,7 @@ abstract class AttributeAv implements ActiveRecordInterface * * @return ChildAttributeAv The current object (for fluent API support) */ - public function setLocale($locale = 'en_US') + public function setLocale($locale = 'en_EN') { $this->currentLocale = $locale; @@ -1974,7 +1974,7 @@ abstract class AttributeAv implements ActiveRecordInterface * @param ConnectionInterface $con an optional connection object * * @return ChildAttributeAvI18n */ - public function getTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function getTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!isset($this->currentTranslations[$locale])) { if (null !== $this->collAttributeAvI18ns) { @@ -2009,7 +2009,7 @@ abstract class AttributeAv implements ActiveRecordInterface * * @return ChildAttributeAv The current object (for fluent API support) */ - public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function removeTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!$this->isNew()) { ChildAttributeAvI18nQuery::create() diff --git a/core/lib/Thelia/Model/Base/AttributeAvI18n.php b/core/lib/Thelia/Model/Base/AttributeAvI18n.php index 3e7b9afcd..bcd1c7453 100644 --- a/core/lib/Thelia/Model/Base/AttributeAvI18n.php +++ b/core/lib/Thelia/Model/Base/AttributeAvI18n.php @@ -61,7 +61,7 @@ abstract class AttributeAvI18n implements ActiveRecordInterface /** * The value for the locale field. - * Note: this column has a database default value of: 'en_US' + * Note: this column has a database default value of: 'en_EN' * @var string */ protected $locale; @@ -111,7 +111,7 @@ abstract class AttributeAvI18n implements ActiveRecordInterface */ public function applyDefaultValues() { - $this->locale = 'en_US'; + $this->locale = 'en_EN'; } /** @@ -576,7 +576,7 @@ abstract class AttributeAvI18n implements ActiveRecordInterface */ public function hasOnlyDefaultValues() { - if ($this->locale !== 'en_US') { + if ($this->locale !== 'en_EN') { return false; } diff --git a/core/lib/Thelia/Model/Base/AttributeAvQuery.php b/core/lib/Thelia/Model/Base/AttributeAvQuery.php index 8ebfaa8c9..4f724b4f4 100644 --- a/core/lib/Thelia/Model/Base/AttributeAvQuery.php +++ b/core/lib/Thelia/Model/Base/AttributeAvQuery.php @@ -841,7 +841,7 @@ abstract class AttributeAvQuery extends ModelCriteria * * @return ChildAttributeAvQuery The current query, for fluid interface */ - public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function joinI18n($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { $relationName = $relationAlias ? $relationAlias : 'AttributeAvI18n'; @@ -859,7 +859,7 @@ abstract class AttributeAvQuery extends ModelCriteria * * @return ChildAttributeAvQuery The current query, for fluid interface */ - public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN) + public function joinWithI18n($locale = 'en_EN', $joinType = Criteria::LEFT_JOIN) { $this ->joinI18n($locale, null, $joinType) @@ -880,7 +880,7 @@ abstract class AttributeAvQuery extends ModelCriteria * * @return ChildAttributeAvI18nQuery A secondary query class using the current class as primary query */ - public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function useI18nQuery($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { return $this ->joinI18n($locale, $relationAlias, $joinType) diff --git a/core/lib/Thelia/Model/Base/AttributeI18n.php b/core/lib/Thelia/Model/Base/AttributeI18n.php index 0e4a1db8f..b8865769c 100644 --- a/core/lib/Thelia/Model/Base/AttributeI18n.php +++ b/core/lib/Thelia/Model/Base/AttributeI18n.php @@ -61,7 +61,7 @@ abstract class AttributeI18n implements ActiveRecordInterface /** * The value for the locale field. - * Note: this column has a database default value of: 'en_US' + * Note: this column has a database default value of: 'en_EN' * @var string */ protected $locale; @@ -111,7 +111,7 @@ abstract class AttributeI18n implements ActiveRecordInterface */ public function applyDefaultValues() { - $this->locale = 'en_US'; + $this->locale = 'en_EN'; } /** @@ -576,7 +576,7 @@ abstract class AttributeI18n implements ActiveRecordInterface */ public function hasOnlyDefaultValues() { - if ($this->locale !== 'en_US') { + if ($this->locale !== 'en_EN') { return false; } diff --git a/core/lib/Thelia/Model/Base/AttributeQuery.php b/core/lib/Thelia/Model/Base/AttributeQuery.php index cabbaf7ac..cbb690efb 100644 --- a/core/lib/Thelia/Model/Base/AttributeQuery.php +++ b/core/lib/Thelia/Model/Base/AttributeQuery.php @@ -886,7 +886,7 @@ abstract class AttributeQuery extends ModelCriteria * * @return ChildAttributeQuery The current query, for fluid interface */ - public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function joinI18n($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { $relationName = $relationAlias ? $relationAlias : 'AttributeI18n'; @@ -904,7 +904,7 @@ abstract class AttributeQuery extends ModelCriteria * * @return ChildAttributeQuery The current query, for fluid interface */ - public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN) + public function joinWithI18n($locale = 'en_EN', $joinType = Criteria::LEFT_JOIN) { $this ->joinI18n($locale, null, $joinType) @@ -925,7 +925,7 @@ abstract class AttributeQuery extends ModelCriteria * * @return ChildAttributeI18nQuery A secondary query class using the current class as primary query */ - public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function useI18nQuery($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { return $this ->joinI18n($locale, $relationAlias, $joinType) diff --git a/core/lib/Thelia/Model/Base/Category.php b/core/lib/Thelia/Model/Base/Category.php index 85a77a061..2f05de899 100644 --- a/core/lib/Thelia/Model/Base/Category.php +++ b/core/lib/Thelia/Model/Base/Category.php @@ -218,7 +218,7 @@ abstract class Category implements ActiveRecordInterface * Current locale * @var string */ - protected $currentLocale = 'en_US'; + protected $currentLocale = 'en_EN'; /** * Current translation objects @@ -4822,7 +4822,7 @@ abstract class Category implements ActiveRecordInterface } // if ($deep) // i18n behavior - $this->currentLocale = 'en_US'; + $this->currentLocale = 'en_EN'; $this->currentTranslations = null; if ($this->collProductCategories instanceof Collection) { @@ -4894,7 +4894,7 @@ abstract class Category implements ActiveRecordInterface * * @return ChildCategory The current object (for fluent API support) */ - public function setLocale($locale = 'en_US') + public function setLocale($locale = 'en_EN') { $this->currentLocale = $locale; @@ -4918,7 +4918,7 @@ abstract class Category implements ActiveRecordInterface * @param ConnectionInterface $con an optional connection object * * @return ChildCategoryI18n */ - public function getTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function getTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!isset($this->currentTranslations[$locale])) { if (null !== $this->collCategoryI18ns) { @@ -4953,7 +4953,7 @@ abstract class Category implements ActiveRecordInterface * * @return ChildCategory The current object (for fluent API support) */ - public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function removeTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!$this->isNew()) { ChildCategoryI18nQuery::create() diff --git a/core/lib/Thelia/Model/Base/CategoryDocument.php b/core/lib/Thelia/Model/Base/CategoryDocument.php index 165bfa492..7225ac46f 100644 --- a/core/lib/Thelia/Model/Base/CategoryDocument.php +++ b/core/lib/Thelia/Model/Base/CategoryDocument.php @@ -120,7 +120,7 @@ abstract class CategoryDocument implements ActiveRecordInterface * Current locale * @var string */ - protected $currentLocale = 'en_US'; + protected $currentLocale = 'en_EN'; /** * Current translation objects @@ -1640,7 +1640,7 @@ abstract class CategoryDocument implements ActiveRecordInterface } // if ($deep) // i18n behavior - $this->currentLocale = 'en_US'; + $this->currentLocale = 'en_EN'; $this->currentTranslations = null; if ($this->collCategoryDocumentI18ns instanceof Collection) { @@ -1683,7 +1683,7 @@ abstract class CategoryDocument implements ActiveRecordInterface * * @return ChildCategoryDocument The current object (for fluent API support) */ - public function setLocale($locale = 'en_US') + public function setLocale($locale = 'en_EN') { $this->currentLocale = $locale; @@ -1707,7 +1707,7 @@ abstract class CategoryDocument implements ActiveRecordInterface * @param ConnectionInterface $con an optional connection object * * @return ChildCategoryDocumentI18n */ - public function getTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function getTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!isset($this->currentTranslations[$locale])) { if (null !== $this->collCategoryDocumentI18ns) { @@ -1742,7 +1742,7 @@ abstract class CategoryDocument implements ActiveRecordInterface * * @return ChildCategoryDocument The current object (for fluent API support) */ - public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function removeTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!$this->isNew()) { ChildCategoryDocumentI18nQuery::create() diff --git a/core/lib/Thelia/Model/Base/CategoryDocumentI18n.php b/core/lib/Thelia/Model/Base/CategoryDocumentI18n.php index db3189cc3..f361b3184 100644 --- a/core/lib/Thelia/Model/Base/CategoryDocumentI18n.php +++ b/core/lib/Thelia/Model/Base/CategoryDocumentI18n.php @@ -61,7 +61,7 @@ abstract class CategoryDocumentI18n implements ActiveRecordInterface /** * The value for the locale field. - * Note: this column has a database default value of: 'en_US' + * Note: this column has a database default value of: 'en_EN' * @var string */ protected $locale; @@ -111,7 +111,7 @@ abstract class CategoryDocumentI18n implements ActiveRecordInterface */ public function applyDefaultValues() { - $this->locale = 'en_US'; + $this->locale = 'en_EN'; } /** @@ -576,7 +576,7 @@ abstract class CategoryDocumentI18n implements ActiveRecordInterface */ public function hasOnlyDefaultValues() { - if ($this->locale !== 'en_US') { + if ($this->locale !== 'en_EN') { return false; } diff --git a/core/lib/Thelia/Model/Base/CategoryDocumentQuery.php b/core/lib/Thelia/Model/Base/CategoryDocumentQuery.php index 8c0a177ac..239ec6c83 100644 --- a/core/lib/Thelia/Model/Base/CategoryDocumentQuery.php +++ b/core/lib/Thelia/Model/Base/CategoryDocumentQuery.php @@ -797,7 +797,7 @@ abstract class CategoryDocumentQuery extends ModelCriteria * * @return ChildCategoryDocumentQuery The current query, for fluid interface */ - public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function joinI18n($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { $relationName = $relationAlias ? $relationAlias : 'CategoryDocumentI18n'; @@ -815,7 +815,7 @@ abstract class CategoryDocumentQuery extends ModelCriteria * * @return ChildCategoryDocumentQuery The current query, for fluid interface */ - public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN) + public function joinWithI18n($locale = 'en_EN', $joinType = Criteria::LEFT_JOIN) { $this ->joinI18n($locale, null, $joinType) @@ -836,7 +836,7 @@ abstract class CategoryDocumentQuery extends ModelCriteria * * @return ChildCategoryDocumentI18nQuery A secondary query class using the current class as primary query */ - public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function useI18nQuery($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { return $this ->joinI18n($locale, $relationAlias, $joinType) diff --git a/core/lib/Thelia/Model/Base/CategoryI18n.php b/core/lib/Thelia/Model/Base/CategoryI18n.php index 83d62572d..65fa17063 100644 --- a/core/lib/Thelia/Model/Base/CategoryI18n.php +++ b/core/lib/Thelia/Model/Base/CategoryI18n.php @@ -61,7 +61,7 @@ abstract class CategoryI18n implements ActiveRecordInterface /** * The value for the locale field. - * Note: this column has a database default value of: 'en_US' + * Note: this column has a database default value of: 'en_EN' * @var string */ protected $locale; @@ -111,7 +111,7 @@ abstract class CategoryI18n implements ActiveRecordInterface */ public function applyDefaultValues() { - $this->locale = 'en_US'; + $this->locale = 'en_EN'; } /** @@ -576,7 +576,7 @@ abstract class CategoryI18n implements ActiveRecordInterface */ public function hasOnlyDefaultValues() { - if ($this->locale !== 'en_US') { + if ($this->locale !== 'en_EN') { return false; } diff --git a/core/lib/Thelia/Model/Base/CategoryImage.php b/core/lib/Thelia/Model/Base/CategoryImage.php index efde7b64a..17c2007f9 100644 --- a/core/lib/Thelia/Model/Base/CategoryImage.php +++ b/core/lib/Thelia/Model/Base/CategoryImage.php @@ -120,7 +120,7 @@ abstract class CategoryImage implements ActiveRecordInterface * Current locale * @var string */ - protected $currentLocale = 'en_US'; + protected $currentLocale = 'en_EN'; /** * Current translation objects @@ -1640,7 +1640,7 @@ abstract class CategoryImage implements ActiveRecordInterface } // if ($deep) // i18n behavior - $this->currentLocale = 'en_US'; + $this->currentLocale = 'en_EN'; $this->currentTranslations = null; if ($this->collCategoryImageI18ns instanceof Collection) { @@ -1683,7 +1683,7 @@ abstract class CategoryImage implements ActiveRecordInterface * * @return ChildCategoryImage The current object (for fluent API support) */ - public function setLocale($locale = 'en_US') + public function setLocale($locale = 'en_EN') { $this->currentLocale = $locale; @@ -1707,7 +1707,7 @@ abstract class CategoryImage implements ActiveRecordInterface * @param ConnectionInterface $con an optional connection object * * @return ChildCategoryImageI18n */ - public function getTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function getTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!isset($this->currentTranslations[$locale])) { if (null !== $this->collCategoryImageI18ns) { @@ -1742,7 +1742,7 @@ abstract class CategoryImage implements ActiveRecordInterface * * @return ChildCategoryImage The current object (for fluent API support) */ - public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function removeTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!$this->isNew()) { ChildCategoryImageI18nQuery::create() diff --git a/core/lib/Thelia/Model/Base/CategoryImageI18n.php b/core/lib/Thelia/Model/Base/CategoryImageI18n.php index ce61e9836..e59c4caca 100644 --- a/core/lib/Thelia/Model/Base/CategoryImageI18n.php +++ b/core/lib/Thelia/Model/Base/CategoryImageI18n.php @@ -61,7 +61,7 @@ abstract class CategoryImageI18n implements ActiveRecordInterface /** * The value for the locale field. - * Note: this column has a database default value of: 'en_US' + * Note: this column has a database default value of: 'en_EN' * @var string */ protected $locale; @@ -111,7 +111,7 @@ abstract class CategoryImageI18n implements ActiveRecordInterface */ public function applyDefaultValues() { - $this->locale = 'en_US'; + $this->locale = 'en_EN'; } /** @@ -576,7 +576,7 @@ abstract class CategoryImageI18n implements ActiveRecordInterface */ public function hasOnlyDefaultValues() { - if ($this->locale !== 'en_US') { + if ($this->locale !== 'en_EN') { return false; } diff --git a/core/lib/Thelia/Model/Base/CategoryImageQuery.php b/core/lib/Thelia/Model/Base/CategoryImageQuery.php index 2130e757b..305b01755 100644 --- a/core/lib/Thelia/Model/Base/CategoryImageQuery.php +++ b/core/lib/Thelia/Model/Base/CategoryImageQuery.php @@ -797,7 +797,7 @@ abstract class CategoryImageQuery extends ModelCriteria * * @return ChildCategoryImageQuery The current query, for fluid interface */ - public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function joinI18n($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { $relationName = $relationAlias ? $relationAlias : 'CategoryImageI18n'; @@ -815,7 +815,7 @@ abstract class CategoryImageQuery extends ModelCriteria * * @return ChildCategoryImageQuery The current query, for fluid interface */ - public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN) + public function joinWithI18n($locale = 'en_EN', $joinType = Criteria::LEFT_JOIN) { $this ->joinI18n($locale, null, $joinType) @@ -836,7 +836,7 @@ abstract class CategoryImageQuery extends ModelCriteria * * @return ChildCategoryImageI18nQuery A secondary query class using the current class as primary query */ - public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function useI18nQuery($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { return $this ->joinI18n($locale, $relationAlias, $joinType) diff --git a/core/lib/Thelia/Model/Base/CategoryQuery.php b/core/lib/Thelia/Model/Base/CategoryQuery.php index 0b7df33dd..5a9c1165f 100644 --- a/core/lib/Thelia/Model/Base/CategoryQuery.php +++ b/core/lib/Thelia/Model/Base/CategoryQuery.php @@ -1461,7 +1461,7 @@ abstract class CategoryQuery extends ModelCriteria * * @return ChildCategoryQuery The current query, for fluid interface */ - public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function joinI18n($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { $relationName = $relationAlias ? $relationAlias : 'CategoryI18n'; @@ -1479,7 +1479,7 @@ abstract class CategoryQuery extends ModelCriteria * * @return ChildCategoryQuery The current query, for fluid interface */ - public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN) + public function joinWithI18n($locale = 'en_EN', $joinType = Criteria::LEFT_JOIN) { $this ->joinI18n($locale, null, $joinType) @@ -1500,7 +1500,7 @@ abstract class CategoryQuery extends ModelCriteria * * @return ChildCategoryI18nQuery A secondary query class using the current class as primary query */ - public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function useI18nQuery($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { return $this ->joinI18n($locale, $relationAlias, $joinType) diff --git a/core/lib/Thelia/Model/Base/Config.php b/core/lib/Thelia/Model/Base/Config.php index d687ffefe..140cdb82d 100644 --- a/core/lib/Thelia/Model/Base/Config.php +++ b/core/lib/Thelia/Model/Base/Config.php @@ -121,7 +121,7 @@ abstract class Config implements ActiveRecordInterface * Current locale * @var string */ - protected $currentLocale = 'en_US'; + protected $currentLocale = 'en_EN'; /** * Current translation objects @@ -1642,7 +1642,7 @@ abstract class Config implements ActiveRecordInterface } // if ($deep) // i18n behavior - $this->currentLocale = 'en_US'; + $this->currentLocale = 'en_EN'; $this->currentTranslations = null; if ($this->collConfigI18ns instanceof Collection) { @@ -1684,7 +1684,7 @@ abstract class Config implements ActiveRecordInterface * * @return ChildConfig The current object (for fluent API support) */ - public function setLocale($locale = 'en_US') + public function setLocale($locale = 'en_EN') { $this->currentLocale = $locale; @@ -1708,7 +1708,7 @@ abstract class Config implements ActiveRecordInterface * @param ConnectionInterface $con an optional connection object * * @return ChildConfigI18n */ - public function getTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function getTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!isset($this->currentTranslations[$locale])) { if (null !== $this->collConfigI18ns) { @@ -1743,7 +1743,7 @@ abstract class Config implements ActiveRecordInterface * * @return ChildConfig The current object (for fluent API support) */ - public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function removeTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!$this->isNew()) { ChildConfigI18nQuery::create() diff --git a/core/lib/Thelia/Model/Base/ConfigI18n.php b/core/lib/Thelia/Model/Base/ConfigI18n.php index 6247e15d1..e73e27514 100644 --- a/core/lib/Thelia/Model/Base/ConfigI18n.php +++ b/core/lib/Thelia/Model/Base/ConfigI18n.php @@ -61,7 +61,7 @@ abstract class ConfigI18n implements ActiveRecordInterface /** * The value for the locale field. - * Note: this column has a database default value of: 'en_US' + * Note: this column has a database default value of: 'en_EN' * @var string */ protected $locale; @@ -111,7 +111,7 @@ abstract class ConfigI18n implements ActiveRecordInterface */ public function applyDefaultValues() { - $this->locale = 'en_US'; + $this->locale = 'en_EN'; } /** @@ -576,7 +576,7 @@ abstract class ConfigI18n implements ActiveRecordInterface */ public function hasOnlyDefaultValues() { - if ($this->locale !== 'en_US') { + if ($this->locale !== 'en_EN') { return false; } diff --git a/core/lib/Thelia/Model/Base/ConfigQuery.php b/core/lib/Thelia/Model/Base/ConfigQuery.php index ef47308a4..b2ddc3409 100644 --- a/core/lib/Thelia/Model/Base/ConfigQuery.php +++ b/core/lib/Thelia/Model/Base/ConfigQuery.php @@ -749,7 +749,7 @@ abstract class ConfigQuery extends ModelCriteria * * @return ChildConfigQuery The current query, for fluid interface */ - public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function joinI18n($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { $relationName = $relationAlias ? $relationAlias : 'ConfigI18n'; @@ -767,7 +767,7 @@ abstract class ConfigQuery extends ModelCriteria * * @return ChildConfigQuery The current query, for fluid interface */ - public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN) + public function joinWithI18n($locale = 'en_EN', $joinType = Criteria::LEFT_JOIN) { $this ->joinI18n($locale, null, $joinType) @@ -788,7 +788,7 @@ abstract class ConfigQuery extends ModelCriteria * * @return ChildConfigI18nQuery A secondary query class using the current class as primary query */ - public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function useI18nQuery($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { return $this ->joinI18n($locale, $relationAlias, $joinType) diff --git a/core/lib/Thelia/Model/Base/Content.php b/core/lib/Thelia/Model/Base/Content.php index 96ea69eef..e8514fc08 100644 --- a/core/lib/Thelia/Model/Base/Content.php +++ b/core/lib/Thelia/Model/Base/Content.php @@ -182,7 +182,7 @@ abstract class Content implements ActiveRecordInterface * Current locale * @var string */ - protected $currentLocale = 'en_US'; + protected $currentLocale = 'en_EN'; /** * Current translation objects @@ -3720,7 +3720,7 @@ abstract class Content implements ActiveRecordInterface } // if ($deep) // i18n behavior - $this->currentLocale = 'en_US'; + $this->currentLocale = 'en_EN'; $this->currentTranslations = null; if ($this->collContentAssocs instanceof Collection) { @@ -3790,7 +3790,7 @@ abstract class Content implements ActiveRecordInterface * * @return ChildContent The current object (for fluent API support) */ - public function setLocale($locale = 'en_US') + public function setLocale($locale = 'en_EN') { $this->currentLocale = $locale; @@ -3814,7 +3814,7 @@ abstract class Content implements ActiveRecordInterface * @param ConnectionInterface $con an optional connection object * * @return ChildContentI18n */ - public function getTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function getTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!isset($this->currentTranslations[$locale])) { if (null !== $this->collContentI18ns) { @@ -3849,7 +3849,7 @@ abstract class Content implements ActiveRecordInterface * * @return ChildContent The current object (for fluent API support) */ - public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function removeTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!$this->isNew()) { ChildContentI18nQuery::create() diff --git a/core/lib/Thelia/Model/Base/ContentDocument.php b/core/lib/Thelia/Model/Base/ContentDocument.php index 990fc4a9f..7c974c839 100644 --- a/core/lib/Thelia/Model/Base/ContentDocument.php +++ b/core/lib/Thelia/Model/Base/ContentDocument.php @@ -120,7 +120,7 @@ abstract class ContentDocument implements ActiveRecordInterface * Current locale * @var string */ - protected $currentLocale = 'en_US'; + protected $currentLocale = 'en_EN'; /** * Current translation objects @@ -1640,7 +1640,7 @@ abstract class ContentDocument implements ActiveRecordInterface } // if ($deep) // i18n behavior - $this->currentLocale = 'en_US'; + $this->currentLocale = 'en_EN'; $this->currentTranslations = null; if ($this->collContentDocumentI18ns instanceof Collection) { @@ -1683,7 +1683,7 @@ abstract class ContentDocument implements ActiveRecordInterface * * @return ChildContentDocument The current object (for fluent API support) */ - public function setLocale($locale = 'en_US') + public function setLocale($locale = 'en_EN') { $this->currentLocale = $locale; @@ -1707,7 +1707,7 @@ abstract class ContentDocument implements ActiveRecordInterface * @param ConnectionInterface $con an optional connection object * * @return ChildContentDocumentI18n */ - public function getTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function getTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!isset($this->currentTranslations[$locale])) { if (null !== $this->collContentDocumentI18ns) { @@ -1742,7 +1742,7 @@ abstract class ContentDocument implements ActiveRecordInterface * * @return ChildContentDocument The current object (for fluent API support) */ - public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function removeTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!$this->isNew()) { ChildContentDocumentI18nQuery::create() diff --git a/core/lib/Thelia/Model/Base/ContentDocumentI18n.php b/core/lib/Thelia/Model/Base/ContentDocumentI18n.php index 2cfc367b0..e275926c5 100644 --- a/core/lib/Thelia/Model/Base/ContentDocumentI18n.php +++ b/core/lib/Thelia/Model/Base/ContentDocumentI18n.php @@ -61,7 +61,7 @@ abstract class ContentDocumentI18n implements ActiveRecordInterface /** * The value for the locale field. - * Note: this column has a database default value of: 'en_US' + * Note: this column has a database default value of: 'en_EN' * @var string */ protected $locale; @@ -111,7 +111,7 @@ abstract class ContentDocumentI18n implements ActiveRecordInterface */ public function applyDefaultValues() { - $this->locale = 'en_US'; + $this->locale = 'en_EN'; } /** @@ -576,7 +576,7 @@ abstract class ContentDocumentI18n implements ActiveRecordInterface */ public function hasOnlyDefaultValues() { - if ($this->locale !== 'en_US') { + if ($this->locale !== 'en_EN') { return false; } diff --git a/core/lib/Thelia/Model/Base/ContentDocumentQuery.php b/core/lib/Thelia/Model/Base/ContentDocumentQuery.php index 89cf5d48b..72cc8cae4 100644 --- a/core/lib/Thelia/Model/Base/ContentDocumentQuery.php +++ b/core/lib/Thelia/Model/Base/ContentDocumentQuery.php @@ -797,7 +797,7 @@ abstract class ContentDocumentQuery extends ModelCriteria * * @return ChildContentDocumentQuery The current query, for fluid interface */ - public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function joinI18n($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { $relationName = $relationAlias ? $relationAlias : 'ContentDocumentI18n'; @@ -815,7 +815,7 @@ abstract class ContentDocumentQuery extends ModelCriteria * * @return ChildContentDocumentQuery The current query, for fluid interface */ - public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN) + public function joinWithI18n($locale = 'en_EN', $joinType = Criteria::LEFT_JOIN) { $this ->joinI18n($locale, null, $joinType) @@ -836,7 +836,7 @@ abstract class ContentDocumentQuery extends ModelCriteria * * @return ChildContentDocumentI18nQuery A secondary query class using the current class as primary query */ - public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function useI18nQuery($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { return $this ->joinI18n($locale, $relationAlias, $joinType) diff --git a/core/lib/Thelia/Model/Base/ContentI18n.php b/core/lib/Thelia/Model/Base/ContentI18n.php index d3974522b..14ff02b39 100644 --- a/core/lib/Thelia/Model/Base/ContentI18n.php +++ b/core/lib/Thelia/Model/Base/ContentI18n.php @@ -61,7 +61,7 @@ abstract class ContentI18n implements ActiveRecordInterface /** * The value for the locale field. - * Note: this column has a database default value of: 'en_US' + * Note: this column has a database default value of: 'en_EN' * @var string */ protected $locale; @@ -111,7 +111,7 @@ abstract class ContentI18n implements ActiveRecordInterface */ public function applyDefaultValues() { - $this->locale = 'en_US'; + $this->locale = 'en_EN'; } /** @@ -576,7 +576,7 @@ abstract class ContentI18n implements ActiveRecordInterface */ public function hasOnlyDefaultValues() { - if ($this->locale !== 'en_US') { + if ($this->locale !== 'en_EN') { return false; } diff --git a/core/lib/Thelia/Model/Base/ContentImage.php b/core/lib/Thelia/Model/Base/ContentImage.php index 22c4bed10..884c20c1e 100644 --- a/core/lib/Thelia/Model/Base/ContentImage.php +++ b/core/lib/Thelia/Model/Base/ContentImage.php @@ -120,7 +120,7 @@ abstract class ContentImage implements ActiveRecordInterface * Current locale * @var string */ - protected $currentLocale = 'en_US'; + protected $currentLocale = 'en_EN'; /** * Current translation objects @@ -1640,7 +1640,7 @@ abstract class ContentImage implements ActiveRecordInterface } // if ($deep) // i18n behavior - $this->currentLocale = 'en_US'; + $this->currentLocale = 'en_EN'; $this->currentTranslations = null; if ($this->collContentImageI18ns instanceof Collection) { @@ -1683,7 +1683,7 @@ abstract class ContentImage implements ActiveRecordInterface * * @return ChildContentImage The current object (for fluent API support) */ - public function setLocale($locale = 'en_US') + public function setLocale($locale = 'en_EN') { $this->currentLocale = $locale; @@ -1707,7 +1707,7 @@ abstract class ContentImage implements ActiveRecordInterface * @param ConnectionInterface $con an optional connection object * * @return ChildContentImageI18n */ - public function getTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function getTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!isset($this->currentTranslations[$locale])) { if (null !== $this->collContentImageI18ns) { @@ -1742,7 +1742,7 @@ abstract class ContentImage implements ActiveRecordInterface * * @return ChildContentImage The current object (for fluent API support) */ - public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function removeTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!$this->isNew()) { ChildContentImageI18nQuery::create() diff --git a/core/lib/Thelia/Model/Base/ContentImageI18n.php b/core/lib/Thelia/Model/Base/ContentImageI18n.php index d655dec53..9fe9b4147 100644 --- a/core/lib/Thelia/Model/Base/ContentImageI18n.php +++ b/core/lib/Thelia/Model/Base/ContentImageI18n.php @@ -61,7 +61,7 @@ abstract class ContentImageI18n implements ActiveRecordInterface /** * The value for the locale field. - * Note: this column has a database default value of: 'en_US' + * Note: this column has a database default value of: 'en_EN' * @var string */ protected $locale; @@ -111,7 +111,7 @@ abstract class ContentImageI18n implements ActiveRecordInterface */ public function applyDefaultValues() { - $this->locale = 'en_US'; + $this->locale = 'en_EN'; } /** @@ -576,7 +576,7 @@ abstract class ContentImageI18n implements ActiveRecordInterface */ public function hasOnlyDefaultValues() { - if ($this->locale !== 'en_US') { + if ($this->locale !== 'en_EN') { return false; } diff --git a/core/lib/Thelia/Model/Base/ContentImageQuery.php b/core/lib/Thelia/Model/Base/ContentImageQuery.php index f69464dd7..26e0ffe5c 100644 --- a/core/lib/Thelia/Model/Base/ContentImageQuery.php +++ b/core/lib/Thelia/Model/Base/ContentImageQuery.php @@ -797,7 +797,7 @@ abstract class ContentImageQuery extends ModelCriteria * * @return ChildContentImageQuery The current query, for fluid interface */ - public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function joinI18n($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { $relationName = $relationAlias ? $relationAlias : 'ContentImageI18n'; @@ -815,7 +815,7 @@ abstract class ContentImageQuery extends ModelCriteria * * @return ChildContentImageQuery The current query, for fluid interface */ - public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN) + public function joinWithI18n($locale = 'en_EN', $joinType = Criteria::LEFT_JOIN) { $this ->joinI18n($locale, null, $joinType) @@ -836,7 +836,7 @@ abstract class ContentImageQuery extends ModelCriteria * * @return ChildContentImageI18nQuery A secondary query class using the current class as primary query */ - public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function useI18nQuery($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { return $this ->joinI18n($locale, $relationAlias, $joinType) diff --git a/core/lib/Thelia/Model/Base/ContentQuery.php b/core/lib/Thelia/Model/Base/ContentQuery.php index 2cbbe109b..28d32cbe6 100644 --- a/core/lib/Thelia/Model/Base/ContentQuery.php +++ b/core/lib/Thelia/Model/Base/ContentQuery.php @@ -1294,7 +1294,7 @@ abstract class ContentQuery extends ModelCriteria * * @return ChildContentQuery The current query, for fluid interface */ - public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function joinI18n($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { $relationName = $relationAlias ? $relationAlias : 'ContentI18n'; @@ -1312,7 +1312,7 @@ abstract class ContentQuery extends ModelCriteria * * @return ChildContentQuery The current query, for fluid interface */ - public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN) + public function joinWithI18n($locale = 'en_EN', $joinType = Criteria::LEFT_JOIN) { $this ->joinI18n($locale, null, $joinType) @@ -1333,7 +1333,7 @@ abstract class ContentQuery extends ModelCriteria * * @return ChildContentI18nQuery A secondary query class using the current class as primary query */ - public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function useI18nQuery($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { return $this ->joinI18n($locale, $relationAlias, $joinType) diff --git a/core/lib/Thelia/Model/Base/Country.php b/core/lib/Thelia/Model/Base/Country.php index 704375de2..3c4247896 100644 --- a/core/lib/Thelia/Model/Base/Country.php +++ b/core/lib/Thelia/Model/Base/Country.php @@ -142,7 +142,7 @@ abstract class Country implements ActiveRecordInterface * Current locale * @var string */ - protected $currentLocale = 'en_US'; + protected $currentLocale = 'en_EN'; /** * Current translation objects @@ -2323,7 +2323,7 @@ abstract class Country implements ActiveRecordInterface } // if ($deep) // i18n behavior - $this->currentLocale = 'en_US'; + $this->currentLocale = 'en_EN'; $this->currentTranslations = null; if ($this->collTaxRuleCountries instanceof Collection) { @@ -2374,7 +2374,7 @@ abstract class Country implements ActiveRecordInterface * * @return ChildCountry The current object (for fluent API support) */ - public function setLocale($locale = 'en_US') + public function setLocale($locale = 'en_EN') { $this->currentLocale = $locale; @@ -2398,7 +2398,7 @@ abstract class Country implements ActiveRecordInterface * @param ConnectionInterface $con an optional connection object * * @return ChildCountryI18n */ - public function getTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function getTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!isset($this->currentTranslations[$locale])) { if (null !== $this->collCountryI18ns) { @@ -2433,7 +2433,7 @@ abstract class Country implements ActiveRecordInterface * * @return ChildCountry The current object (for fluent API support) */ - public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function removeTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!$this->isNew()) { ChildCountryI18nQuery::create() diff --git a/core/lib/Thelia/Model/Base/CountryI18n.php b/core/lib/Thelia/Model/Base/CountryI18n.php index be63955ca..270a9d3f7 100644 --- a/core/lib/Thelia/Model/Base/CountryI18n.php +++ b/core/lib/Thelia/Model/Base/CountryI18n.php @@ -61,7 +61,7 @@ abstract class CountryI18n implements ActiveRecordInterface /** * The value for the locale field. - * Note: this column has a database default value of: 'en_US' + * Note: this column has a database default value of: 'en_EN' * @var string */ protected $locale; @@ -111,7 +111,7 @@ abstract class CountryI18n implements ActiveRecordInterface */ public function applyDefaultValues() { - $this->locale = 'en_US'; + $this->locale = 'en_EN'; } /** @@ -576,7 +576,7 @@ abstract class CountryI18n implements ActiveRecordInterface */ public function hasOnlyDefaultValues() { - if ($this->locale !== 'en_US') { + if ($this->locale !== 'en_EN') { return false; } diff --git a/core/lib/Thelia/Model/Base/CountryQuery.php b/core/lib/Thelia/Model/Base/CountryQuery.php index 6c3a1c950..2c709f800 100644 --- a/core/lib/Thelia/Model/Base/CountryQuery.php +++ b/core/lib/Thelia/Model/Base/CountryQuery.php @@ -972,7 +972,7 @@ abstract class CountryQuery extends ModelCriteria * * @return ChildCountryQuery The current query, for fluid interface */ - public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function joinI18n($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { $relationName = $relationAlias ? $relationAlias : 'CountryI18n'; @@ -990,7 +990,7 @@ abstract class CountryQuery extends ModelCriteria * * @return ChildCountryQuery The current query, for fluid interface */ - public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN) + public function joinWithI18n($locale = 'en_EN', $joinType = Criteria::LEFT_JOIN) { $this ->joinI18n($locale, null, $joinType) @@ -1011,7 +1011,7 @@ abstract class CountryQuery extends ModelCriteria * * @return ChildCountryI18nQuery A secondary query class using the current class as primary query */ - public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function useI18nQuery($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { return $this ->joinI18n($locale, $relationAlias, $joinType) diff --git a/core/lib/Thelia/Model/Base/Coupon.php b/core/lib/Thelia/Model/Base/Coupon.php index 2c3dae5c9..89a4dc9e2 100644 --- a/core/lib/Thelia/Model/Base/Coupon.php +++ b/core/lib/Thelia/Model/Base/Coupon.php @@ -18,10 +18,15 @@ use Propel\Runtime\Map\TableMap; use Propel\Runtime\Parser\AbstractParser; use Propel\Runtime\Util\PropelDateTime; use Thelia\Model\Coupon as ChildCoupon; +use Thelia\Model\CouponI18n as ChildCouponI18n; +use Thelia\Model\CouponI18nQuery as ChildCouponI18nQuery; +use Thelia\Model\CouponOrder as ChildCouponOrder; +use Thelia\Model\CouponOrderQuery as ChildCouponOrderQuery; use Thelia\Model\CouponQuery as ChildCouponQuery; -use Thelia\Model\CouponRule as ChildCouponRule; -use Thelia\Model\CouponRuleQuery as ChildCouponRuleQuery; +use Thelia\Model\CouponVersion as ChildCouponVersion; +use Thelia\Model\CouponVersionQuery as ChildCouponVersionQuery; use Thelia\Model\Map\CouponTableMap; +use Thelia\Model\Map\CouponVersionTableMap; abstract class Coupon implements ActiveRecordInterface { @@ -70,10 +75,28 @@ abstract class Coupon implements ActiveRecordInterface protected $code; /** - * The value for the action field. + * The value for the type field. * @var string */ - protected $action; + protected $type; + + /** + * The value for the title field. + * @var string + */ + protected $title; + + /** + * The value for the short_description field. + * @var string + */ + protected $short_description; + + /** + * The value for the description field. + * @var string + */ + protected $description; /** * The value for the value field. @@ -82,28 +105,28 @@ abstract class Coupon implements ActiveRecordInterface protected $value; /** - * The value for the used field. + * The value for the is_used field. * @var int */ - protected $used; + protected $is_used; /** - * The value for the available_since field. - * @var string - */ - protected $available_since; - - /** - * The value for the date_limit field. - * @var string - */ - protected $date_limit; - - /** - * The value for the activate field. + * The value for the is_enabled field. * @var int */ - protected $activate; + protected $is_enabled; + + /** + * The value for the expiration_date field. + * @var string + */ + protected $expiration_date; + + /** + * The value for the serialized_rules field. + * @var string + */ + protected $serialized_rules; /** * The value for the created_at field. @@ -118,10 +141,29 @@ abstract class Coupon implements ActiveRecordInterface protected $updated_at; /** - * @var ObjectCollection|ChildCouponRule[] Collection to store aggregation of ChildCouponRule objects. + * The value for the version field. + * Note: this column has a database default value of: 0 + * @var int */ - protected $collCouponRules; - protected $collCouponRulesPartial; + protected $version; + + /** + * @var ObjectCollection|ChildCouponOrder[] Collection to store aggregation of ChildCouponOrder objects. + */ + protected $collCouponOrders; + protected $collCouponOrdersPartial; + + /** + * @var ObjectCollection|ChildCouponI18n[] Collection to store aggregation of ChildCouponI18n objects. + */ + protected $collCouponI18ns; + protected $collCouponI18nsPartial; + + /** + * @var ObjectCollection|ChildCouponVersion[] Collection to store aggregation of ChildCouponVersion objects. + */ + protected $collCouponVersions; + protected $collCouponVersionsPartial; /** * Flag to prevent endless save loop, if this object is referenced @@ -131,17 +173,64 @@ abstract class Coupon implements ActiveRecordInterface */ protected $alreadyInSave = false; + // i18n behavior + + /** + * Current locale + * @var string + */ + protected $currentLocale = 'en_EN'; + + /** + * Current translation objects + * @var array[ChildCouponI18n] + */ + protected $currentTranslations; + + // versionable behavior + + + /** + * @var bool + */ + protected $enforceVersion = false; + /** * An array of objects scheduled for deletion. * @var ObjectCollection */ - protected $couponRulesScheduledForDeletion = null; + protected $couponOrdersScheduledForDeletion = null; + + /** + * An array of objects scheduled for deletion. + * @var ObjectCollection + */ + protected $couponI18nsScheduledForDeletion = null; + + /** + * An array of objects scheduled for deletion. + * @var ObjectCollection + */ + protected $couponVersionsScheduledForDeletion = null; + + /** + * Applies default values to this object. + * This method should be called from the object's constructor (or + * equivalent initialization method). + * @see __construct() + */ + public function applyDefaultValues() + { + $this->version = 0; + } /** * Initializes internal state of Thelia\Model\Base\Coupon object. + * @see applyDefaults() */ public function __construct() { + $this->applyDefaultValues(); } /** @@ -414,14 +503,47 @@ abstract class Coupon implements ActiveRecordInterface } /** - * Get the [action] column value. + * Get the [type] column value. * * @return string */ - public function getAction() + public function getType() { - return $this->action; + return $this->type; + } + + /** + * Get the [title] column value. + * + * @return string + */ + public function getTitle() + { + + return $this->title; + } + + /** + * Get the [short_description] column value. + * + * @return string + */ + public function getShortDescription() + { + + return $this->short_description; + } + + /** + * Get the [description] column value. + * + * @return string + */ + public function getDescription() + { + + return $this->description; } /** @@ -436,18 +558,29 @@ abstract class Coupon implements ActiveRecordInterface } /** - * Get the [used] column value. + * Get the [is_used] column value. * * @return int */ - public function getUsed() + public function getIsUsed() { - return $this->used; + return $this->is_used; } /** - * Get the [optionally formatted] temporal [available_since] column value. + * Get the [is_enabled] column value. + * + * @return int + */ + public function getIsEnabled() + { + + return $this->is_enabled; + } + + /** + * Get the [optionally formatted] temporal [expiration_date] column value. * * * @param string $format The date/time format string (either date()-style or strftime()-style). @@ -457,44 +590,24 @@ abstract class Coupon implements ActiveRecordInterface * * @throws PropelException - if unable to parse/validate the date/time value. */ - public function getAvailableSince($format = NULL) + public function getExpirationDate($format = NULL) { if ($format === null) { - return $this->available_since; + return $this->expiration_date; } else { - return $this->available_since !== null ? $this->available_since->format($format) : null; + return $this->expiration_date !== null ? $this->expiration_date->format($format) : null; } } /** - * Get the [optionally formatted] temporal [date_limit] column value. + * Get the [serialized_rules] 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. + * @return string */ - public function getDateLimit($format = NULL) - { - if ($format === null) { - return $this->date_limit; - } else { - return $this->date_limit !== null ? $this->date_limit->format($format) : null; - } - } - - /** - * Get the [activate] column value. - * - * @return int - */ - public function getActivate() + public function getSerializedRules() { - return $this->activate; + return $this->serialized_rules; } /** @@ -537,6 +650,17 @@ abstract class Coupon implements ActiveRecordInterface } } + /** + * Get the [version] column value. + * + * @return int + */ + public function getVersion() + { + + return $this->version; + } + /** * Set the value of [id] column. * @@ -580,25 +704,88 @@ abstract class Coupon implements ActiveRecordInterface } // setCode() /** - * Set the value of [action] column. + * Set the value of [type] column. * * @param string $v new value * @return \Thelia\Model\Coupon The current object (for fluent API support) */ - public function setAction($v) + public function setType($v) { if ($v !== null) { $v = (string) $v; } - if ($this->action !== $v) { - $this->action = $v; - $this->modifiedColumns[] = CouponTableMap::ACTION; + if ($this->type !== $v) { + $this->type = $v; + $this->modifiedColumns[] = CouponTableMap::TYPE; } return $this; - } // setAction() + } // setType() + + /** + * Set the value of [title] column. + * + * @param string $v new value + * @return \Thelia\Model\Coupon The current object (for fluent API support) + */ + public function setTitle($v) + { + if ($v !== null) { + $v = (string) $v; + } + + if ($this->title !== $v) { + $this->title = $v; + $this->modifiedColumns[] = CouponTableMap::TITLE; + } + + + return $this; + } // setTitle() + + /** + * Set the value of [short_description] column. + * + * @param string $v new value + * @return \Thelia\Model\Coupon The current object (for fluent API support) + */ + public function setShortDescription($v) + { + if ($v !== null) { + $v = (string) $v; + } + + if ($this->short_description !== $v) { + $this->short_description = $v; + $this->modifiedColumns[] = CouponTableMap::SHORT_DESCRIPTION; + } + + + return $this; + } // setShortDescription() + + /** + * Set the value of [description] column. + * + * @param string $v new value + * @return \Thelia\Model\Coupon The current object (for fluent API support) + */ + public function setDescription($v) + { + if ($v !== null) { + $v = (string) $v; + } + + if ($this->description !== $v) { + $this->description = $v; + $this->modifiedColumns[] = CouponTableMap::DESCRIPTION; + } + + + return $this; + } // setDescription() /** * Set the value of [value] column. @@ -622,88 +809,88 @@ abstract class Coupon implements ActiveRecordInterface } // setValue() /** - * Set the value of [used] column. + * Set the value of [is_used] column. * * @param int $v new value * @return \Thelia\Model\Coupon The current object (for fluent API support) */ - public function setUsed($v) + public function setIsUsed($v) { if ($v !== null) { $v = (int) $v; } - if ($this->used !== $v) { - $this->used = $v; - $this->modifiedColumns[] = CouponTableMap::USED; + if ($this->is_used !== $v) { + $this->is_used = $v; + $this->modifiedColumns[] = CouponTableMap::IS_USED; } return $this; - } // setUsed() + } // setIsUsed() /** - * Sets the value of [available_since] 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\Coupon The current object (for fluent API support) - */ - public function setAvailableSince($v) - { - $dt = PropelDateTime::newInstance($v, null, '\DateTime'); - if ($this->available_since !== null || $dt !== null) { - if ($dt !== $this->available_since) { - $this->available_since = $dt; - $this->modifiedColumns[] = CouponTableMap::AVAILABLE_SINCE; - } - } // if either are not null - - - return $this; - } // setAvailableSince() - - /** - * Sets the value of [date_limit] 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\Coupon The current object (for fluent API support) - */ - public function setDateLimit($v) - { - $dt = PropelDateTime::newInstance($v, null, '\DateTime'); - if ($this->date_limit !== null || $dt !== null) { - if ($dt !== $this->date_limit) { - $this->date_limit = $dt; - $this->modifiedColumns[] = CouponTableMap::DATE_LIMIT; - } - } // if either are not null - - - return $this; - } // setDateLimit() - - /** - * Set the value of [activate] column. + * Set the value of [is_enabled] column. * * @param int $v new value * @return \Thelia\Model\Coupon The current object (for fluent API support) */ - public function setActivate($v) + public function setIsEnabled($v) { if ($v !== null) { $v = (int) $v; } - if ($this->activate !== $v) { - $this->activate = $v; - $this->modifiedColumns[] = CouponTableMap::ACTIVATE; + if ($this->is_enabled !== $v) { + $this->is_enabled = $v; + $this->modifiedColumns[] = CouponTableMap::IS_ENABLED; } return $this; - } // setActivate() + } // setIsEnabled() + + /** + * Sets the value of [expiration_date] 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\Coupon The current object (for fluent API support) + */ + public function setExpirationDate($v) + { + $dt = PropelDateTime::newInstance($v, null, '\DateTime'); + if ($this->expiration_date !== null || $dt !== null) { + if ($dt !== $this->expiration_date) { + $this->expiration_date = $dt; + $this->modifiedColumns[] = CouponTableMap::EXPIRATION_DATE; + } + } // if either are not null + + + return $this; + } // setExpirationDate() + + /** + * Set the value of [serialized_rules] column. + * + * @param string $v new value + * @return \Thelia\Model\Coupon The current object (for fluent API support) + */ + public function setSerializedRules($v) + { + if ($v !== null) { + $v = (string) $v; + } + + if ($this->serialized_rules !== $v) { + $this->serialized_rules = $v; + $this->modifiedColumns[] = CouponTableMap::SERIALIZED_RULES; + } + + + return $this; + } // setSerializedRules() /** * Sets the value of [created_at] column to a normalized version of the date/time value specified. @@ -747,6 +934,27 @@ abstract class Coupon implements ActiveRecordInterface return $this; } // setUpdatedAt() + /** + * Set the value of [version] column. + * + * @param int $v new value + * @return \Thelia\Model\Coupon The current object (for fluent API support) + */ + public function setVersion($v) + { + if ($v !== null) { + $v = (int) $v; + } + + if ($this->version !== $v) { + $this->version = $v; + $this->modifiedColumns[] = CouponTableMap::VERSION; + } + + + return $this; + } // setVersion() + /** * Indicates whether the columns in this object are only set to default values. * @@ -757,6 +965,10 @@ abstract class Coupon implements ActiveRecordInterface */ public function hasOnlyDefaultValues() { + if ($this->version !== 0) { + return false; + } + // otherwise, everything was equal, so return TRUE return true; } // hasOnlyDefaultValues() @@ -790,41 +1002,50 @@ abstract class Coupon implements ActiveRecordInterface $col = $row[TableMap::TYPE_NUM == $indexType ? 1 + $startcol : CouponTableMap::translateFieldName('Code', TableMap::TYPE_PHPNAME, $indexType)]; $this->code = (null !== $col) ? (string) $col : null; - $col = $row[TableMap::TYPE_NUM == $indexType ? 2 + $startcol : CouponTableMap::translateFieldName('Action', TableMap::TYPE_PHPNAME, $indexType)]; - $this->action = (null !== $col) ? (string) $col : null; + $col = $row[TableMap::TYPE_NUM == $indexType ? 2 + $startcol : CouponTableMap::translateFieldName('Type', TableMap::TYPE_PHPNAME, $indexType)]; + $this->type = (null !== $col) ? (string) $col : null; - $col = $row[TableMap::TYPE_NUM == $indexType ? 3 + $startcol : CouponTableMap::translateFieldName('Value', TableMap::TYPE_PHPNAME, $indexType)]; + $col = $row[TableMap::TYPE_NUM == $indexType ? 3 + $startcol : CouponTableMap::translateFieldName('Title', TableMap::TYPE_PHPNAME, $indexType)]; + $this->title = (null !== $col) ? (string) $col : null; + + $col = $row[TableMap::TYPE_NUM == $indexType ? 4 + $startcol : CouponTableMap::translateFieldName('ShortDescription', TableMap::TYPE_PHPNAME, $indexType)]; + $this->short_description = (null !== $col) ? (string) $col : null; + + $col = $row[TableMap::TYPE_NUM == $indexType ? 5 + $startcol : CouponTableMap::translateFieldName('Description', TableMap::TYPE_PHPNAME, $indexType)]; + $this->description = (null !== $col) ? (string) $col : null; + + $col = $row[TableMap::TYPE_NUM == $indexType ? 6 + $startcol : CouponTableMap::translateFieldName('Value', TableMap::TYPE_PHPNAME, $indexType)]; $this->value = (null !== $col) ? (double) $col : null; - $col = $row[TableMap::TYPE_NUM == $indexType ? 4 + $startcol : CouponTableMap::translateFieldName('Used', TableMap::TYPE_PHPNAME, $indexType)]; - $this->used = (null !== $col) ? (int) $col : null; + $col = $row[TableMap::TYPE_NUM == $indexType ? 7 + $startcol : CouponTableMap::translateFieldName('IsUsed', TableMap::TYPE_PHPNAME, $indexType)]; + $this->is_used = (null !== $col) ? (int) $col : null; - $col = $row[TableMap::TYPE_NUM == $indexType ? 5 + $startcol : CouponTableMap::translateFieldName('AvailableSince', TableMap::TYPE_PHPNAME, $indexType)]; + $col = $row[TableMap::TYPE_NUM == $indexType ? 8 + $startcol : CouponTableMap::translateFieldName('IsEnabled', TableMap::TYPE_PHPNAME, $indexType)]; + $this->is_enabled = (null !== $col) ? (int) $col : null; + + $col = $row[TableMap::TYPE_NUM == $indexType ? 9 + $startcol : CouponTableMap::translateFieldName('ExpirationDate', TableMap::TYPE_PHPNAME, $indexType)]; if ($col === '0000-00-00 00:00:00') { $col = null; } - $this->available_since = (null !== $col) ? PropelDateTime::newInstance($col, null, '\DateTime') : null; + $this->expiration_date = (null !== $col) ? PropelDateTime::newInstance($col, null, '\DateTime') : null; - $col = $row[TableMap::TYPE_NUM == $indexType ? 6 + $startcol : CouponTableMap::translateFieldName('DateLimit', TableMap::TYPE_PHPNAME, $indexType)]; - if ($col === '0000-00-00 00:00:00') { - $col = null; - } - $this->date_limit = (null !== $col) ? PropelDateTime::newInstance($col, null, '\DateTime') : null; + $col = $row[TableMap::TYPE_NUM == $indexType ? 10 + $startcol : CouponTableMap::translateFieldName('SerializedRules', TableMap::TYPE_PHPNAME, $indexType)]; + $this->serialized_rules = (null !== $col) ? (string) $col : null; - $col = $row[TableMap::TYPE_NUM == $indexType ? 7 + $startcol : CouponTableMap::translateFieldName('Activate', TableMap::TYPE_PHPNAME, $indexType)]; - $this->activate = (null !== $col) ? (int) $col : null; - - $col = $row[TableMap::TYPE_NUM == $indexType ? 8 + $startcol : CouponTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)]; + $col = $row[TableMap::TYPE_NUM == $indexType ? 11 + $startcol : CouponTableMap::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 ? 9 + $startcol : CouponTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)]; + $col = $row[TableMap::TYPE_NUM == $indexType ? 12 + $startcol : CouponTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)]; if ($col === '0000-00-00 00:00:00') { $col = null; } $this->updated_at = (null !== $col) ? PropelDateTime::newInstance($col, null, '\DateTime') : null; + + $col = $row[TableMap::TYPE_NUM == $indexType ? 13 + $startcol : CouponTableMap::translateFieldName('Version', TableMap::TYPE_PHPNAME, $indexType)]; + $this->version = (null !== $col) ? (int) $col : null; $this->resetModified(); $this->setNew(false); @@ -833,7 +1054,7 @@ abstract class Coupon implements ActiveRecordInterface $this->ensureConsistency(); } - return $startcol + 10; // 10 = CouponTableMap::NUM_HYDRATE_COLUMNS. + return $startcol + 14; // 14 = CouponTableMap::NUM_HYDRATE_COLUMNS. } catch (Exception $e) { throw new PropelException("Error populating \Thelia\Model\Coupon object", 0, $e); @@ -894,7 +1115,11 @@ abstract class Coupon implements ActiveRecordInterface if ($deep) { // also de-associate any related objects? - $this->collCouponRules = null; + $this->collCouponOrders = null; + + $this->collCouponI18ns = null; + + $this->collCouponVersions = null; } // if (deep) } @@ -964,6 +1189,11 @@ abstract class Coupon implements ActiveRecordInterface $isInsert = $this->isNew(); try { $ret = $this->preSave($con); + // versionable behavior + if ($this->isVersioningNecessary()) { + $this->setVersion($this->isNew() ? 1 : $this->getLastVersionNumber($con) + 1); + $createVersion = true; // for postSave hook + } if ($isInsert) { $ret = $ret && $this->preInsert($con); // timestampable behavior @@ -988,6 +1218,10 @@ abstract class Coupon implements ActiveRecordInterface $this->postUpdate($con); } $this->postSave($con); + // versionable behavior + if (isset($createVersion)) { + $this->addVersion($con); + } CouponTableMap::addInstanceToPool($this); } else { $affectedRows = 0; @@ -1029,17 +1263,51 @@ abstract class Coupon implements ActiveRecordInterface $this->resetModified(); } - if ($this->couponRulesScheduledForDeletion !== null) { - if (!$this->couponRulesScheduledForDeletion->isEmpty()) { - \Thelia\Model\CouponRuleQuery::create() - ->filterByPrimaryKeys($this->couponRulesScheduledForDeletion->getPrimaryKeys(false)) + if ($this->couponOrdersScheduledForDeletion !== null) { + if (!$this->couponOrdersScheduledForDeletion->isEmpty()) { + \Thelia\Model\CouponOrderQuery::create() + ->filterByPrimaryKeys($this->couponOrdersScheduledForDeletion->getPrimaryKeys(false)) ->delete($con); - $this->couponRulesScheduledForDeletion = null; + $this->couponOrdersScheduledForDeletion = null; } } - if ($this->collCouponRules !== null) { - foreach ($this->collCouponRules as $referrerFK) { + if ($this->collCouponOrders !== null) { + foreach ($this->collCouponOrders as $referrerFK) { + if (!$referrerFK->isDeleted() && ($referrerFK->isNew() || $referrerFK->isModified())) { + $affectedRows += $referrerFK->save($con); + } + } + } + + if ($this->couponI18nsScheduledForDeletion !== null) { + if (!$this->couponI18nsScheduledForDeletion->isEmpty()) { + \Thelia\Model\CouponI18nQuery::create() + ->filterByPrimaryKeys($this->couponI18nsScheduledForDeletion->getPrimaryKeys(false)) + ->delete($con); + $this->couponI18nsScheduledForDeletion = null; + } + } + + if ($this->collCouponI18ns !== null) { + foreach ($this->collCouponI18ns as $referrerFK) { + if (!$referrerFK->isDeleted() && ($referrerFK->isNew() || $referrerFK->isModified())) { + $affectedRows += $referrerFK->save($con); + } + } + } + + if ($this->couponVersionsScheduledForDeletion !== null) { + if (!$this->couponVersionsScheduledForDeletion->isEmpty()) { + \Thelia\Model\CouponVersionQuery::create() + ->filterByPrimaryKeys($this->couponVersionsScheduledForDeletion->getPrimaryKeys(false)) + ->delete($con); + $this->couponVersionsScheduledForDeletion = null; + } + } + + if ($this->collCouponVersions !== null) { + foreach ($this->collCouponVersions as $referrerFK) { if (!$referrerFK->isDeleted() && ($referrerFK->isNew() || $referrerFK->isModified())) { $affectedRows += $referrerFK->save($con); } @@ -1078,23 +1346,32 @@ abstract class Coupon implements ActiveRecordInterface if ($this->isColumnModified(CouponTableMap::CODE)) { $modifiedColumns[':p' . $index++] = 'CODE'; } - if ($this->isColumnModified(CouponTableMap::ACTION)) { - $modifiedColumns[':p' . $index++] = 'ACTION'; + if ($this->isColumnModified(CouponTableMap::TYPE)) { + $modifiedColumns[':p' . $index++] = 'TYPE'; + } + if ($this->isColumnModified(CouponTableMap::TITLE)) { + $modifiedColumns[':p' . $index++] = 'TITLE'; + } + if ($this->isColumnModified(CouponTableMap::SHORT_DESCRIPTION)) { + $modifiedColumns[':p' . $index++] = 'SHORT_DESCRIPTION'; + } + if ($this->isColumnModified(CouponTableMap::DESCRIPTION)) { + $modifiedColumns[':p' . $index++] = 'DESCRIPTION'; } if ($this->isColumnModified(CouponTableMap::VALUE)) { $modifiedColumns[':p' . $index++] = 'VALUE'; } - if ($this->isColumnModified(CouponTableMap::USED)) { - $modifiedColumns[':p' . $index++] = 'USED'; + if ($this->isColumnModified(CouponTableMap::IS_USED)) { + $modifiedColumns[':p' . $index++] = 'IS_USED'; } - if ($this->isColumnModified(CouponTableMap::AVAILABLE_SINCE)) { - $modifiedColumns[':p' . $index++] = 'AVAILABLE_SINCE'; + if ($this->isColumnModified(CouponTableMap::IS_ENABLED)) { + $modifiedColumns[':p' . $index++] = 'IS_ENABLED'; } - if ($this->isColumnModified(CouponTableMap::DATE_LIMIT)) { - $modifiedColumns[':p' . $index++] = 'DATE_LIMIT'; + if ($this->isColumnModified(CouponTableMap::EXPIRATION_DATE)) { + $modifiedColumns[':p' . $index++] = 'EXPIRATION_DATE'; } - if ($this->isColumnModified(CouponTableMap::ACTIVATE)) { - $modifiedColumns[':p' . $index++] = 'ACTIVATE'; + if ($this->isColumnModified(CouponTableMap::SERIALIZED_RULES)) { + $modifiedColumns[':p' . $index++] = 'SERIALIZED_RULES'; } if ($this->isColumnModified(CouponTableMap::CREATED_AT)) { $modifiedColumns[':p' . $index++] = 'CREATED_AT'; @@ -1102,6 +1379,9 @@ abstract class Coupon implements ActiveRecordInterface if ($this->isColumnModified(CouponTableMap::UPDATED_AT)) { $modifiedColumns[':p' . $index++] = 'UPDATED_AT'; } + if ($this->isColumnModified(CouponTableMap::VERSION)) { + $modifiedColumns[':p' . $index++] = 'VERSION'; + } $sql = sprintf( 'INSERT INTO coupon (%s) VALUES (%s)', @@ -1119,23 +1399,32 @@ abstract class Coupon implements ActiveRecordInterface case 'CODE': $stmt->bindValue($identifier, $this->code, PDO::PARAM_STR); break; - case 'ACTION': - $stmt->bindValue($identifier, $this->action, PDO::PARAM_STR); + case 'TYPE': + $stmt->bindValue($identifier, $this->type, PDO::PARAM_STR); + break; + case 'TITLE': + $stmt->bindValue($identifier, $this->title, PDO::PARAM_STR); + break; + case 'SHORT_DESCRIPTION': + $stmt->bindValue($identifier, $this->short_description, PDO::PARAM_STR); + break; + case 'DESCRIPTION': + $stmt->bindValue($identifier, $this->description, PDO::PARAM_STR); break; case 'VALUE': $stmt->bindValue($identifier, $this->value, PDO::PARAM_STR); break; - case 'USED': - $stmt->bindValue($identifier, $this->used, PDO::PARAM_INT); + case 'IS_USED': + $stmt->bindValue($identifier, $this->is_used, PDO::PARAM_INT); break; - case 'AVAILABLE_SINCE': - $stmt->bindValue($identifier, $this->available_since ? $this->available_since->format("Y-m-d H:i:s") : null, PDO::PARAM_STR); + case 'IS_ENABLED': + $stmt->bindValue($identifier, $this->is_enabled, PDO::PARAM_INT); break; - case 'DATE_LIMIT': - $stmt->bindValue($identifier, $this->date_limit ? $this->date_limit->format("Y-m-d H:i:s") : null, PDO::PARAM_STR); + case 'EXPIRATION_DATE': + $stmt->bindValue($identifier, $this->expiration_date ? $this->expiration_date->format("Y-m-d H:i:s") : null, PDO::PARAM_STR); break; - case 'ACTIVATE': - $stmt->bindValue($identifier, $this->activate, PDO::PARAM_INT); + case 'SERIALIZED_RULES': + $stmt->bindValue($identifier, $this->serialized_rules, 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); @@ -1143,6 +1432,9 @@ abstract class Coupon implements ActiveRecordInterface case 'UPDATED_AT': $stmt->bindValue($identifier, $this->updated_at ? $this->updated_at->format("Y-m-d H:i:s") : null, PDO::PARAM_STR); break; + case 'VERSION': + $stmt->bindValue($identifier, $this->version, PDO::PARAM_INT); + break; } } $stmt->execute(); @@ -1212,29 +1504,41 @@ abstract class Coupon implements ActiveRecordInterface return $this->getCode(); break; case 2: - return $this->getAction(); + return $this->getType(); break; case 3: - return $this->getValue(); + return $this->getTitle(); break; case 4: - return $this->getUsed(); + return $this->getShortDescription(); break; case 5: - return $this->getAvailableSince(); + return $this->getDescription(); break; case 6: - return $this->getDateLimit(); + return $this->getValue(); break; case 7: - return $this->getActivate(); + return $this->getIsUsed(); break; case 8: - return $this->getCreatedAt(); + return $this->getIsEnabled(); break; case 9: + return $this->getExpirationDate(); + break; + case 10: + return $this->getSerializedRules(); + break; + case 11: + return $this->getCreatedAt(); + break; + case 12: return $this->getUpdatedAt(); break; + case 13: + return $this->getVersion(); + break; default: return null; break; @@ -1266,14 +1570,18 @@ abstract class Coupon implements ActiveRecordInterface $result = array( $keys[0] => $this->getId(), $keys[1] => $this->getCode(), - $keys[2] => $this->getAction(), - $keys[3] => $this->getValue(), - $keys[4] => $this->getUsed(), - $keys[5] => $this->getAvailableSince(), - $keys[6] => $this->getDateLimit(), - $keys[7] => $this->getActivate(), - $keys[8] => $this->getCreatedAt(), - $keys[9] => $this->getUpdatedAt(), + $keys[2] => $this->getType(), + $keys[3] => $this->getTitle(), + $keys[4] => $this->getShortDescription(), + $keys[5] => $this->getDescription(), + $keys[6] => $this->getValue(), + $keys[7] => $this->getIsUsed(), + $keys[8] => $this->getIsEnabled(), + $keys[9] => $this->getExpirationDate(), + $keys[10] => $this->getSerializedRules(), + $keys[11] => $this->getCreatedAt(), + $keys[12] => $this->getUpdatedAt(), + $keys[13] => $this->getVersion(), ); $virtualColumns = $this->virtualColumns; foreach($virtualColumns as $key => $virtualColumn) @@ -1282,8 +1590,14 @@ abstract class Coupon implements ActiveRecordInterface } if ($includeForeignObjects) { - if (null !== $this->collCouponRules) { - $result['CouponRules'] = $this->collCouponRules->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects); + if (null !== $this->collCouponOrders) { + $result['CouponOrders'] = $this->collCouponOrders->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects); + } + if (null !== $this->collCouponI18ns) { + $result['CouponI18ns'] = $this->collCouponI18ns->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects); + } + if (null !== $this->collCouponVersions) { + $result['CouponVersions'] = $this->collCouponVersions->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects); } } @@ -1326,29 +1640,41 @@ abstract class Coupon implements ActiveRecordInterface $this->setCode($value); break; case 2: - $this->setAction($value); + $this->setType($value); break; case 3: - $this->setValue($value); + $this->setTitle($value); break; case 4: - $this->setUsed($value); + $this->setShortDescription($value); break; case 5: - $this->setAvailableSince($value); + $this->setDescription($value); break; case 6: - $this->setDateLimit($value); + $this->setValue($value); break; case 7: - $this->setActivate($value); + $this->setIsUsed($value); break; case 8: - $this->setCreatedAt($value); + $this->setIsEnabled($value); break; case 9: + $this->setExpirationDate($value); + break; + case 10: + $this->setSerializedRules($value); + break; + case 11: + $this->setCreatedAt($value); + break; + case 12: $this->setUpdatedAt($value); break; + case 13: + $this->setVersion($value); + break; } // switch() } @@ -1375,14 +1701,18 @@ abstract class Coupon implements ActiveRecordInterface if (array_key_exists($keys[0], $arr)) $this->setId($arr[$keys[0]]); if (array_key_exists($keys[1], $arr)) $this->setCode($arr[$keys[1]]); - if (array_key_exists($keys[2], $arr)) $this->setAction($arr[$keys[2]]); - if (array_key_exists($keys[3], $arr)) $this->setValue($arr[$keys[3]]); - if (array_key_exists($keys[4], $arr)) $this->setUsed($arr[$keys[4]]); - if (array_key_exists($keys[5], $arr)) $this->setAvailableSince($arr[$keys[5]]); - if (array_key_exists($keys[6], $arr)) $this->setDateLimit($arr[$keys[6]]); - if (array_key_exists($keys[7], $arr)) $this->setActivate($arr[$keys[7]]); - if (array_key_exists($keys[8], $arr)) $this->setCreatedAt($arr[$keys[8]]); - if (array_key_exists($keys[9], $arr)) $this->setUpdatedAt($arr[$keys[9]]); + if (array_key_exists($keys[2], $arr)) $this->setType($arr[$keys[2]]); + if (array_key_exists($keys[3], $arr)) $this->setTitle($arr[$keys[3]]); + if (array_key_exists($keys[4], $arr)) $this->setShortDescription($arr[$keys[4]]); + if (array_key_exists($keys[5], $arr)) $this->setDescription($arr[$keys[5]]); + if (array_key_exists($keys[6], $arr)) $this->setValue($arr[$keys[6]]); + if (array_key_exists($keys[7], $arr)) $this->setIsUsed($arr[$keys[7]]); + if (array_key_exists($keys[8], $arr)) $this->setIsEnabled($arr[$keys[8]]); + if (array_key_exists($keys[9], $arr)) $this->setExpirationDate($arr[$keys[9]]); + if (array_key_exists($keys[10], $arr)) $this->setSerializedRules($arr[$keys[10]]); + if (array_key_exists($keys[11], $arr)) $this->setCreatedAt($arr[$keys[11]]); + if (array_key_exists($keys[12], $arr)) $this->setUpdatedAt($arr[$keys[12]]); + if (array_key_exists($keys[13], $arr)) $this->setVersion($arr[$keys[13]]); } /** @@ -1396,14 +1726,18 @@ abstract class Coupon implements ActiveRecordInterface if ($this->isColumnModified(CouponTableMap::ID)) $criteria->add(CouponTableMap::ID, $this->id); if ($this->isColumnModified(CouponTableMap::CODE)) $criteria->add(CouponTableMap::CODE, $this->code); - if ($this->isColumnModified(CouponTableMap::ACTION)) $criteria->add(CouponTableMap::ACTION, $this->action); + if ($this->isColumnModified(CouponTableMap::TYPE)) $criteria->add(CouponTableMap::TYPE, $this->type); + if ($this->isColumnModified(CouponTableMap::TITLE)) $criteria->add(CouponTableMap::TITLE, $this->title); + if ($this->isColumnModified(CouponTableMap::SHORT_DESCRIPTION)) $criteria->add(CouponTableMap::SHORT_DESCRIPTION, $this->short_description); + if ($this->isColumnModified(CouponTableMap::DESCRIPTION)) $criteria->add(CouponTableMap::DESCRIPTION, $this->description); if ($this->isColumnModified(CouponTableMap::VALUE)) $criteria->add(CouponTableMap::VALUE, $this->value); - if ($this->isColumnModified(CouponTableMap::USED)) $criteria->add(CouponTableMap::USED, $this->used); - if ($this->isColumnModified(CouponTableMap::AVAILABLE_SINCE)) $criteria->add(CouponTableMap::AVAILABLE_SINCE, $this->available_since); - if ($this->isColumnModified(CouponTableMap::DATE_LIMIT)) $criteria->add(CouponTableMap::DATE_LIMIT, $this->date_limit); - if ($this->isColumnModified(CouponTableMap::ACTIVATE)) $criteria->add(CouponTableMap::ACTIVATE, $this->activate); + if ($this->isColumnModified(CouponTableMap::IS_USED)) $criteria->add(CouponTableMap::IS_USED, $this->is_used); + if ($this->isColumnModified(CouponTableMap::IS_ENABLED)) $criteria->add(CouponTableMap::IS_ENABLED, $this->is_enabled); + if ($this->isColumnModified(CouponTableMap::EXPIRATION_DATE)) $criteria->add(CouponTableMap::EXPIRATION_DATE, $this->expiration_date); + if ($this->isColumnModified(CouponTableMap::SERIALIZED_RULES)) $criteria->add(CouponTableMap::SERIALIZED_RULES, $this->serialized_rules); if ($this->isColumnModified(CouponTableMap::CREATED_AT)) $criteria->add(CouponTableMap::CREATED_AT, $this->created_at); if ($this->isColumnModified(CouponTableMap::UPDATED_AT)) $criteria->add(CouponTableMap::UPDATED_AT, $this->updated_at); + if ($this->isColumnModified(CouponTableMap::VERSION)) $criteria->add(CouponTableMap::VERSION, $this->version); return $criteria; } @@ -1468,23 +1802,39 @@ abstract class Coupon implements ActiveRecordInterface public function copyInto($copyObj, $deepCopy = false, $makeNew = true) { $copyObj->setCode($this->getCode()); - $copyObj->setAction($this->getAction()); + $copyObj->setType($this->getType()); + $copyObj->setTitle($this->getTitle()); + $copyObj->setShortDescription($this->getShortDescription()); + $copyObj->setDescription($this->getDescription()); $copyObj->setValue($this->getValue()); - $copyObj->setUsed($this->getUsed()); - $copyObj->setAvailableSince($this->getAvailableSince()); - $copyObj->setDateLimit($this->getDateLimit()); - $copyObj->setActivate($this->getActivate()); + $copyObj->setIsUsed($this->getIsUsed()); + $copyObj->setIsEnabled($this->getIsEnabled()); + $copyObj->setExpirationDate($this->getExpirationDate()); + $copyObj->setSerializedRules($this->getSerializedRules()); $copyObj->setCreatedAt($this->getCreatedAt()); $copyObj->setUpdatedAt($this->getUpdatedAt()); + $copyObj->setVersion($this->getVersion()); if ($deepCopy) { // important: temporarily setNew(false) because this affects the behavior of // the getter/setter methods for fkey referrer objects. $copyObj->setNew(false); - foreach ($this->getCouponRules() as $relObj) { + foreach ($this->getCouponOrders() as $relObj) { if ($relObj !== $this) { // ensure that we don't try to copy a reference to ourselves - $copyObj->addCouponRule($relObj->copy($deepCopy)); + $copyObj->addCouponOrder($relObj->copy($deepCopy)); + } + } + + foreach ($this->getCouponI18ns() as $relObj) { + if ($relObj !== $this) { // ensure that we don't try to copy a reference to ourselves + $copyObj->addCouponI18n($relObj->copy($deepCopy)); + } + } + + foreach ($this->getCouponVersions() as $relObj) { + if ($relObj !== $this) { // ensure that we don't try to copy a reference to ourselves + $copyObj->addCouponVersion($relObj->copy($deepCopy)); } } @@ -1529,37 +1879,43 @@ abstract class Coupon implements ActiveRecordInterface */ public function initRelation($relationName) { - if ('CouponRule' == $relationName) { - return $this->initCouponRules(); + if ('CouponOrder' == $relationName) { + return $this->initCouponOrders(); + } + if ('CouponI18n' == $relationName) { + return $this->initCouponI18ns(); + } + if ('CouponVersion' == $relationName) { + return $this->initCouponVersions(); } } /** - * Clears out the collCouponRules collection + * Clears out the collCouponOrders 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 addCouponRules() + * @see addCouponOrders() */ - public function clearCouponRules() + public function clearCouponOrders() { - $this->collCouponRules = null; // important to set this to NULL since that means it is uninitialized + $this->collCouponOrders = null; // important to set this to NULL since that means it is uninitialized } /** - * Reset is the collCouponRules collection loaded partially. + * Reset is the collCouponOrders collection loaded partially. */ - public function resetPartialCouponRules($v = true) + public function resetPartialCouponOrders($v = true) { - $this->collCouponRulesPartial = $v; + $this->collCouponOrdersPartial = $v; } /** - * Initializes the collCouponRules collection. + * Initializes the collCouponOrders collection. * - * By default this just sets the collCouponRules collection to an empty array (like clearcollCouponRules()); + * By default this just sets the collCouponOrders collection to an empty array (like clearcollCouponOrders()); * 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. * @@ -1568,17 +1924,17 @@ abstract class Coupon implements ActiveRecordInterface * * @return void */ - public function initCouponRules($overrideExisting = true) + public function initCouponOrders($overrideExisting = true) { - if (null !== $this->collCouponRules && !$overrideExisting) { + if (null !== $this->collCouponOrders && !$overrideExisting) { return; } - $this->collCouponRules = new ObjectCollection(); - $this->collCouponRules->setModel('\Thelia\Model\CouponRule'); + $this->collCouponOrders = new ObjectCollection(); + $this->collCouponOrders->setModel('\Thelia\Model\CouponOrder'); } /** - * Gets an array of ChildCouponRule objects which contain a foreign key that references this object. + * Gets an array of ChildCouponOrder 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. @@ -1588,109 +1944,109 @@ abstract class Coupon implements ActiveRecordInterface * * @param Criteria $criteria optional Criteria object to narrow the query * @param ConnectionInterface $con optional connection object - * @return Collection|ChildCouponRule[] List of ChildCouponRule objects + * @return Collection|ChildCouponOrder[] List of ChildCouponOrder objects * @throws PropelException */ - public function getCouponRules($criteria = null, ConnectionInterface $con = null) + public function getCouponOrders($criteria = null, ConnectionInterface $con = null) { - $partial = $this->collCouponRulesPartial && !$this->isNew(); - if (null === $this->collCouponRules || null !== $criteria || $partial) { - if ($this->isNew() && null === $this->collCouponRules) { + $partial = $this->collCouponOrdersPartial && !$this->isNew(); + if (null === $this->collCouponOrders || null !== $criteria || $partial) { + if ($this->isNew() && null === $this->collCouponOrders) { // return empty collection - $this->initCouponRules(); + $this->initCouponOrders(); } else { - $collCouponRules = ChildCouponRuleQuery::create(null, $criteria) + $collCouponOrders = ChildCouponOrderQuery::create(null, $criteria) ->filterByCoupon($this) ->find($con); if (null !== $criteria) { - if (false !== $this->collCouponRulesPartial && count($collCouponRules)) { - $this->initCouponRules(false); + if (false !== $this->collCouponOrdersPartial && count($collCouponOrders)) { + $this->initCouponOrders(false); - foreach ($collCouponRules as $obj) { - if (false == $this->collCouponRules->contains($obj)) { - $this->collCouponRules->append($obj); + foreach ($collCouponOrders as $obj) { + if (false == $this->collCouponOrders->contains($obj)) { + $this->collCouponOrders->append($obj); } } - $this->collCouponRulesPartial = true; + $this->collCouponOrdersPartial = true; } - $collCouponRules->getInternalIterator()->rewind(); + $collCouponOrders->getInternalIterator()->rewind(); - return $collCouponRules; + return $collCouponOrders; } - if ($partial && $this->collCouponRules) { - foreach ($this->collCouponRules as $obj) { + if ($partial && $this->collCouponOrders) { + foreach ($this->collCouponOrders as $obj) { if ($obj->isNew()) { - $collCouponRules[] = $obj; + $collCouponOrders[] = $obj; } } } - $this->collCouponRules = $collCouponRules; - $this->collCouponRulesPartial = false; + $this->collCouponOrders = $collCouponOrders; + $this->collCouponOrdersPartial = false; } } - return $this->collCouponRules; + return $this->collCouponOrders; } /** - * Sets a collection of CouponRule objects related by a one-to-many relationship + * Sets a collection of CouponOrder 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 $couponRules A Propel collection. + * @param Collection $couponOrders A Propel collection. * @param ConnectionInterface $con Optional connection object * @return ChildCoupon The current object (for fluent API support) */ - public function setCouponRules(Collection $couponRules, ConnectionInterface $con = null) + public function setCouponOrders(Collection $couponOrders, ConnectionInterface $con = null) { - $couponRulesToDelete = $this->getCouponRules(new Criteria(), $con)->diff($couponRules); + $couponOrdersToDelete = $this->getCouponOrders(new Criteria(), $con)->diff($couponOrders); - $this->couponRulesScheduledForDeletion = $couponRulesToDelete; + $this->couponOrdersScheduledForDeletion = $couponOrdersToDelete; - foreach ($couponRulesToDelete as $couponRuleRemoved) { - $couponRuleRemoved->setCoupon(null); + foreach ($couponOrdersToDelete as $couponOrderRemoved) { + $couponOrderRemoved->setCoupon(null); } - $this->collCouponRules = null; - foreach ($couponRules as $couponRule) { - $this->addCouponRule($couponRule); + $this->collCouponOrders = null; + foreach ($couponOrders as $couponOrder) { + $this->addCouponOrder($couponOrder); } - $this->collCouponRules = $couponRules; - $this->collCouponRulesPartial = false; + $this->collCouponOrders = $couponOrders; + $this->collCouponOrdersPartial = false; return $this; } /** - * Returns the number of related CouponRule objects. + * Returns the number of related CouponOrder objects. * * @param Criteria $criteria * @param boolean $distinct * @param ConnectionInterface $con - * @return int Count of related CouponRule objects. + * @return int Count of related CouponOrder objects. * @throws PropelException */ - public function countCouponRules(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) + public function countCouponOrders(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) { - $partial = $this->collCouponRulesPartial && !$this->isNew(); - if (null === $this->collCouponRules || null !== $criteria || $partial) { - if ($this->isNew() && null === $this->collCouponRules) { + $partial = $this->collCouponOrdersPartial && !$this->isNew(); + if (null === $this->collCouponOrders || null !== $criteria || $partial) { + if ($this->isNew() && null === $this->collCouponOrders) { return 0; } if ($partial && !$criteria) { - return count($this->getCouponRules()); + return count($this->getCouponOrders()); } - $query = ChildCouponRuleQuery::create(null, $criteria); + $query = ChildCouponOrderQuery::create(null, $criteria); if ($distinct) { $query->distinct(); } @@ -1700,53 +2056,524 @@ abstract class Coupon implements ActiveRecordInterface ->count($con); } - return count($this->collCouponRules); + return count($this->collCouponOrders); } /** - * Method called to associate a ChildCouponRule object to this object - * through the ChildCouponRule foreign key attribute. + * Method called to associate a ChildCouponOrder object to this object + * through the ChildCouponOrder foreign key attribute. * - * @param ChildCouponRule $l ChildCouponRule + * @param ChildCouponOrder $l ChildCouponOrder * @return \Thelia\Model\Coupon The current object (for fluent API support) */ - public function addCouponRule(ChildCouponRule $l) + public function addCouponOrder(ChildCouponOrder $l) { - if ($this->collCouponRules === null) { - $this->initCouponRules(); - $this->collCouponRulesPartial = true; + if ($this->collCouponOrders === null) { + $this->initCouponOrders(); + $this->collCouponOrdersPartial = true; } - if (!in_array($l, $this->collCouponRules->getArrayCopy(), true)) { // only add it if the **same** object is not already associated - $this->doAddCouponRule($l); + if (!in_array($l, $this->collCouponOrders->getArrayCopy(), true)) { // only add it if the **same** object is not already associated + $this->doAddCouponOrder($l); } return $this; } /** - * @param CouponRule $couponRule The couponRule object to add. + * @param CouponOrder $couponOrder The couponOrder object to add. */ - protected function doAddCouponRule($couponRule) + protected function doAddCouponOrder($couponOrder) { - $this->collCouponRules[]= $couponRule; - $couponRule->setCoupon($this); + $this->collCouponOrders[]= $couponOrder; + $couponOrder->setCoupon($this); } /** - * @param CouponRule $couponRule The couponRule object to remove. + * @param CouponOrder $couponOrder The couponOrder object to remove. * @return ChildCoupon The current object (for fluent API support) */ - public function removeCouponRule($couponRule) + public function removeCouponOrder($couponOrder) { - if ($this->getCouponRules()->contains($couponRule)) { - $this->collCouponRules->remove($this->collCouponRules->search($couponRule)); - if (null === $this->couponRulesScheduledForDeletion) { - $this->couponRulesScheduledForDeletion = clone $this->collCouponRules; - $this->couponRulesScheduledForDeletion->clear(); + if ($this->getCouponOrders()->contains($couponOrder)) { + $this->collCouponOrders->remove($this->collCouponOrders->search($couponOrder)); + if (null === $this->couponOrdersScheduledForDeletion) { + $this->couponOrdersScheduledForDeletion = clone $this->collCouponOrders; + $this->couponOrdersScheduledForDeletion->clear(); } - $this->couponRulesScheduledForDeletion[]= clone $couponRule; - $couponRule->setCoupon(null); + $this->couponOrdersScheduledForDeletion[]= clone $couponOrder; + $couponOrder->setCoupon(null); + } + + return $this; + } + + + /** + * If this collection has already been initialized with + * an identical criteria, it returns the collection. + * Otherwise if this Coupon is new, it will return + * an empty collection; or if this Coupon has previously + * been saved, it will retrieve related CouponOrders from storage. + * + * This method is protected by default in order to keep the public + * api reasonable. You can provide public methods for those you + * actually need in Coupon. + * + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @return Collection|ChildCouponOrder[] List of ChildCouponOrder objects + */ + public function getCouponOrdersJoinOrder($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) + { + $query = ChildCouponOrderQuery::create(null, $criteria); + $query->joinWith('Order', $joinBehavior); + + return $this->getCouponOrders($query, $con); + } + + /** + * Clears out the collCouponI18ns 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 addCouponI18ns() + */ + public function clearCouponI18ns() + { + $this->collCouponI18ns = null; // important to set this to NULL since that means it is uninitialized + } + + /** + * Reset is the collCouponI18ns collection loaded partially. + */ + public function resetPartialCouponI18ns($v = true) + { + $this->collCouponI18nsPartial = $v; + } + + /** + * Initializes the collCouponI18ns collection. + * + * By default this just sets the collCouponI18ns collection to an empty array (like clearcollCouponI18ns()); + * 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 initCouponI18ns($overrideExisting = true) + { + if (null !== $this->collCouponI18ns && !$overrideExisting) { + return; + } + $this->collCouponI18ns = new ObjectCollection(); + $this->collCouponI18ns->setModel('\Thelia\Model\CouponI18n'); + } + + /** + * Gets an array of ChildCouponI18n 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 ChildCoupon 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|ChildCouponI18n[] List of ChildCouponI18n objects + * @throws PropelException + */ + public function getCouponI18ns($criteria = null, ConnectionInterface $con = null) + { + $partial = $this->collCouponI18nsPartial && !$this->isNew(); + if (null === $this->collCouponI18ns || null !== $criteria || $partial) { + if ($this->isNew() && null === $this->collCouponI18ns) { + // return empty collection + $this->initCouponI18ns(); + } else { + $collCouponI18ns = ChildCouponI18nQuery::create(null, $criteria) + ->filterByCoupon($this) + ->find($con); + + if (null !== $criteria) { + if (false !== $this->collCouponI18nsPartial && count($collCouponI18ns)) { + $this->initCouponI18ns(false); + + foreach ($collCouponI18ns as $obj) { + if (false == $this->collCouponI18ns->contains($obj)) { + $this->collCouponI18ns->append($obj); + } + } + + $this->collCouponI18nsPartial = true; + } + + $collCouponI18ns->getInternalIterator()->rewind(); + + return $collCouponI18ns; + } + + if ($partial && $this->collCouponI18ns) { + foreach ($this->collCouponI18ns as $obj) { + if ($obj->isNew()) { + $collCouponI18ns[] = $obj; + } + } + } + + $this->collCouponI18ns = $collCouponI18ns; + $this->collCouponI18nsPartial = false; + } + } + + return $this->collCouponI18ns; + } + + /** + * Sets a collection of CouponI18n 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 $couponI18ns A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildCoupon The current object (for fluent API support) + */ + public function setCouponI18ns(Collection $couponI18ns, ConnectionInterface $con = null) + { + $couponI18nsToDelete = $this->getCouponI18ns(new Criteria(), $con)->diff($couponI18ns); + + + //since at least one column in the foreign key is at the same time a PK + //we can not just set a PK to NULL in the lines below. We have to store + //a backup of all values, so we are able to manipulate these items based on the onDelete value later. + $this->couponI18nsScheduledForDeletion = clone $couponI18nsToDelete; + + foreach ($couponI18nsToDelete as $couponI18nRemoved) { + $couponI18nRemoved->setCoupon(null); + } + + $this->collCouponI18ns = null; + foreach ($couponI18ns as $couponI18n) { + $this->addCouponI18n($couponI18n); + } + + $this->collCouponI18ns = $couponI18ns; + $this->collCouponI18nsPartial = false; + + return $this; + } + + /** + * Returns the number of related CouponI18n objects. + * + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related CouponI18n objects. + * @throws PropelException + */ + public function countCouponI18ns(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) + { + $partial = $this->collCouponI18nsPartial && !$this->isNew(); + if (null === $this->collCouponI18ns || null !== $criteria || $partial) { + if ($this->isNew() && null === $this->collCouponI18ns) { + return 0; + } + + if ($partial && !$criteria) { + return count($this->getCouponI18ns()); + } + + $query = ChildCouponI18nQuery::create(null, $criteria); + if ($distinct) { + $query->distinct(); + } + + return $query + ->filterByCoupon($this) + ->count($con); + } + + return count($this->collCouponI18ns); + } + + /** + * Method called to associate a ChildCouponI18n object to this object + * through the ChildCouponI18n foreign key attribute. + * + * @param ChildCouponI18n $l ChildCouponI18n + * @return \Thelia\Model\Coupon The current object (for fluent API support) + */ + public function addCouponI18n(ChildCouponI18n $l) + { + if ($l && $locale = $l->getLocale()) { + $this->setLocale($locale); + $this->currentTranslations[$locale] = $l; + } + if ($this->collCouponI18ns === null) { + $this->initCouponI18ns(); + $this->collCouponI18nsPartial = true; + } + + if (!in_array($l, $this->collCouponI18ns->getArrayCopy(), true)) { // only add it if the **same** object is not already associated + $this->doAddCouponI18n($l); + } + + return $this; + } + + /** + * @param CouponI18n $couponI18n The couponI18n object to add. + */ + protected function doAddCouponI18n($couponI18n) + { + $this->collCouponI18ns[]= $couponI18n; + $couponI18n->setCoupon($this); + } + + /** + * @param CouponI18n $couponI18n The couponI18n object to remove. + * @return ChildCoupon The current object (for fluent API support) + */ + public function removeCouponI18n($couponI18n) + { + if ($this->getCouponI18ns()->contains($couponI18n)) { + $this->collCouponI18ns->remove($this->collCouponI18ns->search($couponI18n)); + if (null === $this->couponI18nsScheduledForDeletion) { + $this->couponI18nsScheduledForDeletion = clone $this->collCouponI18ns; + $this->couponI18nsScheduledForDeletion->clear(); + } + $this->couponI18nsScheduledForDeletion[]= clone $couponI18n; + $couponI18n->setCoupon(null); + } + + return $this; + } + + /** + * Clears out the collCouponVersions 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 addCouponVersions() + */ + public function clearCouponVersions() + { + $this->collCouponVersions = null; // important to set this to NULL since that means it is uninitialized + } + + /** + * Reset is the collCouponVersions collection loaded partially. + */ + public function resetPartialCouponVersions($v = true) + { + $this->collCouponVersionsPartial = $v; + } + + /** + * Initializes the collCouponVersions collection. + * + * By default this just sets the collCouponVersions collection to an empty array (like clearcollCouponVersions()); + * 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 initCouponVersions($overrideExisting = true) + { + if (null !== $this->collCouponVersions && !$overrideExisting) { + return; + } + $this->collCouponVersions = new ObjectCollection(); + $this->collCouponVersions->setModel('\Thelia\Model\CouponVersion'); + } + + /** + * Gets an array of ChildCouponVersion 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 ChildCoupon 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|ChildCouponVersion[] List of ChildCouponVersion objects + * @throws PropelException + */ + public function getCouponVersions($criteria = null, ConnectionInterface $con = null) + { + $partial = $this->collCouponVersionsPartial && !$this->isNew(); + if (null === $this->collCouponVersions || null !== $criteria || $partial) { + if ($this->isNew() && null === $this->collCouponVersions) { + // return empty collection + $this->initCouponVersions(); + } else { + $collCouponVersions = ChildCouponVersionQuery::create(null, $criteria) + ->filterByCoupon($this) + ->find($con); + + if (null !== $criteria) { + if (false !== $this->collCouponVersionsPartial && count($collCouponVersions)) { + $this->initCouponVersions(false); + + foreach ($collCouponVersions as $obj) { + if (false == $this->collCouponVersions->contains($obj)) { + $this->collCouponVersions->append($obj); + } + } + + $this->collCouponVersionsPartial = true; + } + + $collCouponVersions->getInternalIterator()->rewind(); + + return $collCouponVersions; + } + + if ($partial && $this->collCouponVersions) { + foreach ($this->collCouponVersions as $obj) { + if ($obj->isNew()) { + $collCouponVersions[] = $obj; + } + } + } + + $this->collCouponVersions = $collCouponVersions; + $this->collCouponVersionsPartial = false; + } + } + + return $this->collCouponVersions; + } + + /** + * Sets a collection of CouponVersion 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 $couponVersions A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildCoupon The current object (for fluent API support) + */ + public function setCouponVersions(Collection $couponVersions, ConnectionInterface $con = null) + { + $couponVersionsToDelete = $this->getCouponVersions(new Criteria(), $con)->diff($couponVersions); + + + //since at least one column in the foreign key is at the same time a PK + //we can not just set a PK to NULL in the lines below. We have to store + //a backup of all values, so we are able to manipulate these items based on the onDelete value later. + $this->couponVersionsScheduledForDeletion = clone $couponVersionsToDelete; + + foreach ($couponVersionsToDelete as $couponVersionRemoved) { + $couponVersionRemoved->setCoupon(null); + } + + $this->collCouponVersions = null; + foreach ($couponVersions as $couponVersion) { + $this->addCouponVersion($couponVersion); + } + + $this->collCouponVersions = $couponVersions; + $this->collCouponVersionsPartial = false; + + return $this; + } + + /** + * Returns the number of related CouponVersion objects. + * + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related CouponVersion objects. + * @throws PropelException + */ + public function countCouponVersions(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) + { + $partial = $this->collCouponVersionsPartial && !$this->isNew(); + if (null === $this->collCouponVersions || null !== $criteria || $partial) { + if ($this->isNew() && null === $this->collCouponVersions) { + return 0; + } + + if ($partial && !$criteria) { + return count($this->getCouponVersions()); + } + + $query = ChildCouponVersionQuery::create(null, $criteria); + if ($distinct) { + $query->distinct(); + } + + return $query + ->filterByCoupon($this) + ->count($con); + } + + return count($this->collCouponVersions); + } + + /** + * Method called to associate a ChildCouponVersion object to this object + * through the ChildCouponVersion foreign key attribute. + * + * @param ChildCouponVersion $l ChildCouponVersion + * @return \Thelia\Model\Coupon The current object (for fluent API support) + */ + public function addCouponVersion(ChildCouponVersion $l) + { + if ($this->collCouponVersions === null) { + $this->initCouponVersions(); + $this->collCouponVersionsPartial = true; + } + + if (!in_array($l, $this->collCouponVersions->getArrayCopy(), true)) { // only add it if the **same** object is not already associated + $this->doAddCouponVersion($l); + } + + return $this; + } + + /** + * @param CouponVersion $couponVersion The couponVersion object to add. + */ + protected function doAddCouponVersion($couponVersion) + { + $this->collCouponVersions[]= $couponVersion; + $couponVersion->setCoupon($this); + } + + /** + * @param CouponVersion $couponVersion The couponVersion object to remove. + * @return ChildCoupon The current object (for fluent API support) + */ + public function removeCouponVersion($couponVersion) + { + if ($this->getCouponVersions()->contains($couponVersion)) { + $this->collCouponVersions->remove($this->collCouponVersions->search($couponVersion)); + if (null === $this->couponVersionsScheduledForDeletion) { + $this->couponVersionsScheduledForDeletion = clone $this->collCouponVersions; + $this->couponVersionsScheduledForDeletion->clear(); + } + $this->couponVersionsScheduledForDeletion[]= clone $couponVersion; + $couponVersion->setCoupon(null); } return $this; @@ -1759,16 +2586,21 @@ abstract class Coupon implements ActiveRecordInterface { $this->id = null; $this->code = null; - $this->action = null; + $this->type = null; + $this->title = null; + $this->short_description = null; + $this->description = null; $this->value = null; - $this->used = null; - $this->available_since = null; - $this->date_limit = null; - $this->activate = null; + $this->is_used = null; + $this->is_enabled = null; + $this->expiration_date = null; + $this->serialized_rules = null; $this->created_at = null; $this->updated_at = null; + $this->version = null; $this->alreadyInSave = false; $this->clearAllReferences(); + $this->applyDefaultValues(); $this->resetModified(); $this->setNew(true); $this->setDeleted(false); @@ -1786,17 +2618,39 @@ abstract class Coupon implements ActiveRecordInterface public function clearAllReferences($deep = false) { if ($deep) { - if ($this->collCouponRules) { - foreach ($this->collCouponRules as $o) { + if ($this->collCouponOrders) { + foreach ($this->collCouponOrders as $o) { + $o->clearAllReferences($deep); + } + } + if ($this->collCouponI18ns) { + foreach ($this->collCouponI18ns as $o) { + $o->clearAllReferences($deep); + } + } + if ($this->collCouponVersions) { + foreach ($this->collCouponVersions as $o) { $o->clearAllReferences($deep); } } } // if ($deep) - if ($this->collCouponRules instanceof Collection) { - $this->collCouponRules->clearIterator(); + // i18n behavior + $this->currentLocale = 'en_EN'; + $this->currentTranslations = null; + + if ($this->collCouponOrders instanceof Collection) { + $this->collCouponOrders->clearIterator(); } - $this->collCouponRules = null; + $this->collCouponOrders = null; + if ($this->collCouponI18ns instanceof Collection) { + $this->collCouponI18ns->clearIterator(); + } + $this->collCouponI18ns = null; + if ($this->collCouponVersions instanceof Collection) { + $this->collCouponVersions->clearIterator(); + } + $this->collCouponVersions = null; } /** @@ -1823,6 +2677,397 @@ abstract class Coupon implements ActiveRecordInterface return $this; } + // i18n behavior + + /** + * Sets the locale for translations + * + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * + * @return ChildCoupon The current object (for fluent API support) + */ + public function setLocale($locale = 'en_EN') + { + $this->currentLocale = $locale; + + return $this; + } + + /** + * Gets the locale for translations + * + * @return string $locale Locale to use for the translation, e.g. 'fr_FR' + */ + public function getLocale() + { + return $this->currentLocale; + } + + /** + * Returns the current translation for a given locale + * + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param ConnectionInterface $con an optional connection object + * + * @return ChildCouponI18n */ + public function getTranslation($locale = 'en_EN', ConnectionInterface $con = null) + { + if (!isset($this->currentTranslations[$locale])) { + if (null !== $this->collCouponI18ns) { + foreach ($this->collCouponI18ns as $translation) { + if ($translation->getLocale() == $locale) { + $this->currentTranslations[$locale] = $translation; + + return $translation; + } + } + } + if ($this->isNew()) { + $translation = new ChildCouponI18n(); + $translation->setLocale($locale); + } else { + $translation = ChildCouponI18nQuery::create() + ->filterByPrimaryKey(array($this->getPrimaryKey(), $locale)) + ->findOneOrCreate($con); + $this->currentTranslations[$locale] = $translation; + } + $this->addCouponI18n($translation); + } + + return $this->currentTranslations[$locale]; + } + + /** + * Remove the translation for a given locale + * + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param ConnectionInterface $con an optional connection object + * + * @return ChildCoupon The current object (for fluent API support) + */ + public function removeTranslation($locale = 'en_EN', ConnectionInterface $con = null) + { + if (!$this->isNew()) { + ChildCouponI18nQuery::create() + ->filterByPrimaryKey(array($this->getPrimaryKey(), $locale)) + ->delete($con); + } + if (isset($this->currentTranslations[$locale])) { + unset($this->currentTranslations[$locale]); + } + foreach ($this->collCouponI18ns as $key => $translation) { + if ($translation->getLocale() == $locale) { + unset($this->collCouponI18ns[$key]); + break; + } + } + + return $this; + } + + /** + * Returns the current translation + * + * @param ConnectionInterface $con an optional connection object + * + * @return ChildCouponI18n */ + public function getCurrentTranslation(ConnectionInterface $con = null) + { + return $this->getTranslation($this->getLocale(), $con); + } + + // versionable behavior + + /** + * Enforce a new Version of this object upon next save. + * + * @return \Thelia\Model\Coupon + */ + public function enforceVersioning() + { + $this->enforceVersion = true; + + return $this; + } + + /** + * Checks whether the current state must be recorded as a version + * + * @return boolean + */ + public function isVersioningNecessary($con = null) + { + if ($this->alreadyInSave) { + return false; + } + + if ($this->enforceVersion) { + return true; + } + + if (ChildCouponQuery::isVersioningEnabled() && ($this->isNew() || $this->isModified()) || $this->isDeleted()) { + return true; + } + + return false; + } + + /** + * Creates a version of the current object and saves it. + * + * @param ConnectionInterface $con the connection to use + * + * @return ChildCouponVersion A version object + */ + public function addVersion($con = null) + { + $this->enforceVersion = false; + + $version = new ChildCouponVersion(); + $version->setId($this->getId()); + $version->setCode($this->getCode()); + $version->setType($this->getType()); + $version->setTitle($this->getTitle()); + $version->setShortDescription($this->getShortDescription()); + $version->setDescription($this->getDescription()); + $version->setValue($this->getValue()); + $version->setIsUsed($this->getIsUsed()); + $version->setIsEnabled($this->getIsEnabled()); + $version->setExpirationDate($this->getExpirationDate()); + $version->setSerializedRules($this->getSerializedRules()); + $version->setCreatedAt($this->getCreatedAt()); + $version->setUpdatedAt($this->getUpdatedAt()); + $version->setVersion($this->getVersion()); + $version->setCoupon($this); + $version->save($con); + + return $version; + } + + /** + * Sets the properties of the current object to the value they had at a specific version + * + * @param integer $versionNumber The version number to read + * @param ConnectionInterface $con The connection to use + * + * @return ChildCoupon The current object (for fluent API support) + */ + public function toVersion($versionNumber, $con = null) + { + $version = $this->getOneVersion($versionNumber, $con); + if (!$version) { + throw new PropelException(sprintf('No ChildCoupon object found with version %d', $version)); + } + $this->populateFromVersion($version, $con); + + return $this; + } + + /** + * Sets the properties of the current object to the value they had at a specific version + * + * @param ChildCouponVersion $version The version object to use + * @param ConnectionInterface $con the connection to use + * @param array $loadedObjects objects that been loaded in a chain of populateFromVersion calls on referrer or fk objects. + * + * @return ChildCoupon The current object (for fluent API support) + */ + public function populateFromVersion($version, $con = null, &$loadedObjects = array()) + { + $loadedObjects['ChildCoupon'][$version->getId()][$version->getVersion()] = $this; + $this->setId($version->getId()); + $this->setCode($version->getCode()); + $this->setType($version->getType()); + $this->setTitle($version->getTitle()); + $this->setShortDescription($version->getShortDescription()); + $this->setDescription($version->getDescription()); + $this->setValue($version->getValue()); + $this->setIsUsed($version->getIsUsed()); + $this->setIsEnabled($version->getIsEnabled()); + $this->setExpirationDate($version->getExpirationDate()); + $this->setSerializedRules($version->getSerializedRules()); + $this->setCreatedAt($version->getCreatedAt()); + $this->setUpdatedAt($version->getUpdatedAt()); + $this->setVersion($version->getVersion()); + + return $this; + } + + /** + * Gets the latest persisted version number for the current object + * + * @param ConnectionInterface $con the connection to use + * + * @return integer + */ + public function getLastVersionNumber($con = null) + { + $v = ChildCouponVersionQuery::create() + ->filterByCoupon($this) + ->orderByVersion('desc') + ->findOne($con); + if (!$v) { + return 0; + } + + return $v->getVersion(); + } + + /** + * Checks whether the current object is the latest one + * + * @param ConnectionInterface $con the connection to use + * + * @return Boolean + */ + public function isLastVersion($con = null) + { + return $this->getLastVersionNumber($con) == $this->getVersion(); + } + + /** + * Retrieves a version object for this entity and a version number + * + * @param integer $versionNumber The version number to read + * @param ConnectionInterface $con the connection to use + * + * @return ChildCouponVersion A version object + */ + public function getOneVersion($versionNumber, $con = null) + { + return ChildCouponVersionQuery::create() + ->filterByCoupon($this) + ->filterByVersion($versionNumber) + ->findOne($con); + } + + /** + * Gets all the versions of this object, in incremental order + * + * @param ConnectionInterface $con the connection to use + * + * @return ObjectCollection A list of ChildCouponVersion objects + */ + public function getAllVersions($con = null) + { + $criteria = new Criteria(); + $criteria->addAscendingOrderByColumn(CouponVersionTableMap::VERSION); + + return $this->getCouponVersions($criteria, $con); + } + + /** + * Compares the current object with another of its version. + * + * print_r($book->compareVersion(1)); + * => array( + * '1' => array('Title' => 'Book title at version 1'), + * '2' => array('Title' => 'Book title at version 2') + * ); + * + * + * @param integer $versionNumber + * @param string $keys Main key used for the result diff (versions|columns) + * @param ConnectionInterface $con the connection to use + * @param array $ignoredColumns The columns to exclude from the diff. + * + * @return array A list of differences + */ + public function compareVersion($versionNumber, $keys = 'columns', $con = null, $ignoredColumns = array()) + { + $fromVersion = $this->toArray(); + $toVersion = $this->getOneVersion($versionNumber, $con)->toArray(); + + return $this->computeDiff($fromVersion, $toVersion, $keys, $ignoredColumns); + } + + /** + * Compares two versions of the current object. + * + * print_r($book->compareVersions(1, 2)); + * => array( + * '1' => array('Title' => 'Book title at version 1'), + * '2' => array('Title' => 'Book title at version 2') + * ); + * + * + * @param integer $fromVersionNumber + * @param integer $toVersionNumber + * @param string $keys Main key used for the result diff (versions|columns) + * @param ConnectionInterface $con the connection to use + * @param array $ignoredColumns The columns to exclude from the diff. + * + * @return array A list of differences + */ + public function compareVersions($fromVersionNumber, $toVersionNumber, $keys = 'columns', $con = null, $ignoredColumns = array()) + { + $fromVersion = $this->getOneVersion($fromVersionNumber, $con)->toArray(); + $toVersion = $this->getOneVersion($toVersionNumber, $con)->toArray(); + + return $this->computeDiff($fromVersion, $toVersion, $keys, $ignoredColumns); + } + + /** + * Computes the diff between two versions. + * + * print_r($book->computeDiff(1, 2)); + * => array( + * '1' => array('Title' => 'Book title at version 1'), + * '2' => array('Title' => 'Book title at version 2') + * ); + * + * + * @param array $fromVersion An array representing the original version. + * @param array $toVersion An array representing the destination version. + * @param string $keys Main key used for the result diff (versions|columns). + * @param array $ignoredColumns The columns to exclude from the diff. + * + * @return array A list of differences + */ + protected function computeDiff($fromVersion, $toVersion, $keys = 'columns', $ignoredColumns = array()) + { + $fromVersionNumber = $fromVersion['Version']; + $toVersionNumber = $toVersion['Version']; + $ignoredColumns = array_merge(array( + 'Version', + ), $ignoredColumns); + $diff = array(); + foreach ($fromVersion as $key => $value) { + if (in_array($key, $ignoredColumns)) { + continue; + } + if ($toVersion[$key] != $value) { + switch ($keys) { + case 'versions': + $diff[$fromVersionNumber][$key] = $value; + $diff[$toVersionNumber][$key] = $toVersion[$key]; + break; + default: + $diff[$key] = array( + $fromVersionNumber => $value, + $toVersionNumber => $toVersion[$key], + ); + break; + } + } + } + + return $diff; + } + /** + * retrieve the last $number versions. + * + * @param Integer $number the number of record to return. + * @return PropelCollection|array \Thelia\Model\CouponVersion[] List of \Thelia\Model\CouponVersion objects + */ + public function getLastVersions($number = 10, $criteria = null, $con = null) + { + $criteria = ChildCouponVersionQuery::create(null, $criteria); + $criteria->addDescendingOrderByColumn(CouponVersionTableMap::VERSION); + $criteria->limit($number); + + return $this->getCouponVersions($criteria, $con); + } /** * Code to be run before persisting the object * @param ConnectionInterface $con diff --git a/core/lib/Thelia/Model/Base/CouponOrder.php b/core/lib/Thelia/Model/Base/CouponOrder.php index 32ae68fde..7d3c413b6 100644 --- a/core/lib/Thelia/Model/Base/CouponOrder.php +++ b/core/lib/Thelia/Model/Base/CouponOrder.php @@ -16,8 +16,10 @@ use Propel\Runtime\Exception\PropelException; use Propel\Runtime\Map\TableMap; use Propel\Runtime\Parser\AbstractParser; use Propel\Runtime\Util\PropelDateTime; +use Thelia\Model\Coupon as ChildCoupon; use Thelia\Model\CouponOrder as ChildCouponOrder; use Thelia\Model\CouponOrderQuery as ChildCouponOrderQuery; +use Thelia\Model\CouponQuery as ChildCouponQuery; use Thelia\Model\Order as ChildOrder; use Thelia\Model\OrderQuery as ChildOrderQuery; use Thelia\Model\Map\CouponOrderTableMap; @@ -97,6 +99,11 @@ abstract class CouponOrder implements ActiveRecordInterface */ protected $aOrder; + /** + * @var Coupon + */ + protected $aCoupon; + /** * Flag to prevent endless save loop, if this object is referenced * by another object which falls in this transaction. @@ -506,6 +513,10 @@ abstract class CouponOrder implements ActiveRecordInterface $this->modifiedColumns[] = CouponOrderTableMap::CODE; } + if ($this->aCoupon !== null && $this->aCoupon->getCode() !== $v) { + $this->aCoupon = null; + } + return $this; } // setCode() @@ -666,6 +677,9 @@ abstract class CouponOrder implements ActiveRecordInterface if ($this->aOrder !== null && $this->order_id !== $this->aOrder->getId()) { $this->aOrder = null; } + if ($this->aCoupon !== null && $this->code !== $this->aCoupon->getCode()) { + $this->aCoupon = null; + } } // ensureConsistency /** @@ -706,6 +720,7 @@ abstract class CouponOrder implements ActiveRecordInterface if ($deep) { // also de-associate any related objects? $this->aOrder = null; + $this->aCoupon = null; } // if (deep) } @@ -840,6 +855,13 @@ abstract class CouponOrder implements ActiveRecordInterface $this->setOrder($this->aOrder); } + if ($this->aCoupon !== null) { + if ($this->aCoupon->isModified() || $this->aCoupon->isNew()) { + $affectedRows += $this->aCoupon->save($con); + } + $this->setCoupon($this->aCoupon); + } + if ($this->isNew() || $this->isModified()) { // persist changes if ($this->isNew()) { @@ -1050,6 +1072,9 @@ abstract class CouponOrder implements ActiveRecordInterface if (null !== $this->aOrder) { $result['Order'] = $this->aOrder->toArray($keyType, $includeLazyLoadColumns, $alreadyDumpedObjects, true); } + if (null !== $this->aCoupon) { + $result['Coupon'] = $this->aCoupon->toArray($keyType, $includeLazyLoadColumns, $alreadyDumpedObjects, true); + } } return $result; @@ -1296,6 +1321,59 @@ abstract class CouponOrder implements ActiveRecordInterface return $this->aOrder; } + /** + * Declares an association between this object and a ChildCoupon object. + * + * @param ChildCoupon $v + * @return \Thelia\Model\CouponOrder The current object (for fluent API support) + * @throws PropelException + */ + public function setCoupon(ChildCoupon $v = null) + { + if ($v === null) { + $this->setCode(NULL); + } else { + $this->setCode($v->getCode()); + } + + $this->aCoupon = $v; + + // Add binding for other direction of this n:n relationship. + // If this object has already been added to the ChildCoupon object, it will not be re-added. + if ($v !== null) { + $v->addCouponOrder($this); + } + + + return $this; + } + + + /** + * Get the associated ChildCoupon object + * + * @param ConnectionInterface $con Optional Connection object. + * @return ChildCoupon The associated ChildCoupon object. + * @throws PropelException + */ + public function getCoupon(ConnectionInterface $con = null) + { + if ($this->aCoupon === null && (($this->code !== "" && $this->code !== null))) { + $this->aCoupon = ChildCouponQuery::create() + ->filterByCouponOrder($this) // here + ->findOne($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->aCoupon->addCouponOrders($this); + */ + } + + return $this->aCoupon; + } + /** * Clears the current object and sets all attributes to their default values */ @@ -1329,6 +1407,7 @@ abstract class CouponOrder implements ActiveRecordInterface } // if ($deep) $this->aOrder = null; + $this->aCoupon = null; } /** diff --git a/core/lib/Thelia/Model/Base/CouponOrderQuery.php b/core/lib/Thelia/Model/Base/CouponOrderQuery.php index 6897f56dd..e3a95ea1a 100644 --- a/core/lib/Thelia/Model/Base/CouponOrderQuery.php +++ b/core/lib/Thelia/Model/Base/CouponOrderQuery.php @@ -43,6 +43,10 @@ use Thelia\Model\Map\CouponOrderTableMap; * @method ChildCouponOrderQuery rightJoinOrder($relationAlias = null) Adds a RIGHT JOIN clause to the query using the Order relation * @method ChildCouponOrderQuery innerJoinOrder($relationAlias = null) Adds a INNER JOIN clause to the query using the Order relation * + * @method ChildCouponOrderQuery leftJoinCoupon($relationAlias = null) Adds a LEFT JOIN clause to the query using the Coupon relation + * @method ChildCouponOrderQuery rightJoinCoupon($relationAlias = null) Adds a RIGHT JOIN clause to the query using the Coupon relation + * @method ChildCouponOrderQuery innerJoinCoupon($relationAlias = null) Adds a INNER JOIN clause to the query using the Coupon relation + * * @method ChildCouponOrder findOne(ConnectionInterface $con = null) Return the first ChildCouponOrder matching the query * @method ChildCouponOrder findOneOrCreate(ConnectionInterface $con = null) Return the first ChildCouponOrder matching the query, or a new ChildCouponOrder object populated from the query conditions when no match is found * @@ -551,6 +555,81 @@ abstract class CouponOrderQuery extends ModelCriteria ->useQuery($relationAlias ? $relationAlias : 'Order', '\Thelia\Model\OrderQuery'); } + /** + * Filter the query by a related \Thelia\Model\Coupon object + * + * @param \Thelia\Model\Coupon|ObjectCollection $coupon The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return ChildCouponOrderQuery The current query, for fluid interface + */ + public function filterByCoupon($coupon, $comparison = null) + { + if ($coupon instanceof \Thelia\Model\Coupon) { + return $this + ->addUsingAlias(CouponOrderTableMap::CODE, $coupon->getCode(), $comparison); + } elseif ($coupon instanceof ObjectCollection) { + if (null === $comparison) { + $comparison = Criteria::IN; + } + + return $this + ->addUsingAlias(CouponOrderTableMap::CODE, $coupon->toKeyValue('PrimaryKey', 'Code'), $comparison); + } else { + throw new PropelException('filterByCoupon() only accepts arguments of type \Thelia\Model\Coupon or Collection'); + } + } + + /** + * Adds a JOIN clause to the query using the Coupon relation + * + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * + * @return ChildCouponOrderQuery The current query, for fluid interface + */ + public function joinCoupon($relationAlias = null, $joinType = Criteria::INNER_JOIN) + { + $tableMap = $this->getTableMap(); + $relationMap = $tableMap->getRelation('Coupon'); + + // 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, 'Coupon'); + } + + return $this; + } + + /** + * Use the Coupon relation Coupon 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\CouponQuery A secondary query class using the current class as primary query + */ + public function useCouponQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) + { + return $this + ->joinCoupon($relationAlias, $joinType) + ->useQuery($relationAlias ? $relationAlias : 'Coupon', '\Thelia\Model\CouponQuery'); + } + /** * Exclude object from result * diff --git a/core/lib/Thelia/Model/Base/CouponQuery.php b/core/lib/Thelia/Model/Base/CouponQuery.php index 23fdd2e4c..fa5700786 100644 --- a/core/lib/Thelia/Model/Base/CouponQuery.php +++ b/core/lib/Thelia/Model/Base/CouponQuery.php @@ -13,6 +13,7 @@ use Propel\Runtime\Collection\ObjectCollection; use Propel\Runtime\Connection\ConnectionInterface; use Propel\Runtime\Exception\PropelException; use Thelia\Model\Coupon as ChildCoupon; +use Thelia\Model\CouponI18nQuery as ChildCouponI18nQuery; use Thelia\Model\CouponQuery as ChildCouponQuery; use Thelia\Model\Map\CouponTableMap; @@ -23,63 +24,94 @@ use Thelia\Model\Map\CouponTableMap; * * @method ChildCouponQuery orderById($order = Criteria::ASC) Order by the id column * @method ChildCouponQuery orderByCode($order = Criteria::ASC) Order by the code column - * @method ChildCouponQuery orderByAction($order = Criteria::ASC) Order by the action column + * @method ChildCouponQuery orderByType($order = Criteria::ASC) Order by the type column + * @method ChildCouponQuery orderByTitle($order = Criteria::ASC) Order by the title column + * @method ChildCouponQuery orderByShortDescription($order = Criteria::ASC) Order by the short_description column + * @method ChildCouponQuery orderByDescription($order = Criteria::ASC) Order by the description column * @method ChildCouponQuery orderByValue($order = Criteria::ASC) Order by the value column - * @method ChildCouponQuery orderByUsed($order = Criteria::ASC) Order by the used column - * @method ChildCouponQuery orderByAvailableSince($order = Criteria::ASC) Order by the available_since column - * @method ChildCouponQuery orderByDateLimit($order = Criteria::ASC) Order by the date_limit column - * @method ChildCouponQuery orderByActivate($order = Criteria::ASC) Order by the activate column + * @method ChildCouponQuery orderByIsUsed($order = Criteria::ASC) Order by the is_used column + * @method ChildCouponQuery orderByIsEnabled($order = Criteria::ASC) Order by the is_enabled column + * @method ChildCouponQuery orderByExpirationDate($order = Criteria::ASC) Order by the expiration_date column + * @method ChildCouponQuery orderBySerializedRules($order = Criteria::ASC) Order by the serialized_rules column * @method ChildCouponQuery orderByCreatedAt($order = Criteria::ASC) Order by the created_at column * @method ChildCouponQuery orderByUpdatedAt($order = Criteria::ASC) Order by the updated_at column + * @method ChildCouponQuery orderByVersion($order = Criteria::ASC) Order by the version column * * @method ChildCouponQuery groupById() Group by the id column * @method ChildCouponQuery groupByCode() Group by the code column - * @method ChildCouponQuery groupByAction() Group by the action column + * @method ChildCouponQuery groupByType() Group by the type column + * @method ChildCouponQuery groupByTitle() Group by the title column + * @method ChildCouponQuery groupByShortDescription() Group by the short_description column + * @method ChildCouponQuery groupByDescription() Group by the description column * @method ChildCouponQuery groupByValue() Group by the value column - * @method ChildCouponQuery groupByUsed() Group by the used column - * @method ChildCouponQuery groupByAvailableSince() Group by the available_since column - * @method ChildCouponQuery groupByDateLimit() Group by the date_limit column - * @method ChildCouponQuery groupByActivate() Group by the activate column + * @method ChildCouponQuery groupByIsUsed() Group by the is_used column + * @method ChildCouponQuery groupByIsEnabled() Group by the is_enabled column + * @method ChildCouponQuery groupByExpirationDate() Group by the expiration_date column + * @method ChildCouponQuery groupBySerializedRules() Group by the serialized_rules column * @method ChildCouponQuery groupByCreatedAt() Group by the created_at column * @method ChildCouponQuery groupByUpdatedAt() Group by the updated_at column + * @method ChildCouponQuery groupByVersion() Group by the version column * * @method ChildCouponQuery leftJoin($relation) Adds a LEFT JOIN clause to the query * @method ChildCouponQuery rightJoin($relation) Adds a RIGHT JOIN clause to the query * @method ChildCouponQuery innerJoin($relation) Adds a INNER JOIN clause to the query * - * @method ChildCouponQuery leftJoinCouponRule($relationAlias = null) Adds a LEFT JOIN clause to the query using the CouponRule relation - * @method ChildCouponQuery rightJoinCouponRule($relationAlias = null) Adds a RIGHT JOIN clause to the query using the CouponRule relation - * @method ChildCouponQuery innerJoinCouponRule($relationAlias = null) Adds a INNER JOIN clause to the query using the CouponRule relation + * @method ChildCouponQuery leftJoinCouponOrder($relationAlias = null) Adds a LEFT JOIN clause to the query using the CouponOrder relation + * @method ChildCouponQuery rightJoinCouponOrder($relationAlias = null) Adds a RIGHT JOIN clause to the query using the CouponOrder relation + * @method ChildCouponQuery innerJoinCouponOrder($relationAlias = null) Adds a INNER JOIN clause to the query using the CouponOrder relation + * + * @method ChildCouponQuery leftJoinCouponI18n($relationAlias = null) Adds a LEFT JOIN clause to the query using the CouponI18n relation + * @method ChildCouponQuery rightJoinCouponI18n($relationAlias = null) Adds a RIGHT JOIN clause to the query using the CouponI18n relation + * @method ChildCouponQuery innerJoinCouponI18n($relationAlias = null) Adds a INNER JOIN clause to the query using the CouponI18n relation + * + * @method ChildCouponQuery leftJoinCouponVersion($relationAlias = null) Adds a LEFT JOIN clause to the query using the CouponVersion relation + * @method ChildCouponQuery rightJoinCouponVersion($relationAlias = null) Adds a RIGHT JOIN clause to the query using the CouponVersion relation + * @method ChildCouponQuery innerJoinCouponVersion($relationAlias = null) Adds a INNER JOIN clause to the query using the CouponVersion relation * * @method ChildCoupon findOne(ConnectionInterface $con = null) Return the first ChildCoupon matching the query * @method ChildCoupon findOneOrCreate(ConnectionInterface $con = null) Return the first ChildCoupon matching the query, or a new ChildCoupon object populated from the query conditions when no match is found * * @method ChildCoupon findOneById(int $id) Return the first ChildCoupon filtered by the id column * @method ChildCoupon findOneByCode(string $code) Return the first ChildCoupon filtered by the code column - * @method ChildCoupon findOneByAction(string $action) Return the first ChildCoupon filtered by the action column + * @method ChildCoupon findOneByType(string $type) Return the first ChildCoupon filtered by the type column + * @method ChildCoupon findOneByTitle(string $title) Return the first ChildCoupon filtered by the title column + * @method ChildCoupon findOneByShortDescription(string $short_description) Return the first ChildCoupon filtered by the short_description column + * @method ChildCoupon findOneByDescription(string $description) Return the first ChildCoupon filtered by the description column * @method ChildCoupon findOneByValue(double $value) Return the first ChildCoupon filtered by the value column - * @method ChildCoupon findOneByUsed(int $used) Return the first ChildCoupon filtered by the used column - * @method ChildCoupon findOneByAvailableSince(string $available_since) Return the first ChildCoupon filtered by the available_since column - * @method ChildCoupon findOneByDateLimit(string $date_limit) Return the first ChildCoupon filtered by the date_limit column - * @method ChildCoupon findOneByActivate(int $activate) Return the first ChildCoupon filtered by the activate column + * @method ChildCoupon findOneByIsUsed(int $is_used) Return the first ChildCoupon filtered by the is_used column + * @method ChildCoupon findOneByIsEnabled(int $is_enabled) Return the first ChildCoupon filtered by the is_enabled column + * @method ChildCoupon findOneByExpirationDate(string $expiration_date) Return the first ChildCoupon filtered by the expiration_date column + * @method ChildCoupon findOneBySerializedRules(string $serialized_rules) Return the first ChildCoupon filtered by the serialized_rules column * @method ChildCoupon findOneByCreatedAt(string $created_at) Return the first ChildCoupon filtered by the created_at column * @method ChildCoupon findOneByUpdatedAt(string $updated_at) Return the first ChildCoupon filtered by the updated_at column + * @method ChildCoupon findOneByVersion(int $version) Return the first ChildCoupon filtered by the version column * * @method array findById(int $id) Return ChildCoupon objects filtered by the id column * @method array findByCode(string $code) Return ChildCoupon objects filtered by the code column - * @method array findByAction(string $action) Return ChildCoupon objects filtered by the action column + * @method array findByType(string $type) Return ChildCoupon objects filtered by the type column + * @method array findByTitle(string $title) Return ChildCoupon objects filtered by the title column + * @method array findByShortDescription(string $short_description) Return ChildCoupon objects filtered by the short_description column + * @method array findByDescription(string $description) Return ChildCoupon objects filtered by the description column * @method array findByValue(double $value) Return ChildCoupon objects filtered by the value column - * @method array findByUsed(int $used) Return ChildCoupon objects filtered by the used column - * @method array findByAvailableSince(string $available_since) Return ChildCoupon objects filtered by the available_since column - * @method array findByDateLimit(string $date_limit) Return ChildCoupon objects filtered by the date_limit column - * @method array findByActivate(int $activate) Return ChildCoupon objects filtered by the activate column + * @method array findByIsUsed(int $is_used) Return ChildCoupon objects filtered by the is_used column + * @method array findByIsEnabled(int $is_enabled) Return ChildCoupon objects filtered by the is_enabled column + * @method array findByExpirationDate(string $expiration_date) Return ChildCoupon objects filtered by the expiration_date column + * @method array findBySerializedRules(string $serialized_rules) Return ChildCoupon objects filtered by the serialized_rules column * @method array findByCreatedAt(string $created_at) Return ChildCoupon objects filtered by the created_at column * @method array findByUpdatedAt(string $updated_at) Return ChildCoupon objects filtered by the updated_at column + * @method array findByVersion(int $version) Return ChildCoupon objects filtered by the version column * */ abstract class CouponQuery extends ModelCriteria { + // versionable behavior + + /** + * Whether the versioning is enabled + */ + static $isVersioningEnabled = true; + /** * Initializes internal state of \Thelia\Model\Base\CouponQuery object. * @@ -163,7 +195,7 @@ abstract class CouponQuery extends ModelCriteria */ protected function findPkSimple($key, $con) { - $sql = 'SELECT ID, CODE, ACTION, VALUE, USED, AVAILABLE_SINCE, DATE_LIMIT, ACTIVATE, CREATED_AT, UPDATED_AT FROM coupon WHERE ID = :p0'; + $sql = 'SELECT ID, CODE, TYPE, TITLE, SHORT_DESCRIPTION, DESCRIPTION, VALUE, IS_USED, IS_ENABLED, EXPIRATION_DATE, SERIALIZED_RULES, CREATED_AT, UPDATED_AT, VERSION FROM coupon WHERE ID = :p0'; try { $stmt = $con->prepare($sql); $stmt->bindValue(':p0', $key, PDO::PARAM_INT); @@ -323,32 +355,119 @@ abstract class CouponQuery extends ModelCriteria } /** - * Filter the query on the action column + * Filter the query on the type column * * Example usage: * - * $query->filterByAction('fooValue'); // WHERE action = 'fooValue' - * $query->filterByAction('%fooValue%'); // WHERE action LIKE '%fooValue%' + * $query->filterByType('fooValue'); // WHERE type = 'fooValue' + * $query->filterByType('%fooValue%'); // WHERE type LIKE '%fooValue%' * * - * @param string $action The value to use as filter. + * @param string $type 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 ChildCouponQuery The current query, for fluid interface */ - public function filterByAction($action = null, $comparison = null) + public function filterByType($type = null, $comparison = null) { if (null === $comparison) { - if (is_array($action)) { + if (is_array($type)) { $comparison = Criteria::IN; - } elseif (preg_match('/[\%\*]/', $action)) { - $action = str_replace('*', '%', $action); + } elseif (preg_match('/[\%\*]/', $type)) { + $type = str_replace('*', '%', $type); $comparison = Criteria::LIKE; } } - return $this->addUsingAlias(CouponTableMap::ACTION, $action, $comparison); + return $this->addUsingAlias(CouponTableMap::TYPE, $type, $comparison); + } + + /** + * Filter the query on the title column + * + * Example usage: + * + * $query->filterByTitle('fooValue'); // WHERE title = 'fooValue' + * $query->filterByTitle('%fooValue%'); // WHERE title LIKE '%fooValue%' + * + * + * @param string $title 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 ChildCouponQuery The current query, for fluid interface + */ + public function filterByTitle($title = null, $comparison = null) + { + if (null === $comparison) { + if (is_array($title)) { + $comparison = Criteria::IN; + } elseif (preg_match('/[\%\*]/', $title)) { + $title = str_replace('*', '%', $title); + $comparison = Criteria::LIKE; + } + } + + return $this->addUsingAlias(CouponTableMap::TITLE, $title, $comparison); + } + + /** + * Filter the query on the short_description column + * + * Example usage: + * + * $query->filterByShortDescription('fooValue'); // WHERE short_description = 'fooValue' + * $query->filterByShortDescription('%fooValue%'); // WHERE short_description LIKE '%fooValue%' + * + * + * @param string $shortDescription 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 ChildCouponQuery The current query, for fluid interface + */ + public function filterByShortDescription($shortDescription = null, $comparison = null) + { + if (null === $comparison) { + if (is_array($shortDescription)) { + $comparison = Criteria::IN; + } elseif (preg_match('/[\%\*]/', $shortDescription)) { + $shortDescription = str_replace('*', '%', $shortDescription); + $comparison = Criteria::LIKE; + } + } + + return $this->addUsingAlias(CouponTableMap::SHORT_DESCRIPTION, $shortDescription, $comparison); + } + + /** + * Filter the query on the description column + * + * Example usage: + * + * $query->filterByDescription('fooValue'); // WHERE description = 'fooValue' + * $query->filterByDescription('%fooValue%'); // WHERE description LIKE '%fooValue%' + * + * + * @param string $description 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 ChildCouponQuery The current query, for fluid interface + */ + public function filterByDescription($description = null, $comparison = null) + { + if (null === $comparison) { + if (is_array($description)) { + $comparison = Criteria::IN; + } elseif (preg_match('/[\%\*]/', $description)) { + $description = str_replace('*', '%', $description); + $comparison = Criteria::LIKE; + } + } + + return $this->addUsingAlias(CouponTableMap::DESCRIPTION, $description, $comparison); } /** @@ -393,16 +512,16 @@ abstract class CouponQuery extends ModelCriteria } /** - * Filter the query on the used column + * Filter the query on the is_used column * * Example usage: * - * $query->filterByUsed(1234); // WHERE used = 1234 - * $query->filterByUsed(array(12, 34)); // WHERE used IN (12, 34) - * $query->filterByUsed(array('min' => 12)); // WHERE used > 12 + * $query->filterByIsUsed(1234); // WHERE is_used = 1234 + * $query->filterByIsUsed(array(12, 34)); // WHERE is_used IN (12, 34) + * $query->filterByIsUsed(array('min' => 12)); // WHERE is_used > 12 * * - * @param mixed $used The value to use as filter. + * @param mixed $isUsed 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. @@ -410,16 +529,16 @@ abstract class CouponQuery extends ModelCriteria * * @return ChildCouponQuery The current query, for fluid interface */ - public function filterByUsed($used = null, $comparison = null) + public function filterByIsUsed($isUsed = null, $comparison = null) { - if (is_array($used)) { + if (is_array($isUsed)) { $useMinMax = false; - if (isset($used['min'])) { - $this->addUsingAlias(CouponTableMap::USED, $used['min'], Criteria::GREATER_EQUAL); + if (isset($isUsed['min'])) { + $this->addUsingAlias(CouponTableMap::IS_USED, $isUsed['min'], Criteria::GREATER_EQUAL); $useMinMax = true; } - if (isset($used['max'])) { - $this->addUsingAlias(CouponTableMap::USED, $used['max'], Criteria::LESS_EQUAL); + if (isset($isUsed['max'])) { + $this->addUsingAlias(CouponTableMap::IS_USED, $isUsed['max'], Criteria::LESS_EQUAL); $useMinMax = true; } if ($useMinMax) { @@ -430,20 +549,61 @@ abstract class CouponQuery extends ModelCriteria } } - return $this->addUsingAlias(CouponTableMap::USED, $used, $comparison); + return $this->addUsingAlias(CouponTableMap::IS_USED, $isUsed, $comparison); } /** - * Filter the query on the available_since column + * Filter the query on the is_enabled column * * Example usage: * - * $query->filterByAvailableSince('2011-03-14'); // WHERE available_since = '2011-03-14' - * $query->filterByAvailableSince('now'); // WHERE available_since = '2011-03-14' - * $query->filterByAvailableSince(array('max' => 'yesterday')); // WHERE available_since > '2011-03-13' + * $query->filterByIsEnabled(1234); // WHERE is_enabled = 1234 + * $query->filterByIsEnabled(array(12, 34)); // WHERE is_enabled IN (12, 34) + * $query->filterByIsEnabled(array('min' => 12)); // WHERE is_enabled > 12 * * - * @param mixed $availableSince The value to use as filter. + * @param mixed $isEnabled 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 ChildCouponQuery The current query, for fluid interface + */ + public function filterByIsEnabled($isEnabled = null, $comparison = null) + { + if (is_array($isEnabled)) { + $useMinMax = false; + if (isset($isEnabled['min'])) { + $this->addUsingAlias(CouponTableMap::IS_ENABLED, $isEnabled['min'], Criteria::GREATER_EQUAL); + $useMinMax = true; + } + if (isset($isEnabled['max'])) { + $this->addUsingAlias(CouponTableMap::IS_ENABLED, $isEnabled['max'], Criteria::LESS_EQUAL); + $useMinMax = true; + } + if ($useMinMax) { + return $this; + } + if (null === $comparison) { + $comparison = Criteria::IN; + } + } + + return $this->addUsingAlias(CouponTableMap::IS_ENABLED, $isEnabled, $comparison); + } + + /** + * Filter the query on the expiration_date column + * + * Example usage: + * + * $query->filterByExpirationDate('2011-03-14'); // WHERE expiration_date = '2011-03-14' + * $query->filterByExpirationDate('now'); // WHERE expiration_date = '2011-03-14' + * $query->filterByExpirationDate(array('max' => 'yesterday')); // WHERE expiration_date > '2011-03-13' + * + * + * @param mixed $expirationDate 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. @@ -453,16 +613,16 @@ abstract class CouponQuery extends ModelCriteria * * @return ChildCouponQuery The current query, for fluid interface */ - public function filterByAvailableSince($availableSince = null, $comparison = null) + public function filterByExpirationDate($expirationDate = null, $comparison = null) { - if (is_array($availableSince)) { + if (is_array($expirationDate)) { $useMinMax = false; - if (isset($availableSince['min'])) { - $this->addUsingAlias(CouponTableMap::AVAILABLE_SINCE, $availableSince['min'], Criteria::GREATER_EQUAL); + if (isset($expirationDate['min'])) { + $this->addUsingAlias(CouponTableMap::EXPIRATION_DATE, $expirationDate['min'], Criteria::GREATER_EQUAL); $useMinMax = true; } - if (isset($availableSince['max'])) { - $this->addUsingAlias(CouponTableMap::AVAILABLE_SINCE, $availableSince['max'], Criteria::LESS_EQUAL); + if (isset($expirationDate['max'])) { + $this->addUsingAlias(CouponTableMap::EXPIRATION_DATE, $expirationDate['max'], Criteria::LESS_EQUAL); $useMinMax = true; } if ($useMinMax) { @@ -473,91 +633,36 @@ abstract class CouponQuery extends ModelCriteria } } - return $this->addUsingAlias(CouponTableMap::AVAILABLE_SINCE, $availableSince, $comparison); + return $this->addUsingAlias(CouponTableMap::EXPIRATION_DATE, $expirationDate, $comparison); } /** - * Filter the query on the date_limit column + * Filter the query on the serialized_rules column * * Example usage: * - * $query->filterByDateLimit('2011-03-14'); // WHERE date_limit = '2011-03-14' - * $query->filterByDateLimit('now'); // WHERE date_limit = '2011-03-14' - * $query->filterByDateLimit(array('max' => 'yesterday')); // WHERE date_limit > '2011-03-13' + * $query->filterBySerializedRules('fooValue'); // WHERE serialized_rules = 'fooValue' + * $query->filterBySerializedRules('%fooValue%'); // WHERE serialized_rules LIKE '%fooValue%' * * - * @param mixed $dateLimit 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 $serializedRules 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 ChildCouponQuery The current query, for fluid interface */ - public function filterByDateLimit($dateLimit = null, $comparison = null) + public function filterBySerializedRules($serializedRules = null, $comparison = null) { - if (is_array($dateLimit)) { - $useMinMax = false; - if (isset($dateLimit['min'])) { - $this->addUsingAlias(CouponTableMap::DATE_LIMIT, $dateLimit['min'], Criteria::GREATER_EQUAL); - $useMinMax = true; - } - if (isset($dateLimit['max'])) { - $this->addUsingAlias(CouponTableMap::DATE_LIMIT, $dateLimit['max'], Criteria::LESS_EQUAL); - $useMinMax = true; - } - if ($useMinMax) { - return $this; - } - if (null === $comparison) { + if (null === $comparison) { + if (is_array($serializedRules)) { $comparison = Criteria::IN; + } elseif (preg_match('/[\%\*]/', $serializedRules)) { + $serializedRules = str_replace('*', '%', $serializedRules); + $comparison = Criteria::LIKE; } } - return $this->addUsingAlias(CouponTableMap::DATE_LIMIT, $dateLimit, $comparison); - } - - /** - * Filter the query on the activate column - * - * Example usage: - * - * $query->filterByActivate(1234); // WHERE activate = 1234 - * $query->filterByActivate(array(12, 34)); // WHERE activate IN (12, 34) - * $query->filterByActivate(array('min' => 12)); // WHERE activate > 12 - * - * - * @param mixed $activate 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 ChildCouponQuery The current query, for fluid interface - */ - public function filterByActivate($activate = null, $comparison = null) - { - if (is_array($activate)) { - $useMinMax = false; - if (isset($activate['min'])) { - $this->addUsingAlias(CouponTableMap::ACTIVATE, $activate['min'], Criteria::GREATER_EQUAL); - $useMinMax = true; - } - if (isset($activate['max'])) { - $this->addUsingAlias(CouponTableMap::ACTIVATE, $activate['max'], Criteria::LESS_EQUAL); - $useMinMax = true; - } - if ($useMinMax) { - return $this; - } - if (null === $comparison) { - $comparison = Criteria::IN; - } - } - - return $this->addUsingAlias(CouponTableMap::ACTIVATE, $activate, $comparison); + return $this->addUsingAlias(CouponTableMap::SERIALIZED_RULES, $serializedRules, $comparison); } /** @@ -647,40 +752,81 @@ abstract class CouponQuery extends ModelCriteria } /** - * Filter the query by a related \Thelia\Model\CouponRule object + * Filter the query on the version column * - * @param \Thelia\Model\CouponRule|ObjectCollection $couponRule the related object to use as filter + * Example usage: + * + * $query->filterByVersion(1234); // WHERE version = 1234 + * $query->filterByVersion(array(12, 34)); // WHERE version IN (12, 34) + * $query->filterByVersion(array('min' => 12)); // WHERE version > 12 + * + * + * @param mixed $version 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 ChildCouponQuery The current query, for fluid interface + */ + public function filterByVersion($version = null, $comparison = null) + { + if (is_array($version)) { + $useMinMax = false; + if (isset($version['min'])) { + $this->addUsingAlias(CouponTableMap::VERSION, $version['min'], Criteria::GREATER_EQUAL); + $useMinMax = true; + } + if (isset($version['max'])) { + $this->addUsingAlias(CouponTableMap::VERSION, $version['max'], Criteria::LESS_EQUAL); + $useMinMax = true; + } + if ($useMinMax) { + return $this; + } + if (null === $comparison) { + $comparison = Criteria::IN; + } + } + + return $this->addUsingAlias(CouponTableMap::VERSION, $version, $comparison); + } + + /** + * Filter the query by a related \Thelia\Model\CouponOrder object + * + * @param \Thelia\Model\CouponOrder|ObjectCollection $couponOrder the related object to use as filter * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCouponQuery The current query, for fluid interface */ - public function filterByCouponRule($couponRule, $comparison = null) + public function filterByCouponOrder($couponOrder, $comparison = null) { - if ($couponRule instanceof \Thelia\Model\CouponRule) { + if ($couponOrder instanceof \Thelia\Model\CouponOrder) { return $this - ->addUsingAlias(CouponTableMap::ID, $couponRule->getCouponId(), $comparison); - } elseif ($couponRule instanceof ObjectCollection) { + ->addUsingAlias(CouponTableMap::CODE, $couponOrder->getCode(), $comparison); + } elseif ($couponOrder instanceof ObjectCollection) { return $this - ->useCouponRuleQuery() - ->filterByPrimaryKeys($couponRule->getPrimaryKeys()) + ->useCouponOrderQuery() + ->filterByPrimaryKeys($couponOrder->getPrimaryKeys()) ->endUse(); } else { - throw new PropelException('filterByCouponRule() only accepts arguments of type \Thelia\Model\CouponRule or Collection'); + throw new PropelException('filterByCouponOrder() only accepts arguments of type \Thelia\Model\CouponOrder or Collection'); } } /** - * Adds a JOIN clause to the query using the CouponRule relation + * Adds a JOIN clause to the query using the CouponOrder relation * * @param string $relationAlias optional alias for the relation * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildCouponQuery The current query, for fluid interface */ - public function joinCouponRule($relationAlias = null, $joinType = Criteria::INNER_JOIN) + public function joinCouponOrder($relationAlias = null, $joinType = Criteria::INNER_JOIN) { $tableMap = $this->getTableMap(); - $relationMap = $tableMap->getRelation('CouponRule'); + $relationMap = $tableMap->getRelation('CouponOrder'); // create a ModelJoin object for this join $join = new ModelJoin(); @@ -695,14 +841,14 @@ abstract class CouponQuery extends ModelCriteria $this->addAlias($relationAlias, $relationMap->getRightTable()->getName()); $this->addJoinObject($join, $relationAlias); } else { - $this->addJoinObject($join, 'CouponRule'); + $this->addJoinObject($join, 'CouponOrder'); } return $this; } /** - * Use the CouponRule relation CouponRule object + * Use the CouponOrder relation CouponOrder object * * @see useQuery() * @@ -710,13 +856,159 @@ abstract class CouponQuery 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\CouponRuleQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\CouponOrderQuery A secondary query class using the current class as primary query */ - public function useCouponRuleQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) + public function useCouponOrderQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { return $this - ->joinCouponRule($relationAlias, $joinType) - ->useQuery($relationAlias ? $relationAlias : 'CouponRule', '\Thelia\Model\CouponRuleQuery'); + ->joinCouponOrder($relationAlias, $joinType) + ->useQuery($relationAlias ? $relationAlias : 'CouponOrder', '\Thelia\Model\CouponOrderQuery'); + } + + /** + * Filter the query by a related \Thelia\Model\CouponI18n object + * + * @param \Thelia\Model\CouponI18n|ObjectCollection $couponI18n the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return ChildCouponQuery The current query, for fluid interface + */ + public function filterByCouponI18n($couponI18n, $comparison = null) + { + if ($couponI18n instanceof \Thelia\Model\CouponI18n) { + return $this + ->addUsingAlias(CouponTableMap::ID, $couponI18n->getId(), $comparison); + } elseif ($couponI18n instanceof ObjectCollection) { + return $this + ->useCouponI18nQuery() + ->filterByPrimaryKeys($couponI18n->getPrimaryKeys()) + ->endUse(); + } else { + throw new PropelException('filterByCouponI18n() only accepts arguments of type \Thelia\Model\CouponI18n or Collection'); + } + } + + /** + * Adds a JOIN clause to the query using the CouponI18n relation + * + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * + * @return ChildCouponQuery The current query, for fluid interface + */ + public function joinCouponI18n($relationAlias = null, $joinType = 'LEFT JOIN') + { + $tableMap = $this->getTableMap(); + $relationMap = $tableMap->getRelation('CouponI18n'); + + // 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, 'CouponI18n'); + } + + return $this; + } + + /** + * Use the CouponI18n relation CouponI18n 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\CouponI18nQuery A secondary query class using the current class as primary query + */ + public function useCouponI18nQuery($relationAlias = null, $joinType = 'LEFT JOIN') + { + return $this + ->joinCouponI18n($relationAlias, $joinType) + ->useQuery($relationAlias ? $relationAlias : 'CouponI18n', '\Thelia\Model\CouponI18nQuery'); + } + + /** + * Filter the query by a related \Thelia\Model\CouponVersion object + * + * @param \Thelia\Model\CouponVersion|ObjectCollection $couponVersion the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return ChildCouponQuery The current query, for fluid interface + */ + public function filterByCouponVersion($couponVersion, $comparison = null) + { + if ($couponVersion instanceof \Thelia\Model\CouponVersion) { + return $this + ->addUsingAlias(CouponTableMap::ID, $couponVersion->getId(), $comparison); + } elseif ($couponVersion instanceof ObjectCollection) { + return $this + ->useCouponVersionQuery() + ->filterByPrimaryKeys($couponVersion->getPrimaryKeys()) + ->endUse(); + } else { + throw new PropelException('filterByCouponVersion() only accepts arguments of type \Thelia\Model\CouponVersion or Collection'); + } + } + + /** + * Adds a JOIN clause to the query using the CouponVersion relation + * + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * + * @return ChildCouponQuery The current query, for fluid interface + */ + public function joinCouponVersion($relationAlias = null, $joinType = Criteria::INNER_JOIN) + { + $tableMap = $this->getTableMap(); + $relationMap = $tableMap->getRelation('CouponVersion'); + + // 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, 'CouponVersion'); + } + + return $this; + } + + /** + * Use the CouponVersion relation CouponVersion 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\CouponVersionQuery A secondary query class using the current class as primary query + */ + public function useCouponVersionQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) + { + return $this + ->joinCouponVersion($relationAlias, $joinType) + ->useQuery($relationAlias ? $relationAlias : 'CouponVersion', '\Thelia\Model\CouponVersionQuery'); } /** @@ -876,4 +1168,89 @@ abstract class CouponQuery extends ModelCriteria return $this->addAscendingOrderByColumn(CouponTableMap::CREATED_AT); } + // i18n behavior + + /** + * Adds a JOIN clause to the query using the i18n relation + * + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * + * @return ChildCouponQuery The current query, for fluid interface + */ + public function joinI18n($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + { + $relationName = $relationAlias ? $relationAlias : 'CouponI18n'; + + return $this + ->joinCouponI18n($relationAlias, $joinType) + ->addJoinCondition($relationName, $relationName . '.Locale = ?', $locale); + } + + /** + * Adds a JOIN clause to the query and hydrates the related I18n object. + * Shortcut for $c->joinI18n($locale)->with() + * + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * + * @return ChildCouponQuery The current query, for fluid interface + */ + public function joinWithI18n($locale = 'en_EN', $joinType = Criteria::LEFT_JOIN) + { + $this + ->joinI18n($locale, null, $joinType) + ->with('CouponI18n'); + $this->with['CouponI18n']->setIsWithOneToMany(false); + + return $this; + } + + /** + * Use the I18n relation query object + * + * @see useQuery() + * + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * + * @return ChildCouponI18nQuery A secondary query class using the current class as primary query + */ + public function useI18nQuery($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + { + return $this + ->joinI18n($locale, $relationAlias, $joinType) + ->useQuery($relationAlias ? $relationAlias : 'CouponI18n', '\Thelia\Model\CouponI18nQuery'); + } + + // versionable behavior + + /** + * Checks whether versioning is enabled + * + * @return boolean + */ + static public function isVersioningEnabled() + { + return self::$isVersioningEnabled; + } + + /** + * Enables versioning + */ + static public function enableVersioning() + { + self::$isVersioningEnabled = true; + } + + /** + * Disables versioning + */ + static public function disableVersioning() + { + self::$isVersioningEnabled = false; + } + } // CouponQuery diff --git a/core/lib/Thelia/Model/Base/Currency.php b/core/lib/Thelia/Model/Base/Currency.php index 77718992f..a5ada0790 100644 --- a/core/lib/Thelia/Model/Base/Currency.php +++ b/core/lib/Thelia/Model/Base/Currency.php @@ -149,7 +149,7 @@ abstract class Currency implements ActiveRecordInterface * Current locale * @var string */ - protected $currentLocale = 'en_US'; + protected $currentLocale = 'en_EN'; /** * Current translation objects @@ -2681,7 +2681,7 @@ abstract class Currency implements ActiveRecordInterface } // if ($deep) // i18n behavior - $this->currentLocale = 'en_US'; + $this->currentLocale = 'en_EN'; $this->currentTranslations = null; if ($this->collOrders instanceof Collection) { @@ -2735,7 +2735,7 @@ abstract class Currency implements ActiveRecordInterface * * @return ChildCurrency The current object (for fluent API support) */ - public function setLocale($locale = 'en_US') + public function setLocale($locale = 'en_EN') { $this->currentLocale = $locale; @@ -2759,7 +2759,7 @@ abstract class Currency implements ActiveRecordInterface * @param ConnectionInterface $con an optional connection object * * @return ChildCurrencyI18n */ - public function getTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function getTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!isset($this->currentTranslations[$locale])) { if (null !== $this->collCurrencyI18ns) { @@ -2794,7 +2794,7 @@ abstract class Currency implements ActiveRecordInterface * * @return ChildCurrency The current object (for fluent API support) */ - public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function removeTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!$this->isNew()) { ChildCurrencyI18nQuery::create() diff --git a/core/lib/Thelia/Model/Base/CurrencyI18n.php b/core/lib/Thelia/Model/Base/CurrencyI18n.php index eb86a87c4..52cd7fc5b 100644 --- a/core/lib/Thelia/Model/Base/CurrencyI18n.php +++ b/core/lib/Thelia/Model/Base/CurrencyI18n.php @@ -61,7 +61,7 @@ abstract class CurrencyI18n implements ActiveRecordInterface /** * The value for the locale field. - * Note: this column has a database default value of: 'en_US' + * Note: this column has a database default value of: 'en_EN' * @var string */ protected $locale; @@ -93,7 +93,7 @@ abstract class CurrencyI18n implements ActiveRecordInterface */ public function applyDefaultValues() { - $this->locale = 'en_US'; + $this->locale = 'en_EN'; } /** @@ -462,7 +462,7 @@ abstract class CurrencyI18n implements ActiveRecordInterface */ public function hasOnlyDefaultValues() { - if ($this->locale !== 'en_US') { + if ($this->locale !== 'en_EN') { return false; } diff --git a/core/lib/Thelia/Model/Base/CurrencyQuery.php b/core/lib/Thelia/Model/Base/CurrencyQuery.php index eb4b1b2f7..9b4ecf51e 100644 --- a/core/lib/Thelia/Model/Base/CurrencyQuery.php +++ b/core/lib/Thelia/Model/Base/CurrencyQuery.php @@ -1025,7 +1025,7 @@ abstract class CurrencyQuery extends ModelCriteria * * @return ChildCurrencyQuery The current query, for fluid interface */ - public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function joinI18n($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { $relationName = $relationAlias ? $relationAlias : 'CurrencyI18n'; @@ -1043,7 +1043,7 @@ abstract class CurrencyQuery extends ModelCriteria * * @return ChildCurrencyQuery The current query, for fluid interface */ - public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN) + public function joinWithI18n($locale = 'en_EN', $joinType = Criteria::LEFT_JOIN) { $this ->joinI18n($locale, null, $joinType) @@ -1064,7 +1064,7 @@ abstract class CurrencyQuery extends ModelCriteria * * @return ChildCurrencyI18nQuery A secondary query class using the current class as primary query */ - public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function useI18nQuery($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { return $this ->joinI18n($locale, $relationAlias, $joinType) diff --git a/core/lib/Thelia/Model/Base/CustomerTitle.php b/core/lib/Thelia/Model/Base/CustomerTitle.php index 5f8b11dd9..7f4c30d09 100644 --- a/core/lib/Thelia/Model/Base/CustomerTitle.php +++ b/core/lib/Thelia/Model/Base/CustomerTitle.php @@ -124,7 +124,7 @@ abstract class CustomerTitle implements ActiveRecordInterface * Current locale * @var string */ - protected $currentLocale = 'en_US'; + protected $currentLocale = 'en_EN'; /** * Current translation objects @@ -2106,7 +2106,7 @@ abstract class CustomerTitle implements ActiveRecordInterface } // if ($deep) // i18n behavior - $this->currentLocale = 'en_US'; + $this->currentLocale = 'en_EN'; $this->currentTranslations = null; if ($this->collCustomers instanceof Collection) { @@ -2156,7 +2156,7 @@ abstract class CustomerTitle implements ActiveRecordInterface * * @return ChildCustomerTitle The current object (for fluent API support) */ - public function setLocale($locale = 'en_US') + public function setLocale($locale = 'en_EN') { $this->currentLocale = $locale; @@ -2180,7 +2180,7 @@ abstract class CustomerTitle implements ActiveRecordInterface * @param ConnectionInterface $con an optional connection object * * @return ChildCustomerTitleI18n */ - public function getTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function getTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!isset($this->currentTranslations[$locale])) { if (null !== $this->collCustomerTitleI18ns) { @@ -2215,7 +2215,7 @@ abstract class CustomerTitle implements ActiveRecordInterface * * @return ChildCustomerTitle The current object (for fluent API support) */ - public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function removeTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!$this->isNew()) { ChildCustomerTitleI18nQuery::create() diff --git a/core/lib/Thelia/Model/Base/CustomerTitleI18n.php b/core/lib/Thelia/Model/Base/CustomerTitleI18n.php index c68b87123..38e47ecda 100644 --- a/core/lib/Thelia/Model/Base/CustomerTitleI18n.php +++ b/core/lib/Thelia/Model/Base/CustomerTitleI18n.php @@ -61,7 +61,7 @@ abstract class CustomerTitleI18n implements ActiveRecordInterface /** * The value for the locale field. - * Note: this column has a database default value of: 'en_US' + * Note: this column has a database default value of: 'en_EN' * @var string */ protected $locale; @@ -99,7 +99,7 @@ abstract class CustomerTitleI18n implements ActiveRecordInterface */ public function applyDefaultValues() { - $this->locale = 'en_US'; + $this->locale = 'en_EN'; } /** @@ -500,7 +500,7 @@ abstract class CustomerTitleI18n implements ActiveRecordInterface */ public function hasOnlyDefaultValues() { - if ($this->locale !== 'en_US') { + if ($this->locale !== 'en_EN') { return false; } diff --git a/core/lib/Thelia/Model/Base/CustomerTitleQuery.php b/core/lib/Thelia/Model/Base/CustomerTitleQuery.php index ea34c8c91..1c4be4081 100644 --- a/core/lib/Thelia/Model/Base/CustomerTitleQuery.php +++ b/core/lib/Thelia/Model/Base/CustomerTitleQuery.php @@ -825,7 +825,7 @@ abstract class CustomerTitleQuery extends ModelCriteria * * @return ChildCustomerTitleQuery The current query, for fluid interface */ - public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function joinI18n($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { $relationName = $relationAlias ? $relationAlias : 'CustomerTitleI18n'; @@ -843,7 +843,7 @@ abstract class CustomerTitleQuery extends ModelCriteria * * @return ChildCustomerTitleQuery The current query, for fluid interface */ - public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN) + public function joinWithI18n($locale = 'en_EN', $joinType = Criteria::LEFT_JOIN) { $this ->joinI18n($locale, null, $joinType) @@ -864,7 +864,7 @@ abstract class CustomerTitleQuery extends ModelCriteria * * @return ChildCustomerTitleI18nQuery A secondary query class using the current class as primary query */ - public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function useI18nQuery($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { return $this ->joinI18n($locale, $relationAlias, $joinType) diff --git a/core/lib/Thelia/Model/Base/Feature.php b/core/lib/Thelia/Model/Base/Feature.php index 0dddd14e0..826de003f 100644 --- a/core/lib/Thelia/Model/Base/Feature.php +++ b/core/lib/Thelia/Model/Base/Feature.php @@ -139,7 +139,7 @@ abstract class Feature implements ActiveRecordInterface * Current locale * @var string */ - protected $currentLocale = 'en_US'; + protected $currentLocale = 'en_EN'; /** * Current translation objects @@ -2628,7 +2628,7 @@ abstract class Feature implements ActiveRecordInterface } // if ($deep) // i18n behavior - $this->currentLocale = 'en_US'; + $this->currentLocale = 'en_EN'; $this->currentTranslations = null; if ($this->collFeatureAvs instanceof Collection) { @@ -2686,7 +2686,7 @@ abstract class Feature implements ActiveRecordInterface * * @return ChildFeature The current object (for fluent API support) */ - public function setLocale($locale = 'en_US') + public function setLocale($locale = 'en_EN') { $this->currentLocale = $locale; @@ -2710,7 +2710,7 @@ abstract class Feature implements ActiveRecordInterface * @param ConnectionInterface $con an optional connection object * * @return ChildFeatureI18n */ - public function getTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function getTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!isset($this->currentTranslations[$locale])) { if (null !== $this->collFeatureI18ns) { @@ -2745,7 +2745,7 @@ abstract class Feature implements ActiveRecordInterface * * @return ChildFeature The current object (for fluent API support) */ - public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function removeTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!$this->isNew()) { ChildFeatureI18nQuery::create() diff --git a/core/lib/Thelia/Model/Base/FeatureAv.php b/core/lib/Thelia/Model/Base/FeatureAv.php index b09a27cec..818f352a0 100644 --- a/core/lib/Thelia/Model/Base/FeatureAv.php +++ b/core/lib/Thelia/Model/Base/FeatureAv.php @@ -122,7 +122,7 @@ abstract class FeatureAv implements ActiveRecordInterface * Current locale * @var string */ - protected $currentLocale = 'en_US'; + protected $currentLocale = 'en_EN'; /** * Current translation objects @@ -1900,7 +1900,7 @@ abstract class FeatureAv implements ActiveRecordInterface } // if ($deep) // i18n behavior - $this->currentLocale = 'en_US'; + $this->currentLocale = 'en_EN'; $this->currentTranslations = null; if ($this->collFeatureProducts instanceof Collection) { @@ -1947,7 +1947,7 @@ abstract class FeatureAv implements ActiveRecordInterface * * @return ChildFeatureAv The current object (for fluent API support) */ - public function setLocale($locale = 'en_US') + public function setLocale($locale = 'en_EN') { $this->currentLocale = $locale; @@ -1971,7 +1971,7 @@ abstract class FeatureAv implements ActiveRecordInterface * @param ConnectionInterface $con an optional connection object * * @return ChildFeatureAvI18n */ - public function getTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function getTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!isset($this->currentTranslations[$locale])) { if (null !== $this->collFeatureAvI18ns) { @@ -2006,7 +2006,7 @@ abstract class FeatureAv implements ActiveRecordInterface * * @return ChildFeatureAv The current object (for fluent API support) */ - public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function removeTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!$this->isNew()) { ChildFeatureAvI18nQuery::create() diff --git a/core/lib/Thelia/Model/Base/FeatureAvI18n.php b/core/lib/Thelia/Model/Base/FeatureAvI18n.php index 7cbca8129..aa524c430 100644 --- a/core/lib/Thelia/Model/Base/FeatureAvI18n.php +++ b/core/lib/Thelia/Model/Base/FeatureAvI18n.php @@ -61,7 +61,7 @@ abstract class FeatureAvI18n implements ActiveRecordInterface /** * The value for the locale field. - * Note: this column has a database default value of: 'en_US' + * Note: this column has a database default value of: 'en_EN' * @var string */ protected $locale; @@ -111,7 +111,7 @@ abstract class FeatureAvI18n implements ActiveRecordInterface */ public function applyDefaultValues() { - $this->locale = 'en_US'; + $this->locale = 'en_EN'; } /** @@ -576,7 +576,7 @@ abstract class FeatureAvI18n implements ActiveRecordInterface */ public function hasOnlyDefaultValues() { - if ($this->locale !== 'en_US') { + if ($this->locale !== 'en_EN') { return false; } diff --git a/core/lib/Thelia/Model/Base/FeatureAvQuery.php b/core/lib/Thelia/Model/Base/FeatureAvQuery.php index fb3796c97..6b3af4ed9 100644 --- a/core/lib/Thelia/Model/Base/FeatureAvQuery.php +++ b/core/lib/Thelia/Model/Base/FeatureAvQuery.php @@ -841,7 +841,7 @@ abstract class FeatureAvQuery extends ModelCriteria * * @return ChildFeatureAvQuery The current query, for fluid interface */ - public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function joinI18n($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { $relationName = $relationAlias ? $relationAlias : 'FeatureAvI18n'; @@ -859,7 +859,7 @@ abstract class FeatureAvQuery extends ModelCriteria * * @return ChildFeatureAvQuery The current query, for fluid interface */ - public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN) + public function joinWithI18n($locale = 'en_EN', $joinType = Criteria::LEFT_JOIN) { $this ->joinI18n($locale, null, $joinType) @@ -880,7 +880,7 @@ abstract class FeatureAvQuery extends ModelCriteria * * @return ChildFeatureAvI18nQuery A secondary query class using the current class as primary query */ - public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function useI18nQuery($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { return $this ->joinI18n($locale, $relationAlias, $joinType) diff --git a/core/lib/Thelia/Model/Base/FeatureI18n.php b/core/lib/Thelia/Model/Base/FeatureI18n.php index 0ede8eddb..b6070932e 100644 --- a/core/lib/Thelia/Model/Base/FeatureI18n.php +++ b/core/lib/Thelia/Model/Base/FeatureI18n.php @@ -61,7 +61,7 @@ abstract class FeatureI18n implements ActiveRecordInterface /** * The value for the locale field. - * Note: this column has a database default value of: 'en_US' + * Note: this column has a database default value of: 'en_EN' * @var string */ protected $locale; @@ -111,7 +111,7 @@ abstract class FeatureI18n implements ActiveRecordInterface */ public function applyDefaultValues() { - $this->locale = 'en_US'; + $this->locale = 'en_EN'; } /** @@ -576,7 +576,7 @@ abstract class FeatureI18n implements ActiveRecordInterface */ public function hasOnlyDefaultValues() { - if ($this->locale !== 'en_US') { + if ($this->locale !== 'en_EN') { return false; } diff --git a/core/lib/Thelia/Model/Base/FeatureQuery.php b/core/lib/Thelia/Model/Base/FeatureQuery.php index 9b00e812e..f1fc81a3f 100644 --- a/core/lib/Thelia/Model/Base/FeatureQuery.php +++ b/core/lib/Thelia/Model/Base/FeatureQuery.php @@ -931,7 +931,7 @@ abstract class FeatureQuery extends ModelCriteria * * @return ChildFeatureQuery The current query, for fluid interface */ - public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function joinI18n($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { $relationName = $relationAlias ? $relationAlias : 'FeatureI18n'; @@ -949,7 +949,7 @@ abstract class FeatureQuery extends ModelCriteria * * @return ChildFeatureQuery The current query, for fluid interface */ - public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN) + public function joinWithI18n($locale = 'en_EN', $joinType = Criteria::LEFT_JOIN) { $this ->joinI18n($locale, null, $joinType) @@ -970,7 +970,7 @@ abstract class FeatureQuery extends ModelCriteria * * @return ChildFeatureI18nQuery A secondary query class using the current class as primary query */ - public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function useI18nQuery($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { return $this ->joinI18n($locale, $relationAlias, $joinType) diff --git a/core/lib/Thelia/Model/Base/Folder.php b/core/lib/Thelia/Model/Base/Folder.php index 6ee28e7ff..1b0c80d94 100644 --- a/core/lib/Thelia/Model/Base/Folder.php +++ b/core/lib/Thelia/Model/Base/Folder.php @@ -180,7 +180,7 @@ abstract class Folder implements ActiveRecordInterface * Current locale * @var string */ - protected $currentLocale = 'en_US'; + protected $currentLocale = 'en_EN'; /** * Current translation objects @@ -3460,7 +3460,7 @@ abstract class Folder implements ActiveRecordInterface } // if ($deep) // i18n behavior - $this->currentLocale = 'en_US'; + $this->currentLocale = 'en_EN'; $this->currentTranslations = null; if ($this->collRewritings instanceof Collection) { @@ -3526,7 +3526,7 @@ abstract class Folder implements ActiveRecordInterface * * @return ChildFolder The current object (for fluent API support) */ - public function setLocale($locale = 'en_US') + public function setLocale($locale = 'en_EN') { $this->currentLocale = $locale; @@ -3550,7 +3550,7 @@ abstract class Folder implements ActiveRecordInterface * @param ConnectionInterface $con an optional connection object * * @return ChildFolderI18n */ - public function getTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function getTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!isset($this->currentTranslations[$locale])) { if (null !== $this->collFolderI18ns) { @@ -3585,7 +3585,7 @@ abstract class Folder implements ActiveRecordInterface * * @return ChildFolder The current object (for fluent API support) */ - public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function removeTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!$this->isNew()) { ChildFolderI18nQuery::create() diff --git a/core/lib/Thelia/Model/Base/FolderDocument.php b/core/lib/Thelia/Model/Base/FolderDocument.php index 31e7c57a6..25b68a842 100644 --- a/core/lib/Thelia/Model/Base/FolderDocument.php +++ b/core/lib/Thelia/Model/Base/FolderDocument.php @@ -120,7 +120,7 @@ abstract class FolderDocument implements ActiveRecordInterface * Current locale * @var string */ - protected $currentLocale = 'en_US'; + protected $currentLocale = 'en_EN'; /** * Current translation objects @@ -1640,7 +1640,7 @@ abstract class FolderDocument implements ActiveRecordInterface } // if ($deep) // i18n behavior - $this->currentLocale = 'en_US'; + $this->currentLocale = 'en_EN'; $this->currentTranslations = null; if ($this->collFolderDocumentI18ns instanceof Collection) { @@ -1683,7 +1683,7 @@ abstract class FolderDocument implements ActiveRecordInterface * * @return ChildFolderDocument The current object (for fluent API support) */ - public function setLocale($locale = 'en_US') + public function setLocale($locale = 'en_EN') { $this->currentLocale = $locale; @@ -1707,7 +1707,7 @@ abstract class FolderDocument implements ActiveRecordInterface * @param ConnectionInterface $con an optional connection object * * @return ChildFolderDocumentI18n */ - public function getTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function getTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!isset($this->currentTranslations[$locale])) { if (null !== $this->collFolderDocumentI18ns) { @@ -1742,7 +1742,7 @@ abstract class FolderDocument implements ActiveRecordInterface * * @return ChildFolderDocument The current object (for fluent API support) */ - public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function removeTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!$this->isNew()) { ChildFolderDocumentI18nQuery::create() diff --git a/core/lib/Thelia/Model/Base/FolderDocumentI18n.php b/core/lib/Thelia/Model/Base/FolderDocumentI18n.php index d39a49af7..520160758 100644 --- a/core/lib/Thelia/Model/Base/FolderDocumentI18n.php +++ b/core/lib/Thelia/Model/Base/FolderDocumentI18n.php @@ -61,7 +61,7 @@ abstract class FolderDocumentI18n implements ActiveRecordInterface /** * The value for the locale field. - * Note: this column has a database default value of: 'en_US' + * Note: this column has a database default value of: 'en_EN' * @var string */ protected $locale; @@ -111,7 +111,7 @@ abstract class FolderDocumentI18n implements ActiveRecordInterface */ public function applyDefaultValues() { - $this->locale = 'en_US'; + $this->locale = 'en_EN'; } /** @@ -576,7 +576,7 @@ abstract class FolderDocumentI18n implements ActiveRecordInterface */ public function hasOnlyDefaultValues() { - if ($this->locale !== 'en_US') { + if ($this->locale !== 'en_EN') { return false; } diff --git a/core/lib/Thelia/Model/Base/FolderDocumentQuery.php b/core/lib/Thelia/Model/Base/FolderDocumentQuery.php index b1c41a29e..85ed5c241 100644 --- a/core/lib/Thelia/Model/Base/FolderDocumentQuery.php +++ b/core/lib/Thelia/Model/Base/FolderDocumentQuery.php @@ -797,7 +797,7 @@ abstract class FolderDocumentQuery extends ModelCriteria * * @return ChildFolderDocumentQuery The current query, for fluid interface */ - public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function joinI18n($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { $relationName = $relationAlias ? $relationAlias : 'FolderDocumentI18n'; @@ -815,7 +815,7 @@ abstract class FolderDocumentQuery extends ModelCriteria * * @return ChildFolderDocumentQuery The current query, for fluid interface */ - public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN) + public function joinWithI18n($locale = 'en_EN', $joinType = Criteria::LEFT_JOIN) { $this ->joinI18n($locale, null, $joinType) @@ -836,7 +836,7 @@ abstract class FolderDocumentQuery extends ModelCriteria * * @return ChildFolderDocumentI18nQuery A secondary query class using the current class as primary query */ - public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function useI18nQuery($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { return $this ->joinI18n($locale, $relationAlias, $joinType) diff --git a/core/lib/Thelia/Model/Base/FolderI18n.php b/core/lib/Thelia/Model/Base/FolderI18n.php index fcdc66705..35e69d6a6 100644 --- a/core/lib/Thelia/Model/Base/FolderI18n.php +++ b/core/lib/Thelia/Model/Base/FolderI18n.php @@ -61,7 +61,7 @@ abstract class FolderI18n implements ActiveRecordInterface /** * The value for the locale field. - * Note: this column has a database default value of: 'en_US' + * Note: this column has a database default value of: 'en_EN' * @var string */ protected $locale; @@ -111,7 +111,7 @@ abstract class FolderI18n implements ActiveRecordInterface */ public function applyDefaultValues() { - $this->locale = 'en_US'; + $this->locale = 'en_EN'; } /** @@ -576,7 +576,7 @@ abstract class FolderI18n implements ActiveRecordInterface */ public function hasOnlyDefaultValues() { - if ($this->locale !== 'en_US') { + if ($this->locale !== 'en_EN') { return false; } diff --git a/core/lib/Thelia/Model/Base/FolderImage.php b/core/lib/Thelia/Model/Base/FolderImage.php index 46c39060d..73bfd11b8 100644 --- a/core/lib/Thelia/Model/Base/FolderImage.php +++ b/core/lib/Thelia/Model/Base/FolderImage.php @@ -120,7 +120,7 @@ abstract class FolderImage implements ActiveRecordInterface * Current locale * @var string */ - protected $currentLocale = 'en_US'; + protected $currentLocale = 'en_EN'; /** * Current translation objects @@ -1640,7 +1640,7 @@ abstract class FolderImage implements ActiveRecordInterface } // if ($deep) // i18n behavior - $this->currentLocale = 'en_US'; + $this->currentLocale = 'en_EN'; $this->currentTranslations = null; if ($this->collFolderImageI18ns instanceof Collection) { @@ -1683,7 +1683,7 @@ abstract class FolderImage implements ActiveRecordInterface * * @return ChildFolderImage The current object (for fluent API support) */ - public function setLocale($locale = 'en_US') + public function setLocale($locale = 'en_EN') { $this->currentLocale = $locale; @@ -1707,7 +1707,7 @@ abstract class FolderImage implements ActiveRecordInterface * @param ConnectionInterface $con an optional connection object * * @return ChildFolderImageI18n */ - public function getTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function getTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!isset($this->currentTranslations[$locale])) { if (null !== $this->collFolderImageI18ns) { @@ -1742,7 +1742,7 @@ abstract class FolderImage implements ActiveRecordInterface * * @return ChildFolderImage The current object (for fluent API support) */ - public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function removeTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!$this->isNew()) { ChildFolderImageI18nQuery::create() diff --git a/core/lib/Thelia/Model/Base/FolderImageI18n.php b/core/lib/Thelia/Model/Base/FolderImageI18n.php index d5cc004d1..9096c8542 100644 --- a/core/lib/Thelia/Model/Base/FolderImageI18n.php +++ b/core/lib/Thelia/Model/Base/FolderImageI18n.php @@ -61,7 +61,7 @@ abstract class FolderImageI18n implements ActiveRecordInterface /** * The value for the locale field. - * Note: this column has a database default value of: 'en_US' + * Note: this column has a database default value of: 'en_EN' * @var string */ protected $locale; @@ -111,7 +111,7 @@ abstract class FolderImageI18n implements ActiveRecordInterface */ public function applyDefaultValues() { - $this->locale = 'en_US'; + $this->locale = 'en_EN'; } /** @@ -576,7 +576,7 @@ abstract class FolderImageI18n implements ActiveRecordInterface */ public function hasOnlyDefaultValues() { - if ($this->locale !== 'en_US') { + if ($this->locale !== 'en_EN') { return false; } diff --git a/core/lib/Thelia/Model/Base/FolderImageQuery.php b/core/lib/Thelia/Model/Base/FolderImageQuery.php index ca12e098e..4ea930e20 100644 --- a/core/lib/Thelia/Model/Base/FolderImageQuery.php +++ b/core/lib/Thelia/Model/Base/FolderImageQuery.php @@ -797,7 +797,7 @@ abstract class FolderImageQuery extends ModelCriteria * * @return ChildFolderImageQuery The current query, for fluid interface */ - public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function joinI18n($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { $relationName = $relationAlias ? $relationAlias : 'FolderImageI18n'; @@ -815,7 +815,7 @@ abstract class FolderImageQuery extends ModelCriteria * * @return ChildFolderImageQuery The current query, for fluid interface */ - public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN) + public function joinWithI18n($locale = 'en_EN', $joinType = Criteria::LEFT_JOIN) { $this ->joinI18n($locale, null, $joinType) @@ -836,7 +836,7 @@ abstract class FolderImageQuery extends ModelCriteria * * @return ChildFolderImageI18nQuery A secondary query class using the current class as primary query */ - public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function useI18nQuery($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { return $this ->joinI18n($locale, $relationAlias, $joinType) diff --git a/core/lib/Thelia/Model/Base/FolderQuery.php b/core/lib/Thelia/Model/Base/FolderQuery.php index 893bb9819..22d2f3735 100644 --- a/core/lib/Thelia/Model/Base/FolderQuery.php +++ b/core/lib/Thelia/Model/Base/FolderQuery.php @@ -1262,7 +1262,7 @@ abstract class FolderQuery extends ModelCriteria * * @return ChildFolderQuery The current query, for fluid interface */ - public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function joinI18n($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { $relationName = $relationAlias ? $relationAlias : 'FolderI18n'; @@ -1280,7 +1280,7 @@ abstract class FolderQuery extends ModelCriteria * * @return ChildFolderQuery The current query, for fluid interface */ - public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN) + public function joinWithI18n($locale = 'en_EN', $joinType = Criteria::LEFT_JOIN) { $this ->joinI18n($locale, null, $joinType) @@ -1301,7 +1301,7 @@ abstract class FolderQuery extends ModelCriteria * * @return ChildFolderI18nQuery A secondary query class using the current class as primary query */ - public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function useI18nQuery($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { return $this ->joinI18n($locale, $relationAlias, $joinType) diff --git a/core/lib/Thelia/Model/Base/Group.php b/core/lib/Thelia/Model/Base/Group.php index 9cfde2bdc..6b66d5f39 100644 --- a/core/lib/Thelia/Model/Base/Group.php +++ b/core/lib/Thelia/Model/Base/Group.php @@ -139,7 +139,7 @@ abstract class Group implements ActiveRecordInterface * Current locale * @var string */ - protected $currentLocale = 'en_US'; + protected $currentLocale = 'en_EN'; /** * Current translation objects @@ -2786,7 +2786,7 @@ abstract class Group implements ActiveRecordInterface } // if ($deep) // i18n behavior - $this->currentLocale = 'en_US'; + $this->currentLocale = 'en_EN'; $this->currentTranslations = null; if ($this->collAdminGroups instanceof Collection) { @@ -2848,7 +2848,7 @@ abstract class Group implements ActiveRecordInterface * * @return ChildGroup The current object (for fluent API support) */ - public function setLocale($locale = 'en_US') + public function setLocale($locale = 'en_EN') { $this->currentLocale = $locale; @@ -2872,7 +2872,7 @@ abstract class Group implements ActiveRecordInterface * @param ConnectionInterface $con an optional connection object * * @return ChildGroupI18n */ - public function getTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function getTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!isset($this->currentTranslations[$locale])) { if (null !== $this->collGroupI18ns) { @@ -2907,7 +2907,7 @@ abstract class Group implements ActiveRecordInterface * * @return ChildGroup The current object (for fluent API support) */ - public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function removeTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!$this->isNew()) { ChildGroupI18nQuery::create() diff --git a/core/lib/Thelia/Model/Base/GroupI18n.php b/core/lib/Thelia/Model/Base/GroupI18n.php index 4de63ea63..de90d8863 100644 --- a/core/lib/Thelia/Model/Base/GroupI18n.php +++ b/core/lib/Thelia/Model/Base/GroupI18n.php @@ -61,7 +61,7 @@ abstract class GroupI18n implements ActiveRecordInterface /** * The value for the locale field. - * Note: this column has a database default value of: 'en_US' + * Note: this column has a database default value of: 'en_EN' * @var string */ protected $locale; @@ -111,7 +111,7 @@ abstract class GroupI18n implements ActiveRecordInterface */ public function applyDefaultValues() { - $this->locale = 'en_US'; + $this->locale = 'en_EN'; } /** @@ -576,7 +576,7 @@ abstract class GroupI18n implements ActiveRecordInterface */ public function hasOnlyDefaultValues() { - if ($this->locale !== 'en_US') { + if ($this->locale !== 'en_EN') { return false; } diff --git a/core/lib/Thelia/Model/Base/GroupQuery.php b/core/lib/Thelia/Model/Base/GroupQuery.php index d0eded79b..8ca963848 100644 --- a/core/lib/Thelia/Model/Base/GroupQuery.php +++ b/core/lib/Thelia/Model/Base/GroupQuery.php @@ -891,7 +891,7 @@ abstract class GroupQuery extends ModelCriteria * * @return ChildGroupQuery The current query, for fluid interface */ - public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function joinI18n($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { $relationName = $relationAlias ? $relationAlias : 'GroupI18n'; @@ -909,7 +909,7 @@ abstract class GroupQuery extends ModelCriteria * * @return ChildGroupQuery The current query, for fluid interface */ - public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN) + public function joinWithI18n($locale = 'en_EN', $joinType = Criteria::LEFT_JOIN) { $this ->joinI18n($locale, null, $joinType) @@ -930,7 +930,7 @@ abstract class GroupQuery extends ModelCriteria * * @return ChildGroupI18nQuery A secondary query class using the current class as primary query */ - public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function useI18nQuery($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { return $this ->joinI18n($locale, $relationAlias, $joinType) diff --git a/core/lib/Thelia/Model/Base/Message.php b/core/lib/Thelia/Model/Base/Message.php index a2327f388..f39e4ecbe 100644 --- a/core/lib/Thelia/Model/Base/Message.php +++ b/core/lib/Thelia/Model/Base/Message.php @@ -141,7 +141,7 @@ abstract class Message implements ActiveRecordInterface * Current locale * @var string */ - protected $currentLocale = 'en_US'; + protected $currentLocale = 'en_EN'; /** * Current translation objects @@ -2056,7 +2056,7 @@ abstract class Message implements ActiveRecordInterface } // if ($deep) // i18n behavior - $this->currentLocale = 'en_US'; + $this->currentLocale = 'en_EN'; $this->currentTranslations = null; if ($this->collMessageI18ns instanceof Collection) { @@ -2102,7 +2102,7 @@ abstract class Message implements ActiveRecordInterface * * @return ChildMessage The current object (for fluent API support) */ - public function setLocale($locale = 'en_US') + public function setLocale($locale = 'en_EN') { $this->currentLocale = $locale; @@ -2126,7 +2126,7 @@ abstract class Message implements ActiveRecordInterface * @param ConnectionInterface $con an optional connection object * * @return ChildMessageI18n */ - public function getTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function getTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!isset($this->currentTranslations[$locale])) { if (null !== $this->collMessageI18ns) { @@ -2161,7 +2161,7 @@ abstract class Message implements ActiveRecordInterface * * @return ChildMessage The current object (for fluent API support) */ - public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function removeTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!$this->isNew()) { ChildMessageI18nQuery::create() diff --git a/core/lib/Thelia/Model/Base/MessageI18n.php b/core/lib/Thelia/Model/Base/MessageI18n.php index 4d1a532fe..545e75244 100644 --- a/core/lib/Thelia/Model/Base/MessageI18n.php +++ b/core/lib/Thelia/Model/Base/MessageI18n.php @@ -61,7 +61,7 @@ abstract class MessageI18n implements ActiveRecordInterface /** * The value for the locale field. - * Note: this column has a database default value of: 'en_US' + * Note: this column has a database default value of: 'en_EN' * @var string */ protected $locale; @@ -105,7 +105,7 @@ abstract class MessageI18n implements ActiveRecordInterface */ public function applyDefaultValues() { - $this->locale = 'en_US'; + $this->locale = 'en_EN'; } /** @@ -538,7 +538,7 @@ abstract class MessageI18n implements ActiveRecordInterface */ public function hasOnlyDefaultValues() { - if ($this->locale !== 'en_US') { + if ($this->locale !== 'en_EN') { return false; } diff --git a/core/lib/Thelia/Model/Base/MessageQuery.php b/core/lib/Thelia/Model/Base/MessageQuery.php index cf0155f36..938a16aab 100644 --- a/core/lib/Thelia/Model/Base/MessageQuery.php +++ b/core/lib/Thelia/Model/Base/MessageQuery.php @@ -913,7 +913,7 @@ abstract class MessageQuery extends ModelCriteria * * @return ChildMessageQuery The current query, for fluid interface */ - public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function joinI18n($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { $relationName = $relationAlias ? $relationAlias : 'MessageI18n'; @@ -931,7 +931,7 @@ abstract class MessageQuery extends ModelCriteria * * @return ChildMessageQuery The current query, for fluid interface */ - public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN) + public function joinWithI18n($locale = 'en_EN', $joinType = Criteria::LEFT_JOIN) { $this ->joinI18n($locale, null, $joinType) @@ -952,7 +952,7 @@ abstract class MessageQuery extends ModelCriteria * * @return ChildMessageI18nQuery A secondary query class using the current class as primary query */ - public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function useI18nQuery($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { return $this ->joinI18n($locale, $relationAlias, $joinType) diff --git a/core/lib/Thelia/Model/Base/Module.php b/core/lib/Thelia/Model/Base/Module.php index c1ee2ed8d..ebe4b4c18 100644 --- a/core/lib/Thelia/Model/Base/Module.php +++ b/core/lib/Thelia/Model/Base/Module.php @@ -127,7 +127,7 @@ abstract class Module implements ActiveRecordInterface * Current locale * @var string */ - protected $currentLocale = 'en_US'; + protected $currentLocale = 'en_EN'; /** * Current translation objects @@ -1910,7 +1910,7 @@ abstract class Module implements ActiveRecordInterface } // if ($deep) // i18n behavior - $this->currentLocale = 'en_US'; + $this->currentLocale = 'en_EN'; $this->currentTranslations = null; if ($this->collGroupModules instanceof Collection) { @@ -1956,7 +1956,7 @@ abstract class Module implements ActiveRecordInterface * * @return ChildModule The current object (for fluent API support) */ - public function setLocale($locale = 'en_US') + public function setLocale($locale = 'en_EN') { $this->currentLocale = $locale; @@ -1980,7 +1980,7 @@ abstract class Module implements ActiveRecordInterface * @param ConnectionInterface $con an optional connection object * * @return ChildModuleI18n */ - public function getTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function getTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!isset($this->currentTranslations[$locale])) { if (null !== $this->collModuleI18ns) { @@ -2015,7 +2015,7 @@ abstract class Module implements ActiveRecordInterface * * @return ChildModule The current object (for fluent API support) */ - public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function removeTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!$this->isNew()) { ChildModuleI18nQuery::create() diff --git a/core/lib/Thelia/Model/Base/ModuleI18n.php b/core/lib/Thelia/Model/Base/ModuleI18n.php index fbb4293ba..54cf305e4 100644 --- a/core/lib/Thelia/Model/Base/ModuleI18n.php +++ b/core/lib/Thelia/Model/Base/ModuleI18n.php @@ -61,7 +61,7 @@ abstract class ModuleI18n implements ActiveRecordInterface /** * The value for the locale field. - * Note: this column has a database default value of: 'en_US' + * Note: this column has a database default value of: 'en_EN' * @var string */ protected $locale; @@ -111,7 +111,7 @@ abstract class ModuleI18n implements ActiveRecordInterface */ public function applyDefaultValues() { - $this->locale = 'en_US'; + $this->locale = 'en_EN'; } /** @@ -576,7 +576,7 @@ abstract class ModuleI18n implements ActiveRecordInterface */ public function hasOnlyDefaultValues() { - if ($this->locale !== 'en_US') { + if ($this->locale !== 'en_EN') { return false; } diff --git a/core/lib/Thelia/Model/Base/ModuleQuery.php b/core/lib/Thelia/Model/Base/ModuleQuery.php index e1bd9de68..7db21ca22 100644 --- a/core/lib/Thelia/Model/Base/ModuleQuery.php +++ b/core/lib/Thelia/Model/Base/ModuleQuery.php @@ -838,7 +838,7 @@ abstract class ModuleQuery extends ModelCriteria * * @return ChildModuleQuery The current query, for fluid interface */ - public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function joinI18n($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { $relationName = $relationAlias ? $relationAlias : 'ModuleI18n'; @@ -856,7 +856,7 @@ abstract class ModuleQuery extends ModelCriteria * * @return ChildModuleQuery The current query, for fluid interface */ - public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN) + public function joinWithI18n($locale = 'en_EN', $joinType = Criteria::LEFT_JOIN) { $this ->joinI18n($locale, null, $joinType) @@ -877,7 +877,7 @@ abstract class ModuleQuery extends ModelCriteria * * @return ChildModuleI18nQuery A secondary query class using the current class as primary query */ - public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function useI18nQuery($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { return $this ->joinI18n($locale, $relationAlias, $joinType) diff --git a/core/lib/Thelia/Model/Base/Order.php b/core/lib/Thelia/Model/Base/Order.php index b815aff34..ccf7922f3 100644 --- a/core/lib/Thelia/Model/Base/Order.php +++ b/core/lib/Thelia/Model/Base/Order.php @@ -2842,6 +2842,31 @@ abstract class Order implements ActiveRecordInterface return $this; } + + /** + * If this collection has already been initialized with + * an identical criteria, it returns the collection. + * Otherwise if this Order is new, it will return + * an empty collection; or if this Order has previously + * been saved, it will retrieve related CouponOrders from storage. + * + * This method is protected by default in order to keep the public + * api reasonable. You can provide public methods for those you + * actually need in Order. + * + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @return Collection|ChildCouponOrder[] List of ChildCouponOrder objects + */ + public function getCouponOrdersJoinCoupon($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) + { + $query = ChildCouponOrderQuery::create(null, $criteria); + $query->joinWith('Coupon', $joinBehavior); + + return $this->getCouponOrders($query, $con); + } + /** * Clears the current object and sets all attributes to their default values */ diff --git a/core/lib/Thelia/Model/Base/OrderStatus.php b/core/lib/Thelia/Model/Base/OrderStatus.php index fc4a224d1..15ce7fbf7 100644 --- a/core/lib/Thelia/Model/Base/OrderStatus.php +++ b/core/lib/Thelia/Model/Base/OrderStatus.php @@ -109,7 +109,7 @@ abstract class OrderStatus implements ActiveRecordInterface * Current locale * @var string */ - protected $currentLocale = 'en_US'; + protected $currentLocale = 'en_EN'; /** * Current translation objects @@ -1812,7 +1812,7 @@ abstract class OrderStatus implements ActiveRecordInterface } // if ($deep) // i18n behavior - $this->currentLocale = 'en_US'; + $this->currentLocale = 'en_EN'; $this->currentTranslations = null; if ($this->collOrders instanceof Collection) { @@ -1858,7 +1858,7 @@ abstract class OrderStatus implements ActiveRecordInterface * * @return ChildOrderStatus The current object (for fluent API support) */ - public function setLocale($locale = 'en_US') + public function setLocale($locale = 'en_EN') { $this->currentLocale = $locale; @@ -1882,7 +1882,7 @@ abstract class OrderStatus implements ActiveRecordInterface * @param ConnectionInterface $con an optional connection object * * @return ChildOrderStatusI18n */ - public function getTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function getTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!isset($this->currentTranslations[$locale])) { if (null !== $this->collOrderStatusI18ns) { @@ -1917,7 +1917,7 @@ abstract class OrderStatus implements ActiveRecordInterface * * @return ChildOrderStatus The current object (for fluent API support) */ - public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function removeTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!$this->isNew()) { ChildOrderStatusI18nQuery::create() diff --git a/core/lib/Thelia/Model/Base/OrderStatusI18n.php b/core/lib/Thelia/Model/Base/OrderStatusI18n.php index 76ec4a28a..1f98739f0 100644 --- a/core/lib/Thelia/Model/Base/OrderStatusI18n.php +++ b/core/lib/Thelia/Model/Base/OrderStatusI18n.php @@ -61,7 +61,7 @@ abstract class OrderStatusI18n implements ActiveRecordInterface /** * The value for the locale field. - * Note: this column has a database default value of: 'en_US' + * Note: this column has a database default value of: 'en_EN' * @var string */ protected $locale; @@ -111,7 +111,7 @@ abstract class OrderStatusI18n implements ActiveRecordInterface */ public function applyDefaultValues() { - $this->locale = 'en_US'; + $this->locale = 'en_EN'; } /** @@ -576,7 +576,7 @@ abstract class OrderStatusI18n implements ActiveRecordInterface */ public function hasOnlyDefaultValues() { - if ($this->locale !== 'en_US') { + if ($this->locale !== 'en_EN') { return false; } diff --git a/core/lib/Thelia/Model/Base/OrderStatusQuery.php b/core/lib/Thelia/Model/Base/OrderStatusQuery.php index 908efd6b6..07fcdb8dc 100644 --- a/core/lib/Thelia/Model/Base/OrderStatusQuery.php +++ b/core/lib/Thelia/Model/Base/OrderStatusQuery.php @@ -703,7 +703,7 @@ abstract class OrderStatusQuery extends ModelCriteria * * @return ChildOrderStatusQuery The current query, for fluid interface */ - public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function joinI18n($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { $relationName = $relationAlias ? $relationAlias : 'OrderStatusI18n'; @@ -721,7 +721,7 @@ abstract class OrderStatusQuery extends ModelCriteria * * @return ChildOrderStatusQuery The current query, for fluid interface */ - public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN) + public function joinWithI18n($locale = 'en_EN', $joinType = Criteria::LEFT_JOIN) { $this ->joinI18n($locale, null, $joinType) @@ -742,7 +742,7 @@ abstract class OrderStatusQuery extends ModelCriteria * * @return ChildOrderStatusI18nQuery A secondary query class using the current class as primary query */ - public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function useI18nQuery($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { return $this ->joinI18n($locale, $relationAlias, $joinType) diff --git a/core/lib/Thelia/Model/Base/Product.php b/core/lib/Thelia/Model/Base/Product.php index 9a1828e25..905436e1f 100644 --- a/core/lib/Thelia/Model/Base/Product.php +++ b/core/lib/Thelia/Model/Base/Product.php @@ -250,7 +250,7 @@ abstract class Product implements ActiveRecordInterface * Current locale * @var string */ - protected $currentLocale = 'en_US'; + protected $currentLocale = 'en_EN'; /** * Current translation objects @@ -5815,7 +5815,7 @@ abstract class Product implements ActiveRecordInterface } // if ($deep) // i18n behavior - $this->currentLocale = 'en_US'; + $this->currentLocale = 'en_EN'; $this->currentTranslations = null; if ($this->collProductCategories instanceof Collection) { @@ -5914,7 +5914,7 @@ abstract class Product implements ActiveRecordInterface * * @return ChildProduct The current object (for fluent API support) */ - public function setLocale($locale = 'en_US') + public function setLocale($locale = 'en_EN') { $this->currentLocale = $locale; @@ -5938,7 +5938,7 @@ abstract class Product implements ActiveRecordInterface * @param ConnectionInterface $con an optional connection object * * @return ChildProductI18n */ - public function getTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function getTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!isset($this->currentTranslations[$locale])) { if (null !== $this->collProductI18ns) { @@ -5973,7 +5973,7 @@ abstract class Product implements ActiveRecordInterface * * @return ChildProduct The current object (for fluent API support) */ - public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function removeTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!$this->isNew()) { ChildProductI18nQuery::create() diff --git a/core/lib/Thelia/Model/Base/ProductDocument.php b/core/lib/Thelia/Model/Base/ProductDocument.php index 58c9999ed..16503b9fb 100644 --- a/core/lib/Thelia/Model/Base/ProductDocument.php +++ b/core/lib/Thelia/Model/Base/ProductDocument.php @@ -120,7 +120,7 @@ abstract class ProductDocument implements ActiveRecordInterface * Current locale * @var string */ - protected $currentLocale = 'en_US'; + protected $currentLocale = 'en_EN'; /** * Current translation objects @@ -1640,7 +1640,7 @@ abstract class ProductDocument implements ActiveRecordInterface } // if ($deep) // i18n behavior - $this->currentLocale = 'en_US'; + $this->currentLocale = 'en_EN'; $this->currentTranslations = null; if ($this->collProductDocumentI18ns instanceof Collection) { @@ -1683,7 +1683,7 @@ abstract class ProductDocument implements ActiveRecordInterface * * @return ChildProductDocument The current object (for fluent API support) */ - public function setLocale($locale = 'en_US') + public function setLocale($locale = 'en_EN') { $this->currentLocale = $locale; @@ -1707,7 +1707,7 @@ abstract class ProductDocument implements ActiveRecordInterface * @param ConnectionInterface $con an optional connection object * * @return ChildProductDocumentI18n */ - public function getTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function getTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!isset($this->currentTranslations[$locale])) { if (null !== $this->collProductDocumentI18ns) { @@ -1742,7 +1742,7 @@ abstract class ProductDocument implements ActiveRecordInterface * * @return ChildProductDocument The current object (for fluent API support) */ - public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function removeTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!$this->isNew()) { ChildProductDocumentI18nQuery::create() diff --git a/core/lib/Thelia/Model/Base/ProductDocumentI18n.php b/core/lib/Thelia/Model/Base/ProductDocumentI18n.php index 2c5ca4d0c..f6c8436f8 100644 --- a/core/lib/Thelia/Model/Base/ProductDocumentI18n.php +++ b/core/lib/Thelia/Model/Base/ProductDocumentI18n.php @@ -61,7 +61,7 @@ abstract class ProductDocumentI18n implements ActiveRecordInterface /** * The value for the locale field. - * Note: this column has a database default value of: 'en_US' + * Note: this column has a database default value of: 'en_EN' * @var string */ protected $locale; @@ -111,7 +111,7 @@ abstract class ProductDocumentI18n implements ActiveRecordInterface */ public function applyDefaultValues() { - $this->locale = 'en_US'; + $this->locale = 'en_EN'; } /** @@ -576,7 +576,7 @@ abstract class ProductDocumentI18n implements ActiveRecordInterface */ public function hasOnlyDefaultValues() { - if ($this->locale !== 'en_US') { + if ($this->locale !== 'en_EN') { return false; } diff --git a/core/lib/Thelia/Model/Base/ProductDocumentQuery.php b/core/lib/Thelia/Model/Base/ProductDocumentQuery.php index 06af05a9c..32321554d 100644 --- a/core/lib/Thelia/Model/Base/ProductDocumentQuery.php +++ b/core/lib/Thelia/Model/Base/ProductDocumentQuery.php @@ -797,7 +797,7 @@ abstract class ProductDocumentQuery extends ModelCriteria * * @return ChildProductDocumentQuery The current query, for fluid interface */ - public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function joinI18n($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { $relationName = $relationAlias ? $relationAlias : 'ProductDocumentI18n'; @@ -815,7 +815,7 @@ abstract class ProductDocumentQuery extends ModelCriteria * * @return ChildProductDocumentQuery The current query, for fluid interface */ - public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN) + public function joinWithI18n($locale = 'en_EN', $joinType = Criteria::LEFT_JOIN) { $this ->joinI18n($locale, null, $joinType) @@ -836,7 +836,7 @@ abstract class ProductDocumentQuery extends ModelCriteria * * @return ChildProductDocumentI18nQuery A secondary query class using the current class as primary query */ - public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function useI18nQuery($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { return $this ->joinI18n($locale, $relationAlias, $joinType) diff --git a/core/lib/Thelia/Model/Base/ProductI18n.php b/core/lib/Thelia/Model/Base/ProductI18n.php index b0c74bb54..7b6e65976 100644 --- a/core/lib/Thelia/Model/Base/ProductI18n.php +++ b/core/lib/Thelia/Model/Base/ProductI18n.php @@ -61,7 +61,7 @@ abstract class ProductI18n implements ActiveRecordInterface /** * The value for the locale field. - * Note: this column has a database default value of: 'en_US' + * Note: this column has a database default value of: 'en_EN' * @var string */ protected $locale; @@ -111,7 +111,7 @@ abstract class ProductI18n implements ActiveRecordInterface */ public function applyDefaultValues() { - $this->locale = 'en_US'; + $this->locale = 'en_EN'; } /** @@ -576,7 +576,7 @@ abstract class ProductI18n implements ActiveRecordInterface */ public function hasOnlyDefaultValues() { - if ($this->locale !== 'en_US') { + if ($this->locale !== 'en_EN') { return false; } diff --git a/core/lib/Thelia/Model/Base/ProductImage.php b/core/lib/Thelia/Model/Base/ProductImage.php index 0b4030ccb..364e6f00b 100644 --- a/core/lib/Thelia/Model/Base/ProductImage.php +++ b/core/lib/Thelia/Model/Base/ProductImage.php @@ -120,7 +120,7 @@ abstract class ProductImage implements ActiveRecordInterface * Current locale * @var string */ - protected $currentLocale = 'en_US'; + protected $currentLocale = 'en_EN'; /** * Current translation objects @@ -1640,7 +1640,7 @@ abstract class ProductImage implements ActiveRecordInterface } // if ($deep) // i18n behavior - $this->currentLocale = 'en_US'; + $this->currentLocale = 'en_EN'; $this->currentTranslations = null; if ($this->collProductImageI18ns instanceof Collection) { @@ -1683,7 +1683,7 @@ abstract class ProductImage implements ActiveRecordInterface * * @return ChildProductImage The current object (for fluent API support) */ - public function setLocale($locale = 'en_US') + public function setLocale($locale = 'en_EN') { $this->currentLocale = $locale; @@ -1707,7 +1707,7 @@ abstract class ProductImage implements ActiveRecordInterface * @param ConnectionInterface $con an optional connection object * * @return ChildProductImageI18n */ - public function getTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function getTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!isset($this->currentTranslations[$locale])) { if (null !== $this->collProductImageI18ns) { @@ -1742,7 +1742,7 @@ abstract class ProductImage implements ActiveRecordInterface * * @return ChildProductImage The current object (for fluent API support) */ - public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function removeTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!$this->isNew()) { ChildProductImageI18nQuery::create() diff --git a/core/lib/Thelia/Model/Base/ProductImageI18n.php b/core/lib/Thelia/Model/Base/ProductImageI18n.php index 634f726a3..064f09986 100644 --- a/core/lib/Thelia/Model/Base/ProductImageI18n.php +++ b/core/lib/Thelia/Model/Base/ProductImageI18n.php @@ -61,7 +61,7 @@ abstract class ProductImageI18n implements ActiveRecordInterface /** * The value for the locale field. - * Note: this column has a database default value of: 'en_US' + * Note: this column has a database default value of: 'en_EN' * @var string */ protected $locale; @@ -111,7 +111,7 @@ abstract class ProductImageI18n implements ActiveRecordInterface */ public function applyDefaultValues() { - $this->locale = 'en_US'; + $this->locale = 'en_EN'; } /** @@ -576,7 +576,7 @@ abstract class ProductImageI18n implements ActiveRecordInterface */ public function hasOnlyDefaultValues() { - if ($this->locale !== 'en_US') { + if ($this->locale !== 'en_EN') { return false; } diff --git a/core/lib/Thelia/Model/Base/ProductImageQuery.php b/core/lib/Thelia/Model/Base/ProductImageQuery.php index 94cb1b361..e351c6f40 100644 --- a/core/lib/Thelia/Model/Base/ProductImageQuery.php +++ b/core/lib/Thelia/Model/Base/ProductImageQuery.php @@ -797,7 +797,7 @@ abstract class ProductImageQuery extends ModelCriteria * * @return ChildProductImageQuery The current query, for fluid interface */ - public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function joinI18n($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { $relationName = $relationAlias ? $relationAlias : 'ProductImageI18n'; @@ -815,7 +815,7 @@ abstract class ProductImageQuery extends ModelCriteria * * @return ChildProductImageQuery The current query, for fluid interface */ - public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN) + public function joinWithI18n($locale = 'en_EN', $joinType = Criteria::LEFT_JOIN) { $this ->joinI18n($locale, null, $joinType) @@ -836,7 +836,7 @@ abstract class ProductImageQuery extends ModelCriteria * * @return ChildProductImageI18nQuery A secondary query class using the current class as primary query */ - public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function useI18nQuery($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { return $this ->joinI18n($locale, $relationAlias, $joinType) diff --git a/core/lib/Thelia/Model/Base/ProductQuery.php b/core/lib/Thelia/Model/Base/ProductQuery.php index 3df8ecbae..9d4685f38 100644 --- a/core/lib/Thelia/Model/Base/ProductQuery.php +++ b/core/lib/Thelia/Model/Base/ProductQuery.php @@ -1872,7 +1872,7 @@ abstract class ProductQuery extends ModelCriteria * * @return ChildProductQuery The current query, for fluid interface */ - public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function joinI18n($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { $relationName = $relationAlias ? $relationAlias : 'ProductI18n'; @@ -1890,7 +1890,7 @@ abstract class ProductQuery extends ModelCriteria * * @return ChildProductQuery The current query, for fluid interface */ - public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN) + public function joinWithI18n($locale = 'en_EN', $joinType = Criteria::LEFT_JOIN) { $this ->joinI18n($locale, null, $joinType) @@ -1911,7 +1911,7 @@ abstract class ProductQuery extends ModelCriteria * * @return ChildProductI18nQuery A secondary query class using the current class as primary query */ - public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function useI18nQuery($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { return $this ->joinI18n($locale, $relationAlias, $joinType) diff --git a/core/lib/Thelia/Model/Base/Resource.php b/core/lib/Thelia/Model/Base/Resource.php index c6c527134..827de2643 100644 --- a/core/lib/Thelia/Model/Base/Resource.php +++ b/core/lib/Thelia/Model/Base/Resource.php @@ -116,7 +116,7 @@ abstract class Resource implements ActiveRecordInterface * Current locale * @var string */ - protected $currentLocale = 'en_US'; + protected $currentLocale = 'en_EN'; /** * Current translation objects @@ -1968,7 +1968,7 @@ abstract class Resource implements ActiveRecordInterface } // if ($deep) // i18n behavior - $this->currentLocale = 'en_US'; + $this->currentLocale = 'en_EN'; $this->currentTranslations = null; if ($this->collGroupResources instanceof Collection) { @@ -2018,7 +2018,7 @@ abstract class Resource implements ActiveRecordInterface * * @return ChildResource The current object (for fluent API support) */ - public function setLocale($locale = 'en_US') + public function setLocale($locale = 'en_EN') { $this->currentLocale = $locale; @@ -2042,7 +2042,7 @@ abstract class Resource implements ActiveRecordInterface * @param ConnectionInterface $con an optional connection object * * @return ChildResourceI18n */ - public function getTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function getTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!isset($this->currentTranslations[$locale])) { if (null !== $this->collResourceI18ns) { @@ -2077,7 +2077,7 @@ abstract class Resource implements ActiveRecordInterface * * @return ChildResource The current object (for fluent API support) */ - public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function removeTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!$this->isNew()) { ChildResourceI18nQuery::create() diff --git a/core/lib/Thelia/Model/Base/ResourceI18n.php b/core/lib/Thelia/Model/Base/ResourceI18n.php index c060e8776..b740bd858 100644 --- a/core/lib/Thelia/Model/Base/ResourceI18n.php +++ b/core/lib/Thelia/Model/Base/ResourceI18n.php @@ -61,7 +61,7 @@ abstract class ResourceI18n implements ActiveRecordInterface /** * The value for the locale field. - * Note: this column has a database default value of: 'en_US' + * Note: this column has a database default value of: 'en_EN' * @var string */ protected $locale; @@ -111,7 +111,7 @@ abstract class ResourceI18n implements ActiveRecordInterface */ public function applyDefaultValues() { - $this->locale = 'en_US'; + $this->locale = 'en_EN'; } /** @@ -576,7 +576,7 @@ abstract class ResourceI18n implements ActiveRecordInterface */ public function hasOnlyDefaultValues() { - if ($this->locale !== 'en_US') { + if ($this->locale !== 'en_EN') { return false; } diff --git a/core/lib/Thelia/Model/Base/ResourceQuery.php b/core/lib/Thelia/Model/Base/ResourceQuery.php index 6559d6522..e12ee8f53 100644 --- a/core/lib/Thelia/Model/Base/ResourceQuery.php +++ b/core/lib/Thelia/Model/Base/ResourceQuery.php @@ -720,7 +720,7 @@ abstract class ResourceQuery extends ModelCriteria * * @return ChildResourceQuery The current query, for fluid interface */ - public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function joinI18n($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { $relationName = $relationAlias ? $relationAlias : 'ResourceI18n'; @@ -738,7 +738,7 @@ abstract class ResourceQuery extends ModelCriteria * * @return ChildResourceQuery The current query, for fluid interface */ - public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN) + public function joinWithI18n($locale = 'en_EN', $joinType = Criteria::LEFT_JOIN) { $this ->joinI18n($locale, null, $joinType) @@ -759,7 +759,7 @@ abstract class ResourceQuery extends ModelCriteria * * @return ChildResourceI18nQuery A secondary query class using the current class as primary query */ - public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function useI18nQuery($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { return $this ->joinI18n($locale, $relationAlias, $joinType) diff --git a/core/lib/Thelia/Model/Base/Tax.php b/core/lib/Thelia/Model/Base/Tax.php index 3e405414c..f3717366f 100644 --- a/core/lib/Thelia/Model/Base/Tax.php +++ b/core/lib/Thelia/Model/Base/Tax.php @@ -109,7 +109,7 @@ abstract class Tax implements ActiveRecordInterface * Current locale * @var string */ - protected $currentLocale = 'en_US'; + protected $currentLocale = 'en_EN'; /** * Current translation objects @@ -1762,7 +1762,7 @@ abstract class Tax implements ActiveRecordInterface } // if ($deep) // i18n behavior - $this->currentLocale = 'en_US'; + $this->currentLocale = 'en_EN'; $this->currentTranslations = null; if ($this->collTaxRuleCountries instanceof Collection) { @@ -1808,7 +1808,7 @@ abstract class Tax implements ActiveRecordInterface * * @return ChildTax The current object (for fluent API support) */ - public function setLocale($locale = 'en_US') + public function setLocale($locale = 'en_EN') { $this->currentLocale = $locale; @@ -1832,7 +1832,7 @@ abstract class Tax implements ActiveRecordInterface * @param ConnectionInterface $con an optional connection object * * @return ChildTaxI18n */ - public function getTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function getTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!isset($this->currentTranslations[$locale])) { if (null !== $this->collTaxI18ns) { @@ -1867,7 +1867,7 @@ abstract class Tax implements ActiveRecordInterface * * @return ChildTax The current object (for fluent API support) */ - public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function removeTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!$this->isNew()) { ChildTaxI18nQuery::create() diff --git a/core/lib/Thelia/Model/Base/TaxI18n.php b/core/lib/Thelia/Model/Base/TaxI18n.php index f8577e860..8fdec086d 100644 --- a/core/lib/Thelia/Model/Base/TaxI18n.php +++ b/core/lib/Thelia/Model/Base/TaxI18n.php @@ -61,7 +61,7 @@ abstract class TaxI18n implements ActiveRecordInterface /** * The value for the locale field. - * Note: this column has a database default value of: 'en_US' + * Note: this column has a database default value of: 'en_EN' * @var string */ protected $locale; @@ -99,7 +99,7 @@ abstract class TaxI18n implements ActiveRecordInterface */ public function applyDefaultValues() { - $this->locale = 'en_US'; + $this->locale = 'en_EN'; } /** @@ -500,7 +500,7 @@ abstract class TaxI18n implements ActiveRecordInterface */ public function hasOnlyDefaultValues() { - if ($this->locale !== 'en_US') { + if ($this->locale !== 'en_EN') { return false; } diff --git a/core/lib/Thelia/Model/Base/TaxQuery.php b/core/lib/Thelia/Model/Base/TaxQuery.php index 307ace57c..0a61cbb3c 100644 --- a/core/lib/Thelia/Model/Base/TaxQuery.php +++ b/core/lib/Thelia/Model/Base/TaxQuery.php @@ -715,7 +715,7 @@ abstract class TaxQuery extends ModelCriteria * * @return ChildTaxQuery The current query, for fluid interface */ - public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function joinI18n($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { $relationName = $relationAlias ? $relationAlias : 'TaxI18n'; @@ -733,7 +733,7 @@ abstract class TaxQuery extends ModelCriteria * * @return ChildTaxQuery The current query, for fluid interface */ - public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN) + public function joinWithI18n($locale = 'en_EN', $joinType = Criteria::LEFT_JOIN) { $this ->joinI18n($locale, null, $joinType) @@ -754,7 +754,7 @@ abstract class TaxQuery extends ModelCriteria * * @return ChildTaxI18nQuery A secondary query class using the current class as primary query */ - public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function useI18nQuery($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { return $this ->joinI18n($locale, $relationAlias, $joinType) diff --git a/core/lib/Thelia/Model/Base/TaxRule.php b/core/lib/Thelia/Model/Base/TaxRule.php index bf318498c..101471313 100644 --- a/core/lib/Thelia/Model/Base/TaxRule.php +++ b/core/lib/Thelia/Model/Base/TaxRule.php @@ -129,7 +129,7 @@ abstract class TaxRule implements ActiveRecordInterface * Current locale * @var string */ - protected $currentLocale = 'en_US'; + protected $currentLocale = 'en_EN'; /** * Current translation objects @@ -2146,7 +2146,7 @@ abstract class TaxRule implements ActiveRecordInterface } // if ($deep) // i18n behavior - $this->currentLocale = 'en_US'; + $this->currentLocale = 'en_EN'; $this->currentTranslations = null; if ($this->collProducts instanceof Collection) { @@ -2196,7 +2196,7 @@ abstract class TaxRule implements ActiveRecordInterface * * @return ChildTaxRule The current object (for fluent API support) */ - public function setLocale($locale = 'en_US') + public function setLocale($locale = 'en_EN') { $this->currentLocale = $locale; @@ -2220,7 +2220,7 @@ abstract class TaxRule implements ActiveRecordInterface * @param ConnectionInterface $con an optional connection object * * @return ChildTaxRuleI18n */ - public function getTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function getTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!isset($this->currentTranslations[$locale])) { if (null !== $this->collTaxRuleI18ns) { @@ -2255,7 +2255,7 @@ abstract class TaxRule implements ActiveRecordInterface * * @return ChildTaxRule The current object (for fluent API support) */ - public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function removeTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!$this->isNew()) { ChildTaxRuleI18nQuery::create() diff --git a/core/lib/Thelia/Model/Base/TaxRuleI18n.php b/core/lib/Thelia/Model/Base/TaxRuleI18n.php index 51bab6a77..86215b335 100644 --- a/core/lib/Thelia/Model/Base/TaxRuleI18n.php +++ b/core/lib/Thelia/Model/Base/TaxRuleI18n.php @@ -61,7 +61,7 @@ abstract class TaxRuleI18n implements ActiveRecordInterface /** * The value for the locale field. - * Note: this column has a database default value of: 'en_US' + * Note: this column has a database default value of: 'en_EN' * @var string */ protected $locale; @@ -87,7 +87,7 @@ abstract class TaxRuleI18n implements ActiveRecordInterface */ public function applyDefaultValues() { - $this->locale = 'en_US'; + $this->locale = 'en_EN'; } /** @@ -424,7 +424,7 @@ abstract class TaxRuleI18n implements ActiveRecordInterface */ public function hasOnlyDefaultValues() { - if ($this->locale !== 'en_US') { + if ($this->locale !== 'en_EN') { return false; } diff --git a/core/lib/Thelia/Model/Base/TaxRuleQuery.php b/core/lib/Thelia/Model/Base/TaxRuleQuery.php index 2fb478b7a..36f2edd99 100644 --- a/core/lib/Thelia/Model/Base/TaxRuleQuery.php +++ b/core/lib/Thelia/Model/Base/TaxRuleQuery.php @@ -846,7 +846,7 @@ abstract class TaxRuleQuery extends ModelCriteria * * @return ChildTaxRuleQuery The current query, for fluid interface */ - public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function joinI18n($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { $relationName = $relationAlias ? $relationAlias : 'TaxRuleI18n'; @@ -864,7 +864,7 @@ abstract class TaxRuleQuery extends ModelCriteria * * @return ChildTaxRuleQuery The current query, for fluid interface */ - public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN) + public function joinWithI18n($locale = 'en_EN', $joinType = Criteria::LEFT_JOIN) { $this ->joinI18n($locale, null, $joinType) @@ -885,7 +885,7 @@ abstract class TaxRuleQuery extends ModelCriteria * * @return ChildTaxRuleI18nQuery A secondary query class using the current class as primary query */ - public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function useI18nQuery($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { return $this ->joinI18n($locale, $relationAlias, $joinType) diff --git a/core/lib/Thelia/Model/Map/AttributeAvI18nTableMap.php b/core/lib/Thelia/Model/Map/AttributeAvI18nTableMap.php index 02a20540e..14fc79eeb 100644 --- a/core/lib/Thelia/Model/Map/AttributeAvI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/AttributeAvI18nTableMap.php @@ -151,7 +151,7 @@ class AttributeAvI18nTableMap extends TableMap $this->setUseIdGenerator(false); // columns $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'attribute_av', 'ID', true, null, null); - $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US'); + $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN'); $this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null); $this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null); $this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null); diff --git a/core/lib/Thelia/Model/Map/AttributeAvTableMap.php b/core/lib/Thelia/Model/Map/AttributeAvTableMap.php index 0c5c2e1c9..138f0fa9c 100644 --- a/core/lib/Thelia/Model/Map/AttributeAvTableMap.php +++ b/core/lib/Thelia/Model/Map/AttributeAvTableMap.php @@ -106,7 +106,7 @@ class AttributeAvTableMap extends TableMap * * @var string */ - const DEFAULT_LOCALE = 'en_US'; + const DEFAULT_LOCALE = 'en_EN'; /** * holds an array of fieldnames diff --git a/core/lib/Thelia/Model/Map/AttributeI18nTableMap.php b/core/lib/Thelia/Model/Map/AttributeI18nTableMap.php index 8471d3e26..b60cae5b8 100644 --- a/core/lib/Thelia/Model/Map/AttributeI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/AttributeI18nTableMap.php @@ -151,7 +151,7 @@ class AttributeI18nTableMap extends TableMap $this->setUseIdGenerator(false); // columns $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'attribute', 'ID', true, null, null); - $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US'); + $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN'); $this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null); $this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null); $this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null); diff --git a/core/lib/Thelia/Model/Map/AttributeTableMap.php b/core/lib/Thelia/Model/Map/AttributeTableMap.php index 773e13cab..dca811cbc 100644 --- a/core/lib/Thelia/Model/Map/AttributeTableMap.php +++ b/core/lib/Thelia/Model/Map/AttributeTableMap.php @@ -101,7 +101,7 @@ class AttributeTableMap extends TableMap * * @var string */ - const DEFAULT_LOCALE = 'en_US'; + const DEFAULT_LOCALE = 'en_EN'; /** * holds an array of fieldnames diff --git a/core/lib/Thelia/Model/Map/CategoryDocumentI18nTableMap.php b/core/lib/Thelia/Model/Map/CategoryDocumentI18nTableMap.php index 956afae4a..1ad7dfe2f 100644 --- a/core/lib/Thelia/Model/Map/CategoryDocumentI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/CategoryDocumentI18nTableMap.php @@ -151,7 +151,7 @@ class CategoryDocumentI18nTableMap extends TableMap $this->setUseIdGenerator(false); // columns $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'category_document', 'ID', true, null, null); - $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US'); + $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN'); $this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null); $this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null); $this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null); diff --git a/core/lib/Thelia/Model/Map/CategoryDocumentTableMap.php b/core/lib/Thelia/Model/Map/CategoryDocumentTableMap.php index 8b307ea1e..83e748a1e 100644 --- a/core/lib/Thelia/Model/Map/CategoryDocumentTableMap.php +++ b/core/lib/Thelia/Model/Map/CategoryDocumentTableMap.php @@ -111,7 +111,7 @@ class CategoryDocumentTableMap extends TableMap * * @var string */ - const DEFAULT_LOCALE = 'en_US'; + const DEFAULT_LOCALE = 'en_EN'; /** * holds an array of fieldnames diff --git a/core/lib/Thelia/Model/Map/CategoryI18nTableMap.php b/core/lib/Thelia/Model/Map/CategoryI18nTableMap.php index 8c52aa7b2..1611b2ebf 100644 --- a/core/lib/Thelia/Model/Map/CategoryI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/CategoryI18nTableMap.php @@ -151,7 +151,7 @@ class CategoryI18nTableMap extends TableMap $this->setUseIdGenerator(false); // columns $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'category', 'ID', true, null, null); - $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US'); + $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN'); $this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null); $this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null); $this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null); diff --git a/core/lib/Thelia/Model/Map/CategoryImageI18nTableMap.php b/core/lib/Thelia/Model/Map/CategoryImageI18nTableMap.php index 1d27e16ad..1c59c9db2 100644 --- a/core/lib/Thelia/Model/Map/CategoryImageI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/CategoryImageI18nTableMap.php @@ -151,7 +151,7 @@ class CategoryImageI18nTableMap extends TableMap $this->setUseIdGenerator(false); // columns $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'category_image', 'ID', true, null, null); - $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US'); + $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN'); $this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null); $this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null); $this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null); diff --git a/core/lib/Thelia/Model/Map/CategoryImageTableMap.php b/core/lib/Thelia/Model/Map/CategoryImageTableMap.php index 1c7694d05..9eafe2ade 100644 --- a/core/lib/Thelia/Model/Map/CategoryImageTableMap.php +++ b/core/lib/Thelia/Model/Map/CategoryImageTableMap.php @@ -111,7 +111,7 @@ class CategoryImageTableMap extends TableMap * * @var string */ - const DEFAULT_LOCALE = 'en_US'; + const DEFAULT_LOCALE = 'en_EN'; /** * holds an array of fieldnames diff --git a/core/lib/Thelia/Model/Map/CategoryTableMap.php b/core/lib/Thelia/Model/Map/CategoryTableMap.php index 5e02d04c5..c3526ec5d 100644 --- a/core/lib/Thelia/Model/Map/CategoryTableMap.php +++ b/core/lib/Thelia/Model/Map/CategoryTableMap.php @@ -126,7 +126,7 @@ class CategoryTableMap extends TableMap * * @var string */ - const DEFAULT_LOCALE = 'en_US'; + const DEFAULT_LOCALE = 'en_EN'; /** * holds an array of fieldnames diff --git a/core/lib/Thelia/Model/Map/ConfigI18nTableMap.php b/core/lib/Thelia/Model/Map/ConfigI18nTableMap.php index b953b0ac9..a83f87b76 100644 --- a/core/lib/Thelia/Model/Map/ConfigI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/ConfigI18nTableMap.php @@ -151,7 +151,7 @@ class ConfigI18nTableMap extends TableMap $this->setUseIdGenerator(false); // columns $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'config', 'ID', true, null, null); - $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US'); + $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN'); $this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null); $this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null); $this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null); diff --git a/core/lib/Thelia/Model/Map/ConfigTableMap.php b/core/lib/Thelia/Model/Map/ConfigTableMap.php index ebd5d6edf..8bd68a964 100644 --- a/core/lib/Thelia/Model/Map/ConfigTableMap.php +++ b/core/lib/Thelia/Model/Map/ConfigTableMap.php @@ -116,7 +116,7 @@ class ConfigTableMap extends TableMap * * @var string */ - const DEFAULT_LOCALE = 'en_US'; + const DEFAULT_LOCALE = 'en_EN'; /** * holds an array of fieldnames diff --git a/core/lib/Thelia/Model/Map/ContentDocumentI18nTableMap.php b/core/lib/Thelia/Model/Map/ContentDocumentI18nTableMap.php index 7ebde93e6..a6ff890d7 100644 --- a/core/lib/Thelia/Model/Map/ContentDocumentI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/ContentDocumentI18nTableMap.php @@ -151,7 +151,7 @@ class ContentDocumentI18nTableMap extends TableMap $this->setUseIdGenerator(false); // columns $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'content_document', 'ID', true, null, null); - $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US'); + $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN'); $this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null); $this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null); $this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null); diff --git a/core/lib/Thelia/Model/Map/ContentDocumentTableMap.php b/core/lib/Thelia/Model/Map/ContentDocumentTableMap.php index 3d876a570..4344b70ae 100644 --- a/core/lib/Thelia/Model/Map/ContentDocumentTableMap.php +++ b/core/lib/Thelia/Model/Map/ContentDocumentTableMap.php @@ -111,7 +111,7 @@ class ContentDocumentTableMap extends TableMap * * @var string */ - const DEFAULT_LOCALE = 'en_US'; + const DEFAULT_LOCALE = 'en_EN'; /** * holds an array of fieldnames diff --git a/core/lib/Thelia/Model/Map/ContentI18nTableMap.php b/core/lib/Thelia/Model/Map/ContentI18nTableMap.php index f718623b0..ee9122a6c 100644 --- a/core/lib/Thelia/Model/Map/ContentI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/ContentI18nTableMap.php @@ -151,7 +151,7 @@ class ContentI18nTableMap extends TableMap $this->setUseIdGenerator(false); // columns $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'content', 'ID', true, null, null); - $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US'); + $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN'); $this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null); $this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null); $this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null); diff --git a/core/lib/Thelia/Model/Map/ContentImageI18nTableMap.php b/core/lib/Thelia/Model/Map/ContentImageI18nTableMap.php index 759349d27..6ff343d16 100644 --- a/core/lib/Thelia/Model/Map/ContentImageI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/ContentImageI18nTableMap.php @@ -151,7 +151,7 @@ class ContentImageI18nTableMap extends TableMap $this->setUseIdGenerator(false); // columns $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'content_image', 'ID', true, null, null); - $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US'); + $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN'); $this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null); $this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null); $this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null); diff --git a/core/lib/Thelia/Model/Map/ContentImageTableMap.php b/core/lib/Thelia/Model/Map/ContentImageTableMap.php index f731c51a8..c95761ab2 100644 --- a/core/lib/Thelia/Model/Map/ContentImageTableMap.php +++ b/core/lib/Thelia/Model/Map/ContentImageTableMap.php @@ -111,7 +111,7 @@ class ContentImageTableMap extends TableMap * * @var string */ - const DEFAULT_LOCALE = 'en_US'; + const DEFAULT_LOCALE = 'en_EN'; /** * holds an array of fieldnames diff --git a/core/lib/Thelia/Model/Map/ContentTableMap.php b/core/lib/Thelia/Model/Map/ContentTableMap.php index 4a489cedb..724c839a1 100644 --- a/core/lib/Thelia/Model/Map/ContentTableMap.php +++ b/core/lib/Thelia/Model/Map/ContentTableMap.php @@ -121,7 +121,7 @@ class ContentTableMap extends TableMap * * @var string */ - const DEFAULT_LOCALE = 'en_US'; + const DEFAULT_LOCALE = 'en_EN'; /** * holds an array of fieldnames diff --git a/core/lib/Thelia/Model/Map/CountryI18nTableMap.php b/core/lib/Thelia/Model/Map/CountryI18nTableMap.php index 272231464..cc60b09d2 100644 --- a/core/lib/Thelia/Model/Map/CountryI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/CountryI18nTableMap.php @@ -151,7 +151,7 @@ class CountryI18nTableMap extends TableMap $this->setUseIdGenerator(false); // columns $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'country', 'ID', true, null, null); - $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US'); + $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN'); $this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null); $this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null); $this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null); diff --git a/core/lib/Thelia/Model/Map/CountryTableMap.php b/core/lib/Thelia/Model/Map/CountryTableMap.php index e7c356f08..2e4931e37 100644 --- a/core/lib/Thelia/Model/Map/CountryTableMap.php +++ b/core/lib/Thelia/Model/Map/CountryTableMap.php @@ -116,7 +116,7 @@ class CountryTableMap extends TableMap * * @var string */ - const DEFAULT_LOCALE = 'en_US'; + const DEFAULT_LOCALE = 'en_EN'; /** * holds an array of fieldnames diff --git a/core/lib/Thelia/Model/Map/CouponOrderTableMap.php b/core/lib/Thelia/Model/Map/CouponOrderTableMap.php index 9d91ef068..1826bcb70 100644 --- a/core/lib/Thelia/Model/Map/CouponOrderTableMap.php +++ b/core/lib/Thelia/Model/Map/CouponOrderTableMap.php @@ -152,7 +152,7 @@ class CouponOrderTableMap extends TableMap // columns $this->addPrimaryKey('ID', 'Id', 'INTEGER', true, null, null); $this->addForeignKey('ORDER_ID', 'OrderId', 'INTEGER', 'order', 'ID', true, null, null); - $this->addColumn('CODE', 'Code', 'VARCHAR', true, 45, null); + $this->addForeignKey('CODE', 'Code', 'VARCHAR', 'coupon', 'CODE', true, 45, null); $this->addColumn('VALUE', 'Value', 'FLOAT', true, null, null); $this->addColumn('CREATED_AT', 'CreatedAt', 'TIMESTAMP', false, null, null); $this->addColumn('UPDATED_AT', 'UpdatedAt', 'TIMESTAMP', false, null, null); @@ -164,6 +164,7 @@ class CouponOrderTableMap extends TableMap public function buildRelations() { $this->addRelation('Order', '\\Thelia\\Model\\Order', RelationMap::MANY_TO_ONE, array('order_id' => 'id', ), 'CASCADE', 'RESTRICT'); + $this->addRelation('Coupon', '\\Thelia\\Model\\Coupon', RelationMap::MANY_TO_ONE, array('code' => 'code', ), null, null); } // buildRelations() /** diff --git a/core/lib/Thelia/Model/Map/CouponTableMap.php b/core/lib/Thelia/Model/Map/CouponTableMap.php index d1ff79ac0..7e576a585 100644 --- a/core/lib/Thelia/Model/Map/CouponTableMap.php +++ b/core/lib/Thelia/Model/Map/CouponTableMap.php @@ -57,7 +57,7 @@ class CouponTableMap extends TableMap /** * The total number of columns */ - const NUM_COLUMNS = 10; + const NUM_COLUMNS = 14; /** * The number of lazy-loaded columns @@ -67,7 +67,7 @@ class CouponTableMap extends TableMap /** * The number of columns to hydrate (NUM_COLUMNS - NUM_LAZY_LOAD_COLUMNS) */ - const NUM_HYDRATE_COLUMNS = 10; + const NUM_HYDRATE_COLUMNS = 14; /** * the column name for the ID field @@ -80,9 +80,24 @@ class CouponTableMap extends TableMap const CODE = 'coupon.CODE'; /** - * the column name for the ACTION field + * the column name for the TYPE field */ - const ACTION = 'coupon.ACTION'; + const TYPE = 'coupon.TYPE'; + + /** + * the column name for the TITLE field + */ + const TITLE = 'coupon.TITLE'; + + /** + * the column name for the SHORT_DESCRIPTION field + */ + const SHORT_DESCRIPTION = 'coupon.SHORT_DESCRIPTION'; + + /** + * the column name for the DESCRIPTION field + */ + const DESCRIPTION = 'coupon.DESCRIPTION'; /** * the column name for the VALUE field @@ -90,24 +105,24 @@ class CouponTableMap extends TableMap const VALUE = 'coupon.VALUE'; /** - * the column name for the USED field + * the column name for the IS_USED field */ - const USED = 'coupon.USED'; + const IS_USED = 'coupon.IS_USED'; /** - * the column name for the AVAILABLE_SINCE field + * the column name for the IS_ENABLED field */ - const AVAILABLE_SINCE = 'coupon.AVAILABLE_SINCE'; + const IS_ENABLED = 'coupon.IS_ENABLED'; /** - * the column name for the DATE_LIMIT field + * the column name for the EXPIRATION_DATE field */ - const DATE_LIMIT = 'coupon.DATE_LIMIT'; + const EXPIRATION_DATE = 'coupon.EXPIRATION_DATE'; /** - * the column name for the ACTIVATE field + * the column name for the SERIALIZED_RULES field */ - const ACTIVATE = 'coupon.ACTIVATE'; + const SERIALIZED_RULES = 'coupon.SERIALIZED_RULES'; /** * the column name for the CREATED_AT field @@ -119,11 +134,25 @@ class CouponTableMap extends TableMap */ const UPDATED_AT = 'coupon.UPDATED_AT'; + /** + * the column name for the VERSION field + */ + const VERSION = 'coupon.VERSION'; + /** * The default string format for model objects of the related table */ const DEFAULT_STRING_FORMAT = 'YAML'; + // i18n behavior + + /** + * The default locale to use for translations. + * + * @var string + */ + const DEFAULT_LOCALE = 'en_EN'; + /** * holds an array of fieldnames * @@ -131,12 +160,12 @@ class CouponTableMap extends TableMap * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id' */ protected static $fieldNames = array ( - self::TYPE_PHPNAME => array('Id', 'Code', 'Action', 'Value', 'Used', 'AvailableSince', 'DateLimit', 'Activate', 'CreatedAt', 'UpdatedAt', ), - self::TYPE_STUDLYPHPNAME => array('id', 'code', 'action', 'value', 'used', 'availableSince', 'dateLimit', 'activate', 'createdAt', 'updatedAt', ), - self::TYPE_COLNAME => array(CouponTableMap::ID, CouponTableMap::CODE, CouponTableMap::ACTION, CouponTableMap::VALUE, CouponTableMap::USED, CouponTableMap::AVAILABLE_SINCE, CouponTableMap::DATE_LIMIT, CouponTableMap::ACTIVATE, CouponTableMap::CREATED_AT, CouponTableMap::UPDATED_AT, ), - self::TYPE_RAW_COLNAME => array('ID', 'CODE', 'ACTION', 'VALUE', 'USED', 'AVAILABLE_SINCE', 'DATE_LIMIT', 'ACTIVATE', 'CREATED_AT', 'UPDATED_AT', ), - self::TYPE_FIELDNAME => array('id', 'code', 'action', 'value', 'used', 'available_since', 'date_limit', 'activate', 'created_at', 'updated_at', ), - self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, ) + self::TYPE_PHPNAME => array('Id', 'Code', 'Type', 'Title', 'ShortDescription', 'Description', 'Value', 'IsUsed', 'IsEnabled', 'ExpirationDate', 'SerializedRules', 'CreatedAt', 'UpdatedAt', 'Version', ), + self::TYPE_STUDLYPHPNAME => array('id', 'code', 'type', 'title', 'shortDescription', 'description', 'value', 'isUsed', 'isEnabled', 'expirationDate', 'serializedRules', 'createdAt', 'updatedAt', 'version', ), + self::TYPE_COLNAME => array(CouponTableMap::ID, CouponTableMap::CODE, CouponTableMap::TYPE, CouponTableMap::TITLE, CouponTableMap::SHORT_DESCRIPTION, CouponTableMap::DESCRIPTION, CouponTableMap::VALUE, CouponTableMap::IS_USED, CouponTableMap::IS_ENABLED, CouponTableMap::EXPIRATION_DATE, CouponTableMap::SERIALIZED_RULES, CouponTableMap::CREATED_AT, CouponTableMap::UPDATED_AT, CouponTableMap::VERSION, ), + self::TYPE_RAW_COLNAME => array('ID', 'CODE', 'TYPE', 'TITLE', 'SHORT_DESCRIPTION', 'DESCRIPTION', 'VALUE', 'IS_USED', 'IS_ENABLED', 'EXPIRATION_DATE', 'SERIALIZED_RULES', 'CREATED_AT', 'UPDATED_AT', 'VERSION', ), + self::TYPE_FIELDNAME => array('id', 'code', 'type', 'title', 'short_description', 'description', 'value', 'is_used', 'is_enabled', 'expiration_date', 'serialized_rules', 'created_at', 'updated_at', 'version', ), + self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, ) ); /** @@ -146,12 +175,12 @@ class CouponTableMap extends TableMap * e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0 */ protected static $fieldKeys = array ( - self::TYPE_PHPNAME => array('Id' => 0, 'Code' => 1, 'Action' => 2, 'Value' => 3, 'Used' => 4, 'AvailableSince' => 5, 'DateLimit' => 6, 'Activate' => 7, 'CreatedAt' => 8, 'UpdatedAt' => 9, ), - self::TYPE_STUDLYPHPNAME => array('id' => 0, 'code' => 1, 'action' => 2, 'value' => 3, 'used' => 4, 'availableSince' => 5, 'dateLimit' => 6, 'activate' => 7, 'createdAt' => 8, 'updatedAt' => 9, ), - self::TYPE_COLNAME => array(CouponTableMap::ID => 0, CouponTableMap::CODE => 1, CouponTableMap::ACTION => 2, CouponTableMap::VALUE => 3, CouponTableMap::USED => 4, CouponTableMap::AVAILABLE_SINCE => 5, CouponTableMap::DATE_LIMIT => 6, CouponTableMap::ACTIVATE => 7, CouponTableMap::CREATED_AT => 8, CouponTableMap::UPDATED_AT => 9, ), - self::TYPE_RAW_COLNAME => array('ID' => 0, 'CODE' => 1, 'ACTION' => 2, 'VALUE' => 3, 'USED' => 4, 'AVAILABLE_SINCE' => 5, 'DATE_LIMIT' => 6, 'ACTIVATE' => 7, 'CREATED_AT' => 8, 'UPDATED_AT' => 9, ), - self::TYPE_FIELDNAME => array('id' => 0, 'code' => 1, 'action' => 2, 'value' => 3, 'used' => 4, 'available_since' => 5, 'date_limit' => 6, 'activate' => 7, 'created_at' => 8, 'updated_at' => 9, ), - self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, ) + self::TYPE_PHPNAME => array('Id' => 0, 'Code' => 1, 'Type' => 2, 'Title' => 3, 'ShortDescription' => 4, 'Description' => 5, 'Value' => 6, 'IsUsed' => 7, 'IsEnabled' => 8, 'ExpirationDate' => 9, 'SerializedRules' => 10, 'CreatedAt' => 11, 'UpdatedAt' => 12, 'Version' => 13, ), + self::TYPE_STUDLYPHPNAME => array('id' => 0, 'code' => 1, 'type' => 2, 'title' => 3, 'shortDescription' => 4, 'description' => 5, 'value' => 6, 'isUsed' => 7, 'isEnabled' => 8, 'expirationDate' => 9, 'serializedRules' => 10, 'createdAt' => 11, 'updatedAt' => 12, 'version' => 13, ), + self::TYPE_COLNAME => array(CouponTableMap::ID => 0, CouponTableMap::CODE => 1, CouponTableMap::TYPE => 2, CouponTableMap::TITLE => 3, CouponTableMap::SHORT_DESCRIPTION => 4, CouponTableMap::DESCRIPTION => 5, CouponTableMap::VALUE => 6, CouponTableMap::IS_USED => 7, CouponTableMap::IS_ENABLED => 8, CouponTableMap::EXPIRATION_DATE => 9, CouponTableMap::SERIALIZED_RULES => 10, CouponTableMap::CREATED_AT => 11, CouponTableMap::UPDATED_AT => 12, CouponTableMap::VERSION => 13, ), + self::TYPE_RAW_COLNAME => array('ID' => 0, 'CODE' => 1, 'TYPE' => 2, 'TITLE' => 3, 'SHORT_DESCRIPTION' => 4, 'DESCRIPTION' => 5, 'VALUE' => 6, 'IS_USED' => 7, 'IS_ENABLED' => 8, 'EXPIRATION_DATE' => 9, 'SERIALIZED_RULES' => 10, 'CREATED_AT' => 11, 'UPDATED_AT' => 12, 'VERSION' => 13, ), + self::TYPE_FIELDNAME => array('id' => 0, 'code' => 1, 'type' => 2, 'title' => 3, 'short_description' => 4, 'description' => 5, 'value' => 6, 'is_used' => 7, 'is_enabled' => 8, 'expiration_date' => 9, 'serialized_rules' => 10, 'created_at' => 11, 'updated_at' => 12, 'version' => 13, ), + self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, ) ); /** @@ -172,14 +201,18 @@ class CouponTableMap extends TableMap // columns $this->addPrimaryKey('ID', 'Id', 'INTEGER', true, null, null); $this->addColumn('CODE', 'Code', 'VARCHAR', true, 45, null); - $this->addColumn('ACTION', 'Action', 'VARCHAR', true, 255, null); + $this->addColumn('TYPE', 'Type', 'VARCHAR', true, 255, null); + $this->addColumn('TITLE', 'Title', 'VARCHAR', true, 255, null); + $this->addColumn('SHORT_DESCRIPTION', 'ShortDescription', 'LONGVARCHAR', true, null, null); + $this->addColumn('DESCRIPTION', 'Description', 'CLOB', true, null, null); $this->addColumn('VALUE', 'Value', 'FLOAT', true, null, null); - $this->addColumn('USED', 'Used', 'TINYINT', false, null, null); - $this->addColumn('AVAILABLE_SINCE', 'AvailableSince', 'TIMESTAMP', false, null, null); - $this->addColumn('DATE_LIMIT', 'DateLimit', 'TIMESTAMP', false, null, null); - $this->addColumn('ACTIVATE', 'Activate', 'TINYINT', false, null, null); + $this->addColumn('IS_USED', 'IsUsed', 'TINYINT', true, null, null); + $this->addColumn('IS_ENABLED', 'IsEnabled', 'TINYINT', true, null, null); + $this->addColumn('EXPIRATION_DATE', 'ExpirationDate', 'TIMESTAMP', true, null, null); + $this->addColumn('SERIALIZED_RULES', 'SerializedRules', 'LONGVARCHAR', true, null, null); $this->addColumn('CREATED_AT', 'CreatedAt', 'TIMESTAMP', false, null, null); $this->addColumn('UPDATED_AT', 'UpdatedAt', 'TIMESTAMP', false, null, null); + $this->addColumn('VERSION', 'Version', 'INTEGER', false, null, 0); } // initialize() /** @@ -187,7 +220,9 @@ class CouponTableMap extends TableMap */ public function buildRelations() { - $this->addRelation('CouponRule', '\\Thelia\\Model\\CouponRule', RelationMap::ONE_TO_MANY, array('id' => 'coupon_id', ), 'CASCADE', 'RESTRICT', 'CouponRules'); + $this->addRelation('CouponOrder', '\\Thelia\\Model\\CouponOrder', RelationMap::ONE_TO_MANY, array('code' => 'code', ), null, null, 'CouponOrders'); + $this->addRelation('CouponI18n', '\\Thelia\\Model\\CouponI18n', RelationMap::ONE_TO_MANY, array('id' => 'id', ), 'CASCADE', null, 'CouponI18ns'); + $this->addRelation('CouponVersion', '\\Thelia\\Model\\CouponVersion', RelationMap::ONE_TO_MANY, array('id' => 'id', ), 'CASCADE', null, 'CouponVersions'); } // buildRelations() /** @@ -200,6 +235,8 @@ class CouponTableMap extends TableMap { return array( 'timestampable' => array('create_column' => 'created_at', 'update_column' => 'updated_at', ), + 'i18n' => array('i18n_table' => '%TABLE%_i18n', 'i18n_phpname' => '%PHPNAME%I18n', 'i18n_columns' => '', 'locale_column' => 'locale', 'locale_length' => '5', 'default_locale' => '', 'locale_alias' => '', ), + 'versionable' => array('version_column' => 'version', 'version_table' => '', 'log_created_at' => 'false', 'log_created_by' => 'false', 'log_comment' => 'false', 'version_created_at_column' => 'version_created_at', 'version_created_by_column' => 'version_created_by', 'version_comment_column' => 'version_comment', ), ); } // getBehaviors() /** @@ -209,7 +246,8 @@ class CouponTableMap 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. - CouponRuleTableMap::clearInstancePool(); + CouponI18nTableMap::clearInstancePool(); + CouponVersionTableMap::clearInstancePool(); } /** @@ -352,25 +390,33 @@ class CouponTableMap extends TableMap if (null === $alias) { $criteria->addSelectColumn(CouponTableMap::ID); $criteria->addSelectColumn(CouponTableMap::CODE); - $criteria->addSelectColumn(CouponTableMap::ACTION); + $criteria->addSelectColumn(CouponTableMap::TYPE); + $criteria->addSelectColumn(CouponTableMap::TITLE); + $criteria->addSelectColumn(CouponTableMap::SHORT_DESCRIPTION); + $criteria->addSelectColumn(CouponTableMap::DESCRIPTION); $criteria->addSelectColumn(CouponTableMap::VALUE); - $criteria->addSelectColumn(CouponTableMap::USED); - $criteria->addSelectColumn(CouponTableMap::AVAILABLE_SINCE); - $criteria->addSelectColumn(CouponTableMap::DATE_LIMIT); - $criteria->addSelectColumn(CouponTableMap::ACTIVATE); + $criteria->addSelectColumn(CouponTableMap::IS_USED); + $criteria->addSelectColumn(CouponTableMap::IS_ENABLED); + $criteria->addSelectColumn(CouponTableMap::EXPIRATION_DATE); + $criteria->addSelectColumn(CouponTableMap::SERIALIZED_RULES); $criteria->addSelectColumn(CouponTableMap::CREATED_AT); $criteria->addSelectColumn(CouponTableMap::UPDATED_AT); + $criteria->addSelectColumn(CouponTableMap::VERSION); } else { $criteria->addSelectColumn($alias . '.ID'); $criteria->addSelectColumn($alias . '.CODE'); - $criteria->addSelectColumn($alias . '.ACTION'); + $criteria->addSelectColumn($alias . '.TYPE'); + $criteria->addSelectColumn($alias . '.TITLE'); + $criteria->addSelectColumn($alias . '.SHORT_DESCRIPTION'); + $criteria->addSelectColumn($alias . '.DESCRIPTION'); $criteria->addSelectColumn($alias . '.VALUE'); - $criteria->addSelectColumn($alias . '.USED'); - $criteria->addSelectColumn($alias . '.AVAILABLE_SINCE'); - $criteria->addSelectColumn($alias . '.DATE_LIMIT'); - $criteria->addSelectColumn($alias . '.ACTIVATE'); + $criteria->addSelectColumn($alias . '.IS_USED'); + $criteria->addSelectColumn($alias . '.IS_ENABLED'); + $criteria->addSelectColumn($alias . '.EXPIRATION_DATE'); + $criteria->addSelectColumn($alias . '.SERIALIZED_RULES'); $criteria->addSelectColumn($alias . '.CREATED_AT'); $criteria->addSelectColumn($alias . '.UPDATED_AT'); + $criteria->addSelectColumn($alias . '.VERSION'); } } diff --git a/core/lib/Thelia/Model/Map/CurrencyI18nTableMap.php b/core/lib/Thelia/Model/Map/CurrencyI18nTableMap.php index c7e4725c1..d280f8601 100644 --- a/core/lib/Thelia/Model/Map/CurrencyI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/CurrencyI18nTableMap.php @@ -136,7 +136,7 @@ class CurrencyI18nTableMap extends TableMap $this->setUseIdGenerator(false); // columns $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'currency', 'ID', true, null, null); - $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US'); + $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN'); $this->addColumn('NAME', 'Name', 'VARCHAR', false, 45, null); } // initialize() diff --git a/core/lib/Thelia/Model/Map/CurrencyTableMap.php b/core/lib/Thelia/Model/Map/CurrencyTableMap.php index b37a6b30a..08ecf6966 100644 --- a/core/lib/Thelia/Model/Map/CurrencyTableMap.php +++ b/core/lib/Thelia/Model/Map/CurrencyTableMap.php @@ -121,7 +121,7 @@ class CurrencyTableMap extends TableMap * * @var string */ - const DEFAULT_LOCALE = 'en_US'; + const DEFAULT_LOCALE = 'en_EN'; /** * holds an array of fieldnames diff --git a/core/lib/Thelia/Model/Map/CustomerTitleI18nTableMap.php b/core/lib/Thelia/Model/Map/CustomerTitleI18nTableMap.php index 5344099c5..d403756fa 100644 --- a/core/lib/Thelia/Model/Map/CustomerTitleI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/CustomerTitleI18nTableMap.php @@ -141,7 +141,7 @@ class CustomerTitleI18nTableMap extends TableMap $this->setUseIdGenerator(false); // columns $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'customer_title', 'ID', true, null, null); - $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US'); + $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN'); $this->addColumn('SHORT', 'Short', 'VARCHAR', false, 10, null); $this->addColumn('LONG', 'Long', 'VARCHAR', false, 45, null); } // initialize() diff --git a/core/lib/Thelia/Model/Map/CustomerTitleTableMap.php b/core/lib/Thelia/Model/Map/CustomerTitleTableMap.php index c10ce2500..2769f365e 100644 --- a/core/lib/Thelia/Model/Map/CustomerTitleTableMap.php +++ b/core/lib/Thelia/Model/Map/CustomerTitleTableMap.php @@ -106,7 +106,7 @@ class CustomerTitleTableMap extends TableMap * * @var string */ - const DEFAULT_LOCALE = 'en_US'; + const DEFAULT_LOCALE = 'en_EN'; /** * holds an array of fieldnames diff --git a/core/lib/Thelia/Model/Map/FeatureAvI18nTableMap.php b/core/lib/Thelia/Model/Map/FeatureAvI18nTableMap.php index ba592b4b0..b3114e7ba 100644 --- a/core/lib/Thelia/Model/Map/FeatureAvI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/FeatureAvI18nTableMap.php @@ -151,7 +151,7 @@ class FeatureAvI18nTableMap extends TableMap $this->setUseIdGenerator(false); // columns $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'feature_av', 'ID', true, null, null); - $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US'); + $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN'); $this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null); $this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null); $this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null); diff --git a/core/lib/Thelia/Model/Map/FeatureAvTableMap.php b/core/lib/Thelia/Model/Map/FeatureAvTableMap.php index 4dd944bb7..0559f7ce6 100644 --- a/core/lib/Thelia/Model/Map/FeatureAvTableMap.php +++ b/core/lib/Thelia/Model/Map/FeatureAvTableMap.php @@ -106,7 +106,7 @@ class FeatureAvTableMap extends TableMap * * @var string */ - const DEFAULT_LOCALE = 'en_US'; + const DEFAULT_LOCALE = 'en_EN'; /** * holds an array of fieldnames diff --git a/core/lib/Thelia/Model/Map/FeatureI18nTableMap.php b/core/lib/Thelia/Model/Map/FeatureI18nTableMap.php index dba05fb67..af0dfc263 100644 --- a/core/lib/Thelia/Model/Map/FeatureI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/FeatureI18nTableMap.php @@ -151,7 +151,7 @@ class FeatureI18nTableMap extends TableMap $this->setUseIdGenerator(false); // columns $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'feature', 'ID', true, null, null); - $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US'); + $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN'); $this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null); $this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null); $this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null); diff --git a/core/lib/Thelia/Model/Map/FeatureTableMap.php b/core/lib/Thelia/Model/Map/FeatureTableMap.php index 76c2fe724..7d0af0d45 100644 --- a/core/lib/Thelia/Model/Map/FeatureTableMap.php +++ b/core/lib/Thelia/Model/Map/FeatureTableMap.php @@ -106,7 +106,7 @@ class FeatureTableMap extends TableMap * * @var string */ - const DEFAULT_LOCALE = 'en_US'; + const DEFAULT_LOCALE = 'en_EN'; /** * holds an array of fieldnames diff --git a/core/lib/Thelia/Model/Map/FolderDocumentI18nTableMap.php b/core/lib/Thelia/Model/Map/FolderDocumentI18nTableMap.php index 28dab9d8f..5875031fb 100644 --- a/core/lib/Thelia/Model/Map/FolderDocumentI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/FolderDocumentI18nTableMap.php @@ -151,7 +151,7 @@ class FolderDocumentI18nTableMap extends TableMap $this->setUseIdGenerator(false); // columns $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'folder_document', 'ID', true, null, null); - $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US'); + $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN'); $this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null); $this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null); $this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null); diff --git a/core/lib/Thelia/Model/Map/FolderDocumentTableMap.php b/core/lib/Thelia/Model/Map/FolderDocumentTableMap.php index 1d0e3b74a..467b7a65b 100644 --- a/core/lib/Thelia/Model/Map/FolderDocumentTableMap.php +++ b/core/lib/Thelia/Model/Map/FolderDocumentTableMap.php @@ -111,7 +111,7 @@ class FolderDocumentTableMap extends TableMap * * @var string */ - const DEFAULT_LOCALE = 'en_US'; + const DEFAULT_LOCALE = 'en_EN'; /** * holds an array of fieldnames diff --git a/core/lib/Thelia/Model/Map/FolderI18nTableMap.php b/core/lib/Thelia/Model/Map/FolderI18nTableMap.php index d10344811..fc85b17ec 100644 --- a/core/lib/Thelia/Model/Map/FolderI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/FolderI18nTableMap.php @@ -151,7 +151,7 @@ class FolderI18nTableMap extends TableMap $this->setUseIdGenerator(false); // columns $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'folder', 'ID', true, null, null); - $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US'); + $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN'); $this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null); $this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null); $this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null); diff --git a/core/lib/Thelia/Model/Map/FolderImageI18nTableMap.php b/core/lib/Thelia/Model/Map/FolderImageI18nTableMap.php index f0f87fd85..1c89165a4 100644 --- a/core/lib/Thelia/Model/Map/FolderImageI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/FolderImageI18nTableMap.php @@ -151,7 +151,7 @@ class FolderImageI18nTableMap extends TableMap $this->setUseIdGenerator(false); // columns $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'folder_image', 'ID', true, null, null); - $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US'); + $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN'); $this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null); $this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null); $this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null); diff --git a/core/lib/Thelia/Model/Map/FolderImageTableMap.php b/core/lib/Thelia/Model/Map/FolderImageTableMap.php index 6dc186658..c559f9437 100644 --- a/core/lib/Thelia/Model/Map/FolderImageTableMap.php +++ b/core/lib/Thelia/Model/Map/FolderImageTableMap.php @@ -111,7 +111,7 @@ class FolderImageTableMap extends TableMap * * @var string */ - const DEFAULT_LOCALE = 'en_US'; + const DEFAULT_LOCALE = 'en_EN'; /** * holds an array of fieldnames diff --git a/core/lib/Thelia/Model/Map/FolderTableMap.php b/core/lib/Thelia/Model/Map/FolderTableMap.php index 1bfe2cd6e..08871715b 100644 --- a/core/lib/Thelia/Model/Map/FolderTableMap.php +++ b/core/lib/Thelia/Model/Map/FolderTableMap.php @@ -126,7 +126,7 @@ class FolderTableMap extends TableMap * * @var string */ - const DEFAULT_LOCALE = 'en_US'; + const DEFAULT_LOCALE = 'en_EN'; /** * holds an array of fieldnames diff --git a/core/lib/Thelia/Model/Map/GroupI18nTableMap.php b/core/lib/Thelia/Model/Map/GroupI18nTableMap.php index 57788593a..585127821 100644 --- a/core/lib/Thelia/Model/Map/GroupI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/GroupI18nTableMap.php @@ -151,7 +151,7 @@ class GroupI18nTableMap extends TableMap $this->setUseIdGenerator(false); // columns $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'group', 'ID', true, null, null); - $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US'); + $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN'); $this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null); $this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null); $this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null); diff --git a/core/lib/Thelia/Model/Map/GroupTableMap.php b/core/lib/Thelia/Model/Map/GroupTableMap.php index 881a2fa84..a8c830005 100644 --- a/core/lib/Thelia/Model/Map/GroupTableMap.php +++ b/core/lib/Thelia/Model/Map/GroupTableMap.php @@ -101,7 +101,7 @@ class GroupTableMap extends TableMap * * @var string */ - const DEFAULT_LOCALE = 'en_US'; + const DEFAULT_LOCALE = 'en_EN'; /** * holds an array of fieldnames diff --git a/core/lib/Thelia/Model/Map/MessageI18nTableMap.php b/core/lib/Thelia/Model/Map/MessageI18nTableMap.php index bb9bfdd2e..f084515c0 100644 --- a/core/lib/Thelia/Model/Map/MessageI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/MessageI18nTableMap.php @@ -146,7 +146,7 @@ class MessageI18nTableMap extends TableMap $this->setUseIdGenerator(false); // columns $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'message', 'ID', true, null, null); - $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US'); + $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN'); $this->addColumn('TITLE', 'Title', 'LONGVARCHAR', false, null, null); $this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null); $this->addColumn('DESCRIPTION_HTML', 'DescriptionHtml', 'CLOB', false, null, null); diff --git a/core/lib/Thelia/Model/Map/MessageTableMap.php b/core/lib/Thelia/Model/Map/MessageTableMap.php index 392dac824..de2a205f9 100644 --- a/core/lib/Thelia/Model/Map/MessageTableMap.php +++ b/core/lib/Thelia/Model/Map/MessageTableMap.php @@ -126,7 +126,7 @@ class MessageTableMap extends TableMap * * @var string */ - const DEFAULT_LOCALE = 'en_US'; + const DEFAULT_LOCALE = 'en_EN'; /** * holds an array of fieldnames diff --git a/core/lib/Thelia/Model/Map/ModuleI18nTableMap.php b/core/lib/Thelia/Model/Map/ModuleI18nTableMap.php index a8e680f1c..67b7a34ef 100644 --- a/core/lib/Thelia/Model/Map/ModuleI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/ModuleI18nTableMap.php @@ -151,7 +151,7 @@ class ModuleI18nTableMap extends TableMap $this->setUseIdGenerator(false); // columns $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'module', 'ID', true, null, null); - $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US'); + $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN'); $this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null); $this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null); $this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null); diff --git a/core/lib/Thelia/Model/Map/ModuleTableMap.php b/core/lib/Thelia/Model/Map/ModuleTableMap.php index cccaa890a..5370c1da1 100644 --- a/core/lib/Thelia/Model/Map/ModuleTableMap.php +++ b/core/lib/Thelia/Model/Map/ModuleTableMap.php @@ -116,7 +116,7 @@ class ModuleTableMap extends TableMap * * @var string */ - const DEFAULT_LOCALE = 'en_US'; + const DEFAULT_LOCALE = 'en_EN'; /** * holds an array of fieldnames diff --git a/core/lib/Thelia/Model/Map/OrderStatusI18nTableMap.php b/core/lib/Thelia/Model/Map/OrderStatusI18nTableMap.php index 1b2052c2e..5d78c474c 100644 --- a/core/lib/Thelia/Model/Map/OrderStatusI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/OrderStatusI18nTableMap.php @@ -151,7 +151,7 @@ class OrderStatusI18nTableMap extends TableMap $this->setUseIdGenerator(false); // columns $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'order_status', 'ID', true, null, null); - $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US'); + $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN'); $this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null); $this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null); $this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null); diff --git a/core/lib/Thelia/Model/Map/OrderStatusTableMap.php b/core/lib/Thelia/Model/Map/OrderStatusTableMap.php index 18406d9aa..eecfe5a03 100644 --- a/core/lib/Thelia/Model/Map/OrderStatusTableMap.php +++ b/core/lib/Thelia/Model/Map/OrderStatusTableMap.php @@ -101,7 +101,7 @@ class OrderStatusTableMap extends TableMap * * @var string */ - const DEFAULT_LOCALE = 'en_US'; + const DEFAULT_LOCALE = 'en_EN'; /** * holds an array of fieldnames diff --git a/core/lib/Thelia/Model/Map/ProductDocumentI18nTableMap.php b/core/lib/Thelia/Model/Map/ProductDocumentI18nTableMap.php index 09e1dc0e4..103914ee6 100644 --- a/core/lib/Thelia/Model/Map/ProductDocumentI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/ProductDocumentI18nTableMap.php @@ -151,7 +151,7 @@ class ProductDocumentI18nTableMap extends TableMap $this->setUseIdGenerator(false); // columns $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'product_document', 'ID', true, null, null); - $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US'); + $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN'); $this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null); $this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null); $this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null); diff --git a/core/lib/Thelia/Model/Map/ProductDocumentTableMap.php b/core/lib/Thelia/Model/Map/ProductDocumentTableMap.php index ff50bad77..f1420cc43 100644 --- a/core/lib/Thelia/Model/Map/ProductDocumentTableMap.php +++ b/core/lib/Thelia/Model/Map/ProductDocumentTableMap.php @@ -111,7 +111,7 @@ class ProductDocumentTableMap extends TableMap * * @var string */ - const DEFAULT_LOCALE = 'en_US'; + const DEFAULT_LOCALE = 'en_EN'; /** * holds an array of fieldnames diff --git a/core/lib/Thelia/Model/Map/ProductI18nTableMap.php b/core/lib/Thelia/Model/Map/ProductI18nTableMap.php index 79a01514a..8da33f15d 100644 --- a/core/lib/Thelia/Model/Map/ProductI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/ProductI18nTableMap.php @@ -151,7 +151,7 @@ class ProductI18nTableMap extends TableMap $this->setUseIdGenerator(false); // columns $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'product', 'ID', true, null, null); - $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US'); + $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN'); $this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null); $this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null); $this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null); diff --git a/core/lib/Thelia/Model/Map/ProductImageI18nTableMap.php b/core/lib/Thelia/Model/Map/ProductImageI18nTableMap.php index 39ad567f9..de3455c07 100644 --- a/core/lib/Thelia/Model/Map/ProductImageI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/ProductImageI18nTableMap.php @@ -151,7 +151,7 @@ class ProductImageI18nTableMap extends TableMap $this->setUseIdGenerator(false); // columns $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'product_image', 'ID', true, null, null); - $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US'); + $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN'); $this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null); $this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null); $this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null); diff --git a/core/lib/Thelia/Model/Map/ProductImageTableMap.php b/core/lib/Thelia/Model/Map/ProductImageTableMap.php index 36aabed3e..945799020 100644 --- a/core/lib/Thelia/Model/Map/ProductImageTableMap.php +++ b/core/lib/Thelia/Model/Map/ProductImageTableMap.php @@ -111,7 +111,7 @@ class ProductImageTableMap extends TableMap * * @var string */ - const DEFAULT_LOCALE = 'en_US'; + const DEFAULT_LOCALE = 'en_EN'; /** * holds an array of fieldnames diff --git a/core/lib/Thelia/Model/Map/ProductTableMap.php b/core/lib/Thelia/Model/Map/ProductTableMap.php index 75bf5e4e6..ef2cc7ca0 100644 --- a/core/lib/Thelia/Model/Map/ProductTableMap.php +++ b/core/lib/Thelia/Model/Map/ProductTableMap.php @@ -131,7 +131,7 @@ class ProductTableMap extends TableMap * * @var string */ - const DEFAULT_LOCALE = 'en_US'; + const DEFAULT_LOCALE = 'en_EN'; /** * holds an array of fieldnames diff --git a/core/lib/Thelia/Model/Map/ResourceI18nTableMap.php b/core/lib/Thelia/Model/Map/ResourceI18nTableMap.php index ec22e2fd3..8a8ce501a 100644 --- a/core/lib/Thelia/Model/Map/ResourceI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/ResourceI18nTableMap.php @@ -151,7 +151,7 @@ class ResourceI18nTableMap extends TableMap $this->setUseIdGenerator(false); // columns $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'resource', 'ID', true, null, null); - $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US'); + $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN'); $this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null); $this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null); $this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null); diff --git a/core/lib/Thelia/Model/Map/ResourceTableMap.php b/core/lib/Thelia/Model/Map/ResourceTableMap.php index 8d7708ddd..e56960892 100644 --- a/core/lib/Thelia/Model/Map/ResourceTableMap.php +++ b/core/lib/Thelia/Model/Map/ResourceTableMap.php @@ -101,7 +101,7 @@ class ResourceTableMap extends TableMap * * @var string */ - const DEFAULT_LOCALE = 'en_US'; + const DEFAULT_LOCALE = 'en_EN'; /** * holds an array of fieldnames diff --git a/core/lib/Thelia/Model/Map/TaxI18nTableMap.php b/core/lib/Thelia/Model/Map/TaxI18nTableMap.php index a06230c37..2c4c92f4f 100644 --- a/core/lib/Thelia/Model/Map/TaxI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/TaxI18nTableMap.php @@ -141,7 +141,7 @@ class TaxI18nTableMap extends TableMap $this->setUseIdGenerator(false); // columns $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'tax', 'ID', true, null, null); - $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US'); + $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN'); $this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null); $this->addColumn('DESCRIPTION', 'Description', 'LONGVARCHAR', false, null, null); } // initialize() diff --git a/core/lib/Thelia/Model/Map/TaxRuleI18nTableMap.php b/core/lib/Thelia/Model/Map/TaxRuleI18nTableMap.php index 1f0ed1e96..689f30728 100644 --- a/core/lib/Thelia/Model/Map/TaxRuleI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/TaxRuleI18nTableMap.php @@ -131,7 +131,7 @@ class TaxRuleI18nTableMap extends TableMap $this->setUseIdGenerator(false); // columns $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'tax_rule', 'ID', true, null, null); - $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US'); + $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN'); } // initialize() /** diff --git a/core/lib/Thelia/Model/Map/TaxRuleTableMap.php b/core/lib/Thelia/Model/Map/TaxRuleTableMap.php index cc5f628b9..9b862de99 100644 --- a/core/lib/Thelia/Model/Map/TaxRuleTableMap.php +++ b/core/lib/Thelia/Model/Map/TaxRuleTableMap.php @@ -111,7 +111,7 @@ class TaxRuleTableMap extends TableMap * * @var string */ - const DEFAULT_LOCALE = 'en_US'; + const DEFAULT_LOCALE = 'en_EN'; /** * holds an array of fieldnames diff --git a/core/lib/Thelia/Model/Map/TaxTableMap.php b/core/lib/Thelia/Model/Map/TaxTableMap.php index 6d43f20e9..b941e7b52 100644 --- a/core/lib/Thelia/Model/Map/TaxTableMap.php +++ b/core/lib/Thelia/Model/Map/TaxTableMap.php @@ -101,7 +101,7 @@ class TaxTableMap extends TableMap * * @var string */ - const DEFAULT_LOCALE = 'en_US'; + const DEFAULT_LOCALE = 'en_EN'; /** * holds an array of fieldnames diff --git a/install/thelia.sql b/install/thelia.sql index 9188f164d..502bbd036 100755 --- a/install/thelia.sql +++ b/install/thelia.sql @@ -1117,42 +1117,22 @@ CREATE TABLE `coupon` ( `id` INTEGER NOT NULL AUTO_INCREMENT, `code` VARCHAR(45) NOT NULL, - `action` VARCHAR(255) NOT NULL, + `type` VARCHAR(255) NOT NULL, + `title` VARCHAR(255) NOT NULL, + `short_description` TEXT NOT NULL, + `description` LONGTEXT NOT NULL, `value` FLOAT NOT NULL, - `used` TINYINT, - `available_since` DATETIME, - `date_limit` DATETIME, - `activate` TINYINT, + `is_used` TINYINT NOT NULL, + `is_enabled` TINYINT NOT NULL, + `expiration_date` DATETIME NOT NULL, + `serialized_rules` TEXT NOT NULL, `created_at` DATETIME, `updated_at` DATETIME, + `version` INTEGER DEFAULT 0, PRIMARY KEY (`id`), UNIQUE INDEX `code_UNIQUE` (`code`) ) ENGINE=InnoDB; --- --------------------------------------------------------------------- --- coupon_rule --- --------------------------------------------------------------------- - -DROP TABLE IF EXISTS `coupon_rule`; - -CREATE TABLE `coupon_rule` -( - `id` INTEGER NOT NULL AUTO_INCREMENT, - `coupon_id` INTEGER NOT NULL, - `controller` VARCHAR(255), - `operation` VARCHAR(255), - `value` FLOAT, - `created_at` DATETIME, - `updated_at` DATETIME, - PRIMARY KEY (`id`), - INDEX `idx_coupon_rule_coupon_id` (`coupon_id`), - CONSTRAINT `fk_coupon_rule_coupon_id` - FOREIGN KEY (`coupon_id`) - REFERENCES `coupon` (`id`) - ON UPDATE RESTRICT - ON DELETE CASCADE -) ENGINE=InnoDB; - -- --------------------------------------------------------------------- -- coupon_order -- --------------------------------------------------------------------- @@ -1169,11 +1149,15 @@ CREATE TABLE `coupon_order` `updated_at` DATETIME, PRIMARY KEY (`id`), INDEX `idx_coupon_order_order_id` (`order_id`), + INDEX `fk_coupon_order_coupon_idx` (`code`), CONSTRAINT `fk_coupon_order_order_id` FOREIGN KEY (`order_id`) REFERENCES `order` (`id`) ON UPDATE RESTRICT - ON DELETE CASCADE + ON DELETE CASCADE, + CONSTRAINT `fk_coupon_order_coupon` + FOREIGN KEY (`code`) + REFERENCES `coupon` (`code`) ) ENGINE=InnoDB; -- --------------------------------------------------------------------- @@ -1466,7 +1450,7 @@ DROP TABLE IF EXISTS `category_i18n`; CREATE TABLE `category_i18n` ( `id` INTEGER NOT NULL, - `locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL, + `locale` VARCHAR(5) DEFAULT 'en_EN' NOT NULL, `title` VARCHAR(255), `description` LONGTEXT, `chapo` TEXT, @@ -1487,7 +1471,7 @@ DROP TABLE IF EXISTS `product_i18n`; CREATE TABLE `product_i18n` ( `id` INTEGER NOT NULL, - `locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL, + `locale` VARCHAR(5) DEFAULT 'en_EN' NOT NULL, `title` VARCHAR(255), `description` LONGTEXT, `chapo` TEXT, @@ -1508,7 +1492,7 @@ DROP TABLE IF EXISTS `country_i18n`; CREATE TABLE `country_i18n` ( `id` INTEGER NOT NULL, - `locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL, + `locale` VARCHAR(5) DEFAULT 'en_EN' NOT NULL, `title` VARCHAR(255), `description` LONGTEXT, `chapo` TEXT, @@ -1529,7 +1513,7 @@ DROP TABLE IF EXISTS `tax_i18n`; CREATE TABLE `tax_i18n` ( `id` INTEGER NOT NULL, - `locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL, + `locale` VARCHAR(5) DEFAULT 'en_EN' NOT NULL, `title` VARCHAR(255), `description` TEXT, PRIMARY KEY (`id`,`locale`), @@ -1548,7 +1532,7 @@ DROP TABLE IF EXISTS `tax_rule_i18n`; CREATE TABLE `tax_rule_i18n` ( `id` INTEGER NOT NULL, - `locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL, + `locale` VARCHAR(5) DEFAULT 'en_EN' NOT NULL, PRIMARY KEY (`id`,`locale`), CONSTRAINT `tax_rule_i18n_FK_1` FOREIGN KEY (`id`) @@ -1565,7 +1549,7 @@ DROP TABLE IF EXISTS `feature_i18n`; CREATE TABLE `feature_i18n` ( `id` INTEGER NOT NULL, - `locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL, + `locale` VARCHAR(5) DEFAULT 'en_EN' NOT NULL, `title` VARCHAR(255), `description` LONGTEXT, `chapo` TEXT, @@ -1586,7 +1570,7 @@ DROP TABLE IF EXISTS `feature_av_i18n`; CREATE TABLE `feature_av_i18n` ( `id` INTEGER NOT NULL, - `locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL, + `locale` VARCHAR(5) DEFAULT 'en_EN' NOT NULL, `title` VARCHAR(255), `description` LONGTEXT, `chapo` TEXT, @@ -1607,7 +1591,7 @@ DROP TABLE IF EXISTS `attribute_i18n`; CREATE TABLE `attribute_i18n` ( `id` INTEGER NOT NULL, - `locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL, + `locale` VARCHAR(5) DEFAULT 'en_EN' NOT NULL, `title` VARCHAR(255), `description` LONGTEXT, `chapo` TEXT, @@ -1628,7 +1612,7 @@ DROP TABLE IF EXISTS `attribute_av_i18n`; CREATE TABLE `attribute_av_i18n` ( `id` INTEGER NOT NULL, - `locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL, + `locale` VARCHAR(5) DEFAULT 'en_EN' NOT NULL, `title` VARCHAR(255), `description` LONGTEXT, `chapo` TEXT, @@ -1649,7 +1633,7 @@ DROP TABLE IF EXISTS `config_i18n`; CREATE TABLE `config_i18n` ( `id` INTEGER NOT NULL, - `locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL, + `locale` VARCHAR(5) DEFAULT 'en_EN' NOT NULL, `title` VARCHAR(255), `description` LONGTEXT, `chapo` TEXT, @@ -1670,7 +1654,7 @@ DROP TABLE IF EXISTS `customer_title_i18n`; CREATE TABLE `customer_title_i18n` ( `id` INTEGER NOT NULL, - `locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL, + `locale` VARCHAR(5) DEFAULT 'en_EN' NOT NULL, `short` VARCHAR(10), `long` VARCHAR(45), PRIMARY KEY (`id`,`locale`), @@ -1689,7 +1673,7 @@ DROP TABLE IF EXISTS `folder_i18n`; CREATE TABLE `folder_i18n` ( `id` INTEGER NOT NULL, - `locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL, + `locale` VARCHAR(5) DEFAULT 'en_EN' NOT NULL, `title` VARCHAR(255), `description` LONGTEXT, `chapo` TEXT, @@ -1710,7 +1694,7 @@ DROP TABLE IF EXISTS `content_i18n`; CREATE TABLE `content_i18n` ( `id` INTEGER NOT NULL, - `locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL, + `locale` VARCHAR(5) DEFAULT 'en_EN' NOT NULL, `title` VARCHAR(255), `description` LONGTEXT, `chapo` TEXT, @@ -1731,7 +1715,7 @@ DROP TABLE IF EXISTS `product_image_i18n`; CREATE TABLE `product_image_i18n` ( `id` INTEGER NOT NULL, - `locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL, + `locale` VARCHAR(5) DEFAULT 'en_EN' NOT NULL, `title` VARCHAR(255), `description` LONGTEXT, `chapo` TEXT, @@ -1752,7 +1736,7 @@ DROP TABLE IF EXISTS `product_document_i18n`; CREATE TABLE `product_document_i18n` ( `id` INTEGER NOT NULL, - `locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL, + `locale` VARCHAR(5) DEFAULT 'en_EN' NOT NULL, `title` VARCHAR(255), `description` LONGTEXT, `chapo` TEXT, @@ -1773,7 +1757,7 @@ DROP TABLE IF EXISTS `currency_i18n`; CREATE TABLE `currency_i18n` ( `id` INTEGER NOT NULL, - `locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL, + `locale` VARCHAR(5) DEFAULT 'en_EN' NOT NULL, `name` VARCHAR(45), PRIMARY KEY (`id`,`locale`), CONSTRAINT `currency_i18n_FK_1` @@ -1791,7 +1775,7 @@ DROP TABLE IF EXISTS `order_status_i18n`; CREATE TABLE `order_status_i18n` ( `id` INTEGER NOT NULL, - `locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL, + `locale` VARCHAR(5) DEFAULT 'en_EN' NOT NULL, `title` VARCHAR(255), `description` LONGTEXT, `chapo` TEXT, @@ -1812,7 +1796,7 @@ DROP TABLE IF EXISTS `module_i18n`; CREATE TABLE `module_i18n` ( `id` INTEGER NOT NULL, - `locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL, + `locale` VARCHAR(5) DEFAULT 'en_EN' NOT NULL, `title` VARCHAR(255), `description` LONGTEXT, `chapo` TEXT, @@ -1833,7 +1817,7 @@ DROP TABLE IF EXISTS `group_i18n`; CREATE TABLE `group_i18n` ( `id` INTEGER NOT NULL, - `locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL, + `locale` VARCHAR(5) DEFAULT 'en_EN' NOT NULL, `title` VARCHAR(255), `description` LONGTEXT, `chapo` TEXT, @@ -1854,7 +1838,7 @@ DROP TABLE IF EXISTS `resource_i18n`; CREATE TABLE `resource_i18n` ( `id` INTEGER NOT NULL, - `locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL, + `locale` VARCHAR(5) DEFAULT 'en_EN' NOT NULL, `title` VARCHAR(255), `description` LONGTEXT, `chapo` TEXT, @@ -1875,7 +1859,7 @@ DROP TABLE IF EXISTS `message_i18n`; CREATE TABLE `message_i18n` ( `id` INTEGER NOT NULL, - `locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL, + `locale` VARCHAR(5) DEFAULT 'en_EN' NOT NULL, `title` TEXT, `description` LONGTEXT, `description_html` LONGTEXT, @@ -1886,6 +1870,23 @@ CREATE TABLE `message_i18n` ON DELETE CASCADE ) ENGINE=InnoDB; +-- --------------------------------------------------------------------- +-- coupon_i18n +-- --------------------------------------------------------------------- + +DROP TABLE IF EXISTS `coupon_i18n`; + +CREATE TABLE `coupon_i18n` +( + `id` INTEGER NOT NULL, + `locale` VARCHAR(5) DEFAULT 'en_EN' NOT NULL, + PRIMARY KEY (`id`,`locale`), + CONSTRAINT `coupon_i18n_FK_1` + FOREIGN KEY (`id`) + REFERENCES `coupon` (`id`) + ON DELETE CASCADE +) ENGINE=InnoDB; + -- --------------------------------------------------------------------- -- category_image_i18n -- --------------------------------------------------------------------- @@ -1895,7 +1896,7 @@ DROP TABLE IF EXISTS `category_image_i18n`; CREATE TABLE `category_image_i18n` ( `id` INTEGER NOT NULL, - `locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL, + `locale` VARCHAR(5) DEFAULT 'en_EN' NOT NULL, `title` VARCHAR(255), `description` LONGTEXT, `chapo` TEXT, @@ -1916,7 +1917,7 @@ DROP TABLE IF EXISTS `folder_image_i18n`; CREATE TABLE `folder_image_i18n` ( `id` INTEGER NOT NULL, - `locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL, + `locale` VARCHAR(5) DEFAULT 'en_EN' NOT NULL, `title` VARCHAR(255), `description` LONGTEXT, `chapo` TEXT, @@ -1937,7 +1938,7 @@ DROP TABLE IF EXISTS `content_image_i18n`; CREATE TABLE `content_image_i18n` ( `id` INTEGER NOT NULL, - `locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL, + `locale` VARCHAR(5) DEFAULT 'en_EN' NOT NULL, `title` VARCHAR(255), `description` LONGTEXT, `chapo` TEXT, @@ -1958,7 +1959,7 @@ DROP TABLE IF EXISTS `category_document_i18n`; CREATE TABLE `category_document_i18n` ( `id` INTEGER NOT NULL, - `locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL, + `locale` VARCHAR(5) DEFAULT 'en_EN' NOT NULL, `title` VARCHAR(255), `description` LONGTEXT, `chapo` TEXT, @@ -1979,7 +1980,7 @@ DROP TABLE IF EXISTS `content_document_i18n`; CREATE TABLE `content_document_i18n` ( `id` INTEGER NOT NULL, - `locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL, + `locale` VARCHAR(5) DEFAULT 'en_EN' NOT NULL, `title` VARCHAR(255), `description` LONGTEXT, `chapo` TEXT, @@ -2000,7 +2001,7 @@ DROP TABLE IF EXISTS `folder_document_i18n`; CREATE TABLE `folder_document_i18n` ( `id` INTEGER NOT NULL, - `locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL, + `locale` VARCHAR(5) DEFAULT 'en_EN' NOT NULL, `title` VARCHAR(255), `description` LONGTEXT, `chapo` TEXT, @@ -2132,5 +2133,34 @@ CREATE TABLE `message_version` ON DELETE CASCADE ) ENGINE=InnoDB; +-- --------------------------------------------------------------------- +-- coupon_version +-- --------------------------------------------------------------------- + +DROP TABLE IF EXISTS `coupon_version`; + +CREATE TABLE `coupon_version` +( + `id` INTEGER NOT NULL, + `code` VARCHAR(45) NOT NULL, + `type` VARCHAR(255) NOT NULL, + `title` VARCHAR(255) NOT NULL, + `short_description` TEXT NOT NULL, + `description` LONGTEXT NOT NULL, + `value` FLOAT NOT NULL, + `is_used` TINYINT NOT NULL, + `is_enabled` TINYINT NOT NULL, + `expiration_date` DATETIME NOT NULL, + `serialized_rules` TEXT NOT NULL, + `created_at` DATETIME, + `updated_at` DATETIME, + `version` INTEGER DEFAULT 0 NOT NULL, + PRIMARY KEY (`id`,`version`), + CONSTRAINT `coupon_version_FK_1` + FOREIGN KEY (`id`) + REFERENCES `coupon` (`id`) + ON DELETE CASCADE +) ENGINE=InnoDB; + # This restores the fkey checks, after having unset them earlier SET FOREIGN_KEY_CHECKS = 1;