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

[-] BO : fix #PSCFV-3032

Browse Source
This commit is contained in:
lLefevre
2012-07-05 09:02:14 +00:00
parent 61e5df5577
commit 804104c839
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminReturnController.php
+14 -2
View File
@@ -155,6 +155,14 @@ class AdminReturnControllerCore extends AdminController
// If display list, we don't want the "add" button // If display list, we don't want the "add" button
if (!$this->display || $this->display == 'list') if (!$this->display || $this->display == 'list')
return; return;
else if ($this->display != 'options')
$this->toolbar_btn['save-and-stay'] = array(
'short' => 'SaveAndStay',
'href' => '#',
'desc' => $this->l('Save and stay'),
'force_desc' => true,
);
parent::initToolbar(); parent::initToolbar();
} }
@@ -191,7 +199,7 @@ class AdminReturnControllerCore extends AdminController
else else
$this->errors[] = Tools::displayError('You do not have permission to delete here.'); $this->errors[] = Tools::displayError('You do not have permission to delete here.');
} }
elseif (Tools::isSubmit('submitAddorder_return')) elseif (Tools::isSubmit('submitAddorder_return') || Tools::isSubmit('submitAddorder_returnAndStay'))
{ {
if ($this->tabAccess['edit'] === '1') if ($this->tabAccess['edit'] === '1')
{ {
@@ -212,7 +220,11 @@ class AdminReturnControllerCore extends AdminController
Mail::Send((int)$order->id_lang, 'order_return_state', Mail::l('Your order return state has changed', $order->id_lang), Mail::Send((int)$order->id_lang, 'order_return_state', Mail::l('Your order return state has changed', $order->id_lang),
$vars, $customer->email, $customer->firstname.' '.$customer->lastname, null, null, null, $vars, $customer->email, $customer->firstname.' '.$customer->lastname, null, null, null,
null, _PS_MAIL_DIR_, true); null, _PS_MAIL_DIR_, true);
Tools::redirectAdmin(self::$currentIndex.'&conf=4&token='.$this->token);
if (Tools::isSubmit('submitAddorder_returnAndStay'))
Tools::redirectAdmin(self::$currentIndex.'&conf=4&token='.$this->token.'&updateorder_return&id_order_return='.(int)$id_order_return);
else
Tools::redirectAdmin(self::$currentIndex.'&conf=4&token='.$this->token);
} }
} }
else else