// orders WIP

admin-dev/themes/default/css/admin-theme.css

@@ -1,4 +1,4 @@
-/*
+/*!
  * Bootstrap v3.0.0
  *
  * Copyright 2013 Twitter, Inc
@@ -7,7 +7,7 @@
  *
  * Designed and built with all the love in the world by @mdo and @fat.
  */
-/* normalize.css v2.1.0 | MIT License | git.io/normalize */
+/*! normalize.css v2.1.0 | MIT License | git.io/normalize */
 /* line 22, ../bower_components/sass-bootstrap/lib/_normalize.scss */
 article, aside, details, figcaption, figure, footer, header, hgroup, main, nav, section, summary {
   display: block; }
@@ -5717,7 +5717,7 @@ th.visible-print, td.visible-print {
   /* line 523, ../bower_components/sass-bootstrap/lib/_mixins.scss */
   th.hidden-print, td.hidden-print {
     display: none !important; } }
-/*
+/*!
  *  Font Awesome 3.2.1
  *  the iconic font designed for Bootstrap
  *  ------------------------------------------------------------------------------
@@ -8146,7 +8146,7 @@ textarea {
   border-color: #cccccc !important; }
 
 /* line 559, admin-theme.sass */
-.highlight {
+tr.highlight td {
   background-color: #ffffc0; }
 
 /* line 562, admin-theme.sass */

admin-dev/themes/default/css/admin-theme.sass

@@ -556,7 +556,7 @@ textarea
 	background-color: white
 	border-color: #ccc!important
 
-.highlight
+tr.highlight td
 	background-color: #FFFFC0
 
 .hook_panel

admin-dev/themes/default/template/controllers/orders/_discount_form.tpl

@@ -23,66 +23,78 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-<div class="row">
+<div class="form-group">
-	<label class="control-label col-lg-3">
+	<label class="control-label">
 		{l s='Name'}
-		<input type="text" name="discount_name" value="" />
 	</label>
-
+	<input class="form-control" type="text" name="discount_name" value="" />
-	<label class="control-label col-lg-3">
+</div>
+<div class="form-group">
+	<label class="control-label">
 		{l s='Type'}
-		<select name="discount_type" id="discount_type">
-			<option value="1">{l s='Percent'}</option>
-			<option value="2">{l s='Amount'}</option>
-			<option value="3">{l s='Free shipping'}</option>
-		</select>
 	</label>
-
+	<select class="form-control" name="discount_type" id="discount_type">
+		<option value="1">{l s='Percent'}</option>
+		<option value="2">{l s='Amount'}</option>
+		<option value="3">{l s='Free shipping'}</option>
+	</select>
+</div>
+<div class="form-group">
 	<div id="discount_value_field">
-		<label class="control-label col-lg-3">
+		<label class="control-label">
 			{l s='Value'}
-			
+		</label>
+		<div class="input-group">
 			{if ($currency->format % 2)}
-				<span id="discount_currency_sign" style="display: none;">{$currency->sign}</span>
+				<span id="discount_currency_sign" class="input-group-addon" style="display: none;">{$currency->sign}</span>
 			{else}
-				<span id="discount_percent_symbol">%</span>
+				<span id="discount_percent_symbol" class="input-group-addon">%</span>
 			{/if}
 			{if !($currency->format % 2)}
-				<span id="discount_currency_sign" style="display: none;">{$currency->sign}</span>
+				<span id="discount_currency_sign" class="input-group-addon" style="display: none;">{$currency->sign}</span>
 			{/if}
-			<input type="text" name="discount_value" size="3" />
+			<input class="form-control" type="text" name="discount_value"/>
-			<p class="text-muted" id="discount_value_help" style="display: none;">
+		</div>
-				{l s='This value must include taxes.'}
+		<p class="text-muted" id="discount_value_help" style="display: none;">
-			</p>
+			{l s='This value must include taxes.'}
-		</label>
+		</p>
 	</div>
-
-	{if $order->hasInvoice()}
-	<label class="control-label col-lg-3">
-		{l s='Invoice'}
-		<select name="discount_invoice">
-			{foreach from=$invoices_collection item=invoice}
-				<option value="{$invoice->id}" selected="selected">{$invoice->getInvoiceNumberFormatted($current_id_lang)} - {displayPrice price=$invoice->total_paid_tax_incl currency=$order->id_currency}</option>
-			{/foreach}
-		</select>
-		<p class="checkbox">
-			<label class="control-label" for="discount_all_invoices">
-				<input type="checkbox" name="discount_all_invoices" id="discount_all_invoices" value="1" /> 
-				{l s='Apply on all invoices'}
-			</label>
-		</p>
-		<p class="text-muted">
-			{l s='If you chooses to create this discount for all invoices, only one discount will be created per order invoice.'}
-		</p>
-	</label>
-	{/if}
-
-	<p class="col-lg-12 text-right">
-		<input class="btn btn-default" type="submit" name="submitNewVoucher" value="{l s='Add'}" />
-		<a href="#" id="cancel_add_voucher" class="btn btn-default">
-			<i class="icon-remove"></i>
-			{l s='Cancel'}
-		</a>
-	</p>
 </div>
 
+{if $order->hasInvoice()}
+<div class="form-group">
+	<label class="control-label">
+		{l s='Invoice'}
+	</label>
+	<select name="discount_invoice">
+		{foreach from=$invoices_collection item=invoice}
+		<option value="{$invoice->id}" selected="selected">
+			{$invoice->getInvoiceNumberFormatted($current_id_lang)} - {displayPrice price=$invoice->total_paid_tax_incl currency=$order->id_currency}
+		</option>
+		{/foreach}
+	</select>
+</div>
+
+<div class="form-group">
+	<p class="checkbox">
+		<label class="control-label" for="discount_all_invoices">
+			<input type="checkbox" name="discount_all_invoices" id="discount_all_invoices" value="1" /> 
+			{l s='Apply on all invoices'}
+		</label>
+	</p>
+	<p class="help-block">
+		{l s='If you chooses to create this discount for all invoices, only one discount will be created per order invoice.'}
+	</p>
+	{/if}
+</div>
+
+<div class="form-group">
+	<button class="btn btn-default" type="submit" name="submitNewVoucher">
+		<i class="icon-ok"></i>
+		{l s='Add'}
+	</button>
+	<button class="btn btn-default" type="button" id="cancel_add_voucher">
+		<i class="icon-remove"></i>
+		{l s='Cancel'}
+	</button>
+</div>

js/admin_order.js

@@ -797,16 +797,16 @@ function init()
 
 	$('#add_voucher').unbind('click');
 	$('#add_voucher').click(function() {
-		$(this).parent().parent().hide();
+		$(this).hide();
-		$('#voucher_form').parent().show();
+		$('#voucher_form').show();
 
 		return false;
 	});
 
 	$('#cancel_add_voucher').unbind('click');
 	$('#cancel_add_voucher').click(function() {
-		$('#voucher_form').parent().hide();
+		$('#voucher_form').hide();
-		$('#add_voucher').parent().parent().show();
+		$('#add_discount_btn').show();
 
 		return false;
 	});