Merge branch 'master' into 'hafiza-ali'

# Conflicts:
#   app/Http/Controllers/CustomerController.php
#   routes/web.php
This commit is contained in:
Zakwan Hamdan
2021-02-03 04:04:51 +00:00
2 changed files with 37 additions and 1 deletions
+35 -1
View File
@@ -218,6 +218,8 @@ class CustomerController extends Controller
array_push($sttebus_, array(
'norujukan' => $gd->norujukan,
'pinjaman' => number_format($gd->pinjaman,2),
't_gadai' => $gd->t_gadai,
'hargajualan' => $gd->hargajualan,
'bakihargajualan' => $gd->bakihargajualan,
));
@@ -227,6 +229,8 @@ class CustomerController extends Controller
{
array_push($sttebus_T, array(
'norujukan' => $gd->norujukan,
'pinjaman' => number_format($gd->pinjaman,2),
't_gadai' => $gd->t_gadai,
'hargajualan' => $gd->hargajualan,
'bakihargajualan' => $gd->bakihargajualan,
));
@@ -236,6 +240,8 @@ class CustomerController extends Controller
{
array_push($sttebus_L, array(
'norujukan' => $gd->norujukan,
'pinjaman' => number_format($gd->pinjaman,2),
't_gadai' => $gd->t_gadai,
'hargajualan' => $gd->hargajualan,
'bakihargajualan' => $gd->bakihargajualan,
));
@@ -419,7 +425,7 @@ class CustomerController extends Controller
return response('Deleted Successfully', 200);
}
public function akaunBankMobile($nokp)
{
$array_cust = [];
@@ -493,4 +499,32 @@ class CustomerController extends Controller
}
return response()->json($customer, 200);
}
public function jumlahPembiayaanMobile($nokp){
$cawangan_all = Cawangan::on('mysql7')->get();
$jumlahPembiayaan = 0;
foreach($cawangan_all as $index=>$cawangan){
$gadai = Gadai::on($cawangan['mysql'])->where([['nokp','=',$nokp],['sttebus','=','']])->sum('pinjaman');
$jumlahPembiayaan += $gadai;
}
return response()->json(number_format($jumlahPembiayaan,2));
}
public function jumlahBakiLelongMobile($nokp){
$cawangan_all = Cawangan::on('mysql7')->get();
$jumlahBakiLelong = 0;
foreach($cawangan_all as $index=>$cawangan){
$bakilelong = Gadai::on($cawangan['mysql'])
->where('nokp','=',$nokp)
->where('sttebus','=','L')
->where('baki', 'not like', '-%')
->where('tagtbaki','=','1')
->rightJoin('lelong', 'gadai.norujukan', '=', 'lelong.norujukan')
->sum('baki');
$jumlahBakiLelong += $bakilelong;
}
return response()->json(number_format($jumlahBakiLelong,2));
}
}
+2
View File
@@ -273,6 +273,8 @@ $router->group(['prefix'=>'mobile'], function () use ($router){
$router->get('akaun-bank/{nokp}',['uses'=>'CustomerController@akaunBankMobile']);
$router->get('bank-listing',['uses'=>'CustomerController@bankListMobile']);
$router->post('insert/akaun-bank',['uses'=>'CustomerController@insertAkaunBankMobile']);
$router->get('gadai/norujukan/jumlahPembiayaan/{nokp}',['uses'=>'CustomerController@jumlahPembiayaanMobile']);
$router->get('gadai/norujukan/jumlahBakiLelong/{nokp}',['uses'=>'CustomerController@jumlahBakiLelongMobile']);
//gadaian
$router->get('gadai/{noic}',['uses'=>'GadaiController@showOneGadaiMobile']);