Merge branch 'evo-configurations' into develop

This commit is contained in:
Marion Muszynski 2017-01-09 15:28:43 +01:00
commit 7a2b74a9b6

View File

@ -500,7 +500,7 @@ class AdminPrivateSalesSales extends AdminTab {
carriers_info += "<p>"+$(el).data("carrier-name")+"</p>";
carriers_selected.push($(el).val());
});
var config_carriers_socol = ['.Configuration::get('ANT_CARRIERS_SOCOL').'];
var config_carriers_socol = ["'.str_replace(',','","',Configuration::get('ANT_CARRIERS_SOCOL')).'"];
var is_equal = carriers_selected.length==config_carriers_socol.length && carriers_selected.every(function(v,i) { return ($.inArray(v,config_carriers_socol) != -1)})
$(".carriers_info div.info").html(carriers_info);
if (is_equal) {