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

//FIxed Added Controller AdminCarrierController

Browse Source
This commit is contained in:
lLefevre
2011-10-19 14:36:25 +00:00
parent 41140ad21d
commit 99aa249393
9 changed files with 934 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/tabs/AdminOrders.php
+1 -1
View File
@@ -60,7 +60,7 @@ class AdminOrders extends AdminTab
'payment' => array('title' => $this->l('Payment'), 'width' => 100),
'osname' => array('title' => $this->l('Status'), 'widthColumn' => 230, 'type' => 'select', 'select' => $statesArray, 'filter_key' => 'os!id_order_state', 'filter_type' => 'int', 'width' => 200),
'date_add' => array('title' => $this->l('Date'), 'width' => 35, 'align' => 'right', 'type' => 'datetime', 'filter_key' => 'a!date_add'),
'id_pdf' => array('title' => $this->l('PDF'), 'callback' => 'printPDFIcons', 'orderby' => false, 'search' => false));
'id_pdf' => array('title' => $this->l('PDF'), 'callback' => 'printPDtFIcons', 'orderby' => false, 'search' => false));
$this->shopLinkType = 'shop';
$this->shopShareDatas = Shop::SHARE_ORDER;
parent::__construct();
admin-dev/tabs/AdminStatuses.php
+3 -3
View File
@@ -26,7 +26,7 @@
*/
include(_PS_ADMIN_DIR_.'/tabs/AdminOrdersStates.php');
include(_PS_ADMIN_DIR_.'/tabs/AdminReturnStates.php');
include(_PS_CONTROLLER_DIR_.'/admin/AdminReturnStatesController.php');
class AdminStatuses extends AdminTab
{
@@ -37,7 +37,7 @@ class AdminStatuses extends AdminTab
{
$this->table = array('order_state', 'order_return_state');
$this->adminOrdersStates = new adminOrdersStates();
$this->adminReturnStates = new adminReturnStates();
$this->adminReturnStates = new AdminReturnStatesController();
parent::__construct();
}
@@ -77,7 +77,7 @@ class AdminStatuses extends AdminTab
if (!Tools::isSubmit('updateorder_return_state') AND !Tools::isSubmit('submitAddorder_return_state'))
echo '<div style="margin:10px">&nbsp;</div>';
echo '<h2>'.$this->l('Order return statuses').'</h2>';
$this->adminReturnStates->display($this->token);
$this->adminReturnStates->initContent($this->token);
}
}
}