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

Merge branch 'faiqahzaman' into 'main'

Browse Source 
semak sah marhun khazanah

See merge request online-sistem1/lelong!3
This commit is contained in:
Nur Izzati Zulkifli
2022-04-13 03:06:25 +00:00
parent 691a32a94d 32a8b4b072
commit f17a844578
37 changed files with 1866 additions and 253 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/AccountController.php
+19 -14
View File
@@ -37,7 +37,8 @@ class AccountController extends Controller
->join('payment', 'lelongbidder.payment_id', 'payment.id')
->where('lelongbidder.status_bidder', 1)
->where('lelongbid.lelong_id', $lelong_id)
->where('payment.status_payment_opt',2)
->where('payment.status_payment_opt','=', '3,2')
->where('lelongbidder.status_payment', 2)
->whereNull('payment.disahkan_pada')
->select('.lelongbidder.user_id'
)
@@ -48,12 +49,6 @@ class AccountController extends Controller
foreach($listwinner as $index1=>$winner){
$userdetails = User::where('id', $winner['user_id'])->first();
// $SAGWin = Payment::join('lelongbid', 'payment.lelongbid_id', '=', 'lelongbid.id')
// ->join('lelongbidder', 'payment.lelongbidder_id', '=', 'lelongbidder.id')
// ->where('payment.user_id', $winner['user_id'])
// ->where('lelongbidder.status_bidder', 1)
// ->where('lelongbid.lelong_id', $lelong_id)
// ->get();
$SAGWin = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
->where('lelongbidder.user_id', $winner['user_id'])
@@ -62,7 +57,6 @@ class AccountController extends Controller
->get();
// dd($SAGWin->sum('hargabida'));
$id_payment = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
->where('lelongbidder.user_id', $winner['user_id'])
->where('lelongbidder.status_bidder', 1)
@@ -98,7 +92,8 @@ class AccountController extends Controller
->where('lelongbid.lelong_id', $lelong_id)
->where('lelongbidder.user_id', $user_id)
->where('lelongbidder.status_bidder', 1)
->where('payment.status_payment_opt', 2)
->where('payment.status_payment_opt', '=', '3,2')
->where('lelongbidder.status_payment', 2)
->get()->toArray();
$saggroupbyid = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
@@ -106,7 +101,8 @@ class AccountController extends Controller
->where('lelongbid.lelong_id', $lelong_id)
->where('lelongbidder.user_id', $user_id)
->where('lelongbidder.status_bidder', 1)
->where('payment.status_payment_opt', 2)
->where('payment.status_payment_opt', '=', '3,2')
->where('lelongbidder.status_payment', 2)
->select(
'lelongbidder.payment_id as payment_id'
)
@@ -126,21 +122,21 @@ class AccountController extends Controller
$currentdate = $currentdate->toDateTimeString();
$user = Auth::user();
$senaraisag = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
->join('payment', 'lelongbidder.payment_id', '=', 'payment.id')
->where('lelongbid.lelong_id', $request->lelong_id)
->where('lelongbidder.user_id', $request->user_id)
->where('lelongbidder.status_bidder', 1)
->where('payment.status_payment_opt', 2)
->where('payment.status_payment_opt', '3,2')
->where('lelongbidder.status_payment', 2)
->select(
'lelongbid.id as lelongbid_id',
'payment.id as payment_id',
'lelongbid.lelong_id',
'lelongbidder.user_id',
)
->get();
->get();
$total_payment = 0;
$paymentid = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
@@ -148,7 +144,8 @@ class AccountController extends Controller
->where('lelongbid.lelong_id', $request->lelong_id)
->where('lelongbidder.user_id', $request->user_id)
->where('lelongbidder.status_bidder', 1)
->where('payment.status_payment_opt', 2)
->where('payment.status_payment_opt', '3,2')
->where('lelongbidder.status_payment', 2)
->select(
'lelongbidder.payment_id as payment_id'
)
@@ -169,8 +166,16 @@ class AccountController extends Controller
$eachbid = LelongBid::where('id',$sag->lelongbid_id)->first();
$eachbid->status_payment = 1;
$eachbid->status_jual = 1;
$eachbid->status_semak = 1;
$eachbid->t_jual = $currentdate;
$eachbid->save();
$bidder = LelongBidder::where('lelongbid_id', $sag->lelongbid_id)
->where('payment_id', $sag->payment_id)
->where('user_id', $sag->user_id)
->first();
$bidder->status_payment = 1;
$bidder->update();
}
$senaraisagallpayment = LelongBid::join('lelongbidder', 'lelongbid.id', '=', 'lelongbidder.lelongbid_id')
app/Http/Controllers/LelongController.php
+14 -1
View File
@@ -52,7 +52,15 @@ class LelongController extends Controller
public function index()
{
$lelong = Lelong::all();
return view('lelong.senarailelong',compact('lelong'));
foreach($lelong as $lel)
{
$caw_lelong = CawanganLelong::join('cawangan', 'cawangan_lelong.caw_id', '=', 'cawangan.id')
->where('lelong_id', $lel['id'])
->get()->toArray();
}
return view('lelong.senarailelong',compact('lelong', 'caw_lelong'));
}
public function show($id)
@@ -315,6 +323,11 @@ class LelongController extends Controller
$lelongbidmarhun->bil = $simbidmarhun->bil;
$lelongbidmarhun->marhun = $simbidmarhun->marhun;
$lelongbidmarhun->nota = $simbidmarhun->nota;
$lelongbidmarhun->old_karat = $simbidmarhun->karat;
$lelongbidmarhun->old_berat = $simbidmarhun->berat;
$lelongbidmarhun->old_harga = $simbidmarhun->harga;
$lelongbidmarhun->old_nmarhun = $simbidmarhun->n_marhun;
$lelongbidmarhun->old_hargaasas = $simbidmarhun->hargaasas;
$lelongbidmarhun->karat = $simbidmarhun->karat;
$lelongbidmarhun->berat = $simbidmarhun->berat;
$lelongbidmarhun->harga = $simbidmarhun->harga;
app/Http/Controllers/MarhunController.php
+248 -75
View File
@@ -56,69 +56,179 @@ class MarhunController extends Controller
public function kemaskini(Request $request)
{
// dd($request->all());
//idmarhun => lelongbidmarhun_id
$user = Auth::user();
$currentdate = Carbon::now();
$currentdate = $currentdate->toDateTimeString();
// dd($request->all());
$marhun = LelongBidMarhun::where('id','=',$request->idmarhun)->first();
$lelongbid = LelongBid::where('id','=',$marhun->lelongbid_id)->first();
// dd($marhun);
if($marhun->marhun != $request->marhun)
{
// dd($marhun->marhun);
$txtmarhun = ",1 " . $marhun->marhun ;
// dd($txtmarhun);
$lelongbid->marhun = $lelongbid->marhun ."1 " . $request->marhun . "," ;
$lelongbid->marhun = str_replace( $txtmarhun,"",$lelongbid->marhun);
}
$caw = CawanganLelong::where('id','=',$lelongbid->caw_id)->first();
$lelong = Lelong::where('id','=',$lelongbid->lelong_id)->first();
// $simkarat = LelKarat::where('lelong_id','=',$lelong->id)->get();
$ubahberatmin = 0.3;
$bezaberat = $marhun->old_berat - $request->berat_emas;
$bezahargaasas = $marhun->old_hargaasas - $request->harga_asas;
if(($request->karat < $marhun->old_karat) && ($bezaberat > $ubahberatmin))
{
$marhun->marhun = $request->marhun;
$marhun->karat = $request->karat;
$marhun->berat = $request->berat_emas;
$marhun->harga = $request->harga;
$marhun->n_marhun = $request->nilai_marhun;
$marhun->hargaasas = $request->harga_asas;
$marhun->save();
// foreach($simkarat as $karat)
// {
// if($karat->karat == $request->karat)
// {
if($request->karat != $marhun->karat)
{
// $checkdata = Pengesahan::where('lelongbid_id', $lelongbid->id)
// ->whereNull('disahkan_pada')
// ->first();
$karat = new Pengesahan;
$karat->lelong_id = $lelong->id;
$karat->lelongbid_id = $lelongbid->id;
$karat->lelongbidmarhun_id = $marhun->id;
$karat->norujukan = $lelongbid->norujukan;
$karat->diminta_oleh = $user->id;
$karat->diminta_pada = $currentdate;
$karat->status_ubah = 1;
$karat->save();
}
$bezaberat = $marhun->berat - $request->berat_emas;
$bezahargaasas = $marhun->hargaasas - $request->harga_asas;
// $val = round($request->berat_emas * $karat->harga);
$marhun->marhun = $request->marhun;
$marhun->karat = $request->karat;
$marhun->berat = $request->berat_emas;
$marhun->harga = $request->harga;
$marhun->n_marhun = $request->nilai_marhun;
$marhun->hargaasas = $request->harga_asas;
$marhun->save();
// dd($marhun->marhun);
$lelongbid->berat = $lelongbid->berat - ($bezaberat);
$lelongbid->hargaasas = $lelongbid->hargaasas - ($bezahargaasas);
$lelongbid->save();
$lelongbid->berat = $lelongbid->berat - ($bezaberat);
$lelongbid->hargaasas = $lelongbid->hargaasas - ($bezahargaasas);
$lelongbid->save();
// }
// }
$pengesahan = Pengesahan::where('lelongbidmarhun_id', $request->idmarhun)
->where('lelongbid_id', $marhun->lelongbid_id)
->get();
if(isset($pengesahan['id']))
{
$pengesahan->id = $pengesahan->id;
$pengesahan->lelong_id = $lelong->id;
$pengesahan->lelongbid_id = $lelongbid->id;
$pengesahan->lelongbidmarhun_id = $marhun->id;
$pengesahan->norujukan = $lelongbid->norujukan;
$pengesahan->diminta_oleh = $user->id;
$pengesahan->diminta_pada = $currentdate;
$pengesahan->status_ubah = 5;
$pengesahan->save();
}
else
{
$berat = new Pengesahan;
$berat->lelong_id = $lelong->id;
$berat->lelongbid_id = $lelongbid->id;
$berat->lelongbidmarhun_id = $marhun->id;
$berat->norujukan = $lelongbid->norujukan;
$berat->diminta_oleh = $user->id;
$berat->diminta_pada = $currentdate;
$berat->status_ubah = 5;
$berat->save();
}
}
else if($request->karat < $marhun->old_karat)
{
$marhun->marhun = $request->marhun;
$marhun->karat = $request->karat;
$marhun->berat = $request->berat_emas;
$marhun->harga = $request->harga;
$marhun->n_marhun = $request->nilai_marhun;
$marhun->hargaasas = $request->harga_asas;
$marhun->save();
$pengesahan = Pengesahan::where('lelongbidmarhun_id', $request->idmarhun)
->where('lelongbid_id', $marhun->lelongbid_id)
->get();
if(isset($pengesahan['id']))
{
$pengesahan->id = $pengesahan->id;
$pengesahan->lelong_id = $lelong->id;
$pengesahan->lelongbid_id = $lelongbid->id;
$pengesahan->lelongbidmarhun_id = $marhun->id;
$pengesahan->norujukan = $lelongbid->norujukan;
$pengesahan->diminta_oleh = $user->id;
$pengesahan->diminta_pada = $currentdate;
$pengesahan->status_ubah = 1;
$pengesahan->save();
}
else
{
$karat = new Pengesahan;
$karat->lelong_id = $lelong->id;
$karat->lelongbid_id = $lelongbid->id;
$karat->lelongbidmarhun_id = $marhun->id;
$karat->norujukan = $lelongbid->norujukan;
$karat->diminta_oleh = $user->id;
$karat->diminta_pada = $currentdate;
$karat->status_ubah = 1;
$karat->save();
}
}
else if($bezaberat > $ubahberatmin)
{
$marhun->marhun = $request->marhun;
$marhun->karat = $request->karat;
$marhun->berat = $request->berat_emas;
$marhun->harga = $request->harga;
$marhun->n_marhun = $request->nilai_marhun;
$marhun->hargaasas = $request->harga_asas;
$marhun->save();
$lelongbid->berat = $lelongbid->berat - ($bezaberat);
$lelongbid->hargaasas = $lelongbid->hargaasas - ($bezahargaasas);
$lelongbid->save();
$pengesahan = Pengesahan::where('lelongbidmarhun_id', $request->idmarhun)
->where('lelongbid_id', $marhun->lelongbid_id)
->get();
if(isset($pengesahan['id']))
{
$pengesahan->id = $pengesahan->id;
$pengesahan->lelong_id = $lelong->id;
$pengesahan->lelongbid_id = $lelongbid->id;
$pengesahan->lelongbidmarhun_id = $marhun->id;
$pengesahan->norujukan = $lelongbid->norujukan;
$pengesahan->diminta_oleh = $user->id;
$pengesahan->diminta_pada = $currentdate;
$pengesahan->status_ubah = 4;
$pengesahan->save();
}
else
{
$berat = new Pengesahan;
$berat->lelong_id = $lelong->id;
$berat->lelongbid_id = $lelongbid->id;
$berat->lelongbidmarhun_id = $marhun->id;
$berat->norujukan = $lelongbid->norujukan;
$berat->diminta_oleh = $user->id;
$berat->diminta_pada = $currentdate;
$berat->status_ubah = 4;
$berat->save();
}
}
//beza berat kurang daripada 0.30 & penambahan berat (tak perlu pengesahan)
else
{
$marhun->id = $request->idmarhun;
$marhun->marhun = $request->marhun;
$marhun->karat = $request->karat;
$marhun->berat = $request->berat_emas;
$marhun->harga = $request->harga;
$marhun->n_marhun = $request->nilai_marhun;
$marhun->hargaasas = $request->harga_asas;
$marhun->save();
$pengesahan = Pengesahan::where('lelongbidmarhun_id', $request->idmarhun)
->where('lelongbid_id', $marhun->lelongbid_id)
->delete();
$lelongbid->berat = $lelongbid->berat - ($bezaberat);
$lelongbid->hargaasas = $lelongbid->hargaasas - ($bezahargaasas);
$lelongbid->save();
}
return redirect()->route('marhun.show', [$lelongbid->id, $lelong->id])
->with('success','Kemaskini Marhun Berjaya');
@@ -131,7 +241,6 @@ class MarhunController extends Controller
$lelkarat = LelKarat::where('lelong_id','=',$lelongbid->lelong_id)->get();
$karatall = JenisKarat::all();
$emasall = JenisEmas::all();
// dd($lelkarat);
return view('marhun.marhun',compact('marhun','lelongbid','karatall','emasall','lelkarat', 'lelong_id'));
}
@@ -155,9 +264,27 @@ class MarhunController extends Controller
public function semak($id, $lelong_id)
{
//$id => lelongbid_id
$lelongbid = LelongBid::where('id','=',$id)
->where('lelong_id', $lelong_id)
->first();
$lelongbidmarhun = LelongBidMarhun::where('lelongbid_id', $id)->get();
foreach($lelongbidmarhun as $lelbidmarhun)
{
if($lelbidmarhun['karat'] == null && $lelbidmarhun['berat'] == null && $lelbidmarhun['harga'] == null && $lelbidmarhun['n_marhun'] == null && $lelbidmarhun['hargaasas'] == null)
{
$lelbidmarhun->lelongbid_id = $id;
$lelbidmarhun->karat = $lelbidmarhun['old_karat'];
$lelbidmarhun->berat = $lelbidmarhun['old_berat'];
$lelbidmarhun->harga = $lelbidmarhun['old_harga'];
$lelbidmarhun->n_marhun = $lelbidmarhun['old_nmarhun'];
$lelbidmarhun->hargaasas = $lelbidmarhun['old_hargaasas'];
$lelbidmarhun->save();
}
}
$lelongbid->status_semak = 1;
$lelongbid->save();
@@ -268,7 +395,6 @@ class MarhunController extends Controller
public function sahubahmutu($id)
{
$mutumarhun = Lelong::join('pengesahan', 'lelong.id', '=', 'pengesahan.lelong_id')
->where('lelong.id', $id)
->whereNull('disahkan_oleh')
@@ -276,6 +402,18 @@ class MarhunController extends Controller
->groupBy('pengesahan.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')
->where('lelongbid.lelong_id', $id)
->where('lelongbid.norujukan', $mutu['norujukan'])
->select('cawangan.caw_name')
->first();
// dd($cawangan);
$mutumarhun[$index1]['cawangan_name'] = $cawangan;
}
// foreach($mutumarhun as $index1=>$marhun)
// {
// $pengesahan = Pengesahan::where('lelong_id', $id)
@@ -292,50 +430,84 @@ class MarhunController extends Controller
public function mutumarhun($norujukan, $id)
{
$pengesahans = Pengesahan::where('lelong_id', $id)
->where('norujukan', $norujukan)
$lelbidmarhuns = LelongBidMarhun::join('lelongbid', 'lelongbidmarhun.lelongbid_id', '=', 'lelongbid.id')
->where('lelongbid.lelong_id', $id)
->where('lelongbid.norujukan', $norujukan)
->select(
'lelongbidmarhun.id as lelongbidmarhun_id',
'lelongbid.id as lelongbid_id',
'lelongbidmarhun.bil',
'lelongbidmarhun.marhun',
'lelongbidmarhun.nota',
'lelongbidmarhun.karat',
'lelongbidmarhun.berat',
'lelongbidmarhun.harga',
'lelongbidmarhun.n_marhun',
'lelongbidmarhun.hargaasas',
'lelongbidmarhun.status_semak',
'lelongbid.lelong_id',
'lelongbid.caw_id',
'lelongbid.kodcaw',
'lelongbid.norujukan',
'lelongbid.t_lelong',
'lelongbid.jbg',
'lelongbid.kadarupah',
'lelongbid.upahsimpan',
'lelongbid.ansuran',
'lelongbid.nilaimarhun',
'lelongbid.pinjaman',
'lelongbid.bakiupah',
'lelongbid.cajlelong',
'lelongbid.baki',
'lelongbid.percent',
)
->get();
$arraypengesahan = [];
foreach($pengesahans as $pengesahan)
{
// dd($pengesahan);
$marhuns = LelongBidMarhun::where('lelongbid_id', $pengesahan->lelongbid_id)
->where('id', $pengesahan->lelongbidmarhun_id)
$arraylelbidmarhun = [];
$bakilelong = 0;
$rugilelong = 0;
foreach($lelbidmarhuns as $lelbidmarhun)
{
$marhuns = LelongBidMarhun::where('lelongbid_id', $lelbidmarhun->lelongbid_id)
->where('id', $lelbidmarhun->lelongbidmarhun_id)
->get()->toArray();
$lelongbid = LelongBid::where('id', $pengesahan->lelongbid_id)->first();
$lelongbid = LelongBid::where('id', $lelbidmarhun->lelongbid_id)->where('lelong_id', $id)->first();
$karat = Lelkarat::where('lelong_id', $id)->get();
foreach($marhuns as $index1=>$marhun)
{
$status = Pengesahan::where('id', $pengesahan->id)
$status = Pengesahan::where('lelongbidmarhun_id', $lelbidmarhun->lelongbidmarhun_id)
->where('lelongbid_id', $marhun['lelongbid_id'])
->select('status_ubah')
->value('status_ubah');
$gadaimarhun = GadaiMarhun::where('marhun', $marhun['marhun'])
->where('norujukan', $lelongbid->norujukan)
->where('norujukan', $lelongbid->norujukan)
->first();
$karat = $karat->where('karat', $gadaimarhun->karat)->first();
$total = $karat->harga * $gadaimarhun->berat;
$hargaasas = round($total);
$marhuns[$index1]['old_marhun'] = $gadaimarhun->marhun;
$marhuns[$index1]['old_karat'] = $gadaimarhun->karat;
$marhuns[$index1]['old_berat'] = $gadaimarhun->berat;
$marhuns[$index1]['old_harga'] = $karat->harga;
$marhuns[$index1]['old_nilaimarhun'] = $total;
$marhuns[$index1]['old_hargaasas'] = $hargaasas;
$marhuns[$index1]['status_ubah'] = $status;
}
array_push($arraypengesahan,$marhuns);
}
return view('pengesahan.mutumarhun', compact('lelongbid', 'norujukan', 'id', 'arraypengesahan', 'marhuns'));
if($lelongbid->baki > 0)
{
$bakilelong = $bakilelong + $lelongbid->baki;
}
else
{
$rugilelong = $rugilelong - $lelongbid->baki;
}
$marhuns[$index1]['harga_gadai'] = $gadaimarhun->harga;
$marhuns[$index1]['nmarhun_gadai'] = $gadaimarhun->n_marhun;
$marhuns[$index1]['old_marhun'] = $gadaimarhun->marhun;
$marhuns[$index1]['status_ubah'] = $status;
$marhuns[$index1]['pembiayaan'] = $lelongbid->pinjaman;
$marhuns[$index1]['baki_lelong'] = $bakilelong;
$marhuns[$index1]['rugi_lelong'] = $rugilelong;
}
array_push($arraylelbidmarhun,$marhuns);
}
return view('pengesahan.mutumarhun', compact('lelongbid', 'norujukan', 'id', 'arraylelbidmarhun', 'marhuns'));
}
public function terimaperubahan(Request $request)
@@ -349,6 +521,7 @@ class MarhunController extends Controller
$pengesahan = Pengesahan::where('id', $request->pengesahan_id)
->first();
dd($pengesahan);
$pengesahan->disahkan_oleh = $user->id;
$pengesahan->disahkan_pada = $currentdate;
$pengesahan->update();
app/Http/Controllers/PaymentController.php
+56 -6
View File
@@ -24,6 +24,7 @@ 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)
->get();
// dd($senarai);
@@ -41,7 +42,6 @@ class PaymentController extends Controller
)
->groupBy('lelongbidder.user_id')
->get()->toArray();
// dd($listwinner);
foreach($listwinner as $index1=>$winner){
@@ -52,13 +52,20 @@ class PaymentController extends Controller
->where('lelongbid.lelong_id', $lelong_id)
->get();
$payment_id = $$SAGWin = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
$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', $lelong_id)
->select('lelongbidder.status_payment')
->get();
// dd($sts_payment[0]['status_payment']);
$payment_id = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
->where('user_id', $winner['user_id'])
->where('lelongbidder.status_bidder', 1)
->where('lelongbid.lelong_id', $lelong_id)
->select('payment_id')->groupBy('payment_id')->get();
// dd($payment_id);
$total_payment = 0;
foreach($payment_id as $id){
$payment = Payment::where('id', $id->payment_id)
@@ -73,6 +80,7 @@ class PaymentController 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'];
}
@@ -108,7 +116,6 @@ class PaymentController extends Controller
)
->get();
return view('pembayaran.SAGBidItem',compact('SAGBidItem', 'eachbid', 'lelong_id','user_id'));
}
@@ -125,7 +132,7 @@ class PaymentController extends Controller
$resit = Resit::where('lelong_id', $request->lelong_id)
->where('user_id',$request->user_id)
->where('resit_type', 2)
->first();
->first();
$total_hargabida = 0;
$payment = Payment::create([
@@ -212,4 +219,47 @@ class PaymentController extends Controller
return view('pembayaran.pengesahanPembayaran',compact('pengesahanPembayaran'));
}
public function banktransfer(Request $request)
{
// dd($request->all());
$currentdate = Carbon::now();
$currentdate = $currentdate->toDateTimeString();
$user = Auth::user();
// dd($user);
$totalcheck = implode(",", $request->checkboxdata);
$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;
$payment->kodcaw = $user->kodcaw;
$payment->status_payment_opt = 3;
$payment->status = 2;
$payment->remark = 'BAYARAN CDM';
$payment->resit_id = $resit->id;
$payment->total_payment = $totalcheck;
$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)
->first();
$sts_payment->payment_id = $payment->id;
$sts_payment->status_payment = 2; //Menunggu pengesahan account
$sts_payment->update();
return redirect()->route('pembayaran.SenaraiLelongBayar')
->with('success','Menunggu Pengesahan Account');
}
}
app/Http/Controllers/PembidaController.php
+85 -2
View File
@@ -6,11 +6,15 @@ use Illuminate\Http\Request;
use Spatie\Permission\Models\Role;
use Spatie\Permission\Models\Permission;
use Illuminate\Support\Facades\Auth;
use App\Models\User;
use App\Models\File;
use PDF;
use Carbon\Carbon;
use App\Models\User;
use App\Models\File;
use App\Models\Lelong;
use App\Models\CawanganLelong;
use App\Models\LelongBidder;
use App\Models\Payment;
class PembidaController extends Controller
{
@@ -168,6 +172,85 @@ class PembidaController extends Controller
return redirect()->route('pembida.senaraipembidakeseluruhan')->with('success','Pembida Berjaya Dikemaskini');
}
public function senlelpembayaranbidaan(Request $request)
{
$lelong = CawanganLelong::join('lelong', 'cawangan_lelong.lelong_id', '=', 'lelong.id')
->join('cawangan', 'cawangan_lelong.caw_id', '=', 'cawangan.id')
->where('lelong.sts_lelong', 3)
->get();
return view('pembida.senlelpembayaranbidaan',compact('lelong'));
}
public function pembayaranbidaan(Request $request)
{
// dd($request->all());
$listwinner = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
->where('lelongbidder.status_bidder', 1)
->where('lelongbid.lelong_id', $request->lelong_id)
->select('lelongbidder.user_id'
)
->groupBy('lelongbidder.user_id')
->get()->toArray();
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();
$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();
$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();
$payment_id = 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('payment_id')->groupBy('payment_id')->get();
$total_payment = 0;
foreach($payment_id as $id){
$payment = Payment::where('id', $id->payment_id)
->first();
if($payment){
$total_payment = $total_payment + $payment->total_payment;
}
}
$listwinner[$index1]['details'] = $userdetails;
$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'];
}
return view('pembida.pembayaranbidaan',compact('listwinner'));
}
public function detailsbidaan(Request $request)
{
}
}
app/Http/Controllers/SimulasiController.php
+1 -2
View File
@@ -57,8 +57,7 @@ class SimulasiController extends Controller
public function janadata(Request $request)
{
// dd($request->all());
$t_lelong = Carbon::parse($request->tarikh_lelong);
$bulan = (int)round($request->jbg);
$jbgadai = ($t_lelong->subMonths($bulan))->toDateString();
app/Http/Controllers/TamatKontController.php
+217
View File
@@ -0,0 +1,217 @@
<?php
namespace App\Http\Controllers;
use Illuminate\Support\Facades\Auth;
use Illuminate\Http\Request;
use Carbon\Carbon;
use App\Models\User;
use App\Models\Gadai;
use App\Models\GadaiMarhun;
use App\Models\Cawangan;
use App\Models\TransaksiKeuntungan;
class TamatKontController extends Controller
{
//PC
public function notistamatkontrak(Request $request)
{
return view('jananotis.notistamatkontrak');
}
public function gadaibycaw(Request $request)
{
$t_lelong = $request->tarikh_lelong;
$user = Auth::user();
$getsurat = Gadai::where('t_matang1', '<', $t_lelong)
->where('kodcaw', $user->kodcaw)
->where('sttebus', '=', '')
->where('taglel', '=', 0)
->where('tagpalsu', '=', 0)
->where('tagpalsu2', '=', 0)
->whereNotNull('upah12')
->get();
if(sizeof($getsurat) != 0)
{
$t_gadais = Gadai::where('t_matang1', '<', $t_lelong)
->where('sttebus', '=', '')
->where('taglel', '=', 0)
->where('tagpalsu', '=', 0)
->where('tagpalsu2', '=', 0)
->whereNotNull('upah12')
->orderBy('t_gadai')
->select('t_gadai')
->first();
$bil_lelongcaw = Gadai::join('cawangan', 'gadai.kodcaw', '=', 'cawangan.caw_code')
->where('gadai.t_matang1', '<', $t_lelong)
->where('kodcaw', $user->kodcaw)
->where('gadai.sttebus', '=', '')
->where('gadai.taglel', '=', 0)
->where('gadai.tagpalsu', '=', 0)
->where('gadai.tagpalsu2', '=', 0)
->whereNotNull('gadai.upah12')
->selectRaw('count(*) as bil_lelong')
->get()->toArray();
$tarikh_lelong = Carbon::parse($t_lelong);
$t_anggaran = ($tarikh_lelong->subMonths(1))->toDateString();
foreach($getsurat as $index1=>$surats)
{
$senarai = Gadai::join('cawangan', 'gadai.kodcaw', '=', 'cawangan.caw_code')
->where('norujukan', $surats['norujukan'])
->get();
$getsurat[$index1]['list_norujukan'] = $senarai;
}
// $keuntungantlhbyr = TransaksiKeuntungan::on('mysql2')
// ->sum('bayaran_keuntungan');
return view('jananotis.gadaibycaw', compact( 'getsurat',
't_lelong',
'user',
't_gadais',
't_anggaran',
'bil_lelongcaw'
));
}
else if(sizeof($getsurat) == 0)
{
return redirect()->route('jananotis.notistamatkontrak')
->with('failed','Tiada surat untuk di lelong');
}
else
{
return redirect()->route('jananotis.notistamatkontrak')
->with('failed','Sila Masukkan Tarikh Lelongan');
}
}
//Operasi
public function sebelumtamatkont(Request $request)
{
return view('jananotis.sebelumtamatkont');
}
public function senaraitemp(Request $request)
{
$t_lelong = $request->tarikh_lelong;
if($t_lelong != null)
{
$getsurat = Gadai::where('t_matang1', '<', $t_lelong)
->where('sttebus', '=', '')
->where('taglel', '=', 0)
->where('tagpalsu', '=', 0)
->where('tagpalsu2', '=', 0)
->whereNotNull('upah12')
->get();
// dd($getsurat);
if(sizeof($getsurat) == 0)
{
return redirect()->route('notistamatkontrak.sebelumtamatkont')
->with('failed','Tiada surat untuk di lelong');
}
$t_gadais = Gadai::where('t_matang1', '<', $t_lelong)
->where('sttebus', '=', '')
->where('taglel', '=', 0)
->where('tagpalsu', '=', 0)
->where('tagpalsu2', '=', 0)
->whereNotNull('upah12')
->orderBy('t_gadai')
->select('t_gadai')
->first();
$senarai = Gadai::join('cawangan', 'gadai.kodcaw', '=', 'cawangan.caw_code')
->where('gadai.t_matang1', '<', $t_lelong)
->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);
return view('jananotis.senaraitemp', compact( 't_lelong',
'getsurat',
'senarai',
't_gadais'
));
}
else
{
return redirect()->route('notistamatkontrak.sebelumtamatkont')
->with('failed','Sila Masukkan Tarikh Lelongan');
}
}
public function tempbycaw($details, $t_lelong)
{
$getsurat = Gadai::where('t_matang1', '<', $t_lelong)
->where('kodcaw', $details)
->where('sttebus', '=', '')
->where('taglel', '=', 0)
->where('tagpalsu', '=', 0)
->where('tagpalsu2', '=', 0)
->whereNotNull('upah12')
->get();
$t_gadais = Gadai::where('t_matang1', '<', $t_lelong)
->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();
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('jananotis.tempbycaw', compact( 'getsurat',
'details',
'senarai',
't_lelong',
't_gadais',
't_anggaran',
'tarikh_lelong'
));
}
// public function janasimulasi($t_lelong, )
}
composer.json
+1
View File
@@ -19,6 +19,7 @@
"spatie/laravel-permission": "^5.3"
},
"require-dev": {
"barryvdh/laravel-debugbar": "^3.6",
"facade/ignition": "^2.5",
"fakerphp/faker": "^1.9.1",
"laravel/sail": "^1.0.1",
composer.lock
Generated
+220 -1
View File
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "19afa9eb7e1656eb3f55bbf757c7b260",
"content-hash": "1f26af21cdf299942137e16bdee7fbea",
"packages": [
{
"name": "asm89/stack-cors",
@@ -7236,6 +7236,91 @@
}
],
"packages-dev": [
{
"name": "barryvdh/laravel-debugbar",
"version": "v3.6.7",
"source": {
"type": "git",
"url": "https://github.com/barryvdh/laravel-debugbar.git",
"reference": "b96f9820aaf1ff9afe945207883149e1c7afb298"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/b96f9820aaf1ff9afe945207883149e1c7afb298",
"reference": "b96f9820aaf1ff9afe945207883149e1c7afb298",
"shasum": ""
},
"require": {
"illuminate/routing": "^6|^7|^8|^9",
"illuminate/session": "^6|^7|^8|^9",
"illuminate/support": "^6|^7|^8|^9",
"maximebf/debugbar": "^1.17.2",
"php": ">=7.2",
"symfony/debug": "^4.3|^5|^6",
"symfony/finder": "^4.3|^5|^6"
},
"require-dev": {
"mockery/mockery": "^1.3.3",
"orchestra/testbench-dusk": "^4|^5|^6|^7",
"phpunit/phpunit": "^8.5|^9.0",
"squizlabs/php_codesniffer": "^3.5"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "3.6-dev"
},
"laravel": {
"providers": [
"Barryvdh\\Debugbar\\ServiceProvider"
],
"aliases": {
"Debugbar": "Barryvdh\\Debugbar\\Facades\\Debugbar"
}
}
},
"autoload": {
"files": [
"src/helpers.php"
],
"psr-4": {
"Barryvdh\\Debugbar\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Barry vd. Heuvel",
"email": "barryvdh@gmail.com"
}
],
"description": "PHP Debugbar integration for Laravel",
"keywords": [
"debug",
"debugbar",
"laravel",
"profiler",
"webprofiler"
],
"support": {
"issues": "https://github.com/barryvdh/laravel-debugbar/issues",
"source": "https://github.com/barryvdh/laravel-debugbar/tree/v3.6.7"
},
"funding": [
{
"url": "https://fruitcake.nl",
"type": "custom"
},
{
"url": "https://github.com/barryvdh",
"type": "github"
}
],
"time": "2022-02-09T07:52:32+00:00"
},
{
"name": "doctrine/instantiator",
"version": "1.4.0",
@@ -7805,6 +7890,72 @@
},
"time": "2021-11-05T08:25:44+00:00"
},
{
"name": "maximebf/debugbar",
"version": "v1.18.0",
"source": {
"type": "git",
"url": "https://github.com/maximebf/php-debugbar.git",
"reference": "0d44b75f3b5d6d41ae83b79c7a4bceae7fbc78b6"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/0d44b75f3b5d6d41ae83b79c7a4bceae7fbc78b6",
"reference": "0d44b75f3b5d6d41ae83b79c7a4bceae7fbc78b6",
"shasum": ""
},
"require": {
"php": "^7.1|^8",
"psr/log": "^1|^2|^3",
"symfony/var-dumper": "^2.6|^3|^4|^5|^6"
},
"require-dev": {
"phpunit/phpunit": "^7.5.20 || ^9.4.2",
"twig/twig": "^1.38|^2.7|^3.0"
},
"suggest": {
"kriswallsmith/assetic": "The best way to manage assets",
"monolog/monolog": "Log using Monolog",
"predis/predis": "Redis storage"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.17-dev"
}
},
"autoload": {
"psr-4": {
"DebugBar\\": "src/DebugBar/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Maxime Bouroumeau-Fuseau",
"email": "maxime.bouroumeau@gmail.com",
"homepage": "http://maximebf.com"
},
{
"name": "Barry vd. Heuvel",
"email": "barryvdh@gmail.com"
}
],
"description": "Debug bar in the browser for php application",
"homepage": "https://github.com/maximebf/php-debugbar",
"keywords": [
"debug",
"debugbar"
],
"support": {
"issues": "https://github.com/maximebf/php-debugbar/issues",
"source": "https://github.com/maximebf/php-debugbar/tree/v1.18.0"
},
"time": "2021-12-27T18:49:48+00:00"
},
{
"name": "mockery/mockery",
"version": "1.4.4",
@@ -9745,6 +9896,74 @@
],
"time": "2020-09-28T06:39:44+00:00"
},
{
"name": "symfony/debug",
"version": "v4.4.37",
"source": {
"type": "git",
"url": "https://github.com/symfony/debug.git",
"reference": "5de6c6e7f52b364840e53851c126be4d71e60470"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/debug/zipball/5de6c6e7f52b364840e53851c126be4d71e60470",
"reference": "5de6c6e7f52b364840e53851c126be4d71e60470",
"shasum": ""
},
"require": {
"php": ">=7.1.3",
"psr/log": "^1|^2|^3"
},
"conflict": {
"symfony/http-kernel": "<3.4"
},
"require-dev": {
"symfony/http-kernel": "^3.4|^4.0|^5.0"
},
"type": "library",
"autoload": {
"psr-4": {
"Symfony\\Component\\Debug\\": ""
},
"exclude-from-classmap": [
"/Tests/"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "Provides tools to ease debugging PHP code",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/debug/tree/v4.4.37"
},
"funding": [
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2022-01-02T09:41:36+00:00"
},
{
"name": "theseer/tokenizer",
"version": "1.2.1",
database/migrations/2021_12_13_053311_create_cawangans_table.php
+2
View File
@@ -223,6 +223,8 @@ class CreateCawangansTable extends Migration
$table->string('nota');
$table->string('karat');
$table->decimal('berat', $precision = 7, $scale = 2);
$table->decimal('harga', $precision = 9, $scale = 2);
$table->decimal('n_marhun', $precision = 9, $scale = 2);
$table->timestamps();
// $table->foreign('norujukan')
database/migrations/2021_12_14_041557_create_lelongs_table.php
+7 -2
View File
@@ -15,7 +15,7 @@ class CreateLelongsTable extends Migration
{
Schema::create('lelong', function (Blueprint $table) {
$table->bigIncrements('id');
$table->string('tarikh_lelong');
$table->date('tarikh_lelong');
$table->time('masamula_lelong')->nullable();
$table->time('masatamat_lelong')->nullable();
$table->dateTime('masakemaskini_data')->nullable();
@@ -23,7 +23,7 @@ class CreateLelongsTable extends Migration
$table->string('harga_emas_asas');
$table->string('jbg');
$table->integer('cajlelong');
$table->integer('sts_lelong')->default(0);
$table->integer('sts_lelong')->default(0); //1= start, 2 = jana pemenang, 3 = senarai pemenang
$table->timestamps();
});
@@ -95,10 +95,15 @@ class CreateLelongsTable extends Migration
$table->decimal('bil', $precision = 3, $scale = 0);
$table->string('marhun');
$table->string('nota')->nullable();
$table->string('old_karat');
$table->string('karat');
$table->decimal('old_berat', $precision = 7, $scale = 2);
$table->decimal('berat', $precision = 7, $scale = 2);
$table->decimal('old_harga', $precision = 5, $scale = 2);
$table->decimal('harga', $precision = 5, $scale = 2);
$table->decimal('old_nmarhun', $precision = 9, $scale = 2);
$table->decimal('n_marhun', $precision = 9, $scale = 2);
$table->decimal('old_hargaasas', $precision = 11, $scale = 2);
$table->decimal('hargaasas', $precision = 11, $scale = 2);
$table->integer('status_semak')->default(0)->nullable();
$table->timestamps();
database/migrations/2022_01_25_010223_create_payment_table.php
+3 -1
View File
@@ -22,7 +22,7 @@ class CreatePaymentTable extends Migration
$table->string('bank_acc_no_pembeli')->nullable();
$table->string('nama_bank_acc_caw')->nullable();
$table->string('bank_no_acc_caw')->nullable();
$table->integer('status_payment_opt')->nullable(); //1=kaunter,2=online
$table->integer('status_payment_opt')->nullable(); //1=kaunter,2=online,3=CDM
$table->integer('resit_id');
$table->integer('status'); //1 = fee RM10 , 2 = paybidifwin
$table->string('remark');
@@ -40,6 +40,8 @@ class CreatePaymentTable extends Migration
$table->decimal('total_payment', $precision = 11, $scale = 2);
$table->datetime('disahkan_pada')->nullable();
$table->integer('disahkan_oleh')->nullable();
$table->datetime('diminta_pada')->nullable();
$table->integer('diminta_oleh')->nullable();
$table->timestamps();
$table->foreign('user_id')
database/migrations/2022_03_07_061858_create_pengesahan_table.php
+2 -2
View File
@@ -23,8 +23,8 @@ class CreatePengesahanTable extends Migration
$table->datetime('disahkan_pada')->nullable();
$table->integer('diminta_oleh');
$table->datetime('diminta_pada');
$table->integer('status')->default(0); //1 = terima
$table->integer('status_ubah')->default(0); //1 = ubah mutu, 2 = tambah marhun, 3 = hapus marhun
$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->timestamps();
$table->foreign('lelong_id')
database/seeders/RolesSeeder.php
+5
View File
@@ -111,6 +111,10 @@ class RolesSeeder extends Seeder
'name' => 'pengesahan',
'description' => 'Pengesahan Perubahan Mutu Marhun'
]);
Permission::create([
'name' => 'notistamatkontrak',
'description' => 'Notis 30 Hari Sebelum Tamat Kontrak'
]);
//account
Permission::create([
@@ -163,6 +167,7 @@ class RolesSeeder extends Seeder
$role6->givePermissionTo('analisa');
$role6->givePermissionTo('pengesahanpembida');
$role6->givePermissionTo('pengesahan');
$role6->givePermissionTo('notistamatkontrak');
$role7 = Role::create(['name' => 'account']);
$role7->givePermissionTo('pengesahanbayaran');
resources/views/account/listbayaranonline.blade.php
+3
View File
@@ -40,6 +40,9 @@
@endforeach
</tbody>
</table>
<div class="modal-footer" style="margin-top:2%;">
<a href="{{ route('account.senarailelongan') }}" class="btn btn-primary">Kembali</a>
</div>
</div>
</div>
</div>
resources/views/account/sahsagonline.blade.php
+6 -2
View File
@@ -23,6 +23,7 @@
<th>Harga Asas (RM)</th>
<th>Harga Bida (RM)</th>
<th>Masa Bidaan</th>
<th>Remark</th>
<th class="text-center">Status</th>
</tr>
</thead>
@@ -35,6 +36,9 @@
<td>{{ $sag['hargaasas'] }}</td>
<td>{{ $sag['hargabida'] }}</td>
<td>{{ $sag['masa_bidaan'] }}</td>
<td>
<button class="btn btn-outline-success btn-sm" disabled><b>{{ $sag['remark'] }}</b></button>
</td>
<td>
<span class="btn btn-success btn-sm hovernone-success" disabled>PAID</span>
</td>
@@ -45,7 +49,7 @@
<td colspan="2"><b> Jumlah Bayaran</b></td>
<td colspan="2"></td>
<td colspan="1"><b>RM<input type="text" id="total" value="{{ $total_payment }}" style="border: none;" readonly></b></td>
<td colspan="2"></td>
<td colspan="3"></td>
</tr>
</table>
<div class="modal-footer" style="margin-top:2%;">
@@ -67,7 +71,7 @@
type: 'orange',
typeAnimated: true,
buttons: {
Simpan: {
Sahkan: {
btnClass: 'btn-warning',
action: function () {
$("#formsahbayaronline").submit();
resources/views/includes/sidebar.blade.php
+13 -2
View File
@@ -67,6 +67,11 @@
<li class="{{ (request()->is('')) ? 'active' : '' }}">
<a href="#jananotisSubmenu" data-toggle="collapse" aria-expanded="false" style="">Notis Lelong</a>
<ul class="list-unstyled collapse {{ (request()->is('jananotis/*')) ? 'show' : '' }}" id="jananotisSubmenu" >
<li class="{{ (request()->is('jananotis/notistamatkontrak/*') || request()->is('jananotis/notistamatkontrak') ) ? 'active' : '' }}">
<a href="{{url('jananotis/notistamatkontrak')}}">Notis Sebelum Tamat Kontrak</a>
</li>
</ul>
<ul class="list-unstyled collapse {{ (request()->is('jananotis/*')) ? 'show' : '' }}" id="jananotisSubmenu" >
<li class="{{ (request()->is('jananotis/notislelong/*') || request()->is('jananotis/notislelong') ) ? 'active' : '' }}">
<a href="{{url('jananotis/notislelong')}}">Jana Notis Lelong</a>
@@ -96,6 +101,9 @@
</li>
@endhasrole
@hasrole('operasi')
<li class="{{ (request()->is('notistamatkontrak/*')) ? 'active' : '' }}">
<a href="{{url('notistamatkontrak/sebelumtamatkont')}}">Notis Tamat Kontrak</a>
</li>
<li class="{{ (request()->is('analisa/*')) ? 'active' : '' }}">
<a href="#analisaSubmenu" data-toggle="collapse" aria-expanded="false" style="">Simulasi</a>
<ul class="list-unstyled collapse {{ (request()->is('analisa/*')) ? 'show' : '' }}" id="analisaSubmenu" >
@@ -122,7 +130,7 @@
</ul>
</li>
<li class="{{ (request()->is('Pengesahan/*')) ? 'active' : '' }}">
<a href="#pengesahanSubmenu" data-toggle="collapse" aria-expanded="false" style="">Pengesahan</a>
<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>
@@ -143,6 +151,9 @@
<li class="{{ (request()->is('pembida/senaraipembidakeseluruhan/*') || request()->is('pembida/senaraipembidakeseluruhan') ) ? 'active' : '' }}">
<a href="{{url('pembida/senaraipembidakeseluruhan')}}">Senarai Pembida</a>
</li>
<li class="{{ (request()->is('pembida/senlelpembayaranbidaan/*') || request()->is('pembida/senlelpembayaranbidaan') ) ? 'active' : '' }}">
<a href="{{url('pembida/senlelpembayaranbidaan')}}">Pembayaran Bidaan</a>
</li>
</ul>
</li>
@endhasrole
@@ -151,7 +162,7 @@
<a href="/home">Home</a>
</li> --}}
<li class="{{ (request()->is('account/*')) ? 'active' : '' }}">
<a href="{{url('account/senarailelongan')}}">List Bayaran Online</a>
<a href="{{url('account/senarailelongan')}}">Bayaran Online</a>
</li>
@endhasrole
@hasrole('pembida')
resources/views/jananotis/gadaibycaw.blade.php
+123
View File
@@ -0,0 +1,123 @@
@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 Gadaian Cawangan {{ $user->kodcaw }}</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> {{ $t_lelong }}</p>
<p> <b>Tarikh Gadai Sehingga : </b>{{ $t_gadais->t_gadai }}</p>
<p> <b>Anggaran Tarikh Daftar Lelong : </b>{{ $t_anggaran }}</p>
<p> <b>Bilangan Surat : </b>{{ $bil_lelongcaw[0]['bil_lelong'] }}</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>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>
</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></td>
</tr>
@endforeach
</tbody>
</table>
<div class="modal-footer">
<a href="{{ route('jananotis.notistamatkontrak') }}" 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
resources/views/jananotis/notistamatkontrak.blade.php
+42
View File
@@ -0,0 +1,42 @@
@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:2%;">Notis Sebelum Tamat Kontrak</h3>
<form action="{{route('jananotis.gadaibycaw')}}" method="POST" id="formsenarai">
@csrf
<div class="form-group row" style="margin-top:2%; margin-left:1%;">
<label for="tarikh_lelong" class="col-sm-1 col-form-label">Tarikh Lelongan</label>
<div>
<input type="date" class="form-control" id="tarikh_lelong" name="tarikh_lelong" placeholder="Tarikh">
</div>
<label for="tempoh" class="col-sm-1 col-form-label" style="margin-left:3%;">Tempoh</label>
<div>
<input type="text" class="form-control" id="tempoh" name="tempoh" placeholder="12" disabled>
</div>
</div>
<div class="form-group row" style="margin-top:2%;">
<div class="col-sm-10">
<button type="button" class="btn btn-primary" onclick="carian()" style="margin-left:2%; width:9%;">Carian</button>
</div>
</div>
</form>
</div>
</div>
</div>
<script>
function carian() {
$("#formsenarai").submit();
}
</script>
@endsection
resources/views/jananotis/sebelumtamatkont.blade.php
+42
View File
@@ -0,0 +1,42 @@
@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-4" style="margin-left:2%;">Notis Sebelum Tamat Kontrak</h3>
<form action="{{route('notistamatkontrak.senaraitemp')}}" id="formsenarai" method="POST">
@csrf
<div class="form-group row" style="margin-top:2%; margin-left:1%;">
<label for="tarikh_lelong" class="col-sm-1 col-form-label">Tarikh Lelongan</label>
<div>
<input type="date" class="form-control" id="tarikh_lelong" name="tarikh_lelong" placeholder="Tarikh Lelongan">
</div>
<label for="tempoh" class="col-sm-1 col-form-label" style="margin-left:3%;">Tempoh</label>
<div>
<input type="text" class="form-control" id="tempoh" name="tempoh" placeholder="12" disabled>
</div>
</div>
<div class="form-group row" style="margin-top:2%;">
<div class="col-sm-10">
<button type="button" class="btn btn-primary" onclick="carian()" style="margin-left:2%; width:9%;">Carian</button>
</div>
</div>
</form>
</div>
</div>
</div>
<script>
function carian() {
$("#formsenarai").submit();
}
</script>
@endsection
resources/views/jananotis/senaraitemp.blade.php
+116
View File
@@ -0,0 +1,116 @@
@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</h3>
<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_lelong }}</p>
<p> <b>Tarikh Gadai Sehingga : </b>{{ $t_gadais->t_gadai }}</p>
<p> <b>Anggaran Tarikh Daftar Lelong : </b>{{ $t_anggaran }}</p>
</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" onclick="selectall(this)"></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="checkboxdata[]"></td>
<td>{{ $send['kodcaw'] }}</td>
<td>{{ $send['caw_name'] }}</td>
<td>{{ $send['bil_lelong'] }} </td>
<td>{{ $send['total_berat'] }} </td>
<td>{{ $send['total_nilaimarhun'] }} </td>
<td>{{ $send['total_pembiayaan'] }} </td>
<td>{{ $send['total_bakipjm'] }} </td>
<td>
<a href=" {{ route('notistamatkontrak.tempbycaw', [$send['kodcaw'], $t_lelong]) }} " 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('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>
</div>
</div>
</div>
<script>
//Enable tooltips everywhere
$(function () {
$('[data-toggle="tooltip"]').tooltip()
})
var tablesenaraitemp = $('#senaraitemp').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>
@endsection
resources/views/jananotis/tempbycaw.blade.php
+130
View File
@@ -0,0 +1,130 @@
@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('notistamatkontrak.senaraitemp')}}" id="formtlelong" method="POST">
<input type="hidden" name="t_lelong" value="{{ $tarikh_lelong }}">
@csrf
<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> {{ $t_lelong }}</p>
<p> <b>Tarikh Gadai Sehingga : </b>{{ $t_gadais->t_gadai }}</p>
<p> <b>Anggaran Tarikh Daftar Lelong : </b>{{ $t_anggaran }}</p>
</div>
</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>
</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></td>
</tr>
@endforeach
</tbody>
</table>
<div class="modal-footer">
<button type="button" class="btn btn-primary" onclick="kembali()" style="margin-left:2%; width:9%;">Kembali</button>
</div>
</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
resources/views/lelong/senarailelong.blade.php
+12 -10
View File
@@ -16,6 +16,7 @@
<thead class="bg-primary text-white">
<tr>
<th><input type="checkbox" aria-label="Checkbox for following text input" onclick="selectall(this)"></th>
<th>Cawangan</th>
<th>Tarikh Lelong</th>
<th>Masa Tamat Lelong</th>
<th>Harga Emas Asas</th>
@@ -29,6 +30,7 @@
@foreach ($lelong as $lel)
<tr>
<td><input type="checkbox" aria-label="Checkbox for following text input" name="checkboxdata[]" value="{{ $lel->id }}"></td>
<td>{{ $caw_lelong[0]['caw_name'] }}</td>
<td>{{ $lel->tarikh_lelong }}</td>
<td>{{ $lel->masatamat_lelong }}</td>
<td>{{ $lel->harga_emas_asas }}</td>
@@ -91,14 +93,14 @@
}
});
var tablelelong = $('#tablelelong').DataTable( {
var tablelelong = $('#tablelelong').DataTable({
"columnDefs": [
{
"targets": 0,
"orderable": false
},
{
"targets": 6,
"targets": 7,
"orderable": false
}
],
@@ -111,14 +113,14 @@
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-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',
resources/views/marhun/marhun.blade.php
+70 -9
View File
@@ -15,6 +15,14 @@
<input type="hidden" name="type" value="User">
<input type="hidden" name="lelongbidmarhun_id" id="lelongbidmarhun_id">
<input type="hidden" name="lelongbid_id" id="lelongbid_id">
</form>
<form id="formsemak" action="{{ route('marhun.semak', [ $lelongbid, $lelong_id ]) }}" method="GET">
<input type="hidden" name="type" value="User">
<input type="hidden" name="lelongbidmarhun_id" id="lelongbidmarhun_id">
<input type="hidden" name="lelongbid_id" id="lelongbid_id">
</form>
<table class="table table-striped table-xl" id="marhun" style="width:100%">
<thead class="bg-primary text-white">
<tr>
@@ -37,25 +45,58 @@
<td><input type="checkbox" aria-label="Checkbox for following text input" name="checkboxdata[]" value="{{ $item->id }}"></td>
<td>{{ $lelongbid->norujukan }}</td>
<td>{{ $item->marhun }}</td>
<td>{{ $item->karat }}</td>
<td>{{ $item->berat }}</td>
<td>{{ $item->harga }}</td>
<td>{{ $item->n_marhun }}</td>
<td>{{ $item->hargaasas }}</td>
<td>
@if($item->karat != null)
{{ $item->karat }}
@else
{{ $item->old_karat }}
@endif
</td>
<td>
@if($item->berat != null)
{{ $item->berat }}
@else
{{ $item->old_berat }}
@endif
</td>
<td>
@if($item->harga != null)
{{ $item->harga }}
@else
{{ $item->old_harga }}
@endif
</td>
<td>
@if($item->n_marhun != null)
{{ $item->n_marhun }}
@else
{{ $item->old_nmarhun }}
@endif
</td>
<td>
@if($item->hargaasas != null)
{{ $item->hargaasas }}
@else
{{ $item->old_hargaasas }}
@endif
</td>
<td>{{ $item->nota }}</td>
<td class="text-center">
<a onclick="kemaskini(this)" data-idmarhun="{{ $item->id }}" data-marhun="{{ $item->marhun }}" data-karat="{{ $item->karat }}" data-berat="{{ $item->berat }}" data-harga="{{ $item->harga }}" data-nmarhun="{{ $item->n_marhun }}" data-hargaasas="{{ $item->hargaasas }}" data-nota="{{ $item->nota }}" data-toggle="tooltip" data-placement="top" title="Kemaskini Marhun" style="margin-right:30px"><i class="far fa-edit"></i></a>
<a class="confirmdel" id="btndelete" data-lelongbidmarhun="{{ $item->id }}" data-lelongbid="{{ $item->lelongbid_id }}" data-toggle="tooltip" data-placement="top" title="Padam Marhun"><i class="far fa-trash-alt"></i></a>
<a onclick="kemaskini(this)" data-idmarhun="{{ $item->id }}" data-marhun="{{ $item->marhun }}" data-karat="{{ $item->karat }}" data-berat="{{ $item->berat }}" data-harga="{{ $item->harga }}" data-nmarhun="{{ $item->n_marhun }}" data-hargaasas="{{ $item->hargaasas }}" data-nota="{{ $item->nota }}" data-toggle="tooltip" data-placement="top" title="Kemaskini Marhun" style="margin-right:30px"><i class="far fa-edit"></i></a>
<a class="confirmdel" id="btndelete" data-lelongbidmarhun="{{ $item->id }}" data-lelongbid="{{ $item->lelongbid_id }}" data-toggle="tooltip" data-placement="top" title="Padam Marhun"><i class="far fa-trash-alt"></i></a>
</td>
</tr>
@endforeach
</tbody>
</table>
</form>
<div class="modal-footer" style="margin-top:2%;">
<a href="{{ route('marhun.senaraimarhun', $lelong_id) }}" style="width:7%;" class="btn btn-primary">Kembali</a>
<a href="{{ route('marhun.semak', [ $lelongbid, $lelong_id ]) }}" style="width:7%;" class="btn btn-success">Semak</a>
@if($lelongbid->status_semak == 0)
<button style="width:7%;" class="btn btn-success" onclick="confirm()">Semak</button>
@elseif($lelongbid->status_semak == 1)
<button class="btn btn-success btn-sm hovernone-success" disabled>SUDAH DISEMAK</button>
@endif
</div>
</div>
@@ -180,6 +221,26 @@
</div>
</div>
<script>
function confirm() {
$.confirm({
title: 'Confirmation',
content: 'Anda pasti?',
type: 'green',
typeAnimated: true,
buttons: {
Batal: {
btnClass: 'btn-default',
action: function () {}
},
Sahkan: {
btnClass: 'btn-success',
action: function () {
$("#formsemak").submit();
}
}
}
});
}
//Enable tooltips everywhere
$(function () {
$('[data-toggle="tooltip"]').tooltip()
resources/views/marhun/senarailelongmarhun.blade.php
+5 -1
View File
@@ -24,7 +24,11 @@
<tr>
<td>{{$loop->iteration}}</td>
<td>{{ $data->tarikh_lelong }}</td>
<td>{{ $data->sts_lelong }}</td>
<td>
@if($data->sts_lelong == 0)
<button class="btn btn-warning btn-sm" disabled>LELONG BELUM BERMULA</button>
@endif
</td>
<td><a href="{{ route('marhun.exportmarhundetails', ['lelong_id'=>$data['lelong_id']]) }}" data-toggle="tooltip" data-placement="top" title="Muat Turun Senarai Marhun" style="margin-right:40px" ><i class="fas fa-download"></i></a>
<a href=" {{ route('marhun.senaraimarhun', ['lelong_id'=>$data['lelong_id']]) }} " data-toggle="tooltip" data-placement="top" title="Senarai Lelong Marhun" ><i class="far fa-edit"></i></a></td>
</tr>
resources/views/marhun/senaraimarhun.blade.php
+11 -4
View File
@@ -12,12 +12,13 @@
@endif
<form id="exportform" action="" method="POST">
<input type="hidden" name="type" value="User">
<table class="table table-striped table-xl" id="senaraimarhun" style="width:100%">
<table class="table table-striped table-xl text-center" id="senaraimarhun" 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>
<th>Nombor Rujukan</th>
<th>Tarikh Lelong</th>
<th>Status Semak</th>
<th class="text-center">Action</th>
</tr>
</thead>
@@ -28,13 +29,19 @@
<td><input type="checkbox" aria-label="Checkbox for following text input" name="checkboxdata[]" value="{{ $bid->id }}"></td>
<td>{{ $bid->norujukan }}</td>
<td>{{ $bid->t_lelong }}</td>
<td>
@if($bid->status_semak == 0)
<button class="btn btn-secondary btn-sm hovernone-secondary" disabled>BELUM DISEMAK</button>
@elseif($bid->status_semak == 1)
<button class="btn btn-success btn-sm hovernone-success" disabled>SUDAH DISEMAK</button>
@endif
</td>
<td class="text-center">
<a href="{{ route('marhun.show', [$bid->id, $lelong_id]) }}" data-toggle="tooltip" data-placement="top" title="Senarai Marhun" ><i class="far fa-edit"></i></a>
<a href="{{ route('marhun.show', [$bid->id, $lelong_id]) }}" data-toggle="tooltip" data-placement="top" title="Senarai Marhun" ><i class="far fa-edit"></i></a>
</td>
</tr>
@endforeach
</tbody>
</table>
</form>
<div class="modal-footer" style="margin-top:2%;">
@@ -76,7 +83,7 @@
"orderable": false
},
{
"targets": 3,
"targets": 4,
"orderable": false
}
],
resources/views/pembayaran/SAGBidItem.blade.php
+73 -42
View File
@@ -14,49 +14,55 @@
<div class="container">
<div class="row ">
<div class="col-md-11 mx-auto card p-4">
<table class="table table-border table-hover table-xl" style="width:100%">
<thead class="bg-primary text-white">
<tr>
<th class="text-center">No</th>
<th class="text-center">No. rujukan</th>
<th class="text-center">Harga Asas (RM)</th>
<th class="text-center">Harga Bida (RM)</th>
<th class="text-center">Action</th>
</tr>
</thead>
<tbody>
<div class="col-md-11 mx-auto card p-4">
<form action="{{ route('pembayaran.banktransfer') }}" method="POST" id="formbanktransfer">
@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="" />
<table class="table table-border table-hover table-xl" style="width:100%">
<thead class="bg-primary text-white">
<tr>
<th class="text-center">No</th>
<th class="text-center">No. rujukan</th>
<th class="text-center">Harga Asas (RM)</th>
<th class="text-center">Harga Bida (RM)</th>
<th class="text-center">Action</th>
</tr>
</thead>
<tbody>
@foreach($eachbid as $biditem)
<tr>
<td class="text-center">{{ $loop->iteration }}</td>
<td class="text-center">{{ $biditem->norujukan}}</td>
<td class="text-center">{{ $biditem->hargaasas}}</td>
<td class="text-center">{{ $biditem->hargabida}}</td>
<td class="text-center">
@if($biditem->status_payment == 0)
<input type="checkbox" aria-label="Checkbox for following text input" name="checkboxdata[]" data-bid_id="{{ $biditem->lelongbid_id}}" onclick="sum(this.value,this)" value="{{ $biditem->hargabida }}">
@elseif($biditem->status_payment == 2)
<span class="btn btn-warning btn-sm hovernone-warning">MENUNGGU PENGESAHAN</span>
@else
<span class="btn btn-danger btn-sm hovernone-danger">PAID</span>
<!-- $a= (string)$eachbid['hargabida'];
$Total_Payment = sum($a); -->
@foreach($eachbid as $biditem)
<tr>
<td class="text-center">{{ $loop->iteration }}</td>
<td class="text-center">{{ $biditem->norujukan}}</td>
<td class="text-center">{{ $biditem->hargaasas}}</td>
<td class="text-center">{{ $biditem->hargabida}}</td>
<td class="text-center">
@if($biditem->status_payment == 0)
<input type="checkbox" aria-label="Checkbox for following text input" name="checkboxdata[]" data-bid_id="{{ $biditem->lelongbid_id}}" onclick="sum(this.value,this)" value="{{ $biditem->hargabida }}">
@else
<span class="btn btn-danger btn-sm hovernone-danger">PAID</span>
@endif
</td>
</tr>
@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> </td>
</tr>
</tbody>
</table>
<div class="text-right">
<a href="{{ route('pembayaran.SenaraiLelongBayar') }}" class="btn btn-primary" style="width:15%" >Kembali</a>
<button type="button" class="btn btn-success" style="width:15%" id="btnterima" onclick="functerima()">Terima</button>
</div>
</div>
@endif
</td>
</tr>
@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> </td>
</tr>
</tbody>
</table>
</form>
<div class="text-right">
<a href="{{ route('pembayaran.SenaraiLelongBayar') }}" class="btn btn-primary" style="width:15%; margin-right:53%;" >Kembali</a>
<button type="button" class="btn btn-info" style="width:15%" id="btnbanktransfer" onclick="confirm()">CDM</button>
<button type="button" class="btn btn-success" style="width:15%" id="btnterima" onclick="functerima()">Tunai</button>
</div>
</div>
</div>
</div>
@@ -177,6 +183,7 @@
<script>
var arraylelongbid = [];
$("#btnterima").prop("disabled", true);
$("#btnbanktransfer").prop("disabled", true);
function terimadeno() {
$('#eachbid').val(arraylelongbid);
$("#formpaymentdenokaunter").submit();
@@ -191,6 +198,28 @@
$('#amaundiminta').val(parseFloat(total_sum).toFixed(2));
$('#amaunkiraan').val(parseFloat(0).toFixed(2));
}
function confirm() {
$.confirm({
title: 'Confirmation',
content: 'Anda pasti?',
type: 'blue',
typeAnimated: true,
buttons: {
Batal: {
btnClass: 'btn-default',
action: function () {}
},
Sahkan: {
btnClass: 'btn-info',
action: function () {
$('#eachbid').val(arraylelongbid);
$("#formbanktransfer").submit();
var total_sum = parseFloat($('#total').val());
}
}
}
});
}
function sum(val, e){ //e = get all data
console.log(arraylelongbid.length);
@@ -215,10 +244,12 @@
if(arraylelongbid.length != 0)
{
$("#btnterima").prop("disabled", false);
$("#btnbanktransfer").prop("disabled", false);
}
else
{
$("#btnterima").prop("disabled", true);
$("#btnbanktransfer").prop("disabled", true);
}
}
resources/views/pembayaran/kaunterpembayaran.blade.php
+1 -1
View File
@@ -38,7 +38,7 @@
<a href="{{ route('serahan.penyatabayaran',['user_id'=>$winner['details']['id'],'lelong_id'=>$lelong_id]) }}" target = "blank" data-toggle="tooltip" data-placement="top" title="Muat Turun Penyata Bayaran" ><i class="fas fa-download"></i></a>
</td>
<td>
@if( $winner['totalPay'] < $winner['totalBid'] )
@if( ($winner['totalPay'] < $winner['totalBid']) || ($winner['sts_payment'] == 2) )
<a href=" {{ route('pembayaran.SAGBidItem', ['user_id'=>$winner['details']['id'], 'lelong_id'=>$lelong_id]) }} " data-toggle="tooltip" data-placement="top" title="Buat Pembayaran"><i class="far fa-edit"></i></a>
@endif
</td>
resources/views/pembayaran/senarailelongbayaran.blade.php
+5 -1
View File
@@ -24,7 +24,11 @@
<tr>
<td>{{$loop->iteration}}</td>
<td>{{ $data->tarikh_lelong }}</td>
<td>{{ $data->sts_lelong }}</td>
<td>
@if($data->sts_lelong == 3)
<button class="btn btn-success btn-sm" disabled>LELONG SELESAI</button>
@endif
</td>
<td><a href=" {{ route('pembayaran.kaunterpembayaran', ['lelong_id'=>$data['lelong_id']]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Bidaan"><i class="far fa-edit"></i></a></td>
</tr>
@endforeach
resources/views/pembida/pembayaranbidaan.blade.php
+118
View File
@@ -0,0 +1,118 @@
@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
<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 $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['status'] == 1)
<button class="btn btn-info btn-sm" disabled>FEE</button>
@elseif($winner['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-success btn-sm" disabled>BERJAYA</button>
@else
@endif
</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>
</div>
</div>
<script>
//Enable tooltips everywhere
$(function () {
$('[data-toggle="tooltip"]').tooltip()
})
var tablesenarailelongonline = $('#senarailelongonline').DataTable({
"columnDefs": [
{
"targets": 0,
"orderable": false
},
{
"targets": 7,
"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>
@endsection
resources/views/pembida/senaraipembida.blade.php
+1 -1
View File
@@ -41,7 +41,7 @@
@elseif ($user->status =='banned')
<button class="btn btn-danger btn-sm hovernone-danger" disabled>{{$user->status}}</button>
@endif -->
Menunggu Pengesahan Operasi
<button class="btn btn-warning btn-sm hovernone-warning" disabled>BELUM DISAHAKAN</button>
</td>
<td class="text-center">
<a href="{{ route('pembida.show',$user->id) }}" data-toggle="tooltip" data-placement="top" title="Sahkan Pembida"><i class="fas fa-edit"></i></a>
resources/views/pembida/senlelpembayaranbidaan.blade.php
+104
View File
@@ -0,0 +1,104 @@
@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
<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>Cawangan</th>
<th>Tarikh Lelong</th>
<th>Harga Emas Semasa</th>
<th>JBG</th>
<th>cajlelong</th>
<th>Status Lelong</th>
<th class="text-center">Action</th>
</tr>
</thead>
<tbody>
@foreach($lelong as $lel)
<tr>
<td>{{ $loop->iteration }}</td>
<td>{{ $lel->caw_name }}</td>
<td>{{ $lel->tarikh_lelong }}</td>
<td>{{ $lel->harga_emas_asas }}</td>
<td>{{ $lel->jbg }}</td>
<td>{{ $lel->cajlelong }}</td>
<td>
@if($lel->sts_lelong == 3)
<button class="btn btn-success btn-sm" disabled>LELONG SELESAI</button>
@endif
</td>
<td><a href=" {{ route('pembida.pembayaranbidaan', ['lelong_id'=>$lel['lelong_id'], 'kodcaw'=>$lel['caw_code']]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Bidaan"><i class="far fa-edit"></i></a></td>
</tr>
@endforeach
</tbody>
</table>
</div>
</div>
</div>
<script>
//Enable tooltips everywhere
$(function () {
$('[data-toggle="tooltip"]').tooltip()
})
var tablesenarailelongonline = $('#senarailelongonline').DataTable({
"columnDefs": [
{
"targets": 0,
"orderable": false
},
{
"targets": 7,
"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>
@endsection
resources/views/pengesahan/mutumarhun.blade.php
+93 -70
View File
@@ -7,7 +7,6 @@
<form action="{{ route('pengesahan.terimaperubahan') }}" method="POST" id="formmutumarhun">
@csrf
<input type="hidden" name="norujukan" value="{{ $norujukan }}" />
<input type="hidden" name="norujukan" value="{{ $norujukan }}" />
<input type="hidden" name="lelong_id" value="{{ $id }}" />
<input type="hidden" name="jenis_button" value="terima" id="jenis_button" />
@@ -16,78 +15,102 @@
<p>{{ $message }}</p>
</div>
@endif
<table class="table table-striped table-xl text-center" id="tablemutumarhun" style="width:100%">
<thead class="bg-primary text-white">
<tr>
<th>Bil</th>
<th>No Rujukan</th>
<th>Marhun</th>
<th>Karat</th>
<th>Berat</th>
<th>Harga (RM)</th>
<th>Nilai Marhun</th>
<th>Harga Asas</th>
<th>Status</th>
</tr>
</thead>
<tbody>
@foreach($arraypengesahan as $index1=>$detail)
<tr>
<td>{{ $loop->iteration }}</td>
<td>{{ $lelongbid->norujukan }}</td>
<td>
@if($detail[0]['old_marhun'] != $detail[0]['marhun'])
{{ $detail['old_marhun'] }} <i class="btn fa fa-arrow-right" aria-hidden="true"></i>
@endif
{{ $detail[0]['marhun'] }}
</td>
<td>
@if($detail[0]['old_karat'] != $detail[0]['karat'])
{{ $detail[0]['old_karat'] }} <i class="btn fa fa-arrow-right" aria-hidden="true"></i>
@endif
{{ $detail[0]['karat'] }}
</td>
<td>
@if($detail[0]['old_berat'] != $detail[0]['berat'])
{{ number_format($detail[0]['old_berat'], 2, '.', '') }} <i class="btn fa fa-arrow-right" aria-hidden="true"></i>
@endif
{{ $detail[0]['berat'] }}
</td>
<td>
@if($detail[0]['old_harga'] != $detail[0]['harga'])
{{ number_format($detail[0]['old_harga'], 2, '.', '') }} <i class="btn fa fa-arrow-right" aria-hidden="true"></i>
@endif
{{ $detail[0]['harga'] }}
</td>
<td>
@if($detail[0]['old_nilaimarhun'] != $detail[0]['n_marhun'])
{{ number_format($detail[0]['old_nilaimarhun'], 2, '.', '') }} <i class="btn fa fa-arrow-right" aria-hidden="true"></i>
@endif
{{ $detail[0]['n_marhun'] }}
</td>
<td>
@if($detail[0]['old_hargaasas'] != $detail[0]['hargaasas'])
{{ number_format($detail[0]['old_hargaasas'], 2, '.', '') }} <i class="btn fa fa-arrow-right" aria-hidden="true"></i>
@endif
{{ $detail[0]['hargaasas'] }}
</td>
<td>
@if($detail[0]['status_ubah'] == 1)
<button class="btn btn-warning btn-sm hovernone-warning" disabled>PERUBAHAN MUTU</button>
@elseif($detail[0]['status_ubah'] == 2)
<button class="btn btn-warning btn-sm hovernone-warning" disabled>PENAMBAHAN MARHUN</button>
@elseif($detail[0]['status_ubah'] == 3)
<button class="btn btn-warning btn-sm hovernone-warning" disabled>PENGHAPUSAN MARHUN</button>
@endif
</td>
</tr>
@endforeach
</tbody>
</table>
<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>Norujukan : </b> {{ $lelongbid->norujukan }}</p>
<p> <b>Pembiayaan : </b> {{ $marhuns[0]['pembiayaan'] }}</p>
<p> <b>Keuntungan : </b></p>
<p> <b>Baki Lelong : </b>{{ $marhuns[0]['baki_lelong'] }}</p>
<p> <b>Rugi Lelong : </b>{{ $marhuns[0]['rugi_lelong'] }}</p>
</div>
</div>
</div>
<table class="table table-striped table-xl text-center" id="tablemutumarhun" style="width:100%">
<thead class="bg-primary text-white">
<tr>
<th>Bil</th>
<th>Marhun</th>
<th>Karat</th>
<th>Berat</th>
<th>Harga Gadaian (RM)</th>
<th>Harga Lelong (RM)</th>
<th>Nilai Marhun Gadaian</th>
<th>Nilai Marhun Lelong</th>
<th>Harga Asas</th>
<th>Status</th>
</tr>
</thead>
<tbody>
@foreach($arraylelbidmarhun as $index1=>$detail)
<tr>
<td>{{ $loop->iteration }}</td>
<td>
@if($detail[0]['old_marhun'] != $detail[0]['marhun'])
{{ $detail['old_marhun'] }} <i class="btn fa fa-arrow-right" aria-hidden="true"></i>
@endif
{{ $detail[0]['marhun'] }}
</td>
<td>
@if($detail[0]['old_karat'] != $detail[0]['karat'])
{{ $detail[0]['old_karat'] }} <i class="btn fa fa-arrow-right" aria-hidden="true"></i>
@endif
{{ $detail[0]['karat'] }}
</td>
<td>
@if($detail[0]['old_berat'] != $detail[0]['berat'])
{{ number_format($detail[0]['old_berat'], 2, '.', '') }} <i class="btn fa fa-arrow-right" aria-hidden="true"></i>
@endif
{{ $detail[0]['berat'] }}
</td>
<td>
{{ $detail[0]['harga_gadai'] }}
</td>
<td>
@if($detail[0]['old_harga'] != $detail[0]['harga'])
{{ number_format($detail[0]['old_harga'], 2, '.', '') }} <i class="btn fa fa-arrow-right" aria-hidden="true"></i>
@endif
{{ $detail[0]['harga'] }}
</td>
<td>
{{ $detail[0]['nmarhun_gadai'] }}
</td>
<td>
@if($detail[0]['old_nmarhun'] != $detail[0]['n_marhun'])
{{ number_format($detail[0]['old_nmarhun'], 2, '.', '') }} <i class="btn fa fa-arrow-right" aria-hidden="true"></i>
@endif
{{ $detail[0]['n_marhun'] }}
</td>
<td>
@if($detail[0]['old_hargaasas'] != $detail[0]['hargaasas'])
{{ number_format($detail[0]['old_hargaasas'], 2, '.', '') }} <i class="btn fa fa-arrow-right" aria-hidden="true"></i>
@endif
{{ $detail[0]['hargaasas'] }}
</td>
<td>
@if($detail[0]['status_ubah'] == 1)
<button class="btn btn-warning btn-sm hovernone-warning" disabled>PERUBAHAN MUTU</button>
@elseif($detail[0]['status_ubah'] == 2)
<button class="btn btn-warning btn-sm hovernone-warning" disabled>PENAMBAHAN MARHUN</button>
@elseif($detail[0]['status_ubah'] == 3)
<button class="btn btn-warning btn-sm hovernone-warning" disabled>PENGHAPUSAN MARHUN</button>
@elseif($detail[0]['status_ubah'] == 4)
<button class="btn btn-warning btn-sm hovernone-warning" disabled>PENGURANGAN BERAT</button>
@elseif($detail[0]['status_ubah'] == 5)
<button class="btn btn-warning btn-sm hovernone-warning" disabled>PENGURANGAN MUTU & BERAT</button>
@else
@endif
</td>
</tr>
@endforeach
</tbody>
</table>
<div class="modal-footer" style="margin-top:2%;">
<a href="{{ route('pengesahan.perubahanmutumarhun', $id) }}" class="btn btn-primary">Kembali</a>
<button type="button" class="btn btn-danger" onclick="functerima(this)" id="tangguhlelong" >Tangguh Lelong</button>
<button type="button" class="btn btn-success" onclick="functerima(this)" id="terima" >Terima</button>
<button type="button" class="btn btn-success" onclick="functerima(this)" id="terima" >Teruskan Lelong</button>
</div>
</form>
</div>
resources/views/pengesahan/perubahanmutumarhun.blade.php
+3
View File
@@ -14,6 +14,7 @@
<thead class="bg-primary text-white">
<tr>
<th>Bil</th>
<th>Cawangan</th>
<th>No Rujukan</th>
<th>Status</th>
<th class="text-center">Action</th>
@@ -23,6 +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['norujukan'] }}</td>
<td>
@if($marhun['total'] === intval($marhun['tstat']))
@@ -41,6 +43,7 @@
</tr>
@endforeach
</tbody>
</table>
<div class="modal-footer" style="margin-top:2%;">
<a href="{{ route('pengesahan.senarailelongubahmutu') }}" class="btn btn-primary">Kembali</a>
resources/views/serahan/pembayaran.blade.php
+2 -4
View File
@@ -30,14 +30,12 @@
<td>{{ $pay['details']['notelbimbit']}}</td>
<td>{{ $pay['total_surat']}}</td>
<td>{{ $pay['totalBid']}}</td>
{{-- <td> <a href="{{ route('serahan.penyatabayaran',['user_id'=>$pay['details']['id'],'lelong_id'=>$lelong_id]) }}"><i class="fas fa-download"></i></a></td> --}}
<td> <a href="{{ route('serahan.resitpembayaran',['user_id'=>$pay['details']['id'],'lelong_id'=>$lelong_id]) }}" data-toggle="tooltip" data-placement="top" title="Muat Turun Resit"><i class="fas fa-download"></i></a></td>
<td> <a href="{{ route('serahan.senaraibid',['user_id'=>$pay['details']['id'],'lelong_id'=>$lelong_id]) }}" data-toggle="tooltip" data-placement="top" title="Muat Turun Butiran Bidaan" ><i class="fas fa-download"></i></a></td>
<td class="text-center">
<a href=""><i class="far fa-edit"></i></a>
</td>
<button class="btn btn-danger btn-sm hovernone-danger" disabled>EXPORT</button>
</td>
</tr>
@endforeach
</tbody>
routes/web.php
+11
View File
@@ -164,6 +164,8 @@ Route::group(['middleware' => ['permission:pengesahanpembida'],'prefix'=>'pembid
Route::post('/reject',['as'=>'pembida.reject','uses'=>'PembidaController@reject']);
Route::get('/kemaskini/{id}',['as'=>'pembida.kemaskini','uses'=>'PembidaController@kemaskini']);
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::group(['middleware' => ['permission:pengesahan'],'prefix'=>'pengesahan'], function () {
@@ -176,6 +178,12 @@ Route::group(['middleware' => ['permission:pengesahan'],'prefix'=>'pengesahan'],
Route::get('/senaraitangguhlelong/{id}',['as'=>'pengesahan.senaraitangguhlelong','uses'=>'MarhunController@senaraitangguhlelong']);
Route::get('/lelbidmarhun/{id}/{norujukan}',['as'=>'pengesahan.lelbidmarhun','uses'=>'MarhunController@lelbidmarhun']);
});
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']);
});
//Operasi
Route::group(['middleware' => ['permission:serahan'],'prefix'=>'serahan'], function () {
@@ -193,6 +201,7 @@ Route::group(['middleware' => ['permission:pengesahanbayarancash'],'prefix'=>'pe
Route::get('/SAGBidItem/{user_id}/{lelong_id}', ['as'=>'pembayaran.SAGBidItem','uses'=>'PaymentController@SAGBidItem']);
Route::get('/SenaraiLelongBayar', ['as'=>'pembayaran.SenaraiLelongBayar','uses'=>'PaymentController@SenaraiLelongBayar']);
Route::post('/paymentdenokaunter', ['as'=>'pembayaran.paymentdenokaunter','uses'=>'PaymentController@paymentdenokaunter']);
Route::post('/banktransfer', ['as'=>'pembayaran.banktransfer','uses'=>'PaymentController@banktransfer']);
});
// Pengurus Cawangan
@@ -209,6 +218,8 @@ Route::group(['middleware' => ['permission:pengesahanbayaran'],'prefix'=>'accoun
Route::group(['middleware' => ['permission:jananotis'],'prefix'=>'jananotis'], function () {
Route::get('/notislelong',['as'=>'jananotis.notislelong','uses'=>'NotisController@notislelong']);
Route::get('/notistamatkontrak',['as'=>'jananotis.notistamatkontrak','uses'=>'TamatKontController@notistamatkontrak']);
Route::post('/gadaibycaw',['as'=>'jananotis.gadaibycaw','uses'=>'TamatKontController@gadaibycaw']);
Route::get('/pembida',['as'=>'jananotis.pembida','uses'=>'NotisController@pembida']);
Route::get('/senarainotis/{lelong_id}',['as'=>'jananotis.senarainotis','uses'=>'NotisController@senarainotis']);
Route::get('/jananotis/{lelong_id}',['as'=>'jananotis.jananotis','uses'=>'NotisController@jananotis']);
storage/debugbar/.gitignore
+2
View File
@@ -0,0 +1,2 @@
*
!.gitignore