diff --git a/app/Http/Controllers/ImportDataController.php b/app/Http/Controllers/ImportDataController.php index e6c12298..f34936ea 100644 --- a/app/Http/Controllers/ImportDataController.php +++ b/app/Http/Controllers/ImportDataController.php @@ -72,7 +72,7 @@ class ImportDataController extends Controller mysqli_select_db($db,$caw_dbname); $count = 0; - $result=mysqli_query($db,"SELECT * FROM gadai where taglel = '0' and sttebus = '' and upah12 is NOT NULL"); + $result=mysqli_query($db,"SELECT 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,lelong_tawarruq FROM gadai where taglel = '0' and sttebus = '' and upah12 is NOT NULL"); while($row_gadai = mysqli_fetch_array($result)) { @@ -108,9 +108,10 @@ class ImportDataController extends Controller $hargajualan = $row_gadai['hargajualan']; $bakihargajualan = $row_gadai['bakihargajualan']; $tempohbayar = $row_gadai['tempohbayar']; + $lelong_tawarruq = $row_gadai['lelong_tawarruq']; - 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','0','$penilai','$percentpinj','$tagpalsu','$semakbarcode','$historygadaian','$upah12','$hargajualan','$bakihargajualan','$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,lelong_tawarruq) + 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','0','$penilai','$percentpinj','$tagpalsu','$semakbarcode','$historygadaian','$upah12','$hargajualan','$bakihargajualan','$tempohbayar','$lelong_tawarruq')"); //untuk gadaimarhun $result1=mysqli_query($db,"SELECT * FROM marhun where norujukan = '$norujukan'"); diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 77c9cfbc..2725bb0d 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -210,7 +210,7 @@ class LelongController extends Controller 'berat'=>$berat, 'n_marhun'=>$nilai_marhun, 'pinjaman'=>$pinjaman, - 'upah'=>$total_upahkeuntungan, + 'keuntungan'=>$keuntungan, 'hargaasas'=>$hargaasas, 'cajlelong'=>$cajlelong, 'rugilelong'=>$rugilelong, @@ -259,6 +259,7 @@ class LelongController extends Controller 'lelong_id', 'jeniskarat', 'data', + 'keuntungan', 'total_upahkeuntungan', 'total_nilaimarhun')); } @@ -840,11 +841,27 @@ class LelongController extends Controller $marhuns[$index1]['keuntungan'] = $keuntungan; } + $arrayinfo = []; + $lelong_id = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id') + ->where('cawangan_lelong.lelong_id','=',$lelongid) + ->select('lelong_id','tarikh_lelong') + ->groupBy('lelong_id') + ->get()->toArray(); + + + foreach($lelong_id as $laporan) + { + $details = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') + ->where('lelong_id',$laporan['lelong_id']) + ->get() + ->toArray(); + array_push($arrayinfo,['laporan' => $laporan,'details' => $details]); + } - return view('lelong.senaraimarhun',compact('marhuns','lelongid','cawid')); + return view('lelong.senaraimarhun',compact('marhuns','lelongid','cawid','arrayinfo')); } public function deletemarhun(Request $request){ @@ -913,73 +930,25 @@ class LelongController extends Controller $keuntungan=0; $total_hargaasas = 0; - $total_upahkeuntungan = 0; - $total_nmarhun = 0; - $total_pinjaman = 0; + $total_berat = 0; foreach($brglelong as $index1=>$upah) { - - $keuntungan = $upah['bakipjm'] - ($upah['bakihargajualan'] - ($upah['upah12'] - $upah['ansakhir'])-(($upah['tempoh']-$upah['tempohbayar'])*$upah['kadarupah']/100*$upah['bakipjm']) ); - $brglelong[$index1]['keuntungan'] = $keuntungan; - + $total_hargaasas = $total_hargaasas + $upah['hargaasas']; - $total_upahkeuntungan = $total_upahkeuntungan + $keuntungan; - $total_nmarhun = $total_nmarhun + $upah['nilaimarhun']; - $total_pinjaman = $total_pinjaman + $upah['pinjaman']; + $total_berat = $total_berat + $upah['berat']; } - - - return view('lelong.senaraibrglelong',compact('arrayinfo','lelongid','brglelong','lelong_id','keuntungan','total_hargaasas','total_upahkeuntungan','total_nmarhun','total_pinjaman')); - - } - - public function pdfsenarailelong(Request $request){ - - $lelong_id = $request->lelongid; - - $lelongid = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id') - ->where('lelong.id', $lelong_id) - ->get(); - - $brglelong = LelongBid::join('gadai','lelongbid.norujukan','=','gadai.norujukan') - ->where('lelongbid.lelong_id', $lelong_id) - ->get(); - - $keuntungan=0; - $totharga_asas=0; - $totkeuntungan=0; - $totnilai_marhun=0; - $tot_pinjaman=0; - - - - - foreach($brglelong as $index1=>$upah) - { - $keuntungan = $upah['bakipjm'] - ($upah['bakihargajualan'] - ($upah['upah12'] - $upah['ansakhir']) - (($upah['tempoh']-$upah['tempohbayar'])*$upah['kadarupah']/100*$upah['bakipjm']) ); - $brglelong[$index1]['keuntungan'] = $keuntungan; - - } - - $totharga_asas = $totharga_asas + ($upah->sum('hargaasas')); - $totkeuntungan = $totkeuntungan + ($brglelong->sum('keuntungan')); - $totnilai_marhun = $totnilai_marhun + ($upah->sum('nilaimarhun')); - $tot_pinjaman = $tot_pinjaman + ($upah->sum('pinjaman')); - - - $pdf = PDF::loadView('pdf.listlelong',compact('brglelong','totharga_asas','totkeuntungan','totnilai_marhun','tot_pinjaman','lelong_id','lelongid')) + $pdf = PDF::loadView('pdf.listlelong',compact('arrayinfo','lelongid','brglelong','lelong_id','keuntungan','total_hargaasas','total_berat')) ->setPaper('a4', 'potrait'); - return $pdf->download('Senarai Lelong.pdf'); - - - + return $pdf->download('Senarai Barang Lelong.pdf'); } + + public function lapbrglelongdetailsindex (Request $request){ // dd('hiio'); } diff --git a/app/Http/Controllers/SimulasiController.php b/app/Http/Controllers/SimulasiController.php index c80df8ea..15a7f398 100644 --- a/app/Http/Controllers/SimulasiController.php +++ b/app/Http/Controllers/SimulasiController.php @@ -62,6 +62,7 @@ class SimulasiController extends Controller $bulan = (int)round($request->jbg); $fasa = $request->fasa; $jbg = $request->jbg; + // dd($fasa); // dd($fasa); $jbgadai = ($t_lelong->subMonths($bulan))->toDateString(); if($request->fasa == '1'){ @@ -156,6 +157,7 @@ class SimulasiController extends Controller $simulasibid->status_jual = 0; $simulasibid->status_payment = 0; $simulasibid->mora_upah = 0; + $simulasibid->fasa = $request->fasa; $simulasibid->save(); $sumhargaasas = 0; @@ -181,7 +183,7 @@ class SimulasiController extends Controller $simmarhun->karat = $marhun->karat; $simmarhun->berat = $marhun->berat; $simmarhun->harga = $karat->harga; - $simmarhun->n_marhun = $marhun->berat * $karat->harga; + $simmarhun->n_marhun = $marhun->n_marhun; $simmarhun->hargaasas = $val; $simmarhun->save(); } @@ -191,20 +193,20 @@ class SimulasiController extends Controller } - $calcaj = ($request->cajlelong/100)*$sumhargaasas; - $updatesimbid = SimulasiBid::where('id','=',$simulasibid->id)->first(); - $updatesimbid->hargaasas = $sumhargaasas; - $updatesimbid->cajlelong = $calcaj; - $updatesimbid->baki = $sumhargaasas-$data->pinjaman - $data->bakiupah - $calcaj; - $updatesimbid->berat = $berat; - $updatesimbid->save(); + // $calcaj = ($request->cajlelong/100)*$sumhargaasas; + // $updatesimbid = SimulasiBid::where('id','=',$simulasibid->id)->first(); + // $updatesimbid->hargaasas = $sumhargaasas; + // $updatesimbid->cajlelong = $calcaj; + // $updatesimbid->baki = $sumhargaasas-$data->pinjaman - $data->bakiupah - $calcaj; + // $updatesimbid->berat = $berat; + // $updatesimbid->save(); } } } elseif($request->caw && $request->caw != 'all') { //dd($request->caw); - $caw = Cawangan::whereIn('id',$request->caw)->get(); + $caw = Cawangan::whereIn('caw_code',$request->caw)->get(); // dd($caw); foreach($caw as $index=>$cawsimulasi){ // dd($cawsimulasi->id); @@ -246,6 +248,7 @@ class SimulasiController extends Controller $simulasibid->status_jual = 0; $simulasibid->status_payment = 0; $simulasibid->mora_upah = 0; + $simulasibid->fasa = $request->fasa; $simulasibid->save(); $sumhargaasas = 0; @@ -272,7 +275,7 @@ class SimulasiController extends Controller $simmarhun->karat = $marhun->karat; $simmarhun->berat = $marhun->berat; $simmarhun->harga = $karat->harga; - $simmarhun->n_marhun = $marhun->berat * $karat->harga; + $simmarhun->n_marhun = $marhun->n_marhun; $simmarhun->hargaasas = $val; $simmarhun->save(); } @@ -282,13 +285,21 @@ class SimulasiController extends Controller } - $calcaj = ($request->cajlelong/100)*$sumhargaasas; - $updatesimbid = SimulasiBid::where('id','=',$simulasibid->id)->first(); - $updatesimbid->hargaasas = $sumhargaasas; - $updatesimbid->cajlelong = $calcaj; - $updatesimbid->baki = $sumhargaasas-$data->pinjaman - $data->bakiupah - $calcaj; - $updatesimbid->berat = $berat; - $updatesimbid->save(); + // $calcaj = ($request->cajlelong/100)*$sumhargaasas; + // $updatesimbid = SimulasiBid::where('id','=',$simulasibid->id)->first(); + // $updatesimbid->hargaasas = $sumhargaasas; + // $updatesimbid->cajlelong = $calcaj; + // $updatesimbid->baki = $sumhargaasas-$data->pinjaman - $data->bakiupah - $calcaj; + // $updatesimbid->berat = $berat; + // $updatesimbid->save(); + + $updategadai = Gadai::where('norujukan','=',$data->norujukan)->first(); + $updategadai->taglel = 1; + $updategadai->save(); + // $updatesimbid->cajlelong = $calcaj; + // $updatesimbid->baki = $sumhargaasas-$data->pinjaman - $data->bakiupah - $calcaj; + // $updatesimbid->berat = $berat; + // $updatesimbid->save(); } } } @@ -457,6 +468,9 @@ class SimulasiController extends Controller } + + //total keuntungaan full + array_push($arraycaw,[ 'id_cawangan'=> $cawangan['id'], 'cawangan'=>$cawangan['caw_name'], @@ -523,9 +537,20 @@ class SimulasiController extends Controller public function delete($id) { + $simulasibid = SimulasiBid::where('simulasi_id','=',$id)->get(); + foreach($simulasibid as $data) + { + $updategadai = Gadai::where('norujukan','=',$data->norujukan)->first(); + $updategadai->taglel = 0; + $updategadai->save(); + } + //dd($simulasibid); $role = Simulasi::where('id','=',$id)->first(); // dd($role); $role->delete(); + + + return redirect()->route('analisa.senaraisimulasi') ->with('success','Padam Simulasi Berjaya'); } @@ -836,5 +861,222 @@ class SimulasiController extends Controller return redirect()->route('analisa.senaraimarhunlel',['simulasi_id'=>$request->simulasi_id,'cawid'=>$request->cawid]) ->with('success','Delete Berjaya'); } + + public function senaraitempsimulasi(Request $request) + { + + // $t_lelong = $request->tarikh_lelong; + // $tarikh_lelong = Carbon::parse($t_lelong); + // $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'); + //$t_lelong1 = $request->tarikh_lelong; + $t_lelong1 = date('d-m-Y', strtotime($request->tarikh_lelong)); + $t_lelong2 = $request->tarikh_lelong; + $t_lelong = Carbon::parse($request->tarikh_lelong); + $bulan = (int)round($request->jbg); + $fasa = $request->fasa; + $jbg = $request->jbg; + $cajlelong = $request->cajlelong; + $jbgadai = ($t_lelong->subMonths($bulan))->toDateString(); + $t_lelongdisplay = $t_lelong->format('d-m-Y'); + // $t_lelongdisplay = $t_lelong->format('d-m-Y'); + //dd($fasa); + if($t_lelong != null) + { + if($request->fasa == '1'){ + $getsurat = Gadai::where('t_gadai','<=',$jbgadai) + ->where('sttebus','=','') + ->where('tagpalsu','=',0) + ->where('tagpalsu2','=',0) + ->where('taglel','=',0) + ->where('lelong_tawarruq','=',1) + ->get(); + + $t_gadais = Gadai::where('t_gadai','<=',$jbgadai) + ->where('sttebus', '=', '') + ->where('taglel', '=', 0) + ->where('tagpalsu', '=', 0) + ->where('tagpalsu2', '=', 0) + ->where('lelong_tawarruq','=',1) + ->whereNotNull('upah12') + ->orderBy('t_gadai') + ->select('t_gadai', 'norujukan') + ->first(); + //dd($t_gadais); + // $t_gadais = $request->t_gadai; + // $t_gadaisehingga = Carbon::parse($t_gadais); + // $t_gadaisdisplay = $t_gadaisehingga->format('d/m/Y'); + + + $senarai = Gadai::join('cawangan', 'gadai.kodcaw', '=', 'cawangan.caw_code') + ->orderBy('cawangan.caw_name') + ->where('gadai.t_gadai', '<=', $jbgadai) + ->where('gadai.lelong_tawarruq','=',1) + ->where('gadai.sttebus', '=', '') + ->where('gadai.taglel', '=', 0) + ->where('gadai.tagpalsu', '=', 0) + ->where('gadai.tagpalsu2', '=', 0) + ->whereNotNull('gadai.upah12') + ->groupBy('gadai.kodcaw','cawangan.caw_name') + ->selectRaw('count(*) as bil_lelong, + sum(berat) as total_berat, + sum(nilaimarhun) as total_nilaimarhun, + sum(pinjaman) as total_pembiayaan, + sum(bakipjm) as total_bakipjm, + gadai.kodcaw, + cawangan.caw_name as caw_name') + ->get(); + + $bil_lelong = sizeof($getsurat); + } + + else if($request->fasa == '2'){ + $getsurat = Gadai::where('t_gadai','<=',$jbgadai) + ->where('sttebus','=','') + ->where('tagpalsu','=',0) + ->where('tagpalsu2','=',0) + ->where('taglel','=',0) + ->get(); + //dd($getsurat); + + $t_gadais = Gadai::where('t_gadai','<=',$jbgadai) + ->where('sttebus', '=', '') + ->where('taglel', '=', 0) + ->where('tagpalsu', '=', 0) + ->where('tagpalsu2', '=', 0) + ->whereNotNull('upah12') + ->orderBy('t_gadai') + ->select('t_gadai', 'norujukan') + ->first(); + //dd($t_gadais); + // $t_gadais = $request->t_gadai; + // $t_gadaisehingga = Carbon::parse($t_gadais); + // $t_gadaisdisplay = $t_gadaisehingga->format('d/m/Y'); + + + $senarai = Gadai::join('cawangan', 'gadai.kodcaw', '=', 'cawangan.caw_code') + ->orderBy('cawangan.caw_name') + ->where('gadai.t_gadai', '<=', $jbgadai) + ->where('gadai.sttebus', '=', '') + ->where('gadai.taglel', '=', 0) + ->where('gadai.tagpalsu', '=', 0) + ->where('gadai.tagpalsu2', '=', 0) + ->whereNotNull('gadai.upah12') + ->groupBy('gadai.kodcaw','cawangan.caw_name') + ->selectRaw('count(*) as bil_lelong, + sum(berat) as total_berat, + sum(nilaimarhun) as total_nilaimarhun, + sum(pinjaman) as total_pembiayaan, + sum(bakipjm) as total_bakipjm, + gadai.kodcaw, + cawangan.caw_name as caw_name') + ->get(); + + $bil_lelong = sizeof($getsurat); + } + + if(sizeof($getsurat) == 0) + { + return redirect()->route('analisa.janasimulasi') + ->with('failed','Tiada surat untuk di lelong'); + } + + + + return view('simulasi.senaraitempsimulasi', compact( 't_lelong', + 'getsurat', + 'senarai', + 't_gadais', + 't_lelong1', + 't_lelong2', + 't_lelongdisplay', + 'jbgadai', + 'fasa', + 'jbg', + 'cajlelong' + + + )); + } + else + { + return redirect()->route('analisa.janasimulasi') + ->with('failed','Sila Masukkan Tarikh Lelongan'); + } + } + public function tempbycawsimulasi($details, $t_gadai1, $fasa) + { + $jbgadai = $t_gadai1; + //$fasa = $request->fasa; + //dd($fasa); + if($fasa == '1'){ + $getsurat = Gadai::where('t_gadai', '<=', $jbgadai) + ->where('kodcaw', $details) + ->where('sttebus', '=', '') + ->where('lelong_tawarruq','=',1) + ->where('taglel', '=', 0) + ->where('tagpalsu', '=', 0) + ->where('tagpalsu2', '=', 0) + ->whereNotNull('upah12') + ->get(); + + $t_gadais = Gadai::where('t_gadai', '<=', $jbgadai) + ->where('sttebus', '=', '') + ->where('taglel', '=', 0) + ->where('tagpalsu', '=', 0) + ->where('tagpalsu2', '=', 0) + ->whereNotNull('upah12') + ->orderBy('t_gadai') + ->select('t_gadai') + ->first(); + }else{ + $getsurat = Gadai::where('t_gadai', '<=', $jbgadai) + ->where('kodcaw', $details) + ->where('sttebus', '=', '') + ->where('taglel', '=', 0) + ->where('tagpalsu', '=', 0) + ->where('tagpalsu2', '=', 0) + ->whereNotNull('upah12') + ->get(); + + $t_gadais = Gadai::where('t_gadai', '<=', $jbgadai) + ->where('sttebus', '=', '') + ->where('taglel', '=', 0) + ->where('tagpalsu', '=', 0) + ->where('tagpalsu2', '=', 0) + ->whereNotNull('upah12') + ->orderBy('t_gadai') + ->select('t_gadai') + ->first(); + } + + // $tarikh_lelong = Carbon::parse($t_lelong); + // $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); + $getsurat[$index1]['list_norujukan'] = $senarai; + } + + // $keuntungantlhbyr = TransaksiKeuntungan::on('mysql2') + // ->sum('bayaran_keuntungan'); + + return view('simulasi.tempbycawsimulasi', compact( 'getsurat', + 'details', + 'senarai', + + 't_gadais' + + )); + } } \ No newline at end of file diff --git a/resources/views/includes/sidebar.blade.php b/resources/views/includes/sidebar.blade.php index 8fc51b08..057d5460 100644 --- a/resources/views/includes/sidebar.blade.php +++ b/resources/views/includes/sidebar.blade.php @@ -189,6 +189,14 @@ +
  • + + +
    • @endhasrole @hasrole('account') {{--
  • diff --git a/resources/views/lelong/laporanlelong.blade.php b/resources/views/lelong/laporanlelong.blade.php index 8b6e4705..3543e7d1 100644 --- a/resources/views/lelong/laporanlelong.blade.php +++ b/resources/views/lelong/laporanlelong.blade.php @@ -20,7 +20,7 @@ Lelong ID Tarikh Lelong Cawangan - Action + Muat Turun @@ -37,7 +37,7 @@ - + diff --git a/resources/views/lelong/senaraibrglelong.blade.php b/resources/views/lelong/senaraibrglelong.blade.php deleted file mode 100644 index 5199206f..00000000 --- a/resources/views/lelong/senaraibrglelong.blade.php +++ /dev/null @@ -1,120 +0,0 @@ -@extends('layouts.app') - -@section('content') -
    -
    -
    - @foreach ($arrayinfo as $laporan) - - Laporan Barang Lelong - Lelong ID: {{ $laporan['laporan']['lelong_id']}} - Tarikh Lelong: {{ $laporan['laporan']['tarikh_lelong']}} - @foreach($laporan['details'] as $details) - Cawangan: {{ $details['caw_name']}} - @endforeach -
    - @endforeach - - - - @if ($message = Session::get('success')) -
    -

    {{ $message }}

    -
    - @endif -
    - @csrf - - - - - - - - - - - - - - - - - - - @foreach($brglelong as $brg) - - - - - - - - - - - @endforeach - - - - - - - - - - - - - - -
    NoNo RujukanHarga AsasUpah KeuntunganJBGNilai Marhun AsalPinjamanMarhun
    {{ $loop->iteration }} {{ $brg['norujukan']}}{{$brg['hargaasas']}}{{ $brg['keuntungan'] }}{{ $brg['jbg']}}{{ $brg['nilaimarhun']}}{{ $brg['pinjaman']}}{{ $brg['marhun']}}
    JUMLAH KESELURUHAN{{ number_format($total_hargaasas, 2, '.', ',') }}{{ number_format($total_upahkeuntungan, 2, '.', ',') }}{{ number_format($total_nmarhun, 2, '.', ',') }}{{ number_format($total_pinjaman, 2, '.', ',') }}
    -
    - Kembali -
    -
    -
    -
    - - -@endsection diff --git a/resources/views/lelong/senaraimarhun.blade.php b/resources/views/lelong/senaraimarhun.blade.php index 4c0372d6..bec29d8c 100644 --- a/resources/views/lelong/senaraimarhun.blade.php +++ b/resources/views/lelong/senaraimarhun.blade.php @@ -5,6 +5,21 @@
    + @foreach ($arrayinfo as $laporan) + + Lelong ID : {{ $laporan['laporan']['lelong_id']}} + Tarikh Lelong : @php + $myDateTime = DateTime::createFromFormat('Y-m-d', $laporan['laporan']['tarikh_lelong'] ); + $datez = $myDateTime->format('d-m-Y'); + echo($datez); + + @endphp + @foreach($laporan['details'] as $details) + Nama Cawangan : {{ $details['caw_name']}} + Kod Cawangan : {{ $details['caw_code']}} + @endforeach + + @endforeach @if ($message = Session::get('success'))
    @@ -19,9 +34,6 @@ No. - Tarikh Lelong - Kod Cawangan - Nama Cawangan Norujukan Pinjaman (RM) Tempoh @@ -39,9 +51,6 @@ @foreach ($marhuns as $index=> $marhun) {{$loop->iteration}} - {{ $marhun['t_lelong'] }} - {{ $marhun['kodcaw'] }} - {{ $marhun['caw_name'] }} {{ $marhun['norujukan']}} {{ $marhun['pinjaman'] }} {{ $marhun['jbg']}} diff --git a/resources/views/lelong/showlelong.blade.php b/resources/views/lelong/showlelong.blade.php index 8046e733..2f808e9e 100644 --- a/resources/views/lelong/showlelong.blade.php +++ b/resources/views/lelong/showlelong.blade.php @@ -33,7 +33,19 @@ Pembiayaan Keseluruhan : RM{{ number_format($total_pinjaman, 2, '.', ',') }} - Keuntungan Keseluruhan : RM{{ number_format($total_upah, 2, '.', ',') }} + Keuntungan Keseluruhan : RM{{ number_format($total_upahkeuntungan, 2, '.', ',') }} + + + @foreach($data as $data1) + Tarikh Lelong : + @php + $myDateTime = DateTime::createFromFormat('Y-m-d', $data1['tarikh_lelong'] ); + $datez = $myDateTime->format('d-m-Y'); + echo($datez); + + @endphp + + @endforeach
    @@ -51,7 +63,7 @@ @foreach($data as $data) - Tempoh: {{$data['jbg'] }} + Tempoh : {{$data['jbg'] }} @endforeach @@ -64,7 +76,6 @@ No Cawangan - Tarikh Lelong Bil Marhun (Paket) Berat (gm) Nilai Marhun (RM) @@ -82,12 +93,11 @@ {{$index+1}} {{ $caw['cawangan'] }} - {{ $caw['t_lelong'] }} {{ $caw['bil_marhun'] }} {{ number_format($caw['berat'], 2, '.', ',') }} {{ number_format($caw['n_marhun'], 2, '.', ',') }} {{ number_format($caw['pinjaman'], 2, '.', ',') }} - {{ number_format($caw['upah'], 2, '.', ',') }} + {{ number_format($caw['keuntungan'], 2, '.', ',') }} {{ number_format($caw['hargaasas'], 2, '.', ',') }} {{ number_format($caw['cajlelong'], 2, '.', ',') }} {{ number_format($caw['bakilelong'], 2, '.', ',') }} @@ -97,7 +107,7 @@ - JUMLAH KESELURUHAN + JUMLAH KESELURUHAN {{ $total_marhun }} {{ number_format($total_berat, 2, '.', ',') }} {{ number_format($total_nilaimarhun, 2, '.', ',') }} diff --git a/resources/views/pdf/listlelong.blade.php b/resources/views/pdf/listlelong.blade.php index 08af691f..a2056843 100644 --- a/resources/views/pdf/listlelong.blade.php +++ b/resources/views/pdf/listlelong.blade.php @@ -56,11 +56,17 @@ table { border: 0px solid #ddd; } -th, td { +td { text-align: left; padding: 16px; } +th{ + text-align: left; + padding: 16px; + background-color:gainsboro; +} + tr:nth-child(even) { background-color: #f2f2f2; } @@ -75,7 +81,7 @@ tr:nth-child(even) { - LAPORAN SENARAI LELONGAN + LAPORAN BARANG LELONG @@ -84,63 +90,48 @@ tr:nth-child(even) {
    - Lelong ID: {{$lelong_id}} - @foreach ($lelongid as $tarikh) - Tarikh Lelong: {{ $tarikh->tarikh_lelong }} - + @foreach ($arrayinfo as $laporan) + Lelong ID : {{$laporan['laporan']['lelong_id']}} + Tarikh Lelong : {{$laporan['laporan']['tarikh_lelong']}} + @foreach ($laporan['details'] as $details) + Cawangan : {{$details['caw_name']}} + @endforeach @endforeach +
    - - + - - - - - - - - + + + + + - @foreach($brglelong as $brg) - - - - - - - - - - - - - @endforeach - - - - - - - - - - - - - + + + + + + @endforeach + + + + + + +
    NoNo RujukanHarga AsasKeuntunganJbgNilai Marhun Asal(RM)Pembiayaan(RM)MarhunNoNo RujukanMarhunBerat (gm)Harga Asas
    {{ $loop->iteration }} {{ $brg['norujukan'] }}{{ number_format($brg['hargaasas'], 2, '.', ',') }}{{ number_format($brg['keuntungan'], 2, '.', ',') }}{{ $brg['jbg'] }}{{ number_format($brg['nilaimarhun'], 2, '.', ',') }}{{ number_format($brg['pinjaman'], 2, '.', ',') }}{{ ($brg['marhun']) }}
    JUMLAH KESELURUHAN{{ number_format($totharga_asas, 2, '.', ',') }}{{ number_format($totkeuntungan, 2, '.', ',') }}{{ number_format($totnilai_marhun, 2, '.', ',') }}{{ number_format($tot_pinjaman, 2, '.', ',') }}{{ $loop->iteration }} {{ $brg['norujukan']}}{{ $brg['marhun']}}{{ number_format($brg['berat'], 2, '.', ',') }}{{ number_format($brg['hargaasas'], 2, '.', ',') }}
    JUMLAH KESELURUHAN{{ number_format($total_berat, 2, '.', ',') }}{{ number_format($total_hargaasas, 2, '.', ',') }}
    diff --git a/resources/views/simulasi/janasimulasi.blade.php b/resources/views/simulasi/janasimulasi.blade.php index acf310f0..c4ec1592 100644 --- a/resources/views/simulasi/janasimulasi.blade.php +++ b/resources/views/simulasi/janasimulasi.blade.php @@ -14,55 +14,59 @@

    {{ $message }}

    @endif - + + @csrf
    - -
    + +
    - +
    - +
    - +
    - +
    - - - +
    - + @foreach ($caw as $item) @endforeach - -
    +
    --> +
    +
    + + +
    + +
    - +
    diff --git a/resources/views/simulasi/senaraimarhunlel.blade.php b/resources/views/simulasi/senaraimarhunlel.blade.php index dfadf39b..a56425d8 100644 --- a/resources/views/simulasi/senaraimarhunlel.blade.php +++ b/resources/views/simulasi/senaraimarhunlel.blade.php @@ -6,6 +6,7 @@
    + @if ($message = Session::get('success'))

    {{ $message }}

    @@ -19,11 +20,11 @@ No. - Tarikh Lelong + Norujukan - Pinjaman (RM) + Pembiayaan (RM) Tempoh Berat (gm) Nilai Marhun (RM) @@ -39,9 +40,9 @@ @foreach ($marhuns as $index=> $marhun) {{$loop->iteration}} - {{ $marhun['t_lelong'] }} + {{ $marhun['norujukan']}} {{ number_format($marhun['pinjaman'], 2, '.', ',') }} {{ number_format($marhun['tempoh'], 2, '.', ',') }} diff --git a/resources/views/simulasi/senaraisimulasi.blade.php b/resources/views/simulasi/senaraisimulasi.blade.php index 174a0e6d..70f1fe6b 100644 --- a/resources/views/simulasi/senaraisimulasi.blade.php +++ b/resources/views/simulasi/senaraisimulasi.blade.php @@ -29,7 +29,11 @@ {{$loop->iteration}} {{$info['info']['simulasi_id']}} - {{$info['info']['tarikh_lelong']}} + @php + $myDateTime = DateTime::createFromFormat('Y-m-d', $info['info']['tarikh_lelong'] ); + $t_lelong = $myDateTime->format('d-m-Y'); + echo($t_lelong); + @endphp {{$info['info']['fasa']}} @foreach($info['detailsinfo'] as $info2) diff --git a/resources/views/simulasi/senaraitempsimulasi.blade.php b/resources/views/simulasi/senaraitempsimulasi.blade.php new file mode 100644 index 00000000..4284942a --- /dev/null +++ b/resources/views/simulasi/senaraitempsimulasi.blade.php @@ -0,0 +1,153 @@ +@extends('layouts.app') + +@section('content') +
    +
    +
    + @if ($message = Session::get('failed')) +
    +

    {{ $message }}

    +
    + @endif +

    Butiran Gadaian Mengikut Cawangan Lelongan Fasa {{$fasa}}

    +
    + @csrf + + + +
    +
    +
    + +

    Tarikh Lelong : {{ $t_lelong1 }}

    +

    Tarikh Gadai Sehingga : @php + if($fasa == '1'){ + $myDateTime = DateTime::createFromFormat('Y-m-d', $jbgadai ); + $t_gadai = $myDateTime->format('d-m-Y'); + $t_gadai1 = $myDateTime->format('Y-m-d'); + echo($t_gadai); + }else{ + $myDateTime = DateTime::createFromFormat('Y-m-d', $t_lelong2 ); + $tarikhlelong = $myDateTime->modify('-12 month')->format('d-m-Y'); + $t_gadai1 = $myDateTime->modify('-12 month')->format('Y-m-d'); + //$t_gadai = $myDateTime->modify('-12 month')->format('Y-m-d'); + echo($tarikhlelong); + } + @endphp

    + + + + + + + + +
    +
    +
    + + + + + + + + + + + + + + + + @foreach($senarai as $send) + + + + + + + + + + + + @endforeach + +
    Kod CawanganCawanganBil LelongBerat (gm)Nilai MarhunPembiayaan (RM)Baki Pembiayaan (RM)Action
    {{ $send['kodcaw'] }}{{ $send['caw_name'] }}{{ $send['bil_lelong'] }} {{ number_format($send['total_berat'], 2) }} {{ number_format($send['total_nilaimarhun'], 2) }} {{ number_format($send['total_pembiayaan'] , 2) }} {{ number_format($send['total_bakipjm'] , 2) }} + +
    + +
    + Kembali + +
    +
    +
    +
    +
    + + + +@endsection diff --git a/resources/views/simulasi/showsimulasi.blade.php b/resources/views/simulasi/showsimulasi.blade.php index a63aa75f..161206a4 100644 --- a/resources/views/simulasi/showsimulasi.blade.php +++ b/resources/views/simulasi/showsimulasi.blade.php @@ -30,12 +30,20 @@ Pembiayaan Keseluruhan : RM{{ number_format($total_pinjaman, 2, '.', ',') }} - Keuntungan Keseluruhan : RM{{ number_format($total_upah, 2, '.', ',') }} + Keuntungan Keseluruhan : RM{{ number_format($total_upahkeuntungan, 2, '.', ',') }} - @foreach ($data as $data1) - Tarikh Lelong: {{ $data1['tarikh_lelong']}} + @foreach($data as $data1) + Tarikh Lelong : + @php + $myDateTime = DateTime::createFromFormat('Y-m-d', $data1['tarikh_lelong'] ); + $datez = $myDateTime->format('d-m-Y'); + echo($datez); + + @endphp + @endforeach +
    diff --git a/resources/views/simulasi/tempbycawsimulasi.blade.php b/resources/views/simulasi/tempbycawsimulasi.blade.php new file mode 100644 index 00000000..67fe829b --- /dev/null +++ b/resources/views/simulasi/tempbycawsimulasi.blade.php @@ -0,0 +1,128 @@ +@extends('layouts.app') + +@section('content') +
    +
    +
    +

    Butiran Gadaian Cawangan {{ $details }}

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

    {{ $message }}

    +
    + @endif +
    + + @csrf +
    +
    + +
    +
    + + + + + + + + + + + + + + + + + + + + @foreach($getsurat as $surat) + + + + + + + + + + + + + + @endforeach + +
    BilNo RujukanNo Kad PengenalanTempohBerat (gm)Pembiayaan (RM)Baki Pembiayaan (RM)Keuntungan 6 Bulan (RM)Keuntungan Telah Bayar (RM)Nilai Marhun (RM)Tamat Kontrak
    {{ $loop->iteration }}{{ $surat['list_norujukan'][0]['norujukan'] }}{{ $surat['list_norujukan'][0]['nokp'] }}{{ $surat['list_norujukan'][0]['tempoh'] }}{{ $surat['list_norujukan'][0]['berat'] }}{{ $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'] }}
    + +
    +
    +
    +
    + + +@endsection diff --git a/routes/web.php b/routes/web.php index a9757c0b..812bfdf1 100644 --- a/routes/web.php +++ b/routes/web.php @@ -72,6 +72,9 @@ Route::group(['middleware' => ['permission:analisa'],'prefix'=>'analisa'], funct Route::post('/filter',['as'=>'analisa.filter','uses'=>'SimulasiController@filter']); Route::post('/export',['as'=>'analisa.export','uses'=>'SimulasiController@export']); + + Route::post('/senaraitempsimulasi',['as'=>'analisa.senaraitempsimulasi','uses'=>'SimulasiController@senaraitempsimulasi']); + Route::get('/tempbycawsimulasi/{details}/{t_lelong}/{fasa}',['as'=>'analisa.tempbycawsimulasi','uses'=>'SimulasiController@tempbycawsimulasi']); }); Route::group(['middleware' => ['permission:sistem'],'prefix'=>'sistem'], function () { @@ -108,7 +111,6 @@ Route::group(['prefix'=>'lelong'], function () { Route::get('/lapbrglelongindex',['as'=>'lelong.lapbrglelongindex','uses'=>'LelongController@lapbrglelongindex']); Route::get('/senaraibrglelong/{lelong_id}',['as'=>'lelong.senaraibrglelong','uses'=>'LelongController@senaraibrglelong']); - Route::post('/pdfsenarailelong',['as'=>'lelong.pdfsenarailelong','uses'=>'LelongController@pdfsenarailelong']); Route::get('/lapbrglelongdetailsindex',['as'=>'lelong.lapbrglelongdetailsindex','uses'=>'LelongController@lapbrglelongdetailsindex']);