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

Merge pull request #454 from lunika/2.0.2

Browse Source 
Fixes version 2.0.2
This commit is contained in:
Julien
2014-06-06 09:12:33 +02:00
parent 3419aaaaa1 c552f8485a
commit 415b444e6b
20 changed files with 240 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
core/lib/Thelia/Core/Template/Loop/Category.php
View File

@@ -18,6 +18,7 @@ use Thelia\Core\Template\Element\LoopResult;
use Thelia\Core\Template\Element\LoopResultRow;
use Thelia\Core\Template\Element\PropelSearchLoopInterface;
use Thelia\Core\Template\Element\SearchLoopInterface;
use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
use Thelia\Core\Template\Loop\Argument\Argument;
@@ -51,7 +52,7 @@ use Thelia\Model\ProductQuery;
* @author Manuel Raynaud <mraynaud@openstudio.fr>
* @author Etienne Roudeix <eroudeix@openstudio.fr>
*/
class Category extends BaseI18nLoop implements PropelSearchLoopInterface
class Category extends BaseI18nLoop implements PropelSearchLoopInterface, SearchLoopInterface
{
protected $timestampable = true;
protected $versionable = true;
@@ -83,6 +84,23 @@ class Category extends BaseI18nLoop implements PropelSearchLoopInterface
);
}
/**
* @return array of available field to search in
*/
public function getSearchIn()
{
return [
"title"
];
}
public function doSearch(&$search, $searchTerm, $searchIn, $searchCriteria)
{
$search->_and();
$search->where("CASE WHEN NOT ISNULL(`requested_locale_i18n`.ID) THEN `requested_locale_i18n`.`TITLE` ELSE `default_locale_i18n`.`TITLE` END ".$searchCriteria." ?", $searchTerm, \PDO::PARAM_STR);
}
public function buildModelCriteria()
{
$search = CategoryQuery::create();

35
core/lib/Thelia/Core/Template/Loop/Content.php
View File

@@ -18,6 +18,7 @@ use Thelia\Core\Template\Element\LoopResult;
use Thelia\Core\Template\Element\LoopResultRow;
use Thelia\Core\Template\Element\PropelSearchLoopInterface;
use Thelia\Core\Template\Element\SearchLoopInterface;
use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
use Thelia\Core\Template\Loop\Argument\Argument;
@@ -37,7 +38,7 @@ use Thelia\Type\BooleanOrBothType;
* @package Thelia\Core\Template\Loop
* @author Etienne Roudeix <eroudeix@openstudio.fr>
*/
class Content extends BaseI18nLoop implements PropelSearchLoopInterface
class Content extends BaseI18nLoop implements PropelSearchLoopInterface, SearchLoopInterface
{
protected $timestampable = true;
protected $versionable = true;
@@ -60,7 +61,20 @@ class Content extends BaseI18nLoop implements PropelSearchLoopInterface
new Argument(
'order',
new TypeCollection(
new Type\EnumListType(array('alpha', 'alpha-reverse', 'manual', 'manual_reverse', 'random', 'given_id', 'created', 'created_reverse', 'updated', 'updated_reverse'))
new Type\EnumListType(
array(
'alpha',
'alpha-reverse',
'manual',
'manual_reverse',
'random',
'given_id',
'created',
'created_reverse',
'updated',
'updated_reverse'
)
)
),
'alpha'
),
@@ -69,6 +83,23 @@ class Content extends BaseI18nLoop implements PropelSearchLoopInterface
);
}
/**
* @return array of available field to search in
*/
public function getSearchIn()
{
return [
"title"
];
}
public function doSearch(&$search, $searchTerm, $searchIn, $searchCriteria)
{
$search->_and();
$search->where("CASE WHEN NOT ISNULL(`requested_locale_i18n`.ID) THEN `requested_locale_i18n`.`TITLE` ELSE `default_locale_i18n`.`TITLE` END ".$searchCriteria." ?", $searchTerm, \PDO::PARAM_STR);
}
public function buildModelCriteria()
{

20
core/lib/Thelia/Core/Template/Loop/Folder.php
View File

@@ -18,6 +18,7 @@ use Thelia\Core\Template\Element\LoopResult;
use Thelia\Core\Template\Element\LoopResultRow;
use Thelia\Core\Template\Element\PropelSearchLoopInterface;
use Thelia\Core\Template\Element\SearchLoopInterface;
use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
use Thelia\Core\Template\Loop\Argument\Argument;
@@ -33,7 +34,7 @@ use Thelia\Type\BooleanOrBothType;
* @package Thelia\Core\Template\Loop
* @author Etienne Roudeix <eroudeix@openstudio.fr>
*/
class Folder extends BaseI18nLoop implements PropelSearchLoopInterface
class Folder extends BaseI18nLoop implements PropelSearchLoopInterface, SearchLoopInterface
{
protected $timestampable = true;
protected $versionable = true;
@@ -62,6 +63,23 @@ class Folder extends BaseI18nLoop implements PropelSearchLoopInterface
);
}
/**
* @return array of available field to search in
*/
public function getSearchIn()
{
return [
"title"
];
}
public function doSearch(&$search, $searchTerm, $searchIn, $searchCriteria)
{
$search->_and();
$search->where("CASE WHEN NOT ISNULL(`requested_locale_i18n`.ID) THEN `requested_locale_i18n`.`TITLE` ELSE `default_locale_i18n`.`TITLE` END ".$searchCriteria." ?", $searchTerm, \PDO::PARAM_STR);
}
public function buildModelCriteria()
{
$search = FolderQuery::create();

6
core/lib/Thelia/Core/Template/TemplateHelper.php
View File

@@ -60,13 +60,13 @@ class TemplateHelper
$tplVar = 'active-front-template';
break;
case TemplateDefinition::BACK_OFFICE:
$tplVar = 'active-front-template';
$tplVar = 'active-admin-template';
break;
case TemplateDefinition::PDF:
$tplVar = 'active-front-template';
$tplVar = 'active-pdf-template';
break;
case TemplateDefinition::EMAIL:
$tplVar = 'active-front-template';
$tplVar = 'active-mail-template';
break;
}

14
core/lib/Thelia/Form/OrderDelivery.php
View File

@@ -66,19 +66,15 @@ class OrderDelivery extends BaseForm
public function verifyDeliveryModule($value, ExecutionContextInterface $context)
{
$module = ModuleQuery::create()
->filterByType(BaseModule::DELIVERY_MODULE_TYPE)
->filterByActivate(1)
->filterById($value)
->filterActivatedByTypeAndId(BaseModule::DELIVERY_MODULE_TYPE, $value)
->findOne();
if (null === $module) {
$context->addViolation(Translator::getInstance()->trans("Delivery module ID not found"));
} else {
if (! $module->isDeliveryModule()) {
$context->addViolation(
sprintf(Translator::getInstance()->trans("delivery module %s is not a Thelia\Module\DeliveryModuleInterface"), $module->getCode())
);
}
} elseif (! $module->isDeliveryModule()) {
$context->addViolation(
sprintf(Translator::getInstance()->trans("delivery module %s is not a Thelia\Module\DeliveryModuleInterface"), $module->getCode())
);
}
}

8
core/lib/Thelia/Form/OrderPayment.php
View File

@@ -66,16 +66,12 @@ class OrderPayment extends BaseForm
public function verifyPaymentModule($value, ExecutionContextInterface $context)
{
$module = ModuleQuery::create()
->filterByType(BaseModule::PAYMENT_MODULE_TYPE)
->filterByActivate(1)
->filterById($value)
->filterActivatedByTypeAndId(BaseModule::PAYMENT_MODULE_TYPE, $value)
->findOne();
if (null === $module) {
$context->addViolation("Payment module ID not found");
}
if (! $module->isPayementModule()) {
} elseif (! $module->isPayementModule()) {
$context->addViolation(
sprintf(Translator::getInstance()->trans("payment module %s is not a Thelia\Module\PaymentModuleInterface"), $module->getCode())
);

16
core/lib/Thelia/Model/ModuleQuery.php
View File

@@ -3,6 +3,7 @@
namespace Thelia\Model;
use Thelia\Model\Base\ModuleQuery as BaseModuleQuery;
use Thelia\Module\BaseModule;
/**
* Skeleton subclass for performing query and update operations on the 'module' table.
@@ -24,7 +25,7 @@ class ModuleQuery extends BaseModuleQuery
{
if (null === self::$activated) {
self::$activated = self::create()
->filterByActivate(1)
->filterByActivate(BaseModule::IS_ACTIVATED)
->orderByPosition()
->find();
}
@@ -37,4 +38,17 @@ class ModuleQuery extends BaseModuleQuery
self::$activated = null;
}
/**
* @param int $moduleType the module type : classic, payment or delivery. Use BaseModule constant here.
* @param int $id the module id
* @return ModuleQuery
*/
public function filterActivatedByTypeAndId($moduleType, $id)
{
return $this
->filterByType($moduleType)
->filterByActivate(BaseModule::IS_ACTIVATED)
->filterById($id);
}
} // ModuleQuery

4
templates/backOffice/default/I18n/fr_FR.php
View File

@@ -94,6 +94,7 @@ return array(
'Catalog' => 'Catalogue',
'Categories' => 'Rubriques',
'Categories in %cat' => 'Rubrique dans %cat',
'Category' => 'Rubrique',
'Category created on %date_create. Last modification: %date_change' => 'Rubrique créée le %date_create. Dernière modification le %date_change',
'Category title' => 'Titre de la rubrique',
'Cellular phone' => 'Téléphone portable',
@@ -140,6 +141,7 @@ return array(
'Confirm' => 'Confirmer',
'Confirm changes' => 'Valider les modifications',
'Confirmation' => 'Confirmation',
'Content' => 'Contenu',
'Content title' => 'Titre du contenu',
'Contents in %fold' => 'Contenus dans %fold',
'Copy source text in input field' => 'Copier la source dans le champs de traduction',
@@ -283,6 +285,7 @@ return array(
'Details' => 'Détails',
'Disabled' => 'Désactivé',
'Discount' => 'Remise',
'Discount amount' => 'Montant de réduction',
'Do not use a product template' => 'Ne pas utiliser de gabarit',
'Do you really want to add this attribute to all product templates ?' => 'Voulez-vous vraiment ajouter cette déclinaison de tous les gabarits de produit ?',
'Do you really want to add this feature to all product templates ?' => 'Voulez-vous vraiment ajouter cette caractéristique à tous les gabarits de produit ?',
@@ -488,6 +491,7 @@ return array(
'Flush the Thelia internal cache' => 'Vider le cache interne de Thelia',
'Flush the assets cache directory' => 'Vider le cache des assets web',
'Flush the images and documents cache' => 'Vider le caches des images et documents',
'Folder' => 'Dossier',
'Folder created on %date_create. Last modification: %date_change' => 'Dossier créé le %date_create. Dernière modification le %date_change',
'Folder title' => 'Titre du dossier',
'Folders' => 'Dossiers',

4
templates/backOffice/default/ajax/product-related-tab.html
View File

@@ -94,7 +94,7 @@
<td class="text-center">
{admin_position_block
resource="admin.product"
access="update"
access="UPDATE"
path={url path='/admin/product/update-content-position' product_id=$product_id current_tab="related"}
url_parameter="content_id"
in_place_edit_class="contentPositionChange"
@@ -215,7 +215,7 @@
<td class="text-center">
{admin_position_block
resource="admin.product"
access="update"
access="UPDATE"
path={url path='/admin/product/update-accessory-position' product_id=$product_id current_tab="related"}
url_parameter="accessory_id"
in_place_edit_class="accessoryPositionChange"

2
templates/backOffice/default/ajax/template-attribute-list.html
View File

@@ -54,7 +54,7 @@
<td class="text-center">
{admin_position_block
resource="admin.configuration.template"
access="update"
access="UPDATE"
path={url path="admin/template/update-attribute-position" template_id=$template_id}
url_parameter="attribute_id"
in_place_edit_class="attributePositionChange"

2
templates/backOffice/default/ajax/template-feature-list.html
View File

@@ -56,7 +56,7 @@
<td class="text-center">
{admin_position_block
resource="admin.configuration.template"
access="update"
access="UPDATE"
path={url path="/admin/template/update-feature-position" template_id=$template_id}
url_parameter="feature_id"
in_place_edit_class="featurePositionChange"

2
templates/backOffice/default/attribute-edit.html
View File

@@ -139,7 +139,7 @@
<td class="text-center">
{admin_position_block
resource="admin.configuration.attribute"
access="update"
access="UPDATE"
path={url path='/admin/configuration/attributes-av/update-position' attribute_id=$attribute_id}
url_parameter="attributeav_id"
in_place_edit_class="positionChange"

2
templates/backOffice/default/attributes.html
View File

@@ -92,7 +92,7 @@
<td class="text-center">
{admin_position_block
resource="admin.configuration.attribute"
access="update"
access="UPDATE"
path="/admin/configuration/attributes/update-position"
url_parameter="attribute_id"
in_place_edit_class="positionChange"

4
templates/backOffice/default/categories.html
View File

@@ -133,7 +133,7 @@
<td>
{admin_position_block
resource="admin.category"
access="update"
access="UPDATE"
path={url path='admin/categories/update-position' category_id=$ID}
url_parameter="category_id"
in_place_edit_class="categoryPositionChange"
@@ -304,7 +304,7 @@
<td>
{admin_position_block
resource="admin.product"
access="update"
access="UPDATE"
path={url path='/admin/products/update-position' product_id=$ID}
url_parameter="product_id"
in_place_edit_class="productPositionChange"

2
templates/backOffice/default/currencies.html
View File

@@ -143,7 +143,7 @@
<td class="text-center">
{admin_position_block
resource="admin.configuration.currency"
access="update"
access="UPDATE"
path="/admin/configuration/currencies/update-position"
url_parameter="currency_id"
in_place_edit_class="currencyPositionChange"

2
templates/backOffice/default/feature-edit.html
View File

@@ -139,7 +139,7 @@
<td class="text-center">
{admin_position_block
resource="admin.configuration.feature"
access="update"
access="UPDATE"
path={url path='/admin/configuration/features-av/update-position' feature_id=$feature_id}
url_parameter="featureav_id"
in_place_edit_class="positionChange"

2
templates/backOffice/default/features.html
View File

@@ -92,7 +92,7 @@
<td class="text-center">
{admin_position_block
resource="admin.configuration.feature"
access="update"
access="UPDATE"
path="/admin/configuration/features/update-position"
url_parameter="feature_id"
in_place_edit_class="positionChange"

4
templates/backOffice/default/folders.html
View File

@@ -133,7 +133,7 @@
<td>
{admin_position_block
resource="admin.folder"
access="update"
access="UPDATE"
path={url path='admin/folders/update-position' folder_id=$ID}
url_parameter="folder_id"
in_place_edit_class="folderPositionChange"
@@ -291,7 +291,7 @@
<td>
{admin_position_block
resource="admin.content"
access="update"
access="UPDATE"
path={url path='/admin/content/update-position' content_id=$ID}
url_parameter="content_id"
in_place_edit_class="contentPositionChange"

124
templates/backOffice/default/search.html
View File

@@ -170,6 +170,44 @@
</div>
{* end order search *}
{* category search *}
<div class="general-block-decorator">
<div class="table-responsive">
<table class="table table-striped table-condensed table-left-aligned">
<caption class="clearfix">
{intl l='Category'}
</caption>
<thead>
<tr>
<th>{intl l="ID"}</th>
<th></th>
<th>{intl l="Category title"}</th>
<th class="actions">{intl l="Actions"}</th>
</tr>
</thead>
<tbody>
{loop type="category" name="category-search" visible="*" search_mode="sentence" search_term=trim($smarty.get.search_term) search_in="title"}
<tr>
<td>{$ID}</td>
<td></td>
<td class="object-title"><a href="{url path="/admin/categories/update" category_id={$ID}}">{$TITLE}</a></td>
<td class="actions">
<div class="btn-group">
{loop type="auth" name="can_change" role="ADMIN" resource="admin.category" access="UPDATE"}
<a class="btn btn-default btn-xs" title="{intl l='Edit this category'}" href="{url path="/admin/categories/update" category_id={$ID}}"><i class="glyphicon glyphicon-edit"></i></a>
{/loop}
</div>
</td>
</tr>
{/loop}
</tbody>
</table>
</div>
</div>
{* end category search *}
{* product search *}
<div class="general-block-decorator">
<div class="table-responsive">
@@ -222,6 +260,92 @@
</div>
{* end product search *}
{* folder search *}
<div class="general-block-decorator">
<div class="table-responsive">
<table class="table table-striped table-condensed table-left-aligned">
<caption class="clearfix">
{intl l='Folder'}
</caption>
<thead>
<tr>
<th>{intl l="ID"}</th>
<th></th>
<th>{intl l="Folder title"}</th>
<th class="actions">{intl l="Actions"}</th>
</tr>
</thead>
<tbody>
{loop type="folder" name="folder-search" visible="*" search_mode="sentence" search_term=trim($smarty.get.search_term) search_in="title"}
<tr>
<td>{$ID}</td>
<td></td>
<td class="object-title"><a href="{url path="/admin/folders/update/{$ID}"}">{$TITLE}</a></td>
<td class="actions">
<div class="btn-group">
{loop type="auth" name="can_change" role="ADMIN" resource="admin.folder" access="UPDATE"}
<a class="btn btn-default btn-xs" title="{intl l='Edit this folder'}" href="{url path="/admin/folders/update/{$ID}"}"><i class="glyphicon glyphicon-edit"></i></a>
{/loop}
</div>
</td>
</tr>
{/loop}
</tbody>
</table>
</div>
</div>
{* end folder search *}
{* content search *}
<div class="general-block-decorator">
<div class="table-responsive">
<table class="table table-striped table-condensed table-left-aligned">
<caption class="clearfix">
{intl l='Content'}
</caption>
<thead>
<tr>
<th>{intl l="ID"}</th>
<th></th>
<th>{intl l="Content title"}</th>
<th class="actions">{intl l="Actions"}</th>
</tr>
</thead>
<tbody>
{loop type="content" name="content-search" visible="*" search_mode="sentence" search_term=trim($smarty.get.search_term) search_in="title"}
<tr>
<td>{$ID}</td>
<td></td>
<td class="object-title"><a href="{url path="/admin/content/update/{$ID}"}">{$TITLE}</a></td>
<td class="actions">
<div class="btn-group">
{loop type="auth" name="can_change" role="ADMIN" resource="admin.content" access="UPDATE"}
<a class="btn btn-default btn-xs" title="{intl l='Edit this content'}" href="{url path="/admin/content/update/{$ID}"}"><i class="glyphicon glyphicon-edit"></i></a>
{/loop}
</div>
</td>
</tr>
{/loop}
</tbody>
</table>
</div>
</div>
{* end content search *}
</div>
</div>

10
templates/frontOffice/default/product.html
View File

@@ -111,15 +111,11 @@
{loop name="combi_meta" type="attribute_combination" product_sale_elements="$ID"}
{if $LOOP_COUNT == 0}
{if $QUANTITY == 0}
{assign var="current_stock_class" value = "out-of-stock"}
{assign var="current_stock_href" value = "http://schema.org/OutOfStock"}
{else}
{assign var="current_stock_class" value = "out-of-stock"}
{assign var="current_stock_href" value = "http://schema.org/OutOfStock"}
{else}
{assign var="current_stock_class" value = "in-stock"}
{assign var="current_stock_href" value = "http://schema.org/InStock"}
{/if}
{/if}
{/loop}