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

Merge branch 'amirah' of https://gitlab.com/azfararsyad/lelong into amirah

Browse Source
This commit is contained in:
Amirah22
2022-03-02 15:08:44 +08:00
parent cd55888d05 294270ca8c
commit e2b07be523
46 changed files with 1475 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/AccountController.php
+161
View File
@@ -0,0 +1,161 @@
<?php
namespace App\Http\Controllers;
use Carbon\Carbon;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use App\Models\User;
use App\Models\Cawangan;
use App\Models\CawanganLelong;
use App\Models\Lelong;
use App\Models\Payment;
use App\Models\LelongBid;
use App\Models\LelongBidder;
use App\Models\Resit;
class AccountController extends Controller
{
public function senarailelongan(){
$user = Auth::user();
$senarai = 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('account.senarailelongan',compact('senarai'));
}
public function listbayaranonline($lelong_id){
$listwinner = Payment::join('lelongbid', 'payment.lelongbid_id', '=', 'lelongbid.id')
->join('lelongbidder', 'payment.lelongbidder_id', '=', 'lelongbidder.id')
->where('lelongbidder.status_bidder', 1)
->where('lelongbid.lelong_id', $lelong_id)
->select('payment.user_id'
)
->groupBy('payment.user_id')
->get();
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();
$total_payment = 0;
foreach($SAGWin as $SAG){
$payment = Payment::where('lelongbid_id', $SAG->lelongbid_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;
}
return view('account.listbayaranonline',compact('listwinner','lelong_id'));
}
public function sahsagonline($lelong_id, $user_id){
$senaraisag = LelongBid::join('lelongbidder', 'lelongbid.id', '=', 'lelongbidder.lelongbid_id')
->join('payment', 'lelongbid.id', '=', 'payment.lelongbid_id')
->where('lelongbid.lelong_id', $lelong_id)
->where('lelongbidder.user_id', $user_id)
->where('lelongbidder.status_bidder', 1)
->where('payment.status_payment_opt', 2)
->get()->toArray();
// dd($senaraisag);
$total_payment = 0;
foreach($senaraisag as $index1=>$sagbid){
if($sagbid['total_payment']){
$total_payment = $total_payment +$sagbid['total_payment'];
}
// $senaraisag[$index1]['totalPay'] = $total_payment;
}
// dd($senaraisag);
return view('account.sahsagonline', compact('senaraisag', 'user_id', 'lelong_id','total_payment'));
}
public function sahbayaronline($lelong_id, $user_id){
$currentdate = Carbon::now();
$currentdate = $currentdate->toDateTimeString();
$user = Auth::user();
$senaraisag = LelongBid::join('lelongbidder', 'lelongbid.id', '=', 'lelongbidder.lelongbid_id')
->join('payment', 'lelongbid.id', '=', 'payment.lelongbid_id')
->where('lelongbid.lelong_id', $lelong_id)
->where('lelongbidder.user_id', $user_id)
->where('lelongbidder.status_bidder', 1)
->where('payment.status_payment_opt', 2)
->get();
$total_payment = 0;
foreach($senaraisag as $sag)
{
$payment = Payment::where('lelong_id', $lelong_id)
->where('user_id', $user_id)
->where('lelongbid_id',$sag->lelongbid_id)
->first();
$payment->disahkan_oleh = $user->id;
$payment->disahkan_pada = $currentdate;
$payment->save();
$total_payment = $total_payment + $payment->total_payment;
$updatelelbidbidder = LelongBidder::where('lelongbid_id', $sag->lelongbid_id)
->first();
$updatelelbidbidder->status_payment = 1;
$updatelelbidbidder->save();
$eachbid = LelongBid::where('id',$sag->lelongbid_id)->first();
$eachbid->status_jual = 1;
$eachbid->t_jual = $currentdate;
$eachbid->save();
}
$senaraisagallpayment = 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();
// dd($senaraisagallpayment);
$resit = Resit::where('id',$payment->resit_id)->first();
$resit->total_payment = $resit->total_payment + $total_payment;
if($resit->total_payment >= $senaraisagallpayment->sum('hargabida'))
{
$resit->status = 'PAID';
$resit->paid_at = $currentdate;
}
$resit->save();
return redirect()->route('account.senarailelongan')->with('success','Pembayaran Berjaya');
}
}
app/Http/Controllers/LelongController.php
+12 -12
View File
@@ -296,8 +296,6 @@ class LelongController extends Controller
$lelongbid->baki =$simulasibid->baki;
$lelongbid->berat =$simulasibid->berat;
$lelongbid->marhun =$simulasibid->marhun;
$lelongbid->gst_hj =$simulasibid->gst_hj;
$lelongbid->gst_cl =$simulasibid->gst_cl;
$lelongbid->percent =$simulasibid->percent;
$lelongbid->status_jual =$simulasibid->status_jual;
$lelongbid->status_payment =$simulasibid->status_payment;
@@ -448,11 +446,13 @@ class LelongController extends Controller
$lelongbid = LelongBid::where('lelong_id','=',$id)->get();
foreach($lelongbid as $bid)
{
$highestprice = LelongBidder::where('lelongbid_id','=',$bid->id)->orderByRaw('lelongbidder.hargabida DESC' )->get();
$highestprice = LelongBidder::where('lelongbid_id','=',$bid->id)->orderBy('lelongbidder.hargabida','DESC' )->first();
// dd($highestprice->hargabida);
if($highestprice)
{
foreach($highestprice as $price){
$bidders = LelongBidder::where('hargabida','=',$price->hargabida)->MIN('lelongbidder.masa_bidaan' )->get();
// foreach($highestprice as $price){
$bidders = LelongBidder::where('lelongbid_id','=',$bid->id)->where('hargabida','=',$highestprice->hargabida)->orderBy('masa_bidaan','ASC' )->get();
// dd($bidders);
$count = 0;
foreach($bidders as $bidder)
{
@@ -460,11 +460,12 @@ class LelongController extends Controller
if($count == 1)
{
$pemenang = LelongBidder::where('id','=',$bidder->id)
->first();
->first();
$pemenang->status_bidder = 1;
$pemenang->save();
$updatebid = LelongBid::where('id','=',$bid->id)->first();
// dd($updatebid);
$updatebid->hargajual = $bidder->hargabida;
$updatebid->nopembeli = $bidder->user_id;
$updatebid->status_jual = 1;
@@ -488,7 +489,7 @@ class LelongController extends Controller
$resit->lelong_id = $id;
$resit->reference_no = $reference_no;
$resit->billplz_id = '';
$resit->total_payment = '';
$resit->total_payment = '0.00';
$resit->resit_type = 2; // 1 = fee , 2 = bid
$resit->save();
}
@@ -501,7 +502,7 @@ class LelongController extends Controller
$kalah->save();
}
}
}
// }
}
else
@@ -565,11 +566,8 @@ class LelongController extends Controller
public function senarailelongtaklaku(Request $request){
$user = Auth::user();
$senarai = CawanganLelong::join('lelong', 'cawangan_lelong.lelong_id', '=', 'lelong.id')
->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id')
->where('cawangan.caw_code', $user->kodcaw)
->get();
return view('lelong.senarailelongtaklaku',compact('senarai'));
@@ -582,6 +580,7 @@ class LelongController extends Controller
->where('lelongbid.lelong_id', $lelong_id)
->whereNull('t_jual')
->select(
'lelongbid.norujukan',
'lelongbid.t_lelong',
'lelongbid.kodcaw',
'cawangan.caw_name',
@@ -600,6 +599,7 @@ class LelongController extends Controller
$suratlelongtaklaku = LelongBid::join('lelong', 'lelongbid.lelong_id', '=', 'lelong.id')
->where('lelongbid.lelong_id', $lelong_id)
->where('status_jual', '=', 1)
->whereNull('t_jual')
->get();
app/Http/Controllers/MarhunController.php
+8 -1
View File
@@ -126,7 +126,14 @@ class MarhunController extends Controller
}
public function senarailelongmarhun(Request $request){
$senarai = CawanganLelong::join('lelong', 'cawangan_lelong.lelong_id', '=', 'lelong.id')
->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id')
->get();
return view('marhun.senarailelongmarhun',compact('senarai'));
}
}
app/Http/Controllers/Mobile/LelongMobileController.php
+40 -17
View File
@@ -28,25 +28,33 @@ class LelongMobileController extends Controller
->where('sts_lelong','=',1)
->get()->toArray();
foreach($lelong as $index1=>$lel)
if($lelong)
{
$lelongbid = LelongBid::whereIn('lelong_id',$lelong)
->get()->toArray();
$lelong[$index1]['lelongbid'] = $lelongbid;
foreach($lelongbid as $index2=>$lelbidmarhun){
$cawangan = Cawangan::where('id','=',$lelbidmarhun['caw_id'])->first()->toArray();
// $id = lelongbid::first();
$lelongbidmarhun = LelongBidMarhun::where('lelongbid_id', $lelbidmarhun['id'])
foreach($lelong as $index1=>$lel)
{
$lelongbid = LelongBid::whereIn('lelong_id',$lelong)
->get()->toArray();
$lelong[$index1]['lelongbid'][$index2]['lelongbidmarhun'] = $lelongbidmarhun;
$lelong[$index1]['lelongbid'][$index2]['cawangan'] = $cawangan;
$lelong[$index1]['lelongbid'] = $lelongbid;
foreach($lelongbid as $index2=>$lelbidmarhun){
$cawangan = Cawangan::where('id','=',$lelbidmarhun['caw_id'])->first()->toArray();
// $id = lelongbid::first();
$lelongbidmarhun = LelongBidMarhun::where('lelongbid_id', $lelbidmarhun['id'])
->get()->toArray();
$lelong[$index1]['lelongbid'][$index2]['lelongbidmarhun'] = $lelongbidmarhun;
$lelong[$index1]['lelongbid'][$index2]['cawangan'] = $cawangan;
}
}
}
else
{
$lelong[0]['lelongbid'] = [];
}
return response()->json($lelong);
@@ -79,7 +87,8 @@ class LelongMobileController extends Controller
'lelongbid.t_lelong',
'lelongbid.nilaimarhun',
'lelongbid.cajlelong',
'carts.hargabida')
'carts.hargabida',
'carts.id as cart_id')
->get();
// dd($selectBid[0]->hargabida);
@@ -97,14 +106,28 @@ class LelongMobileController extends Controller
$lelongBidder->nilaimarhun = $cart->nilaimarhun;
$lelongBidder->cajlelong = $cart->cajlelong;
$lelongBidder->masa_bidaan = $currentdate;
$lelongBidder->save();
if($lelongBidder->save())
{
$delincart = Cart::where('id',$cart->cart_id)->first();
$delincart->delete();
}
}
return response()->json("success", 201);
$response = [
'success' => "success",
'message' => "Bidder berjaya disimpan"
];
return response()->json($response, 201);
}
else if($feepayment == null){
return response()->json("unsuccess", 201);
$errors = [
'success' => "error",
'message' => "Something wrong with the server"
];
return response()->json($response, 201);
}
}
app/Http/Controllers/PaymentController.php
+36 -26
View File
@@ -87,25 +87,22 @@ class PaymentController extends Controller
'users.alamat'
)
->first();
// foreach($SAGBidItem as $eachbid){
$eachbid = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
->join('users', 'lelongbidder.user_id', '=', 'users.id')
->where('lelongbidder.status_bidder', 1)
->where('users.id', $user_id)
->where('lelongbid.lelong_id', $lelong_id)
->select('lelongbidder.hargabida',
'lelongbid.hargaasas',
'lelongbid.norujukan',
'lelongbidder.lelongbid_id',
'lelongbidder.status_payment'
)
->get();
$eachbid = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
->join('users', 'lelongbidder.user_id', '=', 'users.id')
->where('lelongbidder.status_bidder', 1)
->where('users.id', $user_id)
->where('lelongbid.lelong_id', $lelong_id)
->select('lelongbidder.hargabida',
'lelongbid.hargaasas',
'lelongbid.norujukan',
'lelongbidder.lelongbid_id',
'lelongbidder.status_payment'
)
->get();
// }
return view('pembayaran.SAGBidItem',compact('SAGBidItem', 'eachbid', 'lelong_id'));
return view('pembayaran.SAGBidItem',compact('SAGBidItem', 'eachbid', 'lelong_id','user_id'));
}
public function paymentdenokaunter(Request $request){
@@ -119,6 +116,7 @@ class PaymentController extends Controller
$bid_id = explode(",", $request->eachbid);
$resit = Resit::where('lelong_id', $request->lelong_id)
->where('user_id',$request->user_id)
->first();
$total_hargabida = 0;
@@ -135,8 +133,9 @@ class PaymentController extends Controller
'lelongbid.lelong_id as lelong_id'
)
->first();
$total_hargabida = $total_hargabida + $eachbid->hargabida;
// dd($total_hargabida);
$payment = Payment::create([
'user_id' => $request->user_id,
'lelongbidder_id' => $eachbid->lelongbidder_id,
@@ -166,18 +165,29 @@ class PaymentController extends Controller
$updatelelbidbidder = LelongBidder::where('lelongbid_id', $eachbid->lelongbid_id)
->first();
$updatelelbidbidder->status_payment = 1;
$updatelelbidbidder->update();
$updatelelbidbidder->save();
$eachbid->status_jual = 1;
$eachbid->t_jual = $currentdate;
$eachbid->update();
$eachbidupdate = LelongBid::where('id',$bid)->first();
$eachbidupdate->status_jual = 1;
$eachbidupdate->t_jual = $currentdate;
$eachbidupdate->save();
}
if($request->amaunkiraan == $total_hargabida){
$resit->total_payment = $total_hargabida;
$resit->status = 'PAID';
$resit->paid_at = $currentdate;
$resit->update();
$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');
$resit->total_payment = $resit->total_payment + $total_hargabida;
if($resit->total_payment >= $senaraisagallpayment->sum('hargabida'))
{
$resit->status = 'PAID'; // $resit->status = 'PAID'; when hargabida >= total_payment di resit
$resit->paid_at = $currentdate;
}
$resit->save();
}
return redirect()->route('pembayaran.SenaraiLelongBayar')->with('success','Pembayaran Berjaya');
}
app/Http/Controllers/PembidaController.php
+60 -3
View File
@@ -61,8 +61,6 @@ class PembidaController extends Controller
return view('pembida.show',compact('user','files'));
}
public function delete(Request $request)
{
$user = User::where('id','=',$request->userid)->first();
@@ -110,7 +108,66 @@ class PembidaController extends Controller
->with('unsuccessful','Pengesahan Ditolak');
}
public function senaraipembidakeseluruhan(Request $request)
{
// $alluser = User::all();
$alluser = User::where('user_type','=',2)
->get();
// dd($alluser);
// $allroles = Role::all()->pluck('name');
// $user = Auth::user();
// $user->assignRole('admin');
return view('pembida.senaraipembidakeseluruhan',compact('alluser'));
}
public function kemaskini($userid)
{
// dd($userid);
$user = User::where('id','=',$userid)->first();
$files = File::where('user_id','=',$userid)->get()->toArray();
$array_ic = [];
foreach($files as $index=>$file)
{
$files[$index]['ic64']= 'data:image/' . $file['file_type'] . ';base64,' . base64_encode($file['filename']);
}
// dd($files);
return view('pembida.kemaskini',compact('user','files'));
}
public function update(Request $request)
{
$currentdate = Carbon::now();
$currentdate = $currentdate->toDateTimeString();
if($request->status == true)
{
$status = 'active';
}
else if($request->statusban == true)
{
$status = 'banned';
}
else
{
$status = 'inactive';
}
$user = User::where('id','=',$request->userid)->first();
// dd($user);
$user->email = $request->email;
$user->notelbimbit = $request->notelbimbit;
$user->nokp = $request->nokp;
$user->updated_at = $currentdate;
$user->status = $status;
$user->save();
return redirect()->route('pembida.senaraipembidakeseluruhan')->with('success','Pembida Berjaya Dikemaskini');
}
}
app/Http/Controllers/PenggunaController.php
+27
View File
@@ -7,6 +7,7 @@ use Spatie\Permission\Models\Role;
use Spatie\Permission\Models\Permission;
use Illuminate\Support\Facades\Auth;
use App\Models\User;
use Carbon\Carbon;
use PDF;
class PenggunaController extends Controller
@@ -49,6 +50,8 @@ class PenggunaController extends Controller
public function store(Request $request)
{
$currentdate = Carbon::now();
$currentdate = $currentdate->toDateTimeString();
$user = User::where('id','=',$request->userid)->first();
$allroles = Role::all()->pluck('name');
@@ -64,6 +67,30 @@ class PenggunaController extends Controller
}
// dd($arraytaraf);
$user->syncRoles($arraytaraf);
if($request->status == true)
{
$status = 'active';
}
else if($request->statusban == true)
{
$status = 'banned';
}
else
{
$status = 'inactive';
}
$user = User::where('id','=',$request->userid)->first();
// dd($user);
$user->email = $request->email;
$user->notelbimbit = $request->notelbimbit;
$user->nokp = $request->nokp;
$user->updated_at = $currentdate;
$user->status = $status;
$user->save();
return redirect()->route('pengguna.index')
->with('success','Kemaskini Berjaya');
}
app/Http/Controllers/SimulasiController.php
+7 -11
View File
@@ -123,19 +123,17 @@ class SimulasiController extends Controller
$simulasibid->hargajual = 0.00;
$simulasibid->jbg = $data->jbg;
$simulasibid->kadarupah = $data->kadarupah;
$simulasibid->upahsimpan = $data->upahsimpan;
$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 = $data->baki;
$simulasibid->baki = 0.00;
$simulasibid->berat = $data->berat;
$simulasibid->marhun = $data->marhun;
$simulasibid->gst_hj = $data->gst_hj;
$simulasibid->gst_cl = $data->gst_cl;
$simulasibid->percent = $data->percent;
$simulasibid->percent = $data->percentpinj;
$simulasibid->status_jual = 0;
$simulasibid->status_payment = 0;
$simulasibid->mora_upah = 0;
@@ -143,7 +141,7 @@ class SimulasiController extends Controller
$sumhargaasas = 0;
$berat = 0;
$gadaimarhun = GadaiMarhun::where('gadai_id','=',$data->id)->get();
$gadaimarhun = GadaiMarhun::where('norujukan','=',$data->norujukan)->get();
foreach($gadaimarhun as $marhun)
{
$simkarat = SimKarat::where('simulasi_id','=',$simulasi->id)->get();
@@ -209,7 +207,7 @@ class SimulasiController extends Controller
$simulasibid->hargajual = 0.00;
$simulasibid->jbg = $data->jbg;
$simulasibid->kadarupah = $data->kadarupah;
$simulasibid->upahsimpan = $data->upahsimpan;
$simulasibid->upahsimpan = $data->upahSim;
$simulasibid->ansuran = $data->ansuran;
$simulasibid->nilaimarhun = $data->nilaimarhun;
$simulasibid->pinjaman = $data->pinjaman;
@@ -219,9 +217,7 @@ class SimulasiController extends Controller
$simulasibid->baki = $data->baki;
$simulasibid->berat = $data->berat;
$simulasibid->marhun = $data->marhun;
$simulasibid->gst_hj = $data->gst_hj;
$simulasibid->gst_cl = $data->gst_cl;
$simulasibid->percent = $data->percent;
$simulasibid->percent = $data->percentpinj;
$simulasibid->status_jual = 0;
$simulasibid->status_payment = 0;
$simulasibid->mora_upah = 0;
@@ -229,7 +225,7 @@ class SimulasiController extends Controller
$sumhargaasas = 0;
$berat = 0;
$gadaimarhun = GadaiMarhun::where('gadai_id','=',$data->id)->get();
$gadaimarhun = GadaiMarhun::where('norujukan','=',$data->norujukan)->get();
foreach($gadaimarhun as $marhun)
{
$simkarat = SimKarat::where('simulasi_id','=',$simulasi->id)->get();
app/Models/Gadai.php
-2
View File
@@ -25,8 +25,6 @@ class Gadai extends Model
'baki',
'berat',
'marhun',
'gst_hj',
'gst_cl',
'percent',
'mora_upah',
't_gadai',
app/Models/GadaiMarhun.php
+1 -1
View File
@@ -12,7 +12,7 @@ class GadaiMarhun extends Model
protected $table = 'gadaimarhun';
protected $fillable = [
'gadai_id',
'norujukan',
'bil',
'marhun',
'nota',
app/Models/LelongBid.php
-2
View File
@@ -31,8 +31,6 @@ class LelongBid extends Model
'baki',
'berat',
'marhun',
'gst_hj',
'gst_cl',
'percent',
'status_jual',
'status_payment',
app/Models/SimulasiBid.php
-2
View File
@@ -31,8 +31,6 @@ class SimulasiBid extends Model
'baki',
'berat',
'marhun',
'gst_hj',
'gst_cl',
'percent',
'status_jual',
'status_payment',
database/migrations/2021_12_13_053311_create_cawangans_table.php
+125 -22
View File
@@ -84,47 +84,150 @@ class CreateCawangansTable extends Migration
Schema::create('gadai', function (Blueprint $table) {
$table->bigIncrements('id');
$table->string('kodcaw');
$table->string('kodcaw')->nullable();
$table->string('norujukan');
$table->string('nokp');
$table->decimal('jbg', $precision = 7, $scale = 2);
$table->decimal('kadarupah', $precision = 5, $scale = 2)->nullable();
$table->decimal('upahsimpan', $precision = 11, $scale = 2)->nullable();
$table->decimal('ansuran', $precision = 11, $scale = 2)->nullable();
$table->string('prkod')->nullable();
$table->string('nopelanggan');
$table->string('nokp')->nullable();
$table->date('t_gadai');
$table->time('masa')->nullable();
$table->integer('sirig')->nullable();
$table->decimal('nilaimarhun', $precision = 9, $scale = 2)->nullable();
$table->decimal('n_marhuns', $precision = 9, $scale = 2)->nullable();
$table->decimal('berat', $precision = 7, $scale = 2)->nullable();
$table->decimal('pinjaman', $precision = 9, $scale = 2)->nullable();
$table->decimal('telahbayar', $precision = 7, $scale = 2)->nullable();
$table->decimal('upahtelahbyr', $precision = 7, $scale = 2)->nullable();
$table->decimal('cajtelahbyr', $precision = 7, $scale = 2)->nullable();
$table->decimal('ansuran', $precision = 9, $scale = 2)->nullable();
$table->decimal('ansupah', $precision = 7, $scale = 2)->nullable();
$table->decimal('kadarupah', $precision = 5, $scale = 2)->nullable();
$table->decimal('tempoh', $precision = 10, $scale = 2)->nullable();
$table->date('t_lanjut1')->nullable();
$table->date('t_lanjut2')->nullable();
$table->date('t_matang')->nullable();
$table->date('t_matang1')->nullable();
$table->date('t_matang2')->nullable();
$table->date('t_notis1')->nullable();
$table->date('t_notis2')->nullable();
$table->date('t_notis3')->nullable();
$table->date('t_lelong')->nullable();
$table->date('t_hapus')->nullable();
$table->string('sttebus');
$table->string('terima')->nullable();
$table->integer('cetak')->nullable();
$table->string('tncek')->nullable();
$table->string('nocek')->nullable();
$table->string('bkcode')->nullable();
$table->string('glcode')->nullable();
$table->string('teller')->nullable();
$table->string('pelulus')->nullable();
$table->string('pelulust')->nullable();
$table->string('disburseid')->nullable();
$table->time('disbursetime')->nullable();
$table->string('cancelid')->nullable();
$table->time('canceltime')->nullable();
$table->string('f_lulus')->nullable();
$table->string('tag')->nullable();
$table->decimal('jbg', $precision = 9, $scale = 2);
$table->decimal('bakipjm', $precision = 7, $scale = 2);
$table->decimal('bakiupah', $precision = 7, $scale = 2)->nullable();
$table->decimal('cajlain', $precision = 7, $scale = 2)->nullable();
$table->decimal('baki', $precision = 9, $scale = 2)->nullable();
$table->decimal('berat', $precision = 7, $scale = 2)->nullable();
$table->string('marhun')->nullable();
$table->decimal('gst_hj', $precision = 7, $scale = 2)->default(0.00);
$table->decimal('gst_cl', $precision = 7, $scale = 2)->default(0.00);
$table->decimal('percent', $precision = 7, $scale = 2)->nullable();
$table->integer('mora_upah')->default(0);
$table->date('t_gadai')->nullable();
$table->date('t_matang')->nullable();
$table->integer('sttebus')->nullable();
$table->integer('tagpalsu')->nullable();
$table->integer('tagpalsu2')->nullable();
$table->string('jenisupah')->nullable();
$table->decimal('cajkhidmat', $precision = 7, $scale = 2)->nullable();
$table->integer('stcajkhidmat')->nullable();
$table->string('kodgl')->nullable();
$table->integer('taglel')->nullable();
$table->integer('instno')->nullable();
$table->integer('currInstno')->nullable();
$table->decimal('ansakhir', $precision = 7, $scale = 2)->nullable();
$table->decimal('ansupahakhir', $precision = 7, $scale = 2)->nullable();
$table->decimal('jumupahaz', $precision = 7, $scale = 2)->nullable();
$table->decimal('tunggakan', $precision = 7, $scale = 2)->nullable();
$table->date('t_update');
$table->string('jantina')->nullable();
$table->string('bangsa')->nullable();
$table->integer('sirit')->nullable();
$table->integer('jenisansur')->nullable();
$table->string('nokotak')->nullable();
$table->integer('tiada')->nullable();
$table->integer('tagtbaki')->nullable();
$table->string('penilai')->nullable();
$table->string('namapenilai')->nullable();
$table->integer('tagserah')->nullable();
$table->date('tempTarikhAging')->nullable();
$table->string('jenistebus')->nullable();
$table->string('namapelulus')->nullable();
$table->decimal('percentpinj', $precision = 9, $scale = 2)->nullable();
$table->integer('kuantiti')->nullable();
$table->string('namateller')->nullable();
$table->decimal('jumtebus', $precision = 11, $scale = 2)->nullable();
$table->decimal('upahnotis', $precision = 9, $scale = 2)->nullable();
$table->decimal('upahpercuma', $precision = 11, $scale = 2)->nullable();
$table->integer('tagpalsu')->nullable();
$table->decimal('upahdibayar', $precision = 10, $scale = 2)->nullable();
$table->integer('tagcetak')->nullable();
$table->integer('tag_sms')->nullable();
$table->string('semakbarcode')->nullable();
$table->integer('wangkeluarteller')->nullable();
$table->integer('semakpetibesi')->nullable();
$table->integer('semakaudit')->nullable();
$table->string('historygadaian')->nullable();
$table->integer('tagkiratebus')->nullable();
$table->integer('checkbp')->nullable();
$table->decimal('pampasan', $precision = 9, $scale = 2)->nullable();
$table->integer('lel1stop')->nullable();
$table->string('tellernew')->nullable();
$table->string('idjompay')->nullable();
$table->integer('tangguh')->nullable();
$table->date('tebus')->nullable();
$table->decimal('upahSim', $precision = 7, $scale = 2)->nullable();
$table->decimal('jbgakru', $precision = 5, $scale = 2)->nullable();
$table->decimal('upahakru', $precision = 7, $scale = 2)->nullable();
$table->integer('tagpalsu2')->nullable();
$table->integer('tagcall')->nullable();
$table->decimal('upah_semasa', $precision = 11, $scale = 2)->nullable();
$table->decimal('simulasi_hargaasas', $precision = 11, $scale = 2)->nullable();
$table->decimal('simulasi_cajlelong', $precision = 11, $scale = 2)->nullable();
$table->decimal('simulasi_bakilelong', $precision = 11, $scale = 2)->nullable();
$table->decimal('sim_hargaasas', $precision = 9, $scale = 2)->nullable();
$table->decimal('sim_cajlelong', $precision = 9, $scale = 2)->nullable();
$table->decimal('sim_upahlelong', $precision = 9, $scale = 2)->nullable();
$table->decimal('sim_bakilelong', $precision = 9, $scale = 2)->nullable();
$table->decimal('percentrebet', $precision = 9, $scale = 2)->nullable();
$table->decimal('rebet', $precision = 9, $scale = 2)->nullable();
$table->decimal('upahlpsrebet', $precision = 9, $scale = 2)->nullable();
$table->integer('taguploadslip')->nullable();
$table->integer('tagsahupahonline')->nullable();
$table->decimal('bayarupahonline', $precision = 9, $scale = 2)->nullable();
$table->date('tbayaronline')->nullable();
$table->decimal('upahsebenar', $precision = 9, $scale = 2)->nullable();
$table->integer('tagupdatedbonline')->nullable();
$table->decimal('bayarpinjamanonline', $precision = 9, $scale = 2)->nullable();
$table->string('jenis_bayaran')->nullable();
$table->decimal('upah12', $precision = 9, $scale = 2)->nullable();
$table->decimal('hargajualan', $precision = 9, $scale = 2)->nullable();
$table->decimal('bakihargajualan', $precision = 9, $scale = 2)->nullable();
$table->integer('tagkomuditi')->nullable();
$table->integer('lelong_tawarruq')->nullable();
$table->float('tempohbayar', $precision = 10, $scale = 2)->nullable();
$table->timestamps();
});
Schema::create('gadaimarhun', function (Blueprint $table) {
$table->bigIncrements('id');
$table->unsignedBigInteger('gadai_id')->unsigned();
$table->decimal('bil', $precision = 3, $scale = 0);
$table->string('norujukan');
$table->decimal('bil', $precision = 3, $scale = 2);
$table->string('marhun');
$table->string('nota');
$table->string('karat');
$table->decimal('berat', $precision = 7, $scale = 2);
$table->timestamps();
$table->foreign('gadai_id')
->references('id')->on('gadai')
->onDelete('cascade');
// $table->foreign('norujukan')
// ->references('norujukan')->on('gadai')
// ->onDelete('cascade');
});
}
database/migrations/2021_12_14_041545_create_simulasis_table.php
-2
View File
@@ -69,8 +69,6 @@ class CreateSimulasisTable extends Migration
$table->decimal('baki', $precision = 9, $scale = 2);
$table->decimal('berat', $precision = 7, $scale = 2);
$table->string('marhun');
$table->decimal('gst_hj', $precision = 7, $scale = 2);
$table->decimal('gst_cl', $precision = 7, $scale = 2);
$table->decimal('percent', $precision = 7, $scale = 2);
$table->integer('status_jual');
$table->integer('status_payment');
database/migrations/2021_12_14_041557_create_lelongs_table.php
-2
View File
@@ -72,8 +72,6 @@ class CreateLelongsTable extends Migration
$table->decimal('baki', $precision = 9, $scale = 2);
$table->decimal('berat', $precision = 7, $scale = 2);
$table->string('marhun');
$table->decimal('gst_hj', $precision = 7, $scale = 2);
$table->decimal('gst_cl', $precision = 7, $scale = 2);
$table->decimal('percent', $precision = 7, $scale = 2);
$table->string('status_jual');
$table->string('status_payment');
database/migrations/2022_01_25_010223_create_payment_table.php
+1 -1
View File
@@ -67,7 +67,7 @@ class CreatePaymentTable extends Migration
$table->unsignedBigInteger('lelong_id')->unsigned();
$table->string('reference_no')->nullable();
$table->string('billplz_id');
$table->decimal('total_payment', $precision = 9, $scale = 2);
$table->decimal('total_payment', $precision = 11, $scale = 2);
$table->string('resit_type'); // 1 = fee , 2 = bid
$table->string('status')->nullable(); //status => 1 = paid , 2 = pending
$table->timestamp('paid_at')->nullable();
resources/views/account/listbayaranonline.blade.php
+103
View File
@@ -0,0 +1,103 @@
@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="sahsagonline" style="width:100%">
<thead class="bg-primary text-white">
<tr>
<th>No</th>
<th>Nama</th>
<th>No Kad Pengenalan</th>
<th>No Telefon</th>
<th>Bilangan Surat</th>
<th>Jumlah Bidaan(RM)</th>
<th>Jumlah Pembayaran(RM)</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['details']['notelbimbit']}}</td>
<td>{{ $winner['total_surat']}}</td>
<td>{{ $winner['totalBid']}}</td>
<td>{{ $winner['totalPay']}}</td>
<td>
<a href=" {{ route('account.sahsagonline', ['user_id'=>$winner['details']['id'], 'lelong_id'=>$lelong_id]) }} " 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 tablesahsagonline = $('#sahsagonline').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/account/sahsagonline.blade.php
+107
View File
@@ -0,0 +1,107 @@
@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="tablekaunter" style="width:100%">
<thead class="bg-primary text-white">
<tr>
<th>No</th>
<th>No Rujukan</th>
<th>Tarikh Lelong</th>
<th>Harga Asas (RM)</th>
<th>Harga Bida (RM)</th>
<th>Masa Bidaan</th>
<th class="text-center">Status</th>
</tr>
</thead>
<tbody>
@foreach($senaraisag as $sag)
<tr>
<td> {{ $loop->iteration }} </td>
<td>{{ $sag['norujukan'] }}</td>
<td>{{ $sag['t_lelong'] }}</td>
<td>{{ $sag['hargaasas'] }}</td>
<td>{{ $sag['hargabida'] }}</td>
<td>{{ $sag['masa_bidaan'] }}</td>
<td>
<span class="btn btn-success btn-sm hovernone-success" disabled>PAID</span>
</td>
</tr>
@endforeach
</tbody>
</form>
<tr>
<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>
</tr>
</table>
<div class="modal-footer" style="margin-top:2%;">
<a href="{{ route('account.senarailelongan') }}" class="btn btn-primary">Kembali</a>
<a href="{{ route('account.sahbayaronline', ['lelong_id'=>$lelong_id, 'user_id'=>$user_id]) }}" class="btn btn-warning">Sahkan</a>
</div>
</div>
</div>
</div>
<script>
var tablekaunter = $('#tablekaunter').DataTable({
"columnDefs": [
{
"targets": 0,
"orderable": false
},
{
"targets": 6,
"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/account/senarailelongan.blade.php
+97
View File
@@ -0,0 +1,97 @@
@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="senarailelongan" style="width:100%">
<thead class="bg-primary text-white">
<tr>
<th>No</th>
<th>Kod Cawangan</th>
<th>Tarikh Lelong</th>
<th>Status Lelong</th>
<th class="text-center">Action</th>
</tr>
</thead>
<tbody>
@foreach($senarai as $data)
<tr>
<td>{{$loop->iteration}}</td>
<td>{{ $data->caw_code }}</td>
<td>{{ $data->tarikh_lelong }}</td>
<td>{{ $data->sts_lelong }}</td>
<td>
<a href=" {{ route('account.listbayaranonline', ['lelong_id'=>$data['lelong_id']]) }} " data-toggle="tooltip" data-placement="top" title="Senarai Pembida"><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 tablesenarailelongan = $('#senarailelongan').DataTable({
"columnDefs": [
{
"targets": 0,
"orderable": false
},
{
"targets": 4,
"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/includes/sidebar.blade.php
+15 -4
View File
@@ -42,8 +42,8 @@
@endhasrole
@hasrole('khazanah')
<li class="{{ (request()->is('marhun/senaraimarhun') || request()->is('marhun/senaraimarhun/*')) ? 'active' : '' }}">
<a href="{{url('marhun/senaraimarhun')}}">Marhun</a>
<li class="{{ (request()->is('marhun/senarailelongmarhun') || request()->is('marhun/senarailelongmarhun/*')) ? 'active' : '' }}">
<a href="{{url('marhun/senarailelongmarhun')}}">Marhun</a>
</li>
@endhasrole
@hasrole('teller')
@@ -107,14 +107,25 @@
</li>
</ul>
</li>
<li class="{{ (request()->is('pembida/*')) ? 'active' : '' }}">
<a href="{{url('pembida/senaraipembida')}}">Pengesahan Pembida Baharu</a>
<li class="{{ (request()->is('Pembida/*')) ? 'active' : '' }}">
<a href="#pembidaSubmenu" data-toggle="collapse" aria-expanded="false" style="">Pembida</a>
<ul class="list-unstyled collapse {{ (request()->is('pembida/*')) ? 'show' : '' }}" id="pembidaSubmenu" >
<li class="{{ (request()->is('pembida/senaraipembida/*') || request()->is('pembida/senaraipembida') ) ? 'active' : '' }}">
<a href="{{url('pembida/senaraipembida')}}">Pengesahan Pembida Baharu</a>
</li>
<li class="{{ (request()->is('pembida/senaraipembidakeseluruhan/*') || request()->is('pembida/senaraipembidakeseluruhan') ) ? 'active' : '' }}">
<a href="{{url('pembida/senaraipembidakeseluruhan')}}">Senarai Pembida</a>
</li>
</ul>
</li>
@endhasrole
@hasrole('account')
{{-- <li class="{{ (request()->is('home')) ? 'active' : '' }}">
<a href="/home">Home</a>
</li> --}}
<li class="{{ (request()->is('account/*')) ? 'active' : '' }}">
<a href="{{url('account/senarailelongan')}}">List Bayaran Online</a>
</li>
@endhasrole
@hasrole('pembida')
{{-- <li class="{{ (request()->is('home')) ? 'active' : '' }}">
resources/views/jananotis/notislelong.blade.php
+8 -2
View File
@@ -29,8 +29,8 @@
<td>{{ $bid->lelong_id}}</td>
<td>{{ $bid->tarikh_lelong }}</td>
<td class="text-center">
<a href="{{ route('jananotis.jananotis',$bid->lelong_id) }}"><i class="fas fa-download"></i></a>
<a href="{{ route('jananotis.senarainotis',$bid->lelong_id) }}"><i class="far fa-edit"></i></a>
<a href="{{ route('jananotis.jananotis',$bid->lelong_id) }}" data-toggle="tooltip" data-placement="top" title="Muat Turun Jana Notis" ><i class="fas fa-download"></i></a>
<a href="{{ route('jananotis.senarainotis',$bid->lelong_id) }}" data-toggle="tooltip" data-placement="top" title="Butiran Senarai Notis" ><i class="far fa-edit"></i></a>
</td>
</tr>
@endforeach
@@ -43,4 +43,10 @@
</div>
</div>
<script>
//Enable tooltips everywhere
$(function () {
$('[data-toggle="tooltip"]').tooltip()
})
</script>
@endsection
resources/views/jananotis/senarainotis.blade.php
+3
View File
@@ -44,6 +44,9 @@
@endforeach
</tbody>
</table>
<div class="modal-footer" style="margin-top:2%;">
<a href="{{ route('jananotis.notislelong') }}" class="btn btn-primary">Kembali</a>
</div>
</div>
</div>
</div>
resources/views/lelong/lelongtaklaku.blade.php
+11 -3
View File
@@ -17,7 +17,7 @@
<tr>
<th>No</th>
<th>Tarikh Lelong</th>
<th>Kod Cawangan</th>
<th>No Rujukan</th>
<th>Nama Cawangan</th>
<th>Bilangan</th>
<th>Pinjaman (RM)</th>
@@ -38,7 +38,7 @@
<tr>
<td>{{ $loop->iteration }}</td>
<td>{{ $leltaklaku->t_lelong }}</td>
<td class="text-center">{{ $leltaklaku->kodcaw }}</td>
<td>{{ $leltaklaku->norujukan }}</td>
<td>{{ $leltaklaku->caw_name }}</td>
<td> {{ $leltaklaku['suratlelongtaklaku'] }} </td>
<td>{{ $leltaklaku->pinjaman }}</td>
@@ -64,7 +64,7 @@
<td style = "color:red" ><b>TIDAK LAKU</b> </td>
@endif
<td class="text-center">
<a href=" # " target = "blank" ><i class="fas fa-download"></i></a>
<a href=" # " target = "blank" data-toggle="tooltip" data-placement="top" title="Muat Turun Laporan" ><i class="fas fa-download"></i></a>
</td>
<td>
<input type="checkbox" aria-label="Checkbox for following text input" >
@@ -76,12 +76,20 @@
</table>
</form>
<div class="modal-footer" style="margin-top:2%;">
<a href="{{ route('lelong.senarailelongtaklaku') }}" class="btn btn-primary">Kembali</a>
</div>
</div>
</div>
</div>
<script>
//Enable tooltips everywhere
$(function () {
$('[data-toggle="tooltip"]').tooltip()
})
var tablelelongtaklaku = $('#lelongtaklaku').DataTable({
"columnDefs": [
{
resources/views/lelong/senarailelong.blade.php
+4 -4
View File
@@ -12,7 +12,7 @@
@endif
<form id="exportform" action="" method="POST">
<input type="hidden" name="type" value="User">
<table class="table table-striped table-xl" id="lelong" style="width:100%">
<table class="table table-striped table-xl text-center" id="lelong" 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>
@@ -39,9 +39,9 @@
@if($lel->sts_lelong == 0)
<a href="{{ route('lelong.refresh',$lel->id) }}" data-toggle="tooltip" data-placement="top" title="Kemaskini Data"><i class="fas fa-sync-alt"></i></a>
<a class="startlelong" href="{{ route('lelong.start',$lel->id) }}" data-toggle="tooltip" data-placement="top" title="Start Lelong"><i class="fa fa-play"></i></a>
<a class="confirmdel" href="{{ route('lelong.delete',$lel->id) }}" data-toggle="tooltip" data-placement="top" title="Delete"><i class="far fa-trash-alt"></i></a>
<a href="{{ route('lelong.show',$lel->id) }}" data-toggle="tooltip" data-placement="top" title="Show"><i class="far fa-edit"></i></a>
<a class="startlelong" href="{{ route('lelong.start',$lel->id) }}" data-toggle="tooltip" data-placement="top" title="Mula Lelong"><i class="fa fa-play"></i></a>
<a class="confirmdel" href="{{ route('lelong.delete',$lel->id) }}" data-toggle="tooltip" data-placement="top" title="Padam"><i class="far fa-trash-alt"></i></a>
<a href="{{ route('lelong.show',$lel->id) }}" data-toggle="tooltip" data-placement="top" title="Lihat"><i class="far fa-edit"></i></a>
@elseif ($lel->sts_lelong == 2)
<a href="{{ route('lelong.janapemenang',$lel->id) }}" data-toggle="tooltip" data-placement="top" title="Jana Pemenang"><i class="fas fa-users-cog"></i></a>
@elseif ($lel->sts_lelong == 3)
resources/views/lelong/senarailelongtaklaku.blade.php
+6 -1
View File
@@ -31,7 +31,7 @@
<td>{{ $data->harga_emas_asas }}</td>
<td>{{ $data->jbg }}</td>
<td>{{ $data->cajlelong }}</td>
<td><a href=" {{ route('lelong.lelongtaklaku', ['lelong_id'=>$data['lelong_id']]) }} "><i class="far fa-edit"></i></a></td>
<td><a href=" {{ route('lelong.lelongtaklaku', ['lelong_id'=>$data['lelong_id']]) }} " data-toggle="tooltip" data-placement="top" title="Senarai Lelong Tak Laku" ><i class="far fa-edit"></i></a></td>
</tr>
@endforeach
</tbody>
@@ -41,6 +41,11 @@
</div>
<script>
//Enable tooltips everywhere
$(function () {
$('[data-toggle="tooltip"]').tooltip()
})
var tablesenarailelongtaklaku = $('#ssenarailelongtaklaku').DataTable({
"columnDefs": [
{
resources/views/lelong/senaraipemenang.blade.php
+9 -1
View File
@@ -32,17 +32,25 @@
<td>{{ $winner['total_surat']}}</td>
<td>{{ $winner['totalBid']}}</td>
<td>
<a href=" {{ route('lelong.senaraisagpemenang', ['lelong_id'=>$lelong_id, 'user_id'=>$winner['user_id']]) }} "><i class="far fa-edit"></i></a>
<a href=" {{ route('lelong.senaraisagpemenang', ['lelong_id'=>$lelong_id, 'user_id'=>$winner['user_id']]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Bidaan" ><i class="far fa-edit"></i></a>
</td>
</tr>
@endforeach
</tbody>
</table>
<div class="modal-footer" style="margin-top:2%;">
<a href="{{ route('lelong.senarailelong') }}" class="btn btn-primary">Kembali</a>
</div>
</div>
</div>
</div>
<script>
//Enable tooltips everywhere
$(function () {
$('[data-toggle="tooltip"]').tooltip()
})
var tablekaunter = $('#tablekaunter').DataTable({
"columnDefs": [
{
resources/views/lelong/senaraisagpemenang.blade.php
-4
View File
@@ -19,7 +19,6 @@
<th>Harga Asas (RM)</th>
<th>Harga Bida (RM)</th>
<th>Masa Bidaan</th>
<th class="text-center">Action</th>
</tr>
</thead>
<tbody>
@@ -31,9 +30,6 @@
<td>{{ $senaraisag['hargaasas']}}</td>
<td>{{ $senaraisag['hargabida']}}</td>
<td>{{ $senaraisag['masa_bidaan']}}</td>
<td>
<input type="checkbox" aria-label="Checkbox for following text input" >
</td>
</tr>
@endforeach
</tbody>
resources/views/marhun/marhun.blade.php
+10 -2
View File
@@ -43,8 +43,8 @@
<td>{{ $item->hargaasas }}</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 }}"><i class="far fa-edit"></i></a>
<a class="confirmdel" href="{{ route('marhun.delete',$item->id) }}"><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"><i class="far fa-edit"></i></a>
<a class="confirmdel" href="{{ route('marhun.delete',$item->id) }}" data-toggle="tooltip" data-placement="top" title="Padam Marhun"><i class="far fa-trash-alt"></i></a>
</td>
</tr>
@endforeach
@@ -52,6 +52,9 @@
</table>
</form>
<div class="modal-footer" style="margin-top:2%;">
<a href="{{ route('marhun.senarailelongmarhun') }}" class="btn btn-primary">Kembali</a>
</div>
</div>
</div>
@@ -115,6 +118,11 @@
</div>
</div>
<script>
//Enable tooltips everywhere
$(function () {
$('[data-toggle="tooltip"]').tooltip()
})
$('a.confirmdel').confirm({
title: 'Confirmation',
content: 'Anda pasti?',
resources/views/marhun/senarailelongmarhun.blade.php
+93
View File
@@ -0,0 +1,93 @@
@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>No</th>
<th>Tarikh Lelong</th>
<th>Status Lelong</th>
<th class="text-center">Action</th>
</tr>
</thead>
<tbody>
@foreach($senarai as $data)
<tr>
<td>{{$loop->iteration}}</td>
<td>{{ $data->tarikh_lelong }}</td>
<td>{{ $data->sts_lelong }}</td>
<td><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>
@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": 3,
"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/marhun/senaraimarhun.blade.php
+9 -2
View File
@@ -29,8 +29,7 @@
<td>{{ $bid->norujukan }}</td>
<td>{{ $bid->t_lelong }}</td>
<td class="text-center">
<a href="{{ route('marhun.show',$bid->id) }}"><i class="far fa-edit"></i></a>
{{-- <a class="confirmdel" href="{{ route('marhun.delete',$bid->id) }}"><i class="far fa-trash-alt"></i></a> --}}
<a href="{{ route('marhun.show',$bid->id) }}" data-toggle="tooltip" data-placement="top" title="Senari Marhun" ><i class="far fa-edit"></i></a>
</td>
</tr>
@endforeach
@@ -38,11 +37,19 @@
</table>
</form>
<div class="modal-footer" style="margin-top:2%;">
<a href="{{ route('marhun.senarailelongmarhun') }}" class="btn btn-primary">Kembali</a>
</div>
</div>
</div>
</div>
<script>
//Enable tooltips everywhere
$(function () {
$('[data-toggle="tooltip"]').tooltip()
})
$('a.confirmdel').confirm({
title: 'Confirmation',
content: 'Anda pasti?',
resources/views/pembayaran/SAGBidItem.blade.php
+2 -1
View File
@@ -53,6 +53,7 @@
</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>
@@ -63,7 +64,7 @@
<div class="modal-dialog modal-dialog-centered modal-xl" role="document">
<form action="{{ route('pembayaran.paymentdenokaunter') }}" method="POST" id="formpaymentdenokaunter">
@csrf
<input type="hidden" name="user_id" value="{{ $SAGBidItem->id }}" />
<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="" />
resources/views/pembayaran/kaunterpembayaran.blade.php
+9 -2
View File
@@ -35,22 +35,29 @@
<td>{{ $winner['totalBid']}}</td>
<td>{{ $winner['totalPay']}}</td>
<td>
<a href="{{ route('serahan.penyatabayaran',['user_id'=>$winner['details']['id'],'lelong_id'=>$lelong_id]) }}" target = "blank" ><i class="fas fa-download"></i></a>
<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'] )
<a href=" {{ route('pembayaran.SAGBidItem', ['user_id'=>$winner['details']['id'], 'lelong_id'=>$lelong_id]) }} "><i class="far fa-edit"></i></a>
<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>
</tr>
@endforeach
</tbody>
</table>
<div class="modal-footer" style="margin-top:2%;">
<a href="{{ route('pembayaran.SenaraiLelongBayar') }}" class="btn btn-primary">Kembali</a>
</div>
</div>
</div>
</div>
<script>
//Enable tooltips everywhere
$(function () {
$('[data-toggle="tooltip"]').tooltip()
})
var tablekaunter = $('#tablekaunter').DataTable({
"columnDefs": [
{
resources/views/pembayaran/senarailelongbayaran.blade.php
+5 -1
View File
@@ -25,7 +25,7 @@
<td>{{$loop->iteration}}</td>
<td>{{ $data->tarikh_lelong }}</td>
<td>{{ $data->sts_lelong }}</td>
<td><a href=" {{ route('pembayaran.kaunterpembayaran', ['lelong_id'=>$data['id']]) }} "><i class="far fa-edit"></i></a></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
</tbody>
@@ -35,6 +35,10 @@
</div>
<script>
//Enable tooltips everywhere
$(function () {
$('[data-toggle="tooltip"]').tooltip()
})
var tablesenarailelongonline = $('#senarailelongonline').DataTable({
"columnDefs": [
{
resources/views/pembida/kemaskini.blade.php
+194
View File
@@ -0,0 +1,194 @@
@extends('layouts.app')
@section('content')
<div class="container">
<div class="row justify-content-center">
<div class="col-md-8">
@if ($message = Session::get('success'))
<div class="alert alert-success">
<p>{{ $message }}</p>
</div>
@endif
<form action="{{ route('pembida.update') }}" method="POST" id="formkemaskini">
@csrf
<input type="hidden" value="{{$user->id}}" class="form-control" name="userid" id="userid" readonly>
<div class="form-row">
<div class="form-group col-md-6">
<label for="inputEmail4">Nama</label>
<input type="text" value="{{$user->name}}" class="form-control" name="name" id="name" readonly>
</div>
<div class="form-group col-md-6">
<label for="inputPassword4">Email</label>
<input type="email" value="{{$user->email}}" class="form-control" name="email" id="email">
</div>
</div>
<div class="form-row">
<div class="form-group col-md-6">
<label for="inputPassword4">Number Phone</label>
<input type="text" value="{{$user->notelbimbit}}" class="form-control" name="notelbimbit" id="notelbimbit">
</div>
<div class="form-group col-md-6">
<label for="inputPassword4">Identity Card/Passport Number</label>
<input type="text" value="{{$user->nokp}}" class="form-control" name="nokp" id="nokp">
</div>
</div>
<div class="d-flex form-group">
<div class="d-flex col-md-6">
<div style="margin-right:2%;">
<label for="status1">Status</label>
</div>
<div class="custom-control custom-switch" >
<input type="checkbox" class="custom-control-input" name="status" id="customSwitch1" onchange="showstatus(this)">
<label class="custom-control-label" for="customSwitch1" data-status="{{ $user->status }}" id="txtstatus"></lable>
</div>
</div>
<div class="d-flex col-md-6">
<div style="margin-right:2%;">
<label for="status1">Ban</label>
</div>
<div class="custom-control custom-switch" >
<input type="checkbox" class="custom-control-input" style="background-color:red !important" name="statusban" id="customSwitch2" onchange="showban(this)">
<label class="custom-control-label" for="customSwitch2" id="txtstatusban"></lable>
</div>
</div>
</div>
<div class="form-row">
<h4 class="col-md-3">Identity Card/Passport Picture</h4>
<div class="form-group col-md-9">
@foreach ($files as $file)
<div class=".col-6 .col-sm-4 form-check form-check-inline">
<img src="data:image/png;base64, {{ $file['filename'] }}" alt="Image Preview" style="width:350px; height:250px"/>
</div>
@endforeach
</div>
</div>
<div class="text-right pt-4">
<input type="hidden" name="userid" value="{{$user->id}}">
<a href="{{url('pembida/senaraipembidakeseluruhan')}}" class="btn btn-primary">Kembali</a>
<button type="button" class="btn btn-success" onclick="kemaskini()" >Kemaskini</button>
</div>
</form>
</div>
</div>
</div>
<script>
var status = $('#txtstatus').data('status');
console.log(status);
if(status == 'active'){
$('#customSwitch1').prop('checked',true) ;
$('#customSwitch2').prop('checked',false) ;
$('#txtstatus').text('Active');
}
else if(status == 'banned')
{
$('#customSwitch1').prop('checked',false) ;
$('#customSwitch2').prop('checked',true) ;
$('#txtstatusban').text('Banned');
}
else{
$('#customSwitch1').prop('checked',false) ;
$('#customSwitch2').prop('checked',false) ;
$('#txtstatus').text('Inactive');
}
function kemaskini() {
// console.log($('#txtstatus').val());
$("#formkemaskini").submit();
}
function showban(e){
var value = $(e).prop('checked') ;
if( value == true){
$('#txtstatus').text('Inactive');
$('#txtstatusban').text('Banned');
$('#customSwitch1').prop('checked',false) ;
}
else{
if(status == 'active'){
$('#customSwitch1').prop('checked',true) ;
$('#txtstatus').text('Active');
$('#txtstatusban').text('');
}
else
{
$('#txtstatusban').text('');
$('#txtstatus').text('Inactive');
}
}
}
function showstatus(e){
var value = $(e).prop('checked') ;
if( value == true)
{
$('#txtstatusban').text('');
$('#txtstatus').text('Active');
$('#customSwitch2').prop('checked',false) ;
}
else{
if(status == 'banned'){
$('#customSwitch2').prop('checked',true) ;
$('#txtstatus').text('Inactive');
$('#txtstatusban').text('Banned');
}
else
{
$('#txtstatusban').text('');
$('#txtstatus').text('Inactive');
}
}
console.log(value);
}
function simpantolak() {
$('#modaltolak').modal('hide');
$("#formtolakpembida").submit();
}
function reject(e) {
var userid= $(e).data('user_id');
// console.log(userid);
$('#user_id').val(userid);
$('#modaltolak').modal('show');
}
function confirm() {
$.confirm({
title: 'Confirmation',
content: 'Anda pasti?',
type: 'green',
typeAnimated: true,
buttons: {
Sah: {
btnClass: 'btn-success',
action: function () {
$("#formpengguna").submit();
}
},
Batal: {
btnClass: 'btn-default',
action: function () {}
}
}
});
}
// function reject() {
// $.reject({
// title: 'Confirmation',
// content: 'Anda pasti?',
// type: 'green',
// typeAnimated: true,
// buttons: {
// Sah: {
// btnClass: 'btn-success',
// action: function () {
// $("#formpengguna").submit();
// }
// },
// Batal: {
// btnClass: 'btn-default',
// action: function () {}
// }
// }
// });
// }
</script>
@endsection
resources/views/pembida/senaraipembida.blade.php
+9 -5
View File
@@ -36,16 +36,15 @@
<td>{{ $user->notelbimbit }}</td>
<td>{{ $user->email }}</td>
<td>
@if ($user->status =='active')
<!-- @if ($user->status =='active')
<button class="btn btn-success btn-sm hovernone-success" disabled>{{$user->status}}</button>
@elseif ($user->status =='banned')
<button class="btn btn-danger btn-sm hovernone-danger" disabled>{{$user->status}}</button>
@endif
@endif -->
Menunggu Pengesahan Operasi
</td>
<td class="text-center">
<a href="{{ route('pembida.show',$user->id) }}"><i class="fas fa-check"></i></a>
{{-- <a class="confirmdel" href="{{ route('pengguna.delete',$user->id) }}"><i class="far fa-trash-alt"></i></a> --}}
<a href="{{ route('pembida.show',$user->id) }}" data-toggle="tooltip" data-placement="top" title="Sahkan Pembida"><i class="fas fa-edit"></i></a>
</td>
</tr>
@endforeach
@@ -58,6 +57,11 @@
</div>
</div>
<script>
//Enable tooltips everywhere
$(function () {
$('[data-toggle="tooltip"]').tooltip()
})
$('a.confirmdel').confirm({
title: 'Confirmation',
content: 'Anda pasti?',
resources/views/pembida/senaraipembidakeseluruhan.blade.php
+141
View File
@@ -0,0 +1,141 @@
@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
<?php
// $totaluser = count($alluser);
?>
<form id="exportform" action="{{route('pengguna.export')}}" method="POST">
@csrf
<input type="hidden" name="type" value="User">
<table class="table table-striped table-xl text-center" id="pengguna" 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>Nama</th>
<th>Number Phone</th>
<th>Email</th>
<th>Status</th>
<th class="text-center">Action</th>
</tr>
</thead>
<tbody>
@foreach ($alluser as $user)
<tr>
<td><input type="checkbox" aria-label="Checkbox for following text input" name="checkboxdata[]" value="{{ $user->id }}"></td>
<td>{{ $user->name }}</td>
<td>{{ $user->notelbimbit }}</td>
<td>{{ $user->email }}</td>
<td>
@if ($user->status =='active')
<button class="btn btn-success btn-sm hovernone-success" disabled>{{$user->status}}</button>
@elseif ($user->status =='banned')
<button class="btn btn-danger btn-sm hovernone-danger" disabled>{{$user->status}}</button>
@elseif ($user->status == 'inactive')
<button class="btn btn-danger btn-sm hovernone-danger" disabled>{{$user->status}}</button>
@else ($user->status == null)
Menunggu Pengesahan Operasi
@endif
</td>
<td class="text-center">
<a href="{{ route('pembida.kemaskini',$user->id) }}" data-toggle="tooltip" data-placement="top" title="Kemaskini Pembida"><i class="fas fa-edit"></i></a>
</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 tablepengguna = $('#pengguna').DataTable( {
"columnDefs": [
{
"targets": 0,
"orderable": false
},
{
"targets": 4,
"orderable": false
}
],
order: [[1, 'asc']],
// "ordering": false,
"info": false,
"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 adduser',
text: '<i class="fas fa-plus" id="test"></i>',
titleAttr: 'Tambah Pembida',
action: function ( e, dt, node, config ) {
alert( 'Button activated' );
}
},
{
className: 'btn btn-outline-secondary pl-4 pr-4 btn-sm export',
titleAttr: 'Export to PDF',
text: '<i class="fas fa-download"></i>',
action: function ( e, dt, node, config ) {
$("#exportform").submit();
}
}
]
});
$('.adduser').tooltip();
$('.export').tooltip();
// $( '.dt-buttons').addClass('btn-group');
$( '.adduser').removeClass('dt-button');
$( '.export').removeClass('dt-button');
function selectall(cb) {
tablepengguna.rows().nodes().to$().find('input[type="checkbox"]').each(function(){
$(this).prop('checked', cb.checked);
})
}
</script>
@endsection
resources/views/pengurusandatabase/senaraidb.blade.php
+6 -2
View File
@@ -38,9 +38,9 @@
<td class="text-center">
<form action="{{ route('sistem.deleteConn',$data->id) }}" method="POST" id="formdelconn-{{$data->id}}">
@csrf
<a href="{{ route('sistem.showConn',$data->id) }}"><i class="far fa-edit"></i></a>
<a href="{{ route('sistem.showConn',$data->id) }}" data-toggle="tooltip" data-placement="top" title="Kemaskini" ><i class="far fa-edit"></i></a>
{{-- <a href="{{ route('sistem.showConn',$data->id) }}"><i class="far fa-eye"></i></a> --}}
<a onclick="confirm({{$data->id}})"><i class="far fa-trash-alt"></i></a>
<a onclick="confirm({{$data->id}})" data-toggle="tooltip" data-placement="top" title="Padam"><i class="far fa-trash-alt"></i></a>
</form>
</td>
@@ -153,6 +153,10 @@
</div>
</div>
<script>
//Enable tooltips everywhere
$(function () {
$('[data-toggle="tooltip"]').tooltip()
})
function newconnection() {
$("#formnewconnection").submit();
}
resources/views/pengurusandatabase/show.blade.php
+4
View File
@@ -99,6 +99,10 @@
</div>
</div>
<script>
//Enable tooltips everywhere
$(function () {
$('[data-toggle="tooltip"]').tooltip()
})
function confirm() {
$.confirm({
title: 'Confirmation',
resources/views/pengurusanpengguna/index.blade.php
+6 -2
View File
@@ -48,8 +48,8 @@
</td>
<td class="text-center">
<a href="{{ route('pengguna.show',$user->id) }}"><i class="far fa-edit"></i></a>
<a class="confirmdel" href="{{ route('pengguna.delete',$user->id) }}"><i class="far fa-trash-alt"></i></a>
<a href="{{ route('pengguna.show',$user->id) }}" data-toggle="tooltip" data-placement="top" title="Kemaskini" ><i class="far fa-edit"></i></a>
<a class="confirmdel" href="{{ route('pengguna.delete',$user->id) }}" data-toggle="tooltip" data-placement="top" title="Padam" ><i class="far fa-trash-alt"></i></a>
</td>
</tr>
@endforeach
@@ -62,6 +62,10 @@
</div>
</div>
<script>
//Enable tooltips everywhere
$(function () {
$('[data-toggle="tooltip"]').tooltip()
})
$('a.confirmdel').confirm({
title: 'Confirmation',
content: 'Anda pasti?',
resources/views/pengurusanpengguna/roles.blade.php
+6 -2
View File
@@ -28,8 +28,8 @@
<td>{{ $role->name }}</td>
<td>{{ $role->description }}</td>
<td class="text-center">
<a href="{{ route('pengguna.showrole',$role->id) }}"><i class="far fa-edit"></i></a>
<a class="confirmdel" href="{{ route('pengguna.deleterole',$role->id) }}"><i class="far fa-trash-alt"></i></a>
<a href="{{ route('pengguna.showrole',$role->id) }}" data-toggle="tooltip" data-placement="top" title="Kemaskini" ><i class="far fa-edit"></i></a>
<a class="confirmdel" href="{{ route('pengguna.deleterole',$role->id) }}" data-toggle="tooltip" data-placement="top" title="Padam" ><i class="far fa-trash-alt"></i></a>
</td>
</tr>
@endforeach
@@ -74,6 +74,10 @@
</div>
</div>
<script>
//Enable tooltips everywhere
$(function () {
$('[data-toggle="tooltip"]').tooltip()
})
function newrole() {
$("#formnewrole").submit();
}
resources/views/pengurusanpengguna/show.blade.php
+88
View File
@@ -33,6 +33,28 @@
@endforeach
</div>
</div>
@if($user->user_type == 2)
<div class="d-flex form-group">
<div class="d-flex col-md-6">
<div style="margin-right:2%;">
<label for="status1">Status</label>
</div>
<div class="custom-control custom-switch" >
<input type="checkbox" class="custom-control-input" name="status" id="customSwitch1" onchange="showstatus(this)">
<label class="custom-control-label" for="customSwitch1" data-status="{{ $user->status }}" id="txtstatus"></lable>
</div>
</div>
<div class="d-flex col-md-6">
<div style="margin-right:2%;">
<label for="status1">Ban</label>
</div>
<div class="custom-control custom-switch" >
<input type="checkbox" class="custom-control-input" style="background-color:red !important" name="statusban" id="customSwitch2" onchange="showban(this)">
<label class="custom-control-label" for="customSwitch2" id="txtstatusban"></lable>
</div>
</div>
</div>
@endif
<div class="text-right pt-4">
<input type="hidden" name="userid" value="{{$user->id}}">
<a href="{{url('pengguna/listpengguna')}}" class="btn btn-primary">Kembali</a>
@@ -66,5 +88,71 @@
});
}
var status = $('#txtstatus').data('status');
console.log(status);
if(status == 'active'){
$('#customSwitch1').prop('checked',true) ;
$('#customSwitch2').prop('checked',false) ;
$('#txtstatus').text('Active');
}
else if(status == 'banned')
{
$('#customSwitch1').prop('checked',false) ;
$('#customSwitch2').prop('checked',true) ;
$('#txtstatusban').text('Banned');
}
else{
$('#customSwitch1').prop('checked',false) ;
$('#customSwitch2').prop('checked',false) ;
$('#txtstatus').text('Inactive');
}
function kemaskini() {
// console.log($('#txtstatus').val());
$("#formkemaskini").submit();
}
function showban(e){
var value = $(e).prop('checked') ;
if( value == true){
$('#txtstatus').text('Inactive');
$('#txtstatusban').text('Banned');
$('#customSwitch1').prop('checked',false) ;
}
else{
if(status == 'active'){
$('#customSwitch1').prop('checked',true) ;
$('#txtstatus').text('Active');
$('#txtstatusban').text('');
}
else
{
$('#txtstatusban').text('');
$('#txtstatus').text('Inactive');
}
}
}
function showstatus(e){
var value = $(e).prop('checked') ;
if( value == true)
{
$('#txtstatusban').text('');
$('#txtstatus').text('Active');
$('#customSwitch2').prop('checked',false) ;
}
else{
if(status == 'banned'){
$('#customSwitch2').prop('checked',true) ;
$('#txtstatus').text('Inactive');
$('#txtstatusban').text('Banned');
}
else
{
$('#txtstatusban').text('');
$('#txtstatus').text('Inactive');
}
}
console.log(value);
}
</script>
@endsection
resources/views/pengurusanpengguna/taraf.blade.php
+6 -2
View File
@@ -33,8 +33,8 @@
@endforeach
</td>
<td class="text-center">
<a href="{{ route('pengguna.showtaraf',$role->id) }}"><i class="far fa-edit"></i></a>
<a class="confirmdel" href="{{ route('pengguna.deletetaraf',$role->id) }}"><i class="far fa-trash-alt"></i></a>
<a href="{{ route('pengguna.showtaraf',$role->id) }}" data-toggle="tooltip" data-placement="top" title="Kemaskini" ><i class="far fa-edit"></i></a>
<a class="confirmdel" href="{{ route('pengguna.deletetaraf',$role->id) }}" data-toggle="tooltip" data-placement="top" title="Padam" ><i class="far fa-trash-alt"></i></a>
</td>
</tr>
@endforeach
@@ -47,6 +47,10 @@
</div>
</div>
<script>
//Enable tooltips everywhere
$(function () {
$('[data-toggle="tooltip"]').tooltip()
})
$('a.confirmdel').confirm({
title: 'Confirmation',
content: 'Anda pasti?',
resources/views/serahan/laporanserahan.blade.php
+10 -1
View File
@@ -29,7 +29,7 @@
<td>{{ $bid->lelong_id}}</td>
<td>{{ $bid->tarikh_lelong }}</td>
<td class="text-center">
<a href="{{ route('serahan.pembayaran',$bid->lelong_id) }}"><i class="far fa-edit"></i></a>
<a href="{{ route('serahan.pembayaran',$bid->lelong_id) }}" data-toggle="tooltip" data-placement="top" title="Butiran Pembayaran" ><i class="far fa-edit"></i></a>
</td>
</tr>
@endforeach
@@ -42,4 +42,13 @@
</div>
</div>
<script>
//Enable tooltips everywhere
$(function () {
$('[data-toggle="tooltip"]').tooltip()
})
</script>
@endsection
resources/views/serahan/pembayaran.blade.php
+9 -2
View File
@@ -32,8 +32,8 @@
<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]) }}"><i class="fas fa-download"></i></a></td>
<td> <a href="{{ route('serahan.senaraibid',['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>
@@ -42,10 +42,17 @@
@endforeach
</tbody>
</table>
<div class="modal-footer" style="margin-top:2%;">
<a href="{{ route('serahan.laporanserahan') }}" class="btn btn-primary">Kembali</a>
</div>
</div>
</div>
</div>
<script>
//Enable tooltips everywhere
$(function () {
$('[data-toggle="tooltip"]').tooltip()
})
$('a.confirmdel').confirm({
title: 'Confirmation',
content: 'Anda pasti?',
resources/views/simulasi/senaraisimulasi.blade.php
+6 -2
View File
@@ -33,9 +33,9 @@
<td>{{ $sim->jbg }}</td>
<td>{{ $sim->cajlelong }}</td>
<td class="text-center">
<a href="{{ route('analisa.show',$sim->id) }}"><i class="far fa-edit"></i></a>
<a href="{{ route('analisa.show',$sim->id) }}" data-toggle="tooltip" data-placement="top" title="Butiran Simulasi"><i class="far fa-edit"></i></a>
{{-- <a href="{{ route('sistem.showConn',$data->id) }}"><i class="far fa-eye"></i></a> --}}
<a class="confirmdel" href="{{ route('analisa.delete',$sim->id) }}"><i class="far fa-trash-alt"></i></a>
<a class="confirmdel" href="{{ route('analisa.delete',$sim->id) }}" data-toggle="tooltip" data-placement="top" title="Padam"><i class="far fa-trash-alt"></i></a>
</td>
@@ -50,6 +50,10 @@
</div>
</div>
<script>
//Enable tooltips everywhere
$(function () {
$('[data-toggle="tooltip"]').tooltip()
})
$('a.confirmdel').confirm({
title: 'Confirmation',
content: 'Anda pasti?',
routes/web.php
+21 -7
View File
@@ -89,7 +89,6 @@ Route::group(['prefix'=>'lelong'], function () {
Route::get('/senaraimarhun/{lelongid}/{cawid}', ['as'=>'lelong.senaraimarhun','uses'=>'LelongController@senaraimarhun']);
Route::post('/deletemarhun', ['as'=>'lelong.deletemarhun','uses'=>'LelongController@deletemarhun']);
});
Route::group(['middleware' => ['permission:pengesahanpembayaranpc']], function () {
@@ -116,9 +115,10 @@ Route::group(['prefix'=>'lelong'], function () {
//Khazanah
Route::group(['middleware' => ['permission:semakanmarhun','permission:kemaskinimarhun'],'prefix'=>'marhun'], function () {
Route::get('/senaraimarhun',['as'=>'marhun.senaraimarhun','uses'=>'MarhunController@index']);
Route::get('/senarailelongmarhun',['as'=>'marhun.senarailelongmarhun','uses'=>'MarhunController@senarailelongmarhun']);
Route::get('/senaraimarhun/{lelong_id}',['as'=>'marhun.senaraimarhun','uses'=>'MarhunController@index']);
Route::get('/marhun/{id}',['as'=>'marhun.show','uses'=>'MarhunController@show']);
Route::get('/deletemarhun/{id}',['as'=>'marhun.delete','uses'=>'MarhunController@delete']);
@@ -128,14 +128,20 @@ Route::group(['middleware' => ['permission:semakanmarhun','permission:kemaskinim
});
//Khazanah
//Operasi
Route::group(['middleware' => ['permission:pengesahanpembida'],'prefix'=>'pembida'], function () {
Route::get('/senaraipembidakeseluruhan',['as'=>'pembida.senaraipembidakeseluruhan','uses'=>'PembidaController@senaraipembidakeseluruhan']);
Route::get('/senaraipembida',['as'=>'pembida.senaraipembida','uses'=>'PembidaController@index']);
Route::get('/pembida/{id}',['as'=>'pembida.show','uses'=>'PembidaController@show']);
Route::get('/deletepembida/{id}',['as'=>'pembida.delete','uses'=>'PembidaController@delete']);
Route::get('/sahkanpembida/{id}',['as'=>'pembida.sah','uses'=>'PembidaController@sah']);
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']);
});
//Operasi
Route::group(['middleware' => ['permission:serahan'],'prefix'=>'serahan'], function () {
Route::get('/laporanserahan',['as'=>'serahan.laporanserahan','uses'=>'SerahanController@laporanserahan']);
@@ -146,8 +152,7 @@ Route::group(['middleware' => ['permission:serahan'],'prefix'=>'serahan'], funct
Route::get('/senaraibid/{user_id}/{lelong_id}',['as'=>'serahan.senaraibid','uses'=>'SerahanController@senaraibid']);
});
// Pengurus Cawangan
Route::group(['middleware' => ['permission:pengesahanbayarancash'],'prefix'=>'pembayaran'], function () {
Route::get('/kaunterpembayaran/{lelong_id}', ['as'=>'pembayaran.kaunterpembayaran','uses'=>'PaymentController@SenaraiPemenang']);
Route::get('/SAGBidItem/{user_id}/{lelong_id}', ['as'=>'pembayaran.SAGBidItem','uses'=>'PaymentController@SAGBidItem']);
@@ -155,6 +160,17 @@ Route::group(['middleware' => ['permission:pengesahanbayarancash'],'prefix'=>'pe
Route::post('/paymentdenokaunter', ['as'=>'pembayaran.paymentdenokaunter','uses'=>'PaymentController@paymentdenokaunter']);
});
// Pengurus Cawangan
// Account
Route::group(['middleware' => ['permission:pengesahanbayaran'],'prefix'=>'account'], function () {
Route::get('/senarailelongan', ['as'=>'account.senarailelongan','uses'=>'AccountController@senarailelongan']);
Route::get('/listbayaranonline/{lelong_id}', ['as'=>'account.listbayaranonline','uses'=>'AccountController@listbayaranonline']);
Route::get('/sahsagonline/{lelong_id}/{user_id}', ['as'=>'account.sahsagonline','uses'=>'AccountController@sahsagonline']);
Route::get('/sahbayaronline/{lelong_id}/{user_id}', ['as'=>'account.sahbayaronline','uses'=>'AccountController@sahbayaronline']);
});
// Account
Route::group(['middleware' => ['permission:jananotis'],'prefix'=>'jananotis'], function () {
Route::get('/notislelong',['as'=>'jananotis.notislelong','uses'=>'NotisController@notislelong']);
@@ -164,6 +180,4 @@ Route::group(['middleware' => ['permission:jananotis'],'prefix'=>'jananotis'], f
});