diff --git a/packages/Webkul/Admin/src/Http/Controllers/DashboardController.php b/packages/Webkul/Admin/src/Http/Controllers/DashboardController.php index b43d847a8..3be5ad0c8 100755 --- a/packages/Webkul/Admin/src/Http/Controllers/DashboardController.php +++ b/packages/Webkul/Admin/src/Http/Controllers/DashboardController.php @@ -286,14 +286,14 @@ class DashboardController extends Controller private function getOrdersBetweenDate($start, $end) { return $this->order->scopeQuery(function ($query) use ($start, $end) { - return $query->where('orders.status', '<>', 'canceled')->where('orders.created_at', '>=', $start)->where('orders.created_at', '<=', $end); + return $query->where('orders.created_at', '>=', $start)->where('orders.created_at', '<=', $end); }); } private function getCustomersBetweenDates($start, $end) { return $this->customer->scopeQuery(function ($query) use ($start, $end) { - return $query->where('customers.created_at', '>=', $start)->where('customers.created_at', '<=', $end)->where('customers.status', '=', 1); + return $query->where('customers.created_at', '>=', $start)->where('customers.created_at', '<=', $end); }); } } \ No newline at end of file diff --git a/packages/Webkul/Theme/src/ViewRenderEventManager.php b/packages/Webkul/Theme/src/ViewRenderEventManager.php index 5546b5ad7..7d7479880 100755 --- a/packages/Webkul/Theme/src/ViewRenderEventManager.php +++ b/packages/Webkul/Theme/src/ViewRenderEventManager.php @@ -1,6 +1,9 @@ templates; } - - /** - * get params - * - * @return array - */ - public function getParams() - { - return $this->params; - } - - /** - * get param - * - * @param $name - * - * @return mixed - */ - public function getParam($name) - { - return optional($this->params)[$name]; - } /** * get params @@ -74,6 +57,7 @@ class ViewRenderEventManager { return optional($this->params)[$name]; } + /** * Add templates for render * @@ -84,6 +68,7 @@ class ViewRenderEventManager { array_push($this->templates, $template); } + /** * Renders templates * @@ -92,11 +77,13 @@ class ViewRenderEventManager public function render() { $string = ""; + foreach ($this->templates as $template) { if (view()->exists($template)) { $string .= view($template, $this->params)->render(); } } + return $string; } -} +} \ No newline at end of file