Merge branch 'master' of https://gitlab.com/online-sistem1/api_arrahn into adminapi
This commit is contained in:
@@ -3376,7 +3376,7 @@ class GadaiController extends Controller
|
|||||||
$harini = $current->toDateString();
|
$harini = $current->toDateString();
|
||||||
$totalKomoditi = Komuditi::on('mysql7')->where([['date_purchase',$harini],['transaction_type','Beli Komoditi']])->sum('unit_komuditi');
|
$totalKomoditi = Komuditi::on('mysql7')->where([['date_purchase',$harini],['transaction_type','Beli Komoditi']])->sum('unit_komuditi');
|
||||||
$totalKomoditiJual = Komuditi::on('mysql7')->where([['date_purchase',$harini],['transaction_type','Jual Komoditi']])->sum('unit_komuditi');
|
$totalKomoditiJual = Komuditi::on('mysql7')->where([['date_purchase',$harini],['transaction_type','Jual Komoditi']])->sum('unit_komuditi');
|
||||||
$totalUse = KomuditiTransaksi::on('mysql7')->where('tarikh',$harini)->sum('unit_komuditi');
|
$totalUse = KomuditiTransaksi::on('mysql7')->where('tarikh',$harini)->sum('unit_komuditi');
|
||||||
|
|
||||||
$bakiKomoditi = $totalKomoditi - $totalKomoditiJual - $totalUse;
|
$bakiKomoditi = $totalKomoditi - $totalKomoditiJual - $totalUse;
|
||||||
$percentUse = 0;
|
$percentUse = 0;
|
||||||
@@ -3390,4 +3390,42 @@ class GadaiController extends Controller
|
|||||||
|
|
||||||
return response()->json($dataKomoditi);
|
return response()->json($dataKomoditi);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function updateLelongTawarruq(){
|
||||||
|
$cawangan_all = Cawangan::on('mysql7')->get();
|
||||||
|
|
||||||
|
foreach($cawangan_all as $index=>$cawangan){
|
||||||
|
$gadai_all = Gadai::on($cawangan['mysql'])->where([['sttebus','=',''],['hargajualan','!=','bakihargajualan'],['hargajualan','!=',null]])->get();
|
||||||
|
foreach($gadai_all as $index=>$gadai){
|
||||||
|
$totalbayaran = Transaction::on('mysql7')->where('norujukan',$gadai['norujukan'])->sum('duit_masuk');
|
||||||
|
$upah6bln_raw = $gadai['bakiupah'];
|
||||||
|
|
||||||
|
$upah6bln_round = number_format($upah6bln_raw,2);
|
||||||
|
$upah6bln = (float)substr($upah6bln_round, 0, -1);
|
||||||
|
$upah6bln = floatval(preg_replace('/[^\d.]/', '', $upah6bln));
|
||||||
|
|
||||||
|
if($totalbayaran >= $upah6bln){
|
||||||
|
Gadai::on($cawangan['mysql'])->where('norujukan',$gadai['norujukan'])->update([
|
||||||
|
'lelong_tawarruq'=>0
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
public function updateTebusGadai(){
|
||||||
|
$cawangan_all = Cawangan::on('mysql7')->get();
|
||||||
|
|
||||||
|
foreach($cawangan_all as $index=>$cawangan){
|
||||||
|
$gadai_all = Gadai::on($cawangan['mysql'])->join('tebus','tebus.norujukan','=','gadai.norujukan')->where('gadai.sttebus','=','')->get();
|
||||||
|
|
||||||
|
foreach($gadai_all as $index=>$gadai){
|
||||||
|
Gadai::on($cawangan['mysql'])->where('norujukan',$gadai['norujukan'])->update([
|
||||||
|
'sttebus' => 'T'
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -534,6 +534,9 @@ $router->group(['prefix'=>'api'], function () use ($router){
|
|||||||
$router->get('initiate/tunai',['uses'=>'TunaiController@initiateTunai']);
|
$router->get('initiate/tunai',['uses'=>'TunaiController@initiateTunai']);
|
||||||
//WTD
|
//WTD
|
||||||
$router->get('check/wtd',['uses'=>'WTDController@getDraftWTD']);
|
$router->get('check/wtd',['uses'=>'WTDController@getDraftWTD']);
|
||||||
|
|
||||||
|
$router->get('check/lelong/tawarruq',['uses'=>'GadaiController@updateLelongTawarruq']);
|
||||||
|
$router->get('update/sttebus/gadaian',['uses'=>'GadaiController@updateTebusGadai']);
|
||||||
});
|
});
|
||||||
|
|
||||||
$router->group(['prefix'=>'e-arrahn'], function () use ($router){
|
$router->group(['prefix'=>'e-arrahn'], function () use ($router){
|
||||||
|
|||||||
Reference in New Issue
Block a user