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

Merge branch 'main' into amir_dev_2

Browse Source
This commit is contained in:
Amir
2023-01-31 10:55:32 +08:00
parent bf704edb21 877cb2eb43
commit de892b7d7e
9 changed files with 507 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/PembidaController.php
+3 -1
View File
@@ -1062,6 +1062,7 @@ class PembidaController extends Controller
{ {
// dd($detailspayment); // dd($detailspayment);
$detailspayment = null; $detailspayment = null;
$scanserah = null;
if($sag['payment_id'] != null) if($sag['payment_id'] != null)
{ {
$detailspayment = Payment::where('id', $sag['payment_id'])->first(); $detailspayment = Payment::where('id', $sag['payment_id'])->first();
@@ -1075,7 +1076,8 @@ class PembidaController extends Controller
}else }else
{ {
$total_payment = '0.00'; $total_payment = '0.00';
$scanserah = 'Belum Bayar'; //$scanserah = 'Belum Bayar';
$scanserah = null;
} }
} }
app/Http/Controllers/TangguhLelongController.php
+29 -47
View File
@@ -279,15 +279,14 @@ class TangguhLelongController extends Controller
{ {
$arrayinfo = []; $arrayinfo = [];
$tangguh = CawanganLelong::join('tangguhlelong','tangguhlelong.lelong_id','=','cawangan_lelong.lelong_id') $tangguh = TangguhLelong::join('lelong','lelong.id','=','tangguhlelong.lelong_id')
->join('lelong','lelong.id','=','cawangan_lelong.lelong_id') ->join('cawangan','cawangan.caw_code','=','tangguhlelong.kodcaw')
->join('cawangan','cawangan.id','=','cawangan_lelong.caw_id')
->where('tangguhlelong.status','!=',4) ->where('tangguhlelong.status','!=',4)
->where('lelong.sts_lelong',0) ->where('lelong.sts_lelong',0)
->select('cawangan_lelong.lelong_id', 'cawangan_lelong.caw_id','lelong.sts_lelong','cawangan.caw_name','lelong.tarikh_lelong','cawangan.caw_code','lelong.jbg') ->select('tangguhlelong.kodcaw','tangguhlelong.lelong_id', 'lelong.sts_lelong','cawangan.caw_name','lelong.tarikh_lelong','cawangan.caw_code','lelong.jbg')
->distinct() ->distinct()
->get(); ->get();
// ->toArray(); //display only cwgn yg mohon tangguh 24.01.2023..to be continued..done
foreach($tangguh as $index=>$t) foreach($tangguh as $index=>$t)
{ {
@@ -302,8 +301,6 @@ class TangguhLelongController extends Controller
array_push($arrayinfo,['t'=>$t, 'sag'=>$sag]); array_push($arrayinfo,['t'=>$t, 'sag'=>$sag]);
} }
return view('tangguhlelong.senleltangguh',compact('tangguh','arrayinfo')); return view('tangguhlelong.senleltangguh',compact('tangguh','arrayinfo'));
} }
@@ -911,58 +908,37 @@ class TangguhLelongController extends Controller
{ {
$arrayinfo = []; $arrayinfo = [];
// $lelong = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id') $lelong = TangguhLelong::join('lelong','lelong.id','=','tangguhlelong.lelong_id')
// ->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id') ->join('cawangan','cawangan.caw_code','=','tangguhlelong.kodcaw')
// ->join('tangguhlelong','tangguhlelong.lelong_id','=','cawangan_lelong.lelong_id') ->where(function($query){
// ->where('lelong.sts_lelong', 0) $query->whereNull('tangguhlelong.status')
// ->where('tangguhlelong.status',4) ->orWhere('tangguhlelong.status','=', 4);
// ->select('cawangan_lelong.lelong_id','lelong.tarikh_lelong','lelong.masatamat_lelong','lelong.harga_emas_asas','lelong.jbg','lelong.cajlelong','lelong.sts_lelong','cawangan.caw_code') })
// ->groupBy('cawangan_lelong.lelong_id') ->select('tangguhlelong.kodcaw','tangguhlelong.lelong_id', 'lelong.sts_lelong','cawangan.caw_name','lelong.tarikh_lelong','cawangan.caw_code','lelong.jbg')
// ->get()
// ->toArray();
$lelong = CawanganLelong::join('tangguhlelong','tangguhlelong.lelong_id','=','cawangan_lelong.lelong_id')
->join('lelong','lelong.id','=','cawangan_lelong.lelong_id')
->join('cawangan','cawangan.id','=','cawangan_lelong.caw_id')
->where('tangguhlelong.status',4)
->where('lelong.sts_lelong',0)
->select('cawangan_lelong.lelong_id', 'cawangan_lelong.caw_id','lelong.sts_lelong','cawangan.caw_name','lelong.tarikh_lelong','cawangan.caw_code','lelong.jbg')
->distinct() ->distinct()
->orderBy('cawangan_lelong.lelong_id') ->get();
->get() //display only cwgn yg mohon tangguh 24.01.2023..to be continued ..done
->toArray();
$lelong= Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id') foreach($lelong as $index=>$info)
->where('lelong.sts_lelong',0)
->select('lelong_id','tarikh_lelong','lelong.fasa','jbg','sts_lelong')
->distinct()
->orderBy('lelong_id')
->get()
->toArray();
// dd($lelong);
foreach($lelong as $info)
{ {
$detailsinfo = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
->where('lelong_id',$info['lelong_id'])
->get()
->toArray();
$sag = TangguhLelong::where('lelong_id', $info['lelong_id']) $sag = TangguhLelong::where('lelong_id', $info['lelong_id'])
// ->where('kodcaw', $info['caw_code']) ->where('kodcaw', $info['caw_code'])
->where('status',4) ->where(function($query){
$query->whereNull('tangguhlelong.status')
->orWhere('tangguhlelong.status','=', 4);
})
->select('norujukan') ->select('norujukan')
->get() ->get()
->count(); ->count();
array_push($arrayinfo,['info'=>$info, 'detailsinfo'=>$detailsinfo, 'sag'=>$sag]); $tangguh[$index]['bilsag'] = $sag;
// dd($arrayinfo); array_push($arrayinfo,['info'=>$info, 'sag'=>$sag]);
} }
return view('tangguhlelong.senleltlhtangguh',compact('lelong', 'arrayinfo')); return view('tangguhlelong.senleltlhtangguh',compact('lelong', 'arrayinfo'));
} }
public function operasisenlulustangguh($lelong_id, $caw_code) public function operasisenlulustangguh($lelong_id, $caw_code)
{ {
$caw_code = $caw_code; $caw_code = $caw_code;
@@ -970,8 +946,12 @@ class TangguhLelongController extends Controller
$currentdate = Carbon::now(); $currentdate = Carbon::now();
$currentdate = $currentdate->toDateTimeString(); $currentdate = $currentdate->toDateTimeString();
$tangguh = TangguhLelong::where('status',4) $tangguh = TangguhLelong::where(function($query){
$query->whereNull('tangguhlelong.status')
->orWhere('tangguhlelong.status','=', 4);
})
->where('kodcaw','=',$caw_code) ->where('kodcaw','=',$caw_code)
->where('lelong_id','=',$lelong_id)
->get(); ->get();
// dd($tangguh); // dd($tangguh);
@@ -1021,4 +1001,6 @@ class TangguhLelongController extends Controller
]); ]);
} }
} }
resources/views/pembida/statusserahanbidaan.blade.php
+1 -1
View File
@@ -319,7 +319,7 @@
BELUM SERAH BELUM SERAH
@endif @endif
@else @else
BELUM SELESAI BELUM SERAH
@endif @endif
<br> <br>
@empty @empty
resources/views/tangguhlelong/senaraimohontangguh.blade.php
+83 -2
View File
@@ -161,7 +161,7 @@
<td> <td>
@if($lulus['status'] == 4) @if($lulus['status'] == 4)
<a class="btn m-1 btn-info" href=" {{ route('tangguhlelong.cwgndownloadboranglulus', ['lelongbid_id'=>$mohon['lelongbid_id']]) }} " data-toggle="tooltip" data-placement="top" title="Muat Turun Borang"><i class="fas fa-download"></i></a> <a class="btn m-1 btn-info" href=" {{ route('tangguhlelong.cwgndownloadboranglulus', ['lelongbid_id'=>$lulus['lelongbid_id']]) }} " target="_blank" data-toggle="tooltip" data-placement="top" title="Muat Turun Borang"><i class="fas fa-download"></i></a>
@endif @endif
</td> </td>
@@ -239,7 +239,86 @@
</div> </div>
</div> </div>
<script>
<div class="modal fade" id="upload" data-backdrop="static" data-keyboard="false" role="dialog" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered" role="document">
<div class="modal-content text-center">
<form action="{{ route('tangguhlelong.uploadborang') }}" method="POST" id="formupload" enctype="multipart/form-data">
@csrf
<input type="hidden" name="user_id" id="user_id" />
<input type="hidden" name="lelongbid_id" id="lelongbid_id" />
<input type="hidden" name="lelong_id" id="lelong_id" />
<input type="hidden" name="norujukan" id="norujukan" />
<div class="modal-header">
<h5 class="modal-title" id="exampleModalLabel">Borang Permohonan Tangguh Lelong</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
<div class="tab-content">
<div class="tab-pane fade show active" id="home" role="tabpanel" aria-labelledby="flamingo-tab">
<div class="input-group">
<div class="custom-file">
<input type="file" name="borang" id="inputGroupFile04">
</div>
</div>
</div>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-danger" onclick="funccdmbatal()">Batal</button>
<button type="submit" class="btn btn-success" >Muat Naik</button>
</div>
</form>
</div>
</div>
</div>
<script>
//modal upload
$('#upload').on('show.bs.modal', function(event) {
var button = $(event.relatedTarget);
var lelongbidid =button.data('lelongbidid');
var norujukan =button.data('norujukan');
var lelongid =button.data('lelongid');
var userid =button.data('userid');
$('#norujukan').val(norujukan);
$('#lelongbid_id').val(lelongbidid);
$('#lelong_id').val(lelongid);
$('#user_id').val(userid);
});
//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 () {}
}
}
});
//Enable tooltips everywhere //Enable tooltips everywhere
$(function() { $(function() {
$('[data-toggle="tooltip"]').tooltip() $('[data-toggle="tooltip"]').tooltip()
@@ -312,6 +391,8 @@
// // $( '.dt-buttons').addClass('btn-group'); // // $( '.dt-buttons').addClass('btn-group');
// $( '.addcaw').removeClass('dt-button'); // $( '.addcaw').removeClass('dt-button');
// $( '.export').removeClass('dt-button'); // $( '.export').removeClass('dt-button');
</script> </script>
@endsection @endsection
resources/views/tangguhlelong/senaraimohontangguh2.blade.php
+377
View File
@@ -0,0 +1,377 @@
@extends('layouts.app')
@section('content')
<div class="container-fluid">
<div class="row ">
<div class="col">
<div class="card">
<div class="card-header header-style">
<div class="header-style-title">
Senarai Permohonan Tangguh Lelong
</div>
</div>
<div class="card-body">
@if ($message = Session::get('success'))
<div class="alert alert-success">
<p>{{ $message }}</p>
</div>
@endif
<ul class="nav mb-2 nav-tabs" id="myTab" role="tablist">
<li class="nav-item">
<a class="nav-link active" id="belum-lulus-tab" data-toggle="tab" href="#belum-lulus" role="tab" aria-controls="belum-lulus" aria-selected="false">
Permohonan Baru/Belum Diluluskan
</a>
</li>
<li class="nav-item">
<a class="nav-link" id="telah-lulus-tab" data-toggle="tab" href="#telah-lulus" role="tab" aria-controls="telah-lulus" aria-selected="false">
Permohonan Telah Diluluskan
</a>
</li>
<li class="nav-item">
<a class="nav-link" id="opr-tangguh-tab" data-toggle="tab" href="#opr-tangguh" role="tab" aria-controls="opr-tangguh" aria-selected="false">
Penangguhan Oleh Operasi
</a>
</li>
</ul>
<div class="mb-3"></div>
<div class="tab-content" style="overflow-x: auto;" id="myTabContent">
<div class="tab-pane fade show active" id="belum-lulus" role="tabpanel" aria-labelledby="belum-lulus-tab">
<div style="overflow-x: auto;">
<table class="table table-bordered text-center" id="tablestatusbelumlulus" style="width:100%">
<thead class="bg-primary text-white">
<tr>
<th>No</th>
<th>Batch Lelong</th>
<th>Tarikh Lelong</th>
<th>No Rujukan</th>
<th>Tarikh Mohon / Lulus</th>
<th>Status</th>
<th class="text-center">Tindakan</th>
</tr>
</thead>
<tbody>
@forelse ($tangguh as $index1=>$mohon)
@if(empty($mohon))
<tr>
</tr>
@else
<tr>
<td>{{$loop->iteration}}</td>
<td>{{ $mohon['lelong_id']}}</td>
<td>
@if($mohon['status'] == 4)
@php
$myDateTime = DateTime::createFromFormat('Y-m-d', $mohon['tdet'][0]['t_lelong']);
$datez = $myDateTime->format('d-m-Y');
echo($datez);
@endphp
@else
@php
$myDateTime = DateTime::createFromFormat('Y-m-d', $mohon['tdet'][0]['t_lelong']);
$datez = $myDateTime->format('d-m-Y');
echo($datez);
@endphp
@endif
</td>
<td align='left'><span class="m-2">{{$mohon['norujukan']}}</span></td>
<td>{{$mohon['ditangguh_pada']}}</td>
<td>
@if($mohon['status'] == 0)
<button class="btn btn-warning btn-sm" disabled>Cwgn Baru Mohon</button>
@elseif($mohon['status'] == 1)
<button class="btn btn-warning btn-sm" disabled>Cwgn Telah Muat Naik Borang</button>
@elseif($mohon['status'] == 2)
<button class="btn btn-warning btn-sm" disabled>Operasi Telah Muat Turun Borang</button>
@elseif($mohon['status'] == 3)
<button class="btn btn-warning btn-sm" disabled>Operasi Telah Muat Naik Borang</button>
@elseif($mohon['status'] == 4)
<button class="btn btn-success btn-sm" disabled>Telah Dilulus Operasi</button>
@elseif($mohon['status'] == 99)
<button class="btn btn-danger btn-sm" disabled>Tidak Dilulus Operasi</button>
@elseif($mohon['status'] == NULL)
<button class="btn btn-success btn-sm" disabled>Telah Dilulus Operasi</button>
@endif
</td>
<td>
@if($mohon['status'] == 0)
<a class="btn m-1 btn-info" href=" {{ route('tangguhlelong.ulangdownloadmohon', ['lelongbid_id'=>$mohon['lelongbid_id']]) }} " data-toggle="tooltip" data-placement="top" title="Muat Turun Borang"><i class="fas fa-download"></i></a>
<button type="button" class="btn btn-outline-secondary" id="btn-upload" data-toggle="modal" data-lelongbidid="{{ $mohon['lelongbid_id'] }}" data-norujukan="{{ $mohon['norujukan'] }}" data-userid="{{ $user['user_id'] }}" data-lelongid="{{ $mohon['lelong_id'] }}" data-target="#upload">
Muat Naik Borang <i class="fas fa-file-alt"></i>
</button>
@elseif($mohon['status'] == 1 || $mohon['status'] >= 4)
<a class="btn m-1 btn-info" href=" {{ route('tangguhlelong.cwgndownloadboranglulus', ['lelongbid_id'=>$mohon['lelongbid_id']]) }} " data-toggle="tooltip" data-placement="top" title="Muat Turun Borang"><i class="fas fa-download"></i></a>
@endif
</td>
</tr>
@endif
@empty
<tr>
<td colspan="7">No data available in table</td>
</tr>
@endforelse
</tbody>
</table>
</div>
</div>
<div class="tab-pane fade" id="telah-lulus" role="tabpanel" aria-labelledby="telah-lulus-tab">
<div style="overflow-x: auto;">
<table class="table table-bordered text-center" id="tablestatustelahlulus" style="width:100%">
<thead class="bg-primary text-white">
<tr>
<th>No</th>
<th>Batch Lelong</th>
<th>Tarikh Lelong</th>
<th>No Rujukan</th>
<th>Tarikh Mohon / Lulus</th>
<th>Status</th>
<th class="text-center">Tindakan</th>
</tr>
</thead>
<tbody>
@forelse ($tlhtangguh as $index1=>$lulus)
@if(empty($lulus))
<tr>
</tr>
@else
<tr>
<td>{{$loop->iteration}}</td>
<td>{{ $lulus['lelong_id']}}</td>
<td>
@if($lulus['status'] == 4)
@php
$myDateTime = DateTime::createFromFormat('Y-m-d', $lulus['tlh'][0]['tarikh_lelong']);
$datez = $myDateTime->format('d-m-Y');
echo($datez);
@endphp
@else
@php
$myDateTime = DateTime::createFromFormat('Y-m-d', $lulus['tlh'][0]['tarikh_lelong']);
$datez = $myDateTime->format('d-m-Y');
echo($datez);
@endphp
@endif
</td>
<td align='left'><span class="m-2">{{$lulus['norujukan']}}</span></td>
<td>{{$lulus['ditangguh_pada']}}</td>
<td>
@if($lulus['status'] == 0 && $lulus['nota'] == NULL)
<button class="btn btn-warning btn-sm" disabled>Cwgn Baru Mohon</button>
@elseif($lulus['status'] == 1)
<button class="btn btn-warning btn-sm" disabled>Cwgn Telah Muat Naik Borang</button>
@elseif($lulus['status'] == 2)
<button class="btn btn-warning btn-sm" disabled>Operasi Telah Muat Turun Borang</button>
@elseif($lulus['status'] == 3)
<button class="btn btn-warning btn-sm" disabled>Operasi Telah Muat Naik Borang</button>
@elseif($lulus['status'] == 4)
<button class="btn btn-success btn-sm" disabled>Telah Dilulus Operasi</button>
@elseif($lulus['status'] == 99)
<button class="btn btn-danger btn-sm" disabled>Tidak Dilulus Operasi</button>
@elseif($lulus['status'] == NULL && $lulus['nota'] != NULL)
<button class="btn btn-success btn-sm" disabled>Ditangguh Oleh Operasi</button>
@endif
</td>
<td>
@if($lulus['status'] == 0)
<a class="btn m-1 btn-info" href=" {{ route('tangguhlelong.ulangdownloadmohon', ['lelongbid_id'=>$mohon['lelongbid_id']]) }} " data-toggle="tooltip" data-placement="top" title="Muat Turun Borang"><i class="fas fa-download"></i></a>
<button type="button" class="btn btn-outline-secondary" id="btn-upload" data-toggle="modal" data-lelongbidid="{{ $mohon['lelongbid_id'] }}" data-norujukan="{{ $mohon['norujukan'] }}" data-userid="{{ $user['user_id'] }}" data-lelongid="{{ $mohon['lelong_id'] }}" data-target="#upload">
Muat Naik Borang <i class="fas fa-file-alt"></i>
</button>
@elseif($lulus['status'] == 1 || $lulus['status'] >= 4)
<a class="btn m-1 btn-info" href=" {{ route('tangguhlelong.cwgndownloadboranglulus', ['lelongbid_id'=>$mohon['lelongbid_id']]) }} " data-toggle="tooltip" data-placement="top" title="Muat Turun Borang"><i class="fas fa-download"></i></a>
@endif
</td>
</tr>
@endif
@empty
<tr>
<td colspan="7">No data available in table</td>
</tr>
@endforelse
</tbody>
</table>
</div>
</div>
<div class="tab-pane fade" id="opr-tangguh" role="tabpanel" aria-labelledby="opr-tangguh-tab">
<div style="overflow-x: auto;">
<table class="table table-bordered text-center" id="tableoprtangguh" style="width:100%">
<thead class="bg-primary text-white">
<tr>
<th>No</th>
<th>Batch Lelong</th>
<th>Tarikh Lelong</th>
<th>No Rujukan</th>
<th>Tarikh Mohon / Lulus</th>
<th>Status</th>
</tr>
</thead>
<tbody>
@forelse ($oprtangguh as $index1=>$lulus)
@if(empty($lulus))
<tr>
</tr>
@else
<tr>
<td>{{$loop->iteration}}</td>
<td>{{ $lulus['lelong_id']}}</td>
<td>
@if($lulus['status'] == 4)
@php
$myDateTime = DateTime::createFromFormat('Y-m-d', $lulus['opr'][0]['tarikh_lelong']);
$datez = $myDateTime->format('d-m-Y');
echo($datez);
@endphp
@else
@php
$myDateTime = DateTime::createFromFormat('Y-m-d', $lulus['opr'][0]['tarikh_lelong']);
$datez = $myDateTime->format('d-m-Y');
echo($datez);
@endphp
@endif
</td>
<td align='left'><span class="m-2">{{$lulus['norujukan']}}</span></td>
<td>{{$lulus['ditangguh_pada']}}</td>
<td>
@if($lulus['status'] == 0 && $lulus['nota'] == NULL)
<button class="btn btn-warning btn-sm" disabled>Cwgn Baru Mohon</button>
@elseif($lulus['status'] == 1)
<button class="btn btn-warning btn-sm" disabled>Cwgn Telah Muat Naik Borang</button>
@elseif($lulus['status'] == 2)
<button class="btn btn-warning btn-sm" disabled>Operasi Telah Muat Turun Borang</button>
@elseif($lulus['status'] == 3)
<button class="btn btn-warning btn-sm" disabled>Operasi Telah Muat Naik Borang</button>
@elseif($lulus['status'] == 4)
<button class="btn btn-success btn-sm" disabled>Telah Dilulus Operasi</button>
@elseif($lulus['status'] == 99)
<button class="btn btn-danger btn-sm" disabled>Tidak Dilulus Operasi</button>
@elseif($lulus['status'] == NULL && $lulus['nota'] != NULL)
<button class="btn btn-success btn-sm" disabled>Ditangguh Oleh Operasi</button>
@endif
</td>
</tr>
@endif
@empty
<tr>
<td colspan="6">No data available in table</td>
</tr>
@endforelse
</tbody>
</table>
</div>
</div>
</div>
</div>
</div>
</div>
<script>
//Enable tooltips everywhere
$(function() {
$('[data-toggle="tooltip"]').tooltip()
})
var tablestatussedanglelong = $('#tablestatusbelumlulus').DataTable({
"columnDefs": [{
"targets": 0,
"orderable": false
},
{
"targets": 7,
"orderable": false
}
],
order: [
[1, 'asc']
],
// "ordering": false,
"info": false,
"lengthChange": false,
"pageLength": 15,
dom: 'Bfrtip',
});
var tablestatusselesailelong = $('#tablestatustelahlulus').DataTable({
"columnDefs": [{
"targets": 0,
"orderable": false
},
{
"targets": 7,
"orderable": false
}
],
order: [
[1, 'asc']
],
// "ordering": false,
"info": false,
"lengthChange": false,
"pageLength": 15,
dom: 'Bfrtip',
});
var tablestatusselesailelong2 = $('#tableoprtangguh').DataTable({
"columnDefs": [{
"targets": 0,
"orderable": false
},
{
"targets": 7,
"orderable": false
}
],
order: [
[1, 'asc']
],
// "ordering": false,
"info": false,
"lengthChange": false,
"pageLength": 15,
dom: 'Bfrtip',
});
// $('.addcaw').tooltip();
// $('.export').tooltip();
// // $( '.dt-buttons').addClass('btn-group');
// $( '.addcaw').removeClass('dt-button');
// $( '.export').removeClass('dt-button');
</script>
@endsection
resources/views/tangguhlelong/senleltangguh.blade.php
+1 -1
View File
@@ -66,7 +66,7 @@
@endif @endif
</td> </td>
<td> <td>
@if($lel['sts_lelong'] == 0) @if($lel['sts_lelong'] == 0 && $lel['bilsag'] != 0)
<div class="row justify-content-center"> <div class="row justify-content-center">
resources/views/tangguhlelong/senleltlhtangguh.blade.php
+2 -9
View File
@@ -43,11 +43,7 @@
echo($datez); echo($datez);
@endphp</td> @endphp</td>
<td align = 'left'> <td align = 'left'><span class="m-2">{{$lel['info']['caw_name']}}</span></td>
@foreach($lel['detailsinfo'] as $details)
<span class="m-2">{{$details['caw_name']}}</span><br>
@endforeach
</td>
<td>{{$lel['sag']}}</td> <td>{{$lel['sag']}}</td>
<td>{{$lel['info']['jbg']}}</td> <td>{{$lel['info']['jbg']}}</td>
<td> <td>
@@ -62,14 +58,11 @@
@endif @endif
</td> </td>
<td> <td>
@if($lel['info']['sts_lelong'] == 0)
<div class="row justify-content-center"> <div class="row justify-content-center">
<a class="btn m-1 btn-primary" href="{{ route('pengesahan.opsenaraitangguh', [$lel['info']['lelong_id'], $lel['detailsinfo'][0]['caw_code']]) }}" title="Carian"><i class="far fa-edit"></i></a> <a class="btn m-1 btn-primary" href="{{ route('pengesahan.opsenaraitangguh', [$lel['info']['lelong_id'], $lel['info']['caw_code']]) }}" title="Carian"><i class="far fa-edit"></i></a>
</div> </div>
@endif
</td> </td>
</tr> </tr>
@endforeach @endforeach
resources/views/tangguhlelong/senmohontangguhtelahlulus.blade.php
View File
resources/views/tangguhlelong/sentangguhoperasi.blade.php
+9 -3
View File
@@ -10,7 +10,7 @@
<i class="fas fa-arrow-left"></i> <i class="fas fa-arrow-left"></i>
</a> </a>
<div class="header-style-title"> <div class="header-style-title">
Pengesahan Tangguh Lelong Senarai Telah Tangguh Lelong
</div> </div>
</div> </div>
<div class="card-body"> <div class="card-body">
@@ -56,7 +56,9 @@
<td>{{$sah['bid_details'][0]['berat']}}</td> --> <td>{{$sah['bid_details'][0]['berat']}}</td> -->
<td> <td>
@if($sah['status'] == 0) @if($sah['status'] == NULL)
<button class="btn btn-danger btn-sm" disabled>Ditangguh Operasi</button>
@elseif($sah['status'] == 0)
<button class="btn btn-danger btn-sm" disabled>BELUM MUAT NAIK BORANG</button> <button class="btn btn-danger btn-sm" disabled>BELUM MUAT NAIK BORANG</button>
@elseif($sah['status'] == 1) @elseif($sah['status'] == 1)
<button type="button" class="btn btn-success btn-sm" data-toggle="modal" data-target="#download"> <button type="button" class="btn btn-success btn-sm" data-toggle="modal" data-target="#download">
@@ -75,8 +77,12 @@
<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'] }}"> <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> --> </td> -->
<td><a href=" {{ route('tangguhlelong.operasidownloadboranglulus', ['lelongbid_id'=>$sah['lelongbid_id']]) }} " data-toggle="tooltip" data-placement="top" title="Muat Turun Borang"><i class="fas fa-download"></i></a> <td>
@if($sah['status'] == 4)
<a href=" {{ route('tangguhlelong.operasidownloadboranglulus', ['lelongbid_id'=>$sah['lelongbid_id']]) }} " target="_blank" data-toggle="tooltip" data-placement="top" title="Muat Turun Borang"><i class="fas fa-download"></i></a>
@endif
</td> </td>
</tr> </tr>
@empty @empty
<tr> <tr>