From cc0a04309360991bf36a057580b94f23dee55287 Mon Sep 17 00:00:00 2001 From: amirhassan Date: Mon, 25 Mar 2024 11:49:24 +0800 Subject: [PATCH] Fix create marhun batu permata for PS feature --- app/Http/Controllers/MarhunController.php | 34 +++++++++++------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php index a42c8e8..544119c 100644 --- a/app/Http/Controllers/MarhunController.php +++ b/app/Http/Controllers/MarhunController.php @@ -61,32 +61,30 @@ class MarhunController extends Controller $current = Carbon::now(); $current = new Carbon(); - $request_data = json_decode($request->getContent(), false); - - $harga = HargaEmas::on('mysql7')->where('karat',$request_data->karat)->first(); + $harga = HargaEmas::on('mysql7')->where('karat',$request->karat)->first(); $hargaemas = $harga['harga']; - if(isset($request_data->jenisAT)){ - if($request_data->jenisAT == 'hargalama'){ - $hargaemas = $request_data->harga; - // $nilai_marhun = $request_data->berat_emas * $request_data->harga; + if(isset($request->jenisAT)){ + if($request->jenisAT == 'hargalama'){ + $hargaemas = $request->harga; + // $nilai_marhun = $request->berat_emas * $request->harga; }else $hargaemas = $harga['harga']; - // $nilai_marhun = $request_data->berat_emas * $harga['harga']; + // $nilai_marhun = $request->berat_emas * $harga['harga']; }else $hargaemas = $harga['harga']; - $nilai_marhun = $request_data->berat_emas * $hargaemas; + $nilai_marhun = $request->berat_emas * $hargaemas; $marhunToCreate = [ 'kodcaw'=> $kodcaw, - 'norujukan'=> $request_data->norujukan, + 'norujukan'=> $request->norujukan, 't_gadai' => $current->toDateString(), 'bil' => 1, - 'marhun' => $request_data->marhun, - 'nota' => $request_data->nota, - 'tag_permata' => $request_data->tag_permata, - 'berat_batu_permata' => $request_data->berat_batu_permata, - 'karat' => $request_data->karat, - 'berat' => $request_data->berat_emas, + 'marhun' => $request->marhun, + 'nota' => $request->nota, + 'tag_permata' => $request->tag_permata != null ? $request->tag_permata : 0, + 'berat_batu_permata' => $request->berat_batu_permata != null ? $request->berat_batu_permata : '', + 'karat' => $request->karat, + 'berat' => $request->berat_emas, 'harga' => $hargaemas, 'n_marhun' => $nilai_marhun ]; @@ -100,9 +98,9 @@ class MarhunController extends Controller $marhun = Marhun::on($cawangan['mysql'])->create($marhunToCreate); $audit = new Audit(); - $audit->users = $request_data->teller; + $audit->users = $request->teller; $audit->actions = 'Daftar Marhun'; - $audit->norujukan = $request_data->norujukan; + $audit->norujukan = $request->norujukan; $audit->new_data = $marhun; $audit->kodcaw = $kodcaw; $audit->created_at = $current;