diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index b7c4423a..9fb98edf 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -582,6 +582,7 @@ class LelongController extends Controller $keuntungan = bcdiv(($detail_sag['tempoh']-$detail_sag['tempohbayar'])*$detail_sag['kadarupah']/100*$detail_sag['bakipjm'],1,1)-$beza_keuntungan; $sumhargaasas = 0; + $sumnmarhuns = 0; $lelongbidmarhun = LelongBidMarhun::where('lelongbid_id','=',$bid['id'])->get(); foreach($lelongbidmarhun as $marhun) { @@ -596,6 +597,8 @@ class LelongController extends Controller $marhun->harga = $karat->harga2; $marhun->n_marhun = $marhun->berat * $karat->harga2; + $sumnmarhuns = $sumnmarhuns + $marhun->n_marhun; + $marhun->hargaasas = $val; $marhun->save(); } @@ -618,7 +621,8 @@ class LelongController extends Controller $kirakeuntungan = LelongBid::where('norujukan',$bid['norujukan']) ->update([ 'bakiupah'=> bcdiv($keuntungan,1,1), - 'hargaasas'=> $sumhargaasas + 'hargaasas'=> $sumhargaasas, + 'nmarhuns'=> $sumnmarhuns ]); //insert loguser $loguser = new LogUser; diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php index 8ae61494..4663e46f 100644 --- a/app/Http/Controllers/MarhunController.php +++ b/app/Http/Controllers/MarhunController.php @@ -486,9 +486,9 @@ class MarhunController extends Controller $lelongBidMarhun->n_marhun = $request->berat_emas * $lelongBidMarhun->harga; $lelongBidMarhun->update(); - // $existingPengesahan = Pengesahan::where('lelongbidmarhun_id', '=', $request->idmarhun) - // ->first() - // ->delete(); + $existingPengesahan = Pengesahan::where('lelongbidmarhun_id', '=', $request->idmarhun) + ->first(); + //->delete(); } // if ($perluPengesahan == true) { @@ -1595,8 +1595,26 @@ class MarhunController extends Controller $user = Auth::user(); $current = Carbon::now(); - $checkExisting = ScanSemak::where('norujukan', '=', $request->norujukan_barcode) - ->whereNull('scan_masuk') + $lelongbidItem = LelongBid::where('norujukan', '=', $request->norujukan_barcode)->first(); + + $scanKeluar = new ScanMarhun; + $scanKeluar->kodcaw = $lelongbidItem['kodcaw']; + $scanKeluar->lelong_id = $lelongbidItem['lelong_id']; + $scanKeluar->lelongbid_id = $lelongbidItem['id']; + $scanKeluar->norujukan = $lelongbidItem['norujukan']; + $scanKeluar->user_id = $user['id']; + $scanKeluar->tarikh_scankeluar = $current->toDateString(); + $scanKeluar->masa_scankeluar = $current->toTimeString(); + $scanKeluar->tag_scankeluar = 1; + // $scanKeluar->masa_scanmasuk = $current->toTimeString(); //dummy data + // $scanKeluar->tarikh_scanmasuk = $current->toDateString(); //dummy data + // $scanKeluar->masa = $current->toTimeString(); //dummy data + $scanKeluar->save(); + + $lelong_id = $lelongbidItem['lelong_id']; + $lelongDetail = Lelong::where('id', '=', $lelong_id)->first(); + $lelongbid = LelongBid::where('lelong_id', '=', $lelong_id) + ->where('caw_id', '=', $caw->id) ->get(); if ($checkExisting->isEmpty()) { diff --git a/app/Http/Controllers/TangguhLelongController.php b/app/Http/Controllers/TangguhLelongController.php index 0f9aa1fe..ef84dcb3 100644 --- a/app/Http/Controllers/TangguhLelongController.php +++ b/app/Http/Controllers/TangguhLelongController.php @@ -16,6 +16,8 @@ use App\Models\CawanganLelong; use App\Models\TangguhLelong; use App\Models\Pengesahan; use App\Models\GadaiMarhun; +use PDF; +use DateTime; class TangguhLelongController extends Controller @@ -110,84 +112,65 @@ class TangguhLelongController extends Controller $getic = Gadai::on($datalelbid[0]['kodcaw'])->whereIn('norujukan',$arraylelbid) ->where('gadai.nokp', $request->nokp) - ->get(); - + ->get()->toArray(); + //dd($getic); // $getic = LelongBid::join('gadai', 'lelongbid.norujukan', '=', 'gadai.norujukan') // ->where('lelongbid.kodcaw', $user['kodcaw']) // ->where('gadai.nokp', $request->nokp) // ->where('lelongbid.lelong_id', $request->lelong_id) // ->get(); - - foreach($getic as $index1=>$ic) + + // if(empty($ic)) { + // return redirect()->route('tangguhlelong.carian', $request->lelong_id)->with('failed','Tiada Dalam Rekod Lelongan'); + if($getic) { - $getnorujukan = LelongBid::join('lelongbidmarhun', 'lelongbid.id', '=', 'lelongbidmarhun.lelongbid_id') - ->where('norujukan', $ic->norujukan) - ->where('jbg', $ic->tempoh) - ->where('lelongbid.kodcaw', $user['kodcaw']) - ->where('lelong_id', $request->lelong_id) - ->get(); - // dd($getnorujukan); - - $customer = LelongBid::where('kodcaw', $user['kodcaw']); - - $arraycustomer = $customer->pluck('kodcaw')->toArray(); - $datacustomer = $customer->get(); - - $customer_detail = Customer::query() - ->join('daerah', 'customer.koddaerah', '=', 'daerah.koddaerah') - ->join('negeri', 'customer.kodnegeri', '=', 'negeri.kodnegeri') - ->where('customer.kpbaru', $ic['nokp']) - ->orWhere('customer.kplama', $ic['nokp']) - ->first(); - - // $customer_detail = Customer::join('daerah', 'customer.koddaerah', '=', 'daerah.koddaerah') - // ->join('negeri', 'customer.kodnegeri', '=', 'negeri.kodnegeri') - // ->where('customer.kpbaru', $ic['nokp']) - // ->orWhere('customer.kplama', $ic['nokp']) - // ->first(); - // dd($customer_detail); - - // $getic['customer_detail'] = $customer_detail; - // $getic2 = $customer_detail; - // dd($getic2); - - foreach($getnorujukan as $norujukan) + + foreach($getic as $index1=>$ic) { - // dd($norujukan); - $pengesahan = Pengesahan::where('lelongbidmarhun_id', $norujukan->id) - ->where('lelongbid_id', $norujukan->lelongbid_id) - ->where('norujukan', $norujukan->norujukan) - ->first(); - // dd($pengesahan); + + $getnorujukan = LelongBid::join('lelongbidmarhun', 'lelongbid.id', '=', 'lelongbidmarhun.lelongbid_id') + ->where('norujukan', $ic['norujukan']) + ->where('jbg', $ic['tempoh']) + ->where('lelongbid.kodcaw', $user['kodcaw']) + ->where('lelong_id', $request->lelong_id) + ->get(); + // dd($getnorujukan); + + + $customer = LelongBid::where('kodcaw', $user['kodcaw']); - $adapengesahan = Pengesahan::join('lelongbid', 'pengesahan.norujukan', '=', 'lelongbid.norujukan') - ->where('pengesahan.norujukan', $norujukan->norujukan) - ->where('pengesahan.status_ubah', 6) - ->where('pengesahan.lelong_id', $request->lelong_id) - ->get(); - // dd($adapengesahan); - - if($pengesahan) - { - return redirect()->route('tangguhlelong.carian', $request->lelong_id)->with('failed','Pengesahan Tangguh Lelong Telah Dibuat'); - } - else - { - $getic[$index1]['user_details'] = $getnorujukan; - $getic[$index1]['t_lelong'] = $getnorujukan[0]['t_lelong']; - $getic[$index1]['sdhadapengesahan'] = $adapengesahan; - } - - } + $arraycustomer = $customer->pluck('kodcaw')->toArray(); + $datacustomer = $customer->get(); - } + $customer_detail = Customer::query() + ->join('daerah', 'customer.koddaerah', '=', 'daerah.koddaerah') + ->join('negeri', 'customer.kodnegeri', '=', 'negeri.kodnegeri') + ->where('customer.kpbaru', $ic['nokp']) + ->orWhere('customer.kplama', $ic['nokp']) + ->first(); + //dd($customer_detail); - $lelong_id = $request->lelong_id; - - return view('tangguhlelong.searchbyic', compact('getic', 'customer_detail', 'user', 'lelong_id', 'namacaw')); + + foreach($getnorujukan as $norujukan) + { + + $getic[$index1]['user_details'] = $getnorujukan; + $getic[$index1]['t_lelong'] = $getnorujukan[0]['t_lelong']; + // $getic[$index1]['sdhadapengesahan'] = $adapengesahan; + $getic[$index1]['lelongbid_id'] = $norujukan->lelongbid_id; - } + } + + $lelong_id = $request->lelong_id; + + } //end foreach + return view('tangguhlelong.searchtodownload', compact('getic', 'customer_detail', 'user', 'lelong_id', 'namacaw')); + } else { + return redirect()->route('tangguhlelong.carian', $request->lelong_id)->with('failed','Tiada Dalam Rekod Lelongan'); + } //end if($getic) + + } //tutup nokp != null } @@ -409,6 +392,7 @@ class TangguhLelongController extends Controller ->first(); $pengesahan->disahkan_oleh = $user->id; $pengesahan->disahkan_pada = $currentdate; + $pengesahan->status = 2; $pengesahan->save(); $tangguhlelong = TangguhLelong::where('lelong_id', $request->lelong_id) @@ -416,6 +400,7 @@ class TangguhLelongController extends Controller ->where('norujukan', $lelongbidmarhun[0]['norujukan']) ->first(); $tangguhlelong->tarikhtangguh = $currentdate; + $tangguhlelong->status = 2; $tangguhlelong->save(); $biddelete = LelongBid::join('lelongbidmarhun', 'lelongbid.id', '=', 'lelongbidmarhun.lelongbid_id') @@ -527,4 +512,360 @@ class TangguhLelongController extends Controller return view('tangguhlelong.taglelbidmarhun',compact('tangguhlelong', 'id', 'norujukan', 'caw_names','datatangguh')); } + + public function mohontangguhlelong(Request $request) + { + //new added 120922 nisha + $user = Auth::user(); + $currentdate = Carbon::now(); + $currentdate = $currentdate->toDateTimeString(); + + $current = new Carbon(); + $t_mohon = $current->toDateString(); + + $selectedbid_id = $request->lelongbid_id; + //dd($selectedbid_id); + $nokp = $request->nokp; + $lelong_id = $request->lelong_id; + + if(empty($selectedbid_id)) + { + return redirect()->route('tangguhlelong.carian', $request->lelong_id)->with('failed','Sila Pilih No Rujukan Terlebih Dahulu'); + } + else + { + $lelongbid = LelongBid::whereIn('lelongbid.id', $selectedbid_id) + ->get(); + // dd($lelongbid); + + $arraynorujukan = []; + + foreach($lelongbid as $index1=>$bidmarhun) + { + // dd($bidmarhun->toArray()); + $lelongbidmarhun = LelongBidMarhun::where('lelongbid_id',$bidmarhun->id) + ->get(); + $bidmarhun['lelongbidmarhun'] = $lelongbidmarhun->toArray(); + + $bidmarhun['percents'] = round(($bidmarhun->pinjaman / $bidmarhun->nmarhuns * 100),2); + + $history = TangguhLelong::where('lelongbid_id',$bidmarhun->id) + ->first(); + //dd($bidmarhun->id); + + if($history) + { + return redirect()->route('tangguhlelong.carian', $request->lelong_id)->with('failed','Maaf No Rujukan Telah Wujud Dalam Senarai Mohon Tangguh'); + + } else { + $tangguhlelong = new TangguhLelong(); //pastikan hanya 1 kali insert utk lelong_id & norujukan yg sama + $tangguhlelong->kodcaw = $bidmarhun->kodcaw; + $tangguhlelong->lelong_id = $request->lelong_id; + $tangguhlelong->lelongbid_id = $bidmarhun->id; + $tangguhlelong->norujukan = $bidmarhun->norujukan; + $tangguhlelong->pinjaman = $bidmarhun->pinjaman; + $tangguhlelong->ditangguh_oleh = $user->id; + $tangguhlelong->ditangguh_pada = $currentdate; + $tangguhlelong->status = 0; + $tangguhlelong->save(); + + $pengesahan = new Pengesahan(); + $pengesahan->lelong_id = $request->lelong_id; + $pengesahan->lelongbid_id = $bidmarhun->id; + $pengesahan->lelongbidmarhun_id = $bidmarhun->id; + $pengesahan->norujukan = $bidmarhun->norujukan; + $pengesahan->diminta_oleh = $user->id; + $pengesahan->diminta_pada = $currentdate; + $pengesahan->save(); + } + + $customer = Customer::where('kpbaru','=',$nokp) + ->orWhere('kplama','=',$nokp) + ->join('poskod','customer.poskod','=','poskod.poskod') + ->join('daerah','poskod.koddaerah','=','daerah.koddaerah') + ->join('negeri','poskod.kodnegeri','=','negeri.kodnegeri') + ->first(); + + $cwgn = Cawangan::where('caw_code','=',$bidmarhun->kodcaw) + ->first(); + } + + } + // return view('pdf.brgtangguhlelong',compact('lelongbid','lelongbidmarhun','customer','t_mohon','nokp')); + $pdf = PDF::loadView('pdf.brgtangguhlelong',compact('lelongbid','lelongbidmarhun','customer','cwgn','t_mohon','nokp')) + ->setPaper('a4', 'potrait'); + + return $pdf->download('Borang Tangguh Lelong.pdf'); + } + + public function sentangguh() + { + $user = Auth::user(); + + // // $tangguh = TangguhLelong::join('lelongbid','tangguhlelong.lelongbid_id','=','lelongbid.id') + // ->where('tangguhlelong.kodcaw', $user->kodcaw) + // ->get(); + + // foreach($tangguh as $index1=>$t) + // { + + // $lelongbid = LelongBid::where('id', $t->lelongbid_id) + // ->where('norujukan', $t->norujukan) + // ->get(); + + // $tangguh[$index1]['tdet'] = $lelongbid; + // } + // $tangguh = TangguhLelong::join('lelongbid','tangguhlelong.lelongbid_id','=','lelongbid.id') + + $tangguh = TangguhLelong::where('tangguhlelong.kodcaw', $user->kodcaw) + ->get(); + + foreach($tangguh as $index1=>$t) + { + if($t['status'] == 4) + { + $lelongbid = Lelong::where('id', $t->lelong_id) + ->get(); + + $tangguh[$index1]['tdet'] = $lelongbid; + } else + { + $lelongbid = LelongBid::where('id', $t->lelongbid_id) + ->where('norujukan', $t->norujukan) + ->get(); + + $tangguh[$index1]['tdet'] = $lelongbid; + } + + + } + + return view('tangguhlelong.senaraimohontangguh',compact('user','tangguh')); + } + + public function uploadborang(Request $request) + { + $data = base64_encode($request->borang->get()); + $file_type = $request->borang->extension(); + $tangguhlelong = TangguhLelong::where('lelongbid_id','=',$request->lelongbid_id) + ->where('norujukan','=',$request->norujukan)->first(); + + $tangguhlelong->filename = $data; + $tangguhlelong->file_type = $file_type; + $tangguhlelong->status = 1; + $tangguhlelong->update(); + + return redirect()->route('tangguhlelong.sentangguh',$request->lelong_id) + ->with('success', 'Borang Tangguh Lelong Berjaya Di Simpan.'); + } + + public function operasisenmohontangguh($lelong_id, $caw_code) + { + $caw_code = $caw_code; + $lelong_id = $lelong_id; + $currentdate = Carbon::now(); + $currentdate = $currentdate->toDateTimeString(); + + $pengesahan = Pengesahan::join('tangguhlelong', 'pengesahan.norujukan', '=', 'tangguhlelong.norujukan') + ->where('pengesahan.lelong_id', $lelong_id) + ->whereNull('pengesahan.disahkan_oleh') + ->whereNull('pengesahan.disahkan_pada') + ->whereNull('tangguhlelong.tarikhtangguh') + ->whereIn('tangguhlelong.status',[1,2,3,4]) + ->get(); + + + // dd($pengesahan); + + foreach($pengesahan as $index1=>$sah) + { + $lelongbid = LelongBid::where('id', $sah->lelongbid_id) + ->where('norujukan', $sah->norujukan) + // ->where('kodcaw', $caw_code) + ->get(); + // dd($lelongbid); + + $pengesahan[$index1]['bid_details'] = $lelongbid; + $pengesahan[$index1]['nota'] = $sah->nota; + } + + $filter_null = function($x){ + if(! empty( $x->bid_details->first())){ + return $x; + } + }; + + $filtered_pengesahan = $pengesahan->filter($filter_null); + + // return view('tangguhlelong.sensahpc', compact('pengesahan', 'lelong_id' , 'caw_code')); + return view('tangguhlelong.senactionoperasi', compact('filtered_pengesahan', 'lelong_id' , 'caw_code')); + } + + public function operasidownloadborang($lelongbid_id) + { + //dd($lelongbid_id); + $selectedbid_id = $lelongbid_id; + + $tangguh = TangguhLelong::where('lelongbid_id',$selectedbid_id) + ->first(); + // $download = Http::get(config('api.url').'/admin/permohonan/viewfiles',[ + // 'files_id' => $tangguh->files_id + // ])->json(); + + //update status=operasi download borang tangguh + $tangguh->status = 2; //operasi download + $tangguh->update(); + + return response(base64_decode($tangguh['filename']), 200, [ + 'Content-type' => 'application/' . $tangguh['file_type'], + 'Content-Disposition' => 'inline; filename='.$tangguh['norujukan'] + ]); + } + + public function operasiuploadborang(Request $request) + { + // dd($request->all()); + $data = base64_encode($request->surat->get()); + $file_type = $request->surat->extension(); + $tangguhlelong = TangguhLelong::where('lelongbid_id','=',$request->lelongbidid_modal) + ->where('norujukan','=',$request->norujukan_modal)->first(); + + // dd($tangguhlelong->toArray()); + + // dd($data); + // dd($tangguhlelong); + $tangguhlelong->filename = $data; + $tangguhlelong->file_type = $file_type; + $tangguhlelong->status = 3; + $tangguhlelong->update(); + + return redirect()->route('pengesahan.opsenaraisahtangguh',[$tangguhlelong->lelong_id, $tangguhlelong->kodcaw]) + ->with('success', 'Borang Pengesahan Tangguh Lelong Berjaya Di Simpan.'); + } + + public function operasisahtangguh(Request $request) + { + $user = Auth::user(); + $currentdate = Carbon::now(); + $currentdate = $currentdate->toDateTimeString(); + + //dd($request->all()); + $tangguhlelong = TangguhLelong::where('lelongbid_id','=',$request->lelongbidid_mdl) + ->where('norujukan','=',$request->norujukan_mdl)->first(); + + if($request->sahkan == "1") { + $tangguhlelong->status = 4; + $tangguhlelong->ditangguh_oleh = $user->id; + $tangguhlelong->ditangguh_pada = $currentdate; + $tangguhlelong->update(); + + //update pengesahan sbb operasi dh lulus + $pengesahan = Pengesahan::where('lelongbid_id','=',$request->lelongbidid_mdl) + ->where('norujukan','=',$request->norujukan_mdl)->first(); + + $pengesahan->disahkan_oleh = $user->id; + $pengesahan->disahkan_pada = $currentdate; + $pengesahan->update(); + + //delete from lelongbid,lelongbidmarhun + $lelongbidmarhun = LelongBidMarhun::where('lelongbidmarhun.lelongbid_id', $request->lelongbidid_mdl) + ->delete(); + + $lelongbid = LelongBid::where('lelongbid.id', $request->lelongbidid_mdl) + ->delete(); + + + }else{ + $tangguhlelong->status = 99; + $tangguhlelong->update(); + } + + + return redirect()->route('pengesahan.opsenaraisahtangguh',[$tangguhlelong->lelong_id, $tangguhlelong->kodcaw]) + ->with('success', 'Tangguh Lelong Telah Di Sahkan.'); + } + + public function senaraitlhtangguh() + { + $arrayinfo = []; + + $lelong = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id') + ->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id') + ->join('tangguhlelong','tangguhlelong.lelong_id','=','cawangan_lelong.lelong_id') + ->where('lelong.sts_lelong', 0) + ->where('tangguhlelong.status',4) + ->select('cawangan_lelong.lelong_id','lelong.tarikh_lelong','lelong.masatamat_lelong','lelong.harga_emas_asas','lelong.jbg','lelong.cajlelong','lelong.sts_lelong') + ->groupBy('cawangan_lelong.lelong_id') + ->get() + ->toArray(); + + foreach($lelong as $info) + { + + $detailsinfo = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') + ->where('lelong_id',$info['lelong_id']) + ->get() + ->toArray(); + array_push($arrayinfo,['info'=>$info, 'detailsinfo'=>$detailsinfo]); + // dd($arrayinfo); + } + + return view('tangguhlelong.senleltlhtangguh',compact('lelong', 'arrayinfo')); + } + + public function operasisenlulustangguh($lelong_id, $caw_code) + { + $caw_code = $caw_code; + $lelong_id = $lelong_id; + $currentdate = Carbon::now(); + $currentdate = $currentdate->toDateTimeString(); + + $tangguh = TangguhLelong::where('status',4) + ->get(); + + // dd($pengesahan); + + foreach($tangguh as $index1=>$sah) + { + $lelongbid = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id') + ->where('lelong.id', $sah->lelong_id) + ->get(); + // dd($lelongbid); + + $tangguh[$index1]['bid_details'] = $lelongbid; + + } + + // $filter_null = function($x){ + // if(! empty( $x->bid_details->first())){ + // return $x; + // } + // }; + + // $filtered_pengesahan = $pengesahan->filter($filter_null);0 + + return view('tangguhlelong.sentangguhoperasi', compact('tangguh', 'lelong_id' , 'caw_code')); + } + + public function operasidownloadboranglulus($lelongbid_id) + { + //dd($lelongbid_id); + $selectedbid_id = $lelongbid_id; + + $tangguh = TangguhLelong::where('lelongbid_id',$selectedbid_id) + ->first(); + // $download = Http::get(config('api.url').'/admin/permohonan/viewfiles',[ + // 'files_id' => $tangguh->files_id + // ])->json(); + + //update status=operasi download borang tangguh + // $tangguh->status = 2; //operasi download + // $tangguh->update(); + + return response(base64_decode($tangguh['filename']), 200, [ + 'Content-type' => 'application/' . $tangguh['file_type'], + 'Content-Disposition' => 'inline; filename='.$tangguh['norujukan'] + ]); + + } } diff --git a/config/database.php b/config/database.php index 8b8c6321..bf393ac0 100644 --- a/config/database.php +++ b/config/database.php @@ -773,6 +773,26 @@ return [ ]) : [], ], + 'kaunterpkb' => [ + 'driver' => 'mysql', + 'url' => env('DATABASE_URL_KAUNTERPKB'), + 'host' => env('DB_HOST_KAUNTERPKB', '127.0.0.1'), + 'port' => env('DB_PORT_KAUNTERPKB', '3306'), + 'database' => env('DB_DATABASE_KAUNTERPKB', 'forge'), + 'username' => env('DB_USERNAME_KAUNTERPKB', 'forge'), + 'password' => env('DB_PASSWORD_KAUNTERPKB', ''), + 'unix_socket' => env('DB_SOCKET_KAUNTERPKB', ''), + 'charset' => 'utf8mb4', + 'collation' => 'utf8mb4_unicode_ci', + 'prefix' => '', + 'prefix_indexes' => true, + 'strict' => true, + 'engine' => null, + 'options' => extension_loaded('pdo_mysql') ? array_filter([ + PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'), + ]) : [], + ], + 'pgsql' => [ 'driver' => 'pgsql', 'url' => env('DATABASE_URL'), diff --git a/database/migrations/2022_03_09_122631_create_tangguhlelong_table.php b/database/migrations/2022_03_09_122631_create_tangguhlelong_table.php index c3e40e58..dbb52366 100644 --- a/database/migrations/2022_03_09_122631_create_tangguhlelong_table.php +++ b/database/migrations/2022_03_09_122631_create_tangguhlelong_table.php @@ -25,6 +25,8 @@ class CreateTangguhlelongTable extends Migration $table->datetime('ditangguh_pada'); $table->string('nota'); $table->timestamps(); + $table->integer('status'); //new added + $table->string('filetype'); // $table->foreign('lelong_id') // ->references('id')->on('lelong') @@ -35,6 +37,9 @@ class CreateTangguhlelongTable extends Migration // ->onDelete('cascade'); }); + + // once the table is created use a raw query to ALTER it and add the MEDIUMBLOB + DB::statement("ALTER TABLE tangguhlelong ADD filename LONGBLOB"); } /** diff --git a/resources/views/includes/sidebar.blade.php b/resources/views/includes/sidebar.blade.php index 4be85a69..657637c7 100644 --- a/resources/views/includes/sidebar.blade.php +++ b/resources/views/includes/sidebar.blade.php @@ -109,9 +109,22 @@ -
  • - Tangguh Lelong +
  • + + +
  • +
  • Pembayaran Pemenang
  • @@ -297,12 +310,12 @@ diff --git a/resources/views/pdf/brgtangguhlelong.blade.php b/resources/views/pdf/brgtangguhlelong.blade.php new file mode 100644 index 00000000..039eea94 --- /dev/null +++ b/resources/views/pdf/brgtangguhlelong.blade.php @@ -0,0 +1,341 @@ + + + + + + + + + + + + + +@foreach($lelongbid as $index1=> $borang) +{{-- {{dd($notis['nama']['alamat1'])}} --}} + +
    + + + {{-- --}} + + + +
    + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @php + $myDateTime = DateTime::createFromFormat('Y-m-d', $borang['t_lelong']); + $tlelong = $myDateTime->format('d-m-Y'); + echo($tlelong); + @endphp + +
    Kepada :Bahagian Operasi Ar-Rahn
    Nama Pelanggan :{{ $customer['nama'] }}
    Alamat Pelanggan:{{ strtoupper($customer['alamat1']) }}
    + {!! ($customer['alamat2'] === null || $customer['alamat2'] === '') ? '' : '
    ' . strtoupper($customer['alamat2']) !!}
    + {{ ' ' . $customer['poskod'] . ' ' . strtoupper($customer['namadaerah']) . ' ' . strtoupper($customer['negeri'])}}
    Alamat Baru
    (sekiranya ada perubahan)
    :
    No Telefon:{{ $customer['telefon'] }}No Telefon
    (terkini)
    :
    Tarikh Permohonan:@php + $myDateTime = DateTime::createFromFormat('Y-m-d', $t_mohon); + $datez = $myDateTime->format('d-m-Y'); + echo($datez); + @endphp

    Pohon penangguhan lelong Batch {{ $borang['lelong_id']}} yang akan dijalankan pada tarikh {{ $tlelong }} bagi pembiayaan sepertimana berikut:-

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Cawangan Ar-Rahn:{{ $cwgn['caw_name'] }} Nilai Pembiayaan (RM):{{ $borang['pinjaman']}} Pembiayaan Asal (%):{{ $borang['percent']}}
    No Kad Pengenalan:{{ $nokp }}Nilai Marhun Asal (RM):{{ $borang['nilaimarhun']}} Nilai Marhun Semasa (RM):{{ $borang['nmarhuns']}}
    No SAG:{{ $borang['norujukan'] }}JBG:{{ $borang['jbg']}} Pembiayaan Semasa (%):{{ $borang['percents']}}
    + +

    + + + + + + + + + + + + + + + + + + + + @foreach($borang['lelongbidmarhun'] as $index1=> $lel) + + + + + + + + + + @endforeach +
    BilMarhunBerat (gm)Mutu
    AsalBaruAsalBaru
    {{ $loop->iteration }}{{ $lel['marhun'] }}{{ $lel['old_berat'] }}{{ $lel['old_karat'] }}

















    +

    + + +

    + + + + + + + + Pengesahan / Komen + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Tandatangan Pelanggan:............................
    Penilai:_______________________________Khazanah:_______________________________
    ______________________________________________________________
    ............................
    (nama Penilai)
    ............................
    (nama Khazanah)
    PC:_______________________________Bahagian Operasi:Diluluskan / Tidak Diluluskan
    _______________________________
    ............................
    (nama PC)
    ............................
    (nama Pegawai Operasi)
    +

    +
    +
    + + @endforeach \ No newline at end of file diff --git a/resources/views/pdf/marhundetails.blade.php b/resources/views/pdf/marhundetails.blade.php index 45f7d9a0..8a500d5a 100644 --- a/resources/views/pdf/marhundetails.blade.php +++ b/resources/views/pdf/marhundetails.blade.php @@ -75,7 +75,7 @@ tr:nth-child(even) { - LAPORAN SIMULASI SEMUA CAWANGAN + LAPORAN SENARAI MARHUN diff --git a/resources/views/tangguhlelong/searchbyic.blade.php b/resources/views/tangguhlelong/searchbyic.blade.php index 44e6a9b2..963db09b 100644 --- a/resources/views/tangguhlelong/searchbyic.blade.php +++ b/resources/views/tangguhlelong/searchbyic.blade.php @@ -32,16 +32,20 @@ +
    +
    **Sila pilih SAG terlebih dahulu sebelum Muat Turun Borang Tangguh Lelong
    +
    @csrf + - + @@ -52,6 +56,7 @@ @foreach ($getic as $ic) + @@ -83,7 +88,7 @@ @@ -189,5 +194,12 @@ }) } + @endsection diff --git a/resources/views/tangguhlelong/searchtodownload.blade.php b/resources/views/tangguhlelong/searchtodownload.blade.php new file mode 100644 index 00000000..d3a4c858 --- /dev/null +++ b/resources/views/tangguhlelong/searchtodownload.blade.php @@ -0,0 +1,188 @@ +@extends('layouts.app') + +@section('content') +
    +
    +
    + + @if ($message = Session::get('success')) +
    +

    {{ $message }}

    +
    + @elseif ($message = Session::get('failed')) +
    +

    {{ $message }}

    +
    + @endif +
    + +
    +
    +
    +
    Nama :
    {{$customer_detail['nama']}}
    +
    No Kad Pengenalan :
    {{ ($customer_detail) ? $customer_detail['kpbaru'] : $customer_detail['kplama']}}
    +
    Alamat :
    {{$customer_detail['alamat1']}}
    +
    Poskod :
    {{$customer_detail['poskod']}}
    +
    Nama Daerah :
    {{$customer_detail['namadaerah']}}
    +
    Negeri :
    {{$customer_detail['negeri']}}
    +
    No Telefon :
    {{$customer_detail['telefon']}}
    +
    Tarikh Lelong :
    {{$getic[0]['t_lelong']}}
    +
    Nama Cawangan :
    {{$namacaw['caw_name']}}
    +
    +
    +
    +
    +
    +
    **Sila pilih SAG terlebih dahulu sebelum Muat Turun Borang Tangguh Lelong
    + + + @csrf + + +
    No No Rujukan TempohNarhunMarhun Nilai Marhun (RM) Pembiayaan (RM) Berat
    {{$loop->iteration}} {{$ic['norujukan']}} {{$ic['tempoh']}}
    + + + + + + + + + + + + + + + + @foreach ($getic as $ic) + + + + + + + + + + + + @endforeach + +
    NoNo RujukanTempohMarhunNilai Marhun (RM)Pembiayaan (RM)Berat
    {{$loop->iteration}}{{$ic['norujukan']}}{{$ic['tempoh']}}{{$ic['marhun']}}{{ number_format($ic['nilaimarhun'], 2, '.', ',')}}{{ number_format($ic['pinjaman'], 2, '.', ',')}}{{$ic['berat']}}
    +
    + + + + + + + + + +@endsection diff --git a/resources/views/tangguhlelong/senactionoperasi.blade.php b/resources/views/tangguhlelong/senactionoperasi.blade.php new file mode 100644 index 00000000..4d0fca60 --- /dev/null +++ b/resources/views/tangguhlelong/senactionoperasi.blade.php @@ -0,0 +1,231 @@ +@extends('layouts.app') + +@section('content') +
    +
    +
    + + @if ($message = Session::get('success')) +
    +

    {{ $message }}

    +
    + @endif + +
    + + + + + + + + + + + + + + + + + + + @foreach ($filtered_pengesahan as $index1=>$sah) + + + + + + + + + + + + + + + + + + + @endforeach + +
    NoTarikh LelongNo RujukanTempohN.Marhun (RM)Pembiayaan (RM)BeratStatusTindakan
    {{$loop->iteration}}@php + $myDateTime = DateTime::createFromFormat('Y-m-d', $sah['bid_details'][0]['t_lelong'] ); + + $t_lelong = $myDateTime->format('d-m-Y'); + echo($t_lelong); + @endphp{{$sah['norujukan']}}{{$sah['bid_details'][0]['jbg']}}{{ number_format($sah['bid_details'][0]['nilaimarhun'], 2, '.', ',')}}{{ number_format($sah['bid_details'][0]['pinjaman'], 2, '.', ',')}}{{$sah['bid_details'][0]['berat']}} + @if($sah['status'] == 0) + + @elseif($sah['status'] == 1) + + @elseif($sah['status'] == 2) + + @elseif($sah['status'] == 3) + + @elseif($sah['status'] == 4) + + @endif + + @if($sah['status'] == 2) + + @elseif($sah['status'] == 3) + + + @endif +
    +
    + + +
    +
    +
    + + + + + + +@endsection diff --git a/resources/views/tangguhlelong/senactionoperasi.blade00.php b/resources/views/tangguhlelong/senactionoperasi.blade00.php new file mode 100644 index 00000000..3d57b02d --- /dev/null +++ b/resources/views/tangguhlelong/senactionoperasi.blade00.php @@ -0,0 +1,192 @@ +@extends('layouts.app') + +@section('content') +
    +
    +
    + + @if ($message = Session::get('success')) +
    +

    {{ $message }}

    +
    + @endif +
    +
    **Sila pilih SAG terlebih dahulu sebelum Muat Turun Borang Tangguh Lelong
    +
    +
    + @csrf + + + + + + + + + + + + + + + + + + + + + + @foreach ($pengesahan as $sah) + + + + + + + + + + + + + + + + + @endforeach + +
    NoTarikh LelongNo RujukanTempohMarhunN.Marhun (RM)Pembiayaan (RM)BeratStatusTindakan
    {{$loop->iteration}}@php + $myDateTime = DateTime::createFromFormat('Y-m-d', $sah['bid_details'][0]['t_lelong'] ); + $t_lelong = $myDateTime->format('d-m-Y'); + echo($t_lelong); + @endphp{{$sah['norujukan']}}{{$sah['bid_details'][0]['jbg']}}{{$sah['bid_details'][0]['marhun']}}{{ number_format($sah['bid_details'][0]['nilaimarhun'], 2, '.', ',')}}{{ number_format($sah['bid_details'][0]['pinjaman'], 2, '.', ',')}}{{$sah['bid_details'][0]['berat']}} + @if($sah['status'] == 0) + + @elseif($sah['status'] == 1) + + @elseif($sah['status'] == 4) + + @endif + {{ $sah['bid_details'][0]['id']}}
    + +
    +
    +
    +
    + + + + +@endsection diff --git a/resources/views/tangguhlelong/senarailelongtangguh.blade.php b/resources/views/tangguhlelong/senarailelongtangguh.blade.php index 5523b271..02d68bcb 100644 --- a/resources/views/tangguhlelong/senarailelongtangguh.blade.php +++ b/resources/views/tangguhlelong/senarailelongtangguh.blade.php @@ -60,8 +60,8 @@ @if($lel['info']['sts_lelong'] == 0) {{-- @foreach($lel['detailsinfo'] as $details) --}} - - + + {{-- @endforeach --}} @endif diff --git a/resources/views/tangguhlelong/senaraimohontangguh.blade.php b/resources/views/tangguhlelong/senaraimohontangguh.blade.php new file mode 100644 index 00000000..77e40764 --- /dev/null +++ b/resources/views/tangguhlelong/senaraimohontangguh.blade.php @@ -0,0 +1,264 @@ +@extends('layouts.app') + +@section('content') +
    +
    +
    + + @if ($message = Session::get('success')) +
    +

    {{ $message }}

    +
    + @endif +
    + + + + + + + + + + + + + + + + @foreach ($tangguh as $index1=>$mohon) + @if(empty($mohon)) + + + @else + + + + + + + + + + + @endif + @endforeach + + +
    NoID LelongTarikh LelongNo RujukanTarikh Mohon / LulusStatusTindakan
    {{$loop->iteration}}{{ $mohon['lelong_id']}} + @if($mohon['status'] == 4) + + + @php + $myDateTime = DateTime::createFromFormat('Y-m-d', $mohon['tdet'][0]['tarikh_lelong']); + $datez = $myDateTime->format('d-m-Y'); + echo($datez); + + @endphp + @else + + + @php + $myDateTime = DateTime::createFromFormat('Y-m-d', $mohon['tdet'][0]['t_lelong']); + $datez = $myDateTime->format('d-m-Y'); + echo($datez); + + @endphp + @endif + {{$mohon['norujukan']}}{{$mohon['ditangguh_pada']}} + @if($mohon['status'] == 0) + + @elseif($mohon['status'] == 1) + + @elseif($mohon['status'] == 2) + + @elseif($mohon['status'] == 3) + + @elseif($mohon['status'] == 4) + + @endif + + @if($mohon['status'] == 0) + + @elseif($mohon['status'] == 4) + + @endif +
    +
    +
    + +
    +
    + + + + +@endsection diff --git a/resources/views/tangguhlelong/senleltangguh.blade.php b/resources/views/tangguhlelong/senleltangguh.blade.php index b89e64be..692f47e4 100644 --- a/resources/views/tangguhlelong/senleltangguh.blade.php +++ b/resources/views/tangguhlelong/senleltangguh.blade.php @@ -58,7 +58,7 @@ @if($lel['info']['sts_lelong'] == 0) - + @endif @@ -122,14 +122,14 @@ // alert( 'Button activated' ); // } // }, - { - className: 'btn btn-outline-secondary pl-4 pr-4 btn-sm export', - titleAttr: 'Export to CSV', - text: '', - action: function ( e, dt, node, config ) { - $("#exportform").submit(); - } - } + // { + // className: 'btn btn-outline-secondary pl-4 pr-4 btn-sm export', + // titleAttr: 'Export to CSV', + // text: '', + // action: function ( e, dt, node, config ) { + // $("#exportform").submit(); + // } + // } ] }); diff --git a/resources/views/tangguhlelong/senleltlhtangguh.blade.php b/resources/views/tangguhlelong/senleltlhtangguh.blade.php new file mode 100644 index 00000000..ee879fd9 --- /dev/null +++ b/resources/views/tangguhlelong/senleltlhtangguh.blade.php @@ -0,0 +1,149 @@ +@extends('layouts.app') + +@section('content') +
    +
    +
    + + @if ($message = Session::get('success')) +
    +

    {{ $message }}

    +
    + @endif +
    + + + + + + + + + + + + + + + + + @foreach ($arrayinfo as $lel) + + + + + + + + + + + + @endforeach + +
    NoID LelongTarikh LelongCawanganHarga Emas AsasTempohCaj LelongStatus LelongTindakan
    {{$loop->iteration}}{{ $lel['info']['lelong_id']}} @php + $myDateTime = DateTime::createFromFormat('Y-m-d', $lel['info']['tarikh_lelong']); + $datez = $myDateTime->format('d-m-Y'); + echo($datez); + + @endphp + @foreach($lel['detailsinfo'] as $details) + {{$details['caw_name']}}
    + @endforeach +
    {{$lel['info']['harga_emas_asas']}}{{$lel['info']['jbg']}}{{$lel['info']['cajlelong']}} + @if($lel['info']['sts_lelong'] == 0) + + @elseif($lel['info']['sts_lelong'] == 1) + + @elseif($lel['info']['sts_lelong'] == 2) + + @elseif($lel['info']['sts_lelong'] == 3) + + @endif + + @if($lel['info']['sts_lelong'] == 0) + + @endif +
    +
    +
    + +
    +
    + + +@endsection diff --git a/resources/views/tangguhlelong/sensahpc.blade.php b/resources/views/tangguhlelong/sensahpc.blade.php index 46549755..195da689 100644 --- a/resources/views/tangguhlelong/sensahpc.blade.php +++ b/resources/views/tangguhlelong/sensahpc.blade.php @@ -50,7 +50,17 @@ {{ number_format($sah['bid_details'][0]['nilaimarhun'], 2, '.', ',')}} {{ number_format($sah['bid_details'][0]['pinjaman'], 2, '.', ',')}} {{$sah['bid_details'][0]['berat']}} - {{$sah['nota']}} + + + @if($sah['status'] == 0) + + @elseif($sah['status'] == 1) + + @elseif($sah['status'] == 4) + + @endif + @@ -66,7 +76,60 @@ + + +@endsection diff --git a/routes/web.php b/routes/web.php index 16444476..98af2206 100644 --- a/routes/web.php +++ b/routes/web.php @@ -305,6 +305,9 @@ Route::group(['middleware' => ['permission:pengesahan'],'prefix'=>'pengesahan'], Route::post('/sahkantangguhlel',['as'=>'pengesahan.sahkantangguhlel','uses'=>'TangguhLelongController@sahkantangguhlel']); Route::get('/listperubahanmutumarhun/{id}',['as'=>'pengesahan.listperubahanmutumarhun','uses'=>'MarhunController@listsahubahmutu']); Route::get('/detailmutumarhun/{norujukan}/{id}',['as'=>'pengesahan.detailmutumarhun','uses'=>'MarhunController@detailmutumarhun']); + Route::get('/opsenaraisahtangguh/{lelong_id}/{caw_code}',['as'=>'pengesahan.opsenaraisahtangguh','uses'=>'TangguhLelongController@operasisenmohontangguh']); + Route::get('/senaraitlhtangguh',['as'=>'pengesahan.senaraitlhtangguh','uses'=>'TangguhLelongController@senaraitlhtangguh']); + Route::get('/opsenaraitangguh/{lelong_id}/{caw_code}',['as'=>'pengesahan.opsenaraitangguh','uses'=>'TangguhLelongController@operasisenlulustangguh']); }); Route::group(['middleware' => ['permission:notistamatkontrak'],'prefix'=>'notistamatkontrak'], function () { @@ -359,6 +362,14 @@ Route::group(['middleware' => ['permission:tangguhlelong'],'prefix'=>'tangguhlel Route::post('/tangguhlelong', ['as'=>'tangguhlelong.tangguhlelong','uses'=>'TangguhLelongController@tangguhlelong']); Route::get('/listtangguh/{lelong_id}/{caw_code}', ['as'=>'tangguhlelong.listtangguh','uses'=>'TangguhLelongController@listtangguh']); Route::get('/taglelbidmarhun/{id}/{norujukan}/{tangguhlelong_id}',['as'=>'tangguhlelong.taglelbidmarhun','uses'=>'TangguhLelongController@taglelbidmarhun']); + Route::post('/mohontangguhlelong', ['as'=>'tangguhlelong.mohontangguhlelong','uses'=>'TangguhLelongController@mohontangguhlelong']); + Route::get('/sentangguh', ['as'=>'tangguhlelong.sentangguh','uses'=>'TangguhLelongController@sentangguh']); + Route::post('/uploadborang', ['as'=>'tangguhlelong.uploadborang','uses'=>'TangguhLelongController@uploadborang']); + Route::get('/operasidownloadborang/{lelongbid_id}', ['as'=>'tangguhlelong.operasidownloadborang','uses'=>'TangguhLelongController@operasidownloadborang']); + Route::post('/operasiuploadborang', ['as'=>'tangguhlelong.operasiuploadborang','uses'=>'TangguhLelongController@operasiuploadborang']); + Route::post('/operasisahtangguh', ['as'=>'tangguhlelong.operasisahtangguh','uses'=>'TangguhLelongController@operasisahtangguh']); + Route::get('/operasidownloadboranglulus/{lelongbid_id}', ['as'=>'tangguhlelong.operasidownloadboranglulus','uses'=>'TangguhLelongController@operasidownloadboranglulus']); + Route::get('/cwgndownloadboranglulus/{lelongbid_id}', ['as'=>'tangguhlelong.cwgndownloadboranglulus','uses'=>'TangguhLelongController@operasidownloadboranglulus']); }); //pengurus cawangan KHAS