This commit is contained in:
Afiq Zakwan
2023-12-20 08:04:51 +08:00
parent f9d812f326
commit b8ff35e804
6 changed files with 71 additions and 13 deletions
@@ -53,7 +53,8 @@ class TransactionOnlineController extends Controller
'tarikh' => $current->toDateString(),
'masa' => $current->toTimeString(),
'customer_name' => $request->customer_name,
'tempohbayar'=>$sag['tempoh']
'tempohbayar'=>$sag['tempoh'],
'jenisbayaran' => $request->jenisbayaran ? $request->jenisbayaran : 'A'
]);
return response()->json($transaction,201);
@@ -77,12 +78,14 @@ class TransactionOnlineController extends Controller
->where('kodcaw','=',$transaction['kodcaw'])
->first();
$gadai_data = Gadai::on($cawangan['mysql'])->where([['norujukan',$transaction['norujukan']],['nokp',$transaction['nokp']]])->first();
if($gadai_data['hargajualan'] > 0){
$this->updateGadaiMarhunKaunter($transaction['kodcaw'],$transaction['norujukan'],$transaction['total_payment'],$transaction['paid_at'],$transaction['tempohbayar']);
}else{
$this->createAdvansur($transaction['kodcaw'],$transaction['norujukan'],$transaction['total_payment'],$transaction['paid_at']);
if($transaction->jenisbayaran == 'A'){
if($gadai_data['hargajualan'] > 0){
$this->updateGadaiMarhunKaunter($transaction['kodcaw'],$transaction['norujukan'],$transaction['total_payment'],$transaction['paid_at'],$transaction['tempohbayar']);
}else{
$this->createAdvansur($transaction['kodcaw'],$transaction['norujukan'],$transaction['total_payment'],$transaction['paid_at']);
}
}
GlDetail::on($cawangan['mysql'])->create([
'kodcaw' => $transaction['kodcaw'],
@@ -174,15 +177,14 @@ class TransactionOnlineController extends Controller
$onepercent = new OnePercentServices();
$old_data = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->first();
$margin_semasa = ($gadai['bakipjm'] / $gadai['nilaimarhun']) * 100;
$keuntungan = $onepercent->kiraanKeuntunganSebenar($gadai['bakipjm'],$gadai['nilaimarhun'],$gadai['kadarupah'],$margin_semasa);
$ujrahasal = $onepercent->kiraanUjrahSebenar($gadai['nilaimarhun'],$gadai['kadarupah'],$gadai['margin_semasa']);
if($gadai['tagbaru'] == 1){
$upahsemasa = $keuntungan;
$upah_semasa = $keuntungan;
}
$baki_hargajualan = $gadai['bakihargajualan'] - $bayaran;
$baki_bayaran = $bayaran - $upahsemasa;
@@ -318,7 +320,7 @@ class TransactionOnlineController extends Controller
$current = Carbon::now();
$current = new Carbon();
$boolmasa = false;
$boolmasa = false;
$transaction_online = TransactionOnline::on('mysql7')->where([['norujukan',$request->norujukan],['status','PAID'],['update_status',0],['tarikh',$current->toDateString()]])->first();
$transaction_masa = TransactionOnline::on('mysql7')->where([['norujukan',$request->norujukan],['status','NOT PAID'],['tarikh',$current->toDateString()]])