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

Merged in feature-batu-permata (pull request #140)

Browse Source 
Feature batu permata
This commit is contained in:
arrahn pkb
2024-03-14 04:35:35 +00:00
parent af677e5a3f ce41e2e7db
commit 95ccd5d564
6 changed files with 275 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/MarhunController.php
+47 -29
View File
@@ -51,7 +51,7 @@ class MarhunController extends Controller
}
public function getAllJemas(){
$jemas = Jemas::on('mysql7')->get();
$jemas = Jemas::on('mysql7')->orderBy('ordernum', 'asc')->get();
return response()->json($jemas);
}
@@ -61,38 +61,48 @@ class MarhunController extends Controller
$current = Carbon::now();
$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'];
if(isset($request->jenisAT)){
if($request->jenisAT == 'hargalama'){
$hargaemas = $request->harga;
// $nilai_marhun = $request->berat_emas * $request->harga;
if(isset($request_data->jenisAT)){
if($request_data->jenisAT == 'hargalama'){
$hargaemas = $request_data->harga;
// $nilai_marhun = $request_data->berat_emas * $request_data->harga;
}else $hargaemas = $harga['harga'];
// $nilai_marhun = $request->berat_emas * $harga['harga'];
// $nilai_marhun = $request_data->berat_emas * $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();
$marhun = Marhun::on($cawangan['mysql'])->create([
$marhunToCreate = [
'kodcaw'=> $kodcaw,
'norujukan'=> $request->norujukan,
'norujukan'=> $request_data->norujukan,
't_gadai' => $current->toDateString(),
'bil' => 1,
'marhun' => $request->marhun,
'nota' => $request->nota,
'karat' => $request->karat,
'berat' => $request->berat_emas,
'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,
'harga' => $hargaemas,
'n_marhun' => $nilai_marhun
]);
];
// Set value berat_batu_permata to null if value passed is null
if($marhunToCreate['berat_batu_permata'] == '') {
$marhunToCreate['berat_batu_permata'] = null;
};
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$marhun = Marhun::on($cawangan['mysql'])->create($marhunToCreate);
$audit = new Audit();
$audit->users = $request->teller;
$audit->users = $request_data->teller;
$audit->actions = 'Daftar Marhun';
$audit->norujukan = $request->norujukan;
$audit->norujukan = $request_data->norujukan;
$audit->new_data = $marhun;
$audit->kodcaw = $kodcaw;
$audit->created_at = $current;
@@ -154,15 +164,23 @@ class MarhunController extends Controller
$old_data = Marhun::on($cawangan['mysql'])->where([['recno','=',$request->recno],['norujukan','=',$norujukan]])->first();
$jemas = Marhun::on($cawangan['mysql'])->where([['recno','=',$request->recno],['norujukan','=',$norujukan]])->update(
[
'karat' => $request->karat,
'marhun' => $request->marhun,
'nota' => $request->nota,
'berat' => $request->berat,
'harga' => $harga['harga'],
'n_marhun' => $nilai_marhun
]);
$marhunToUpdate = [
'karat' => $request->karat,
'marhun' => $request->marhun,
'nota' => $request->nota,
'tag_permata' => $request->tag_permata,
'berat_batu_permata' => $request->berat_batu_permata,
'berat' => $request->berat,
'harga' => $harga['harga'],
'n_marhun' => $nilai_marhun
];
// Set value berat_batu_permata to null if value passed is null
if($marhunToUpdate['berat_batu_permata'] == '') {
$marhunToUpdate['berat_batu_permata'] = null;
};
$jemas = Marhun::on($cawangan['mysql'])->where([['recno','=',$request->recno],['norujukan','=',$norujukan]])->update($marhunToUpdate);
$new_data = Marhun::on($cawangan['mysql'])->where([['recno','=',$request->recno],['norujukan','=',$norujukan]])->first();
@@ -184,7 +202,7 @@ class MarhunController extends Controller
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$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.tag_permata', 'marhun.berat_batu_permata')
->rightJoin('gadai', 'gadai.norujukan', '=', 'marhun.norujukan')
->rightJoin('online_arrahn.customer as customer', 'customer.kpbaru','=','gadai.nokp')
->where('marhun.t_gadai','=',$tarikh)