// Fix PSTEST-396

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

@@ -431,10 +431,20 @@
 	function updateCarrierList(carriers)
 	{
 		var html = '';
+		if (carriers.length > 0)
+		{
 			$.each(carriers, function() {
 				html += '<option value="'+this.id_carrier+'">'+this.name+' - '+this.delay+'</option>';
 			});
+			$('#carrier_form').show();
 			$('#id_carrier').html(html);
+			$('#carriers_err').hide();
+		}
+		else
+		{
+			$('#carrier_form').hide();
+			$('#carriers_err').show().html('{l s='No carrier can be applied to this order'}');
+		}
 	}
 
 	function searchProducts()
@@ -551,7 +561,7 @@
 		updateCartVouchers(jsonSummary.summary.discounts);
 		updateAddressesList(jsonSummary.addresses, jsonSummary.cart.id_address_delivery, jsonSummary.cart.id_address_invoice);
 
-		if (!jsonSummary.summary.products.length || !jsonSummary.addresses.length)
+		if (!jsonSummary.summary.products.length || !jsonSummary.addresses.length || !jsonSummary.cart.id_carrier)
 			$('#carriers_part,#summary_part').hide();
 		else
 			$('#carriers_part,#summary_part').show();
@@ -746,7 +756,6 @@
 		var addresses_invoice_options = '';
 		var address_invoice_detail = '';
 		var address_delivery_detail = '';
-		
 		$.each(addresses, function() {
 			if (this.id_address == id_address_invoice)
 				address_invoice_detail = this.company+' '+this.firstname+' '+this.lastname+'<br />'+this.address1+'<br />'+this.address2+'<br />'+this.postcode+' '+this.city+' '+this.country;
@@ -782,27 +791,10 @@
 			success : function(res)
 			{
 				displaySummary(res);
-				var x;
-				for(x in res.addresses)
-				{
-					if (res.addresses[x].id_address == $('#id_address_delivery option:selected').val())
-						displayAddressDetail('address_delivery_detail', res.addresses[x]);
-					else if (res.addresses[x].id_address == $('#id_address_invoice option:selected').val())
-						displayAddressDetail('address_invoice_detail', res.addresses[x]);
-				}
 			}
 		});
 	}
 
-	function displayAddressDetail(id, address)
-	{
-		var address_detail = address.company+' '+address.firstname+' '+address.lastname+'<br />';
-		address_detail += address.address1+'<br />';
-		address_detail += address.address2+'<br />';
-		address_detail += address.postcode+' '+address.city+' '+address.country;
-		$('#'+id).html(address_detail);
-	}
-
 </script>
 {if $show_toolbar}
 	<div class="toolbar-placeholder">
@@ -990,6 +982,8 @@
 <br />
 <fieldset id="carriers_part" style="display:none;">
 	<legend><img src="../img/t/AdminCarriers.gif" />{l s='Carriers'}</legend>
+	<div id="carriers_err" style="display:none;" class="warn"></div>
+		<div id="carrier_form">
 			<div>
 				<p>
 					<label>{l s='Carriers:'} </label>
@@ -1010,6 +1004,8 @@
 					<p><label for="gift_message">{l s='Gift message:'}</label><textarea id="gift_message" cols="40" rows="4"></textarea></p>
 				{/if}
 			</div>
+		</div>
+	</div>
 </fieldset>
 <br />
 <fieldset id="summary_part" style="display:none;">

classes/AdminController.php

@@ -1604,12 +1604,15 @@ class AdminControllerCore extends Controller
 			_PS_JS_DIR_.'toggle.js',
 			_PS_JS_DIR_.'tools.js',
 			_PS_JS_DIR_.'ajax.js',
-			_PS_JS_DIR_.'notifications.js',
 			_PS_JS_DIR_.'toolbar.js'
 		));
 
+		if (!Tools::getValue('submitFormAjax'))
+		{
+			$this->addJs(_PS_JS_DIR_.'notifications.js');
 			if (Configuration::get('PS_HELPBOX'))
 				$this->addJS(_PS_JS_DIR_.'helpAccess.js');
+      }
 	}
 	/**
 	 * use translations files to replace english expression.