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

Merge branch 'main' into amir_dev

Browse Source
This commit is contained in:
Amir
2022-08-07 09:00:06 +08:00
parent 738c3361bb aa281710af
commit 4b22b3ab2d
25 changed files with 9862 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/views/home.blade.php
+39 -1
View File
@@ -15,19 +15,48 @@
<!-- {{ __('Selamat Datang!') }} -->
@hasrole('admin')
I am a admin!
I am a admin!
@endhasrole
@hasrole('khazanah')
I am a khazanah!
<div class="container">
<div class="row">
<div class="col-6 col-sm-4">
<p><b>SAG Belum Disemak : {{ sizeof($sag) }}</b></p>
</div>
<div class="col-6 col-sm-4">
</div>
</div>
</div>
@endhasrole
@hasrole('teller')
I am a teller!
@endhasrole
@hasrole('pengurus-cawangan')
I am a pengurus-cawangan!
<div class="container">
<div class="row">
<div class="col-6 col-sm-4">
<p><b>SAG Belum Disemak : {{ sizeof($sag) }}</b></p>
</div>
<div class="col-6 col-sm-4">
</div>
</div>
</div>
@endhasrole
@hasrole('jurulelong')
Saya jurulelong!
<div class="container">
<div class="row">
<div class="col-6 col-sm-4">
<p><b>SAG Belum Disemak : {{ sizeof($sag) }}</b></p>
</div>
<div class="col-6 col-sm-4">
</div>
</div>
</div>
</div>
@if(count($arrayinfo)> 0)
<table class=" table table-striped table-xl text-center" id="tablelelong" style="width:100%">
@@ -130,6 +159,15 @@
@hasrole('operasi')
<!-- I am a operasi! -->
<div class="container">
<div class="row">
<div class="col-6 col-sm-4">
<p><b>SAG Belum Disemak : {{ sizeof($sag) }}</b></p>
</div>
<div class="col-6 col-sm-4">
</div>
</div>
</div>
@php
@empty($arrayinfomutu)
@endphp
resources/views/includes/sidebar.blade.php
+8 -14
View File
@@ -258,25 +258,19 @@
<a href="{{url('report/lapbrglelpembidaindex')}}">Barang Lelong Pembida</a>
</li>
</ul>
<ul class="list-unstyled collapse {{ (request()->is('report/*')) ? 'show' : '' }}" id="reportSubmenu" >
<li class="{{ (request()->is('report/lelongtebusindex/*') || request()->is('report/lelongtebusindex') ) ? 'active' : '' }}">
<a href="{{url('report/lelongtebusindex')}}">Senarai Lelong Tebus</a>
</li>
</ul>
</li>
{{-- end laporan --}}
{{-- Kemaskini Notis --}}
<li class="{{ (request()->is('report/')) ? 'active' : '' }}">
<a href="#kemaskiniSubmenu" data-toggle="collapse" aria-expanded="false" style="">Kemaskini Notis Lelong</a>
<ul class="list-unstyled collapse {{ (request()->is('jananotis/*')) ? 'show' : '' }}" id="kemaskiniSubmenu" >
<li class="{{ (request()->is('jananotis/kemaskininotis/*') || request()->is('jananotis/kemaskininotis') ) ? 'active' : '' }}">
<a href="{{url('jananotis/kemaskininotis')}}">Semua Cawangan</a>
</li>
</ul>
<ul class="list-unstyled collapse {{ (request()->is('jananotis/*')) ? 'show' : '' }}" id="kemaskiniSubmenu" >
<li class="{{ (request()->is('jananotis/kemaskininotisbycaw/*') || request()->is('jananotis/kemaskininotisbycaw') ) ? 'active' : '' }}">
<a href="{{url('jananotis/kemaskininotisbycaw')}}">By Cawangan</a>
</li>
</ul>
</li>
<li class="{{ (request()->is('report/*')) ? 'active' : '' }}">
<a href="{{url('jananotis/kemaskininotis')}}">Kemaskini Notis Lelong</a>
</li>
{{-- end Kemaskini Notis --}}
resources/views/jananotis/gadaibycaw.blade.php
+4 -1
View File
@@ -47,7 +47,10 @@
<td>{{ $surat['list_norujukan'][0]['pinjaman'] }}</td>
<td>{{ $surat['list_norujukan'][0]['bakipjm'] }}</td>
<td>{{ $surat['list_norujukan'][0]['bakiupah'] }}</td>
<td></td>
<td>{{ number_format($surat['ktlhbyr'] , 2, '.', ',')}}</td>
</tr>
@endforeach
</tbody>
resources/views/jananotis/kemaskininotis.blade.php
+15 -8
View File
@@ -1,5 +1,6 @@
@extends('layouts.app')
@section('content')
<link href="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.10/css/select2.min.css" rel="stylesheet"/>
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
@@ -18,12 +19,12 @@
@endif
<form action="{{route('jananotis.storeall')}}" method="POST" enctype="multipart/form-data">
@csrf
<div class="form-group row">
<div class="col-sm-4" id="para2">
<textarea name="para2" rows="10" cols="100" id="article-ckeditor" required>
@foreach($tetapan as $notis)
{{-- {{dd($notis->para2)}} --}}
<div class="form-group row">
<div class="col-sm-4" id="para2">
<textarea name="para2" id="article-ckeditor" >
{{$notis->para2}}
</textarea>
</div>
</div>
@@ -33,14 +34,20 @@
<button type="submit" class="btn btn-primary">Simpan</button>
</div>
</div>
@endforeach
</form>
</div>
</div>
</div>
<script>
CKEDITOR.replace( 'article-ckeditor' );
</script>
CKEDITOR.replace( 'article-ckeditor', {
height: 400,
width: 1500
} );
</script>
<script>
$('#caw').select2({
width: '100%',
resources/views/jananotis/kemaskininotisbycaw.blade.php
+14 -10
View File
@@ -26,7 +26,7 @@
<option value="">Sila Pilih Cawangan</option>
@foreach ($caw as $caws)
<option value="{{$caws->caw_code}}">{{$caws->caw_name}}</option>
<option value="{{$caws->caw_code}}">{{$caws->caw_name}} </option>
@endforeach
</select>
@@ -35,25 +35,29 @@
<div class="form-group row">
<div class="col-sm-4" id="list">
<textarea onchange="getSelectValue();" name="para2" rows="10" cols="100" id="article-ckeditor" id="list" required>
</textarea>
</div>
<br>
<div class="form-group row">
<textarea onchange="getSelectValue();" name="para2" id="article-ckeditor" id="list" required>
</textarea><br>
</div>
{{-- <div class="form-group row"> --}}
<div class="col-sm-10">
<button type="submit" class="btn btn-primary">Simpan</button>
</div>
</div>
{{-- </div> --}}
</form>
</div>
</div>
</div>
<script>
CKEDITOR.replace( 'article-ckeditor' );
</script>
CKEDITOR.replace( 'article-ckeditor', {
height: 400,
width: 1500
} );
</script>
<script>
function getSelectValue()
{
resources/views/jurulelong/listpemenang.blade.php
+1 -1
View File
@@ -40,7 +40,7 @@
@foreach($lel['detailsinfo'] as $details)
@if($details['status_jual'] == 1)
<a href=" {{ route('pemenang.senaraipemenang', [ 'lelong_id'=>$lel['detail']['lelong_id'], 'kodcaw'=>$details['caw_code'] ]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Bidaan"><i class="far fa-edit"></i></a>
<a href=" {{ route('pemenang.senaraipemenang', [ 'lelong_id'=>$lel['detail']['lelong_id'], 'caw_code'=>$details['caw_code'] ]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Bidaan"><i class="far fa-edit"></i></a>
@endif
<span class="m-2">{{$details['caw_name']}}</span><br>
@endforeach
resources/views/lelong/lelongtebusindex.blade.php
+85
View File
@@ -0,0 +1,85 @@
@extends('layouts.app')
@section('content')
<div class="container-fluid">
<div class="row ">
<div class="col-md-11 mx-auto card p-4">
<h3 class="pt-3" style="margin-left:1%;">Senarai Lelong Tebus</h3>
@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" id="tablenotislelong" style="width:100%">
<thead class="bg-primary text-white">
<tr>
<th>Bil</th>
<th>ID Lelong</th>
<th>Tarikh Lelong</th>
<th>Fasa</th>
<th>Cawangan</th>
{{-- <th class="text-center">Muat Turun</th> --}}
</tr>
</thead>
<tbody>
@foreach ($arraydetails as $info)
<tr>
<td>{{$loop->iteration}}</td>
<td>{{ $info['laporan']['batch_no']}}</td>
<td>@php
$myDateTime = DateTime::createFromFormat('Y-m-d', $info['laporan']['tarikh_lelong'] );
$t_lelong = $myDateTime->format('d-m-Y');
echo($t_lelong);
@endphp</td>
<td>{{ $info['laporan']['fasa'] }}</td>
<td>
@foreach($info['details'] as $details)
<a href=" {{ route('report.lelongtebus', ['lelong_id'=>$info['laporan']['id'], 'kodcaw'=>$details['caw_code']]) }} " data-toggle="tooltip" data-placement="top" title="Senarai Barang Lelong"><i class="fas fa-download"></i></a>
<span class="m-2"> {{ $details['caw_name']}}</span><br>
@endforeach
</td>
{{-- <td class="text-center">
<a href="{{ route('report.lapbrglelpembida',$info['laporan']['lelong_id'],$details['caw_name']) }}" data-toggle="tooltip" data-placement="top" title="Senarai Barang Lelong Pembida" ><i class="fas fa-download"></i></a>
</td> --}}
</tr>
@endforeach
</tbody>
</table>
</form>
</div>
</div>
</div>
<script>
//Enable tooltips everywhere
$(function () {
$('[data-toggle="tooltip"]').tooltip()
})
var tablenotislelong = $('#tablenotislelong').DataTable({
"columnDefs": [
{
"targets": 0,
"orderable": false
},
{
"targets": 3,
"orderable": false
}
],
order: [[1, 'asc']],
"info": false,
"lengthChange": false,
"pageLength": 15,
dom: 'Bfrtip',
});
</script>
@endsection
resources/views/lelong/showpindah.blade.php
+1 -1
View File
@@ -21,7 +21,7 @@
@endif
<form action="{{route('lelong.pindahjanadata')}}" method="POST" enctype="multipart/form-data">
@csrf
<div id='loader'></div>
<div id='loader'><img id="loader-image" src="../img/loadingmsg.gif" alt="Sila Tunggu Sebentar..." /></div>
<input type="hidden" name="type" value="User">
<input type="hidden" class="form-control" id="lelongidasal" name="lelongidasal" value="{{$lelong_id}}">
resources/views/lelong/showrenewxlaku.blade.php
+1 -1
View File
@@ -22,7 +22,7 @@
@endif
<form action="{{route('lelong.renewxlakujanadata')}}" method="POST" enctype="multipart/form-data">
@csrf
<div id='loader'></div>
<div id='loader'><img id="loader-image" src="../img/loadingmsg.gif" alt="Sila Tunggu Sebentar..." /></div>
<input type="hidden" name="type" value="User">
<input type="hidden" class="form-control" id="lelongidasal" name="lelongidasal" value="{{$lelong_id}}">
<div class="form-group row">
resources/views/lelong/showtukartarikh.blade.php
+1 -1
View File
@@ -21,7 +21,7 @@
@endif
<form action="{{route('lelong.tukartarikhjanadata')}}" method="POST" enctype="multipart/form-data">
@csrf
<div id='loader'></div>
<div id='loader'><img id="loader-image" src="../img/loadingmsg.gif" alt="Sila Tunggu Sebentar..." /></div>
<input type="hidden" name="type" value="User">
<input type="hidden" class="form-control" id="lelongidasal" name="lelongidasal" value="{{$lelong_id}}">
<div class="form-group row">
resources/views/pdf/pdflelongtebus.blade.php
+163
View File
@@ -0,0 +1,163 @@
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
<style>
#sim {
font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
font-size:10px;
border-collapse: collapse;
width: 100%;
}
#sim td {padding:3px 5px 3px 5px; padding-right:10px;}, #sim th {
border: 0px solid;
padding: 1px;
text-align: left;
}
#sim tr:nth-child(even){}
#sim tr:hover {}
#sim th {
text-align: left;
border: 0px solid;
table-layout:auto;
color: black;
font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
}
* {
box-sizing: border-box;
}
.row {
margin-left:-5px;
margin-right:-5px;
}
.column {
float: left;
width: 100%;
padding: 5px;
}
/* Clearfix (clear floats) */
.row::after {
content: "";
clear: both;
display: table;
}
table {
border-collapse: collapse;
border-spacing: 0;
width: 200%;
border: 0px solid #ddd;
}
td {
text-align: left;
padding: 16px;
}
th{
text-align: left;
padding: 16px;
background-color:gainsboro;
}
tr:nth-child(even) {
background-color: #f2f2f2;
}
</style>
<body>
<table width="100%" border="0" id="sim">
<tr>
<td width="50%"><h3>PERMODALAN KELANTAN BERHAD</h3></td>
</tr>
<tr>
<td colspan="2"><u><b>LAPORAN LELONG TEBUS</b></u></td>
</tr>
</table>
<table cellspacing="" cellpadding="5" text-align="left" border="0" height="25" align="left" id="sim">
<thead>
<br>
<tr>
<td>ID Lelong: {{$lelong_id}}</td>
@foreach ($info as $info)
<td>Tarikh Lelong: @php
$myDateTime = DateTime::createFromFormat('Y-m-d', $info->tarikh_lelong );
$t_lelong = $myDateTime->format('d-m-Y');
echo($t_lelong);
@endphp</td>
<td>Fasa: {{$info->fasa}} </td>
@endforeach
@foreach ($arrayinfocaw as $laporancaw)
@foreach ($laporancaw['cawangan'] as $details)
<td>Cawangan : {{$details['caw_name']}}
@endforeach
@endforeach
</thead>
</table>
<br>
<table cellspacing="0" cellpadding="5" style="float:right;" border="0" width="100%" height="80" align="left" id="sim">
<thead>
<tr>
<th>No</th>
<th>Tarikh</th>
<th>No Rujukan</th>
<th>Nilai Marhun(RM)</th>
<th>Pinjaman(RM)</th>
<th>Keuntungan (RM)</th>
<th>Tempoh</th>
</tr>
</thead>
@foreach ($laporantebus as $laporan)
<tr>
<td>{{ $loop->iteration }}</td>
<td>{{ $laporan['tarikh']}}</td>
<td>{{ $laporan['norujukan'] }}</td>
<td>{{ number_format($laporan['nilaimarhun'], 2, '.', ',')}}</td>
<td>{{ number_format($laporan['pinjaman'], 2, '.', ',')}}</td>
<td>{{ number_format($laporan['upah'], 2, '.', ',')}}</td>
<td>{{$laporan['jbg']}}</td>
</tr>
@endforeach
<tr>
<td colspan="3" align="left"><strong>Jumlah Keseluruhan</strong></td>
<td><strong>{{ number_format($total_berat, 2, '.', ',') }}</strong></td>
<td><strong>{{ number_format($total_hargaasas, 2, '.', ',') }}</strong></td>
<td><strong>{{ number_format($total_hargalelong, 2, '.', ',') }}</strong></td>
<td></td>
</tr>
</table>
</tbody>
resources/views/pengesahan/mutumarhun.blade.php
+13 -10
View File
@@ -17,17 +17,20 @@
</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>No Rujukan : </b> {{ $lelongbid->norujukan }}</p>
<p> <b>Tempoh : </b> {{ $lelongbid->jbg }}</p>
<p> <b>TESTING : </b> {{ $lelongbid->kodcaw }}</p>
<p> <b>Pembiayaan(RM) : </b> {{ number_format($marhuns[0]['pembiayaan'], 2, '.', ',') }}</p>
<p> <b>Keuntungan(RM) : </b> {{ number_format($marhuns[0]['bakiupah'], 2, '.', ',') }}</p>
<p> <b>Baki Lelong(RM) : </b>{{ number_format($marhuns[0]['baki_lelong'], 2, '.', ',') }}</p>
<p> <b>Rugi Lelong(RM) : </b>{{ number_format($marhuns[0]['rugi_lelong'], 2, '.', ',') }}</p>
</div>
<div class="row">
<div class="col-6 col-sm-4">
<p> <b>No Rujukan : </b> {{ $lelongbid->norujukan }}</p>
<p> <b>Tempoh : </b> {{ $lelongbid->jbg }}</p>
<p> <b>Kod Cawangan : </b> {{ $lelongbid->kodcaw }}</p>
</div>
<div class="col-6 col-sm-4">
<p> <b>Pembiayaan(RM) : </b> {{ number_format($marhuns[0]['pembiayaan'], 2, '.', ',') }}</p>
<p> <b>Keuntungan(RM) : </b> {{ number_format($marhuns[0]['bakiupah'], 2, '.', ',') }}</p>
<p> <b>Baki Lelong(RM) : </b>{{ number_format($marhuns[0]['baki_lelong'], 2, '.', ',') }}</p>
<p> <b>Rugi Lelong(RM) : </b>{{ number_format($marhuns[0]['rugi_lelong'], 2, '.', ',') }}</p>
</div>
</div>
</div>
<table class="table table-striped table-xl text-center" id="tablemutumarhun" style="width:100%">
resources/views/simulasi/janasimulasi.blade.php
-2
View File
@@ -110,8 +110,6 @@
$(function() {
$( "form" ).submit(function() {
$('#loader').show();
// $message = "Simulasi Sedang Dijana";
// $('#message').show();
});
});
resources/views/simulasi/senaraisimulasiall.blade.php
+4 -4
View File
@@ -18,8 +18,8 @@
<th>No</th>
<th>Kali Lelong</th>
{{-- <th>Tarikh Lelong</th> --}}
<th>Fasa</th>
<th align='left'>Cawangan</th>
{{-- <th>Fasa</th>
<th align='left'>Cawangan</th> --}}
{{-- <th>Harga Asas (RM)</th> --}}
<th class="text-center">Tindakan</th>
</tr>
@@ -34,7 +34,7 @@
{{$info['info']['tarikh_lelong'] }}
</td> --}}
<td align = 'center'>
{{-- <td align = 'center'>
@foreach($info['detailsinfo'] as $info2)
{{$info2['fasa']}}<br>
@endforeach
@@ -42,7 +42,7 @@
<td align = 'left'>
@foreach($info['detailsinfo'] as $info2)
{{$info2['caw_name']}}<br>
@endforeach
@endforeach --}}
{{-- </td>
<td>{{ $info['info']['harga_emas_asas'] }}</td> --}}
<td class="text-center">
resources/views/simulasi/senaraitempsimulasi.blade.php
+1 -1
View File
@@ -19,7 +19,7 @@
@csrf
<input type="hidden" class="form-control" id="fasa" name="fasa" value="{{$fasa}}">
<div id='loader'></div>
<div id='loader'><img id="loader-image" src="../img/loadingmsg.gif" alt="Sila Tunggu Sebentar..." /></div>
<div class="container">
<div>
resources/views/simulasi/showsimulasi.blade.php
+1 -1
View File
@@ -172,7 +172,7 @@
<div class="col-md-10 mx-auto">
<form action="{{ route('analisa.kemaskiniharga') }}" method="POST" id="formhargaasas">
@csrf
<div id='loader'></div>
<div id='loader'><img id="loader-image" src="../img/loadingmsg.gif" alt="Sila Tunggu Sebentar..." /></div>
<input type="hidden" name="idsimulasi" value="{{$simulasi_id}}">
<table class="table table-striped table-xl" id="kemaskinikarat" style="width:100%" >
<thead class="bg-primary text-white">