Merge pull request #222 from jitendra-webkul/master

jitendra-webkul · web-flow · commit b0bd5b6622ab · 2021-09-16T20:47:59.000+05:30
Issue #197 fixed
diff --git a/packages/Webkul/Admin/src/Traits/Dashboard/DataRetrival.php b/packages/Webkul/Admin/src/Traits/Dashboard/DataRetrival.php
@@ -460,7 +460,7 @@ private function getQuotes($startDateFilter, $endDateFilter, $totalWeeks)
                 ]);
 
                 // get quotes count
-                array_push($quotes, $quotesRepository->getQuotesCount("all", $startDate, $endDate));
+                array_push($quotes, $quotesRepository->getQuotesCount($startDate, $endDate));
             }
         } else {
             $labels = [__("admin::app.dashboard.week") . "1"];
diff --git a/packages/Webkul/Admin/src/Traits/Dashboard/Helper.php b/packages/Webkul/Admin/src/Traits/Dashboard/Helper.php
@@ -70,8 +70,8 @@ private function getFormattedDateRange($data)
 
         $endDate = $currentIndex == 1 ? $endDate->addDays(1) : (clone $startDate)->addDays(7);
         
-        $startDate = $startDate->format('Y-m-d');
-        $endDate = $endDate->format('Y-m-d');
+        $startDate = $startDate->format('Y-m-d  00:00:01');
+        $endDate = $endDate->format('Y-m-d 23:59:59');
 
         return compact('startDate', 'endDate', 'labels');
     }

Original file line number	Diff line number	Diff line change
`@@ -460,7 +460,7 @@ private function getQuotes($startDateFilter, $endDateFilter, $totalWeeks)`
`460`	`460`	`]);`
`461`	`461`
`462`	`462`	`// get quotes count`
`463`		`- array_push($quotes, $quotesRepository->getQuotesCount("all", $startDate, $endDate));`
	`463`	`+ array_push($quotes, $quotesRepository->getQuotesCount($startDate, $endDate));`
`464`	`464`	`}`
`465`	`465`	`} else {`
`466`	`466`	`$labels = [__("admin::app.dashboard.week") . "1"];`
Original file line number	Diff line number	Diff line change
`@@ -70,8 +70,8 @@ private function getFormattedDateRange($data)`
`70`	`70`
`71`	`71`	`$endDate = $currentIndex == 1 ? $endDate->addDays(1) : (clone $startDate)->addDays(7);`
`72`	`72`
`73`		`- $startDate = $startDate->format('Y-m-d');`
`74`		`- $endDate = $endDate->format('Y-m-d');`
	`73`	`+ $startDate = $startDate->format('Y-m-d 00:00:01');`
	`74`	`+ $endDate = $endDate->format('Y-m-d 23:59:59');`
`75`	`75`
`76`	`76`	`return compact('startDate', 'endDate', 'labels');`
`77`	`77`	`}`