diff --git a/admin-dev/themes/template/orders/_customized_data.tpl b/admin-dev/themes/template/orders/_customized_data.tpl index 3c87a5b9d..682b71db0 100755 --- a/admin-dev/themes/template/orders/_customized_data.tpl +++ b/admin-dev/themes/template/orders/_customized_data.tpl @@ -28,7 +28,7 @@ {if ($product.image->id)}{$product.image_tag}{else}'--'{/if} - + {$product['product_name']} - {l s='customized'}
{if ($product['product_reference'])}{l s='Ref:'} {$product['product_reference']}
{/if} {if ($product['product_supplier_reference'])}{l s='Ref Supplier:'} {$product['product_supplier_reference']}{/if} diff --git a/admin-dev/themes/template/orders/_product_line.tpl b/admin-dev/themes/template/orders/_product_line.tpl index 1891a0e20..1e002c260 100755 --- a/admin-dev/themes/template/orders/_product_line.tpl +++ b/admin-dev/themes/template/orders/_product_line.tpl @@ -34,7 +34,7 @@ {if ($product['product_quantity'] > $product['customizationQuantityTotal'])} id && isset($product.image_size)} height="{$product['image_size'][1] + 7}"{/if}> {if isset($product.image) && $product.image->id}{$product.image_tag}{/if} - + {$product['product_name']}
{if $product.product_reference}{l s='Ref:'} {$product.product_reference}
{/if} {if $product.product_supplier_reference}{l s='Ref Supplier:'} {$product.product_supplier_reference}{/if} diff --git a/admin-dev/themes/template/search/view.tpl b/admin-dev/themes/template/search/view.tpl index b3606070d..4a83a52fe 100644 --- a/admin-dev/themes/template/search/view.tpl +++ b/admin-dev/themes/template/search/view.tpl @@ -30,9 +30,21 @@ $(function() { }); -{if isset($features) || isset($categories) || isset($products) || isset($customers)} -

{l s='Search results'} :

+{if $show_toolbar} +
+
+ {include file="toolbar.tpl" toolbar_btn=$toolbar_btn} +
+

+ {block name=pageTitle} + {$title|default:' '} + {/block} +

+
+
+
{/if} + {if isset($features)} {if !$features}

{l s='No features matching your query'} : {$query}

diff --git a/controllers/admin/AdminSearchController.php b/controllers/admin/AdminSearchController.php index dfa4eb2ca..14e7dea11 100644 --- a/controllers/admin/AdminSearchController.php +++ b/controllers/admin/AdminSearchController.php @@ -42,7 +42,7 @@ class AdminSearchControllerCore extends AdminController { if (!$searchType and strlen($this->query) > 1) $this->searchFeatures(); - + /* Product research */ if (!$searchType OR $searchType == 1) { @@ -64,7 +64,7 @@ class AdminSearchControllerCore extends AdminController if ($searchType AND (int)$this->query AND Validate::isUnsignedInt((int)$this->query)) if ($customer = new Customer((int)$this->query) AND Validate::isLoadedObject($customer)) Tools::redirectAdmin('index.php?tab=AdminCustomers&id_customer='.(int)($customer->id).'&viewcustomer'.'&token='.Tools::getAdminToken('AdminCustomers'.(int)(Tab::getIdFromClassName('AdminCustomers')).(int)$this->context->employee->id)); - + /* Normal customer search */ $this->searchCustomer(); } @@ -100,9 +100,9 @@ class AdminSearchControllerCore extends AdminController // 6 - but it is included in the customer block } $this->display = 'view'; - } + } + - public function searchIP() { if (!ip2long(trim($this->query))) @@ -131,10 +131,10 @@ class AdminSearchControllerCore extends AdminController * @params string $query String to find in the catalog */ public function searchCustomer() - { + { $this->_list['customers'] = Customer::searchByName($this->query); } - + /** * Search a feature in all store * @@ -166,13 +166,13 @@ class AdminSearchControllerCore extends AdminController $this->_list['features'][$tabs[$key]][] = array('link' => '?tab='.Tools::safeOutput($key).'&token='.Tools::getAdminTokenLite($key) , 'value' => Tools::safeOutput($value)); } } - + if (!count($this->_list['features'])) $this->_list['features'] = false; else $this->_list['features']; } - + protected function initCustomerList() { $genders_icon = array('default' => 'unknown.gif'); @@ -194,7 +194,7 @@ class AdminSearchControllerCore extends AdminController 'active' => array('title' => $this->l('Enabled'),'align' => 'center','active' => 'status','type' => 'bool'), )); } - + protected function initProductList() { $this->show_toolbar = false; @@ -207,16 +207,27 @@ class AdminSearchControllerCore extends AdminController 'status' => array('title' => $this->l('Status'), 'align' => 'center'), )); } - + public function setMedia() { parent::setMedia(); $this->addJqueryPlugin('highlight'); } - + + // Override because we don't want any buttons + public function initToolbar() + { + } + + public function initToolbarTitle() + { + $this->toolbar_title = $this->l('Search results'); + } + public function initView() { $this->tpl_view_vars['query'] = $this->query; + $this->tpl_view_vars['show_toolbar'] = true; if (sizeof($this->_errors)) return parent::initView(); @@ -259,10 +270,10 @@ class AdminSearchControllerCore extends AdminController foreach($this->_list['customers'] as $key => $val) $this->_list['customers'][$key]['orders'] = Order::getCustomerNbOrders((int)$val['id_customer']); $view = $helper->generateList($this->_list['customers'], $this->fieldsDisplay['customers']); - } + } $this->tpl_view_vars['customers'] = $view; } return parent::initView(); } - } + } } diff --git a/controllers/admin/AdminTaxRulesGroupController.php b/controllers/admin/AdminTaxRulesGroupController.php index d386a8d17..f9add7ef3 100644 --- a/controllers/admin/AdminTaxRulesGroupController.php +++ b/controllers/admin/AdminTaxRulesGroupController.php @@ -286,11 +286,11 @@ class AdminTaxRulesGroupControllerCore extends AdminController 'id' => 'id', 'name' => 'name' ), - 'hint' => array( - $this->l('Define the behavior if an address matches multiple rules:'), - ''.$this->l('This Tax Only:').' '.$this->l('Will apply only this tax'), - ''.$this->l('Combine:').' '.$this->l('Combine taxes (eg: 10% + 5% => 15%)'), - ''.$this->l('One After Another:').' '.$this->l('Apply taxes one after another (eg: 100€ + 10% => 110€ + 5% => 115.5€)') + 'hint' => + $this->l('Define the behavior if an address matches multiple rules:').'
+ '.$this->l('This Tax Only:').' '.$this->l('Will apply only this tax').'
+ '.$this->l('Combine:').' '.$this->l('Combine taxes (eg: 10% + 5% => 15%)').'
+ '.$this->l('One After Another:').' '.$this->l('Apply taxes one after another (eg: 100€ + 10% => 110€ + 5% => 115.5€)' ) ), array(