KoPKB/lelong
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into amirah

Browse Source
This commit is contained in:
Amirah22
2022-05-18 12:17:55 +08:00
parent b108eafa1b 2f91401299
commit e53cd7b573
34 changed files with 1543 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/ImportDataController.php
+5 -4
View File
@@ -72,7 +72,7 @@ class ImportDataController extends Controller
mysqli_select_db($db,$caw_dbname);
$count = 0;
$result=mysqli_query($db,"SELECT * FROM gadai where sttebus = '' and upah12 is NOT NULL");
$result=mysqli_query($db,"SELECT * FROM gadai where taglel = '0' and sttebus = '' and upah12 is NOT NULL");
while($row_gadai = mysqli_fetch_array($result))
{
@@ -108,9 +108,9 @@ class ImportDataController extends Controller
$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')");
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')");
//untuk gadaimarhun
$result1=mysqli_query($db,"SELECT * FROM marhun where norujukan = '$norujukan'");
@@ -127,9 +127,10 @@ class ImportDataController extends Controller
$berat1 = $row_tender1['berat'];
$harga1 = $row_tender1['harga'];
$n_marhun1 = $row_tender1['n_marhun'];
$nota2 = $db -> real_escape_string($nota1);
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')");
VALUES ('$kodcaw1','$norujukan1','$t_gadai1','$bil1','$marhun1','$nota2','$karat1','$berat1','$harga1','$n_marhun1')");
}
app/Http/Controllers/LelongController.php
+2
View File
@@ -792,9 +792,11 @@ class LelongController extends Controller
public function senaraisagpemenang($user_id, $lelong_id){
// dd($user_id);
$senaraisag = LelongBid::join('lelongbidder', 'lelongbid.id', '=', 'lelongbidder.lelongbid_id')
->where('lelongbid.lelong_id', $lelong_id)
->where('lelongbidder.user_id', $user_id)
->where('lelongbidder.status_bidder', 1)
->get();
return view('lelong.senaraisagpemenang', compact('senaraisag', 'user_id', 'lelong_id'));
app/Http/Controllers/MarhunController.php
+83 -35
View File
@@ -394,25 +394,25 @@ class MarhunController extends Controller
return view('pengesahan.senarailelongubahmutu',compact('lelong'));
}
public function sahubahmutu($id)
{
$mutumarhun = Lelong::join('pengesahan', 'lelong.id', '=', 'pengesahan.lelong_id')
->where('lelong.id', $id)
->whereNull('disahkan_oleh')
public function sahubahmutu($id){
$mutumarhun = Pengesahan::whereNull('disahkan_oleh')
->whereNull('disahkan_pada')
->where('lelong_id', $id)
->whereIn('status_ubah', [1,2,3,4,5])
->selectRaw('count(*) as total, sum(status) as tstat,norujukan')
->groupBy('pengesahan.norujukan')
->groupBy('norujukan')
->get()->toArray();
foreach($mutumarhun as $index1=>$mutu)
{
$cawangan = CawanganLelong::join('cawangan', 'cawangan_lelong.caw_id', 'cawangan.id')
->join('lelongbid', 'cawangan_lelong.lelong_id', '=', 'lelongbid.lelong_id')
$cawangan = LelongBid::join('cawangan', 'lelongbid.caw_id', 'cawangan.id')
->where('lelongbid.lelong_id', $id)
->where('lelongbid.norujukan', $mutu['norujukan'])
->select('cawangan.caw_name')
->first();
// dd($cawangan);
$mutumarhun[$index1]['cawangan_name'] = $cawangan;
$mutumarhun[$index1]['cawangan_name'] = $cawangan['caw_name'];
}
// foreach($mutumarhun as $index1=>$marhun)
@@ -528,7 +528,7 @@ class MarhunController extends Controller
$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();
@@ -538,7 +538,6 @@ class MarhunController extends Controller
->where('pengesahan.lelongbid_id', $pengesahan->lelongbid_id)
->where('pengesahan.id', $pengesahan->id)
->get();
dd($lelongbidmarhuns['marhun']);
foreach($lelongbidmarhuns as $bidmarhuns)
{
@@ -550,29 +549,32 @@ class MarhunController extends Controller
{
//
}
$txtmarhun = ",1 " . $bidmarhuns->marhun ;
}
$pengesahan = Pengesahan::join('lelongbidmarhun', 'pengesahan.lelongbid_id', '=', 'lelongbidmarhun.lelongbid_id')
$pengesahans = 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();
// $marhun = LelongBidMarhun::join('lelongbid', 'lelongbidmarhun.lelongbid_id', '=', 'lelongbid.id')
// ->where('lelongbid_id','=',$pengesahan->lelongbid_id)
// ->get();
$lelongbids = LelongBid::where('id', $lelongbid[0]['id'])->first();
$lelongbids->marhun = str_replace( $txtmarhun,"",$lelongbids->marhun);
$lelongbids->berat = $lelongbids->berat;
$lelongbids->hargaasas = $lelongbids->hargaasas;
$lelongbids->save();
// $this->pcdelete($request->pengesahan_id, $pengesahan->lelongbid_id);
}
else if($request->jenis_button == "tangguhlelong")
{
$pengesahan = Pengesahan::where('norujukan', $request->norujukan)
->get();
dd($pengesahan) ;
//add into table tangguhlelong
$tangguhlelong = new TangguhLelong;
$tangguhlelong->lelong_id = $pengesahan->lelong_id;
@@ -653,16 +655,29 @@ class MarhunController extends Controller
public function senarailelong()
{
$lelong = Lelong::where('sts_lelong', 0)
->get();
$arrayinfo = [];
return view('pengesahan.senarailelong',compact('lelong'));
$lelong = Lelong::where('sts_lelong', 0)
->get()->toArray();
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'));
}
public function senaraitangguhlelong($id)
public function senaraitangguhlelong($id, $caw_name)
{
$tangguhlelong = TangguhLelong::join('lelongbid', 'tangguhlelong.lelongbid_id', '=', 'lelongbid.id')
$tangguhlelong = TangguhLelong::join('lelong', 'tangguhlelong.lelong_id', '=', 'lelong.id')
->where('tangguhlelong.lelong_id', $id)
->whereNotNull('tangguhlelong.tarikhtangguh')
->select('tangguhlelong.id as tangguhlelong_id',
'tangguhlelong.lelongbid_id',
'tangguhlelong.norujukan',
@@ -678,20 +693,53 @@ class MarhunController extends Controller
'lelong.sts_lelong'
)
->get();
// dd($tangguhlelong);
return view('pengesahan.senaraitangguhlelong',compact('tangguhlelong','id'));
foreach($tangguhlelong as $index1=>$tanguhlel)
{
$getkodcaw = LelongBid::join('cawangan', 'lelongbid.kodcaw', '=', 'cawangan.caw_code')
->where('lelong_id', $id)
->first();
$tangguhlelong[$index1]['details'] = $tanguhlel;
$tangguhlelong[$index1]['nama_caw'] = $getkodcaw;
}
return view('pengesahan.senaraitangguhlelong',compact('tangguhlelong','id', 'caw_name'));
}
public function lelbidmarhun($id, $norujukan, $tangguhlelong_id)
{
$marhuns = LelongBidMarhun::join('tangguhlelong', 'lelongbidmarhun.lelongbid_id', '=', 'tangguhlelong.lelongbid_id')
$tangguhlelong = TangguhLelong::join('gadaimarhun', 'tangguhlelong.norujukan', '=', 'gadaimarhun.norujukan')
->where('gadaimarhun.norujukan', $norujukan)
->where('tangguhlelong.id', $tangguhlelong_id)
->where('tangguhlelong.lelong_id', $id)
->where('tangguhlelong.norujukan', $norujukan)
->select('tangguhlelong.id as tangguhlelong_id',
'tangguhlelong.lelong_id',
'tangguhlelong.lelongbid_id',
'tangguhlelong.norujukan',
'tangguhlelong.pinjaman',
'tangguhlelong.tarikhtangguh',
'tangguhlelong.nota as tangguh_nota',
'tangguhlelong.pinjaman',
'gadaimarhun.bil',
'gadaimarhun.marhun',
'gadaimarhun.nota as gadai_nota',
'gadaimarhun.karat',
'gadaimarhun.berat',
'gadaimarhun.harga',
'gadaimarhun.n_marhun'
)
->get();
return view('pengesahan.lelbidmarhun',compact('tangguhlelong', 'id', 'norujukan'));
$caw_names = GadaiMarhun::join('cawangan', 'gadaimarhun.kodcaw', '=', 'cawangan.caw_code')
->where('gadaimarhun.norujukan', $norujukan)
->select('cawangan.caw_name')
->first();
// dd($caw_names);
return view('pengesahan.lelbidmarhun',compact('tangguhlelong', 'id', 'norujukan', 'caw_names'));
}
}
app/Http/Controllers/PaymentController.php
+55 -27
View File
@@ -24,11 +24,9 @@ class PaymentController extends Controller
$senarai = CawanganLelong::join('lelong', 'cawangan_lelong.lelong_id', '=', 'lelong.id')
->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id')
->where('cawangan.caw_code', $user->kodcaw)
->where('sts_lelong', 3)
->where('lelong.sts_lelong', 3)
->get();
// dd($senarai);
return view('pembayaran.senarailelongbayaran',compact('senarai'));
}
@@ -120,6 +118,7 @@ class PaymentController extends Controller
}
public function paymentdenokaunter(Request $request){
// dd($request->all());
$currentdate = Carbon::now();
@@ -127,7 +126,9 @@ class PaymentController extends Controller
$user = Auth::user();
$bid_id = explode(",", $request->eachbid);
// $bid_id = implode(",", $request->eachbid);
$bid_id = $request->eachbid;
// dd($bid_id);
$resit = Resit::where('lelong_id', $request->lelong_id)
->where('user_id',$request->user_id)
@@ -158,24 +159,24 @@ class PaymentController extends Controller
'disahkan_oleh' => $user->id,
'disahkan_pada' => $currentdate
]);
foreach($bid_id as $bid){
foreach($bid_id as $bid)
{
$eachbid = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
->join('users', 'lelongbidder.user_id', '=', 'users.id')
->where('lelongbidder.lelongbid_id', $bid)
->select('lelongbidder.hargabida',
'lelongbid.hargaasas',
'lelongbid.norujukan',
'lelongbidder.lelongbid_id',
'lelongbidder.id as lelongbidder_id',
'lelongbid.lelong_id as lelong_id'
)
'lelongbid.hargaasas',
'lelongbid.norujukan',
'lelongbidder.lelongbid_id',
'lelongbidder.id as lelongbidder_id',
'lelongbid.lelong_id as lelong_id'
)
->first();
$total_hargabida = $total_hargabida + $eachbid->hargabida;
// dd($total_hargabida);
$updatelelbidbidder = LelongBidder::where('lelongbid_id', $eachbid->lelongbid_id)
->where('user_id',$request->user_id)
->first();
@@ -191,14 +192,15 @@ class PaymentController extends Controller
$eachbidupdate->save();
}
$senaraisagallpayment = LelongBid::join('lelongbidder', 'lelongbid.id', '=', 'lelongbidder.lelongbid_id')
->where('lelongbid.lelong_id', $request->lelong_id)
->where('lelongbidder.user_id', $request->user_id)
->where('lelongbidder.status_bidder', 1)
->get();
// dd(floatval($request->amaunkiraan));
if(floatval($request->amaunkiraan) == $total_hargabida){
// dd('hye');
if(floatval($request->amaunkiraan) == $total_hargabida)
{
$resit->total_payment = $resit->total_payment + $total_hargabida;
if($resit->total_payment >= $senaraisagallpayment->sum('hargabida'))
{
@@ -207,11 +209,14 @@ class PaymentController extends Controller
}
$resit->save();
}
return redirect()->route('pembayaran.SenaraiLelongBayar')->with('success','Pembayaran Berjaya');
}
public function pengesahanPembayaran(Request $request){
// dd($request->all());
$pengesahanPembayaran = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
->join('users', 'lelongbidder.user_id', '=', 'users.id')
->where('lelongbidder.status_bidder', 1)
@@ -228,15 +233,15 @@ class PaymentController extends Controller
$currentdate = $currentdate->toDateTimeString();
$user = Auth::user();
// dd($user);
$totalcheck = implode(",", $request->checkboxdata);
// $totalcheck = implode(",", $request->checkboxdata);
$bid_id = explode(",", $request->eachbid); //bid_id = lelongbid_id
$resit = Resit::where('lelong_id', $request->lelong_id)
->where('user_id',$request->user_id)
->where('resit_type', 2)
->first();
$payment = new Payment;
$payment->user_id = $request->user_id;
$payment->lelong_id = $request->lelong_id;
@@ -245,21 +250,44 @@ class PaymentController extends Controller
$payment->status = 2;
$payment->remark = 'BAYARAN CDM';
$payment->resit_id = $resit->id;
$payment->total_payment = $totalcheck;
$payment->total_payment = $request->total;
$payment->diminta_pada = $currentdate;
$payment->diminta_oleh = $user->id;
$payment->save();
$sts_payment = LelongBidder::where('user_id', $request->user_id)
->where('lelongbid_id', $request->eachbid)
foreach($bid_id as $bid){
$eachbid = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
->join('users', 'lelongbidder.user_id', '=', 'users.id')
->where('lelongbidder.lelongbid_id', $bid)
->select('lelongbidder.hargabida',
'lelongbid.hargaasas',
'lelongbid.norujukan',
'lelongbidder.lelongbid_id',
'lelongbidder.id as lelongbidder_id',
'lelongbid.lelong_id as lelong_id'
)
->first();
$sts_payment->payment_id = $payment->id;
$sts_payment->status_payment = 2; //Menunggu pengesahan account
$sts_payment->update();
$updatelelbidbidder = LelongBidder::where('lelongbid_id', $eachbid->lelongbid_id)
->where('user_id',$request->user_id)
->first();
$updatelelbidbidder->status_payment = 1;
$updatelelbidbidder->payment_id = $payment->id;
$updatelelbidbidder->save();
$eachbidupdate = LelongBid::where('id',$bid)->first();
$eachbidupdate->status_jual = 1;
$eachbidupdate->status_payment = 2;
$eachbidupdate->t_jual = $currentdate;
$eachbidupdate->hargajual = $eachbid->hargabida;
$eachbidupdate->save();
}
return redirect()->route('pembayaran.SenaraiLelongBayar')
->with('success','Menunggu Pengesahan Account');
->with('success','Menunggu Pengesahan Account');
}
}
app/Http/Controllers/PembidaController.php
+13 -19
View File
@@ -194,29 +194,22 @@ class PembidaController extends Controller
->groupBy('lelongbidder.user_id')
->get()->toArray();
foreach($listwinner as $index1=>$winner){
foreach($listwinner as $index1=>$winner)
{
$userdetails = User::where('id', $winner['user_id'])->first();
$SAGWin = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
->where('user_id', $winner['user_id'])
->where('lelongbidder.status_bidder', 1)
->where('lelongbid.lelong_id', $request->lelong_id)
->get();
// dd($SAGWin);
$sts_payment = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
->where('user_id', $winner['user_id'])
->where('lelongbidder.status_bidder', 1)
->where('lelongbid.lelong_id', $request->lelong_id)
->select('lelongbidder.status_payment')
->get();
foreach($SAGWin as $index2=>$sag)
{
$detailspayment = LelongBidder::join('payment', 'lelongbidder.payment_id', '=', 'payment.id')
->where('payment.kodcaw', $request->kodcaw)
->where('payment.lelong_id', $request->lelong_id)
->whereNotNull('payment.disahkan_pada')
->where('lelongbidder.status_bidder', 1)
->where('lelongbidder.status_payment', 1)
->get();
$detailspayment = Payment::where('id', $sag->payment_id)->first();
// dd($detailspayment);
}
$payment_id = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
->where('user_id', $winner['user_id'])
@@ -225,7 +218,8 @@ class PembidaController extends Controller
->select('payment_id')->groupBy('payment_id')->get();
$total_payment = 0;
foreach($payment_id as $id){
foreach($payment_id as $id)
{
$payment = Payment::where('id', $id->payment_id)
->first();
@@ -238,9 +232,9 @@ class PembidaController extends Controller
$listwinner[$index1]['total_surat'] = sizeof($SAGWin);
$listwinner[$index1]['totalBid'] = $SAGWin->sum('hargabida');
$listwinner[$index1]['totalPay'] = $total_payment;
$listwinner[$index1]['sts_payment'] = $sts_payment[0]['status_payment'];
$listwinner[$index1]['status'] = $detailspayment[0]['status'];
$listwinner[$index1]['remark'] = $detailspayment[0]['remark'];
$listwinner[$index1][$index2]['remarks'] = $detailspayment['remark'];
$listwinner[$index1][$index2]['status_payment'] = $sag->status_payment;
$listwinner[$index1][$index2]['status'] = $detailspayment['status'];
}
app/Http/Controllers/PenggunaController.php
+2 -2
View File
@@ -33,8 +33,8 @@ class PenggunaController extends Controller
public function index()
{
// $alluser = User::all();
$alluser = User::with('roles')->get();
$allroles = Role::all()->pluck('name');
$alluser = User::with('roles')->orderBy('id')->get();
$allroles = Role::all();
$caw = Cawangan::all();
$user = User::with('roles')->first();
$userroles = $user->getRoleNames()->toArray();
app/Http/Controllers/SimulasiController.php
+23 -4
View File
@@ -60,14 +60,29 @@ class SimulasiController extends Controller
//dd($request->all());
$t_lelong = Carbon::parse($request->tarikh_lelong);
$bulan = (int)round($request->jbg);
$fasa = $request->fasa;
$jbg = $request->jbg;
// dd($fasa);
$jbgadai = ($t_lelong->subMonths($bulan))->toDateString();
$surat = Gadai::where('t_gadai','<=',$jbgadai)
if($request->fasa == '1'){
$surat = Gadai::where('t_gadai','<=',$jbgadai)
->where('sttebus','=','')
->where('tagpalsu','=',0)
->where('tagpalsu2','=',0)
->where('taglel','=',0)
->where('lelong_tawarruq','=',1)
->get();
}
else if($request->fasa == '2'){
$surat = Gadai::where('t_gadai','<=',$jbgadai)
->where('sttebus','=','')
->where('tagpalsu','=',0)
->where('tagpalsu2','=',0)
->where('taglel','=',0)
->get();
}
// dd($jbg);
if(sizeof($surat) == 0)
{
return redirect()->route('analisa.janasimulasi')
@@ -80,6 +95,7 @@ class SimulasiController extends Controller
$simulasi->harga_emas_asas = $request->hargaasas;
$simulasi->jbg = $request->jbg;
$simulasi->cajlelong = $request->cajlelong;
$simulasi->fasa = $request->fasa;
$simulasi->save();
//create harga asas berdasarkan input harga asas
@@ -96,10 +112,11 @@ class SimulasiController extends Controller
$simkarat->save();
}
//$fasa = $request->fasa;
// join cawangan yang terlibat dengan simulasi
if($request->caw && $request->caw == 'all')
{
//dd($request->fasa);
foreach($cawangan as $key=>$caw)
{
@@ -108,6 +125,7 @@ class SimulasiController extends Controller
$caw_simulasi->caw_id = $caw->id;
$caw_simulasi->online = 'Online';
$caw_simulasi->lokasi = $caw->lokasi;
$caw_simulasi->fasa = $request->fasa;
$caw_simulasi->save();
$suratcaw = $surat->where('kodcaw','=',$caw->caw_code)->all();
@@ -195,6 +213,7 @@ class SimulasiController extends Controller
$caw_simulasi->caw_id = $cawsimulasi->id;
$caw_simulasi->online = 'Online';
$caw_simulasi->lokasi = $cawsimulasi->lokasi;
$caw_simulasi->fasa = $request->fasa;
$caw_simulasi->save();
// dd($caw_simulasi);
@@ -288,7 +307,7 @@ class SimulasiController extends Controller
$arrayinfo = [];
$simulasi = Simulasi::join('cawangan_simulasi','simulasi.id','=','cawangan_simulasi.simulasi_id')
->select('simulasi_id','tarikh_lelong')
->select('simulasi_id','tarikh_lelong', 'simulasi.fasa')
->groupBy('simulasi_id')
->get()
->toArray();
@@ -359,7 +378,6 @@ class SimulasiController extends Controller
$keuntungan = 0;
$total_upahkeuntungan = 0;
$total_nilaimarhun = 0;
@@ -466,6 +484,7 @@ class SimulasiController extends Controller
$total_cazlelong = $total_cazlelong + $cajlelong;
$total_rugilelong = $total_rugilelong + $rugilelong;
$total_bakilelong = $total_bakilelong + $bakilelong;
$data = Simulasi::where('simulasi.id','=',$simulasi_id)
->get();
app/Http/Controllers/TamatKontController.php
+171 -2
View File
@@ -5,12 +5,28 @@ namespace App\Http\Controllers;
use Illuminate\Support\Facades\Auth;
use Illuminate\Http\Request;
use Carbon\Carbon;
use Spatie\Permission\Models\Role;
use Spatie\Permission\Models\Permission;
use App\Models\User;
use App\Models\Gadai;
use App\Models\GadaiMarhun;
use App\Models\Cawangan;
use App\Models\TransaksiKeuntungan;
use PDF;
use App\Models\Simulasi;
use App\Models\SimulasiBid;
use App\Models\SimulasiBidMarhun;
use App\Models\SimKarat;
use App\Models\SimKarat_temp;
use App\Models\CawanganSimulasi;
use App\Models\JenisEmas;
use App\Models\JenisKarat;
use App\Models\Lelong;
use App\Models\CawanganLelong;
use App\Models\LelongBid;
use App\Models\LelongBidMarhun;
use App\Models\LelKarat;
use DateTime;
@@ -140,9 +156,11 @@ class TamatKontController extends Controller
->where('tagpalsu', '=', 0)
->where('tagpalsu2', '=', 0)
->whereNotNull('upah12')
->where('t_matang1', '<', $t_lelong)
->orderBy('t_gadai')
->select('t_gadai')
->first();
->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');
@@ -235,6 +253,157 @@ class TamatKontController extends Controller
't_lelongdisplay'
));
}
public function janadatatamatkontrak(Request $request)
{
//dd($request->all());
$t_lelong = Carbon::parse($request->trkh_lelong);
$bulan = (int)round('12.00');
$fasa = '2';
$jbg = '12';
$cajlelong = '3';
//dd($t_lelong);
$t_gadai = $request->t_gadai;
//dd($t_gadai);
if($fasa == '2'){
$surat = Gadai::where('t_matang1','<',$t_lelong)
->where('sttebus','=','')
->where('tagpalsu','=',0)
->where('tagpalsu2','=',0)
->where('taglel','=',0)
->get();
}
//dd($surat);
// dd($jbg);
if(sizeof($surat) == 0)
{
return redirect()->route('analisa.janasimulasi')
->with('failed','Tiada surat untuk di lelong');
}
$cawangan = Cawangan::all();
//create simulasi
$simulasi = new Simulasi;
$simulasi->tarikh_lelong = $request->trkh_lelong;
$simulasi->harga_emas_asas = "0.00";
$simulasi->jbg = $jbg;
$simulasi->cajlelong = $cajlelong;
$simulasi->fasa = $fasa;
$simulasi->save();
//create harga asas berdasarkan input harga asas
$karat = JenisKarat::all();
$hargaasas = $request->hargaasas; //rial
foreach($karat as $item)
{
$simkarat = new SimKarat;
$simkarat->simulasi_id = $simulasi->id;
$simkarat->karat = $item->karat;
$simkarat->keterangan = $item->keterangan;
$simkarat->harga = ($hargaasas + ($item->dariharga916)); //gram
$simkarat->harga2 = $hargaasas + ($item->dariharga916); //rial
$simkarat->save();
}
//$fasa = $request->fasa;
// join cawangan yang terlibat dengan simulasi
if($request->caw && $request->caw != 'all')
{
// dd($request->kodcaw);
$caw = Cawangan::whereIn('caw_code',$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 = $cawsimulasi->id;
$caw_simulasi->online = 'Online';
$caw_simulasi->lokasi = $cawsimulasi->lokasi;
$caw_simulasi->fasa = $request->fasa;
$caw_simulasi->save();
// dd($caw_simulasi);
$suratcaw = $surat->where('kodcaw','=',$cawsimulasi->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 = $cawsimulasi->id;
$simulasibid->kodcaw = $data->kodcaw;
$simulasibid->norujukan = $data->norujukan;
$simulasibid->t_lelong = $request->trkh_lelong;
$simulasibid->hargaasas = 0.00;
$simulasibid->hargajual = 0.00;
$simulasibid->jbg = $data->jbg;
$simulasibid->kadarupah = $data->kadarupah;
$simulasibid->upahsimpan = $data->upahSim;
$simulasibid->ansuran = $data->ansuran;
$simulasibid->nilaimarhun = $data->nilaimarhun;
$simulasibid->pinjaman = $data->pinjaman;
$simulasibid->bakiupah = $data->bakiupah;
$simulasibid->cajlain = $data->cajlain;
$simulasibid->cajlelong = 0.00;
$simulasibid->baki = 0.00;
$simulasibid->berat = $data->berat;
$simulasibid->marhun = $data->marhun;
$simulasibid->percent = $data->percentpinj;
$simulasibid->status_jual = 0;
$simulasibid->status_payment = 0;
$simulasibid->mora_upah = 0;
$simulasibid->save();
$sumhargaasas = 0;
$berat = 0;
$gadaimarhun = GadaiMarhun::where('norujukan','=',$data->norujukan)->get();
foreach($gadaimarhun as $marhun)
{
$simkarat = SimKarat::where('simulasi_id','=',$simulasi->id)->get();
// dd($simkarat);
foreach($simkarat as $karat)
{
if($karat->karat == $marhun->karat)
{
$val = round($marhun->berat * $karat->harga);
$sumhargaasas = $sumhargaasas + $val;
$berat = $berat + $marhun->berat;
$simmarhun = new SimulasiBidMarhun;
$simmarhun->simulasibid_id = $simulasibid->id;
$simmarhun->bil = $marhun->bil;
$simmarhun->marhun = $marhun->marhun;
$simmarhun->nota = $marhun->nota;
$simmarhun->karat = $marhun->karat;
$simmarhun->berat = $marhun->berat;
$simmarhun->harga = $karat->harga;
$simmarhun->n_marhun = $marhun->berat * $karat->harga;
$simmarhun->hargaasas = $val;
$simmarhun->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();
}
}
}
else
{
dd('error');
}
return redirect()->route('analisa.show',$simulasi->id);
}
// public function janasimulasi($t_lelong, )
}
app/Http/Controllers/TangguhLelongController.php
+329
View File
@@ -0,0 +1,329 @@
<?php
namespace App\Http\Controllers;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Carbon\Carbon;
use App\Models\Gadai;
use App\Models\Cawangan;
use App\Models\Customer;
use App\Models\Lelong;
use App\Models\LelongBid;
use App\Models\LelongBidMarhun;
use App\Models\CawanganLelong;
use App\Models\TangguhLelong;
use App\Models\Pengesahan;
class TangguhLelongController extends Controller
{
//PC
public function senleluntuktangguh()
{
$user = Auth::user();
$arrayinfo = [];
$lelong = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id')
->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id')
->where('cawangan.caw_code', $user->kodcaw)
->where('sts_lelong', 0)
->select('lelong_id','tarikh_lelong','masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong')
->groupBy('lelong_id')
->get()
->toArray();
foreach($lelong as $info)
{
$detailsinfo = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
->where('lelong_id',$info['lelong_id'])
->get()
->toArray();
array_push($arrayinfo,['info'=>$info, 'detailsinfo'=>$detailsinfo]);
// dd($arrayinfo);
}
return view('tangguhlelong.senarailelongtangguh',compact('lelong', 'arrayinfo'));
}
public function carian($lelong_id)
{
return view('tangguhlelong.carian', compact('lelong_id'));
}
public function searchbyic(Request $request)
{
// dd($request->all());
$user = Auth::user();
if($request->nokp == null)
{
return redirect()->route('tangguhlelong.carian', $request->lelong_id)->with('success','Sila Masukkan No Kad Pengenalan');
}
else if($request->nokp != null)
{
$lelong = Lelong::where('id', $request->lelong_id)->first();
$getic = Customer::join('gadai', 'customer.kpbaru', '=', 'gadai.nokp')
->where('customer.kpbaru', '=', $request->nokp)
->where('gadai.tempoh', '=', $lelong->jbg)
->get();
foreach($getic as $index1=>$ic)
{
$getnorujukan = LelongBid::where('norujukan', $ic->norujukan)
->where('jbg', $ic->tempoh)
->get();
foreach($getnorujukan as $norujukan)
{
$pengesahan = Pengesahan::where('lelongbidmarhun_id', $norujukan->id)
->where('lelongbid_id', $norujukan->lelongbid_id)
->where('norujukan', $norujukan->norujukan)
->first();
$adapengesahan = Pengesahan::join('lelongbid', 'pengesahan.norujukan', '=', 'lelongbid.norujukan')
->where('pengesahan.norujukan', $norujukan->norujukan)
->where('pengesahan.status_ubah', 6)
->where('pengesahan.lelong_id', $request->lelong_id)
->get();
if($pengesahan)
{
return redirect()->route('tangguhlelong.carian', $request->lelong_id)->with('failed','Pengesahan Tangguh Lelong Telah Dibuat');
}
else
{
//
}
}
$getic[$index1]['user_details'] = $getnorujukan;
$getic[$index1]['sdhadapengesahan'] = $adapengesahan;
}
$lelong_id = $request->lelong_id;
return view('tangguhlelong.searchbyic', compact('getic', 'user', 'lelong_id'));
}
}
public function tangguhlelong(Request $request)
{
// dd($request->all());
$user = Auth::user();
$currentdate = Carbon::now();
$currentdate = $currentdate->toDateTimeString();
$lelbidmarhun = $request->checkboxdata;
// dd($lelbidmarhun);
$lelong = Lelong::where('id', $request->lelong_id)->get()->toArray();
foreach($lelbidmarhun as $bidmarhun)
{
$lelongbidmarhun = LelongBidMarhun::join('lelongbid', 'lelongbidmarhun.lelongbid_id', '=', 'lelongbid.id')
->where('lelongbid.id', $bidmarhun)
->select('lelongbidmarhun.id as lelongbidmarhun_id',
'lelongbidmarhun.bil',
'lelongbidmarhun.marhun',
'lelongbidmarhun.nota',
'lelongbidmarhun.old_karat',
'lelongbidmarhun.karat',
'lelongbidmarhun.old_berat',
'lelongbidmarhun.berat',
'lelongbidmarhun.old_harga',
'lelongbidmarhun.harga',
'lelongbidmarhun.old_nmarhun',
'lelongbidmarhun.n_marhun',
'lelongbidmarhun.old_hargaasas',
'lelongbidmarhun.hargaasas',
'lelongbid.id as lelongbid_id',
'lelongbid.caw_id',
'lelongbid.kodcaw',
'lelongbid.norujukan',
'lelongbid.t_lelong',
'lelongbid.hargaasas',
'lelongbid.nopembeli',
'lelongbid.jbg',
'lelongbid.kadarupah',
'lelongbid.upahsimpan',
'lelongbid.ansuran',
'lelongbid.nilaimarhun',
'lelongbid.pinjaman',
'lelongbid.bakiupah',
'lelongbid.cajlain',
'lelongbid.cajlelong',
'lelongbid.baki',
'lelongbid.berat',
'lelongbid.marhun',
)
->get()->toArray();
// dd($lelongbidmarhun);
$pengesahan = new Pengesahan();
$pengesahan->lelong_id = $request->lelong_id;
$pengesahan->lelongbid_id = $bidmarhun;
$pengesahan->lelongbidmarhun_id = $lelongbidmarhun[0]['lelongbidmarhun_id'];
$pengesahan->norujukan = $lelongbidmarhun[0]['norujukan'];
$pengesahan->diminta_oleh = $user->id;
$pengesahan->diminta_pada = $currentdate;
$pengesahan->status = 2;
$pengesahan->status_ubah = 6;
$pengesahan->save();
$tangguhlelong = new TangguhLelong();
$tangguhlelong->lelong_id = $request->lelong_id;
$tangguhlelong->lelongbid_id = $bidmarhun;
$tangguhlelong->norujukan = $lelongbidmarhun[0]['norujukan'];
$tangguhlelong->pinjaman = $lelongbidmarhun[0]['pinjaman'];
$tangguhlelong->ditangguh_oleh = $user->id;
$tangguhlelong->ditangguh_pada = $currentdate;
$tangguhlelong->nota = $request->remark;
$tangguhlelong->save();
}
return redirect()->route('tangguhlelong.carian', $request->lelong_id)->with('success','Pengesahan Tangguh Lelong Berjaya');
}
//Operasi
public function senarailelongtangguh()
{
$arrayinfo = [];
$lelong = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id')
->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id')
->where('sts_lelong', 0)
->select('lelong_id','tarikh_lelong','masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong')
->groupBy('lelong_id')
->get()
->toArray();
foreach($lelong as $info)
{
$detailsinfo = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
->where('lelong_id',$info['lelong_id'])
->get()
->toArray();
array_push($arrayinfo,['info'=>$info, 'detailsinfo'=>$detailsinfo]);
// dd($arrayinfo);
}
return view('tangguhlelong.senleltangguh',compact('lelong', 'arrayinfo'));
}
public function senaraisahtangguh($lelong_id, $caw_code)
{
$currentdate = Carbon::now();
$currentdate = $currentdate->toDateTimeString();
$pengesahan = Pengesahan::join('tangguhlelong', 'pengesahan.norujukan', '=', 'tangguhlelong.norujukan')
->where('pengesahan.lelong_id', $lelong_id)
->whereNull('pengesahan.disahkan_oleh')
->whereNull('pengesahan.disahkan_pada')
->whereNull('tangguhlelong.tarikhtangguh')
->get();
foreach($pengesahan as $index1=>$sah)
{
$lelongbid = LelongBid::where('id', $sah->lelongbid_id)
->where('norujukan', $sah->norujukan)
->where('kodcaw', $caw_code)
->get();
$pengesahan[$index1]['bid_details'] = $lelongbid;
$pengesahan[$index1]['nota'] = $sah->nota;
}
return view('tangguhlelong.sensahpc', compact('pengesahan', 'lelong_id' , 'caw_code'));
}
public function sahkantangguhlel(Request $request)
{
// dd($request->all());
$user = Auth::user();
$currentdate = Carbon::now();
$currentdate = $currentdate->toDateTimeString();
$lelbidmarhun = $request->checkboxdata;
$lelong = Lelong::where('id', $request->lelong_id)->get()->toArray();
foreach($lelbidmarhun as $bidmarhun)
{
// dd($bidmarhun);
$lelongbidmarhun = LelongBidMarhun::join('lelongbid', 'lelongbidmarhun.lelongbid_id', '=', 'lelongbid.id')
->where('lelongbid.id', $bidmarhun)
->select('lelongbidmarhun.id as lelongbidmarhun_id',
'lelongbidmarhun.bil',
'lelongbidmarhun.marhun',
'lelongbidmarhun.nota',
'lelongbidmarhun.old_karat',
'lelongbidmarhun.karat',
'lelongbidmarhun.old_berat',
'lelongbidmarhun.berat',
'lelongbidmarhun.old_harga',
'lelongbidmarhun.harga',
'lelongbidmarhun.old_nmarhun',
'lelongbidmarhun.n_marhun',
'lelongbidmarhun.old_hargaasas',
'lelongbidmarhun.hargaasas',
'lelongbid.id as lelongbid_id',
'lelongbid.caw_id',
'lelongbid.kodcaw',
'lelongbid.norujukan',
'lelongbid.t_lelong',
'lelongbid.hargaasas',
'lelongbid.nopembeli',
'lelongbid.jbg',
'lelongbid.kadarupah',
'lelongbid.upahsimpan',
'lelongbid.ansuran',
'lelongbid.nilaimarhun',
'lelongbid.pinjaman',
'lelongbid.bakiupah',
'lelongbid.cajlain',
'lelongbid.cajlelong',
'lelongbid.baki',
'lelongbid.berat',
'lelongbid.marhun',
)
->get()->toArray();
// dd($lelongbidmarhun);
$pengesahan = Pengesahan::where('lelongbidmarhun_id', $lelongbidmarhun[0]['lelongbidmarhun_id'])
->where('lelongbid_id', $lelongbidmarhun[0]['lelongbid_id'])
->where('norujukan', $lelongbidmarhun[0]['norujukan'])
->first();
$pengesahan->disahkan_oleh = $user->id;
$pengesahan->disahkan_pada = $currentdate;
$pengesahan->save();
$tangguhlelong = TangguhLelong::where('lelong_id', $request->lelong_id)
->where('lelongbid_id', $bidmarhun)
->where('norujukan', $lelongbidmarhun[0]['norujukan'])
->first();
$tangguhlelong->tarikhtangguh = $currentdate;
$tangguhlelong->save();
$biddelete = LelongBid::join('lelongbidmarhun', 'lelongbid.id', '=', 'lelongbidmarhun.lelongbid_id')
->where('lelongbid.id', $tangguhlelong->lelongbid_id)
->where('lelongbid.norujukan', $tangguhlelong->norujukan)
->where('lelongbid.lelong_id', $request->lelong_id)
->delete();
$caw_code = $request->kodcaw;
}
return redirect()->route('pengesahan.senaraisahtangguh', [$request->lelong_id, $caw_code])->with('success','Pengesahan Berjaya');
}
}
app/Models/Customer.php
+60
View File
@@ -0,0 +1,60 @@
<?php
namespace App\Models;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
class Customer extends Model
{
use HasFactory;
protected $table = 'customer';
protected $fillable = [
'ahli',
'kodcaw',
'nosiri',
'tarikhdaftar',
'nopelanggan',
'kplama',
'kpbaru',
'nama',
't_lahir',
'jantina',
'alamat1',
'alamat2',
'alamat3',
'alamat4',
'poskod',
'koddaerah',
'kodnegeri',
'telefon',
'jumpinjaman',
't_gadai',
'pinjamhari',
'bumiputra',
'warganegara',
'bangsa',
'kodkerja',
'kodugama',
'kodstatus',
'kodbank',
'noakaun',
'nota',
'teller',
'pelulus',
't_ubah',
'm_ubah',
'aktif',
'yuranahli',
'nopelangganlama',
'tujuangadai',
'kodkerjabaru',
'tagperingatan',
'namateller',
'kumpulan',
'telefon2',
'tagpelanggan'
];
}
database/migrations/2021_12_14_041545_create_simulasis_table.php
+3
View File
@@ -22,6 +22,7 @@ class CreateSimulasisTable extends Migration
$table->string('harga_emas_asas')->nullable();
$table->string('jbg')->nullable();
$table->integer('cajlelong')->nullable();
$table->integer('fasa')->default(0);
$table->timestamps();
});
@@ -35,6 +36,7 @@ class CreateSimulasisTable extends Migration
$table->date('export_data_stsdate')->nullable();
$table->date('import_data_sts_date')->nullable();
$table->string('lokasi')->nullable();
$table->integer('fasa')->default(0);
$table->timestamps();
$table->foreign('caw_id')
@@ -73,6 +75,7 @@ class CreateSimulasisTable extends Migration
$table->integer('status_jual');
$table->integer('status_payment');
$table->integer('mora_upah');
$table->integer('fasa')->default(0);
$table->timestamps();
$table->foreign('caw_id')
database/migrations/2021_12_14_041557_create_lelongs_table.php
+2
View File
@@ -24,6 +24,7 @@ class CreateLelongsTable extends Migration
$table->string('jbg');
$table->integer('cajlelong');
$table->integer('sts_lelong')->default(0); //1= start, 2 = jana pemenang, 3 = senarai pemenang
$table->integer('fasa')->default(0);
$table->timestamps();
});
@@ -78,6 +79,7 @@ class CreateLelongsTable extends Migration
$table->integer('status_semak')->default(0);
$table->datetime('diserahkan_pada')->nullable();
$table->string('mora_upah');
$table->integer('fasa')->default(0);
$table->timestamps();
$table->foreign('caw_id')
database/migrations/2022_01_23_042652_create_lelongbidder_table.php
+1 -1
View File
@@ -24,7 +24,7 @@ class CreateLelongbidderTable extends Migration
$table->decimal('cajlelong');
$table->integer('status_bidder')->nullable(); //1 = win
$table->integer('payment_id')->nullable();
$table->integer('status_payment')->nullable(); // 1=paid
$table->integer('status_payment')->nullable(); // 1=paid, 2=memerlukan pengesahan operasi (CDM)
$table->datetime('masa_bidaan');
$table->timestamps();
database/migrations/2022_03_07_061858_create_pengesahan_table.php
+1 -1
View File
@@ -24,7 +24,7 @@ class CreatePengesahanTable extends Migration
$table->integer('diminta_oleh');
$table->datetime('diminta_pada');
$table->integer('status')->default(0); //1 = terima, 2 = tangguh lelong
$table->integer('status_ubah')->default(0); //1 = ubah mutu, 2 = tambah marhun, 3 = hapus marhun, 4 = ubah berat, 5 = ubah mutu & berat
$table->integer('status_ubah')->default(0); //1 = ubah mutu, 2 = tambah marhun, 3 = hapus marhun, 4 = ubah berat, 5 = ubah mutu & berat, 6 = tangguh lelong pc
$table->timestamps();
// $table->foreign('lelong_id')
database/seeders/RolesSeeder.php
+5 -1
View File
@@ -71,6 +71,10 @@ class RolesSeeder extends Seeder
'name' => 'serahan',
'description' => 'Penyerahan Marhun Kepada Pembida Yang Menang'
]);
Permission::create([
'name' => 'tangguhlelong',
'description' => 'Penangguhan Lelong Cawangan'
]);
//jurulelong
Permission::create([
@@ -156,7 +160,7 @@ class RolesSeeder extends Seeder
$role4->givePermissionTo('jananotis');
$role4->givePermissionTo('pengesahanbayarancash');
$role4->givePermissionTo('serahan');
$role4->givePermissionTo('tangguhlelong');
$role5 = Role::create(['name' => 'jurulelong']);
$role5->givePermissionTo('pendaftaranbatch');
resources/views/importdata/listcawangan.blade.php
+1 -1
View File
@@ -30,7 +30,7 @@
$count = 0;
// $result = mysql_query("SELECT * FROM cawangan_lelong");
$results = DB::select('select * from cawangan');
$results = DB::select('select * from cawangan order by caw_name');
foreach($results as $row)
{
$caw_ip = $row->caw_ip;
resources/views/includes/sidebar.blade.php
+10 -2
View File
@@ -83,6 +83,9 @@
</li>
</ul>
</li>
<li class="{{ ( request()->is('tangguhlelong/*')) ? 'active' : '' }}">
<a href="{{url('tangguhlelong/senleluntuktangguh')}}">Tangguh Lelong</a>
</li>
<li class="{{ ( request()->is('pembayaran/kaunter/*')) ? 'active' : '' }}">
<a href="{{url('pembayaran/SenaraiLelongBayar')}}">Pembayaran Pemenang</a>
</li>
@@ -130,12 +133,17 @@
<a href="#pengesahanSubmenu" data-toggle="collapse" aria-expanded="false" style="">Kelulusan</a>
<ul class="list-unstyled collapse {{ (request()->is('pengesahan/*')) ? 'show' : '' }}" id="pengesahanSubmenu" >
<li class="{{ (request()->is('pengesahan/senarailelongubahmutu/*') || request()->is('pengesahan/senarailelongubahmutu') ) ? 'active' : '' }}">
<a href="{{url('pengesahan/senarailelongubahmutu')}}">Senarai Perubahan Mutu Marhun</a>
<a href="{{url('pengesahan/senarailelongubahmutu')}}">Perubahan Mutu Marhun</a>
</li>
</ul>
<ul class="list-unstyled collapse {{ (request()->is('pengesahan/*')) ? 'show' : '' }}" id="pengesahanSubmenu" >
<li class="{{ (request()->is('pengesahan/senarailelong/*') || request()->is('pengesahan/senarailelong') ) ? 'active' : '' }}">
<a href="{{url('pengesahan/senarailelong')}}">Senarai Tangguh Lelong</a>
<a href="{{url('pengesahan/senarailelong')}}">Tangguh Lelong</a>
</li>
</ul>
<ul class="list-unstyled collapse {{ (request()->is('pengesahan/*')) ? 'show' : '' }}" id="pengesahanSubmenu" >
<li class="{{ (request()->is('pengesahan/senarailelongtangguh/*') || request()->is('pengesahan/senarailelongtangguh') ) ? 'active' : '' }}">
<a href="{{url('pengesahan/senarailelongtangguh')}}">Lelong Ditangguh PC</a>
</li>
</ul>
</li>
resources/views/jananotis/senaraitemp.blade.php
+22 -13
View File
@@ -10,31 +10,38 @@
</div>
@endif
<h3 class="pt-3" style="margin-left:1%;">Butiran Gadaian Mengikut Cawangan</h3>
<form action="{{route('notistamatkontrak.janadatatamatkontrak')}}" method="POST" enctype="multipart/form-data">
@csrf
<div class="container">
<div class="row mb-2">
<div class="col-md-11 mx-auto card p-4" style="margin-top:2%; margin-bottom:2%;">
<p> <b>Tarikh Lelong : </b> {{ $t_lelongdisplay }}</p>
<p> <b>Tarikh Gadai Sehingga : </b> @php
$myDateTime = DateTime::createFromFormat('Y-m-d', $t_gadais->t_gadai );
$datez = $myDateTime->format('d-m-Y');
echo($datez);
$myDateTime = DateTime::createFromFormat('Y-m-d', $t_lelong );
$tarikhlelong = $myDateTime->modify('-12 month')->format('d-m-Y');
$t_gadai = $myDateTime->modify('-12 month')->format('Y-m-d');
echo($tarikhlelong);
@endphp</p>
<p> <b>Tarikh Perlu Blast Notis SMS(30 Hari) : </b> @php
$myDateTime = DateTime::createFromFormat('Y-m-d', $t_lelong );
$datez1 = $myDateTime->modify('-1 month')->format('d-m-Y');
echo($datez1);
$trkh_lelong = $myDateTime->format('Y-m-d');
$tblastnotis = $myDateTime->modify('-1 month')->format('d-m-Y');
echo($tblastnotis);
@endphp</p>
<p> <b>Tarikh Perlu Daftar Batch Lelong(20 Hari) : </b>@php
$myDateTime = DateTime::createFromFormat('Y-m-d', $t_lelong );
$datez1 = $myDateTime->modify('-20 days')->format('d-m-Y');
echo($datez1);
$tdaftarbatch = $myDateTime->modify('-20 days')->format('d-m-Y');
echo($tdaftarbatch);
@endphp</p>
<input type="hidden" class="form-control" id="trkh_lelong" name="trkh_lelong" value="@php echo($trkh_lelong) @endphp">
<input type="hidden" class="form-control" id="t_gadai" name="t_gadai" value="@php echo($t_gadai) @endphp">
</div>
</div>
</div>
<table class="table table-striped table-xl text-center" id="senaraitemp" style="width:100%">
</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" onclick="selectall(this)"></th>
@@ -51,7 +58,7 @@
<tbody>
@foreach($senarai as $send)
<tr>
<td><input type="checkbox" aria-label="Checkbox for following text input" name="checkboxdata[]"></td>
<td><input type="checkbox" aria-label="Checkbox for following text input" name="caw[]" id="caw" value = "{{ $send['kodcaw'] }}"></td>
<td>{{ $send['kodcaw'] }}</td>
<td>{{ $send['caw_name'] }}</td>
<td>{{ $send['bil_lelong'] }} </td>
@@ -66,10 +73,12 @@
@endforeach
</tbody>
</table>
<div class="modal-footer; text-center" style="margin-top:2%; margin-bottom:2%;">
<a href="{{ route('notistamatkontrak.sebelumtamatkont') }}" class="btn btn-primary" style="width:8%;">Kembali</a>
<a href="{{ route('analisa.janadata') }}" class="btn btn-success" style="width:8%; margin-left:1%;">Jana Simulasi</a>
</div>
<button type="submit" class="btn btn-success">Jana Simulasi</button>
</div>
</form>
</div>
</div>
</div>
resources/views/jananotis/tempbycaw.blade.php
+1 -1
View File
@@ -19,7 +19,7 @@
<div class="col-md-12 mx-auto card p-4" style="margin-top:2%; margin-bottom:2%;">
<p> <b>Tarikh Lelong : </b> {{ $t_lelongdisplay }}</p>
<p> <b>Tarikh Gadai Sehingga : </b> @php
$myDateTime = DateTime::createFromFormat('Y-m-d', $t_gadais->t_gadai );
$myDateTime = DateTime::createFromFormat('Y-m-d', $t_lelong );
$datez = $myDateTime->format('d-m-Y');
echo($datez);
@endphp</p>
resources/views/pembayaran/SAGBidItem.blade.php
+6 -10
View File
@@ -51,7 +51,7 @@
@endforeach
<tr>
<td colspan="3"><b> Jumlah Bayaran</b></td>
<td class="text-center"><b>RM<input type="text" id="total" value="0" style="border: none;" readonly></b></td>
<td class="text-center"><b>RM<input type="text" id="total" name="total" value="0" style="border: none;" readonly></b></td>
<td> </td>
</tr>
</tbody>
@@ -72,7 +72,7 @@
@csrf
<input type="hidden" name="user_id" value="{{ $user_id }}" />
<input type="hidden" name="lelong_id" value="{{ $lelong_id }}" />
<input type="hidden" name="eachbid" id="eachbid" value="" />
<input type="hidden" name="eachbid[]" id="eachbid" value="" />
<div class="modal-content">
<div class="modal-header justify-content-center" style="text-align: center;">
@@ -164,11 +164,6 @@
</div>
</div>
<!-- <input type="hidden" id="jenisjenis" /> -->
<!-- <input type="hidden" id="kodcawangan" /> -->
<!-- <input type="hidden" id="tellerla" /> -->
</div>
<div class="modal-footer">
<button type="button" class="btn btn-danger" onclick="funcbatal()">Batal</button>
@@ -185,7 +180,7 @@
$("#btnterima").prop("disabled", true);
$("#btnbanktransfer").prop("disabled", true);
function terimadeno() {
$('#eachbid').val(arraylelongbid);
$("input[name='eachbid[]']").val(arraylelongbid);
$("#formpaymentdenokaunter").submit();
}
function funcbatal(){
@@ -213,8 +208,9 @@
btnClass: 'btn-info',
action: function () {
$('#eachbid').val(arraylelongbid);
$("#formbanktransfer").submit();
var total_sum = parseFloat($('#total').val());
$('#total').val(parseFloat(total_sum).toFixed(2));
$("#formbanktransfer").submit();
}
}
}
@@ -224,7 +220,7 @@
console.log(arraylelongbid.length);
let bid_id = $(e).data('bid_id');
// console.log(bid_id);
console.log(bid_id);
if(e.checked==true) //checkbox
{
arraylelongbid.push(bid_id);
resources/views/pembida/pembayaranbidaan.blade.php
+8 -6
View File
@@ -26,7 +26,7 @@
</tr>
</thead>
<tbody>
@foreach($listwinner as $winner)
@foreach($listwinner as $index1=>$winner)
<tr>
<td>{{ $loop->iteration }}</td>
<td>{{ $winner['details']['name'] }}</td>
@@ -35,20 +35,22 @@
<td>{{ $winner['totalBid'] }}</td>
<td>{{ $winner['totalPay'] }}</td>
<td>
@if($winner['status'] == 1)
@if($winner[$index1]['status'] == 1)
<button class="btn btn-info btn-sm" disabled>FEE</button>
@elseif($winner['status'] == 2)
@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['remark'] }}</button></td>
<td>
@if($winner['sts_payment'] == 1)
<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>
@else
@endif
</td>
<td>
</td>
</tr>
@endforeach
</tbody>
resources/views/pengesahan/lelbidmarhun.blade.php
+1 -1
View File
@@ -50,7 +50,7 @@
</table>
</form>
<div class="modal-footer" style="margin-top:2%;">
<a href="{{ route('pengesahan.senaraitangguhlelong', $id) }}" class="btn btn-primary">Kembali</a>
<a href="{{ route('pengesahan.senaraitangguhlelong', [$id, 'caw_name'=>$caw_names->caw_name]) }}" class="btn btn-primary">Kembali</a>
</div>
</div>
resources/views/pengesahan/perubahanmutumarhun.blade.php
+1 -1
View File
@@ -24,7 +24,7 @@
@foreach($mutumarhun as $marhun)
<tr>
<th><input type="checkbox" aria-label="Checkbox for following text input" onclick="selectall(this)"></th>
<td>{{ $marhun['cawangan_name']['caw_name'] }}</td>
<td>{{ $marhun['cawangan_name'] }}</td>
<td>{{ $marhun['norujukan'] }}</td>
<td>
@if($marhun['total'] === intval($marhun['tstat']))
resources/views/pengesahan/senarailelong.blade.php
+1 -1
View File
@@ -38,7 +38,7 @@
<td>{{$lel['detail']['jbg']}}</td>
<td>{{$lel['detail']['cajlelong']}}</td>
<td>
<a href="{{ route('pengesahan.senaraitangguhlelong',$lel['detail']['id']) }}" 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
resources/views/pengesahan/senaraitangguhlelong.blade.php
+32 -24
View File
@@ -10,16 +10,25 @@
<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> {{ $tangguhlelong[0]['tarikh_lelong'] }}</p>
<p> <b>Nama Cawangan : </b>{{ $caw_name }}</p>
<p> <b>JBG : </b>{{ $tangguhlelong[0]['jbg'] }}</p>
</div>
</div>
</div>
<form id="exportform" action="" method="POST">
<input type="hidden" name="type" value="User">
<table class="table table-striped table-xl text-center" id="tablelelong" style="width:100%">
<thead class="bg-primary text-white">
<tr>
<th>Bil</th>
<th>Nama Cawangan</th>
<th>Tarikh Lelong</th>
<th>Tarikh Tangguh</th>
<th>No Rujukan</th>
<th>Remark</th>
<th class="text-center">Action</th>
</tr>
</thead>
@@ -27,10 +36,9 @@
@foreach ($tangguhlelong as $tangguhlel)
<tr>
<td>{{ $loop->iteration }}</td>
<td>{{ $tangguhlel['nama_caw']['caw_name'] }}</td>
<td>{{ $tangguhlel->tarikh_lelong }}</td>
<td>{{ $tangguhlel->tarikhtangguh }}</td>
<td>{{ $tangguhlel->norujukan }}</td>
<td>{{ $tangguhlel->nota }}</td>
<td>
<a href="{{ route('pengesahan.lelbidmarhun', [ $id, $tangguhlel->norujukan, 'tangguhlelong_id'=>$tangguhlel['details']['tangguhlelong_id'] ]) }}" data-toggle="tooltip" data-placement="top" title="Butiran" class="text-center" ><i class="far fa-edit"></i></a>
</td>
@@ -69,26 +77,26 @@
"lengthChange": false,
"pageLength": 15,
dom: 'Bfrtip',
buttons: [
// 'copy', 'excel', 'pdf'
// { text: 'copy', className: 'btn btn-primary' },
{
className: 'btn btn-outline-success pl-4 pr-4 btn-sm addsim',
text: '<i class="fas fa-plus" id="test"></i>',
titleAttr: 'Tambah Simulasi',
action: function ( e, dt, node, config ) {
alert( 'Button activated' );
}
},
{
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();
}
}
]
// buttons: [
// // 'copy', 'excel', 'pdf'
// // { text: 'copy', className: 'btn btn-primary' },
// {
// className: 'btn btn-outline-success pl-4 pr-4 btn-sm addsim',
// text: '<i class="fas fa-plus" id="test"></i>',
// titleAttr: 'Tambah Simulasi',
// action: function ( e, dt, node, config ) {
// alert( 'Button activated' );
// }
// },
// {
// 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();
// }
// }
// ]
});
$('.addsim').tooltip();
resources/views/pengurusandatabase/senaraidb.blade.php
+1 -1
View File
@@ -196,7 +196,7 @@
order: [[1, 'asc']],
"info": false,
"lengthChange": false,
"pageLength": 15,
"pageLength": 40,
dom: 'Bfrtip',
buttons: [
{
resources/views/simulasi/janasimulasi.blade.php
+31 -13
View File
@@ -27,10 +27,27 @@
</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-1 col-form-label">Fasa Lelong</label>
<div class="col-sm-4">
<input type="text" class="form-control" id="jbg" name="jbg" placeholder="JBG">
<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>
<div class="col-sm-4">
<input type="text" class="form-control" id="cajlelong" name="cajlelong" placeholder="%">
</div>
</div>
<div class="form-group row">
<label for="jbg" class="col-sm-1 col-form-label">JBG</label>
<div class="col-sm-4" id="fasa_1">
<input type="text" class="form-control" id="jbg" name="jbg" placeholder="JBG">
</div>
<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">
@@ -43,17 +60,6 @@
</select>
</div>
</div>
<div class="form-group row">
<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>
{{-- <label for="inputEmail3" class="col-sm-1 col-form-label">Upah</label>
<div class="col-sm-4">
<input type="text" class="form-control" id="inputEmail3" placeholder="Upah">
</div> --}}
</div>
<div class="form-group row">
<div class="col-sm-10">
<button type="submit" class="btn btn-primary">Jana Simulasi</button>
@@ -70,6 +76,18 @@
placeholder: "Pilih Cawangan",
allowClear: true
});
$(document).ready(function () {
$("input[name=fasa]").change(function(){
if($("#fasa1").is(':checked')){
$("#jbg").val('').prop("readonly", false);
}
if($("#fasa2").is(':checked')){
$("#jbg").val('12').prop("readonly", true);
}
});
});
</script>
@endsection
resources/views/simulasi/senaraisimulasi.blade.php
+5 -3
View File
@@ -18,6 +18,7 @@
<th>No</th>
<th>Lelong ID</th>
<th>Tarikh Lelong</th>
<th>Fasa</th>
<th>Cawangan</th>
<th class="text-center">Action</th>
</tr>
@@ -29,9 +30,10 @@
<td>{{$loop->iteration}}</td>
<td>{{$info['info']['simulasi_id']}}</td>
<td>{{$info['info']['tarikh_lelong']}}</td>
<td>
<td>{{$info['info']['fasa']}}</td>
<td align = 'left'>
@foreach($info['detailsinfo'] as $info2)
<span class="m-2">{{$info2['caw_name']}}</span><br>
{{$info2['caw_name']}}<br>
@endforeach
</td>
<td class="text-center">
@@ -82,7 +84,7 @@
"orderable": false
},
{
"targets": 5,
"targets": 4,
"orderable": false
}
],
resources/views/tangguhlelong/carian.blade.php
+43
View File
@@ -0,0 +1,43 @@
@extends('layouts.app')
@section('content')
<div class="container">
<div class="row justify-content-md-center">
<div class="col-md-6 mx-auto card">
@if ($message = Session::get('success'))
<div class="alert alert-success" style="margin-top:1%;">
<p>{{ $message }}</p>
</div>
@elseif ($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:2%;">Sila Masukkan No Kad Pengenalan</h3>
<form action="{{route('tangguhlelong.searchbyic')}}" method="POST" id="formcariannokp">
@csrf
<input type="hidden" name="lelong_id" value="{{ $lelong_id }}">
<div class="form-group row" style="margin-top:2%; margin-left:1%;">
<label for="nokp" class=" col-form-label mr-3" style="margin-left:2%;">No Kad Pengenalan</label>
<div>
<input type="text" class="form-control" id="nokp" name="nokp" placeholder="xxxxxxxxxxxx">
</div>
</div>
<div class="d-flex justify-content-center" style="margin:2% 0%; ">
<a href="{{ route('tangguhlelong.senleluntuktangguh') }}" class="btn btn-primary mr-2">Kembali</a>
<button type="button" class="btn btn-primary" onclick="find()" >Carian</button>
</div>
</form>
</div>
</div>
</div>
<script>
function find()
{
$("#formcariannokp").submit();
}
</script>
@endsection
resources/views/tangguhlelong/searchbyic.blade.php
+169
View File
@@ -0,0 +1,169 @@
@extends('layouts.app')
@section('content')
<div class="container-fluid">
<div class="row ">
<div class="col-md-11 mx-auto card p-4">
@if ($message = Session::get('success'))
<div class="alert alert-success">
<p>{{ $message }}</p>
</div>
@endif
<form id="formtangguhlel" action="{{route('tangguhlelong.tangguhlelong')}}" method="POST">
@csrf
<input type="hidden" name="lelong_id" value="{{ $lelong_id }}">
<table class="table table-striped table-xl text-center" id="tangguhlel" style="width:100%">
<thead class="bg-primary text-white">
<tr>
<th>No</th>
<th>Tarikh Lelong</th>
<th>No Rujukan</th>
<th>JBG</th>
<th>Narhun</th>
<th>Nilai Marhun (RM)</th>
<th>Pembiayaan (RM)</th>
<th>Berat</th>
<th class="text-center">Action</th>
</tr>
</thead>
<tbody>
@foreach ($getic as $ic)
<tr>
<td>{{$loop->iteration}}</td>
<td>{{$ic['user_details'][0]['t_lelong']}}</td>
<td>{{$ic['norujukan']}}</td>
<td>{{$ic['jbg']}}</td>
<td>{{$ic['marhun']}}</td>
<td>{{$ic['nilaimarhun']}}</td>
<td>{{$ic['pinjaman']}}</td>
<td>{{$ic['berat']}}</td>
<td class="text-center">
@if(sizeof($ic['sdhadapengesahan']) !== 0)
@else
<input type="checkbox" onclick="bidmarhunfunc(this)" aria-label="Checkbox for following text input" name="checkboxdata[]" value="{{ $ic['user_details'][0]['id'] }}" data-bidmarhun="{{ $ic['user_details'][0]['id'] }}">
@endif
</td>
</tr>
@endforeach
</tbody>
</table>
<div class="form-group row">
<label for="remark" class=" col-form-label mr-4" style="margin-left:2%;">Remark</label>
<div>
<input type="text" class="form-control" id="remark" name="remark" placeholder="**sebab tangguh lelong**">
</div>
</div>
<div class="modal-footer" style="margin-top:2%;">
<a href="{{ route('tangguhlelong.carian', ['lelong_id'=>$lelong_id]) }}" class="btn btn-primary">Kembali</a>
<button type="submit" class="btn btn-danger">Tangguh Lelong</button>
</div>
</form>
</div>
</div>
</div>
<script>
//Enable tooltips everywhere
$(function () {
$('[data-toggle="tooltip"]').tooltip()
})
$('a.confirmdel').confirm({
title: 'Confirmation',
content: 'Anda pasti?',
type: 'orange',
typeAnimated: true,
buttons: {
Delete: {
btnClass: 'btn-warning',
action: function () {
location.href = this.$target.attr('href');
$("#formtangguhlel").submit();
}
},
Batal: {
btnClass: 'btn-default',
action: function () {}
}
}
});
let arraybidmarhun = [];
function bidmarhunfunc(e)
{
let bidmarhun = $(e).data('bidmarhun');
if(e.checked==true) //checkbox
{
arraybidmarhun.push(bidmarhun);
}
else
{
arraybidmarhun = arraybidmarhun.filter(item => item !== bidmarhun);
}
// $('#bidmarhun').val(arraybidmarhun);
// console.log(arraybidmarhun);
}
var tabletangguhlel = $('#tangguhlel').DataTable( {
"columnDefs": [
{
"targets": 0,
"orderable": false
},
{
"targets": 8,
"orderable": false
}
],
order: [[1, 'asc']],
// "ordering": false,
"info": false,
"lengthChange": false,
"pageLength": 9999,
dom: 'Bfrtip',
// buttons: [
// // 'copy', 'excel', 'pdf'
// // { text: 'copy', className: 'btn btn-primary' },
// {
// className: 'btn btn-outline-success pl-4 pr-4 btn-sm addsim',
// text: '<i class="fas fa-plus" id="test"></i>',
// titleAttr: 'Tambah tangguhlelong',
// action: function ( e, dt, node, config ) {
// alert( 'Button activated' );
// }
// },
// {
// 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();
// }
// }
// ]
});
$('.addsim').tooltip();
$('.export').tooltip();
// $( '.dt-buttons').addClass('btn-group');
$( '.addsim').removeClass('dt-button');
$( '.export').removeClass('dt-button');
function selectall(cb) {
tabletangguhlelong.rows().nodes().to$().find('input[type="checkbox"]').each(function(){
$(this).prop('checked', cb.checked);
})
}
</script>
@endsection
resources/views/tangguhlelong/senarailelongtangguh.blade.php
+142
View File
@@ -0,0 +1,142 @@
@extends('layouts.app')
@section('content')
<div class="container-fluid">
<div class="row ">
<div class="col-md-11 mx-auto card p-4">
@if ($message = Session::get('success'))
<div class="alert alert-success">
<p>{{ $message }}</p>
</div>
@endif
<form id="exportform" action="" method="POST">
<input type="hidden" name="type" value="User">
<table class="table table-striped table-xl text-center" id="tablelelong" style="width:100%">
<thead class="bg-primary text-white">
<tr>
<th>No</th>
<th>Tarikh Lelong</th>
<th>Cawangan</th>
<th>Harga Emas Asas</th>
<th>JBG</th>
<th>Caj Lelong</th>
<th>Status Lelong</th>
<th class="text-center">Action</th>
</tr>
</thead>
<tbody>
@foreach ($arrayinfo as $lel)
<tr>
<td>{{$loop->iteration}}</td>
<td>{{ $lel['info']['tarikh_lelong']}}</td>
<td>
@foreach($lel['detailsinfo'] as $details)
<span class="m-2">{{$details['caw_name']}}</span><br>
@endforeach
</td>
<td>{{$lel['info']['harga_emas_asas']}}</td>
<td>{{$lel['info']['jbg']}}</td>
<td>{{$lel['info']['cajlelong']}}</td>
<td>
@if($lel['info']['sts_lelong'] == 0)
<button class="btn btn-primary btn-sm" disabled>LELONG BELUM BERMULA</button>
@elseif($lel['info']['sts_lelong'] == 1)
<button class="btn btn-warning btn-sm" disabled>LELONG BERMULA</button>
@elseif($lel['info']['sts_lelong'] == 2)
<button class="btn btn-warning btn-sm" disabled>LELONG SELESAI</button>
@elseif($lel['info']['sts_lelong'] == 3)
<button class="btn btn-warning btn-sm" disabled>LELONG SELESAI</button>
@endif
</td>
<td>
@if($lel['info']['sts_lelong'] == 0)
<a href="{{ route('tangguhlelong.carian', $lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Carian"><i class="fas fa-search"></i></a>
@endif
</td>
</tr>
@endforeach
</tbody>
</table>
</form>
</div>
</div>
</div>
<script>
//Enable tooltips everywhere
$(function () {
$('[data-toggle="tooltip"]').tooltip()
})
$('a.confirmdel').confirm({
title: 'Confirmation',
content: 'Anda pasti?',
type: 'orange',
typeAnimated: true,
buttons: {
Delete: {
btnClass: 'btn-warning',
action: function () {
location.href = this.$target.attr('href');
}
},
Batal: {
btnClass: 'btn-default',
action: function () {}
}
}
});
var tablelelong = $('#tablelelong').DataTable({
"columnDefs": [
{
"targets": 0,
"orderable": false
},
{
"targets": 7,
"orderable": false
}
],
order: [[1, 'asc']],
// "ordering": false,
"info": false,
"lengthChange": false,
"pageLength": 99999999,
dom: 'Bfrtip',
buttons: [
// 'copy', 'excel', 'pdf'
// { text: 'copy', className: 'btn btn-primary' },
// {
// className: 'btn btn-outline-success pl-4 pr-4 btn-sm addsim',
// text: '<i class="fas fa-plus" id="test"></i>',
// titleAttr: 'Tambah Simulasi',
// action: function ( e, dt, node, config ) {
// alert( 'Button activated' );
// }
// },
{
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();
}
}
]
});
$('.addsim').tooltip();
$('.export').tooltip();
// $( '.dt-buttons').addClass('btn-group');
$( '.addsim').removeClass('dt-button');
$( '.export').removeClass('dt-button');
function selectall(cb) {
tablelelong.rows().nodes().to$().find('input[type="checkbox"]').each(function(){
$(this).prop('checked', cb.checked);
})
}
</script>
@endsection
resources/views/tangguhlelong/senleltangguh.blade.php
+142
View File
@@ -0,0 +1,142 @@
@extends('layouts.app')
@section('content')
<div class="container-fluid">
<div class="row ">
<div class="col-md-11 mx-auto card p-4">
@if ($message = Session::get('success'))
<div class="alert alert-success">
<p>{{ $message }}</p>
</div>
@endif
<form id="exportform" action="" method="POST">
<input type="hidden" name="type" value="User">
<table class="table table-striped table-xl text-center" id="tablelelong" style="width:100%">
<thead class="bg-primary text-white">
<tr>
<th>No</th>
<th>Tarikh Lelong</th>
<th>Cawangan</th>
<th>Harga Emas Asas</th>
<th>JBG</th>
<th>Caj Lelong</th>
<th>Status Lelong</th>
<th class="text-center">Action</th>
</tr>
</thead>
<tbody>
@foreach ($arrayinfo as $lel)
<tr>
<td>{{$loop->iteration}}</td>
<td>{{ $lel['info']['tarikh_lelong']}}</td>
<td>
@foreach($lel['detailsinfo'] as $details)
<span class="m-2">{{$details['caw_name']}}</span><br>
@endforeach
</td>
<td>{{$lel['info']['harga_emas_asas']}}</td>
<td>{{$lel['info']['jbg']}}</td>
<td>{{$lel['info']['cajlelong']}}</td>
<td>
@if($lel['info']['sts_lelong'] == 0)
<button class="btn btn-primary btn-sm" disabled>LELONG BELUM BERMULA</button>
@elseif($lel['info']['sts_lelong'] == 1)
<button class="btn btn-warning btn-sm" disabled>LELONG BERMULA</button>
@elseif($lel['info']['sts_lelong'] == 2)
<button class="btn btn-warning btn-sm" disabled>LELONG SELESAI</button>
@elseif($lel['info']['sts_lelong'] == 3)
<button class="btn btn-warning btn-sm" disabled>LELONG SELESAI</button>
@endif
</td>
<td>
@if($lel['info']['sts_lelong'] == 0)
<a href="{{ route('pengesahan.senaraisahtangguh', [$lel['info']['lelong_id'], $lel['detailsinfo'][0]['caw_code']]) }}" data-toggle="tooltip" data-placement="top" title="Carian"><i class="far fa-edit"></i></a>
@endif
</td>
</tr>
@endforeach
</tbody>
</table>
</form>
</div>
</div>
</div>
<script>
//Enable tooltips everywhere
$(function () {
$('[data-toggle="tooltip"]').tooltip()
})
$('a.confirmdel').confirm({
title: 'Confirmation',
content: 'Anda pasti?',
type: 'orange',
typeAnimated: true,
buttons: {
Delete: {
btnClass: 'btn-warning',
action: function () {
location.href = this.$target.attr('href');
}
},
Batal: {
btnClass: 'btn-default',
action: function () {}
}
}
});
var tablelelong = $('#tablelelong').DataTable({
"columnDefs": [
{
"targets": 0,
"orderable": false
},
{
"targets": 7,
"orderable": false
}
],
order: [[1, 'asc']],
// "ordering": false,
"info": false,
"lengthChange": false,
"pageLength": 99999999,
dom: 'Bfrtip',
buttons: [
// 'copy', 'excel', 'pdf'
// { text: 'copy', className: 'btn btn-primary' },
// {
// className: 'btn btn-outline-success pl-4 pr-4 btn-sm addsim',
// text: '<i class="fas fa-plus" id="test"></i>',
// titleAttr: 'Tambah Simulasi',
// action: function ( e, dt, node, config ) {
// alert( 'Button activated' );
// }
// },
{
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();
}
}
]
});
$('.addsim').tooltip();
$('.export').tooltip();
// $( '.dt-buttons').addClass('btn-group');
$( '.addsim').removeClass('dt-button');
$( '.export').removeClass('dt-button');
function selectall(cb) {
tablelelong.rows().nodes().to$().find('input[type="checkbox"]').each(function(){
$(this).prop('checked', cb.checked);
})
}
</script>
@endsection
resources/views/tangguhlelong/sensahpc.blade.php
+161
View File
@@ -0,0 +1,161 @@
@extends('layouts.app')
@section('content')
<div class="container-fluid">
<div class="row ">
<div class="col-md-11 mx-auto card p-4">
@if ($message = Session::get('success'))
<div class="alert alert-success">
<p>{{ $message }}</p>
</div>
@endif
<form id="formtangguhlelong" action="{{route('pengesahan.sahkantangguhlel')}}" method="POST">
@csrf
<input type="hidden" name="lelong_id" value="{{ $lelong_id }}">
<input type="hidden" name="kodcaw" value="{{ $caw_code }}">
<table class="table table-striped table-xl text-center" id="tangguhlelong" style="width:100%">
<thead class="bg-primary text-white">
<tr>
<th>No</th>
<th>Tarikh Lelong</th>
<th>No Rujukan</th>
<th>JBG</th>
<th>Narhun</th>
<th>Nilai Marhun (RM)</th>
<th>Pembiayaan (RM)</th>
<th>Berat</th>
<th>Remark</th>
<th class="text-center">Action</th>
</tr>
</thead>
<tbody>
@foreach ($pengesahan as $sah)
<tr>
<td>{{$loop->iteration}}</td>
<td>{{$sah['bid_details'][0]['t_lelong']}}</td>
<td>{{$sah['norujukan']}}</td>
<td>{{$sah['bid_details'][0]['jbg']}}</td>
<td>{{$sah['bid_details'][0]['marhun']}}</td>
<td>{{$sah['bid_details'][0]['nilaimarhun']}}</td>
<td>{{$sah['bid_details'][0]['pinjaman']}}</td>
<td>{{$sah['bid_details'][0]['berat']}}</td>
<td>{{$sah['nota']}}</td>
<td class="text-center">
<input type="checkbox" onclick="bidmarhunfunc(this)" aria-label="Checkbox for following text input" name="checkboxdata[]" value="{{ $sah['bid_details'][0]['id'] }}" data-bidmarhun="{{ $sah['bid_details'][0]['id'] }}">
</td>
</tr>
@endforeach
</tbody>
</table>
<div class="modal-footer" style="margin-top:2%;">
<a href="{{ route('pengesahan.senarailelongtangguh') }}" class="btn btn-primary">Kembali</a>
<button type="submit" class="btn btn-warning">Sahkan</button>
</div>
</form>
</div>
</div>
</div>
<script>
//Enable tooltips everywhere
$(function () {
$('[data-toggle="tooltip"]').tooltip()
})
$('a.confirmdel').confirm({
title: 'Confirmation',
content: 'Anda pasti?',
type: 'yellow',
typeAnimated: true,
buttons: {
Delete: {
btnClass: 'btn-warning',
action: function () {
location.href = this.$target.attr('href');
}
},
Batal: {
btnClass: 'btn-default',
action: function () {}
}
}
});
let arraybidmarhun = [];
function bidmarhunfunc(e)
{
let bidmarhun = $(e).data('bidmarhun');
if(e.checked==true) //checkbox
{
arraybidmarhun.push(bidmarhun);
}
else
{
arraybidmarhun = arraybidmarhun.filter(item => item !== bidmarhun);
}
// $('#bidmarhun').val(arraybidmarhun);
// console.log(arraybidmarhun);
}
var tabletangguhlelong = $('#tangguhlelong').DataTable( {
"columnDefs": [
{
"targets": 0,
"orderable": false
},
{
"targets": 8,
"orderable": false
}
],
order: [[1, 'asc']],
// "ordering": false,
"info": false,
"lengthChange": false,
"pageLength": 9999,
dom: 'Bfrtip',
// buttons: [
// // 'copy', 'excel', 'pdf'
// // { text: 'copy', className: 'btn btn-primary' },
// {
// className: 'btn btn-outline-success pl-4 pr-4 btn-sm addsim',
// text: '<i class="fas fa-plus" id="test"></i>',
// titleAttr: 'Tambah tangguhlelong',
// action: function ( e, dt, node, config ) {
// alert( 'Button activated' );
// }
// },
// {
// 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 ) {
// $("#formtangguhlelong").submit();
// }
// }
// ]
});
$('.addsim').tooltip();
$('.export').tooltip();
// $( '.dt-buttons').addClass('btn-group');
$( '.addsim').removeClass('dt-button');
$( '.export').removeClass('dt-button');
function selectall(cb) {
tabletangguhlelong.rows().nodes().to$().find('input[type="checkbox"]').each(function(){
$(this).prop('checked', cb.checked);
})
}
</script>
@endsection
routes/web.php
+11 -1
View File
@@ -192,14 +192,18 @@ Route::group(['middleware' => ['permission:pengesahan'],'prefix'=>'pengesahan'],
Route::post('/terimaperubahan',['as'=>'pengesahan.terimaperubahan','uses'=>'MarhunController@terimaperubahan']);
Route::post('/pcdelete',['as'=>'pengesahan.pcdelete','uses'=>'MarhunController@pcdelete']);
Route::get('/senarailelong',['as'=>'pengesahan.senarailelong','uses'=>'MarhunController@senarailelong']);
Route::get('/senaraitangguhlelong/{id}',['as'=>'pengesahan.senaraitangguhlelong','uses'=>'MarhunController@senaraitangguhlelong']);
Route::get('/senaraitangguhlelong/{id}/{caw_name}',['as'=>'pengesahan.senaraitangguhlelong','uses'=>'MarhunController@senaraitangguhlelong']);
Route::get('/lelbidmarhun/{id}/{norujukan}/{tangguhlelong_id}',['as'=>'pengesahan.lelbidmarhun','uses'=>'MarhunController@lelbidmarhun']);
Route::get('/senarailelongtangguh',['as'=>'pengesahan.senarailelongtangguh','uses'=>'TangguhLelongController@senarailelongtangguh']);
Route::get('/senaraisahtangguh/{lelong_id}/{caw_code}',['as'=>'pengesahan.senaraisahtangguh','uses'=>'TangguhLelongController@senaraisahtangguh']);
Route::post('/sahkantangguhlel',['as'=>'pengesahan.sahkantangguhlel','uses'=>'TangguhLelongController@sahkantangguhlel']);
});
Route::group(['middleware' => ['permission:notistamatkontrak'],'prefix'=>'notistamatkontrak'], function () {
Route::get('/sebelumtamatkont',['as'=>'notistamatkontrak.sebelumtamatkont','uses'=>'TamatKontController@sebelumtamatkont']);
Route::post('/senaraitemp',['as'=>'notistamatkontrak.senaraitemp','uses'=>'TamatKontController@senaraitemp']);
Route::get('/tempbycaw/{details}/{t_lelong}',['as'=>'notistamatkontrak.tempbycaw','uses'=>'TamatKontController@tempbycaw']);
Route::post('/janadatatamatkontrak',['as'=>'notistamatkontrak.janadatatamatkontrak','uses'=>'TamatKontController@janadatatamatkontrak']);
});
Route::group(['middleware' => ['permission:importdata'],'prefix'=>'importdata'], function () {
@@ -229,6 +233,12 @@ Route::group(['middleware' => ['permission:pengesahanbayarancash'],'prefix'=>'pe
Route::post('/banktransfer', ['as'=>'pembayaran.banktransfer','uses'=>'PaymentController@banktransfer']);
});
Route::group(['middleware' => ['permission:tangguhlelong'],'prefix'=>'tangguhlelong'], function () {
Route::get('/senleluntuktangguh', ['as'=>'tangguhlelong.senleluntuktangguh','uses'=>'TangguhLelongController@senleluntuktangguh']);
Route::get('/carian/{lelong_id}', ['as'=>'tangguhlelong.carian','uses'=>'TangguhLelongController@carian']);
Route::post('/searchbyic', ['as'=>'tangguhlelong.searchbyic','uses'=>'TangguhLelongController@searchbyic']);
Route::post('/tangguhlelong', ['as'=>'tangguhlelong.tangguhlelong','uses'=>'TangguhLelongController@tangguhlelong']);
});
// Pengurus Cawangan
// Account