diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index b8d94992..9587aace 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -18,6 +18,7 @@ use App\Models\Payment; use App\Models\User; use App\Models\LelongBidder; use Hash; +use DateTime; class HomeController extends Controller { @@ -132,18 +133,28 @@ class HomeController extends Controller array_push($arrayinfomutu,['info'=>$infomutu, 'detailsinfo'=>$detailsinfo]); } - - if($caw <> NULL) { //staf cwgn - $sag = LelongBid::where('status_semak', 0) //belum disemak - ->where('kodcaw', $caw['caw_code']) - ->get(); - //dd($sag); - + $all_lelong = Lelong::select('id', 'tarikh_lelong')->where('sts_lelong', 0)->get()->keyBy('id'); + foreach ($all_lelong as $data) { + $data->tarikh_lelong = DateTime::createFromFormat('Y-m-d', $data->tarikh_lelong); + $data->tarikh_lelong = $data->tarikh_lelong->format('d-m-Y'); } - else { //operasi,jurulelong + + if ($caw <> NULL) { //staf cwgn $sag = LelongBid::where('status_semak', 0) //belum disemak - ->get(); - + ->where('kodcaw', $caw['caw_code']) + ->get(); + + $sag_by_lelong_id = $sag->groupBy('lelong_id'); + + foreach ($sag_by_lelong_id as $index => $lelong) { + if ($all_lelong[$index]); { + $all_lelong[$index]['sag_belum_semak'] = $lelong->count(); + } + } + + } else { //operasi,jurulelong + $sag = LelongBid::where('status_semak', 0) //belum disemak + ->get(); } //paparan pemenang lelongan harini @@ -245,7 +256,7 @@ class HomeController extends Controller //endpaparan untuk account page - return view('home',compact('lelongmutu', 'arrayinfomutu','arrayinfo','sag','semakCountArray','arrayinfomenang','arrayinfoaccount')); + return view('home',compact('all_lelong','lelongmutu', 'arrayinfomutu','arrayinfo','sag','semakCountArray','arrayinfomenang','arrayinfoaccount')); } diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 1481df6a..171fbf07 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' )); } @@ -619,6 +620,7 @@ class LelongController extends Controller $lelongbidmarhun->bil = $simbidmarhun->bil; $lelongbidmarhun->marhun = $simbidmarhun->marhun; $lelongbidmarhun->nota = $simbidmarhun->nota; + $lelongbidmarhun->old_marhun = $simbidmarhun->marhun; $lelongbidmarhun->old_karat = $simbidmarhun->karat; $lelongbidmarhun->old_berat = $simbidmarhun->berat; $lelongbidmarhun->old_harga = $simbidmarhun->harga; @@ -807,6 +809,7 @@ class LelongController extends Controller $karat->keterangan = $karat->keterangan; // $karat->harga = $request->harga[$index]; $karat->harga2 = $request->harga2[$index]; + $karat->updated_at = $currentdate; $karat->save(); } @@ -3117,7 +3120,7 @@ class LelongController extends Controller foreach($cawanganlel as $cawlel) { $cawangan = Cawangan::where('id','=',$cawlel->caw_id)->first(); - $databid = LelongBid::select('lelongbid.id','lelongbid.berat','lelongbid.marhun','lelongbid.cajlelong','lelongbid.baki','lelongbid.nilaimarhun', + $databid = LelongBid::select('lelongbid.jbg','lelongbid.id','lelongbid.berat','lelongbid.marhun','lelongbid.cajlelong','lelongbid.baki','lelongbid.nilaimarhun', 'lelongbid.pinjaman','lelongbid.hargaasas','lelongbid.cajlelong','lelongbid.bakiupah') ->where('caw_id','=',$cawlel->caw_id)->where('lelong_id','=',$lelong_id)->get(); @@ -3203,6 +3206,199 @@ class LelongController extends Controller + } + array_push($arraycaw,[ + 'id_cawangan'=> $cawangan['id'], + 'cawangan'=>$cawangan['caw_name'], + 't_lelong'=>$lelong['tarikh_lelong'], + 'bil_marhun'=>sizeof($databid), + 'jbg'=>$bid['jbg'], + 'berat'=>$berat, + 'n_marhun'=>$nilai_marhun, + 'pinjaman'=>$pinjaman, + 'upahsimpan'=>$bakiupah, + 'bakiupah'=>$bakiupah, + 'hargaasas'=>$hargaasas, + 'cajlelong'=>$cajlelong, + 'rugilelong'=>$rugilelong, + 'bakilelong'=>$bakilelong, + ]); + + $total_marhun = $total_marhun + sizeof($databid); + $total_berat = $total_berat + $berat; + $total_pinjaman = $total_pinjaman + $pinjaman; + $total_hargaasas = $total_hargaasas + $hargaasas; + $total_cazlelong = $total_cazlelong + $cajlelong; + $total_rugilelong = $total_rugilelong + $rugilelong; + $total_bakilelong = $total_bakilelong + $bakilelong; + $total_nilaimarhun = $total_nilaimarhun + $nilai_marhun; + $total_bakiupah = $total_bakiupah + $bakiupah; + + + $data = Lelong::where('lelong.id','=',$lelong_id) + ->first(); + } + + $pdf = PDF::loadView('pdf.lelreport',compact('arraycaw', + 'total_marhun', + 'total_berat', + 'total_nmarhun', + 'total_pinjaman', + 'total_upah', + 'total_hargaasas', + 'total_cazlelong', + 'total_rugilelong', + 'total_bakilelong', + 'total24Kgb', + 'total24K', + 'total23k', + 'total22K', + 'total21K', + 'total20K', + 'total18Kp', + 'total18K', + 'total14Kp', + 'total14K', + 'total9K', + 'lelkarat', + 'lelong_id', + 'jeniskarat', + 'data', + 'total_bakiupah', + 'total_nilaimarhun' + ))->setPaper('a4', 'potrait'); + return $pdf->download('Lelong Simulasi Keseluruhan.pdf'); + + } + public function exportlelongdone(Request $request) + { + + $lelong_id = $request->lelongid; + + + $lelong = Lelong::where('id','=',$lelong_id)->first(); + $cawanganlel = CawanganLelong::where('lelong_id','=',$lelong_id)->get(); + $lelkarat = LelKarat::where('lelong_id','=',$lelong_id)->get(); + $jeniskarat = JenisKarat::all(); + + $arraydata = []; + $arraycaw = []; + $data = []; + + $total_marhun = 0; + $total_berat = 0; + $total_nmarhun = 0; + $total_pinjaman = 0; + $total_upah = 0; + $total_hargaasas = 0; + $total_cazlelong = 0; + $total_rugilelong = 0; + $total_bakilelong = 0; + + $total24Kgb = 0; + $total24K = 0; + $total23k = 0; + $total22K = 0; + $total21K = 0; + $total20K = 0; + $total18Kp = 0; + $total18K = 0; + $total14Kp = 0; + $total14K = 0; + $total9K = 0; + $total_nilaimarhun = 0; + $nilai_marhun = 0; + $total_bakiupah = 0; + + foreach($cawanganlel as $cawlel) + { + $cawangan = Cawangan::where('id','=',$cawlel->caw_id)->first(); + $databid = LelongBid::select('lelongbid.id','lelongbid.berat','lelongbid.marhun','lelongbid.cajlelong','lelongbid.baki','lelongbid.nilaimarhun', + 'lelongbid.pinjaman','lelongbid.hargaasas','lelongbid.cajlelong','lelongbid.bakiupah') + ->where('caw_id','=',$cawlel->caw_id)->where('status_jual','=',1)->where('lelong_id','=',$lelong_id)->get(); + + // dd($databid->toArray()); + $packet = 0; + $berat = 0; + $pinjaman =0; + $nilai_marhun = 0; + $bakiupah = 0; + $hargaasas = 0; + $cajlelong = 0; + $rugilelong = 0; + $bakilelong = 0; + + foreach($databid as $index1=>$bid) + { + $marhun = LelongBidMarhun::where('lelongbid_id','=',$bid['id'])->get(); + $berat = $berat + $bid['berat']; + $nilai_marhun = $nilai_marhun + $bid['nilaimarhun']; + $pinjaman =$pinjaman + $bid['pinjaman']; + $bakiupah = $bakiupah + $bid['bakiupah']; + $hargaasas = $hargaasas + $bid['hargaasas']; + $cajlelong = $cajlelong + $bid['cajlelong']; + + $lelongsim = Lelong::where('id', $lelong_id )->get(); + $sumcajlelong = $bid['hargaasas'] * ($lelongsim[0]['cajlelong']/100); + $cajlelong = $cajlelong + bcdiv($sumcajlelong,1,1); + $totalbaki = $bid['hargaasas'] - $bid['pinjaman'] - $bid['bakiupah'] - bcdiv($sumcajlelong,1,1); + + if($totalbaki > 0) + { + $bakilelong = $bakilelong + $totalbaki; + } + else + { + $rugilelong = $rugilelong - $totalbaki; + } + + + $total24Kgb += LelongBidMarhun::where('lelongbid_id','=',$bid['id']) + ->where('karat','=','24.0Kgb') + ->sum('berat'); + + $total24K += LelongBidMarhun::where('lelongbid_id','=',$bid['id']) + ->where('karat','=','24.0K') + ->sum('berat'); + + $total23k += LelongBidMarhun::where('lelongbid_id','=',$bid['id']) + ->where('karat','=','23.0K') + ->sum('berat'); + + $total22K += LelongBidMarhun::where('lelongbid_id','=',$bid['id']) + ->where('karat','=','22.0K') + ->sum('berat'); + + $total21K += LelongBidMarhun::where('lelongbid_id','=',$bid['id']) + ->where('karat','=','21.0K') + ->sum('berat'); + + $total20K += LelongBidMarhun::where('lelongbid_id','=',$bid['id']) + ->where('karat','=','20.0K') + ->sum('berat'); + + $total18Kp += LelongBidMarhun::where('lelongbid_id','=',$bid['id']) + ->where('karat','=','18.0Kp') + ->sum('berat'); + + $total18K += LelongBidMarhun::where('lelongbid_id','=',$bid['id']) + ->where('karat','=','18.0K') + ->sum('berat'); + + $total14Kp += LelongBidMarhun::where('lelongbid_id','=',$bid['id']) + ->where('karat','=','14.0Kp') + ->sum('berat'); + + $total14K += LelongBidMarhun::where('lelongbid_id','=',$bid['id']) + ->where('karat','=','14.0K') + ->sum('berat'); + + $total9K += LelongBidMarhun::where('lelongbid_id','=',$bid['id']) + ->where('karat','=','9.0K') + ->sum('berat'); + + + } array_push($arraycaw,[ 'id_cawangan'=> $cawangan['id'], @@ -3235,7 +3431,11 @@ class LelongController extends Controller ->first(); } - $pdf = PDF::loadView('pdf.lelreport',compact('arraycaw', + $datacaw = Cawangan::where('id','=',$cawlel->caw_id) + ->get(); + + + $pdf = PDF::loadView('pdf.lelreportdone',compact('datacaw','arraycaw', 'total_marhun', 'total_berat', 'total_nmarhun', @@ -3263,10 +3463,9 @@ class LelongController extends Controller 'total_bakiupah', 'total_nilaimarhun' ))->setPaper('a4', 'potrait'); - return $pdf->download('Lelong Simulasi Keseluruhan.pdf'); + return $pdf->download('Lelong Keseluruhan.pdf'); } - public function senarailelongall() { @@ -4370,7 +4569,7 @@ class LelongController extends Controller foreach($cawanganlel as $cawlel) { $cawangan = Cawangan::where('id','=',$cawlel->caw_id)->first(); - $databid = LelongBid::select('lelongbid.id','lelongbid.berat','lelongbid.marhun','lelongbid.cajlelong','lelongbid.baki','lelongbid.nilaimarhun', + $databid = LelongBid::select('lelongbid.jbg','lelongbid.id','lelongbid.berat','lelongbid.marhun','lelongbid.cajlelong','lelongbid.baki','lelongbid.nilaimarhun', 'lelongbid.pinjaman','lelongbid.hargaasas','lelongbid.cajlelong','lelongbid.bakiupah') ->where('caw_id','=',$cawlel->caw_id)->where('lelong_id','=',$lelong_id)->get(); @@ -4820,7 +5019,13 @@ class LelongController extends Controller $lelong_id = $id; $lelong = Lelong::where('id','=',$id)->first(); // $cawanganlel = CawanganLelong::where('lelong_id','=',$id)->get(); - $cawanganlel = CawanganLelong::with(['cawangan', 'lelongBid.lelongBidMarhun'])->where('lelong_id', '=', $id)->get(); + // $cawanganlel = CawanganLelong::with(['cawangan', 'lelongBid.lelongBidMarhun'],['lelongbid' => function($q){ + // $q->where('lelongbid.status_jual', '=', 1); + // }])->where('lelong_id', '=', $id)->get(); + $cawanganlel = CawanganLelong::with(['cawangan', 'lelongBid' => function ($query) { + $query->where('status_jual', '=', 1); + }]) + ->where('lelong_id', '=', $id)->get(); // dd($cawanganlel); $lelkarat = LelKarat::where('lelong_id','=',$id)->get(); $jeniskarat = JenisKarat::all(); @@ -4857,6 +5062,7 @@ class LelongController extends Controller $nilai_marhun = 0; $totalkeuntungan2 = 0; + $total_marhun = 0; foreach ($cawanganlel as $cawlel) { $berat = 0; @@ -4867,12 +5073,13 @@ class LelongController extends Controller $cajlelong = 0; $rugilelong = 0; $bakilelong = 0; - $total_marhun = 0; + + $databid = LelongBid::where('caw_id','=',$cawlel->caw_id)->where('lelong_id','=',$id)->where('status_jual','=',1)->get(); // dd($databid); foreach ($databid as $lel_bid) { - $total_marhun += 1; + $nilai_marhun += $lel_bid->nilaimarhun; $pinjaman += $lel_bid->pinjaman; $bakiupah += $lel_bid->bakiupah; @@ -4921,6 +5128,7 @@ class LelongController extends Controller } } // dd($cawlel->cawangan); + // $total_marhun += sizeof($cawlel->lelongBid); array_push($arraycaw,[ 'id_cawangan'=> $cawlel['caw_id'], 'cawangan' => $cawlel->cawangan->caw_name, @@ -4937,6 +5145,8 @@ class LelongController extends Controller 'bakilelong'=>$bakilelong, ]); + $total_marhun += sizeof($cawlel->lelongBid); + // $total_marhun = $total_marhun + sizeof($databid); // $total_berat = $total_berat + $berat; // $total_pinjaman = $total_pinjaman + $pinjaman; diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php index 7b643974..c608734a 100644 --- a/app/Http/Controllers/MarhunController.php +++ b/app/Http/Controllers/MarhunController.php @@ -28,6 +28,8 @@ use Carbon\Carbon; use App\Models\ScanJual; use App\Services\MarhunPhotoService; use Illuminate\Support\Facades\Request as FacadesRequest; +use App\Models\TempPengesahan; +use DateTime; class MarhunController extends Controller { @@ -150,10 +152,13 @@ class MarhunController extends Controller foreach ($sudahdisahkan as $sahkan) { // dd($sahkan); $lelongbidmarhun = LelongBidMarhun::join('pengesahan', 'lelongbidmarhun.id', '=', 'pengesahan.lelongbidmarhun_id') - ->where('lelongbidmarhun.id', $sahkan['lelongbidmarhun_id']) - ->select('pengesahan.disahkan_oleh', 'pengesahan.disahkan_pada') - ->first(); - + ->where('lelongbidmarhun.id', $sahkan['lelongbidmarhun_id']) + ->where('pengesahan.status', '0') + ->select('pengesahan.disahkan_oleh', + 'pengesahan.disahkan_pada' + ) + ->first(); + $lelongbid[$index1]['pengesahan'] = $lelongbidmarhun; // dd($lelongbid[$index1]['pengesahan']); } @@ -342,11 +347,13 @@ 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) { - $pengesahan = new Pengesahan(); + // 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; $pengesahan->lelongbidmarhun_id = $lelongBidMarhun->id; @@ -359,8 +366,10 @@ class MarhunController extends Controller $pengesahan->request_marhun = $request->marhun; $pengesahan->save(); // dd($pengesahan); - } elseif ($lelongBidMarhun->karat > $request->karat && $lelongBidMarhun->marhun != $request->marhun) { - $pengesahan = new Pengesahan(); + + } + else if($lelongBidMarhun->karat != $request->karat && $lelongBidMarhun->marhun != $request->marhun) { + $pengesahan = new Pengesahan; $pengesahan->lelong_id = $lelong->id; $pengesahan->lelongbid_id = $lelongbid->id; $pengesahan->lelongbidmarhun_id = $lelongBidMarhun->id; @@ -372,8 +381,10 @@ class MarhunController extends Controller $pengesahan->request_marhun = $request->marhun; $pengesahan->save(); // dd($pengesahan); - } elseif ($bezaBerat > $parameterBezaBerat && $lelongBidMarhun->marhun != $request->marhun) { - $pengesahan = new Pengesahan(); + + } + else if($lelongBidMarhun->berat != $request->berat_emas && $lelongBidMarhun->marhun != $request->marhun) { + $pengesahan = new Pengesahan; $pengesahan->lelong_id = $lelong->id; $pengesahan->lelongbid_id = $lelongbid->id; $pengesahan->lelongbidmarhun_id = $lelongBidMarhun->id; @@ -385,8 +396,10 @@ class MarhunController extends Controller $pengesahan->request_marhun = $request->marhun; $pengesahan->save(); // dd($pengesahan); - } elseif ($bezaBerat > $parameterBezaBerat && $lelongBidMarhun->karat > $request->karat) { - $pengesahan = new Pengesahan(); + + } + else if ($lelongBidMarhun->berat != $request->berat_emas && $lelongBidMarhun->karat != $request->karat) { + $pengesahan = new Pengesahan; $pengesahan->lelong_id = $lelong->id; $pengesahan->lelongbid_id = $lelongbid->id; $pengesahan->lelongbidmarhun_id = $lelongBidMarhun->id; @@ -398,8 +411,10 @@ class MarhunController extends Controller $pengesahan->request_karat = $request->karat; $pengesahan->save(); // dd($pengesahan); - } elseif ($bezaBerat > $parameterBezaBerat) { - $pengesahan = new Pengesahan(); + + } + else if ($lelongBidMarhun->berat != $request->berat_emas) { + $pengesahan = new Pengesahan; $pengesahan->lelong_id = $lelong->id; $pengesahan->lelongbid_id = $lelongbid->id; $pengesahan->lelongbidmarhun_id = $lelongBidMarhun->id; @@ -409,8 +424,9 @@ class MarhunController extends Controller $pengesahan->status_ubah = 4; //ubah berat $pengesahan->request_berat = $request->berat_emas; $pengesahan->save(); - } elseif ($lelongBidMarhun->karat > $request->karat) { - $pengesahan = new Pengesahan(); + } + else if ($lelongBidMarhun->karat != $request->karat) { + $pengesahan = new Pengesahan; $pengesahan->lelong_id = $lelong->id; $pengesahan->lelongbid_id = $lelongbid->id; $pengesahan->lelongbidmarhun_id = $lelongBidMarhun->id; @@ -504,7 +520,7 @@ class MarhunController extends Controller ->where('photo_type', '=', '1') ->first(); if (isset($filemarhun)) { - $lelongbid->filemarhun_filename = $filemarhun->filename; + $lelongbid->filemarhun_filename = true; $lelongbid->filemarhun_id = $filemarhun->id; } $marhun = LelongBidMarhun::with( @@ -523,11 +539,24 @@ class MarhunController extends Controller $index->eachmarhun_filename = route('marhun.showphotomarhun', ['lelong_id' => $lelong_id, 'filemarhun_id' => $eachmarhun]); $index->eachmarhun_id = $eachmarhun->id; } + + /** + * FIXME: + * Status here need to clarify + */ + $status = Pengesahan::where('lelongbid_id', $id) + ->where('lelong_id', $lelongbid['lelong_id']) + ->first(); + // dd($status); + // $marhun[$index->status_semak] = $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')); } public function senarailelongmarhun(Request $request) @@ -775,18 +804,18 @@ class MarhunController extends Controller { $user = Auth::user(); $arrayinfo = []; - - $lelong = pengesahan::join('lelong', 'lelong.id', '=', 'pengesahan.lelong_id') - ->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]) - ->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') - - ->distinct() - ->get() - ->toArray(); + + $lelong = pengesahan::join('lelong','lelong.id','=','pengesahan.lelong_id') + ->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,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') + + ->distinct() + ->get() + ->toArray(); // dd($lelong); foreach ($lelong as $info) { @@ -912,30 +941,30 @@ class MarhunController extends Controller // dd($status['request_karat']); // if($status['request']) $getkaratnew = LelKarat::where('karat', $status['request_karat']) - ->where('lelong_id', $id) - ->first(); - - $newhargaasas = bcdiv($status['request_berat'] * $getkaratnew['harga2'], 1); + ->where('lelong_id', $id) + ->first(); + + $newhargaasas = round($status['request_berat'] * $getkaratnew['harga2']); // dump($lelbidmarhun->lelongbidmarhun_id); } elseif ($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 = bcdiv($status['request_berat'] * $marhun['harga'], 1); + ->where('lelong_id', $id) + ->first(); + + $newhargaasas = round($status['request_berat'] * $marhun['harga'], 1); // dd($newhargaasas); } elseif ($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 = bcdiv($marhun['berat'] * $getkaratnew['harga2'], 1); + ->where('lelong_id', $id) + ->first(); + + $newhargaasas = round($marhun['berat'] * $getkaratnew['harga2']); // dd($newhargaasas); } elseif ($status->status_ubah == 7) { //jika ubah marhun @@ -943,39 +972,41 @@ 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 // dd($status['request_karat']); // if($status['request']) $getkaratnew = LelKarat::where('karat', $status['request_karat']) - ->where('lelong_id', $id) - ->first(); - - $newhargaasas = bcdiv($status['request_berat'] * $getkaratnew['harga2'], 1); + ->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 = bcdiv($getkaratnew['harga2'] * $marhun['berat'], 1); - } elseif ($status->status_ubah == 4) { - //jika berat berubah + ->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 = bcdiv($status['request_berat'] * $marhun['harga'], 1); - } elseif ($status->status_ubah == 2) { - //jika add marhun + ->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 = bcdiv($marhun['berat'] * $marhun['harga'], 1); - } elseif ($status->status_ubah == 3) { - //jika hapus marhun + ->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) @@ -983,18 +1014,18 @@ class MarhunController extends Controller $newhargaasas = 0.0; } else { $getkaratnew = LelKarat::where('karat', $marhun['karat']) - ->where('lelong_id', $id) - ->first(); - $newhargaasas = bcdiv($marhun['berat'] * $marhun['harga'], 1); + ->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 = bcdiv($marhun['berat'] * $marhun['harga'], 1); + ->where('lelong_id', $id) + ->first(); + $newhargaasas = round($marhun['berat'] * $marhun['harga']); } // dump($newhargaasas); @@ -1033,6 +1064,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 @@ -1074,126 +1340,132 @@ class MarhunController extends Controller $getkarat = LelKarat::where('karat', $terimalel->request_karat) ->where('lelong_id', $request->lelong_id) ->first(); - $nilaimarhunnew = $lelongbidmarhuns->berat * $getkarat->harga2; - $hargaasasnew = bcdiv($nilaimarhunnew, 1); + $nilaimarhunnew = $lelongbidmarhuns->berat * $getkarat->harga2; + $hargaasasnew = round($nilaimarhunnew); - $updatemarhun = $lelongbidmarhuns; - $updatemarhun->karat = $terimalel->request_karat; - $updatemarhun->harga = $getkarat['harga2']; - $updatemarhun->n_marhun = $nilaimarhunnew; - $updatemarhun->hargaasas = $hargaasasnew; - $updatemarhun->update(); - } elseif ($terimalel->status_ubah == 4) { - //ubah berat - $getkarat = LelKarat::where('karat', $lelongbidmarhuns->old_karat) + $updatemarhun = $lelongbidmarhuns; + $updatemarhun->karat = $terimalel->request_karat; + $updatemarhun->harga = $getkarat['harga2']; + $updatemarhun->n_marhun = $nilaimarhunnew; + $updatemarhun->hargaasas = $hargaasasnew; + $updatemarhun->update(); + + } else if ($terimalel->status_ubah == 4) //ubah berat + { + $getkarat = LelKarat::where('karat', $lelongbidmarhuns->old_karat) ->where('lelong_id', $request->lelong_id) ->first(); - $nilaimarhunnew = $terimalel->request_berat * $getkarat['harga2']; - $hargaasasnew = bcdiv($nilaimarhunnew, 1); + $nilaimarhunnew = $terimalel->request_berat * $getkarat['harga2']; + $hargaasasnew = round($nilaimarhunnew); - $updatemarhun = $lelongbidmarhuns; - $updatemarhun->berat = $terimalel->request_berat; - $updatemarhun->harga = $getkarat['harga2']; - $updatemarhun->n_marhun = $nilaimarhunnew; - $updatemarhun->hargaasas = $hargaasasnew; - $updatemarhun->save(); - } elseif ($terimalel->status_ubah == 5) { - //ubah mutu dan berat - $getkarat = LelKarat::where('karat', $terimalel->request_karat) + $updatemarhun = $lelongbidmarhuns; + $updatemarhun->berat = $terimalel->request_berat; + $updatemarhun->harga = $getkarat['harga2']; + $updatemarhun->n_marhun = $nilaimarhunnew; + $updatemarhun->hargaasas = $hargaasasnew; + $updatemarhun->save(); + } else if ($terimalel->status_ubah == 5) //ubah mutu dan berat + { + $getkarat = LelKarat::where('karat', $terimalel->request_karat) ->where('lelong_id', $request->lelong_id) ->first(); - // dd($getkarat['harga2']); - $nilaimarhunnew = $terimalel->request_berat * $getkarat['harga2']; - $hargaasasnew = bcdiv($nilaimarhunnew, 1); + // dd($getkarat['harga2']); + $nilaimarhunnew = $terimalel->request_berat * $getkarat['harga2']; + $hargaasasnew = round($nilaimarhunnew); - $updatemarhun = LelongBidMarhun::where('id', $terimalel->lelongbidmarhun_id)->first(); - $updatemarhun->berat = $terimalel->request_berat; - $updatemarhun->karat = $terimalel->request_karat; - $updatemarhun->harga = $getkarat['harga2']; - $updatemarhun->n_marhun = $nilaimarhunnew; - $updatemarhun->hargaasas = $hargaasasnew; - $updatemarhun->save(); - } elseif ($terimalel->status_ubah == 7) { - //ubah marhun - $getkarat = LelKarat::where('karat', $lelongbidmarhuns->karat) + $updatemarhun = LelongBidMarhun::where('id', $terimalel->lelongbidmarhun_id)->first(); + $updatemarhun->berat = $terimalel->request_berat; + $updatemarhun->karat = $terimalel->request_karat; + $updatemarhun->harga = $getkarat['harga2']; + $updatemarhun->n_marhun = $nilaimarhunnew; + $updatemarhun->hargaasas = $hargaasasnew; + $updatemarhun->save(); + } + else if ($terimalel->status_ubah == 7) //ubah marhun + { + $getkarat = LelKarat::where('karat', $lelongbidmarhuns->karat) ->where('lelong_id', $request->lelong_id) ->first(); - // dd($getkarat['harga2']); - $nilaimarhunnew = $lelongbidmarhuns->berat * $getkarat['harga2']; - $hargaasasnew = bcdiv($nilaimarhunnew, 1); + // dd($getkarat['harga2']); + $nilaimarhunnew = $lelongbidmarhuns->berat * $getkarat['harga2']; + $hargaasasnew = round($nilaimarhunnew); - $updatemarhun = LelongBidMarhun::where('id', $terimalel->lelongbidmarhun_id)->first(); - $updatemarhun->marhun = $terimalel->request_marhun; - $updatemarhun->harga = $getkarat['harga2']; - $updatemarhun->n_marhun = $nilaimarhunnew; - $updatemarhun->hargaasas = $hargaasasnew; - $updatemarhun->save(); - } elseif ($terimalel->status_ubah == 8) { - //ubah mutu dan berat dan marhun - $getkarat = LelKarat::where('karat', $terimalel->request_karat) + $updatemarhun = LelongBidMarhun::where('id', $terimalel->lelongbidmarhun_id)->first(); + $updatemarhun->marhun = $terimalel->request_marhun; + $updatemarhun->harga = $getkarat['harga2']; + $updatemarhun->n_marhun = $nilaimarhunnew; + $updatemarhun->hargaasas = $hargaasasnew; + $updatemarhun->save(); + } + else if ($terimalel->status_ubah == 8) //ubah mutu dan berat dan marhun + { + $getkarat = LelKarat::where('karat', $terimalel->request_karat) ->where('lelong_id', $request->lelong_id) ->first(); - // dd($getkarat['harga2']); - $nilaimarhunnew = $terimalel->request_berat * $getkarat['harga2']; - $hargaasasnew = bcdiv($nilaimarhunnew, 1); + // dd($getkarat['harga2']); + $nilaimarhunnew = $terimalel->request_berat * $getkarat['harga2']; + $hargaasasnew = round($nilaimarhunnew); - $updatemarhun = LelongBidMarhun::where('id', $terimalel->lelongbidmarhun_id)->first(); - $updatemarhun->marhun = $terimalel->request_marhun; - $updatemarhun->berat = $terimalel->request_berat; - $updatemarhun->karat = $terimalel->request_karat; - $updatemarhun->harga = $getkarat['harga2']; - $updatemarhun->n_marhun = $nilaimarhunnew; - $updatemarhun->hargaasas = $hargaasasnew; - $updatemarhun->save(); - } elseif ($terimalel->status_ubah == 9) { - //ubah mutu dan marhun - $getkarat = LelKarat::where('karat', $terimalel->request_karat) + $updatemarhun = LelongBidMarhun::where('id', $terimalel->lelongbidmarhun_id)->first(); + $updatemarhun->marhun = $terimalel->request_marhun; + $updatemarhun->berat = $terimalel->request_berat; + $updatemarhun->karat = $terimalel->request_karat; + $updatemarhun->harga = $getkarat['harga2']; + $updatemarhun->n_marhun = $nilaimarhunnew; + $updatemarhun->hargaasas = $hargaasasnew; + $updatemarhun->save(); + } + else if ($terimalel->status_ubah == 9) //ubah mutu dan marhun + { + $getkarat = LelKarat::where('karat', $terimalel->request_karat) ->where('lelong_id', $request->lelong_id) ->first(); - // dd($getkarat['harga2']); - $nilaimarhunnew = $lelongbidmarhuns->berat * $getkarat['harga2']; - $hargaasasnew = bcdiv($nilaimarhunnew, 1); + // dd($getkarat['harga2']); + $nilaimarhunnew = $lelongbidmarhuns->berat * $getkarat['harga2']; + $hargaasasnew = round($nilaimarhunnew); - $updatemarhun = LelongBidMarhun::where('id', $terimalel->lelongbidmarhun_id)->first(); - $updatemarhun->marhun = $terimalel->request_marhun; - $updatemarhun->karat = $terimalel->request_karat; - $updatemarhun->harga = $getkarat['harga2']; - $updatemarhun->n_marhun = $nilaimarhunnew; - $updatemarhun->hargaasas = $hargaasasnew; - $updatemarhun->save(); - } elseif ($terimalel->status_ubah == 10) { - //ubah berat dan marhun - $getkarat = LelKarat::where('karat', $lelongbidmarhuns->karat) + $updatemarhun = LelongBidMarhun::where('id', $terimalel->lelongbidmarhun_id)->first(); + $updatemarhun->marhun = $terimalel->request_marhun; + $updatemarhun->karat = $terimalel->request_karat; + $updatemarhun->harga = $getkarat['harga2']; + $updatemarhun->n_marhun = $nilaimarhunnew; + $updatemarhun->hargaasas = $hargaasasnew; + $updatemarhun->save(); + } + else if ($terimalel->status_ubah == 10) //ubah berat dan marhun + { + $getkarat = LelKarat::where('karat', $lelongbidmarhuns->karat) ->where('lelong_id', $request->lelong_id) ->first(); - // dd($getkarat['harga2']); - $nilaimarhunnew = $terimalel->request_berat * $getkarat['harga2']; - $hargaasasnew = bcdiv($nilaimarhunnew, 1); + // dd($getkarat['harga2']); + $nilaimarhunnew = $terimalel->request_berat * $getkarat['harga2']; + $hargaasasnew = round($nilaimarhunnew); - $updatemarhun = LelongBidMarhun::where('id', $terimalel->lelongbidmarhun_id)->first(); - $updatemarhun->marhun = $terimalel->request_marhun; - $updatemarhun->berat = $terimalel->request_berat; - $updatemarhun->harga = $getkarat['harga2']; - $updatemarhun->n_marhun = $nilaimarhunnew; - $updatemarhun->hargaasas = $hargaasasnew; - $updatemarhun->save(); - } elseif ($terimalel->status_ubah == 2) { - //tambah marhun - $getkarat = LelKarat::where('karat', $lelongbidmarhuns->karat) + $updatemarhun = LelongBidMarhun::where('id', $terimalel->lelongbidmarhun_id)->first(); + $updatemarhun->marhun = $terimalel->request_marhun; + $updatemarhun->berat = $terimalel->request_berat; + $updatemarhun->harga = $getkarat['harga2']; + $updatemarhun->n_marhun = $nilaimarhunnew; + $updatemarhun->hargaasas = $hargaasasnew; + $updatemarhun->save(); + } + else if ($terimalel->status_ubah == 2) //tambah marhun + { + $getkarat = LelKarat::where('karat', $lelongbidmarhuns->karat) ->where('lelong_id', $request->lelong_id) ->first(); - // dd($getkarat['harga2']); - $nilaimarhunnew = $lelongbidmarhuns->berat * $getkarat['harga2']; - $hargaasasnew = bcdiv($nilaimarhunnew, 1); + // dd($getkarat['harga2']); + $nilaimarhunnew = $lelongbidmarhuns->berat * $getkarat['harga2']; + $hargaasasnew = round($nilaimarhunnew); - $updatemarhun = LelongBidMarhun::where('id', $terimalel->lelongbidmarhun_id)->first(); - $updatemarhun->harga = $getkarat['harga2']; - $updatemarhun->n_marhun = $nilaimarhunnew; - $updatemarhun->hargaasas = $hargaasasnew; - $updatemarhun->save(); - } else { - // - } + $updatemarhun = LelongBidMarhun::where('id', $terimalel->lelongbidmarhun_id)->first(); + $updatemarhun->harga = $getkarat['harga2']; + $updatemarhun->n_marhun = $nilaimarhunnew; + $updatemarhun->hargaasas = $hargaasasnew; + $updatemarhun->save(); + } else { + // + } $terimalel->disahkan_oleh = $user['id']; $terimalel->disahkan_pada = $currentdate; $terimalel->status = 1; @@ -1205,6 +1477,7 @@ class MarhunController extends Controller ->first(); $updatelelongbid->berat = $itemmarhun->sum('berat'); $updatelelongbid->hargaasas = $itemmarhun->sum('hargaasas'); + $updatelelongbid->status_semak = '1'; $updatelelongbid->update(); } } elseif ($request->jenis_button == 'tidaksah') { @@ -1340,16 +1613,18 @@ class MarhunController extends Controller { $user = Auth::user(); - $cawangan = Pengesahan::join('users', 'pengesahan.diminta_oleh', 'users.id') - ->where('pengesahan.lelong_id', $id) - ->whereNotNull('pengesahan.disahkan_oleh') - ->select('pengesahan.diminta_oleh', 'pengesahan.disahkan_oleh', 'pengesahan.disahkan_pada', 'pengesahan.norujukan', 'pengesahan.lelong_id', 'users.id as user_id', 'users.name', 'users.username', 'users.kodcaw') - ->distinct() - ->get(); + $cawangan = Pengesahan::where('pengesahan.lelong_id', $id) + ->where('pengesahan.status', 1) + ->whereNotNull('pengesahan.disahkan_oleh') + ->select('pengesahan.lelongbid_id','pengesahan.diminta_oleh','pengesahan.disahkan_oleh', 'pengesahan.disahkan_pada', 'pengesahan.norujukan', 'pengesahan.lelong_id') + ->orderBy('pengesahan.lelongbid_id') + ->distinct() + ->get(); // dd($cawangan); foreach ($cawangan as $index1 => $caw) { // dd($caw); + $getpengesahan = Cawangan::where('caw_code', $caw['kodcaw'])->first(); // dd($getpengesahan); @@ -1357,9 +1632,22 @@ class MarhunController extends Controller $getdimintaoleh = User::where('id', $caw['diminta_oleh'])->first(); // dd($getdisahkanoleh); - $cawangan[$index1]['namacaw'] = $getpengesahan['caw_name']; + // dd(/$caw['lelongbid_id']); + $status = Pengesahan::where('lelongbid_id', $caw['lelongbid_id']) + ->select('id as sahid','status_ubah', 'request_karat', 'request_berat', 'request_marhun') + ->get(); + // dump($status); + + // $marhun= LelongBidMarhun::where('lelongbid_id','=',$caw['lelongbid_id']) + // ->get(); + $marhuns = LelongBidMarhun::where('lelongbid_id', $caw['lelongbid_id']) + ->get()->toArray(); + // dd($marhuns); + // $cawangan[$index1]['namacaw'] = $getpengesahan['caw_name']; $cawangan[$index1]['disahkan_oleh'] = $getdisahkanoleh['name']; $cawangan[$index1]['diminta_oleh'] = $getdimintaoleh['name']; + $cawangan[$index1]['detailmarhun']=$status; + $cawangan[$index1]['detail']=$marhuns; } return view('pengesahan.listperubahanmutumarhun', compact('cawangan', 'id')); @@ -1382,12 +1670,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')); @@ -1457,9 +1757,36 @@ class MarhunController extends Controller return view('marhun.scanbarcode', compact('lelong_id', 'lelongDetail', 'new_lelong_bid', 'senaraiScanKeluar')); } + public function listScanBarcodeMasuk($lelong_id) + { + $user = Auth::user(); + $caw = Cawangan::where('caw_code', '=', $user->kodcaw)->first(); + + $lelongDetail = Lelong::where('id', '=', $lelong_id)->first(); + $lelongbid = LelongBid::where('lelong_id', '=', $lelong_id) + ->where('caw_id', '=', $caw->id) + ->select('id') + ->get() + ->keyBy('id'); + + $senaraiScanKeluar = ScanSemak::where('lelong_id', '=', $lelong_id) + ->where('kodcaw', '=', $caw->caw_code) + ->whereNull('scan_masuk') + ->get(); + + $pluckLelongBid = $lelongbid->pluck('id')->toArray(); + $pluckScanKeluar = $senaraiScanKeluar->pluck('lelongbid_id')->toArray(); + $diff_lelong_bid = array_diff($pluckLelongBid, $pluckScanKeluar); + + $new_lelong_bid = LelongBid::with('scanSemakSelesai')->whereIn('id', $diff_lelong_bid)->get(); + + return view('marhun.scanbarcodemasuk', compact('lelong_id', 'lelongDetail', 'new_lelong_bid', 'senaraiScanKeluar')); + } + public function scanKeluarMarhun(Request $request) { - $user = Auth::user(); + + // $user = Auth::user(); $current = Carbon::now(); $checkExisting = ScanSemak::where('norujukan', '=', $request->norujukan_barcode) @@ -1468,18 +1795,50 @@ 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(); - return redirect() - ->route('marhun.scanbarcode', $request->lelong_id) + $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 { return redirect() @@ -1503,12 +1862,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.'); } } @@ -1782,23 +2139,42 @@ class MarhunController extends Controller $current = Carbon::now(); $current = new Carbon(); $tarikh_cetak = $current->toDateString(); + // dd($request->datehingga); - if ($request->datemula == null) { - $mula_date = '2017-01-01'; - } else { - $split_date = explode('-', $request->datemula); - $mula_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0]; - } + + + $myDateTime = DateTime::createFromFormat('Y-m-d', $request->datehingga ); + $datez = $myDateTime->modify('+1 day')->format('Y-m-d'); + $request->datehingga =$datez; - if ($request->datehingga == null) { - $hingga_date = $current->toDateString(); - } else { - $split_date = explode('-', $request->datehingga); - $hingga_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0]; - } $kodcaw = $auth_user['kodcaw']; + $cawangan = Cawangan::where('caw_code','=',$kodcaw) + ->first(); + + if($request->jenis == 'keluar') + { + $scan=ScanSemak::where('scan_semak.kodcaw','=',$kodcaw) + ->join('users','scan_semak.khazanah_id','=','users.id') + ->where('scan_keluar','>=', $request->datemula) + ->where('scan_keluar','<=', $request->datehingga ) + ->get(); + + return view('pdf.laporanscankeluar', compact('scan','auth_user','tarikh_cetak','cawangan')); + + } + + else if($request->jenis == 'masuk'){ + + $scan=ScanSemak::join('users','scan_semak.khazanah_id','=','users.id') + ->where('scan_semak.kodcaw','=',$kodcaw) + ->where([['scan_masuk','>=', $request->datemula],['scan_masuk','<=', $request->datehingga ]]) + ->get(); + + return view('pdf.laporanscanmasuk', compact('scan','auth_user','tarikh_cetak','cawangan')); + } + $cawangan = Cawangan::where('caw_code', '=', $kodcaw)->first(); if ($request->jenis == 'keluar') { @@ -1825,6 +2201,8 @@ class MarhunController extends Controller return view('pdf.laporanscanserahpembida', compact('scan', 'auth_user', 'tarikh_cetak', 'cawangan')); } + + } public function senaraiterimaserah(Request $request) @@ -1884,4 +2262,7 @@ class MarhunController extends Controller $marhun = FileMarhun::where('id', '=', $request->filemarhun_id)->first(); return $this->marhunPhotoService->show($request->lelong_id, $marhun); } + + + } diff --git a/app/Http/Controllers/NotisController.php b/app/Http/Controllers/NotisController.php index b4820721..fbce6251 100644 --- a/app/Http/Controllers/NotisController.php +++ b/app/Http/Controllers/NotisController.php @@ -183,7 +183,7 @@ class NotisController extends Controller $pdf = PDF::loadView('pdf.jananotis',compact('marhuns','lelong_id','lelongid','caw','tarikh_cetak','customer','listsag')) ->setPaper('a4', 'potrait'); - return $pdf->download('Penjanaan Notis Fasa 1: ID Lelong '.$lelong_id.'.pdf'); + return $pdf->download('Penjanaan Notis Fasa 1:Batch Lelong '.$lelong_id.'.pdf'); } @@ -386,7 +386,7 @@ class NotisController extends Controller $pdf = PDF::loadView('pdf.jananotisfasa2',compact('marhuns','lelong_id','lelongid','caw','tarikh_cetak','customer','listsag')) ->setPaper('a4', 'potrait'); - return $pdf->download('Penjanaan Notis Fasa 2: ID Lelong '.$lelong_id.'.pdf'); + return $pdf->download('Penjanaan Notis Fasa 2:Batch Lelong '.$lelong_id.'.pdf'); } diff --git a/app/Http/Controllers/PaymentController.php b/app/Http/Controllers/PaymentController.php index b238817a..4478f92f 100644 --- a/app/Http/Controllers/PaymentController.php +++ b/app/Http/Controllers/PaymentController.php @@ -47,8 +47,10 @@ class PaymentController extends Controller array_push($arrayinfo,['info'=>$info, 'detailsinfo'=>$detailsinfo]); // dd($detailsinfo); } + $datacaw = Cawangan::where('caw_code','=', $user->kodcaw) + ->get(); - return view('pembayaran.senarailelongbayaran',compact('lelong', 'arrayinfo')); + return view('pembayaran.senarailelongbayaran',compact('datacaw','lelong', 'arrayinfo')); } @@ -111,7 +113,10 @@ class PaymentController extends Controller } - return view('pembayaran.kaunterpembayaran',compact('listwinner','lelong_id')); + $datacaw = Cawangan::where('caw_code','=', $user->kodcaw) + ->get(); + + return view('pembayaran.kaunterpembayaran',compact('datacaw','listwinner','lelong_id')); } diff --git a/app/Http/Controllers/PembidaController.php b/app/Http/Controllers/PembidaController.php index 4b0856fc..881d44c8 100644 --- a/app/Http/Controllers/PembidaController.php +++ b/app/Http/Controllers/PembidaController.php @@ -485,8 +485,10 @@ class PembidaController extends Controller array_push($arrayinfo,['detail'=>$details, 'detailsinfo'=>$detailsinfo]); } // dd($request->kodcaw); + $datacaw = Cawangan::where('caw_code','=',$kodcaw) + ->get(); - return view('pembida.listkebenaranbayarantunai',compact('lelong','arrayinfo')); + return view('pembida.listkebenaranbayarantunai',compact('datacaw','lelong','arrayinfo')); } // public function senaraipemenangbycaw(Request $request, $lelong_id){ @@ -596,9 +598,11 @@ class PembidaController extends Controller $listwinner[$index1]['sts_payment'] = $sts_payment[0]['status_payment']; } + $datacaw = Cawangan::where('caw_code','=',$caw_code) + ->get(); // return view('pembayaran.kaunterpembayaran',compact('listwinner','lelong_id')); - return view('pembida.senaraipemenangbycaw',compact('listwinner','lelong_id','caw_code')); + return view('pembida.senaraipemenangbycaw',compact('datacaw','listwinner','lelong_id','caw_code')); } diff --git a/app/Http/Controllers/PenggunaController.php b/app/Http/Controllers/PenggunaController.php index da6485aa..fe55e4e1 100644 --- a/app/Http/Controllers/PenggunaController.php +++ b/app/Http/Controllers/PenggunaController.php @@ -72,40 +72,51 @@ class PenggunaController extends Controller 'username' => 'required|string|unique:users' ]); - if ($validator->fails()) { - $errors = [ - 'success' => "error", - 'message' => $validator->errors() + // if ($validator->fails()) { + // $errors = [ + // 'success' => "error", + // 'message' => $validator->errors() - ]; + // ]; - return redirect()->route('pengguna.index') - ->with('message', 'Sila Masukkan Email Yang Sah'); } + // return redirect()->route('pengguna.index') + // ->with('message', 'Sila Masukkan Email Yang Sah'); } - $user = new User; - $user->name = $request->name; - $user->username = $request->username; - $user->kodcaw = $request->caw; - $user->status = 'active'; - $user->t_daftar = $currentdate; - $user->email = $request->email; - $user->email_verified_at = $currentdate; - $user->password = '$2y$10$92IXUNpkjO0rOQ5byMi.Ye4oKoEa3Ro9llC/.og/at2.uheWG/igi'; //password - $user->user_type = 1; - $user->save(); + //check if user already existed + $check = User::where('username',$request->username) + ->orWhere('email',$request->email) + ->first(); - $allroles = Role::all()->pluck('name'); - $arraytaraf = []; - foreach($allroles as $index=>$taraf) { - $req = 'taraf'.$taraf; - if($request->$req) + if($check) { - array_push($arraytaraf,$taraf); + return redirect()->route('pengguna.index')->with('failed','Maaf, Nama Pengguna / Emel Berikut Telah Wujud !'); + } else { + $user = new User; + $user->name = $request->name; + $user->username = $request->username; + $user->kodcaw = $request->caw; + $user->status = 'active'; + $user->t_daftar = $currentdate; + $user->email = $request->email; + $user->email_verified_at = $currentdate; + $user->password = '$2y$10$92IXUNpkjO0rOQ5byMi.Ye4oKoEa3Ro9llC/.og/at2.uheWG/igi'; //password + $user->user_type = 1; + $user->save(); + + $allroles = Role::all()->pluck('name'); + $arraytaraf = []; + foreach($allroles as $index=>$taraf) { + $req = 'taraf'.$taraf; + if($request->$req) + { + array_push($arraytaraf,$taraf); + } + } + $user->syncRoles($arraytaraf); + return redirect()->route('pengguna.index') + ->with('success', 'Pengguna Berjaya Disimpan'); } - } - $user->syncRoles($arraytaraf); - return redirect()->route('pengguna.index') - ->with('success', 'Pengguna Berjaya Disimpan'); + } public function store(Request $request) diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php index 7ffe9ca1..106353f2 100644 --- a/app/Http/Controllers/ReportController.php +++ b/app/Http/Controllers/ReportController.php @@ -33,6 +33,7 @@ use App\Models\Resit; use App\Models\Customer; use App\Models\LelongTebus; use App\Models\Pengesahan; +use App\Models\TransaksiKeuntungan; use Carbon\Carbon; @@ -649,10 +650,63 @@ class ReportController extends Controller ->setPaper('a4','potrait'); return $pdf->download('Laporan Simulasi Cawangan.pdf'); - + } + public function simulasireportbycust($simulasi_id, $cawid) + { + $keuntungan = 0; + $arraylistgadai = 0; + + $simulasilel = Simulasi::with('cawangan')->find($simulasi_id); + $cawname = Cawangan::where('id','=',$cawid)->first(); + + $cawanganDetail = $simulasilel->cawangan->find($cawid); + + $marhun = SimulasiBid::join('cawangan', 'simulasibid.caw_id', '=', 'cawangan.id') + ->where('simulasi_id','=',$simulasi_id) + ->where('caw_id','=',$cawid); + + $arraynorujukan = $marhun->pluck('norujukan')->toArray(); + $datasimulasi = $marhun->get(); + $marhuns = Gadai::on($datasimulasi[0]['kodcaw'])->whereIn('norujukan', $arraynorujukan) + ->select('nokp') + ->groupBy('nokp')->get(); + // dd($datagadai); + $arraysag = []; + + foreach($marhuns as $index1=>$cal) + { + $customer = Customer::where('kpbaru','=',$cal['nokp']) + ->orWhere('kplama','=',$cal['nokp']) + ->first(); + // dd($customer); + + $listsag = Gadai::on($datasimulasi[0]['kodcaw'])->whereIn('norujukan', $arraynorujukan) + ->where('nokp','=',$cal['nokp']) + ->get(); + // dd($listgadai); + foreach($listsag as $index=>$listing){ + $ktlhbyr = TransaksiKeuntungan::on('main')->where('norujukan','=',$listing['norujukan'])->sum('bayaran_keuntungan'); + // dd($ktlhbyr); + $total_untung_rebet = TransaksiKeuntungan::on('main')->where('norujukan','=',$listing['norujukan'])->sum('keuntungan_rebet'); + $total_untung_asal = TransaksiKeuntungan::on('main')->where('norujukan','=',$listing['norujukan'])->sum('bayaran_keuntungan'); + $beza_keuntungan = $total_untung_asal - $total_untung_rebet; + $keuntungan = bcdiv(($listing['tempoh']-$listing['tempohbayar'])*$listing['kadarupah']/100*$listing['bakipjm'],1,1)-$beza_keuntungan; + // dd($keuntungan); + $listsag[$index]['ktlhbyr'] = $ktlhbyr; + $listsag[$index]['keuntungan'] = $keuntungan; + } + $marhuns[$index1]['nama'] = $customer; + $marhuns[$index1]['listsag'] = $listsag; + + } + $pdf = PDF::loadView('pdf.simulasireportbycust',compact('simulasilel','cawanganDetail','marhuns','simulasi_id','cawid','ktlhbyr','cawname')) + ->setPaper('a4','potrait'); + + return $pdf->download('Laporan Simulasi Cawangan by Pelanggan.pdf'); + } public function lelongreport ($lelongid, $cawid){ @@ -770,33 +824,71 @@ class ReportController extends Controller // return view('lelong.senaraimarhun',compact('arraymarhun','marhuns','lelongid','cawid','arrayinfo')); } + public function lapubahmarhunlelong (){ - public function lapubahmarhunlelongindex (){ - - $arraydetails = []; - - $laporan= Pengesahan::join('lelongbidmarhun','pengesahan.lelongbidmarhun_id','=','lelongbidmarhun.id') - ->join('lelongbid','lelongbid.norujukan','=','pengesahan.norujukan') - ->select('pengesahan.norujukan','pengesahan.lelong_id','lelongbid.caw_id','pengesahan.diminta_pada','pengesahan.disahkan_oleh','pengesahan.disahkan_pada','pengesahan.diminta_oleh','pengesahan.status','pengesahan.status_ubah','lelongbidmarhun.old_karat','lelongbidmarhun.karat','lelongbidmarhun.old_berat','lelongbidmarhun.berat','lelongbid.kodcaw','lelongbid.norujukan','lelongbid.lelong_id') - ->whereNotNull('pengesahan.disahkan_oleh') - ->orderBy('pengesahan.id') + $arraydetails = []; + + $laporan= Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id') + ->join('pengesahan','lelong.id','=','pengesahan.lelong_id') + ->select('cawangan_lelong.lelong_id','tarikh_lelong','lelong.fasa') + ->distinct() + ->orderBy('cawangan_lelong.lelong_id') ->get() ->toArray(); + // dd($laporan); - foreach($laporan as $lap) //stop here 01.09.2022 - { - $details = CawanganLelong ::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') - ->where('lelong_id',$lap['lelong_id']) - ->where('caw_id',$lap['caw_id']) + + foreach($laporan as $brg) + { + $details = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') + ->where('lelong_id', $brg['lelong_id']) ->distinct() ->orderBy('lelong_id') ->get() ->toArray(); - array_push($arraydetails, ['lap' =>$lap,'details' =>$details]); - - } + array_push($arraydetails,['brg' => $brg, 'detailsbrg' => $details ]); + } - return view('marhun.ubahmarhun', compact('laporan','arraydetails')); + + return view('marhun.ubahmarhuncaw', compact('arraydetails')); + + } + + + public function lapubahmarhunlelongindex ($lelong_id, $kodcaw){ + + $cawangan = Pengesahan::where('pengesahan.lelong_id', $lelong_id) + ->where('pengesahan.status', 1) + ->whereNotNull('pengesahan.disahkan_oleh') + ->select('pengesahan.lelongbid_id','pengesahan.diminta_oleh','pengesahan.disahkan_oleh', 'pengesahan.disahkan_pada', 'pengesahan.norujukan', 'pengesahan.lelong_id') + ->orderBy('pengesahan.lelongbid_id') + ->distinct() + ->get(); + + foreach($cawangan as $index1=>$caw) + { + + $getpengesahan = Cawangan::where('caw_code', $kodcaw)->first(); + + $getdisahkanoleh = User::where('id', $caw['disahkan_oleh'])->first(); + $getdimintaoleh = User::where('id', $caw['diminta_oleh'])->first(); + + $status = Pengesahan::where('lelongbid_id', $caw['lelongbid_id']) + ->select('id as sahid','status_ubah', 'request_karat', 'request_berat', 'request_marhun') + ->get(); + + + $marhuns = LelongBidMarhun::where('lelongbid_id', $caw['lelongbid_id']) + ->get() + ->toArray(); + $cawangan[$index1]['namacaw'] = $getpengesahan['caw_name']; + $cawangan[$index1]['disahkan_oleh'] = $getdisahkanoleh['name']; + $cawangan[$index1]['diminta_oleh'] = $getdimintaoleh['name']; + $cawangan[$index1]['detailmarhun']=$status; + $cawangan[$index1]['detail']=$marhuns; + } + + return view('marhun.ubahmarhun', compact('cawangan','lelong_id','getpengesahan')); } public function exportubahmarhun (){ diff --git a/app/Http/Controllers/SimulasiController.php b/app/Http/Controllers/SimulasiController.php index 929163b1..5dfdd098 100644 --- a/app/Http/Controllers/SimulasiController.php +++ b/app/Http/Controllers/SimulasiController.php @@ -1120,6 +1120,7 @@ class SimulasiController extends Controller $karat->karat = $karat->karat; $karat->keterangan = $karat->keterangan; $karat->harga2 = $request->harga2[$index]; + $karat->updated_at = $currentdate; $karat->save(); } diff --git a/app/Http/Controllers/TangguhLelongController.php b/app/Http/Controllers/TangguhLelongController.php index 3e417b83..1201e60c 100644 --- a/app/Http/Controllers/TangguhLelongController.php +++ b/app/Http/Controllers/TangguhLelongController.php @@ -635,7 +635,79 @@ class TangguhLelongController extends Controller return $pdf->download('Borang Tangguh Lelong '.$lelong_id.'.pdf'); - } + } + + public function ulangdownloadmohon($lelongbid_id) + { + $user = Auth::user(); + $currentdate = Carbon::now(); + $currentdate = $currentdate->toDateTimeString(); + + $current = new Carbon(); + $t_mohon = $current->toDateString(); + + $selectedbid_id = $lelongbid_id; + //dd($selectedbid_id); + // $nokp = $request->nokp; + // $lelong_id = $request->lelong_id; + + + $lelongbid = LelongBid::where('lelongbid.id', $selectedbid_id) + ->get(); + + + foreach($lelongbid as $bidmarhun) + { + + $cust = Gadai::on($bidmarhun->kodcaw)->where('norujukan',$bidmarhun->norujukan) + ->first(); + //dd($cust['nokp']); + //to get nokp + + $lelongbidmarhun = LelongBidMarhun::where('lelongbid_id',$bidmarhun->id) + ->get(); + + $percents = round(($bidmarhun->pinjaman / $bidmarhun->nmarhuns * 100),2); + + $history = TangguhLelong::where('lelongbid_id',$bidmarhun->id) + ->first(); + + $cwgn = Cawangan::where('caw_code','=',$bidmarhun->kodcaw) + ->first(); + + $customer = Customer::where('kpbaru','=',$cust['nokp']) + ->orWhere('kplama','=',$cust->nokp) + ->join('poskod','customer.poskod','=','poskod.poskod') + ->join('daerah','poskod.koddaerah','=','daerah.koddaerah') + ->join('negeri','poskod.kodnegeri','=','negeri.kodnegeri') + ->first(); + + $lelongbid['nama'] = ($customer) ? $customer : dd($cust['nokp']); + + } + + //get staf cwgn roles harian + $roles_harian_penilai = Http::get(config('app.api_url_kaunter').'api/roles_harian/' . $user->kodcaw ,[ + 'role_harian' => 'penilai' + ])->json(); + + $roles_harian_khazanah = Http::get(config('app.api_url_kaunter').'api/roles_harian/' . $user->kodcaw ,[ + 'role_harian' => 'khazanah' + ])->json(); + + $roles_harian_pc = Http::get(config('app.api_url_kaunter').'api/roles_harian/' . $user->kodcaw ,[ + 'role_harian' => 'pc' + ])->json(); + + // dd($roles_harian_penilai,$roles_harian_khazanah,$roles_harian_pc); + + + // return view('pdf.brgtangguhlelong',compact('lelongbid','lelongbidmarhun','customer','cwgn','t_mohon','nokp','roles_harian_penilai','roles_harian_khazanah','roles_harian_pc')); + $pdf = PDF::loadView('pdf.brgtangguhlelong',compact('lelongbid','lelongbidmarhun','customer','cwgn','t_mohon','nokp','roles_harian_penilai','roles_harian_khazanah','roles_harian_pc')) + ->setPaper('a4', 'potrait'); + + return $pdf->download('Borang Tangguh Lelong '.$selectedbid_id.'.pdf'); + } public function sentangguh() { @@ -813,15 +885,19 @@ class TangguhLelongController extends Controller $lelongbid = LelongBid::where('lelongbid.id', $request->lelongbidid_mdl) ->delete(); - + return redirect()->route('pengesahan.opsenaraisahtangguh',[$tangguhlelong->lelong_id, $tangguhlelong->kodcaw]) + ->with('success', 'Tangguh Lelong Telah Di Lulus.'); + }else{ $tangguhlelong->status = 99; $tangguhlelong->update(); + + return redirect()->route('pengesahan.opsenaraisahtangguh',[$tangguhlelong->lelong_id, $tangguhlelong->kodcaw]) + ->with('success', 'Tangguh Lelong Tidak Di Lulus.'); } - return redirect()->route('pengesahan.opsenaraisahtangguh',[$tangguhlelong->lelong_id, $tangguhlelong->kodcaw]) - ->with('success', 'Tangguh Lelong Telah Di Sahkan.'); + } public function senaraitlhtangguh() diff --git a/app/Models/Gadai.php b/app/Models/Gadai.php index 7f4addc0..7387d9d3 100644 --- a/app/Models/Gadai.php +++ b/app/Models/Gadai.php @@ -9,6 +9,7 @@ class Gadai extends Model { use HasFactory; + protected $connection = 'main'; protected $table = 'gadai'; protected $fillable = [ diff --git a/app/Models/Lelong.php b/app/Models/Lelong.php index 63cf76b2..8f12511d 100644 --- a/app/Models/Lelong.php +++ b/app/Models/Lelong.php @@ -40,4 +40,9 @@ class Lelong extends Model { return $this->hasMany(LelKarat::class, 'lelong_id', 'id'); } + + public function pengesahan() + { + return $this->hasMany(Pengesahan::class,'lelong_id','id'); + } } 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..c8855205 100644 --- a/app/Models/Pengesahan.php +++ b/app/Models/Pengesahan.php @@ -22,4 +22,14 @@ class Pengesahan extends Model 'status', 'status_ubah' ]; + + public function lelongbidmarhun() + { + return $this->belongsTo(LelongBidMarhun::class, 'lelongbidmarhun_id' , 'id'); + } + + public function lelong() + { + return $this->belongsTo(Lelong::class,'lelong_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/2021_12_14_041557_create_lelongs_table.php b/database/migrations/2021_12_14_041557_create_lelongs_table.php index 82311997..1dc55c27 100644 --- a/database/migrations/2021_12_14_041557_create_lelongs_table.php +++ b/database/migrations/2021_12_14_041557_create_lelongs_table.php @@ -123,7 +123,8 @@ class CreateLelongsTable extends Migration $table->bigIncrements('id'); $table->unsignedBigInteger('lelongbid_id')->unsigned(); $table->decimal('bil', $precision = 3, $scale = 0); - $table->string('marhun'); + $table->string('old_marhun'); + $table->string('marhun'); $table->string('nota')->nullable(); $table->string('old_karat'); $table->string('karat'); 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/public/css/app.css b/public/css/app.css index 8ba99088..95f87c59 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -16459,3 +16459,350 @@ readers do not read off random characters that represent icons */ text-transform: capitalize; padding: 12px 12px; } + +a, +a:hover, +a:focus { + color: inherit; + text-decoration: none; + transition: all 0.3s; +} + +.navbar { + padding: 15px 10px; + background: #fff; + border: none; + border-radius: 0; + margin-bottom: 40px; + box-shadow: 1px 1px 3px rgba(0, 0, 0, 0.1); +} + +.navbar-btn { + box-shadow: none; + outline: none !important; + border: none; +} + +.line { + width: 100%; + height: 1px; + border-bottom: 1px dashed #ddd; + margin: 40px 0; +} + + +/* --------------------------------------------------- + SIDEBAR STYLE +----------------------------------------------------- */ + +#sidebar { + bottom: 0; + overflow-y: scroll; + width: 265px; + position: fixed; + top: 0; + left: 0; + height: 100vh; + z-index: 999; + background: #1E1E2D; + /* color: rgb(41, 39, 39); */ + color: #808080; + transition: all 0.3s; +} + +#sidebar.active { + margin-left: -265px; +} + +.sidebar-header { + padding: 20px; + display: flex; + justify-content: space-between; + /* border-bottom: 0.2px solid #6d7fcc; */ +} + +.sidebar-title { + font-size: 1.074rem; + font-weight: bold; + color: white; + border-color: white; + align-self: center; + /* border-bottom: border 1px solid white; */ +} + +.sidebar-logo { + width: 50px; + height: 35px; +} + +/* #sidebar ul.components { + padding: 20px 0; + border-bottom: 1px solid #fff; +} */ + +/* #sidebar ul p { + color: rgb(41, 39, 39); + padding: 10px; +} */ + +#sidebar ul li { + margin: 3px 0; +} + +#sidebar ul li.active { + background: #2a2a3c; + color: white; + border-radius: 25px; +} + +#sidebar ul li.active:hover { + background: #2a2a3ca1; + /* color: white; */ +} + +#sidebar ul li a { + padding: 7px 5px; + font-size: 1.05em; + display: block; +} + +#sidebar ul li a:hover { + color: white; + /* background: var(--indigo); */ + border-radius: 15px; +} + +/* #sidebar ul li.active a{ + color: white; + background: #F0F0F0; +} */ + +#sidebar ul li .active a{ + color: white; + /* background: #2a2a3c; */ + border-radius: 15px; + margin: 2px; + background-position: 20px; + /* width: 70%; */ +} + +#sidebar ul li .active a:hover{ + color: #ffffffd6; + background: #2a2a3ca1; +} + +/* #sidebar ul li.active>a, +a[aria-expanded="true"] { + color: #111; + background: #F0F0F0; +} */ + +#sidebar ul li ul li a:before{ + font-family: "Font Awesome 5 Free"; + font-weight: 600; + content: "\f111"; + font-size: 4px; + vertical-align: middle; + margin-right: 8px; +} + + + +/* .dropdown-toggle::after { + display: block; + position: absolute; + top: 50%; + right: 20px; + transform: translateY(-50%); +} */ + +#sidebar ul ul a { + font-size: 0.9em; + padding-left: 30px !important; + /* background: #fff; */ +} + + + +.sidebar-menu { + display: flex; + justify-content: space-between; +} + +.sidebar-menu-title { + margin-top: 20px; + padding: 6px 14px; +} + +.sidebar-menu-item-expand { + align-self: center; + font-size: 1.0em; + margin-right: 11px; +} + +/* .sidebar-menu-item-expand::before { + font-family: "Font Awesome 5 Free"; + font-weight: 900; + content: "\f078"; +} */ + +.sidebar-menu-main-title { + display: flex; +} + +.sidebar-menu-item-main { + font-size: 1.0em; + /* vertical-align: sub; */ + margin-right: 9px; + margin-left: 7px; + align-self: center; + color: var(--indigo); +} + +/* .sidebar-menu-item-main:hover { + color: white; + background: white; +} */ + +/* ul.CTAs { + padding: 20px; +} + +ul.CTAs a { + text-align: center; + font-size: 0.9em !important; + display: block; + border-radius: 5px; + margin-bottom: 5px; +} */ +a[data-toggle="collapse"] { + position: relative; +} + +a.download { + background: #fff; + color: #7386D5; +} + +a.article, +a.article:hover { + background: #6d7fcc !important; + color: #fff !important; +} + +/* --------------------------------------------------- + CONTENT STYLE +----------------------------------------------------- */ + +#content { + width: calc(100% - 265px); + padding: 3x; + min-height: 100vh; + transition: all 0.3s; + position: absolute; + top: 0; + right: 0; + overflow-y: auto; +} + +#content.active { + width: 100%; +} + +.hovernone:hover { + background-color: #3490dc !important; + cursor: context-menu !important; +} + +.hovernone-success:hover { + background-color: #38c172 !important; + cursor: context-menu !important; +} + +.hovernone-danger:hover { + background-color: #e3342f !important; + cursor: context-menu !important; +} + +#loader { + display: none; + position: fixed; + top: 0; + left: 0; + right: 0; + bottom: 0; + width: 100%; + background: rgba(0, 0, 0, 0.4) url("") no-repeat center center; + z-index: 99999; + + +} + +#loader-image { + position: absolute; + top: 40%; + left: 45%; + z-index: 100 +} + +.button { + background-color: #E09215; + border: none; + color: white; + padding: 10px 24px; + text-align: center; + text-decoration: none; + display: inline-block; + font-size: 14px; + margin: 4px 2px; + cursor: pointer; +} + + + +/* --------------------------------------------------- + MEDIAQUERIES +----------------------------------------------------- */ + +@media (max-width: 992px) { + #sidebar { + margin-left: -265px; + } + + #sidebar.active { + margin-left: 0; + } + + #content { + width: 100%; + } + + #content.active { + width: calc(100% - 265px); + } + + #sidebarCollapse span { + display: none; + } +} + +.sidebar-footer { + /* position: absolute; */ + /* bottom: 0; */ + margin-top: 70px; +} + +.sidebar-footer-content { + display: flex; + justify-content: center; + align-self: center; + border: 2px solid #2a2a3c; + padding: 10px; + margin: 46px; + border-radius: 10px; + color: #484859; +} + +.user-info { + /* display: flex; */ +} \ No newline at end of file diff --git a/resources/views/account/senarailelongan.blade.php b/resources/views/account/senarailelongan.blade.php index 78d07568..918cb77d 100644 --- a/resources/views/account/senarailelongan.blade.php +++ b/resources/views/account/senarailelongan.blade.php @@ -15,7 +15,7 @@ No - ID Lelong + Batch Lelong Tarikh Lelong Cawangan Fasa diff --git a/resources/views/home.blade copy 2.php b/resources/views/home.blade copy 2.php index f2422eb1..1bb08742 100644 --- a/resources/views/home.blade copy 2.php +++ b/resources/views/home.blade copy 2.php @@ -55,7 +55,7 @@ No - ID Lelong + Batch Lelong Cawangan Tarikh Lelong Harga Emas Asas @@ -138,7 +138,7 @@ No - ID Lelong + Batch Lelong T.Lelong Fasa Cawangan @@ -286,7 +286,7 @@ No - ID Lelong + Batch Lelong Tarikh Lelong Cawangan Status Export @@ -347,7 +347,7 @@ No - ID Lelong + Batch Lelong Tarikh Lelong {{-- Cawangan --}} Nama diff --git a/resources/views/home.blade copy.php b/resources/views/home.blade copy.php index 36e85f03..5fbbd5d6 100644 --- a/resources/views/home.blade copy.php +++ b/resources/views/home.blade copy.php @@ -32,7 +32,7 @@ No - ID Lelong + Batch Lelong T.Lelong Fasa Cawangan diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php index 8a96a168..ab195b48 100644 --- a/resources/views/home.blade.php +++ b/resources/views/home.blade.php @@ -7,7 +7,6 @@
{{ __('Dashboard') }}
-
@if (session('status'))