Merge branch 'ticket-11056' into develop

This commit is contained in:
Marion Muszynski 2016-10-20 14:03:30 +02:00
commit 49aeb076ac

View File

@ -500,12 +500,14 @@ class AdminPrivateSalesSales extends AdminTab {
carriers_selected.push($(el).val());
});
$(".carriers_info div.info").html(carriers_info);
if (carriers_selected.indexOf("45") && carriers_selected.indexOf("47") && carriers_selected.indexOf("48")) {
$("#delivery_mode option[val=\'1\']").attr("selected", "selected");
} else if (carriers_selected.indexOf("45")) {
$("#delivery_mode option[val=\'2\']").attr("selected", "selected");
} else if (carriers_selected.indexOf("22")) {
("#delivery_mode option[val=\'3\']").attr("selected", "selected");
console.log($.inArray("45",carriers_selected));
if ($.inArray("45",carriers_selected)!= -1 && $.inArray("47",carriers_selected)!= -1 && $.inArray("48",carriers_selected)!= -1) {
$("#delivery_mode option[value=\'1\']").attr("selected","selected");
} else if ($.inArray("45",carriers_selected)!= -1) {
console.log("test");
$("#delivery_mode option[value=\'2\']").attr("selected","selected");
} else if ($.inArray("22",carriers_selected)!= -1) {
$("#delivery_mode option[value=\'3\']").attr("selected","selected");
}
$("#delivery_mode").change(function(){