Merge branch 'ticket-11985-CarrierSelection'

This commit is contained in:
Marion Muszynski 2017-07-04 15:29:42 +02:00
commit 0e9d19a20f

View File

@ -820,13 +820,12 @@ class AdminLogistics extends AdminTab {
$("#orderInfos").html(content);
if($.inArray(String(loaded.order.id_carrier), carriers_laposte) > 0) {
$("#parcel_carrier").val("laposte");
} else if($.inArray(String(loaded.order.id_carrier), carriers_exapaq) > 0) {
$("#parcel_carrier").val("exapaq");
} else if($.inArray(String(loaded.order.id_carrier), carriers_mondialrelay) > 0) {
$("#parcel_carrier").val("mondialrelay");
if($.inArray(String(loaded.order.id_carrier), carriers_laposte) != -1) {
$("#parcel_carrier option[value=\'lasposte\']").attr("selected","selected");
} else if($.inArray(String(loaded.order.id_carrier), carriers_exapaq) != -1) {
$("#parcel_carrier option[value=\'exapaq\']").attr("selected","selected");
} else if($.inArray(String(loaded.order.id_carrier), carriers_mondialrelay) != -1) {
$("#parcel_carrier option[value=\'mondialrelay\']").attr("selected","selected");
}
$("#orderInfos").show();