update marketing
All checks were successful
Build, Push and Deploy / build-and-push (push) Successful in 5m14s
Gitea Actions Demo / Explore-Gitea-Actions (push) Successful in 17s
Build, Push and Deploy / deploy-staging (push) Successful in 41s
Build, Push and Deploy / deploy-production (push) Has been skipped

This commit is contained in:
2026-05-14 11:55:22 +07:00
parent f80fcc4c1b
commit 05fd3230b8
448 changed files with 17545 additions and 5128 deletions

View File

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

View File

@@ -21,7 +21,7 @@
@if (auth()->user()->accessToMultiBranch())
<td class="text-start">{{ $expense_report->branch->name ?? '' }}</td>
@endif
<td class="text-start">{{ $expense_report->category->categoryName }}</td>
<td class="text-start">{{ $expense_report->category->categoryName ?? ''}}</td>
<td class="text-start">{{ $expense_report->expanseFor }}</td>
<td class="text-start">
@if ($expense_report->transactions && $expense_report->transactions->isNotEmpty())

View File

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

View File

@@ -4,7 +4,19 @@
<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="">{{ __('Expense Report List') }}</h4>
{{-- <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> --}}
@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
</div>
@endsection
@@ -81,7 +93,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($expense_report->amount, currency: business_currency()) }}
{{ currency_format($expense_reports->sum('amount'), currency: business_currency()) }}
</td>
</tr>
</tfoot>