KoPKB/api_arrahn
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
hafifierahman
2022-04-17 11:24:13 +08:00
parent 42cb6476de
commit 229f319d17
6 changed files with 86 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/AdminPageController.php
+49 -36
View File
@@ -1838,12 +1838,26 @@ class AdminPageController extends Controller
$current_day = sprintf("%02d", $current->day); $current_day = sprintf("%02d", $current->day);
try { try {
$transaksipermohonan = Permohonan::whereYear('tarikh_permohonan','=', $current->year)->where('kodcaw',$kodcaw)->orderBy('mohonid','desc')->first();
$mohonid = 0;
if($transaksipermohonan)
{
$mohonid = $transaksipermohonan['mohonid'] + 1;
}else{
$mohonid = 1;
}
$transbaru = sprintf("%04d",$mohonid);
$permohonan = new Permohonan; $permohonan = new Permohonan;
$pengesahan = new Pengesahan; $pengesahan = new Pengesahan;
$status = new Status; $status = new Status;
$nopermohonan = 'AR' . strtoupper($kodcaw) . $curent_year . $curent_month . $current_day . '-000' .rand(1,9); $nopermohonan = 'AR' . strtoupper($kodcaw) . $curent_year . $curent_month . $current_day . '-' . $transbaru;
$permohonan->mohonid = $mohonid;
$permohonan->kodcaw = $kodcaw; $permohonan->kodcaw = $kodcaw;
$permohonan->jenismohon = $request->jenismohon; $permohonan->jenismohon = $request->jenismohon;
$permohonan->baki_petibesi = $request->bakipetibesi; $permohonan->baki_petibesi = $request->bakipetibesi;
@@ -1853,13 +1867,12 @@ class AdminPageController extends Controller
$permohonan->outstandingsemasa = $request->outstanding; $permohonan->outstandingsemasa = $request->outstanding;
$permohonan->nopermohonan = $nopermohonan; $permohonan->nopermohonan = $nopermohonan;
$permohonan->save(); $permohonan->save();
$pengesahan->mohonid = $permohonan->id; $pengesahan->nopermohonan = $permohonan->nopermohonan;
$pengesahan->kodcaw = $kodcaw; $pengesahan->kodcaw = $kodcaw;
$pengesahan->save(); $pengesahan->save();
$status->mohonid = $permohonan->id; $status->nopermohonan = $permohonan->nopermohonan;
$status->statusid = 1; $status->statusid = 1;
$status->tarikhmasa = $timeloni->toDateTimeString(); $status->tarikhmasa = $timeloni->toDateTimeString();
$status->save(); $status->save();
@@ -1875,7 +1888,7 @@ class AdminPageController extends Controller
{ {
if($kodcaw === 'admin') if($kodcaw === 'admin')
{ {
$listpermohonan = Permohonan::join('pengesahan', 'permohonan.mohonid', '=', 'pengesahan.mohonid') $listpermohonan = Permohonan::join('pengesahan', 'permohonan.nopermohonan', '=', 'pengesahan.nopermohonan')
->where('tagterima',1) ->where('tagterima',1)
->orWhere('tagoperasi','=',2) ->orWhere('tagoperasi','=',2)
->orWhere('tagakaun','=',2) ->orWhere('tagakaun','=',2)
@@ -1886,7 +1899,7 @@ class AdminPageController extends Controller
->orderBy('tarikh_permohonan','desc')->paginate(5); ->orderBy('tarikh_permohonan','desc')->paginate(5);
}else{ }else{
$listpermohonan = Permohonan::join('pengesahan', 'permohonan.mohonid', '=', 'pengesahan.mohonid') $listpermohonan = Permohonan::join('pengesahan', 'permohonan.nopermohonan', '=', 'pengesahan.nopermohonan')
->where('pengesahan.kodcaw', $kodcaw) ->where('pengesahan.kodcaw', $kodcaw)
->where('tagterima',1) ->where('tagterima',1)
->orWhere('tagoperasi','=',2) ->orWhere('tagoperasi','=',2)
@@ -1907,7 +1920,7 @@ class AdminPageController extends Controller
if($kodcaw === 'admin') if($kodcaw === 'admin')
{ {
$listpermohonan = Permohonan::join('pengesahan', 'permohonan.mohonid', '=', 'pengesahan.mohonid') $listpermohonan = Permohonan::join('pengesahan', 'permohonan.nopermohonan', '=', 'pengesahan.nopermohonan')
->where('tagterima',0) ->where('tagterima',0)
->where('tagoperasi','!=',2) ->where('tagoperasi','!=',2)
->where('tagakaun','!=',2) ->where('tagakaun','!=',2)
@@ -1922,7 +1935,7 @@ class AdminPageController extends Controller
->orderBy('tarikh_permohonan','desc')->paginate(5); ->orderBy('tarikh_permohonan','desc')->paginate(5);
}else{ }else{
$listpermohonan = Permohonan::join('pengesahan', 'permohonan.mohonid', '=', 'pengesahan.mohonid') $listpermohonan = Permohonan::join('pengesahan', 'permohonan.nopermohonan', '=', 'pengesahan.nopermohonan')
->where('pengesahan.kodcaw', $kodcaw) ->where('pengesahan.kodcaw', $kodcaw)
->where('tagterima',0) ->where('tagterima',0)
->where('tagoperasi','!=',2) ->where('tagoperasi','!=',2)
@@ -1944,10 +1957,10 @@ class AdminPageController extends Controller
public function GetPermohonanById($kodcaw,$mohonid) public function GetPermohonanById($kodcaw,$mohonid)
{ {
$permohonanstatus = []; $permohonanstatus = [];
$listpermohonan = Permohonan::join('pengesahan', 'permohonan.mohonid', '=', 'pengesahan.mohonid') $listpermohonan = Permohonan::join('pengesahan', 'permohonan.nopermohonan', '=', 'pengesahan.nopermohonan')
->where([['permohonan.kodcaw', $kodcaw],['permohonan.mohonid',$mohonid]])->first()->toArray(); ->where([['permohonan.kodcaw', $kodcaw],['permohonan.nopermohonan',$mohonid]])->first()->toArray();
$status = Status::where('mohonid',$mohonid)->get()->toArray(); $status = Status::where('nopermohonan',$mohonid)->get()->toArray();
array_push($listpermohonan,(["status" => $status])); array_push($listpermohonan,(["status" => $status]));
@@ -1958,9 +1971,9 @@ class AdminPageController extends Controller
{ {
$statusarray = []; $statusarray = [];
$statusdetails = []; $statusdetails = [];
$status = Status::join('pengesahan', 'status.mohonid', '=', 'pengesahan.mohonid') $status = Status::join('pengesahan', 'status.nopermohonan', '=', 'pengesahan.nopermohonan')
->join('permohonan', 'status.mohonid', '=', 'permohonan.mohonid') ->join('permohonan', 'status.nopermohonan', '=', 'permohonan.nopermohonan')
->where('status.mohonid',$mohonid)->get()->toArray(); ->where('status.nopermohonan',$mohonid)->get()->toArray();
foreach($status as $index=>$stat) foreach($status as $index=>$stat)
{ {
@@ -2001,12 +2014,12 @@ class AdminPageController extends Controller
if($request->kelulusan == 'Lulus') if($request->kelulusan == 'Lulus')
{ {
$status->mohonid = $request->mohonid; $status->nopermohonan = $request->mohonid;
$status->statusid = 2; $status->statusid = 2;
$status->tarikhmasa = $timeloni->toDateTimeString(); $status->tarikhmasa = $timeloni->toDateTimeString();
$status->save(); $status->save();
$pengesahan = Pengesahan::where([['mohonid',$request->mohonid],['tagoperasi',0]]) $pengesahan = Pengesahan::where([['nopermohonan',$request->mohonid],['tagoperasi',0]])
->update(array( ->update(array(
'tagoperasi' => 1, 'tagoperasi' => 1,
'nama_operasi' => $request->namaoperasi, 'nama_operasi' => $request->namaoperasi,
@@ -2015,12 +2028,12 @@ class AdminPageController extends Controller
}else{ }else{
$status->mohonid = $request->mohonid; $status->nopermohonan = $request->mohonid;
$status->statusid = 7; $status->statusid = 7;
$status->tarikhmasa = $timeloni->toDateTimeString(); $status->tarikhmasa = $timeloni->toDateTimeString();
$status->save(); $status->save();
$pengesahan = Pengesahan::where([['mohonid',$request->mohonid],['tagoperasi',0]]) $pengesahan = Pengesahan::where([['nopermohonan',$request->mohonid],['tagoperasi',0]])
->update(array( ->update(array(
'tagoperasi' => 2, 'tagoperasi' => 2,
'komen_batal' => $request->komen, 'komen_batal' => $request->komen,
@@ -2048,12 +2061,12 @@ class AdminPageController extends Controller
if($request->kelulusan == 'Lulus') if($request->kelulusan == 'Lulus')
{ {
$status->mohonid = $request->mohonid; $status->nopermohonan = $request->mohonid;
$status->statusid = 3; $status->statusid = 3;
$status->tarikhmasa = $timeloni->toDateTimeString(); $status->tarikhmasa = $timeloni->toDateTimeString();
$status->save(); $status->save();
$pengesahan = Pengesahan::where([['mohonid',$request->mohonid],['tagakaun',0]]) $pengesahan = Pengesahan::where([['nopermohonan',$request->mohonid],['tagakaun',0]])
->update(array( ->update(array(
'tagakaun' => 1, 'tagakaun' => 1,
'nama_akaun' => $request->namaakaun, 'nama_akaun' => $request->namaakaun,
@@ -2062,12 +2075,12 @@ class AdminPageController extends Controller
}else }else
{ {
$status->mohonid = $request->mohonid; $status->nopermohonan = $request->mohonid;
$status->statusid = 7; $status->statusid = 7;
$status->tarikhmasa = $timeloni->toDateTimeString(); $status->tarikhmasa = $timeloni->toDateTimeString();
$status->save(); $status->save();
$pengesahan = Pengesahan::where([['mohonid',$request->mohonid],['tagakaun',0]]) $pengesahan = Pengesahan::where([['nopermohonan',$request->mohonid],['tagakaun',0]])
->update(array( ->update(array(
'tagakaun' => 2, 'tagakaun' => 2,
'komen_batal' => $request->komen, 'komen_batal' => $request->komen,
@@ -2089,7 +2102,7 @@ class AdminPageController extends Controller
$timeloni = Carbon::now(); $timeloni = Carbon::now();
try{ try{
$pengesahan = Pengesahan::where([['mohonid',$request->mohonid],['tagakaun',1]]) $pengesahan = Pengesahan::where([['nopermohonan',$request->mohonid],['tagakaun',1]])
->update(array( ->update(array(
'tagprint' => 1, 'tagprint' => 1,
'nama_print' => $request->namaprint, 'nama_print' => $request->namaprint,
@@ -2112,7 +2125,7 @@ class AdminPageController extends Controller
if($request->kelulusan == 'Lulus') if($request->kelulusan == 'Lulus')
{ {
$status->mohonid = $request->mohonid; $status->nopermohonan = $request->mohonid;
$status->statusid = 4; $status->statusid = 4;
$status->tarikhmasa = $timeloni->toDateTimeString(); $status->tarikhmasa = $timeloni->toDateTimeString();
$status->save(); $status->save();
@@ -2123,24 +2136,24 @@ class AdminPageController extends Controller
$ar_files->tarikhmasa = $timeloni->toDateTimeString(); $ar_files->tarikhmasa = $timeloni->toDateTimeString();
$ar_files->save(); $ar_files->save();
$pengesahan = Pengesahan::where([['mohonid',$request->mohonid],['tagpb',0]]) $pengesahan = Pengesahan::where([['nopermohonan',$request->mohonid],['tagpb',0]])
->update(array( ->update(array(
'tagpb' => 1, 'tagpb' => 1,
'files_id' => $ar_files->id 'files_id' => $ar_files->id
)); ));
$permohonan = Permohonan::where('mohonid',$request->mohonid) $permohonan = Permohonan::where('nopermohonan',$request->mohonid)
->update(array( ->update(array(
'tarikh_diluluskan' => $timeloni->toDateTimeString(), 'tarikh_diluluskan' => $timeloni->toDateTimeString(),
'jumlah_diluluskan' => $request->amaun_lulus 'jumlah_diluluskan' => $request->amaun_lulus
)); ));
}else{ }else{
$status->mohonid = $request->mohonid; $status->nopermohonan = $request->mohonid;
$status->statusid = 7; $status->statusid = 7;
$status->tarikhmasa = $timeloni->toDateTimeString(); $status->tarikhmasa = $timeloni->toDateTimeString();
$status->save(); $status->save();
$pengesahan = Pengesahan::where([['mohonid',$request->mohonid],['tagpb',0]]) $pengesahan = Pengesahan::where([['nopermohonan',$request->mohonid],['tagpb',0]])
->update(array( ->update(array(
'tagpb' => 2, 'tagpb' => 2,
'komen_batal' => $request->komen 'komen_batal' => $request->komen
@@ -2164,12 +2177,12 @@ class AdminPageController extends Controller
if($request->kelulusan == 'Lulus') if($request->kelulusan == 'Lulus')
{ {
$status->mohonid = $request->mohonid; $status->nopermohonan = $request->mohonid;
$status->statusid = 5; $status->statusid = 5;
$status->tarikhmasa = $timeloni->toDateTimeString(); $status->tarikhmasa = $timeloni->toDateTimeString();
$status->save(); $status->save();
$pengesahan = Pengesahan::where([['mohonid',$request->mohonid],['tagdeposit',0]]) $pengesahan = Pengesahan::where([['nopermohonan',$request->mohonid],['tagdeposit',0]])
->update(array( ->update(array(
'tagdeposit' => 1, 'tagdeposit' => 1,
'tarikh_bankin' => $timeloni->toDateString(), 'tarikh_bankin' => $timeloni->toDateString(),
@@ -2179,12 +2192,12 @@ class AdminPageController extends Controller
'nama_cit' => $request->namacit 'nama_cit' => $request->namacit
)); ));
}else{ }else{
$status->mohonid = $request->mohonid; $status->nopermohonan = $request->mohonid;
$status->statusid = 7; $status->statusid = 7;
$status->tarikhmasa = $timeloni->toDateTimeString(); $status->tarikhmasa = $timeloni->toDateTimeString();
$status->save(); $status->save();
$pengesahan = Pengesahan::where([['mohonid',$request->mohonid],['tagdeposit',0]]) $pengesahan = Pengesahan::where([['nopermohonan',$request->mohonid],['tagdeposit',0]])
->update(array( ->update(array(
'tagdeposit' => 2, 'tagdeposit' => 2,
'komen_batal' => $request->komen 'komen_batal' => $request->komen
@@ -2206,12 +2219,12 @@ class AdminPageController extends Controller
try{ try{
$status->mohonid = $request->mohonid; $status->nopermohonan = $request->mohonid;
$status->statusid = 6; $status->statusid = 6;
$status->tarikhmasa = $timeloni->toDateTimeString(); $status->tarikhmasa = $timeloni->toDateTimeString();
$status->save(); $status->save();
$pengesahan = Permohonan::where([['mohonid',$request->mohonid],['tagterima',0]]) $pengesahan = Permohonan::where([['nopermohonan',$request->mohonid],['tagterima',0]])
->update(array( ->update(array(
'tagterima' => 1, 'tagterima' => 1,
'tarikh_terima' => $timeloni->toDateString(), 'tarikh_terima' => $timeloni->toDateString(),
@@ -2233,7 +2246,7 @@ class AdminPageController extends Controller
try{ try{
$status->mohonid = $request->mohonid; $status->nopermohonan = $request->mohonid;
$status->statusid = 8; $status->statusid = 8;
$status->tarikhmasa = $timeloni->toDateTimeString(); $status->tarikhmasa = $timeloni->toDateTimeString();
$status->save(); $status->save();
@@ -2252,7 +2265,7 @@ class AdminPageController extends Controller
$ar_files2->tarikhmasa = $timeloni->toDateTimeString(); $ar_files2->tarikhmasa = $timeloni->toDateTimeString();
$ar_files2->save(); $ar_files2->save();
$pengesahan = Pengesahan::where([['mohonid',$request->mohonid],['tagcit',0]]) $pengesahan = Pengesahan::where([['nopermohonan',$request->mohonid],['tagcit',0]])
->update(array( ->update(array(
'tagcit' => 1, 'tagcit' => 1,
'resit_cit' => $request->resitcit, 'resit_cit' => $request->resitcit,
app/Http/Controllers/TransactionOnlineController.php
+33
View File
@@ -267,4 +267,37 @@ class TransactionOnlineController extends Controller
return response()->json($transaction,200); return response()->json($transaction,200);
} }
public function CustomerInfo(Request $request){
$cawangan_all = Cawangan::on('mysql7')->get();
$gadai_all = [];
$akanlelongarray = [];
foreach($cawangan_all as $index=>$cawangan){
$gadai = Gadai::on($cawangan['mysql'])
->where([['sttebus','=',''],['nokp','=',$request->ic]])
->orderBy('t_gadai','desc')
->get()->toArray();
if(sizeof($gadai) != 0){
$gadai_all += $gadai;
}
$akanlelong = Gadai::on($cawangan['mysql'])
->where([['sttebus','=', ''],['nokp','=',$request->ic],['hargajual','=', 0]])
->rightJoin('lelong', 'gadai.norujukan', '=', 'lelong.norujukan')
->get()->toArray();
if(sizeof($akanlelong) != 0){
$akanlelongarray += $akanlelong;
}
}
return response()->json(
array(
'gadai' => $gadai_all,
'lelong' => $akanlelongarray
),200);
}
} }
app/Pengesahan.php
+1 -1
View File
@@ -26,7 +26,7 @@ class Pengesahan extends Model
'noresit', 'noresit',
'tarikh_bankin', 'tarikh_bankin',
'kodcaw', 'kodcaw',
'mohonid', 'nopermohonan',
'tagoperasi', 'tagoperasi',
'tagakaun', 'tagakaun',
'tagpb', 'tagpb',
app/Permohonan.php
+1 -1
View File
@@ -9,7 +9,7 @@ class Permohonan extends Model
protected $table = 'permohonan'; protected $table = 'permohonan';
public $timestamps = false; public $timestamps = false;
protected $connection = 'mysql7'; protected $connection = 'mysql7';
/** /**
* The attributes that are mass assignable. * The attributes that are mass assignable.
* *
app/Status.php
+1 -1
View File
@@ -17,7 +17,7 @@ class Status extends Model
*/ */
protected $fillable = [ protected $fillable = [
'recno', 'recno',
'mohonid', 'nopermohonan',
'statusid', 'statusid',
'tarikhmasa' 'tarikhmasa'
]; ];
routes/web.php
+1 -3
View File
@@ -630,6 +630,7 @@ $router->group(['prefix'=>'portal'], function () use ($router){
$router->get('transaksipelanggan',['uses'=>'TransactionController@TransaksiPelanggan']); $router->get('transaksipelanggan',['uses'=>'TransactionController@TransaksiPelanggan']);
$router->get('transaksipelanggan/upah',['uses'=>'TransactionController@TransaksiUpah']); $router->get('transaksipelanggan/upah',['uses'=>'TransactionController@TransaksiUpah']);
$router->get('searchsagonline',['uses'=>'TransactionOnlineController@searchSAGOnline']); $router->get('searchsagonline',['uses'=>'TransactionOnlineController@searchSAGOnline']);
$router->get('customer/info',['uses'=>'TransactionOnlineController@CustomerInfo']);
}); });
$router->group(['prefix'=>'admin'], function () use ($router){ $router->group(['prefix'=>'admin'], function () use ($router){
@@ -684,7 +685,6 @@ $router->group(['prefix'=>'admin'], function () use ($router){
$router->get('customers/{ic}/gadai/{status}',['uses'=>'AdminPageController@showOneCustomerGadai']); $router->get('customers/{ic}/gadai/{status}',['uses'=>'AdminPageController@showOneCustomerGadai']);
<<<<<<< Updated upstream
$router->post('permohonan/add/{kodcaw}',['uses'=>'AdminPageController@TambahPermohonan']); $router->post('permohonan/add/{kodcaw}',['uses'=>'AdminPageController@TambahPermohonan']);
$router->get('permohonan/get/{kodcaw}',['uses'=>'AdminPageController@GetPermohonanCawangan']); $router->get('permohonan/get/{kodcaw}',['uses'=>'AdminPageController@GetPermohonanCawangan']);
$router->get('permohonan/rekod/{kodcaw}',['uses'=>'AdminPageController@GetRekodPermohonanCawangan']); $router->get('permohonan/rekod/{kodcaw}',['uses'=>'AdminPageController@GetRekodPermohonanCawangan']);
@@ -701,8 +701,6 @@ $router->group(['prefix'=>'admin'], function () use ($router){
$router->get('permohonan/viewfiles',['uses'=>'AdminPageController@downloadFile']); $router->get('permohonan/viewfiles',['uses'=>'AdminPageController@downloadFile']);
=======
>>>>>>> Stashed changes
}); });
$router->group(['prefix'=>'kelantanpay'], function () use ($router){ $router->group(['prefix'=>'kelantanpay'], function () use ($router){