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

//FIxed Added Controller AdminCarrierController

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9464 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
lLefevre
2011-10-19 14:36:25 +00:00
parent 8b4f3d0cf6
commit 5f4ee34f0f
9 changed files with 934 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
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);
}
}
}