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

Update create gadaian, edit gadaian and laporan marhun harian to feat baru permata feature

Browse Source
This commit is contained in:
amirhassan
2024-01-31 08:49:54 +08:00
parent b239106ba8
commit d15d1ff0c0
1 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/MarhunController.php
+21 -15
View File
@@ -61,38 +61,42 @@ class MarhunController extends Controller
$current = Carbon::now(); $current = Carbon::now();
$current = new Carbon(); $current = new Carbon();
$harga = HargaEmas::on('mysql7')->where('karat',$request->karat)->first(); $request_data = json_decode($request->getContent(), false);
$harga = HargaEmas::on('mysql7')->where('karat',$request_data->karat)->first();
$hargaemas = $harga['harga']; $hargaemas = $harga['harga'];
if(isset($request->jenisAT)){ if(isset($request_data->jenisAT)){
if($request->jenisAT == 'hargalama'){ if($request_data->jenisAT == 'hargalama'){
$hargaemas = $request->harga; $hargaemas = $request_data->harga;
// $nilai_marhun = $request->berat_emas * $request->harga; // $nilai_marhun = $request_data->berat_emas * $request_data->harga;
}else $hargaemas = $harga['harga']; }else $hargaemas = $harga['harga'];
// $nilai_marhun = $request->berat_emas * $harga['harga']; // $nilai_marhun = $request_data->berat_emas * $harga['harga'];
}else $hargaemas = $harga['harga']; }else $hargaemas = $harga['harga'];
$nilai_marhun = $request->berat_emas * $hargaemas; $nilai_marhun = $request_data->berat_emas * $hargaemas;
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$marhun = Marhun::on($cawangan['mysql'])->create([ $marhun = Marhun::on($cawangan['mysql'])->create([
'kodcaw'=> $kodcaw, 'kodcaw'=> $kodcaw,
'norujukan'=> $request->norujukan, 'norujukan'=> $request_data->norujukan,
't_gadai' => $current->toDateString(), 't_gadai' => $current->toDateString(),
'bil' => 1, 'bil' => 1,
'marhun' => $request->marhun, 'marhun' => $request_data->marhun,
'nota' => $request->nota, 'nota' => $request_data->nota,
'karat' => $request->karat, 'batu_permata' => $request_data->batu_permata,
'berat' => $request->berat_emas, 'berat_batu_permata' => $request_data->berat_batu_permata,
'karat' => $request_data->karat,
'berat' => $request_data->berat_emas,
'harga' => $hargaemas, 'harga' => $hargaemas,
'n_marhun' => $nilai_marhun 'n_marhun' => $nilai_marhun
]); ]);
$audit = new Audit(); $audit = new Audit();
$audit->users = $request->teller; $audit->users = $request_data->teller;
$audit->actions = 'Daftar Marhun'; $audit->actions = 'Daftar Marhun';
$audit->norujukan = $request->norujukan; $audit->norujukan = $request_data->norujukan;
$audit->new_data = $marhun; $audit->new_data = $marhun;
$audit->kodcaw = $kodcaw; $audit->kodcaw = $kodcaw;
$audit->created_at = $current; $audit->created_at = $current;
@@ -159,6 +163,8 @@ class MarhunController extends Controller
'karat' => $request->karat, 'karat' => $request->karat,
'marhun' => $request->marhun, 'marhun' => $request->marhun,
'nota' => $request->nota, 'nota' => $request->nota,
'batu_permata' => $request->batu_permata,
'berat_batu_permata' => $request->berat_batu_permata,
'berat' => $request->berat, 'berat' => $request->berat,
'harga' => $harga['harga'], 'harga' => $harga['harga'],
'n_marhun' => $nilai_marhun 'n_marhun' => $nilai_marhun
@@ -184,7 +190,7 @@ class MarhunController extends Controller
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$marhun = Marhun::on($cawangan['mysql']) $marhun = Marhun::on($cawangan['mysql'])
->select('marhun.norujukan','gadai.nokp','customer.nama','marhun.marhun','marhun.nota','marhun.berat','marhun.karat','marhun.harga','marhun.n_marhun','marhun.t_gadai') ->select('marhun.norujukan','gadai.nokp','customer.nama','marhun.marhun','marhun.nota','marhun.berat','marhun.karat','marhun.harga','marhun.n_marhun','marhun.t_gadai','marhun.batu_permata', 'marhun.berat_batu_permata')
->rightJoin('gadai', 'gadai.norujukan', '=', 'marhun.norujukan') ->rightJoin('gadai', 'gadai.norujukan', '=', 'marhun.norujukan')
->rightJoin('online_arrahn.customer as customer', 'customer.kpbaru','=','gadai.nokp') ->rightJoin('online_arrahn.customer as customer', 'customer.kpbaru','=','gadai.nokp')
->where('marhun.t_gadai','=',$tarikh) ->where('marhun.t_gadai','=',$tarikh)