Merge pull request #16088 from atomiix/fix-cart-rule-conflict

Disable Customer group selection checkbox when single customer is set…
PrestaShop · Oct 31, 2019 · 378bd21 · 378bd21
2 parents c28c1e6 + b996178
commit 378bd21
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/admin-dev/themes/default/template/controllers/cart_rules/form.js b/admin-dev/themes/default/template/controllers/cart_rules/form.js
@@ -105,14 +105,22 @@ var restrictions = new Array('country', 'carrier', 'group', 'cart_rule', 'shop')
 for (i in restrictions)
 {
 	toggleCartRuleFilter($('#' + restrictions[i] + '_restriction'));
-	$('#' + restrictions[i] + '_restriction').click(function() {toggleCartRuleFilter(this);});
+	$('#' + restrictions[i] + '_restriction').change(function() {toggleCartRuleFilter(this);});
 	$('#' + restrictions[i] + '_select_remove').click(function() {removeCartRuleOption(this);});
 	$('#' + restrictions[i] + '_select_add').click(function() {addCartRuleOption(this);});
 }
 
 toggleCartRuleFilter($('#product_restriction'));
 
-$('#product_restriction').click(function() {
+$('#group_restriction').change(function() {
+  $('#customerFilter').prop('disabled', $(this).prop('checked'));
+}).change();
+
+$('#customerFilter').on('change keyup', function() {
+    $('#group_restriction').prop('disabled', $(this).val() !== '');
+}).change();
+
+$('#product_restriction').change(function() {
 	toggleCartRuleFilter(this);
 
 	if ($(this).prop('checked'))
@@ -497,8 +505,8 @@ $(document).ready(function() {
 			callback: function(text) { combinable_filter('#cart_rule_select_2', text, 'selected'); }
 		});
 	}
-  
-  displayProductAttributes();  
+
+  displayProductAttributes();
 });