diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index c8983009..e3dab427 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -310,7 +310,8 @@ class LelongController extends Controller 'data', 'total_bakiupah', 'total_nilaimarhun', - 'tarikhkemaskini' + 'tarikhkemaskini', + 'lelong' )); } diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php index e236d6e6..e475e46f 100644 --- a/app/Http/Controllers/MarhunController.php +++ b/app/Http/Controllers/MarhunController.php @@ -26,6 +26,7 @@ use App\Models\ScanSemak; use App\Models\TangguhLelong; use Carbon\Carbon; use App\Models\ScanJual; +use App\Models\TempPengesahan; use DateTime; class MarhunController extends Controller @@ -150,6 +151,7 @@ class MarhunController extends Controller // dd($sahkan); $lelongbidmarhun = LelongBidMarhun::join('pengesahan', 'lelongbidmarhun.id', '=', 'pengesahan.lelongbidmarhun_id') ->where('lelongbidmarhun.id', $sahkan['lelongbidmarhun_id']) + ->where('pengesahan.status', '0') ->select('pengesahan.disahkan_oleh', 'pengesahan.disahkan_pada' ) @@ -364,10 +366,12 @@ class MarhunController extends Controller $lelong = Lelong::where('id','=',$lelongbid->lelong_id)->first(); // $perluPengesahan = false; - $parameterBezaBerat = 0.3; //parameterBezaBerat = (berat sebelum) - (berat selepas) + $parameterBezaBerat = 0.0; //parameterBezaBerat = (berat sebelum) - (berat selepas) $bezaBerat = $lelongBidMarhun->berat - $request->berat_emas; // dd($request->marhun); - if($bezaBerat > $parameterBezaBerat && $lelongBidMarhun->karat > $request->karat && $lelongBidMarhun->marhun != $request->marhun) { + // if($bezaBerat > $parameterBezaBerat && $lelongBidMarhun->karat > $request->karat && $lelongBidMarhun->marhun != $request->marhun) { + if($lelongBidMarhun->berat != $request->berat_emas && $lelongBidMarhun->karat != $request->karat && $lelongBidMarhun->marhun != $request->marhun) { + $pengesahan = new Pengesahan; $pengesahan->lelong_id = $lelong->id; $pengesahan->lelongbid_id = $lelongbid->id; @@ -383,7 +387,7 @@ class MarhunController extends Controller // dd($pengesahan); } - else if($lelongBidMarhun->karat > $request->karat && $lelongBidMarhun->marhun != $request->marhun) { + else if($lelongBidMarhun->karat != $request->karat && $lelongBidMarhun->marhun != $request->marhun) { $pengesahan = new Pengesahan; $pengesahan->lelong_id = $lelong->id; $pengesahan->lelongbid_id = $lelongbid->id; @@ -398,7 +402,7 @@ class MarhunController extends Controller // dd($pengesahan); } - else if($bezaBerat > $parameterBezaBerat && $lelongBidMarhun->marhun != $request->marhun) { + else if($lelongBidMarhun->berat != $request->berat_emas && $lelongBidMarhun->marhun != $request->marhun) { $pengesahan = new Pengesahan; $pengesahan->lelong_id = $lelong->id; $pengesahan->lelongbid_id = $lelongbid->id; @@ -413,7 +417,7 @@ class MarhunController extends Controller // dd($pengesahan); } - else if ($bezaBerat > $parameterBezaBerat && $lelongBidMarhun->karat > $request->karat) { + else if ($lelongBidMarhun->berat != $request->berat_emas && $lelongBidMarhun->karat != $request->karat) { $pengesahan = new Pengesahan; $pengesahan->lelong_id = $lelong->id; $pengesahan->lelongbid_id = $lelongbid->id; @@ -428,7 +432,7 @@ class MarhunController extends Controller // dd($pengesahan); } - else if ($bezaBerat > $parameterBezaBerat) { + else if ($lelongBidMarhun->berat != $request->berat_emas) { $pengesahan = new Pengesahan; $pengesahan->lelong_id = $lelong->id; $pengesahan->lelongbid_id = $lelongbid->id; @@ -440,7 +444,7 @@ class MarhunController extends Controller $pengesahan->request_berat = $request->berat_emas; $pengesahan->save(); } - else if ($lelongBidMarhun->karat > $request->karat) { + else if ($lelongBidMarhun->karat != $request->karat) { $pengesahan = new Pengesahan; $pengesahan->lelong_id = $lelong->id; $pengesahan->lelongbid_id = $lelongbid->id; @@ -540,26 +544,27 @@ class MarhunController extends Controller $lelongbid->filemarhun_filename = $filemarhun->filename; $lelongbid->filemarhun_id = $filemarhun->id; } - $marhun = LelongBidMarhun::with( - // ['pengesahan' => function ($query) - // { - // $query->select('norujukan'); - // } - // ] - 'pengesahan' - ) - ->where('lelongbid_id', '=', $id)->get(); - foreach ($marhun as $index) { - $eachmarhun = FileMarhun::where('lelongbidmarhun_id', '=', $index['id'])->first(); + $marhun = LelongBidMarhun::with('pengesahan')->where('lelongbid_id', '=', $id)->get(); + // dd($marhun); + foreach ($marhun as $index=>$data) { + $eachmarhun = FileMarhun::where('lelongbidmarhun_id', '=', $data['id'])->first(); if (isset($eachmarhun)) { - $index->eachmarhun_filename = $eachmarhun->filename; - $index->eachmarhun_id = $eachmarhun->id; + $data->eachmarhun_filename = $eachmarhun->filename; + $data->eachmarhun_id = $eachmarhun->id; } + + $status = Pengesahan::where('lelongbid_id', $id) + ->where('lelong_id', $lelongbid['lelong_id']) + ->first(); + // dd($status); + $marhun[$index]['status'] = $status; + // dd($status); + } $lelkarat = LelKarat::where('lelong_id','=',$lelongbid->lelong_id)->get(); $karatall = JenisKarat::all(); $emasall = JenisEmas::all(); - return view('marhun.marhun',compact('marhun','lelongbid','karatall','emasall','lelkarat', 'lelong_id')); + return view('marhun.marhun',compact('marhun','lelongbid','karatall','emasall','lelkarat', 'lelong_id','status')); } @@ -841,7 +846,7 @@ class MarhunController extends Controller ->join('lelongbid','lelongbid.id','=','pengesahan.lelongbid_id') ->where('sts_lelong', 0) ->where('lelongbid.kodcaw', $user->kodcaw) - ->whereIn('pengesahan.status_ubah', [1,2,3,4,5]) + ->whereIn('pengesahan.status_ubah', [1,2,3,4,5,7,8,9,10]) ->select('lelong.fasa','pengesahan.lelong_id','lelong.id','lelong.tarikh_lelong','lelong.masatamat_lelong','lelong.harga_emas_asas','lelong.jbg','lelong.cajlelong','sts_lelong') // ->groupBy('pengesahan.lelong_id') @@ -1006,7 +1011,7 @@ class MarhunController extends Controller ->where('lelong_id', $id) ->first(); - $newhargaasas = bcdiv($status['request_berat'] * $getkaratnew['harga2'], 1); + $newhargaasas = round($status['request_berat'] * $getkaratnew['harga2']); // dump($lelbidmarhun->lelongbidmarhun_id); } else if($status->status_ubah == 10)//jika berat dan marhun @@ -1017,7 +1022,7 @@ class MarhunController extends Controller ->where('lelong_id', $id) ->first(); - $newhargaasas = bcdiv($status['request_berat'] * $marhun['harga'], 1); + $newhargaasas = round($status['request_berat'] * $marhun['harga'], 1); // dd($newhargaasas); } else if($status->status_ubah == 9)//jika mutu dan marhun @@ -1028,7 +1033,7 @@ class MarhunController extends Controller ->where('lelong_id', $id) ->first(); - $newhargaasas = bcdiv($marhun['berat'] * $getkaratnew['harga2'], 1); + $newhargaasas = round($marhun['berat'] * $getkaratnew['harga2']); // dd($newhargaasas); } @@ -1038,7 +1043,7 @@ class MarhunController extends Controller ->where('lelong_id', $id) ->first(); // dd($getkaratnew); - $newhargaasas = bcdiv($marhun['berat'] * $marhun['harga'], 1); + $newhargaasas = round($marhun['berat'] * $marhun['harga']); // dd($newhargaasas); } elseif($status->status_ubah == 5)//jika mutu dan berat berubah @@ -1049,7 +1054,7 @@ class MarhunController extends Controller ->where('lelong_id', $id) ->first(); - $newhargaasas = bcdiv($status['request_berat'] * $getkaratnew['harga2'], 1); + $newhargaasas = round($status['request_berat'] * $getkaratnew['harga2']); // dd($newhargaasas); } elseif($status->status_ubah == 1)//jika karat berubah @@ -1057,21 +1062,21 @@ class MarhunController extends Controller $getkaratnew = LelKarat::where('karat', $status['request_karat']) ->where('lelong_id', $id) ->first(); - $newhargaasas = bcdiv($getkaratnew['harga2'] * $marhun['berat'], 1); + $newhargaasas = round($getkaratnew['harga2'] * $marhun['berat']); } elseif($status->status_ubah == 4)//jika berat berubah { $getkaratnew = LelKarat::where('karat', $marhun['karat']) ->where('lelong_id', $id) ->first(); - $newhargaasas = bcdiv($status['request_berat'] * $marhun['harga'], 1); + $newhargaasas = round($status['request_berat'] * $marhun['harga']); }elseif ($status->status_ubah == 2) //jika add marhun { // dd($marhun['berat']); $getkaratnew = LelKarat::where('karat', $marhun['karat']) ->where('lelong_id', $id) ->first(); - $newhargaasas = bcdiv($marhun['berat'] * $marhun['harga'], 1); + $newhargaasas = round($marhun['berat'] * $marhun['harga']); }elseif ($status->status_ubah == 3) //jika hapus marhun { @@ -1086,7 +1091,7 @@ class MarhunController extends Controller $getkaratnew = LelKarat::where('karat', $marhun['karat']) ->where('lelong_id', $id) ->first(); - $newhargaasas = bcdiv($marhun['berat'] * $marhun['harga'], 1); + $newhargaasas = round($marhun['berat'] * $marhun['harga']); } $marhuns[$index1]['status_ubah'] = $status; @@ -1095,7 +1100,7 @@ class MarhunController extends Controller $getkaratnew = LelKarat::where('karat', $marhun['karat']) ->where('lelong_id', $id) ->first(); - $newhargaasas = bcdiv($marhun['berat'] * $marhun['harga'], 1); + $newhargaasas = round($marhun['berat'] * $marhun['harga']); } // dump($newhargaasas); @@ -1137,6 +1142,241 @@ class MarhunController extends Controller return view('pengesahan.mutumarhun', compact('lelongbid', 'norujukan', 'id', 'arraylelbidmarhun', 'marhuns', 'gadai')); } + public function lihatubahmutumarhun($norujukan, $id) + { + $totalnewhargaasas = '0'; + $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.bakiupah', + 'lelongbid.ansuran', + 'lelongbid.nilaimarhun', + 'lelongbid.pinjaman', + 'lelongbid.bakiupah', + 'lelongbid.cajlelong', + 'lelongbid.baki', + 'lelongbid.percent' + ) + ->get(); + + $arraygadai = $lelbidmarhuns->pluck('norujukan')->toArray(); + $datagadai = $lelbidmarhuns; + + + $gadai = GadaiMarhun::on($datagadai[0]['kodcaw'])->whereIn('norujukan', $arraygadai) + ->get()->toArray(); + + foreach ($gadai as $index2 => $gadai2) { + + $listgadai = GadaiMarhun::on($datagadai[0]['kodcaw'])->whereIn('norujukan', $arraygadai) + ->get(); + // dd($listgadai); + + $gadai[$index2]['listgadai'] = $listgadai; + } + // dd($gadai); + $arraylelbidmarhun = []; + $bakilelong = 0; + $rugilelong = 0; + + foreach ($lelbidmarhuns as $lelbidmarhun) { + $marhuns = LelongBidMarhun::where('lelongbid_id', $lelbidmarhun->lelongbid_id) + ->where('id', $lelbidmarhun->lelongbidmarhun_id) + ->get()->toArray(); + + $marhunsdet = LelongBidMarhun::where('lelongbid_id', $lelbidmarhun->lelongbid_id) + // ->where('id', $lelbidmarhun->lelongbidmarhun_id) + ->get(); + // dd($marhunsdet); + + $totalhargaasas = $marhunsdet->sum('hargaasas'); + $tothargaasas = bcdiv($totalhargaasas, 1); + // dd($totalhargaasas); + + // $marhunsgadai = GadaiMarhun::where('norujukan', $norujukan) + // // ->where('karat', $lelbidmarhun->karat) + // // ->where('id', $lelbidmarhun->idgadaimarhun) + // ->first(); + // // dd($lelbidmarhun->idgadaimarhun); + + $lelongbid = LelongBid::where('lelongbid.id', $lelbidmarhun->lelongbid_id) + ->where('lelongbid.lelong_id', $id) + ->first(); + + + $karat = Lelkarat::where('lelong_id', $id)->get(); + + // dd($id); + foreach ($marhuns as $index1 => $marhun) { + // dd($lelbidmarhun); + + $status = Pengesahan::where('lelongbidmarhun_id', $lelbidmarhun->lelongbidmarhun_id) + ->where('lelongbid_id', $marhun['lelongbid_id']) + ->select('id as sahid','status_ubah', 'request_karat', 'request_berat', 'request_marhun') + ->first(); + // dd($status); + // dump($lelbidmarhun->lelongbidmarhun_id); + if($status){ + if($status->status_ubah == 8 )//jika mutu,berat dan marhun + { + // dd($status['request_karat']); + // if($status['request']) + $getkaratnew = LelKarat::where('karat', $status['request_karat']) + ->where('lelong_id', $id) + ->first(); + + $newhargaasas = round($status['request_berat'] * $getkaratnew['harga2']); + // dump($lelbidmarhun->lelongbidmarhun_id); + } + else if($status->status_ubah == 10)//jika berat dan marhun + { + // dd($status['request_karat']); + // if($status['request']) + $getkaratnew = LelKarat::where('karat', $marhun['karat']) + ->where('lelong_id', $id) + ->first(); + + $newhargaasas = round($status['request_berat'] * $marhun['harga'], 1); + // dd($newhargaasas); + } + else if($status->status_ubah == 9)//jika mutu dan marhun + { + // dd($status['request_karat']); + // if($status['request']) + $getkaratnew = LelKarat::where('karat', $status['request_karat']) + ->where('lelong_id', $id) + ->first(); + + $newhargaasas = round($marhun['berat'] * $getkaratnew['harga2']); + // dd($newhargaasas); + } + + elseif ($status->status_ubah == 7) //jika ubah marhun + { + $getkaratnew = LelKarat::where('karat', $marhun['karat']) + ->where('lelong_id', $id) + ->first(); + // dd($getkaratnew); + $newhargaasas = round($marhun['berat'] * $marhun['harga']); + // dd($newhargaasas); + } + elseif($status->status_ubah == 5)//jika mutu dan berat berubah + { + // dd($status['request_karat']); + // if($status['request']) + $getkaratnew = LelKarat::where('karat', $status['request_karat']) + ->where('lelong_id', $id) + ->first(); + + $newhargaasas = round($status['request_berat'] * $getkaratnew['harga2']); + // dd($newhargaasas); + } + elseif($status->status_ubah == 1)//jika karat berubah + { + $getkaratnew = LelKarat::where('karat', $status['request_karat']) + ->where('lelong_id', $id) + ->first(); + $newhargaasas = round($getkaratnew['harga2'] * $marhun['berat']); + } + elseif($status->status_ubah == 4)//jika berat berubah + { + $getkaratnew = LelKarat::where('karat', $marhun['karat']) + ->where('lelong_id', $id) + ->first(); + $newhargaasas = round($status['request_berat'] * $marhun['harga']); + }elseif ($status->status_ubah == 2) //jika add marhun + { + // dd($marhun['berat']); + $getkaratnew = LelKarat::where('karat', $marhun['karat']) + ->where('lelong_id', $id) + ->first(); + $newhargaasas = round($marhun['berat'] * $marhun['harga']); + + }elseif ($status->status_ubah == 3) //jika hapus marhun + { + // dd($marhun['berat']); + $getkaratnew = LelKarat::where('karat', $marhun['karat']) + ->where('lelong_id', $id) + ->first(); + $newhargaasas = 0.00; + } + else + { + $getkaratnew = LelKarat::where('karat', $marhun['karat']) + ->where('lelong_id', $id) + ->first(); + $newhargaasas = round($marhun['berat'] * $marhun['harga']); + } + + $marhuns[$index1]['status_ubah'] = $status; + } + else{ //jika tiada $status + $getkaratnew = LelKarat::where('karat', $marhun['karat']) + ->where('lelong_id', $id) + ->first(); + $newhargaasas = round($marhun['berat'] * $marhun['harga']); + } + // dump($newhargaasas); + + + $totalnewhargaasas = $totalnewhargaasas + $newhargaasas; + $lelong = Lelong::where('id', $id)->get(); + $sumcajlelong = $totalnewhargaasas * ($lelong[0]['cajlelong'] / 100); + $totalbaki = $totalnewhargaasas - $lelongbid->pinjaman - $lelongbid->bakiupah - bcdiv($sumcajlelong, 1, 1); + // dd($totalnewhargaasas); + if ($totalbaki > 0) { + $bakilelong = $totalbaki; + $rugilelong = 0.00; + } else if ($totalbaki < 0) { + $rugilelong = $totalbaki; + $bakilelong = 0.00; + } + + $marhuns[$index1]['nmarhun_gadai'] = $marhun['old_nmarhun']; + $marhuns[$index1]['old_marhun'] = $marhun['marhun']; + $marhuns[$index1]['pembiayaan'] = $lelongbid->pinjaman; + $marhuns[$index1]['bakiupah'] = $lelongbid->bakiupah; + $marhuns[$index1]['karatnew'] = $getkaratnew; + $marhuns[$index1]['newhargaasas'] = $newhargaasas; + $marhuns[$index1]['totalnewhargaasas'] = $totalnewhargaasas; + $marhuns[$index1]['pembiayaan'] = $lelongbid->pinjaman; + $marhuns[$index1]['bakiupah'] = $lelongbid->bakiupah; + $marhuns[$index1]['baki_lelong'] = $bakilelong; + $marhuns[$index1]['rugi_lelong'] = $rugilelong; + $marhuns[$index1]['cajlelong'] = bcdiv($sumcajlelong, 1, 1); + } + + array_push($arraylelbidmarhun, $marhuns); + // dd($arraylelbidmarhun); + + + } + // dd($lelbidmarhun->lelongbidmarhun_id); + // dd($totalnewhargaasas); + return view('marhun.lihatubahmutumarhun', compact('lelongbid', 'norujukan', 'id', 'arraylelbidmarhun', 'marhuns', 'gadai')); + } + + public function terimaperubahan(Request $request) { //update mutu marhun - gadaimarhun @@ -1181,7 +1421,7 @@ class MarhunController extends Controller ->where('lelong_id', $request->lelong_id) ->first(); $nilaimarhunnew = $lelongbidmarhuns->berat * $getkarat->harga2; - $hargaasasnew = bcdiv($nilaimarhunnew, 1); + $hargaasasnew = round($nilaimarhunnew); $updatemarhun = $lelongbidmarhuns; $updatemarhun->karat = $terimalel->request_karat; @@ -1196,7 +1436,7 @@ class MarhunController extends Controller ->where('lelong_id', $request->lelong_id) ->first(); $nilaimarhunnew = $terimalel->request_berat * $getkarat['harga2']; - $hargaasasnew = bcdiv($nilaimarhunnew, 1); + $hargaasasnew = round($nilaimarhunnew); $updatemarhun = $lelongbidmarhuns; $updatemarhun->berat = $terimalel->request_berat; @@ -1211,7 +1451,7 @@ class MarhunController extends Controller ->first(); // dd($getkarat['harga2']); $nilaimarhunnew = $terimalel->request_berat * $getkarat['harga2']; - $hargaasasnew = bcdiv($nilaimarhunnew, 1); + $hargaasasnew = round($nilaimarhunnew); $updatemarhun = LelongBidMarhun::where('id', $terimalel->lelongbidmarhun_id)->first(); $updatemarhun->berat = $terimalel->request_berat; @@ -1228,7 +1468,7 @@ class MarhunController extends Controller ->first(); // dd($getkarat['harga2']); $nilaimarhunnew = $lelongbidmarhuns->berat * $getkarat['harga2']; - $hargaasasnew = bcdiv($nilaimarhunnew, 1); + $hargaasasnew = round($nilaimarhunnew); $updatemarhun = LelongBidMarhun::where('id', $terimalel->lelongbidmarhun_id)->first(); $updatemarhun->marhun = $terimalel->request_marhun; @@ -1244,7 +1484,7 @@ class MarhunController extends Controller ->first(); // dd($getkarat['harga2']); $nilaimarhunnew = $terimalel->request_berat * $getkarat['harga2']; - $hargaasasnew = bcdiv($nilaimarhunnew, 1); + $hargaasasnew = round($nilaimarhunnew); $updatemarhun = LelongBidMarhun::where('id', $terimalel->lelongbidmarhun_id)->first(); $updatemarhun->marhun = $terimalel->request_marhun; @@ -1262,7 +1502,7 @@ class MarhunController extends Controller ->first(); // dd($getkarat['harga2']); $nilaimarhunnew = $lelongbidmarhuns->berat * $getkarat['harga2']; - $hargaasasnew = bcdiv($nilaimarhunnew, 1); + $hargaasasnew = round($nilaimarhunnew); $updatemarhun = LelongBidMarhun::where('id', $terimalel->lelongbidmarhun_id)->first(); $updatemarhun->marhun = $terimalel->request_marhun; @@ -1279,7 +1519,7 @@ class MarhunController extends Controller ->first(); // dd($getkarat['harga2']); $nilaimarhunnew = $terimalel->request_berat * $getkarat['harga2']; - $hargaasasnew = bcdiv($nilaimarhunnew, 1); + $hargaasasnew = round($nilaimarhunnew); $updatemarhun = LelongBidMarhun::where('id', $terimalel->lelongbidmarhun_id)->first(); $updatemarhun->marhun = $terimalel->request_marhun; @@ -1296,7 +1536,7 @@ class MarhunController extends Controller ->first(); // dd($getkarat['harga2']); $nilaimarhunnew = $lelongbidmarhuns->berat * $getkarat['harga2']; - $hargaasasnew = bcdiv($nilaimarhunnew, 1); + $hargaasasnew = round($nilaimarhunnew); $updatemarhun = LelongBidMarhun::where('id', $terimalel->lelongbidmarhun_id)->first(); $updatemarhun->harga = $getkarat['harga2']; @@ -1317,6 +1557,7 @@ class MarhunController extends Controller ->first(); $updatelelongbid->berat = $itemmarhun->sum('berat'); $updatelelongbid->hargaasas = $itemmarhun->sum('hargaasas'); + $updatelelongbid->status_semak = '1'; $updatelelongbid->update(); } @@ -1533,12 +1774,24 @@ class MarhunController extends Controller ->where('lelong_id', $lelong_id) ->orderBy('id', 'desc') ->get(); + foreach ($sedangDinilai as $key => $dinilai) { + $sdhdisemak = LelongBid::where('lelongbid.lelong_id', $lelong_id) + ->where('lelongbid.caw_id', $caw->id) + ->where('lelongbid.status_semak', 1) + ->where('lelongbid.norujukan', $dinilai->norujukan) + ->first(); + $sedangDinilai[$key]['sdhdisemak'] = $sdhdisemak; + // dd($dinilai->norujukan); + } $sudahSerah = ScanSemak::where('kodcaw', '=', $caw->caw_code) ->whereNotNull('serah_marhun') ->where('lelong_id', $lelong_id) ->orderBy('id', 'desc') ->get(); + + + // dd($sedangDinilai->norujukan); if ($senaraiScanKeluar || $sedangDinilai || $sudahSerah) { return view('marhun.terimaserahmarhun', compact('senaraiScanKeluar', 'sedangDinilai', 'sudahSerah','lelong_id')); @@ -1629,7 +1882,7 @@ class MarhunController extends Controller public function scanKeluarMarhun(Request $request) { - $user = Auth::user(); + // $user = Auth::user(); $current = Carbon::now(); $checkExisting = ScanSemak::where('norujukan', '=', $request->norujukan_barcode) @@ -1638,16 +1891,49 @@ class MarhunController extends Controller if ($checkExisting->isEmpty()) { $lelongbidItem = LelongBid::where('norujukan', '=', $request->norujukan_barcode)->first(); + // dd($request->norujukan_barcode); + + $pengesahan = Pengesahan::where('norujukan', $lelongbidItem['norujukan']) + ->where('lelong_id', $request->lelong_id) + ->get(); + // dd($pengesahan); + foreach ($pengesahan as $temppengesahan) { + $addpengesahan = new TempPengesahan(); + $addpengesahan->lelong_id = $temppengesahan->lelong_id; + $addpengesahan->lelongbid_id = $temppengesahan->lelongbid_id; + $addpengesahan->lelongbidmarhun_id = $temppengesahan->lelongbidmarhun_id; + $addpengesahan->norujukan = $temppengesahan->norujukan; + $addpengesahan->disahkan_oleh = $temppengesahan->disahkan_oleh; + $addpengesahan->disahkan_pada = $temppengesahan->disahkan_pada; + $addpengesahan->diminta_oleh = $temppengesahan->diminta_oleh; + $addpengesahan->diminta_pada = $temppengesahan->diminta_pada; + $addpengesahan->status = $temppengesahan->status; + $addpengesahan->status_ubah = $temppengesahan->status_ubah; + $addpengesahan->request_berat = $temppengesahan->request_berat; + $addpengesahan->request_karat = $temppengesahan->request_karat; + $addpengesahan->request_marhun = $temppengesahan->request_marhun; + $addpengesahan->save(); + } + + $deletepengesahan = Pengesahan::where('lelong_id', $request->lelong_id) + ->where('norujukan', $lelongbidItem['norujukan']) + ->delete(); $scanKeluar = new ScanSemak(); $scanKeluar->kodcaw = $lelongbidItem['kodcaw']; $scanKeluar->lelong_id = $lelongbidItem['lelong_id']; $scanKeluar->lelongbid_id = $lelongbidItem['id']; $scanKeluar->norujukan = $lelongbidItem['norujukan']; - $scanKeluar->khazanah_id = $user['id']; + $scanKeluar->khazanah_id = Auth::user()->id; $scanKeluar->scan_keluar = $current->toDateTimeString(); $scanKeluar->save(); + $lelongbidItem->status_semak = 0; + $lelongbidItem->save(); + + + + return redirect()->route('marhun.scanbarcode', $request->lelong_id) ->with('success', 'Marhun Berjaya Di Scan Keluar Dari Peti Besi.'); } else { @@ -1671,10 +1957,10 @@ class MarhunController extends Controller if ($scanMasuk) { $scanMasuk->scan_masuk = $current->toDateTimeString(); $scanMasuk->update(); - return redirect()->route('marhun.scanbarcode', $request->lelong_id) + return redirect()->route('marhun.scanbarcodemasuk', $request->lelong_id) ->with('success', 'Marhun Berjaya Di Scan Masuk Ke Peti Besi.'); } else { - return redirect()->route('marhun.scanbarcode', $request->lelong_id) + return redirect()->route('marhun.scanbarcodemasuk', $request->lelong_id) ->with('failed', 'Gagal Scan, Marhun Belum Diserah Oleh Penilai.'); } } diff --git a/app/Models/LelongBid.php b/app/Models/LelongBid.php index 8eeeb9f0..2b1cbd5a 100644 --- a/app/Models/LelongBid.php +++ b/app/Models/LelongBid.php @@ -71,4 +71,9 @@ class LelongBid extends Model { return $this->hasMany(ScanSemak::class, 'lelongbid_id', 'id')->whereNotNull('scan_masuk'); } + + public function pengesahan() + { + return $this->belongsTo(Pengesahan::class, 'id', 'lelongbid_id'); + } } diff --git a/app/Models/LelongBidMarhun.php b/app/Models/LelongBidMarhun.php index 6aa587f8..5760b171 100644 --- a/app/Models/LelongBidMarhun.php +++ b/app/Models/LelongBidMarhun.php @@ -29,6 +29,6 @@ class LelongBidMarhun extends Model ]; public function pengesahan() { - return $this->hasOne(Pengesahan::class, 'lelongbidmarhun_id'); + return $this->hasOne(Pengesahan::class, 'lelongbidmarhun_id', 'id'); } } diff --git a/app/Models/Pengesahan.php b/app/Models/Pengesahan.php index cd242860..a3814af1 100644 --- a/app/Models/Pengesahan.php +++ b/app/Models/Pengesahan.php @@ -22,4 +22,8 @@ class Pengesahan extends Model 'status', 'status_ubah' ]; + + public function lelongbidmarhun(){ + return $this->belongsTo(LelongBidMarhun::class, 'lelongbidmarhun_id' , 'id'); + } } diff --git a/app/Models/TempPengesahan.php b/app/Models/TempPengesahan.php new file mode 100644 index 00000000..fc04a271 --- /dev/null +++ b/app/Models/TempPengesahan.php @@ -0,0 +1,29 @@ +belongsTo(LelongBidMarhun::class, 'lelongbidmarhun_id' , '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 f81b8dfb..773ba99d 100644 --- a/database/migrations/2022_03_07_061858_create_pengesahan_table.php +++ b/database/migrations/2022_03_07_061858_create_pengesahan_table.php @@ -61,6 +61,24 @@ class CreatePengesahanTable extends Migration $table->timestamps(); }); + Schema::create('temppengesahan', function (Blueprint $table) { + $table->id(); + $table->unsignedBigInteger('lelong_id')->unsigned(); + $table->unsignedBigInteger('lelongbid_id')->unsigned(); + $table->unsignedBigInteger('lelongbidmarhun_id')->unsigned(); + $table->string('norujukan'); + $table->integer('disahkan_oleh')->nullable(); + $table->datetime('disahkan_pada')->nullable(); + $table->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, 6 = tangguh lelong pc, 7 = ubah marhun,8 = ubah mutu, berat dan marhun,9=ubah mutu dan marhun,10=ubah berat dan marhun + $table->string('request_berat')->nullable(); + $table->string('request_karat')->nullable(); + $table->string('request_marhun')->nullable(); + $table->timestamps(); + }); + } /** @@ -73,5 +91,6 @@ class CreatePengesahanTable extends Migration Schema::dropIfExists('pengesahan'); Schema::dropIfExists('scan_semak'); Schema::dropIfExists('scan_jual'); + Schema::dropIfExists('temppengesahan'); } } diff --git a/resources/views/lelong/senaraisagpemenang.blade.php b/resources/views/lelong/senaraisagpemenang.blade.php index 0157efbe..c048ab1b 100644 --- a/resources/views/lelong/senaraisagpemenang.blade.php +++ b/resources/views/lelong/senaraisagpemenang.blade.php @@ -7,12 +7,12 @@
- @if ($message = Session::get('success')) -
-

{{ $message }}

-
- @endif +
+ @if ($message = Session::get('success')) +
+

{{ $message }}

+
+ @endif
diff --git a/resources/views/lelong/showlelong.blade.php b/resources/views/lelong/showlelong.blade.php index 37e3e68b..3e965db8 100644 --- a/resources/views/lelong/showlelong.blade.php +++ b/resources/views/lelong/showlelong.blade.php @@ -2,91 +2,178 @@ @section('content')
-
-
-