diff --git a/app/Http/Controllers/WebsiteController.php b/app/Http/Controllers/WebsiteController.php index b534ef1..3b33057 100755 --- a/app/Http/Controllers/WebsiteController.php +++ b/app/Http/Controllers/WebsiteController.php @@ -65,7 +65,7 @@ class WebsiteController extends Controller // $vid = Clip::latest()->where('active', 1)->first(); $discount = Discount::whereNotNull('expire') - ->where('expire', '>', \DB::raw('NOW()')) + ->where('expire', '>', date('Y-m-d')) ->whereNotNull('product_id')->pluck('product_id')->toArray(); $disPros = Product::whereIn('id', $discount)->get(); diff --git a/app/Models/Product.php b/app/Models/Product.php index 905a6a5..bada857 100755 --- a/app/Models/Product.php +++ b/app/Models/Product.php @@ -300,7 +300,7 @@ class Product extends Model implements HasMedia function hasDiscount() { - return $this->discounts()->where('expire', '>', \DB::raw('NOW()'))->count() > 0; + return $this->discounts()->where('expire', '>', date('Y-m-d'))->count() > 0; } public function isFav() diff --git a/tests/Feature/AdminWebPagesTest.php b/tests/Feature/AdminWebPagesTest.php index c34e89e..9030260 100644 --- a/tests/Feature/AdminWebPagesTest.php +++ b/tests/Feature/AdminWebPagesTest.php @@ -208,7 +208,7 @@ class AdminWebPagesTest extends TestCase $response->assertStatus(200); if (Customer::count() != 0){ - $response = $this->actingAs($user)->get(route('admin.customer.edit',Customer::first()->slug)); + $response = $this->actingAs($user)->get(route('admin.customer.edit',Customer::first()->id)); $response->assertStatus(200); }