diff --git a/core/lib/Thelia/Config/Resources/routing/admin.xml b/core/lib/Thelia/Config/Resources/routing/admin.xml
index f52705c6b..f9301caa6 100644
--- a/core/lib/Thelia/Config/Resources/routing/admin.xml
+++ b/core/lib/Thelia/Config/Resources/routing/admin.xml
@@ -1,1160 +1,1160 @@
-
-
-
-
-
-
- Thelia\Controller\Admin\AdminController::indexAction
- 1
-
-
-
-
-
- Thelia\Controller\Admin\HomeController::defaultAction
-
-
-
- Thelia\Controller\Admin\HomeController::getLatestTheliaVersion
-
-
-
- Thelia\Controller\Admin\HomeController::loadStatsAjaxAction
-
-
-
- Thelia\Controller\Admin\AdminController::processTemplateAction
- ajax/thelia_news_feed
- 1
-
-
-
-
-
-
- Thelia\Controller\Admin\SessionController::showLoginAction
- 1
-
-
-
-
- Thelia\Controller\Admin\SessionController::checkLogoutAction
-
-
-
-
- Thelia\Controller\Admin\SessionController::checkLoginAction
- 1
-
-
-
-
-
- Thelia\Controller\Admin\CategoryController::defaultAction
-
-
-
-
-
- Thelia\Controller\Admin\FileController::saveImageAjaxAction
- .*
- \d+
-
-
- Thelia\Controller\Admin\FileController::getImageFormAjaxAction
- .*
- \d+
-
-
- Thelia\Controller\Admin\FileController::getImageListAjaxAction
- .*
- \d+
-
-
- Thelia\Controller\Admin\FileController::updateImagePositionAction
- .*
- \d+
-
-
- Thelia\Controller\Admin\FileController::viewImageAction
- .*
- \d+
-
-
- Thelia\Controller\Admin\FileController::updateImageAction
- .*
- \d+
-
-
- Thelia\Controller\Admin\FileController::deleteImageAction
- .*
- \d+
-
-
-
- Thelia\Controller\Admin\FileController::saveDocumentAjaxAction
- .*
- \d+
-
-
- Thelia\Controller\Admin\FileController::getDocumentFormAjaxAction
- .*
- \d+
-
-
- Thelia\Controller\Admin\FileController::getDocumentListAjaxAction
- .*
- \d+
-
-
- Thelia\Controller\Admin\FileController::updateDocumentPositionAction
- .*
- \d+
-
-
- Thelia\Controller\Admin\FileController::viewDocumentAction
- .*
- \d+
-
-
- Thelia\Controller\Admin\FileController::updateDocumentAction
- .*
- \d+
-
-
- Thelia\Controller\Admin\FileController::deleteDocumentAction
- .*
- \d+
-
-
-
-
-
- Thelia\Controller\Admin\CustomerController::defaultAction
-
-
-
- Thelia\Controller\Admin\CustomerController::updateAction
-
-
-
- Thelia\Controller\Admin\CustomerController::processUpdateAction
-
-
-
- Thelia\Controller\Admin\CustomerController::deleteAction
-
-
-
- Thelia\Controller\Admin\CustomerController::createAction
-
-
-
-
-
-
-
- Thelia\Controller\Admin\AddressController::deleteAction
-
-
-
- Thelia\Controller\Admin\AddressController::useAddressAction
-
-
-
- Thelia\Controller\Admin\AddressController::createAction
-
-
-
- Thelia\Controller\Admin\AddressController::updateAction
-
-
-
- Thelia\Controller\Admin\AddressController::processUpdateAction
-
-
-
-
-
-
-
- Thelia\Controller\Admin\OrderController::indexAction
-
-
-
- Thelia\Controller\Admin\OrderController::viewAction
- \d+
-
-
-
- Thelia\Controller\Admin\OrderController::updateStatus
-
-
-
- Thelia\Controller\Admin\OrderController::updateStatus
-
-
-
- Thelia\Controller\Admin\OrderController::updateDeliveryRef
-
-
-
- Thelia\Controller\Admin\OrderController::updateAddress
-
-
-
- Thelia\Controller\Admin\OrderController::generateInvoicePdf
- \d+
-
-
-
- Thelia\Controller\Admin\OrderController::generateDeliveryPdf
- \d+
-
-
-
-
-
-
-
- Thelia\Controller\Admin\CategoryController::defaultAction
-
-
-
- Thelia\Controller\Admin\CategoryController::createAction
-
-
-
- Thelia\Controller\Admin\CategoryController::updateAction
-
-
-
- Thelia\Controller\Admin\CategoryController::processUpdateAction
-
-
-
- Thelia\Controller\Admin\CategoryController::processUpdateSeoAction
-
-
-
- Thelia\Controller\Admin\CategoryController::setToggleVisibilityAction
-
-
-
- Thelia\Controller\Admin\CategoryController::deleteAction
-
-
-
- Thelia\Controller\Admin\CategoryController::updatePositionAction
-
-
-
- Thelia\Controller\Admin\CategoryController::addRelatedContentAction
-
-
-
- Thelia\Controller\Admin\CategoryController::addRelatedPictureAction
-
-
-
- Thelia\Controller\Admin\CategoryController::deleteRelatedContentAction
-
-
-
- Thelia\Controller\Admin\CategoryController::getAvailableRelatedContentAction
- xml|json
-
-
-
- Thelia\Controller\Admin\CategoryController::getByParentIdAction
- xml|json
-
-
-
-
-
- Thelia\Controller\Admin\ProductController::defaultAction
-
-
-
- Thelia\Controller\Admin\ProductController::createAction
-
-
-
- Thelia\Controller\Admin\ProductController::updateAction
-
-
-
- Thelia\Controller\Admin\ProductController::processUpdateAction
-
-
-
- Thelia\Controller\Admin\ProductController::processUpdateSeoAction
-
-
-
- Thelia\Controller\Admin\ProductController::setToggleVisibilityAction
-
-
-
- Thelia\Controller\Admin\ProductController::deleteAction
-
-
-
- Thelia\Controller\Admin\ProductController::updatePositionAction
-
-
-
-
- Thelia\Controller\Admin\ProductController::loadGeneralAjaxTabAction
-
-
-
-
-
- Thelia\Controller\Admin\ProductController::loadRelatedAjaxTabAction
-
-
-
-
-
- Thelia\Controller\Admin\ProductController::addAdditionalCategoryAction
-
-
-
- Thelia\Controller\Admin\ProductController::deleteAdditionalCategoryAction
-
-
-
-
-
- Thelia\Controller\Admin\ProductController::addRelatedContentAction
-
-
-
- Thelia\Controller\Admin\ProductController::deleteRelatedContentAction
-
-
-
- Thelia\Controller\Admin\ProductController::getAvailableRelatedContentAction
- xml|json
-
-
-
- Thelia\Controller\Admin\ProductController::updateContentPositionAction
-
-
-
- Thelia\Controller\Admin\ProductController::priceCaclulator
-
-
-
- Thelia\Controller\Admin\ProductController::calculatePrice
-
-
-
- Thelia\Controller\Admin\ProductController::loadConvertedPrices
-
-
-
-
-
- Thelia\Controller\Admin\ProductController::addAccessoryAction
-
-
-
- Thelia\Controller\Admin\ProductController::deleteAccessoryAction
-
-
-
- Thelia\Controller\Admin\ProductController::getAvailableAccessoriesAction
- xml|json
-
-
-
- Thelia\Controller\Admin\ProductController::updateAccessoryPositionAction
-
-
-
-
-
- Thelia\Controller\Admin\ProductController::loadAttributesAjaxTabAction
-
-
-
- Thelia\Controller\Admin\ProductController::setProductTemplateAction
-
-
-
- Thelia\Controller\Admin\ProductController::updateAttributesAndFeaturesAction
-
-
-
-
-
- Thelia\Controller\Admin\ProductController::getAttributeValuesAction
- xml|json
-
-
-
- Thelia\Controller\Admin\ProductController::addAttributeValueToCombinationAction
- xml|json
-
-
-
- Thelia\Controller\Admin\ProductController::addProductSaleElementAction
-
-
-
- Thelia\Controller\Admin\ProductController::deleteProductSaleElementAction
-
-
-
- Thelia\Controller\Admin\ProductController::updateProductSaleElementsAction
-
-
-
- Thelia\Controller\Admin\ProductController::buildCombinationsAction
-
-
-
- Thelia\Controller\Admin\ProductController::updateProductDefaultSaleElementAction
-
-
-
-
-
-
-
-
- Thelia\Controller\Admin\FolderController::defaultAction
-
-
-
- Thelia\Controller\Admin\FolderController::createAction
-
-
-
- Thelia\Controller\Admin\FolderController::updateAction
- \d+
-
-
-
- Thelia\Controller\Admin\FolderController::setToggleVisibilityAction
-
-
-
- Thelia\Controller\Admin\FolderController::processUpdateAction
-
-
-
- Thelia\Controller\Admin\FolderController::processUpdateSeoAction
-
-
-
- Thelia\Controller\Admin\FolderController::deleteAction
-
-
-
- Thelia\Controller\Admin\FolderController::updatePositionAction
-
-
-
-
- Thelia\Controller\Admin\ContentController::createAction
-
-
-
- Thelia\Controller\Admin\ContentController::updateAction
- \d+
-
-
-
- Thelia\Controller\Admin\ContentController::processUpdateAction
-
-
-
- Thelia\Controller\Admin\ContentController::processUpdateSeoAction
-
-
-
- Thelia\Controller\Admin\ContentController::updatePositionAction
-
-
-
- Thelia\Controller\Admin\ContentController::setToggleVisibilityAction
-
-
-
- Thelia\Controller\Admin\ContentController::deleteAction
-
-
-
- Thelia\Controller\Admin\ContentController::addAdditionalFolderAction
-
-
-
- Thelia\Controller\Admin\ContentController::removeAdditionalFolderAction
-
-
-
-
-
-
- Thelia\Controller\Admin\CouponController::browseAction
-
-
- Thelia\Controller\Admin\CouponController::createAction
-
-
- Thelia\Controller\Admin\CouponController::updateAction
- \d+
-
-
- Thelia\Controller\Admin\CouponController::readAction
- \d+
-
-
- Thelia\Controller\Admin\CouponController::getBackOfficeInputsAjaxAction
- .*
-
-
- Thelia\Controller\Admin\CouponController::getBackOfficeConditionSummariesAjaxAction
- \d+
-
-
- Thelia\Controller\Admin\CouponController::getConditionEmptyInputAjaxAction
- .*
-
-
- Thelia\Controller\Admin\CouponController::getConditionToUpdateInputAjaxAction
- \d+
- \d+
-
-
- Thelia\Controller\Admin\CouponController::saveConditionsAction
- \d+
-
-
- Thelia\Controller\Admin\CouponController::deleteConditionsAction
- \d+
- \d+
-
-
- Thelia\Controller\Admin\CouponController::consumeAction
- .*
-
-
-
-
-
- Thelia\Controller\Admin\ConfigController::defaultAction
-
-
-
- Thelia\Controller\Admin\ConfigController::changeValuesAction
-
-
-
- Thelia\Controller\Admin\ConfigController::createAction
-
-
-
- Thelia\Controller\Admin\ConfigController::updateAction
-
-
-
- Thelia\Controller\Admin\ConfigController::processUpdateAction
-
-
-
- Thelia\Controller\Admin\ConfigController::deleteAction
-
-
-
-
-
- Thelia\Controller\Admin\ConfigStoreController::defaultAction
-
-
-
- Thelia\Controller\Admin\ConfigStoreController::saveAction
-
-
-
-
-
-
- Thelia\Controller\Admin\SystemLogController::defaultAction
-
-
-
- Thelia\Controller\Admin\SystemLogController::saveAction
-
-
-
-
-
- Thelia\Controller\Admin\MessageController::defaultAction
-
-
-
- Thelia\Controller\Admin\MessageController::createAction
-
-
-
- Thelia\Controller\Admin\MessageController::updateAction
-
-
-
- Thelia\Controller\Admin\MessageController::processUpdateAction
-
-
-
- Thelia\Controller\Admin\MessageController::deleteAction
-
-
-
-
-
- Thelia\Controller\Admin\CurrencyController::defaultAction
-
-
-
- Thelia\Controller\Admin\CurrencyController::createAction
-
-
-
- Thelia\Controller\Admin\CurrencyController::updateAction
-
-
-
- Thelia\Controller\Admin\CurrencyController::processUpdateAction
-
-
-
- Thelia\Controller\Admin\CurrencyController::setDefaultAction
-
-
-
- Thelia\Controller\Admin\CurrencyController::updatePositionAction
-
-
-
- Thelia\Controller\Admin\CurrencyController::updateRatesAction
-
-
-
- Thelia\Controller\Admin\CurrencyController::deleteAction
-
-
-
- Thelia\Controller\Admin\CurrencyController::updatePositionAction
-
-
-
-
-
-
- Thelia\Controller\Admin\TemplateController::defaultAction
-
-
-
- Thelia\Controller\Admin\TemplateController::createAction
-
-
-
- Thelia\Controller\Admin\TemplateController::updateAction
-
-
-
- Thelia\Controller\Admin\TemplateController::processUpdateAction
-
-
-
- Thelia\Controller\Admin\TemplateController::deleteAction
-
-
-
- Thelia\Controller\Admin\TemplateController::getAjaxFeaturesAction
-
-
-
- Thelia\Controller\Admin\TemplateController::addFeatureAction
-
-
-
- Thelia\Controller\Admin\TemplateController::deleteFeatureAction
-
-
-
- Thelia\Controller\Admin\TemplateController::updateFeaturePositionAction
-
-
-
- Thelia\Controller\Admin\TemplateController::getAjaxAttributesAction
-
-
-
- Thelia\Controller\Admin\TemplateController::addAttributeAction
-
-
-
- Thelia\Controller\Admin\TemplateController::deleteAttributeAction
-
-
-
- Thelia\Controller\Admin\TemplateController::updateAttributePositionAction
-
-
-
-
-
-
- Thelia\Controller\Admin\AttributeController::defaultAction
-
-
-
- Thelia\Controller\Admin\AttributeController::createAction
-
-
-
- Thelia\Controller\Admin\AttributeController::updateAction
-
-
-
- Thelia\Controller\Admin\AttributeController::processUpdateAction
-
-
-
- Thelia\Controller\Admin\AttributeController::deleteAction
-
-
-
- Thelia\Controller\Admin\AttributeController::updatePositionAction
-
-
-
- Thelia\Controller\Admin\AttributeController::removeFromAllTemplates
-
-
-
- Thelia\Controller\Admin\AttributeController::addToAllTemplates
-
-
-
-
- Thelia\Controller\Admin\AttributeAvController::createAction
-
-
-
- Thelia\Controller\Admin\AttributeAvController::updateAction
-
-
-
- Thelia\Controller\Admin\AttributeAvController::processUpdateAction
-
-
-
- Thelia\Controller\Admin\AttributeAvController::deleteAction
-
-
-
- Thelia\Controller\Admin\AttributeAvController::updatePositionAction
-
-
-
-
-
-
-
-
-
-
-
- Thelia\Controller\Admin\ShippingZoneController::indexAction
-
-
-
- Thelia\Controller\Admin\ShippingZoneController::updateAction
- \d+
-
-
-
- Thelia\Controller\Admin\ShippingZoneController::addArea
-
-
-
- Thelia\Controller\Admin\ShippingZoneController::removeArea
-
-
-
-
-
-
-
- Thelia\Controller\Admin\AreaController::defaultAction
-
-
-
- Thelia\Controller\Admin\AreaController::updateAction
- \d+
-
-
-
- Thelia\Controller\Admin\AreaController::deleteAction
-
-
-
- Thelia\Controller\Admin\AreaController::createAction
-
-
-
- Thelia\Controller\Admin\AreaController::updatePostageAction
- \d+
-
-
-
- Thelia\Controller\Admin\AreaController::addCountry
-
-
-
- Thelia\Controller\Admin\AreaController::removeCountry
-
-
-
-
-
-
-
- Thelia\Controller\Admin\CountryController::defaultAction
-
-
-
- Thelia\Controller\Admin\CountryController::createAction
-
-
-
- Thelia\Controller\Admin\CountryController::updateAction
- \d+
-
-
-
- Thelia\Controller\Admin\CountryController::processUpdateAction
- \d+
-
-
-
- Thelia\Controller\Admin\CountryController::deleteAction
-
-
-
- Thelia\Controller\Admin\CountryController::toggleDefaultAction
-
-
-
-
-
-
-
- Thelia\Controller\Admin\ProfileController::defaultAction
- \d+
-
-
-
- Thelia\Controller\Admin\ProfileController::updateAction
- \d+
-
-
-
- Thelia\Controller\Admin\ProfileController::createAction
-
-
-
- Thelia\Controller\Admin\ProfileController::processUpdateAction
-
-
-
- Thelia\Controller\Admin\ProfileController::processUpdateResourceAccess
-
-
-
- Thelia\Controller\Admin\ProfileController::processUpdateModuleAccess
-
-
-
- Thelia\Controller\Admin\ProfileController::deleteAction
-
-
-
-
-
-
-
- Thelia\Controller\Admin\AdministratorController::defaultAction
-
-
-
- Thelia\Controller\Admin\AdministratorController::createAction
-
-
-
- Thelia\Controller\Admin\AdministratorController::processUpdateAction
-
-
-
- Thelia\Controller\Admin\AdministratorController::deleteAction
-
-
-
-
-
-
-
- Thelia\Controller\Admin\MailingSystemController::defaultAction
-
-
-
- Thelia\Controller\Admin\MailingSystemController::updateAction
-
-
-
-
-
-
-
- Thelia\Controller\Admin\AdminLogsController::defaultAction
-
-
-
- Thelia\Controller\Admin\AdminLogsController::loadLoggerAjaxAction
-
-
-
-
-
-
-
- Thelia\Controller\Admin\FeatureController::defaultAction
-
-
-
- Thelia\Controller\Admin\FeatureController::createAction
-
-
-
- Thelia\Controller\Admin\FeatureController::updateAction
-
-
-
- Thelia\Controller\Admin\FeatureController::processUpdateAction
-
-
-
- Thelia\Controller\Admin\FeatureController::deleteAction
-
-
-
- Thelia\Controller\Admin\FeatureController::updatePositionAction
-
-
-
- Thelia\Controller\Admin\FeatureController::removeFromAllTemplates
-
-
-
- Thelia\Controller\Admin\FeatureController::addToAllTemplates
-
-
-
-
- Thelia\Controller\Admin\FeatureAvController::createAction
-
-
-
- Thelia\Controller\Admin\FeatureAvController::updateAction
-
-
-
- Thelia\Controller\Admin\FeatureAvController::processUpdateAction
-
-
-
- Thelia\Controller\Admin\FeatureAvController::deleteAction
-
-
-
- Thelia\Controller\Admin\FeatureAvController::updatePositionAction
-
-
-
-
-
-
- Thelia\Controller\Admin\CacheController::defaultAction
-
-
-
- Thelia\Controller\Admin\CacheController::flushAction
-
-
-
-
-
-
-
- Thelia\Controller\Admin\ModuleController::indexAction
-
-
-
- Thelia\Controller\Admin\ModuleController::updateAction
- \d+
-
-
-
- Thelia\Controller\Admin\ModuleController::processUpdateAction
-
-
-
- Thelia\Controller\Admin\ModuleController::toggleActivationAction
- \d+
-
-
-
- Thelia\Controller\Admin\ModuleController::deleteAction
-
-
-
- Thelia\Controller\Admin\ModuleController::updatePositionAction
-
-
-
-
- Thelia\Controller\Admin\ModuleController::configureAction
-
-
-
-
-
-
-
- Thelia\Controller\Admin\TaxController::updateAction
- \d+
-
-
-
- Thelia\Controller\Admin\TaxController::createAction
-
-
-
- Thelia\Controller\Admin\TaxController::processUpdateAction
-
-
-
- Thelia\Controller\Admin\TaxController::deleteAction
-
-
-
-
-
-
-
- Thelia\Controller\Admin\TaxRuleController::defaultAction
-
-
-
- Thelia\Controller\Admin\TaxRuleController::updateAction
- \d+
-
-
-
- Thelia\Controller\Admin\TaxRuleController::createAction
-
-
-
- Thelia\Controller\Admin\TaxRuleController::processUpdateAction
-
-
-
- Thelia\Controller\Admin\TaxRuleController::processUpdateTaxesAction
-
-
-
- Thelia\Controller\Admin\TaxRuleController::deleteAction
-
-
-
- Thelia\Controller\Admin\TaxRuleController::setDefaultAction
- \d+
-
-
-
-
-
-
-
- Thelia\Controller\Admin\LangController::defaultAction
-
-
-
- Thelia\Controller\Admin\LangController::updateAction
- \d+
-
-
-
- Thelia\Controller\Admin\LangController::processUpdateAction
- \d+
-
-
-
- Thelia\Controller\Admin\LangController::toggleDefaultAction
- \d+
-
-
-
- Thelia\Controller\Admin\LangController::addAction
-
-
-
- Thelia\Controller\Admin\LangController::deleteAction
-
-
-
- Thelia\Controller\Admin\LangController::defaultBehaviorAction
-
-
-
- Thelia\Controller\Admin\LangController::domainAction
-
-
-
- Thelia\Controller\Admin\LangController::activateDomainAction
-
-
-
- Thelia\Controller\Admin\LangController::deactivateDomainAction
-
-
-
-
-
- Thelia\Controller\Admin\TranslationsController::defaultAction
-
-
-
- Thelia\Controller\Admin\TranslationsController::updateAction
-
-
-
-
-
- Thelia\Controller\Admin\AdminController::processTemplateAction
- .*
-
-
-
+
+
+
+
+
+
+ Thelia\Controller\Admin\AdminController::indexAction
+ 1
+
+
+
+
+
+ Thelia\Controller\Admin\HomeController::defaultAction
+
+
+
+ Thelia\Controller\Admin\HomeController::getLatestTheliaVersion
+
+
+
+ Thelia\Controller\Admin\HomeController::loadStatsAjaxAction
+
+
+
+ Thelia\Controller\Admin\AdminController::processTemplateAction
+ ajax/thelia_news_feed
+ 1
+
+
+
+
+
+
+ Thelia\Controller\Admin\SessionController::showLoginAction
+ 1
+
+
+
+
+ Thelia\Controller\Admin\SessionController::checkLogoutAction
+
+
+
+
+ Thelia\Controller\Admin\SessionController::checkLoginAction
+ 1
+
+
+
+
+
+ Thelia\Controller\Admin\CategoryController::defaultAction
+
+
+
+
+
+ Thelia\Controller\Admin\FileController::saveImageAjaxAction
+ .*
+ \d+
+
+
+ Thelia\Controller\Admin\FileController::getImageFormAjaxAction
+ .*
+ \d+
+
+
+ Thelia\Controller\Admin\FileController::getImageListAjaxAction
+ .*
+ \d+
+
+
+ Thelia\Controller\Admin\FileController::updateImagePositionAction
+ .*
+ \d+
+
+
+ Thelia\Controller\Admin\FileController::viewImageAction
+ .*
+ \d+
+
+
+ Thelia\Controller\Admin\FileController::updateImageAction
+ .*
+ \d+
+
+
+ Thelia\Controller\Admin\FileController::deleteImageAction
+ .*
+ \d+
+
+
+
+ Thelia\Controller\Admin\FileController::saveDocumentAjaxAction
+ .*
+ \d+
+
+
+ Thelia\Controller\Admin\FileController::getDocumentFormAjaxAction
+ .*
+ \d+
+
+
+ Thelia\Controller\Admin\FileController::getDocumentListAjaxAction
+ .*
+ \d+
+
+
+ Thelia\Controller\Admin\FileController::updateDocumentPositionAction
+ .*
+ \d+
+
+
+ Thelia\Controller\Admin\FileController::viewDocumentAction
+ .*
+ \d+
+
+
+ Thelia\Controller\Admin\FileController::updateDocumentAction
+ .*
+ \d+
+
+
+ Thelia\Controller\Admin\FileController::deleteDocumentAction
+ .*
+ \d+
+
+
+
+
+
+ Thelia\Controller\Admin\CustomerController::defaultAction
+
+
+
+ Thelia\Controller\Admin\CustomerController::updateAction
+
+
+
+ Thelia\Controller\Admin\CustomerController::processUpdateAction
+
+
+
+ Thelia\Controller\Admin\CustomerController::deleteAction
+
+
+
+ Thelia\Controller\Admin\CustomerController::createAction
+
+
+
+
+
+
+
+ Thelia\Controller\Admin\AddressController::deleteAction
+
+
+
+ Thelia\Controller\Admin\AddressController::useAddressAction
+
+
+
+ Thelia\Controller\Admin\AddressController::createAction
+
+
+
+ Thelia\Controller\Admin\AddressController::updateAction
+
+
+
+ Thelia\Controller\Admin\AddressController::processUpdateAction
+
+
+
+
+
+
+
+ Thelia\Controller\Admin\OrderController::indexAction
+
+
+
+ Thelia\Controller\Admin\OrderController::viewAction
+ \d+
+
+
+
+ Thelia\Controller\Admin\OrderController::updateStatus
+
+
+
+ Thelia\Controller\Admin\OrderController::updateStatus
+
+
+
+ Thelia\Controller\Admin\OrderController::updateDeliveryRef
+
+
+
+ Thelia\Controller\Admin\OrderController::updateAddress
+
+
+
+ Thelia\Controller\Admin\OrderController::generateInvoicePdf
+ \d+
+
+
+
+ Thelia\Controller\Admin\OrderController::generateDeliveryPdf
+ \d+
+
+
+
+
+
+
+
+ Thelia\Controller\Admin\CategoryController::defaultAction
+
+
+
+ Thelia\Controller\Admin\CategoryController::createAction
+
+
+
+ Thelia\Controller\Admin\CategoryController::updateAction
+
+
+
+ Thelia\Controller\Admin\CategoryController::processUpdateAction
+
+
+
+ Thelia\Controller\Admin\CategoryController::processUpdateSeoAction
+
+
+
+ Thelia\Controller\Admin\CategoryController::setToggleVisibilityAction
+
+
+
+ Thelia\Controller\Admin\CategoryController::deleteAction
+
+
+
+ Thelia\Controller\Admin\CategoryController::updatePositionAction
+
+
+
+ Thelia\Controller\Admin\CategoryController::addRelatedContentAction
+
+
+
+ Thelia\Controller\Admin\CategoryController::addRelatedPictureAction
+
+
+
+ Thelia\Controller\Admin\CategoryController::deleteRelatedContentAction
+
+
+
+ Thelia\Controller\Admin\CategoryController::getAvailableRelatedContentAction
+ xml|json
+
+
+
+ Thelia\Controller\Admin\CategoryController::getByParentIdAction
+ xml|json
+
+
+
+
+
+ Thelia\Controller\Admin\ProductController::defaultAction
+
+
+
+ Thelia\Controller\Admin\ProductController::createAction
+
+
+
+ Thelia\Controller\Admin\ProductController::updateAction
+
+
+
+ Thelia\Controller\Admin\ProductController::processUpdateAction
+
+
+
+ Thelia\Controller\Admin\ProductController::processUpdateSeoAction
+
+
+
+ Thelia\Controller\Admin\ProductController::setToggleVisibilityAction
+
+
+
+ Thelia\Controller\Admin\ProductController::deleteAction
+
+
+
+ Thelia\Controller\Admin\ProductController::updatePositionAction
+
+
+
+
+ Thelia\Controller\Admin\ProductController::loadGeneralAjaxTabAction
+
+
+
+
+
+ Thelia\Controller\Admin\ProductController::loadRelatedAjaxTabAction
+
+
+
+
+
+ Thelia\Controller\Admin\ProductController::addAdditionalCategoryAction
+
+
+
+ Thelia\Controller\Admin\ProductController::deleteAdditionalCategoryAction
+
+
+
+
+
+ Thelia\Controller\Admin\ProductController::addRelatedContentAction
+
+
+
+ Thelia\Controller\Admin\ProductController::deleteRelatedContentAction
+
+
+
+ Thelia\Controller\Admin\ProductController::getAvailableRelatedContentAction
+ xml|json
+
+
+
+ Thelia\Controller\Admin\ProductController::updateContentPositionAction
+
+
+
+ Thelia\Controller\Admin\ProductController::priceCaclulator
+
+
+
+ Thelia\Controller\Admin\ProductController::calculatePrice
+
+
+
+ Thelia\Controller\Admin\ProductController::loadConvertedPrices
+
+
+
+
+
+ Thelia\Controller\Admin\ProductController::addAccessoryAction
+
+
+
+ Thelia\Controller\Admin\ProductController::deleteAccessoryAction
+
+
+
+ Thelia\Controller\Admin\ProductController::getAvailableAccessoriesAction
+ xml|json
+
+
+
+ Thelia\Controller\Admin\ProductController::updateAccessoryPositionAction
+
+
+
+
+
+ Thelia\Controller\Admin\ProductController::loadAttributesAjaxTabAction
+
+
+
+ Thelia\Controller\Admin\ProductController::setProductTemplateAction
+
+
+
+ Thelia\Controller\Admin\ProductController::updateAttributesAndFeaturesAction
+
+
+
+
+
+ Thelia\Controller\Admin\ProductController::getAttributeValuesAction
+ xml|json
+
+
+
+ Thelia\Controller\Admin\ProductController::addAttributeValueToCombinationAction
+ xml|json
+
+
+
+ Thelia\Controller\Admin\ProductController::addProductSaleElementAction
+
+
+
+ Thelia\Controller\Admin\ProductController::deleteProductSaleElementAction
+
+
+
+ Thelia\Controller\Admin\ProductController::updateProductSaleElementsAction
+
+
+
+ Thelia\Controller\Admin\ProductController::buildCombinationsAction
+
+
+
+ Thelia\Controller\Admin\ProductController::updateProductDefaultSaleElementAction
+
+
+
+
+
+
+
+
+ Thelia\Controller\Admin\FolderController::defaultAction
+
+
+
+ Thelia\Controller\Admin\FolderController::createAction
+
+
+
+ Thelia\Controller\Admin\FolderController::updateAction
+ \d+
+
+
+
+ Thelia\Controller\Admin\FolderController::setToggleVisibilityAction
+
+
+
+ Thelia\Controller\Admin\FolderController::processUpdateAction
+
+
+
+ Thelia\Controller\Admin\FolderController::processUpdateSeoAction
+
+
+
+ Thelia\Controller\Admin\FolderController::deleteAction
+
+
+
+ Thelia\Controller\Admin\FolderController::updatePositionAction
+
+
+
+
+ Thelia\Controller\Admin\ContentController::createAction
+
+
+
+ Thelia\Controller\Admin\ContentController::updateAction
+ \d+
+
+
+
+ Thelia\Controller\Admin\ContentController::processUpdateAction
+
+
+
+ Thelia\Controller\Admin\ContentController::processUpdateSeoAction
+
+
+
+ Thelia\Controller\Admin\ContentController::updatePositionAction
+
+
+
+ Thelia\Controller\Admin\ContentController::setToggleVisibilityAction
+
+
+
+ Thelia\Controller\Admin\ContentController::deleteAction
+
+
+
+ Thelia\Controller\Admin\ContentController::addAdditionalFolderAction
+
+
+
+ Thelia\Controller\Admin\ContentController::removeAdditionalFolderAction
+
+
+
+
+
+
+ Thelia\Controller\Admin\CouponController::browseAction
+
+
+ Thelia\Controller\Admin\CouponController::createAction
+
+
+ Thelia\Controller\Admin\CouponController::updateAction
+ \d+
+
+
+ Thelia\Controller\Admin\CouponController::readAction
+ \d+
+
+
+ Thelia\Controller\Admin\CouponController::getBackOfficeInputsAjaxAction
+ .*
+
+
+ Thelia\Controller\Admin\CouponController::getBackOfficeConditionSummariesAjaxAction
+ \d+
+
+
+ Thelia\Controller\Admin\CouponController::getConditionEmptyInputAjaxAction
+ .*
+
+
+ Thelia\Controller\Admin\CouponController::getConditionToUpdateInputAjaxAction
+ \d+
+ \d+
+
+
+ Thelia\Controller\Admin\CouponController::saveConditionsAction
+ \d+
+
+
+ Thelia\Controller\Admin\CouponController::deleteConditionsAction
+ \d+
+ \d+
+
+
+ Thelia\Controller\Admin\CouponController::consumeAction
+ .*
+
+
+
+
+
+ Thelia\Controller\Admin\ConfigController::defaultAction
+
+
+
+ Thelia\Controller\Admin\ConfigController::changeValuesAction
+
+
+
+ Thelia\Controller\Admin\ConfigController::createAction
+
+
+
+ Thelia\Controller\Admin\ConfigController::updateAction
+
+
+
+ Thelia\Controller\Admin\ConfigController::processUpdateAction
+
+
+
+ Thelia\Controller\Admin\ConfigController::deleteAction
+
+
+
+
+
+ Thelia\Controller\Admin\ConfigStoreController::defaultAction
+
+
+
+ Thelia\Controller\Admin\ConfigStoreController::saveAction
+
+
+
+
+
+
+ Thelia\Controller\Admin\SystemLogController::defaultAction
+
+
+
+ Thelia\Controller\Admin\SystemLogController::saveAction
+
+
+
+
+
+ Thelia\Controller\Admin\MessageController::defaultAction
+
+
+
+ Thelia\Controller\Admin\MessageController::createAction
+
+
+
+ Thelia\Controller\Admin\MessageController::updateAction
+
+
+
+ Thelia\Controller\Admin\MessageController::processUpdateAction
+
+
+
+ Thelia\Controller\Admin\MessageController::deleteAction
+
+
+
+
+
+ Thelia\Controller\Admin\CurrencyController::defaultAction
+
+
+
+ Thelia\Controller\Admin\CurrencyController::createAction
+
+
+
+ Thelia\Controller\Admin\CurrencyController::updateAction
+
+
+
+ Thelia\Controller\Admin\CurrencyController::processUpdateAction
+
+
+
+ Thelia\Controller\Admin\CurrencyController::setDefaultAction
+
+
+
+ Thelia\Controller\Admin\CurrencyController::updatePositionAction
+
+
+
+ Thelia\Controller\Admin\CurrencyController::updateRatesAction
+
+
+
+ Thelia\Controller\Admin\CurrencyController::deleteAction
+
+
+
+ Thelia\Controller\Admin\CurrencyController::updatePositionAction
+
+
+
+
+
+
+ Thelia\Controller\Admin\TemplateController::defaultAction
+
+
+
+ Thelia\Controller\Admin\TemplateController::createAction
+
+
+
+ Thelia\Controller\Admin\TemplateController::updateAction
+
+
+
+ Thelia\Controller\Admin\TemplateController::processUpdateAction
+
+
+
+ Thelia\Controller\Admin\TemplateController::deleteAction
+
+
+
+ Thelia\Controller\Admin\TemplateController::getAjaxFeaturesAction
+
+
+
+ Thelia\Controller\Admin\TemplateController::addFeatureAction
+
+
+
+ Thelia\Controller\Admin\TemplateController::deleteFeatureAction
+
+
+
+ Thelia\Controller\Admin\TemplateController::updateFeaturePositionAction
+
+
+
+ Thelia\Controller\Admin\TemplateController::getAjaxAttributesAction
+
+
+
+ Thelia\Controller\Admin\TemplateController::addAttributeAction
+
+
+
+ Thelia\Controller\Admin\TemplateController::deleteAttributeAction
+
+
+
+ Thelia\Controller\Admin\TemplateController::updateAttributePositionAction
+
+
+
+
+
+
+ Thelia\Controller\Admin\AttributeController::defaultAction
+
+
+
+ Thelia\Controller\Admin\AttributeController::createAction
+
+
+
+ Thelia\Controller\Admin\AttributeController::updateAction
+
+
+
+ Thelia\Controller\Admin\AttributeController::processUpdateAction
+
+
+
+ Thelia\Controller\Admin\AttributeController::deleteAction
+
+
+
+ Thelia\Controller\Admin\AttributeController::updatePositionAction
+
+
+
+ Thelia\Controller\Admin\AttributeController::removeFromAllTemplates
+
+
+
+ Thelia\Controller\Admin\AttributeController::addToAllTemplates
+
+
+
+
+ Thelia\Controller\Admin\AttributeAvController::createAction
+
+
+
+ Thelia\Controller\Admin\AttributeAvController::updateAction
+
+
+
+ Thelia\Controller\Admin\AttributeAvController::processUpdateAction
+
+
+
+ Thelia\Controller\Admin\AttributeAvController::deleteAction
+
+
+
+ Thelia\Controller\Admin\AttributeAvController::updatePositionAction
+
+
+
+
+
+
+
+
+
+
+
+ Thelia\Controller\Admin\ShippingZoneController::indexAction
+
+
+
+ Thelia\Controller\Admin\ShippingZoneController::updateAction
+ \d+
+
+
+
+ Thelia\Controller\Admin\ShippingZoneController::addArea
+
+
+
+ Thelia\Controller\Admin\ShippingZoneController::removeArea
+
+
+
+
+
+
+
+ Thelia\Controller\Admin\AreaController::defaultAction
+
+
+
+ Thelia\Controller\Admin\AreaController::updateAction
+ \d+
+
+
+
+ Thelia\Controller\Admin\AreaController::deleteAction
+
+
+
+ Thelia\Controller\Admin\AreaController::createAction
+
+
+
+ Thelia\Controller\Admin\AreaController::updatePostageAction
+ \d+
+
+
+
+ Thelia\Controller\Admin\AreaController::addCountry
+
+
+
+ Thelia\Controller\Admin\AreaController::removeCountry
+
+
+
+
+
+
+
+ Thelia\Controller\Admin\CountryController::defaultAction
+
+
+
+ Thelia\Controller\Admin\CountryController::createAction
+
+
+
+ Thelia\Controller\Admin\CountryController::updateAction
+ \d+
+
+
+
+ Thelia\Controller\Admin\CountryController::processUpdateAction
+ \d+
+
+
+
+ Thelia\Controller\Admin\CountryController::deleteAction
+
+
+
+ Thelia\Controller\Admin\CountryController::toggleDefaultAction
+
+
+
+
+
+
+
+ Thelia\Controller\Admin\ProfileController::defaultAction
+ \d+
+
+
+
+ Thelia\Controller\Admin\ProfileController::updateAction
+ \d+
+
+
+
+ Thelia\Controller\Admin\ProfileController::createAction
+
+
+
+ Thelia\Controller\Admin\ProfileController::processUpdateAction
+
+
+
+ Thelia\Controller\Admin\ProfileController::processUpdateResourceAccess
+
+
+
+ Thelia\Controller\Admin\ProfileController::processUpdateModuleAccess
+
+
+
+ Thelia\Controller\Admin\ProfileController::deleteAction
+
+
+
+
+
+
+
+ Thelia\Controller\Admin\AdministratorController::defaultAction
+
+
+
+ Thelia\Controller\Admin\AdministratorController::createAction
+
+
+
+ Thelia\Controller\Admin\AdministratorController::processUpdateAction
+
+
+
+ Thelia\Controller\Admin\AdministratorController::deleteAction
+
+
+
+
+
+
+
+ Thelia\Controller\Admin\MailingSystemController::defaultAction
+
+
+
+ Thelia\Controller\Admin\MailingSystemController::updateAction
+
+
+
+
+
+
+
+ Thelia\Controller\Admin\AdminLogsController::defaultAction
+
+
+
+ Thelia\Controller\Admin\AdminLogsController::loadLoggerAjaxAction
+
+
+
+
+
+
+
+ Thelia\Controller\Admin\FeatureController::defaultAction
+
+
+
+ Thelia\Controller\Admin\FeatureController::createAction
+
+
+
+ Thelia\Controller\Admin\FeatureController::updateAction
+
+
+
+ Thelia\Controller\Admin\FeatureController::processUpdateAction
+
+
+
+ Thelia\Controller\Admin\FeatureController::deleteAction
+
+
+
+ Thelia\Controller\Admin\FeatureController::updatePositionAction
+
+
+
+ Thelia\Controller\Admin\FeatureController::removeFromAllTemplates
+
+
+
+ Thelia\Controller\Admin\FeatureController::addToAllTemplates
+
+
+
+
+ Thelia\Controller\Admin\FeatureAvController::createAction
+
+
+
+ Thelia\Controller\Admin\FeatureAvController::updateAction
+
+
+
+ Thelia\Controller\Admin\FeatureAvController::processUpdateAction
+
+
+
+ Thelia\Controller\Admin\FeatureAvController::deleteAction
+
+
+
+ Thelia\Controller\Admin\FeatureAvController::updatePositionAction
+
+
+
+
+
+
+ Thelia\Controller\Admin\CacheController::defaultAction
+
+
+
+ Thelia\Controller\Admin\CacheController::flushAction
+
+
+
+
+
+
+
+ Thelia\Controller\Admin\ModuleController::indexAction
+
+
+
+ Thelia\Controller\Admin\ModuleController::updateAction
+ \d+
+
+
+
+ Thelia\Controller\Admin\ModuleController::processUpdateAction
+
+
+
+ Thelia\Controller\Admin\ModuleController::toggleActivationAction
+ \d+
+
+
+
+ Thelia\Controller\Admin\ModuleController::deleteAction
+
+
+
+ Thelia\Controller\Admin\ModuleController::updatePositionAction
+
+
+
+
+ Thelia\Controller\Admin\ModuleController::configureAction
+
+
+
+
+
+
+
+ Thelia\Controller\Admin\TaxController::updateAction
+ \d+
+
+
+
+ Thelia\Controller\Admin\TaxController::createAction
+
+
+
+ Thelia\Controller\Admin\TaxController::processUpdateAction
+
+
+
+ Thelia\Controller\Admin\TaxController::deleteAction
+
+
+
+
+
+
+
+ Thelia\Controller\Admin\TaxRuleController::defaultAction
+
+
+
+ Thelia\Controller\Admin\TaxRuleController::updateAction
+ \d+
+
+
+
+ Thelia\Controller\Admin\TaxRuleController::createAction
+
+
+
+ Thelia\Controller\Admin\TaxRuleController::processUpdateAction
+
+
+
+ Thelia\Controller\Admin\TaxRuleController::processUpdateTaxesAction
+
+
+
+ Thelia\Controller\Admin\TaxRuleController::deleteAction
+
+
+
+ Thelia\Controller\Admin\TaxRuleController::setDefaultAction
+ \d+
+
+
+
+
+
+
+
+ Thelia\Controller\Admin\LangController::defaultAction
+
+
+
+ Thelia\Controller\Admin\LangController::updateAction
+ \d+
+
+
+
+ Thelia\Controller\Admin\LangController::processUpdateAction
+ \d+
+
+
+
+ Thelia\Controller\Admin\LangController::toggleDefaultAction
+ \d+
+
+
+
+ Thelia\Controller\Admin\LangController::addAction
+
+
+
+ Thelia\Controller\Admin\LangController::deleteAction
+
+
+
+ Thelia\Controller\Admin\LangController::defaultBehaviorAction
+
+
+
+ Thelia\Controller\Admin\LangController::domainAction
+
+
+
+ Thelia\Controller\Admin\LangController::activateDomainAction
+
+
+
+ Thelia\Controller\Admin\LangController::deactivateDomainAction
+
+
+
+
+
+ Thelia\Controller\Admin\TranslationsController::defaultAction
+
+
+
+ Thelia\Controller\Admin\TranslationsController::updateAction
+
+
+
+
+
+ Thelia\Controller\Admin\AdminController::processTemplateAction
+ .*
+
+
+
diff --git a/core/lib/Thelia/Controller/Admin/TranslationsController.php b/core/lib/Thelia/Controller/Admin/TranslationsController.php
index e7953c74b..880e0a1b2 100644
--- a/core/lib/Thelia/Controller/Admin/TranslationsController.php
+++ b/core/lib/Thelia/Controller/Admin/TranslationsController.php
@@ -27,11 +27,12 @@ use Thelia\Tools\URL;
class TranslationsController extends BaseAdminController
{
/**
- * @param string $item_name the modume code
- * @return Module the module object
+ * @param string $item_name the modume code
+ * @return Module the module object
* @throws \InvalidArgumentException if module was not found
*/
- protected function getModule($item_name) {
+ protected function getModule($item_name)
+ {
if (null !== $module = ModuleQuery::create()->findPk($item_name))
return $module;
@@ -40,8 +41,8 @@ class TranslationsController extends BaseAdminController
);
}
-
- protected function getModuleTemplateNames(Module $module, $template_type) {
+ protected function getModuleTemplateNames(Module $module, $template_type)
+ {
$templates =
TemplateHelper::getInstance()->getList(
$template_type,
@@ -96,14 +97,12 @@ class TranslationsController extends BaseAdminController
$domain = $module->getTranslationDomain();
$i18n_directory = $module->getAbsoluteI18nPath();
$walkMode = TemplateHelper::WALK_MODE_PHP;
- }
- else if ($module_part == 'admin-includes') {
+ } elseif ($module_part == 'admin-includes') {
$directory = $module->getAbsoluteAdminIncludesPath();
$domain = $module->getAdminIncludesTranslationDomain();
$i18n_directory = $module->getAbsoluteAdminIncludesI18nPath();
$walkMode = TemplateHelper::WALK_MODE_TEMPLATE;
- }
- else if (! empty($module_part)) {
+ } elseif (! empty($module_part)) {
// Front or back office template, form of $module_part is [bo|fo].subdir-name
list($type, $subdir) = explode('.', $module_part);
@@ -111,13 +110,11 @@ class TranslationsController extends BaseAdminController
$directory = $module->getAbsoluteBackOfficeTemplatePath($subdir);
$domain = $module->getBackOfficeTemplateTranslationDomain($subdir);
$i18n_directory = $module->getAbsoluteBackOfficeI18nTemplatePath($subdir);
- }
- else if ($type == 'fo') {
+ } elseif ($type == 'fo') {
$directory = $module->getAbsoluteFrontOfficeTemplatePath($subdir);
$domain = $module->getFrontOfficeTemplateTranslationDomain($subdir);
$i18n_directory = $module->getAbsoluteFrontOfficeI18nTemplatePath($subdir);
- }
- else {
+ } else {
throw new \InvalidArgumentException("Undefined module template type: '$type'.");
}
@@ -171,7 +168,7 @@ class TranslationsController extends BaseAdminController
if ($template) {
$directory = $template->getAbsolutePath();
-
+
$i18n_directory = $template->getAbsoluteI18nPath();
$domain = $template->getTranslationDomain();
diff --git a/core/lib/Thelia/Core/Template/Element/BaseLoop.php b/core/lib/Thelia/Core/Template/Element/BaseLoop.php
index 5841d8461..2ee3c6ff7 100644
--- a/core/lib/Thelia/Core/Template/Element/BaseLoop.php
+++ b/core/lib/Thelia/Core/Template/Element/BaseLoop.php
@@ -132,10 +132,10 @@ abstract class BaseLoop
/**
* Provides a getter to loop parameter values
*
- * @param string $name the method name (only getArgname is supported)
- * @param mixed $arguments this parameter is ignored
+ * @param string $name the method name (only getArgname is supported)
+ * @param mixed $arguments this parameter is ignored
*
- * @return mixed the argument value
+ * @return mixed the argument value
* @throws \InvalidArgumentException if the parameter is unknown or the method name is not supported.
*/
public function __call($name, $arguments)
@@ -230,7 +230,7 @@ abstract class BaseLoop
*
* @param string $argumentName the argument name
*
- * @return Argument the loop argument.
+ * @return Argument the loop argument.
* @throws \InvalidArgumentException if argument is not found in loop argument list
*/
protected function getArg($argumentName)
@@ -251,7 +251,7 @@ abstract class BaseLoop
* @param string $argumentName the argument name
*
* @throws \InvalidArgumentException if argument is not found in loop argument list
- * @return mixed the loop argument value
+ * @return mixed the loop argument value
*/
protected function getArgValue($argumentName)
{
@@ -263,7 +263,7 @@ abstract class BaseLoop
* @param PropelModelPager $pagination the pagination part
*
* @return array|PropelModelPager|ObjectCollection
- * @throws \InvalidArgumentException if the search mode is undefined.
+ * @throws \InvalidArgumentException if the search mode is undefined.
*/
protected function search(ModelCriteria $search, &$pagination = null)
{
@@ -356,7 +356,7 @@ abstract class BaseLoop
}
/**
- * @param ModelCriteria $search
+ * @param ModelCriteria $search
* @param PropelModelPager $pagination
*
* @return array|PropelModelPager
@@ -536,4 +536,4 @@ abstract class BaseLoop
*/
abstract protected function getArgDefinitions();
-}
\ No newline at end of file
+}
diff --git a/core/lib/Thelia/Core/Template/Loop/Delivery.php b/core/lib/Thelia/Core/Template/Loop/Delivery.php
index ba4a40985..9d4065467 100644
--- a/core/lib/Thelia/Core/Template/Loop/Delivery.php
+++ b/core/lib/Thelia/Core/Template/Loop/Delivery.php
@@ -94,4 +94,4 @@ class Delivery extends BaseSpecificModule
{
return BaseModule::DELIVERY_MODULE_TYPE;
}
-}
\ No newline at end of file
+}
diff --git a/core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php b/core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php
index 3658f652b..dfc31e3fd 100644
--- a/core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php
+++ b/core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php
@@ -59,7 +59,7 @@ class TheliaLoop extends AbstractSmartyPlugin
}
/**
- * @param string $loopName
+ * @param string $loopName
* @return PropelModelPager
* @throws \InvalidArgumentException if no pagination was found for loop
*/
@@ -77,10 +77,10 @@ class TheliaLoop extends AbstractSmartyPlugin
/**
* Process the count function: executes a loop and return the number of items found
*
- * @param array $params parameters array
+ * @param array $params parameters array
* @param \Smarty_Internal_Template $template
*
- * @return int the item count
+ * @return int the item count
* @throws \InvalidArgumentException if a parameter is missing
*
*/
@@ -104,10 +104,10 @@ class TheliaLoop extends AbstractSmartyPlugin
/**
* Process {loop name="loop name" type="loop type" ... } ... {/loop} block
*
- * @param array $params
- * @param string $content
- * @param \Smarty_Internal_Template $template
- * @param boolean $repeat
+ * @param array $params
+ * @param string $content
+ * @param \Smarty_Internal_Template $template
+ * @param boolean $repeat
*
* @throws \InvalidArgumentException
*
@@ -209,11 +209,11 @@ class TheliaLoop extends AbstractSmartyPlugin
/**
* Process {elseloop rel="loopname"} ... {/elseloop} block
*
- * @param array $params loop parameters
- * @param string $content loop text content
+ * @param array $params loop parameters
+ * @param string $content loop text content
* @param \Smarty_Internal_Template $template the Smarty object
- * @param boolean $repeat repeat indicator (see Smarty doc.)
- * @return string the loop output
+ * @param boolean $repeat repeat indicator (see Smarty doc.)
+ * @return string the loop output
*/
public function theliaElseloop($params, $content, /** @noinspection PhpUnusedParameterInspection */ $template, &$repeat)
{
@@ -228,11 +228,11 @@ class TheliaLoop extends AbstractSmartyPlugin
/**
* Process {ifloop rel="loopname"} ... {/ifloop} block
*
- * @param array $params loop parameters
- * @param string $content loop text content
+ * @param array $params loop parameters
+ * @param string $content loop text content
* @param \Smarty_Internal_Template $template the Smarty object
- * @param boolean $repeat repeat indicator (see Smarty doc.)
- * @return string the loop output
+ * @param boolean $repeat repeat indicator (see Smarty doc.)
+ * @return string the loop output
*/
public function theliaIfLoop($params, $content, /** @noinspection PhpUnusedParameterInspection */ $template, &$repeat)
{
@@ -247,11 +247,11 @@ class TheliaLoop extends AbstractSmartyPlugin
/**
* Process {pageloop rel="loopname"} ... {/pageloop} block
*
- * @param array $params loop parameters
- * @param string $content loop text content
+ * @param array $params loop parameters
+ * @param string $content loop text content
* @param \Smarty_Internal_Template $template the Smarty object
- * @param boolean $repeat repeat indicator (see Smarty doc.)
- * @return string the loop output
+ * @param boolean $repeat repeat indicator (see Smarty doc.)
+ * @return string the loop output
* @throws \InvalidArgumentException
*/
public function theliaPageLoop($params, $content, $template, &$repeat)
@@ -337,9 +337,9 @@ class TheliaLoop extends AbstractSmartyPlugin
* Check if a loop has returned results. The loop shoud have been executed before, or an
* InvalidArgumentException is thrown
*
- * @param array $params
+ * @param array $params
*
- * @return boolean true if the loop is empty
+ * @return boolean true if the loop is empty
* @throws \InvalidArgumentException
*/
protected function checkEmptyLoop($params)
diff --git a/core/lib/Thelia/Core/Template/Smarty/Plugins/Translation.php b/core/lib/Thelia/Core/Template/Smarty/Plugins/Translation.php
index 79c859dc1..aa66c114f 100644
--- a/core/lib/Thelia/Core/Template/Smarty/Plugins/Translation.php
+++ b/core/lib/Thelia/Core/Template/Smarty/Plugins/Translation.php
@@ -29,7 +29,7 @@ class Translation extends AbstractSmartyPlugin
/**
* Set the default translation domain
*
- * @param array $params
+ * @param array $params
* @param \Smarty_Internal_Template $smarty
* @return string
*/
@@ -41,7 +41,7 @@ class Translation extends AbstractSmartyPlugin
/**
* Process translate function
*
- * @param array $params
+ * @param array $params
* @param \Smarty_Internal_Template $smarty
* @return string
*/
diff --git a/core/lib/Thelia/Core/Template/Smarty/SmartyParser.php b/core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
index 05c84a3a4..6f31082cc 100644
--- a/core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
+++ b/core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
@@ -242,6 +242,7 @@ class SmartyParser extends Smarty implements ParserInterface
if (false === $this->templateExists($realTemplateName) || false === $this->checkTemplate($realTemplateName)) {
throw new ResourceNotFoundException(Translator::getInstance()->trans("Template file %file cannot be found.", array('%file' => $realTemplateName)));
}
+
return $this->internalRenderer('file', $realTemplateName, $parameters);
}
diff --git a/core/lib/Thelia/Core/Template/TemplateDefinition.php b/core/lib/Thelia/Core/Template/TemplateDefinition.php
index 5d1210134..c4e2149b9 100644
--- a/core/lib/Thelia/Core/Template/TemplateDefinition.php
+++ b/core/lib/Thelia/Core/Template/TemplateDefinition.php
@@ -77,7 +77,8 @@ class TemplateDefinition
}
}
- public function getTranslationDomain() {
+ public function getTranslationDomain()
+ {
return $this->translationDomainPrefix . strtolower($this->getName());
}
diff --git a/core/lib/Thelia/Core/Template/TemplateHelper.php b/core/lib/Thelia/Core/Template/TemplateHelper.php
index 8d53526e4..96ed4e89f 100644
--- a/core/lib/Thelia/Core/Template/TemplateHelper.php
+++ b/core/lib/Thelia/Core/Template/TemplateHelper.php
@@ -96,7 +96,7 @@ class TemplateHelper
/**
* Return a list of existing templates for a given template type
*
- * @param int $templateType the template type
+ * @param int $templateType the template type
* @param string the template base (module or core, default to core).
* @return TemplateDefinition[] of \Thelia\Core\Template\TemplateDefinition
*/
@@ -126,8 +126,7 @@ class TemplateHelper
$list[] = new TemplateDefinition($file->getFilename(), $templateType);
}
- }
- catch (\UnexpectedValueException $ex) {
+ } catch (\UnexpectedValueException $ex) {
// Ignore the exception and continue
}
}
diff --git a/core/lib/Thelia/Core/Thelia.php b/core/lib/Thelia/Core/Thelia.php
index f81616c64..902818250 100644
--- a/core/lib/Thelia/Core/Thelia.php
+++ b/core/lib/Thelia/Core/Thelia.php
@@ -217,7 +217,7 @@ class Thelia extends Kernel
$module->getAbsoluteTemplateBasePath()
);
- foreach($templates as $template) {
+ foreach ($templates as $template) {
$translationDirs[$module->getBackOfficeTemplateTranslationDomain($template->getName())] =
$module->getAbsoluteBackOfficeI18nTemplatePath($template->getName());
}
@@ -229,7 +229,7 @@ class Thelia extends Kernel
$module->getAbsoluteTemplateBasePath()
);
- foreach($templates as $template) {
+ foreach ($templates as $template) {
$translationDirs[$module->getFrontOfficeTemplateTranslationDomain($template->getName())] =
$module->getAbsoluteFrontOfficeI18nTemplatePath($template->getName());
}
@@ -279,8 +279,7 @@ class Thelia extends Kernel
$translator->addMethodCall('addResource', array($format, (string) $file, $locale, $domain));
}
- }
- catch (\InvalidArgumentException $ex) {
+ } catch (\InvalidArgumentException $ex) {
// Ignore missing I18n directories
Tlog::getInstance()->addWarning("loadTranslation: missing $dir directory");
}
diff --git a/core/lib/Thelia/Form/BaseForm.php b/core/lib/Thelia/Form/BaseForm.php
index 0748d8f28..332d8eff6 100644
--- a/core/lib/Thelia/Form/BaseForm.php
+++ b/core/lib/Thelia/Form/BaseForm.php
@@ -13,224 +13,224 @@
namespace Thelia\Form;
use Symfony\Component\Form\Extension\Validator\ValidatorExtension;
-use Symfony\Component\Form\Forms;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\Form\Extension\HttpFoundation\HttpFoundationExtension;
-use Symfony\Component\Form\Extension\Csrf\CsrfExtension;
-use Symfony\Component\Form\Extension\Csrf\CsrfProvider\SessionCsrfProvider;
-use Symfony\Component\Validator\Validation;
-use Thelia\Core\Translation\Translator;
-use Thelia\Model\ConfigQuery;
-use Thelia\Tools\URL;
-
-/**
- * Base form class for creating form objects
- *
- * Class BaseForm
- * @package Thelia\Form
- * @author Manuel Raynaud
- */
-abstract class BaseForm
-{
- /**
- * @var \Symfony\Component\Form\FormFactoryInterface
- */
- protected $formBuilder;
-
- /**
- * @var \Symfony\Component\Form\Form
- */
- protected $form;
-
- protected $request;
-
- private $view = null;
-
- /**
- * true if the form has an error, false otherwise.
- * @var boolean
- */
- private $has_error = false;
-
- /**
- * The form error message.
- * @var string
- */
- private $error_message = '';
-
- public function __construct(Request $request, $type= "form", $data = array(), $options = array())
- {
- $this->request = $request;
-
- $validator = Validation::createValidatorBuilder();
-
- if (!isset($options["attr"]["name"])) {
- $options["attr"]["thelia_name"] = $this->getName();
- }
-
- $builder = Forms::createFormFactoryBuilder()
- ->addExtension(new HttpFoundationExtension());
- if (!isset($options["csrf_protection"]) || $options["csrf_protection"] !== false) {
- $builder->addExtension(
- new CsrfExtension(
- new SessionCsrfProvider(
- $request->getSession(),
- isset($options["secret"]) ? $options["secret"] : ConfigQuery::read("form.secret", md5(__DIR__))
- )
- )
- );
- }
-
- $translator = Translator::getInstance();
-
- $validator
- ->setTranslationDomain('validators')
- ->setTranslator($translator);
- $this->formBuilder = $builder
- ->addExtension(new ValidatorExtension($validator->getValidator()))
- ->getFormFactory()
- ->createNamedBuilder($this->getName(), $type, $data, $this->cleanOptions($options));
- ;
-
- $this->buildForm();
-
- // If not already set, define the success_url field
- if (! $this->formBuilder->has('success_url')) {
- $this->formBuilder->add("success_url", "text");
- }
-
- if (! $this->formBuilder->has('error_message')) {
- $this->formBuilder->add("error_message", "text");
- }
-
- $this->form = $this->formBuilder->getForm();
- }
-
- public function getRequest()
- {
- return $this->request;
- }
-
- protected function cleanOptions($options)
- {
- unset($options["csrf_protection"]);
-
- return $options;
- }
-
- /**
- * Returns the absolute URL to redirect the user to if the form is successfully processed.
- *
- * @param string $default the default URL. If not given, the configured base URL is used.
- *
- * @return string an absolute URL
- */
- public function getSuccessUrl($default = null)
- {
- $successUrl = $this->form->get('success_url')->getData();
-
- if (empty($successUrl)) {
-
- if ($default === null) $default = ConfigQuery::read('base_url', '/');
-
- $successUrl = $default;
- }
-
- return URL::getInstance()->absoluteUrl($successUrl);
- }
-
- public function createView()
- {
- $this->view = $this->form->createView();
-
- return $this;
- }
-
- public function getView()
- {
- if ($this->view === null) throw new \LogicException("View was not created. Please call BaseForm::createView() first.");
- return $this->view;
- }
-
- // -- Error and errro message ----------------------------------------------
-
- /**
- * Set the error status of the form.
- *
- * @param boolean $has_error
- */
- public function setError($has_error = true)
- {
- $this->has_error = $has_error;
-
- return $this;
- }
-
- /**
- * Get the cuirrent error status of the form.
- *
- * @return boolean
- */
- public function hasError()
- {
- return $this->has_error;
- }
-
- /**
- * Set the error message related to global form error
- *
- * @param string $message
- */
- public function setErrorMessage($message)
- {
- $this->setError(true);
- $this->error_message = $message;
-
- return $this;
- }
-
- /**
- * Get the form error message.
- *
- * @return string
- */
- public function getErrorMessage()
- {
- return $this->error_message;
- }
-
- /**
- * @return \Symfony\Component\Form\Form
- */
- public function getForm()
- {
- return $this->form;
- }
-
- /**
- *
- * in this function you add all the fields you need for your Form.
- * Form this you have to call add method on $this->formBuilder attribute :
- *
- * $this->formBuilder->add("name", "text")
- * ->add("email", "email", array(
- * "attr" => array(
- * "class" => "field"
- * ),
- * "label" => "email",
- * "constraints" => array(
- * new \Symfony\Component\Validator\Constraints\NotBlank()
- * )
- * )
- * )
- * ->add('age', 'integer');
- *
- * @return null
- */
- abstract protected function buildForm();
-
- /**
- * @return string the name of you form. This name must be unique
- */
- abstract public function getName();
-}
+use Symfony\Component\Form\Forms;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Form\Extension\HttpFoundation\HttpFoundationExtension;
+use Symfony\Component\Form\Extension\Csrf\CsrfExtension;
+use Symfony\Component\Form\Extension\Csrf\CsrfProvider\SessionCsrfProvider;
+use Symfony\Component\Validator\Validation;
+use Thelia\Core\Translation\Translator;
+use Thelia\Model\ConfigQuery;
+use Thelia\Tools\URL;
+
+/**
+ * Base form class for creating form objects
+ *
+ * Class BaseForm
+ * @package Thelia\Form
+ * @author Manuel Raynaud
+ */
+abstract class BaseForm
+{
+ /**
+ * @var \Symfony\Component\Form\FormFactoryInterface
+ */
+ protected $formBuilder;
+
+ /**
+ * @var \Symfony\Component\Form\Form
+ */
+ protected $form;
+
+ protected $request;
+
+ private $view = null;
+
+ /**
+ * true if the form has an error, false otherwise.
+ * @var boolean
+ */
+ private $has_error = false;
+
+ /**
+ * The form error message.
+ * @var string
+ */
+ private $error_message = '';
+
+ public function __construct(Request $request, $type= "form", $data = array(), $options = array())
+ {
+ $this->request = $request;
+
+ $validator = Validation::createValidatorBuilder();
+
+ if (!isset($options["attr"]["name"])) {
+ $options["attr"]["thelia_name"] = $this->getName();
+ }
+
+ $builder = Forms::createFormFactoryBuilder()
+ ->addExtension(new HttpFoundationExtension());
+ if (!isset($options["csrf_protection"]) || $options["csrf_protection"] !== false) {
+ $builder->addExtension(
+ new CsrfExtension(
+ new SessionCsrfProvider(
+ $request->getSession(),
+ isset($options["secret"]) ? $options["secret"] : ConfigQuery::read("form.secret", md5(__DIR__))
+ )
+ )
+ );
+ }
+
+ $translator = Translator::getInstance();
+
+ $validator
+ ->setTranslationDomain('validators')
+ ->setTranslator($translator);
+ $this->formBuilder = $builder
+ ->addExtension(new ValidatorExtension($validator->getValidator()))
+ ->getFormFactory()
+ ->createNamedBuilder($this->getName(), $type, $data, $this->cleanOptions($options));
+ ;
+
+ $this->buildForm();
+
+ // If not already set, define the success_url field
+ if (! $this->formBuilder->has('success_url')) {
+ $this->formBuilder->add("success_url", "text");
+ }
+
+ if (! $this->formBuilder->has('error_message')) {
+ $this->formBuilder->add("error_message", "text");
+ }
+
+ $this->form = $this->formBuilder->getForm();
+ }
+
+ public function getRequest()
+ {
+ return $this->request;
+ }
+
+ protected function cleanOptions($options)
+ {
+ unset($options["csrf_protection"]);
+
+ return $options;
+ }
+
+ /**
+ * Returns the absolute URL to redirect the user to if the form is successfully processed.
+ *
+ * @param string $default the default URL. If not given, the configured base URL is used.
+ *
+ * @return string an absolute URL
+ */
+ public function getSuccessUrl($default = null)
+ {
+ $successUrl = $this->form->get('success_url')->getData();
+
+ if (empty($successUrl)) {
+
+ if ($default === null) $default = ConfigQuery::read('base_url', '/');
+
+ $successUrl = $default;
+ }
+
+ return URL::getInstance()->absoluteUrl($successUrl);
+ }
+
+ public function createView()
+ {
+ $this->view = $this->form->createView();
+
+ return $this;
+ }
+
+ public function getView()
+ {
+ if ($this->view === null) throw new \LogicException("View was not created. Please call BaseForm::createView() first.");
+ return $this->view;
+ }
+
+ // -- Error and errro message ----------------------------------------------
+
+ /**
+ * Set the error status of the form.
+ *
+ * @param boolean $has_error
+ */
+ public function setError($has_error = true)
+ {
+ $this->has_error = $has_error;
+
+ return $this;
+ }
+
+ /**
+ * Get the cuirrent error status of the form.
+ *
+ * @return boolean
+ */
+ public function hasError()
+ {
+ return $this->has_error;
+ }
+
+ /**
+ * Set the error message related to global form error
+ *
+ * @param string $message
+ */
+ public function setErrorMessage($message)
+ {
+ $this->setError(true);
+ $this->error_message = $message;
+
+ return $this;
+ }
+
+ /**
+ * Get the form error message.
+ *
+ * @return string
+ */
+ public function getErrorMessage()
+ {
+ return $this->error_message;
+ }
+
+ /**
+ * @return \Symfony\Component\Form\Form
+ */
+ public function getForm()
+ {
+ return $this->form;
+ }
+
+ /**
+ *
+ * in this function you add all the fields you need for your Form.
+ * Form this you have to call add method on $this->formBuilder attribute :
+ *
+ * $this->formBuilder->add("name", "text")
+ * ->add("email", "email", array(
+ * "attr" => array(
+ * "class" => "field"
+ * ),
+ * "label" => "email",
+ * "constraints" => array(
+ * new \Symfony\Component\Validator\Constraints\NotBlank()
+ * )
+ * )
+ * )
+ * ->add('age', 'integer');
+ *
+ * @return null
+ */
+ abstract protected function buildForm();
+
+ /**
+ * @return string the name of you form. This name must be unique
+ */
+ abstract public function getName();
+}
diff --git a/core/lib/Thelia/Model/Module.php b/core/lib/Thelia/Model/Module.php
index 72149665e..eba9b7fbb 100644
--- a/core/lib/Thelia/Model/Module.php
+++ b/core/lib/Thelia/Model/Module.php
@@ -1,179 +1,182 @@
-getCode());
- }
-
- public function getAdminIncludesTranslationDomain() {
- return $this->getTranslationDomain().'.ai';
- }
-
- public function getAbsoluteBackOfficeTemplatePath($subdir)
- {
- return sprintf("%s".DS."%s".DS."%s",
- $this->getAbsoluteTemplateBasePath(),
- TemplateDefinition::BACK_OFFICE_SUBDIR,
- $subdir
- );
- }
-
- public function getAbsoluteBackOfficeI18nTemplatePath($subdir)
- {
- return sprintf("%s".DS."%s".DS."%s",
- $this->getAbsoluteI18nPath(),
- TemplateDefinition::BACK_OFFICE_SUBDIR,
- $subdir
- );
- }
-
- public function getBackOfficeTemplateTranslationDomain($templateName) {
- return $this->getTranslationDomain(). '.bo.' . $templateName;
- }
-
- public function getAbsoluteFrontOfficeTemplatePath($subdir)
- {
- return sprintf("%s".DS."%s".DS."%s",
- $this->getAbsoluteTemplateBasePath(),
- TemplateDefinition::FRONT_OFFICE_SUBDIR,
- $subdir
- );
- }
-
- public function getAbsoluteFrontOfficeI18nTemplatePath($subdir)
- {
- return sprintf("%s".DS."%s".DS."%s",
- $this->getAbsoluteI18nPath(),
- TemplateDefinition::FRONT_OFFICE_SUBDIR,
- $subdir
- );
- }
-
- public function getFrontOfficeTemplateTranslationDomain($templateName) {
- return $this->getTranslationDomain(). '.fo.' . $templateName;
- }
-
- /**
- * @return the module's base directory path, relative to THELIA_MODULE_DIR
- */
- public function getBaseDir()
- {
- return ucfirst($this->getCode());
- }
-
- /**
- * @return the module's base directory path, relative to THELIA_MODULE_DIR
- */
- public function getAbsoluteBaseDir()
- {
- return THELIA_MODULE_DIR . $this->getBaseDir();
- }
-
- /**
- * @return the module's config directory path, relative to THELIA_MODULE_DIR
- */
- public function getConfigPath()
- {
- return $this->getBaseDir() . DS . "Config";
- }
-
- /**
- * @return the module's config absolute directory path
- */
- public function getAbsoluteConfigPath()
- {
- return THELIA_MODULE_DIR . $this->getConfigPath();
- }
-
- /**
- * @return the module's i18N directory path, relative to THELIA_MODULE_DIR
- */
- public function getI18nPath()
- {
- return $this->getBaseDir() . DS . "I18n";
- }
-
- /**
- * @return the module's i18N absolute directory path
- */
- public function getAbsoluteI18nPath()
- {
- return THELIA_MODULE_DIR . $this->getI18nPath();
- }
-
- /**
- * @return the module's AdminIncludes absolute directory path
- */
- public function getAbsoluteAdminIncludesPath()
- {
- return $this->getAbsoluteBaseDir() . DS . self::ADMIN_INCLUDES_DIRECTORY_NAME;
- }
-
- /**
- * @return the module's AdminIncludes i18N absolute directory path
- */
- public function getAbsoluteAdminIncludesI18nPath()
- {
- return THELIA_MODULE_DIR . $this->getI18nPath() . DS . self::ADMIN_INCLUDES_DIRECTORY_NAME;
- }
-
- /**
- * Return the absolute path to the module's template directory
- *
- * @return string a path
- */
- public function getAbsoluteTemplateBasePath()
- {
- return $this->getAbsoluteBaseDir() . DS . 'templates';
- }
-
- /**
- * Return the absolute path to one of the module's template directories
- *
- * @param int $templateSubdirName the name of the, probably one of TemplateDefinition::xxx_SUBDIR constants
- * @return string a path
- */
- public function getAbsoluteTemplateDirectoryPath($templateSubdirName)
- {
- return $this->getAbsoluteTemplateBasePath() .DS. $templateSubdirName;
- }
-
- /**
- * Calculate next position relative to module type
- */
- protected function addCriteriaToPositionQuery($query)
- {
- $query->filterByType($this->getType());
- }
-
- /**
- * {@inheritDoc}
- */
- public function preInsert(ConnectionInterface $con = null)
- {
- $this->setPosition($this->getNextPosition());
-
- return true;
- }
-}
+getCode());
+ }
+
+ public function getAdminIncludesTranslationDomain()
+ {
+ return $this->getTranslationDomain().'.ai';
+ }
+
+ public function getAbsoluteBackOfficeTemplatePath($subdir)
+ {
+ return sprintf("%s".DS."%s".DS."%s",
+ $this->getAbsoluteTemplateBasePath(),
+ TemplateDefinition::BACK_OFFICE_SUBDIR,
+ $subdir
+ );
+ }
+
+ public function getAbsoluteBackOfficeI18nTemplatePath($subdir)
+ {
+ return sprintf("%s".DS."%s".DS."%s",
+ $this->getAbsoluteI18nPath(),
+ TemplateDefinition::BACK_OFFICE_SUBDIR,
+ $subdir
+ );
+ }
+
+ public function getBackOfficeTemplateTranslationDomain($templateName)
+ {
+ return $this->getTranslationDomain(). '.bo.' . $templateName;
+ }
+
+ public function getAbsoluteFrontOfficeTemplatePath($subdir)
+ {
+ return sprintf("%s".DS."%s".DS."%s",
+ $this->getAbsoluteTemplateBasePath(),
+ TemplateDefinition::FRONT_OFFICE_SUBDIR,
+ $subdir
+ );
+ }
+
+ public function getAbsoluteFrontOfficeI18nTemplatePath($subdir)
+ {
+ return sprintf("%s".DS."%s".DS."%s",
+ $this->getAbsoluteI18nPath(),
+ TemplateDefinition::FRONT_OFFICE_SUBDIR,
+ $subdir
+ );
+ }
+
+ public function getFrontOfficeTemplateTranslationDomain($templateName)
+ {
+ return $this->getTranslationDomain(). '.fo.' . $templateName;
+ }
+
+ /**
+ * @return the module's base directory path, relative to THELIA_MODULE_DIR
+ */
+ public function getBaseDir()
+ {
+ return ucfirst($this->getCode());
+ }
+
+ /**
+ * @return the module's base directory path, relative to THELIA_MODULE_DIR
+ */
+ public function getAbsoluteBaseDir()
+ {
+ return THELIA_MODULE_DIR . $this->getBaseDir();
+ }
+
+ /**
+ * @return the module's config directory path, relative to THELIA_MODULE_DIR
+ */
+ public function getConfigPath()
+ {
+ return $this->getBaseDir() . DS . "Config";
+ }
+
+ /**
+ * @return the module's config absolute directory path
+ */
+ public function getAbsoluteConfigPath()
+ {
+ return THELIA_MODULE_DIR . $this->getConfigPath();
+ }
+
+ /**
+ * @return the module's i18N directory path, relative to THELIA_MODULE_DIR
+ */
+ public function getI18nPath()
+ {
+ return $this->getBaseDir() . DS . "I18n";
+ }
+
+ /**
+ * @return the module's i18N absolute directory path
+ */
+ public function getAbsoluteI18nPath()
+ {
+ return THELIA_MODULE_DIR . $this->getI18nPath();
+ }
+
+ /**
+ * @return the module's AdminIncludes absolute directory path
+ */
+ public function getAbsoluteAdminIncludesPath()
+ {
+ return $this->getAbsoluteBaseDir() . DS . self::ADMIN_INCLUDES_DIRECTORY_NAME;
+ }
+
+ /**
+ * @return the module's AdminIncludes i18N absolute directory path
+ */
+ public function getAbsoluteAdminIncludesI18nPath()
+ {
+ return THELIA_MODULE_DIR . $this->getI18nPath() . DS . self::ADMIN_INCLUDES_DIRECTORY_NAME;
+ }
+
+ /**
+ * Return the absolute path to the module's template directory
+ *
+ * @return string a path
+ */
+ public function getAbsoluteTemplateBasePath()
+ {
+ return $this->getAbsoluteBaseDir() . DS . 'templates';
+ }
+
+ /**
+ * Return the absolute path to one of the module's template directories
+ *
+ * @param int $templateSubdirName the name of the, probably one of TemplateDefinition::xxx_SUBDIR constants
+ * @return string a path
+ */
+ public function getAbsoluteTemplateDirectoryPath($templateSubdirName)
+ {
+ return $this->getAbsoluteTemplateBasePath() .DS. $templateSubdirName;
+ }
+
+ /**
+ * Calculate next position relative to module type
+ */
+ protected function addCriteriaToPositionQuery($query)
+ {
+ $query->filterByType($this->getType());
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public function preInsert(ConnectionInterface $con = null)
+ {
+ $this->setPosition($this->getNextPosition());
+
+ return true;
+ }
+}
diff --git a/core/lib/Thelia/Module/AbstractDeliveryModule.php b/core/lib/Thelia/Module/AbstractDeliveryModule.php
index e59ed5a39..070b19cc1 100644
--- a/core/lib/Thelia/Module/AbstractDeliveryModule.php
+++ b/core/lib/Thelia/Module/AbstractDeliveryModule.php
@@ -1,19 +1,19 @@
- title_string
+ * @param array $titles an associative array of locale => title_string
*/
public function setTitle(Module $module, $titles)
{
@@ -451,4 +451,4 @@ class BaseModule extends ContainerAware implements BaseModuleInterface
{
// Override this method to do something useful.
}
-}
\ No newline at end of file
+}
diff --git a/core/lib/Thelia/Module/DeliveryModuleInterface.php b/core/lib/Thelia/Module/DeliveryModuleInterface.php
index a0505dd1c..9fd15ddd1 100644
--- a/core/lib/Thelia/Module/DeliveryModuleInterface.php
+++ b/core/lib/Thelia/Module/DeliveryModuleInterface.php
@@ -35,7 +35,7 @@ interface DeliveryModuleInterface extends BaseModuleInterface
*
* @param Country $country the country to deliver to.
*
- * @return float the delivery price
+ * @return float the delivery price
* @throws DeliveryException if the postage price cannot be calculated.
*/
public function getPostage(Country $country);
diff --git a/core/lib/Thelia/Module/Exception/DeliveryException.php b/core/lib/Thelia/Module/Exception/DeliveryException.php
index f68f99c7b..f5668a082 100644
--- a/core/lib/Thelia/Module/Exception/DeliveryException.php
+++ b/core/lib/Thelia/Module/Exception/DeliveryException.php
@@ -1,17 +1,17 @@
-