From ba7d9eec21bda0c5afabf5da08e39139297f3d04 Mon Sep 17 00:00:00 2001
From: Kevin Granger <shipowlata@gmail.com>
Date: Mon, 7 Oct 2013 11:11:21 +0200
Subject: [PATCH] // fix Orders

---
 .../controllers/orders/_discount_form.tpl     | 12 ++--
 .../controllers/orders/_new_product.tpl       | 61 ++++++++++++-------
 .../controllers/orders/helpers/view/view.tpl  | 12 +---
 controllers/admin/AdminOrdersController.php   |  2 +-
 4 files changed, 45 insertions(+), 42 deletions(-)

diff --git a/admin-dev/themes/default/template/controllers/orders/_discount_form.tpl b/admin-dev/themes/default/template/controllers/orders/_discount_form.tpl
index d4fac3786..d59685c5f 100644
--- a/admin-dev/themes/default/template/controllers/orders/_discount_form.tpl
+++ b/admin-dev/themes/default/template/controllers/orders/_discount_form.tpl
@@ -52,15 +52,11 @@
 		</label>
 		<div class="col-lg-9">
 			<div class="input-group">
-				{if ($currency->format % 2)}
-					<span id="discount_currency_sign" class="input-group-addon" style="display: none;">{$currency->sign}</span>
-				{else}
-					<span id="discount_percent_symbol" class="input-group-addon">%</span>
-				{/if}
+				<div class="input-group-addon">
+					<span id="discount_currency_sign" style="display: none;">{$currency->sign}</span>
 
-				{if !($currency->format % 2)}
-					<span id="discount_currency_sign" class="input-group-addon" style="display: none;">{$currency->sign}</span>
-				{/if}
+					<span id="discount_percent_symbol">%</span>
+				</div>
 				<input class="form-control" type="text" name="discount_value"/>
 			</div>
 			<p class="text-muted" id="discount_value_help" style="display: none;">
diff --git a/admin-dev/themes/default/template/controllers/orders/_new_product.tpl b/admin-dev/themes/default/template/controllers/orders/_new_product.tpl
index 55d02a0dc..266b1e856 100644
--- a/admin-dev/themes/default/template/controllers/orders/_new_product.tpl
+++ b/admin-dev/themes/default/template/controllers/orders/_new_product.tpl
@@ -25,34 +25,49 @@
 <tr id="new_product" style="display:none">
 	<td style="display:none;" colspan="2">
 		<input type="hidden" id="add_product_product_id" name="add_product[product_id]" value="0" />
-		{l s='Product:'} <input type="text" id="add_product_product_name" value=""/>
-		<div id="add_product_product_attribute_area" style="display: none;">
-			{l s='Combinations'} <select name="add_product[product_attribute_id]" id="add_product_product_attribute_id"></select>
+
+		<div class="form-group">
+			<label>{l s='Product:'}</label>
+			<div class="input-group">
+				<input type="text" id="add_product_product_name" value=""/>
+				<div class="input-group-addon">
+					<i class="icon-search"></i>
+				</div>
+			</div>
 		</div>
-		<div id="add_product_product_warehouse_area" style="display: none;">
-			{l s='Warehouse'} <select  id="add_product_warehouse" name="add_product_warehouse">
-			</select>
+		
+		<div id="add_product_product_attribute_area" class="form-group" style="display: none;">
+			<label>{l s='Combinations'}</label>
+			<select name="add_product[product_attribute_id]" id="add_product_product_attribute_id"></select>
+		</div>
+
+		<div id="add_product_product_warehouse_area" class="form-group" style="display: none;">
+			<label>{l s='Warehouse'}</label>
+			<select  id="add_product_warehouse" name="add_product_warehouse"></select>
 		</div>
 	</td>
+
 	<td style="display:none;">
-		{if $currency->sign % 2}
-			{$currency->sign}
-		{/if}
-		<input type="text" name="add_product[product_price_tax_excl]" id="add_product_product_price_tax_excl" value="" disabled="disabled" />
-		{if !($currency->sign % 2)}
-			{$currency->sign}
-		{/if}
-		{l s='tax excl.'}
-		<br />
-		{if $currency->sign % 2}
-			{$currency->sign}
-		{/if}
-		<input type="text" name="add_product[product_price_tax_incl]" id="add_product_product_price_tax_incl" value="" disabled="disabled" />
-		{if !($currency->sign % 2)}
-			{$currency->sign}
-		{/if}
-		{l s='tax incl.'}<br />
+		<div class="form-group">
+			<div class="input-group">
+				<div class="input-group-addon">
+					{$currency->sign}
+					{l s='tax excl.'}
+				</div>
+				<input type="text" name="add_product[product_price_tax_excl]" id="add_product_product_price_tax_excl" value="" disabled="disabled" />
+			</div>
+		</div>
+		<div class="form-group">
+			<div class="input-group">
+				<div class="input-group-addon">
+					{$currency->sign}
+					{l s='tax incl.'}
+				</div>
+				<input type="text" name="add_product[product_price_tax_incl]" id="add_product_product_price_tax_incl" value="" disabled="disabled" />
+			</div>
+		</div>
 	</td>
+
 	<td style="display:none;" class="productQuantity">
 		<input type="text" name="add_product[product_quantity]" id="add_product_product_quantity" value="1" disabled="disabled" />
 	</td>
diff --git a/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
index c35d56fbc..210f22430 100755
--- a/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
+++ b/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
@@ -74,6 +74,7 @@
 				<i class="icon-comments"></i>
 				<span class="title">{l s='Messages'}<br /><small>sous-titre</small></span>
 				<span class="value">{sizeof($messages)}</span>
+				<span class="value"><a href="{$link->getAdminLink('AdminCustomerThreads')|escape:'htmlall':'UTF-8'}">{sizeof($customer_thread_message)}</a></span>
 			</div>
 			<div class="col-lg-3 box-stats color1" >
 				<i class="icon-ok"></i>
@@ -168,15 +169,6 @@
 					<i class="icon-print"></i>
 					{l s='Print order'}
 				</a>
-				<hr/>
-				<dl>
-					<dt>
-						<a href="{$link->getAdminLink('AdminCustomerThreads')|escape:'htmlall':'UTF-8'}">{l s='New Customer Messages:'}</a>
-					</dt>
-					<dd>
-						<a href="{$link->getAdminLink('AdminCustomerThreads')|escape:'htmlall':'UTF-8'}">{sizeof($customer_thread_message)}</a>
-					</dd>
-				</dl>
 			</div>
 		</div>
 	</div>
@@ -1037,7 +1029,7 @@
 							<i class="icon-remove text-danger"></i>
 							{l s='Cancel'}
 						</button>
-						<button type="submit" id="submitMessage" class="btn btn-default" >
+						<button type="submit" id="submitMessage" class="btn btn-default" name="submitMessage">
 							<i class="icon-ok text-success"></i>
 							{l s='Send'}
 						</button>
diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php
index be1f5b4af..4b885816d 100755
--- a/controllers/admin/AdminOrdersController.php
+++ b/controllers/admin/AdminOrdersController.php
@@ -1047,7 +1047,7 @@ class AdminOrdersControllerCore extends AdminController
 			else
 				$this->errors[] = Tools::displayError('You do not have permission to edit this.');
 		}
-		elseif (Tools::getValue('submitNewVoucher') && isset($order))
+		elseif (Tools::isSubmit('submitNewVoucher') && isset($order))
 		{
 			if ($this->tabAccess['edit'] === '1')
 			{