Merge branch 'main' into feat/advanced-filters

Author: steven-tey

apps/web/lib/zod/schemas/rewards.ts

@@ -111,7 +111,7 @@ export const REWARD_CONDITIONS: Record<
               },
               {
                 id: "submitted",
-                label: "qualified lead",
+                label: "submitted referral",
               },
               {
                 id: "trial",

apps/web/tests/rewards/reward-conditions.test.ts

@@ -1662,68 +1662,96 @@ describe("evaluateRewardConditions", () => {
   });
 
   describe("subscription duration conditions", () => {
-    describe("customer.subscriptionDurationMonths", () => {
-      test("should match when subscription duration meets greater_than_or_equal condition", () => {
-        const conditions = [
+    const lessThanOrEqualCondition = [
+      {
+        operator: "AND" as const,
+        type: "flat" as const,
+        amountInCents: 5000,
+        conditions: [
           {
-            operator: "AND" as const,
-            type: "flat" as const,
-            amountInCents: 5000,
-            conditions: [
-              {
-                entity: "customer" as const,
-                attribute: "subscriptionDurationMonths" as const,
-                operator: "greater_than_or_equal" as const,
-                value: 12,
-              },
-            ],
+            entity: "customer" as const,
+            attribute: "subscriptionDurationMonths" as const,
+            operator: "less_than_or_equal" as const,
+            value: 12,
           },
-        ];
-
-        const context: RewardContext = {
-          customer: {
-            subscriptionDurationMonths: 12,
+        ],
+      },
+    ];
+
+    const greaterThanCondition = [
+      {
+        operator: "AND" as const,
+        type: "flat" as const,
+        amountInCents: 5000,
+        conditions: [
+          {
+            entity: "customer" as const,
+            attribute: "subscriptionDurationMonths" as const,
+            operator: "greater_than" as const,
+            value: 12,
           },
-        };
+        ],
+      },
+    ];
 
-        const result = evaluateRewardConditions({
-          conditions,
-          context,
-        });
+    test("should match when subscription duration meets less_than_or_equal condition", () => {
+      const context: RewardContext = {
+        customer: {
+          subscriptionDurationMonths: 12,
+        },
+      };
 
-        expect(result).toEqual(conditions[0]);
+      const result = evaluateRewardConditions({
+        conditions: lessThanOrEqualCondition,
+        context,
       });
 
-      test("should not match when subscription duration is less than condition value", () => {
-        const conditions = [
-          {
-            operator: "AND" as const,
-            type: "flat" as const,
-            amountInCents: 5000,
-            conditions: [
-              {
-                entity: "customer" as const,
-                attribute: "subscriptionDurationMonths" as const,
-                operator: "greater_than_or_equal" as const,
-                value: 12,
-              },
-            ],
-          },
-        ];
+      expect(result).toEqual(lessThanOrEqualCondition[0]);
+    });
 
-        const context: RewardContext = {
-          customer: {
-            subscriptionDurationMonths: 6,
-          },
-        };
+    test("should not match when subscription duration is more than less_than_or_equal condition value", () => {
+      const context: RewardContext = {
+        customer: {
+          subscriptionDurationMonths: 16,
+        },
+      };
 
-        const result = evaluateRewardConditions({
-          conditions,
-          context,
-        });
+      const result = evaluateRewardConditions({
+        conditions: lessThanOrEqualCondition,
+        context,
+      });
 
-        expect(result).toBe(null);
+      expect(result).toBe(null);
+    });
+
+    test("should match when subscription duration meets greater_than condition", () => {
+      const context: RewardContext = {
+        customer: {
+          subscriptionDurationMonths: 16,
+        },
+      };
+
+      const result = evaluateRewardConditions({
+        conditions: greaterThanCondition,
+        context,
       });
+
+      expect(result).toEqual(greaterThanCondition[0]);
+    });
+
+    test("should not match when subscription duration is less than greater_than condition value", () => {
+      const context: RewardContext = {
+        customer: {
+          subscriptionDurationMonths: 6,
+        },
+      };
+
+      const result = evaluateRewardConditions({
+        conditions: greaterThanCondition,
+        context,
+      });
+
+      expect(result).toBe(null);
     });
   });
 });

apps/web/ui/partners/rewards/rewards-logic.tsx

@@ -2,6 +2,8 @@
 
 import { constructRewardAmount } from "@/lib/api/sales/construct-reward-amount";
 import { getPlanCapabilities } from "@/lib/plan-capabilities";
+import { REFERRAL_ENABLED_PROGRAM_IDS } from "@/lib/referrals/constants";
+import useProgram from "@/lib/swr/use-program";
 import useWorkspace from "@/lib/swr/use-workspace";
 import { RECURRING_MAX_DURATIONS } from "@/lib/zod/schemas/misc";
 import {
@@ -273,6 +275,7 @@ function ConditionLogic({
   conditionIndex: number;
   onRemove?: () => void;
 }) {
+  const { program } = useProgram();
   const modifierKey = `modifiers.${modifierIndex}` as const;
   const conditionKey = `${modifierKey}.conditions.${conditionIndex}` as const;
 
@@ -511,10 +514,20 @@ function ConditionLogic({
                             (condition.value as string[] | undefined) ??
                             (isArrayValue ? [] : undefined)
                           }
-                          items={attribute.options.map(({ id, label }) => ({
-                            text: label,
-                            value: id,
-                          }))}
+                          items={attribute.options
+                            .filter(
+                              (attribute) =>
+                                isCustomerSourceCondition &&
+                                (attribute.id !== "submitted" ||
+                                  (program &&
+                                    REFERRAL_ENABLED_PROGRAM_IDS.includes(
+                                      program.id,
+                                    ))),
+                            )
+                            .map(({ id, label }) => ({
+                              text: label,
+                              value: id,
+                            }))}
                           onSelect={(value) => {
                             setValue(conditionKey, {
                               ...condition,