diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 9fb98edf..f6fcd682 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -1746,6 +1746,7 @@ class LelongController extends Controller // foreach($highestprice as $price){ // $bidders = LelongBidder::where('lelongbid_id','=',$bid->id)->where('hargabida','=',$highestprice->hargabida)->orderBy('masa_bidaan','ASC' )->get(); $bidders = LelongBidder::join('lelongbid', 'lelongbid.id', '=', 'lelongbidder.lelongbid_id') + ->where('lelongbid.lelong_id', '=', $lelong_id) ->where('lelongbid_id', '=', $bid->id) ->where('hargabida', '=', $highestprice->hargabida)->orderBy('masa_bidaan', 'ASC') ->select('lelongbidder.user_id', 'lelongbidder.id', 'lelongbidder.hargabida', 'lelongbid.pinjaman', 'lelongbid.bakiupah') diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php index 1420fc6e..c1b505a4 100644 --- a/app/Http/Controllers/MarhunController.php +++ b/app/Http/Controllers/MarhunController.php @@ -24,7 +24,7 @@ use App\Models\GadaiMarhun; use App\Models\ScanSemak; use App\Models\TangguhLelong; use Carbon\Carbon; -use App\Models\ScanMarhun; +use App\Models\ScanJual; class MarhunController extends Controller { @@ -1793,5 +1793,120 @@ class MarhunController extends Controller return redirect()->route('marhun.senarailelongterimaserah')->with('failed', 'Tiada Surat Untuk Dilelong Pada Tarikh Ini.'); } } + + public function senarailelongscanjual(Request $request){ + + $user = Auth::user(); + $arrayinfo = []; + + $lelong = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id') + ->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id') + ->where('cawangan.caw_code', $user->kodcaw) + ->where('sts_lelong', 3) + ->select('lelong_id','tarikh_lelong','cawangan_lelong.masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong') + ->get() + ->toArray(); + + foreach($lelong as $info) + { + + $detailsinfo = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') + ->where('lelong_id',$info['lelong_id']) + ->where('cawangan.caw_code', $user->kodcaw) + ->get() + ->toArray(); + array_push($arrayinfo,['info'=>$info, 'detailsinfo'=>$detailsinfo]); + + } + + return view('marhun.senarailelongscanjual',compact('lelong', 'arrayinfo')); + + } + + public function listScanBarcodejual($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('status_payment', '=', '1') + ->where('caw_id', '=', $caw->id) + ->get(); + + $senaraiScanKeluar = ScanSemak::where('lelong_id', '=', $lelong_id) + ->where('kodcaw', '=', $caw->caw_code) + ->where('serahkpdpembida', '=', '1') + ->orderBy('id', 'desc') + ->get(); + // dd($senaraiScanKeluar); + + + return view('marhun.scanbarcodejual', compact('lelong_id', 'lelongDetail', 'lelongbid', 'senaraiScanKeluar')); + } + public function scanKeluarMarhunjual(Request $request) + { + + $user = Auth::user(); + $current = Carbon::now(); + + $checkExisting = ScanSemak::where('norujukan', '=', $request->norujukan_barcode) + ->where('serahkpdpembida', '=', '1') + ->get(); + + if ($checkExisting->isEmpty()) { + $lelongbidItem = LelongBid::where('norujukan', '=', $request->norujukan_barcode)->first(); + + $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->scan_keluar = $current->toDateTimeString(); + $scanKeluar->serahkpdpembida = 1; + $scanKeluar->save(); + + $scanJualKeluar = new ScanJual(); + $scanJualKeluar->kodcaw = $lelongbidItem['kodcaw']; + $scanJualKeluar->lelong_id = $lelongbidItem['lelong_id']; + $scanJualKeluar->lelongbid_id = $lelongbidItem['id']; + $scanJualKeluar->norujukan = $lelongbidItem['norujukan']; + $scanJualKeluar->khazanah_id = $user['id']; + $scanJualKeluar->scan_keluar = $current->toDateTimeString(); + $scanJualKeluar->serah_marhun = $current->toDateTimeString(); + $scanJualKeluar->serahkpdpembida = 1; + $scanJualKeluar->save(); + + return redirect()->route('marhun.scanbarcodejual', $request->lelong_id) + ->with('success', 'Marhun Berjaya Di Scan Keluar Serahan Kepada Pembida.'); + } else { + return redirect()->route('marhun.scanbarcodejual', $request->lelong_id) + ->with('failed', 'Maaf,Marhun Telah Serah Kepada Pembida.'); + } + } + + public function cetakkeluarscanbarcodejual($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('status_payment', '=', '1') + ->where('caw_id', '=', $caw->id) + ->get(); + + $senaraiScanKeluar = ScanSemak::where('lelong_id', '=', $lelong_id) + ->where('kodcaw', '=', $caw->caw_code) + ->where('serahkpdpembida', '=', '1') + ->orderBy('id', 'desc') + ->get(); + // return view('pdf.cetakkeluarscanbarcode', compact('lelong_id', 'lelongDetail', 'lelongbid', 'senaraiScanKeluar', 'senaraiScanMasuk','caw')); + $pdf = PDF::loadView('pdf.cetakkeluarscanbarcodejual',compact('caw','lelong_id', 'lelongDetail', 'lelongbid', 'senaraiScanKeluar' + ))->setPaper('a4', 'potrait'); + + return $pdf->download('Senarai SAG Telah Serah Kepada Pembida.pdf'); + } } diff --git a/app/Http/Controllers/PaymentController.php b/app/Http/Controllers/PaymentController.php index 52561a7c..e6ecdf5f 100644 --- a/app/Http/Controllers/PaymentController.php +++ b/app/Http/Controllers/PaymentController.php @@ -16,6 +16,7 @@ use App\Models\File; use App\Models\FileResit; use Carbon\Carbon; use Illuminate\Support\Facades\Auth; +use App\Models\Invoice; class PaymentController extends Controller { @@ -127,7 +128,8 @@ class PaymentController extends Controller 'users.id', 'users.name', 'users.nokp', - 'users.alamat' + 'users.alamat', + 'users.notelbimbit' ) ->first(); @@ -168,8 +170,10 @@ class PaymentController extends Controller $total_payment = $total_payment + $payment->total_payment; } $listwinner[$index1]['totalPay'] = $total_payment; + } } + // dd(); } // foreach($gettunai as $index1=>$cash) // { @@ -189,13 +193,19 @@ class PaymentController extends Controller ->get()->toArray(); // dd($getresit); + $getinvoice = Invoice::where('lelong_id',$lelong_id) + ->where('user_id','=',$user_id) + ->first(); + + $totalbidaan = $eachbid->SUM('hargabida'); + $array_resit = []; foreach($getresit as $index1=>$resit) { $getresit[$index1]['resit64'] = 'data:image/' . $resit['file_type'] . ';base64' . base64_encode($resit['filename']); } - return view('pembayaran.SAGBidItem',compact('SAGBidItem', 'eachbid', 'lelong_id','user_id', 'getresit')); + return view('pembayaran.SAGBidItem',compact('SAGBidItem', 'eachbid', 'lelong_id','user_id', 'getresit','getinvoice','totalbidaan')); } public function paymentdenokaunter(Request $request){ @@ -205,6 +215,13 @@ class PaymentController extends Controller $currentdate = Carbon::now(); $currentdate = $currentdate->toDateTimeString(); + $current = Carbon::now(); + $current = new Carbon(); + + $day = $current->day; + $month = $current->month; + $year = $current->format('y'); + $user = Auth::user(); // $bid_id = implode(",", $request->eachbid); @@ -212,39 +229,77 @@ class PaymentController extends Controller $bidid = implode(",", $request->eachbid); $bid_id = explode(",", $bidid); + $norujukanid = implode(",", $request->norujukan); + $norujukan_id = explode(",", $norujukanid); + + // dd($norujukan_id); - $resit = Resit::where('lelong_id', $request->lelong_id) - ->where('user_id',$request->user_id) + + // $resit = Resit::where('lelong_id', $request->lelong_id) + // ->where('user_id',$request->user_id) + // ->where('resit_type', 2) + // ->first(); + $getinvoice = Invoice::where('lelong_id',$request->lelong_id) + ->where('user_id','=',$request->user_id) + ->first(); + + $previous_siri = Resit::orderBy('id','desc')->first(); + $checkdata = Resit::where('user_id', $request->user_id) + ->where('lelong_id', $request->lelong_id) ->where('resit_type', 2) ->first(); + + if(!$checkdata){ + if($previous_siri){ + $nosiri = $previous_siri->id + 1; + }else{ + $nosiri = 1; + } + + $reference_no = 'LPKB' . $day . $month . $year . sprintf("%08d", $nosiri); + + $resit = new Resit; + $resit->user_id = $request->user_id; + $resit->lelong_id = $request->lelong_id; + $resit->reference_no = $reference_no; + $resit->invoice_id = $getinvoice->id; + $resit->invoice_no = $getinvoice->invoice_no; + $resit->billplz_id = ''; + $resit->total_payment = $request->amaunkiraan; + $resit->resit_type = 2; // 1 = fee , 2 = bid + $resit->save(); + } + // dd($checkdata->id); $total_hargabida = 0; - $payment = Payment::create([ - 'user_id' => $request->user_id, - 'lelong_id' => $request->lelong_id, - 'kodcaw' => $user->kodcaw, - 'status_payment_opt' => 1, - 'status' => 2, - 'remark' => 'TUNAI', - 'resit_id' => $resit->id, - 'total_payment' => $request->amaunkiraan, - '1sen' => $request->ambilansen1, - '5sen' => $request->ambilansen5, - '10sen' => $request->ambilansen10, - '20sen' => $request->ambilansen20, - '50sen' => $request->ambilansen50, - 'rm1' => $request->ambilanring1, - 'rm5' => $request->ambilanring5, - 'rm10' => $request->ambilanring10, - 'rm20' => $request->ambilanring20, - 'rm50' => $request->ambilanring50, - 'rm100' => $request->ambilanring100, - 'disahkan_oleh' => $user->id, - 'disahkan_pada' => $currentdate - ]); + // $payment = Payment::create([ + // 'user_id' => $request->user_id, + // 'lelong_id' => $request->lelong_id, + // 'kodcaw' => $user->kodcaw, + // 'norujukan' => $norujukan_id, + // 'status_payment_opt' => 1, + // 'status' => 2, + // 'remark' => 'TUNAI', + // 'resit_id' => $resit->id, + // 'total_payment' => $request->amaunkiraan, + // '1sen' => $request->ambilansen1, + // '5sen' => $request->ambilansen5, + // '10sen' => $request->ambilansen10, + // '20sen' => $request->ambilansen20, + // '50sen' => $request->ambilansen50, + // 'rm1' => $request->ambilanring1, + // 'rm5' => $request->ambilanring5, + // 'rm10' => $request->ambilanring10, + // 'rm20' => $request->ambilanring20, + // 'rm50' => $request->ambilanring50, + // 'rm100' => $request->ambilanring100, + // 'disahkan_oleh' => $user->id, + // 'disahkan_pada' => $currentdate + // ]); foreach($bid_id as $bid) { + $eachbid = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') ->join('users', 'lelongbidder.user_id', '=', 'users.id') ->where('lelongbidder.lelongbid_id', $bid) @@ -256,9 +311,40 @@ class PaymentController extends Controller 'lelongbid.lelong_id as lelong_id' ) ->first(); + // dd($eachbid); $total_hargabida = $total_hargabida + $eachbid->hargabida; - // dd($total_hargabida); + // $resit = Resit::where('lelong_id', $request->lelong_id) + // ->where('user_id',$request->user_id) + // ->where('resit_type', 2) + // ->first(); + // dd($resit->id); + + $payment = Payment::create([ + 'user_id' => $request->user_id, + 'lelong_id' => $request->lelong_id, + 'kodcaw' => $user->kodcaw, + 'norujukan' => $norujukanid, + 'status_payment_opt' => 1, + 'status' => 2, + 'remark' => 'TUNAI', + 'resit_id' => $resit->id, + 'total_payment' => $request->amaunkiraan, + '1sen' => $request->ambilansen1, + '5sen' => $request->ambilansen5, + '10sen' => $request->ambilansen10, + '20sen' => $request->ambilansen20, + '50sen' => $request->ambilansen50, + 'rm1' => $request->ambilanring1, + 'rm5' => $request->ambilanring5, + 'rm10' => $request->ambilanring10, + 'rm20' => $request->ambilanring20, + 'rm50' => $request->ambilanring50, + 'rm100' => $request->ambilanring100, + 'disahkan_oleh' => $user->id, + 'disahkan_pada' => $currentdate + ]); + $updatelelbidbidder = LelongBidder::where('lelongbid_id', $eachbid->lelongbid_id) ->where('user_id',$request->user_id) diff --git a/app/Http/Controllers/PembidaController.php b/app/Http/Controllers/PembidaController.php index 06551898..3de8fd6b 100644 --- a/app/Http/Controllers/PembidaController.php +++ b/app/Http/Controllers/PembidaController.php @@ -19,6 +19,8 @@ use App\Models\Payment; use App\Models\Cawangan; use App\Models\TakLaku; use App\Models\LogUser; +use App\Models\FileResit; +use App\Models\Invoice; @@ -394,7 +396,7 @@ class PembidaController extends Controller public function declaretidaklaku(Request $request) { - + // dd($request->user_id); $currentdate = Carbon::now(); $currentdate = $currentdate->toDateTimeString(); $t_lelong = Carbon::parse($request->t_lelong); @@ -432,6 +434,13 @@ class PembidaController extends Controller $bida->cajlelong = 0.00; $bida->baki = 0.00; $bida->save(); + // dd($request->user_id); + + //hapus lelongbidder + $lelongbidder = LelongBidder::where('lelongbid_id', $bida->id) + ->where('user_id', $request->user_id) + ->delete(); + // dd($lelongbidder); //audit trail $loguser = new LogUser; @@ -445,6 +454,278 @@ class PembidaController extends Controller } return redirect()->route('lelong.senarailelongtaklaku'); } + + public function kebenaranbayarantunai(Request $request) + { + $kodcaw = $request->kodcaw; + + + $arrayinfo = []; + + $lelong = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id') + ->select('lelong_id','tarikh_lelong','lelong.fasa','harga_emas_asas','jbg','cajlelong','sts_lelong') + ->distinct() + ->orderBy('lelong_id') + ->where('lelong.sts_lelong', 3) + ->get() + ->toArray(); + + foreach($lelong as $details) + { + + $detailsinfo = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') + ->select('cawangan_lelong.lelong_id','cawangan_lelong.caw_id','caw_name','caw_code','cawangan_lelong.export_data_sts') + ->where('lelong_id',$details['lelong_id']) + ->distinct() + ->orderBy('lelong_id') + ->get() + ->toArray(); + // dd($detailsinfo); + + array_push($arrayinfo,['detail'=>$details, 'detailsinfo'=>$detailsinfo]); + } + // dd($request->kodcaw); + + return view('pembida.listkebenaranbayarantunai',compact('lelong','arrayinfo')); + } + + // public function senaraipemenangbycaw(Request $request, $lelong_id){ + + // $caw_code = $request->kodcaw; + + // $listwinner = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') + // ->where('lelongbidder.status_bidder', 1) + // ->where('lelongbid.lelong_id', $lelong_id) + // ->where('lelongbid.kodcaw', $caw_code) + // ->select('lelongbidder.user_id') + // ->groupBy('lelongbidder.user_id') + // ->get()->toArray(); + // // dd($listwinner); + + // foreach($listwinner as $index1=>$winner){ + + // $userdetails = User::where('id', $winner['user_id'])->first(); + // $SAGWin = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') + // ->where('user_id', $winner['user_id']) + // ->where('lelongbidder.status_bidder', 1) + // ->where('lelongbid.lelong_id', $lelong_id) + // ->where('lelongbid.kodcaw', $caw_code) + // ->get(); + + // $listwinner[$index1]['details'] = $userdetails; + // $listwinner[$index1]['total_surat'] = sizeof($SAGWin); + // $listwinner[$index1]['totalBid'] = $SAGWin->sum('hargabida'); + // $listwinner[$index1]['lelong_id'] = $lelong_id; + // // $listwinner[$index1]['kodcaw'] = $kodcaw; + // // dd( $caw_code); + // } + + // return view('pembida.senaraipemenangbycaw',compact('listwinner','lelong_id','caw_code')); + // } + + public function senaraisagpemenangbycaw($user_id, $lelong_id, $kodcaw){ + + $userdetails = User::where('id', $user_id)->first(); + + $senaraisag = LelongBid::join('lelongbidder', 'lelongbid.id', '=', 'lelongbidder.lelongbid_id') + ->where('lelongbid.lelong_id', $lelong_id) + ->where('lelongbid.kodcaw', $kodcaw) + ->where('lelongbidder.user_id', $user_id) + ->where('lelongbidder.status_bidder', 1) + ->get(); + + + return view('pembida.senaraisagpemenangbycaw', compact('senaraisag', 'user_id', 'lelong_id','userdetails')); + } + public function senaraipemenangbycaw(Request $request,$lelong_id){ + + // $user = Auth::user(); + $caw_code = $request->kodcaw; + + $listwinner = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') + ->where('lelongbidder.status_bidder', 1) + ->where('lelongbid.kodcaw',$caw_code) + ->where('lelongbid.lelong_id', $lelong_id) + ->select('lelongbidder.user_id') + ->groupBy('lelongbidder.user_id') + ->get()->toArray(); + + foreach($listwinner as $index1=>$winner){ + + $userdetails = User::where('id', $winner['user_id'])->first(); + $SAGWin = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') + ->where('user_id', $winner['user_id']) + ->where('lelongbid.kodcaw', $caw_code) + ->where('lelongbidder.status_bidder', 1) + ->where('lelongbid.lelong_id', $lelong_id) + ->get(); + // dd($userdetails); + + $sts_payment = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') + ->where('user_id', $winner['user_id']) + ->where('lelongbidder.status_bidder', 1) + ->where('lelongbid.kodcaw', $caw_code) + ->where('lelongbid.lelong_id', $lelong_id) + ->select('lelongbidder.status_payment') + ->get(); + // dd($sts_payment[0]['status_payment']); + + $payment_id = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') + ->where('user_id', $winner['user_id']) + ->where('lelongbid.kodcaw', $caw_code) + ->where('lelongbidder.status_bidder', 1) + ->where('lelongbid.lelong_id', $lelong_id) + ->select('payment_id')->groupBy('payment_id')->get(); + + $total_payment = 0; + foreach($payment_id as $id){ + $payment = Payment::where('id', $id->payment_id) + ->first(); + // dd($payment); + + if($payment){ + $total_payment = $total_payment + $payment->total_payment; + } + } + // dd($total_payment); + + $listwinner[$index1]['details'] = $userdetails; + $listwinner[$index1]['total_surat'] = sizeof($SAGWin); + $listwinner[$index1]['totalBid'] = $SAGWin->sum('hargabida'); + $listwinner[$index1]['totalPay'] = $total_payment; + $listwinner[$index1]['sts_payment'] = $sts_payment[0]['status_payment']; + + } + + // return view('pembayaran.kaunterpembayaran',compact('listwinner','lelong_id')); + return view('pembida.senaraipemenangbycaw',compact('listwinner','lelong_id','caw_code')); + + + } + public function SAGBidItembycaw($user_id, $lelong_id,$kodcaw){ + + // $user = Auth::user(); + + $SAGBidItem = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') + ->join('users', 'lelongbidder.user_id', '=', 'users.id') + ->where('lelongbidder.status_bidder', 1) + ->where('users.id', $user_id) + ->where('lelongbid.kodcaw', $kodcaw) + ->where('lelongbid.lelong_id', $lelong_id) + ->select( + 'users.id', + 'users.name', + 'users.nokp', + 'users.alamat', + 'users.notelbimbit' + ) + ->first(); + + $eachbid = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') + ->join('users', 'lelongbidder.user_id', '=', 'users.id') + ->where('lelongbidder.status_bidder', 1) + ->where('users.id', $user_id) + ->where('lelongbid.lelong_id', $lelong_id) + ->where('lelongbid.kodcaw', $kodcaw) + ->select('lelongbidder.hargabida', + 'lelongbidder.user_id', + 'lelongbid.hargaasas', + 'lelongbid.norujukan', + 'lelongbidder.lelongbid_id', + 'lelongbidder.status_payment' + ) + ->get(); + + foreach($eachbid as $bid) + { + // dd($bid); + $paymentstatus = Payment::where('lelong_id', $lelong_id) + ->where('user_id', $bid['user_id']) + ->where('status', 2) + ->where('status_payment_opt', 2) + ->orWhere('status_payment_opt', 3) + ->get(); + + if($paymentstatus) + { + $total_payment = 0; + foreach($paymentstatus as $index1=>$payemnt) + { + $payment = Payment::where('id', $payemnt->payment_id) + ->first(); + + if($payment){ + $total_payment = $total_payment + $payment->total_payment; + } + $listwinner[$index1]['totalPay'] = $total_payment; + } + } + } + // foreach($gettunai as $index1=>$cash) + // { + // // dd($cash); + // $remarktunai = Payment::where('id', $cash['payment_id']) + // ->where('remark', '=', 'TUNAI') + // ->select('remark') + // ->first(); + // // dd($remarktunai); + + // $eachbid[$index1]['cash_only'] = $remarktunai; + // } + + $getresit = FileResit::join('payment', 'fileresit.payment_id', '=', 'payment.id') + ->where('payment.lelong_id', $lelong_id) + ->where('payment.user_id', $user_id) + ->get()->toArray(); + // dd($getresit); + + + $getinvoice = Invoice::where('lelong_id',$lelong_id) + ->where('user_id','=',$user_id) + ->first(); + // dd($getinvoice); + + $array_resit = []; + foreach($getresit as $index1=>$resit) + { + $getresit[$index1]['resit64'] = 'data:image/' . $resit['file_type'] . ';base64' . base64_encode($resit['filename']); + } + + return view('pembida.SAGBidItembycaw',compact('SAGBidItem', 'eachbid', 'lelong_id','user_id', 'getresit', 'getinvoice')); + } + + public function benarkantunai(Request $request) + { + $currentdate = Carbon::now(); + $currentdate = $currentdate->toDateTimeString(); + + $user = Auth::user(); + + $idpembida = $request->user_id; + $lelong_id = $request->lelong_id; + + + + $opencash = Invoice::where('lelong_id',$lelong_id) + ->where('user_id','=',$idpembida) + ->first(); + $opencash->opencash = 1; + $opencash->save(); + + //audit trail + $loguser = new LogUser; + $loguser->user_id = $user->id; + $loguser->date = $currentdate; + $loguser->username = $user->username; + $loguser->nama_user = $user->name; + $loguser->norujukan = $opencash->invoice_no; + $loguser->nota = 'Benarkan Bayaran Tunai'; + $loguser->save(); + + + return redirect()->route('pembida.kebenaranbayarantunai')->with('success','Kebenaran Berjaya'); + + } } \ No newline at end of file diff --git a/app/Http/Controllers/SerahanController.php b/app/Http/Controllers/SerahanController.php index 6c02b8db..8e4e0eed 100644 --- a/app/Http/Controllers/SerahanController.php +++ b/app/Http/Controllers/SerahanController.php @@ -18,6 +18,8 @@ use App\Models\Payment; use App\Models\Resit; use App\Models\Invoice; use App\Models\FileResit; +use App\Models\LelongBidMarhun; + @@ -284,7 +286,9 @@ class SerahanController extends Controller public function slipserahan($user_id, $lelong_id) { - + $total_berat = 0; + $berat = 0; + $user = Auth::user(); $caw = Cawangan::where('caw_code','=',$user->kodcaw)->first()->toArray(); @@ -301,39 +305,51 @@ class SerahanController extends Controller // dd($invois); - $SAGWin = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') - ->join('lelongbidmarhun','lelongbid.id','=','lelongbidmarhun.lelongbid_id') - ->join('jenisemas','lelongbidmarhun.marhun','jenisemas.marhun') - ->join('payment','lelongbid.norujukan','=','payment.norujukan') - ->join('resit','payment.resit_id','=','resit.id') - ->where('lelongbidder.user_id',$user_id) - ->where('lelongbidder.status_bidder', 1) + $SAGWin = LelongBid::join('scan_semak','lelongbid.norujukan','=','scan_semak.norujukan') + ->where('lelongbid.nopembeli',$user_id) + ->where('lelongbid.status_payment', 1) + ->where('scan_semak.serahkpdpembida', 1) ->where('lelongbid.lelong_id', $lelong_id) ->where('lelongbid.kodcaw',$user->kodcaw) - ->where('payment.status',2) // ->where('payment.resit_id',$resit_id) ->get(); // dd($SAGWin); + if($SAGWin->isNotEmpty()){ + foreach($SAGWin as $index1=>$lelong){ - $senaraisag = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') - // ->where('lelongbid.kodcaw',$caw['caw_code']) buang jap nti check balik - ->join('payment','lelongbid.norujukan','=','payment.norujukan') - ->where('lelongbid.kodcaw',$user->kodcaw) - ->where('lelongbidder.user_id',$user_id) - // ->where('payment.resit_id',$resit_id) - ->where('lelongbidder.status_bidder', 1) + $marhun= LelongBidMarhun::join('jenisemas','jenisemas.marhun','=','lelongbidmarhun.marhun') + ->where('lelongbid_id','=',$lelong['id']) + // ->where('kodcaw','=',$user['kodcaw']) + ->get(); + + $total_berat = $total_berat + ($marhun->sum('berat')); + // $total_harga = $total_harga + ($marhun->sum('harga')); + // $total_nmarhun = $total_nmarhun + ($marhun->sum('n_marhun')); + // $total_hargaasas = $total_hargaasas + ($marhun->sum('hargaasas')); + + $SAGWin[$index1]['detailmarhun']=$marhun; + + } + + $senaraisag = LelongBid::where('lelongbid.kodcaw',$user->kodcaw) + ->where('lelongbid.nopembeli',$user_id) + ->where('lelongbid.status_payment', 1) ->where('lelongbid.lelong_id', $lelong_id) - ->where('payment.status',2) ->get(); - + // dd($senaraisag); $caw['total_berat'] = $senaraisag->sum('berat'); - $caw['total_bidaan'] = $senaraisag->sum('hargabida'); + $caw['total_bidaan'] = $senaraisag->sum('hargajual'); - $pdf = PDF::loadView('pdf.slipserahan',compact('userdetails','SAGWin','caw','user','lelong','invois')) + $pdf = PDF::loadView('pdf.slipserahan',compact('userdetails','SAGWin','caw','user','lelong','invois','total_berat')) ->setPaper('a4', 'potrait'); return $pdf->download('Slip Serahan.pdf'); + } + elseif($SAGWin->isEmpty()){ + return redirect()->route('pembayaran.kaunterpembayaran',$lelong_id) + ->with('failed','Maaf, Tidak Boleh Dijana kerana SAG Belum Di Scan Keluar/Belum Bayar Penuh'); + } } public function senaraibid($user_id, $lelong_id) diff --git a/app/Models/Invoice.php b/app/Models/Invoice.php index e0be608f..990e92a5 100644 --- a/app/Models/Invoice.php +++ b/app/Models/Invoice.php @@ -18,6 +18,7 @@ class Invoice extends Model 'total_invoice', 'invoice_type', // 1 = fee , 2 = bid 'status', //status => 1 = paid , 2 = pending + 'opencash', 'paid_at' ]; } diff --git a/app/Models/Resit.php b/app/Models/Resit.php index 02befe25..f9c708b7 100644 --- a/app/Models/Resit.php +++ b/app/Models/Resit.php @@ -12,6 +12,7 @@ class Resit extends Model protected $table = 'resit'; protected $fillable = [ + 'id', 'user_id', 'lelong_id', 'reference_no', diff --git a/app/Models/ScanJual.php b/app/Models/ScanJual.php new file mode 100644 index 00000000..9c5460e4 --- /dev/null +++ b/app/Models/ScanJual.php @@ -0,0 +1,24 @@ +bigIncrements('id'); $table->unsignedBigInteger('lelong_id')->unsigned(); + $table->string('caw_id'); $table->string('kodcaw'); $table->string('norujukan'); $table->date('t_lelong'); diff --git a/database/migrations/2022_01_25_010223_create_payment_table.php b/database/migrations/2022_01_25_010223_create_payment_table.php index 8a08b300..29b82be0 100644 --- a/database/migrations/2022_01_25_010223_create_payment_table.php +++ b/database/migrations/2022_01_25_010223_create_payment_table.php @@ -77,7 +77,7 @@ class CreatePaymentTable extends Migration ->onDelete('cascade'); }); - Schema::create('invoice', function (Blueprint $table) { + Schema::create('listpengguna', function (Blueprint $table) { $table->bigIncrements('id'); $table->unsignedBigInteger('user_id')->unsigned(); $table->unsignedBigInteger('lelong_id')->unsigned(); @@ -85,6 +85,7 @@ class CreatePaymentTable extends Migration $table->decimal('total_invoice', $precision = 11, $scale = 2); $table->string('invoice_type'); // 1 = fee , 2 = bid $table->string('status')->nullable(); //status => 1 = paid , 2 = pending + $table->string('opencash')->nullable()->default(0); $table->timestamp('paid_at')->nullable(); $table->timestamps(); @@ -108,6 +109,6 @@ class CreatePaymentTable extends Migration { Schema::dropIfExists('payment'); Schema::dropIfExists('resit'); - Schema::dropIfExists('invoice'); + Schema::dropIfExists('listpengguna'); } } 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 de26e4c9..f81b8dfb 100644 --- a/database/migrations/2022_03_07_061858_create_pengesahan_table.php +++ b/database/migrations/2022_03_07_061858_create_pengesahan_table.php @@ -44,11 +44,20 @@ class CreatePengesahanTable extends Migration $table->datetime('terima_marhun')->nullable(); $table->datetime('serah_marhun')->nullable(); $table->datetime('scan_masuk')->nullable(); + $table->integer('serahkpdpembida')->default(0); $table->timestamps(); }); Schema::create('scan_jual', function (Blueprint $table) { $table->id(); + $table->string('kodcaw'); + $table->unsignedBigInteger('lelong_id')->unsigned(); + $table->integer('lelongbid_id'); + $table->string('norujukan'); + $table->string('khazanah_id', '100'); + $table->datetime('scan_keluar'); + $table->datetime('serah_marhun')->nullable(); + $table->integer('serahkpdpembida')->default(0); $table->timestamps(); }); diff --git a/database/migrations/2022_03_09_122631_create_tangguhlelong_table.php b/database/migrations/2022_03_09_122631_create_tangguhlelong_table.php index dbb52366..c0d87b11 100644 --- a/database/migrations/2022_03_09_122631_create_tangguhlelong_table.php +++ b/database/migrations/2022_03_09_122631_create_tangguhlelong_table.php @@ -23,9 +23,9 @@ class CreateTangguhlelongTable extends Migration $table->datetime('tarikhtangguh')->nullable(); $table->integer('ditangguh_oleh'); $table->datetime('ditangguh_pada'); - $table->string('nota'); + $table->string('nota')->nullable();; $table->timestamps(); - $table->integer('status'); //new added + $table->integer('status')->nullable();; //new added $table->string('filetype'); // $table->foreign('lelong_id') diff --git a/resources/views/includes/sidebar.blade.php b/resources/views/includes/sidebar.blade.php index 657637c7..97e808f0 100644 --- a/resources/views/includes/sidebar.blade.php +++ b/resources/views/includes/sidebar.blade.php @@ -63,6 +63,9 @@
  • Scan Barcode
    • +
  • + Scan Barcode Serahan Pembida +
    • @endhasrole @hasrole('penilai')
  • @@ -334,6 +337,9 @@
  • Bidaan Belum Bayar
    • +
  • + Kebenaran Bayaran Tunai +
    • diff --git a/resources/views/marhun/scanbarcodejual.blade.php b/resources/views/marhun/scanbarcodejual.blade.php new file mode 100644 index 00000000..fd340cfa --- /dev/null +++ b/resources/views/marhun/scanbarcodejual.blade.php @@ -0,0 +1,111 @@ +@extends('layouts.app') + +@section('content') +
    +
    +
    +
    +
    Scan Barcode Serahan Marhun Kepada Pembida
    +
    + @if ($message = Session::get('success')) +
    +

    {{ $message }}

    +
    + @elseif ($message = Session::get('failed')) +
    +

    {{ $message }}

    +
    + @endif + Kembali + +

    Tarikh Lelong: + @php + $myDateTime = DateTime::createFromFormat('Y-m-d', $lelongDetail['tarikh_lelong'] ); + $t_lelong = $myDateTime->format('d-m-Y'); + echo($t_lelong); + @endphp +

    + + +
    +
    + + + + + + + + + + + + @foreach($lelongbid as $index) + + + + + + + + @endforeach + +
    BilNo RujukanMarhunN. MarhunBerat
    {{$loop->iteration}}{{$index->norujukan}}{{$index->marhun}}{{ number_format($index->nilaimarhun, 2, '.', ',')}}{{$index->berat}}
    +
    +
    +
    +
    +
    + @csrf + +
    Scan Barcode Marhun Serahan Kepada Pembida
    + + +
    +
    +
    + + + + + + + + + + + + @foreach ($senaraiScanKeluar as $index) + + + + + + + @endforeach + +
    BilNo RujukanTarikh/Masa Scan KeluarStatus
    {{$loop->iteration}}{{$index->norujukan}}{{$index->scan_keluar}}Telah Serah Kepada Pembida
    +
    + +
    +
    +
    +
    +
    +
    + + + +@endsection \ No newline at end of file diff --git a/resources/views/marhun/senarailelongscanjual.blade.php b/resources/views/marhun/senarailelongscanjual.blade.php new file mode 100644 index 00000000..e574951a --- /dev/null +++ b/resources/views/marhun/senarailelongscanjual.blade.php @@ -0,0 +1,73 @@ +@extends('layouts.app') + +@section('content') + +
    +
    +
    +

    Senarai Lelongan Scan Kepada Pembida

    + + + + + + + + + + + + @foreach($arrayinfo as $lel) + + + + + + + + @endforeach + +
    NoBatch LelongTarikh LelongStatus LelongTindakan
    {{$loop->iteration}}{{ $lel['info']['lelong_id']}}@php + $myDateTime = DateTime::createFromFormat('Y-m-d', $lel['info']['tarikh_lelong'] ); + $t_lelong = $myDateTime->format('d-m-Y'); + echo($t_lelong); + @endphp + @if($lel['info']['sts_lelong'] == 3) + + @endif + + @if($lel['info']['sts_lelong'] == 3) + + + @endif +
    +
    +
    +
    + + + +@endsection \ No newline at end of file diff --git a/resources/views/pdf/cetakkeluarscanbarcodejual.blade.php b/resources/views/pdf/cetakkeluarscanbarcodejual.blade.php new file mode 100644 index 00000000..be918b97 --- /dev/null +++ b/resources/views/pdf/cetakkeluarscanbarcodejual.blade.php @@ -0,0 +1,113 @@ + + + + + + + + + + + + + + + + + + + + +

    PERMODALAN KELANTAN BERHAD

    LAPORAN SERAHAN KEPADA PEMBIDA
    Cawangan: {{$caw['caw_name']}}
    ID Lelong: {{$lelong_id}}
    + +
    + + + + + + + + + + + + @foreach ($senaraiScanKeluar as $index) + + + + + + + @endforeach + +
    BilNo RujukanTarikh/Masa Scan KeluarStatus
    {{$loop->iteration}}{{$index->norujukan}}{{$index->scan_keluar}}Telah Serah Kepada Pembida
    + + + + diff --git a/resources/views/pdf/slipserahan.blade.php b/resources/views/pdf/slipserahan.blade.php index ebb788ad..80b7467a 100644 --- a/resources/views/pdf/slipserahan.blade.php +++ b/resources/views/pdf/slipserahan.blade.php @@ -1,194 +1,199 @@ + font-size:11px; + border-collapse: collapse; + width: 100%; + } + + #marhun td, #marhun th { + border: 0px solid; + padding: 1px; + + } + + + + #marhun th { - - - - - - - - - @foreach ($invois as $data) - - @endforeach - - - - - - - - - - - - - - -
    {{$caw['caw_name']}}Slip Serahan
    {{$caw['alamat1']}}No.Slip: {{$data['invoice_no']}}
    {{$caw['alamat2']}}Tarikh: {{$lelong->tarikh_lelong}}
    Tel :{{$caw['notel']}} 
    Faks :{{$caw['nofaks']}}
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
     
    Nama :{{$userdetails->name}}
    No.K/P:{{$userdetails->nokp}}
    Alamat:{{$userdetails->alamat}}
    No Telefon:{{$userdetails->notelbimbit}}
    - - -
    SLIP SERAHAN BARANG GADAIAN YANG BERJAYA DILELONG
    - - - - - - - - - - - - - @foreach ($SAGWin as $index=>$info) + font-family: "Trebuchet MS", Arial, Helvetica, sans-serif; + + } + + +
    BilNo RujukanJenis BarangBerat(g) Harga Lelong(RM)
    - - - - - + + - @endforeach + + + + @foreach ($invois as $data) + + @endforeach + + - - - - - - - - + + + + + + + + + + + +
    {{$index+1}}{{$info['norujukan']}}{{$info['descpt']}}{{ number_format($info['berat'], 2, '.', ',') }}{{ number_format($info['hargabida'], 2, '.', ',') }}{{$caw['caw_name']}}Slip Serahan
    {{$caw['alamat1']}}No.Slip: {{$data['invoice_no']}}
    Jumlah{{ number_format($caw['total_berat'], 2, '.', ',') }}{{ number_format($caw['total_bidaan'], 2, '.', ',') }}
    {{$caw['alamat2']}}Tarikh: @php + $myDateTime = DateTime::createFromFormat('Y-m-d', $lelong->t_lelong); + $t_lelong = $myDateTime->format('d-m-Y'); + echo($t_lelong); + @endphp +
    Tel :{{$caw['notel']}} 
    Faks :{{$caw['nofaks']}}
    + + + - + + + + - - -
    - - - - - - - - -

    PERHATIAN: Bahawa PEMBELI hendaklah mengaku bahawa identiti harta yang berjaya dibeli bersama-sama dengan keterangan yang dinyatakan oleh PLAINTIF PEMEGANG GADAIAN adalah seperti yang dicatatkan di dalam keterangan harta tersebut dan - setelah selesai proses pembayaran maka PEMBELI bertanggungjawab dan jika ada apa-apa masalah maka PEMBELI tidak berhak - membuat apa-apa tuntutan lagi.

    -

     

    -

     

    - - - - - - - - - - - - - - - - - - - - - - - - - -
    ...................................                                                 - ...................................
    Tandatangan Khazanah                                                 - Tandatangan Pembeli
    Nama:                                                 - Nama: {{$userdetails->name}}
                                                      - No.K/P: {{$userdetails->nokp}}
                                                      - Tarikh:
                                                      - Masa:
    -

     

     
    + + + Nama + : + {{$userdetails->name}} + + + No.K/P + : + {{$userdetails->nokp}} + + + Alamat + : + {{$userdetails->alamat}} + + + No Telefon + : + {{$userdetails->notelbimbit}} + + + - \ No newline at end of file +
    SLIP SERAHAN BARANG GADAIAN YANG BERJAYA DILELONG
    + + + + + + + + + + + + + @foreach ($SAGWin as $index=>$info) + + + + + + + + @endforeach + + + + + + + + + + + @foreach($infos as $index=> $inf) - + diff --git a/resources/views/pembida/listkebenaranbayarantunai.blade.php b/resources/views/pembida/listkebenaranbayarantunai.blade.php new file mode 100644 index 00000000..8bae945e --- /dev/null +++ b/resources/views/pembida/listkebenaranbayarantunai.blade.php @@ -0,0 +1,127 @@ +@extends('layouts.app') + +@section('content') + +
    +
    +
    + @if ($message = Session::get('success')) +
    +

    {{ $message }}

    +
    + @endif +

    KEBENARAN BAYARAN TUNAI

    +
    BilNo RujukanJenis BarangBerat(g) Harga Lelong(RM)
    {{$index+1}}{{$info['norujukan']}}@foreach ($info['detailmarhun'] as $item) + {{ "-".$item['descpt'] }}
    + @endforeach    		@foreach ($info['detailmarhun'] as $item) + {{ $item['berat'] }}
    + @endforeach    		{{ number_format($info['hargajual'], 2, '.', ',') }}
    Jumlah{{ number_format($total_berat, 2, '.', ',') }}{{ number_format($caw['total_bidaan'], 2, '.', ',') }}
    + + + + + + + +

    PERHATIAN: Bahawa PEMBELI hendaklah mengaku bahawa identiti harta yang berjaya dibeli bersama-sama dengan keterangan yang dinyatakan oleh PLAINTIF PEMEGANG GADAIAN adalah seperti yang dicatatkan di dalam keterangan harta tersebut dan + setelah selesai proses pembayaran maka PEMBELI bertanggungjawab dan jika ada apa-apa masalah maka PEMBELI tidak berhak + membuat apa-apa tuntutan lagi.

    +

     

    +

     

    + + + + + + + + + + + + + + + + + + + + + + + + + +
    ...................................                                                 + ...................................
    Tandatangan Khazanah                                                 + Tandatangan Pembeli
    Nama: {{$user->name}}                                                 + Nama: {{$userdetails->name}}
                                                      + No.K/P: {{$userdetails->nokp}}
                                                      + Tarikh: @php + $today = date('d-m-Y'); + echo($today); + @endphp
                                                      + Masa:
    +
    + + \ No newline at end of file diff --git a/resources/views/pembayaran/SAGBidItem.blade.php b/resources/views/pembayaran/SAGBidItem.blade.php index d741e5b4..6365784c 100644 --- a/resources/views/pembayaran/SAGBidItem.blade.php +++ b/resources/views/pembayaran/SAGBidItem.blade.php @@ -7,7 +7,8 @@

    Nama : {{ $SAGBidItem->name }}

    No Kad Pengenalan : {{ $SAGBidItem->nokp }}

    -

    Alamat : {{ $SAGBidItem->alamat }}

    +

    No.Telefon : {{ $SAGBidItem->notelbimbit }}

    +

    No.Invoice : {{ $getinvoice->invoice_no }}

    @@ -20,57 +21,74 @@ - - - - - - - - - - - - @foreach($eachbid as $biditem) - - - - - - - - @endforeach - {{-- - - - - --}} - -
    NoNo rujukanHarga Asas (RM)Harga Bida (RM)Tindakan
    {{ $loop->iteration }} - {{ $biditem->norujukan}} - {{ number_format($biditem->hargaasas, 2, '.', ',')}}{{ number_format($biditem->hargabida, 2, '.', ',')}} - @if($biditem->status_payment == 1) - - PAID - @elseif($biditem->status_payment == 2) - TUNGGU PENGESAHAN - @else - BELUM BAYAR - @endif -
    Jumlah BayaranRM - @if($getresit) - - @else - @endif -
    + + + + + + + + + + + + + @foreach($eachbid as $biditem) + + + + + + {{-- --}} + + + @endforeach + + + + + + +
    NoNo rujukanHarga Asas (RM)Harga Bida (RM)Tindakan
    {{ $loop->iteration }} + {{ $biditem->norujukan}} + {{ number_format($biditem->hargaasas, 2, '.', ',')}}{{ number_format($biditem->hargabida, 2, '.', ',')}} + @if($biditem->status_payment == 0) + + @elseif($biditem->status_payment == 2) + TUNGGU PENGESAHAN + @else + PAID + @endif + + @if($biditem->status_payment == 1) + + PAID + @elseif($biditem->status_payment == 2) + TUNGGU PENGESAHAN + @else + + BELUM BAYAR + @endif +
    Jumlah BayaranRM + @if($getresit) + + @else + @endif +
    - + @if($getinvoice->opencash == '1' && $biditem->status_payment == '') +
    + {{-- Kembali --}} + {{-- --}} + +
    + @elseif($getinvoice->opencash == '0' && $biditem->status_payment == '') +
    +

    Sila Hubungi Operasi Untuk Kebenaran

    +
    + @endif
    Kembali
    @@ -85,6 +103,7 @@ +
    @@ -252,20 +271,25 @@ + + + +@endsection \ No newline at end of file diff --git a/resources/views/pembida/belumbayarbidaan.blade copy.php b/resources/views/pembida/belumbayarbidaan.blade copy.php new file mode 100644 index 00000000..82fc6576 --- /dev/null +++ b/resources/views/pembida/belumbayarbidaan.blade copy.php @@ -0,0 +1,131 @@ +@extends('layouts.app') + +@section('content') +
    +
    +
    + +
    + @if ($message = Session::get('failed')) +
    +

    {{ $message }}

    +
    + @endif + +
    + +
    + + + + + + + + + + + + + + + @foreach($infos as $inf) + + + + + + + + + + + + @endforeach + +
    BilNo RujukanMarhunHarga Asas (RM)Harga Bida (RM)Masa BidaanKaedah PembayaranNo Resit
    {{ $loop->iteration }}{{ $inf['info']['norujukan'] }}{{ $inf['info']['marhun'] }}{{ number_format($inf['info']['hargaasas'], 2, '.', ',') }}{{ number_format($inf['info']['hargabida'], 2, '.', ',') }}{{ $inf['info']['masa_bidaan'] }} + @foreach($inf['butiran_bidaan'] as $butiran_bidaan) + {{ $butiran_bidaan['remark'] }} + @endforeach + + @foreach($inf['butiran_bidaan'] as $butiran_bidaan) + {{ $butiran_bidaan['reference_no'] }} + @endforeach +
    + +
    +
    +
    + + +@endsection diff --git a/resources/views/pembida/detailsbidaanbelumbayar.blade.php b/resources/views/pembida/detailsbidaanbelumbayar.blade.php index d5b5d7c4..aee00bbb 100644 --- a/resources/views/pembida/detailsbidaanbelumbayar.blade.php +++ b/resources/views/pembida/detailsbidaanbelumbayar.blade.php @@ -37,7 +37,7 @@
    {{ $loop->iteration }} {{ $inf['norujukan'] }} {{ $inf['nama_bidder'] }}
    + + + + + + + + + + + + + + + @foreach($arrayinfo as $lel) + + + + + + + + + + + + + @endforeach + +
    NoID LelongTarikh LelongCawanganStatus ExportHarga Emas SemasaTempohCaj LelongStatus Lelong
    {{ $loop->iteration }}{{ $lel['detail']['lelong_id']}}@php + $myDateTime = DateTime::createFromFormat('Y-m-d', $lel['detail']['tarikh_lelong'] ); + $t_lelong = $myDateTime->format('d-m-Y'); + echo($t_lelong); + @endphp + @foreach($lel['detailsinfo'] as $details) + + {{ $details['caw_name']}} +
    + @endforeach +     		+ @foreach($lel['detailsinfo'] as $details) + @if($details['export_data_sts'] == '1') + Selesai Export + + @endif + +
    + @endforeach +     		{{ $lel['detail']['harga_emas_asas'] }}{{ $lel['detail']['jbg'] }}{{ $lel['detail']['cajlelong'] }} + @if($lel['detail']['sts_lelong'] == 3) + + @endif +
    + + + + + + +@endsection \ No newline at end of file diff --git a/resources/views/pembida/senaraipemenangbycaw.blade.php b/resources/views/pembida/senaraipemenangbycaw.blade.php new file mode 100644 index 00000000..1653e9d6 --- /dev/null +++ b/resources/views/pembida/senaraipemenangbycaw.blade.php @@ -0,0 +1,139 @@ +@extends('layouts.app') + +@section('content') + +
    +
    +
    + @if ($message = Session::get('success')) +
    +

    {{ $message }}

    +
    + @endif +
    +

    Senarai Bayaran Pemenang

    + + + + + + + + + + + + {{-- + + --}} + + + + + @foreach($listwinner as $winner) + + + + + + + + + + {{-- + + + + --}} + + + @endforeach + +
    NoNamaNo Kad PengenalanNo TelefonBilangan SuratJumlah Bidaan(RM)Amaun Telah Dibayar(RM)Status BayaranPenyata BayaranSlip SerahanResit PembayaranTindakan
    {{ $loop->iteration }} {{ $winner['details']['name']}}{{ $winner['details']['nokp']}}{{ $winner['details']['notelbimbit']}}{{ $winner['total_surat']}}{{ number_format($winner['totalBid'], 2, '.', ',')}}{{ number_format($winner['totalPay'], 2, '.', ',')}} + @if($winner['totalPay'] < $winner['totalBid']) + + @elseif($winner['totalPay'] == $winner['totalBid']) + + @endif + + + + + + + + +
    +
    + Kembali +
    +
    +
    +
    + + + +@endsection + diff --git a/resources/views/pembida/senaraisagpemenangbycaw.blade.php b/resources/views/pembida/senaraisagpemenangbycaw.blade.php new file mode 100644 index 00000000..0157efbe --- /dev/null +++ b/resources/views/pembida/senaraisagpemenangbycaw.blade.php @@ -0,0 +1,107 @@ +@extends('layouts.app') + +@section('content') + +
    +
    +
    + + @if ($message = Session::get('success')) +
    +

    {{ $message }}

    +
    + @endif +
    +
    +
    +

    Nama Pembida : {{ $userdetails['name'] }}

    +

    No Kad Pengenalan : {{ $userdetails['nokp'] }}

    +

    No Telefon : {{ $userdetails['notelbimbit'] }}

    +
    +
    +
    + + + + + + + + + + + + + @foreach($senaraisag as $senaraisag) + + + + + + + + + + @endforeach + +
    NoNo RujukanTarikh LelongHarga Asas (RM)Harga Bida (RM)Masa Bidaan
    {{ $loop->iteration }} {{ $senaraisag['norujukan']}}@php + $myDateTime = DateTime::createFromFormat('Y-m-d', $senaraisag['t_lelong'] ); + $t_lelong = $myDateTime->format('d-m-Y'); + echo($t_lelong); + @endphp{{ number_format($senaraisag['hargaasas'], 2, '.', ',')}}{{ number_format($senaraisag['hargabida'], 2, '.', ',')}}{{ $senaraisag['masa_bidaan']}}
    +
    + {{-- Kembali --}} +
    +
    +
    +
    + + + +@endsection diff --git a/resources/views/pengesahan/mutumarhun.blade.php b/resources/views/pengesahan/mutumarhun.blade.php index a5a7f4bd..911d0a70 100644 --- a/resources/views/pengesahan/mutumarhun.blade.php +++ b/resources/views/pengesahan/mutumarhun.blade.php @@ -2,9 +2,15 @@ @section('content') +
    +
    + +
    @csrf @@ -20,6 +26,9 @@
    + + {{-- Kembali --}} +

    No Rujukan : {{ $lelongbid->norujukan }}

    @@ -236,8 +245,8 @@
    - Kembali - + +
    diff --git a/routes/web.php b/routes/web.php index 98af2206..84a35cff 100644 --- a/routes/web.php +++ b/routes/web.php @@ -260,6 +260,12 @@ Route::group(['middleware' => ['permission:semakanmarhun','permission:kemaskinim Route::post('/tambahmarhun',['as'=>'marhun.tambahmarhun','uses'=>'MarhunController@tambahmarhun']); Route::get('/exportmarhundetails/{lelong_id}',['as'=>'marhun.exportmarhundetails','uses'=>'MarhunController@exportmarhundetails']); + //action khazanah untuk serahan marhun kepada pembida menang + Route::get('/senarailelongscanjual',['as'=>'marhun.senarailelongscanjual','uses'=>'MarhunController@senarailelongscanjual']); + Route::get('/scanbarcodejual/{lelong_id}',['as'=>'marhun.scanbarcodejual','uses'=>'MarhunController@listScanBarcodejual']); + Route::post('/scankeluarmarhunjual',['as'=>'marhun.scankeluarmarhunjual','uses'=>'MarhunController@scanKeluarMarhunjual']); + Route::get('/cetakkeluarscanbarcodejual/{lelong_id}',['as'=>'marhun.cetakkeluarscanbarcodejual','uses'=>'MarhunController@cetakkeluarscanbarcodejual']); + //Penilai Route::post('/addphotomarhun',['as'=>'marhun.addphotomarhun','uses'=>'MarhunController@addPhotoMarhun']); Route::post('/deletephotomarhun',['as'=>'marhun.deletephotomarhun','uses'=>'MarhunController@deletePhotoMarhun']); @@ -289,6 +295,13 @@ Route::group(['middleware' => ['permission:pengesahanpembida'],'prefix'=>'pembid Route::get('/senlelbelumbayarbidaan',['as'=>'pembida.senlelbelumbayarbidaan','uses'=>'PembidaController@senlelbelumbayarbidaan']); Route::get('/belumbayarbidaan',['as'=>'pembida.belumbayarbidaan','uses'=>'PembidaController@belumbayarbidaan']); Route::post('/declaretidaklaku',['as'=>'pembida.declaretidaklaku','uses'=>'PembidaController@declaretidaklaku']); + Route::get('/kebenaranbayarantunai',['as'=>'pembida.kebenaranbayarantunai','uses'=>'PembidaController@kebenaranbayarantunai']); + Route::get('/senaraipemenangbycaw/{lelong_id}/{kodcaw}',['as'=>'pembida.senaraipemenangbycaw','uses'=>'PembidaController@senaraipemenangbycaw']); + Route::get('/senaraisagpemenangbycaw/{user_id}/{lelong_id}/{kodcaw}',['as'=>'pembida.senaraisagpemenangbycaw','uses'=>'PembidaController@senaraisagpemenangbycaw']); + Route::get('/SAGBidItembycaw/{user_id}/{lelong_id}/{kodcaw}', ['as'=>'pembida.SAGBidItembycaw','uses'=>'PembidaController@SAGBidItembycaw']); + Route::post('/benarkantunai', ['as'=>'pembida.benarkantunai','uses'=>'PembidaController@benarkantunai']); + + }); Route::group(['middleware' => ['permission:pengesahan'],'prefix'=>'pengesahan'], function () {