Merge branch 'hafiza-ali' into 'master'

New API Mobile (Gadaian)

See merge request online-sistem1/api_arrahn!26
This commit is contained in:
Zakwan Hamdan
2021-01-30 07:20:39 +00:00
2 changed files with 71 additions and 43 deletions
+49 -26
View File
@@ -197,39 +197,62 @@ class CustomerController extends Controller
return response()->json($gadai_all); return response()->json($gadai_all);
} }
public function showOneCustomerGadaiByCawanganMobile($ic,$status,$kodcaw){ public function gadaiTebusLelongByCawanganMobile($ic,$kodcaw){
if($status == 'belum_tebus'){
$gadai_status = '';
}elseif($status == 'sudah_tebus'){
$gadai_status = 'T';
}elseif($status == 'lelong'){
$gadai_status = 'L';
}
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$gadai_all = []; $sttebus_ = [];
if($status == 'belum_tebus' || $status == 'sudah_tebus'){ $sttebus_T = [];
$gadai = Gadai::on($cawangan['mysql']) $sttebus_L = [];
->where([['sttebus','=',$gadai_status],['nokp','=',$ic]]) $array_all = [];
->get();
if(sizeof($gadai) != 0){ $gadai = Gadai::on($cawangan['mysql'])->where([['nokp','=',$ic]])->get();
foreach($gadai as $index => $gadai_detail){
array_push($gadai_all,['norujukan'=>$gadai_detail['norujukan'],'hargajualan'=>$gadai_detail['hargajualan'],'bakihargajualan'=>$gadai_detail['bakihargajualan']]); //to check if gadai has data
if(!empty($gadai))
{
//loop each array
foreach($gadai as $gd){
if($gd->sttebus == '' || empty($gd->sttebus)){
array_push($sttebus_, array(
'norujukan' => $gd->norujukan,
'hargajualan' => $gd->hargajualan,
'bakihargajualan' => $gd->bakihargajualan,
));
} }
} elseif($gd->sttebus == 'T')
}elseif($status == 'lelong'){ {
$gadai = Gadai::on($cawangan['mysql']) array_push($sttebus_T, array(
->where([['sttebus','=',$gadai_status],['nokp','=',$ic]]) 'norujukan' => $gd->norujukan,
->rightJoin('lelong', 'gadai.norujukan', '=', 'lelong.norujukan') 'hargajualan' => $gd->hargajualan,
->get(); 'bakihargajualan' => $gd->bakihargajualan,
if(sizeof($gadai) != 0){ ));
foreach($gadai as $index => $gadai_detail){
array_push($gadai_all,['norujukan'=>$gadai_detail['norujukan'],'hargajualan'=>$gadai_detail['hargajualan'],'bakihargajualan'=>$gadai_detail['bakihargajualan']]); }
elseif($gd->sttebus == 'L')
{
array_push($sttebus_L, array(
'norujukan' => $gd->norujukan,
'hargajualan' => $gd->hargajualan,
'bakihargajualan' => $gd->bakihargajualan,
));
} }
} }
} }
else
{
return response()->json('Data Not Found');
}
return response()->json($gadai_all); array_push($array_all, array(
'gadai' => $sttebus_,
'tebus' => $sttebus_T,
'lelong' => $sttebus_L
));
return response()->json($array_all);
} }
public function getLaporanCustomers($kodcaw, $tarikh) public function getLaporanCustomers($kodcaw, $tarikh)
+16 -11
View File
@@ -257,23 +257,28 @@ $router->group(['prefix'=>'e-arrahn'], function () use ($router){
}); });
$router->group(['prefix'=>'mobile'], function () use ($router){ $router->group(['prefix'=>'mobile'], function () use ($router){
$router->get('customers/{ic}',['uses'=>'CustomerController@showOneCustomerByICMobile']); $router->get('customers/{ic}',['uses'=>'CustomerController@showOneCustomerByICMobile']);
$router->get('customers/{ic}/gadai/{status}/{kodcaw}',['uses'=>'CustomerController@showOneCustomerGadaiByCawanganMobile']);
$router->get('customers/{ic}/gadai/amaran/lelong',['uses'=>'CustomerController@show6BlnGadai']);
$router->get('harga_emas',['uses'=>'HargaEmasController@showAllHargaEmasMobile']); //utama
$router->get('customers/{ic}/gadai/amaran/lelong',['uses'=>'CustomerController@show6BlnGadai']);
$router->get('harga_emas',['uses'=>'HargaEmasController@showAllHargaEmasMobile']);
$router->get('gadai/norujukan/count/{nokp}',['uses'=>'CustomerController@countNorujukanMobile']);
$router->get('gadai/norujukan/{nokp}',['uses'=>'CustomerController@listNorujukanMobile']);
$router->get('gadai/norujukan/{nokp}',['uses'=>'CustomerController@listNorujukanMobile']); //gadaian
$router->get('gadai/norujukan/count/{nokp}',['uses'=>'CustomerController@countNorujukanMobile']); $router->get('gadai/{noic}',['uses'=>'GadaiController@showOneGadaiMobile']);
$router->post('gadai/detail/norujukan',['uses'=>'CustomerController@getGadaiDetailMobile']); $router->get('customers/{ic}/gadaitebuslelong/{kodcaw}',['uses'=>'CustomerController@gadaiTebusLelongByCawanganMobile']);
$router->put('customers/update/{nokp}', ['uses' => 'CustomerController@customerUpdate']); $router->post('gadai/detail/norujukan',['uses'=>'CustomerController@getGadaiDetailMobile']);
$router->put('customers/update/{nokp}', ['uses' => 'CustomerController@customerUpdate']);
//register
$router->get('otp/{nokp}',['uses'=>'OtpController@getOtp']);
$router->get('otp/check/{otp_token}',['uses'=>'OtpController@checkToken']);
$router->put('otp/update_otp',['uses'=>'OtpController@usedOTP']);
$router->get('otp/{nokp}',['uses'=>'OtpController@getOtp']);
$router->get('otp/check/{otp_token}',['uses'=>'OtpController@checkToken']);
$router->put('otp/update_otp',['uses'=>'OtpController@usedOTP']);
$router->get('gadai/{noic}',['uses'=>'GadaiController@showOneGadaiMobile']);
}); });
$router->group(['prefix'=>'dashboard'], function () use ($router){ $router->group(['prefix'=>'dashboard'], function () use ($router){