resolved conflicts

This commit is contained in:
2025-03-31 03:46:05 +03:00
6454 changed files with 1520539 additions and 9 deletions
@@ -0,0 +1,10 @@
<div class="panel panel-default">
<div class="panel-body">
<a href="{{ route('payments.new_payment') }}" class="nav-item btn btn-success" style="border-radius: 5px;"><i class="fa fa-plus"></i> <span style="margin-left: 5px">{{ __('payments.new_payment') }}</span></a>
<a href="{{ route('payments.create_bills') }}" class="nav-item btn btn-success" style="border-radius: 5px;"><i class="fa fa-plus"></i> <span style="margin-left: 5px">{{ __('payments.create_or_register_bill') }}</span></a>
<a href="{{ route('payments.bills.inventory') }}" class="nav-item btn btn-success" style="border-radius: 5px;"><i class="fa fa-plus"></i> <span style="margin-left: 5px">{{ __('payments.received_inventory_bills') }}</span></a>
<a href="{{ route('payments.bills') }}" class="nav-item btn btn-success" style="border-radius: 5px;"><i class="fa fa-plus"></i> <span style="margin-left: 5px">{{ __('payments.bills') }}</span></a>
<a href="{{ route('payments.view_payments') }}" class="nav-item btn btn-success" style="border-radius: 5px;"><i class="fa fa-plus"></i> <span style="margin-left: 5px">{{ __('payments.expenses_report') }}</span></a>
<a href="{{ route('payments.bills.inactive') }}" class="nav-item btn btn-danger" style="border-radius: 5px;"><i class="fa fa-plus"></i> <span style="margin-left: 5px">{{ __('payments.inactive_bills') }}</span></a>
</div>
</div>