Merge branch 'main' into amirah

This commit is contained in:
Amirah22
2022-05-25 13:52:23 +08:00
14 changed files with 840 additions and 106 deletions
@@ -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'");
+56 -6
View File
@@ -14,6 +14,7 @@ use App\Models\File;
use App\Models\Lelong;
use App\Models\CawanganLelong;
use App\Models\LelongBidder;
use App\Models\LelongBid;
use App\Models\Payment;
class PembidaController extends Controller
@@ -202,7 +203,7 @@ class PembidaController extends Controller
->where('lelongbidder.status_bidder', 1)
->where('lelongbid.lelong_id', $request->lelong_id)
->get();
// dd($SAGWin);
// dd($userdetails);
foreach($SAGWin as $index2=>$sag)
{
@@ -232,18 +233,67 @@ class PembidaController extends Controller
$listwinner[$index1]['total_surat'] = sizeof($SAGWin);
$listwinner[$index1]['totalBid'] = $SAGWin->sum('hargabida');
$listwinner[$index1]['totalPay'] = $total_payment;
$listwinner[$index1][$index2]['remarks'] = $detailspayment['remark'];
$listwinner[$index1][$index2]['status_payment'] = $sag->status_payment;
$listwinner[$index1][$index2]['status'] = $detailspayment['status'];
$listwinner[$index1]['payment_id'] = $payment_id;
$listwinner[$index1]['jenisbayaran']['remarks'] = $detailspayment['remark'];
$listwinner[$index1]['jenisbayaran']['status_payment'] = $sag->status_payment;
$listwinner[$index1]['jenisbayaran']['status'] = $detailspayment['status'];
}
return view('pembida.pembayaranbidaan',compact('listwinner'));
$kodcaw = $request->kodcaw;
return view('pembida.pembayaranbidaan',compact('listwinner', 'kodcaw'));
}
public function detailsbidaan(Request $request)
public function detailsbidaan($user_id, $payment_id, $kodcaw)
{
$userdetail = User::where('id', $user_id)->first();
$infos = LelongBid::join('cawangan', 'lelongbid.kodcaw', '=', 'cawangan.caw_code')
->join('lelongbidder', 'lelongbid.id', '=', 'lelongbidder.lelongbid_id')
->where('lelongbidder.user_id', $user_id)
->where('lelongbidder.payment_id', $payment_id)
->where('cawangan.caw_code', $kodcaw)
->where('lelongbidder.status_payment', 1)
->select('lelongbid.id as lelongbid_id',
'lelongbidder.id as lelongbidder_id',
'lelongbid.lelong_id',
'lelongbidder.payment_id',
'lelongbid.t_lelong',
'cawangan.caw_name',
'lelongbid.norujukan',
'lelongbid.marhun',
'lelongbid.hargaasas',
'lelongbidder.hargabida',
'lelongbid.nilaimarhun',
'lelongbid.berat',
'lelongbidder.masa_bidaan',
'lelongbidder.notelbimbit'
)
->get();
foreach ($infos as $index1 => $info)
{
$butiranbidaan = Payment::join('resit', 'payment.resit_id', '=', 'resit.id')
->where('payment.id', $info['payment_id'])
->where('payment.lelong_id', $info['lelong_id'])
->whereNotNull('payment.disahkan_oleh')
->whereNotNull('payment.disahkan_pada')
->select('payment.remark',
'resit.reference_no'
)
->get();
// dd($butiranbidaan);
$infos[$index1]['info'] = $info;
// dd($infos[$index1]['info']);
$infos[$index1]['butiran_bidaan'] = $butiranbidaan;
// dd($infos[$index1]['butiran_bidaan']);
}
return view('pembida.detailsbidaan', compact('infos', 'userdetail', 'kodcaw'));
}
}
+263 -23
View File
@@ -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();
}
}
}
@@ -359,6 +370,8 @@ class SimulasiController extends Controller
$total14Kp = 0;
$total14K = 0;
$total9K = 0;
$total_upahkeuntungan2 = 0;
$total_nilaimarhun = 0;
foreach($cawangansim as $cawsim)
{
@@ -381,10 +394,7 @@ class SimulasiController extends Controller
$keuntungan = 0;
$total_upahkeuntungan = 0;
$total_nilaimarhun = 0;
foreach($databid as $index1=>$bid)
{
$marhun = SimulasiBidMarhun::where('simulasibid_id','=',$bid['id'])->get();
@@ -461,7 +471,6 @@ class SimulasiController extends Controller
}
array_push($arraycaw,[
'id_cawangan'=> $cawangan['id'],
'cawangan'=>$cawangan['caw_name'],
@@ -481,11 +490,13 @@ class SimulasiController extends Controller
$total_marhun = $total_marhun + sizeof($databid);
$total_berat = $total_berat + $berat;
$total_nilaimarhun = $total_nilaimarhun + $nilai_marhun;
//dd($nilai_marhun);
$total_pinjaman = $total_pinjaman + $pinjaman;
$total_hargaasas = $total_hargaasas + $hargaasas;
$total_cazlelong = $total_cazlelong + $cajlelong;
$total_rugilelong = $total_rugilelong + $rugilelong;
$total_bakilelong = $total_bakilelong + $bakilelong;
$total_upahkeuntungan2 = $total_upahkeuntungan2 + $total_upahkeuntungan;
$data = Simulasi::where('simulasi.id','=',$simulasi_id)
@@ -522,15 +533,27 @@ class SimulasiController extends Controller
'jeniskarat',
'data',
'total_upahkeuntungan',
'total_nilaimarhun'
'total_nilaimarhun',
'total_upahkeuntungan2'
));
}
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');
}
@@ -841,5 +864,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'
));
}
}
@@ -0,0 +1,135 @@
@extends('layouts.app')
@section('content')
<div class="container-fluid">
<div class="row ">
<div class="col-md-12 mx-auto card">
<h3 class="pt-3" style="margin-left:1%;">Butiran Bidaan Pembida Yang Menang</h3>
@if ($message = Session::get('failed'))
<div class="alert alert-danger">
<p>{{ $message }}</p>
</div>
@endif
<div class="container">
<div class="row mb-2">
<div class="col-md-12 mx-auto card p-4" style="margin-top:2%; margin-bottom:2%;">
<p> <b>Tarikh Lelong : </b> {{ $infos[0]['t_lelong'] }}</p>
<p> <b>Cawangan : </b>{{ $infos[0]['caw_name'] }}</p>
<p> <b>Nama Pembida : </b>{{ $userdetail['name'] }}</p>
<p> <b>No Kad Pengenalan : </b>{{ $userdetail['nokp'] }}</p>
<p> <b>No Tel Bimbit : </b>{{ $infos[0]['notelbimbit'] }}</p>
</div>
</div>
</div>
<table class="table table-striped table-xl text-center" id="butirangadai" style="width:100%; margin-top:1%;">
<thead class="bg-primary text-white">
<tr>
<th>Bil</th>
<th>No Rujukan</th>
<th>Marhun</th>
<th>Harga Asas (RM)</th>
<th>Harga Bida (RM)</th>
<th>Nilai Marhun (RM)</th>
<th>Berat (gm)</th>
<th>Masa Bidaan</th>
<th>Kaedah Pembayaran</th>
<th>No Resit</th>
</tr>
</thead>
<tbody>
@foreach($infos as $inf)
<tr>
<td>{{ $loop->iteration }}</td>
<td>{{ $inf['info']['norujukan'] }}</td>
<td>{{ $inf['info']['marhun'] }}</td>
<td>{{ $inf['info']['hargaasas'] }}</td>
<td>{{ $inf['info']['hargabida'] }}</td>
<td>{{ $inf['info']['nilaimarhun'] }}</td>
<td>{{ $inf['info']['berat'] }}</td>
<td>{{ $inf['info']['masa_bidaan'] }}</td>
<td>
@foreach($inf['butiran_bidaan'] as $butiran_bidaan)
{{ $butiran_bidaan['remark'] }}
@endforeach
</td>
<td>
@foreach($inf['butiran_bidaan'] as $butiran_bidaan)
{{ $butiran_bidaan['reference_no'] }}
@endforeach
</td>
</tr>
@endforeach
</tbody>
</table>
<div class="modal-footer">
<a href="{{ route('pembida.senlelpembayaranbidaan') }}" class="btn btn-primary" style="width:8%;">Kembali</a>
</div>
</div>
</div>
</div>
<script>
//Enable tooltips everywhere
$(function () {
$('[data-toggle="tooltip"]').tooltip()
})
var tablebutirangadai = $('#butirangadai').DataTable({
"columnDefs": [
{
"targets": 0,
"orderable": false
},
{
"targets": 8,
"orderable": true
}
],
order: [[1, 'asc']],
"info": false,
"lengthChange": false,
"pageLength": 15,
dom: 'Bfrtip',
// buttons: [
// {
// className: 'btn btn-outline-success pl-4 pr-4 btn-sm addcaw',
// text: '<i class="fas fa-plus" id="test"></i>',
// titleAttr: 'Tambah Cawangan',
// action: function ( e, dt, node, config ) {
// // alert( 'Button activated' );
// // console.log('hye');
// $('#myModal').modal("show");
// $('#myModal').on('shown.bs.modal', function () {
// $('#rolename').trigger('focus')
// })
// }
// },
// {
// className: 'btn btn-outline-secondary pl-4 pr-4 btn-sm export',
// titleAttr: 'Senarai Gadaian Excel',
// text: '<i class="fas fa-download"></i>',
// action: function ( e, dt, node, config ) {
// $("#exportform").submit();
// }
// },
// {
// className: 'btn btn-outline-secondary pl-4 pr-4 btn-sm export',
// titleAttr: 'Senarai Gadaian PDF',
// text: '<i class="fas fa-download"></i>',
// action: function ( e, dt, node, config ) {
// $("#exportform").submit();
// }
// }
// ]
});
$('.addcaw').tooltip();
$('.export').tooltip();
// $( '.dt-buttons').addClass('btn-group');
$( '.addcaw').removeClass('dt-button');
$( '.export').removeClass('dt-button');
</script>
@endsection
+1 -1
View File
@@ -8,7 +8,7 @@
<div class="alert alert-success">
<p>{{ $message }}</p>
</div>
@endif
@endif
<form action="{{ route('pembida.update') }}" method="POST" id="formkemaskini">
@csrf
<input type="hidden" value="{{$user->id}}" class="form-control" name="userid" id="userid" readonly>
@@ -10,55 +10,58 @@
<p>{{ $message }}</p>
</div>
@endif
<table class="table table-striped table-xl text-center" id="senarailelongonline" style="width:100%">
<thead class="bg-primary text-white">
<table class="table table-striped table-xl text-center" id="senarailelongonline" style="width:100%">
<thead class="bg-primary text-white">
<tr>
<th>Bil</th>
<th>Nama Pembida</th>
<th>No Kad Pengenalan</th>
<th>Bilangan Surat</th>
<th> Jumlah Bidaan (RM)</th>
<th> Amaun Telah Dibayar (RM)</th>
<th>Status Pembayaran</th>
<th>Remark</th>
<th>Status</th>
<th class="text-center">Action</th>
</tr>
</thead>
<tbody>
@foreach($listwinner as $index1=>$winner)
<tr>
<th>Bil</th>
<th>Nama Pembida</th>
<th>No Kad Pengenalan</th>
<th>Bilangan Surat</th>
<th> Jumlah Bidaan (RM)</th>
<th> Amaun Telah Dibayar (RM)</th>
<th>Status Pembayaran</th>
<th>Remark</th>
<th>Status</th>
<th class="text-center">Action</th>
<td>{{ $loop->iteration }}</td>
<td>{{ $winner['details']['name'] }}</td>
<td>{{ $winner['details']['nokp'] }}</td>
<td>{{ $winner['total_surat'] }}</td>
<td>{{ $winner['totalBid'] }}</td>
<td>{{ $winner['totalPay'] }}</td>
<td>
@if($winner['jenisbayaran']['status'] == 1)
<button class="btn btn-info btn-sm" disabled>FEE</button>
@elseif($winner['jenisbayaran']['status'] == 2)
<button class="btn btn-info btn-sm" disabled>BIDAAN MENANG</button>
@endif
</td>
<td>
<button class="btn btn-info btn-sm" disabled>{{ $winner['jenisbayaran']['remarks'] }}</button>
</td>
<td>
@if($winner['jenisbayaran']['status_payment'] == 1)
<button class="btn btn-success btn-sm" disabled>BERJAYA</button>
@endif
</td>
<td>
{{-- {{ dd($winner) }} --}}
<a href="{{ route('pembida.detailsbidaan', [ 'user_id'=>$winner['details']['id'], 'payment_id'=>$winner['payment_id'][0]['payment_id'], $kodcaw ]) }}" data-toggle="tooltip" data-placement="top" title="Butiran Bidaan"><i class="far fa-list-alt"></i></a>
</td>
</tr>
</thead>
<tbody>
@foreach($listwinner as $index1=>$winner)
<tr>
<td>{{ $loop->iteration }}</td>
<td>{{ $winner['details']['name'] }}</td>
<td>{{ $winner['details']['nokp'] }}</td>
<td>{{ $winner['total_surat'] }}</td>
<td>{{ $winner['totalBid'] }}</td>
<td>{{ $winner['totalPay'] }}</td>
<td>
@if($winner[$index1]['status'] == 1)
<button class="btn btn-info btn-sm" disabled>FEE</button>
@elseif($winner[$index1]['status'] == 2)
<button class="btn btn-info btn-sm" disabled>BIDAAN MENANG</button>
@endif
</td>
<td>
<button class="btn btn-info btn-sm" disabled>{{ $winner[$index1]['remarks'] }}</button>
</td>
<td>
@if($winner[$index1]['status_payment'] == 1)
<button class="btn btn-success btn-sm" disabled>BERJAYA</button>
@endif
</td>
<td>
</td>
</tr>
@endforeach
</tbody>
</table>
<div class="modal-footer" style="margin-top:2%;">
<a href="{{ route('pembida.senlelpembayaranbidaan') }}" class="btn btn-primary">Kembali</a>
</div>
</div>
@endforeach
</tbody>
</table>
<div class="modal-footer" style="margin-top:2%;">
<a href="{{ route('pembida.senlelpembayaranbidaan') }}" class="btn btn-primary">Kembali</a>
</div>
</div>
</form>
</div>
</div>
@@ -74,11 +77,23 @@
"orderable": false
},
{
"targets": 6,
"orderable": false
},
{
"targets": 7,
"orderable": false
},
{
"targets": 8,
"orderable": false
},
{
"targets": 9,
"orderable": false
}
],
order: [[1, 'asc']],
order: [[0, 'asc']],
"info": false,
"lengthChange": false,
"pageLength": 15,
@@ -38,7 +38,7 @@
<td>{{$lel['detail']['jbg']}}</td>
<td>{{$lel['detail']['cajlelong']}}</td>
<td>
<a href="{{ route('pengesahan.senaraitangguhlelong', [$lel['detail']['id'], 'caw_name'=>$details['caw_name']]) }}" data-toggle="tooltip" data-placement="top" title="Butiran" class="text-center" ><i class="far fa-edit"></i></a>
<a href="{{ route('pengesahan.senaraitangguhlelong', [ $lel['detail']['id'], 'caw_name'=>$details['caw_name'] ]) }}" data-toggle="tooltip" data-placement="top" title="Butiran" class="text-center" ><i class="far fa-edit"></i></a>
</td>
</tr>
@endforeach
+21 -17
View File
@@ -14,55 +14,59 @@
<p>{{ $message }}</p>
</div>
@endif
<form action="{{route('analisa.janadata')}}" method="POST" enctype="multipart/form-data">
<!-- <form action="{{route('analisa.janadata')}}" method="POST" enctype="multipart/form-data"> -->
<form action="{{route('analisa.senaraitempsimulasi')}}" method="POST" enctype="multipart/form-data">
@csrf
<div class="form-group row">
<label for="tarikh_lelong" class="col-sm-1 col-form-label">Tarikh</label>
<div class="col-sm-4">
<label for="tarikh_lelong" class="col-sm-2 col-form-label">Tarikh Lelong</label>
<div class="col-sm-3">
<input type="date" class="form-control" id="tarikh_lelong" name="tarikh_lelong" placeholder="Tarikh">
</div>
<label for="hargaasas" class="col-sm-1 col-form-label">Harga Emas Asas</label>
<!-- <label for="hargaasas" class="col-sm-1 col-form-label">Harga Emas Asas</label>
<div class="col-sm-4">
<input type="text" class="form-control" id="hargaasas" name="hargaasas" placeholder="RM">
</div>
</div> -->
</div>
<div class="form-group row">
<label for="jbg" class="col-sm-1 col-form-label">Fasa Lelong</label>
<label for="jbg" class="col-sm-2 col-form-label">Fasa Lelong</label>
<div class="col-sm-4">
<input type="radio" value='1' id="fasa1" name="fasa" checked>
<label for="1">Fasa 1</label>
<input type="radio" value='2' id="fasa2" name="fasa">
<label for="2">Fasa 2</label>
</div>
<label for="cajlelong" class="col-sm-1 col-form-label">Caj Lelong</label>
<!-- <label for="cajlelong" class="col-sm-1 col-form-label">Caj Lelong</label>
<div class="col-sm-4">
<input type="text" class="form-control" id="cajlelong" name="cajlelong" placeholder="%">
</div>
</div> -->
</div>
<div class="form-group row">
<label for="jbg" class="col-sm-1 col-form-label">JBG</label>
<label for="jbg" class="col-sm-2 col-form-label">Tempoh</label>
<div class="col-sm-4" id="fasa_1">
<input type="text" class="form-control" id="jbg" name="jbg" placeholder="JBG">
<input type="text" class="form-control" id="jbg" name="jbg" placeholder="Tempoh">
</div>
<label for="caw" class="col-sm-1 col-form-label">Cawangan</label>
<!-- <label for="caw" class="col-sm-1 col-form-label">Cawangan</label>
<div class="col-sm-4">
<select class="selectpicker" multiple name="caw[]" id="caw">
<!-- <option value="">Please select</option> -->
@foreach ($caw as $item)
<option value="{{$item->id}}">{{$item->caw_name}}</option>
@endforeach
<!-- <option value="all">Select All</option> -->
</select>
</div>
</div> -->
</div>
<div class="form-group row">
<label for="cajlelong" class="col-sm-2 col-form-label">Caj Lelong</label>
<div class="col-sm-4">
<input type="text" class="form-control" id="cajlelong" name="cajlelong" value = '3'>
</div>
</div>
<div class="form-group row">
<div class="col-sm-10">
<button type="submit" class="btn btn-primary">Jana Simulasi</button>
<button type="submit" class="btn btn-primary">Carian</button>
</div>
</div>
</form>
@@ -20,11 +20,11 @@
<thead class="bg-primary text-white">
<tr>
<th>No.</th>
<th>Tarikh Lelong</th>
<!-- <th>Tarikh Lelong</th>
<th>Kod Cawangan</th>
<th>Nama Cawangan</th>
<th>Nama Cawangan</th> -->
<th>Norujukan</th>
<th>Pinjaman (RM)</th>
<th>Pembiayaan (RM)</th>
<th>Tempoh</th>
<th>Berat (gm)</th>
<th>Nilai Marhun (RM)</th>
@@ -40,9 +40,9 @@
@foreach ($marhuns as $index=> $marhun)
<tr>
<td>{{$loop->iteration}}</td>
<td>{{ $marhun['t_lelong'] }}</td>
<!-- <td>{{ $marhun['t_lelong'] }}</td>
<td class="text-center">{{ $marhun['kodcaw'] }}</td>
<td>{{ $marhun['caw_name'] }}</td>
<td>{{ $marhun['caw_name'] }}</td> -->
<td>{{ $marhun['norujukan']}}</td>
<td>{{ number_format($marhun['pinjaman'], 2, '.', ',') }}</td>
<td>{{ number_format($marhun['tempoh'], 2, '.', ',') }}</td>
@@ -29,7 +29,11 @@
<tr>
<td>{{$loop->iteration}}</td>
<td>{{$info['info']['simulasi_id']}}</td>
<td>{{$info['info']['tarikh_lelong']}}</td>
<td>@php
$myDateTime = DateTime::createFromFormat('Y-m-d', $info['info']['tarikh_lelong'] );
$t_lelong = $myDateTime->format('d-m-Y');
echo($t_lelong);
@endphp</td>
<td>{{$info['info']['fasa']}}</td>
<td align = 'left'>
@foreach($info['detailsinfo'] as $info2)
@@ -0,0 +1,153 @@
@extends('layouts.app')
@section('content')
<div class="container-fluid">
<div class="row ">
<div class="col-md-12 mx-auto card">
@if ($message = Session::get('failed'))
<div class="alert alert-danger" style="margin-top:1%;">
<p>{{ $message }}</p>
</div>
@endif
<h3 class="pt-3" style="margin-left:1%;">Butiran Gadaian Mengikut Cawangan Lelongan Fasa {{$fasa}}</h3>
<form action="{{route('analisa.janadata')}}" method="POST" enctype="multipart/form-data">
@csrf
<input type="hidden" class="form-control" id="fasa" name="fasa" value="{{$fasa}}">
<div class="container">
<div>
<div style="margin-top:2%; margin-bottom:2%;" align = "left">
<p> <b>Tarikh Lelong : </b> {{ $t_lelong1 }}</p>
<p> <b>Tarikh Gadai Sehingga : </b> @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</p>
<input type="hidden" class="form-control" id="tarikh_lelong" name="tarikh_lelong" value="{{$t_lelong2}}">
<input type="hidden" class="form-control" id="t_gadai" name="t_gadai" value="@php echo($t_gadai1) @endphp">
<input type="hidden" class="form-control" id="jbg" name="jbg" value="{{$jbg}}">
<input type="hidden" class="form-control" id="hargaasas" name="hargaasas" value="0.00">
<input type="hidden" class="form-control" id="cajlelong" name="cajlelong" value="{{$cajlelong}}">
</div>
</div>
</div>
<table class="table table-striped table-xl text-center" id="senaraitemp" style="width:100%">
<thead class="bg-primary text-white">
<tr>
<th><input type="checkbox" aria-label="Checkbox for following text input" class="check_all"></th>
<th>Kod Cawangan</th>
<th>Cawangan</th>
<th>Bil Lelong</th>
<th>Berat (gm)</th>
<th>Nilai Marhun</th>
<th>Pembiayaan (RM)</th>
<th>Baki Pembiayaan (RM)</th>
<th class="text-center">Action</th>
</tr>
</thead>
<tbody>
@foreach($senarai as $send)
<tr>
<td><input type="checkbox" aria-label="Checkbox for following text input" name="caw[]" id="caw" value = "{{ $send['kodcaw'] }}" class="custom_name"></td>
<td>{{ $send['kodcaw'] }}</td>
<td align="left">{{ $send['caw_name'] }}</td>
<td>{{ $send['bil_lelong'] }} </td>
<td align="right">{{ number_format($send['total_berat'], 2) }} </td>
<td align="right">{{ number_format($send['total_nilaimarhun'], 2) }} </td>
<td align="right">{{ number_format($send['total_pembiayaan'] , 2) }} </td>
<td align="right">{{ number_format($send['total_bakipjm'] , 2) }} </td>
<td>
<a href=" {{ route('analisa.tempbycawsimulasi', [$send['kodcaw'],$t_gadai1,$fasa]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Gadaian"><i class="far fa-edit"></i></a>
</td>
</tr>
@endforeach
</tbody>
</table>
<div class="modal-footer; text-center" style="margin-top:2%; margin-bottom:2%;">
<a href="{{ route('analisa.janasimulasi') }}" class="btn btn-primary" style="width:8%;">Kembali</a>
<button type="submit" class="btn btn-success">Jana Simulasi</button>
</div>
</form>
</div>
</div>
</div>
<script>
//Enable tooltips everywhere
$(function () {
$('[data-toggle="tooltip"]').tooltip()
})
var tablesenaraitemp = $('#senaraitempsimulasi').DataTable({
"columnDefs": [
{
"targets": 0,
"orderable": false
},
{
"targets": 8,
"orderable": false
}
],
order: [[1, 'asc']],
"info": false,
"lengthChange": false,
"pageLength": 15,
dom: 'Bfrtip',
// buttons: [
// {
// className: 'btn btn-outline-success pl-4 pr-4 btn-sm addcaw',
// text: '<i class="fas fa-plus" id="test"></i>',
// titleAttr: 'Tambah Cawangan',
// action: function ( e, dt, node, config ) {
// // alert( 'Button activated' );
// // console.log('hye');
// $('#myModal').modal("show");
// $('#myModal').on('shown.bs.modal', function () {
// $('#rolename').trigger('focus')
// })
// }
// },
// {
// className: 'btn btn-outline-secondary pl-4 pr-4 btn-sm export',
// titleAttr: 'Export to CSV',
// text: '<i class="fas fa-download"></i>',
// action: function ( e, dt, node, config ) {
// $("#exportform").submit();
// }
// }
// ]
});
// $('.addcaw').tooltip();
// $('.export').tooltip();
// // $( '.dt-buttons').addClass('btn-group');
// $( '.addcaw').removeClass('dt-button');
// $( '.export').removeClass('dt-button');
</script>
<script
src="https://code.jquery.com/jquery-3.4.1.js"
integrity="sha256-WpOohJOqMqqyKL9FccASB9O0KwACQJpFTUBLTYOVvVU="
crossorigin="anonymous"></script>
<script>
$(".check_all").on("click", function(){
$(".custom_name").each(function(){
$(this).attr("checked", true);
});
});
</script>
@endsection
@@ -110,7 +110,7 @@
<td>{{ number_format($total_berat, 2, '.', ',') }}</td>
<td>{{ number_format($total_nilaimarhun, 2, '.', ',') }}</td>
<td>{{ number_format($total_pinjaman, 2, '.', ',') }}</td>
<td>{{ number_format($total_upahkeuntungan, 2, '.', ',') }}</td>
<td>{{ number_format($total_upahkeuntungan2, 2, '.', ',') }}</td>
<td>{{ number_format($total_hargaasas, 2, '.', ',') }}</td>
<td>{{ number_format($total_cazlelong, 2, '.', ',') }}</td>
<td>{{ number_format($total_bakilelong, 2, '.', ',') }}</td>
@@ -0,0 +1,128 @@
@extends('layouts.app')
@section('content')
<div class="container-fluid">
<div class="row ">
<div class="col-md-12 mx-auto card">
<h3 class="pt-3" style="margin-bottom:2%; margin-top:1%;">Butiran Gadaian Cawangan {{ $details }}</h3>
@if ($message = Session::get('failed'))
<div class="alert alert-danger">
<p>{{ $message }}</p>
</div>
@endif
<form action="{{route('analisa.senaraitempsimulasi')}}" id="formtlelong" method="POST">
@csrf
<div class="container">
<div class="row mb-2">
<button type="button" class="btn btn-primary" ><a href="javascript:window.history.go(-1);">Kembali</a></button>
</div>
</div>
<table class="table table-striped table-xl text-center" id="detailsgadai" style="width:100%; margin-top:1%;">
<thead class="bg-primary text-white">
<tr>
<th>Bil</th>
<th>No Rujukan</th>
<th>No Kad Pengenalan</th>
<th>Tempoh</th>
<th>Berat (gm)</th>
<th>Pembiayaan (RM)</th>
<th>Baki Pembiayaan (RM)</th>
<th>Keuntungan 6 Bulan (RM)</th>
<th>Keuntungan Telah Bayar (RM)</th>
<th>Nilai Marhun (RM)</th>
<th>Tamat Kontrak</th>
</tr>
</thead>
<tbody>
@foreach($getsurat as $surat)
<tr>
<td>{{ $loop->iteration }}</td>
<td>{{ $surat['list_norujukan'][0]['norujukan'] }}</td>
<td>{{ $surat['list_norujukan'][0]['nokp'] }}</td>
<td>{{ $surat['list_norujukan'][0]['tempoh'] }}</td>
<td>{{ $surat['list_norujukan'][0]['berat'] }}</td>
<td>{{ $surat['list_norujukan'][0]['pinjaman'] }}</td>
<td>{{ $surat['list_norujukan'][0]['bakipjm'] }}</td>
<td>{{ $surat['list_norujukan'][0]['bakiupah'] }}</td>
<td>{{ $surat['list_norujukan'][0]['ansakhir'] }}</td>
<td>{{ $surat['list_norujukan'][0]['nilaimarhun'] }}</td>
<td>{{ $surat['list_norujukan'][0]['t_matang1'] }}</td>
</tr>
@endforeach
</tbody>
</table>
</form>
</div>
</div>
</div>
<script>
//Enable tooltips everywhere
$(function () {
$('[data-toggle="tooltip"]').tooltip()
})
function kembali() {
$("#formtlelong").submit();
}
var tabledetailsgadai = $('#detailsgadai').DataTable({
"columnDefs": [
{
"targets": 0,
"orderable": false
},
{
"targets": 8,
"orderable": true
}
],
order: [[1, 'asc']],
"info": false,
"lengthChange": false,
"pageLength": 15,
dom: 'Bfrtip',
buttons: [
// {
// className: 'btn btn-outline-success pl-4 pr-4 btn-sm addcaw',
// text: '<i class="fas fa-plus" id="test"></i>',
// titleAttr: 'PDF Senarai Gadaian',
// action: function ( e, dt, node, config ) {
// // alert( 'Button activated' );
// // console.log('hye');
// $('#myModal').modal("show");
// $('#myModal').on('shown.bs.modal', function () {
// $('#rolename').trigger('focus')
// })
// }
// },
{
className: 'btn btn-outline-secondary pl-4 pr-4 btn-sm export',
titleAttr: 'Senarai Gadaian Excel',
text: '<i class="fas fa-download"></i>',
action: function ( e, dt, node, config ) {
$("#exportform").submit();
}
},
{
className: 'btn btn-outline-secondary pl-4 pr-4 btn-sm export',
titleAttr: 'Senarai Gadaian PDF',
text: '<i class="fas fa-download"></i>',
action: function ( e, dt, node, config ) {
$("#exportform").submit();
}
}
]
});
$('.addcaw').tooltip();
$('.export').tooltip();
// $( '.dt-buttons').addClass('btn-group');
$( '.addcaw').removeClass('dt-button');
$( '.export').removeClass('dt-button');
</script>
@endsection
+4
View File
@@ -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 () {
@@ -184,6 +187,7 @@ Route::group(['middleware' => ['permission:pengesahanpembida'],'prefix'=>'pembid
Route::post('/update',['as'=>'pembida.update','uses'=>'PembidaController@update']);
Route::get('/senlelpembayaranbidaan',['as'=>'pembida.senlelpembayaranbidaan','uses'=>'PembidaController@senlelpembayaranbidaan']);
Route::get('/pembayaranbidaan',['as'=>'pembida.pembayaranbidaan','uses'=>'PembidaController@pembayaranbidaan']);
Route::get('/detailsbidaan/{user_id}/{payment_id}/{kodcaw}',['as'=>'pembida.detailsbidaan','uses'=>'PembidaController@detailsbidaan']);
});
Route::group(['middleware' => ['permission:pengesahan'],'prefix'=>'pengesahan'], function () {