fix
This commit is contained in:
@@ -32,6 +32,10 @@ class TransactionOnlineController extends Controller
|
||||
$current = Carbon::now();
|
||||
$current = new Carbon();
|
||||
|
||||
$cawangan = Cawangan::on('mysql7')->where('kodcaw',$request->kodcaw)->first();
|
||||
|
||||
$sag = Gadai::on($cawangan['mysql'])->where('norujukan',$request->norujukan)->first();
|
||||
|
||||
$transaction = TransactionOnline::on('mysql7')->create([
|
||||
'nokp' => $request->nokp,
|
||||
'reference_no' => $request->reference_no,
|
||||
@@ -42,7 +46,8 @@ class TransactionOnlineController extends Controller
|
||||
'total_payment' => $request->total_payment,
|
||||
'tarikh' => $current->toDateString(),
|
||||
'masa' => $current->toTimeString(),
|
||||
'customer_name' => $request->customer_name
|
||||
'customer_name' => $request->customer_name,
|
||||
'tempohbayar'=>$sag['tempoh']
|
||||
]);
|
||||
|
||||
return response()->json($transaction,201);
|
||||
@@ -68,12 +73,12 @@ class TransactionOnlineController extends Controller
|
||||
$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']);
|
||||
$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([
|
||||
GlDetail::on($cawangan['mysql'])->create([
|
||||
'kodcaw' => $transaction['kodcaw'],
|
||||
'tarikh' => Carbon::parse($transaction['paid_at'])->format('Y-m-d'),
|
||||
'dtacct' => '1000/010',
|
||||
@@ -83,7 +88,7 @@ class TransactionOnlineController extends Controller
|
||||
'teller' => 'ONLINE'
|
||||
]);
|
||||
|
||||
TransactionOnline::on('mysql7')->where([['norujukan',$transaction['norujukan'],['billplz_id',$transaction['billplz_id']]]])->update([
|
||||
TransactionOnline::on('mysql7')->where([['norujukan',$transaction['norujukan']],['billplz_id',$transaction['billplz_id']]])->update([
|
||||
'update_status' => 1,
|
||||
'update_serahan' => 1
|
||||
]);
|
||||
@@ -92,7 +97,7 @@ class TransactionOnlineController extends Controller
|
||||
return response()->json('success');
|
||||
}
|
||||
|
||||
public function kiraupahTawarruq($kodcaw,$norujukan){
|
||||
public function kiraupahTawarruq($kodcaw,$norujukan,$tempohbayar){
|
||||
$cawangan = Cawangan::on('mysql7')
|
||||
->where('kodcaw','=',$kodcaw)
|
||||
->first();
|
||||
@@ -101,20 +106,20 @@ class TransactionOnlineController extends Controller
|
||||
->where('norujukan','=',$norujukan)
|
||||
->first();
|
||||
|
||||
$bilang_bln = $gadai_data['tempoh'] - $gadai_data['tempohbayar'];
|
||||
$bilang_bln = $tempohbayar - $gadai_data['tempohbayar'];
|
||||
|
||||
$upahsemasa_raw = $bilang_bln * (($gadai_data['kadarupah']/100 )* $gadai_data['pinjaman']);
|
||||
|
||||
$upah_semasa_round = number_format($upahsemasa_raw,2);
|
||||
$upah_semasa = substr($upah_semasa_round, 0, -1);
|
||||
if(strpos($upah_semasa,',')){
|
||||
if(strpos($upah_semasa,',')){
|
||||
$upah_semasa = str_replace(',','',$upah_semasa);
|
||||
}
|
||||
// $upah_semasa = floatval(preg_replace('/[^\d.]/', '', $upah_semasa));
|
||||
return $upah_semasa;
|
||||
}
|
||||
|
||||
public function kiraUpahRebet($kodcaw,$norujukan){
|
||||
public function kiraUpahRebet($kodcaw,$norujukan,$tempohbayar){
|
||||
$cawangan = Cawangan::on('mysql7')
|
||||
->where('kodcaw','=',$kodcaw)
|
||||
->first();
|
||||
@@ -123,13 +128,13 @@ class TransactionOnlineController extends Controller
|
||||
->where('norujukan','=',$norujukan)
|
||||
->first();
|
||||
|
||||
$bilang_bln = $gadai_data['tempoh'] - $gadai_data['tempohbayar'];
|
||||
$bilang_bln = $tempohbayar - $gadai_data['tempohbayar'];
|
||||
|
||||
$upahrebet_raw = $bilang_bln * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']);
|
||||
|
||||
$upah_rebet_round = number_format($upahrebet_raw,2);
|
||||
$upah_rebet = substr($upah_rebet_round, 0, -1);
|
||||
if(strpos($upah_rebet,',')){
|
||||
if(strpos($upah_rebet,',')){
|
||||
$upah_rebet = str_replace(',','',$upah_rebet);
|
||||
}
|
||||
// $upah_rebet = floatval(preg_replace('/[^\d.]/', '', $upah_rebet));
|
||||
@@ -137,15 +142,19 @@ class TransactionOnlineController extends Controller
|
||||
return $upah_rebet;
|
||||
}
|
||||
|
||||
public function updateGadaiMarhunKaunter($kodcaw,$norujukan,$bayaran,$paid_at){
|
||||
public function updateGadaiMarhunKaunter($kodcaw,$norujukan,$bayaran,$paid_at,$tempohbayar){
|
||||
$current = Carbon::now();
|
||||
$current = new Carbon();
|
||||
|
||||
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
|
||||
$gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->first();
|
||||
|
||||
$upahsemasa = $this->kiraupahTawarruq($kodcaw,$norujukan);
|
||||
$upahrebet = $this->kiraUpahRebet($kodcaw,$norujukan);
|
||||
if($tempohbayar == 0.0){
|
||||
$tempohbayar = $gadai['tempoh'];
|
||||
}
|
||||
|
||||
$upahsemasa = $this->kiraupahTawarruq($kodcaw,$norujukan,$tempohbayar);
|
||||
$upahrebet = $this->kiraUpahRebet($kodcaw,$norujukan,$tempohbayar);
|
||||
|
||||
$total_bayaran_prev = Transaction::on('mysql7')->where([['norujukan','=',$norujukan],['trans_type','=','A']])->sum('duit_masuk');
|
||||
|
||||
@@ -188,7 +197,7 @@ class TransactionOnlineController extends Controller
|
||||
'jbg' => 0,
|
||||
't_update' => Carbon::parse($paid_at)->toDateString(),
|
||||
'bakihargajualan' => $baki_hargajualan,
|
||||
'tempohbayar' => $gadai['tempoh'],
|
||||
'tempohbayar' => $tempohbayar,
|
||||
'lelong_tawarruq' => $lelong_tawarruq
|
||||
));
|
||||
return response()->json($update_gadai, 200);
|
||||
@@ -243,4 +252,19 @@ class TransactionOnlineController extends Controller
|
||||
return response()->json(false);
|
||||
}
|
||||
}
|
||||
|
||||
public function getListUnsuccessful(){
|
||||
$list = TransactionOnline::on('mysql7')->whereIn('status',['NOT PAID','UNSUCCESSFUL'])->get();
|
||||
|
||||
return response()->json($list);
|
||||
}
|
||||
|
||||
public function updateUnsuccessfulTransaction(Request $request){
|
||||
$transaction = TransactionOnline::on('mysql7')->where('billplz_id','=',$request->billplz_id)->update(array(
|
||||
'status' => $request->status,
|
||||
'paid_at' => $request->paid_at
|
||||
));
|
||||
|
||||
return response()->json($transaction,200);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user