dst/mastercut
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/yogapangestu777/pangestu-barbershop

Browse Source
This commit is contained in:
Yoga Pangestu 2024-11-25 23:12:15 +07:00
commit 59fb6b94be
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/Providers/RouteServiceProvider.php
View File

@ -27,12 +27,12 @@ public function register(): void
*/
public function boot(): void
{
Route::bind('barbershop', fn (string $barbershop) => Barbershop::findOrFail(decryptId($barbershop)));
Route::bind('user', fn (string $user) => User::findOrFail(decryptId($user)));
Route::bind('customer', fn (string $customer) => Customer::findOrFail(decryptId($customer)));
Route::bind('service', fn (string $service) => Service::findOrFail(decryptId($service)));
Route::bind('expense', fn (string $expense) => Expense::findOrFail(decryptId($expense)));
Route::bind('payroll', fn (string $payroll) => Payroll::findOrFail(decryptId($payroll)));
Route::bind('cash', fn (string $cash) => Cash::findOrFail(decryptId($cash)));
Route::bind('barbershop', fn(string $barbershop) => Barbershop::findOrFail(decryptId($barbershop)));
Route::bind('user', fn(string $user) => User::findOrFail(decryptId($user)));
Route::bind('customer', fn(string $customer) => Customer::findOrFail(decryptId($customer)));
Route::bind('service', fn(string $service) => Service::findOrFail(decryptId($service)));
Route::bind('expense', fn(string $expense) => Expense::findOrFail(decryptId($expense)));
Route::bind('payroll', fn(string $payroll) => Payroll::findOrFail(decryptId($payroll)));
Route::bind('cash', fn(string $cash) => Cash::findOrFail(decryptId($cash)));
}
}

3
resources/views/pages/admin/finance/expenses.blade.php
View File

@ -122,6 +122,7 @@ class="form-control rupiah-format @error('amount') is-invalid @enderror" id="amo
@enderror
</div>
<div class="col-lg-12 position-relative">
<<<<<<< HEAD
<label class="form-label" for="use_cash">Gunakan Kas</label>
<div class="form-check radio ps-0">
<ul class="radio-wrapper">
@ -148,6 +149,8 @@ class="form-control rupiah-format @error('amount') is-invalid @enderror" id="amo
@enderror
</div>
<div class="col-lg-12 position-relative">
=======
>>>>>>> 21e2ec04bd9458fd280d8f46f52746684c355e1c
<label class="form-label" for="proof">Bukti
<span class="form-span"><i>(.jpeg,.png,.jpg,.gif,.svg)</i></span>
</label>