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

// Added color management of the return states in the UI #PSCFV-3606

Browse Source
This commit is contained in:
dMetzger
2012-08-13 14:07:48 +00:00
parent 20db4b77d9
commit 58fe8a66ea
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminStatusesController.php
+11 -3
View File
@@ -174,8 +174,9 @@ class AdminStatusesControllerCore extends AdminController
if ($order_return_state->id) if ($order_return_state->id)
$helper->fields_value = array( $helper->fields_value = array(
'name' => $this->getFieldValue($order_return_state, 'name') 'name' => $this->getFieldValue($order_return_state, 'name'),
); 'color' => $this->getFieldValue($order_return_state, 'color'),
);
else else
$helper->fields_value = $this->getFieldsValue($order_return_state); $helper->fields_value = $this->getFieldsValue($order_return_state);
$helper->toolbar_btn = $this->toolbar_btn; $helper->toolbar_btn = $this->toolbar_btn;
@@ -376,6 +377,13 @@ class AdminStatusesControllerCore extends AdminController
'required' => true, 'required' => true,
'hint' => $this->l('Invalid characters: numbers and').' !<>,;?=+()@#"�{}_$%:', 'hint' => $this->l('Invalid characters: numbers and').' !<>,;?=+()@#"�{}_$%:',
'desc' => $this->l('Order return status name') 'desc' => $this->l('Order return status name')
),
array(
'type' => 'color',
'label' => $this->l('Color:'),
'name' => 'color',
'size' => 30,
'desc' => $this->l('Status will be highlighted in this color. HTML colors only (e.g.').' "lightblue", "#CC6600")'
) )
), ),
'submit' => array( 'submit' => array(
@@ -383,7 +391,6 @@ class AdminStatusesControllerCore extends AdminController
'class' => 'button' 'class' => 'button'
) )
); );
return $helper->generateForm($this->fields_form); return $helper->generateForm($this->fields_form);
} }
@@ -414,6 +421,7 @@ class AdminStatusesControllerCore extends AdminController
// Create Object OrderReturnState // Create Object OrderReturnState
$order_return_state = new OrderReturnState((int)$id_order_return_state); $order_return_state = new OrderReturnState((int)$id_order_return_state);
$order_return_state->color = Tools::getValue('color');
$order_return_state->name = array(); $order_return_state->name = array();
$languages = Language::getLanguages(false); $languages = Language::getLanguages(false);
foreach ($languages as $language) foreach ($languages as $language)