From 2fcc87180fb1015c779081f757ed6e89044e085f Mon Sep 17 00:00:00 2001
From: radhika587 <radhikabytefury@gmail.com>
Date: Sat, 5 Feb 2022 18:16:10 +0530
Subject: [PATCH] fix dashboard issue

---
 .../Admin/Dashboard/DashboardController.php   |  5 ++--
 .../admin/views/dashboard/DashboardStats.vue  | 24 +++++++------------
 .../admin/views/dashboard/DashboardTable.vue  | 10 ++++++--
 3 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/app/Http/Controllers/V1/Admin/Dashboard/DashboardController.php b/app/Http/Controllers/V1/Admin/Dashboard/DashboardController.php
index 64b66f82..4e1d96d2 100644
--- a/app/Http/Controllers/V1/Admin/Dashboard/DashboardController.php
+++ b/app/Http/Controllers/V1/Admin/Dashboard/DashboardController.php
@@ -12,6 +12,7 @@ use Crater\Models\Expense;
 use Crater\Models\Invoice;
 use Crater\Models\Payment;
 use Illuminate\Http\Request;
+use Silber\Bouncer\BouncerFacade;
 
 class DashboardController extends Controller
 {
@@ -151,8 +152,8 @@ class DashboardController extends Controller
             'total_invoice_count' => $total_invoice_count,
             'total_estimate_count' => $total_estimate_count,
 
-            'recent_due_invoices' => $recent_due_invoices,
-            'recent_estimates' => $recent_estimates,
+            'recent_due_invoices' => BouncerFacade::can('view-invoice', Invoice::class) ? $recent_due_invoices : [],
+            'recent_estimates' => BouncerFacade::can('view-estimate', Estimate::class) ? $recent_estimates : [],
 
             'chart_data' => $chart_data,
 
diff --git a/resources/scripts/admin/views/dashboard/DashboardStats.vue b/resources/scripts/admin/views/dashboard/DashboardStats.vue
index f698abc0..e54b3af6 100644
--- a/resources/scripts/admin/views/dashboard/DashboardStats.vue
+++ b/resources/scripts/admin/views/dashboard/DashboardStats.vue
@@ -2,11 +2,10 @@
   <div class="grid gap-6 sm:grid-cols-2 lg:grid-cols-9 xl:gap-8">
     <!-- Amount Due -->
     <DashboardStatsItem
+      v-if="userStore.hasAbilities(abilities.VIEW_INVOICE)"
       :icon-component="DollarIcon"
       :loading="!dashboardStore.isDashboardDataLoaded"
-      :route="
-        userStore.hasAbilities(abilities.VIEW_INVOICE) ? `/admin/invoices` : ''
-      "
+      route="/admin/invoices"
       :large="true"
       :label="$t('dashboard.cards.due_amount')"
     >
@@ -18,13 +17,10 @@
 
     <!-- Customers -->
     <DashboardStatsItem
+      v-if="userStore.hasAbilities(abilities.VIEW_CUSTOMER)"
       :icon-component="CustomerIcon"
       :loading="!dashboardStore.isDashboardDataLoaded"
-      :route="
-        userStore.hasAbilities(abilities.VIEW_CUSTOMER)
-          ? `/admin/customers`
-          : ''
-      "
+      route="/admin/customers"
       :label="$t('dashboard.cards.customers')"
     >
       {{ dashboardStore.stats.totalCustomerCount }}
@@ -32,11 +28,10 @@
 
     <!-- Invoices -->
     <DashboardStatsItem
+      v-if="userStore.hasAbilities(abilities.VIEW_INVOICE)"
       :icon-component="InvoiceIcon"
       :loading="!dashboardStore.isDashboardDataLoaded"
-      :route="
-        userStore.hasAbilities(abilities.VIEW_INVOICE) ? `/admin/invoices` : ''
-      "
+      route="/admin/invoices"
       :label="$t('dashboard.cards.invoices')"
     >
       {{ dashboardStore.stats.totalInvoiceCount }}
@@ -44,13 +39,10 @@
 
     <!-- Estimates -->
     <DashboardStatsItem
+      v-if="userStore.hasAbilities(abilities.VIEW_ESTIMATE)"
       :icon-component="EstimateIcon"
       :loading="!dashboardStore.isDashboardDataLoaded"
-      :route="
-        userStore.hasAbilities(abilities.VIEW_ESTIMATE)
-          ? `/admin/estimates`
-          : ''
-      "
+      route="/admin/estimates"
       :label="$t('dashboard.cards.estimates')"
     >
       {{ dashboardStore.stats.totalEstimateCount }}
diff --git a/resources/scripts/admin/views/dashboard/DashboardTable.vue b/resources/scripts/admin/views/dashboard/DashboardTable.vue
index e1a9cf50..0decb6a5 100644
--- a/resources/scripts/admin/views/dashboard/DashboardTable.vue
+++ b/resources/scripts/admin/views/dashboard/DashboardTable.vue
@@ -2,7 +2,10 @@
   <div>
     <div class="grid grid-cols-1 gap-6 mt-10 xl:grid-cols-2">
       <!-- Due Invoices -->
-      <div class="due-invoices">
+      <div
+        v-if="userStore.hasAbilities(abilities.VIEW_INVOICE)"
+        class="due-invoices"
+      >
         <div class="relative z-10 flex items-center justify-between mb-3">
           <h6 class="mb-0 text-xl font-semibold leading-normal">
             {{ $t('dashboard.recent_invoices_card.title') }}
@@ -49,7 +52,10 @@
       </div>
 
       <!-- Recent Estimates -->
-      <div class="recent-estimates">
+      <div
+        v-if="userStore.hasAbilities(abilities.VIEW_ESTIMATE)"
+        class="recent-estimates"
+      >
         <div class="relative z-10 flex items-center justify-between mb-3">
           <h6 class="mb-0 text-xl font-semibold leading-normal">
             {{ $t('dashboard.recent_estimate_card.title') }}