Issue #2893367 by bojanz: The Product: Quantity condition doesn't take into account non-combined order items (part 1)

Author: bojanz

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

@@ -3,18 +3,21 @@
 namespace Drupal\commerce_order\Plugin\Commerce\Condition;
 
 use Drupal\commerce\Plugin\Commerce\Condition\ConditionBase;
+use Drupal\commerce_price\Calculator;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Form\FormStateInterface;
 
 /**
- * Provides the quantity condition for order items.
+ * Provides the total product quantity condition.
+ *
+ * Implemented as an order condition to be able to count products across
+ * non-combined order items.
  *
  * @CommerceCondition(
  *   id = "order_item_quantity",
- *   label = @Translation("Quantity"),
- *   display_label = @Translation("Total product quantity"),
+ *   label = @Translation("Total product quantity"),
  *   category = @Translation("Order"),
- *   entity_type = "commerce_order_item",
+ *   entity_type = "commerce_order",
  * )
  */
 class OrderItemQuantity extends ConditionBase {
@@ -69,9 +72,13 @@ public function submitConfigurationForm(array &$form, FormStateInterface $form_s
    */
   public function evaluate(EntityInterface $entity) {
     $this->assertEntity($entity);
-    /** @var \Drupal\commerce_order\Entity\OrderItemInterface $order_item */
-    $order_item = $entity;
-    $quantity = $order_item->getQuantity();
+    /** @var \Drupal\commerce_order\Entity\OrderInterface $order */
+    $order = $entity;
+    $quantity = '0';
+    foreach ($order->getItems() as $order_item) {
+      // @todo Filter by offer conditions here, once available.
+      $quantity = Calculator::add($quantity, $order_item->getQuantity());
+    }
 
     switch ($this->configuration['operator']) {
       case '>=':

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

@@ -2,6 +2,7 @@
 
 namespace Drupal\Tests\commerce_order\Unit\Plugin\Commerce\Condition;
 
+use Drupal\commerce_order\Entity\OrderInterface;
 use Drupal\commerce_order\Entity\OrderItemInterface;
 use Drupal\commerce_order\Plugin\Commerce\Condition\OrderItemQuantity;
 use Drupal\Tests\UnitTestCase;
@@ -21,13 +22,17 @@ public function testEvaluate($operator, $quantity, $given_quantity, $result) {
     $condition = new OrderItemQuantity([
       'operator' => $operator,
       'quantity' => $quantity,
-    ], 'order_item_quantity', ['entity_type' => 'commerce_order_item']);
+    ], 'order_item_quantity', ['entity_type' => 'commerce_order']);
     $order_item = $this->prophesize(OrderItemInterface::class);
     $order_item->getEntityTypeId()->willReturn('commerce_order_item');
     $order_item->getQuantity()->willReturn($given_quantity);
     $order_item = $order_item->reveal();
+    $order = $this->prophesize(OrderInterface::class);
+    $order->getEntityTypeId()->willReturn('commerce_order');
+    $order->getItems()->willReturn([$order_item]);
+    $order = $order->reveal();
 
-    $this->assertEquals($result, $condition->evaluate($order_item));
+    $this->assertEquals($result, $condition->evaluate($order));
   }
 
   /**

tests/src/Unit/ConditionGroupTest.php

@@ -3,8 +3,9 @@
 namespace Drupal\Tests\commerce\Unit;
 
 use Drupal\commerce\ConditionGroup;
-use Drupal\commerce_order\Entity\OrderItemInterface;
-use Drupal\commerce_order\Plugin\Commerce\Condition\OrderItemQuantity;
+use Drupal\commerce_order\Entity\OrderInterface;
+use Drupal\commerce_order\Plugin\Commerce\Condition\OrderTotalPrice;
+use Drupal\commerce_price\Price;
 use Drupal\Tests\UnitTestCase;
 
 /**
@@ -28,10 +29,13 @@ public function testInvalidOperator() {
    */
   public function testGetters() {
     $conditions = [];
-    $conditions[] = new OrderItemQuantity([
+    $conditions[] = new OrderTotalPrice([
       'operator' => '>',
-      'quantity' => '10',
-    ], 'order_item_quantity', []);
+      'amount' => [
+        'number' => '10',
+        'currency_code' => 'USD',
+      ],
+    ], 'order_total_price', ['entity_type' => 'commerce_order']);
 
     $condition_group = new ConditionGroup($conditions, 'AND');
     $this->assertEquals($conditions, $condition_group->getConditions());
@@ -43,33 +47,39 @@ public function testGetters() {
    */
   public function testEvaluate() {
     $conditions = [];
-    $conditions[] = new OrderItemQuantity([
+    $conditions[] = new OrderTotalPrice([
       'operator' => '>',
-      'quantity' => '10',
-    ], 'order_item_quantity', ['entity_type' => 'commerce_order_item']);
-    $conditions[] = new OrderItemQuantity([
+      'amount' => [
+        'number' => '10',
+        'currency_code' => 'USD',
+      ],
+    ], 'order_total_price', ['entity_type' => 'commerce_order']);
+    $conditions[] = new OrderTotalPrice([
       'operator' => '<',
-      'quantity' => '100',
-    ], 'order_item_quantity', ['entity_type' => 'commerce_order_item']);
-    $first_order_item = $this->prophesize(OrderItemInterface::class);
-    $first_order_item->getEntityTypeId()->willReturn('commerce_order_item');
-    $first_order_item->getQuantity()->willReturn(101);
-    $first_order_item = $first_order_item->reveal();
+      'amount' => [
+        'number' => '100',
+        'currency_code' => 'USD',
+      ],
+    ], 'order_total_price', ['entity_type' => 'commerce_order']);
+    $first_order = $this->prophesize(OrderInterface::class);
+    $first_order->getEntityTypeId()->willReturn('commerce_order');
+    $first_order->getTotalPrice()->willReturn(new Price('101', 'USD'));
+    $first_order = $first_order->reveal();
 
-    $second_order_item = $this->prophesize(OrderItemInterface::class);
-    $second_order_item->getEntityTypeId()->willReturn('commerce_order_item');
-    $second_order_item->getQuantity()->willReturn(90);
+    $second_order_item = $this->prophesize(OrderInterface::class);
+    $second_order_item->getEntityTypeId()->willReturn('commerce_order');
+    $second_order_item->getTotalPrice()->willReturn(new Price('90', 'USD'));
     $second_order_item = $second_order_item->reveal();
 
     $empty_condition_group = new ConditionGroup([], 'AND');
-    $this->assertTrue($empty_condition_group->evaluate($first_order_item));
+    $this->assertTrue($empty_condition_group->evaluate($first_order));
 
     $and_condition_group = new ConditionGroup($conditions, 'AND');
-    $this->assertFalse($and_condition_group->evaluate($first_order_item));
+    $this->assertFalse($and_condition_group->evaluate($first_order));
     $this->assertTrue($and_condition_group->evaluate($second_order_item));
 
     $or_condition_group = new ConditionGroup($conditions, 'OR');
-    $this->assertTrue($or_condition_group->evaluate($first_order_item));
+    $this->assertTrue($or_condition_group->evaluate($first_order));
     $this->assertTrue($or_condition_group->evaluate($second_order_item));
   }