Issue #3407043 by khiminrm, rszrama: Add a negate option to the customer...

Issue #3407043 by khiminrm, rszrama: Add a negate option to the customer shipping/billing address condition.

modules/order/src/Plugin/Commerce/Condition/CustomerAddressBase.php

@@ -18,6 +18,7 @@ abstract class CustomerAddressBase extends ConditionBase {
   public function defaultConfiguration() {
     return [
       'zone' => NULL,
+      'operator' => 'in',
     ] + parent::defaultConfiguration();
   }
 
@@ -27,6 +28,17 @@ abstract class CustomerAddressBase extends ConditionBase {
   public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
     $form = parent::buildConfigurationForm($form, $form_state);
 
+    $form['operator'] = [
+      '#type' => 'select',
+      '#field_prefix' => $this->t('Address '),
+      '#field_suffix' => $this->t(' in one of the following territories:'),
+      '#options' => [
+        'in' => $this->t('must be'),
+        'not in' => $this->t('must NOT be'),
+      ],
+      '#default_value' => $this->configuration['operator'],
+    ];
+
     $form['zone'] = [
       '#type' => 'address_zone',
       '#default_value' => $this->configuration['zone'],
@@ -51,6 +63,7 @@ abstract class CustomerAddressBase extends ConditionBase {
     unset($values['zone']['label']);
 
     $this->configuration['zone'] = $values['zone'];
+    $this->configuration['operator'] = $values['operator'];
   }
 
   /**
@@ -78,6 +91,10 @@ abstract class CustomerAddressBase extends ConditionBase {
       return FALSE;
     }
 
+    if (!empty($this->configuration['operator']) && $this->configuration['operator'] == 'not in') {
+      return !$zone->match($address);
+    }
+
     return $zone->match($address);
   }
 

modules/order/tests/src/Unit/Plugin/Commerce/Condition/OrderBillingAddressTest.php

@@ -59,6 +59,16 @@ class OrderBillingAddressTest extends UnitTestCase {
     ], 'order_billing_address', ['entity_type' => 'commerce_order', 'profile_scope' => 'billing']);
     $this->assertFalse($condition->evaluate($order));
 
+    $condition = new OrderBillingAddress([
+      'zone' => [
+        'territories' => [
+          ['country_code' => 'US', 'administrative_area' => 'CA'],
+        ],
+      ],
+      'operator' => 'not in',
+    ], 'order_billing_address', ['entity_type' => 'commerce_order', 'profile_scope' => 'billing']);
+    $this->assertTrue($condition->evaluate($order));
+
     $condition = new OrderBillingAddress([
       'zone' => [
         'territories' => [
@@ -67,6 +77,16 @@ class OrderBillingAddressTest extends UnitTestCase {
       ],
     ], 'order_billing_address', ['entity_type' => 'commerce_order', 'profile_scope' => 'billing']);
     $this->assertTrue($condition->evaluate($order));
+
+    $condition = new OrderBillingAddress([
+      'zone' => [
+        'territories' => [
+          ['country_code' => 'US', 'administrative_area' => 'SC'],
+        ],
+      ],
+      'operator' => 'not in',
+    ], 'order_billing_address', ['entity_type' => 'commerce_order', 'profile_scope' => 'billing']);
+    $this->assertFalse($condition->evaluate($order));
   }
 
 }

modules/order/tests/src/Unit/Plugin/Commerce/Condition/OrderShippingAddressTest.php

@@ -58,6 +58,16 @@ class OrderShippingAddressTest extends UnitTestCase {
     ], 'order_shipping_address', ['entity_type' => 'commerce_order', 'profile_scope' => 'shipping']);
     $this->assertFalse($condition->evaluate($order));
 
+    $condition = new OrderShippingAddress([
+      'zone' => [
+        'territories' => [
+          ['country_code' => 'US', 'administrative_area' => 'CA'],
+        ],
+      ],
+      'operator' => 'not in',
+    ], 'order_shipping_address', ['entity_type' => 'commerce_order', 'profile_scope' => 'shipping']);
+    $this->assertTrue($condition->evaluate($order));
+
     $condition = new OrderShippingAddress([
       'zone' => [
         'territories' => [
@@ -66,6 +76,16 @@ class OrderShippingAddressTest extends UnitTestCase {
       ],
     ], 'order_shipping_address', ['entity_type' => 'commerce_order', 'profile_scope' => 'shipping']);
     $this->assertTrue($condition->evaluate($order));
+
+    $condition = new OrderShippingAddress([
+      'zone' => [
+        'territories' => [
+          ['country_code' => 'US', 'administrative_area' => 'SC'],
+        ],
+      ],
+      'operator' => 'not in',
+    ], 'order_shipping_address', ['entity_type' => 'commerce_order', 'profile_scope' => 'shipping']);
+    $this->assertFalse($condition->evaluate($order));
   }
 
 }