dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// fixes to orders->view product, adminsearch->toolbar, admintaxrules hint

Browse Source
This commit is contained in:
tDidierjean
2011-11-23 13:14:07 +00:00
parent 01b1f1ebcc
commit 52840edca2
5 changed files with 45 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/template/orders/_customized_data.tpl
+1 -1
View File
@@ -28,7 +28,7 @@
<tr> <tr>
<td align="center">{if ($product.image->id)}{$product.image_tag}{else}'--'{/if}</td> <td align="center">{if ($product.image->id)}{$product.image_tag}{else}'--'{/if}</td>
<td> <td>
<a href="index.php?tab=AdminCatalog&id_product={$product['product_id']}&updateproduct&token={getAdminToken tab='AdminCatalog'}"> <a href="index.php?controller=adminproducts&id_product={$product['product_id']}&updateproduct&token={getAdminToken tab='AdminProducts'}">
<span class="productName">{$product['product_name']} - {l s='customized'}</span><br /> <span class="productName">{$product['product_name']} - {l s='customized'}</span><br />
{if ($product['product_reference'])}{l s='Ref:'} {$product['product_reference']}<br />{/if} {if ($product['product_reference'])}{l s='Ref:'} {$product['product_reference']}<br />{/if}
{if ($product['product_supplier_reference'])}{l s='Ref Supplier:'} {$product['product_supplier_reference']}{/if} {if ($product['product_supplier_reference'])}{l s='Ref Supplier:'} {$product['product_supplier_reference']}{/if}
admin-dev/themes/template/orders/_product_line.tpl
+1 -1
View File
@@ -34,7 +34,7 @@
{if ($product['product_quantity'] > $product['customizationQuantityTotal'])} {if ($product['product_quantity'] > $product['customizationQuantityTotal'])}
<tr{if isset($product.image) && $product.image->id && isset($product.image_size)} height="{$product['image_size'][1] + 7}"{/if}> <tr{if isset($product.image) && $product.image->id && isset($product.image_size)} height="{$product['image_size'][1] + 7}"{/if}>
<td align="center">{if isset($product.image) && $product.image->id}{$product.image_tag}{/if}</td> <td align="center">{if isset($product.image) && $product.image->id}{$product.image_tag}{/if}</td>
<td><a href="index.php?tab=AdminCatalog&id_product={$product['product_id']}&updateproduct&token={getAdminToken tab='AdminCatalog'}"> <td><a href="index.php?controller=adminproducts&id_product={$product['product_id']}&updateproduct&token={getAdminToken tab='AdminProducts'}">
<span class="productName">{$product['product_name']}</span><br /> <span class="productName">{$product['product_name']}</span><br />
{if $product.product_reference}{l s='Ref:'} {$product.product_reference}<br />{/if} {if $product.product_reference}{l s='Ref:'} {$product.product_reference}<br />{/if}
{if $product.product_supplier_reference}{l s='Ref Supplier:'} {$product.product_supplier_reference}{/if} {if $product.product_supplier_reference}{l s='Ref Supplier:'} {$product.product_supplier_reference}{/if}
admin-dev/themes/template/search/view.tpl
+14 -2
View File
@@ -30,9 +30,21 @@ $(function() {
}); });
</script> </script>
{if isset($features) || isset($categories) || isset($products) || isset($customers)} {if $show_toolbar}
<h2>{l s='Search results'} :</h2> <div class="toolbar-placeholder">
<div class="toolbarBox {if $toolbar_fix}toolbarHead{/if}">
{include file="toolbar.tpl" toolbar_btn=$toolbar_btn}
<div class="pageTitle">
<h3>
{block name=pageTitle}
<span id="current_obj" style="font-weight: normal;">{$title|default:'&nbsp;'}</span>
{/block}
</h3>
</div>
</div>
</div>
{/if} {/if}
{if isset($features)} {if isset($features)}
{if !$features} {if !$features}
<h3>{l s='No features matching your query'} : {$query}</h3> <h3>{l s='No features matching your query'} : {$query}</h3>
controllers/admin/AdminSearchController.php
+11
View File
@@ -214,9 +214,20 @@ class AdminSearchControllerCore extends AdminController
$this->addJqueryPlugin('highlight'); $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() public function initView()
{ {
$this->tpl_view_vars['query'] = $this->query; $this->tpl_view_vars['query'] = $this->query;
$this->tpl_view_vars['show_toolbar'] = true;
if (sizeof($this->_errors)) if (sizeof($this->_errors))
return parent::initView(); return parent::initView();
controllers/admin/AdminTaxRulesGroupController.php
+5 -5
View File
@@ -286,11 +286,11 @@ class AdminTaxRulesGroupControllerCore extends AdminController
'id' => 'id', 'id' => 'id',
'name' => 'name' 'name' => 'name'
), ),
'hint' => array( 'hint' =>
$this->l('Define the behavior if an address matches multiple rules:'), $this->l('Define the behavior if an address matches multiple rules:').'<br />
'<b>'.$this->l('This Tax Only:').'</b> '.$this->l('Will apply only this tax'), <b>'.$this->l('This Tax Only:').'</b> '.$this->l('Will apply only this tax').'<br />
'<b>'.$this->l('Combine:').'</b> '.$this->l('Combine taxes (eg: 10% + 5% => 15%)'), <b>'.$this->l('Combine:').'</b> '.$this->l('Combine taxes (eg: 10% + 5% => 15%)').'<br />
'<b>'.$this->l('One After Another:').'</b> '.$this->l('Apply taxes one after another (eg: 100€ + 10% => 110€ + 5% => 115.5€)') <b>'.$this->l('One After Another:').'</b> '.$this->l('Apply taxes one after another (eg: 100€ + 10% => 110€ + 5% => 115.5€)'
) )
), ),
array( array(