🔧 refactor(permissions): pembersihan role & perbaikan UI form
- Hapus role `pemohon-ao` & `pemohon-eo` dari module.json pada semua menu (dashboard, laporan, permohonan, dsb.) - Rapikan indentasi role `administrator` dan streamline permissions untuk akses kontrol yang lebih sederhana - Tambahkan konsistensi role yang dipertahankan: administrator, admin, AO/EO Appraisal, DD Appraisal, Penilai, Surveyor - Perbaiki class ordering pada input file & error message di `debitur.blade.php` agar sesuai konvensi Tailwind - Perbaiki struktur div container di `debitur.blade.php` (`flex flex-wrap gap-2.5 items-baseline lg:flex-nowrap`) - Perbaiki formatting input file & textarea pada `persetujuan_penawaran/form.blade.php` dengan multi-line untuk readability - Rapikan class ordering error message di form penawaran (`text-sm alert text-danger`) - Standarisasi formatting & konsistensi layout antar form untuk UX lebih rapi
This commit is contained in:
60
module.json
60
module.json
@@ -57,8 +57,6 @@
|
|||||||
"permission": "",
|
"permission": "",
|
||||||
"roles": [
|
"roles": [
|
||||||
"administrator",
|
"administrator",
|
||||||
"pemohon-ao",
|
|
||||||
"pemohon-eo",
|
|
||||||
"admin",
|
"admin",
|
||||||
"DD Appraisal",
|
"DD Appraisal",
|
||||||
"EO Appraisal",
|
"EO Appraisal",
|
||||||
@@ -74,8 +72,6 @@
|
|||||||
"permission": "",
|
"permission": "",
|
||||||
"roles": [
|
"roles": [
|
||||||
"administrator",
|
"administrator",
|
||||||
"pemohon-ao",
|
|
||||||
"pemohon-eo",
|
|
||||||
"admin",
|
"admin",
|
||||||
"DD Appraisal",
|
"DD Appraisal",
|
||||||
"EO Appraisal",
|
"EO Appraisal",
|
||||||
@@ -91,8 +87,6 @@
|
|||||||
"permission": "",
|
"permission": "",
|
||||||
"roles": [
|
"roles": [
|
||||||
"administrator",
|
"administrator",
|
||||||
"pemohon-ao",
|
|
||||||
"pemohon-eo",
|
|
||||||
"admin",
|
"admin",
|
||||||
"DD Appraisal",
|
"DD Appraisal",
|
||||||
"EO Appraisal",
|
"EO Appraisal",
|
||||||
@@ -118,9 +112,7 @@
|
|||||||
"attributes": [],
|
"attributes": [],
|
||||||
"permission": "",
|
"permission": "",
|
||||||
"roles": [
|
"roles": [
|
||||||
"administrator",
|
"administrator",
|
||||||
"pemohon-ao",
|
|
||||||
"pemohon-eo",
|
|
||||||
"admin",
|
"admin",
|
||||||
"DD Appraisal",
|
"DD Appraisal",
|
||||||
"EO Appraisal",
|
"EO Appraisal",
|
||||||
@@ -136,8 +128,6 @@
|
|||||||
"permission": "",
|
"permission": "",
|
||||||
"roles": [
|
"roles": [
|
||||||
"administrator",
|
"administrator",
|
||||||
"pemohon-ao",
|
|
||||||
"pemohon-eo",
|
|
||||||
"admin",
|
"admin",
|
||||||
"DD Appraisal",
|
"DD Appraisal",
|
||||||
"EO Appraisal",
|
"EO Appraisal",
|
||||||
@@ -153,8 +143,6 @@
|
|||||||
"permission": "",
|
"permission": "",
|
||||||
"roles": [
|
"roles": [
|
||||||
"administrator",
|
"administrator",
|
||||||
"pemohon-ao",
|
|
||||||
"pemohon-eo",
|
|
||||||
"admin",
|
"admin",
|
||||||
"DD Appraisal",
|
"DD Appraisal",
|
||||||
"EO Appraisal",
|
"EO Appraisal",
|
||||||
@@ -207,8 +195,6 @@
|
|||||||
"permission": "",
|
"permission": "",
|
||||||
"roles": [
|
"roles": [
|
||||||
"administrator",
|
"administrator",
|
||||||
"pemohon-ao",
|
|
||||||
"pemohon-eo",
|
|
||||||
"admin",
|
"admin",
|
||||||
"DD Appraisal",
|
"DD Appraisal",
|
||||||
"EO Appraisal",
|
"EO Appraisal",
|
||||||
@@ -333,8 +319,7 @@
|
|||||||
"permission": "",
|
"permission": "",
|
||||||
"roles": [
|
"roles": [
|
||||||
"administrator",
|
"administrator",
|
||||||
"pemohon-ao",
|
"pemohon-ao"
|
||||||
"pemohon-eo"
|
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -346,7 +331,7 @@
|
|||||||
"permission": "",
|
"permission": "",
|
||||||
"roles": [
|
"roles": [
|
||||||
"administrator",
|
"administrator",
|
||||||
"pemohon-eo"
|
"pemohon-ao"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -384,6 +369,23 @@
|
|||||||
"pemohon-ao"
|
"pemohon-ao"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"title": "Memo Penyelesaian",
|
||||||
|
"path": "memo",
|
||||||
|
"icon": "ki-filled ki-document text-lg text-primary",
|
||||||
|
"classes": "",
|
||||||
|
"attributes": [],
|
||||||
|
"permission": "",
|
||||||
|
"roles": [
|
||||||
|
"administrator",
|
||||||
|
"pemohon-ao",
|
||||||
|
"pemohon-eo",
|
||||||
|
"admin",
|
||||||
|
"DD Appraisal",
|
||||||
|
"EO Appraisal",
|
||||||
|
"senior-officer"
|
||||||
|
]
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"title": "Kurang Bayar",
|
"title": "Kurang Bayar",
|
||||||
"path": "pembayaran.kurang",
|
"path": "pembayaran.kurang",
|
||||||
@@ -606,8 +608,7 @@
|
|||||||
"permission": "",
|
"permission": "",
|
||||||
"roles": [
|
"roles": [
|
||||||
"administrator",
|
"administrator",
|
||||||
"pemohon-ao",
|
"pemohon-ao"
|
||||||
"pemohon-eo"
|
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -655,8 +656,6 @@
|
|||||||
"permission": "",
|
"permission": "",
|
||||||
"roles": [
|
"roles": [
|
||||||
"administrator",
|
"administrator",
|
||||||
"pemohon-ao",
|
|
||||||
"pemohon-eo",
|
|
||||||
"admin",
|
"admin",
|
||||||
"surveyor",
|
"surveyor",
|
||||||
"senior-officer",
|
"senior-officer",
|
||||||
@@ -709,23 +708,6 @@
|
|||||||
"EO Appraisal",
|
"EO Appraisal",
|
||||||
"senior-officer"
|
"senior-officer"
|
||||||
]
|
]
|
||||||
},
|
|
||||||
{
|
|
||||||
"title": "Memo Penyelesaian",
|
|
||||||
"path": "memo",
|
|
||||||
"icon": "ki-filled ki-document text-lg text-primary",
|
|
||||||
"classes": "",
|
|
||||||
"attributes": [],
|
|
||||||
"permission": "",
|
|
||||||
"roles": [
|
|
||||||
"administrator",
|
|
||||||
"pemohon-ao",
|
|
||||||
"pemohon-eo",
|
|
||||||
"admin",
|
|
||||||
"DD Appraisal",
|
|
||||||
"EO Appraisal",
|
|
||||||
"senior-officer"
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"master": [
|
"master": [
|
||||||
|
|||||||
@@ -1,120 +1,131 @@
|
|||||||
<form action="{{ isset($debitur->id) ? route('debitur.update', $debitur->id) : route('debitur.store') }}" method="POST" id="debitur-form" class="grid gap-5">
|
<form action="{{ isset($debitur->id) ? route('debitur.update', $debitur->id) : route('debitur.store') }}" method="POST"
|
||||||
@if(isset($debitur->id))
|
id="debitur-form" class="grid gap-5">
|
||||||
|
@if (isset($debitur->id))
|
||||||
<input type="hidden" name="id" value="{{ $debitur->id }}">
|
<input type="hidden" name="id" value="{{ $debitur->id }}">
|
||||||
@method('PUT')
|
@method('PUT')
|
||||||
@endif
|
@endif
|
||||||
@csrf
|
@csrf
|
||||||
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
|
<div class="flex flex-wrap gap-2.5 items-baseline lg:flex-nowrap">
|
||||||
<label class="form-label max-w-56 gap-1">
|
<label class="gap-1 form-label max-w-56">
|
||||||
Cabang
|
Cabang
|
||||||
<span class="text-danger">*</span>
|
<span class="text-danger">*</span>
|
||||||
</label>
|
</label>
|
||||||
<div class="flex flex-wrap items-baseline w-full">
|
<div class="flex flex-wrap items-baseline w-full">
|
||||||
@if(auth()->user()->hasRole('administrator'))
|
@if (auth()->user()->hasRole(['administrator']))
|
||||||
<select class="input tomselect w-full @error('branch_id') border-danger bg-danger-light @enderror" name="branch_id" id="branch_id">
|
<select class="input tomselect w-full @error('branch_id') border-danger bg-danger-light @enderror"
|
||||||
|
name="branch_id" id="branch_id">
|
||||||
<option value="">Pilih Cabang</option>
|
<option value="">Pilih Cabang</option>
|
||||||
@foreach($branches as $branch)
|
@foreach ($branches as $branch)
|
||||||
<option value="{{ $branch->id }}" {{ (isset($debitur) && $branch->id == $debitur->branch_id) || (old('branch_id') == $branch->id) ? 'selected' : '' }}>
|
<option value="{{ $branch->id }}"
|
||||||
|
{{ (isset($debitur) && $branch->id == $debitur->branch_id) || old('branch_id') == $branch->id ? 'selected' : '' }}>
|
||||||
{{ $branch->name }}
|
{{ $branch->name }}
|
||||||
</option>
|
</option>
|
||||||
@endforeach
|
@endforeach
|
||||||
</select>
|
</select>
|
||||||
@else
|
@else
|
||||||
<input type="hidden" name="branch_id" value="{{ auth()->user()->branch_id }}">
|
<input type="hidden" name="branch_id" value="{{ auth()->user()->branch_id }}">
|
||||||
<input type="text" class="input w-full" value="{{ auth()->user()->branch->name }}" readonly>
|
<input type="text" class="w-full input" value="{{ auth()->user()->branch->name }}" readonly>
|
||||||
@endif
|
@endif
|
||||||
@error('branch_id')
|
@error('branch_id')
|
||||||
<em class="alert text-danger text-sm">{{ $message }}</em>
|
<em class="text-sm alert text-danger">{{ $message }}</em>
|
||||||
@enderror
|
@enderror
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
|
<div class="flex flex-wrap gap-2.5 items-baseline lg:flex-nowrap">
|
||||||
<label class="form-label max-w-56 gap-1">
|
<label class="gap-1 form-label max-w-56">
|
||||||
CIF
|
CIF
|
||||||
<span class="text-danger">
|
<span class="text-danger">
|
||||||
*
|
*
|
||||||
</span>
|
</span>
|
||||||
</label>
|
</label>
|
||||||
<div class="flex flex-wrap items-baseline w-full">
|
<div class="flex flex-wrap items-baseline w-full">
|
||||||
<input class="input @error('cif') border-danger bg-danger-light @enderror" type="number" id="cif" name="cif" value="{{ $debitur->cif ?? '0000000000' }}">
|
<input class="input @error('cif') border-danger bg-danger-light @enderror" type="number" id="cif"
|
||||||
|
name="cif" value="{{ $debitur->cif ?? '0000000000' }}">
|
||||||
@error('cif')
|
@error('cif')
|
||||||
<em class="alert text-danger text-sm">{{ $message }}</em>
|
<em class="text-sm alert text-danger">{{ $message }}</em>
|
||||||
@enderror
|
@enderror
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
|
<div class="flex flex-wrap gap-2.5 items-baseline lg:flex-nowrap">
|
||||||
<label class="form-label max-w-56">
|
<label class="form-label max-w-56">
|
||||||
Nomor Rekening
|
Nomor Rekening
|
||||||
</label>
|
</label>
|
||||||
<div class="flex flex-wrap items-baseline w-full">
|
<div class="flex flex-wrap items-baseline w-full">
|
||||||
<input class="input @error('nomor_rekening') border-danger bg-danger-light @enderror" type="number" name="nomor_rekening" value="{{ $debitur->nomor_rekening ?? '' }}">
|
<input class="input @error('nomor_rekening') border-danger bg-danger-light @enderror" type="number"
|
||||||
|
name="nomor_rekening" value="{{ $debitur->nomor_rekening ?? '' }}">
|
||||||
@error('nomor_rekening')
|
@error('nomor_rekening')
|
||||||
<em class="alert text-danger text-sm">{{ $message }}</em>
|
<em class="text-sm alert text-danger">{{ $message }}</em>
|
||||||
@enderror
|
@enderror
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
|
<div class="flex flex-wrap gap-2.5 items-baseline lg:flex-nowrap">
|
||||||
<label class="form-label max-w-56 gap-1">
|
<label class="gap-1 form-label max-w-56">
|
||||||
Nama Debitur
|
Nama Debitur
|
||||||
<span class="text-danger">
|
<span class="text-danger">
|
||||||
*
|
*
|
||||||
</span>
|
</span>
|
||||||
</label>
|
</label>
|
||||||
<div class="flex flex-wrap items-baseline w-full">
|
<div class="flex flex-wrap items-baseline w-full">
|
||||||
<input required class="input @error('name') border-danger bg-danger-light @enderror" type="text" name="name" value="{{ $debitur->name ?? '' }}">
|
<input required class="input @error('name') border-danger bg-danger-light @enderror" type="text"
|
||||||
|
name="name" value="{{ $debitur->name ?? '' }}">
|
||||||
@error('name')
|
@error('name')
|
||||||
<em class="alert text-danger text-sm">{{ $message }}</em>
|
<em class="text-sm alert text-danger">{{ $message }}</em>
|
||||||
@enderror
|
@enderror
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
|
<div class="flex flex-wrap gap-2.5 items-baseline lg:flex-nowrap">
|
||||||
<label class="form-label max-w-56">
|
<label class="form-label max-w-56">
|
||||||
NPWP
|
NPWP
|
||||||
</label>
|
</label>
|
||||||
<div class="flex flex-wrap items-baseline w-full">
|
<div class="flex flex-wrap items-baseline w-full">
|
||||||
<input class="input @error('npwp') border-danger bg-danger-light @enderror" type="number" name="npwp" value="{{ $debitur->npwp ?? '' }}">
|
<input class="input @error('npwp') border-danger bg-danger-light @enderror" type="number" name="npwp"
|
||||||
|
value="{{ $debitur->npwp ?? '' }}">
|
||||||
@error('npwp')
|
@error('npwp')
|
||||||
<em class="alert text-danger text-sm">{{ $message }}</em>
|
<em class="text-sm alert text-danger">{{ $message }}</em>
|
||||||
@enderror
|
@enderror
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
|
<div class="flex flex-wrap gap-2.5 items-baseline lg:flex-nowrap">
|
||||||
<label class="form-label max-w-56">
|
<label class="form-label max-w-56">
|
||||||
Email
|
Email
|
||||||
</label>
|
</label>
|
||||||
<div class="flex flex-wrap items-baseline w-full">
|
<div class="flex flex-wrap items-baseline w-full">
|
||||||
<input class="input @error('email') border-danger bg-danger-light @enderror" type="email" name="email" value="{{ $debitur->email ?? '' }}">
|
<input class="input @error('email') border-danger bg-danger-light @enderror" type="email" name="email"
|
||||||
|
value="{{ $debitur->email ?? '' }}">
|
||||||
@error('email')
|
@error('email')
|
||||||
<em class="alert text-danger text-sm">{{ $message }}</em>
|
<em class="text-sm alert text-danger">{{ $message }}</em>
|
||||||
@enderror
|
@enderror
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
|
<div class="flex flex-wrap gap-2.5 items-baseline lg:flex-nowrap">
|
||||||
<label class="form-label max-w-56">
|
<label class="form-label max-w-56">
|
||||||
No Handphone
|
No Handphone
|
||||||
</label>
|
</label>
|
||||||
<div class="flex flex-wrap items-baseline w-full">
|
<div class="flex flex-wrap items-baseline w-full">
|
||||||
<input class="input @error('phone') border-danger bg-danger-light @enderror" type="number" name="phone" value="{{ $debitur->phone ?? '' }}">
|
<input class="input @error('phone') border-danger bg-danger-light @enderror" type="number" name="phone"
|
||||||
|
value="{{ $debitur->phone ?? '' }}">
|
||||||
@error('phone')
|
@error('phone')
|
||||||
<em class="alert text-danger text-sm">{{ $message }}</em>
|
<em class="text-sm alert text-danger">{{ $message }}</em>
|
||||||
@enderror
|
@enderror
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
|
<div class="flex flex-wrap gap-2.5 items-baseline lg:flex-nowrap">
|
||||||
<label class="form-label max-w-56 gap-1">
|
<label class="gap-1 form-label max-w-56">
|
||||||
Alamat
|
Alamat
|
||||||
<span class="text-danger">
|
<span class="text-danger">
|
||||||
*
|
*
|
||||||
</span>
|
</span>
|
||||||
</label>
|
</label>
|
||||||
<div class="flex flex-wrap items-baseline w-full">
|
<div class="flex flex-wrap items-baseline w-full">
|
||||||
<div class="flex flex-col lg:flex-row gap-2 w-full">
|
<div class="flex flex-col gap-2 w-full lg:flex-row">
|
||||||
<div class="flex flex-wrap items-baseline w-full">
|
<div class="flex flex-wrap items-baseline w-full">
|
||||||
<select required id="province_code" name="province_code" class="select w-full @error('province_code') border-danger bg-danger-light @enderror">
|
<select required id="province_code" name="province_code"
|
||||||
|
class="select w-full @error('province_code') border-danger bg-danger-light @enderror">
|
||||||
<option value="">Select Province</option>
|
<option value="">Select Province</option>
|
||||||
@foreach($provinces as $province)
|
@foreach ($provinces as $province)
|
||||||
@if(isset($debitur))
|
@if (isset($debitur))
|
||||||
<option value="{{ $province->code }}" {{ isset($debitur->province_code) && $debitur->province_code == $province->code?'selected' : '' }}>
|
<option value="{{ $province->code }}"
|
||||||
|
{{ isset($debitur->province_code) && $debitur->province_code == $province->code ? 'selected' : '' }}>
|
||||||
{{ $province->name }}
|
{{ $province->name }}
|
||||||
</option>
|
</option>
|
||||||
@else
|
@else
|
||||||
@@ -125,16 +136,18 @@
|
|||||||
@endforeach
|
@endforeach
|
||||||
</select>
|
</select>
|
||||||
@error('province_code')
|
@error('province_code')
|
||||||
<em class="alert text-danger text-sm">{{ $message }}</em>
|
<em class="text-sm alert text-danger">{{ $message }}</em>
|
||||||
@enderror
|
@enderror
|
||||||
</div>
|
</div>
|
||||||
<div class="flex flex-wrap items-baseline w-full">
|
<div class="flex flex-wrap items-baseline w-full">
|
||||||
<select required id="city_code" name="city_code" class="select w-full @error('city_code') border-danger bg-danger-light @enderror">
|
<select required id="city_code" name="city_code"
|
||||||
|
class="select w-full @error('city_code') border-danger bg-danger-light @enderror">
|
||||||
<option value="">Select City</option>
|
<option value="">Select City</option>
|
||||||
@if(isset($cities))
|
@if (isset($cities))
|
||||||
@foreach($cities as $city)
|
@foreach ($cities as $city)
|
||||||
@if(isset($debitur))
|
@if (isset($debitur))
|
||||||
<option value="{{ $city->code }}" {{ isset($debitur->city_code) && $debitur->city_code == $city->code?'selected' : '' }}>
|
<option value="{{ $city->code }}"
|
||||||
|
{{ isset($debitur->city_code) && $debitur->city_code == $city->code ? 'selected' : '' }}>
|
||||||
{{ $city->name }}
|
{{ $city->name }}
|
||||||
</option>
|
</option>
|
||||||
@else
|
@else
|
||||||
@@ -147,18 +160,20 @@
|
|||||||
@endif
|
@endif
|
||||||
</select>
|
</select>
|
||||||
@error('city_code')
|
@error('city_code')
|
||||||
<em class="alert text-danger text-sm">{{ $message }}</em>
|
<em class="text-sm alert text-danger">{{ $message }}</em>
|
||||||
@enderror
|
@enderror
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="flex flex-col lg:flex-row gap-2 w-full mt-2 lg:mt-5">
|
<div class="flex flex-col gap-2 mt-2 w-full lg:flex-row lg:mt-5">
|
||||||
<div class="flex flex-wrap items-baseline w-full">
|
<div class="flex flex-wrap items-baseline w-full">
|
||||||
<select required id="district_code" name="district_code" class="select w-full @error('district_code') border-danger bg-danger-light @enderror">
|
<select required id="district_code" name="district_code"
|
||||||
|
class="select w-full @error('district_code') border-danger bg-danger-light @enderror">
|
||||||
<option value="">Select District</option>
|
<option value="">Select District</option>
|
||||||
@if(isset($districts))
|
@if (isset($districts))
|
||||||
@foreach($districts as $district)
|
@foreach ($districts as $district)
|
||||||
@if(isset($debitur))
|
@if (isset($debitur))
|
||||||
<option value="{{ $district->code }}" {{ isset($debitur->district_code) && $debitur->district_code == $district->code?'selected' : '' }}>
|
<option value="{{ $district->code }}"
|
||||||
|
{{ isset($debitur->district_code) && $debitur->district_code == $district->code ? 'selected' : '' }}>
|
||||||
{{ $district->name }}
|
{{ $district->name }}
|
||||||
</option>
|
</option>
|
||||||
@else
|
@else
|
||||||
@@ -171,16 +186,18 @@
|
|||||||
@endif
|
@endif
|
||||||
</select>
|
</select>
|
||||||
@error('district_code')
|
@error('district_code')
|
||||||
<em class="alert text-danger text-sm">{{ $message }}</em>
|
<em class="text-sm alert text-danger">{{ $message }}</em>
|
||||||
@enderror
|
@enderror
|
||||||
</div>
|
</div>
|
||||||
<div class="flex flex-wrap items-baseline w-full">
|
<div class="flex flex-wrap items-baseline w-full">
|
||||||
<select required id="village_code" name="village_code" class="select w-full @error('district_code') border-danger bg-danger-light @enderror">
|
<select required id="village_code" name="village_code"
|
||||||
|
class="select w-full @error('district_code') border-danger bg-danger-light @enderror">
|
||||||
<option value="">Select Village</option>
|
<option value="">Select Village</option>
|
||||||
@if(isset($villages))
|
@if (isset($villages))
|
||||||
@foreach($villages as $village)
|
@foreach ($villages as $village)
|
||||||
@if(isset($debitur))
|
@if (isset($debitur))
|
||||||
<option value="{{ $village->code }}" {{ isset($debitur->village_code) && $debitur->village_code == $village->code?'selected' : '' }}>
|
<option value="{{ $village->code }}"
|
||||||
|
{{ isset($debitur->village_code) && $debitur->village_code == $village->code ? 'selected' : '' }}>
|
||||||
{{ $village->name }}
|
{{ $village->name }}
|
||||||
</option>
|
</option>
|
||||||
@else
|
@else
|
||||||
@@ -193,20 +210,23 @@
|
|||||||
@endif
|
@endif
|
||||||
</select>
|
</select>
|
||||||
@error('district_code')
|
@error('district_code')
|
||||||
<em class="alert text-danger text-sm">{{ $message }}</em>
|
<em class="text-sm alert text-danger">{{ $message }}</em>
|
||||||
@enderror
|
@enderror
|
||||||
</div>
|
</div>
|
||||||
<div class="flex flex-wrap items-baseline w-full">
|
<div class="flex flex-wrap items-baseline w-full">
|
||||||
<input required class="input @error('postal_code') border-danger bg-danger-light @enderror" type="number" id="postal_code" name="postal_code" value="{{ $debitur->postal_code ?? '' }}" placeholder="Postal Code">
|
<input required class="input @error('postal_code') border-danger bg-danger-light @enderror"
|
||||||
|
type="number" id="postal_code" name="postal_code"
|
||||||
|
value="{{ $debitur->postal_code ?? '' }}" placeholder="Postal Code">
|
||||||
@error('postal_code')
|
@error('postal_code')
|
||||||
<em class="alert text-danger text-sm">{{ $message }}</em>
|
<em class="text-sm alert text-danger">{{ $message }}</em>
|
||||||
@enderror
|
@enderror
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="flex flex-row w-full mt-2 lg:mt-5">
|
<div class="flex flex-row mt-2 w-full lg:mt-5">
|
||||||
<textarea required class="textarea @error('address') border-danger bg-danger-light @enderror" rows="3" id="address" name="address" placeholder="Alamat Lengkap">{{ $debitur->address ?? '' }}</textarea>
|
<textarea required class="textarea @error('address') border-danger bg-danger-light @enderror" rows="3"
|
||||||
|
id="address" name="address" placeholder="Alamat Lengkap">{{ $debitur->address ?? '' }}</textarea>
|
||||||
@error('address')
|
@error('address')
|
||||||
<em class="alert text-danger text-sm">{{ $message }}</em>
|
<em class="text-sm alert text-danger">{{ $message }}</em>
|
||||||
@enderror
|
@enderror
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -219,7 +239,7 @@
|
|||||||
</form>
|
</form>
|
||||||
@push('scripts')
|
@push('scripts')
|
||||||
<script>
|
<script>
|
||||||
document.addEventListener('DOMContentLoaded', function () {
|
document.addEventListener('DOMContentLoaded', function() {
|
||||||
const form = document.getElementById('debitur-form');
|
const form = document.getElementById('debitur-form');
|
||||||
const nameInput = form.querySelector('input[name="name"]');
|
const nameInput = form.querySelector('input[name="name"]');
|
||||||
const provinceSelect = form.querySelector('#province_code');
|
const provinceSelect = form.querySelector('#province_code');
|
||||||
@@ -319,7 +339,7 @@
|
|||||||
return isValid;
|
return isValid;
|
||||||
}
|
}
|
||||||
|
|
||||||
form.addEventListener('submit', function (event) {
|
form.addEventListener('submit', function(event) {
|
||||||
const isValid =
|
const isValid =
|
||||||
validateBranch() &&
|
validateBranch() &&
|
||||||
validateCIF() &&
|
validateCIF() &&
|
||||||
@@ -336,7 +356,7 @@
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
submitButton.addEventListener('click', function (event) {
|
submitButton.addEventListener('click', function(event) {
|
||||||
if (!validateAllFields()) {
|
if (!validateAllFields()) {
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,97 +5,119 @@
|
|||||||
@endsection
|
@endsection
|
||||||
|
|
||||||
@section('content')
|
@section('content')
|
||||||
<div class="w-full grid gap-5 lg:gap-7.5 mx-auto">
|
<div class="grid gap-5 mx-auto w-full lg:gap-7.5">
|
||||||
<div class="card border border-agi-100 pb-2.5">
|
<div class="pb-2.5 border card border-agi-100">
|
||||||
<div class="card-header bg-agi-50" id="basic_settings">
|
<div class="card-header bg-agi-50" id="basic_settings">
|
||||||
<div class="card-title flex flex-row gap-1.5">
|
<div class="flex flex-row gap-1.5 card-title">
|
||||||
Persetujuan Penawaran
|
Persetujuan Penawaranaa
|
||||||
</div>
|
</div>
|
||||||
<div class="flex items-center gap-2">
|
<div class="flex gap-2 items-center">
|
||||||
<a href="{{ route('persetujuan-penawaran.index') }}" class="btn btn-xs btn-info"><i class="ki-filled ki-exit-left"></i> Back</a>
|
<a href="{{ route('persetujuan-penawaran.index') }}" class="btn btn-xs btn-info"><i
|
||||||
|
class="ki-filled ki-exit-left"></i> Back</a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="card-body">
|
<div class="card-body">
|
||||||
<form action="{{ route('persetujuan-penawaran.store') }}" method="POST" class="grid gap-5" enctype="multipart/form-data">
|
<form action="{{ route('persetujuan-penawaran.store') }}" method="POST" class="grid gap-5"
|
||||||
|
enctype="multipart/form-data">
|
||||||
@csrf
|
@csrf
|
||||||
<input type="hidden" name="permohonan_id" value="{{ $permohonan->id }}">
|
<input type="hidden" name="permohonan_id" value="{{ $permohonan->id }}">
|
||||||
<input type="hidden" name="penawaran_id" value="{{ $permohonan->penawaran->id ?? old('penawaran_id') }}">
|
<input type="hidden" name="penawaran_id"
|
||||||
<input type="hidden" name="nomor_proposal_penawaran" value="{{ $permohonan->penawaran->detail->no_proposal ?? old('nomor_proposal_penawaran') }}">
|
value="{{ $permohonan->penawaran->id ?? old('penawaran_id') }}">
|
||||||
<input type="hidden" name="tanggal_proposal_penawaran" value="{{ $permohonan->penawaran->detail->tgl_proposal ?? old('tanggal_proposal_penawaran') }}">
|
<input type="hidden" name="nomor_proposal_penawaran"
|
||||||
<input type="hidden" name="biaya_final" value="{{ $permohonan->penawaran->detail->biaya_penawaran ?? old('biaya_final') }}">
|
value="{{ $permohonan->penawaran->detail->no_proposal ?? old('nomor_proposal_penawaran') }}">
|
||||||
|
<input type="hidden" name="tanggal_proposal_penawaran"
|
||||||
|
value="{{ $permohonan->penawaran->detail->tgl_proposal ?? old('tanggal_proposal_penawaran') }}">
|
||||||
|
<input type="hidden" name="biaya_final"
|
||||||
|
value="{{ $permohonan->penawaran->detail->biaya_penawaran ?? old('biaya_final') }}">
|
||||||
|
|
||||||
|
|
||||||
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5 hidden">
|
<div class="flex hidden flex-wrap gap-2.5 items-baseline lg:flex-nowrap">
|
||||||
<label class="form-label max-w-56">
|
<label class="form-label max-w-56">
|
||||||
Status Bayar
|
Status Bayar
|
||||||
</label>
|
</label>
|
||||||
<div class="flex flex-wrap items-baseline w-full">
|
<div class="flex flex-wrap items-baseline w-full">
|
||||||
<select class="input tomselect w-full @error('status_bayar') border-danger bg-danger-light @enderror" name="status_bayar" id="status_bayar">
|
<select
|
||||||
|
class="input tomselect w-full @error('status_bayar') border-danger bg-danger-light @enderror"
|
||||||
|
name="status_bayar" id="status_bayar">
|
||||||
<option value="">Pilih Status Bayar</option>
|
<option value="">Pilih Status Bayar</option>
|
||||||
<option value="sudah_bayar" {{ (old('status_bayar') == 'sudah_bayar') || (isset($permohonan) && $permohonan->status_bayar == 'sudah_bayar') ? 'selected' : '' }}>Sudah Bayar</option>
|
<option value="sudah_bayar"
|
||||||
<option value="belum_bayar" {{ (old('status_bayar') == 'belum_bayar') || (isset($permohonan) && $permohonan->status_bayar == 'belum_bayar') ? 'selected' : '' }}>Belum Bayar</option>
|
{{ old('status_bayar') == 'sudah_bayar' || (isset($permohonan) && $permohonan->status_bayar == 'sudah_bayar') ? 'selected' : '' }}>
|
||||||
|
Sudah Bayar</option>
|
||||||
|
<option value="belum_bayar"
|
||||||
|
{{ old('status_bayar') == 'belum_bayar' || (isset($permohonan) && $permohonan->status_bayar == 'belum_bayar') ? 'selected' : '' }}>
|
||||||
|
Belum Bayar</option>
|
||||||
</select>
|
</select>
|
||||||
@error('status_bayar')
|
@error('status_bayar')
|
||||||
<em class="alert text-danger text-sm">{{ $message }}</em>
|
<em class="text-sm alert text-danger">{{ $message }}</em>
|
||||||
@enderror
|
@enderror
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
|
<div class="flex flex-wrap gap-2.5 items-baseline lg:flex-nowrap">
|
||||||
<label class="form-label max-w-56">
|
<label class="form-label max-w-56">
|
||||||
File Persetujuan Penawaran
|
File Persetujuan Penawaran
|
||||||
</label>
|
</label>
|
||||||
<div class="flex flex-wrap items-baseline w-full">
|
<div class="flex flex-wrap items-baseline w-full">
|
||||||
<input type="file" name="file_persetujuan_penawaran" id="file_persetujuan_penawaran" class="file-input w-full @error('file_persetujuan_penawaran') border-danger bg-danger-light @enderror" accept=".pdf,.doc,.docx">
|
<input type="file" name="file_persetujuan_penawaran" id="file_persetujuan_penawaran"
|
||||||
|
class="file-input w-full @error('file_persetujuan_penawaran') border-danger bg-danger-light @enderror"
|
||||||
|
accept=".pdf,.doc,.docx">
|
||||||
@error('file_persetujuan_penawaran')
|
@error('file_persetujuan_penawaran')
|
||||||
<em class="alert text-danger text-sm">{{ $message }}</em>
|
<em class="text-sm alert text-danger">{{ $message }}</em>
|
||||||
@enderror
|
@enderror
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
|
<div class="flex flex-wrap gap-2.5 items-baseline lg:flex-nowrap">
|
||||||
<label class="form-label max-w-56">
|
<label class="form-label max-w-56">
|
||||||
Surat Representasi
|
Surat Representasi
|
||||||
</label>
|
</label>
|
||||||
<div class="flex flex-wrap items-baseline w-full">
|
<div class="flex flex-wrap items-baseline w-full">
|
||||||
<input type="file" name="surat_representasi" id="surat_representasi" class="file-input w-full @error('surat_representasi') border-danger bg-danger-light @enderror" accept=".pdf,.doc,.docx">
|
<input type="file" name="surat_representasi" id="surat_representasi"
|
||||||
|
class="file-input w-full @error('surat_representasi') border-danger bg-danger-light @enderror"
|
||||||
|
accept=".pdf,.doc,.docx">
|
||||||
@error('surat_representasi')
|
@error('surat_representasi')
|
||||||
<em class="alert text-danger text-sm">{{ $message }}</em>
|
<em class="text-sm alert text-danger">{{ $message }}</em>
|
||||||
@enderror
|
@enderror
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
|
<div class="flex flex-wrap gap-2.5 items-baseline lg:flex-nowrap">
|
||||||
<label class="form-label max-w-56">
|
<label class="form-label max-w-56">
|
||||||
Nominal Bayar
|
Nominal Bayar
|
||||||
</label>
|
</label>
|
||||||
<div class="flex flex-wrap items-baseline w-full">
|
<div class="flex flex-wrap items-baseline w-full">
|
||||||
<input type="number" name="nominal_bayar" id="nominal_bayar" class="input w-full @error('nominal_bayar') border-danger bg-danger-light @enderror" value="{{ old('nominal_bayar', $persetujuanPenawaran->nominal_bayar ?? '') }}" placeholder="Masukkan nominal bayar">
|
<input type="number" name="nominal_bayar" id="nominal_bayar"
|
||||||
|
class="input w-full @error('nominal_bayar') border-danger bg-danger-light @enderror"
|
||||||
|
value="{{ old('nominal_bayar', $persetujuanPenawaran->nominal_bayar ?? '') }}"
|
||||||
|
placeholder="Masukkan nominal bayar">
|
||||||
@error('nominal_bayar')
|
@error('nominal_bayar')
|
||||||
<em class="alert text-danger text-sm">{{ $message }}</em>
|
<em class="text-sm alert text-danger">{{ $message }}</em>
|
||||||
@enderror
|
@enderror
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
|
<div class="flex flex-wrap gap-2.5 items-baseline lg:flex-nowrap">
|
||||||
<label class="form-label max-w-56">
|
<label class="form-label max-w-56">
|
||||||
Bukti Bayar
|
Bukti Bayar
|
||||||
</label>
|
</label>
|
||||||
<div class="flex flex-wrap items-baseline w-full">
|
<div class="flex flex-wrap items-baseline w-full">
|
||||||
<input type="file" name="bukti_bayar" id="bukti_bayar" class="file-input w-full @error('bukti_bayar') border-danger bg-danger-light @enderror" accept=".pdf,.jpg,.jpeg,.png">
|
<input type="file" name="bukti_bayar" id="bukti_bayar"
|
||||||
|
class="file-input w-full @error('bukti_bayar') border-danger bg-danger-light @enderror"
|
||||||
|
accept=".pdf,.jpg,.jpeg,.png">
|
||||||
@error('bukti_bayar')
|
@error('bukti_bayar')
|
||||||
<em class="alert text-danger text-sm">{{ $message }}</em>
|
<em class="text-sm alert text-danger">{{ $message }}</em>
|
||||||
@enderror
|
@enderror
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
|
<div class="flex flex-wrap gap-2.5 items-baseline lg:flex-nowrap">
|
||||||
<label class="form-label max-w-56">
|
<label class="form-label max-w-56">
|
||||||
Catatan
|
Catatan
|
||||||
</label>
|
</label>
|
||||||
<div class="flex flex-wrap items-baseline w-full">
|
<div class="flex flex-wrap items-baseline w-full">
|
||||||
<textarea name="catatan" id="catatan" rows="4" class="textarea w-full @error('catatan') border-danger bg-danger-light @enderror" placeholder="Masukkan catatan">{{ old('catatan', $persetujuanPenawaran->catatan ?? '') }}</textarea>
|
<textarea name="catatan" id="catatan" rows="4"
|
||||||
|
class="textarea w-full @error('catatan') border-danger bg-danger-light @enderror" placeholder="Masukkan catatan">{{ old('catatan', $persetujuanPenawaran->catatan ?? '') }}</textarea>
|
||||||
@error('catatan')
|
@error('catatan')
|
||||||
<em class="alert text-danger text-sm">{{ $message }}</em>
|
<em class="text-sm alert text-danger">{{ $message }}</em>
|
||||||
@enderror
|
@enderror
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Reference in New Issue
Block a user