shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactored widgets

Browse Source
This commit is contained in:
denisdulici
2019-12-29 03:01:19 +03:00
parent e41b56a5b0
commit 6052506fd0
23 changed files with 445 additions and 935 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
resources/lang/en-GB/dashboard.php
View File

@@ -2,7 +2,7 @@
return [
'total_incomes' => 'Total Incomes',
'total_income' => 'Total Income',
'receivables' => 'Receivables',
'open_invoices' => 'Open Invoices',
'overdue_invoices' => 'Overdue Invoices',
@@ -15,9 +15,9 @@ return [
'overdue_profit' => 'Overdue Profit',
'cash_flow' => 'Cash Flow',
'no_profit_loss' => 'No Profit Loss',
'incomes_by_category' => 'Incomes By Category',
'income_by_category' => 'Income By Category',
'expenses_by_category' => 'Expenses By Category',
'account_balance' => 'Account Balance',
'latest_incomes' => 'Latest Incomes',
'latest_income' => 'Latest Income',
'latest_expenses' => 'Latest Expenses',
];

2
resources/views/widgets/incomes_by_category.blade.php → resources/views/widgets/income_by_category.blade.php
View File

@@ -4,7 +4,7 @@
<div class="row align-items-center">
<div class="col-6 text-nowrap">
<h4 class="mb-0">{{ trans('dashboard.incomes_by_category') }}</h4>
<h4 class="mb-0">{{ trans('dashboard.income_by_category') }}</h4>
</div>
<div class="col-6 hidden-sm">

8
resources/views/widgets/latest_expenses.blade.php
View File

@@ -34,16 +34,16 @@
<thead class="thead-light">
<tr class="row table-head-line">
<th class="col-xs-4 col-md-4 text-left">{{ trans('general.date') }}</th>
<th class="col-xs-4 col-md-4 text-center">{{ trans_choice('general.categories', 1) }}</th>
<th class="col-xs-4 col-md-4 text-left">{{ trans_choice('general.categories', 1) }}</th>
<th class="col-xs-4 col-md-4 text-right">{{ trans('general.amount') }}</th>
</tr>
</thead>
<tbody>
@if ($latest_expenses->count())
@foreach($latest_expenses as $item)
@if ($transactions->count())
@foreach($transactions as $item)
<tr class="row border-top-1">
<td class="col-xs-4 col-md-4 text-left">@date($item->paid_at)</td>
<td class="col-xs-4 col-md-4 text-center">{{ $item->category ? $item->category->name : trans_choice('general.bills', 2) }}</td>
<td class="col-xs-4 col-md-4 text-left">{{ $item->category->name }}</td>
<td class="col-xs-4 col-md-4 text-right">@money($item->amount, $item->currency_code, true)</td>
</tr>
@endforeach

10
resources/views/widgets/latest_incomes.blade.php → resources/views/widgets/latest_income.blade.php
View File

@@ -3,7 +3,7 @@
<div class="card-header border-bottom-0">
<div class="row align-items-center">
<div class="col-6 text-nowrap">
<h4 class="mb-0">{{ trans('dashboard.latest_incomes') }}</h4>
<h4 class="mb-0">{{ trans('dashboard.latest_income') }}</h4>
</div>
<div class="col-6 hidden-sm">
@@ -34,16 +34,16 @@
<thead class="thead-light">
<tr class="row table-head-line">
<th class="col-xs-4 col-md-4 text-left">{{ trans('general.date') }}</th>
<th class="col-xs-4 col-md-4 text-center">{{ trans_choice('general.categories', 1) }}</th>
<th class="col-xs-4 col-md-4 text-left">{{ trans_choice('general.categories', 1) }}</th>
<th class="col-xs-4 col-md-4 text-right">{{ trans('general.amount') }}</th>
</tr>
</thead>
<tbody>
@if ($latest_incomes->count())
@foreach($latest_incomes as $item)
@if ($transactions->count())
@foreach($transactions as $item)
<tr class="row border-top-1">
<td class="col-xs-4 col-md-4 text-left">@date($item->paid_at)</td>
<td class="col-xs-4 col-md-4 text-center">{{ $item->category ? $item->category->name : trans_choice('general.invoices', 2) }}</td>
<td class="col-xs-4 col-md-4 text-left">{{ $item->category->name }}</td>
<td class="col-xs-4 col-md-4 text-right">@money($item->amount, $item->currency_code, true)</td>
</tr>
@endforeach

6
resources/views/widgets/total_expenses.blade.php
View File

@@ -23,7 +23,7 @@
<div class="row">
<div class="col">
<h5 class="text-uppercase text-white mb-0">{{ trans('dashboard.total_expenses') }}</h5>
<span class="font-weight-bold text-white mb-0">@money($total_expenses['total'], setting('default.currency'), true)</span>
<span class="font-weight-bold text-white mb-0">@money($totals['current'], setting('default.currency'), true)</span>
</div>
<div class="col-auto">
@@ -33,9 +33,9 @@
</div>
</div>
<p class="mt-3 mb-0 text-sm" title="{{ trans('dashboard.open_bills') }}: {{ $total_expenses['open_bill'] }}<br>{{ trans('dashboard.overdue_bills') }}: {{ $total_expenses['overdue_bill'] }}" data-toggle="tooltip" data-html="true">
<p class="mt-3 mb-0 text-sm" title="{{ trans('dashboard.open_bills') }}: {{ $totals['open'] }}<br>{{ trans('dashboard.overdue_bills') }}: {{ $totals['overdue'] }}" data-toggle="tooltip" data-html="true">
<span class="text-white">{{ trans('dashboard.payables') }}</span>
<span class="text-white font-weight-bold float-right">{{ $total_expenses['open_bill'] }} / {{ $total_expenses['overdue_bill'] }}</span>
<span class="text-white font-weight-bold float-right">{{ $totals['open'] }} / {{ $totals['overdue'] }}</span>
</p>
</div>
</div>

8
resources/views/widgets/total_incomes.blade.php → resources/views/widgets/total_income.blade.php
View File

@@ -22,8 +22,8 @@
<div class="card-body">
<div class="row">
<div class="col">
<h5 class="text-uppercase text-white mb-0">{{ trans('dashboard.total_incomes') }}</h5>
<span class="font-weight-bold text-white mb-0">@money($total_incomes['total'], setting('default.currency'), true)</span>
<h5 class="text-uppercase text-white mb-0">{{ trans('dashboard.total_income') }}</h5>
<span class="font-weight-bold text-white mb-0">@money($totals['current'], setting('default.currency'), true)</span>
</div>
<div class="col-auto">
@@ -33,9 +33,9 @@
</div>
</div>
<p class="mt-3 mb-0 text-sm" title="{{ trans('dashboard.open_invoices') }}: {{ $total_incomes['open_invoice'] }}<br>{{ trans('dashboard.overdue_invoices') }}: {{ $total_incomes['overdue_invoice'] }}" data-toggle="tooltip" data-html="true">
<p class="mt-3 mb-0 text-sm" title="{{ trans('dashboard.open_invoices') }}: {{ $totals['open'] }}<br>{{ trans('dashboard.overdue_invoices') }}: {{ $totals['overdue'] }}" data-toggle="tooltip" data-html="true">
<span class="text-white">{{ trans('dashboard.receivables') }}</span>
<span class="text-white font-weight-bold float-right">{{ $total_incomes['open_invoice'] }} / {{ $total_incomes['overdue_invoice'] }}</span>
<span class="text-white font-weight-bold float-right">{{ $totals['open'] }} / {{ $totals['overdue'] }}</span>
</p>
</div>
</div>

6
resources/views/widgets/total_profit.blade.php
View File

@@ -23,7 +23,7 @@
<div class="row">
<div class="col">
<h5 class="text-uppercase text-white mb-0">{{ trans('dashboard.total_profit') }}</h5>
<span class="font-weight-bold text-white mb-0">@money($total_profit['total'], setting('default.currency'), true)</span>
<span class="font-weight-bold text-white mb-0">@money($totals['current'], setting('default.currency'), true)</span>
</div>
<div class="col-auto">
@@ -33,9 +33,9 @@
</div>
</div>
<p class="mt-3 mb-0 text-sm" title="{{ trans('dashboard.open_profit') }}: {{ $total_profit['open'] }}<br>{{ trans('dashboard.overdue_profit') }}: {{ $total_profit['overdue'] }}" data-toggle="tooltip" data-html="true">
<p class="mt-3 mb-0 text-sm" title="{{ trans('dashboard.open_profit') }}: {{ $totals['open'] }}<br>{{ trans('dashboard.overdue_profit') }}: {{ $totals['overdue'] }}" data-toggle="tooltip" data-html="true">
<span class="text-white">{{ trans('general.upcoming') }}</span>
<span class="text-white font-weight-bold float-right">{{ $total_profit['open'] }} / {{ $total_profit['overdue'] }}</span>
<span class="text-white font-weight-bold float-right">{{ $totals['open'] }} / {{ $totals['overdue'] }}</span>
</p>
</div>
</div>