diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php index a39c13af..28bc1c6e 100644 --- a/app/Http/Controllers/MarhunController.php +++ b/app/Http/Controllers/MarhunController.php @@ -56,69 +56,90 @@ class MarhunController extends Controller public function kemaskini(Request $request) { + // dd($request->all()); $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->berat - $request->berat_emas; + $bezahargaasas = $marhun->hargaasas - $request->harga_asas; + + if($request->karat < $marhun->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(); + + $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(); + } - // 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(); + 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(); - // } - // } - + $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->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(); + } return redirect()->route('marhun.show', [$lelongbid->id, $lelong->id]) ->with('success','Kemaskini Marhun Berjaya'); @@ -267,7 +288,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') @@ -285,30 +305,58 @@ class MarhunController extends Controller // $mutumarhun[$index1]['pengesahan_id'] = $pengesahan; // } - return view('pengesahan.perubahanmutumarhun', compact('mutumarhun', 'id')); + return view('pengesahan.perubahanmutumarhun', compact('mutumarhun', 'id', )); } 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 = []; + 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)->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'); @@ -330,16 +378,59 @@ class MarhunController extends Controller $marhuns[$index1]['old_hargaasas'] = $hargaasas; $marhuns[$index1]['status_ubah'] = $status; } - - array_push($arraypengesahan,$marhuns); + array_push($arraylelbidmarhun,$marhuns); } + + // $pengesahans = Pengesahan::where('lelong_id', $id) + // ->where('norujukan', $norujukan) + // ->get(); + + // $arraypengesahan = []; + // foreach($pengesahans as $pengesahan) + // { + // $marhuns = LelongBidMarhun::where('lelongbid_id', $pengesahan->lelongbid_id) + // ->where('id', $pengesahan->lelongbidmarhun_id) + // ->get()->toArray(); - return view('pengesahan.mutumarhun', compact('lelongbid', 'norujukan', 'id', 'arraypengesahan', 'marhuns')); + // $lelongbid = LelongBid::where('id', $pengesahan->lelongbid_id)->first(); + // $karat = Lelkarat::where('lelong_id', $id)->get(); + + // foreach($marhuns as $index1=>$marhun) + // { + // $status = Pengesahan::where('id', $pengesahan->id) + // ->where('lelongbid_id', $marhun['lelongbid_id']) + // ->select('status_ubah') + // ->value('status_ubah'); + + // $gadaimarhun = GadaiMarhun::where('marhun', $marhun['marhun']) + // ->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; + // $marhuns[$index1]['pengesahanid'] = $pengesahan_id; + // } + // array_push($arraypengesahan,$marhuns); + + + // } + + return view('pengesahan.mutumarhun', compact('lelongbid', 'norujukan', 'id', 'arraylelbidmarhun', 'marhuns')); } public function terimaperubahan(Request $request) { - // dd($request->all()); + dd($request->all()); //update mutu marhun - gadaimarhun $user = Auth::user(); @@ -348,6 +439,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/database/migrations/2022_03_07_061858_create_pengesahan_table.php b/database/migrations/2022_03_07_061858_create_pengesahan_table.php index 98c764a4..649bf4b0 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 $table->timestamps(); $table->foreign('lelong_id') 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/pengesahan/mutumarhun.blade.php b/resources/views/pengesahan/mutumarhun.blade.php index 038a3602..cc759657 100644 --- a/resources/views/pengesahan/mutumarhun.blade.php +++ b/resources/views/pengesahan/mutumarhun.blade.php @@ -7,7 +7,6 @@
@csrf - @@ -31,7 +30,7 @@ - @foreach($arraypengesahan as $index1=>$detail) + @foreach($arraylelbidmarhun as $index1=>$detail) {{ $loop->iteration }} {{ $lelongbid->norujukan }} @@ -78,6 +77,10 @@ @elseif($detail[0]['status_ubah'] == 3) + @elseif($detail[0]['status_ubah'] == 4) + + @else + @endif