From fdc7e590848a27722b9a3cc9b23ae46f99a48d11 Mon Sep 17 00:00:00 2001 From: Amirah22 <94591077+Amirah22@users.noreply.github.com> Date: Tue, 26 Apr 2022 15:01:17 +0800 Subject: [PATCH 1/4] update index -> laporan --- app/Http/Controllers/AccountController.php | 2 +- app/Http/Controllers/LelongController.php | 58 +++++- app/Http/Controllers/MarhunController.php | 173 ++++++++---------- app/Http/Controllers/SimulasiController.php | 6 +- .../lelong/lapbrglelpembidaindex.blade.php | 20 +- .../views/lelong/laplelongindex.blade.php | 22 ++- .../views/lelong/laporanbidaanindex.blade.php | 22 ++- 7 files changed, 177 insertions(+), 126 deletions(-) diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index bfb2a048..334b7f6e 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/AccountController.php @@ -128,7 +128,7 @@ class AccountController extends Controller ->where('lelongbid.lelong_id', $request->lelong_id) ->where('lelongbidder.user_id', $request->user_id) ->where('lelongbidder.status_bidder', 1) - ->where('payment.status_payment_opt', '3,2') + ->where('payment.status_payment_opt', '3,2') ->where('lelongbidder.status_payment', 2) ->select( 'lelongbid.id as lelongbid_id', diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 5eb15738..0241fa70 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -984,14 +984,26 @@ class LelongController extends Controller public function lapbidaanpembidaindex (Request $request){ + $arraydetails = []; + $lelongid = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id') + ->select('lelong_id','tarikh_lelong') + ->groupBy('lelong_id') + ->get() + ->toArray(); - $lelongid = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id') - ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') - ->get(); + foreach($lelongid as $laporan){ + + $details = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') + ->where('lelong_id',$laporan['lelong_id']) + ->get() + ->toArray(); + array_push($arraydetails,['laporan' => $laporan,'details' => $details]); + + } - return view('lelong.laporanbidaanindex',compact('lelongid')); + return view('lelong.laporanbidaanindex',compact('lelongid','arraydetails')); } @@ -1068,12 +1080,25 @@ class LelongController extends Controller } Public function laplelongindex (Request $request){ + + $arraydetails =[]; $lelongid = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id') - ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') - ->get(); + ->select('lelong_id','tarikh_lelong') + ->groupBy('lelong_id') + ->get() + ->toArray(); - return view('lelong.laplelongindex',compact('lelongid')); + foreach($lelongid as $laporan){ + + $details = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') + ->where('lelong_id',$laporan['lelong_id']) + ->get() + ->toArray(); + array_push($arraydetails,['laporan' => $laporan,'details' => $details]); + } + + return view('lelong.laplelongindex',compact('lelongid','arraydetails')); } @@ -1168,11 +1193,24 @@ class LelongController extends Controller Public function lapbrglelpembidaindex (Request $request){ + $arraydetails = []; + $lelongid = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id') - ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') - ->get(); + ->select('lelong_id','tarikh_lelong') + ->groupBy('lelong_id') + ->get() + ->toArray(); - return view ('lelong.lapbrglelpembidaindex',compact('lelongid')); + foreach($lelongid as $laporan){ + + $details = CawanganLelong ::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') + ->where('lelong_id',$laporan['lelong_id']) + ->get() + ->toArray(); + array_push($arraydetails, ['laporan' =>$laporan,'details' =>$details]); + } + + return view ('lelong.lapbrglelpembidaindex',compact('lelongid','arraydetails')); } diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php index aeab4529..966404d7 100644 --- a/app/Http/Controllers/MarhunController.php +++ b/app/Http/Controllers/MarhunController.php @@ -521,83 +521,72 @@ class MarhunController extends Controller $currentdate = Carbon::now(); $currentdate = $currentdate->toDateTimeString(); - $pengesahan = Pengesahan::where('norujukan', $request->norujukan)->where('lelong_id', $request->lelong_id)->get(); - + $pengesahan = Pengesahan::where('norujukan', $request->norujukan) + ->first(); + + $pengesahan->id = $pengesahan['id'] ; + $pengesahan->disahkan_oleh = $user['id']; + $pengesahan->disahkan_pada = $currentdate; + $pengesahan->save(); + // dd($pengesahan); + $lelongbid = LelongBid::where('id', $pengesahan->lelongbid_id)->get(); + $lelongbidmarhun = LelongBidMarhun::where('lelongbid_id', $pengesahan->lelongbid_id)->get(); + if($request->jenis_button == "terima") { - foreach($pengesahan as $index1=>$sah) - { - $savepengesahan = Pengesahan::where('id', $sah['id']) - ->first(); - $savepengesahan->disahkan_oleh = $user['id']; - $savepengesahan->disahkan_pada = $currentdate; - $savepengesahan->status = 1; - $savepengesahan->save(); - - $lelongbid = LelongBid::where('id', $sah->lelongbid_id)->get(); - $lelongbidmarhun = LelongBidMarhun::where('lelongbid_id', $sah->lelongbid_id)->get(); - - $lelongbidmarhuns = LelongBidMarhun::join('pengesahan', 'lelongbidmarhun.lelongbid_id', '=', 'pengesahan.lelongbid_id') - ->where('pengesahan.lelongbid_id', $sah->lelongbid_id) - ->where('pengesahan.id', $sah->id) - ->get(); - - $total_berat = 0; - $total_hargaasas = 0; - foreach($lelongbidmarhuns as $index2=>$bidmarhuns) - { - if($bidmarhuns->status_ubah == 3) - { - $bidmarhuns->delete(); - } - else - { - // - } - - $lelongbids = LelongBid::where('id', $sah->lelongbid_id)->first(); - $txtmarhun = ",1 " . $bidmarhuns->marhun ; - $lelongbids->marhun = str_replace( $txtmarhun,"", $lelongbid[0]['marhun']); - $lelongbids->berat = $total_berat += $bidmarhuns->berat ; - $lelongbids->hargaasas = $total_hargaasas += $bidmarhuns->hargaasas; - $lelongbids->save(); - - } + $lelongbidmarhuns = LelongBidMarhun::join('pengesahan', 'lelongbidmarhun.lelongbid_id', '=', 'pengesahan.lelongbid_id') + ->where('pengesahan.lelongbid_id', $pengesahan->lelongbid_id) + ->where('pengesahan.id', $pengesahan->id) + ->get(); + dd($lelongbidmarhuns['marhun']); + foreach($lelongbidmarhuns as $bidmarhuns) + { + if($bidmarhuns->status_ubah == 3) + { + $bidmarhuns->delete(); + } + else + { + // + } } + $pengesahan = Pengesahan::join('lelongbidmarhun', 'pengesahan.lelongbid_id', '=', 'lelongbidmarhun.lelongbid_id') + ->where('pengesahan.lelongbid_id', $pengesahan->lelongbid_id) + ->select('pengesahan.id as pengesahan_id') + ->first(); + + $marhun = LelongBidMarhun::join('lelongbid', 'lelongbidmarhun.lelongbid_id', '=', 'lelongbid.id') + ->where('lelongbid_id','=',$pengesahan->lelongbid_id) + ->get(); + + $lelongbid = LelongBid::where('id', $pengesahan->lelongbid_id)->first(); + $txtmarhun = ",1 " . $lelongbidmarhuns->marhun ; + $lelongbid->marhun = str_replace( $txtmarhun,"",$lelongbid->marhun); + $lelongbid->berat = $lelongbid->berat - $lelongbidmarhuns->berat; + $lelongbid->hargaasas = $lelongbid->hargaasas - $lelongbidmarhuns->hargaasas; + $lelongbid->save(); + // $this->pcdelete($request->pengesahan_id, $pengesahan->lelongbid_id); } else if($request->jenis_button == "tangguhlelong") { - foreach($pengesahan as $index1=>$sah) - { - $savepengesahan = Pengesahan::where('id', $sah['id']) - ->first(); - $savepengesahan->disahkan_oleh = $user['id']; - $savepengesahan->disahkan_pada = $currentdate; - $savepengesahan->status = 1; - $savepengesahan->save(); - - $lelongbidasal = LelongBid::where('id', $sah['lelongbid_id'])->first(); - - //add into table tangguhlelong - $tangguhlelong = new TangguhLelong; - $tangguhlelong->lelong_id = $sah->lelong_id; - $tangguhlelong->lelongbid_id = $sah->lelongbid_id; - $tangguhlelong->norujukan = $sah->norujukan; - $tangguhlelong->pinjaman = $lelongbidasal['pinjaman']; - $tangguhlelong->tarikhtangguh = $currentdate; - $tangguhlelong->ditangguh_oleh = $user->id; - $tangguhlelong->ditangguh_pada = $currentdate; - $tangguhlelong->nota = $request->nota; - $tangguhlelong->save(); - - $marhundelete = LelongBid::where('id', $sah->lelongbid_id)->delete(); - } - + //add into table tangguhlelong + $tangguhlelong = new TangguhLelong; + $tangguhlelong->lelong_id = $pengesahan->lelong_id; + $tangguhlelong->lelongbid_id = $pengesahan->lelongbid_id; + $tangguhlelong->norujukan = $pengesahan->norujukan; + $tangguhlelong->pinjaman = $lelongbid[0]['pinjaman']; + $tangguhlelong->tarikhtangguh = $currentdate; + $tangguhlelong->ditangguh_oleh = $user->id; + $tangguhlelong->ditangguh_pada = $currentdate; + $tangguhlelong->nota = $request->nota; + $tangguhlelong->save(); + // dd($tangguhlelong); + $marhundelete = LelongBid::where('id', $pengesahan->lelongbid_id)->delete(); } @@ -641,48 +630,48 @@ class MarhunController extends Controller } + public function pcdelete($id, $lelongbid_id) + { + $lelongbidmarhun = LelongBidMarhun::where('lelongbid_id', $lelongbid_id)->first(); + $pengesahan = Pengesahan::join('lelongbidmarhun', 'pengesahan.lelongbid_id', '=', 'lelongbidmarhun.lelongbid_id') + ->where('pengesahan.lelongbid_id', $lelongbid_id) + ->select('pengesahan.id as pengesahan_id') + ->first(); + + $marhun = LelongBidMarhun::join('lelongbid', 'lelongbidmarhun.lelongbid_id', '=', 'lelongbid.id') + ->where('lelongbid_id','=',$lelongbid_id) + ->get(); + + $lelongbid = LelongBid::where('id', $lelongbid_id)->first(); + $txtmarhun = ",1 " . $lelongbidmarhun->marhun ; + $lelongbid->marhun = str_replace( $txtmarhun,"",$lelongbid->marhun); + $lelongbid->berat = $lelongbid->berat - $lelongbidmarhun->berat_emastambahan; + $lelongbid->hargaasas = $lelongbid->hargaasas - $lelongbidmarhun->harga_asastambahan; + $lelongbid->save(); + + } + public function senarailelong() { - $arrayinfo = []; - $lelong = Lelong::where('sts_lelong', 0) - ->get()->toArray(); + ->get(); - foreach($lelong as $details) - { - $detailsinfo = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') - ->where('lelong_id', $details['id']) - ->get() - ->toArray(); - - array_push($arrayinfo,['detail'=>$details, 'detailsinfo'=>$detailsinfo]); - } - - return view('pengesahan.senarailelong',compact('lelong', 'arrayinfo')); + return view('pengesahan.senarailelong',compact('lelong')); } public function senaraitangguhlelong($id) { - $tangguhlelong = TangguhLelong::join('lelong', 'tangguhlelong.lelong_id', 'lelong.id') + $tangguhlelong = TangguhLelong::join('lelongbid', 'tangguhlelong.lelongbid_id', '=', 'lelongbid.id') ->where('tangguhlelong.lelong_id', $id) ->get(); - foreach($tangguhlelong as $index1=>$tanguhlel) - { - $getkodcaw = LelongBid::join('cawangan', 'lelongbid.kodcaw', '=', 'cawangan.caw_code') - ->where('lelong_id', $id) - ->first(); - - $tangguhlelong[$index1]['nama_caw'] = $getkodcaw->caw_name; - } - return view('pengesahan.senaraitangguhlelong',compact('tangguhlelong','id')); } public function lelbidmarhun($id, $norujukan) { - $marhuns = TangguhLelong::join('gadaimarhun', 'tangguhlelong.norujukan', '=', 'gadaimarhun.norujukan') - ->join('gadai', 'tangguhlelong.norujukan', '=', 'gadai.norujukan') + $marhuns = LelongBidMarhun::join('tangguhlelong', 'lelongbidmarhun.lelongbid_id', '=', 'tangguhlelong.lelongbid_id') + ->where('tangguhlelong.lelong_id', $id) ->where('tangguhlelong.norujukan', $norujukan) ->get(); diff --git a/app/Http/Controllers/SimulasiController.php b/app/Http/Controllers/SimulasiController.php index ac6ca11d..1b35711f 100644 --- a/app/Http/Controllers/SimulasiController.php +++ b/app/Http/Controllers/SimulasiController.php @@ -460,6 +460,10 @@ class SimulasiController extends Controller $data = Simulasi::where('simulasi.id','=',$simulasi_id) ->get(); + + $simulasi = new Simulasi; + $simulasi->harga_emas_asas = $request->hargaasas; + $simulasi->save(); } @@ -479,7 +483,7 @@ class SimulasiController extends Controller 'total23k', 'total22K', 'total21K', - 'total20K', + 'total20K', 'total18Kp', 'total18K', 'total14Kp', diff --git a/resources/views/lelong/lapbrglelpembidaindex.blade.php b/resources/views/lelong/lapbrglelpembidaindex.blade.php index 3ec908ab..8e2d64e4 100644 --- a/resources/views/lelong/lapbrglelpembidaindex.blade.php +++ b/resources/views/lelong/lapbrglelpembidaindex.blade.php @@ -15,7 +15,7 @@ - + @@ -24,14 +24,20 @@ - @foreach ($lelongid as $info) + @foreach ($arraydetails as $info) - - - - + + + + + + @endforeach diff --git a/resources/views/lelong/laplelongindex.blade.php b/resources/views/lelong/laplelongindex.blade.php index b08607c1..5ec3a2fa 100644 --- a/resources/views/lelong/laplelongindex.blade.php +++ b/resources/views/lelong/laplelongindex.blade.php @@ -15,7 +15,7 @@
Bil Lelong ID Cawangan Tarikh Lelong
{{ $info->lelong_id}}{{ $info->caw_name}}{{ $info->tarikh_lelong }}{{$loop->iteration}}{{ $info['laporan']['lelong_id']}} + @foreach($info['details'] as $details) + {{ $details['caw_name']}}
+ @endforeach + 		{{ $info['laporan']['tarikh_lelong'] }} - +
- + @@ -24,15 +24,21 @@ - @foreach ($lelongid as $bid) + @foreach ($arraydetails as $bid) - - - - - + + + + + @endforeach diff --git a/resources/views/lelong/laporanbidaanindex.blade.php b/resources/views/lelong/laporanbidaanindex.blade.php index 3d2a68e5..9742f2bd 100644 --- a/resources/views/lelong/laporanbidaanindex.blade.php +++ b/resources/views/lelong/laporanbidaanindex.blade.php @@ -4,6 +4,7 @@
+

Laporan Nama Pembida

@if ($message = Session::get('success'))
@@ -15,7 +16,7 @@
Bil Lelong ID Cawangan Tarikh Lelong
{{ $bid->lelong_id}}{{ $bid->caw_name}}{{ $bid->tarikh_lelong }} - + {{$loop->iteration}}{{ $bid['laporan']['lelong_id']}} + @foreach($bid['details'] as $details) + {{ $details['caw_name']}}
+ @endforeach + 		{{ $bid['laporan']['tarikh_lelong'] }} + +
- + @@ -24,14 +25,21 @@ - @foreach ($lelongid as $bid) + @foreach ($arraydetails as $bid) - - - - + + + + + + @endforeach From be64ed3a93a5b31dffa79c7e49d9d0ef04a818ac Mon Sep 17 00:00:00 2001 From: Nur Izzati Zulkifli Date: Wed, 27 Apr 2022 10:25:02 +0800 Subject: [PATCH 2/4] new function importdata from live to master --- app/Http/Controllers/ImportDataController.php | 165 ++++++++++++++++++ app/Http/Controllers/PenggunaController.php | 9 +- app/Http/Controllers/TamatKontController.php | 12 +- config/app.php | 1 + ...21_12_13_053311_create_cawangans_table.php | 2 + database/seeders/RolesSeeder.php | 5 + .../importdata/importdatacawangan.blade.php | 38 ++++ .../views/importdata/listcawangan.blade.php | 163 +++++++++++++++++ .../views/importdata/showsenarai.blade.php | 108 ++++++++++++ resources/views/includes/sidebar.blade.php | 3 + resources/views/jananotis/tempbycaw.blade.php | 25 ++- .../views/pengurusanpengguna/index.blade.php | 15 +- routes/web.php | 8 + 13 files changed, 542 insertions(+), 12 deletions(-) create mode 100644 app/Http/Controllers/ImportDataController.php create mode 100644 resources/views/importdata/importdatacawangan.blade.php create mode 100644 resources/views/importdata/listcawangan.blade.php create mode 100644 resources/views/importdata/showsenarai.blade.php diff --git a/app/Http/Controllers/ImportDataController.php b/app/Http/Controllers/ImportDataController.php new file mode 100644 index 00000000..2a2ffb1d --- /dev/null +++ b/app/Http/Controllers/ImportDataController.php @@ -0,0 +1,165 @@ +first(); + + return view('importdata.showsenarai',compact('caw')); + } + + public function importdatagadai($kodcaw) + { + // dd($kodcaw); + $caw = Cawangan::all(); + if (Gadai::where('kodcaw', '=', $kodcaw)->count() == null) + { + $results = DB::select("SELECT * FROM cawangan where caw_code = '$kodcaw' "); + //dd($results); + foreach($results as $row) + { + $caw_ip = $row->caw_ip; + $caw_dbuser = $row->caw_dbuser; + $caw_dbpass = $row->caw_dbpass; + $caw_dbname = $row->caw_dbname; + $caw_name = $row->caw_name; + $caw_id = $row->id; + + // dd($caw_ip); + + $db = mysqli_connect($caw_ip,$caw_dbuser, $caw_dbpass); + if (!$db) + { + echo "

Server Down: $caw_name

"; + continue; + die('Could not connect: ' . mysqli_error()); + } + mysqli_select_db($db,$caw_dbname); + + $count = 0; + $result=mysqli_query($db,"SELECT * FROM gadai where sttebus = '' and upah12 is NOT NULL"); + while($row_gadai = mysqli_fetch_array($result)) + { + + $count++; + $kodcaw = $row_gadai['kodcaw']; + $norujukan = $row_gadai['norujukan']; + $nopelanggan = $row_gadai['nopelanggan']; + $nokp = $row_gadai['nokp']; + $t_gadai = $row_gadai['t_gadai']; + $masa = $row_gadai['masa']; + $sirig = $row_gadai['sirig']; + $nilaimarhun = $row_gadai['nilaimarhun']; + $berat = $row_gadai['berat']; + $pinjaman = $row_gadai['pinjaman']; + $kadarupah = $row_gadai['kadarupah']; + $tempoh = $row_gadai['tempoh']; + $t_matang = $row_gadai['t_matang']; + $t_matang1 = $row_gadai['t_matang1']; + $teller = $row_gadai['teller']; + $bakipjm = $row_gadai['bakipjm']; + $bakiupah = $row_gadai['bakiupah']; + $marhun = $row_gadai['marhun']; + $taglel = $row_gadai['taglel']; + $ansakhir = $row_gadai['ansakhir']; + $t_update = $row_gadai['t_update']; + $tagtbaki = $row_gadai['tagtbaki']; + $penilai = $row_gadai['penilai']; + $percentpinj = $row_gadai['percentpinj']; + $tagpalsu = $row_gadai['tagpalsu']; + $semakbarcode = $row_gadai['semakbarcode']; + $historygadaian = $row_gadai['historygadaian']; + $upah12 = $row_gadai['upah12']; + $hargajualan = $row_gadai['hargajualan']; + $bakihargajualan = $row_gadai['bakihargajualan']; + $tempohbayar = $row_gadai['tempohbayar']; + + DB::insert("INSERT INTO elelong.gadai (kodcaw,norujukan,nopelanggan,nokp,t_gadai,masa,sirig,nilaimarhun,berat,pinjaman,sttebus,tagcetak,kadarupah,tempoh,t_matang,t_matang1,teller,bakipjm,bakiupah,marhun,taglel,ansakhir,t_update,tagtbaki,penilai,percentpinj,tagpalsu,semakbarcode,historygadaian,upah12,hargajualan,bakihargajualan,tempohbayar) + VALUES ('$kodcaw','$norujukan','$nopelanggan','$nokp','$t_gadai','$masa','$sirig','$nilaimarhun','$berat','$pinjaman', '','','$kadarupah','$tempoh','$t_matang','$t_matang1','$teller','$bakipjm','$bakiupah','$marhun','$taglel','$ansakhir','$t_update','$tagtbaki','$penilai','$percentpinj','$tagpalsu','$semakbarcode','$historygadaian','$upah12','$hargajualan','$bakihargajualan','$tempohbayar')"); + + //untuk gadaimarhun + $result1=mysqli_query($db,"SELECT * FROM marhun where norujukan = '$norujukan'"); + while($row_tender1 = mysqli_fetch_array($result1)) + { + + $kodcaw1 = $row_tender1['kodcaw']; + $norujukan1 = $row_tender1['norujukan']; + $bil1 = $row_tender1['bil']; + $t_gadai1 = $row_tender1['t_gadai']; + $marhun1 = $row_tender1['marhun']; + $nota1 = $row_tender1['nota']; + $karat1 = $row_tender1['karat']; + $berat1 = $row_tender1['berat']; + $harga1 = $row_tender1['harga']; + $n_marhun1 = $row_tender1['n_marhun']; + //$hargaasas1 = $row_tender1['hargaasas']; + //$batch_no1 = $row_tender1['batch_no']; + + DB::insert("INSERT INTO elelong.gadaimarhun (kodcaw,norujukan,t_gadai,bil,marhun,nota,karat,berat,harga,n_marhun) + VALUES ('$kodcaw1','$norujukan1','$t_gadai1','$bil1','$marhun1','$nota1','$karat1','$berat1','$harga1','$n_marhun1')"); + + } + + } + return redirect()->route('importdata.listcawangan') + ->with('success','Data '.$caw_name.' berjaya import'); + + } + }else{ + return redirect()->route('importdata.listcawangan') + ->with('success','Data '.$kodcaw.' Ini Telah Wujud Sila Hapus Data Dahulu'); + } + + + } + public function hapusdatacawangan($kodcaw) + { + $caw = Gadai::where('kodcaw','=',$kodcaw); + $caw->delete(); + + $cawmarhun = GadaiMarhun::where('kodcaw','=',$kodcaw); + $cawmarhun->delete(); + // dd($cawmarhun); + return redirect()->route('importdata.listcawangan') + ->with('success','Data '.$kodcaw.' Berjaya Dihapuskan'); + } + + + + +} diff --git a/app/Http/Controllers/PenggunaController.php b/app/Http/Controllers/PenggunaController.php index b1b0ecb4..ad9ec588 100644 --- a/app/Http/Controllers/PenggunaController.php +++ b/app/Http/Controllers/PenggunaController.php @@ -63,18 +63,19 @@ class PenggunaController extends Controller $currentdate = $currentdate->toDateTimeString(); //dd($request->all()); $validator = Validator::make($request->all(), [ - 'email' => 'required|string|unique:users|email' + 'email' => 'required|string|unique:users|email', + 'username' => 'required|string|unique:users' ]); if ($validator->fails()) { $errors = [ 'success' => "error", - //'message' => $validator->errors() + 'message' => $validator->errors() ]; return redirect()->route('pengguna.index') - ->with('success', 'Sila Masukkan Email Yang Sah'); } + ->with('message', 'Sila Masukkan Email Yang Sah'); } $user = new User; $user->name = $request->name; @@ -111,7 +112,7 @@ class PenggunaController extends Controller array_push($arraytaraf,$taraf); } } - // dd($arraytaraf); + //dd($arraytaraf); $user->syncRoles($arraytaraf); if($request->status == true) diff --git a/app/Http/Controllers/TamatKontController.php b/app/Http/Controllers/TamatKontController.php index 11b9c9a8..b79e75c9 100644 --- a/app/Http/Controllers/TamatKontController.php +++ b/app/Http/Controllers/TamatKontController.php @@ -206,14 +206,18 @@ class TamatKontController extends Controller ->first(); $tarikh_lelong = Carbon::parse($t_lelong); - $t_anggaran = ($tarikh_lelong->subMonths(1))->toDateString(); + // $t_anggaran = ($tarikh_lelong->subMonths(1))->toDateString(); + $t_lelongdisplay = $tarikh_lelong->format('d-m-Y'); + $t_anggaran = ($tarikh_lelong->subDays(20))->format('d/m/Y'); + $t_daftarlelong = ($tarikh_lelong->subMonths(1))->format('d/m/Y'); + foreach($getsurat as $index1=>$surats) { $senarai = Gadai::join('cawangan', 'gadai.kodcaw', '=', 'cawangan.caw_code') ->where('norujukan', $surats['norujukan']) ->get(); - dd($senarai); + //dd($senarai); $getsurat[$index1]['list_norujukan'] = $senarai; } @@ -226,7 +230,9 @@ class TamatKontController extends Controller 't_lelong', 't_gadais', 't_anggaran', - 'tarikh_lelong' + 'tarikh_lelong', + 't_daftarlelong', + 't_lelongdisplay' )); } diff --git a/config/app.php b/config/app.php index b10360d0..edd35c19 100644 --- a/config/app.php +++ b/config/app.php @@ -231,6 +231,7 @@ return [ 'Validator' => Illuminate\Support\Facades\Validator::class, 'View' => Illuminate\Support\Facades\View::class, 'PDF' => Barryvdh\DomPDF\Facade::class, + 'Input' => Illuminate\Support\Facades\Input::class, ], diff --git a/database/migrations/2021_12_13_053311_create_cawangans_table.php b/database/migrations/2021_12_13_053311_create_cawangans_table.php index 08b9e31f..f181a278 100644 --- a/database/migrations/2021_12_13_053311_create_cawangans_table.php +++ b/database/migrations/2021_12_13_053311_create_cawangans_table.php @@ -218,7 +218,9 @@ class CreateCawangansTable extends Migration Schema::create('gadaimarhun', function (Blueprint $table) { $table->bigIncrements('id'); + $table->string('kodcaw')->nullable(); $table->string('norujukan'); + $table->date('t_gadai')->nullable();; $table->decimal('bil', $precision = 3, $scale = 2); $table->string('marhun'); $table->string('nota'); diff --git a/database/seeders/RolesSeeder.php b/database/seeders/RolesSeeder.php index 09d9ee98..5d2ea98b 100644 --- a/database/seeders/RolesSeeder.php +++ b/database/seeders/RolesSeeder.php @@ -115,6 +115,10 @@ class RolesSeeder extends Seeder 'name' => 'notistamatkontrak', 'description' => 'Notis 30 Hari Sebelum Tamat Kontrak' ]); + Permission::create([ + 'name' => 'importdata', + 'description' => 'Import Data Cawangan Dari LIVE to Master' + ]); //account @@ -170,6 +174,7 @@ class RolesSeeder extends Seeder $role6->givePermissionTo('pengesahan'); $role6->givePermissionTo('notistamatkontrak'); $role6->givePermissionTo('kemaskinihargaasas'); + $role6->givePermissionTo('importdata'); $role7 = Role::create(['name' => 'account']); $role7->givePermissionTo('pengesahanbayaran'); diff --git a/resources/views/importdata/importdatacawangan.blade.php b/resources/views/importdata/importdatacawangan.blade.php new file mode 100644 index 00000000..e58c629d --- /dev/null +++ b/resources/views/importdata/importdatacawangan.blade.php @@ -0,0 +1,38 @@ +@extends('layouts.app') + +@section('content') +
+
+
+ @if ($message = Session::get('failed')) +
+

{{ $message }}

+
+ @endif +

Import Data Cawangan

+ +
+ @csrf +
+ +
+ +
+ +
+ +
+
+ +
+
+ +
+
+ +
+
+
+ + +@endsection diff --git a/resources/views/importdata/listcawangan.blade.php b/resources/views/importdata/listcawangan.blade.php new file mode 100644 index 00000000..db5156d5 --- /dev/null +++ b/resources/views/importdata/listcawangan.blade.php @@ -0,0 +1,163 @@ +@extends('layouts.app') + +@section('content') +
+
+
+ @if ($message = Session::get('success')) +
+

{{ $message }}

+
+ @endif +

Import Data Cawangan

+
+ "; + echo "
"; + echo " "; + echo " "; + echo " "; + //echo " "; + //echo " "; + //echo " "; + echo " "; + echo " "; + // echo " "; + // echo " "; + echo " "; + echo " "; + echo ""; + + $count = 0; + // $result = mysql_query("SELECT * FROM cawangan_lelong"); + $results = DB::select('select * from cawangan'); + foreach($results as $row) + { + $caw_ip = $row->caw_ip; + $caw_dbuser = $row->caw_dbuser; + $caw_dbpass = $row->caw_dbpass; + $caw_dbname = $row->caw_dbname; + $caw_name = $row->caw_name; + $caw_id = $row->id; + $kodcaw = $row->caw_code; + + //dd($caw_ip); + + $db = mysqli_connect($caw_ip,$caw_dbuser, $caw_dbpass); + if (!$db) + { + echo "

Server Down: $con[caw_dbname]/$con[caw_name]

"; + continue; + die('Could not connect: ' . mysqli_error()); + } + mysqli_select_db($db,$caw_dbname); + $count++; + + + echo ""; + echo ""; + echo ""; + //echo ""; + // echo ""; + //echo ""; + echo ""; + echo ""; + // echo ""; + // echo ""; + echo ""; + + } + echo "
Bil Lelong ID Cawangan Tarikh Lelong
{{ $bid->lelong_id}}{{ $bid->caw_name}}{{ $bid->tarikh_lelong }}{{$loop->iteration}} + {{ $bid['laporan']['lelong_id']}} + @foreach($bid['details'] as $details) + {{ $details['caw_name']}}
+ @endforeach + 		{{ $bid['laporan']['tarikh_lelong'] }} - +
#CawanganTarikh LelongBatch LelongTarikh LelongImport DataHapus DataSenarai LelonganExport Data
$count$caw_name$tarikh$batchno$tarikhImport Data From Live To MasterHapusLihat SenaraiExport Data
"?> + + + + + + + + +@endsection diff --git a/resources/views/importdata/showsenarai.blade.php b/resources/views/importdata/showsenarai.blade.php new file mode 100644 index 00000000..405f01ff --- /dev/null +++ b/resources/views/importdata/showsenarai.blade.php @@ -0,0 +1,108 @@ +@extends('layouts.app') + +@section('content') +
+
+
+ @if ($message = Session::get('success')) +
+

{{ $message }}

+
+ @endif + "; + echo " "; + echo " "; + echo " #"; + echo " Cawangan"; + //echo " Tarikh Lelong"; + echo " Batch Lelong"; + echo " Tarikh Lelong"; + echo " Import Data"; + echo " Senarai Lelongan"; + echo " Export Data"; + echo " "; + echo " "; + echo ""; + + $count = 0; + // $result = mysql_query("SELECT * FROM cawangan_lelong"); + $results = DB::select('select * from cawangan'); + foreach($results as $row) + { + $caw_ip = $row->caw_ip; + $caw_dbuser = $row->caw_dbuser; + $caw_dbpass = $row->caw_dbpass; + $caw_dbname = $row->caw_dbname; + $caw_name = $row->caw_name; + $caw_id = $row->id; + + //dd($caw_ip); + + $db = mysqli_connect($caw_ip,$caw_dbuser, $caw_dbpass); + if (!$db) + { + echo "

Server Down: $con[caw_dbname]/$con[caw_name]

"; + continue; + die('Could not connect: ' . mysqli_error()); + } + mysqli_select_db($db,$caw_dbname); + $count++; + + $result_tender = mysqli_query($db,"SELECT *, lelong.batchno as batch, DATE_FORMAT(tarikh, '%d/%m/%Y') AS tarikh FROM batchlel +JOIN lelong ON (lelong.batchno = batchlel.batchno) +where norujukan NOT IN(select norujukan FROM gadai where sttebus = 'L' OR sttebus = 'H') and lelong.hargajual = '0.00' and lelong.nopembeli = '0' ORDER BY `batchlel`.`tarikh` ASC"); + $row_tender = mysqli_fetch_array($result_tender); + + $result_tender1 = mysqli_query($db,"SELECT MAX(batchno) as batchno + FROM batchlel"); + $row_tender1 = mysqli_fetch_array($result_tender1); + + $batchno = $row_tender['batch']; + $tarikh = $row_tender['tarikh']; + + echo ""; + echo "$count"; + echo "$caw_name"; + //echo "$tarikh"; + echo "$batchno"; + echo "$tarikh"; + echo "Import Data"; + echo "Lihat Senarai"; + echo "Export Data"; + echo ""; + + } + echo ""?> + +
+
+
+ +@endsection diff --git a/resources/views/includes/sidebar.blade.php b/resources/views/includes/sidebar.blade.php index c2fc6fb1..02599deb 100644 --- a/resources/views/includes/sidebar.blade.php +++ b/resources/views/includes/sidebar.blade.php @@ -98,6 +98,9 @@ @endhasrole @hasrole('operasi') +
  • + Import Data +
  • Notis Tamat Kontrak
    • diff --git a/resources/views/jananotis/tempbycaw.blade.php b/resources/views/jananotis/tempbycaw.blade.php index 0f2f60c9..e73c41ba 100644 --- a/resources/views/jananotis/tempbycaw.blade.php +++ b/resources/views/jananotis/tempbycaw.blade.php @@ -17,9 +17,22 @@
    -

    Tarikh Lelong : {{ $t_lelong }}

    -

    Tarikh Gadai Sehingga : {{ $t_gadais->t_gadai }}

    -

    Anggaran Tarikh Daftar Lelong : {{ $t_anggaran }}

    +

    Tarikh Lelong : {{ $t_lelongdisplay }}

    +

    Tarikh Gadai Sehingga : @php + $myDateTime = DateTime::createFromFormat('Y-m-d', $t_gadais->t_gadai ); + $datez = $myDateTime->format('d-m-Y'); + echo($datez); + @endphp

    +

    Tarikh Perlu Blast Notis SMS(30 Hari) : @php + $myDateTime = DateTime::createFromFormat('Y-m-d', $t_lelong ); + $datez1 = $myDateTime->modify('-1 month')->format('d-m-Y'); + echo($datez1); + @endphp

    +

    Tarikh Perlu Daftar Batch Lelong(20 Hari) : @php + $myDateTime = DateTime::createFromFormat('Y-m-d', $t_lelong ); + $datez1 = $myDateTime->modify('-20 days')->format('d-m-Y'); + echo($datez1); + @endphp

    @@ -36,6 +49,8 @@ Baki Pembiayaan (RM) Keuntungan 6 Bulan (RM) Keuntungan Telah Bayar (RM) + Nilai Marhun (RM) + Tamat Kontrak @@ -50,7 +65,9 @@ {{ $surat['list_norujukan'][0]['pinjaman'] }} {{ $surat['list_norujukan'][0]['bakipjm'] }} {{ $surat['list_norujukan'][0]['bakiupah'] }} - + {{ $surat['list_norujukan'][0]['ansakhir'] }} + {{ $surat['list_norujukan'][0]['nilaimarhun'] }} + {{ $surat['list_norujukan'][0]['t_matang1'] }} @endforeach diff --git a/resources/views/pengurusanpengguna/index.blade.php b/resources/views/pengurusanpengguna/index.blade.php index 3041a067..1ecc1d68 100644 --- a/resources/views/pengurusanpengguna/index.blade.php +++ b/resources/views/pengurusanpengguna/index.blade.php @@ -73,7 +73,7 @@
    -
    New Pengguna
    +
    Tambah Pengguna
    @@ -110,6 +110,19 @@
    + +
    diff --git a/routes/web.php b/routes/web.php index 86b1f14c..f0d1269a 100644 --- a/routes/web.php +++ b/routes/web.php @@ -202,6 +202,14 @@ Route::group(['middleware' => ['permission:notistamatkontrak'],'prefix'=>'notist Route::post('/senaraitemp',['as'=>'notistamatkontrak.senaraitemp','uses'=>'TamatKontController@senaraitemp']); Route::get('/tempbycaw/{details}/{t_lelong}',['as'=>'notistamatkontrak.tempbycaw','uses'=>'TamatKontController@tempbycaw']); }); + +Route::group(['middleware' => ['permission:importdata'],'prefix'=>'importdata'], function () { + Route::get('/importdatacawangan',['as'=>'importdata.importdatacawangan','uses'=>'ImportDataController@importdata']); + Route::get('/listcawangan',['as'=>'importdata.listcawangan','uses'=>'ImportDataController@listcawangan']); + Route::get('/showsenarai/{id}',['as'=>'importdata.showsenarai','uses'=>'ImportDataController@showsenarai']); + Route::get('/importdatagadai/{caw_id}',['as'=>'importdata.importdatagadai','uses'=>'ImportDataController@importdatagadai']); + Route::get('/hapusdatacawangan/{caw_id}',['as'=>'importdata.hapusdatacawangan','uses'=>'ImportDataController@hapusdatacawangan']); +}); //Operasi Route::group(['middleware' => ['permission:serahan'],'prefix'=>'serahan'], function () { From 9f9c0436ad388335b0d40b70a21e7c223ee81223 Mon Sep 17 00:00:00 2001 From: Nur Izzati Zulkifli Date: Wed, 27 Apr 2022 13:53:28 +0800 Subject: [PATCH 3/4] update multiple select cawangan simulasi --- app/Http/Controllers/ImportDataController.php | 4 +-- app/Http/Controllers/SimulasiController.php | 31 ++++++++++++------- ...21_12_14_041545_create_simulasis_table.php | 10 +++--- ...2021_12_14_041557_create_lelongs_table.php | 2 +- .../views/simulasi/janasimulasi.blade.php | 17 +++++++--- .../views/simulasi/senaraimarhunlel.blade.php | 2 +- 6 files changed, 39 insertions(+), 27 deletions(-) diff --git a/app/Http/Controllers/ImportDataController.php b/app/Http/Controllers/ImportDataController.php index 2a2ffb1d..7d0cf5e5 100644 --- a/app/Http/Controllers/ImportDataController.php +++ b/app/Http/Controllers/ImportDataController.php @@ -127,9 +127,7 @@ class ImportDataController extends Controller $berat1 = $row_tender1['berat']; $harga1 = $row_tender1['harga']; $n_marhun1 = $row_tender1['n_marhun']; - //$hargaasas1 = $row_tender1['hargaasas']; - //$batch_no1 = $row_tender1['batch_no']; - + DB::insert("INSERT INTO elelong.gadaimarhun (kodcaw,norujukan,t_gadai,bil,marhun,nota,karat,berat,harga,n_marhun) VALUES ('$kodcaw1','$norujukan1','$t_gadai1','$bil1','$marhun1','$nota1','$karat1','$berat1','$harga1','$n_marhun1')"); diff --git a/app/Http/Controllers/SimulasiController.php b/app/Http/Controllers/SimulasiController.php index 1b35711f..13c209a7 100644 --- a/app/Http/Controllers/SimulasiController.php +++ b/app/Http/Controllers/SimulasiController.php @@ -57,7 +57,7 @@ class SimulasiController extends Controller public function janadata(Request $request) { - // dd($request->all()); + //dd($request->all()); $t_lelong = Carbon::parse($request->tarikh_lelong); $bulan = (int)round($request->jbg); $jbgadai = ($t_lelong->subMonths($bulan))->toDateString(); @@ -185,22 +185,27 @@ class SimulasiController extends Controller } elseif($request->caw && $request->caw != 'all') { - // dd($request->caw); - $caw = Cawangan::where('id','=',$request->caw)->first(); + //dd($request->caw); + $caw = Cawangan::whereIn('id',$request->caw)->get(); + // dd($caw); + foreach($caw as $index=>$cawsimulasi){ + // dd($cawsimulasi->id); $caw_simulasi = new CawanganSimulasi; $caw_simulasi->simulasi_id = $simulasi->id; - $caw_simulasi->caw_id = $caw->id; + $caw_simulasi->caw_id = $cawsimulasi->id; $caw_simulasi->online = 'Online'; - $caw_simulasi->lokasi = $caw->lokasi; + $caw_simulasi->lokasi = $cawsimulasi->lokasi; $caw_simulasi->save(); + // dd($caw_simulasi); + + $suratcaw = $surat->where('kodcaw','=',$cawsimulasi->caw_code)->all(); - $suratcaw = $surat->where('kodcaw','=',$caw->caw_code)->all(); // $simulasibid = SimulasiBid::where('caw_id','=',$caw->id)->get(); foreach($suratcaw as $data) { $simulasibid = new SimulasiBid; $simulasibid->simulasi_id = $simulasi->id; - $simulasibid->caw_id = $caw->id; + $simulasibid->caw_id = $cawsimulasi->id; $simulasibid->kodcaw = $data->kodcaw; $simulasibid->norujukan = $data->norujukan; $simulasibid->t_lelong = $request->tarikh_lelong; @@ -267,6 +272,7 @@ class SimulasiController extends Controller $updatesimbid->save(); } } + } else { dd('error'); @@ -301,7 +307,7 @@ class SimulasiController extends Controller return view('simulasi.senaraisimulasi',compact('simulasi','arrayinfo')); } - public function show($id) + public function show(Request $request, $id) { $simulasi_id = $id; $simulasi = Simulasi::where('id','=',$id)->first(); @@ -461,9 +467,9 @@ class SimulasiController extends Controller $data = Simulasi::where('simulasi.id','=',$simulasi_id) ->get(); - $simulasi = new Simulasi; - $simulasi->harga_emas_asas = $request->hargaasas; - $simulasi->save(); + // $simulasi = new Simulasi; + // $simulasi->harga_emas_asas = $request->hargaasas; + // $simulasi->save(); } @@ -494,7 +500,8 @@ class SimulasiController extends Controller 'jeniskarat', 'data', 'total_upahkeuntungan', - 'total_nilaimarhun')); + 'total_nilaimarhun' + )); } public function delete($id) diff --git a/database/migrations/2021_12_14_041545_create_simulasis_table.php b/database/migrations/2021_12_14_041545_create_simulasis_table.php index 507b2546..4cfb3ab8 100644 --- a/database/migrations/2021_12_14_041545_create_simulasis_table.php +++ b/database/migrations/2021_12_14_041545_create_simulasis_table.php @@ -15,13 +15,13 @@ class CreateSimulasisTable extends Migration { Schema::create('simulasi', function (Blueprint $table) { $table->bigIncrements('id'); - $table->string('tarikh_lelong'); + $table->string('tarikh_lelong')->nullable(); $table->time('masatamat_lelong')->nullable(); $table->dateTime('masakemaskini_data')->nullable(); $table->string('kali')->nullable(); - $table->string('harga_emas_asas'); - $table->string('jbg'); - $table->integer('cajlelong'); + $table->string('harga_emas_asas')->nullable(); + $table->string('jbg')->nullable(); + $table->integer('cajlelong')->nullable(); $table->timestamps(); }); @@ -34,7 +34,7 @@ class CreateSimulasisTable extends Migration $table->string('import_data_sts')->nullable(); $table->date('export_data_stsdate')->nullable(); $table->date('import_data_sts_date')->nullable(); - $table->string('lokasi'); + $table->string('lokasi')->nullable(); $table->timestamps(); $table->foreign('caw_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 3900d97d..49dc7eb7 100644 --- a/database/migrations/2021_12_14_041557_create_lelongs_table.php +++ b/database/migrations/2021_12_14_041557_create_lelongs_table.php @@ -37,7 +37,7 @@ class CreateLelongsTable extends Migration $table->string('import_data_sts')->nullable(); $table->date('export_data_stsdate')->nullable(); $table->date('import_data_sts_date')->nullable(); - $table->string('lokasi'); + $table->string('lokasi')->nullable(); $table->timestamps(); $table->foreign('caw_id') diff --git a/resources/views/simulasi/janasimulasi.blade.php b/resources/views/simulasi/janasimulasi.blade.php index 336e9bbd..1e9de514 100644 --- a/resources/views/simulasi/janasimulasi.blade.php +++ b/resources/views/simulasi/janasimulasi.blade.php @@ -1,6 +1,9 @@ @extends('layouts.app') @section('content') + + +
    @@ -11,7 +14,7 @@

    {{ $message }}

    @endif -
    + @csrf
    @@ -30,13 +33,13 @@
    - + @foreach ($caw as $item) @endforeach - +
    @@ -62,7 +65,11 @@
    @endsection diff --git a/resources/views/simulasi/senaraimarhunlel.blade.php b/resources/views/simulasi/senaraimarhunlel.blade.php index 9a0882a4..dfadf39b 100644 --- a/resources/views/simulasi/senaraimarhunlel.blade.php +++ b/resources/views/simulasi/senaraimarhunlel.blade.php @@ -44,7 +44,7 @@ {{ $marhun['caw_name'] }} {{ $marhun['norujukan']}} {{ number_format($marhun['pinjaman'], 2, '.', ',') }} - {{ number_format($marhun['jbg'], 2, '.', ',') }} + {{ number_format($marhun['tempoh'], 2, '.', ',') }} {{ number_format($marhun['berat'], 2, '.', ',') }} {{ number_format($marhun['nilaimarhun'], 2, '.', ',') }} {{ number_format($marhun['hargaasas'], 2, '.', ',') }} From 153a6c69d413ce00124ba818cc5bb85fc20c5265 Mon Sep 17 00:00:00 2001 From: Amirah22 <94591077+Amirah22@users.noreply.github.com> Date: Wed, 27 Apr 2022 13:59:48 +0800 Subject: [PATCH 4/4] tarikh lelong page simulasi --- app/Http/Controllers/SimulasiController.php | 9 ++++----- resources/views/simulasi/showsimulasi.blade.php | 9 ++++++--- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/app/Http/Controllers/SimulasiController.php b/app/Http/Controllers/SimulasiController.php index 1b35711f..c9805997 100644 --- a/app/Http/Controllers/SimulasiController.php +++ b/app/Http/Controllers/SimulasiController.php @@ -301,7 +301,7 @@ class SimulasiController extends Controller return view('simulasi.senaraisimulasi',compact('simulasi','arrayinfo')); } - public function show($id) + public function show(Request $request, $id) { $simulasi_id = $id; $simulasi = Simulasi::where('id','=',$id)->first(); @@ -461,9 +461,7 @@ class SimulasiController extends Controller $data = Simulasi::where('simulasi.id','=',$simulasi_id) ->get(); - $simulasi = new Simulasi; - $simulasi->harga_emas_asas = $request->hargaasas; - $simulasi->save(); + } @@ -494,7 +492,8 @@ class SimulasiController extends Controller 'jeniskarat', 'data', 'total_upahkeuntungan', - 'total_nilaimarhun')); + 'total_nilaimarhun' + )); } public function delete($id) diff --git a/resources/views/simulasi/showsimulasi.blade.php b/resources/views/simulasi/showsimulasi.blade.php index dd60f631..a63aa75f 100644 --- a/resources/views/simulasi/showsimulasi.blade.php +++ b/resources/views/simulasi/showsimulasi.blade.php @@ -32,6 +32,11 @@ Keuntungan Keseluruhan : RM{{ number_format($total_upah, 2, '.', ',') }} + + @foreach ($data as $data1) + Tarikh Lelong: {{ $data1['tarikh_lelong']}} + @endforeach +
    @@ -61,7 +66,6 @@ No Cawangan - Tarikh Lelong Bil Marhun (Paket) Berat (gm) Nilai Marhun (RM) @@ -79,7 +83,6 @@ {{$index+1}} {{ $caw['cawangan'] }} - {{ $caw['t_lelong'] }} {{ $caw['bil_marhun'] }} {{ number_format($caw['berat'], 2, '.', ',') }} {{ number_format($caw['n_marhun'], 2, '.', ',') }} @@ -94,7 +97,7 @@ - JUMLAH KESELURUHAN + JUMLAH KESELURUHAN {{ $total_marhun }} {{ number_format($total_berat, 2, '.', ',') }} {{ number_format($total_nilaimarhun, 2, '.', ',') }}