diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index 3c9711d7..bfb2a048 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/AccountController.php @@ -37,7 +37,8 @@ class AccountController extends Controller ->join('payment', 'lelongbidder.payment_id', 'payment.id') ->where('lelongbidder.status_bidder', 1) ->where('lelongbid.lelong_id', $lelong_id) - ->where('payment.status_payment_opt',2) + ->where('payment.status_payment_opt','=', '3,2') + ->where('lelongbidder.status_payment', 2) ->whereNull('payment.disahkan_pada') ->select('.lelongbidder.user_id' ) @@ -48,12 +49,6 @@ class AccountController extends Controller foreach($listwinner as $index1=>$winner){ $userdetails = User::where('id', $winner['user_id'])->first(); - // $SAGWin = Payment::join('lelongbid', 'payment.lelongbid_id', '=', 'lelongbid.id') - // ->join('lelongbidder', 'payment.lelongbidder_id', '=', 'lelongbidder.id') - // ->where('payment.user_id', $winner['user_id']) - // ->where('lelongbidder.status_bidder', 1) - // ->where('lelongbid.lelong_id', $lelong_id) - // ->get(); $SAGWin = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') ->where('lelongbidder.user_id', $winner['user_id']) @@ -62,7 +57,6 @@ class AccountController extends Controller ->get(); // dd($SAGWin->sum('hargabida')); - $id_payment = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') ->where('lelongbidder.user_id', $winner['user_id']) ->where('lelongbidder.status_bidder', 1) @@ -98,7 +92,8 @@ class AccountController extends Controller ->where('lelongbid.lelong_id', $lelong_id) ->where('lelongbidder.user_id', $user_id) ->where('lelongbidder.status_bidder', 1) - ->where('payment.status_payment_opt', 2) + ->where('payment.status_payment_opt', '=', '3,2') + ->where('lelongbidder.status_payment', 2) ->get()->toArray(); $saggroupbyid = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') @@ -106,7 +101,8 @@ class AccountController extends Controller ->where('lelongbid.lelong_id', $lelong_id) ->where('lelongbidder.user_id', $user_id) ->where('lelongbidder.status_bidder', 1) - ->where('payment.status_payment_opt', 2) + ->where('payment.status_payment_opt', '=', '3,2') + ->where('lelongbidder.status_payment', 2) ->select( 'lelongbidder.payment_id as payment_id' ) @@ -126,21 +122,21 @@ class AccountController extends Controller $currentdate = $currentdate->toDateTimeString(); $user = Auth::user(); - $senaraisag = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') ->join('payment', 'lelongbidder.payment_id', '=', 'payment.id') ->where('lelongbid.lelong_id', $request->lelong_id) ->where('lelongbidder.user_id', $request->user_id) ->where('lelongbidder.status_bidder', 1) - ->where('payment.status_payment_opt', 2) + ->where('payment.status_payment_opt', '3,2') + ->where('lelongbidder.status_payment', 2) ->select( 'lelongbid.id as lelongbid_id', 'payment.id as payment_id', 'lelongbid.lelong_id', 'lelongbidder.user_id', ) - ->get(); + ->get(); $total_payment = 0; $paymentid = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') @@ -148,7 +144,8 @@ class AccountController extends Controller ->where('lelongbid.lelong_id', $request->lelong_id) ->where('lelongbidder.user_id', $request->user_id) ->where('lelongbidder.status_bidder', 1) - ->where('payment.status_payment_opt', 2) + ->where('payment.status_payment_opt', '3,2') + ->where('lelongbidder.status_payment', 2) ->select( 'lelongbidder.payment_id as payment_id' ) @@ -169,8 +166,16 @@ class AccountController extends Controller $eachbid = LelongBid::where('id',$sag->lelongbid_id)->first(); $eachbid->status_payment = 1; $eachbid->status_jual = 1; + $eachbid->status_semak = 1; $eachbid->t_jual = $currentdate; $eachbid->save(); + + $bidder = LelongBidder::where('lelongbid_id', $sag->lelongbid_id) + ->where('payment_id', $sag->payment_id) + ->where('user_id', $sag->user_id) + ->first(); + $bidder->status_payment = 1; + $bidder->update(); } $senaraisagallpayment = LelongBid::join('lelongbidder', 'lelongbid.id', '=', 'lelongbidder.lelongbid_id') diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 171296fe..76e0f180 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -52,7 +52,15 @@ class LelongController extends Controller public function index() { $lelong = Lelong::all(); - return view('lelong.senarailelong',compact('lelong')); + + foreach($lelong as $lel) + { + $caw_lelong = CawanganLelong::join('cawangan', 'cawangan_lelong.caw_id', '=', 'cawangan.id') + ->where('lelong_id', $lel['id']) + ->get()->toArray(); + } + + return view('lelong.senarailelong',compact('lelong', 'caw_lelong')); } public function show($id) @@ -315,6 +323,11 @@ class LelongController extends Controller $lelongbidmarhun->bil = $simbidmarhun->bil; $lelongbidmarhun->marhun = $simbidmarhun->marhun; $lelongbidmarhun->nota = $simbidmarhun->nota; + $lelongbidmarhun->old_karat = $simbidmarhun->karat; + $lelongbidmarhun->old_berat = $simbidmarhun->berat; + $lelongbidmarhun->old_harga = $simbidmarhun->harga; + $lelongbidmarhun->old_nmarhun = $simbidmarhun->n_marhun; + $lelongbidmarhun->old_hargaasas = $simbidmarhun->hargaasas; $lelongbidmarhun->karat = $simbidmarhun->karat; $lelongbidmarhun->berat = $simbidmarhun->berat; $lelongbidmarhun->harga = $simbidmarhun->harga; diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php index 8ec34ebb..cb2338ee 100644 --- a/app/Http/Controllers/MarhunController.php +++ b/app/Http/Controllers/MarhunController.php @@ -56,69 +56,179 @@ class MarhunController extends Controller public function kemaskini(Request $request) { + // dd($request->all()); + //idmarhun => lelongbidmarhun_id $user = Auth::user(); $currentdate = Carbon::now(); $currentdate = $currentdate->toDateTimeString(); - // dd($request->all()); $marhun = LelongBidMarhun::where('id','=',$request->idmarhun)->first(); $lelongbid = LelongBid::where('id','=',$marhun->lelongbid_id)->first(); // dd($marhun); if($marhun->marhun != $request->marhun) { - // dd($marhun->marhun); $txtmarhun = ",1 " . $marhun->marhun ; - // dd($txtmarhun); $lelongbid->marhun = $lelongbid->marhun ."1 " . $request->marhun . "," ; $lelongbid->marhun = str_replace( $txtmarhun,"",$lelongbid->marhun); } $caw = CawanganLelong::where('id','=',$lelongbid->caw_id)->first(); $lelong = Lelong::where('id','=',$lelongbid->lelong_id)->first(); - // $simkarat = LelKarat::where('lelong_id','=',$lelong->id)->get(); + $ubahberatmin = 0.3; + $bezaberat = $marhun->old_berat - $request->berat_emas; + $bezahargaasas = $marhun->old_hargaasas - $request->harga_asas; + + if(($request->karat < $marhun->old_karat) && ($bezaberat > $ubahberatmin)) + { + $marhun->marhun = $request->marhun; + $marhun->karat = $request->karat; + $marhun->berat = $request->berat_emas; + $marhun->harga = $request->harga; + $marhun->n_marhun = $request->nilai_marhun; + $marhun->hargaasas = $request->harga_asas; + $marhun->save(); - // foreach($simkarat as $karat) - // { - // if($karat->karat == $request->karat) - // { - if($request->karat != $marhun->karat) - { - // $checkdata = Pengesahan::where('lelongbid_id', $lelongbid->id) - // ->whereNull('disahkan_pada') - // ->first(); - - $karat = new Pengesahan; - $karat->lelong_id = $lelong->id; - $karat->lelongbid_id = $lelongbid->id; - $karat->lelongbidmarhun_id = $marhun->id; - $karat->norujukan = $lelongbid->norujukan; - $karat->diminta_oleh = $user->id; - $karat->diminta_pada = $currentdate; - $karat->status_ubah = 1; - $karat->save(); - } - $bezaberat = $marhun->berat - $request->berat_emas; - $bezahargaasas = $marhun->hargaasas - $request->harga_asas; - // $val = round($request->berat_emas * $karat->harga); - - $marhun->marhun = $request->marhun; - $marhun->karat = $request->karat; - $marhun->berat = $request->berat_emas; - $marhun->harga = $request->harga; - $marhun->n_marhun = $request->nilai_marhun; - $marhun->hargaasas = $request->harga_asas; - $marhun->save(); - // dd($marhun->marhun); - - $lelongbid->berat = $lelongbid->berat - ($bezaberat); - $lelongbid->hargaasas = $lelongbid->hargaasas - ($bezahargaasas); - $lelongbid->save(); + $lelongbid->berat = $lelongbid->berat - ($bezaberat); + $lelongbid->hargaasas = $lelongbid->hargaasas - ($bezahargaasas); + $lelongbid->save(); - // } - // } + $pengesahan = Pengesahan::where('lelongbidmarhun_id', $request->idmarhun) + ->where('lelongbid_id', $marhun->lelongbid_id) + ->get(); + + if(isset($pengesahan['id'])) + { + $pengesahan->id = $pengesahan->id; + $pengesahan->lelong_id = $lelong->id; + $pengesahan->lelongbid_id = $lelongbid->id; + $pengesahan->lelongbidmarhun_id = $marhun->id; + $pengesahan->norujukan = $lelongbid->norujukan; + $pengesahan->diminta_oleh = $user->id; + $pengesahan->diminta_pada = $currentdate; + $pengesahan->status_ubah = 5; + $pengesahan->save(); + } + else + { + $berat = new Pengesahan; + $berat->lelong_id = $lelong->id; + $berat->lelongbid_id = $lelongbid->id; + $berat->lelongbidmarhun_id = $marhun->id; + $berat->norujukan = $lelongbid->norujukan; + $berat->diminta_oleh = $user->id; + $berat->diminta_pada = $currentdate; + $berat->status_ubah = 5; + $berat->save(); + } + + } + + else if($request->karat < $marhun->old_karat) + { + $marhun->marhun = $request->marhun; + $marhun->karat = $request->karat; + $marhun->berat = $request->berat_emas; + $marhun->harga = $request->harga; + $marhun->n_marhun = $request->nilai_marhun; + $marhun->hargaasas = $request->harga_asas; + $marhun->save(); + + $pengesahan = Pengesahan::where('lelongbidmarhun_id', $request->idmarhun) + ->where('lelongbid_id', $marhun->lelongbid_id) + ->get(); + + if(isset($pengesahan['id'])) + { + $pengesahan->id = $pengesahan->id; + $pengesahan->lelong_id = $lelong->id; + $pengesahan->lelongbid_id = $lelongbid->id; + $pengesahan->lelongbidmarhun_id = $marhun->id; + $pengesahan->norujukan = $lelongbid->norujukan; + $pengesahan->diminta_oleh = $user->id; + $pengesahan->diminta_pada = $currentdate; + $pengesahan->status_ubah = 1; + $pengesahan->save(); + } + else + { + $karat = new Pengesahan; + $karat->lelong_id = $lelong->id; + $karat->lelongbid_id = $lelongbid->id; + $karat->lelongbidmarhun_id = $marhun->id; + $karat->norujukan = $lelongbid->norujukan; + $karat->diminta_oleh = $user->id; + $karat->diminta_pada = $currentdate; + $karat->status_ubah = 1; + $karat->save(); + } + } + + else if($bezaberat > $ubahberatmin) + { + $marhun->marhun = $request->marhun; + $marhun->karat = $request->karat; + $marhun->berat = $request->berat_emas; + $marhun->harga = $request->harga; + $marhun->n_marhun = $request->nilai_marhun; + $marhun->hargaasas = $request->harga_asas; + $marhun->save(); + + $lelongbid->berat = $lelongbid->berat - ($bezaberat); + $lelongbid->hargaasas = $lelongbid->hargaasas - ($bezahargaasas); + $lelongbid->save(); + + $pengesahan = Pengesahan::where('lelongbidmarhun_id', $request->idmarhun) + ->where('lelongbid_id', $marhun->lelongbid_id) + ->get(); + + if(isset($pengesahan['id'])) + { + $pengesahan->id = $pengesahan->id; + $pengesahan->lelong_id = $lelong->id; + $pengesahan->lelongbid_id = $lelongbid->id; + $pengesahan->lelongbidmarhun_id = $marhun->id; + $pengesahan->norujukan = $lelongbid->norujukan; + $pengesahan->diminta_oleh = $user->id; + $pengesahan->diminta_pada = $currentdate; + $pengesahan->status_ubah = 4; + $pengesahan->save(); + } + else + { + $berat = new Pengesahan; + $berat->lelong_id = $lelong->id; + $berat->lelongbid_id = $lelongbid->id; + $berat->lelongbidmarhun_id = $marhun->id; + $berat->norujukan = $lelongbid->norujukan; + $berat->diminta_oleh = $user->id; + $berat->diminta_pada = $currentdate; + $berat->status_ubah = 4; + $berat->save(); + } + + } + //beza berat kurang daripada 0.30 & penambahan berat (tak perlu pengesahan) + else + { + $marhun->id = $request->idmarhun; + $marhun->marhun = $request->marhun; + $marhun->karat = $request->karat; + $marhun->berat = $request->berat_emas; + $marhun->harga = $request->harga; + $marhun->n_marhun = $request->nilai_marhun; + $marhun->hargaasas = $request->harga_asas; + $marhun->save(); + + $pengesahan = Pengesahan::where('lelongbidmarhun_id', $request->idmarhun) + ->where('lelongbid_id', $marhun->lelongbid_id) + ->delete(); + $lelongbid->berat = $lelongbid->berat - ($bezaberat); + $lelongbid->hargaasas = $lelongbid->hargaasas - ($bezahargaasas); + $lelongbid->save(); + } return redirect()->route('marhun.show', [$lelongbid->id, $lelong->id]) ->with('success','Kemaskini Marhun Berjaya'); @@ -131,7 +241,6 @@ class MarhunController extends Controller $lelkarat = LelKarat::where('lelong_id','=',$lelongbid->lelong_id)->get(); $karatall = JenisKarat::all(); $emasall = JenisEmas::all(); - // dd($lelkarat); return view('marhun.marhun',compact('marhun','lelongbid','karatall','emasall','lelkarat', 'lelong_id')); } @@ -155,9 +264,27 @@ class MarhunController extends Controller public function semak($id, $lelong_id) { + //$id => lelongbid_id $lelongbid = LelongBid::where('id','=',$id) ->where('lelong_id', $lelong_id) ->first(); + + $lelongbidmarhun = LelongBidMarhun::where('lelongbid_id', $id)->get(); + + foreach($lelongbidmarhun as $lelbidmarhun) + { + if($lelbidmarhun['karat'] == null && $lelbidmarhun['berat'] == null && $lelbidmarhun['harga'] == null && $lelbidmarhun['n_marhun'] == null && $lelbidmarhun['hargaasas'] == null) + { + $lelbidmarhun->lelongbid_id = $id; + $lelbidmarhun->karat = $lelbidmarhun['old_karat']; + $lelbidmarhun->berat = $lelbidmarhun['old_berat']; + $lelbidmarhun->harga = $lelbidmarhun['old_harga']; + $lelbidmarhun->n_marhun = $lelbidmarhun['old_nmarhun']; + $lelbidmarhun->hargaasas = $lelbidmarhun['old_hargaasas']; + $lelbidmarhun->save(); + } + } + $lelongbid->status_semak = 1; $lelongbid->save(); @@ -268,7 +395,6 @@ class MarhunController extends Controller public function sahubahmutu($id) { - $mutumarhun = Lelong::join('pengesahan', 'lelong.id', '=', 'pengesahan.lelong_id') ->where('lelong.id', $id) ->whereNull('disahkan_oleh') @@ -276,6 +402,18 @@ class MarhunController extends Controller ->groupBy('pengesahan.norujukan') ->get()->toArray(); + foreach($mutumarhun as $index1=>$mutu) + { + $cawangan = CawanganLelong::join('cawangan', 'cawangan_lelong.caw_id', 'cawangan.id') + ->join('lelongbid', 'cawangan_lelong.lelong_id', '=', 'lelongbid.lelong_id') + ->where('lelongbid.lelong_id', $id) + ->where('lelongbid.norujukan', $mutu['norujukan']) + ->select('cawangan.caw_name') + ->first(); + // dd($cawangan); + $mutumarhun[$index1]['cawangan_name'] = $cawangan; + } + // foreach($mutumarhun as $index1=>$marhun) // { // $pengesahan = Pengesahan::where('lelong_id', $id) @@ -292,50 +430,84 @@ class MarhunController extends Controller public function mutumarhun($norujukan, $id) { - $pengesahans = Pengesahan::where('lelong_id', $id) - ->where('norujukan', $norujukan) + $lelbidmarhuns = LelongBidMarhun::join('lelongbid', 'lelongbidmarhun.lelongbid_id', '=', 'lelongbid.id') + ->where('lelongbid.lelong_id', $id) + ->where('lelongbid.norujukan', $norujukan) + ->select( + 'lelongbidmarhun.id as lelongbidmarhun_id', + 'lelongbid.id as lelongbid_id', + 'lelongbidmarhun.bil', + 'lelongbidmarhun.marhun', + 'lelongbidmarhun.nota', + 'lelongbidmarhun.karat', + 'lelongbidmarhun.berat', + 'lelongbidmarhun.harga', + 'lelongbidmarhun.n_marhun', + 'lelongbidmarhun.hargaasas', + 'lelongbidmarhun.status_semak', + 'lelongbid.lelong_id', + 'lelongbid.caw_id', + 'lelongbid.kodcaw', + 'lelongbid.norujukan', + 'lelongbid.t_lelong', + 'lelongbid.jbg', + 'lelongbid.kadarupah', + 'lelongbid.upahsimpan', + 'lelongbid.ansuran', + 'lelongbid.nilaimarhun', + 'lelongbid.pinjaman', + 'lelongbid.bakiupah', + 'lelongbid.cajlelong', + 'lelongbid.baki', + 'lelongbid.percent', + ) ->get(); - - $arraypengesahan = []; - foreach($pengesahans as $pengesahan) - { - // dd($pengesahan); - $marhuns = LelongBidMarhun::where('lelongbid_id', $pengesahan->lelongbid_id) - ->where('id', $pengesahan->lelongbidmarhun_id) + + $arraylelbidmarhun = []; + $bakilelong = 0; + $rugilelong = 0; + foreach($lelbidmarhuns as $lelbidmarhun) + { + $marhuns = LelongBidMarhun::where('lelongbid_id', $lelbidmarhun->lelongbid_id) + ->where('id', $lelbidmarhun->lelongbidmarhun_id) ->get()->toArray(); - - $lelongbid = LelongBid::where('id', $pengesahan->lelongbid_id)->first(); + + $lelongbid = LelongBid::where('id', $lelbidmarhun->lelongbid_id)->where('lelong_id', $id)->first(); $karat = Lelkarat::where('lelong_id', $id)->get(); foreach($marhuns as $index1=>$marhun) { - $status = Pengesahan::where('id', $pengesahan->id) + $status = Pengesahan::where('lelongbidmarhun_id', $lelbidmarhun->lelongbidmarhun_id) ->where('lelongbid_id', $marhun['lelongbid_id']) ->select('status_ubah') ->value('status_ubah'); $gadaimarhun = GadaiMarhun::where('marhun', $marhun['marhun']) - ->where('norujukan', $lelongbid->norujukan) + ->where('norujukan', $lelongbid->norujukan) ->first(); - - $karat = $karat->where('karat', $gadaimarhun->karat)->first(); - - $total = $karat->harga * $gadaimarhun->berat; - $hargaasas = round($total); - - $marhuns[$index1]['old_marhun'] = $gadaimarhun->marhun; - $marhuns[$index1]['old_karat'] = $gadaimarhun->karat; - $marhuns[$index1]['old_berat'] = $gadaimarhun->berat; - $marhuns[$index1]['old_harga'] = $karat->harga; - $marhuns[$index1]['old_nilaimarhun'] = $total; - $marhuns[$index1]['old_hargaasas'] = $hargaasas; - $marhuns[$index1]['status_ubah'] = $status; - } - - array_push($arraypengesahan,$marhuns); - } - return view('pengesahan.mutumarhun', compact('lelongbid', 'norujukan', 'id', 'arraypengesahan', 'marhuns')); + if($lelongbid->baki > 0) + { + $bakilelong = $bakilelong + $lelongbid->baki; + } + else + { + $rugilelong = $rugilelong - $lelongbid->baki; + } + + $marhuns[$index1]['harga_gadai'] = $gadaimarhun->harga; + $marhuns[$index1]['nmarhun_gadai'] = $gadaimarhun->n_marhun; + $marhuns[$index1]['old_marhun'] = $gadaimarhun->marhun; + $marhuns[$index1]['status_ubah'] = $status; + $marhuns[$index1]['pembiayaan'] = $lelongbid->pinjaman; + $marhuns[$index1]['baki_lelong'] = $bakilelong; + $marhuns[$index1]['rugi_lelong'] = $rugilelong; + } + array_push($arraylelbidmarhun,$marhuns); + } + + + return view('pengesahan.mutumarhun', compact('lelongbid', 'norujukan', 'id', 'arraylelbidmarhun', 'marhuns')); } public function terimaperubahan(Request $request) @@ -349,6 +521,7 @@ class MarhunController extends Controller $pengesahan = Pengesahan::where('id', $request->pengesahan_id) ->first(); + dd($pengesahan); $pengesahan->disahkan_oleh = $user->id; $pengesahan->disahkan_pada = $currentdate; $pengesahan->update(); diff --git a/app/Http/Controllers/PaymentController.php b/app/Http/Controllers/PaymentController.php index f83a0e4f..b0c37542 100644 --- a/app/Http/Controllers/PaymentController.php +++ b/app/Http/Controllers/PaymentController.php @@ -24,6 +24,7 @@ class PaymentController extends Controller $senarai = CawanganLelong::join('lelong', 'cawangan_lelong.lelong_id', '=', 'lelong.id') ->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id') ->where('cawangan.caw_code', $user->kodcaw) + ->where('sts_lelong', 3) ->get(); // dd($senarai); @@ -41,7 +42,6 @@ class PaymentController extends Controller ) ->groupBy('lelongbidder.user_id') ->get()->toArray(); - // dd($listwinner); foreach($listwinner as $index1=>$winner){ @@ -52,13 +52,20 @@ class PaymentController extends Controller ->where('lelongbid.lelong_id', $lelong_id) ->get(); - - $payment_id = $$SAGWin = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') + $sts_payment = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') + ->where('user_id', $winner['user_id']) + ->where('lelongbidder.status_bidder', 1) + ->where('lelongbid.lelong_id', $lelong_id) + ->select('lelongbidder.status_payment') + ->get(); + // dd($sts_payment[0]['status_payment']); + + $payment_id = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') ->where('user_id', $winner['user_id']) ->where('lelongbidder.status_bidder', 1) ->where('lelongbid.lelong_id', $lelong_id) ->select('payment_id')->groupBy('payment_id')->get(); - // dd($payment_id); + $total_payment = 0; foreach($payment_id as $id){ $payment = Payment::where('id', $id->payment_id) @@ -73,6 +80,7 @@ class PaymentController extends Controller $listwinner[$index1]['total_surat'] = sizeof($SAGWin); $listwinner[$index1]['totalBid'] = $SAGWin->sum('hargabida'); $listwinner[$index1]['totalPay'] = $total_payment; + $listwinner[$index1]['sts_payment'] = $sts_payment[0]['status_payment']; } @@ -108,7 +116,6 @@ class PaymentController extends Controller ) ->get(); - return view('pembayaran.SAGBidItem',compact('SAGBidItem', 'eachbid', 'lelong_id','user_id')); } @@ -125,7 +132,7 @@ class PaymentController extends Controller $resit = Resit::where('lelong_id', $request->lelong_id) ->where('user_id',$request->user_id) ->where('resit_type', 2) - ->first(); + ->first(); $total_hargabida = 0; $payment = Payment::create([ @@ -212,4 +219,47 @@ class PaymentController extends Controller return view('pembayaran.pengesahanPembayaran',compact('pengesahanPembayaran')); } + + public function banktransfer(Request $request) + { + // dd($request->all()); + + $currentdate = Carbon::now(); + $currentdate = $currentdate->toDateTimeString(); + + $user = Auth::user(); + // dd($user); + + $totalcheck = implode(",", $request->checkboxdata); + + $resit = Resit::where('lelong_id', $request->lelong_id) + ->where('user_id',$request->user_id) + ->where('resit_type', 2) + ->first(); + + $payment = new Payment; + $payment->user_id = $request->user_id; + $payment->lelong_id = $request->lelong_id; + $payment->kodcaw = $user->kodcaw; + $payment->status_payment_opt = 3; + $payment->status = 2; + $payment->remark = 'BAYARAN CDM'; + $payment->resit_id = $resit->id; + $payment->total_payment = $totalcheck; + $payment->diminta_pada = $currentdate; + $payment->diminta_oleh = $user->id; + $payment->save(); + + $sts_payment = LelongBidder::where('user_id', $request->user_id) + ->where('lelongbid_id', $request->eachbid) + ->first(); + + $sts_payment->payment_id = $payment->id; + $sts_payment->status_payment = 2; //Menunggu pengesahan account + $sts_payment->update(); + + return redirect()->route('pembayaran.SenaraiLelongBayar') + ->with('success','Menunggu Pengesahan Account'); + + } } diff --git a/app/Http/Controllers/PembidaController.php b/app/Http/Controllers/PembidaController.php index df679cc5..ccbb0934 100644 --- a/app/Http/Controllers/PembidaController.php +++ b/app/Http/Controllers/PembidaController.php @@ -6,11 +6,15 @@ use Illuminate\Http\Request; use Spatie\Permission\Models\Role; use Spatie\Permission\Models\Permission; use Illuminate\Support\Facades\Auth; -use App\Models\User; -use App\Models\File; use PDF; use Carbon\Carbon; +use App\Models\User; +use App\Models\File; +use App\Models\Lelong; +use App\Models\CawanganLelong; +use App\Models\LelongBidder; +use App\Models\Payment; class PembidaController extends Controller { @@ -168,6 +172,85 @@ class PembidaController extends Controller return redirect()->route('pembida.senaraipembidakeseluruhan')->with('success','Pembida Berjaya Dikemaskini'); } + + public function senlelpembayaranbidaan(Request $request) + { + $lelong = CawanganLelong::join('lelong', 'cawangan_lelong.lelong_id', '=', 'lelong.id') + ->join('cawangan', 'cawangan_lelong.caw_id', '=', 'cawangan.id') + ->where('lelong.sts_lelong', 3) + ->get(); + + return view('pembida.senlelpembayaranbidaan',compact('lelong')); + } + + public function pembayaranbidaan(Request $request) + { + // dd($request->all()); + $listwinner = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') + ->where('lelongbidder.status_bidder', 1) + ->where('lelongbid.lelong_id', $request->lelong_id) + ->select('lelongbidder.user_id' + ) + ->groupBy('lelongbidder.user_id') + ->get()->toArray(); + + foreach($listwinner as $index1=>$winner){ + + $userdetails = User::where('id', $winner['user_id'])->first(); + $SAGWin = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') + ->where('user_id', $winner['user_id']) + ->where('lelongbidder.status_bidder', 1) + ->where('lelongbid.lelong_id', $request->lelong_id) + ->get(); + + $sts_payment = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') + ->where('user_id', $winner['user_id']) + ->where('lelongbidder.status_bidder', 1) + ->where('lelongbid.lelong_id', $request->lelong_id) + ->select('lelongbidder.status_payment') + ->get(); + + $detailspayment = LelongBidder::join('payment', 'lelongbidder.payment_id', '=', 'payment.id') + ->where('payment.kodcaw', $request->kodcaw) + ->where('payment.lelong_id', $request->lelong_id) + ->whereNotNull('payment.disahkan_pada') + ->where('lelongbidder.status_bidder', 1) + ->where('lelongbidder.status_payment', 1) + ->get(); + + $payment_id = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') + ->where('user_id', $winner['user_id']) + ->where('lelongbidder.status_bidder', 1) + ->where('lelongbid.lelong_id', $request->lelong_id) + ->select('payment_id')->groupBy('payment_id')->get(); + + $total_payment = 0; + foreach($payment_id as $id){ + $payment = Payment::where('id', $id->payment_id) + ->first(); + + if($payment){ + $total_payment = $total_payment + $payment->total_payment; + } + } + + $listwinner[$index1]['details'] = $userdetails; + $listwinner[$index1]['total_surat'] = sizeof($SAGWin); + $listwinner[$index1]['totalBid'] = $SAGWin->sum('hargabida'); + $listwinner[$index1]['totalPay'] = $total_payment; + $listwinner[$index1]['sts_payment'] = $sts_payment[0]['status_payment']; + $listwinner[$index1]['status'] = $detailspayment[0]['status']; + $listwinner[$index1]['remark'] = $detailspayment[0]['remark']; + + } + + return view('pembida.pembayaranbidaan',compact('listwinner')); + } + + public function detailsbidaan(Request $request) + { + + } } \ No newline at end of file diff --git a/app/Http/Controllers/SimulasiController.php b/app/Http/Controllers/SimulasiController.php index c59d8d5c..3747c527 100644 --- a/app/Http/Controllers/SimulasiController.php +++ b/app/Http/Controllers/SimulasiController.php @@ -57,8 +57,7 @@ class SimulasiController extends Controller public function janadata(Request $request) { - - + // dd($request->all()); $t_lelong = Carbon::parse($request->tarikh_lelong); $bulan = (int)round($request->jbg); $jbgadai = ($t_lelong->subMonths($bulan))->toDateString(); diff --git a/app/Http/Controllers/TamatKontController.php b/app/Http/Controllers/TamatKontController.php new file mode 100644 index 00000000..c491eed6 --- /dev/null +++ b/app/Http/Controllers/TamatKontController.php @@ -0,0 +1,217 @@ +tarikh_lelong; + + $user = Auth::user(); + $getsurat = Gadai::where('t_matang1', '<', $t_lelong) + ->where('kodcaw', $user->kodcaw) + ->where('sttebus', '=', '') + ->where('taglel', '=', 0) + ->where('tagpalsu', '=', 0) + ->where('tagpalsu2', '=', 0) + ->whereNotNull('upah12') + ->get(); + + + if(sizeof($getsurat) != 0) + { + + $t_gadais = Gadai::where('t_matang1', '<', $t_lelong) + ->where('sttebus', '=', '') + ->where('taglel', '=', 0) + ->where('tagpalsu', '=', 0) + ->where('tagpalsu2', '=', 0) + ->whereNotNull('upah12') + ->orderBy('t_gadai') + ->select('t_gadai') + ->first(); + + $bil_lelongcaw = Gadai::join('cawangan', 'gadai.kodcaw', '=', 'cawangan.caw_code') + ->where('gadai.t_matang1', '<', $t_lelong) + ->where('kodcaw', $user->kodcaw) + ->where('gadai.sttebus', '=', '') + ->where('gadai.taglel', '=', 0) + ->where('gadai.tagpalsu', '=', 0) + ->where('gadai.tagpalsu2', '=', 0) + ->whereNotNull('gadai.upah12') + ->selectRaw('count(*) as bil_lelong') + ->get()->toArray(); + + + $tarikh_lelong = Carbon::parse($t_lelong); + $t_anggaran = ($tarikh_lelong->subMonths(1))->toDateString(); + + foreach($getsurat as $index1=>$surats) + { + $senarai = Gadai::join('cawangan', 'gadai.kodcaw', '=', 'cawangan.caw_code') + ->where('norujukan', $surats['norujukan']) + ->get(); + + $getsurat[$index1]['list_norujukan'] = $senarai; + } + + // $keuntungantlhbyr = TransaksiKeuntungan::on('mysql2') + // ->sum('bayaran_keuntungan'); + + return view('jananotis.gadaibycaw', compact( 'getsurat', + 't_lelong', + 'user', + 't_gadais', + 't_anggaran', + 'bil_lelongcaw' + )); + } + else if(sizeof($getsurat) == 0) + { + return redirect()->route('jananotis.notistamatkontrak') + ->with('failed','Tiada surat untuk di lelong'); + } + else + { + return redirect()->route('jananotis.notistamatkontrak') + ->with('failed','Sila Masukkan Tarikh Lelongan'); + } + + } + + //Operasi + public function sebelumtamatkont(Request $request) + { + return view('jananotis.sebelumtamatkont'); + } + + public function senaraitemp(Request $request) + { + $t_lelong = $request->tarikh_lelong; + + if($t_lelong != null) + { + $getsurat = Gadai::where('t_matang1', '<', $t_lelong) + ->where('sttebus', '=', '') + ->where('taglel', '=', 0) + ->where('tagpalsu', '=', 0) + ->where('tagpalsu2', '=', 0) + ->whereNotNull('upah12') + ->get(); + // dd($getsurat); + if(sizeof($getsurat) == 0) + { + return redirect()->route('notistamatkontrak.sebelumtamatkont') + ->with('failed','Tiada surat untuk di lelong'); + } + + $t_gadais = Gadai::where('t_matang1', '<', $t_lelong) + ->where('sttebus', '=', '') + ->where('taglel', '=', 0) + ->where('tagpalsu', '=', 0) + ->where('tagpalsu2', '=', 0) + ->whereNotNull('upah12') + ->orderBy('t_gadai') + ->select('t_gadai') + ->first(); + + $senarai = Gadai::join('cawangan', 'gadai.kodcaw', '=', 'cawangan.caw_code') + ->where('gadai.t_matang1', '<', $t_lelong) + ->where('gadai.sttebus', '=', '') + ->where('gadai.taglel', '=', 0) + ->where('gadai.tagpalsu', '=', 0) + ->where('gadai.tagpalsu2', '=', 0) + ->whereNotNull('gadai.upah12') + ->groupBy('gadai.kodcaw','cawangan.caw_name') + ->selectRaw('count(*) as bil_lelong, + sum(berat) as total_berat, + sum(nilaimarhun) as total_nilaimarhun, + sum(pinjaman) as total_pembiayaan, + sum(bakipjm) as total_bakipjm, + gadai.kodcaw, + cawangan.caw_name as caw_name' + ) + ->get(); + + $bil_lelong = sizeof($getsurat); + + return view('jananotis.senaraitemp', compact( 't_lelong', + 'getsurat', + 'senarai', + 't_gadais' + )); + } + else + { + return redirect()->route('notistamatkontrak.sebelumtamatkont') + ->with('failed','Sila Masukkan Tarikh Lelongan'); + } + + } + + public function tempbycaw($details, $t_lelong) + { + $getsurat = Gadai::where('t_matang1', '<', $t_lelong) + ->where('kodcaw', $details) + ->where('sttebus', '=', '') + ->where('taglel', '=', 0) + ->where('tagpalsu', '=', 0) + ->where('tagpalsu2', '=', 0) + ->whereNotNull('upah12') + ->get(); + + $t_gadais = Gadai::where('t_matang1', '<', $t_lelong) + ->where('sttebus', '=', '') + ->where('taglel', '=', 0) + ->where('tagpalsu', '=', 0) + ->where('tagpalsu2', '=', 0) + ->whereNotNull('upah12') + ->orderBy('t_gadai') + ->select('t_gadai') + ->first(); + + $tarikh_lelong = Carbon::parse($t_lelong); + $t_anggaran = ($tarikh_lelong->subMonths(1))->toDateString(); + + foreach($getsurat as $index1=>$surats) + { + $senarai = Gadai::join('cawangan', 'gadai.kodcaw', '=', 'cawangan.caw_code') + ->where('norujukan', $surats['norujukan']) + ->get(); + dd($senarai); + $getsurat[$index1]['list_norujukan'] = $senarai; + } + + // $keuntungantlhbyr = TransaksiKeuntungan::on('mysql2') + // ->sum('bayaran_keuntungan'); + + return view('jananotis.tempbycaw', compact( 'getsurat', + 'details', + 'senarai', + 't_lelong', + 't_gadais', + 't_anggaran', + 'tarikh_lelong' + )); + } + + // public function janasimulasi($t_lelong, ) +} diff --git a/composer.json b/composer.json index 6c0c5c04..6fb524f9 100644 --- a/composer.json +++ b/composer.json @@ -19,6 +19,7 @@ "spatie/laravel-permission": "^5.3" }, "require-dev": { + "barryvdh/laravel-debugbar": "^3.6", "facade/ignition": "^2.5", "fakerphp/faker": "^1.9.1", "laravel/sail": "^1.0.1", diff --git a/composer.lock b/composer.lock index 2ac71203..766ef0da 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "19afa9eb7e1656eb3f55bbf757c7b260", + "content-hash": "1f26af21cdf299942137e16bdee7fbea", "packages": [ { "name": "asm89/stack-cors", @@ -7236,6 +7236,91 @@ } ], "packages-dev": [ + { + "name": "barryvdh/laravel-debugbar", + "version": "v3.6.7", + "source": { + "type": "git", + "url": "https://github.com/barryvdh/laravel-debugbar.git", + "reference": "b96f9820aaf1ff9afe945207883149e1c7afb298" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/b96f9820aaf1ff9afe945207883149e1c7afb298", + "reference": "b96f9820aaf1ff9afe945207883149e1c7afb298", + "shasum": "" + }, + "require": { + "illuminate/routing": "^6|^7|^8|^9", + "illuminate/session": "^6|^7|^8|^9", + "illuminate/support": "^6|^7|^8|^9", + "maximebf/debugbar": "^1.17.2", + "php": ">=7.2", + "symfony/debug": "^4.3|^5|^6", + "symfony/finder": "^4.3|^5|^6" + }, + "require-dev": { + "mockery/mockery": "^1.3.3", + "orchestra/testbench-dusk": "^4|^5|^6|^7", + "phpunit/phpunit": "^8.5|^9.0", + "squizlabs/php_codesniffer": "^3.5" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.6-dev" + }, + "laravel": { + "providers": [ + "Barryvdh\\Debugbar\\ServiceProvider" + ], + "aliases": { + "Debugbar": "Barryvdh\\Debugbar\\Facades\\Debugbar" + } + } + }, + "autoload": { + "files": [ + "src/helpers.php" + ], + "psr-4": { + "Barryvdh\\Debugbar\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Barry vd. Heuvel", + "email": "barryvdh@gmail.com" + } + ], + "description": "PHP Debugbar integration for Laravel", + "keywords": [ + "debug", + "debugbar", + "laravel", + "profiler", + "webprofiler" + ], + "support": { + "issues": "https://github.com/barryvdh/laravel-debugbar/issues", + "source": "https://github.com/barryvdh/laravel-debugbar/tree/v3.6.7" + }, + "funding": [ + { + "url": "https://fruitcake.nl", + "type": "custom" + }, + { + "url": "https://github.com/barryvdh", + "type": "github" + } + ], + "time": "2022-02-09T07:52:32+00:00" + }, { "name": "doctrine/instantiator", "version": "1.4.0", @@ -7805,6 +7890,72 @@ }, "time": "2021-11-05T08:25:44+00:00" }, + { + "name": "maximebf/debugbar", + "version": "v1.18.0", + "source": { + "type": "git", + "url": "https://github.com/maximebf/php-debugbar.git", + "reference": "0d44b75f3b5d6d41ae83b79c7a4bceae7fbc78b6" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/0d44b75f3b5d6d41ae83b79c7a4bceae7fbc78b6", + "reference": "0d44b75f3b5d6d41ae83b79c7a4bceae7fbc78b6", + "shasum": "" + }, + "require": { + "php": "^7.1|^8", + "psr/log": "^1|^2|^3", + "symfony/var-dumper": "^2.6|^3|^4|^5|^6" + }, + "require-dev": { + "phpunit/phpunit": "^7.5.20 || ^9.4.2", + "twig/twig": "^1.38|^2.7|^3.0" + }, + "suggest": { + "kriswallsmith/assetic": "The best way to manage assets", + "monolog/monolog": "Log using Monolog", + "predis/predis": "Redis storage" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.17-dev" + } + }, + "autoload": { + "psr-4": { + "DebugBar\\": "src/DebugBar/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Maxime Bouroumeau-Fuseau", + "email": "maxime.bouroumeau@gmail.com", + "homepage": "http://maximebf.com" + }, + { + "name": "Barry vd. Heuvel", + "email": "barryvdh@gmail.com" + } + ], + "description": "Debug bar in the browser for php application", + "homepage": "https://github.com/maximebf/php-debugbar", + "keywords": [ + "debug", + "debugbar" + ], + "support": { + "issues": "https://github.com/maximebf/php-debugbar/issues", + "source": "https://github.com/maximebf/php-debugbar/tree/v1.18.0" + }, + "time": "2021-12-27T18:49:48+00:00" + }, { "name": "mockery/mockery", "version": "1.4.4", @@ -9745,6 +9896,74 @@ ], "time": "2020-09-28T06:39:44+00:00" }, + { + "name": "symfony/debug", + "version": "v4.4.37", + "source": { + "type": "git", + "url": "https://github.com/symfony/debug.git", + "reference": "5de6c6e7f52b364840e53851c126be4d71e60470" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/debug/zipball/5de6c6e7f52b364840e53851c126be4d71e60470", + "reference": "5de6c6e7f52b364840e53851c126be4d71e60470", + "shasum": "" + }, + "require": { + "php": ">=7.1.3", + "psr/log": "^1|^2|^3" + }, + "conflict": { + "symfony/http-kernel": "<3.4" + }, + "require-dev": { + "symfony/http-kernel": "^3.4|^4.0|^5.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\Debug\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides tools to ease debugging PHP code", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/debug/tree/v4.4.37" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2022-01-02T09:41:36+00:00" + }, { "name": "theseer/tokenizer", "version": "1.2.1", diff --git a/database/migrations/2021_12_13_053311_create_cawangans_table.php b/database/migrations/2021_12_13_053311_create_cawangans_table.php index b1594c0e..0e58b8c6 100644 --- a/database/migrations/2021_12_13_053311_create_cawangans_table.php +++ b/database/migrations/2021_12_13_053311_create_cawangans_table.php @@ -223,6 +223,8 @@ class CreateCawangansTable extends Migration $table->string('nota'); $table->string('karat'); $table->decimal('berat', $precision = 7, $scale = 2); + $table->decimal('harga', $precision = 9, $scale = 2); + $table->decimal('n_marhun', $precision = 9, $scale = 2); $table->timestamps(); // $table->foreign('norujukan') diff --git a/database/migrations/2021_12_14_041557_create_lelongs_table.php b/database/migrations/2021_12_14_041557_create_lelongs_table.php index 09b63431..146f6470 100644 --- a/database/migrations/2021_12_14_041557_create_lelongs_table.php +++ b/database/migrations/2021_12_14_041557_create_lelongs_table.php @@ -15,7 +15,7 @@ class CreateLelongsTable extends Migration { Schema::create('lelong', function (Blueprint $table) { $table->bigIncrements('id'); - $table->string('tarikh_lelong'); + $table->date('tarikh_lelong'); $table->time('masamula_lelong')->nullable(); $table->time('masatamat_lelong')->nullable(); $table->dateTime('masakemaskini_data')->nullable(); @@ -23,7 +23,7 @@ class CreateLelongsTable extends Migration $table->string('harga_emas_asas'); $table->string('jbg'); $table->integer('cajlelong'); - $table->integer('sts_lelong')->default(0); + $table->integer('sts_lelong')->default(0); //1= start, 2 = jana pemenang, 3 = senarai pemenang $table->timestamps(); }); @@ -95,10 +95,15 @@ class CreateLelongsTable extends Migration $table->decimal('bil', $precision = 3, $scale = 0); $table->string('marhun'); $table->string('nota')->nullable(); + $table->string('old_karat'); $table->string('karat'); + $table->decimal('old_berat', $precision = 7, $scale = 2); $table->decimal('berat', $precision = 7, $scale = 2); + $table->decimal('old_harga', $precision = 5, $scale = 2); $table->decimal('harga', $precision = 5, $scale = 2); + $table->decimal('old_nmarhun', $precision = 9, $scale = 2); $table->decimal('n_marhun', $precision = 9, $scale = 2); + $table->decimal('old_hargaasas', $precision = 11, $scale = 2); $table->decimal('hargaasas', $precision = 11, $scale = 2); $table->integer('status_semak')->default(0)->nullable(); $table->timestamps(); diff --git a/database/migrations/2022_01_25_010223_create_payment_table.php b/database/migrations/2022_01_25_010223_create_payment_table.php index 2171df04..ca4d5bdd 100644 --- a/database/migrations/2022_01_25_010223_create_payment_table.php +++ b/database/migrations/2022_01_25_010223_create_payment_table.php @@ -22,7 +22,7 @@ class CreatePaymentTable extends Migration $table->string('bank_acc_no_pembeli')->nullable(); $table->string('nama_bank_acc_caw')->nullable(); $table->string('bank_no_acc_caw')->nullable(); - $table->integer('status_payment_opt')->nullable(); //1=kaunter,2=online + $table->integer('status_payment_opt')->nullable(); //1=kaunter,2=online,3=CDM $table->integer('resit_id'); $table->integer('status'); //1 = fee RM10 , 2 = paybidifwin $table->string('remark'); @@ -40,6 +40,8 @@ class CreatePaymentTable extends Migration $table->decimal('total_payment', $precision = 11, $scale = 2); $table->datetime('disahkan_pada')->nullable(); $table->integer('disahkan_oleh')->nullable(); + $table->datetime('diminta_pada')->nullable(); + $table->integer('diminta_oleh')->nullable(); $table->timestamps(); $table->foreign('user_id') diff --git a/database/migrations/2022_03_07_061858_create_pengesahan_table.php b/database/migrations/2022_03_07_061858_create_pengesahan_table.php index 98c764a4..a1c175a3 100644 --- a/database/migrations/2022_03_07_061858_create_pengesahan_table.php +++ b/database/migrations/2022_03_07_061858_create_pengesahan_table.php @@ -23,8 +23,8 @@ class CreatePengesahanTable extends Migration $table->datetime('disahkan_pada')->nullable(); $table->integer('diminta_oleh'); $table->datetime('diminta_pada'); - $table->integer('status')->default(0); //1 = terima - $table->integer('status_ubah')->default(0); //1 = ubah mutu, 2 = tambah marhun, 3 = hapus marhun + $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->timestamps(); $table->foreign('lelong_id') diff --git a/database/seeders/RolesSeeder.php b/database/seeders/RolesSeeder.php index 35b520c2..cc004140 100644 --- a/database/seeders/RolesSeeder.php +++ b/database/seeders/RolesSeeder.php @@ -111,6 +111,10 @@ class RolesSeeder extends Seeder 'name' => 'pengesahan', 'description' => 'Pengesahan Perubahan Mutu Marhun' ]); + Permission::create([ + 'name' => 'notistamatkontrak', + 'description' => 'Notis 30 Hari Sebelum Tamat Kontrak' + ]); //account Permission::create([ @@ -163,6 +167,7 @@ class RolesSeeder extends Seeder $role6->givePermissionTo('analisa'); $role6->givePermissionTo('pengesahanpembida'); $role6->givePermissionTo('pengesahan'); + $role6->givePermissionTo('notistamatkontrak'); $role7 = Role::create(['name' => 'account']); $role7->givePermissionTo('pengesahanbayaran'); diff --git a/resources/views/account/listbayaranonline.blade.php b/resources/views/account/listbayaranonline.blade.php index 9d27bcbf..0ea0e14c 100644 --- a/resources/views/account/listbayaranonline.blade.php +++ b/resources/views/account/listbayaranonline.blade.php @@ -40,6 +40,9 @@ @endforeach +
+ Kembali +
diff --git a/resources/views/account/sahsagonline.blade.php b/resources/views/account/sahsagonline.blade.php index f66642bd..fb0ca877 100644 --- a/resources/views/account/sahsagonline.blade.php +++ b/resources/views/account/sahsagonline.blade.php @@ -23,6 +23,7 @@ Harga Asas (RM) Harga Bida (RM) Masa Bidaan + Remark Status @@ -35,6 +36,9 @@ {{ $sag['hargaasas'] }} {{ $sag['hargabida'] }} {{ $sag['masa_bidaan'] }} + + + PAID @@ -45,7 +49,7 @@ Jumlah Bayaran RM - +
@@ -67,7 +71,7 @@ type: 'orange', typeAnimated: true, buttons: { - Simpan: { + Sahkan: { btnClass: 'btn-warning', action: function () { $("#formsahbayaronline").submit(); diff --git a/resources/views/includes/sidebar.blade.php b/resources/views/includes/sidebar.blade.php index 7c2f5f01..56c92cb8 100644 --- a/resources/views/includes/sidebar.blade.php +++ b/resources/views/includes/sidebar.blade.php @@ -67,6 +67,11 @@
  • +
    • @@ -180,6 +221,26 @@ + +@endsection \ No newline at end of file diff --git a/resources/views/pembida/senaraipembida.blade.php b/resources/views/pembida/senaraipembida.blade.php index 571a4ba0..5a5b9d2a 100644 --- a/resources/views/pembida/senaraipembida.blade.php +++ b/resources/views/pembida/senaraipembida.blade.php @@ -41,7 +41,7 @@ @elseif ($user->status =='banned') @endif --> - Menunggu Pengesahan Operasi + diff --git a/resources/views/pembida/senlelpembayaranbidaan.blade.php b/resources/views/pembida/senlelpembayaranbidaan.blade.php new file mode 100644 index 00000000..721cfcf7 --- /dev/null +++ b/resources/views/pembida/senlelpembayaranbidaan.blade.php @@ -0,0 +1,104 @@ +@extends('layouts.app') + +@section('content') + +
    +
    +
    + @if ($message = Session::get('success')) +
    +

    {{ $message }}

    +
    + @endif + + + + + + + + + + + + + + + @foreach($lelong as $lel) + + + + + + + + + + + @endforeach + +
    BilCawanganTarikh LelongHarga Emas SemasaJBGcajlelongStatus LelongAction
    {{ $loop->iteration }}{{ $lel->caw_name }}{{ $lel->tarikh_lelong }}{{ $lel->harga_emas_asas }}{{ $lel->jbg }}{{ $lel->cajlelong }} + @if($lel->sts_lelong == 3) + + @endif +
    +
    +
    +
    + + + +@endsection \ No newline at end of file diff --git a/resources/views/pengesahan/mutumarhun.blade.php b/resources/views/pengesahan/mutumarhun.blade.php index a7309b2b..d45dd124 100644 --- a/resources/views/pengesahan/mutumarhun.blade.php +++ b/resources/views/pengesahan/mutumarhun.blade.php @@ -7,7 +7,6 @@
    @csrf - @@ -16,78 +15,102 @@

    {{ $message }}

    @endif - - - - - - - - - - - - - - - - @foreach($arraypengesahan as $index1=>$detail) - - - - - - - - - - - - @endforeach - -
    BilNo RujukanMarhunKaratBeratHarga (RM)Nilai MarhunHarga AsasStatus
    {{ $loop->iteration }}{{ $lelongbid->norujukan }} - @if($detail[0]['old_marhun'] != $detail[0]['marhun']) - {{ $detail['old_marhun'] }} - @endif - {{ $detail[0]['marhun'] }} - - @if($detail[0]['old_karat'] != $detail[0]['karat']) - {{ $detail[0]['old_karat'] }} - @endif - {{ $detail[0]['karat'] }} - - @if($detail[0]['old_berat'] != $detail[0]['berat']) - {{ number_format($detail[0]['old_berat'], 2, '.', '') }} - @endif - {{ $detail[0]['berat'] }} - - @if($detail[0]['old_harga'] != $detail[0]['harga']) - {{ number_format($detail[0]['old_harga'], 2, '.', '') }} - @endif - {{ $detail[0]['harga'] }} - - @if($detail[0]['old_nilaimarhun'] != $detail[0]['n_marhun']) - {{ number_format($detail[0]['old_nilaimarhun'], 2, '.', '') }} - @endif - {{ $detail[0]['n_marhun'] }} - - @if($detail[0]['old_hargaasas'] != $detail[0]['hargaasas']) - {{ number_format($detail[0]['old_hargaasas'], 2, '.', '') }} - @endif - {{ $detail[0]['hargaasas'] }} - - @if($detail[0]['status_ubah'] == 1) - - @elseif($detail[0]['status_ubah'] == 2) - - @elseif($detail[0]['status_ubah'] == 3) - - @endif -
    + +
    +
    +
    +

    Norujukan : {{ $lelongbid->norujukan }}

    +

    Pembiayaan : {{ $marhuns[0]['pembiayaan'] }}

    +

    Keuntungan :

    +

    Baki Lelong : {{ $marhuns[0]['baki_lelong'] }}

    +

    Rugi Lelong : {{ $marhuns[0]['rugi_lelong'] }}

    +
    +
    +
    + + + + + + + + + + + + + + + + + @foreach($arraylelbidmarhun as $index1=>$detail) + + + + + + + + + + + + + @endforeach + +
    BilMarhunKaratBeratHarga Gadaian (RM)Harga Lelong (RM)Nilai Marhun GadaianNilai Marhun LelongHarga AsasStatus
    {{ $loop->iteration }} + @if($detail[0]['old_marhun'] != $detail[0]['marhun']) + {{ $detail['old_marhun'] }} + @endif + {{ $detail[0]['marhun'] }} + + @if($detail[0]['old_karat'] != $detail[0]['karat']) + {{ $detail[0]['old_karat'] }} + @endif + {{ $detail[0]['karat'] }} + + @if($detail[0]['old_berat'] != $detail[0]['berat']) + {{ number_format($detail[0]['old_berat'], 2, '.', '') }} + @endif + {{ $detail[0]['berat'] }} + + {{ $detail[0]['harga_gadai'] }} + + @if($detail[0]['old_harga'] != $detail[0]['harga']) + {{ number_format($detail[0]['old_harga'], 2, '.', '') }} + @endif + {{ $detail[0]['harga'] }} + + {{ $detail[0]['nmarhun_gadai'] }} + + @if($detail[0]['old_nmarhun'] != $detail[0]['n_marhun']) + {{ number_format($detail[0]['old_nmarhun'], 2, '.', '') }} + @endif + {{ $detail[0]['n_marhun'] }} + + @if($detail[0]['old_hargaasas'] != $detail[0]['hargaasas']) + {{ number_format($detail[0]['old_hargaasas'], 2, '.', '') }} + @endif + {{ $detail[0]['hargaasas'] }} + + @if($detail[0]['status_ubah'] == 1) + + @elseif($detail[0]['status_ubah'] == 2) + + @elseif($detail[0]['status_ubah'] == 3) + + @elseif($detail[0]['status_ubah'] == 4) + + @elseif($detail[0]['status_ubah'] == 5) + + @else + + @endif +
    Kembali - +
    diff --git a/resources/views/pengesahan/perubahanmutumarhun.blade.php b/resources/views/pengesahan/perubahanmutumarhun.blade.php index 2e9413e6..ad13942b 100644 --- a/resources/views/pengesahan/perubahanmutumarhun.blade.php +++ b/resources/views/pengesahan/perubahanmutumarhun.blade.php @@ -14,6 +14,7 @@ Bil + Cawangan No Rujukan Status Action @@ -23,6 +24,7 @@ @foreach($mutumarhun as $marhun) + {{ $marhun['cawangan_name']['caw_name'] }} {{ $marhun['norujukan'] }} @if($marhun['total'] === intval($marhun['tstat'])) @@ -41,6 +43,7 @@ @endforeach +
    Kembali diff --git a/resources/views/serahan/pembayaran.blade.php b/resources/views/serahan/pembayaran.blade.php index 1b353a3d..dfd1875e 100644 --- a/resources/views/serahan/pembayaran.blade.php +++ b/resources/views/serahan/pembayaran.blade.php @@ -30,14 +30,12 @@ {{ $pay['details']['notelbimbit']}} {{ $pay['total_surat']}} {{ $pay['totalBid']}} - {{-- --}} - - - + + @endforeach diff --git a/routes/web.php b/routes/web.php index 1cddffab..ed5c4cd6 100644 --- a/routes/web.php +++ b/routes/web.php @@ -164,6 +164,8 @@ Route::group(['middleware' => ['permission:pengesahanpembida'],'prefix'=>'pembid Route::post('/reject',['as'=>'pembida.reject','uses'=>'PembidaController@reject']); Route::get('/kemaskini/{id}',['as'=>'pembida.kemaskini','uses'=>'PembidaController@kemaskini']); Route::post('/update',['as'=>'pembida.update','uses'=>'PembidaController@update']); + Route::get('/senlelpembayaranbidaan',['as'=>'pembida.senlelpembayaranbidaan','uses'=>'PembidaController@senlelpembayaranbidaan']); + Route::get('/pembayaranbidaan',['as'=>'pembida.pembayaranbidaan','uses'=>'PembidaController@pembayaranbidaan']); }); Route::group(['middleware' => ['permission:pengesahan'],'prefix'=>'pengesahan'], function () { @@ -176,6 +178,12 @@ Route::group(['middleware' => ['permission:pengesahan'],'prefix'=>'pengesahan'], Route::get('/senaraitangguhlelong/{id}',['as'=>'pengesahan.senaraitangguhlelong','uses'=>'MarhunController@senaraitangguhlelong']); Route::get('/lelbidmarhun/{id}/{norujukan}',['as'=>'pengesahan.lelbidmarhun','uses'=>'MarhunController@lelbidmarhun']); }); + +Route::group(['middleware' => ['permission:notistamatkontrak'],'prefix'=>'notistamatkontrak'], function () { + Route::get('/sebelumtamatkont',['as'=>'notistamatkontrak.sebelumtamatkont','uses'=>'TamatKontController@sebelumtamatkont']); + Route::post('/senaraitemp',['as'=>'notistamatkontrak.senaraitemp','uses'=>'TamatKontController@senaraitemp']); + Route::get('/tempbycaw/{details}/{t_lelong}',['as'=>'notistamatkontrak.tempbycaw','uses'=>'TamatKontController@tempbycaw']); +}); //Operasi Route::group(['middleware' => ['permission:serahan'],'prefix'=>'serahan'], function () { @@ -193,6 +201,7 @@ Route::group(['middleware' => ['permission:pengesahanbayarancash'],'prefix'=>'pe Route::get('/SAGBidItem/{user_id}/{lelong_id}', ['as'=>'pembayaran.SAGBidItem','uses'=>'PaymentController@SAGBidItem']); Route::get('/SenaraiLelongBayar', ['as'=>'pembayaran.SenaraiLelongBayar','uses'=>'PaymentController@SenaraiLelongBayar']); Route::post('/paymentdenokaunter', ['as'=>'pembayaran.paymentdenokaunter','uses'=>'PaymentController@paymentdenokaunter']); + Route::post('/banktransfer', ['as'=>'pembayaran.banktransfer','uses'=>'PaymentController@banktransfer']); }); // Pengurus Cawangan @@ -209,6 +218,8 @@ Route::group(['middleware' => ['permission:pengesahanbayaran'],'prefix'=>'accoun Route::group(['middleware' => ['permission:jananotis'],'prefix'=>'jananotis'], function () { Route::get('/notislelong',['as'=>'jananotis.notislelong','uses'=>'NotisController@notislelong']); + Route::get('/notistamatkontrak',['as'=>'jananotis.notistamatkontrak','uses'=>'TamatKontController@notistamatkontrak']); + Route::post('/gadaibycaw',['as'=>'jananotis.gadaibycaw','uses'=>'TamatKontController@gadaibycaw']); Route::get('/pembida',['as'=>'jananotis.pembida','uses'=>'NotisController@pembida']); Route::get('/senarainotis/{lelong_id}',['as'=>'jananotis.senarainotis','uses'=>'NotisController@senarainotis']); Route::get('/jananotis/{lelong_id}',['as'=>'jananotis.jananotis','uses'=>'NotisController@jananotis']); diff --git a/storage/debugbar/.gitignore b/storage/debugbar/.gitignore new file mode 100644 index 00000000..d6b7ef32 --- /dev/null +++ b/storage/debugbar/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore