From ca2a6ceac8e265809e8c4bf51a30cdb37bbebc5b Mon Sep 17 00:00:00 2001
From: John Oleksowicz <johnoleksowicz@icloud.com>
Date: Fri, 21 Apr 2023 16:27:39 -0500
Subject: [PATCH] Add missing options and fix order of options

MAILPOET-4987
---
 .../dynamic_segments_filters/woocommerce.tsx  |  4 ++-
 .../Filters/WooCommerceAverageSpent.php       |  4 +++
 .../Filters/WooCommerceAverageSpentTest.php   | 32 +++++++++++++++++++
 3 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/mailpoet/assets/js/src/segments/dynamic/dynamic_segments_filters/woocommerce.tsx b/mailpoet/assets/js/src/segments/dynamic/dynamic_segments_filters/woocommerce.tsx
index 952cfeb5ab..99bd25fedd 100644
--- a/mailpoet/assets/js/src/segments/dynamic/dynamic_segments_filters/woocommerce.tsx
+++ b/mailpoet/assets/js/src/segments/dynamic/dynamic_segments_filters/woocommerce.tsx
@@ -421,9 +421,11 @@ function AverageSpentFields({ filterIndex }: Props): JSX.Element {
           }}
           automationId="select-average-spent-operator"
         >
+          <option value=">">{MailPoet.I18n.t('moreThan')}</option>
+          <option value=">=">{MailPoet.I18n.t('moreThanOrEqual')}</option>
           <option value="=">{MailPoet.I18n.t('equals')}</option>
           <option value="!=">{MailPoet.I18n.t('notEquals')}</option>
-          <option value=">">{MailPoet.I18n.t('moreThan')}</option>
+          <option value="<">{MailPoet.I18n.t('lessThanOrEqual')}</option>
           <option value="<">{MailPoet.I18n.t('lessThan')}</option>
         </Select>
         <Input
diff --git a/mailpoet/lib/Segments/DynamicSegments/Filters/WooCommerceAverageSpent.php b/mailpoet/lib/Segments/DynamicSegments/Filters/WooCommerceAverageSpent.php
index 5af68c2228..0536b077b4 100644
--- a/mailpoet/lib/Segments/DynamicSegments/Filters/WooCommerceAverageSpent.php
+++ b/mailpoet/lib/Segments/DynamicSegments/Filters/WooCommerceAverageSpent.php
@@ -46,6 +46,10 @@ class WooCommerceAverageSpent implements Filter {
       $queryBuilder->having("AVG($orderStatsAlias.total_sales) > :$amountParam");
     } elseif ($operator === '<') {
       $queryBuilder->having("AVG($orderStatsAlias.total_sales) < :$amountParam");
+    } elseif ($operator === '<=') {
+      $queryBuilder->having("AVG($orderStatsAlias.total_sales) <= :$amountParam");
+    } elseif ($operator === '>=') {
+      $queryBuilder->having("AVG($orderStatsAlias.total_sales) >= :$amountParam");
     }
 
     $queryBuilder->setParameter($amountParam, $amount);
diff --git a/mailpoet/tests/integration/Segments/DynamicSegments/Filters/WooCommerceAverageSpentTest.php b/mailpoet/tests/integration/Segments/DynamicSegments/Filters/WooCommerceAverageSpentTest.php
index aba2e75ea5..4ea24bfff5 100644
--- a/mailpoet/tests/integration/Segments/DynamicSegments/Filters/WooCommerceAverageSpentTest.php
+++ b/mailpoet/tests/integration/Segments/DynamicSegments/Filters/WooCommerceAverageSpentTest.php
@@ -99,6 +99,38 @@ class WooCommerceAverageSpentTest extends \MailPoetTest {
     $this->assertEqualsCanonicalizing(['1@e.com'], $emails);
   }
 
+  public function testItWorksWithGreaterThanOrEqual() {
+    $this->createCustomerWithOrderValues('1@e.com', [5, 10]);
+    $this->createCustomerWithOrderValues('2@e.com', [5, 15]);
+    $this->createCustomerWithOrderValues('3@e.com', [5, 20]);
+    $matchingEmails = $this->getMatchingEmails('>=', 7.50);
+    $this->assertEqualsCanonicalizing(['1@e.com', '2@e.com', '3@e.com'], $matchingEmails);
+    $matchingEmails = $this->getMatchingEmails('>=', 7.51);
+    $this->assertEqualsCanonicalizing(['2@e.com', '3@e.com'], $matchingEmails);
+    $matchingEmails = $this->getMatchingEmails('>=', 10);
+    $this->assertEqualsCanonicalizing(['2@e.com', '3@e.com'], $matchingEmails);
+    $matchingEmails = $this->getMatchingEmails('>=', 10.01);
+    $this->assertEqualsCanonicalizing(['3@e.com'], $matchingEmails);
+    $matchingEmails = $this->getMatchingEmails('>=', 12.50);
+    $this->assertEqualsCanonicalizing(['3@e.com'], $matchingEmails);
+    $matchingEmails = $this->getMatchingEmails('>=', 12.51);
+    $this->assertEqualsCanonicalizing([], $matchingEmails);
+  }
+
+  public function testItWorksWithLessThanOrEqual() {
+    $this->createCustomerWithOrderValues('1@e.com', [5, 10]);
+    $this->createCustomerWithOrderValues('2@e.com', [5, 15]);
+    $this->createCustomerWithOrderValues('3@e.com', [5, 20]);
+    $matchingEmails = $this->getMatchingEmails('<=', 7.49);
+    $this->assertEqualsCanonicalizing([], $matchingEmails);
+    $matchingEmails = $this->getMatchingEmails('<=', 7.50);
+    $this->assertEqualsCanonicalizing(['1@e.com'], $matchingEmails);
+    $matchingEmails = $this->getMatchingEmails('<=', 10);
+    $this->assertEqualsCanonicalizing(['1@e.com', '2@e.com'], $matchingEmails);
+    $matchingEmails = $this->getMatchingEmails('<=', 12.50);
+    $this->assertEqualsCanonicalizing(['1@e.com', '2@e.com', '3@e.com'], $matchingEmails);
+  }
+
   private function getMatchingEmails(string $operator, float $amount, int $days = 365): array {
     $filterData = new DynamicSegmentFilterData(DynamicSegmentFilterData::TYPE_WOOCOMMERCE, WooCommerceAverageSpent::ACTION, [
       'operator' => $operator,