From 82760de8d495f87a61da625a415bd88125b016b3 Mon Sep 17 00:00:00 2001
From: jitendra <jitendra@webkul.com>
Date: Tue, 27 Nov 2018 10:44:13 +0530
Subject: [PATCH 1/2] Issues #150 fixed

---
 packages/Webkul/Admin/src/DataGrids/OrderDataGrid.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/Webkul/Admin/src/DataGrids/OrderDataGrid.php b/packages/Webkul/Admin/src/DataGrids/OrderDataGrid.php
index 11d0e02ac..1ac4f3c3e 100644
--- a/packages/Webkul/Admin/src/DataGrids/OrderDataGrid.php
+++ b/packages/Webkul/Admin/src/DataGrids/OrderDataGrid.php
@@ -79,7 +79,7 @@ class OrderDataGrid
                     'label' => 'Base Total',
                     'sortable' => true,
                     'wrapper' => function ($value) {
-                        return core()->currency($value);
+                        return core()->formatBasePrice($value);
                     }
                 ], [
                     'name' => 'or.grand_total',
@@ -88,7 +88,7 @@ class OrderDataGrid
                     'label' => 'Grand Total',
                     'sortable' => false,
                     'wrapper' => function ($value) {
-                        return core()->currency($value);
+                        return core()->formatBasePrice($value);
                     }
                 ], [
                     'name' => 'or.created_at',

From a9ef1269c309f0322bf61defb2094dc1e54e61d0 Mon Sep 17 00:00:00 2001
From: jitendra <jitendra@webkul.com>
Date: Tue, 27 Nov 2018 10:53:47 +0530
Subject: [PATCH 2/2] Dashboard progress issues fixed

---
 .../Admin/src/Http/Controllers/DashboardController.php      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/Webkul/Admin/src/Http/Controllers/DashboardController.php b/packages/Webkul/Admin/src/Http/Controllers/DashboardController.php
index 8e7ad4477..cc533cad0 100644
--- a/packages/Webkul/Admin/src/Http/Controllers/DashboardController.php
+++ b/packages/Webkul/Admin/src/Http/Controllers/DashboardController.php
@@ -294,9 +294,9 @@ class DashboardController extends Controller
             $this->endDate = Carbon::now();
 
         $this->lastStartDate = clone $this->startDate;
-        $this->lastEndDate = clone $this->endDate;
+        $this->lastEndDate = clone $this->startDate;
 
-        $this->lastStartDate->subDays($this->lastStartDate->diffInDays($this->lastEndDate));
-        $this->lastEndDate->subDays($this->lastStartDate->diffInDays($this->lastEndDate));
+        $this->lastStartDate->subDays($this->startDate->diffInDays($this->endDate));
+        // $this->lastEndDate->subDays($this->lastStartDate->diffInDays($this->lastEndDate));
     }
 }
\ No newline at end of file