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

Merge pull request #446 from lunika/issues

Browse Source 
Issues
This commit is contained in:
Manuel Raynaud
2014-05-30 17:33:07 +02:00
parent c738361221 d439197133
commit 6137fb8893
59 changed files with 243 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/lib/Thelia/Controller/Admin/FileController.php
View File

@@ -31,10 +31,12 @@ use Thelia\Model\ContentDocument;
use Thelia\Model\ContentImage;
use Thelia\Model\FolderDocument;
use Thelia\Model\FolderImage;
use Thelia\Model\Lang;
use Thelia\Model\ProductDocument;
use Thelia\Model\ProductImage;
use Thelia\Tools\FileManager;
use Thelia\Tools\Rest\ResponseRest;
use Thelia\Tools\URL;
/**
* Created by JetBrains PhpStorm.
@@ -182,6 +184,7 @@ class FileController extends BaseAdminController
}
$documentModel->setParentId($parentId);
$documentModel->setLocale(Lang::getDefaultLanguage()->getLocale());
$documentModel->setTitle($fileBeingUploaded->getClientOriginalName());
$documentCreateOrUpdateEvent = new DocumentCreateOrUpdateEvent(
@@ -389,7 +392,7 @@ class FileController extends BaseAdminController
$this->adminLogAppend(AdminResources::retrieve($parentType), AccessManager::UPDATE, sprintf('Image with Ref %s (ID %d) modified', $imageUpdated->getTitle(), $imageUpdated->getId()));
if ($this->getRequest()->get('save_mode') == 'close') {
$this->redirectToRoute('admin.images');
$this->redirect(URL::getInstance()->absoluteUrl($fileManager->getRedirectionUrl($parentType, $image->getParentId(), FileManager::FILE_TYPE_IMAGES)));
} else {
$this->redirectSuccess($imageModification);
}
@@ -466,7 +469,7 @@ class FileController extends BaseAdminController
$this->adminLogAppend(AdminResources::retrieve($parentType), AccessManager::UPDATE, sprintf('Document with Ref %s (ID %d) modified', $documentUpdated->getTitle(), $documentUpdated->getId()));
if ($this->getRequest()->get('save_mode') == 'close') {
$this->redirectToRoute('admin.documents');
$this->redirect(URL::getInstance()->absoluteUrl($fileManager->getRedirectionUrl($parentType, $document->getParentId(), FileManager::FILE_TYPE_DOCUMENTS)));
} else {
$this->redirectSuccess($documentModification);
}

4
core/lib/Thelia/Core/Template/Loop/Cart.php
View File

@@ -82,9 +82,9 @@ class Cart extends BaseLoop implements ArraySearchLoopInterface
public function parseResults(LoopResult $loopResult)
{
$taxCountry = $this->container->get('thelia.taxEngine')->getDeliveryCountry();
$locale = $this->request->getSession()->getLang()->getLocale();
foreach ($loopResult->getResultDataCollection() as $cartItem) {
$product = $cartItem->getProduct();
$product = $cartItem->getProduct(null, $locale);
$productSaleElement = $cartItem->getProductSaleElements();
$loopResultRow = new LoopResultRow();

2
core/lib/Thelia/Core/Template/Loop/Document.php
View File

@@ -237,7 +237,7 @@ class Document extends BaseI18nLoop implements PropelSearchLoopInterface
$loopResultRow
->set("ID" , $result->getId())
->set("LOCALE" , $this->locale)
->set("DOCUMENT_URL" , $event->getFileUrl())
->set("DOCUMENT_URL" , $event->getDocumentUrl())
->set("DOCUMENT_PATH" , $event->getDocumentPath())
->set("ORIGINAL_DOCUMENT_PATH", $source_filepath)
->set("TITLE" , $result->getVirtualColumn('i18n_TITLE'))

18
core/lib/Thelia/Model/CartItem.php
View File

@@ -8,6 +8,7 @@ use Thelia\Core\Event\TheliaEvents;
use Thelia\Model\Base\CartItem as BaseCartItem;
use Thelia\Core\Event\Cart\CartEvent;
use Thelia\Model\ConfigQuery;
use Thelia\TaxEngine\Calculator;
class CartItem extends BaseCartItem
@@ -89,6 +90,23 @@ class CartItem extends BaseCartItem
return $this->getPromo() == 1 ? $this->getPromoPrice() : $this->getPrice();
}
public function getProduct(ConnectionInterface $con = null, $locale = null)
{
$product = parent::getProduct($con);
$translation = $product->getTranslation($locale);
if ($translation->isNew()) {
if (ConfigQuery::getDefaultLangWhenNoTranslationAvailable()) {
$locale = Lang::getDefaultLanguage()->getLocale();
}
}
$product->setLocale($locale);
return $product;
}
public function getRealTaxedPrice(Country $country)
{
return $this->getPromo() == 1 ? $this->getTaxedPromoPrice($country) : $this->getTaxedPrice($country);

12
core/lib/Thelia/Model/Lang.php
View File

@@ -17,6 +17,9 @@ use Thelia\Model\Map\LangTableMap;
class Lang extends BaseLang
{
use \Thelia\Model\Tools\ModelEventDispatcherTrait;
protected static $defaultLanguage;
/**
* Return the default language object, using a local variable to cache it.
*
@@ -24,10 +27,13 @@ class Lang extends BaseLang
*/
public static function getDefaultLanguage()
{
$default_lang = LangQuery::create()->findOneByByDefault(1);
if (null === self::$defaultLanguage) {
self::$defaultLanguage = LangQuery::create()->findOneByByDefault(1);
if ($default_lang == null) throw new \RuntimeException("No default language is defined. Please define one.");
return $default_lang;
if (self::$defaultLanguage == null) throw new \RuntimeException("No default language is defined. Please define one.");
}
return self::$defaultLanguage;
}
public function toggleDefault()

2
templates/backOffice/default/admin-layout.tpl
View File

@@ -4,6 +4,8 @@
{check_auth role="ADMIN" resource="{block name="check-resource"}{/block}" access="{block name="check-access"}{/block}" login_tpl="/admin/login"}
{/block}
{block name="no-return-functions"}{/block}
{* -- Define some stuff for Smarty ------------------------------------------ *}
{config_load file='variables.conf'}

4
templates/backOffice/default/admin-logs.html
View File

@@ -1,5 +1,9 @@
{extends file="admin-layout.tpl"}
{block name="no-return-functions"}
{$admin_current_location = 'configuration'}
{/block}
{block name="page-title"}{intl l='Thelia Mailing System'}{/block}
{block name="check-resource"}admin.configuration.admin-logs{/block}

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

@@ -1,5 +1,9 @@
{extends file="admin-layout.tpl"}
{block name="no-return-functions"}
{$admin_current_location = 'configuration'}
{/block}
{block name="page-title"}{intl l='Back-office users'}{/block}
{block name="check-resource"}admin.configuration.administrator{/block}

4
templates/backOffice/default/advanced-configuration.html
View File

@@ -1,5 +1,9 @@
{extends file="admin-layout.tpl"}
{block name="no-return-functions"}
{$admin_current_location = 'configuration'}
{/block}
{block name="page-title"}{intl l='Advanced configuration'}{/block}
{block name="check-resource"}admin.cache{/block}

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

@@ -1,5 +1,9 @@
{extends file="admin-layout.tpl"}
{block name="no-return-functions"}
{$admin_current_location = 'configuration'}
{/block}
{block name="page-title"}{intl l='Edit an attribute'}{/block}
{block name="check-resource"}admin.configuration.attribute{/block}

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

@@ -1,5 +1,9 @@
{extends file="admin-layout.tpl"}
{block name="no-return-functions"}
{$admin_current_location = 'configuration'}
{/block}
{block name="page-title"}{intl l='Thelia Product Attributes'}{/block}
{block name="check-resource"}admin.configuration.attribute{/block}

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

@@ -1,5 +1,9 @@
{extends file="admin-layout.tpl"}
{block name="no-return-functions"}
{$admin_current_location = 'catalog'}
{/block}
{block name="page-title"}{intl l='Categories'}{/block}
{block name="check-resource"}admin.category{/block}

4
templates/backOffice/default/category-edit.html
View File

@@ -1,5 +1,9 @@
{extends file="admin-layout.tpl"}
{block name="no-return-functions"}
{$admin_current_location = 'catalog'}
{/block}
{block name="check-resource"}admin.category{/block}
{block name="check-access"}update{/block}

4
templates/backOffice/default/config-store.html
View File

@@ -1,5 +1,9 @@
{extends file="admin-layout.tpl"}
{block name="no-return-functions"}
{$admin_current_location = 'configuration'}
{/block}
{block name="page-title"}{intl l='Store'}{/block}
{block name="check-resource"}admin.configuration.store{/block}

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

@@ -1,5 +1,9 @@
{extends file="admin-layout.tpl"}
{block name="no-return-functions"}
{$admin_current_location = 'configuration'}
{/block}
{block name="page-title"}{intl l='Configuration'}{/block}
{block name="check-resource"}admin.configuration{/block}

4
templates/backOffice/default/content-edit.html
View File

@@ -1,5 +1,9 @@
{extends file="admin-layout.tpl"}
{block name="no-return-functions"}
{$admin_current_location = 'folder'}
{/block}
{block name="check-resource"}admin.content{/block}
{block name="check-access"}view{/block}

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

@@ -1,5 +1,9 @@
{extends file="admin-layout.tpl"}
{block name="no-return-functions"}
{$admin_current_location = 'configuration'}
{/block}
{block name="page-title"}{intl l='Countries'}{/block}
{block name="check-resource"}admin.configuration.country{/block}

4
templates/backOffice/default/country-edit.html
View File

@@ -1,5 +1,9 @@
{extends file="admin-layout.tpl"}
{block name="no-return-functions"}
{$admin_current_location = 'configuration'}
{/block}
{block name="page-title"}{intl l='Edit a country'}{/block}
{block name="check-resource"}admin.configuration.country{/block}

4
templates/backOffice/default/coupon-create.html
View File

@@ -1,5 +1,9 @@
{extends file="admin-layout.tpl"}
{block name="no-return-functions"}
{$admin_current_location = 'tools'}
{/block}
{block name="check-resource"}admin.coupon{/block}
{block name="check-access"}create{/block}

4
templates/backOffice/default/coupon-list.html
View File

@@ -1,5 +1,9 @@
{extends file="admin-layout.tpl"}
{block name="no-return-functions"}
{$admin_current_location = 'tools'}
{/block}
{block name="check-resource"}admin.coupon{/block}
{block name="check-access"}view{/block}

4
templates/backOffice/default/coupon-update.html
View File

@@ -1,5 +1,9 @@
{extends file="admin-layout.tpl"}
{block name="no-return-functions"}
{$admin_current_location = 'tools'}
{/block}
{block name="check-resource"}admin.coupon{/block}
{block name="check-access"}update{/block}

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

@@ -1,5 +1,9 @@
{extends file="admin-layout.tpl"}
{block name="no-return-functions"}
{$admin_current_location = 'configuration'}
{/block}
{block name="page-title"}{intl l='Currencies'}{/block}
{block name="check-resource"}admin.configuration.currency{/block}

4
templates/backOffice/default/currency-edit.html
View File

@@ -1,5 +1,9 @@
{extends file="admin-layout.tpl"}
{block name="no-return-functions"}
{$admin_current_location = 'configuration'}
{/block}
{block name="page-title"}{intl l='Edit a currency'}{/block}
{block name="check-resource"}admin.configuration.currency{/block}

4
templates/backOffice/default/customer-edit.html
View File

@@ -1,5 +1,9 @@
{extends file="admin-layout.tpl"}
{block name="no-return-functions"}
{$admin_current_location = 'customer'}
{/block}
{block name="page-title"}{intl l='Edit a customer'}{/block}
{block name="check-resource"}admin.customer{/block}

5
templates/backOffice/default/customers.html
View File

@@ -1,6 +1,9 @@
{extends file="admin-layout.tpl"}
{block name="no-return-functions"}
{$admin_current_location = 'customer'}
{/block}
{block name="page-title"}{intl l='Customer'}{/block}
{block name="check-resource"}admin.customer{/block}

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

@@ -34,7 +34,7 @@
hide_submit_buttons = false
page_url = "{url path="/admin/document/type/{$documentType}/{$ID}/update"}"
close_url = "{url path="{$redirectUrl}"}"
close_url = "{url path="{$redirectUrl}" noamp=1}"
}
{form_hidden_fields form=$form}

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

@@ -1,5 +1,9 @@
{extends file="admin-layout.tpl"}
{block name="no-return-functions"}
{$admin_current_location = 'tools'}
{/block}
{block name="page-title"}{intl l='Exports'}{/block}
{block name="check-resource"}admin.export{/block}

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

@@ -1,5 +1,9 @@
{extends file="admin-layout.tpl"}
{block name="no-return-functions"}
{$admin_current_location = 'configuration'}
{/block}
{block name="page-title"}{intl l='Edit a feature'}{/block}
{block name="check-resource"}admin.configuration.feature{/block}

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

@@ -1,5 +1,9 @@
{extends file="admin-layout.tpl"}
{block name="no-return-functions"}
{$admin_current_location = 'configuration'}
{/block}
{block name="page-title"}{intl l='Thelia Product Features'}{/block}
{block name="check-resource"}admin.configuration.feature{/block}

4
templates/backOffice/default/folder-edit.html
View File

@@ -1,5 +1,9 @@
{extends file="admin-layout.tpl"}
{block name="no-return-functions"}
{$admin_current_location = 'folder'}
{/block}
{block name="check-resource"}admin.folder{/block}
{block name="check-access"}update{/block}

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

@@ -1,5 +1,9 @@
{extends file="admin-layout.tpl"}
{block name="no-return-functions"}
{$admin_current_location = 'folder'}
{/block}
{block name="page-title"}{intl l='Folders'}{/block}
{block name="check-resource"}admin.folder{/block}

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

@@ -1,5 +1,9 @@
{extends file="admin-layout.tpl"}
{block name="no-return-functions"}
{$admin_current_location = 'home'}
{/block}
{block name="page-title"}{intl l='Back-office home'}{/block}
{block name="main-content"}

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

@@ -34,7 +34,7 @@
hide_submit_buttons = false
page_url = "{url path="/admin/image/type/{$imageType}/{$ID}/update"}"
close_url = "{url path="{$redirectUrl}"}"
close_url = "{url path="{$redirectUrl}" noamp=1}"
}
{form_hidden_fields form=$form}

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

@@ -1,5 +1,9 @@
{extends file="admin-layout.tpl"}
{block name="no-return-functions"}
{$admin_current_location = 'configuration'}
{/block}
{block name="page-title"}{intl l='Thelia Languages'}{/block}
{block name="check-resource"}admin.configuration.language{/block}

4
templates/backOffice/default/mailing-system.html
View File

@@ -1,5 +1,9 @@
{extends file="admin-layout.tpl"}
{block name="no-return-functions"}
{$admin_current_location = 'configuration'}
{/block}
{block name="page-title"}{intl l='Thelia Mailing System'}{/block}
{block name="check-resource"}admin.configuration.mailing-system{/block}

4
templates/backOffice/default/message-edit.html
View File

@@ -1,5 +1,9 @@
{extends file="admin-layout.tpl"}
{block name="no-return-functions"}
{$admin_current_location = 'configuration'}
{/block}
{block name="page-title"}{intl l='Edit a mailing template'}{/block}
{block name="check-resource"}admin.configuration.message{/block}

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

@@ -1,5 +1,9 @@
{extends file="admin-layout.tpl"}
{block name="no-return-functions"}
{$admin_current_location = 'configuration'}
{/block}
{block name="page-title"}{intl l='Thelia Mailing Templates'}{/block}
{block name="check-resource"}admin.configuration.message{/block}

4
templates/backOffice/default/module-configure.html
View File

@@ -1,5 +1,9 @@
{extends file="admin-layout.tpl"}
{block name="no-return-functions"}
{$admin_current_location = 'modules'}
{/block}
{block name="page-title"}{intl l='Modules'}{/block}
{block name="check-resource"}admin.module{/block}

4
templates/backOffice/default/module-edit.html
View File

@@ -1,5 +1,9 @@
{extends file="admin-layout.tpl"}
{block name="no-return-functions"}
{$admin_current_location = 'modules'}
{/block}
{block name="page-title"}{intl l='Edit a module'}{/block}
{block name="check-resource"}admin.module{/block}

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

@@ -1,5 +1,9 @@
{extends file="admin-layout.tpl"}
{block name="no-return-functions"}
{$admin_current_location = 'modules'}
{/block}
{block name="page-title"}{intl l='Modules'}{/block}
{block name="check-resource"}admin.module{/block}

4
templates/backOffice/default/order-edit.html
View File

@@ -1,5 +1,9 @@
{extends file="admin-layout.tpl"}
{block name="no-return-functions"}
{$admin_current_location = 'order'}
{/block}
{block name="page-title"}{intl l='Edit an order'}{/block}
{block name="check-resource"}admin.order{/block}

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

@@ -1,5 +1,9 @@
{extends file="admin-layout.tpl"}
{block name="no-return-functions"}
{$admin_current_location = 'order'}
{/block}
{block name="page-title"}{intl l='Orders'}{/block}
{block name="check-resource"}admin.order{/block}

4
templates/backOffice/default/product-edit.html
View File

@@ -1,5 +1,9 @@
{extends file="admin-layout.tpl"}
{block name="no-return-functions"}
{$admin_current_location = 'catalog'}
{/block}
{block name="check-resource"}admin.product{/block}
{block name="check-access"}update{/block}

4
templates/backOffice/default/profile-edit.html
View File

@@ -1,5 +1,9 @@
{extends file="admin-layout.tpl"}
{block name="no-return-functions"}
{$admin_current_location = 'configuration'}
{/block}
{block name="page-title"}{intl l='Edit a profile'}{/block}
{block name="check-resource"}admin.configuration.profile{/block}

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

@@ -1,5 +1,9 @@
{extends file="admin-layout.tpl"}
{block name="no-return-functions"}
{$admin_current_location = 'configuration'}
{/block}
{block name="page-title"}{intl l='Administration profiles'}{/block}
{block name="check-resource"}admin.configuration.profile{/block}

4
templates/backOffice/default/shipping-configuration-edit.html
View File

@@ -1,5 +1,9 @@
{extends file="admin-layout.tpl"}
{block name="no-return-functions"}
{$admin_current_location = 'configuration'}
{/block}
{block name="page-title"}{intl l='Edit a shipping configuration'}{/block}
{block name="check-resource"}admin.configuration.shipping-configuration{/block}

4
templates/backOffice/default/shipping-configuration.html
View File

@@ -1,5 +1,9 @@
{extends file="admin-layout.tpl"}
{block name="no-return-functions"}
{$admin_current_location = 'configuration'}
{/block}
{block name="page-title"}{intl l='Thelia Shipping configuration'}{/block}
{block name="check-resource"}admin.configuration.shipping-configuration{/block}

4
templates/backOffice/default/shipping-zones-edit.html
View File

@@ -1,5 +1,9 @@
{extends file="admin-layout.tpl"}
{block name="no-return-functions"}
{$admin_current_location = 'configuration'}
{/block}
{block name="page-title"}{intl l='Edit a shipping zone'}{/block}
{block name="check-resource"}admin.configuration.shipping-zone{/block}

4
templates/backOffice/default/shipping-zones.html
View File

@@ -1,5 +1,9 @@
{extends file="admin-layout.tpl"}
{block name="no-return-functions"}
{$admin_current_location = 'configuration'}
{/block}
{block name="page-title"}{intl l='Thelia Shipping zones'}{/block}
{block name="check-resource"}admin.configuration.shipping-zone{/block}

4
templates/backOffice/default/system-logs.html
View File

@@ -1,5 +1,9 @@
{extends file="admin-layout.tpl"}
{block name="no-return-functions"}
{$admin_current_location = 'configuration'}
{/block}
{block name="page-title"}{intl l='System Logs'}{/block}
{block name="check-resource"}admin.configuration.variable{/block}

4
templates/backOffice/default/tax-edit.html
View File

@@ -1,5 +1,9 @@
{extends file="admin-layout.tpl"}
{block name="no-return-functions"}
{$admin_current_location = 'configuration'}
{/block}
{block name="page-title"}{intl l='Edit a tax'}{/block}
{block name="check-resource"}admin.configuration.tax{/block}

4
templates/backOffice/default/tax-rule-edit.html
View File

@@ -1,5 +1,9 @@
{extends file="admin-layout.tpl"}
{block name="no-return-functions"}
{$admin_current_location = 'configuration'}
{/block}
{block name="page-title"}{intl l='Edit a tax rule'}{/block}
{block name="check-resource"}admin.configuration.tax{/block}

4
templates/backOffice/default/taxes-rules.html
View File

@@ -1,5 +1,9 @@
{extends file="admin-layout.tpl"}
{block name="no-return-functions"}
{$admin_current_location = 'configuration'}
{/block}
{block name="page-title"}{intl l='Taxes rules'}{/block}
{block name="check-resource"}admin.configuration.tax{/block}

4
templates/backOffice/default/template-edit.html
View File

@@ -1,5 +1,9 @@
{extends file="admin-layout.tpl"}
{block name="no-return-functions"}
{$admin_current_location = 'configuration'}
{/block}
{block name="page-title"}{intl l='Edit a template'}{/block}
{block name="check-resource"}admin.configuration.template{/block}

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

@@ -1,5 +1,9 @@
{extends file="admin-layout.tpl"}
{block name="no-return-functions"}
{$admin_current_location = 'configuration'}
{/block}
{block name="page-title"}{intl l='Thelia Product Templates'}{/block}
{block name="check-resource"}admin.configuration.template{/block}

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

@@ -1,5 +1,9 @@
{extends file="admin-layout.tpl"}
{block name="no-return-functions"}
{$admin_current_location = 'tools'}
{/block}
{block name="page-title"}{intl l='Tools'}{/block}
{block name="check-resource"}admin.tools{/block}

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

@@ -1,5 +1,9 @@
{extends file="admin-layout.tpl"}
{block name="no-return-functions"}
{$admin_current_location = 'configuration'}
{/block}
{block name="page-title"}{intl l='Translations'}{/block}
{block name="check-resource"}admin.configuration.variable{/block}

4
templates/backOffice/default/variable-edit.html
View File

@@ -1,5 +1,9 @@
{extends file="admin-layout.tpl"}
{block name="no-return-functions"}
{$admin_current_location = 'configuration'}
{/block}
{block name="page-title"}{intl l='Edit a system variable'}{/block}
{block name="check-resource"}admin.configuration.variable{/block}

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

@@ -1,5 +1,9 @@
{extends file="admin-layout.tpl"}
{block name="no-return-functions"}
{$admin_current_location = 'configuration'}
{/block}
{block name="page-title"}{intl l='Thelia System Variables'}{/block}
{block name="check-resource"}admin.configuration.variable{/block}