diff --git a/app/Http/Controllers/CartController.php b/app/Http/Controllers/CartController.php index 2ade905f..4fc07354 100644 --- a/app/Http/Controllers/CartController.php +++ b/app/Http/Controllers/CartController.php @@ -19,6 +19,8 @@ use App\Models\LelongBidMarhun; use App\Models\LelKarat; use App\Models\Cart; use Carbon\Carbon; +use App\Models\FileMarhun; + class CartController extends Controller { @@ -78,6 +80,9 @@ class CartController extends Controller $total_surat = 0; foreach ($cart as $index1 => $data) { + $fileMarhun = FileMarhun::where('lelongbid_id', $data['id'])->get(); + $cart[$index1]['filemarhun'] = $fileMarhun; + $total_hargabida += $data['hargabida']; $total_berat += $data['berat']; $total_surat += 1; diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index e69be024..5730f920 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -164,6 +164,8 @@ class LelongController extends Controller ->where('kodcaw', '=', $cawanganLelong->cawangan->caw_code) ->sum('total_payment'); + // dd($cawanganLelong->cawangan->caw_code, $request->tarikh_lelong, $lelongDetails->masamula_lelong, $lelongDetails->masatamat_lelong, $lelongBidMaster->toArray(), $lelongbidmarhun->toArray(), floatval($paymentOnline), floatval($paymentTunai)); + $exportData = Http::withOptions(['verify' => config('app.api_verify')])->post( config('app.api_url') . 'exportLelong', [ @@ -859,7 +861,14 @@ class LelongController extends Controller if($detail_sag['tempohbayar'] == $detail_sag['tempoh'] ){ $keuntungan = 0.00; }else{ - $keuntungan = bcdiv(($detail_sag['tempoh']-$detail_sag['tempohbayar'])*$detail_sag['kadarupah']/100*$detail_sag['bakipjm'],1,1)-$beza_keuntungan; + // $keuntungan = bcdiv(($detail_sag['tempoh']-$detail_sag['tempohbayar'])*$detail_sag['kadarupah']/100*$detail_sag['bakipjm'],1,1)-$beza_keuntungan; + $jbg = $detail_sag['tempoh']-$detail_sag['tempohbayar']; + $jbg2 = 12- $detail_sag['tempohbayar']; + if($detail_sag['tempoh'] <= '12.00'){ + $keuntungan = bcdiv(($jbg)*$detail_sag['kadarupah']/100*$detail_sag['bakipjm'],1,1)-$beza_keuntungan; + }else{ + $keuntungan = bcdiv(($jbg2)*$detail_sag['kadarupah']/100*$detail_sag['bakipjm'],1,1)-$beza_keuntungan; + } } $sumhargaasas = 0; @@ -1242,6 +1251,10 @@ class LelongController extends Controller public function senaraipemenang(Request $request, $lelong_id){ $caw_code = $request->caw_code; + + $lelonglel = Lelong::with('cawangan')->find($lelong_id); + + $cawanganDetail = $lelonglel->cawangan->where('caw_code', $caw_code)->first(); $listwinner = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') ->where('lelongbidder.status_bidder', 1) @@ -1269,13 +1282,17 @@ class LelongController extends Controller // $listwinner[$index1]['kodcaw'] = $kodcaw; } - return view('lelong.senaraipemenang',compact('listwinner','lelong_id','caw_code')); + return view('lelong.senaraipemenang',compact('listwinner','lelong_id','caw_code','cawanganDetail')); } public function senaraisagpemenang($user_id, $lelong_id, $kodcaw){ $userdetails = User::where('id', $user_id)->first(); + $lelonglel = Lelong::with('cawangan')->find($lelong_id); + + $cawanganDetail = $lelonglel->cawangan->where('caw_code', $kodcaw)->first(); + $senaraisag = LelongBid::join('lelongbidder', 'lelongbid.id', '=', 'lelongbidder.lelongbid_id') ->where('lelongbid.lelong_id', $lelong_id) ->where('lelongbid.kodcaw', $kodcaw) @@ -1284,7 +1301,7 @@ class LelongController extends Controller ->get(); - return view('lelong.senaraisagpemenang', compact('senaraisag', 'user_id', 'lelong_id','userdetails')); + return view('lelong.senaraisagpemenang', compact('senaraisag', 'user_id', 'lelong_id','userdetails','cawanganDetail')); } public function senaraimarhun($lelongid, $cawid){ @@ -1305,6 +1322,7 @@ class LelongController extends Controller $marhuns = LelongBid::where('caw_id', '=', $cawid) ->where('lelong_id', '=', $lelongid) + ->orderBy('norujukan', 'ASC') ->get(); // dd($marhuns); $arraymarhun = []; @@ -2042,16 +2060,24 @@ class LelongController extends Controller $month = $current->month; $year = $current->format('y'); + $today = $current->format('Y-m-d'); + // dd($today); + $lelong = Lelong::where('id', '=', $lelong_id)->first(); $lelongbid = LelongBid::where('lelong_id', '=', $lelong_id)->get(); foreach ($lelongbid as $bid) { - $highestprice = LelongBidder::where('lelongbid_id', '=', $bid->id)->orderBy('lelongbidder.hargabida', 'DESC')->first(); + $highestprice = LelongBidder::where('lelongbid_id', '=', $bid->id) + ->where('masa_bidaan', 'LIKE', '%'.$today.'%') + ->orderBy('lelongbidder.hargabida', 'DESC') + ->first(); + // dd($highestprice); // dd($highestprice->hargabida); if ($highestprice) { // 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('masa_bidaan', 'LIKE', '%'.$today.'%') ->where('lelongbid.lelong_id', '=', $lelong_id) ->where('lelongbid_id', '=', $bid->id) ->where('hargabida', '=', $highestprice->hargabida)->orderBy('masa_bidaan', 'ASC') @@ -2082,7 +2108,7 @@ class LelongController extends Controller // dd($totalbaki); $updatebid->hargajual = $bidder->hargabida; $updatebid->t_jual = $currentdate; - $updatebid->cajlelong = bcdiv($sumcajlelong, 1, 1); + $updatebid->cajlelong = round($sumcajlelong, 1, 1); $updatebid->baki = $totalbaki; $updatebid->nopembeli = $bidder->user_id; $updatebid->status_jual = 1; @@ -2161,20 +2187,27 @@ class LelongController extends Controller $cawid = $caw['caw_id']; $marhun = LelongBid::join('cawangan', 'lelongbid.caw_id', '=', 'cawangan.id') ->where('lelong_id','=',$lelong_id) - ->where('caw_id','=',$caw['caw_id']); + ->where('caw_id','=',$caw['caw_id']) + ->select('lelongbid.norujukan','lelongbid.fasa','lelongbid.kodcaw'); $arraynorujukan = $marhun->pluck('norujukan')->toArray(); $datalelong = $marhun->get(); - // dd($datalelong[$index]['kodcaw']); + // dd($datalelong[$index]['fasa']); + $kodcaw = $datalelong[$index]['kodcaw']; $senaraisag = Gadai::on($datalelong[$index]['kodcaw'])->whereIn('norujukan', $arraynorujukan) ->get(); // dd($senaraisag); foreach($senaraisag as $data) { - // dd($data['norujukan']); - // dd($datalelong[$index]['fasa']); - if($datalelong[$index]['fasa'] == 1){ + + $marhunitemfasa = LelongBid::where('lelong_id','=',$lelong_id) + ->where('kodcaw','=',$kodcaw) + ->where('norujukan','=',$data['norujukan']) + ->select('lelongbid.norujukan','lelongbid.fasa') + ->first(); + // dd($marhunitemfasa->fasa); + if($marhunitemfasa->fasa == 1){ //insert lelong_tebus if($data['sttebus'] == "T") { @@ -2241,7 +2274,14 @@ class LelongController extends Controller $total_untung_rebet = TransaksiKeuntungan::on('main')->where('norujukan','=',$data['norujukan'])->sum('keuntungan_rebet'); $total_untung_asal = TransaksiKeuntungan::on('main')->where('norujukan','=',$data['norujukan'])->sum('bayaran_keuntungan'); $beza_keuntungan = $total_untung_asal - $total_untung_rebet; - $keuntungan = bcdiv(($data['tempoh']-$data['tempohbayar'])*$data['kadarupah']/100*$data['bakipjm'],1,1)-$beza_keuntungan; + // $keuntungan = bcdiv(($data['tempoh']-$data['tempohbayar'])*$data['kadarupah']/100*$data['bakipjm'],1,1)-$beza_keuntungan; + $jbg = $data['tempoh']-$data['tempohbayar']; + $jbg2 = 12- $data['tempohbayar']; + if($data['tempoh'] <= '12.00'){ + $keuntungan = bcdiv(($jbg)*$data['kadarupah']/100*$data['bakipjm'],1,1)-$beza_keuntungan; + }else{ + $keuntungan = bcdiv(($jbg2)*$data['kadarupah']/100*$data['bakipjm'],1,1)-$beza_keuntungan; + } // dd($keuntungan); //update dalam simulasibid $updatetempoh = LelongBid::where('norujukan', $data['norujukan']) @@ -2266,24 +2306,32 @@ class LelongController extends Controller $lelong = Lelong::where('id','=',$lelong_id)->first(); $lelong->masakemaskini_data = $date; $lelong->save(); - } - }else if($datalelong[$index]['fasa'] == 2){ - // dd($datasimulasi[$index]['fasa']); - if($data['sttebus'] == "T") - { - $lelongtebus = new LelongTebus; - $lelongtebus->tarikh = $currentdate; - $lelongtebus->kodcaw = $data['kodcaw']; - $lelongtebus->teller = $user->name; - $lelongtebus->norujukan = $data['norujukan']; - $lelongtebus->batch_no = $lelong_id; - $lelongtebus->nilaimarhun = $data['nilaimarhun']; - $lelongtebus->pinjaman = $data['pinjaman']; - $lelongtebus->upah = $data['bakiupah']; - $lelongtebus->jbg = $data['jbg']; - $lelongtebus->jenis_tebus = 'T'; - $lelongtebus->save(); - + + } + }else if($marhunitemfasa->fasa == 2){ + // dd($datasimulasi[$index]['fasa']); + if($data['sttebus'] == "T") + { + $lelongtebus = new LelongTebus; + $lelongtebus->tarikh = $currentdate; + $lelongtebus->kodcaw = $data['kodcaw']; + $lelongtebus->teller = $user->name; + $lelongtebus->norujukan = $data['norujukan']; + $lelongtebus->batch_no = $lelong_id; + $lelongtebus->nilaimarhun = $data['nilaimarhun']; + $lelongtebus->pinjaman = $data['pinjaman']; + $lelongtebus->upah = $data['bakiupah']; + $lelongtebus->jbg = $data['jbg']; + $lelongtebus->jenis_tebus = 'T'; + $lelongtebus->save(); + + $updategadai = Http::withOptions(['verify' => config('app.api_verify')]) + ->post(config('app.api_url').'taglel/revert',[ + 'kodcaw'=>$data['kodcaw'], + 'norujukan'=>$data['norujukan'] + ]) + ->json(); + // dd($data['norujukan']); $updatelelong = LelongBid::where('norujukan','=',$data['norujukan'])->first(); $updatelelong->delete(); @@ -2297,18 +2345,54 @@ class LelongController extends Controller $loguser->nota = ' LELONG TEBUS '.$lelong_id; $loguser->save(); - + + } + else{ + //kemaskini keuntungan + $total_untung_rebet = TransaksiKeuntungan::on('main')->where('norujukan','=',$data['norujukan'])->sum('keuntungan_rebet'); + $total_untung_asal = TransaksiKeuntungan::on('main')->where('norujukan','=',$data['norujukan'])->sum('bayaran_keuntungan'); + $beza_keuntungan = $total_untung_asal - $total_untung_rebet; + // $keuntungan = bcdiv(($data['tempoh']-$data['tempohbayar'])*$data['kadarupah']/100*$data['bakipjm'],1,1)-$beza_keuntungan; + $jbg = $data['tempoh']-$data['tempohbayar']; + $jbg2 = 12- $data['tempohbayar']; + if($data['tempoh'] <= '12.00'){ + $keuntungan = bcdiv(($jbg)*$data['kadarupah']/100*$data['bakipjm'],1,1)-$beza_keuntungan; + }else{ + $keuntungan = bcdiv(($jbg2)*$data['kadarupah']/100*$data['bakipjm'],1,1)-$beza_keuntungan; + } + // dd($keuntungan); + //update dalam simulasibid + $updatetempoh = LelongBid::where('norujukan', $data['norujukan']) + ->where('lelong_id', $lelong_id) + ->first(); + $updatetempoh->jbg = $data['tempoh']; + $updatetempoh->pinjaman = $data['bakipjm']; + $updatetempoh->bakiupah = bcdiv($keuntungan,1,1); + $updatetempoh->update(); + + //insert loguser + $loguser = new LogUser; + $loguser->user_id = $user->id; + $loguser->date = $currentdate; + $loguser->username = $user->username; + $loguser->nama_user = $user->name; + $loguser->norujukan = $data['norujukan']; + $loguser->nota = $lelong_id.' Kemaskini Tempoh/Bakipjm/Keuntungan' ; + $loguser->save(); } $date = Carbon::now()->toDateTimeString(); $lelong = Lelong::where('id','=',$lelong_id)->first(); $lelong->masakemaskini_data = $date; $lelong->save(); } - - - } - + + } + + } + + + // dd($datalelong[$index]['fasa']); return redirect()->route('lelong.senarailelong') ->with('success','Kemaskini Berjaya'); } @@ -2320,7 +2404,7 @@ class LelongController extends Controller $lelong = CawanganLelong::join('lelong', 'cawangan_lelong.lelong_id', '=', 'lelong.id') ->select('lelong_id','tarikh_lelong','lelong.fasa','lelong.masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong') ->groupBy('lelong_id') - // ->where('lelong.sts_lelong', 3) + ->where('lelong.sts_lelong', 0) ->get()->toArray(); foreach($lelong as $laporan) @@ -2395,10 +2479,15 @@ class LelongController extends Controller $data = Lelong::where('lelong.id','=',$lelong_id) ->get(); } - $datapindah = lelong::select("id","tarikh_lelong") - ->where('sts_lelong', 0) - ->where('id','!=', $lelong_id) - ->where('kali','=', $kali) + // dd($cawangan['caw_code']); + $datapindah = lelong::join('cawangan_lelong','cawangan_lelong.lelong_id','=','lelong.id') + ->join('cawangan','cawangan.id','=','cawangan_lelong.caw_id') + ->select("lelong.id","lelong.tarikh_lelong") + ->where('cawangan_lelong.caw_id','!=', $cawangan['id']) + ->where('lelong.sts_lelong', 0) + ->where('cawangan_lelong.lelong_id','!=', $lelong_id) + ->where('lelong.id','!=', $lelong_id) + ->where('lelong.kali','=', $kali) ->get()->toArray(); foreach($datapindah as $row) { @@ -2706,12 +2795,13 @@ class LelongController extends Controller // $keuntungan = $cal['bakipjm'] - ($cal['bakihargajualan'] - ($cal['upah12'] - $cal['ansakhir'])-(($cal['tempoh']-$cal['tempohbayar'])*$cal['kadarupah']/100*$cal['bakipjm']) ); // $marhuns[$index1]['keuntungan'] = bcdiv($keuntungan,1,1); - // $simulasilel = Lelong::where('id',$lelongid)->get(); - // $sumcajlelong = $cal['hargaasas'] * ($simulasilel[0]['cajlelong']/100); - // $totalbaki = $cal['hargaasas'] - $cal['pinjaman'] - bcdiv($keuntungan,1,1) - bcdiv($sumcajlelong,1,1); + $simulasilel = Lelong::where('id',$lelongid)->get(); + $sumcajlelong = $cal['hargaasas'] * ($simulasilel[0]['cajlelong']/100); + $cajlelongnew = bcdiv($sumcajlelong,1,1); + $totalbaki = $cal['hargaasas'] - $cal['pinjaman'] - $cal['bakiupah'] - $cajlelongnew; - // $marhuns[$index1]['cajlelong'] = bcdiv($sumcajlelong,1,1); - // $marhuns[$index1]['baki'] = $totalbaki; + $marhuns[$index1]['cajlelong'] = $cajlelongnew; + $marhuns[$index1]['baki'] = $totalbaki; } $arrayinfo = []; @@ -2767,19 +2857,48 @@ class LelongController extends Controller $pindahlelongsag->lelong_id = $lelongidbaru; $pindahlelongsag->update(); - //insert loguser - $loguser = new LogUser; - $loguser->user_id = $user->id; - $loguser->date = $currentdate; - $loguser->username = $user->username; - $loguser->nama_user = $user->name; - $loguser->norujukan = $norujukan; - $loguser->nota = 'Pindah Lelong '.$lelongidasal.'-'.$lelongidbaru; - $loguser->save(); + + $checksag = LelongBid::where('lelong_id',$request->lelongid) + ->first(); + // dd($checksag); + + if($checksag) + { + + //insert loguser + $loguser = new LogUser; + $loguser->user_id = $user->id; + $loguser->date = $currentdate; + $loguser->username = $user->username; + $loguser->nama_user = $user->name; + $loguser->norujukan = $norujukan; + $loguser->nota = 'Pindah Lelong '.$lelongidasal.'-'.$lelongidbaru; + $loguser->save(); + } + else{ + $lelongbatch = Lelong::where('id','=',$lelongidasal)->first(); + $lelongbatch->delete(); + + $loguser = new LogUser; + $loguser->user_id = $user->id; + $loguser->date = $currentdate; + $loguser->username = $user->username; + $loguser->nama_user = $user->name; + $loguser->norujukan = $norujukan; + $loguser->nota = 'Pindah Lelong '.$lelongidasal.'-'.$lelongidbaru; + $loguser->save(); + + } } + if($checksag){ return redirect()->route('lelong.listsagpindah',['lelongid'=>$request->lelongid,'cawid'=>$request->cawid]) ->with('success','Pindah ID Lelong Berjaya'); + }else{ + return redirect()->route('lelong.pindahsenarailelong') + ->with('success','Pindah ID Lelong Berjaya'); + } + } public function temprenewlelongxlaku(Request $request) @@ -3081,7 +3200,14 @@ class LelongController extends Controller $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; + // $keuntungan = bcdiv(($listing['tempoh']-$listing['tempohbayar'])*$listing['kadarupah']/100*$listing['bakipjm'],1,1)-$beza_keuntungan; + $jbg = $listing['tempoh']-$listing['tempohbayar']; + $jbg2 = 12- $listing['tempohbayar']; + if($listing['tempoh'] <= '12.00'){ + $keuntungan = bcdiv(($jbg)*$listing['kadarupah']/100*$listing['bakipjm'],1,1)-$beza_keuntungan; + }else{ + $keuntungan = bcdiv(($jbg2)*$listing['kadarupah']/100*$listing['bakipjm'],1,1)-$beza_keuntungan; + } // dd($keuntungan); $listsag[$index]['ktlhbyr'] = $ktlhbyr; $listsag[$index]['keuntungan'] = $keuntungan; @@ -3822,7 +3948,7 @@ class LelongController extends Controller $total_bakiupah = $total_bakiupah + $bakiupah; - $data = Simulasi::where('kali','=',$kali) + $data = Lelong::where('kali','=',$kali) ->first(); // dd($data); @@ -5193,7 +5319,7 @@ class LelongController extends Controller 'id_cawangan'=> $cawlel['caw_id'], 'cawangan' => $cawlel->cawangan->caw_name, 't_lelong'=>$lelong['tarikh_lelong'], - 'bil_marhun'=>sizeof($cawlel->lelongBid), + 'bil_marhun'=>sizeof($databid), 'berat'=>$berat, 'n_marhun'=>$nilai_marhun, 'pinjaman'=>$pinjaman, @@ -5206,7 +5332,7 @@ class LelongController extends Controller 'bakilelong'=>$bakilelong, ]); - $total_marhun += sizeof($cawlel->lelongBid); + $total_marhun += sizeof($databid); // $total_marhun = $total_marhun + sizeof($databid); // $total_berat = $total_berat + $berat; @@ -5991,6 +6117,26 @@ class LelongController extends Controller } + public function exporthargaemas($lelong_id){ + + $lelong = Lelong::with(['lelKarat'])->find($lelong_id); + // dd($lelong); + $lelkarat = $lelong->lelKarat; + $tarikhkemaskini = $lelong->lelKarat[0]; + $jeniskarat = JenisKarat::all(); + $today = date('d-m-Y'); + + $pdf1 = PDF::loadView('pdf.exporthargaemas', compact('lelong_id','lelkarat','jeniskarat','tarikhkemaskini')) + ->setPaper('a4', 'potrait'); + + return $pdf1->download('Harga Emas Lelong '.$today.'.pdf'); + + + + + } + + diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php index 691f083a..4864ba24 100644 --- a/app/Http/Controllers/MarhunController.php +++ b/app/Http/Controllers/MarhunController.php @@ -731,7 +731,7 @@ class MarhunController extends Controller ->where('kodcaw', '=', $user['kodcaw']) ->get() ->toArray(); - dd($lelongs); + //dd($lelongs); $arraycaw = []; @@ -1680,14 +1680,14 @@ class MarhunController extends Controller $senaraiScanKeluar = ScanSemak::where('kodcaw', '=', $caw->caw_code) ->where('lelong_id', $lelong_id) ->whereNull('terima_marhun') - ->orderBy('id', 'desc') + ->orderBy('norujukan', 'asc') ->get(); $sedangDinilai = ScanSemak::where('kodcaw', '=', $caw->caw_code) ->whereNotNull('terima_marhun') ->whereNull('serah_marhun') ->where('lelong_id', $lelong_id) - ->orderBy('id', 'desc') + ->orderBy('norujukan', 'asc') ->get(); foreach ($sedangDinilai as $key => $dinilai) { $sdhdisemak = LelongBid::where('lelongbid.lelong_id', $lelong_id) @@ -1702,7 +1702,7 @@ class MarhunController extends Controller $sudahSerah = ScanSemak::where('kodcaw', '=', $caw->caw_code) ->whereNotNull('serah_marhun') ->where('lelong_id', $lelong_id) - ->orderBy('id', 'desc') + ->orderBy('norujukan', 'asc') ->get(); diff --git a/app/Http/Controllers/Mobile/LelongMobileController.php b/app/Http/Controllers/Mobile/LelongMobileController.php index b301840b..351f24b9 100644 --- a/app/Http/Controllers/Mobile/LelongMobileController.php +++ b/app/Http/Controllers/Mobile/LelongMobileController.php @@ -19,6 +19,7 @@ use App\Models\Resit; use App\Models\FileResit; use App\Models\Invoice; use App\Models\JenisEmas; +use App\Services\MarhunPhotoService; use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Validator; @@ -204,6 +205,9 @@ class LelongMobileController extends Controller $total_hargabida = 0; $total_berat = 0; foreach ($lelongBidder as $index1 => $data) { + $fileMarhun = FileMarhun::where('lelongbid_id', $data['id'])->get(); + $lelongBidder[$index1]['filemarhun'] = $fileMarhun; + $total_hargabida += $data['hargabida']; $total_berat += $data['berat']; $marhun = LelongBidMarhun::where('lelongbid_id', '=', $data['id'])->get()->toArray(); @@ -345,6 +349,7 @@ class LelongMobileController extends Controller if ($lelong) { $lelongbid = LelongBid::where('lelong_id', $lelong['lelong_id']) ->where('caw_id', '=', $request->caw_id) + ->where('status_jual', '=', 0) ->select('id', 'kodcaw') ->get(); $pluckedLelongBid = $lelongbid->pluck('id')->toArray(); @@ -377,6 +382,20 @@ class LelongMobileController extends Controller $lelongbid['lelongbidmarhun'] = $lelongbidmarhun; $fileMarhun = FileMarhun::where('lelongbid_id', $lelongbid['id'])->get(); + // dd($fileMarhun); + + // foreach ($fileMarhun as $index) { + // dd($index); + // // $eachmarhun = FileMarhun::where('lelongbidmarhun_id', '=', $index['id'])->first(); + // // if (isset($eachmarhun)) { + // // $index->eachmarhun_filename = route('marhun.showphotomarhun', ['norujukan_sag' => $lelongbid['norujukan'], 'filemarhun_id' => $index->id]); + // // $test = route('marhun.showphotomarhun', ['norujukan_sag' => $lelongbid['norujukan'], 'filemarhun_id' => $index->id]); + // $marhunPhotoService = new MarhunPhotoService(); + // $marhun_photo = $marhunPhotoService->get($lelongbid['norujukan'], $index); + // dd($marhun_photo); + // return $marhun_photo; + // } + // // dd($fileMarhun); if ($fileMarhun->isNotEmpty()) { $lelongbid['filemarhun'] = $fileMarhun; @@ -398,6 +417,14 @@ class LelongMobileController extends Controller } } + public function photoMarhun(Request $request) + { + $fileMarhun = FileMarhun::find($request->filemarhun_id); + $marhunPhotoService = new MarhunPhotoService(); + $marhun_photo = $marhunPhotoService->get($request->norujukan, $fileMarhun); + return base64_encode($marhun_photo); + } + public function lelongOnline() { $lelong = Lelong::where('sts_lelong', '=', 1)->first(); diff --git a/app/Http/Controllers/ReportCawanganController.php b/app/Http/Controllers/ReportCawanganController.php index a15d9e0e..3f36b454 100644 --- a/app/Http/Controllers/ReportCawanganController.php +++ b/app/Http/Controllers/ReportCawanganController.php @@ -154,7 +154,9 @@ class ReportCawanganController extends Controller $lelongid = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id') + ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') ->where('cawangan_lelong.lelong_id','=',$lelong_id) + ->where('cawangan.caw_code',$user->kodcaw) ->select('lelong_id','tarikh_lelong','lelong.fasa') ->groupBy('lelong_id') ->get()->toArray(); @@ -192,9 +194,6 @@ class ReportCawanganController extends Controller ]); - - - $pdf = PDF::loadView('pdf.laporanbrgleldetailscaw',compact('lelongs','arraycaw','total_nmarhun','total_berat','total_harga','total_hargaasas','arrayinfo' ))->setPaper('a4', 'potrait'); @@ -336,6 +335,7 @@ class ReportCawanganController extends Controller foreach($laporanlelong as $index1=>$laplelong) { + $margin = ($laplelong['pinjaman']/ $laplelong['nilaimarhun'])*100; $total_nmarhun = $total_nmarhun + $laplelong['nilaimarhun']; $total_pembiayaan = $total_pembiayaan + $laplelong['pinjaman']; @@ -344,6 +344,8 @@ class ReportCawanganController extends Controller $total_hargalelong = $total_hargalelong + $laplelong['hargabida']; $total_bakirugi = $total_bakirugi + $laplelong['baki']; $total_hargaasas = $total_hargaasas + $laplelong['hargaasas']; + + $laporanlelong[$index1]['margin']=$margin; } diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php index d438ee53..267b06c5 100644 --- a/app/Http/Controllers/ReportController.php +++ b/app/Http/Controllers/ReportController.php @@ -554,9 +554,9 @@ class ReportController extends Controller Public function lelongtebus ($lelong_id, $kodcaw){ - $total_berat = 0; - $total_hargaasas = 0; - $total_hargalelong = 0; + $total_nmarhun = 0; + $total_pinjaman = 0; + $total_upah = 0; $arrayinfocaw = []; @@ -584,16 +584,15 @@ class ReportController extends Controller ->get()->toArray(); // dd($laporantebus); - // foreach( $brglelpembida as $index1=>$totalbrglelpembida){ + foreach( $laporantebus as $index1=>$totalbrglelpembida){ - // $total_berat = $total_berat + $totalbrglelpembida['berat']; - // $total_hargaasas = $total_hargaasas + $totalbrglelpembida['hargaasas']; - // $total_hargalelong = $total_hargalelong + $totalbrglelpembida['hargabida']; - - // } + $total_nmarhun += $totalbrglelpembida['nilaimarhun']; + $total_pinjaman += $totalbrglelpembida['pinjaman']; + $total_upah += $totalbrglelpembida['upah']; + } - $pdf = PDF::loadView('pdf.pdflelongtebus',compact('lelong_id','info','laporantebus','total_berat','total_hargaasas','total_hargalelong','arrayinfocaw')) + $pdf = PDF::loadView('pdf.pdflelongtebus',compact('lelong_id','info','laporantebus','total_nmarhun','total_pinjaman','total_upah','arrayinfocaw')) ->setPaper('a4','potrait'); return $pdf->download('Laporan Barang Lelong Pembida.pdf'); diff --git a/app/Http/Controllers/SimulasiController.php b/app/Http/Controllers/SimulasiController.php index 8fd629f8..583f2f05 100644 --- a/app/Http/Controllers/SimulasiController.php +++ b/app/Http/Controllers/SimulasiController.php @@ -1137,8 +1137,15 @@ class SimulasiController extends Controller if($detail_sag['tempohbayar'] == $detail_sag['tempoh'] ){ $keuntungan = 0.00; }else{ - $keuntungan = bcdiv(($detail_sag['tempoh']-$detail_sag['tempohbayar'])*$detail_sag['kadarupah']/100*$detail_sag['bakipjm'],1,1)-$beza_keuntungan; - } + // $keuntungan = bcdiv(($detail_sag['tempoh']-$detail_sag['tempohbayar'])*$detail_sag['kadarupah']/100*$detail_sag['bakipjm'],1,1)-$beza_keuntungan; + $jbg = $detail_sag['tempoh']-$detail_sag['tempohbayar']; + $jbg2 = 12- $detail_sag['tempohbayar']; + if($detail_sag['tempoh'] <= '12.00'){ + $keuntungan = bcdiv(($jbg)*$detail_sag['kadarupah']/100*$detail_sag['bakipjm'],1,1)-$beza_keuntungan; + }else{ + $keuntungan = bcdiv(($jbg2)*$detail_sag['kadarupah']/100*$detail_sag['bakipjm'],1,1)-$beza_keuntungan; + } + } $sumhargaasas = 0; $simulasibidmarhun = SimulasiBidMarhun::where('simulasibid_id','=',$bid['id'])->get(); @@ -1719,8 +1726,14 @@ class SimulasiController extends Controller $beza_keuntungan = $total_untung_asal - $total_untung_rebet; // dd($beza_keuntungan); - $keuntungan = bcdiv(($surats['tempoh']-$surats['tempohbayar'])*$surats['kadarupah']/100*$surats['bakipjm'],1,1)-$beza_keuntungan; - + // $keuntungan = bcdiv(($surats['tempoh']-$surats['tempohbayar'])*$surats['kadarupah']/100*$surats['bakipjm'],1,1)-$beza_keuntungan; + $jbg = $surats['tempoh']-$surats['tempohbayar']; + $jbg2 = 12- $surats['tempohbayar']; + if($surats['tempoh'] <= '12.00'){ + $keuntungan = bcdiv(($jbg)*$surats['kadarupah']/100*$surats['bakipjm'],1,1)-$beza_keuntungan; + }else{ + $keuntungan = bcdiv(($jbg2)*$surats['kadarupah']/100*$surats['bakipjm'],1,1)-$beza_keuntungan; + } // dd($surats['hargajualan']); $ktlhbyr = $surats['hargajualan']-$surats['bakihargajualan']; // dd($ktlhbyr); @@ -1855,7 +1868,14 @@ class SimulasiController extends Controller $total_untung_rebet = TransaksiKeuntungan::on('main')->where('norujukan','=',$data['norujukan'])->sum('keuntungan_rebet'); $total_untung_asal = TransaksiKeuntungan::on('main')->where('norujukan','=',$data['norujukan'])->sum('bayaran_keuntungan'); $beza_keuntungan = $total_untung_asal - $total_untung_rebet; - $keuntungan = bcdiv(($data['tempoh']-$data['tempohbayar'])*$data['kadarupah']/100*$data['bakipjm'],1,1)-$beza_keuntungan; + + $jbg = $data['tempoh']-$data['tempohbayar']; + $jbg2 = 12- $data['tempohbayar']; + if($data['tempoh'] <= '12.00'){ + $keuntungan = bcdiv(($jbg)*$data['kadarupah']/100*$data['bakipjm'],1,1)-$beza_keuntungan; + }else{ + $keuntungan = bcdiv(($jbg2)*$data['kadarupah']/100*$data['bakipjm'],1,1)-$beza_keuntungan; + } // dd($keuntungan); //update dalam simulasibid $updatetempoh = SimulasiBid::where('norujukan', $data['norujukan']) @@ -1919,6 +1939,39 @@ class SimulasiController extends Controller $loguser->nota = ' LELONG TEBUS '.$simulasi_id; $loguser->save(); } + else{ + //kemaskini keuntungan + $total_untung_rebet = TransaksiKeuntungan::on('main')->where('norujukan','=',$data['norujukan'])->sum('keuntungan_rebet'); + $total_untung_asal = TransaksiKeuntungan::on('main')->where('norujukan','=',$data['norujukan'])->sum('bayaran_keuntungan'); + $beza_keuntungan = $total_untung_asal - $total_untung_rebet; + + $jbg = $data['tempoh']-$data['tempohbayar']; + $jbg2 = 12- $data['tempohbayar']; + if($data['tempoh'] <= '12.00'){ + $keuntungan = bcdiv(($jbg)*$data['kadarupah']/100*$data['bakipjm'],1,1)-$beza_keuntungan; + }else{ + $keuntungan = bcdiv(($jbg2)*$data['kadarupah']/100*$data['bakipjm'],1,1)-$beza_keuntungan; + } + // dd($keuntungan); + //update dalam simulasibid + $updatetempoh = SimulasiBid::where('norujukan', $data['norujukan']) + ->where('simulasi_id', $simulasi_id) + ->first(); + $updatetempoh->jbg = $data['tempoh']; + $updatetempoh->pinjaman = $data['bakipjm']; + $updatetempoh->bakiupah = bcdiv($keuntungan,1,1); + $updatetempoh->update(); + + //insert loguser + $loguser = new LogUser; + $loguser->user_id = $user->id; + $loguser->date = $currentdate; + $loguser->username = $user->username; + $loguser->nama_user = $user->name; + $loguser->norujukan = $data['norujukan']; + $loguser->nota = $simulasi_id.' Kemaskini Tempoh/Bakipjm/Keuntungan' ; + $loguser->save(); + } $date = Carbon::now()->toDateTimeString(); $simulasi = Simulasi::where('id','=',$simulasi_id)->first(); $simulasi->masakemaskini_data = $date; @@ -1971,8 +2024,16 @@ class SimulasiController extends Controller $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; + + // $keuntungan = bcdiv(($listing['tempoh']-$listing['tempohbayar'])*$listing['kadarupah']/100*$listing['bakipjm'],1,1)-$beza_keuntungan; // dd($keuntungan); + $jbg = $listing['tempoh']-$listing['tempohbayar']; + $jbg2 = 12- $listing['tempohbayar']; + if($listing['tempoh'] <= '12.00'){ + $keuntungan = bcdiv(($jbg)*$listing['kadarupah']/100*$listing['bakipjm'],1,1)-$beza_keuntungan; + }else{ + $keuntungan = bcdiv(($jbg2)*$listing['kadarupah']/100*$listing['bakipjm'],1,1)-$beza_keuntungan; + } $listsag[$index]['ktlhbyr'] = $ktlhbyr; $listsag[$index]['keuntungan'] = $keuntungan; } @@ -2370,8 +2431,14 @@ class SimulasiController extends Controller $beza_keuntungan = $total_untung_asal - $total_untung_rebet; // dd($beza_keuntungan); - $keuntungan = bcdiv(($surats['tempoh']-$surats['tempohbayar'])*$surats['kadarupah']/100*$surats['bakipjm'],1,1)-$beza_keuntungan; + $jbg = $surats['tempoh']-$surats['tempohbayar']; + $jbg2 = 12- $surats['tempohbayar']; + if($surats['tempoh'] <= '12.00'){ + $keuntungan = bcdiv(($jbg)*$surats['kadarupah']/100*$surats['bakipjm'],1,1)-$beza_keuntungan; + }else{ + $keuntungan = bcdiv(($jbg2)*$surats['kadarupah']/100*$surats['bakipjm'],1,1)-$beza_keuntungan; + } // dd($surats['hargajualan']); $ktlhbyr = $surats['hargajualan']-$surats['bakihargajualan']; // dd($ktlhbyr); @@ -2470,8 +2537,14 @@ class SimulasiController extends Controller $beza_keuntungan = $total_untung_asal - $total_untung_rebet; // dd($beza_keuntungan); - $keuntungan = bcdiv(($surats['tempoh']-$surats['tempohbayar'])*$surats['kadarupah']/100*$surats['bakipjm'],1,1)-$beza_keuntungan; - + // $keuntungan = bcdiv(($surats['tempoh']-$surats['tempohbayar'])*$surats['kadarupah']/100*$surats['bakipjm'],1,1)-$beza_keuntungan; + $jbg = $surats['tempoh']-$surats['tempohbayar']; + $jbg2 = 12- $surats['tempohbayar']; + if($surats['tempoh'] <= '12.00'){ + $keuntungan = bcdiv(($jbg)*$surats['kadarupah']/100*$surats['bakipjm'],1,1)-$beza_keuntungan; + }else{ + $keuntungan = bcdiv(($jbg2)*$surats['kadarupah']/100*$surats['bakipjm'],1,1)-$beza_keuntungan; + } // dd($surats['hargajualan']); $ktlhbyr = $surats['hargajualan']-$surats['bakihargajualan']; // dd($ktlhbyr); diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index 1f65d8a3..6221e573 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -44,7 +44,7 @@ class Kernel extends HttpKernel 'api' => [ // \Laravel\Sanctum\Http\Middleware\EnsureFrontendRequestsAreStateful::class, \Laravel\Sanctum\Http\Middleware\EnsureFrontendRequestsAreStateful::class, - 'throttle:api', + // 'throttle:api', \Illuminate\Routing\Middleware\SubstituteBindings::class, ], ]; diff --git a/app/Services/MarhunPhotoService.php b/app/Services/MarhunPhotoService.php index 1cdac2a8..d86ea30e 100644 --- a/app/Services/MarhunPhotoService.php +++ b/app/Services/MarhunPhotoService.php @@ -92,4 +92,23 @@ class MarhunPhotoService header('Content-Disposition: inline; filename="'.basename($filePath).'"'); readfile($filePath); } + + public function get($norujukan_sag, $marhun) + { + $lelongbidmarhun_id = $marhun->lelongbidmarhun_id; + + $photo_type_name = $marhun->photo_type === 1 ? 'overall_photo' : 'by_marhun_photo'; + + $directory = "/{$norujukan_sag}/{$photo_type_name}/"; + $imageExtension = $marhun->file_type; + + $marhunImageFileName = "overall.{$imageExtension}"; + + if (!empty($lelongbidmarhun_id)) { + $marhunImageFileName = "$lelongbidmarhun_id.$imageExtension"; + } + + return Storage::disk('marhun')->get("{$directory}${marhunImageFileName}"); + + } } diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index 12559f3e..83c017f1 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -27,7 +27,7 @@

ArrahnBid

-

Bida Harga Lelong Emas Anda Sekarang Secara Atas Talian

+

Sistem Lelongan Atas Talian

@@ -67,9 +67,9 @@ {{ $message }} @enderror - + {{-- Sila Baca Terma Dan Syarat Terlebih Dahulu Klik Disini - + --}}
@@ -92,7 +92,7 @@
-

© Sistem Lelong. All rights reserved

+

ArrahnBid © Permodalan Kelantan Berhad

diff --git a/resources/views/includes/sidebar.blade.php b/resources/views/includes/sidebar.blade.php index 3bdea217..6646f801 100644 --- a/resources/views/includes/sidebar.blade.php +++ b/resources/views/includes/sidebar.blade.php @@ -163,7 +163,7 @@