finishing to dev
All checks were successful
Build, Push and Deploy / build-and-push (push) Successful in 3m41s
Gitea Actions Demo / Explore-Gitea-Actions (push) Successful in 16s
Build, Push and Deploy / deploy-staging (push) Successful in 42s
Build, Push and Deploy / deploy-production (push) Has been skipped

This commit is contained in:
2026-05-14 22:50:44 +07:00
parent 2fabdf8fc9
commit 8307b9e66d
212 changed files with 2451 additions and 4493 deletions

View File

@@ -36,7 +36,7 @@
@if (auth()->user()->accessToMultiBranch())
<td class="text-start">{{ $income_report->branch->name ?? '' }}</td>
@endif
<td class="text-start">{{ $income_report->category->categoryName ?? '' }}</td>
<td class="text-start">{{ $income_report->category->categoryName }}</td>
<td class="text-start">{{ $income_report->incomeFor }}</td>
<td class="text-start d-print-none">
@if ($income_report->transactions && $income_report->transactions->isNotEmpty())

View File

@@ -103,17 +103,17 @@
<div class="table-top-btn-group d-print-none">
<ul>
<li>
<a class="export-btn" href="{{ route('business.income-reports.csv') }}">
<a href="{{ route('business.income-reports.csv') }}">
<img src="{{ asset('assets/images/logo/csv.svg') }}" alt="">
</a>
</li>
<li>
<a class="export-btn" href="{{ route('business.income-reports.excel') }}">
<a href="{{ route('business.income-reports.excel') }}">
<img src="{{ asset('assets/images/logo/excel.svg') }}" alt="">
</a>
</li>
<li>
<a class="export-btn" target="_blank" href="{{ route('business.income-reports.pdf') }}">
<a target="blank" href="{{ route('business.income-reports.pdf') }}">
<img src="{{ asset('assets/images/logo/pdf.svg') }}" alt="">
</a>
</li>

View File

@@ -4,19 +4,7 @@
<div class="table-header justify-content-center border-0 d-none d-block d-print-block text-center">
@include('business::print.header')
<h4 style="text-align: center; margin: 0; padding: 0; font-size: 16px;" class="">{{ __('Income Report List') }}</h4>
@if ($filter_from_date && $filter_to_date)
<p style="text-align: center; margin: 0; padding: 0; font-weight: 400; font-size: 14px;" class="">{{ __('Duration:') }}
@if ($duration === 'today')
{{ Carbon\Carbon::parse($filter_from_date)->format('d-m-Y') }}
@elseif ($duration === 'yesterday')
{{ Carbon\Carbon::parse($filter_from_date)->format('d-m-Y') }}
@else
{{ Carbon\Carbon::parse($filter_from_date)->format('d-m-Y') }}
{{ __('to') }}
{{ Carbon\Carbon::parse($filter_to_date)->format('d-m-Y') }}
@endif
</p>
@endif
{{-- <p style="text-align: center; margin: 0; padding: 0; font-weight: 400; font-size: 14px;" class="">{{ __('Duration: 14-12-2025 to 24-12-2025') }}</p> --}}
</div>
@endsection
@@ -93,7 +81,7 @@
<td style="border:1px solid gainsboro; text-align:center;"></td>
<td style="border:1px solid gainsboro; text-align:center;"></td>
<td style="border:1px solid gainsboro; text-align:center; color: white; font-weight: 600;">
{{ currency_format($income_reports->sum('amount'), currency: business_currency()) }}
{{ currency_format($income_report->amount, currency: business_currency()) }}
</td>
</tr>
</tfoot>