Merge pull request #677 from jitendra-webkul/master

Isue #672 fixed
krayin · Nov 11, 2021 · f6b7be9 · f6b7be9
2 parents 85330d1 + 04b6b0e
commit f6b7be9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/packages/Webkul/Admin/src/DataGrids/Quote/QuoteDataGrid.php b/packages/Webkul/Admin/src/DataGrids/Quote/QuoteDataGrid.php
@@ -3,6 +3,7 @@
 namespace Webkul\Admin\DataGrids\Quote;
 
 use Illuminate\Support\Facades\DB;
+use Carbon\Carbon;
 use Webkul\Admin\Traits\ProvideDropdownOptions;
 use Webkul\UI\DataGrid\DataGrid;
 use Webkul\User\Repositories\UserRepository;
@@ -41,7 +42,7 @@ public function init()
         $this->setRowProperties([
             'backgroundColor' => '#ffd0d6',
             'condition' => function ($row) {
-                if ($row->expired_at < \Carbon\Carbon::now()) {
+                if (Carbon::createFromFormat('Y-m-d H:i:s',  $row->expired_at)->endOfDay() < Carbon::now()) {
                     return true;
                 }
 

diff --git a/packages/Webkul/Admin/src/Http/Controllers/Admin/DashboardController.php b/packages/Webkul/Admin/src/Http/Controllers/Admin/DashboardController.php
@@ -34,8 +34,7 @@ public function __construct(DashboardHelper $dashboardHelper)
      * @return \Illuminate\View\View
      */
     public function index()
-    {
-        $cards = $this->dashboardHelper->getCards();
+    {$cards = $this->dashboardHelper->getCards();
 
         if ($dateRange = request('date-range')) {
             $dateRange = explode(",", $dateRange);