KoPKB/kaunter
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

update pekerjaan lain-lain

Browse Source
This commit is contained in:
Ain Izazi
2024-12-01 14:15:15 +08:00
parent 3cbc26aebe
commit 6443548081
8 changed files with 203 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/CustomersController.php
+9 -5
View File
@@ -40,9 +40,10 @@ class CustomersController extends Controller
$idtype = 'nokp'; $idtype = 'nokp';
$cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); $cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
$bank = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/bank')->json(); $bank = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/bank')->json();
$pekerjaan = Http::withOptions(['verify' => config('app.api_verify')])->get($api_url . '/api/pekerjaan')->json();
$blacklist_search = false; $blacklist_search = false;
return view('customers.' . $cawangan_info['version'] . '.index',compact('search','blacklist_search','cawangan_info','bank','api_url','idtype')); return view('customers.' . $cawangan_info['version'] . '.index',compact('search','blacklist_search','cawangan_info','bank','api_url','idtype','pekerjaan'));
} }
public function info(Request $request){ public function info(Request $request){
@@ -51,7 +52,8 @@ class CustomersController extends Controller
$cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); $cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
$customer_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/customers/'. Session::get('noic'))->json(); $customer_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/customers/'. Session::get('noic'))->json();
// dd($customer_info);
$pekerjaan = Http::withOptions(['verify' => config('app.api_verify')])->get($api_url . '/api/pekerjaan')->json();
$komoditi = Komoditi::first(); $komoditi = Komoditi::first();
$min_komoditi = $komoditi['min_komoditi']; $min_komoditi = $komoditi['min_komoditi'];
@@ -68,7 +70,7 @@ class CustomersController extends Controller
$request->session()->flash('activate_tab', 'SAG_baru'); $request->session()->flash('activate_tab', 'SAG_baru');
} }
return view($customer_page,compact('cawangan_info','api_url','customer_info','bakilelong','rugilelong','min_komoditi')); return view($customer_page,compact('cawangan_info','api_url','customer_info','bakilelong','rugilelong','min_komoditi','pekerjaan'));
} }
public function search(Request $request){ public function search(Request $request){
@@ -81,6 +83,7 @@ class CustomersController extends Controller
$cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); $cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
$bank = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/bank')->json(); $bank = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/bank')->json();
$customer_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/customers/'. $noic)->json(); $customer_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/customers/'. $noic)->json();
$pekerjaan = Http::withOptions(['verify' => config('app.api_verify')])->get($api_url . '/api/pekerjaan')->json();
$blacklist = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/customer/blacklist',[ $blacklist = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/customer/blacklist',[
'nokp' => $noic 'nokp' => $noic
@@ -105,9 +108,9 @@ class CustomersController extends Controller
}else{ }else{
if($blacklist){ if($blacklist){
$blacklist_search = true; $blacklist_search = true;
return view('customers.' . $cawangan_info['version'] . '.index',compact('blacklist_search','customer_info','search','noic','cawangan_info','bank','api_url','idtype')); return view('customers.' . $cawangan_info['version'] . '.index',compact('blacklist_search','customer_info','search','noic','cawangan_info','bank','api_url','idtype','pekerjaan'));
}else{ }else{
return view('customers.' . $cawangan_info['version'] . '.index',compact('blacklist_search','customer_info','search','noic','cawangan_info','bank','api_url','idtype')); return view('customers.' . $cawangan_info['version'] . '.index',compact('blacklist_search','customer_info','search','noic','cawangan_info','bank','api_url','idtype','pekerjaan'));
} }
} }
} }
@@ -219,6 +222,7 @@ class CustomersController extends Controller
'nosiri' => $nosiri_latest, 'nosiri' => $nosiri_latest,
'nota'=>$request->nota, 'nota'=>$request->nota,
'kodkerja'=>$request->pekerjaan, 'kodkerja'=>$request->pekerjaan,
'nota_pekerjaan'=>$request->nota_pekerjaan,
'tujuangadai'=>$request->tujuan_gadai, 'tujuangadai'=>$request->tujuan_gadai,
]); ]);
app/Http/Controllers/KhazanahController.php
+37 -35
View File
@@ -78,15 +78,17 @@ class KhazanahController extends Controller
Session::put('customer_info_khazanah',$customer_info); Session::put('customer_info_khazanah',$customer_info);
if($auth_user->roles == 'admin'){ if($auth_user->roles == 'admin'){
return redirect()->route('admin.customer_info')->with( ['customer_info' => $customer_info,'cawangan_info'=>$cawangan_info,'api_url'=>$api_url]); return redirect()->route('admin.customer_info')->with( ['customer_info' => $customer_info,'cawangan_info'=>$cawangan_info,'api_url'=>$api_url]);
}else{
return redirect()->route('khazanah.customer_info')->with( ['customer_info' => $customer_info,'cawangan_info'=>$cawangan_info,'api_url'=>$api_url]);
} }
return redirect()->route('khazanah.customer_info')->with( ['customer_info' => $customer_info,'cawangan_info'=>$cawangan_info,'api_url'=>$api_url]);
// return redirect()->back()->with('failed','Maaf,Tiada Data Pelanggan...');
}else{ }else{
if($auth_user->roles == 'admin'){ if($auth_user->roles == 'admin'){
return view('admin.customer_index',compact('search','noic','cawangan_info','bank','api_url','idtype')); return view('admin.customer_index',compact('search','noic','cawangan_info','bank','api_url','idtype'));
}else{
return view('khazanah.index',compact('search','noic','cawangan_info','bank','api_url','idtype'));
} }
// return view('khazanah.index',compact('search','noic','cawangan_info','bank','api_url','idtype'));
return redirect()->back()->with('failed','Maaf,Tiada Data Pelanggan...');
} }
} }
@@ -2181,7 +2183,7 @@ class KhazanahController extends Controller
$tarikh_cetak = $current->toDateString(); $tarikh_cetak = $current->toDateString();
$kod_cawangan = $auth_user['cawangan']; $kod_cawangan = $auth_user['cawangan'];
if($request->dateringkasanharian == null){ if($request->dateringkasanharian == null){
$startDate = $current->toDateString(); $startDate = $current->toDateString();
}else{ }else{
@@ -2195,22 +2197,22 @@ class KhazanahController extends Controller
$split_date = explode('-',$request->dateringkasanharian); $split_date = explode('-',$request->dateringkasanharian);
$endDate = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0]; $endDate = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0];
} }
$cawangan=Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json(); $cawangan=Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
$cawangan_detail=$cawangan[0]; $cawangan_detail=$cawangan[0];
$laporan_ringkasan = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/reports/ringkasan-harian/' . $kod_cawangan,[ $laporan_ringkasan = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/reports/ringkasan-harian/' . $kod_cawangan,[
'startDate' => $startDate, 'startDate' => $startDate,
'endDate' => $endDate, 'endDate' => $endDate,
])->json(); ])->json();
$laporan = $laporan_ringkasan[0]; $laporan = $laporan_ringkasan[0];
$kawalanstok = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/reports/kawalan-stok/' . $kod_cawangan, [ $kawalanstok = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/reports/kawalan-stok/' . $kod_cawangan, [
'startDate' => $startDate, 'startDate' => $startDate,
'endDate' => $endDate, 'endDate' => $endDate,
])->json(); ])->json();
/* Kawalan Stok */ /* Kawalan Stok */
//Gadai //Gadai
$totalbilgadaikeseluruhan = $kawalanstok[0]['gadai1'][0]['bil'] + $kawalanstok[0]['gadai2'][0]['bil'] + $kawalanstok[0]['gadai3'][0]['bil']; $totalbilgadaikeseluruhan = $kawalanstok[0]['gadai1'][0]['bil'] + $kawalanstok[0]['gadai2'][0]['bil'] + $kawalanstok[0]['gadai3'][0]['bil'];
@@ -2424,11 +2426,11 @@ class KhazanahController extends Controller
$auth_user = Auth::user(); $auth_user = Auth::user();
$api_url = config('api.url'); $api_url = config('api.url');
$cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); $cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
$data_sebenar = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/admin/dashboard/aging',['kodcaw' => $auth_user['cawangan'], 'options' => 'sebenar'])->json(); $data_sebenar = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/admin/dashboard/aging',['kodcaw' => $auth_user['cawangan'], 'options' => 'sebenar'])->json();
$data_lelong = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/admin/dashboard/aging',['kodcaw' => $auth_user['cawangan'], 'options' => 'datalelong'])->json(); $data_lelong = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/admin/dashboard/aging',['kodcaw' => $auth_user['cawangan'], 'options' => 'datalelong'])->json();
$data_filter = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/admin/dashboard/aging',['kodcaw' => $auth_user['cawangan'], 'options' => 'filter'])->json(); $data_filter = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/admin/dashboard/aging',['kodcaw' => $auth_user['cawangan'], 'options' => 'filter'])->json();
return view('khazanah.bajet',compact('cawangan_info','api_url','data_sebenar','data_lelong','data_filter')); return view('khazanah.bajet',compact('cawangan_info','api_url','data_sebenar','data_lelong','data_filter'));
} }
@@ -3135,34 +3137,34 @@ class KhazanahController extends Controller
$current = Carbon::now(); $current = Carbon::now();
$current = new Carbon(); $current = new Carbon();
$tarikh_cetak = $current->toDateString(); $tarikh_cetak = $current->toDateString();
if($request->datetimepicker1 == null){ if($request->datetimepicker1 == null){
$gadai_date = $current->toDateString(); $gadai_date = $current->toDateString();
} else { } else {
$split_date = explode('-', $request->datetimepicker1); $split_date = explode('-', $request->datetimepicker1);
$gadai_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0]; $gadai_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0];
} }
// Fetching the data from API // Fetching the data from API
$tuntutbaki = Http::withOptions(['verify' => config('app.api_verify')]) $tuntutbaki = Http::withOptions(['verify' => config('app.api_verify')])
->get(config('api.url') . '/api/TuntutBakiTarikh/' . $auth_user['cawangan'], ['tarikh' => $gadai_date]) ->get(config('api.url') . '/api/TuntutBakiTarikh/' . $auth_user['cawangan'], ['tarikh' => $gadai_date])
->json(); ->json();
$cawangan = Http::withOptions(['verify' => config('app.api_verify')]) $cawangan = Http::withOptions(['verify' => config('app.api_verify')])
->get(config('api.url') . '/api/cawangan/detail/' . $auth_user['cawangan']) ->get(config('api.url') . '/api/cawangan/detail/' . $auth_user['cawangan'])
->json(); ->json();
// Check if $tuntutbaki is an array and not empty before sending it to the view // Check if $tuntutbaki is an array and not empty before sending it to the view
if (!is_array($tuntutbaki) || empty($tuntutbaki)) { if (!is_array($tuntutbaki) || empty($tuntutbaki)) {
$tuntutbaki = []; // If not valid, set it to an empty array $tuntutbaki = []; // If not valid, set it to an empty array
} }
$cawangan_detail = $cawangan[0] ?? null; $cawangan_detail = $cawangan[0] ?? null;
return view('print.laporan_tuntutbaki', compact('tuntutbaki', 'cawangan_detail', 'tarikh_cetak', 'gadai_date', 'api_url')); return view('print.laporan_tuntutbaki', compact('tuntutbaki', 'cawangan_detail', 'tarikh_cetak', 'gadai_date', 'api_url'));
} }
@@ -4315,12 +4317,12 @@ class KhazanahController extends Controller
if($request->datetimepicker2 == null){ if($request->datetimepicker2 == null){
$tarikh_cetak = $current->toDateString(); $tarikh_cetak = $current->toDateString();
}else{ }else{
$split_date = explode('-',$request->datetimepicker2); $split_date = explode('-',$request->datetimepicker2);
$tarikh_imbangan2 = $request->datetimepicker2; $tarikh_imbangan2 = $request->datetimepicker2;
} }
$tarikh_imbangan2 = new Carbon($tarikh_imbangan2); $tarikh_imbangan2 = new Carbon($tarikh_imbangan2);
// if($tarikh_imbangan2 < $current->toDateString()){ // if($tarikh_imbangan2 < $current->toDateString()){
if($tarikh_imbangan2 < $current->toDateString()){ if($tarikh_imbangan2 < $current->toDateString()){
@@ -4374,12 +4376,12 @@ class KhazanahController extends Controller
$cawangan=Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json(); $cawangan=Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
$cawangan_detail=$cawangan[0]; $cawangan_detail=$cawangan[0];
$stokaudit_aktif = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/stokaudit/aktif/'. $auth_user['cawangan'],['tarikh' => $stokaudit_date])->json(); $stokaudit_aktif = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/stokaudit/aktif/'. $auth_user['cawangan'],['tarikh' => $stokaudit_date])->json();
$stokaudit_takaktif = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/stokaudit/takaktif/'. $auth_user['cawangan'],['tarikh' => $stokaudit_date])->json(); $stokaudit_takaktif = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/stokaudit/takaktif/'. $auth_user['cawangan'],['tarikh' => $stokaudit_date])->json();
// return view('print.laporan_stokauditbelumaktif', compact('stokaudit','cawangan_detail','tarikh_cetak','stokaudit_date','api_url')); // return view('print.laporan_stokauditbelumaktif', compact('stokaudit','cawangan_detail','tarikh_cetak','stokaudit_date','api_url'));
return view('print.laporan_stokauditcombine', compact('stokaudit_aktif','stokaudit_takaktif','cawangan_detail','tarikh_cetak','stokaudit_date','api_url')); return view('print.laporan_stokauditcombine', compact('stokaudit_aktif','stokaudit_takaktif','cawangan_detail','tarikh_cetak','stokaudit_date','api_url'));
} }
@@ -4466,7 +4468,7 @@ class KhazanahController extends Controller
$cawangan_detail=$cawangan[0]; $cawangan_detail=$cawangan[0];
return view('print.laporan_tebus_ujrah', compact('tebus','cawangan_detail','tarikh_cetak','mula_date','hingga_date','tebuspengasingan','api_url','upahlama','ansuran','totalkeuntunganrebet')); return view('print.laporan_tebus_ujrah', compact('tebus','cawangan_detail','tarikh_cetak','mula_date','hingga_date','tebuspengasingan','api_url','upahlama','ansuran','totalkeuntunganrebet'));
} }
public function laporanAnsuranUjrah(){ public function laporanAnsuranUjrah(){
$auth_user = Auth::user(); $auth_user = Auth::user();
$api_url = config('api.url'); $api_url = config('api.url');
@@ -4496,12 +4498,12 @@ class KhazanahController extends Controller
$split_date = explode('-', $request->datehingga); $split_date = explode('-', $request->datehingga);
$hingga_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0]; $hingga_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0];
} }
$tebus = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/ansuranujrah/laporan/'. $auth_user['cawangan'],['mula' => $mula_date,'akhir' => $hingga_date])->json(); $tebus = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/ansuranujrah/laporan/'. $auth_user['cawangan'],['mula' => $mula_date,'akhir' => $hingga_date])->json();
$cawangan=Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json(); $cawangan=Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
$cawangan_detail=$cawangan[0]; $cawangan_detail=$cawangan[0];
return view('print.laporan_ansuran_ujrah', compact('tebus','cawangan_detail','tarikh_cetak','mula_date','hingga_date','api_url')); return view('print.laporan_ansuran_ujrah', compact('tebus','cawangan_detail','tarikh_cetak','mula_date','hingga_date','api_url'));
} }
public function laporanStokAuditKhas(){ public function laporanStokAuditKhas(){
$auth_user = Auth::user(); $auth_user = Auth::user();
@@ -4549,7 +4551,7 @@ class KhazanahController extends Controller
$cawangan_detail=$cawangan[0]; $cawangan_detail=$cawangan[0];
$stokaudit = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/stokauditkhas/aktif/'. $auth_user['cawangan'],['daritempoh' => $daritempoh, 'hinggatempoh' => $hinggatempoh])->json(); $stokaudit = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/stokauditkhas/aktif/'. $auth_user['cawangan'],['daritempoh' => $daritempoh, 'hinggatempoh' => $hinggatempoh])->json();
if($request->type == 'excel') if($request->type == 'excel')
{ {
return view('excel.excel_stokauditkhas', compact('stokaudit','cawangan_detail','tarikh_cetak','daritempoh','hinggatempoh','api_url','cawangan_info')); return view('excel.excel_stokauditkhas', compact('stokaudit','cawangan_detail','tarikh_cetak','daritempoh','hinggatempoh','api_url','cawangan_info'));
@@ -4567,7 +4569,7 @@ class KhazanahController extends Controller
return redirect()->route('laporan.stokauditkhas') return redirect()->route('laporan.stokauditkhas')
->with('failed','Blast Whatsapp Tidak Berjaya, Sila Semak Semula Rekod Blasted.'); ->with('failed','Blast Whatsapp Tidak Berjaya, Sila Semak Semula Rekod Blasted.');
} }
} }
else else
{ {
@@ -4693,7 +4695,7 @@ class KhazanahController extends Controller
$kodcaw = $auth_user['cawangan']; $kodcaw = $auth_user['cawangan'];
$cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'.$auth_user['cawangan'])->json(); $cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'.$auth_user['cawangan'])->json();
$bycawnotisperingatan = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/cawangan/bycawnotisperingatan/'.$auth_user['cawangan'].'/'.$notisid)->json(); $bycawnotisperingatan = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/cawangan/bycawnotisperingatan/'.$auth_user['cawangan'].'/'.$notisid)->json();
return view('callcenter.khazanah.bycawdetailnotisperingatan',compact('cawangan_info','bycawnotisperingatan','kodcaw','notisid','api_url')); return view('callcenter.khazanah.bycawdetailnotisperingatan',compact('cawangan_info','bycawnotisperingatan','kodcaw','notisid','api_url'));
} }
resources/views/admin/customer_info.blade.php
+2 -2
View File
@@ -145,10 +145,10 @@
</div> </div>
</div> </div>
</div> </div>
<div class="mr-5 form-group float-right"> {{-- <div class="mr-5 form-group float-right">
<button type="button" class="btn btn-primary" onclick="kemaskinifunc()" id="btnkemaskini">Kemaskini</button> <button type="button" class="btn btn-primary" onclick="kemaskinifunc()" id="btnkemaskini">Kemaskini</button>
<button type="button" class="btn btn-primary" onclick="kemaskinipelanggan()" id="btnsave">Save</button> <button type="button" class="btn btn-primary" onclick="kemaskinipelanggan()" id="btnsave">Save</button>
</div> </div> --}}
</form> </form>
</div> </div>
</div> </div>
resources/views/callcenter/index.blade.php
+9 -9
View File
@@ -46,7 +46,7 @@
<option value="passport" {{ $idtype == 'passport' ? 'selected' : ''}}>Passport</option> <option value="passport" {{ $idtype == 'passport' ? 'selected' : ''}}>Passport</option>
</select> </select>
</div> </div>
<div class="input-group-append"> <div class="input-group-append">
<button class="btn btn-outline-primary" type="submit" id="button-addon2">Cari</button> <button class="btn btn-outline-primary" type="submit" id="button-addon2">Cari</button>
</div> </div>
@@ -56,14 +56,14 @@
</div> </div>
</div> </div>
@if ($message = Session::get('success')) @if ($message = Session::get('success'))
<div class="alert alert-success"> <div class="alert alert-success">
<p>{{ $message }}</p> <p>{{ $message }}</p>
</div> </div>
@elseif ($message = Session::get('failed')) @elseif ($message = Session::get('failed'))
<div class="alert alert-danger"> <div class="alert alert-danger">
<p>{{ $message }}</p> <p>{{ $message }}</p>
</div> </div>
@endif @endif
</form> </form>
</div> </div>
@if($search == true ) @if($search == true )
resources/views/customers/v2/index.blade.php
+31 -18
View File
@@ -182,23 +182,23 @@
</select> </select>
</div> </div>
<div class="col-md-4">Pekerjaan</div> <div class="col-md-4">Pekerjaan</div>
@php
$pekerjaan = Http::withOptions(['verify' => config('app.api_verify')])->get($api_url . '/api/pekerjaan')->json();
@endphp
<div class="col-md-8"> <div class="col-md-8">
<select class="form-control" name="pekerjaan" data-placeholder="Pilih Pekerjaan" id="pekerjaan"> <select class="form-control" name="pekerjaan" id="pekerjaan">
<option disabled selected value> -- Pilih Pekerjaan -- </option> <option disabled selected value> -- Pilih Pekerjaan -- </option>
@foreach($pekerjaan as $kerja) @foreach($pekerjaan as $kerja)
<option value="{{ $kerja['kodkerja'] }}">{{ $kerja['keterangan'] }}</option> <option value="{{ $kerja['kodkerja'] }}">{{ $kerja['keterangan'] }}</option>
@endforeach @endforeach
</select> </select>
<div id="pekerjaan-lain-container" style="display: none; margin-top: 10px;">
<input type="text" class="form-control" id="pekerjaan-lain" name="nota_pekerjaan" placeholder="Masukkan pekerjaan lain">
</div>
</div> </div>
<div class="col-md-4">Nota</div> <div class="col-md-4">Nota</div>
<div class="col-md-8"><input class="form-control" type="text" name="nota" id="nota" placeholder="Nota"></div> <div class="col-md-8"><input class="form-control" type="text" name="nota" id="nota" placeholder="Nota"></div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<input type="text" hidden name="idtype" value="nokp"> <input type="text" hidden name="idtype" value="nokp">
@@ -321,16 +321,17 @@
</select> </select>
</div> </div>
<div class="col-md-4">Pekerjaan</div> <div class="col-md-4">Pekerjaan</div>
@php
$pekerjaan = Http::withOptions(['verify' => config('app.api_verify')])->get($api_url . '/api/pekerjaan')->json();
@endphp
<div class="col-md-8"> <div class="col-md-8">
<select class="form-control" name="pekerjaan" data-placeholder="Pilih Pekerjaan" id="pekerjaan"> <select class="form-control" name="pekerjaan" id="pekerjaan">
<option disabled selected value> -- Pilih Pekerjaan -- </option> <option disabled selected value> -- Pilih Pekerjaan -- </option>
@foreach($pekerjaan as $kerja) @foreach($pekerjaan as $kerja)
<option value="{{ $kerja['kodkerja'] }}">{{ $kerja['keterangan'] }}</option> <option value="{{ $kerja['kodkerja'] }}">{{ $kerja['keterangan'] }}</option>
@endforeach @endforeach
</select> </select>
<div id="pekerjaan-lain-container" style="display: none; margin-top: 10px;">
<input type="text" class="form-control" id="pekerjaan-lain" name="nota_pekerjaan" placeholder="Masukkan pekerjaan lain">
</div>
</div> </div>
<div class="col-md-4">Nota</div> <div class="col-md-4">Nota</div>
<div class="col-md-8"><input class="form-control" type="text" name="nota" id="nota" placeholder="Nota"></div> <div class="col-md-8"><input class="form-control" type="text" name="nota" id="nota" placeholder="Nota"></div>
@@ -446,16 +447,17 @@
</select> </select>
</div> </div>
<div class="col-md-4">Pekerjaan</div> <div class="col-md-4">Pekerjaan</div>
@php
$pekerjaan = Http::withOptions(['verify' => config('app.api_verify')])->get($api_url . '/api/pekerjaan')->json();
@endphp
<div class="col-md-8"> <div class="col-md-8">
<select class="form-control" name="pekerjaan" data-placeholder="Pilih Pekerjaan" id="passport_pekerjaan"> <select class="form-control" name="pekerjaan" id="pekerjaan">
<option disabled selected value> -- Pilih Pekerjaan -- </option> <option disabled selected value> -- Pilih Pekerjaan -- </option>
@foreach($pekerjaan as $kerja) @foreach($pekerjaan as $kerja)
<option value="{{ $kerja['kodkerja'] }}">{{ $kerja['keterangan'] }}</option> <option value="{{ $kerja['kodkerja'] }}">{{ $kerja['keterangan'] }}</option>
@endforeach @endforeach
</select> </select>
<div id="pekerjaan-lain-container" style="display: none; margin-top: 10px;">
<input type="text" class="form-control" id="pekerjaan-lain" name="nota_pekerjaan" placeholder="Masukkan pekerjaan lain">
</div>
</div> </div>
<div class="col-md-4">Nota</div> <div class="col-md-4">Nota</div>
<div class="col-md-8"><input class="form-control" type="text" name="nota" id="passport_nota" placeholder="Nota"></div> <div class="col-md-8"><input class="form-control" type="text" name="nota" id="passport_nota" placeholder="Nota"></div>
@@ -1281,6 +1283,17 @@
</script> </script>
<script src="{{ asset('js/searchName.js') }}"></script> <script src="{{ asset('js/searchName.js') }}"></script>
<script>
$('#pekerjaan').on('change', function() {
var lainContainer = $('#pekerjaan-lain-container');
if ($(this).val() === '6') {
lainContainer.show();
} else {
$('#pekerjaan-lain').val('');
lainContainer.hide();
}
});
</script>
@push('additional_scripts') @push('additional_scripts')
<script> <script>
// mycard-read endpoint initialization // mycard-read endpoint initialization
@@ -1293,4 +1306,4 @@
<script src="{{ asset('js/postcode-concerns.js') }}"></script> <script src="{{ asset('js/postcode-concerns.js') }}"></script>
@endpush @endpush
@endsection @endsection
resources/views/customers/v2/info.blade.php
+57 -15
View File
@@ -121,13 +121,13 @@
<!-- footer card --> <!-- footer card -->
<div class="mr-4 form-group d-flex justify-content-end"> <div class="mr-4 form-group d-flex justify-content-end">
<button class="btn btn-primary button-spacing" data-toggle="modal" data-target="#customer_detail">Maklumat Pelanggan</button> <button class="btn btn-primary button-spacing" data-toggle="modal" data-target="#customer_detail">Maklumat Pelanggan</button>
</div>
</div> </div>
</div> </div>
</div>
<!-- button --> <!-- button -->
<div class="col-md-10 mt-md-2 justify-content-between form-group row"> <div class="col-md-10 mt-md-2 justify-content-between form-group row">
@@ -143,14 +143,14 @@
<label class="btn btn-secondary flex-fill"> <label class="btn btn-secondary flex-fill">
<input type="radio" name="options" id="option3" value="lelong" autocomplete="off"> <input type="radio" name="options" id="option3" value="lelong" autocomplete="off">
Lelong Lelong
</label> </label>
</div> </div>
</div> </div>
<!-- card --> <!-- card -->
<div class="col-md-12 col-lg-12"> <div class="col-md-12 col-lg-12">
<div class="card"> <div class="card">
<div class="card-body"> <div class="card-body">
@@ -345,6 +345,27 @@
<span id="errorkodbank" style="color:red;"></span> <span id="errorkodbank" style="color:red;"></span>
</div> </div>
</div> </div>
<div class='form-group row col-md-12'>
<div class='col-md-5'>
Pekerjaan
</div>
<div class='col-md-7'>
@php
$pekerjaan = Http::withOptions(['verify' => config('app.api_verify')])->get($api_url . '/api/pekerjaan')->json();
@endphp
<select class="form-control" name="kodkerja" data-placeholder="Pilih Pekerjaan" id="kodkerja" disabled="true">
<option value="-" selected disabled>-</option>
@foreach($pekerjaan as $kerja)
<option value="{{ $kerja['kodkerja'] }}" {{ $kerja['kodkerja'] == $customer_info['kodkerja'] ? 'selected' : '' }}>
{{ $kerja['keterangan'] }}
</option>
@endforeach
</select>
<div id="pekerjaan-lain-container" style="display: {{ $customer_info['kodkerja'] == '6' ? 'block' : 'none' }}; margin-top: 10px;" >
<input type="text" class="form-control" id="nota_pekerjaan" name="nota_pekerjaan" placeholder="Sila Nyatakan" value="{{ $customer_info['nota_pekerjaan'] ?? '' }}" disabled="true">
</div>
</div>
</div>
<div class='form-group row col-md-12'> <div class='form-group row col-md-12'>
<div class='col-md-5'> <div class='col-md-5'>
No Akaun No Akaun
@@ -2500,6 +2521,8 @@
$('#telefon').attr('readonly', false); $('#telefon').attr('readonly', false);
$('#telefon2').attr('readonly', false); $('#telefon2').attr('readonly', false);
$('#kodbank').attr('disabled', false); $('#kodbank').attr('disabled', false);
$('#kodkerja').attr('disabled', false);
$('#nota_pekerjaan').attr('disabled', false);
$('#noakaun').attr('readonly', false); $('#noakaun').attr('readonly', false);
$('#nota').attr('readonly', false); $('#nota').attr('readonly', false);
$('#alamat').attr('readonly', false); $('#alamat').attr('readonly', false);
@@ -2521,6 +2544,8 @@
$('#telefon').attr('readonly', true); $('#telefon').attr('readonly', true);
$('#telefon2').attr('readonly', true); $('#telefon2').attr('readonly', true);
$('#kodbank').attr('disabled', true); $('#kodbank').attr('disabled', true);
$('#kodkerja').attr('disabled', true);
$('#nota_pekerjaan').attr('disabled', true);
$('#noakaun').attr('readonly', true); $('#noakaun').attr('readonly', true);
$('#nota').attr('readonly', true); $('#nota').attr('readonly', true);
$('#alamat').attr('readonly', true); $('#alamat').attr('readonly', true);
@@ -2534,6 +2559,8 @@
var telefon1 = $('#telefon').val(); var telefon1 = $('#telefon').val();
var telefon2 = $('#telefon2').val(); var telefon2 = $('#telefon2').val();
var kodbank = $('#kodbank').val(); var kodbank = $('#kodbank').val();
var kodkerja = $('#kodkerja').val();
var nota_pekerjaan = $('#nota_pekerjaan').val();
var noakaun = $('#noakaun').val(); var noakaun = $('#noakaun').val();
var nota = $('#nota').val(); var nota = $('#nota').val();
var alamat = $('#alamat').val(); var alamat = $('#alamat').val();
@@ -2547,6 +2574,8 @@
"telefon1": telefon1, "telefon1": telefon1,
"telefon2": telefon2, "telefon2": telefon2,
"kodbank":kodbank, "kodbank":kodbank,
"kodkerja":kodkerja,
"nota_pekerjaan":nota_pekerjaan,
"noakaun":noakaun, "noakaun":noakaun,
'nota':nota, 'nota':nota,
'alamat':alamat, 'alamat':alamat,
@@ -2631,6 +2660,8 @@
$('#telefon2').attr('readonly', true); $('#telefon2').attr('readonly', true);
$('#noakaun').attr('readonly', true); $('#noakaun').attr('readonly', true);
$('#kodbank').attr('disabled', true); $('#kodbank').attr('disabled', true);
$('#kodkerja').attr('disabled', true);
$('#nota_pekerjaan').attr('disabled', true);
$('#nota').attr('readonly', true); $('#nota').attr('readonly', true);
$('#alamat').attr('readonly', true); $('#alamat').attr('readonly', true);
$('#poskod').attr('readonly', true); $('#poskod').attr('readonly', true);
@@ -2676,7 +2707,7 @@
}); });
async function removeansuran(event){ async function removeansuran(event){
let ansid = $('input[name="belum"]:checked').val(); let ansid = $('input[name="belum"]:checked').val();
let harini = new Date();harini.setHours(0, 0, 0, 0); let harini = new Date();harini.setHours(0, 0, 0, 0);
@@ -2687,7 +2718,7 @@
text: 'Ansuran untuk Pembiayaan Belum Selesai Sahaja!' text: 'Ansuran untuk Pembiayaan Belum Selesai Sahaja!'
}); });
return false; return false;
} }
if(ansid == null && $("input[name='options']:checked").val() == 'belum_tebus'){ if(ansid == null && $("input[name='options']:checked").val() == 'belum_tebus'){
@@ -2710,7 +2741,7 @@
let ansuranlatest = await fetch(api_url + '/admin/ansuran/getLatest?' + queryString) let ansuranlatest = await fetch(api_url + '/admin/ansuran/getLatest?' + queryString)
.then(response => response.json()) .then(response => response.json())
.then(response => {return response}); .then(response => {return response});
if(Object.keys(ansuranlatest).length == 0){ if(Object.keys(ansuranlatest).length == 0){
Swal.fire({ Swal.fire({
icon: 'error', icon: 'error',
@@ -2728,9 +2759,9 @@
}catch(error){ }catch(error){
console.error("Error:", error); console.error("Error:", error);
} }
} }
@@ -2743,7 +2774,7 @@
} }
async function getKelulusanKhazanahOperasi(textstatus = 'none',norujukan){ async function getKelulusanKhazanahOperasi(textstatus = 'none',norujukan){
const swalWithBootstrapButtons = Swal.mixin({ const swalWithBootstrapButtons = Swal.mixin({
customClass: { customClass: {
confirmButton: 'btn btn-success', confirmButton: 'btn btn-success',
@@ -2810,7 +2841,7 @@
}) })
.then(response => response.json()) .then(response => response.json())
.then(response => {return response}); .then(response => {return response});
return siricreated; return siricreated;
}else if (result.dismiss === Swal.DismissReason.cancel){ }else if (result.dismiss === Swal.DismissReason.cancel){
@@ -2904,7 +2935,7 @@
}).then(()=>{ }).then(()=>{
location.reload(); location.reload();
}); });
}catch(error){ }catch(error){
Swal.fire({ Swal.fire({
@@ -2915,4 +2946,15 @@
} }
} }
</script> </script>
<script>
$('#kodkerja').on('change', function() {
var lainContainer = $('#pekerjaan-lain-container');
if ($(this).val() === '6') {
lainContainer.show();
} else {
$('#pekerjaan-lain').val('');
lainContainer.hide();
}
});
</script>
@endsection @endsection
resources/views/khazanah/index.blade.php
+10 -1
View File
@@ -33,13 +33,22 @@
<select class="form-select" id="customerIDType" name="customerIDType" class="form-control"> <select class="form-select" id="customerIDType" name="customerIDType" class="form-control">
<option value="nokp" {{ $idtype == 'nokp' ? 'selected' : ''}}>Kad Pengenalan</option> <option value="nokp" {{ $idtype == 'nokp' ? 'selected' : ''}}>Kad Pengenalan</option>
<option value="passport" {{ $idtype == 'passport' ? 'selected' : ''}}>Passport</option> <option value="passport" {{ $idtype == 'passport' ? 'selected' : ''}}>Passport</option>
<option value="name">Nama</option> <option value="name">Nama</option>
</select> </select>
</div> </div>
<div class="input-group-append"> <div class="input-group-append">
<button class="btn btn-outline-primary" type="submit" id="button-addon2">Cari</button> <button class="btn btn-outline-primary" type="submit" id="button-addon2">Cari</button>
</div> </div>
</div> </div>
@if ($message = Session::get('success'))
<div class="alert alert-success">
<p>{{ $message }}</p>
</div>
@elseif ($message = Session::get('failed'))
<div class="alert alert-danger">
<p>{{ $message }}</p>
</div>
@endif
</div> </div>
</div> </div>
</form> </form>
resources/views/khazanah/v2/info.blade.php
+48 -5
View File
@@ -122,13 +122,13 @@
<!-- footer card --> <!-- footer card -->
<div class="mr-4 form-group d-flex justify-content-end"> <div class="mr-4 form-group d-flex justify-content-end">
<button class="btn btn-primary button-spacing" data-toggle="modal" data-target="#customer_detail">Maklumat Pelanggan</button> <button class="btn btn-primary button-spacing" data-toggle="modal" data-target="#customer_detail">Maklumat Pelanggan</button>
</div>
</div> </div>
</div> </div>
</div>
<!-- button --> <!-- button -->
<div class="col-md-10 mt-md-2 justify-content-between form-group row"> <div class="col-md-10 mt-md-2 justify-content-between form-group row">
@@ -142,7 +142,7 @@
</label> </label>
<label class="btn btn-secondary flex-fill"> <label class="btn btn-secondary flex-fill">
<input type="radio" name="options" id="option3" value="lelong" autocomplete="off">Lelong <input type="radio" name="options" id="option3" value="lelong" autocomplete="off">Lelong
</label> </label>
</div> </div>
</div> </div>
</div> </div>
@@ -332,6 +332,27 @@
<span id="errorkodbank" style="color:red;"></span> <span id="errorkodbank" style="color:red;"></span>
</div> </div>
</div> </div>
<div class='form-group row col-md-12'>
<div class='col-md-5'>
Pekerjaan
</div>
<div class='col-md-7'>
@php
$pekerjaan = Http::withOptions(['verify' => config('app.api_verify')])->get($api_url . '/api/pekerjaan')->json();
@endphp
<select class="form-control" name="kodkerja" data-placeholder="Pilih Pekerjaan" id="kodkerja" disabled="true">
<option value="-" selected disabled>-</option>
@foreach($pekerjaan as $kerja)
<option value="{{ $kerja['kodkerja'] }}" {{ $kerja['kodkerja'] == $customer_info['kodkerja'] ? 'selected' : '' }}>
{{ $kerja['keterangan'] }}
</option>
@endforeach
</select>
<div id="pekerjaan-lain-container" style="display: {{ $customer_info['kodkerja'] == '6' ? 'block' : 'none' }}; margin-top: 10px;" >
<input type="text" class="form-control" id="nota_pekerjaan" name="nota_pekerjaan" placeholder="Sila Nyatakan" value="{{ $customer_info['nota_pekerjaan'] ?? '' }}" disabled="true">
</div>
</div>
</div>
<div class='form-group row col-md-12'> <div class='form-group row col-md-12'>
<div class='col-md-5'> <div class='col-md-5'>
No Akaun No Akaun
@@ -869,7 +890,7 @@ $.each(data,function(index,gadai_detail){
let histid = $('input[name="sudahtebus"]:checked').val(); let histid = $('input[name="sudahtebus"]:checked').val();
let checkps = await checkPS(histid); let checkps = await checkPS(histid);
if(histid == null){ if(histid == null){
Swal.fire({ Swal.fire({
icon: 'error', icon: 'error',
@@ -1383,6 +1404,8 @@ $.each(data,function(index,gadai_detail){
$('#telefon').attr('readonly', false); $('#telefon').attr('readonly', false);
$('#telefon2').attr('readonly', false); $('#telefon2').attr('readonly', false);
$('#kodbank').attr('disabled', false); $('#kodbank').attr('disabled', false);
$('#kodkerja').attr('disabled', false);
$('#nota_pekerjaan').attr('disabled', false);
$('#noakaun').attr('readonly', false); $('#noakaun').attr('readonly', false);
$('#nota').attr('readonly', false); $('#nota').attr('readonly', false);
$('#nama').attr('readonly', false); $('#nama').attr('readonly', false);
@@ -1404,6 +1427,8 @@ $.each(data,function(index,gadai_detail){
$('#telefon').attr('readonly', true); $('#telefon').attr('readonly', true);
$('#telefon2').attr('readonly', true); $('#telefon2').attr('readonly', true);
$('#kodbank').attr('disabled', true); $('#kodbank').attr('disabled', true);
$('#kodkerja').attr('disabled', true);
$('#nota_pekerjaan').attr('disabled', true);
$('#noakaun').attr('readonly', true); $('#noakaun').attr('readonly', true);
$('#nota').attr('readonly', true); $('#nota').attr('readonly', true);
$('#nama').attr('readonly', true); $('#nama').attr('readonly', true);
@@ -1427,6 +1452,8 @@ $.each(data,function(index,gadai_detail){
var telefon1 = $('#telefon').val(); var telefon1 = $('#telefon').val();
var telefon2 = $('#telefon2').val(); var telefon2 = $('#telefon2').val();
var kodbank = $('#kodbank').val(); var kodbank = $('#kodbank').val();
var kodkerja = $('#kodkerja').val();
var nota_pekerjaan = $('#nota_pekerjaan').val();
var noakaun = $('#noakaun').val(); var noakaun = $('#noakaun').val();
var nota = $('#nota').val(); var nota = $('#nota').val();
var nama = $('#nama').val(); var nama = $('#nama').val();
@@ -1441,6 +1468,8 @@ $.each(data,function(index,gadai_detail){
"telefon1": telefon1, "telefon1": telefon1,
"telefon2": telefon2, "telefon2": telefon2,
"kodbank":kodbank, "kodbank":kodbank,
"kodkerja":kodkerja,
"nota_pekerjaan":nota_pekerjaan,
"noakaun":noakaun, "noakaun":noakaun,
'nota':nota, 'nota':nota,
'nama':nama, 'nama':nama,
@@ -1526,6 +1555,8 @@ $.each(data,function(index,gadai_detail){
$('#telefon2').attr('readonly', true); $('#telefon2').attr('readonly', true);
$('#noakaun').attr('readonly', true); $('#noakaun').attr('readonly', true);
$('#kodbank').attr('disabled', true); $('#kodbank').attr('disabled', true);
$('#kodkerja').attr('disabled', true);
$('#nota_pekerjaan').attr('disabled', true);
$('#nota').attr('readonly', true); $('#nota').attr('readonly', true);
$('#nama').attr('readonly', true); $('#nama').attr('readonly', true);
$('#alamat').attr('readonly', true); $('#alamat').attr('readonly', true);
@@ -1580,4 +1611,16 @@ $.each(data,function(index,gadai_detail){
}); });
}); });
</script> </script>
<script>
$('#kodkerja').on('change', function() {
var lainContainer = $('#pekerjaan-lain-container');
if ($(this).val() === '6') {
lainContainer.show();
} else {
$('#pekerjaan-lain').val('');
lainContainer.hide();
}
});
</script>
@endsection @endsection