TheCloneArmy/crater
1
0
Fork 1
mirror of https://github.com/crater-invoice/crater.git synced 2025-10-27 11:41:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix-dashboard-issue' into 'master'

Browse Source 
fix dashboard issue

See merge request mohit.panjvani/crater-web!1437
This commit is contained in:
Mohit Panjwani
2022-02-07 12:28:53 +00:00
parent 2019e9be03 2fcc87180f
commit 9709489c66
3 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/Http/Controllers/V1/Admin/Dashboard/DashboardController.php
View File

@ -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,

24
resources/scripts/admin/views/dashboard/DashboardStats.vue
View File

@ -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 }}

10
resources/scripts/admin/views/dashboard/DashboardTable.vue
View File

@ -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') }}