Merge branch 'adminapi' into 'master'
Adminapi See merge request online-sistem1/api_arrahn!146
This commit is contained in:
@@ -279,7 +279,7 @@ class TransactionOnlineController extends Controller
|
||||
|
||||
foreach($cawangan_all as $index=>$cawangan){
|
||||
$gadai = Gadai::on($cawangan['mysql'])
|
||||
->where([['sttebus','=',''],['nokp','=',$request->ic]])
|
||||
->where([['sttebus','=',''],['taglel',0],['nokp','=',$request->ic]])
|
||||
->orderBy('t_gadai','desc')
|
||||
->get()->toArray();
|
||||
if(sizeof($gadai) != 0){
|
||||
@@ -293,16 +293,16 @@ class TransactionOnlineController extends Controller
|
||||
}
|
||||
|
||||
$akanlelong = Gadai::on($cawangan['mysql'])
|
||||
->where([['sttebus','=', ''],['nokp','=',$request->ic],['hargajual','=', 0]])
|
||||
->where([['sttebus','=', ''],['taglel',1],['nokp','=',$request->ic],['hargajual','=', 0]])
|
||||
->rightJoin('lelong', 'gadai.norujukan', '=', 'lelong.norujukan')
|
||||
->get()->toArray();
|
||||
|
||||
if(sizeof($akanlelong) != 0){
|
||||
foreach($akanlelong as $lelong)
|
||||
{
|
||||
$result = (new TebusController)->kiraupahTawarruq($gad['kodcaw'],$gad['norujukan']);
|
||||
$result = (new TebusController)->kiraupahTawarruq($lelong['kodcaw'],$lelong['norujukan']);
|
||||
$lelong['keuntungan'] = $result;
|
||||
array_push($akanlelong,$lelong);
|
||||
array_push($akanlelongarray,$lelong);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user