Merge branch 'adminapi' into 'master'
Adminapi See merge request online-sistem1/api_arrahn!142
This commit is contained in:
@@ -4,9 +4,9 @@ namespace App;
|
|||||||
|
|
||||||
use Illuminate\Database\Eloquent\Model;
|
use Illuminate\Database\Eloquent\Model;
|
||||||
|
|
||||||
class KPFiles extends Model
|
class ARFiles extends Model
|
||||||
{
|
{
|
||||||
protected $table = 'kelulusanpb_files';
|
protected $table = 'arrahn_files';
|
||||||
public $timestamps = false;
|
public $timestamps = false;
|
||||||
protected $connection = 'mysql7';
|
protected $connection = 'mysql7';
|
||||||
|
|
||||||
@@ -16,7 +16,7 @@ class KPFiles extends Model
|
|||||||
* @var array
|
* @var array
|
||||||
*/
|
*/
|
||||||
protected $fillable = [
|
protected $fillable = [
|
||||||
'kp_id',
|
'files_id',
|
||||||
'data',
|
'data',
|
||||||
'filename',
|
'filename',
|
||||||
'type',
|
'type',
|
||||||
@@ -26,7 +26,7 @@ use App\Pengesahan;
|
|||||||
use App\Permohonan;
|
use App\Permohonan;
|
||||||
use App\Status;
|
use App\Status;
|
||||||
use App\LookupStatus;
|
use App\LookupStatus;
|
||||||
use App\KPFiles;
|
use App\ARFiles;
|
||||||
|
|
||||||
use DB;
|
use DB;
|
||||||
use Carbon\Carbon;
|
use Carbon\Carbon;
|
||||||
@@ -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;
|
||||||
@@ -1854,12 +1868,11 @@ class AdminPageController extends Controller
|
|||||||
$permohonan->nopermohonan = $nopermohonan;
|
$permohonan->nopermohonan = $nopermohonan;
|
||||||
$permohonan->save();
|
$permohonan->save();
|
||||||
|
|
||||||
|
$pengesahan->nopermohonan = $permohonan->nopermohonan;
|
||||||
$pengesahan->mohonid = $permohonan->id;
|
|
||||||
$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)
|
||||||
{
|
{
|
||||||
@@ -1975,15 +1988,15 @@ class AdminPageController extends Controller
|
|||||||
break;
|
break;
|
||||||
case 3: array_push($status_lookup,['tarikh' => $date, 'masa' => $time,'nama_akaun' => $stat['nama_akaun']]);
|
case 3: array_push($status_lookup,['tarikh' => $date, 'masa' => $time,'nama_akaun' => $stat['nama_akaun']]);
|
||||||
break;
|
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;
|
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;
|
break;
|
||||||
case 6: array_push($status_lookup,['tarikh' => $date, 'masa' => $time,'nama_penerima' => $stat['nama_penerima']]);
|
case 6: array_push($status_lookup,['tarikh' => $date, 'masa' => $time,'nama_penerima' => $stat['nama_penerima']]);
|
||||||
break;
|
break;
|
||||||
case 7: array_push($status_lookup,['tarikh' => $date, 'masa' => $time,'komen' => $stat['komen_batal']]);
|
case 7: array_push($status_lookup,['tarikh' => $date, 'masa' => $time,'komen' => $stat['komen_batal']]);
|
||||||
break;
|
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;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -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,
|
||||||
@@ -2106,41 +2119,41 @@ class AdminPageController extends Controller
|
|||||||
{
|
{
|
||||||
$timeloni = Carbon::now();
|
$timeloni = Carbon::now();
|
||||||
$status = new Status;
|
$status = new Status;
|
||||||
$kp_files = new KPFiles;
|
$ar_files = new ARFiles;
|
||||||
|
|
||||||
try{
|
try{
|
||||||
|
|
||||||
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();
|
||||||
|
|
||||||
$kp_files->data = $request->dataimage;
|
$ar_files->data = $request->dataimage;
|
||||||
$kp_files->type = $request->imagetype;
|
$ar_files->type = $request->imagetype;
|
||||||
$kp_files->filename = $request->imagename;
|
$ar_files->filename = $request->imagename;
|
||||||
$kp_files->tarikhmasa = $timeloni->toDateTimeString();
|
$ar_files->tarikhmasa = $timeloni->toDateTimeString();
|
||||||
$kp_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,
|
||||||
'kp_id' => $kp_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,25 +2177,27 @@ 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(),
|
||||||
'jenisbank' => $request->jenisbank,
|
'jenisbank' => $request->jenisbank,
|
||||||
'noresit' => $request->noresit
|
'noresit' => $request->noresit,
|
||||||
|
'jeniscit' => $request->jeniscit,
|
||||||
|
'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
|
||||||
@@ -2204,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(),
|
||||||
@@ -2231,16 +2246,32 @@ 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();
|
||||||
|
|
||||||
$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(
|
->update(array(
|
||||||
'tagcit' => 1,
|
'tagcit' => 1,
|
||||||
'resit_cit' => $request->resitcit,
|
'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);
|
return response()->json(1);
|
||||||
@@ -2251,18 +2282,10 @@ class AdminPageController extends Controller
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public function viewFile(Request $request) {
|
public function downloadFile(Request $request) {
|
||||||
// $data = \DB::connection($conn)
|
$kp = ARFiles::where('files_id',$request->files_id)
|
||||||
// ->table($tbl)
|
|
||||||
// ->where('filename', $filename)
|
|
||||||
// ->first();
|
|
||||||
|
|
||||||
$kp = KPFiles::where('kp_id',$request->kp_id)
|
|
||||||
->first();
|
->first();
|
||||||
|
|
||||||
return response(base64_decode(stream_get_contents($kp->data)), 200, [
|
return response($kp,200);
|
||||||
'Content-type' => 'application/' . $kp->type,
|
|
||||||
'Content-Disposition' => 'inline; filename='.$kp->filename
|
|
||||||
]);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -717,7 +717,7 @@ class LelongController extends Controller
|
|||||||
->leftJoin('gadai', 'gadai.norujukan', '=', 'lelong.norujukan')
|
->leftJoin('gadai', 'gadai.norujukan', '=', 'lelong.norujukan')
|
||||||
// ->leftJoin('customer', 'customer.kpbaru', '=', 'gadai.nokp')
|
// ->leftJoin('customer', 'customer.kpbaru', '=', 'gadai.nokp')
|
||||||
->where('batchno','=',$request->batchno)
|
->where('batchno','=',$request->batchno)
|
||||||
->where('fasa',1)
|
->where('fasa',2)
|
||||||
->orderBy('gadai.t_gadai','asc')
|
->orderBy('gadai.t_gadai','asc')
|
||||||
->orderBy('gadai.sirig','asc')
|
->orderBy('gadai.sirig','asc')
|
||||||
->where('gadai.taglel','=', 1);
|
->where('gadai.taglel','=', 1);
|
||||||
|
|||||||
@@ -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);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+4
-3
@@ -26,7 +26,7 @@ class Pengesahan extends Model
|
|||||||
'noresit',
|
'noresit',
|
||||||
'tarikh_bankin',
|
'tarikh_bankin',
|
||||||
'kodcaw',
|
'kodcaw',
|
||||||
'mohonid',
|
'nopermohonan',
|
||||||
'tagoperasi',
|
'tagoperasi',
|
||||||
'tagakaun',
|
'tagakaun',
|
||||||
'tagpb',
|
'tagpb',
|
||||||
@@ -37,10 +37,11 @@ class Pengesahan extends Model
|
|||||||
'tagcit',
|
'tagcit',
|
||||||
'bank_cit',
|
'bank_cit',
|
||||||
'komen_batal',
|
'komen_batal',
|
||||||
'kelulusanpbimage',
|
|
||||||
'resit_cit',
|
'resit_cit',
|
||||||
'nama_cit',
|
'nama_cit',
|
||||||
'jeniscit'
|
'jeniscit',
|
||||||
|
'resitfiles_id',
|
||||||
|
'invoicefiles_id'
|
||||||
];
|
];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
+1
-1
@@ -17,7 +17,7 @@ class Status extends Model
|
|||||||
*/
|
*/
|
||||||
protected $fillable = [
|
protected $fillable = [
|
||||||
'recno',
|
'recno',
|
||||||
'mohonid',
|
'nopermohonan',
|
||||||
'statusid',
|
'statusid',
|
||||||
'tarikhmasa'
|
'tarikhmasa'
|
||||||
];
|
];
|
||||||
|
|||||||
+3
-2
@@ -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){
|
||||||
@@ -696,8 +697,8 @@ $router->group(['prefix'=>'admin'], function () use ($router){
|
|||||||
$router->post('permohonan/updatepb',['uses'=>'AdminPageController@KelulusanPermohonanByPB']);
|
$router->post('permohonan/updatepb',['uses'=>'AdminPageController@KelulusanPermohonanByPB']);
|
||||||
$router->put('permohonan/updatebank',['uses'=>'AdminPageController@DepositBank']);
|
$router->put('permohonan/updatebank',['uses'=>'AdminPageController@DepositBank']);
|
||||||
$router->put('permohonan/tagterima',['uses'=>'AdminPageController@TagTerima']);
|
$router->put('permohonan/tagterima',['uses'=>'AdminPageController@TagTerima']);
|
||||||
$router->put('permohonan/tagcit',['uses'=>'AdminPageController@TagCit']);
|
$router->post('permohonan/tagcit',['uses'=>'AdminPageController@TagCit']);
|
||||||
$router->get('permohonan/viewfiles',['uses'=>'AdminPageController@viewFile']);
|
$router->get('permohonan/viewfiles',['uses'=>'AdminPageController@downloadFile']);
|
||||||
|
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user