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

Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap

Browse Source 
Conflicts:
	admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/modules_positions/form.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/products/input_text_lang.tpl
	admin-dev/themes/default/template/controllers/products/shipping.tpl
	admin-dev/themes/default/template/controllers/shipping/content.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/helpers/list/list_header.tpl
	admin-dev/themes/default/template/toolbar.tpl
	classes/helper/HelperList.php
	controllers/admin/AdminCategoriesController.php
	controllers/admin/AdminManufacturersController.php
	controllers/admin/AdminModulesPositionsController.php
	controllers/admin/AdminPerformanceController.php
	controllers/admin/AdminStockInstantStateController.php
	css/admin.css
	js/admin-products.js
	js/admin.js
This commit is contained in:
Kevin Granger
2013-08-21 09:14:10 +02:00
parent 17be1e7528 f610b0d844
commit 3005ca39f2
274 changed files with 9470 additions and 1279 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminStatusesController.php
+11 -9
View File
@@ -225,14 +225,6 @@ class AdminStatusesControllerCore extends AdminController
}
public function renderForm()
{
if (Tools::isSubmit('updateorder_state') || Tools::isSubmit('addorder_state'))
return $this->renderOrderStatusForm();
else if (Tools::isSubmit('updateorder_return_state') || Tools::isSubmit('addorder_return_state'))
return $this->renderOrderReturnsForm();
}
protected function renderOrderStatusForm()
{
$this->fields_form = array(
'tinymce' => true,
@@ -362,7 +354,17 @@ class AdminStatusesControllerCore extends AdminController
'class' => 'button'
)
);
if (Tools::isSubmit('updateorder_state') || Tools::isSubmit('addorder_state'))
return $this->renderOrderStatusForm();
else if (Tools::isSubmit('updateorder_return_state') || Tools::isSubmit('addorder_return_state'))
return $this->renderOrderReturnsForm();
else
return parent::renderForm();
}
protected function renderOrderStatusForm()
{
if (!($obj = $this->loadObject(true)))
return;