diff --git a/app/Http/Controllers/CustomersController.php b/app/Http/Controllers/CustomersController.php index f86df08..c5b978d 100644 --- a/app/Http/Controllers/CustomersController.php +++ b/app/Http/Controllers/CustomersController.php @@ -40,9 +40,10 @@ class CustomersController extends Controller $idtype = 'nokp'; $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(); + $pekerjaan = Http::withOptions(['verify' => config('app.api_verify')])->get($api_url . '/api/pekerjaan')->json(); $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){ @@ -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(); $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(); $min_komoditi = $komoditi['min_komoditi']; @@ -68,7 +70,7 @@ class CustomersController extends Controller $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){ @@ -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(); $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(); + $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',[ 'nokp' => $noic @@ -105,9 +108,9 @@ class CustomersController extends Controller }else{ if($blacklist){ $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{ - 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, 'nota'=>$request->nota, 'kodkerja'=>$request->pekerjaan, + 'nota_pekerjaan'=>$request->nota_pekerjaan, 'tujuangadai'=>$request->tujuan_gadai, ]); diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index 16838c9..fea5a66 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -78,15 +78,17 @@ class KhazanahController extends Controller Session::put('customer_info_khazanah',$customer_info); if($auth_user->roles == 'admin'){ 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{ if($auth_user->roles == 'admin'){ 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(); $kod_cawangan = $auth_user['cawangan']; - + if($request->dateringkasanharian == null){ $startDate = $current->toDateString(); }else{ @@ -2195,22 +2197,22 @@ class KhazanahController extends Controller $split_date = explode('-',$request->dateringkasanharian); $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_detail=$cawangan[0]; - + $laporan_ringkasan = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/reports/ringkasan-harian/' . $kod_cawangan,[ 'startDate' => $startDate, 'endDate' => $endDate, - ])->json(); - + ])->json(); + $laporan = $laporan_ringkasan[0]; - + $kawalanstok = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/reports/kawalan-stok/' . $kod_cawangan, [ 'startDate' => $startDate, 'endDate' => $endDate, ])->json(); - + /* Kawalan Stok */ //Gadai $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(); $api_url = config('api.url'); $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_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(); - + 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 = new Carbon(); $tarikh_cetak = $current->toDateString(); - + if($request->datetimepicker1 == null){ $gadai_date = $current->toDateString(); } else { $split_date = explode('-', $request->datetimepicker1); $gadai_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0]; } - + // Fetching the data from API $tuntutbaki = Http::withOptions(['verify' => config('app.api_verify')]) ->get(config('api.url') . '/api/TuntutBakiTarikh/' . $auth_user['cawangan'], ['tarikh' => $gadai_date]) ->json(); - + $cawangan = Http::withOptions(['verify' => config('app.api_verify')]) ->get(config('api.url') . '/api/cawangan/detail/' . $auth_user['cawangan']) ->json(); - + // Check if $tuntutbaki is an array and not empty before sending it to the view if (!is_array($tuntutbaki) || empty($tuntutbaki)) { $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')); } - - + + @@ -4315,12 +4317,12 @@ class KhazanahController extends Controller if($request->datetimepicker2 == null){ $tarikh_cetak = $current->toDateString(); }else{ - $split_date = explode('-',$request->datetimepicker2); - $tarikh_imbangan2 = $request->datetimepicker2; + $split_date = explode('-',$request->datetimepicker2); + $tarikh_imbangan2 = $request->datetimepicker2; } $tarikh_imbangan2 = new Carbon($tarikh_imbangan2); - + // 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_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_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_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]; 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(){ $auth_user = Auth::user(); $api_url = config('api.url'); @@ -4496,12 +4498,12 @@ class KhazanahController extends Controller $split_date = explode('-', $request->datehingga); $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(); $cawangan=Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json(); $cawangan_detail=$cawangan[0]; return view('print.laporan_ansuran_ujrah', compact('tebus','cawangan_detail','tarikh_cetak','mula_date','hingga_date','api_url')); - } + } public function laporanStokAuditKhas(){ $auth_user = Auth::user(); @@ -4549,7 +4551,7 @@ class KhazanahController extends Controller $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(); - + if($request->type == 'excel') { 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') ->with('failed','Blast Whatsapp Tidak Berjaya, Sila Semak Semula Rekod Blasted.'); } - + } else { @@ -4693,7 +4695,7 @@ class KhazanahController extends Controller $kodcaw = $auth_user['cawangan']; $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(); - + return view('callcenter.khazanah.bycawdetailnotisperingatan',compact('cawangan_info','bycawnotisperingatan','kodcaw','notisid','api_url')); } diff --git a/resources/views/admin/customer_info.blade.php b/resources/views/admin/customer_info.blade.php index 8400672..5d93938 100644 --- a/resources/views/admin/customer_info.blade.php +++ b/resources/views/admin/customer_info.blade.php @@ -145,10 +145,10 @@ -
+ {{--
-
+
--}} diff --git a/resources/views/callcenter/index.blade.php b/resources/views/callcenter/index.blade.php index 909a8dc..c707dc7 100644 --- a/resources/views/callcenter/index.blade.php +++ b/resources/views/callcenter/index.blade.php @@ -46,7 +46,7 @@ - +
@@ -56,14 +56,14 @@ @if ($message = Session::get('success')) -
-

{{ $message }}

-
- @elseif ($message = Session::get('failed')) -
-

{{ $message }}

-
- @endif +
+

{{ $message }}

+
+ @elseif ($message = Session::get('failed')) +
+

{{ $message }}

+
+ @endif @if($search == true ) diff --git a/resources/views/customers/v2/index.blade.php b/resources/views/customers/v2/index.blade.php index b151aea..debe378 100644 --- a/resources/views/customers/v2/index.blade.php +++ b/resources/views/customers/v2/index.blade.php @@ -182,23 +182,23 @@
Pekerjaan
- @php - $pekerjaan = Http::withOptions(['verify' => config('app.api_verify')])->get($api_url . '/api/pekerjaan')->json(); - @endphp +
- @foreach($pekerjaan as $kerja) - + @endforeach +
Nota
-
+
-
Pekerjaan
- @php - $pekerjaan = Http::withOptions(['verify' => config('app.api_verify')])->get($api_url . '/api/pekerjaan')->json(); - @endphp +
- @foreach($pekerjaan as $kerja) - + @endforeach +
Nota
@@ -446,16 +447,17 @@
Pekerjaan
- @php - $pekerjaan = Http::withOptions(['verify' => config('app.api_verify')])->get($api_url . '/api/pekerjaan')->json(); - @endphp +
- @foreach($pekerjaan as $kerja) - + @endforeach +
Nota
@@ -1281,6 +1283,17 @@ + @push('additional_scripts') @endpush -@endsection \ No newline at end of file +@endsection diff --git a/resources/views/customers/v2/info.blade.php b/resources/views/customers/v2/info.blade.php index 2fe5024..ed86898 100644 --- a/resources/views/customers/v2/info.blade.php +++ b/resources/views/customers/v2/info.blade.php @@ -121,13 +121,13 @@
- + +
+ - -
@@ -143,14 +143,14 @@ +
- + - +
@@ -345,6 +345,27 @@
+
+
+ Pekerjaan +
+
+ @php + $pekerjaan = Http::withOptions(['verify' => config('app.api_verify')])->get($api_url . '/api/pekerjaan')->json(); + @endphp + +
+ +
+
+
No Akaun @@ -2500,6 +2521,8 @@ $('#telefon').attr('readonly', false); $('#telefon2').attr('readonly', false); $('#kodbank').attr('disabled', false); + $('#kodkerja').attr('disabled', false); + $('#nota_pekerjaan').attr('disabled', false); $('#noakaun').attr('readonly', false); $('#nota').attr('readonly', false); $('#alamat').attr('readonly', false); @@ -2521,6 +2544,8 @@ $('#telefon').attr('readonly', true); $('#telefon2').attr('readonly', true); $('#kodbank').attr('disabled', true); + $('#kodkerja').attr('disabled', true); + $('#nota_pekerjaan').attr('disabled', true); $('#noakaun').attr('readonly', true); $('#nota').attr('readonly', true); $('#alamat').attr('readonly', true); @@ -2534,6 +2559,8 @@ var telefon1 = $('#telefon').val(); var telefon2 = $('#telefon2').val(); var kodbank = $('#kodbank').val(); + var kodkerja = $('#kodkerja').val(); + var nota_pekerjaan = $('#nota_pekerjaan').val(); var noakaun = $('#noakaun').val(); var nota = $('#nota').val(); var alamat = $('#alamat').val(); @@ -2547,6 +2574,8 @@ "telefon1": telefon1, "telefon2": telefon2, "kodbank":kodbank, + "kodkerja":kodkerja, + "nota_pekerjaan":nota_pekerjaan, "noakaun":noakaun, 'nota':nota, 'alamat':alamat, @@ -2631,6 +2660,8 @@ $('#telefon2').attr('readonly', true); $('#noakaun').attr('readonly', true); $('#kodbank').attr('disabled', true); + $('#kodkerja').attr('disabled', true); + $('#nota_pekerjaan').attr('disabled', true); $('#nota').attr('readonly', true); $('#alamat').attr('readonly', true); $('#poskod').attr('readonly', true); @@ -2676,7 +2707,7 @@ }); async function removeansuran(event){ - + let ansid = $('input[name="belum"]:checked').val(); let harini = new Date();harini.setHours(0, 0, 0, 0); @@ -2687,7 +2718,7 @@ text: 'Ansuran untuk Pembiayaan Belum Selesai Sahaja!' }); - return false; + return false; } if(ansid == null && $("input[name='options']:checked").val() == 'belum_tebus'){ @@ -2710,7 +2741,7 @@ let ansuranlatest = await fetch(api_url + '/admin/ansuran/getLatest?' + queryString) .then(response => response.json()) .then(response => {return response}); - + if(Object.keys(ansuranlatest).length == 0){ Swal.fire({ icon: 'error', @@ -2728,9 +2759,9 @@ }catch(error){ console.error("Error:", error); } - - - + + + } @@ -2743,7 +2774,7 @@ } async function getKelulusanKhazanahOperasi(textstatus = 'none',norujukan){ - + const swalWithBootstrapButtons = Swal.mixin({ customClass: { confirmButton: 'btn btn-success', @@ -2810,7 +2841,7 @@ }) .then(response => response.json()) .then(response => {return response}); - + return siricreated; }else if (result.dismiss === Swal.DismissReason.cancel){ @@ -2904,7 +2935,7 @@ }).then(()=>{ location.reload(); }); - + }catch(error){ Swal.fire({ @@ -2915,4 +2946,15 @@ } } + @endsection diff --git a/resources/views/khazanah/index.blade.php b/resources/views/khazanah/index.blade.php index 9423656..d161ad5 100644 --- a/resources/views/khazanah/index.blade.php +++ b/resources/views/khazanah/index.blade.php @@ -33,13 +33,22 @@
+ @if ($message = Session::get('success')) +
+

{{ $message }}

+
+ @elseif ($message = Session::get('failed')) +
+

{{ $message }}

+
+ @endif
diff --git a/resources/views/khazanah/v2/info.blade.php b/resources/views/khazanah/v2/info.blade.php index e558cba..b45c2bf 100644 --- a/resources/views/khazanah/v2/info.blade.php +++ b/resources/views/khazanah/v2/info.blade.php @@ -122,13 +122,13 @@
- + +
+ - -
@@ -142,7 +142,7 @@ +
@@ -332,6 +332,27 @@ +
+
+ Pekerjaan +
+
+ @php + $pekerjaan = Http::withOptions(['verify' => config('app.api_verify')])->get($api_url . '/api/pekerjaan')->json(); + @endphp + +
+ +
+
+
No Akaun @@ -869,7 +890,7 @@ $.each(data,function(index,gadai_detail){ let histid = $('input[name="sudahtebus"]:checked').val(); let checkps = await checkPS(histid); - + if(histid == null){ Swal.fire({ icon: 'error', @@ -1383,6 +1404,8 @@ $.each(data,function(index,gadai_detail){ $('#telefon').attr('readonly', false); $('#telefon2').attr('readonly', false); $('#kodbank').attr('disabled', false); + $('#kodkerja').attr('disabled', false); + $('#nota_pekerjaan').attr('disabled', false); $('#noakaun').attr('readonly', false); $('#nota').attr('readonly', false); $('#nama').attr('readonly', false); @@ -1404,6 +1427,8 @@ $.each(data,function(index,gadai_detail){ $('#telefon').attr('readonly', true); $('#telefon2').attr('readonly', true); $('#kodbank').attr('disabled', true); + $('#kodkerja').attr('disabled', true); + $('#nota_pekerjaan').attr('disabled', true); $('#noakaun').attr('readonly', true); $('#nota').attr('readonly', true); $('#nama').attr('readonly', true); @@ -1427,6 +1452,8 @@ $.each(data,function(index,gadai_detail){ var telefon1 = $('#telefon').val(); var telefon2 = $('#telefon2').val(); var kodbank = $('#kodbank').val(); + var kodkerja = $('#kodkerja').val(); + var nota_pekerjaan = $('#nota_pekerjaan').val(); var noakaun = $('#noakaun').val(); var nota = $('#nota').val(); var nama = $('#nama').val(); @@ -1441,6 +1468,8 @@ $.each(data,function(index,gadai_detail){ "telefon1": telefon1, "telefon2": telefon2, "kodbank":kodbank, + "kodkerja":kodkerja, + "nota_pekerjaan":nota_pekerjaan, "noakaun":noakaun, 'nota':nota, 'nama':nama, @@ -1526,6 +1555,8 @@ $.each(data,function(index,gadai_detail){ $('#telefon2').attr('readonly', true); $('#noakaun').attr('readonly', true); $('#kodbank').attr('disabled', true); + $('#kodkerja').attr('disabled', true); + $('#nota_pekerjaan').attr('disabled', true); $('#nota').attr('readonly', true); $('#nama').attr('readonly', true); $('#alamat').attr('readonly', true); @@ -1580,4 +1611,16 @@ $.each(data,function(index,gadai_detail){ }); }); + + @endsection