Fix issue when discount relation dates are null (#797)

* Fix issue when dates are null * Bug fix on logic * Change test as NULL is a valid starts_at Co-authored-by: Alec Ritson <hello@itsalec.co.uk>
lunarphp · Jan 12, 2023 · d945e4b · d945e4b
1 parent 17bba79
commit d945e4b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/packages/core/src/Managers/DiscountManager.php b/packages/core/src/Managers/DiscountManager.php
@@ -145,22 +145,26 @@ public function getDiscounts(): Collection
             $joinTable = (new Discount)->channels()->getTable();
             $query->whereIn("{$joinTable}.channel_id", $this->channels->pluck('id'))
                 ->where("{$joinTable}.enabled", true)
-                ->whereNotNull("{$joinTable}.starts_at")
-                ->where("{$joinTable}.starts_at", '<=', now())
+                ->where(function ($query) use ($joinTable) {
+                    $query->whereNull("{$joinTable}.starts_at")
+                        ->orWhere("{$joinTable}.starts_at", '<=', now());
+                })
                 ->where(function ($query) use ($joinTable) {
                     $query->whereNull("{$joinTable}.ends_at")
-                        ->orWhereDate("{$joinTable}.ends_at", '>', now());
+                        ->orWhere("{$joinTable}.ends_at", '>', now());
                 });
         })->whereHas('customerGroups', function ($query) {
             $joinTable = (new Discount)->customerGroups()->getTable();
 
             $query->whereIn("{$joinTable}.customer_group_id", $this->customerGroups->pluck('id'))
             ->where("{$joinTable}.enabled", true)
-            ->whereNotNull("{$joinTable}.starts_at")
-            ->where("{$joinTable}.starts_at", '<=', now())
+            ->where(function ($query) use ($joinTable) {
+                $query->whereNull("{$joinTable}.starts_at")
+                    ->orWhere("{$joinTable}.starts_at", '<=', now());
+            })
             ->where(function ($query) use ($joinTable) {
                 $query->whereNull("{$joinTable}.ends_at")
-                    ->orWhereDate("{$joinTable}.ends_at", '>', now());
+                    ->orWhere("{$joinTable}.ends_at", '>', now());
             });
         })->orderBy('priority')->get();
     }

diff --git a/packages/core/tests/Unit/Managers/DiscountManagerTest.php b/packages/core/tests/Unit/Managers/DiscountManagerTest.php
@@ -201,17 +201,17 @@ public function can_restrict_discounts_to_customer_group()
         ]);
 
         $this->assertEmpty($manager->getDiscounts());
-
+        
         $discount->customerGroups()->sync([
             $customerGroup->id => [
                 'enabled' => true,
                 'visible' => true,
-                'starts_at' => now(),
+                'starts_at' => now()->addMinutes(1),
             ],
             $customerGroupTwo->id => [
                 'enabled' => true,
                 'visible' => false,
-                'starts_at' => null,
+                'starts_at' => now()->addMinutes(1),
             ],
         ]);