diff --git a/admin-dev/themes/default/template/controllers/return/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/return/helpers/form/form.tpl index 3c5ef7cc7..1d9d6510b 100644 --- a/admin-dev/themes/default/template/controllers/return/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/controllers/return/helpers/form/form.tpl @@ -28,12 +28,12 @@ {block name="input"} {if $input.type == 'text_customer'} - {$customer->firstname} {$customer->lastname} + {$customer->firstname} {$customer->lastname}
{l s='View details on customer page'}
{elseif $input.type == 'text_order'} - {$text_order} + {$text_order}{l s='View details on order page'}
diff --git a/controllers/admin/AdminReturnController.php b/controllers/admin/AdminReturnController.php index 2a9da8fa0..7242f2cf3 100644 --- a/controllers/admin/AdminReturnController.php +++ b/controllers/admin/AdminReturnController.php @@ -132,7 +132,7 @@ class AdminReturnControllerCore extends AdminController $products = OrderReturn::getOrdersReturnProducts($this->object->id, $order); // Prepare customer explanation for display - $this->object->question = nl2br($this->object->question); + $this->object->question = ''.nl2br($this->object->question).''; $this->tpl_form_vars = array( 'customer' => new Customer($this->object->id_customer), diff --git a/css/admin.css b/css/admin.css index 619128ae7..0d102e32f 100644 --- a/css/admin.css +++ b/css/admin.css @@ -199,6 +199,12 @@ background: -moz-linear-gradient(center top , #F9F9F9, #ECECEC) repeat-x scroll color: #7F7F7F; font-size: 0.85em; } +.margin-form .normal-text { + display: block; + padding-top: 0.2em; + font-size: 1.2em; + color: black; +} fieldset.width1 .margin-form { margin: 0 0 1em 130px;