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

Merge pull request #300 from roadster31/profilefix

Browse Source 
"Module" tab improvement
This commit is contained in:
Manuel Raynaud
2014-04-16 23:50:37 +02:00
parent feeff10bd1 f53b88fc64
commit fccde719b8
10 changed files with 248 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/lib/Thelia/Controller/Admin/AttributeAvController.php
View File

@@ -141,7 +141,7 @@ class AttributeAvController extends AbstractCrudController
->findOneById($this->getRequest()->get('attributeav_id', 0)); ->findOneById($this->getRequest()->get('attributeav_id', 0));
if (null !== $attributeAv) { if (null !== $attributeAv) {
$attribute->setLocale($this->getCurrentEditionLocale()); $attributeAv->setLocale($this->getCurrentEditionLocale());
} }
return $attributeAv; return $attributeAv;

75
core/lib/Thelia/Core/Template/Loop/Order.php
View File

@@ -92,11 +92,11 @@ class Order extends BaseLoop implements SearchLoopInterface, PropelSearchLoopInt
public function getSearchIn() public function getSearchIn()
{ {
return array( return array(
"ref", 'ref',
"customer_ref", 'customer_ref',
"customer_firstname", 'customer_firstname',
"customer_lastname", 'customer_lastname',
"customer_email", 'customer_email',
); );
} }
@@ -115,25 +115,25 @@ class Order extends BaseLoop implements SearchLoopInterface, PropelSearchLoopInt
$search->_or(); $search->_or();
} }
switch ($searchInElement) { switch ($searchInElement) {
case "ref": case 'ref':
$search->filterByRef($searchTerm, $searchCriteria); $search->filterByRef($searchTerm, $searchCriteria);
break; break;
case "customer_ref": case 'customer_ref':
$search->filterByCustomer( $search->filterByCustomer(
CustomerQuery::create()->filterByRef($searchTerm, $searchCriteria)->find() CustomerQuery::create()->filterByRef($searchTerm, $searchCriteria)->find()
); );
break; break;
case "customer_firstname": case 'customer_firstname':
$search->filterByOrderAddressRelatedByInvoiceOrderAddressId( $search->filterByOrderAddressRelatedByInvoiceOrderAddressId(
OrderAddressQuery::create()->filterByFirstname($searchTerm, $searchCriteria)->find() OrderAddressQuery::create()->filterByFirstname($searchTerm, $searchCriteria)->find()
); );
break; break;
case "customer_lastname": case 'customer_lastname':
$search->filterByOrderAddressRelatedByInvoiceOrderAddressId( $search->filterByOrderAddressRelatedByInvoiceOrderAddressId(
OrderAddressQuery::create()->filterByLastname($searchTerm, $searchCriteria)->find() OrderAddressQuery::create()->filterByLastname($searchTerm, $searchCriteria)->find()
); );
break; break;
case "customer_email": case 'customer_email':
$search->filterByCustomer( $search->filterByCustomer(
CustomerQuery::create()->filterByEmail($searchTerm, $searchCriteria)->find() CustomerQuery::create()->filterByEmail($searchTerm, $searchCriteria)->find()
); );
@@ -178,28 +178,28 @@ class Order extends BaseLoop implements SearchLoopInterface, PropelSearchLoopInt
case 'id': case 'id':
$search->orderById(Criteria::ASC); $search->orderById(Criteria::ASC);
break; break;
case 'id_reverse': case 'id-reverse':
$search->orderById(Criteria::DESC); $search->orderById(Criteria::DESC);
break; break;
case 'reference': case 'reference':
$search->orderByRef(Criteria::ASC); $search->orderByRef(Criteria::ASC);
break; break;
case 'reference_reverse': case 'reference-reverse':
$search->orderByRef(Criteria::DESC); $search->orderByRef(Criteria::DESC);
break; break;
case "create-date": case 'create-date':
$search->orderByCreatedAt(Criteria::ASC); $search->orderByCreatedAt(Criteria::ASC);
break; break;
case "create-date-reverse": case 'create-date-reverse':
$search->orderByCreatedAt(Criteria::DESC); $search->orderByCreatedAt(Criteria::DESC);
break; break;
case "status": case 'status':
$search->orderByStatusId(Criteria::ASC); $search->orderByStatusId(Criteria::ASC);
break; break;
case "status": case 'status-reverse':
$search->orderByStatusId(Criteria::DESC); $search->orderByStatusId(Criteria::DESC);
break; break;
@@ -210,7 +210,7 @@ class Order extends BaseLoop implements SearchLoopInterface, PropelSearchLoopInt
->orderBy('company', Criteria::ASC) ->orderBy('company', Criteria::ASC)
; ;
break; break;
case 'companyreverse' : case 'company-reverse' :
$search $search
->joinOrderAddressRelatedByDeliveryOrderAddressId() ->joinOrderAddressRelatedByDeliveryOrderAddressId()
->withColumn(OrderAddressTableMap::COMPANY, 'company') ->withColumn(OrderAddressTableMap::COMPANY, 'company')
@@ -244,31 +244,32 @@ class Order extends BaseLoop implements SearchLoopInterface, PropelSearchLoopInt
public function parseResults(LoopResult $loopResult) public function parseResults(LoopResult $loopResult)
{ {
/** @var \Thelia\Model\Order $order */
foreach ($loopResult->getResultDataCollection() as $order) { foreach ($loopResult->getResultDataCollection() as $order) {
$tax = 0; $tax = 0;
$amount = $order->getTotalAmount($tax); $amount = $order->getTotalAmount($tax);
$loopResultRow = new LoopResultRow($order); $loopResultRow = new LoopResultRow($order);
$loopResultRow $loopResultRow
->set("ID", $order->getId()) ->set('ID', $order->getId())
->set("REF", $order->getRef()) ->set('REF', $order->getRef())
->set("CUSTOMER", $order->getCustomerId()) ->set('CUSTOMER', $order->getCustomerId())
->set("DELIVERY_ADDRESS", $order->getDeliveryOrderAddressId()) ->set('DELIVERY_ADDRESS', $order->getDeliveryOrderAddressId())
->set("INVOICE_ADDRESS", $order->getInvoiceOrderAddressId()) ->set('INVOICE_ADDRESS', $order->getInvoiceOrderAddressId())
->set("INVOICE_DATE", $order->getInvoiceDate()) ->set('INVOICE_DATE', $order->getInvoiceDate())
->set("CURRENCY", $order->getCurrencyId()) ->set('CURRENCY', $order->getCurrencyId())
->set("CURRENCY_RATE", $order->getCurrencyRate()) ->set('CURRENCY_RATE', $order->getCurrencyRate())
->set("TRANSACTION_REF", $order->getTransactionRef()) ->set('TRANSACTION_REF', $order->getTransactionRef())
->set("DELIVERY_REF", $order->getDeliveryRef()) ->set('DELIVERY_REF', $order->getDeliveryRef())
->set("INVOICE_REF", $order->getInvoiceRef()) ->set('INVOICE_REF', $order->getInvoiceRef())
->set("POSTAGE", $order->getPostage()) ->set('POSTAGE', $order->getPostage())
->set("PAYMENT_MODULE", $order->getPaymentModuleId()) ->set('PAYMENT_MODULE', $order->getPaymentModuleId())
->set("DELIVERY_MODULE", $order->getDeliveryModuleId()) ->set('DELIVERY_MODULE', $order->getDeliveryModuleId())
->set("STATUS", $order->getStatusId()) ->set('STATUS', $order->getStatusId())
->set("LANG", $order->getLangId()) ->set('LANG', $order->getLangId())
->set("DISCOUNT", $order->getDiscount()) ->set('DISCOUNT', $order->getDiscount())
->set("TOTAL_TAX", $tax) ->set('TOTAL_TAX', $tax)
->set("TOTAL_AMOUNT", $amount - $tax) ->set('TOTAL_AMOUNT', $amount - $tax)
->set("TOTAL_TAXED_AMOUNT", $amount) ->set('TOTAL_TAXED_AMOUNT', $amount)
; ;
$loopResult->addRow($loopResultRow); $loopResult->addRow($loopResultRow);

9
core/lib/Thelia/Core/Template/Smarty/Plugins/Module.php
View File

@@ -67,7 +67,7 @@ class Module extends AbstractSmartyPlugin
if (false !== $location = $this->getParam($params, 'location', false)) { if (false !== $location = $this->getParam($params, 'location', false)) {
if ($this->debug === true && $this->request->get('SHOW_INCLUDE')) { if ($this->debug === true && $this->request->get('SHOW_INCLUDE')) {
echo sprintf('<div style="background-color: #C82D26; border-color: #000000; border: solid;">%s</div>', $location); echo sprintf('<div style="background-color: #C82D26; color: #fff; border-color: #000000; border: solid;">%s</div>', $location);
} }
$moduleLimit = $this->getParam($params, 'module', null); $moduleLimit = $this->getParam($params, 'module', null);
@@ -83,12 +83,17 @@ class Module extends AbstractSmartyPlugin
$file = sprintf("%s/AdminIncludes/%s.html", $module->getAbsoluteBaseDir(), $location); $file = sprintf("%s/AdminIncludes/%s.html", $module->getAbsoluteBaseDir(), $location);
if (file_exists($file)) { if (file_exists($file)) {
$content .= file_get_contents($file);
$output = trim(file_get_contents($file));
if (! empty($output)) {
$content .= $output;
$count++; $count++;
} }
} }
} }
}
if (false !== $countvarname = $this->getParam($params, 'countvar', false)) { if (false !== $countvarname = $this->getParam($params, 'countvar', false)) {
$template->assign($countvarname, $count); $template->assign($countvarname, $count);

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

@@ -271,13 +271,8 @@
} }
</div> </div>
{module_include location='category-edit' countvar='module_count'} {include file="includes/module-tab-content.html" location="category-edit"}
{if $module_count == 0}
<div class="alert alert-info">
{intl l="There is currently no active module here."}
</div>
{/if}
</div> </div>
</div> </div>
</div> </div>

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

@@ -41,7 +41,8 @@
<div class="col-md-12"> <div class="col-md-12">
<ul class="nav nav-tabs" id="tabbed-menu"> <ul class="nav nav-tabs" id="tabbed-menu">
<li class="active"><a href="#general" data-toggle="tab">{intl l="General description"}</a></li> <li class="active">
<a href="#general" data-toggle="tab">{intl l="General description"}</a></li>
<li><a href="#seo" data-toggle="tab">{intl l="SEO"}</a></li> <li><a href="#seo" data-toggle="tab">{intl l="SEO"}</a></li>
<li><a href="#association" data-toggle="tab">{intl l="Associations"}</a></li> <li><a href="#association" data-toggle="tab">{intl l="Associations"}</a></li>
<li><a href="#images" data-toggle="tab">{intl l="Images"}</a></li> <li><a href="#images" data-toggle="tab">{intl l="Images"}</a></li>
@@ -75,7 +76,8 @@
<input type="hidden" name="{$name}" value="{$edit_language_locale}"/> <input type="hidden" name="{$name}" value="{$edit_language_locale}"/>
{/form_field} {/form_field}
{if $form_error}<div class="alert alert-danger">{$form_error_message}</div>{/if} {if $form_error}
<div class="alert alert-danger">{$form_error_message}</div>{/if}
<div class="row"> <div class="row">
<div class="col-md-8"> <div class="col-md-8">
@@ -106,6 +108,7 @@
{form_field form=$form field='visible'} {form_field form=$form field='visible'}
<div class="form-group {if $error}has-error{/if}"> <div class="form-group {if $error}has-error{/if}">
<label for="{$label_attr.for}" class="control-label">{intl l='Visibility'}</label> <label for="{$label_attr.for}" class="control-label">{intl l='Visibility'}</label>
<div class="checkbox"> <div class="checkbox">
<label> <label>
<input type="checkbox" id="{$label_attr.for}" name="{$name}" value="1" {if $value != 0}checked="checked"{/if}> <input type="checkbox" id="{$label_attr.for}" name="{$name}" value="1" {if $value != 0}checked="checked"{/if}>
@@ -166,13 +169,7 @@
} }
</div> </div>
{module_include location='content-edit' countvar='module_count'} {include file="includes/module-tab-content.html" location="content-edit"}
{if $module_count == 0}
<div class="alert alert-info">
{intl l="There is currently no active module here."}
</div>
{/if}
</div> </div>
</div> </div>
</div> </div>
@@ -182,14 +179,11 @@
</div> </div>
</div> </div>
</div> </div>
{* Delete category confirmation dialog *} {* Delete category confirmation dialog *}
{capture "delete_folder_dialog"} {capture "delete_folder_dialog"}
<input type="hidden" name="content_id" value="{$content_id}"/> <input type="hidden" name="content_id" value="{$content_id}"/>
<input type="hidden" name="additional_folder_id" id="additional_folder_delete_id" value=""/> <input type="hidden" name="additional_folder_id" id="additional_folder_delete_id" value=""/>
<input type="hidden" name="current_tab" value="association"/> <input type="hidden" name="current_tab" value="association"/>
{/capture} {/capture}
@@ -220,7 +214,6 @@ form_content = {$smarty.capture.delete_folder_dialog nofilter}
{javascripts file='assets/js/jquery-ui-1.10.3.custom.min.js'} {javascripts file='assets/js/jquery-ui-1.10.3.custom.min.js'}
<script src="{$asset_url}"></script> <script src="{$asset_url}"></script>
{/javascripts} {/javascripts}
<script> <script>
$(function() { $(function() {
$.imageUploadManager.initImageDropZone(); $.imageUploadManager.initImageDropZone();
@@ -273,7 +266,10 @@ form_content = {$smarty.capture.delete_folder_dialog nofilter}
}); });
}); });
// Initialize folder (id={$folder_id}) select value // Initialize folder (id=
{$folder_id})
select
value
{if $folder_id != 0} {if $folder_id != 0}
$('#folder_id').val("{$folder_id}").change(); $('#folder_id').val("{$folder_id}").change();
{/if} {/if}

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

@@ -152,13 +152,7 @@
} }
</div> </div>
{module_include location='folder-edit' countvar='module_count'} {include file="includes/module-tab-content.html" location="folder-edit"}
{if $module_count == 0}
<div class="alert alert-info">
{intl l="There is currently no active module here."}
</div>
{/if}
</div> </div>
</div> </div>
</div> </div>

15
templates/backOffice/default/includes/module-tab-content.html Normal file
View File

@@ -0,0 +1,15 @@
{capture name="module_include"}
{module_include location=$location countvar='module_count'}
{/capture}
{if trim($smarty.capture.module_include) == ''}
<br />
<div class="alert alert-info">
<p class="text-center" style="font-size: 2.2em"><span class="glyphicon glyphicon-info-sign"></span></p>
<p class="text-center">{intl l="There is currently no active module here."}</p>
</div>
{else}
x="{$smarty.capture.module_include nofilter}"
{/if}

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

@@ -16,6 +16,7 @@
<ul class="breadcrumb"> <ul class="breadcrumb">
<li><a href="{url path='/admin/home'}">{intl l="Home"}</a></li> <li><a href="{url path='/admin/home'}">{intl l="Home"}</a></li>
<li><a href="{url path='/admin/orders'}">{intl l="Orders"}</a></li> <li><a href="{url path='/admin/orders'}">{intl l="Orders"}</a></li>
<li>{intl l="Order details"}</a></li>
</ul> </ul>
<div class="row"> <div class="row">
@@ -35,7 +36,7 @@
<div class="row"> <div class="row">
<div class="col-md-7 title"> <div class="col-md-7 title">
{intl l='Order %ref' ref=$REF} {intl l='Order %ref - ID %id' id=$ID ref=$REF}
</div> </div>
<div class="col-md-5 actions"> <div class="col-md-5 actions">
@@ -352,13 +353,7 @@
<div class="tab-pane fade {if $oder_tab == 'modules'}active in{/if} clearfix" id="modules"> <div class="tab-pane fade {if $oder_tab == 'modules'}active in{/if} clearfix" id="modules">
{module_include location='order-edit' countvar='module_count'} {include file="includes/module-tab-content.html" location="order-edit"}
{if $module_count == 0}
<div class="alert alert-info">
{intl l="There is currently no active module here."}
</div>
{/if}
</div> </div>
</div> </div>
{/loop} {/loop}

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

@@ -32,6 +32,16 @@
<thead> <thead>
<tr> <tr>
<th class="object-title">
{admin_sortable_header
current_order=$orders_order
order='id'
reverse_order='id-reverse'
path={url path='/admin/orders'}
request_parameter_name='orders_order'
label="{intl l='ID'}"
} </th>
<th class="object-title"> <th class="object-title">
{admin_sortable_header {admin_sortable_header
current_order=$orders_order current_order=$orders_order
@@ -39,7 +49,7 @@
reverse_order='reference-reverse' reverse_order='reference-reverse'
path={url path='/admin/orders'} path={url path='/admin/orders'}
request_parameter_name='orders_order' request_parameter_name='orders_order'
label="{intl l='Order #'}" label="{intl l='Reference'}"
} </th> } </th>
<th class="object-title"> <th class="object-title">
@@ -111,6 +121,7 @@
<tr> <tr>
<td><a href="{url path="/admin/order/update/$ID"}">{$ID}</a></td>
<td><a href="{url path="/admin/order/update/$ID"}">{$REF}</a></td> <td><a href="{url path="/admin/order/update/$ID"}">{$REF}</a></td>
<td>{format_date date=$CREATE_DATE}</td> <td>{format_date date=$CREATE_DATE}</td>
<td>{$orderInvoiceCompany}</td> <td>{$orderInvoiceCompany}</td>

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

@@ -119,13 +119,7 @@
} }
</div> </div>
{module_include location='product-edit' countvar='module_count'} {include file="includes/module-tab-content.html" location="product-edit"}
{if $module_count == 0}
<div class="alert alert-info">
{intl l="There is currently no active module here."}
</div>
{/if}
</div> </div>
</div> </div>