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

Merge branch 'adminapi' into 'master'

Browse Source 
Adminapi

See merge request online-sistem1/api_arrahn!142
This commit is contained in:
Afiq Zakwan Hamdan
2022-04-21 03:39:31 +00:00
parent 7681ef2133 3822356e44
commit fc68e9d45b
8 changed files with 131 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/KPFiles.php → app/ARFiles.php
+3 -3
View File
@@ -4,9 +4,9 @@ namespace App;
use Illuminate\Database\Eloquent\Model;
class KPFiles extends Model
class ARFiles extends Model
{
protected $table = 'kelulusanpb_files';
protected $table = 'arrahn_files';
public $timestamps = false;
protected $connection = 'mysql7';
@@ -16,7 +16,7 @@ class KPFiles extends Model
* @var array
*/
protected $fillable = [
'kp_id',
'files_id',
'data',
'filename',
'type',
app/Http/Controllers/AdminPageController.php
+84 -61
View File
@@ -26,7 +26,7 @@ use App\Pengesahan;
use App\Permohonan;
use App\Status;
use App\LookupStatus;
use App\KPFiles;
use App\ARFiles;
use DB;
use Carbon\Carbon;
@@ -1838,12 +1838,26 @@ class AdminPageController extends Controller
$current_day = sprintf("%02d", $current->day);
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;
$pengesahan = new Pengesahan;
$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->jenismohon = $request->jenismohon;
$permohonan->baki_petibesi = $request->bakipetibesi;
@@ -1853,13 +1867,12 @@ class AdminPageController extends Controller
$permohonan->outstandingsemasa = $request->outstanding;
$permohonan->nopermohonan = $nopermohonan;
$permohonan->save();
$pengesahan->mohonid = $permohonan->id;
$pengesahan->nopermohonan = $permohonan->nopermohonan;
$pengesahan->kodcaw = $kodcaw;
$pengesahan->save();
$status->mohonid = $permohonan->id;
$status->nopermohonan = $permohonan->nopermohonan;
$status->statusid = 1;
$status->tarikhmasa = $timeloni->toDateTimeString();
$status->save();
@@ -1875,7 +1888,7 @@ class AdminPageController extends Controller
{
if($kodcaw === 'admin')
{
$listpermohonan = Permohonan::join('pengesahan', 'permohonan.mohonid', '=', 'pengesahan.mohonid')
$listpermohonan = Permohonan::join('pengesahan', 'permohonan.nopermohonan', '=', 'pengesahan.nopermohonan')
->where('tagterima',1)
->orWhere('tagoperasi','=',2)
->orWhere('tagakaun','=',2)
@@ -1886,7 +1899,7 @@ class AdminPageController extends Controller
->orderBy('tarikh_permohonan','desc')->paginate(5);
}else{
$listpermohonan = Permohonan::join('pengesahan', 'permohonan.mohonid', '=', 'pengesahan.mohonid')
$listpermohonan = Permohonan::join('pengesahan', 'permohonan.nopermohonan', '=', 'pengesahan.nopermohonan')
->where('pengesahan.kodcaw', $kodcaw)
->where('tagterima',1)
->orWhere('tagoperasi','=',2)
@@ -1907,7 +1920,7 @@ class AdminPageController extends Controller
if($kodcaw === 'admin')
{
$listpermohonan = Permohonan::join('pengesahan', 'permohonan.mohonid', '=', 'pengesahan.mohonid')
$listpermohonan = Permohonan::join('pengesahan', 'permohonan.nopermohonan', '=', 'pengesahan.nopermohonan')
->where('tagterima',0)
->where('tagoperasi','!=',2)
->where('tagakaun','!=',2)
@@ -1922,7 +1935,7 @@ class AdminPageController extends Controller
->orderBy('tarikh_permohonan','desc')->paginate(5);
}else{
$listpermohonan = Permohonan::join('pengesahan', 'permohonan.mohonid', '=', 'pengesahan.mohonid')
$listpermohonan = Permohonan::join('pengesahan', 'permohonan.nopermohonan', '=', 'pengesahan.nopermohonan')
->where('pengesahan.kodcaw', $kodcaw)
->where('tagterima',0)
->where('tagoperasi','!=',2)
@@ -1944,10 +1957,10 @@ class AdminPageController extends Controller
public function GetPermohonanById($kodcaw,$mohonid)
{
$permohonanstatus = [];
$listpermohonan = Permohonan::join('pengesahan', 'permohonan.mohonid', '=', 'pengesahan.mohonid')
->where([['permohonan.kodcaw', $kodcaw],['permohonan.mohonid',$mohonid]])->first()->toArray();
$listpermohonan = Permohonan::join('pengesahan', 'permohonan.nopermohonan', '=', 'pengesahan.nopermohonan')
->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]));
@@ -1958,9 +1971,9 @@ class AdminPageController extends Controller
{
$statusarray = [];
$statusdetails = [];
$status = Status::join('pengesahan', 'status.mohonid', '=', 'pengesahan.mohonid')
->join('permohonan', 'status.mohonid', '=', 'permohonan.mohonid')
->where('status.mohonid',$mohonid)->get()->toArray();
$status = Status::join('pengesahan', 'status.nopermohonan', '=', 'pengesahan.nopermohonan')
->join('permohonan', 'status.nopermohonan', '=', 'permohonan.nopermohonan')
->where('status.nopermohonan',$mohonid)->get()->toArray();
foreach($status as $index=>$stat)
{
@@ -1975,15 +1988,15 @@ class AdminPageController extends Controller
break;
case 3: array_push($status_lookup,['tarikh' => $date, 'masa' => $time,'nama_akaun' => $stat['nama_akaun']]);
break;
case 4: array_push($status_lookup,['tarikh' => $date, 'masa' => $time,'jumlah_diluluskan' => $stat['jumlah_diluluskan']]);
case 4: array_push($status_lookup,['tarikh' => $date, 'masa' => $time,'jumlah_diluluskan' => $stat['jumlah_diluluskan'],'pbfiles' => $stat['files_id']]);
break;
case 5: array_push($status_lookup,['tarikh' => $date, 'masa' => $time,'jenisbank' => $stat['jenisbank'],'noresit' => $stat['noresit']]);
case 5: array_push($status_lookup,['tarikh' => $date, 'masa' => $time,'jenisbank' => $stat['jenisbank'],'noresit' => $stat['noresit'],'jeniscit' => $stat['jeniscit'],'namasyarikat' => $stat['nama_cit']]);
break;
case 6: array_push($status_lookup,['tarikh' => $date, 'masa' => $time,'nama_penerima' => $stat['nama_penerima']]);
break;
case 7: array_push($status_lookup,['tarikh' => $date, 'masa' => $time,'komen' => $stat['komen_batal']]);
break;
case 8: array_push($status_lookup,['tarikh' => $date, 'masa' => $time,'jenisbank' => $stat['bank_cit']]);
case 8: array_push($status_lookup,['tarikh' => $date, 'masa' => $time,'jenisbank' => $stat['bank_cit'],'invoicefiles' => $stat['invoicefiles_id'],'resitfiles' => $stat['resitfiles_id']]);
break;
}
@@ -2001,12 +2014,12 @@ class AdminPageController extends Controller
if($request->kelulusan == 'Lulus')
{
$status->mohonid = $request->mohonid;
$status->nopermohonan = $request->mohonid;
$status->statusid = 2;
$status->tarikhmasa = $timeloni->toDateTimeString();
$status->save();
$pengesahan = Pengesahan::where([['mohonid',$request->mohonid],['tagoperasi',0]])
$pengesahan = Pengesahan::where([['nopermohonan',$request->mohonid],['tagoperasi',0]])
->update(array(
'tagoperasi' => 1,
'nama_operasi' => $request->namaoperasi,
@@ -2015,12 +2028,12 @@ class AdminPageController extends Controller
}else{
$status->mohonid = $request->mohonid;
$status->nopermohonan = $request->mohonid;
$status->statusid = 7;
$status->tarikhmasa = $timeloni->toDateTimeString();
$status->save();
$pengesahan = Pengesahan::where([['mohonid',$request->mohonid],['tagoperasi',0]])
$pengesahan = Pengesahan::where([['nopermohonan',$request->mohonid],['tagoperasi',0]])
->update(array(
'tagoperasi' => 2,
'komen_batal' => $request->komen,
@@ -2048,12 +2061,12 @@ class AdminPageController extends Controller
if($request->kelulusan == 'Lulus')
{
$status->mohonid = $request->mohonid;
$status->nopermohonan = $request->mohonid;
$status->statusid = 3;
$status->tarikhmasa = $timeloni->toDateTimeString();
$status->save();
$pengesahan = Pengesahan::where([['mohonid',$request->mohonid],['tagakaun',0]])
$pengesahan = Pengesahan::where([['nopermohonan',$request->mohonid],['tagakaun',0]])
->update(array(
'tagakaun' => 1,
'nama_akaun' => $request->namaakaun,
@@ -2062,12 +2075,12 @@ class AdminPageController extends Controller
}else
{
$status->mohonid = $request->mohonid;
$status->nopermohonan = $request->mohonid;
$status->statusid = 7;
$status->tarikhmasa = $timeloni->toDateTimeString();
$status->save();
$pengesahan = Pengesahan::where([['mohonid',$request->mohonid],['tagakaun',0]])
$pengesahan = Pengesahan::where([['nopermohonan',$request->mohonid],['tagakaun',0]])
->update(array(
'tagakaun' => 2,
'komen_batal' => $request->komen,
@@ -2089,7 +2102,7 @@ class AdminPageController extends Controller
$timeloni = Carbon::now();
try{
$pengesahan = Pengesahan::where([['mohonid',$request->mohonid],['tagakaun',1]])
$pengesahan = Pengesahan::where([['nopermohonan',$request->mohonid],['tagakaun',1]])
->update(array(
'tagprint' => 1,
'nama_print' => $request->namaprint,
@@ -2106,41 +2119,41 @@ class AdminPageController extends Controller
{
$timeloni = Carbon::now();
$status = new Status;
$kp_files = new KPFiles;
$ar_files = new ARFiles;
try{
if($request->kelulusan == 'Lulus')
{
$status->mohonid = $request->mohonid;
$status->nopermohonan = $request->mohonid;
$status->statusid = 4;
$status->tarikhmasa = $timeloni->toDateTimeString();
$status->save();
$kp_files->data = $request->dataimage;
$kp_files->type = $request->imagetype;
$kp_files->filename = $request->imagename;
$kp_files->tarikhmasa = $timeloni->toDateTimeString();
$kp_files->save();
$ar_files->data = $request->dataimage;
$ar_files->type = $request->imagetype;
$ar_files->filename = $request->imagename;
$ar_files->tarikhmasa = $timeloni->toDateTimeString();
$ar_files->save();
$pengesahan = Pengesahan::where([['mohonid',$request->mohonid],['tagpb',0]])
$pengesahan = Pengesahan::where([['nopermohonan',$request->mohonid],['tagpb',0]])
->update(array(
'tagpb' => 1,
'kp_id' => $kp_files->id
'files_id' => $ar_files->id
));
$permohonan = Permohonan::where('mohonid',$request->mohonid)
$permohonan = Permohonan::where('nopermohonan',$request->mohonid)
->update(array(
'tarikh_diluluskan' => $timeloni->toDateTimeString(),
'jumlah_diluluskan' => $request->amaun_lulus
));
}else{
$status->mohonid = $request->mohonid;
$status->nopermohonan = $request->mohonid;
$status->statusid = 7;
$status->tarikhmasa = $timeloni->toDateTimeString();
$status->save();
$pengesahan = Pengesahan::where([['mohonid',$request->mohonid],['tagpb',0]])
$pengesahan = Pengesahan::where([['nopermohonan',$request->mohonid],['tagpb',0]])
->update(array(
'tagpb' => 2,
'komen_batal' => $request->komen
@@ -2164,25 +2177,27 @@ class AdminPageController extends Controller
if($request->kelulusan == 'Lulus')
{
$status->mohonid = $request->mohonid;
$status->nopermohonan = $request->mohonid;
$status->statusid = 5;
$status->tarikhmasa = $timeloni->toDateTimeString();
$status->save();
$pengesahan = Pengesahan::where([['mohonid',$request->mohonid],['tagdeposit',0]])
$pengesahan = Pengesahan::where([['nopermohonan',$request->mohonid],['tagdeposit',0]])
->update(array(
'tagdeposit' => 1,
'tarikh_bankin' => $timeloni->toDateString(),
'jenisbank' => $request->jenisbank,
'noresit' => $request->noresit
'noresit' => $request->noresit,
'jeniscit' => $request->jeniscit,
'nama_cit' => $request->namacit
));
}else{
$status->mohonid = $request->mohonid;
$status->nopermohonan = $request->mohonid;
$status->statusid = 7;
$status->tarikhmasa = $timeloni->toDateTimeString();
$status->save();
$pengesahan = Pengesahan::where([['mohonid',$request->mohonid],['tagdeposit',0]])
$pengesahan = Pengesahan::where([['nopermohonan',$request->mohonid],['tagdeposit',0]])
->update(array(
'tagdeposit' => 2,
'komen_batal' => $request->komen
@@ -2204,12 +2219,12 @@ class AdminPageController extends Controller
try{
$status->mohonid = $request->mohonid;
$status->nopermohonan = $request->mohonid;
$status->statusid = 6;
$status->tarikhmasa = $timeloni->toDateTimeString();
$status->save();
$pengesahan = Permohonan::where([['mohonid',$request->mohonid],['tagterima',0]])
$pengesahan = Permohonan::where([['nopermohonan',$request->mohonid],['tagterima',0]])
->update(array(
'tagterima' => 1,
'tarikh_terima' => $timeloni->toDateString(),
@@ -2231,16 +2246,32 @@ class AdminPageController extends Controller
try{
$status->mohonid = $request->mohonid;
$status->nopermohonan = $request->mohonid;
$status->statusid = 8;
$status->tarikhmasa = $timeloni->toDateTimeString();
$status->save();
$pengesahan = Pengesahan::where([['mohonid',$request->mohonid],['tagcit',0]])
$ar_files = new ARFiles;
$ar_files->data = $request->dataresit;
$ar_files->type = $request->resittype;
$ar_files->filename = $request->resitname;
$ar_files->tarikhmasa = $timeloni->toDateTimeString();
$ar_files->save();
$ar_files2 = new ARFiles;
$ar_files2->data = $request->datainvoice;
$ar_files2->type = $request->invoicetype;
$ar_files2->filename = $request->invoicename;
$ar_files2->tarikhmasa = $timeloni->toDateTimeString();
$ar_files2->save();
$pengesahan = Pengesahan::where([['nopermohonan',$request->mohonid],['tagcit',0]])
->update(array(
'tagcit' => 1,
'resit_cit' => $request->resitcit,
'bank_cit' => $request->bank
'bank_cit' => $request->bank,
'resitfiles_id' => $ar_files->id,
'invoicefiles_id' => $ar_files2->id
));
return response()->json(1);
@@ -2251,18 +2282,10 @@ class AdminPageController extends Controller
}
}
public function viewFile(Request $request) {
// $data = \DB::connection($conn)
// ->table($tbl)
// ->where('filename', $filename)
// ->first();
$kp = KPFiles::where('kp_id',$request->kp_id)
public function downloadFile(Request $request) {
$kp = ARFiles::where('files_id',$request->files_id)
->first();
return response(base64_decode(stream_get_contents($kp->data)), 200, [
'Content-type' => 'application/' . $kp->type,
'Content-Disposition' => 'inline; filename='.$kp->filename
]);
return response($kp,200);
}
}
app/Http/Controllers/LelongController.php
+1 -1
View File
@@ -717,7 +717,7 @@ class LelongController extends Controller
->leftJoin('gadai', 'gadai.norujukan', '=', 'lelong.norujukan')
// ->leftJoin('customer', 'customer.kpbaru', '=', 'gadai.nokp')
->where('batchno','=',$request->batchno)
->where('fasa',1)
->where('fasa',2)
->orderBy('gadai.t_gadai','asc')
->orderBy('gadai.sirig','asc')
->where('gadai.taglel','=', 1);
app/Http/Controllers/TransactionOnlineController.php
+33
View File
@@ -267,4 +267,37 @@ class TransactionOnlineController extends Controller
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
+4 -3
View File
@@ -26,7 +26,7 @@ class Pengesahan extends Model
'noresit',
'tarikh_bankin',
'kodcaw',
'mohonid',
'nopermohonan',
'tagoperasi',
'tagakaun',
'tagpb',
@@ -37,10 +37,11 @@ class Pengesahan extends Model
'tagcit',
'bank_cit',
'komen_batal',
'kelulusanpbimage',
'resit_cit',
'nama_cit',
'jeniscit'
'jeniscit',
'resitfiles_id',
'invoicefiles_id'
];
/**
app/Permohonan.php
+1 -1
View File
@@ -9,7 +9,7 @@ class Permohonan extends Model
protected $table = 'permohonan';
public $timestamps = false;
protected $connection = 'mysql7';
/**
* The attributes that are mass assignable.
*
app/Status.php
+1 -1
View File
@@ -17,7 +17,7 @@ class Status extends Model
*/
protected $fillable = [
'recno',
'mohonid',
'nopermohonan',
'statusid',
'tarikhmasa'
];
routes/web.php
+4 -3
View File
@@ -630,6 +630,7 @@ $router->group(['prefix'=>'portal'], function () use ($router){
$router->get('transaksipelanggan',['uses'=>'TransactionController@TransaksiPelanggan']);
$router->get('transaksipelanggan/upah',['uses'=>'TransactionController@TransaksiUpah']);
$router->get('searchsagonline',['uses'=>'TransactionOnlineController@searchSAGOnline']);
$router->get('customer/info',['uses'=>'TransactionOnlineController@CustomerInfo']);
});
$router->group(['prefix'=>'admin'], function () use ($router){
@@ -696,10 +697,10 @@ $router->group(['prefix'=>'admin'], function () use ($router){
$router->post('permohonan/updatepb',['uses'=>'AdminPageController@KelulusanPermohonanByPB']);
$router->put('permohonan/updatebank',['uses'=>'AdminPageController@DepositBank']);
$router->put('permohonan/tagterima',['uses'=>'AdminPageController@TagTerima']);
$router->put('permohonan/tagcit',['uses'=>'AdminPageController@TagCit']);
$router->get('permohonan/viewfiles',['uses'=>'AdminPageController@viewFile']);
$router->post('permohonan/tagcit',['uses'=>'AdminPageController@TagCit']);
$router->get('permohonan/viewfiles',['uses'=>'AdminPageController@downloadFile']);
});
$router->group(['prefix'=>'kelantanpay'], function () use ($router){