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

// fixed little bug on AdminTracking

Browse Source 
// fixed undefined error

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12928 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
aFolletete
2012-02-02 13:30:51 +00:00
parent 9136bc5ddb
commit e4c9eee04b
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/orders/_print_pdf_icon.tpl
+2 -2
View File
@@ -26,7 +26,7 @@
{* Generate HTML code for printing Invoice Icon with link *} {* Generate HTML code for printing Invoice Icon with link *}
<span style="width:20px; margin-right:5px;"> <span style="width:20px; margin-right:5px;">
{if (($order_state->invoice && $order->invoice_number) && $tr['product_number'])} {if ($order_state->invoice && $order->invoice_number)}
<a target="_blank" href="pdf.php?id_order={$order->id}&pdf"><img src="../img/admin/tab-invoice.gif" alt="invoice" /></a> <a target="_blank" href="pdf.php?id_order={$order->id}&pdf"><img src="../img/admin/tab-invoice.gif" alt="invoice" /></a>
{else} {else}
- -
@@ -40,4 +40,4 @@
{else} {else}
- -
{/if} {/if}
</span> </span>
controllers/admin/AdminTrackingController.php
+10 -10
View File
@@ -69,8 +69,8 @@ class AdminTrackingControllerCore extends AdminController
$this->table = 'category'; $this->table = 'category';
$this->lang = true; $this->lang = true;
$this->identifier = 'id_category'; $this->identifier = 'id_category';
$this->_defaultOrderBy = 'id_category'; $this->_orderBy = 'id_category';
$this->_defaultOrderWay = 'DESC'; $this->_orderWay = 'DESC';
self::$currentIndex = 'index.php?controller=AdminCategories'; self::$currentIndex = 'index.php?controller=AdminCategories';
$this->token = Tools::getAdminTokenLite('AdminCategories'); $this->token = Tools::getAdminTokenLite('AdminCategories');
@@ -103,8 +103,8 @@ class AdminTrackingControllerCore extends AdminController
$this->table = 'product'; $this->table = 'product';
$this->lang = true; $this->lang = true;
$this->identifier = 'id_product'; $this->identifier = 'id_product';
$this->_defaultOrderBy = 'id_product'; $this->_orderBy = 'id_product';
$this->_defaultOrderWay = 'DESC'; $this->_orderWay = 'DESC';
self::$currentIndex = 'index.php?controller=AdminProducts'; self::$currentIndex = 'index.php?controller=AdminProducts';
$this->token = Tools::getAdminTokenLite('AdminProducts'); $this->token = Tools::getAdminTokenLite('AdminProducts');
$this->show_toolbar = false; $this->show_toolbar = false;
@@ -141,8 +141,8 @@ class AdminTrackingControllerCore extends AdminController
$this->table = 'product'; $this->table = 'product';
$this->lang = true; $this->lang = true;
$this->identifier = 'id_product'; $this->identifier = 'id_product';
$this->_defaultOrderBy = 'id_product'; $this->_orderBy = 'id_product';
$this->_defaultOrderWay = 'DESC'; $this->_orderWay = 'DESC';
$this->show_toolbar = false; $this->show_toolbar = false;
self::$currentIndex = 'index.php?controller=AdminProducts'; self::$currentIndex = 'index.php?controller=AdminProducts';
$this->token = Tools::getAdminTokenLite('AdminProducts'); $this->token = Tools::getAdminTokenLite('AdminProducts');
@@ -179,8 +179,8 @@ class AdminTrackingControllerCore extends AdminController
$this->table = 'product'; $this->table = 'product';
$this->lang = true; $this->lang = true;
$this->identifier = 'id_product'; $this->identifier = 'id_product';
$this->_defaultOrderBy = 'id_product'; $this->_orderBy = 'id_product';
$this->_defaultOrderWay = 'DESC'; $this->_orderWay = 'DESC';
$this->_filter = 'AND active = 0'; $this->_filter = 'AND active = 0';
$this->list_no_filter = true; $this->list_no_filter = true;
$this->tpl_list_vars = array('sub_title' => $this->l('List of disabled products:')); $this->tpl_list_vars = array('sub_title' => $this->l('List of disabled products:'));
@@ -206,8 +206,8 @@ class AdminTrackingControllerCore extends AdminController
$this->actions = array(); $this->actions = array();
$this->lang = false; $this->lang = false;
$this->identifier = ''; $this->identifier = '';
$this->_defaultOrderBy = ''; $this->_orderBy = '';
$this->_defaultOrderWay = ''; $this->_orderWay = '';
$this->_filter = ''; $this->_filter = '';
$this->_group = ''; $this->_group = '';
$this->list_no_filter = true; $this->list_no_filter = true;