diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php index 7528eddd..bdb0cd69 100644 --- a/app/Http/Controllers/MarhunController.php +++ b/app/Http/Controllers/MarhunController.php @@ -399,6 +399,7 @@ class MarhunController extends Controller $mutumarhun = Lelong::join('pengesahan', 'lelong.id', '=', 'pengesahan.lelong_id') ->where('lelong.id', $id) ->whereNull('disahkan_oleh') + ->where('pengesahan.status_ubah', [1,2,3,4,5]) ->selectRaw('count(*) as total, sum(status) as tstat,norujukan') ->groupBy('pengesahan.norujukan') ->get()->toArray(); @@ -653,16 +654,30 @@ class MarhunController extends Controller public function senarailelong() { - $lelong = Lelong::where('sts_lelong', 0) - ->get(); + $arrayinfo = []; - return view('pengesahan.senarailelong',compact('lelong')); + $lelong = Lelong::where('sts_lelong', 0) + ->get()->toArray(); + + foreach($lelong as $details) + { + $detailsinfo = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') + ->where('lelong_id', $details['id']) + ->get() + ->toArray(); + + array_push($arrayinfo,['detail'=>$details, 'detailsinfo'=>$detailsinfo]); + } + + return view('pengesahan.senarailelong',compact('lelong', 'arrayinfo')); } - public function senaraitangguhlelong($id) + public function senaraitangguhlelong($id, $caw_name) { - $tangguhlelong = TangguhLelong::join('lelongbid', 'tangguhlelong.lelongbid_id', '=', 'lelongbid.id') + $tangguhlelong = TangguhLelong::join('lelong', 'tangguhlelong.lelong_id', '=', 'lelong.id') ->where('tangguhlelong.lelong_id', $id) + // ->join('lelongbid', 'tangguhlelong.lelongbid_id', '=', 'lelongbid.id') + // ->where('tangguhlelong.lelong_id', $id) ->select('tangguhlelong.id as tangguhlelong_id', 'tangguhlelong.lelongbid_id', 'tangguhlelong.norujukan', @@ -678,18 +693,52 @@ class MarhunController extends Controller 'lelong.sts_lelong' ) ->get(); + // dd($tangguhlelong); - return view('pengesahan.senaraitangguhlelong',compact('tangguhlelong','id')); + foreach($tangguhlelong as $index1=>$tanguhlel) + { + $getkodcaw = LelongBid::join('cawangan', 'lelongbid.kodcaw', '=', 'cawangan.caw_code') + ->where('lelong_id', $id) + ->first(); + + $tangguhlelong[$index1]['details'] = $tanguhlel; + $tangguhlelong[$index1]['nama_caw'] = $getkodcaw; + } + + return view('pengesahan.senaraitangguhlelong',compact('tangguhlelong','id', 'caw_name')); } public function lelbidmarhun($id, $norujukan, $tangguhlelong_id) { - $marhuns = LelongBidMarhun::join('tangguhlelong', 'lelongbidmarhun.lelongbid_id', '=', 'tangguhlelong.lelongbid_id') + $tangguhlelong = TangguhLelong::join('gadaimarhun', 'tangguhlelong.norujukan', '=', 'gadaimarhun.norujukan') + ->where('gadaimarhun.norujukan', $norujukan) + ->where('tangguhlelong.id', $tangguhlelong_id) ->where('tangguhlelong.lelong_id', $id) - ->where('tangguhlelong.norujukan', $norujukan) + ->select('tangguhlelong.id as tangguhlelong_id', + 'tangguhlelong.lelong_id', + 'tangguhlelong.lelongbid_id', + 'tangguhlelong.norujukan', + 'tangguhlelong.pinjaman', + 'tangguhlelong.tarikhtangguh', + 'tangguhlelong.nota as tangguh_nota', + 'tangguhlelong.pinjaman', + 'gadaimarhun.bil', + 'gadaimarhun.marhun', + 'gadaimarhun.nota as gadai_nota', + 'gadaimarhun.karat', + 'gadaimarhun.berat', + 'gadaimarhun.harga', + 'gadaimarhun.n_marhun' + ) ->get(); - - return view('pengesahan.lelbidmarhun',compact('tangguhlelong', 'id', 'norujukan')); + + $caw_names = GadaiMarhun::join('cawangan', 'gadaimarhun.kodcaw', '=', 'cawangan.caw_code') + ->where('gadaimarhun.norujukan', $norujukan) + ->select('cawangan.caw_name') + ->first(); + // dd($caw_names); + + return view('pengesahan.lelbidmarhun',compact('tangguhlelong', 'id', 'norujukan', 'caw_names')); } diff --git a/app/Http/Controllers/PaymentController.php b/app/Http/Controllers/PaymentController.php index b0c37542..acb14560 100644 --- a/app/Http/Controllers/PaymentController.php +++ b/app/Http/Controllers/PaymentController.php @@ -128,6 +128,7 @@ class PaymentController extends Controller $user = Auth::user(); $bid_id = explode(",", $request->eachbid); + dd($bid_id); $resit = Resit::where('lelong_id', $request->lelong_id) ->where('user_id',$request->user_id) @@ -222,14 +223,14 @@ class PaymentController extends Controller public function banktransfer(Request $request) { - // dd($request->all()); + dd($request->all()); $currentdate = Carbon::now(); $currentdate = $currentdate->toDateTimeString(); $user = Auth::user(); // dd($user); - + // dd($request->checkboxdata); $totalcheck = implode(",", $request->checkboxdata); $resit = Resit::where('lelong_id', $request->lelong_id) @@ -245,7 +246,7 @@ class PaymentController extends Controller $payment->status = 2; $payment->remark = 'BAYARAN CDM'; $payment->resit_id = $resit->id; - $payment->total_payment = $totalcheck; + $payment->total_payment = sum($totalcheck->valueOf()); $payment->diminta_pada = $currentdate; $payment->diminta_oleh = $user->id; $payment->save(); diff --git a/app/Http/Controllers/TangguhLelongController.php b/app/Http/Controllers/TangguhLelongController.php new file mode 100644 index 00000000..76431cac --- /dev/null +++ b/app/Http/Controllers/TangguhLelongController.php @@ -0,0 +1,310 @@ +join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id') + ->where('cawangan.caw_code', $user->kodcaw) + ->where('sts_lelong', 0) + ->select('lelong_id','tarikh_lelong','masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong') + ->groupBy('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.senarailelongtangguh',compact('lelong', 'arrayinfo')); + } + + public function carian($lelong_id) + { + return view('tangguhlelong.carian', compact('lelong_id')); + } + + public function searchbyic(Request $request) + { + // dd($request->all()); + $user = Auth::user(); + + if($request->nokp == null) + { + return redirect()->route('tangguhlelong.carian', $request->lelong_id)->with('failed','Sila Masukkan No Kad Pengenalan'); + } + else if($request->nokp != null) + { + $lelong = Lelong::where('id', $request->lelong_id)->first(); + + $getic = Customer::join('gadai', 'customer.nopelanggan', '=', 'gadai.nopelanggan') + ->where('customer.kpbaru', $request->nokp) + ->where('gadai.tempoh', $lelong->jbg) + ->get(); + + foreach($getic as $index1=>$ic) + { + $getnorujukan = LelongBid::where('norujukan', $ic->norujukan) + ->where('jbg', $ic->tempoh) + ->get(); + + foreach($getnorujukan as $norujukan) + { + $pengesahan = Pengesahan::where('lelongbidmarhun_id', $norujukan->id) + ->where('lelongbid_id', $norujukan->lelongbid_id) + ->where('norujukan', $norujukan->norujukan) + ->get()->toArray(); + + if($pengesahan) + { + return redirect()->route('tangguhlelong.carian', $request->lelong_id)->with('success','Pengesahan Tangguh Lelong Telah Dibuat'); + } + } + + $getic[$index1]['user_details'] = $getnorujukan; + // dd($getic[$index1]['user_details']); + } + $lelong_id = $request->lelong_id; + + return view('tangguhlelong.searchbyic', compact('getic', 'user', 'lelong_id' )); + + } + + } + + public function tangguhlelong(Request $request) + { + // dd($request->all()); + $user = Auth::user(); + $currentdate = Carbon::now(); + $currentdate = $currentdate->toDateTimeString(); + + $lelbidmarhun = $request->checkboxdata; + // dd($lelbidmarhun); + + $lelong = Lelong::where('id', $request->lelong_id)->get()->toArray(); + + foreach($lelbidmarhun as $bidmarhun) + { + $lelongbidmarhun = LelongBidMarhun::join('lelongbid', 'lelongbidmarhun.lelongbid_id', '=', 'lelongbid.id') + ->where('lelongbid.id', $bidmarhun) + ->select('lelongbidmarhun.id as lelongbidmarhun_id', + 'lelongbidmarhun.bil', + 'lelongbidmarhun.marhun', + 'lelongbidmarhun.nota', + 'lelongbidmarhun.old_karat', + 'lelongbidmarhun.karat', + 'lelongbidmarhun.old_berat', + 'lelongbidmarhun.berat', + 'lelongbidmarhun.old_harga', + 'lelongbidmarhun.harga', + 'lelongbidmarhun.old_nmarhun', + 'lelongbidmarhun.n_marhun', + 'lelongbidmarhun.old_hargaasas', + 'lelongbidmarhun.hargaasas', + 'lelongbid.id as lelongbid_id', + 'lelongbid.caw_id', + 'lelongbid.kodcaw', + 'lelongbid.norujukan', + 'lelongbid.t_lelong', + 'lelongbid.hargaasas', + 'lelongbid.nopembeli', + 'lelongbid.jbg', + 'lelongbid.kadarupah', + 'lelongbid.upahsimpan', + 'lelongbid.ansuran', + 'lelongbid.nilaimarhun', + 'lelongbid.pinjaman', + 'lelongbid.bakiupah', + 'lelongbid.cajlain', + 'lelongbid.cajlelong', + 'lelongbid.baki', + 'lelongbid.berat', + 'lelongbid.marhun', + ) + ->get()->toArray(); + // dd($lelongbidmarhun); + + $pengesahan = new Pengesahan(); + $pengesahan->lelong_id = $request->lelong_id; + $pengesahan->lelongbid_id = $bidmarhun; + $pengesahan->lelongbidmarhun_id = $lelongbidmarhun[0]['lelongbidmarhun_id']; + $pengesahan->norujukan = $lelongbidmarhun[0]['norujukan']; + $pengesahan->diminta_oleh = $user->id; + $pengesahan->diminta_pada = $currentdate; + $pengesahan->status = 2; + $pengesahan->status_ubah = 6; + $pengesahan->save(); + + } + return redirect()->route('tangguhlelong.carian', $request->lelong_id)->with('success','Pengesahan Tangguh Lelong Berjaya'); + + } + + //Operasi + public function senarailelongtangguh() + { + $arrayinfo = []; + + $lelong = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id') + ->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id') + ->where('sts_lelong', 0) + ->select('lelong_id','tarikh_lelong','masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong') + ->groupBy('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.senleltangguh',compact('lelong', 'arrayinfo')); + + } + + public function senaraisahtangguh($lelong_id, $caw_code) + { + $currentdate = Carbon::now(); + $currentdate = $currentdate->toDateTimeString(); + + $pengesahan = Pengesahan::where('pengesahan.lelong_id', $lelong_id) + ->whereNull('disahkan_oleh') + ->whereNull('disahkan_pada') + ->get(); + + foreach($pengesahan as $index1=>$sah) + { + $lelongbid = LelongBid::where('id', $sah->lelongbid_id) + ->where('norujukan', $sah->norujukan) + ->where('kodcaw', $caw_code) + ->get(); + // dd($lelongbid[0]['jbg']); + + $pengesahan[$index1]['bid_details'] = $lelongbid; + } + + return view('tangguhlelong.sensahpc', compact('pengesahan', 'lelong_id' , 'caw_code')); + } + + public function sahkantangguhlel(Request $request) + { + // dd($request->all()); + + $user = Auth::user(); + $currentdate = Carbon::now(); + $currentdate = $currentdate->toDateTimeString(); + + $lelbidmarhun = $request->checkboxdata; + + $lelong = Lelong::where('id', $request->lelong_id)->get()->toArray(); + + foreach($lelbidmarhun as $bidmarhun) + { + // dd($bidmarhun); + $lelongbidmarhun = LelongBidMarhun::join('lelongbid', 'lelongbidmarhun.lelongbid_id', '=', 'lelongbid.id') + ->where('lelongbid.id', $bidmarhun) + ->select('lelongbidmarhun.id as lelongbidmarhun_id', + 'lelongbidmarhun.bil', + 'lelongbidmarhun.marhun', + 'lelongbidmarhun.nota', + 'lelongbidmarhun.old_karat', + 'lelongbidmarhun.karat', + 'lelongbidmarhun.old_berat', + 'lelongbidmarhun.berat', + 'lelongbidmarhun.old_harga', + 'lelongbidmarhun.harga', + 'lelongbidmarhun.old_nmarhun', + 'lelongbidmarhun.n_marhun', + 'lelongbidmarhun.old_hargaasas', + 'lelongbidmarhun.hargaasas', + 'lelongbid.id as lelongbid_id', + 'lelongbid.caw_id', + 'lelongbid.kodcaw', + 'lelongbid.norujukan', + 'lelongbid.t_lelong', + 'lelongbid.hargaasas', + 'lelongbid.nopembeli', + 'lelongbid.jbg', + 'lelongbid.kadarupah', + 'lelongbid.upahsimpan', + 'lelongbid.ansuran', + 'lelongbid.nilaimarhun', + 'lelongbid.pinjaman', + 'lelongbid.bakiupah', + 'lelongbid.cajlain', + 'lelongbid.cajlelong', + 'lelongbid.baki', + 'lelongbid.berat', + 'lelongbid.marhun', + ) + ->get()->toArray(); + // dd($lelongbidmarhun); + + $pengesahan = Pengesahan::where('lelongbidmarhun_id', $lelongbidmarhun[0]['lelongbidmarhun_id']) + ->where('lelongbid_id', $lelongbidmarhun[0]['lelongbid_id']) + ->where('norujukan', $lelongbidmarhun[0]['norujukan']) + ->first(); + $pengesahan->disahkan_oleh = $user->id; + $pengesahan->disahkan_pada = $currentdate; + $pengesahan->save(); + + $tangguhlelong = new TangguhLelong(); + $tangguhlelong->lelong_id = $request->lelong_id; + $tangguhlelong->lelongbid_id = $bidmarhun; + $tangguhlelong->norujukan = $lelongbidmarhun[0]['norujukan']; + $tangguhlelong->pinjaman = $lelongbidmarhun[0]['pinjaman']; + $tangguhlelong->tarikhtangguh = $currentdate; + $tangguhlelong->ditangguh_oleh = $user->id; + $tangguhlelong->ditangguh_pada = $currentdate; + $tangguhlelong->nota = 'Tangguh Lelong PC'; + $tangguhlelong->save(); + + $biddelete = LelongBid::join('lelongbidmarhun', 'lelongbid.id', '=', 'lelongbidmarhun.lelongbid_id') + ->where('lelongbid.id', $tangguhlelong->lelongbid_id) + ->where('lelongbid.norujukan', $tangguhlelong->norujukan) + ->where('lelongbid.lelong_id', $request->lelong_id) + ->delete(); + + $caw_code = $request->kodcaw; + + } + return redirect()->route('pengesahan.senaraisahtangguh', [$request->lelong_id, $caw_code])->with('success','Pengesahan Berjaya'); + } +} diff --git a/app/Models/Customer.php b/app/Models/Customer.php new file mode 100644 index 00000000..06013a88 --- /dev/null +++ b/app/Models/Customer.php @@ -0,0 +1,60 @@ +integer('diminta_oleh'); $table->datetime('diminta_pada'); $table->integer('status')->default(0); //1 = terima, 2 = tangguh lelong - $table->integer('status_ubah')->default(0); //1 = ubah mutu, 2 = tambah marhun, 3 = hapus marhun, 4 = ubah berat, 5 = ubah mutu & berat + $table->integer('status_ubah')->default(0); //1 = ubah mutu, 2 = tambah marhun, 3 = hapus marhun, 4 = ubah berat, 5 = ubah mutu & berat, 6 = tangguh lelong pc $table->timestamps(); // $table->foreign('lelong_id') diff --git a/database/seeders/RolesSeeder.php b/database/seeders/RolesSeeder.php index 5d2ea98b..cf26e849 100644 --- a/database/seeders/RolesSeeder.php +++ b/database/seeders/RolesSeeder.php @@ -71,6 +71,10 @@ class RolesSeeder extends Seeder 'name' => 'serahan', 'description' => 'Penyerahan Marhun Kepada Pembida Yang Menang' ]); + Permission::create([ + 'name' => 'tangguhlelong', + 'description' => 'Penangguhan Lelong Cawangan' + ]); //jurulelong Permission::create([ @@ -156,7 +160,7 @@ class RolesSeeder extends Seeder $role4->givePermissionTo('jananotis'); $role4->givePermissionTo('pengesahanbayarancash'); $role4->givePermissionTo('serahan'); - + $role4->givePermissionTo('tangguhlelong'); $role5 = Role::create(['name' => 'jurulelong']); $role5->givePermissionTo('pendaftaranbatch'); diff --git a/resources/views/includes/sidebar.blade.php b/resources/views/includes/sidebar.blade.php index 02599deb..8fc51b08 100644 --- a/resources/views/includes/sidebar.blade.php +++ b/resources/views/includes/sidebar.blade.php @@ -83,6 +83,9 @@ +
{{ $message }}
@endif + +Tarikh Lelong : {{ $tangguhlelong[0]['tarikh_lelong'] }}
+Nama Cawangan : {{ $caw_name }}
+JBG : {{ $tangguhlelong[0]['jbg'] }}
+