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

Merge branch 'faiqahzaman' into 'main'

Browse Source 
Faiqahzaman

See merge request online-sistem1/lelong!26
This commit is contained in:
Nur Izzati Zulkifli
2022-05-09 01:41:24 +00:00
parent 36bb8e5665 03d06ab355
commit 3fefdb436b
17 changed files with 1133 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/MarhunController.php
+59 -10
View File
@@ -399,6 +399,7 @@ class MarhunController extends Controller
$mutumarhun = Lelong::join('pengesahan', 'lelong.id', '=', 'pengesahan.lelong_id')
->where('lelong.id', $id)
->whereNull('disahkan_oleh')
->where('pengesahan.status_ubah', [1,2,3,4,5])
->selectRaw('count(*) as total, sum(status) as tstat,norujukan')
->groupBy('pengesahan.norujukan')
->get()->toArray();
@@ -653,16 +654,30 @@ class MarhunController extends Controller
public function senarailelong()
{
$lelong = Lelong::where('sts_lelong', 0)
->get();
$arrayinfo = [];
return view('pengesahan.senarailelong',compact('lelong'));
$lelong = Lelong::where('sts_lelong', 0)
->get()->toArray();
foreach($lelong as $details)
{
$detailsinfo = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
->where('lelong_id', $details['id'])
->get()
->toArray();
array_push($arrayinfo,['detail'=>$details, 'detailsinfo'=>$detailsinfo]);
}
return view('pengesahan.senarailelong',compact('lelong', 'arrayinfo'));
}
public function senaraitangguhlelong($id)
public function senaraitangguhlelong($id, $caw_name)
{
$tangguhlelong = TangguhLelong::join('lelongbid', 'tangguhlelong.lelongbid_id', '=', 'lelongbid.id')
$tangguhlelong = TangguhLelong::join('lelong', 'tangguhlelong.lelong_id', '=', 'lelong.id')
->where('tangguhlelong.lelong_id', $id)
// ->join('lelongbid', 'tangguhlelong.lelongbid_id', '=', 'lelongbid.id')
// ->where('tangguhlelong.lelong_id', $id)
->select('tangguhlelong.id as tangguhlelong_id',
'tangguhlelong.lelongbid_id',
'tangguhlelong.norujukan',
@@ -678,18 +693,52 @@ class MarhunController extends Controller
'lelong.sts_lelong'
)
->get();
// dd($tangguhlelong);
return view('pengesahan.senaraitangguhlelong',compact('tangguhlelong','id'));
foreach($tangguhlelong as $index1=>$tanguhlel)
{
$getkodcaw = LelongBid::join('cawangan', 'lelongbid.kodcaw', '=', 'cawangan.caw_code')
->where('lelong_id', $id)
->first();
$tangguhlelong[$index1]['details'] = $tanguhlel;
$tangguhlelong[$index1]['nama_caw'] = $getkodcaw;
}
return view('pengesahan.senaraitangguhlelong',compact('tangguhlelong','id', 'caw_name'));
}
public function lelbidmarhun($id, $norujukan, $tangguhlelong_id)
{
$marhuns = LelongBidMarhun::join('tangguhlelong', 'lelongbidmarhun.lelongbid_id', '=', 'tangguhlelong.lelongbid_id')
$tangguhlelong = TangguhLelong::join('gadaimarhun', 'tangguhlelong.norujukan', '=', 'gadaimarhun.norujukan')
->where('gadaimarhun.norujukan', $norujukan)
->where('tangguhlelong.id', $tangguhlelong_id)
->where('tangguhlelong.lelong_id', $id)
->where('tangguhlelong.norujukan', $norujukan)
->select('tangguhlelong.id as tangguhlelong_id',
'tangguhlelong.lelong_id',
'tangguhlelong.lelongbid_id',
'tangguhlelong.norujukan',
'tangguhlelong.pinjaman',
'tangguhlelong.tarikhtangguh',
'tangguhlelong.nota as tangguh_nota',
'tangguhlelong.pinjaman',
'gadaimarhun.bil',
'gadaimarhun.marhun',
'gadaimarhun.nota as gadai_nota',
'gadaimarhun.karat',
'gadaimarhun.berat',
'gadaimarhun.harga',
'gadaimarhun.n_marhun'
)
->get();
return view('pengesahan.lelbidmarhun',compact('tangguhlelong', 'id', 'norujukan'));
$caw_names = GadaiMarhun::join('cawangan', 'gadaimarhun.kodcaw', '=', 'cawangan.caw_code')
->where('gadaimarhun.norujukan', $norujukan)
->select('cawangan.caw_name')
->first();
// dd($caw_names);
return view('pengesahan.lelbidmarhun',compact('tangguhlelong', 'id', 'norujukan', 'caw_names'));
}
app/Http/Controllers/PaymentController.php
+4 -3
View File
@@ -128,6 +128,7 @@ class PaymentController extends Controller
$user = Auth::user();
$bid_id = explode(",", $request->eachbid);
dd($bid_id);
$resit = Resit::where('lelong_id', $request->lelong_id)
->where('user_id',$request->user_id)
@@ -222,14 +223,14 @@ class PaymentController extends Controller
public function banktransfer(Request $request)
{
// dd($request->all());
dd($request->all());
$currentdate = Carbon::now();
$currentdate = $currentdate->toDateTimeString();
$user = Auth::user();
// dd($user);
// dd($request->checkboxdata);
$totalcheck = implode(",", $request->checkboxdata);
$resit = Resit::where('lelong_id', $request->lelong_id)
@@ -245,7 +246,7 @@ class PaymentController extends Controller
$payment->status = 2;
$payment->remark = 'BAYARAN CDM';
$payment->resit_id = $resit->id;
$payment->total_payment = $totalcheck;
$payment->total_payment = sum($totalcheck->valueOf());
$payment->diminta_pada = $currentdate;
$payment->diminta_oleh = $user->id;
$payment->save();
app/Http/Controllers/TangguhLelongController.php
+310
View File
@@ -0,0 +1,310 @@
<?php
namespace App\Http\Controllers;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Carbon\Carbon;
use App\Models\Gadai;
use App\Models\Cawangan;
use App\Models\Customer;
use App\Models\Lelong;
use App\Models\LelongBid;
use App\Models\LelongBidMarhun;
use App\Models\CawanganLelong;
use App\Models\TangguhLelong;
use App\Models\Pengesahan;
class TangguhLelongController extends Controller
{
//PC
public function senleluntuktangguh()
{
$user = Auth::user();
$arrayinfo = [];
$lelong = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id')
->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id')
->where('cawangan.caw_code', $user->kodcaw)
->where('sts_lelong', 0)
->select('lelong_id','tarikh_lelong','masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong')
->groupBy('lelong_id')
->get()
->toArray();
foreach($lelong as $info)
{
$detailsinfo = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
->where('lelong_id',$info['lelong_id'])
->get()
->toArray();
array_push($arrayinfo,['info'=>$info, 'detailsinfo'=>$detailsinfo]);
// dd($arrayinfo);
}
return view('tangguhlelong.senarailelongtangguh',compact('lelong', 'arrayinfo'));
}
public function carian($lelong_id)
{
return view('tangguhlelong.carian', compact('lelong_id'));
}
public function searchbyic(Request $request)
{
// dd($request->all());
$user = Auth::user();
if($request->nokp == null)
{
return redirect()->route('tangguhlelong.carian', $request->lelong_id)->with('failed','Sila Masukkan No Kad Pengenalan');
}
else if($request->nokp != null)
{
$lelong = Lelong::where('id', $request->lelong_id)->first();
$getic = Customer::join('gadai', 'customer.nopelanggan', '=', 'gadai.nopelanggan')
->where('customer.kpbaru', $request->nokp)
->where('gadai.tempoh', $lelong->jbg)
->get();
foreach($getic as $index1=>$ic)
{
$getnorujukan = LelongBid::where('norujukan', $ic->norujukan)
->where('jbg', $ic->tempoh)
->get();
foreach($getnorujukan as $norujukan)
{
$pengesahan = Pengesahan::where('lelongbidmarhun_id', $norujukan->id)
->where('lelongbid_id', $norujukan->lelongbid_id)
->where('norujukan', $norujukan->norujukan)
->get()->toArray();
if($pengesahan)
{
return redirect()->route('tangguhlelong.carian', $request->lelong_id)->with('success','Pengesahan Tangguh Lelong Telah Dibuat');
}
}
$getic[$index1]['user_details'] = $getnorujukan;
// dd($getic[$index1]['user_details']);
}
$lelong_id = $request->lelong_id;
return view('tangguhlelong.searchbyic', compact('getic', 'user', 'lelong_id' ));
}
}
public function tangguhlelong(Request $request)
{
// dd($request->all());
$user = Auth::user();
$currentdate = Carbon::now();
$currentdate = $currentdate->toDateTimeString();
$lelbidmarhun = $request->checkboxdata;
// dd($lelbidmarhun);
$lelong = Lelong::where('id', $request->lelong_id)->get()->toArray();
foreach($lelbidmarhun as $bidmarhun)
{
$lelongbidmarhun = LelongBidMarhun::join('lelongbid', 'lelongbidmarhun.lelongbid_id', '=', 'lelongbid.id')
->where('lelongbid.id', $bidmarhun)
->select('lelongbidmarhun.id as lelongbidmarhun_id',
'lelongbidmarhun.bil',
'lelongbidmarhun.marhun',
'lelongbidmarhun.nota',
'lelongbidmarhun.old_karat',
'lelongbidmarhun.karat',
'lelongbidmarhun.old_berat',
'lelongbidmarhun.berat',
'lelongbidmarhun.old_harga',
'lelongbidmarhun.harga',
'lelongbidmarhun.old_nmarhun',
'lelongbidmarhun.n_marhun',
'lelongbidmarhun.old_hargaasas',
'lelongbidmarhun.hargaasas',
'lelongbid.id as lelongbid_id',
'lelongbid.caw_id',
'lelongbid.kodcaw',
'lelongbid.norujukan',
'lelongbid.t_lelong',
'lelongbid.hargaasas',
'lelongbid.nopembeli',
'lelongbid.jbg',
'lelongbid.kadarupah',
'lelongbid.upahsimpan',
'lelongbid.ansuran',
'lelongbid.nilaimarhun',
'lelongbid.pinjaman',
'lelongbid.bakiupah',
'lelongbid.cajlain',
'lelongbid.cajlelong',
'lelongbid.baki',
'lelongbid.berat',
'lelongbid.marhun',
)
->get()->toArray();
// dd($lelongbidmarhun);
$pengesahan = new Pengesahan();
$pengesahan->lelong_id = $request->lelong_id;
$pengesahan->lelongbid_id = $bidmarhun;
$pengesahan->lelongbidmarhun_id = $lelongbidmarhun[0]['lelongbidmarhun_id'];
$pengesahan->norujukan = $lelongbidmarhun[0]['norujukan'];
$pengesahan->diminta_oleh = $user->id;
$pengesahan->diminta_pada = $currentdate;
$pengesahan->status = 2;
$pengesahan->status_ubah = 6;
$pengesahan->save();
}
return redirect()->route('tangguhlelong.carian', $request->lelong_id)->with('success','Pengesahan Tangguh Lelong Berjaya');
}
//Operasi
public function senarailelongtangguh()
{
$arrayinfo = [];
$lelong = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id')
->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id')
->where('sts_lelong', 0)
->select('lelong_id','tarikh_lelong','masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong')
->groupBy('lelong_id')
->get()
->toArray();
foreach($lelong as $info)
{
$detailsinfo = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
->where('lelong_id',$info['lelong_id'])
->get()
->toArray();
array_push($arrayinfo,['info'=>$info, 'detailsinfo'=>$detailsinfo]);
// dd($arrayinfo);
}
return view('tangguhlelong.senleltangguh',compact('lelong', 'arrayinfo'));
}
public function senaraisahtangguh($lelong_id, $caw_code)
{
$currentdate = Carbon::now();
$currentdate = $currentdate->toDateTimeString();
$pengesahan = Pengesahan::where('pengesahan.lelong_id', $lelong_id)
->whereNull('disahkan_oleh')
->whereNull('disahkan_pada')
->get();
foreach($pengesahan as $index1=>$sah)
{
$lelongbid = LelongBid::where('id', $sah->lelongbid_id)
->where('norujukan', $sah->norujukan)
->where('kodcaw', $caw_code)
->get();
// dd($lelongbid[0]['jbg']);
$pengesahan[$index1]['bid_details'] = $lelongbid;
}
return view('tangguhlelong.sensahpc', compact('pengesahan', 'lelong_id' , 'caw_code'));
}
public function sahkantangguhlel(Request $request)
{
// dd($request->all());
$user = Auth::user();
$currentdate = Carbon::now();
$currentdate = $currentdate->toDateTimeString();
$lelbidmarhun = $request->checkboxdata;
$lelong = Lelong::where('id', $request->lelong_id)->get()->toArray();
foreach($lelbidmarhun as $bidmarhun)
{
// dd($bidmarhun);
$lelongbidmarhun = LelongBidMarhun::join('lelongbid', 'lelongbidmarhun.lelongbid_id', '=', 'lelongbid.id')
->where('lelongbid.id', $bidmarhun)
->select('lelongbidmarhun.id as lelongbidmarhun_id',
'lelongbidmarhun.bil',
'lelongbidmarhun.marhun',
'lelongbidmarhun.nota',
'lelongbidmarhun.old_karat',
'lelongbidmarhun.karat',
'lelongbidmarhun.old_berat',
'lelongbidmarhun.berat',
'lelongbidmarhun.old_harga',
'lelongbidmarhun.harga',
'lelongbidmarhun.old_nmarhun',
'lelongbidmarhun.n_marhun',
'lelongbidmarhun.old_hargaasas',
'lelongbidmarhun.hargaasas',
'lelongbid.id as lelongbid_id',
'lelongbid.caw_id',
'lelongbid.kodcaw',
'lelongbid.norujukan',
'lelongbid.t_lelong',
'lelongbid.hargaasas',
'lelongbid.nopembeli',
'lelongbid.jbg',
'lelongbid.kadarupah',
'lelongbid.upahsimpan',
'lelongbid.ansuran',
'lelongbid.nilaimarhun',
'lelongbid.pinjaman',
'lelongbid.bakiupah',
'lelongbid.cajlain',
'lelongbid.cajlelong',
'lelongbid.baki',
'lelongbid.berat',
'lelongbid.marhun',
)
->get()->toArray();
// dd($lelongbidmarhun);
$pengesahan = Pengesahan::where('lelongbidmarhun_id', $lelongbidmarhun[0]['lelongbidmarhun_id'])
->where('lelongbid_id', $lelongbidmarhun[0]['lelongbid_id'])
->where('norujukan', $lelongbidmarhun[0]['norujukan'])
->first();
$pengesahan->disahkan_oleh = $user->id;
$pengesahan->disahkan_pada = $currentdate;
$pengesahan->save();
$tangguhlelong = new TangguhLelong();
$tangguhlelong->lelong_id = $request->lelong_id;
$tangguhlelong->lelongbid_id = $bidmarhun;
$tangguhlelong->norujukan = $lelongbidmarhun[0]['norujukan'];
$tangguhlelong->pinjaman = $lelongbidmarhun[0]['pinjaman'];
$tangguhlelong->tarikhtangguh = $currentdate;
$tangguhlelong->ditangguh_oleh = $user->id;
$tangguhlelong->ditangguh_pada = $currentdate;
$tangguhlelong->nota = 'Tangguh Lelong PC';
$tangguhlelong->save();
$biddelete = LelongBid::join('lelongbidmarhun', 'lelongbid.id', '=', 'lelongbidmarhun.lelongbid_id')
->where('lelongbid.id', $tangguhlelong->lelongbid_id)
->where('lelongbid.norujukan', $tangguhlelong->norujukan)
->where('lelongbid.lelong_id', $request->lelong_id)
->delete();
$caw_code = $request->kodcaw;
}
return redirect()->route('pengesahan.senaraisahtangguh', [$request->lelong_id, $caw_code])->with('success','Pengesahan Berjaya');
}
}
app/Models/Customer.php
+60
View File
@@ -0,0 +1,60 @@
<?php
namespace App\Models;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
class Customer extends Model
{
use HasFactory;
protected $table = 'customer';
protected $fillable = [
'ahli',
'kodcaw',
'nosiri',
'tarikhdaftar',
'nopelanggan',
'kplama',
'kpbaru',
'nama',
't_lahir',
'jantina',
'alamat1',
'alamat2',
'alamat3',
'alamat4',
'poskod',
'koddaerah',
'kodnegeri',
'telefon',
'jumpinjaman',
't_gadai',
'pinjamhari',
'bumiputra',
'warganegara',
'bangsa',
'kodkerja',
'kodugama',
'kodstatus',
'kodbank',
'noakaun',
'nota',
'teller',
'pelulus',
't_ubah',
'm_ubah',
'aktif',
'yuranahli',
'nopelangganlama',
'tujuangadai',
'kodkerjabaru',
'tagperingatan',
'namateller',
'kumpulan',
'telefon2',
'tagpelanggan'
];
}
database/migrations/2022_03_07_061858_create_pengesahan_table.php
+1 -1
View File
@@ -24,7 +24,7 @@ class CreatePengesahanTable extends Migration
$table->integer('diminta_oleh');
$table->datetime('diminta_pada');
$table->integer('status')->default(0); //1 = terima, 2 = tangguh lelong
$table->integer('status_ubah')->default(0); //1 = ubah mutu, 2 = tambah marhun, 3 = hapus marhun, 4 = ubah berat, 5 = ubah mutu & berat
$table->integer('status_ubah')->default(0); //1 = ubah mutu, 2 = tambah marhun, 3 = hapus marhun, 4 = ubah berat, 5 = ubah mutu & berat, 6 = tangguh lelong pc
$table->timestamps();
// $table->foreign('lelong_id')
database/seeders/RolesSeeder.php
+5 -1
View File
@@ -71,6 +71,10 @@ class RolesSeeder extends Seeder
'name' => 'serahan',
'description' => 'Penyerahan Marhun Kepada Pembida Yang Menang'
]);
Permission::create([
'name' => 'tangguhlelong',
'description' => 'Penangguhan Lelong Cawangan'
]);
//jurulelong
Permission::create([
@@ -156,7 +160,7 @@ class RolesSeeder extends Seeder
$role4->givePermissionTo('jananotis');
$role4->givePermissionTo('pengesahanbayarancash');
$role4->givePermissionTo('serahan');
$role4->givePermissionTo('tangguhlelong');
$role5 = Role::create(['name' => 'jurulelong']);
$role5->givePermissionTo('pendaftaranbatch');
resources/views/includes/sidebar.blade.php
+10 -2
View File
@@ -83,6 +83,9 @@
</li>
</ul>
</li>
<li class="{{ ( request()->is('tangguhlelong/*')) ? 'active' : '' }}">
<a href="{{url('tangguhlelong/senleluntuktangguh')}}">Tangguh Lelong</a>
</li>
<li class="{{ ( request()->is('pembayaran/kaunter/*')) ? 'active' : '' }}">
<a href="{{url('pembayaran/SenaraiLelongBayar')}}">Pembayaran Pemenang</a>
</li>
@@ -130,12 +133,17 @@
<a href="#pengesahanSubmenu" data-toggle="collapse" aria-expanded="false" style="">Kelulusan</a>
<ul class="list-unstyled collapse {{ (request()->is('pengesahan/*')) ? 'show' : '' }}" id="pengesahanSubmenu" >
<li class="{{ (request()->is('pengesahan/senarailelongubahmutu/*') || request()->is('pengesahan/senarailelongubahmutu') ) ? 'active' : '' }}">
<a href="{{url('pengesahan/senarailelongubahmutu')}}">Senarai Perubahan Mutu Marhun</a>
<a href="{{url('pengesahan/senarailelongubahmutu')}}">Perubahan Mutu Marhun</a>
</li>
</ul>
<ul class="list-unstyled collapse {{ (request()->is('pengesahan/*')) ? 'show' : '' }}" id="pengesahanSubmenu" >
<li class="{{ (request()->is('pengesahan/senarailelong/*') || request()->is('pengesahan/senarailelong') ) ? 'active' : '' }}">
<a href="{{url('pengesahan/senarailelong')}}">Senarai Tangguh Lelong</a>
<a href="{{url('pengesahan/senarailelong')}}">Tangguh Lelong</a>
</li>
</ul>
<ul class="list-unstyled collapse {{ (request()->is('pengesahan/*')) ? 'show' : '' }}" id="pengesahanSubmenu" >
<li class="{{ (request()->is('pengesahan/senarailelongtangguh/*') || request()->is('pengesahan/senarailelongtangguh') ) ? 'active' : '' }}">
<a href="{{url('pengesahan/senarailelongtangguh')}}">Lelong Ditangguh PC</a>
</li>
</ul>
</li>
resources/views/pembayaran/SAGBidItem.blade.php
+1
View File
@@ -215,6 +215,7 @@
$('#eachbid').val(arraylelongbid);
$("#formbanktransfer").submit();
var total_sum = parseFloat($('#total').val());
$('#total').val(parseFloat(total_sum).toFixed(2));
}
}
}
resources/views/pengesahan/lelbidmarhun.blade.php
+1 -1
View File
@@ -50,7 +50,7 @@
</table>
</form>
<div class="modal-footer" style="margin-top:2%;">
<a href="{{ route('pengesahan.senaraitangguhlelong', $id) }}" class="btn btn-primary">Kembali</a>
<a href="{{ route('pengesahan.senaraitangguhlelong', [$id, 'caw_name'=>$caw_names->caw_name]) }}" class="btn btn-primary">Kembali</a>
</div>
</div>
resources/views/pengesahan/senarailelong.blade.php
+1 -1
View File
@@ -38,7 +38,7 @@
<td>{{$lel['detail']['jbg']}}</td>
<td>{{$lel['detail']['cajlelong']}}</td>
<td>
<a href="{{ route('pengesahan.senaraitangguhlelong',$lel['detail']['id']) }}" data-toggle="tooltip" data-placement="top" title="Butiran" class="text-center" ><i class="far fa-edit"></i></a>
<a href="{{ route('pengesahan.senaraitangguhlelong', [$lel['detail']['id'], 'caw_name'=>$details['caw_name']]) }}" data-toggle="tooltip" data-placement="top" title="Butiran" class="text-center" ><i class="far fa-edit"></i></a>
</td>
</tr>
@endforeach
resources/views/pengesahan/senaraitangguhlelong.blade.php
+32 -24
View File
@@ -10,16 +10,25 @@
<p>{{ $message }}</p>
</div>
@endif
<div class="container">
<div class="row mb-2">
<div class="col-md-12 mx-auto card p-4" style="margin-top:2%; margin-bottom:2%;">
<p> <b>Tarikh Lelong : </b> {{ $tangguhlelong[0]['tarikh_lelong'] }}</p>
<p> <b>Nama Cawangan : </b>{{ $caw_name }}</p>
<p> <b>JBG : </b>{{ $tangguhlelong[0]['jbg'] }}</p>
</div>
</div>
</div>
<form id="exportform" action="" method="POST">
<input type="hidden" name="type" value="User">
<table class="table table-striped table-xl text-center" id="tablelelong" style="width:100%">
<thead class="bg-primary text-white">
<tr>
<th>Bil</th>
<th>Nama Cawangan</th>
<th>Tarikh Lelong</th>
<th>Tarikh Tangguh</th>
<th>No Rujukan</th>
<th>Remark</th>
<th class="text-center">Action</th>
</tr>
</thead>
@@ -27,10 +36,9 @@
@foreach ($tangguhlelong as $tangguhlel)
<tr>
<td>{{ $loop->iteration }}</td>
<td>{{ $tangguhlel['nama_caw']['caw_name'] }}</td>
<td>{{ $tangguhlel->tarikh_lelong }}</td>
<td>{{ $tangguhlel->tarikhtangguh }}</td>
<td>{{ $tangguhlel->norujukan }}</td>
<td>{{ $tangguhlel->nota }}</td>
<td>
<a href="{{ route('pengesahan.lelbidmarhun', [ $id, $tangguhlel->norujukan, 'tangguhlelong_id'=>$tangguhlel['details']['tangguhlelong_id'] ]) }}" data-toggle="tooltip" data-placement="top" title="Butiran" class="text-center" ><i class="far fa-edit"></i></a>
</td>
@@ -69,26 +77,26 @@
"lengthChange": false,
"pageLength": 15,
dom: 'Bfrtip',
buttons: [
// 'copy', 'excel', 'pdf'
// { text: 'copy', className: 'btn btn-primary' },
{
className: 'btn btn-outline-success pl-4 pr-4 btn-sm addsim',
text: '<i class="fas fa-plus" id="test"></i>',
titleAttr: 'Tambah Simulasi',
action: function ( e, dt, node, config ) {
alert( 'Button activated' );
}
},
{
className: 'btn btn-outline-secondary pl-4 pr-4 btn-sm export',
titleAttr: 'Export to CSV',
text: '<i class="fas fa-download"></i>',
action: function ( e, dt, node, config ) {
$("#exportform").submit();
}
}
]
// buttons: [
// // 'copy', 'excel', 'pdf'
// // { text: 'copy', className: 'btn btn-primary' },
// {
// className: 'btn btn-outline-success pl-4 pr-4 btn-sm addsim',
// text: '<i class="fas fa-plus" id="test"></i>',
// titleAttr: 'Tambah Simulasi',
// action: function ( e, dt, node, config ) {
// alert( 'Button activated' );
// }
// },
// {
// className: 'btn btn-outline-secondary pl-4 pr-4 btn-sm export',
// titleAttr: 'Export to CSV',
// text: '<i class="fas fa-download"></i>',
// action: function ( e, dt, node, config ) {
// $("#exportform").submit();
// }
// }
// ]
});
$('.addsim').tooltip();
resources/views/tangguhlelong/carian.blade.php
+39
View File
@@ -0,0 +1,39 @@
@extends('layouts.app')
@section('content')
<div class="container">
<div class="row justify-content-md-center">
<div class="col-md-6 mx-auto card">
@if ($message = Session::get('success'))
<div class="alert alert-success" style="margin-top:1%;">
<p>{{ $message }}</p>
</div>
@endif
<h3 class="pt-3" style="margin-left:2%;">Sila Masukkan No Kad Pengenalan</h3>
<form action="{{route('tangguhlelong.searchbyic')}}" method="POST" id="formcariannokp">
@csrf
<input type="hidden" name="lelong_id" value="{{ $lelong_id }}">
<div class="form-group row" style="margin-top:2%; margin-left:1%;">
<label for="nokp" class=" col-form-label mr-3" style="margin-left:2%;">No Kad Pengenalan</label>
<div>
<input type="text" class="form-control" id="nokp" name="nokp" placeholder="xxxxxxxxxxxx">
</div>
</div>
<div class="d-flex justify-content-center" style="margin:2% 0%; ">
<a href="{{ route('tangguhlelong.senleluntuktangguh') }}" class="btn btn-primary mr-2">Kembali</a>
<button type="button" class="btn btn-primary" onclick="carian()" >Carian</button>
</div>
</form>
</div>
</div>
</div>
<script>
function carian()
{
$("#formcariannokp").submit();
}
</script>
@endsection
resources/views/tangguhlelong/searchbyic.blade.php
+157
View File
@@ -0,0 +1,157 @@
@extends('layouts.app')
@section('content')
<div class="container-fluid">
<div class="row ">
<div class="col-md-11 mx-auto card p-4">
@if ($message = Session::get('success'))
<div class="alert alert-success">
<p>{{ $message }}</p>
</div>
@endif
<form id="formtangguhlel" action="{{route('tangguhlelong.tangguhlelong')}}" method="POST">
@csrf
<input type="hidden" name="lelong_id" value="{{ $lelong_id }}">
<table class="table table-striped table-xl text-center" id="tangguhlel" style="width:100%">
<thead class="bg-primary text-white">
<tr>
<th>No</th>
<th>Tarikh Lelong</th>
<th>No Rujukan</th>
<th>JBG</th>
<th>Narhun</th>
<th>Nilai Marhun (RM)</th>
<th>Pembiayaan (RM)</th>
<th>Berat</th>
<th class="text-center">Action</th>
</tr>
</thead>
<tbody>
@foreach ($getic as $ic)
<tr>
<td>{{$loop->iteration}}</td>
<td>{{$ic['user_details'][0]['t_lelong']}}</td>
<td>{{$ic['norujukan']}}</td>
<td>{{$ic['jbg']}}</td>
<td>{{$ic['marhun']}}</td>
<td>{{$ic['nilaimarhun']}}</td>
<td>{{$ic['pinjaman']}}</td>
<td>{{$ic['berat']}}</td>
<td class="text-center">
<input type="checkbox" onclick="bidmarhunfunc(this)" aria-label="Checkbox for following text input" name="checkboxdata[]" value="{{ $ic['user_details'][0]['id'] }}" data-bidmarhun="{{ $ic['user_details'][0]['id'] }}">
</td>
</tr>
@endforeach
</tbody>
</table>
<div class="modal-footer" style="margin-top:2%;">
<a href="{{ route('tangguhlelong.carian', ['lelong_id'=>$lelong_id]) }}" class="btn btn-primary">Kembali</a>
<button type="submit" class="btn btn-danger">Tangguh Lelong</button>
</div>
</form>
</div>
</div>
</div>
<script>
//Enable tooltips everywhere
$(function () {
$('[data-toggle="tooltip"]').tooltip()
})
$('a.confirmdel').confirm({
title: 'Confirmation',
content: 'Anda pasti?',
type: 'orange',
typeAnimated: true,
buttons: {
Delete: {
btnClass: 'btn-warning',
action: function () {
location.href = this.$target.attr('href');
}
},
Batal: {
btnClass: 'btn-default',
action: function () {}
}
}
});
let arraybidmarhun = [];
function bidmarhunfunc(e)
{
let bidmarhun = $(e).data('bidmarhun');
if(e.checked==true) //checkbox
{
arraybidmarhun.push(bidmarhun);
}
else
{
arraybidmarhun = arraybidmarhun.filter(item => item !== bidmarhun);
}
// $('#bidmarhun').val(arraybidmarhun);
// console.log(arraybidmarhun);
}
var tabletangguhlel = $('#tangguhlel').DataTable( {
"columnDefs": [
{
"targets": 0,
"orderable": false
},
{
"targets": 8,
"orderable": false
}
],
order: [[1, 'asc']],
// "ordering": false,
"info": false,
"lengthChange": false,
"pageLength": 15,
dom: 'Bfrtip',
// buttons: [
// // 'copy', 'excel', 'pdf'
// // { text: 'copy', className: 'btn btn-primary' },
// {
// className: 'btn btn-outline-success pl-4 pr-4 btn-sm addsim',
// text: '<i class="fas fa-plus" id="test"></i>',
// titleAttr: 'Tambah tangguhlelong',
// action: function ( e, dt, node, config ) {
// alert( 'Button activated' );
// }
// },
// {
// className: 'btn btn-outline-secondary pl-4 pr-4 btn-sm export',
// titleAttr: 'Export to CSV',
// text: '<i class="fas fa-download"></i>',
// action: function ( e, dt, node, config ) {
// $("#exportform").submit();
// }
// }
// ]
});
$('.addsim').tooltip();
$('.export').tooltip();
// $( '.dt-buttons').addClass('btn-group');
$( '.addsim').removeClass('dt-button');
$( '.export').removeClass('dt-button');
function selectall(cb) {
tabletangguhlelong.rows().nodes().to$().find('input[type="checkbox"]').each(function(){
$(this).prop('checked', cb.checked);
})
}
</script>
@endsection
resources/views/tangguhlelong/senarailelongtangguh.blade.php
+142
View File
@@ -0,0 +1,142 @@
@extends('layouts.app')
@section('content')
<div class="container-fluid">
<div class="row ">
<div class="col-md-11 mx-auto card p-4">
@if ($message = Session::get('success'))
<div class="alert alert-success">
<p>{{ $message }}</p>
</div>
@endif
<form id="exportform" action="" method="POST">
<input type="hidden" name="type" value="User">
<table class="table table-striped table-xl text-center" id="tablelelong" style="width:100%">
<thead class="bg-primary text-white">
<tr>
<th>No</th>
<th>Tarikh Lelong</th>
<th>Cawangan</th>
<th>Harga Emas Asas</th>
<th>JBG</th>
<th>Caj Lelong</th>
<th>Status Lelong</th>
<th class="text-center">Action</th>
</tr>
</thead>
<tbody>
@foreach ($arrayinfo as $lel)
<tr>
<td>{{$loop->iteration}}</td>
<td>{{ $lel['info']['tarikh_lelong']}}</td>
<td>
@foreach($lel['detailsinfo'] as $details)
<span class="m-2">{{$details['caw_name']}}</span><br>
@endforeach
</td>
<td>{{$lel['info']['harga_emas_asas']}}</td>
<td>{{$lel['info']['jbg']}}</td>
<td>{{$lel['info']['cajlelong']}}</td>
<td>
@if($lel['info']['sts_lelong'] == 0)
<button class="btn btn-primary btn-sm" disabled>LELONG BELUM BERMULA</button>
@elseif($lel['info']['sts_lelong'] == 1)
<button class="btn btn-warning btn-sm" disabled>LELONG BERMULA</button>
@elseif($lel['info']['sts_lelong'] == 2)
<button class="btn btn-warning btn-sm" disabled>LELONG SELESAI</button>
@elseif($lel['info']['sts_lelong'] == 3)
<button class="btn btn-warning btn-sm" disabled>LELONG SELESAI</button>
@endif
</td>
<td>
@if($lel['info']['sts_lelong'] == 0)
<a href="{{ route('tangguhlelong.carian', $lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Carian"><i class="fas fa-search"></i></a>
@endif
</td>
</tr>
@endforeach
</tbody>
</table>
</form>
</div>
</div>
</div>
<script>
//Enable tooltips everywhere
$(function () {
$('[data-toggle="tooltip"]').tooltip()
})
$('a.confirmdel').confirm({
title: 'Confirmation',
content: 'Anda pasti?',
type: 'orange',
typeAnimated: true,
buttons: {
Delete: {
btnClass: 'btn-warning',
action: function () {
location.href = this.$target.attr('href');
}
},
Batal: {
btnClass: 'btn-default',
action: function () {}
}
}
});
var tablelelong = $('#tablelelong').DataTable({
"columnDefs": [
{
"targets": 0,
"orderable": false
},
{
"targets": 7,
"orderable": false
}
],
order: [[1, 'asc']],
// "ordering": false,
"info": false,
"lengthChange": false,
"pageLength": 99999999,
dom: 'Bfrtip',
buttons: [
// 'copy', 'excel', 'pdf'
// { text: 'copy', className: 'btn btn-primary' },
// {
// className: 'btn btn-outline-success pl-4 pr-4 btn-sm addsim',
// text: '<i class="fas fa-plus" id="test"></i>',
// titleAttr: 'Tambah Simulasi',
// action: function ( e, dt, node, config ) {
// alert( 'Button activated' );
// }
// },
{
className: 'btn btn-outline-secondary pl-4 pr-4 btn-sm export',
titleAttr: 'Export to CSV',
text: '<i class="fas fa-download"></i>',
action: function ( e, dt, node, config ) {
$("#exportform").submit();
}
}
]
});
$('.addsim').tooltip();
$('.export').tooltip();
// $( '.dt-buttons').addClass('btn-group');
$( '.addsim').removeClass('dt-button');
$( '.export').removeClass('dt-button');
function selectall(cb) {
tablelelong.rows().nodes().to$().find('input[type="checkbox"]').each(function(){
$(this).prop('checked', cb.checked);
})
}
</script>
@endsection
resources/views/tangguhlelong/senleltangguh.blade.php
+142
View File
@@ -0,0 +1,142 @@
@extends('layouts.app')
@section('content')
<div class="container-fluid">
<div class="row ">
<div class="col-md-11 mx-auto card p-4">
@if ($message = Session::get('success'))
<div class="alert alert-success">
<p>{{ $message }}</p>
</div>
@endif
<form id="exportform" action="" method="POST">
<input type="hidden" name="type" value="User">
<table class="table table-striped table-xl text-center" id="tablelelong" style="width:100%">
<thead class="bg-primary text-white">
<tr>
<th>No</th>
<th>Tarikh Lelong</th>
<th>Cawangan</th>
<th>Harga Emas Asas</th>
<th>JBG</th>
<th>Caj Lelong</th>
<th>Status Lelong</th>
<th class="text-center">Action</th>
</tr>
</thead>
<tbody>
@foreach ($arrayinfo as $lel)
<tr>
<td>{{$loop->iteration}}</td>
<td>{{ $lel['info']['tarikh_lelong']}}</td>
<td>
@foreach($lel['detailsinfo'] as $details)
<span class="m-2">{{$details['caw_name']}}</span><br>
@endforeach
</td>
<td>{{$lel['info']['harga_emas_asas']}}</td>
<td>{{$lel['info']['jbg']}}</td>
<td>{{$lel['info']['cajlelong']}}</td>
<td>
@if($lel['info']['sts_lelong'] == 0)
<button class="btn btn-primary btn-sm" disabled>LELONG BELUM BERMULA</button>
@elseif($lel['info']['sts_lelong'] == 1)
<button class="btn btn-warning btn-sm" disabled>LELONG BERMULA</button>
@elseif($lel['info']['sts_lelong'] == 2)
<button class="btn btn-warning btn-sm" disabled>LELONG SELESAI</button>
@elseif($lel['info']['sts_lelong'] == 3)
<button class="btn btn-warning btn-sm" disabled>LELONG SELESAI</button>
@endif
</td>
<td>
@if($lel['info']['sts_lelong'] == 0)
<a href="{{ route('pengesahan.senaraisahtangguh', [$lel['info']['lelong_id'], $lel['detailsinfo'][0]['caw_code']]) }}" data-toggle="tooltip" data-placement="top" title="Carian"><i class="far fa-edit"></i></a>
@endif
</td>
</tr>
@endforeach
</tbody>
</table>
</form>
</div>
</div>
</div>
<script>
//Enable tooltips everywhere
$(function () {
$('[data-toggle="tooltip"]').tooltip()
})
$('a.confirmdel').confirm({
title: 'Confirmation',
content: 'Anda pasti?',
type: 'orange',
typeAnimated: true,
buttons: {
Delete: {
btnClass: 'btn-warning',
action: function () {
location.href = this.$target.attr('href');
}
},
Batal: {
btnClass: 'btn-default',
action: function () {}
}
}
});
var tablelelong = $('#tablelelong').DataTable({
"columnDefs": [
{
"targets": 0,
"orderable": false
},
{
"targets": 7,
"orderable": false
}
],
order: [[1, 'asc']],
// "ordering": false,
"info": false,
"lengthChange": false,
"pageLength": 99999999,
dom: 'Bfrtip',
buttons: [
// 'copy', 'excel', 'pdf'
// { text: 'copy', className: 'btn btn-primary' },
// {
// className: 'btn btn-outline-success pl-4 pr-4 btn-sm addsim',
// text: '<i class="fas fa-plus" id="test"></i>',
// titleAttr: 'Tambah Simulasi',
// action: function ( e, dt, node, config ) {
// alert( 'Button activated' );
// }
// },
{
className: 'btn btn-outline-secondary pl-4 pr-4 btn-sm export',
titleAttr: 'Export to CSV',
text: '<i class="fas fa-download"></i>',
action: function ( e, dt, node, config ) {
$("#exportform").submit();
}
}
]
});
$('.addsim').tooltip();
$('.export').tooltip();
// $( '.dt-buttons').addClass('btn-group');
$( '.addsim').removeClass('dt-button');
$( '.export').removeClass('dt-button');
function selectall(cb) {
tablelelong.rows().nodes().to$().find('input[type="checkbox"]').each(function(){
$(this).prop('checked', cb.checked);
})
}
</script>
@endsection
resources/views/tangguhlelong/sensahpc.blade.php
+159
View File
@@ -0,0 +1,159 @@
@extends('layouts.app')
@section('content')
<div class="container-fluid">
<div class="row ">
<div class="col-md-11 mx-auto card p-4">
@if ($message = Session::get('success'))
<div class="alert alert-success">
<p>{{ $message }}</p>
</div>
@endif
<form id="formtangguhlelong" action="{{route('pengesahan.sahkantangguhlel')}}" method="POST">
@csrf
<input type="hidden" name="lelong_id" value="{{ $lelong_id }}">
<input type="hidden" name="kodcaw" value="{{ $caw_code }}">
<table class="table table-striped table-xl text-center" id="tangguhlelong" style="width:100%">
<thead class="bg-primary text-white">
<tr>
<th>No</th>
<th>Tarikh Lelong</th>
<th>No Rujukan</th>
<th>JBG</th>
<th>Narhun</th>
<th>Nilai Marhun (RM)</th>
<th>Pembiayaan (RM)</th>
<th>Berat</th>
<th class="text-center">Action</th>
</tr>
</thead>
<tbody>
@foreach ($pengesahan as $sah)
<tr>
<td>{{$loop->iteration}}</td>
<td>{{$sah['bid_details'][0]['t_lelong']}}</td>
<td>{{$sah['norujukan']}}</td>
<td>{{$sah['bid_details'][0]['jbg']}}</td>
<td>{{$sah['bid_details'][0]['marhun']}}</td>
<td>{{$sah['bid_details'][0]['nilaimarhun']}}</td>
<td>{{$sah['bid_details'][0]['pinjaman']}}</td>
<td>{{$sah['bid_details'][0]['berat']}}</td>
<td class="text-center">
<input type="checkbox" onclick="bidmarhunfunc(this)" aria-label="Checkbox for following text input" name="checkboxdata[]" value="{{ $sah['bid_details'][0]['id'] }}" data-bidmarhun="{{ $sah['bid_details'][0]['id'] }}">
</td>
</tr>
@endforeach
</tbody>
</table>
<div class="modal-footer" style="margin-top:2%;">
<a href="{{ route('pengesahan.senarailelongtangguh') }}" class="btn btn-primary">Kembali</a>
<button type="submit" class="btn btn-warning">Sahkan</button>
</div>
</form>
</div>
</div>
</div>
<script>
//Enable tooltips everywhere
$(function () {
$('[data-toggle="tooltip"]').tooltip()
})
$('a.confirmdel').confirm({
title: 'Confirmation',
content: 'Anda pasti?',
type: 'yellow',
typeAnimated: true,
buttons: {
Delete: {
btnClass: 'btn-warning',
action: function () {
location.href = this.$target.attr('href');
}
},
Batal: {
btnClass: 'btn-default',
action: function () {}
}
}
});
let arraybidmarhun = [];
function bidmarhunfunc(e)
{
let bidmarhun = $(e).data('bidmarhun');
if(e.checked==true) //checkbox
{
arraybidmarhun.push(bidmarhun);
}
else
{
arraybidmarhun = arraybidmarhun.filter(item => item !== bidmarhun);
}
// $('#bidmarhun').val(arraybidmarhun);
// console.log(arraybidmarhun);
}
var tabletangguhlelong = $('#tangguhlelong').DataTable( {
"columnDefs": [
{
"targets": 0,
"orderable": false
},
{
"targets": 8,
"orderable": false
}
],
order: [[1, 'asc']],
// "ordering": false,
"info": false,
"lengthChange": false,
"pageLength": 15,
dom: 'Bfrtip',
// buttons: [
// // 'copy', 'excel', 'pdf'
// // { text: 'copy', className: 'btn btn-primary' },
// {
// className: 'btn btn-outline-success pl-4 pr-4 btn-sm addsim',
// text: '<i class="fas fa-plus" id="test"></i>',
// titleAttr: 'Tambah tangguhlelong',
// action: function ( e, dt, node, config ) {
// alert( 'Button activated' );
// }
// },
// {
// className: 'btn btn-outline-secondary pl-4 pr-4 btn-sm export',
// titleAttr: 'Export to CSV',
// text: '<i class="fas fa-download"></i>',
// action: function ( e, dt, node, config ) {
// $("#formtangguhlelong").submit();
// }
// }
// ]
});
$('.addsim').tooltip();
$('.export').tooltip();
// $( '.dt-buttons').addClass('btn-group');
$( '.addsim').removeClass('dt-button');
$( '.export').removeClass('dt-button');
function selectall(cb) {
tabletangguhlelong.rows().nodes().to$().find('input[type="checkbox"]').each(function(){
$(this).prop('checked', cb.checked);
})
}
</script>
@endsection
routes/web.php
+10 -1
View File
@@ -193,8 +193,11 @@ Route::group(['middleware' => ['permission:pengesahan'],'prefix'=>'pengesahan'],
Route::post('/terimaperubahan',['as'=>'pengesahan.terimaperubahan','uses'=>'MarhunController@terimaperubahan']);
Route::post('/pcdelete',['as'=>'pengesahan.pcdelete','uses'=>'MarhunController@pcdelete']);
Route::get('/senarailelong',['as'=>'pengesahan.senarailelong','uses'=>'MarhunController@senarailelong']);
Route::get('/senaraitangguhlelong/{id}',['as'=>'pengesahan.senaraitangguhlelong','uses'=>'MarhunController@senaraitangguhlelong']);
Route::get('/senaraitangguhlelong/{id}/{caw_name}',['as'=>'pengesahan.senaraitangguhlelong','uses'=>'MarhunController@senaraitangguhlelong']);
Route::get('/lelbidmarhun/{id}/{norujukan}/{tangguhlelong_id}',['as'=>'pengesahan.lelbidmarhun','uses'=>'MarhunController@lelbidmarhun']);
Route::get('/senarailelongtangguh',['as'=>'pengesahan.senarailelongtangguh','uses'=>'TangguhLelongController@senarailelongtangguh']);
Route::get('/senaraisahtangguh/{lelong_id}/{caw_code}',['as'=>'pengesahan.senaraisahtangguh','uses'=>'TangguhLelongController@senaraisahtangguh']);
Route::post('/sahkantangguhlel',['as'=>'pengesahan.sahkantangguhlel','uses'=>'TangguhLelongController@sahkantangguhlel']);
});
Route::group(['middleware' => ['permission:notistamatkontrak'],'prefix'=>'notistamatkontrak'], function () {
@@ -230,6 +233,12 @@ Route::group(['middleware' => ['permission:pengesahanbayarancash'],'prefix'=>'pe
Route::post('/banktransfer', ['as'=>'pembayaran.banktransfer','uses'=>'PaymentController@banktransfer']);
});
Route::group(['middleware' => ['permission:tangguhlelong'],'prefix'=>'tangguhlelong'], function () {
Route::get('/senleluntuktangguh', ['as'=>'tangguhlelong.senleluntuktangguh','uses'=>'TangguhLelongController@senleluntuktangguh']);
Route::get('/carian/{lelong_id}', ['as'=>'tangguhlelong.carian','uses'=>'TangguhLelongController@carian']);
Route::post('/searchbyic', ['as'=>'tangguhlelong.searchbyic','uses'=>'TangguhLelongController@searchbyic']);
Route::post('/tangguhlelong', ['as'=>'tangguhlelong.tangguhlelong','uses'=>'TangguhLelongController@tangguhlelong']);
});
// Pengurus Cawangan
// Account