Tweak products scope

lunarphp · Jun 22, 2023 · 7990ccb · 7990ccb
1 parent 5532acd
commit 7990ccb
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/packages/core/src/Models/Discount.php b/packages/core/src/Models/Discount.php
@@ -158,16 +158,18 @@ public function scopeActive(Builder $query)
      *
      * @return Builder
      */
-    public function scopeProducts(Builder $query, iterable $productIds = [])
+    public function scopeProducts(Builder $query, iterable $productIds = [], string $type = 'condition')
     {
         if (is_array($productIds)) {
             $productIds = collect($productIds);
         }
 
-        return $query->where(function ($subQuery) use ($productIds) {
+        return $query->where(function ($subQuery) use ($productIds, $type) {
             $subQuery->whereDoesntHave('purchasables')
-                ->orWhereHas('purchasables', function ($relation) use ($productIds) {
-                    $relation->whereIn('purchasable_id', $productIds);
+                ->orWhereHas('purchasables', function ($relation) use ($productIds, $type) {
+                    $relation->whereIn('purchasable_id', $productIds)
+                        ->wherePurchasableType(Product::class)
+                        ->whereType($type);
                 });
         });
     }