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

Merge branch 'faiqahzaman'

Browse Source
This commit is contained in:
Azfar Arsyad
2022-03-03 17:11:32 +08:00
parent ff468766f7 c3629a736b
commit e97d72424d
12 changed files with 28 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/AccountController.php
+1 -5
View File
@@ -88,10 +88,8 @@ class AccountController extends Controller
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'));
}
@@ -134,8 +132,6 @@ class AccountController extends Controller
$eachbid->t_jual = $currentdate;
$eachbid->save();
}
$senaraisagallpayment = LelongBid::join('lelongbidder', 'lelongbid.id', '=', 'lelongbidder.lelongbid_id')
app/Http/Controllers/SimulasiController.php
+5 -8
View File
@@ -58,20 +58,18 @@ class SimulasiController extends Controller
public function janadata(Request $request)
{
$t_lelong = Carbon::parse($request->tarikh_lelong);
$bulan = round($request->jbg,0);
$bulan = (int)round($request->jbg);
$jbgadai = ($t_lelong->subMonths($bulan))->toDateString();
// dd($jbgadai);
$surat = Gadai::where('t_gadai','<=',$jbgadai)
->where('sttebus','=',0)
->where('sttebus','=','')
->where('tagpalsu','=',0)
->where('tagpalsu2','=',0)
->where('taglel','=',0)
->where('lelong_tawarruq','=',1)
->get();
->get();
$cawangan = Cawangan::all();
// dd($cawangan);
//create simulasi
$simulasi = new Simulasi;
$simulasi->tarikh_lelong = $request->tarikh_lelong;
@@ -108,7 +106,6 @@ class SimulasiController extends Controller
$caw_simulasi->lokasi = $caw->lokasi;
$caw_simulasi->save();
// dd($caw->caw_code);
$suratcaw = $surat->where('kodcaw','=',$caw->caw_code)->all();
// $simulasibid = SimulasiBid::where('caw_id','=',$caw->id)->get();
foreach($suratcaw as $data)
@@ -145,7 +142,6 @@ class SimulasiController extends Controller
foreach($gadaimarhun as $marhun)
{
$simkarat = SimKarat::where('simulasi_id','=',$simulasi->id)->get();
// dd($simkarat);
foreach($simkarat as $karat)
{
@@ -185,6 +181,7 @@ class SimulasiController extends Controller
}
elseif($request->caw && $request->caw != 'all')
{
// dd($request->caw);
$caw = Cawangan::where('id','=',$request->caw)->first();
$caw_simulasi = new CawanganSimulasi;
$caw_simulasi->simulasi_id = $simulasi->id;
resources/views/account/sahsagonline.blade.php
+10
View File
@@ -4,6 +4,11 @@
<div class="container-fluid">
<div class="row ">
<form action="{{ route('account.sahbayaronline') }}" method="POST" id="formsahbayaronline">
@csrf
<input type="hidden" name="lelong_id" value="{{ $lelong_id }}" />
<input type="hidden" name="user_id" value="{{ $user_id }}" />
<div class="col-md-11 mx-auto card p-4">
@if ($message = Session::get('success'))
<div class="alert alert-success">
@@ -48,13 +53,18 @@
<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>
<button type="button" class="btn btn-warning" onclick="sahbayaronline()" >Sahkan</button>
</div>
</div>
</form>
</div>
</div>
<script>
function sahbayaronline() {
$("#formsahbayaronline").submit();
}
var tablekaunter = $('#tablekaunter').DataTable({
"columnDefs": [
{
resources/views/jananotis/notislelong.blade.php
+1 -1
View File
@@ -29,7 +29,7 @@
<td>{{ $bid->lelong_id}}</td>
<td>{{ $bid->tarikh_lelong }}</td>
<td class="text-center">
<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.jananotis',$bid->lelong_id) }}" data-toggle="tooltip" data-placement="top" title="Muat Turun Jana Notis" style="margin-right:40px" ><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>
resources/views/jananotis/senarainotis.blade.php
+1 -1
View File
@@ -17,7 +17,7 @@
<input type="hidden" name="type" id="typedonwload" value="">
<input type="hidden" name="lelong_id" value="{{ $lelong_id}}">
<table class="table table-striped table-xl" id="notis" style="width:100%">
<table class="table table-striped table-xl text-center" id="notis" style="width:100%">
<thead class="bg-primary text-white">
<tr>
<th>No</th>
resources/views/lelong/senarailelong.blade.php
+3 -3
View File
@@ -38,9 +38,9 @@
@hasrole('jurulelong')
@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="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.refresh',$lel->id) }}" data-toggle="tooltip" data-placement="top" title="Kemaskini Data" style="margin-right:40px"><i class="fas fa-sync-alt"></i></a>
<a class="startlelong" href="{{ route('lelong.start',$lel->id) }}" data-toggle="tooltip" data-placement="top" title="Mula Lelong" style="margin-right:40px"><i class="fa fa-play"></i></a>
<a class="confirmdel" href="{{ route('lelong.delete',$lel->id) }}" data-toggle="tooltip" data-placement="top" title="Padam" style="margin-right:40px" ><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>
resources/views/marhun/marhun.blade.php
+1 -1
View File
@@ -43,7 +43,7 @@
<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 }}" data-toggle="tooltip" data-placement="top" title="Kemaskini Marhun"><i class="far fa-edit"></i></a>
<a onclick="kemaskini(this)" data-idmarhun="{{ $item->id }}" data-marhun="{{ $item->marhun }}" data-karat="{{ $item->karat }}" data-berat="{{ $item->berat }}" data-harga="{{ $item->harga }}" data-nmarhun="{{ $item->n_marhun }}" data-hargaasas="{{ $item->hargaasas }}" data-nota="{{ $item->nota }}" data-toggle="tooltip" data-placement="top" title="Kemaskini Marhun" style="margin-right:30px"><i class="far fa-edit"></i></a>
<a class="confirmdel" 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>
resources/views/pengurusandatabase/senaraidb.blade.php
+1 -1
View File
@@ -38,7 +38,7 @@
<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) }}" data-toggle="tooltip" data-placement="top" title="Kemaskini" ><i class="far fa-edit"></i></a>
<a href="{{ route('sistem.showConn',$data->id) }}" data-toggle="tooltip" data-placement="top" title="Kemaskini" style="margin-right:30px" ><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}})" data-toggle="tooltip" data-placement="top" title="Padam"><i class="far fa-trash-alt"></i></a>
</form>
resources/views/pengurusanpengguna/index.blade.php
+2 -2
View File
@@ -48,8 +48,8 @@
</td>
<td class="text-center">
<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>
<a href="{{ route('pengguna.show',$user->id) }}" data-toggle="tooltip" data-placement="top" title="Kemaskini" style="margin-right:30px" ><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
resources/views/pengurusanpengguna/roles.blade.php
+1 -1
View File
@@ -28,7 +28,7 @@
<td>{{ $role->name }}</td>
<td>{{ $role->description }}</td>
<td class="text-center">
<a href="{{ route('pengguna.showrole',$role->id) }}" data-toggle="tooltip" data-placement="top" title="Kemaskini" ><i class="far fa-edit"></i></a>
<a href="{{ route('pengguna.showrole',$role->id) }}" data-toggle="tooltip" data-placement="top" title="Kemaskini" style="margin-right:30px" ><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>
resources/views/pengurusanpengguna/taraf.blade.php
+1 -1
View File
@@ -33,7 +33,7 @@
@endforeach
</td>
<td class="text-center">
<a href="{{ route('pengguna.showtaraf',$role->id) }}" data-toggle="tooltip" data-placement="top" title="Kemaskini" ><i class="far fa-edit"></i></a>
<a href="{{ route('pengguna.showtaraf',$role->id) }}" data-toggle="tooltip" data-placement="top" title="Kemaskini" style="margin-right:30px"><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>
resources/views/simulasi/senaraisimulasi.blade.php
+1 -1
View File
@@ -33,7 +33,7 @@
<td>{{ $sim->jbg }}</td>
<td>{{ $sim->cajlelong }}</td>
<td class="text-center">
<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('analisa.show',$sim->id) }}" data-toggle="tooltip" data-placement="top" title="Butiran Simulasi" style="margin-right:30px"><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) }}" data-toggle="tooltip" data-placement="top" title="Padam"><i class="far fa-trash-alt"></i></a>