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

Add XML export and export_category definition and Fix CS

Browse Source 
nouveau fichier: core/lib/Thelia/Config/Resources/export.xml
	modifié:         core/lib/Thelia/Controller/Admin/CustomerExportController.php
	modifié:         core/lib/Thelia/Controller/Admin/ExportController.php
	modifié:         core/lib/Thelia/Controller/Admin/ImportExportController.php
	modifié:         core/lib/Thelia/Core/DependencyInjection/Compiler/RegisterArchiveBuilderPass.php
	modifié:         core/lib/Thelia/Core/DependencyInjection/Compiler/RegisterFormatterPass.php
	modifié:         core/lib/Thelia/Core/DependencyInjection/Loader/XmlFileLoader.php
	modifié:         core/lib/Thelia/Core/DependencyInjection/Loader/schema/dic/config/thelia-1.0.xsd
	modifié:         core/lib/Thelia/Core/Event/ImportExport/Export.php
	modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilderManager.php
	modifié:         core/lib/Thelia/Core/FileFormat/Formatting/Formatter/JsonFormatter.php
	modifié:         core/lib/Thelia/Core/FileFormat/Formatting/Formatter/XMLFormatter.php
	modifié:         core/lib/Thelia/Core/FileFormat/Formatting/FormatterData.php
	modifié:         core/lib/Thelia/Core/FileFormat/Formatting/FormatterManager.php
	modifié:         core/lib/Thelia/Core/Template/Loop/ArchiveBuilder.php
	modifié:         core/lib/Thelia/Core/Template/Loop/Export.php
	modifié:         core/lib/Thelia/Core/Template/Loop/ExportCategory.php
	modifié:         core/lib/Thelia/Core/Template/Loop/Formatter.php
	modifié:         core/lib/Thelia/Core/Template/Loop/Import.php
	modifié:         core/lib/Thelia/Core/Template/Loop/ImportCategory.php
	modifié:         core/lib/Thelia/Core/Template/Loop/ImportExportCategory.php
	modifié:         core/lib/Thelia/Core/Template/Loop/ImportExportType.php
	modifié:         core/lib/Thelia/Exception/FileNotFoundException.php
	modifié:         core/lib/Thelia/Exception/FileNotReadableException.php
	modifié:         core/lib/Thelia/Exception/HttpUrlException.php
	modifié:         core/lib/Thelia/Form/ExportForm.php
	modifié:         core/lib/Thelia/ImportExport/Export/MailingExport.php
	modifié:         core/lib/Thelia/Model/Base/Export.php
	modifié:         core/lib/Thelia/Model/Base/ExportCategory.php
	modifié:         core/lib/Thelia/Model/Base/ExportCategoryQuery.php
	modifié:         core/lib/Thelia/Model/Base/ExportQuery.php
	modifié:         core/lib/Thelia/Model/Base/Import.php
	modifié:         core/lib/Thelia/Model/Base/ImportCategory.php
	modifié:         core/lib/Thelia/Model/Base/ImportCategoryQuery.php
	modifié:         core/lib/Thelia/Model/Base/ImportQuery.php
	modifié:         core/lib/Thelia/Model/Export.php
	modifié:         core/lib/Thelia/Model/ExportCategory.php
	modifié:         core/lib/Thelia/Model/ExportCategoryI18nQuery.php
	modifié:         core/lib/Thelia/Model/ExportCategoryQuery.php
	modifié:         core/lib/Thelia/Model/ExportI18nQuery.php
	modifié:         core/lib/Thelia/Model/ExportQuery.php
	modifié:         core/lib/Thelia/Model/ImportCategoryI18nQuery.php
	modifié:         core/lib/Thelia/Model/ImportCategoryQuery.php
	modifié:         core/lib/Thelia/Model/ImportI18nQuery.php
	modifié:         core/lib/Thelia/Model/ImportQuery.php
	modifié:         core/lib/Thelia/Model/Map/ExportCategoryTableMap.php
	modifié:         core/lib/Thelia/Model/Map/ExportTableMap.php
	modifié:         core/lib/Thelia/Model/Map/ImportCategoryTableMap.php
	modifié:         core/lib/Thelia/Model/Map/ImportTableMap.php
	modifié:         core/lib/Thelia/Model/Tax.php
	modifié:         local/config/schema.xml
	modifié:         setup/thelia.sql
	modifié:         templates/backOffice/default/ajax/export-modal.html
	modifié:         templates/backOffice/default/export-page.html
This commit is contained in:
Benjamin Perche
2014-07-15 15:40:56 +02:00
parent 740869eba0
commit 7a312e9093
53 changed files with 1019 additions and 307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

144
core/lib/Thelia/Model/Base/Export.php
View File

@@ -65,6 +65,12 @@ abstract class Export implements ActiveRecordInterface
*/
protected $id;
/**
* The value for the ref field.
* @var string
*/
protected $ref;
/**
* The value for the export_category_id field.
* @var int
@@ -78,10 +84,10 @@ abstract class Export implements ActiveRecordInterface
protected $position;
/**
* The value for the handleclass field.
* The value for the handle_class field.
* @var string
*/
protected $handleclass;
protected $handle_class;
/**
* The value for the created_at field.
@@ -403,6 +409,17 @@ abstract class Export implements ActiveRecordInterface
return $this->id;
}
/**
* Get the [ref] column value.
*
* @return string
*/
public function getRef()
{
return $this->ref;
}
/**
* Get the [export_category_id] column value.
*
@@ -426,14 +443,14 @@ abstract class Export implements ActiveRecordInterface
}
/**
* Get the [handleclass] column value.
* Get the [handle_class] column value.
*
* @return string
*/
public function getHandleclass()
public function getHandleClass()
{
return $this->handleclass;
return $this->handle_class;
}
/**
@@ -497,6 +514,27 @@ abstract class Export implements ActiveRecordInterface
return $this;
} // setId()
/**
* Set the value of [ref] column.
*
* @param string $v new value
* @return \Thelia\Model\Export The current object (for fluent API support)
*/
public function setRef($v)
{
if ($v !== null) {
$v = (string) $v;
}
if ($this->ref !== $v) {
$this->ref = $v;
$this->modifiedColumns[ExportTableMap::REF] = true;
}
return $this;
} // setRef()
/**
* Set the value of [export_category_id] column.
*
@@ -544,25 +582,25 @@ abstract class Export implements ActiveRecordInterface
} // setPosition()
/**
* Set the value of [handleclass] column.
* Set the value of [handle_class] column.
*
* @param string $v new value
* @return \Thelia\Model\Export The current object (for fluent API support)
*/
public function setHandleclass($v)
public function setHandleClass($v)
{
if ($v !== null) {
$v = (string) $v;
}
if ($this->handleclass !== $v) {
$this->handleclass = $v;
$this->modifiedColumns[ExportTableMap::HANDLECLASS] = true;
if ($this->handle_class !== $v) {
$this->handle_class = $v;
$this->modifiedColumns[ExportTableMap::HANDLE_CLASS] = true;
}
return $this;
} // setHandleclass()
} // setHandleClass()
/**
* Sets the value of [created_at] column to a normalized version of the date/time value specified.
@@ -646,22 +684,25 @@ abstract class Export implements ActiveRecordInterface
$col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : ExportTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)];
$this->id = (null !== $col) ? (int) $col : null;
$col = $row[TableMap::TYPE_NUM == $indexType ? 1 + $startcol : ExportTableMap::translateFieldName('ExportCategoryId', TableMap::TYPE_PHPNAME, $indexType)];
$col = $row[TableMap::TYPE_NUM == $indexType ? 1 + $startcol : ExportTableMap::translateFieldName('Ref', TableMap::TYPE_PHPNAME, $indexType)];
$this->ref = (null !== $col) ? (string) $col : null;
$col = $row[TableMap::TYPE_NUM == $indexType ? 2 + $startcol : ExportTableMap::translateFieldName('ExportCategoryId', TableMap::TYPE_PHPNAME, $indexType)];
$this->export_category_id = (null !== $col) ? (int) $col : null;
$col = $row[TableMap::TYPE_NUM == $indexType ? 2 + $startcol : ExportTableMap::translateFieldName('Position', TableMap::TYPE_PHPNAME, $indexType)];
$col = $row[TableMap::TYPE_NUM == $indexType ? 3 + $startcol : ExportTableMap::translateFieldName('Position', TableMap::TYPE_PHPNAME, $indexType)];
$this->position = (null !== $col) ? (int) $col : null;
$col = $row[TableMap::TYPE_NUM == $indexType ? 3 + $startcol : ExportTableMap::translateFieldName('Handleclass', TableMap::TYPE_PHPNAME, $indexType)];
$this->handleclass = (null !== $col) ? (string) $col : null;
$col = $row[TableMap::TYPE_NUM == $indexType ? 4 + $startcol : ExportTableMap::translateFieldName('HandleClass', TableMap::TYPE_PHPNAME, $indexType)];
$this->handle_class = (null !== $col) ? (string) $col : null;
$col = $row[TableMap::TYPE_NUM == $indexType ? 4 + $startcol : ExportTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)];
$col = $row[TableMap::TYPE_NUM == $indexType ? 5 + $startcol : ExportTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)];
if ($col === '0000-00-00 00:00:00') {
$col = null;
}
$this->created_at = (null !== $col) ? PropelDateTime::newInstance($col, null, '\DateTime') : null;
$col = $row[TableMap::TYPE_NUM == $indexType ? 5 + $startcol : ExportTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)];
$col = $row[TableMap::TYPE_NUM == $indexType ? 6 + $startcol : ExportTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)];
if ($col === '0000-00-00 00:00:00') {
$col = null;
}
@@ -674,7 +715,7 @@ abstract class Export implements ActiveRecordInterface
$this->ensureConsistency();
}
return $startcol + 6; // 6 = ExportTableMap::NUM_HYDRATE_COLUMNS.
return $startcol + 7; // 7 = ExportTableMap::NUM_HYDRATE_COLUMNS.
} catch (Exception $e) {
throw new PropelException("Error populating \Thelia\Model\Export object", 0, $e);
@@ -932,14 +973,17 @@ abstract class Export implements ActiveRecordInterface
if ($this->isColumnModified(ExportTableMap::ID)) {
$modifiedColumns[':p' . $index++] = '`ID`';
}
if ($this->isColumnModified(ExportTableMap::REF)) {
$modifiedColumns[':p' . $index++] = '`REF`';
}
if ($this->isColumnModified(ExportTableMap::EXPORT_CATEGORY_ID)) {
$modifiedColumns[':p' . $index++] = '`EXPORT_CATEGORY_ID`';
}
if ($this->isColumnModified(ExportTableMap::POSITION)) {
$modifiedColumns[':p' . $index++] = '`POSITION`';
}
if ($this->isColumnModified(ExportTableMap::HANDLECLASS)) {
$modifiedColumns[':p' . $index++] = '`HANDLECLASS`';
if ($this->isColumnModified(ExportTableMap::HANDLE_CLASS)) {
$modifiedColumns[':p' . $index++] = '`HANDLE_CLASS`';
}
if ($this->isColumnModified(ExportTableMap::CREATED_AT)) {
$modifiedColumns[':p' . $index++] = '`CREATED_AT`';
@@ -961,14 +1005,17 @@ abstract class Export implements ActiveRecordInterface
case '`ID`':
$stmt->bindValue($identifier, $this->id, PDO::PARAM_INT);
break;
case '`REF`':
$stmt->bindValue($identifier, $this->ref, PDO::PARAM_STR);
break;
case '`EXPORT_CATEGORY_ID`':
$stmt->bindValue($identifier, $this->export_category_id, PDO::PARAM_INT);
break;
case '`POSITION`':
$stmt->bindValue($identifier, $this->position, PDO::PARAM_INT);
break;
case '`HANDLECLASS`':
$stmt->bindValue($identifier, $this->handleclass, PDO::PARAM_STR);
case '`HANDLE_CLASS`':
$stmt->bindValue($identifier, $this->handle_class, 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);
@@ -1042,18 +1089,21 @@ abstract class Export implements ActiveRecordInterface
return $this->getId();
break;
case 1:
return $this->getExportCategoryId();
return $this->getRef();
break;
case 2:
return $this->getPosition();
return $this->getExportCategoryId();
break;
case 3:
return $this->getHandleclass();
return $this->getPosition();
break;
case 4:
return $this->getCreatedAt();
return $this->getHandleClass();
break;
case 5:
return $this->getCreatedAt();
break;
case 6:
return $this->getUpdatedAt();
break;
default:
@@ -1086,11 +1136,12 @@ abstract class Export implements ActiveRecordInterface
$keys = ExportTableMap::getFieldNames($keyType);
$result = array(
$keys[0] => $this->getId(),
$keys[1] => $this->getExportCategoryId(),
$keys[2] => $this->getPosition(),
$keys[3] => $this->getHandleclass(),
$keys[4] => $this->getCreatedAt(),
$keys[5] => $this->getUpdatedAt(),
$keys[1] => $this->getRef(),
$keys[2] => $this->getExportCategoryId(),
$keys[3] => $this->getPosition(),
$keys[4] => $this->getHandleClass(),
$keys[5] => $this->getCreatedAt(),
$keys[6] => $this->getUpdatedAt(),
);
$virtualColumns = $this->virtualColumns;
foreach ($virtualColumns as $key => $virtualColumn) {
@@ -1142,18 +1193,21 @@ abstract class Export implements ActiveRecordInterface
$this->setId($value);
break;
case 1:
$this->setExportCategoryId($value);
$this->setRef($value);
break;
case 2:
$this->setPosition($value);
$this->setExportCategoryId($value);
break;
case 3:
$this->setHandleclass($value);
$this->setPosition($value);
break;
case 4:
$this->setCreatedAt($value);
$this->setHandleClass($value);
break;
case 5:
$this->setCreatedAt($value);
break;
case 6:
$this->setUpdatedAt($value);
break;
} // switch()
@@ -1181,11 +1235,12 @@ abstract class Export implements ActiveRecordInterface
$keys = ExportTableMap::getFieldNames($keyType);
if (array_key_exists($keys[0], $arr)) $this->setId($arr[$keys[0]]);
if (array_key_exists($keys[1], $arr)) $this->setExportCategoryId($arr[$keys[1]]);
if (array_key_exists($keys[2], $arr)) $this->setPosition($arr[$keys[2]]);
if (array_key_exists($keys[3], $arr)) $this->setHandleclass($arr[$keys[3]]);
if (array_key_exists($keys[4], $arr)) $this->setCreatedAt($arr[$keys[4]]);
if (array_key_exists($keys[5], $arr)) $this->setUpdatedAt($arr[$keys[5]]);
if (array_key_exists($keys[1], $arr)) $this->setRef($arr[$keys[1]]);
if (array_key_exists($keys[2], $arr)) $this->setExportCategoryId($arr[$keys[2]]);
if (array_key_exists($keys[3], $arr)) $this->setPosition($arr[$keys[3]]);
if (array_key_exists($keys[4], $arr)) $this->setHandleClass($arr[$keys[4]]);
if (array_key_exists($keys[5], $arr)) $this->setCreatedAt($arr[$keys[5]]);
if (array_key_exists($keys[6], $arr)) $this->setUpdatedAt($arr[$keys[6]]);
}
/**
@@ -1198,9 +1253,10 @@ abstract class Export implements ActiveRecordInterface
$criteria = new Criteria(ExportTableMap::DATABASE_NAME);
if ($this->isColumnModified(ExportTableMap::ID)) $criteria->add(ExportTableMap::ID, $this->id);
if ($this->isColumnModified(ExportTableMap::REF)) $criteria->add(ExportTableMap::REF, $this->ref);
if ($this->isColumnModified(ExportTableMap::EXPORT_CATEGORY_ID)) $criteria->add(ExportTableMap::EXPORT_CATEGORY_ID, $this->export_category_id);
if ($this->isColumnModified(ExportTableMap::POSITION)) $criteria->add(ExportTableMap::POSITION, $this->position);
if ($this->isColumnModified(ExportTableMap::HANDLECLASS)) $criteria->add(ExportTableMap::HANDLECLASS, $this->handleclass);
if ($this->isColumnModified(ExportTableMap::HANDLE_CLASS)) $criteria->add(ExportTableMap::HANDLE_CLASS, $this->handle_class);
if ($this->isColumnModified(ExportTableMap::CREATED_AT)) $criteria->add(ExportTableMap::CREATED_AT, $this->created_at);
if ($this->isColumnModified(ExportTableMap::UPDATED_AT)) $criteria->add(ExportTableMap::UPDATED_AT, $this->updated_at);
@@ -1266,9 +1322,10 @@ abstract class Export implements ActiveRecordInterface
*/
public function copyInto($copyObj, $deepCopy = false, $makeNew = true)
{
$copyObj->setRef($this->getRef());
$copyObj->setExportCategoryId($this->getExportCategoryId());
$copyObj->setPosition($this->getPosition());
$copyObj->setHandleclass($this->getHandleclass());
$copyObj->setHandleClass($this->getHandleClass());
$copyObj->setCreatedAt($this->getCreatedAt());
$copyObj->setUpdatedAt($this->getUpdatedAt());
@@ -1611,9 +1668,10 @@ abstract class Export implements ActiveRecordInterface
public function clear()
{
$this->id = null;
$this->ref = null;
$this->export_category_id = null;
$this->position = null;
$this->handleclass = null;
$this->handle_class = null;
$this->created_at = null;
$this->updated_at = null;
$this->alreadyInSave = false;

86
core/lib/Thelia/Model/Base/ExportCategory.php
View File

@@ -65,6 +65,12 @@ abstract class ExportCategory implements ActiveRecordInterface
*/
protected $id;
/**
* The value for the ref field.
* @var string
*/
protected $ref;
/**
* The value for the position field.
* @var int
@@ -398,6 +404,17 @@ abstract class ExportCategory implements ActiveRecordInterface
return $this->id;
}
/**
* Get the [ref] column value.
*
* @return string
*/
public function getRef()
{
return $this->ref;
}
/**
* Get the [position] column value.
*
@@ -470,6 +487,27 @@ abstract class ExportCategory implements ActiveRecordInterface
return $this;
} // setId()
/**
* Set the value of [ref] column.
*
* @param string $v new value
* @return \Thelia\Model\ExportCategory The current object (for fluent API support)
*/
public function setRef($v)
{
if ($v !== null) {
$v = (string) $v;
}
if ($this->ref !== $v) {
$this->ref = $v;
$this->modifiedColumns[ExportCategoryTableMap::REF] = true;
}
return $this;
} // setRef()
/**
* Set the value of [position] column.
*
@@ -573,16 +611,19 @@ abstract class ExportCategory implements ActiveRecordInterface
$col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : ExportCategoryTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)];
$this->id = (null !== $col) ? (int) $col : null;
$col = $row[TableMap::TYPE_NUM == $indexType ? 1 + $startcol : ExportCategoryTableMap::translateFieldName('Position', TableMap::TYPE_PHPNAME, $indexType)];
$col = $row[TableMap::TYPE_NUM == $indexType ? 1 + $startcol : ExportCategoryTableMap::translateFieldName('Ref', TableMap::TYPE_PHPNAME, $indexType)];
$this->ref = (null !== $col) ? (string) $col : null;
$col = $row[TableMap::TYPE_NUM == $indexType ? 2 + $startcol : ExportCategoryTableMap::translateFieldName('Position', TableMap::TYPE_PHPNAME, $indexType)];
$this->position = (null !== $col) ? (int) $col : null;
$col = $row[TableMap::TYPE_NUM == $indexType ? 2 + $startcol : ExportCategoryTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)];
$col = $row[TableMap::TYPE_NUM == $indexType ? 3 + $startcol : ExportCategoryTableMap::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 ? 3 + $startcol : ExportCategoryTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)];
$col = $row[TableMap::TYPE_NUM == $indexType ? 4 + $startcol : ExportCategoryTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)];
if ($col === '0000-00-00 00:00:00') {
$col = null;
}
@@ -595,7 +636,7 @@ abstract class ExportCategory implements ActiveRecordInterface
$this->ensureConsistency();
}
return $startcol + 4; // 4 = ExportCategoryTableMap::NUM_HYDRATE_COLUMNS.
return $startcol + 5; // 5 = ExportCategoryTableMap::NUM_HYDRATE_COLUMNS.
} catch (Exception $e) {
throw new PropelException("Error populating \Thelia\Model\ExportCategory object", 0, $e);
@@ -856,6 +897,9 @@ abstract class ExportCategory implements ActiveRecordInterface
if ($this->isColumnModified(ExportCategoryTableMap::ID)) {
$modifiedColumns[':p' . $index++] = '`ID`';
}
if ($this->isColumnModified(ExportCategoryTableMap::REF)) {
$modifiedColumns[':p' . $index++] = '`REF`';
}
if ($this->isColumnModified(ExportCategoryTableMap::POSITION)) {
$modifiedColumns[':p' . $index++] = '`POSITION`';
}
@@ -879,6 +923,9 @@ abstract class ExportCategory implements ActiveRecordInterface
case '`ID`':
$stmt->bindValue($identifier, $this->id, PDO::PARAM_INT);
break;
case '`REF`':
$stmt->bindValue($identifier, $this->ref, PDO::PARAM_STR);
break;
case '`POSITION`':
$stmt->bindValue($identifier, $this->position, PDO::PARAM_INT);
break;
@@ -954,12 +1001,15 @@ abstract class ExportCategory implements ActiveRecordInterface
return $this->getId();
break;
case 1:
return $this->getPosition();
return $this->getRef();
break;
case 2:
return $this->getCreatedAt();
return $this->getPosition();
break;
case 3:
return $this->getCreatedAt();
break;
case 4:
return $this->getUpdatedAt();
break;
default:
@@ -992,9 +1042,10 @@ abstract class ExportCategory implements ActiveRecordInterface
$keys = ExportCategoryTableMap::getFieldNames($keyType);
$result = array(
$keys[0] => $this->getId(),
$keys[1] => $this->getPosition(),
$keys[2] => $this->getCreatedAt(),
$keys[3] => $this->getUpdatedAt(),
$keys[1] => $this->getRef(),
$keys[2] => $this->getPosition(),
$keys[3] => $this->getCreatedAt(),
$keys[4] => $this->getUpdatedAt(),
);
$virtualColumns = $this->virtualColumns;
foreach ($virtualColumns as $key => $virtualColumn) {
@@ -1046,12 +1097,15 @@ abstract class ExportCategory implements ActiveRecordInterface
$this->setId($value);
break;
case 1:
$this->setPosition($value);
$this->setRef($value);
break;
case 2:
$this->setCreatedAt($value);
$this->setPosition($value);
break;
case 3:
$this->setCreatedAt($value);
break;
case 4:
$this->setUpdatedAt($value);
break;
} // switch()
@@ -1079,9 +1133,10 @@ abstract class ExportCategory implements ActiveRecordInterface
$keys = ExportCategoryTableMap::getFieldNames($keyType);
if (array_key_exists($keys[0], $arr)) $this->setId($arr[$keys[0]]);
if (array_key_exists($keys[1], $arr)) $this->setPosition($arr[$keys[1]]);
if (array_key_exists($keys[2], $arr)) $this->setCreatedAt($arr[$keys[2]]);
if (array_key_exists($keys[3], $arr)) $this->setUpdatedAt($arr[$keys[3]]);
if (array_key_exists($keys[1], $arr)) $this->setRef($arr[$keys[1]]);
if (array_key_exists($keys[2], $arr)) $this->setPosition($arr[$keys[2]]);
if (array_key_exists($keys[3], $arr)) $this->setCreatedAt($arr[$keys[3]]);
if (array_key_exists($keys[4], $arr)) $this->setUpdatedAt($arr[$keys[4]]);
}
/**
@@ -1094,6 +1149,7 @@ abstract class ExportCategory implements ActiveRecordInterface
$criteria = new Criteria(ExportCategoryTableMap::DATABASE_NAME);
if ($this->isColumnModified(ExportCategoryTableMap::ID)) $criteria->add(ExportCategoryTableMap::ID, $this->id);
if ($this->isColumnModified(ExportCategoryTableMap::REF)) $criteria->add(ExportCategoryTableMap::REF, $this->ref);
if ($this->isColumnModified(ExportCategoryTableMap::POSITION)) $criteria->add(ExportCategoryTableMap::POSITION, $this->position);
if ($this->isColumnModified(ExportCategoryTableMap::CREATED_AT)) $criteria->add(ExportCategoryTableMap::CREATED_AT, $this->created_at);
if ($this->isColumnModified(ExportCategoryTableMap::UPDATED_AT)) $criteria->add(ExportCategoryTableMap::UPDATED_AT, $this->updated_at);
@@ -1160,6 +1216,7 @@ abstract class ExportCategory implements ActiveRecordInterface
*/
public function copyInto($copyObj, $deepCopy = false, $makeNew = true)
{
$copyObj->setRef($this->getRef());
$copyObj->setPosition($this->getPosition());
$copyObj->setCreatedAt($this->getCreatedAt());
$copyObj->setUpdatedAt($this->getUpdatedAt());
@@ -1679,6 +1736,7 @@ abstract class ExportCategory implements ActiveRecordInterface
public function clear()
{
$this->id = null;
$this->ref = null;
$this->position = null;
$this->created_at = null;
$this->updated_at = null;

35
core/lib/Thelia/Model/Base/ExportCategoryQuery.php
View File

@@ -23,11 +23,13 @@ use Thelia\Model\Map\ExportCategoryTableMap;
*
*
* @method ChildExportCategoryQuery orderById($order = Criteria::ASC) Order by the id column
* @method ChildExportCategoryQuery orderByRef($order = Criteria::ASC) Order by the ref column
* @method ChildExportCategoryQuery orderByPosition($order = Criteria::ASC) Order by the position column
* @method ChildExportCategoryQuery orderByCreatedAt($order = Criteria::ASC) Order by the created_at column
* @method ChildExportCategoryQuery orderByUpdatedAt($order = Criteria::ASC) Order by the updated_at column
*
* @method ChildExportCategoryQuery groupById() Group by the id column
* @method ChildExportCategoryQuery groupByRef() Group by the ref column
* @method ChildExportCategoryQuery groupByPosition() Group by the position column
* @method ChildExportCategoryQuery groupByCreatedAt() Group by the created_at column
* @method ChildExportCategoryQuery groupByUpdatedAt() Group by the updated_at column
@@ -48,11 +50,13 @@ use Thelia\Model\Map\ExportCategoryTableMap;
* @method ChildExportCategory findOneOrCreate(ConnectionInterface $con = null) Return the first ChildExportCategory matching the query, or a new ChildExportCategory object populated from the query conditions when no match is found
*
* @method ChildExportCategory findOneById(int $id) Return the first ChildExportCategory filtered by the id column
* @method ChildExportCategory findOneByRef(string $ref) Return the first ChildExportCategory filtered by the ref column
* @method ChildExportCategory findOneByPosition(int $position) Return the first ChildExportCategory filtered by the position column
* @method ChildExportCategory findOneByCreatedAt(string $created_at) Return the first ChildExportCategory filtered by the created_at column
* @method ChildExportCategory findOneByUpdatedAt(string $updated_at) Return the first ChildExportCategory filtered by the updated_at column
*
* @method array findById(int $id) Return ChildExportCategory objects filtered by the id column
* @method array findByRef(string $ref) Return ChildExportCategory objects filtered by the ref column
* @method array findByPosition(int $position) Return ChildExportCategory objects filtered by the position column
* @method array findByCreatedAt(string $created_at) Return ChildExportCategory objects filtered by the created_at column
* @method array findByUpdatedAt(string $updated_at) Return ChildExportCategory objects filtered by the updated_at column
@@ -144,7 +148,7 @@ abstract class ExportCategoryQuery extends ModelCriteria
*/
protected function findPkSimple($key, $con)
{
$sql = 'SELECT `ID`, `POSITION`, `CREATED_AT`, `UPDATED_AT` FROM `export_category` WHERE `ID` = :p0';
$sql = 'SELECT `ID`, `REF`, `POSITION`, `CREATED_AT`, `UPDATED_AT` FROM `export_category` WHERE `ID` = :p0';
try {
$stmt = $con->prepare($sql);
$stmt->bindValue(':p0', $key, PDO::PARAM_INT);
@@ -274,6 +278,35 @@ abstract class ExportCategoryQuery extends ModelCriteria
return $this->addUsingAlias(ExportCategoryTableMap::ID, $id, $comparison);
}
/**
* Filter the query on the ref column
*
* Example usage:
* <code>
* $query->filterByRef('fooValue'); // WHERE ref = 'fooValue'
* $query->filterByRef('%fooValue%'); // WHERE ref LIKE '%fooValue%'
* </code>
*
* @param string $ref 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 ChildExportCategoryQuery The current query, for fluid interface
*/
public function filterByRef($ref = null, $comparison = null)
{
if (null === $comparison) {
if (is_array($ref)) {
$comparison = Criteria::IN;
} elseif (preg_match('/[\%\*]/', $ref)) {
$ref = str_replace('*', '%', $ref);
$comparison = Criteria::LIKE;
}
}
return $this->addUsingAlias(ExportCategoryTableMap::REF, $ref, $comparison);
}
/**
* Filter the query on the position column
*

61
core/lib/Thelia/Model/Base/ExportQuery.php
View File

@@ -23,16 +23,18 @@ use Thelia\Model\Map\ExportTableMap;
*
*
* @method ChildExportQuery orderById($order = Criteria::ASC) Order by the id column
* @method ChildExportQuery orderByRef($order = Criteria::ASC) Order by the ref column
* @method ChildExportQuery orderByExportCategoryId($order = Criteria::ASC) Order by the export_category_id column
* @method ChildExportQuery orderByPosition($order = Criteria::ASC) Order by the position column
* @method ChildExportQuery orderByHandleclass($order = Criteria::ASC) Order by the handleClass column
* @method ChildExportQuery orderByHandleClass($order = Criteria::ASC) Order by the handle_class column
* @method ChildExportQuery orderByCreatedAt($order = Criteria::ASC) Order by the created_at column
* @method ChildExportQuery orderByUpdatedAt($order = Criteria::ASC) Order by the updated_at column
*
* @method ChildExportQuery groupById() Group by the id column
* @method ChildExportQuery groupByRef() Group by the ref column
* @method ChildExportQuery groupByExportCategoryId() Group by the export_category_id column
* @method ChildExportQuery groupByPosition() Group by the position column
* @method ChildExportQuery groupByHandleclass() Group by the handleClass column
* @method ChildExportQuery groupByHandleClass() Group by the handle_class column
* @method ChildExportQuery groupByCreatedAt() Group by the created_at column
* @method ChildExportQuery groupByUpdatedAt() Group by the updated_at column
*
@@ -52,16 +54,18 @@ use Thelia\Model\Map\ExportTableMap;
* @method ChildExport findOneOrCreate(ConnectionInterface $con = null) Return the first ChildExport matching the query, or a new ChildExport object populated from the query conditions when no match is found
*
* @method ChildExport findOneById(int $id) Return the first ChildExport filtered by the id column
* @method ChildExport findOneByRef(string $ref) Return the first ChildExport filtered by the ref column
* @method ChildExport findOneByExportCategoryId(int $export_category_id) Return the first ChildExport filtered by the export_category_id column
* @method ChildExport findOneByPosition(int $position) Return the first ChildExport filtered by the position column
* @method ChildExport findOneByHandleclass(string $handleClass) Return the first ChildExport filtered by the handleClass column
* @method ChildExport findOneByHandleClass(string $handle_class) Return the first ChildExport filtered by the handle_class column
* @method ChildExport findOneByCreatedAt(string $created_at) Return the first ChildExport filtered by the created_at column
* @method ChildExport findOneByUpdatedAt(string $updated_at) Return the first ChildExport filtered by the updated_at column
*
* @method array findById(int $id) Return ChildExport objects filtered by the id column
* @method array findByRef(string $ref) Return ChildExport objects filtered by the ref column
* @method array findByExportCategoryId(int $export_category_id) Return ChildExport objects filtered by the export_category_id column
* @method array findByPosition(int $position) Return ChildExport objects filtered by the position column
* @method array findByHandleclass(string $handleClass) Return ChildExport objects filtered by the handleClass column
* @method array findByHandleClass(string $handle_class) Return ChildExport objects filtered by the handle_class column
* @method array findByCreatedAt(string $created_at) Return ChildExport objects filtered by the created_at column
* @method array findByUpdatedAt(string $updated_at) Return ChildExport objects filtered by the updated_at column
*
@@ -152,7 +156,7 @@ abstract class ExportQuery extends ModelCriteria
*/
protected function findPkSimple($key, $con)
{
$sql = 'SELECT `ID`, `EXPORT_CATEGORY_ID`, `POSITION`, `HANDLECLASS`, `CREATED_AT`, `UPDATED_AT` FROM `export` WHERE `ID` = :p0';
$sql = 'SELECT `ID`, `REF`, `EXPORT_CATEGORY_ID`, `POSITION`, `HANDLE_CLASS`, `CREATED_AT`, `UPDATED_AT` FROM `export` WHERE `ID` = :p0';
try {
$stmt = $con->prepare($sql);
$stmt->bindValue(':p0', $key, PDO::PARAM_INT);
@@ -282,6 +286,35 @@ abstract class ExportQuery extends ModelCriteria
return $this->addUsingAlias(ExportTableMap::ID, $id, $comparison);
}
/**
* Filter the query on the ref column
*
* Example usage:
* <code>
* $query->filterByRef('fooValue'); // WHERE ref = 'fooValue'
* $query->filterByRef('%fooValue%'); // WHERE ref LIKE '%fooValue%'
* </code>
*
* @param string $ref 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 ChildExportQuery The current query, for fluid interface
*/
public function filterByRef($ref = null, $comparison = null)
{
if (null === $comparison) {
if (is_array($ref)) {
$comparison = Criteria::IN;
} elseif (preg_match('/[\%\*]/', $ref)) {
$ref = str_replace('*', '%', $ref);
$comparison = Criteria::LIKE;
}
}
return $this->addUsingAlias(ExportTableMap::REF, $ref, $comparison);
}
/**
* Filter the query on the export_category_id column
*
@@ -367,32 +400,32 @@ abstract class ExportQuery extends ModelCriteria
}
/**
* Filter the query on the handleClass column
* Filter the query on the handle_class column
*
* Example usage:
* <code>
* $query->filterByHandleclass('fooValue'); // WHERE handleClass = 'fooValue'
* $query->filterByHandleclass('%fooValue%'); // WHERE handleClass LIKE '%fooValue%'
* $query->filterByHandleClass('fooValue'); // WHERE handle_class = 'fooValue'
* $query->filterByHandleClass('%fooValue%'); // WHERE handle_class LIKE '%fooValue%'
* </code>
*
* @param string $handleclass The value to use as filter.
* @param string $handleClass 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 ChildExportQuery The current query, for fluid interface
*/
public function filterByHandleclass($handleclass = null, $comparison = null)
public function filterByHandleClass($handleClass = null, $comparison = null)
{
if (null === $comparison) {
if (is_array($handleclass)) {
if (is_array($handleClass)) {
$comparison = Criteria::IN;
} elseif (preg_match('/[\%\*]/', $handleclass)) {
$handleclass = str_replace('*', '%', $handleclass);
} elseif (preg_match('/[\%\*]/', $handleClass)) {
$handleClass = str_replace('*', '%', $handleClass);
$comparison = Criteria::LIKE;
}
}
return $this->addUsingAlias(ExportTableMap::HANDLECLASS, $handleclass, $comparison);
return $this->addUsingAlias(ExportTableMap::HANDLE_CLASS, $handleClass, $comparison);
}
/**

144
core/lib/Thelia/Model/Base/Import.php
View File

@@ -65,6 +65,12 @@ abstract class Import implements ActiveRecordInterface
*/
protected $id;
/**
* The value for the ref field.
* @var string
*/
protected $ref;
/**
* The value for the import_category_id field.
* @var int
@@ -78,10 +84,10 @@ abstract class Import implements ActiveRecordInterface
protected $position;
/**
* The value for the handleclass field.
* The value for the handle_class field.
* @var string
*/
protected $handleclass;
protected $handle_class;
/**
* The value for the created_at field.
@@ -403,6 +409,17 @@ abstract class Import implements ActiveRecordInterface
return $this->id;
}
/**
* Get the [ref] column value.
*
* @return string
*/
public function getRef()
{
return $this->ref;
}
/**
* Get the [import_category_id] column value.
*
@@ -426,14 +443,14 @@ abstract class Import implements ActiveRecordInterface
}
/**
* Get the [handleclass] column value.
* Get the [handle_class] column value.
*
* @return string
*/
public function getHandleclass()
public function getHandleClass()
{
return $this->handleclass;
return $this->handle_class;
}
/**
@@ -497,6 +514,27 @@ abstract class Import implements ActiveRecordInterface
return $this;
} // setId()
/**
* Set the value of [ref] column.
*
* @param string $v new value
* @return \Thelia\Model\Import The current object (for fluent API support)
*/
public function setRef($v)
{
if ($v !== null) {
$v = (string) $v;
}
if ($this->ref !== $v) {
$this->ref = $v;
$this->modifiedColumns[ImportTableMap::REF] = true;
}
return $this;
} // setRef()
/**
* Set the value of [import_category_id] column.
*
@@ -544,25 +582,25 @@ abstract class Import implements ActiveRecordInterface
} // setPosition()
/**
* Set the value of [handleclass] column.
* Set the value of [handle_class] column.
*
* @param string $v new value
* @return \Thelia\Model\Import The current object (for fluent API support)
*/
public function setHandleclass($v)
public function setHandleClass($v)
{
if ($v !== null) {
$v = (string) $v;
}
if ($this->handleclass !== $v) {
$this->handleclass = $v;
$this->modifiedColumns[ImportTableMap::HANDLECLASS] = true;
if ($this->handle_class !== $v) {
$this->handle_class = $v;
$this->modifiedColumns[ImportTableMap::HANDLE_CLASS] = true;
}
return $this;
} // setHandleclass()
} // setHandleClass()
/**
* Sets the value of [created_at] column to a normalized version of the date/time value specified.
@@ -646,22 +684,25 @@ abstract class Import implements ActiveRecordInterface
$col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : ImportTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)];
$this->id = (null !== $col) ? (int) $col : null;
$col = $row[TableMap::TYPE_NUM == $indexType ? 1 + $startcol : ImportTableMap::translateFieldName('ImportCategoryId', TableMap::TYPE_PHPNAME, $indexType)];
$col = $row[TableMap::TYPE_NUM == $indexType ? 1 + $startcol : ImportTableMap::translateFieldName('Ref', TableMap::TYPE_PHPNAME, $indexType)];
$this->ref = (null !== $col) ? (string) $col : null;
$col = $row[TableMap::TYPE_NUM == $indexType ? 2 + $startcol : ImportTableMap::translateFieldName('ImportCategoryId', TableMap::TYPE_PHPNAME, $indexType)];
$this->import_category_id = (null !== $col) ? (int) $col : null;
$col = $row[TableMap::TYPE_NUM == $indexType ? 2 + $startcol : ImportTableMap::translateFieldName('Position', TableMap::TYPE_PHPNAME, $indexType)];
$col = $row[TableMap::TYPE_NUM == $indexType ? 3 + $startcol : ImportTableMap::translateFieldName('Position', TableMap::TYPE_PHPNAME, $indexType)];
$this->position = (null !== $col) ? (int) $col : null;
$col = $row[TableMap::TYPE_NUM == $indexType ? 3 + $startcol : ImportTableMap::translateFieldName('Handleclass', TableMap::TYPE_PHPNAME, $indexType)];
$this->handleclass = (null !== $col) ? (string) $col : null;
$col = $row[TableMap::TYPE_NUM == $indexType ? 4 + $startcol : ImportTableMap::translateFieldName('HandleClass', TableMap::TYPE_PHPNAME, $indexType)];
$this->handle_class = (null !== $col) ? (string) $col : null;
$col = $row[TableMap::TYPE_NUM == $indexType ? 4 + $startcol : ImportTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)];
$col = $row[TableMap::TYPE_NUM == $indexType ? 5 + $startcol : ImportTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)];
if ($col === '0000-00-00 00:00:00') {
$col = null;
}
$this->created_at = (null !== $col) ? PropelDateTime::newInstance($col, null, '\DateTime') : null;
$col = $row[TableMap::TYPE_NUM == $indexType ? 5 + $startcol : ImportTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)];
$col = $row[TableMap::TYPE_NUM == $indexType ? 6 + $startcol : ImportTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)];
if ($col === '0000-00-00 00:00:00') {
$col = null;
}
@@ -674,7 +715,7 @@ abstract class Import implements ActiveRecordInterface
$this->ensureConsistency();
}
return $startcol + 6; // 6 = ImportTableMap::NUM_HYDRATE_COLUMNS.
return $startcol + 7; // 7 = ImportTableMap::NUM_HYDRATE_COLUMNS.
} catch (Exception $e) {
throw new PropelException("Error populating \Thelia\Model\Import object", 0, $e);
@@ -932,14 +973,17 @@ abstract class Import implements ActiveRecordInterface
if ($this->isColumnModified(ImportTableMap::ID)) {
$modifiedColumns[':p' . $index++] = '`ID`';
}
if ($this->isColumnModified(ImportTableMap::REF)) {
$modifiedColumns[':p' . $index++] = '`REF`';
}
if ($this->isColumnModified(ImportTableMap::IMPORT_CATEGORY_ID)) {
$modifiedColumns[':p' . $index++] = '`IMPORT_CATEGORY_ID`';
}
if ($this->isColumnModified(ImportTableMap::POSITION)) {
$modifiedColumns[':p' . $index++] = '`POSITION`';
}
if ($this->isColumnModified(ImportTableMap::HANDLECLASS)) {
$modifiedColumns[':p' . $index++] = '`HANDLECLASS`';
if ($this->isColumnModified(ImportTableMap::HANDLE_CLASS)) {
$modifiedColumns[':p' . $index++] = '`HANDLE_CLASS`';
}
if ($this->isColumnModified(ImportTableMap::CREATED_AT)) {
$modifiedColumns[':p' . $index++] = '`CREATED_AT`';
@@ -961,14 +1005,17 @@ abstract class Import implements ActiveRecordInterface
case '`ID`':
$stmt->bindValue($identifier, $this->id, PDO::PARAM_INT);
break;
case '`REF`':
$stmt->bindValue($identifier, $this->ref, PDO::PARAM_STR);
break;
case '`IMPORT_CATEGORY_ID`':
$stmt->bindValue($identifier, $this->import_category_id, PDO::PARAM_INT);
break;
case '`POSITION`':
$stmt->bindValue($identifier, $this->position, PDO::PARAM_INT);
break;
case '`HANDLECLASS`':
$stmt->bindValue($identifier, $this->handleclass, PDO::PARAM_STR);
case '`HANDLE_CLASS`':
$stmt->bindValue($identifier, $this->handle_class, 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);
@@ -1042,18 +1089,21 @@ abstract class Import implements ActiveRecordInterface
return $this->getId();
break;
case 1:
return $this->getImportCategoryId();
return $this->getRef();
break;
case 2:
return $this->getPosition();
return $this->getImportCategoryId();
break;
case 3:
return $this->getHandleclass();
return $this->getPosition();
break;
case 4:
return $this->getCreatedAt();
return $this->getHandleClass();
break;
case 5:
return $this->getCreatedAt();
break;
case 6:
return $this->getUpdatedAt();
break;
default:
@@ -1086,11 +1136,12 @@ abstract class Import implements ActiveRecordInterface
$keys = ImportTableMap::getFieldNames($keyType);
$result = array(
$keys[0] => $this->getId(),
$keys[1] => $this->getImportCategoryId(),
$keys[2] => $this->getPosition(),
$keys[3] => $this->getHandleclass(),
$keys[4] => $this->getCreatedAt(),
$keys[5] => $this->getUpdatedAt(),
$keys[1] => $this->getRef(),
$keys[2] => $this->getImportCategoryId(),
$keys[3] => $this->getPosition(),
$keys[4] => $this->getHandleClass(),
$keys[5] => $this->getCreatedAt(),
$keys[6] => $this->getUpdatedAt(),
);
$virtualColumns = $this->virtualColumns;
foreach ($virtualColumns as $key => $virtualColumn) {
@@ -1142,18 +1193,21 @@ abstract class Import implements ActiveRecordInterface
$this->setId($value);
break;
case 1:
$this->setImportCategoryId($value);
$this->setRef($value);
break;
case 2:
$this->setPosition($value);
$this->setImportCategoryId($value);
break;
case 3:
$this->setHandleclass($value);
$this->setPosition($value);
break;
case 4:
$this->setCreatedAt($value);
$this->setHandleClass($value);
break;
case 5:
$this->setCreatedAt($value);
break;
case 6:
$this->setUpdatedAt($value);
break;
} // switch()
@@ -1181,11 +1235,12 @@ abstract class Import implements ActiveRecordInterface
$keys = ImportTableMap::getFieldNames($keyType);
if (array_key_exists($keys[0], $arr)) $this->setId($arr[$keys[0]]);
if (array_key_exists($keys[1], $arr)) $this->setImportCategoryId($arr[$keys[1]]);
if (array_key_exists($keys[2], $arr)) $this->setPosition($arr[$keys[2]]);
if (array_key_exists($keys[3], $arr)) $this->setHandleclass($arr[$keys[3]]);
if (array_key_exists($keys[4], $arr)) $this->setCreatedAt($arr[$keys[4]]);
if (array_key_exists($keys[5], $arr)) $this->setUpdatedAt($arr[$keys[5]]);
if (array_key_exists($keys[1], $arr)) $this->setRef($arr[$keys[1]]);
if (array_key_exists($keys[2], $arr)) $this->setImportCategoryId($arr[$keys[2]]);
if (array_key_exists($keys[3], $arr)) $this->setPosition($arr[$keys[3]]);
if (array_key_exists($keys[4], $arr)) $this->setHandleClass($arr[$keys[4]]);
if (array_key_exists($keys[5], $arr)) $this->setCreatedAt($arr[$keys[5]]);
if (array_key_exists($keys[6], $arr)) $this->setUpdatedAt($arr[$keys[6]]);
}
/**
@@ -1198,9 +1253,10 @@ abstract class Import implements ActiveRecordInterface
$criteria = new Criteria(ImportTableMap::DATABASE_NAME);
if ($this->isColumnModified(ImportTableMap::ID)) $criteria->add(ImportTableMap::ID, $this->id);
if ($this->isColumnModified(ImportTableMap::REF)) $criteria->add(ImportTableMap::REF, $this->ref);
if ($this->isColumnModified(ImportTableMap::IMPORT_CATEGORY_ID)) $criteria->add(ImportTableMap::IMPORT_CATEGORY_ID, $this->import_category_id);
if ($this->isColumnModified(ImportTableMap::POSITION)) $criteria->add(ImportTableMap::POSITION, $this->position);
if ($this->isColumnModified(ImportTableMap::HANDLECLASS)) $criteria->add(ImportTableMap::HANDLECLASS, $this->handleclass);
if ($this->isColumnModified(ImportTableMap::HANDLE_CLASS)) $criteria->add(ImportTableMap::HANDLE_CLASS, $this->handle_class);
if ($this->isColumnModified(ImportTableMap::CREATED_AT)) $criteria->add(ImportTableMap::CREATED_AT, $this->created_at);
if ($this->isColumnModified(ImportTableMap::UPDATED_AT)) $criteria->add(ImportTableMap::UPDATED_AT, $this->updated_at);
@@ -1266,9 +1322,10 @@ abstract class Import implements ActiveRecordInterface
*/
public function copyInto($copyObj, $deepCopy = false, $makeNew = true)
{
$copyObj->setRef($this->getRef());
$copyObj->setImportCategoryId($this->getImportCategoryId());
$copyObj->setPosition($this->getPosition());
$copyObj->setHandleclass($this->getHandleclass());
$copyObj->setHandleClass($this->getHandleClass());
$copyObj->setCreatedAt($this->getCreatedAt());
$copyObj->setUpdatedAt($this->getUpdatedAt());
@@ -1611,9 +1668,10 @@ abstract class Import implements ActiveRecordInterface
public function clear()
{
$this->id = null;
$this->ref = null;
$this->import_category_id = null;
$this->position = null;
$this->handleclass = null;
$this->handle_class = null;
$this->created_at = null;
$this->updated_at = null;
$this->alreadyInSave = false;

86
core/lib/Thelia/Model/Base/ImportCategory.php
View File

@@ -65,6 +65,12 @@ abstract class ImportCategory implements ActiveRecordInterface
*/
protected $id;
/**
* The value for the ref field.
* @var string
*/
protected $ref;
/**
* The value for the position field.
* @var int
@@ -398,6 +404,17 @@ abstract class ImportCategory implements ActiveRecordInterface
return $this->id;
}
/**
* Get the [ref] column value.
*
* @return string
*/
public function getRef()
{
return $this->ref;
}
/**
* Get the [position] column value.
*
@@ -470,6 +487,27 @@ abstract class ImportCategory implements ActiveRecordInterface
return $this;
} // setId()
/**
* Set the value of [ref] column.
*
* @param string $v new value
* @return \Thelia\Model\ImportCategory The current object (for fluent API support)
*/
public function setRef($v)
{
if ($v !== null) {
$v = (string) $v;
}
if ($this->ref !== $v) {
$this->ref = $v;
$this->modifiedColumns[ImportCategoryTableMap::REF] = true;
}
return $this;
} // setRef()
/**
* Set the value of [position] column.
*
@@ -573,16 +611,19 @@ abstract class ImportCategory implements ActiveRecordInterface
$col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : ImportCategoryTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)];
$this->id = (null !== $col) ? (int) $col : null;
$col = $row[TableMap::TYPE_NUM == $indexType ? 1 + $startcol : ImportCategoryTableMap::translateFieldName('Position', TableMap::TYPE_PHPNAME, $indexType)];
$col = $row[TableMap::TYPE_NUM == $indexType ? 1 + $startcol : ImportCategoryTableMap::translateFieldName('Ref', TableMap::TYPE_PHPNAME, $indexType)];
$this->ref = (null !== $col) ? (string) $col : null;
$col = $row[TableMap::TYPE_NUM == $indexType ? 2 + $startcol : ImportCategoryTableMap::translateFieldName('Position', TableMap::TYPE_PHPNAME, $indexType)];
$this->position = (null !== $col) ? (int) $col : null;
$col = $row[TableMap::TYPE_NUM == $indexType ? 2 + $startcol : ImportCategoryTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)];
$col = $row[TableMap::TYPE_NUM == $indexType ? 3 + $startcol : ImportCategoryTableMap::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 ? 3 + $startcol : ImportCategoryTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)];
$col = $row[TableMap::TYPE_NUM == $indexType ? 4 + $startcol : ImportCategoryTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)];
if ($col === '0000-00-00 00:00:00') {
$col = null;
}
@@ -595,7 +636,7 @@ abstract class ImportCategory implements ActiveRecordInterface
$this->ensureConsistency();
}
return $startcol + 4; // 4 = ImportCategoryTableMap::NUM_HYDRATE_COLUMNS.
return $startcol + 5; // 5 = ImportCategoryTableMap::NUM_HYDRATE_COLUMNS.
} catch (Exception $e) {
throw new PropelException("Error populating \Thelia\Model\ImportCategory object", 0, $e);
@@ -856,6 +897,9 @@ abstract class ImportCategory implements ActiveRecordInterface
if ($this->isColumnModified(ImportCategoryTableMap::ID)) {
$modifiedColumns[':p' . $index++] = '`ID`';
}
if ($this->isColumnModified(ImportCategoryTableMap::REF)) {
$modifiedColumns[':p' . $index++] = '`REF`';
}
if ($this->isColumnModified(ImportCategoryTableMap::POSITION)) {
$modifiedColumns[':p' . $index++] = '`POSITION`';
}
@@ -879,6 +923,9 @@ abstract class ImportCategory implements ActiveRecordInterface
case '`ID`':
$stmt->bindValue($identifier, $this->id, PDO::PARAM_INT);
break;
case '`REF`':
$stmt->bindValue($identifier, $this->ref, PDO::PARAM_STR);
break;
case '`POSITION`':
$stmt->bindValue($identifier, $this->position, PDO::PARAM_INT);
break;
@@ -954,12 +1001,15 @@ abstract class ImportCategory implements ActiveRecordInterface
return $this->getId();
break;
case 1:
return $this->getPosition();
return $this->getRef();
break;
case 2:
return $this->getCreatedAt();
return $this->getPosition();
break;
case 3:
return $this->getCreatedAt();
break;
case 4:
return $this->getUpdatedAt();
break;
default:
@@ -992,9 +1042,10 @@ abstract class ImportCategory implements ActiveRecordInterface
$keys = ImportCategoryTableMap::getFieldNames($keyType);
$result = array(
$keys[0] => $this->getId(),
$keys[1] => $this->getPosition(),
$keys[2] => $this->getCreatedAt(),
$keys[3] => $this->getUpdatedAt(),
$keys[1] => $this->getRef(),
$keys[2] => $this->getPosition(),
$keys[3] => $this->getCreatedAt(),
$keys[4] => $this->getUpdatedAt(),
);
$virtualColumns = $this->virtualColumns;
foreach ($virtualColumns as $key => $virtualColumn) {
@@ -1046,12 +1097,15 @@ abstract class ImportCategory implements ActiveRecordInterface
$this->setId($value);
break;
case 1:
$this->setPosition($value);
$this->setRef($value);
break;
case 2:
$this->setCreatedAt($value);
$this->setPosition($value);
break;
case 3:
$this->setCreatedAt($value);
break;
case 4:
$this->setUpdatedAt($value);
break;
} // switch()
@@ -1079,9 +1133,10 @@ abstract class ImportCategory implements ActiveRecordInterface
$keys = ImportCategoryTableMap::getFieldNames($keyType);
if (array_key_exists($keys[0], $arr)) $this->setId($arr[$keys[0]]);
if (array_key_exists($keys[1], $arr)) $this->setPosition($arr[$keys[1]]);
if (array_key_exists($keys[2], $arr)) $this->setCreatedAt($arr[$keys[2]]);
if (array_key_exists($keys[3], $arr)) $this->setUpdatedAt($arr[$keys[3]]);
if (array_key_exists($keys[1], $arr)) $this->setRef($arr[$keys[1]]);
if (array_key_exists($keys[2], $arr)) $this->setPosition($arr[$keys[2]]);
if (array_key_exists($keys[3], $arr)) $this->setCreatedAt($arr[$keys[3]]);
if (array_key_exists($keys[4], $arr)) $this->setUpdatedAt($arr[$keys[4]]);
}
/**
@@ -1094,6 +1149,7 @@ abstract class ImportCategory implements ActiveRecordInterface
$criteria = new Criteria(ImportCategoryTableMap::DATABASE_NAME);
if ($this->isColumnModified(ImportCategoryTableMap::ID)) $criteria->add(ImportCategoryTableMap::ID, $this->id);
if ($this->isColumnModified(ImportCategoryTableMap::REF)) $criteria->add(ImportCategoryTableMap::REF, $this->ref);
if ($this->isColumnModified(ImportCategoryTableMap::POSITION)) $criteria->add(ImportCategoryTableMap::POSITION, $this->position);
if ($this->isColumnModified(ImportCategoryTableMap::CREATED_AT)) $criteria->add(ImportCategoryTableMap::CREATED_AT, $this->created_at);
if ($this->isColumnModified(ImportCategoryTableMap::UPDATED_AT)) $criteria->add(ImportCategoryTableMap::UPDATED_AT, $this->updated_at);
@@ -1160,6 +1216,7 @@ abstract class ImportCategory implements ActiveRecordInterface
*/
public function copyInto($copyObj, $deepCopy = false, $makeNew = true)
{
$copyObj->setRef($this->getRef());
$copyObj->setPosition($this->getPosition());
$copyObj->setCreatedAt($this->getCreatedAt());
$copyObj->setUpdatedAt($this->getUpdatedAt());
@@ -1679,6 +1736,7 @@ abstract class ImportCategory implements ActiveRecordInterface
public function clear()
{
$this->id = null;
$this->ref = null;
$this->position = null;
$this->created_at = null;
$this->updated_at = null;

35
core/lib/Thelia/Model/Base/ImportCategoryQuery.php
View File

@@ -23,11 +23,13 @@ use Thelia\Model\Map\ImportCategoryTableMap;
*
*
* @method ChildImportCategoryQuery orderById($order = Criteria::ASC) Order by the id column
* @method ChildImportCategoryQuery orderByRef($order = Criteria::ASC) Order by the ref column
* @method ChildImportCategoryQuery orderByPosition($order = Criteria::ASC) Order by the position column
* @method ChildImportCategoryQuery orderByCreatedAt($order = Criteria::ASC) Order by the created_at column
* @method ChildImportCategoryQuery orderByUpdatedAt($order = Criteria::ASC) Order by the updated_at column
*
* @method ChildImportCategoryQuery groupById() Group by the id column
* @method ChildImportCategoryQuery groupByRef() Group by the ref column
* @method ChildImportCategoryQuery groupByPosition() Group by the position column
* @method ChildImportCategoryQuery groupByCreatedAt() Group by the created_at column
* @method ChildImportCategoryQuery groupByUpdatedAt() Group by the updated_at column
@@ -48,11 +50,13 @@ use Thelia\Model\Map\ImportCategoryTableMap;
* @method ChildImportCategory findOneOrCreate(ConnectionInterface $con = null) Return the first ChildImportCategory matching the query, or a new ChildImportCategory object populated from the query conditions when no match is found
*
* @method ChildImportCategory findOneById(int $id) Return the first ChildImportCategory filtered by the id column
* @method ChildImportCategory findOneByRef(string $ref) Return the first ChildImportCategory filtered by the ref column
* @method ChildImportCategory findOneByPosition(int $position) Return the first ChildImportCategory filtered by the position column
* @method ChildImportCategory findOneByCreatedAt(string $created_at) Return the first ChildImportCategory filtered by the created_at column
* @method ChildImportCategory findOneByUpdatedAt(string $updated_at) Return the first ChildImportCategory filtered by the updated_at column
*
* @method array findById(int $id) Return ChildImportCategory objects filtered by the id column
* @method array findByRef(string $ref) Return ChildImportCategory objects filtered by the ref column
* @method array findByPosition(int $position) Return ChildImportCategory objects filtered by the position column
* @method array findByCreatedAt(string $created_at) Return ChildImportCategory objects filtered by the created_at column
* @method array findByUpdatedAt(string $updated_at) Return ChildImportCategory objects filtered by the updated_at column
@@ -144,7 +148,7 @@ abstract class ImportCategoryQuery extends ModelCriteria
*/
protected function findPkSimple($key, $con)
{
$sql = 'SELECT `ID`, `POSITION`, `CREATED_AT`, `UPDATED_AT` FROM `import_category` WHERE `ID` = :p0';
$sql = 'SELECT `ID`, `REF`, `POSITION`, `CREATED_AT`, `UPDATED_AT` FROM `import_category` WHERE `ID` = :p0';
try {
$stmt = $con->prepare($sql);
$stmt->bindValue(':p0', $key, PDO::PARAM_INT);
@@ -274,6 +278,35 @@ abstract class ImportCategoryQuery extends ModelCriteria
return $this->addUsingAlias(ImportCategoryTableMap::ID, $id, $comparison);
}
/**
* Filter the query on the ref column
*
* Example usage:
* <code>
* $query->filterByRef('fooValue'); // WHERE ref = 'fooValue'
* $query->filterByRef('%fooValue%'); // WHERE ref LIKE '%fooValue%'
* </code>
*
* @param string $ref 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 ChildImportCategoryQuery The current query, for fluid interface
*/
public function filterByRef($ref = null, $comparison = null)
{
if (null === $comparison) {
if (is_array($ref)) {
$comparison = Criteria::IN;
} elseif (preg_match('/[\%\*]/', $ref)) {
$ref = str_replace('*', '%', $ref);
$comparison = Criteria::LIKE;
}
}
return $this->addUsingAlias(ImportCategoryTableMap::REF, $ref, $comparison);
}
/**
* Filter the query on the position column
*

61
core/lib/Thelia/Model/Base/ImportQuery.php
View File

@@ -23,16 +23,18 @@ use Thelia\Model\Map\ImportTableMap;
*
*
* @method ChildImportQuery orderById($order = Criteria::ASC) Order by the id column
* @method ChildImportQuery orderByRef($order = Criteria::ASC) Order by the ref column
* @method ChildImportQuery orderByImportCategoryId($order = Criteria::ASC) Order by the import_category_id column
* @method ChildImportQuery orderByPosition($order = Criteria::ASC) Order by the position column
* @method ChildImportQuery orderByHandleclass($order = Criteria::ASC) Order by the handleClass column
* @method ChildImportQuery orderByHandleClass($order = Criteria::ASC) Order by the handle_class column
* @method ChildImportQuery orderByCreatedAt($order = Criteria::ASC) Order by the created_at column
* @method ChildImportQuery orderByUpdatedAt($order = Criteria::ASC) Order by the updated_at column
*
* @method ChildImportQuery groupById() Group by the id column
* @method ChildImportQuery groupByRef() Group by the ref column
* @method ChildImportQuery groupByImportCategoryId() Group by the import_category_id column
* @method ChildImportQuery groupByPosition() Group by the position column
* @method ChildImportQuery groupByHandleclass() Group by the handleClass column
* @method ChildImportQuery groupByHandleClass() Group by the handle_class column
* @method ChildImportQuery groupByCreatedAt() Group by the created_at column
* @method ChildImportQuery groupByUpdatedAt() Group by the updated_at column
*
@@ -52,16 +54,18 @@ use Thelia\Model\Map\ImportTableMap;
* @method ChildImport findOneOrCreate(ConnectionInterface $con = null) Return the first ChildImport matching the query, or a new ChildImport object populated from the query conditions when no match is found
*
* @method ChildImport findOneById(int $id) Return the first ChildImport filtered by the id column
* @method ChildImport findOneByRef(string $ref) Return the first ChildImport filtered by the ref column
* @method ChildImport findOneByImportCategoryId(int $import_category_id) Return the first ChildImport filtered by the import_category_id column
* @method ChildImport findOneByPosition(int $position) Return the first ChildImport filtered by the position column
* @method ChildImport findOneByHandleclass(string $handleClass) Return the first ChildImport filtered by the handleClass column
* @method ChildImport findOneByHandleClass(string $handle_class) Return the first ChildImport filtered by the handle_class column
* @method ChildImport findOneByCreatedAt(string $created_at) Return the first ChildImport filtered by the created_at column
* @method ChildImport findOneByUpdatedAt(string $updated_at) Return the first ChildImport filtered by the updated_at column
*
* @method array findById(int $id) Return ChildImport objects filtered by the id column
* @method array findByRef(string $ref) Return ChildImport objects filtered by the ref column
* @method array findByImportCategoryId(int $import_category_id) Return ChildImport objects filtered by the import_category_id column
* @method array findByPosition(int $position) Return ChildImport objects filtered by the position column
* @method array findByHandleclass(string $handleClass) Return ChildImport objects filtered by the handleClass column
* @method array findByHandleClass(string $handle_class) Return ChildImport objects filtered by the handle_class column
* @method array findByCreatedAt(string $created_at) Return ChildImport objects filtered by the created_at column
* @method array findByUpdatedAt(string $updated_at) Return ChildImport objects filtered by the updated_at column
*
@@ -152,7 +156,7 @@ abstract class ImportQuery extends ModelCriteria
*/
protected function findPkSimple($key, $con)
{
$sql = 'SELECT `ID`, `IMPORT_CATEGORY_ID`, `POSITION`, `HANDLECLASS`, `CREATED_AT`, `UPDATED_AT` FROM `import` WHERE `ID` = :p0';
$sql = 'SELECT `ID`, `REF`, `IMPORT_CATEGORY_ID`, `POSITION`, `HANDLE_CLASS`, `CREATED_AT`, `UPDATED_AT` FROM `import` WHERE `ID` = :p0';
try {
$stmt = $con->prepare($sql);
$stmt->bindValue(':p0', $key, PDO::PARAM_INT);
@@ -282,6 +286,35 @@ abstract class ImportQuery extends ModelCriteria
return $this->addUsingAlias(ImportTableMap::ID, $id, $comparison);
}
/**
* Filter the query on the ref column
*
* Example usage:
* <code>
* $query->filterByRef('fooValue'); // WHERE ref = 'fooValue'
* $query->filterByRef('%fooValue%'); // WHERE ref LIKE '%fooValue%'
* </code>
*
* @param string $ref 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 ChildImportQuery The current query, for fluid interface
*/
public function filterByRef($ref = null, $comparison = null)
{
if (null === $comparison) {
if (is_array($ref)) {
$comparison = Criteria::IN;
} elseif (preg_match('/[\%\*]/', $ref)) {
$ref = str_replace('*', '%', $ref);
$comparison = Criteria::LIKE;
}
}
return $this->addUsingAlias(ImportTableMap::REF, $ref, $comparison);
}
/**
* Filter the query on the import_category_id column
*
@@ -367,32 +400,32 @@ abstract class ImportQuery extends ModelCriteria
}
/**
* Filter the query on the handleClass column
* Filter the query on the handle_class column
*
* Example usage:
* <code>
* $query->filterByHandleclass('fooValue'); // WHERE handleClass = 'fooValue'
* $query->filterByHandleclass('%fooValue%'); // WHERE handleClass LIKE '%fooValue%'
* $query->filterByHandleClass('fooValue'); // WHERE handle_class = 'fooValue'
* $query->filterByHandleClass('%fooValue%'); // WHERE handle_class LIKE '%fooValue%'
* </code>
*
* @param string $handleclass The value to use as filter.
* @param string $handleClass 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 ChildImportQuery The current query, for fluid interface
*/
public function filterByHandleclass($handleclass = null, $comparison = null)
public function filterByHandleClass($handleClass = null, $comparison = null)
{
if (null === $comparison) {
if (is_array($handleclass)) {
if (is_array($handleClass)) {
$comparison = Criteria::IN;
} elseif (preg_match('/[\%\*]/', $handleclass)) {
$handleclass = str_replace('*', '%', $handleclass);
} elseif (preg_match('/[\%\*]/', $handleClass)) {
$handleClass = str_replace('*', '%', $handleClass);
$comparison = Criteria::LIKE;
}
}
return $this->addUsingAlias(ImportTableMap::HANDLECLASS, $handleclass, $comparison);
return $this->addUsingAlias(ImportTableMap::HANDLE_CLASS, $handleClass, $comparison);
}
/**