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

// Context part 9

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7637 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
tDidierjean
2011-07-18 10:08:07 +00:00
parent 311e8ab964
commit 0dbcebf01e
39 changed files with 290 additions and 445 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/tabs/AdminOrdersStates.php
+3 -5
View File
@@ -52,8 +52,7 @@ class AdminOrdersStates extends AdminTab
public function postProcess()
{
global $cookie;
$context = Context::getContext();
if (Tools::isSubmit('submitAdd'.$this->table))
{
$_POST['invoice'] = Tools::getValue('invoice');
@@ -70,7 +69,7 @@ class AdminOrdersStates extends AdminTab
}
elseif (isset($_GET['delete'.$this->table]))
{
$orderState = new OrderState((int)($_GET['id_order_state']), $cookie->id_lang);
$orderState = new OrderState($_GET['id_order_state'], $context->language->id);
if (!$orderState->isRemovable())
$this->_errors[] = $this->l('For security reasons, you cannot delete default order statuses.');
else
@@ -80,7 +79,7 @@ class AdminOrdersStates extends AdminTab
{
foreach ($_POST[$this->table.'Box'] AS $selection)
{
$orderState = new OrderState((int)($selection), $cookie->id_lang);
$orderState = new OrderState($selection, $context->language->id);
if (!$orderState->isRemovable())
{
$this->_errors[] = $this->l('For security reasons, you cannot delete default order statuses.');
@@ -108,7 +107,6 @@ class AdminOrdersStates extends AdminTab
public function displayForm($isMainTab = true)
{
global $currentIndex;
parent::displayForm();
if (!($obj = $this->loadObject(true)))