diff --git a/app/Console/Commands/DailyImbangDuga.php b/app/Console/Commands/DailyImbangDuga.php index a3637fe..2020e84 100644 --- a/app/Console/Commands/DailyImbangDuga.php +++ b/app/Console/Commands/DailyImbangDuga.php @@ -54,7 +54,7 @@ class DailyImbangDuga extends Command foreach($array_cawangan as $caw) { - if($caw['zone'] == $zone) + if($caw['version'] == 'v2') { $response = $this->imbangduga->OperationImbangDuga($caw['kodcaw']); } diff --git a/app/Console/Commands/generateAkruProblem.php b/app/Console/Commands/generateAkruProblem.php index e16cfd3..21eb4ac 100644 --- a/app/Console/Commands/generateAkruProblem.php +++ b/app/Console/Commands/generateAkruProblem.php @@ -63,7 +63,7 @@ class generateAkruProblem extends Command $updateIG = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/admin/laporan/akrual/updateImbangDuga',[ 'zone' => $zone, - 'tarikh' => $previousmonth, + 'tarikh' => $previousmonth->toDateString(), ])->json(); $this->info('sucess'); diff --git a/app/Http/Controllers/PenebusanController.php b/app/Http/Controllers/PenebusanController.php index e624996..d489d3c 100644 --- a/app/Http/Controllers/PenebusanController.php +++ b/app/Http/Controllers/PenebusanController.php @@ -257,7 +257,8 @@ class PenebusanController extends Controller 'karat' => $array1['karat'], 'berat_emas' => $array1['berat'], 'harga' => $array1['harga'], - 'nilai_marhun' => $array1['n_marhun'] + 'nilai_marhun' => $array1['n_marhun'], + 'kuantiti' => $array1['bil'] ])->json(); } @@ -307,13 +308,130 @@ class PenebusanController extends Controller "bakipelanggan" => $request->bakipelanggan, "nowakil" => isset($request->nowakil) ? $request->nowakil : 0 ])->json(); - - if($updatetebus['result'] == 'success'){ - event(new TebusNotify('lulus',Auth::user()->cawangan)); - event(new GadaiNotify('lulus',Auth::user()->cawangan)); - $this->AliranTunaiController->alirantunaiTebus($request); + + if($updatetebus == 'duplicate'){ + return response()->json('duplicate'); } - return response()->json($updatetebus['result'],200); + + ////////////////////// + /// MAKING NEW SAG//// + ///////////////////// + + $gadai_transaction = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/gadai/'. $auth_user['cawangan'] . '/' . $current->toDateString())->json(); + if($gadai_transaction){ + $new_sirig = $gadai_transaction['sirig'] + 1; + + }else{ + $new_sirig = 1; + } + + $new_transaction = sprintf("%04d",$new_sirig); + $norujukanbaru = strtoupper($auth_user['cawangan']) . $curent_year . $curent_month . $current_day . '-' .$new_transaction; + + $gadai = Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url').'/api/gadai/'.$auth_user['cawangan'],[ + 'norujukan' => $norujukanbaru, + 'nopelanggan' => $request->nopelanggan, + 'nokp' => $request->noic, + 'sirig' => $new_sirig + ]); + + /////////////////////////// + /// MARHUN UPDATE TABLE//// + ////////////////////////// + + + $arraymarhunbaru = []; + + $marhunsediada = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/marhun/'. $request->norujukan)->json(); + + $marhunyangdiambil = $marhunsediada[0]; + foreach($marhunyangdiambil as $index=>$marhunloop) + { + $karatbaru = str_replace('.','-',$marhunloop['karat']); + $hargabaru = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/harga_emas/'. $karatbaru)->json(); + + $nilaimarhun = (floatval($hargabaru['harga']) * floatval($marhunloop['berat'])); + + array_push($arraymarhunbaru, ["bil" => $marhunloop['bil'],"tag_permata" => $marhunloop['tag_permata'],"berat_batu_permata" => $marhunloop['berat_batu_permata'],"marhun" => $marhunloop['marhun'],"nota" => $marhunloop['nota'],"karat" => $marhunloop['karat'], "berat" => $marhunloop['berat'], "harga" => $hargabaru['harga'], "n_marhun" => $nilaimarhun]); + } + + foreach($arraymarhunbaru as $array1){ + $updatemarhun = Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url').'/api/marhun/'. $auth_user['cawangan'],[ + 'norujukan' => $norujukanbaru, + 'marhun' => $array1['marhun'], + 'nota' => $array1['nota'], + 'karat' => $array1['karat'], + 'berat_emas' => $array1['berat'], + 'harga' => $array1['harga'], + 'tag_permata' => $array1['tag_permata'], + 'berat_batu_permata' => $array1['berat_batu_permata'], + 'kuantiti' => $array1['bil'] + ])->json(); + } + + + + ////////////////////// + ////Update SAG BARU/// + ///////////////////// + + $total_nilai_marhun = $request->nilai_marhun; + $margin_pinjaman = $request->pinjaman / $total_nilai_marhun; + $kadarupah = $request->kadarkeuntungan * 100; + + $onepercent = Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url').'/api/onepercent',[ + 'pembiayaan' => $request->pinjaman, + 'nilaimarhun' => $total_nilai_marhun, + 'kadarujrah' => $request->kadarkeuntungan, + 'margin' => ($margin_pinjaman*100), + 'kodcaw' => Auth::user()->cawangan + ])->json(); + + $keuntungan_sebln = $onepercent['keuntungan']; + $keuntungan_sebln = str_replace(',','',$keuntungan_sebln); + $keuntungan6bulan = $keuntungan_sebln * 6; + $keuntungan12bulan = $keuntungan_sebln * 12; + $hargajualan = $request->pinjaman + $keuntungan12bulan; + + + + + $gadai = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url').'/api/gadai/norujukan/'. $auth_user['cawangan'] .'/' . $norujukanbaru,[ + 'kodcaw' => $auth_user['cawangan'], + 'nilaimarhun' => round($total_nilai_marhun, 2), + 'berat' => round($request->total_berat, 2), + 'pinjaman' => round($request->pinjaman, 2), + 'kadarupah' => round($kadarupah, 2), + 'marhun' => $request->marhun, + 'percentpinj' => $margin_pinjaman, + 'teller'=> $auth_user['name'], + 'upah6' => $keuntungan6bulan, + 'upah12' => $keuntungan12bulan, + 'hargajualan' => $hargajualan, + 'kuantiti_marhun' => $request->kuantiti_marhun + ])->json(); + + $komuditi = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url').'/api/komuditi/transaksi',[ + 'unit_komuditi' => round($request->pinjaman, 2), + 'norujukan' => $norujukanbaru, + 'kodcaw' => $auth_user['cawangan'], + 'teller' => $auth_user['name'] + ]); + + //////////////////////////// + ////Update History Gadaian/// + //////////////////////////// + + $updatehistorygadaian = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url').'/api/gadai/updatehistory/'. $auth_user['cawangan'] .'/' . $norujukanbaru,[ + 'historygadaian' => $request->norujukan, + 'jenistebus' => $request->jenistebus, + ])->json(); + + + event(new TebusNotify('lulus',Auth::user()->cawangan)); + event(new GadaiNotify('lulus',Auth::user()->cawangan)); + $this->AliranTunaiController->alirantunaiTebus($request); + } public function tebusautotawarruq(Request $request) @@ -348,14 +466,130 @@ class PenebusanController extends Controller "jenisAT" => $request->jenisAT, ])->json(); - - if($updatetebus['result'] == 'success'){ - $alirantunai = new AliranTunaiController(); - event(new TebusNotify('lulus',Auth::user()->cawangan)); - event(new GadaiNotify('lulus',Auth::user()->cawangan)); - $alirantunai->alirantunaiTebusAutoTawarruq($request); + if($updatetebus == 'duplicate'){ + return response()->json('duplicate'); } + ////////////////////// + /// MAKING NEW SAG//// + ///////////////////// + $gadai_transaction = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/gadai/'. $auth_user['cawangan'] . '/' . $current->toDateString())->json(); + if($gadai_transaction){ + $new_sirig = $gadai_transaction['sirig'] + 1; + + }else{ + $new_sirig = 1; + } + + $new_transaction = sprintf("%04d",$new_sirig); + $norujukanbaru = strtoupper($auth_user['cawangan']) . $curent_year . $curent_month . $current_day . '-' .$new_transaction; + + $gadai = Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url').'/api/gadai/'.$auth_user['cawangan'],[ + 'norujukan' => $norujukanbaru, + 'nopelanggan' => $request->nopelanggan, + 'nokp' => $request->noic, + 'sirig' => $new_sirig + ]); + + /////////////////////////// + /// MARHUN UPDATE TABLE//// + ////////////////////////// + + $arraymarhunbaru = []; + + $marhunsediada = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/marhun/'. $request->norujukan)->json(); + + $marhunyangdiambil = $marhunsediada[0]; + foreach($marhunyangdiambil as $index=>$marhunloop) + { + $karatbaru = str_replace('.','-',$marhunloop['karat']); + $hargabaru = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/harga_emas/'. $karatbaru)->json(); + + $harga = ($request->jenisAT == 'hargalama') ? $marhunloop['harga'] : $hargabaru['harga']; + $nilaimarhun = (floatval($harga) * floatval($marhunloop['berat'])); + + array_push($arraymarhunbaru, ["bil" => $marhunloop['bil'],"tag_permata" => $marhunloop['tag_permata'],"berat_batu_permata" => $marhunloop['berat_batu_permata'],"marhun" => $marhunloop['marhun'],"nota" => $marhunloop['nota'],"karat" => $marhunloop['karat'], "berat" => $marhunloop['berat'], "harga" => $harga, "n_marhun" => $nilaimarhun]); + } + + foreach($arraymarhunbaru as $array1){ + $updatemarhun = Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url').'/api/marhun/'. $auth_user['cawangan'],[ + 'norujukan' => $norujukanbaru, + 'marhun' => $array1['marhun'], + 'nota' => $array1['nota'], + 'karat' => $array1['karat'], + 'berat_emas' => $array1['berat'], + 'harga' => $array1['harga'], + 'nilai_marhun' => $array1['n_marhun'], + 'tag_permata' => $array1['tag_permata'], + 'berat_batu_permata' => $array1['berat_batu_permata'], + 'jenisAT' => $request->jenisAT + 'kuantiti' => $array1['bil'] + ])->json(); + } + + ////////////////////// + ////Update SAG BARU/// + ///////////////////// + + + $total_nilai_marhun = $request->total_nilai_marhun; + $margin_pinjaman = ($request->pinjaman / $total_nilai_marhun); + + $onepercent = Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url').'/api/onepercent',[ + 'pembiayaan' => $request->pinjaman, + 'nilaimarhun' => $total_nilai_marhun, + 'kadarujrah' => $request->kadarkeuntungan, + 'margin' => ($margin_pinjaman*100), + 'kodcaw' => Auth::user()->cawangan + ])->json(); + + $keuntungan_sebln = $onepercent['keuntungan']; + $keuntungan_sebln = str_replace(',','',$keuntungan_sebln); + + $kadarupah = $request->kadarkeuntungan * 100; + $keuntungan6bulan = $keuntungan_sebln * 6; + $keuntungan12bulan = $keuntungan_sebln * 12; + $hargajualan = $request->pinjaman + $keuntungan12bulan; + + + $gadai = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url').'/api/gadai/norujukan/'. $auth_user['cawangan'] .'/' . $norujukanbaru,[ + 'kodcaw' => $auth_user['cawangan'], + 'nilaimarhun' => round($total_nilai_marhun, 2), + 'berat' => round($request->total_berat, 2), + 'pinjaman' => round($request->pinjaman, 2), + 'kadarupah' => round($kadarupah, 2), + 'marhun' => $request->marhun_detail, + 'percentpinj' => $margin_pinjaman, + 'teller'=> $auth_user['name'], + 'upah6' => $keuntungan6bulan, + 'upah12' => $keuntungan12bulan, + 'hargajualan' => $hargajualan, + 'kuantiti_marhun' => $request->kuantiti_marhun, + ]); + + + $komuditi = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url').'/api/komuditi/transaksi',[ + 'unit_komuditi' => round($request->pinjaman, 2), + 'norujukan' => $norujukanbaru, + 'kodcaw' => $auth_user['cawangan'], + 'teller' => $auth_user['name'] + ]); + + //////////////////////////// + ////Update History Gadaian/// + //////////////////////////// + + $updatehistorygadaian = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url').'/api/gadai/updatehistory/'. $auth_user['cawangan'] .'/' . $norujukanbaru,[ + 'historygadaian' => $request->norujukan, + 'jenistebus' => $request->jenistebus, + ])->json(); + + + $alirantunai = new AliranTunaiController(); + event(new TebusNotify('lulus',Auth::user()->cawangan)); + event(new GadaiNotify('lulus',Auth::user()->cawangan)); + $alirantunai->alirantunaiTebusAutoTawarruq($request); + return response()->json($updatetebus['result'],200); } @@ -394,6 +628,9 @@ class PenebusanController extends Controller "bakipelanggan" => $request->bakipelanggan, ])->json(); + if($updatetebus == 'duplicate'){ + return response()->json('duplicate'); + } ////////////////////// /// MAKING NEW SAG//// @@ -453,6 +690,7 @@ class PenebusanController extends Controller 'tag_permata' => $array1['tag_permata'], 'berat_batu_permata' => $array1['berat_batu_permata'], 'nilai_marhun' => $array1['n_marhun'] + 'kuantiti' => $array1['bil'] ])->json(); } diff --git a/app/Services/ImbangdugaServices.php b/app/Services/ImbangdugaServices.php index df7425b..f4909cc 100644 --- a/app/Services/ImbangdugaServices.php +++ b/app/Services/ImbangdugaServices.php @@ -56,7 +56,7 @@ class ImbangdugaServices if($kodcaw == '010219') if($tarikh >= '2022-11-24') - $data = $value - 78379.9; + $data = $value; else $data = $value; else $data = $value; break; @@ -64,7 +64,12 @@ class ImbangdugaServices if($kodcaw == '010219') if($tarikh < '2022-11-24') $data = $value - 78379.9; - else $data = $value; + else if($tarikh >= '2023-02-16'){ + $hutang = Http::get(config('api.url').'/admin/ig/penghutang' ,['kodcaw' => $kodcaw, 'tarikh' => $tarikh])->json(); + $bayaran_hutang = Http::get(config('api.url').'/admin/ig/bayaran_penghutang' ,['kodcaw' => $kodcaw, 'tarikh' => $tarikh])->json(); + $data = $hutang['bakihutang'] - $bayaran_hutang; + }else $data = $value; + //else $data = $value; else $data = $value; break; case 'jualan1stop': diff --git a/config/redeemoption.php b/config/redeemoption.php index 5987f20..8ddf12b 100644 --- a/config/redeemoption.php +++ b/config/redeemoption.php @@ -1,7 +1,7 @@ env('ENABLE_TAMBAHPINJAM',1), - 'enable_separuh' => env('ENABLE_SEPARUH',1), - 'enable_pembiayaansemula' => env('ENABLE_AUTOTAWARRUQ',1) + 'enable_separuh' => env('ENABLE_SEPARUH',0), + 'enable_pembiayaansemula' => env('ENABLE_AUTOTAWARRUQ',0) ]; -?> \ No newline at end of file +?> diff --git a/resources/views/callcenter/v2/info.blade.php b/resources/views/callcenter/v2/info.blade.php index f846e96..958a29d 100644 --- a/resources/views/callcenter/v2/info.blade.php +++ b/resources/views/callcenter/v2/info.blade.php @@ -118,26 +118,25 @@ + +
+ +
+
-
-
- {{-- --}} -
-
- -
diff --git a/resources/views/customers/v2/info.blade.php b/resources/views/customers/v2/info.blade.php index 970f9c6..2fe5024 100644 --- a/resources/views/customers/v2/info.blade.php +++ b/resources/views/customers/v2/info.blade.php @@ -12,7 +12,7 @@
- +
-
- -
+
No Telefon
@@ -119,30 +117,48 @@
- -
-
- - - -
-
- -
-
- Daftar Pembiayaan -
-
-
+ + +
+ +
+ +
+ +
+ + + +
+
+ + + +
+ +
+ + + + +
+
+