// update order tab

admin-dev/themes/default/template/controllers/invoices/helpers/form/form.tpl

@@ -64,22 +64,18 @@
 	{if $input.type == 'checkboxStatuses'}
 		{foreach $input.values.query as $value}
 			{assign var=id_checkbox value=$input.name|cat:'_'|cat:intval($value[$input.values.id])}
-			<input type="checkbox"
+			<p class="checkbox">
-				name="{$input.name}[]"
+				<label for="{$id_checkbox}" class="control-label">
-				id="{$id_checkbox}"
+					<input type="checkbox" name="{$input.name}[]" id="{$id_checkbox}" value="{$value[$input.values.id]|intval}" {if isset($fields_value[$id_checkbox]) && $fields_value[$id_checkbox]}checked="checked"{/if} />
-				value="{$value[$input.values.id]|intval}"
-				{if isset($fields_value[$id_checkbox]) && $fields_value[$id_checkbox]}checked="checked"{/if} />
-			<label for="{$id_checkbox}"
-				style="float:none;{if !(isset($statusStats[$value['id_order_state']]) && $statusStats[$value['id_order_state']])}font-weight:normal;{/if}padding:0;text-align:left;width:100%;color:#000">
 						<img src="../img/admin/charged_{if $value['invoice']}ok{else}ko{/if}.gif" alt="" />
 						{$value[$input.values.name]}
 						({if isset($statusStats[$value['id_order_state']]) && $statusStats[$value['id_order_state']]}{$statusStats[$value['id_order_state']]}{else}0{/if})
-			</label><br />
+				</label>
+			</p>
 		{/foreach}
 	{else}
 		{$smarty.block.parent}
 	{/if}
 {/block}
 
-{block name="after"}<div style="clear:both">&nbsp;</div>{/block}
 

admin-dev/themes/default/template/controllers/modules/tab_modules_list.tpl

@@ -63,7 +63,7 @@
 			<ul class="nav">
 				{if count($tab_modules_list.installed)}
 					<li>
-						<a id="nav_tabs_modules_installed" class="btn btn-default" href="#" onclick="">
+						<a id="nav_tabs_modules_installed" class="panel-content" href="#" onclick="">
 							<i class="icon-plus-sign-alt"></i>
 							{l s='Installed'}
 						</a>
@@ -71,7 +71,7 @@
 				{/if}
 				{if count($tab_modules_list.not_installed)}
 					<li>
-						<a href="#" id="nav_tabs_modules_not_installed" class="btn btn-default">
+						<a href="#" id="nav_tabs_modules_not_installed" class="panel-content">
 							<i class="icon-minus-sign-alt"></i>
 							{l s='Not Installed'}
 						</a>
@@ -82,14 +82,14 @@
 	</div>
 	<div id="modules_list_container_content">
 		{if count($tab_modules_list.installed)}
-		<table id="tab_modules_list_installed">
+		<table id="tab_modules_list_installed" class="table table-striped table-hover">
 			{foreach from=$tab_modules_list.installed item=module}
 				{include file='controllers/modules/tab_module_line.tpl' class_row={cycle values=",rowalt"}}
 			{/foreach}
 		</table>
 		{/if}
 		{if count($tab_modules_list.not_installed)}
-		<table id="tab_modules_list_not_installed">
+		<table id="tab_modules_list_not_installed" class="table table-striped table-hover">
 			{foreach from=$tab_modules_list.not_installed item=module}
 				{include file='controllers/modules/tab_module_line.tpl' class_row={cycle values=",rowalt"}}
 			{/foreach}

admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl

@@ -59,56 +59,63 @@
 
 	{assign var="hook_invoice" value={hook h="displayInvoice" id_order=$order->id}}
 	{if ($hook_invoice)}
-	<div style="float: right; margin: -40px 40px 10px 0;">{$hook_invoice}</div><br class="clear" />
+	<div>{$hook_invoice}</div>
 	{/if}
 
-<div class="bloc-command">
+<div class="row">
-	<div class="button-command">
+	<div class="col-lg-12">
+		<div class="well">
+			<span>
+				{l s='Date:'} {dateFormat date=$order->date_add full=true} 
+			</span>
+			<span>
+				| {l s='Messages:'} {sizeof($messages)}
+			</span>
+			<span>
+				| <a href="{$link->getAdminLink('AdminCustomerThreads')|escape:'htmlall':'UTF-8'}">{l s='New Customer Messages:'}</a> 
+				<a href="{$link->getAdminLink('AdminCustomerThreads')|escape:'htmlall':'UTF-8'}">{sizeof($customer_thread_message)}</a>
+			</span>
+			<span>
+				| {l s='Products:'} {sizeof($products)}
+			</span>
+			<span>
+				| {l s='Total:'} {displayPrice price=$order->total_paid_tax_incl currency=$currency->id}
+			</span>
+			<span class="pull-right">
 				{if (count($invoices_collection))}
-				<a class="button" href="{$link->getAdminLink('AdminPdf')|escape:'htmlall':'UTF-8'}&submitAction=generateInvoicePDF&id_order={$order->id}" target="_blank">
+					<a href="{$link->getAdminLink('AdminPdf')|escape:'htmlall':'UTF-8'}&submitAction=generateInvoicePDF&id_order={$order->id}" target="_blank">
-					<img src="../img/admin/charged_ok.gif" alt="{l s='View invoice'}" /> {l s='View invoice'}
+						<i class="icon-file"></i> 
+						{l s='View invoice'}
 					</a>
 				{else}
-				<img src="../img/admin/charged_ko.gif" alt="{l s='No invoice'}" /> {l s='No invoice'}
+					<i class="icon-file"></i> {l s='No invoice'}
 				{/if}
 				 |
 				{if (($currentState && $currentState->delivery) || $order->delivery_number)}
-				<a class="button"  href="{$link->getAdminLink('AdminPdf')|escape:'htmlall':'UTF-8'}&submitAction=generateDeliverySlipPDF&id_order={$order->id}" target="_blank">
+					<a href="{$link->getAdminLink('AdminPdf')|escape:'htmlall':'UTF-8'}&submitAction=generateDeliverySlipPDF&id_order={$order->id}" target="_blank">
-					<img src="../img/admin/delivery.gif" alt="{l s='View delivery slip'}" /> {l s='View delivery slip'}
+						<i class="icon-suitcase"></i> {l s='View delivery slip'}
 					</a>
 				{else}
-				<img src="../img/admin/delivery_ko.gif" alt="{l s='No delivery slip'}" /> {l s='No delivery slip'}
+					<i class="icon-suitcase"></i> {l s='No delivery slip'}
 				{/if}
 				 |
-			<a class="button" href="javascript:window.print()"><img src="../img/admin/printer.gif" alt="{l s='Print order'}" title="{l s='Print order'}" /> {l s='Print order'}</a>
+				<a href="javascript:window.print()">
+					<i class="icon-print"></i> 
+					{l s='Print order'}
+				</a>
+			</span>
 		</div>
-		<div class="metadata-command">
-			<dl>
-				<dt>{l s='Date'} </dt>
-				<dd>{dateFormat date=$order->date_add full=true}</dd>
-			|</dl>
-			<dl>
-				<dt>{l s='Messages:'}</dt>
-				<dd>{sizeof($messages)}</dd>
-			|</dl>
-			<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>
-			<dl>
-				<dt>{l s='Products:'}</dt>
-				<dd id="product_number">{sizeof($products)}</dd>
-			|</dl>
-			<dl>
-				<dt>{l s='Total'}</dt>
-				<dd class="total_paid">{displayPrice price=$order->total_paid_tax_incl currency=$currency->id}</dd>
-			</dl>
-		<div class="clear"></div>
 	</div>
-</div>
+
-	<div class="container-command">
+	<div class="col-lg-12">
-		<!-- Left column -->
+		<div class="breadcrumb pull-right">
-		<div style="width: 49%; float:left;">
+			<b>{l s='Orders'}</b> :
+			{if $previousOrder}<a class="button" href="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&vieworder&id_order={$previousOrder}">{l s='< Prev'}</a>{/if}
+			{if $nextOrder}<a class="button" href="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&vieworder&id_order={$nextOrder}">{l s='Next >'}</a>{/if}
+		</div>
+	</div>
+
+	<div class="col-lg-12">
 		<!-- Change status form -->
 		<form action="{$currentIndex}&vieworder&token={$smarty.get.token}" method="post">
 			<select id="id_order_state" name="id_order_state">
@@ -121,8 +128,6 @@
 			<input type="hidden" name="id_order" value="{$order->id}" />
 			<input type="submit" name="submitState" value="{l s='Add'}" class="button" />
 		</form>
-			<br />
-
 		<!-- History of status -->
 		<table cellspacing="0" cellpadding="0" class="table history-status" style="width: 100%;">
 			<colgroup>
@@ -151,8 +156,12 @@
 		</table>
 
 		{if $customer->id}
+	</div>
+	<!-- Left column -->
+
 	<!-- Customer informations -->
-			<br />
+
+	<div class="col-lg-6">
 		<fieldset>
 			<legend><img src="../img/admin/tab-customers.gif" /> {l s='Customer information'}</legend>
 			<span style="font-weight: bold; font-size: 14px;"><a href="?tab=AdminCustomers&id_customer={$customer->id}&viewcustomer&token={getAdminToken tab='AdminCustomers'}"> {$customer->firstname} {$customer->lastname}</a></span> ({l s='#'}{$customer->id})<br />
@@ -178,7 +187,6 @@
 
 		<!-- Sources block -->
 		{if (sizeof($sources))}
-			<br />
 		<fieldset>
 			<legend><img src="../img/admin/tab-stats.gif" /> {l s='Sources'}</legend>
 			<ul {if sizeof($sources) > 3}style="height: 200px; overflow-y: scroll;"{/if}>
@@ -197,19 +205,119 @@
 		<!-- Admin order hook -->
 		{hook h="displayAdminOrder" id_order=$order->id}
 	</div>
-		<!-- END Left column -->
 	
-		<!-- Right column -->
+	<div class="col-lg-6">
-		<div style="width: 49%; float:right;">
+		<form action="{$smarty.server.REQUEST_URI}&token={$smarty.get.token}" method="post" onsubmit="if (getE('visibility').checked == true) return confirm('{l s='Do you want to send this message to the customer?'}');">
-			<div class="button-command-prev-next">
+		<fieldset>
-				<b>{l s='Orders'}</b> :
+			<legend onclick="$('#message').slideToggle();$('#message_m').slideToggle();return false"><img src="../img/admin/email_edit.gif" /> {l s='New message'}</legend>
-				{if $previousOrder}<a class="button" href="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&vieworder&id_order={$previousOrder}">{l s='< Prev'}</a>{/if}
+			<div id="message_m" style="display: {if Tools::getValue('message')}none{else}block{/if}; overflow: auto; width: 400px;">
-				{if $nextOrder}<a class="button" href="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&vieworder&id_order={$nextOrder}">{l s='Next >'}</a>{/if}
+				<a href="#" onclick="$('#message').slideToggle();$('#message_m').slideToggle();return false"><b>{l s='Click here'}</b> {l s='to add a comment or send a message to the customer.'}</a>
+			</div>
+			<a href="{$link->getAdminLink('AdminCustomerThreads')|escape:'htmlall':'UTF-8'}"><b>{l s='Click here'}</b> {l s='to see all messages.'}</a><br>
+			<div id="message" style="display: {if Tools::getValue('message')}block{else}none{/if}">
+						<select name="order_message" id="order_message" onchange="orderOverwriteMessage(this, '{l s='Do you want to overwrite your existing message?'}')">
+							<option value="0" selected="selected">-- {l s='Choose a standard message'} --</option>
+			{foreach from=$orderMessages item=orderMessage}
+				<option value="{$orderMessage['message']|escape:'htmlall':'UTF-8'}">{$orderMessage['name']}</option>
+			{/foreach}
+						</select><br /><br />
+						<b>{l s='Display to customer?'}</b>
+						<input type="radio" name="visibility" id="visibility" value="0" /> {l s='Yes'}
+						<input type="radio" name="visibility" value="1" checked="checked" /> {l s='No'}
+						<p id="nbchars" style="display:inline;font-size:10px;color:#666;"></p><br /><br />
+				<textarea id="txt_msg" name="message" cols="50" rows="8" onKeyUp="var length = document.getElementById('txt_msg').value.length; if (length > 600) length = '600+'; document.getElementById('nbchars').innerHTML = '{l s='600 characters, max.'} (' + length + ')';">{Tools::getValue('message')|escape:'htmlall':'UTF-8'}</textarea><br /><br />
+				<input type="hidden" name="id_order" value="{$order->id}" />
+				<input type="hidden" name="id_customer" value="{$order->id_customer}" />
+				<input type="submit" class="button" name="submitMessage" value="{l s='Send'}" />
+			</div>
+		</fieldset>
+		</form>
+
+	{if (sizeof($messages))}
+		<fieldset>
+		<legend><img src="../img/admin/email.gif" /> {l s='Messages'}</legend>
+		{foreach from=$messages item=message}
+			<div style="overflow:auto; width:400px;" {if $message['is_new_for_me']}class="new_message"{/if}>
+			{if ($message['is_new_for_me'])}
+				<a class="new_message" title="{l s='Mark this message as \'viewed\''}" href="{$smarty.server.REQUEST_URI}&token={$smarty.get.token}&messageReaded={$message['id_message']}"><img src="../img/admin/enabled.gif" alt="" /></a>
+			{/if}
+			{l s='At'} <i>{dateFormat date=$message['date_add']}
+			</i> {l s='from'} <b>{if ($message['elastname']|escape:'htmlall':'UTF-8')}{$message['efirstname']|escape:'htmlall':'UTF-8'} {$message['elastname']|escape:'htmlall':'UTF-8'}{else}{$message['cfirstname']|escape:'htmlall':'UTF-8'} {$message['clastname']|escape:'htmlall':'UTF-8'}{/if}</b>
+			{if ($message['private'] == 1)}<span style="color:red; font-weight:bold;">{l s='Private'}</span>{/if}
+			<p>{$message['message']|escape:'htmlall':'UTF-8'|nl2br}</p>
+			</div>
+			<br />
+		{/foreach}
+		</fieldset>
+	{/if}
+	</div>
+
+	<div class="col-lg-12">
+		<!-- Addresses -->
+		{if !$order->isVirtual()}
+			<div>
+				<!-- Shipping address -->
+				<fieldset>
+					<legend><img src="../img/admin/delivery.gif" alt="{l s='Shipping address'}" />{l s='Shipping address'}</legend>
+
+					{if $can_edit}
+					<form method="post" action="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&vieworder&id_order={$order->id}">
+						<div style="margin-bottom:5px;">
+							<p>
+								<select name="id_address">
+									{foreach from=$customer_addresses item=address}
+									<option value="{$address['id_address']}"{if $address['id_address'] == $order->id_address_delivery} selected="selected"{/if}>{$address['alias']} - {$address['address1']} {$address['postcode']} {$address['city']}{if !empty($address['state'])} {$address['state']}{/if}, {$address['country']}</option>
+									{/foreach}
+								</select>
+								<input class="button" type="submit" name="submitAddressShipping" value="{l s='Change'}" />
+							</p>
+						</div>
+					</form>
+					{/if}
+
+					<div style="float: right">
+						<a href="?tab=AdminAddresses&id_address={$addresses.delivery->id}&addaddress&realedit=1&id_order={$order->id}{if ($addresses.delivery->id == $addresses.invoice->id)}&address_type=1{/if}&token={getAdminToken tab='AdminAddresses'}&back={$smarty.server.REQUEST_URI|urlencode}"><img src="../img/admin/edit.gif" /></a>
+						<a href="http://maps.google.com/maps?f=q&hl={$iso_code_lang}&geocode=&q={$addresses.delivery->address1} {$addresses.delivery->postcode} {$addresses.delivery->city} {if ($addresses.delivery->id_state)} {$addresses.deliveryState->name}{/if}" target="_blank"><img src="../img/admin/google.gif" alt="" class="middle" /></a>
+					</div>
+
+					{displayAddressDetail address=$addresses.delivery newLine='<br />'}
+					{if $addresses.delivery->other}<hr />{$addresses.delivery->other}<br />{/if}
+				</fieldset>
+			</div>
+		{/if}
+		<div>
+			<!-- Invoice address -->
+			<fieldset>
+				<legend><img src="../img/admin/invoice.gif" alt="{l s='Invoice address'}" />{l s='Invoice address'}</legend>
+
+				{if $can_edit}
+				<form method="post" action="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&vieworder&id_order={$order->id}">
+					<div style="margin-bottom:5px;">
+						<p>
+							<select name="id_address">
+								{foreach from=$customer_addresses item=address}
+								<option value="{$address['id_address']}"{if $address['id_address'] == $order->id_address_invoice} selected="selected"{/if}>{$address['alias']} - {$address['address1']} {$address['postcode']} {$address['city']}{if !empty($address['state'])} {$address['state']}{/if}, {$address['country']}</option>
+								{/foreach}
+							</select>
+							<input class="button" type="submit" name="submitAddressInvoice" value="{l s='Change'}" />
+						</p>
+					</div>
+				</form>
+				{/if}
+
+				<div style="float: right">
+					<a href="?tab=AdminAddresses&id_address={$addresses.invoice->id}&addaddress&realedit=1&id_order={$order->id}{if ($addresses.delivery->id == $addresses.invoice->id)}&address_type=2{/if}&back={$smarty.server.REQUEST_URI|urlencode}&token={getAdminToken tab='AdminAddresses'}"><img src="../img/admin/edit.gif" /></a>
+				</div>
+
+				{displayAddressDetail address=$addresses.invoice newLine='<br />'}
+				{if $addresses.invoice->other}<hr />{$addresses.invoice->other}<br />{/if}
+			</fieldset>
+		</div>
 	</div>
-			<div class="clear"></div>
 
 	<!-- linked orders block -->
 	{if count($order->getBrother()) > 0}
+		<div class="col-lg-6">
 			<fieldset>
 				<legend><img src="../img/admin/tab-orders.gif" /> {l s='Linked orders'}</legend>
 				<table class="table" width="100%;" cellspacing="0" cellpadding="0">
@@ -248,9 +356,10 @@
 					</tbody>
 				</table>
 			</fieldset>
-				<br />
+		</div>
 	{/if}
 
+	<div class="col-lg-6">
 	<!-- Documents block -->
 		<fieldset>
 			<legend><img src="../img/admin/details.gif" /> {l s='Documents'}</legend>
@@ -258,8 +367,9 @@
 			{* Include document template *}
 			{include file='controllers/orders/_documents.tpl'}
 		</fieldset>
-			<br />
+	</div>
 
+	<div class="col-lg-6">
 		<!-- Payments block -->
 		<fieldset>
 			<legend><img src="../img/admin/money.gif" /> {l s='Payment: '}</legend>
@@ -417,10 +527,11 @@
 				</table>
 			</form>
 		</fieldset>
-			<br />
+	</div>
 
 	<!-- Shipping block -->
 	{if !$order->isVirtual()}
+		<div class="col-lg-6">
 			<fieldset>
 				<legend><img src="../img/admin/delivery.gif" /> {l s='Shipping'}</legend>
 
@@ -453,8 +564,8 @@
 					{$carrierModuleCall}
 				{/if}
 			</fieldset>
-				<br />
+		</div>
-
+		<div class="col-lg-6">
 			<!-- Return block -->
 			<fieldset>
 				<legend><img src="../img/admin/delivery.gif" /> {l s='Merchandise returns'}</legend>
@@ -500,75 +611,9 @@
 					{$carrierModuleCall}
 				{/if}
 			</fieldset>
-			{/if}
-		</div>
-		<!-- END Right column -->
-		<div class="clear" style="margin-bottom: 10px;"></div>
-	</div>
-
-	<div class="container-command container-command-top-spacing">
-		<!-- Addresses -->
-		{if !$order->isVirtual()}
-			<div style="width: 49%; float:left;">
-				<!-- Shipping address -->
-				<fieldset>
-					<legend><img src="../img/admin/delivery.gif" alt="{l s='Shipping address'}" />{l s='Shipping address'}</legend>
-
-					{if $can_edit}
-					<form method="post" action="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&vieworder&id_order={$order->id}">
-						<div style="margin-bottom:5px;">
-							<p>
-								<select name="id_address">
-									{foreach from=$customer_addresses item=address}
-									<option value="{$address['id_address']}"{if $address['id_address'] == $order->id_address_delivery} selected="selected"{/if}>{$address['alias']} - {$address['address1']} {$address['postcode']} {$address['city']}{if !empty($address['state'])} {$address['state']}{/if}, {$address['country']}</option>
-									{/foreach}
-								</select>
-								<input class="button" type="submit" name="submitAddressShipping" value="{l s='Change'}" />
-							</p>
-						</div>
-					</form>
-					{/if}
-
-					<div style="float: right">
-						<a href="?tab=AdminAddresses&id_address={$addresses.delivery->id}&addaddress&realedit=1&id_order={$order->id}{if ($addresses.delivery->id == $addresses.invoice->id)}&address_type=1{/if}&token={getAdminToken tab='AdminAddresses'}&back={$smarty.server.REQUEST_URI|urlencode}"><img src="../img/admin/edit.gif" /></a>
-						<a href="http://maps.google.com/maps?f=q&hl={$iso_code_lang}&geocode=&q={$addresses.delivery->address1} {$addresses.delivery->postcode} {$addresses.delivery->city} {if ($addresses.delivery->id_state)} {$addresses.deliveryState->name}{/if}" target="_blank"><img src="../img/admin/google.gif" alt="" class="middle" /></a>
-					</div>
-
-					{displayAddressDetail address=$addresses.delivery newLine='<br />'}
-					{if $addresses.delivery->other}<hr />{$addresses.delivery->other}<br />{/if}
-				</fieldset>
 		</div>
 	{/if}
-		<div style="width: 49%; float:right;">
+</div>
-			<!-- Invoice address -->
-			<fieldset>
-				<legend><img src="../img/admin/invoice.gif" alt="{l s='Invoice address'}" />{l s='Invoice address'}</legend>
-
-				{if $can_edit}
-				<form method="post" action="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&vieworder&id_order={$order->id}">
-					<div style="margin-bottom:5px;">
-						<p>
-							<select name="id_address">
-								{foreach from=$customer_addresses item=address}
-								<option value="{$address['id_address']}"{if $address['id_address'] == $order->id_address_invoice} selected="selected"{/if}>{$address['alias']} - {$address['address1']} {$address['postcode']} {$address['city']}{if !empty($address['state'])} {$address['state']}{/if}, {$address['country']}</option>
-								{/foreach}
-							</select>
-							<input class="button" type="submit" name="submitAddressInvoice" value="{l s='Change'}" />
-						</p>
-					</div>
-				</form>
-				{/if}
-
-				<div style="float: right">
-					<a href="?tab=AdminAddresses&id_address={$addresses.invoice->id}&addaddress&realedit=1&id_order={$order->id}{if ($addresses.delivery->id == $addresses.invoice->id)}&address_type=2{/if}&back={$smarty.server.REQUEST_URI|urlencode}&token={getAdminToken tab='AdminAddresses'}"><img src="../img/admin/edit.gif" /></a>
-				</div>
-
-				{displayAddressDetail address=$addresses.invoice newLine='<br />'}
-				{if $addresses.invoice->other}<hr />{$addresses.invoice->other}<br />{/if}
-			</fieldset>
-		</div>
-		<div class="clear" style="margin-bottom: 10px;"></div>
-	</div>
 
 	<form style="width: 98%" class="container-command-top-spacing" action="{$current_index}&vieworder&token={$smarty.get.token}&id_order={$order->id}" method="post" onsubmit="return orderDeleteProduct('{l s='This product cannot be returned.'}', '{l s='Quantity to cancel is greater than quantity available.'}');">
 		<input type="hidden" name="id_order" value="{$order->id}" />
@@ -740,55 +785,6 @@
 			</div>
 		</fieldset>
 	</form>
-	<div class="clear" style="height:20px;">&nbsp;</div>
-
-	<div style="float: left">
-		<form action="{$smarty.server.REQUEST_URI}&token={$smarty.get.token}" method="post" onsubmit="if (getE('visibility').checked == true) return confirm('{l s='Do you want to send this message to the customer?'}');">
-		<fieldset style="width: 400px;">
-			<legend style="cursor: pointer;" onclick="$('#message').slideToggle();$('#message_m').slideToggle();return false"><img src="../img/admin/email_edit.gif" /> {l s='New message'}</legend>
-			<div id="message_m" style="display: {if Tools::getValue('message')}none{else}block{/if}; overflow: auto; width: 400px;">
-				<a href="#" onclick="$('#message').slideToggle();$('#message_m').slideToggle();return false"><b>{l s='Click here'}</b> {l s='to add a comment or send a message to the customer.'}</a>
-			</div>
-			<a href="{$link->getAdminLink('AdminCustomerThreads')|escape:'htmlall':'UTF-8'}"><b>{l s='Click here'}</b> {l s='to see all messages.'}</a><br>
-			<div id="message" style="display: {if Tools::getValue('message')}block{else}none{/if}">
-						<select name="order_message" id="order_message" onchange="orderOverwriteMessage(this, '{l s='Do you want to overwrite your existing message?'}')">
-							<option value="0" selected="selected">-- {l s='Choose a standard message'} --</option>
-			{foreach from=$orderMessages item=orderMessage}
-				<option value="{$orderMessage['message']|escape:'htmlall':'UTF-8'}">{$orderMessage['name']}</option>
-			{/foreach}
-						</select><br /><br />
-						<b>{l s='Display to customer?'}</b>
-						<input type="radio" name="visibility" id="visibility" value="0" /> {l s='Yes'}
-						<input type="radio" name="visibility" value="1" checked="checked" /> {l s='No'}
-						<p id="nbchars" style="display:inline;font-size:10px;color:#666;"></p><br /><br />
-				<textarea id="txt_msg" name="message" cols="50" rows="8" onKeyUp="var length = document.getElementById('txt_msg').value.length; if (length > 600) length = '600+'; document.getElementById('nbchars').innerHTML = '{l s='600 characters, max.'} (' + length + ')';">{Tools::getValue('message')|escape:'htmlall':'UTF-8'}</textarea><br /><br />
-				<input type="hidden" name="id_order" value="{$order->id}" />
-				<input type="hidden" name="id_customer" value="{$order->id_customer}" />
-				<input type="submit" class="button" name="submitMessage" value="{l s='Send'}" />
-			</div>
-		</fieldset>
-		</form>
-
-	{if (sizeof($messages))}
-		<br />
-		<fieldset style="width: 400px;">
-		<legend><img src="../img/admin/email.gif" /> {l s='Messages'}</legend>
-		{foreach from=$messages item=message}
-			<div style="overflow:auto; width:400px;" {if $message['is_new_for_me']}class="new_message"{/if}>
-			{if ($message['is_new_for_me'])}
-				<a class="new_message" title="{l s='Mark this message as \'viewed\''}" href="{$smarty.server.REQUEST_URI}&token={$smarty.get.token}&messageReaded={$message['id_message']}"><img src="../img/admin/enabled.gif" alt="" /></a>
-			{/if}
-			{l s='At'} <i>{dateFormat date=$message['date_add']}
-			</i> {l s='from'} <b>{if ($message['elastname']|escape:'htmlall':'UTF-8')}{$message['efirstname']|escape:'htmlall':'UTF-8'} {$message['elastname']|escape:'htmlall':'UTF-8'}{else}{$message['cfirstname']|escape:'htmlall':'UTF-8'} {$message['clastname']|escape:'htmlall':'UTF-8'}{/if}</b>
-			{if ($message['private'] == 1)}<span style="color:red; font-weight:bold;">{l s='Private'}</span>{/if}
-			<p>{$message['message']|escape:'htmlall':'UTF-8'|nl2br}</p>
-			</div>
-			<br />
-		{/foreach}
-		</fieldset>
-	{/if}
-	</div>
-
 
 	<div class="clear">&nbsp;</div>
 	<br /><br /><a href="{$current_index}&token={$smarty.get.token}"><img src="../img/admin/arrow2.gif" /> {l s='Back to list'}</a><br />

controllers/admin/AdminInvoicesController.php

@@ -28,6 +28,7 @@ class AdminInvoicesControllerCore extends AdminController
 {
 	public function __construct()
 	{
+		$this->bootstrap = true;
 		$this->table = 'invoice';
 
 		parent::__construct();