From 73db8b97d7f8550c77137c2661cf8034a5f7e4b4 Mon Sep 17 00:00:00 2001 From: Hafifie PKB Date: Wed, 4 Mar 2026 09:40:01 +0800 Subject: [PATCH] 1.added page that shows margin mutu harga emas. 2. change in gadaian page that have static 75% and 80% max pinjam turn to manipulate value of max pinjam based on mutu emas --- app/Http/Controllers/OperasiController.php | 21 +++ resources/views/gadaian/v2/edit.blade.php | 6 + resources/views/gadaian/v2/index.blade.php | 160 +++++++++--------- .../views/operasi/edit_marginmutu.blade.php | 119 +++++++++++++ resources/views/operasi/marginmutu.blade.php | 64 +++++++ resources/views/operasi/parameter.blade.php | 2 +- routes/web.php | 2 + 7 files changed, 297 insertions(+), 77 deletions(-) create mode 100644 resources/views/operasi/edit_marginmutu.blade.php create mode 100644 resources/views/operasi/marginmutu.blade.php diff --git a/app/Http/Controllers/OperasiController.php b/app/Http/Controllers/OperasiController.php index 2bc4fc1..001324f 100644 --- a/app/Http/Controllers/OperasiController.php +++ b/app/Http/Controllers/OperasiController.php @@ -317,4 +317,25 @@ class OperasiController extends Controller $auth_user = Auth::user(); event(new KomoditiNotify('lulus',$auth_user['cawangan'])); } + + public function marginmutu() + { + $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(); + + // Get MaxMutuEmas data from API + $maxmutuemas = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/maxmutuemas')->json(); + + return view('operasi.marginmutu', compact('cawangan_info', 'api_url', 'maxmutuemas')); + } + + public function editMarginMutu() + { + $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(); + + return view('operasi.edit_marginmutu', compact('cawangan_info', 'api_url')); + } } diff --git a/resources/views/gadaian/v2/edit.blade.php b/resources/views/gadaian/v2/edit.blade.php index 4a557ec..f0d85c5 100644 --- a/resources/views/gadaian/v2/edit.blade.php +++ b/resources/views/gadaian/v2/edit.blade.php @@ -567,6 +567,7 @@ total_berat = 0; total_kuantiti = 0; var marhun_details = ''; + var array_mutu = []; tablemarhun.clear().draw(); $.each(data,function(index,marhun){ $.each(marhun,function(index,marhun_detail){ @@ -576,6 +577,7 @@ jumlah_nilai_marhun += Number(marhun_detail['n_marhun']); status_tag_permata = marhun_detail['tag_permata'] == 1 ? 'Ada' : ''; total_kuantiti += Number(marhun_detail['bil']); + array_mutu.push([marhun_detail['karat'], marhun_detail['n_marhun']]); tablemarhun.row.add([ counter, marhun_detail['recno'], @@ -659,6 +661,10 @@ $.ajax({ method:'GET', url: api_url + '/api/maxpinjaman', + data: { + 'mutu': array_mutu, + 'total_nilai_marhun': total_nilai_marhun, + }, success:function(data){ $.each(data,function(index,pinjaman){ diff --git a/resources/views/gadaian/v2/index.blade.php b/resources/views/gadaian/v2/index.blade.php index 46de56e..39104a1 100644 --- a/resources/views/gadaian/v2/index.blade.php +++ b/resources/views/gadaian/v2/index.blade.php @@ -526,60 +526,63 @@ closeOnSelect: false }); - var total_nilai_marhun = 0; - var total_berat = 0; - var total_kuantiti = 0; - var kadarupah = 0; - var jumlah_marhun = 0; - var jumlah_nilai_marhun = 0; - var pinjaman_pelulus = 0; - var pinjaman_teller = 0; - function marhuntable(data){ - var counter = 1; - total_nilai_marhun = 0; - total_berat = 0; - total_kuantiti = 0; - var marhun_details = ''; - jumlah_nilai_marhun = 0; - tablemarhun.clear().draw(); - $.each(data,function(index,marhun){ - $.each(marhun,function(index,marhun_detail){ - total_nilai_marhun = total_nilai_marhun + Number(marhun_detail['n_marhun']); - total_berat = total_berat + Number(marhun_detail['berat']); - marhun_details = marhun_details + marhun_detail['bil'] + " " + marhun_detail['marhun'] +","; - jumlah_nilai_marhun += Number(marhun_detail['n_marhun']); - status_tag_permata = marhun_detail['tag_permata'] == 1 ? 'Ada' : ''; - total_kuantiti += Number(marhun_detail['bil']); - tablemarhun.row.add([ - counter, - marhun_detail['recno'], - marhun_detail['marhun'], - formatter.format(marhun_detail['n_marhun']), - marhun_detail['karat'], - formatter.format(marhun_detail['berat']), - marhun_detail['bil'], - marhun_detail['nota'], - marhun_detail['harga'], - status_tag_permata, - marhun_detail['berat_batu_permata'], - "
" - ]).draw(); - counter = counter + 1; + var total_nilai_marhun = 0; + var total_berat = 0; + var total_kuantiti = 0; + var kadarupah = 0; + var jumlah_marhun = 0; + var jumlah_nilai_marhun = 0; + var pinjaman_pelulus = 0; + var pinjaman_teller = 0; + + function marhuntable(data) { + var counter = 1; + total_nilai_marhun = 0; + total_berat = 0; + total_kuantiti = 0; + var marhun_details = ''; + var array_mutu = []; + jumlah_nilai_marhun = 0; + tablemarhun.clear().draw(); + $.each(data, function(index, marhun) { + $.each(marhun, function(index, marhun_detail) { + total_nilai_marhun = total_nilai_marhun + Number(marhun_detail['n_marhun']); + total_berat = total_berat + Number(marhun_detail['berat']); + marhun_details = marhun_details + marhun_detail['bil'] + " " + marhun_detail['marhun'] + ","; + jumlah_nilai_marhun += Number(marhun_detail['n_marhun']); + status_tag_permata = marhun_detail['tag_permata'] == 1 ? 'Ada' : ''; + total_kuantiti += Number(marhun_detail['bil']); + array_mutu.push([marhun_detail['karat'], marhun_detail['n_marhun']]); + tablemarhun.row.add([ + counter, + marhun_detail['recno'], + marhun_detail['marhun'], + formatter.format(marhun_detail['n_marhun']), + marhun_detail['karat'], + formatter.format(marhun_detail['berat']), + marhun_detail['bil'], + marhun_detail['nota'], + marhun_detail['harga'], + status_tag_permata, + marhun_detail['berat_batu_permata'], + "
" + ]).draw(); + counter = counter + 1; + }); }); - }); - $('#totalberattable').text(formatter.format(total_berat)); - $('#totalkuantititable').text(total_kuantiti); - $('#totalnilaimarhuntable').text(formatter.format(jumlah_nilai_marhun)); - $('#bilangan_marhun').val(formatter.format(counter-1)); - $('#bilangan_jumlah_kuantiti').val(formatter.format(total_kuantiti)); - $('#jumlah_nilai_marhun').val(formatter.format(jumlah_nilai_marhun)); - // if(total_nilai_marhun > 0 && total_nilai_marhun < 401){ - // kadarupah = 1.2/100; - // }else if(total_nilai_marhun >= 401 && total_nilai_marhun < 2001){ - // kadarupah = 1.5/100; - // }else if(total_nilai_marhun >= 2001 ){ - // kadarupah = 1.7/100; - // } + $('#totalberattable').text(formatter.format(total_berat)); + $('#totalkuantititable').text(total_kuantiti); + $('#totalnilaimarhuntable').text(formatter.format(jumlah_nilai_marhun)); + $('#bilangan_marhun').val(formatter.format(counter - 1)); + $('#bilangan_jumlah_kuantiti').val(formatter.format(total_kuantiti)); + $('#jumlah_nilai_marhun').val(formatter.format(jumlah_nilai_marhun)); + // if(total_nilai_marhun > 0 && total_nilai_marhun < 401){ + // kadarupah = 1.2/100; + // }else if(total_nilai_marhun >= 401 && total_nilai_marhun < 2001){ + // kadarupah = 1.5/100; + // }else if(total_nilai_marhun >= 2001 ){ + // kadarupah = 1.7/100; + // } $.ajax({ method:'GET', @@ -600,27 +603,31 @@ $('#kadarkeuntungan').val(formatter.format(kadarupah)); $('#kuantiti_marhun').val(formatter.format(jumlah_marhun)); - $.ajax({ - method:'GET', - url: api_url + '/api/maxpinjaman', - success:function(data){ - $.each(data,function(index,pinjaman){ - if(pinjaman['user_type'] == 'teller'){ - pinjaman_teller = Number(pinjaman['max']); - } - if(pinjaman['user_type'] == 'khazanah'){ - pinjaman_pelulus = Number(pinjaman['max']); - } - }); - $('.span-pinjaman-max-pelulus').text(formatter.format(pinjaman_pelulus) + ' %'); - $('.span-pinjaman-max').text(formatter.format(pinjaman_teller) + ' %'); - var max_teller = total_nilai_marhun * (pinjaman_teller/100); - var max_pelulus = total_nilai_marhun * (pinjaman_pelulus/100); - $('#pembiayaan_max_teller').val(formatter.format(max_teller.toFixed(2))); - $('#pembiyaan_max_pelulus').val(formatter.format(max_pelulus.toFixed(2))); - } - }); - } + $.ajax({ + method: 'GET', + url: api_url + '/api/maxpinjaman', + data: { + 'mutu': array_mutu, + 'total_nilai_marhun': total_nilai_marhun, + }, + success: function(data) { + $.each(data, function(index, pinjaman) { + if (pinjaman['user_type'] == 'teller') { + pinjaman_teller = Number(pinjaman['max']); + } + if (pinjaman['user_type'] == 'khazanah') { + pinjaman_pelulus = Number(pinjaman['max']); + } + }); + $('.span-pinjaman-max-pelulus').text(formatter.format(pinjaman_pelulus) + ' %'); + $('.span-pinjaman-max').text(formatter.format(pinjaman_teller) + ' %'); + var max_teller = total_nilai_marhun * (pinjaman_teller / 100); + var max_pelulus = total_nilai_marhun * (pinjaman_pelulus / 100); + $('#pembiayaan_max_teller').val(formatter.format(max_teller.toFixed(2))); + $('#pembiyaan_max_pelulus').val(formatter.format(max_pelulus.toFixed(2))); + } + }); + } $('#pinjaman').on('input',function(){ var pinjaman = Number(this.value); @@ -859,8 +866,9 @@ var batu_permata_array = $('#batupermata').val(); var tag_permata = $('input[id=tagpermata]').is(':checked') ? 1 : 0; - var beratpermata = $('#beratpermata').val(); - var kuantiti = $('#kuantiti').val(); + var beratpermata = $('#beratpermata').val(); + var kuantiti = $('#kuantiti').val(); + if(kuantiti > 10) { diff --git a/resources/views/operasi/edit_marginmutu.blade.php b/resources/views/operasi/edit_marginmutu.blade.php new file mode 100644 index 0000000..c9508ee --- /dev/null +++ b/resources/views/operasi/edit_marginmutu.blade.php @@ -0,0 +1,119 @@ +@extends('layouts.app_operasi') +@section('content') + +
+
+
+
+ + +
+

Edit Margin Mutu Emas

+ +
+ @csrf + + +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + Cancel +
+
+
+
+
+
+
+ + +@endsection \ No newline at end of file diff --git a/resources/views/operasi/marginmutu.blade.php b/resources/views/operasi/marginmutu.blade.php new file mode 100644 index 0000000..5bc86a6 --- /dev/null +++ b/resources/views/operasi/marginmutu.blade.php @@ -0,0 +1,64 @@ +@extends('layouts.app_operasi') +@section('content') + +
+
+
+
+ + +
+ +
+ + + + + + + + + + + + + + + + @foreach($maxmutuemas as $index=>$mme) + + + + + + + + + + + @endforeach + +
BilKaratKeteranganTeller (%)PC (%)Operasi (%)Tarikh UpdateTindakan
{{ $loop->iteration }}{{ $mme['karat'] }}{{ $mme['keterangan'] }}{{ $mme['teller'] }}%{{ $mme['pc'] }}%{{ $mme['operasi'] }}%{{ \Carbon\Carbon::parse($mme['tarikhupdate'])->format('d/m/Y') }} + Edit +
+ +
+
+
+
+
+
+ +@endsection \ No newline at end of file diff --git a/resources/views/operasi/parameter.blade.php b/resources/views/operasi/parameter.blade.php index 110e2ca..4028c70 100644 --- a/resources/views/operasi/parameter.blade.php +++ b/resources/views/operasi/parameter.blade.php @@ -16,7 +16,7 @@
Harga Emas Margin Pembiayaan - Contoh 2 + Margin Mutu Emas
diff --git a/routes/web.php b/routes/web.php index f3114bc..b29ec1d 100644 --- a/routes/web.php +++ b/routes/web.php @@ -360,6 +360,8 @@ Route::post('operasi/kakitangan/edit/store',['as'=>'operasi.kakitangan.edit.stor Route::get('/operasi/margin',['as'=>'operasi.margin','uses'=>'OperasiController@margin'])->middleware('auth','operasi'); +Route::get('/operasi/marginmutu',['as'=>'operasi.marginmutu','uses'=>'OperasiController@marginmutu'])->middleware('auth','operasi'); +Route::get('/operasi/marginmutu/edit',['as'=>'operasi.marginmutu.edit','uses'=>'OperasiController@editMarginMutu'])->middleware('auth','operasi'); Route::get('/komoditi',['as'=>'komuditi','uses'=>'KomuditiController@index']); Route::get('/komoditi/rekod',['as'=>'rekod.komoditi','uses'=>'KomuditiController@rekodKomoditi']);