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

update error comment by kak aida

Browse Source
This commit is contained in:
Amirah22
2022-06-21 11:32:25 +08:00
parent ae9572d6b4
commit 3e2403c796
18 changed files with 182 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/views/lelong/lelongtaklaku.blade.php
+12 -5
View File
@@ -4,11 +4,18 @@
<div class="container-fluid">
<div class="row ">
<div class="col-md-11 mx-auto card p-4">
<div class="nav nav-tabs" id="nav-tab" role="tablist">
<button type="button" class="btn btn-light" ><a href="javascript:window.history.go(-1);"><h3><i class="fas fa-arrow-alt-circle-left"></i></h3></a></button>
</div>
<br>
<br>
@if ($message = Session::get('success'))
<div class="alert alert-success">
<p>{{ $message }}</p>
</div>
@endif
<form id="exportform" action="{{route('lelong.pdflelongtaklaku')}}" method="POST">
@csrf
<input type="hidden" name="type" value="User">
@@ -24,12 +31,12 @@
<th>Bilangan</th>
<th>Pinjaman (RM)</th>
<th>Berat (gm)</th>
<th>Nilai Marhun (RM)</th>
<th>N. Marhun (RM)</th>
<th>Harga Asas (RM)</th>
<th>Upah Simpan (RM)</th>
<th>Caj Lelong (RM)</th>
<th>Rugi Lelong (RM)</th>
<th>Baki Lelong (RM)</th>
<th>Caj (RM)</th>
<th>Rugi (RM)</th>
<th>Baki (RM)</th>
<th>Status Lelong (RM)</th>
<th>Action</th>
</tr>
@@ -41,7 +48,7 @@
<td>{{ $leltaklaku->t_lelong }}</td>
<td>{{ $leltaklaku->norujukan }}</td>
<td>{{ $leltaklaku->caw_name }}</td>
<td> {{ $leltaklaku['suratlelongtaklaku'] }} </td>
<td>{{ $leltaklaku['suratlelongtaklaku'] }} </td>
<td>{{ $leltaklaku->pinjaman }}</td>
<td>{{ $leltaklaku->berat }}</td>
<td>{{ $leltaklaku->nilaimarhun }}</td>
resources/views/lelong/senarailelong.blade.php
+29 -23
View File
@@ -16,15 +16,15 @@
<thead class="bg-primary text-white">
<tr>
<th>No</th>
<th>Lelong ID</th>
<th>ID Lelong</th>
<th>Tarikh Lelong</th>
<th>Fasa</th>
<th>Cawangan</th>
<th>Masa Tamat Lelong</th>
<th>Harga Emas Asas</th>
<th>JBG</th>
<th>Tempoh</th>
<th>Caj Lelong</th>
<th class="text-center">Action</th>
<th class="text-center">Tindakan</th>
</tr>
</thead>
<tbody>
@@ -44,6 +44,12 @@
<span class="m-2">{{$details['caw_name']}}</span><br>
@endforeach
</td>
{{-- <td>@php
$myDateTime = DateTime::createFromFormat('H:i:s', $lel['info']['masatamat_lelong'] );
$masa_lelong = $myDateTime->format('h:i: a');
dd($masa_lelong);
echo($masa_lelong);
@endphp</td> --}}
<td>{{$lel['info']['masatamat_lelong']}}</td>
<td>{{$lel['info']['harga_emas_asas']}}</td>
<td>{{$lel['info']['jbg']}}</td>
@@ -133,26 +139,26 @@
"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();
}
}
]
// 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/lelong/senarailelongtaklaku.blade.php
+30 -11
View File
@@ -5,6 +5,7 @@
<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>
@@ -13,25 +14,43 @@
<table class="table table-striped table-xl text-center" id="senarailelongtaklaku" 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>Bil</th>
<th>ID Lelong</th>
<th>Tarikh Lelong</th>
<th>Fasa</th>
<th>Cawangan</th>
<th>Masa Tamat Lelong</th>
<th>Harga Emas Asas</th>
<th>JBG</th>
<th>Tempoh</th>
<th>Caj Lelong</th>
<th class="text-center">Action</th>
<th class="text-center">Tindakan</th>
</tr>
</thead>
<tbody>
@foreach($senarai as $data)
@foreach($arraydetails as $data)
<tr>
<td><input type="checkbox" aria-label="Checkbox for following text input" name="checkboxdata[]" value="{{ $data->lelong_id }}"></td>
<td>{{ $data->tarikh_lelong }}</td>
<td>{{ $data->masatamat_lelong }}</td>
<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']]) }} " data-toggle="tooltip" data-placement="top" title="Senarai Lelong Tak Laku" ><i class="far fa-edit"></i></a></td>
<td>{{$loop->iteration}}</td>
<td>{{ $data['laporan']['lelong_id'] }}</td>
<td>@php
$myDateTime = DateTime::createFromFormat('Y-m-d', $data['laporan']['tarikh_lelong'] );
$t_lelong = $myDateTime->format('d-m-Y');
echo($t_lelong);
@endphp</td>
<td>{{ $data['laporan']['fasa'] }}</td>
<td align = 'left'>
@foreach($data['details'] as $details)
<span class="m-2">{{ $details['caw_name']}}</span><br>
@endforeach
</td>
<td>@php
$myDateTime = DateTime::createFromFormat('H:i:s', $data['laporan']['masatamat_lelong'] );
$masa_lelong = $myDateTime->format('h:i: a');
echo($masa_lelong);
@endphp</td>
<td>{{ $data['laporan']['harga_emas_asas'] }}</td>
<td>{{ $data['laporan']['jbg'] }}</td>
<td>{{ $data['laporan']['cajlelong'] }}</td>
<td><a href=" {{ route('lelong.lelongtaklaku', ['lelong_id'=>$data['laporan']['lelong_id']]) }} " data-toggle="tooltip" data-placement="top" title="Senarai Lelong Tak Laku" ><i class="far fa-edit"></i></a></td>
</tr>
@endforeach
</tbody>
resources/views/lelong/senaraimarhun.blade.php
+34 -21
View File
@@ -5,21 +5,34 @@
<div class="container-fluid">
<div class="row ">
<div class="col-md-11 mx-auto card p-4">
@foreach ($arrayinfo as $laporan)
<div class="nav nav-tabs" id="nav-tab" role="tablist">
<button type="button" class="btn btn-light" ><a href="javascript:window.history.go(-1);"><h3><i class="fas fa-arrow-alt-circle-left"></i></h3></a></button>
</div>
<table cellspacing="" cellpadding="4" text-align="left" border="0" height="25" align="left" id="sim" class="table table-striped table-xl">
<thead class="bg-light ">
@foreach ($arrayinfo as $laporan)
<tr>
<td><b>ID Lelong: {{ $laporan['laporan']['lelong_id']}} <b></td>
<td><b>Fasa Lelong: {{ $laporan['laporan']['fasa']}} <b></td>
<td><b>Tarikh Lelong : @php
$myDateTime = DateTime::createFromFormat('Y-m-d', $laporan['laporan']['tarikh_lelong'] );
$datez = $myDateTime->format('d-m-Y');
echo($datez);
@endphp</b></td>
@foreach($laporan['details'] as $details)
<td><b>Nama Cawangan : {{ $details['caw_name']}}</b></td>
<td><b>Kod Cawangan : {{ $details['caw_code']}}</b></td>
@endforeach
</tr>
@endforeach
</thead>
</table>
<span class="pt-3" style="margin-left:1%;"><b>Lelong ID : {{ $laporan['laporan']['lelong_id']}}</b></span>
<span class="pt-3" style="margin-left:1%;"><b>Tarikh Lelong : @php
$myDateTime = DateTime::createFromFormat('Y-m-d', $laporan['laporan']['tarikh_lelong'] );
$datez = $myDateTime->format('d-m-Y');
echo($datez);
@endphp</b></span>
@foreach($laporan['details'] as $details)
<span class="pt-3" style="margin-left:1%;"><b>Nama Cawangan : {{ $details['caw_name']}}</b></span>
<span class="pt-3" style="margin-left:1%;"><b>Kod Cawangan : {{ $details['caw_code']}}</b></span>
@endforeach
@endforeach
@if ($message = Session::get('success'))
<div class="alert alert-success">
@@ -37,16 +50,16 @@
<th>Norujukan</th>
<th>Tempoh</th>
<th>Berat (gm)</th>
<th>Nilai Marhun (RM)</th>
<th>N. Marhun (RM)</th>
<th>Tarikh Jual (RM)</th>
<th>Harga Asas (RM)</th>
<th>Harga Jual (RM)</th>
<th>Pembiayaan (RM)</th>
<th>Keuntungan (RM)</th>
<th>Caj Lelong (%)</th>
<th>Rugi Lelong (RM)</th>
<th>Baki Lelong (RM)</th>
<th>Action</th>
<th>Caj (%)</th>
<th>Rugi (RM)</th>
<th>Baki (RM)</th>
<th>Pilih</th>
</tr>
</thead>
<tbody>
@@ -89,8 +102,8 @@
</table>
<div class="text-right pt-4">
<a href="{{ route('lelong.show',$lelongid) }}" class="btn btn-primary">Kembali</a>
<button type="button" class="btn btn-danger" id="btndelete" onclick="confirm()">Delete</button>
{{-- <a href="{{ route('lelong.show',$lelongid) }}" class="btn btn-primary">Kembali</a> --}}
<button type="button" class="btn btn-danger" id="btndelete" onclick="confirm()">Hapus</button>
</div>
{{-- <a href="{{url('lelong/senarailelong')}}" class="btn btn-primary">Kembali</a> --}}
resources/views/lelong/showlelong.blade.php
+8 -7
View File
@@ -6,6 +6,7 @@
<div class="col-md-11 mx-auto card p-4">
<nav>
<div class="nav nav-tabs" id="nav-tab" role="tablist">
<button type="button" class="btn btn-light" ><a href="javascript:window.history.go(-1);"><h3><i class="fas fa-arrow-alt-circle-left"></i></h3></a></button>
<a class="nav-link active" id="nav-simulasi-tab" data-toggle="tab" href="#nav-simulasi" role="tab" aria-controls="nav-simulasi" aria-selected="true">Lelong</a>
<a class="nav-link" id="nav-hargaasas-tab" data-toggle="tab" href="#nav-hargaasas" role="tab" aria-controls="nav-hargaasas" aria-selected="false">Harga Emas Asas</a>
</div>
@@ -78,13 +79,13 @@
<th>Cawangan</th>
<th>Bil Marhun (Paket)</th>
<th>Berat (gm)</th>
<th>Nilai Marhun (RM)</th>
<th>N. Marhun (RM)</th>
<th>Pembiayaan (RM)</th>
<th>Keuntungan (RM)</th>
<th>Harga Asas (RM)</th>
<th>Caj Lelong (RM)</th>
<th>Baki Lelong (RM)</th>
<th>Rugi Lelong (RM)</th>
<th>Caj (RM)</th>
<th>Baki (RM)</th>
<th>Rugi (RM)</th>
</tr>
</thead>
<tbody>
@@ -388,9 +389,9 @@
// }
// },
{
className: 'btn btn-outline-secondary pl-4 pr-4 btn-sm export',
titleAttr: 'Export to CSV',
text: '<i class="fas fa-download"></i>',
className: 'btn btn-outline-danger pl-4 pr-4 btn-sm export',
titleAttr: 'Muat Turun PDF',
text: '<h8><b>PDF</b></h8>',
action: function ( e, dt, node, config ) {
$("#exportform").submit();
}
resources/views/pdf/jananotis.blade.php
+1 -1
View File
@@ -244,7 +244,7 @@
<tr>
<td>Waktu</td>
<td>:</td>
<td>{{ date('H:i',strtotime($bid->masamula_lelong)). ' pagi' }}</td>
<td>10.00 pagi</td>
</tr>
</table>
resources/views/pengesahan/senarailelong.blade.php
+2 -2
View File
@@ -16,11 +16,11 @@
<thead class="bg-primary text-white">
<tr>
<th>No</th>
<th>Lelong ID</th>
<th>ID Lelong</th>
<th>Tarikh Lelong</th>
<th>Nama Cawangan</th>
<th>Harga Emas Asas</th>
<th>JBG</th>
<th>Tempoh</th>
<th>Caj Lelong</th>
<!-- <th class="text-center">Action</th> -->
</tr>
resources/views/pengesahan/senarailelongubahmutu.blade.php
+1 -1
View File
@@ -20,7 +20,7 @@
<th>Cawangan</th>
<th>Tarikh Lelong</th>
<th>Harga Emas Asas</th>
<th>JBG</th>
<th>Tempoh</th>
<th>Caj Lelong</th>
<th>Status Lelong</th>
<th class="text-center">Pengesahan</th>
resources/views/pengesahan/senaraitangguhlelong.blade.php
+2 -2
View File
@@ -18,10 +18,10 @@
<tr>
<th>Bil</th>
<th>Tarikh Tangguh</th>
<th>ID Lelong</th>
<th>Lelong ID</th>
<th>No Rujukan</th>
<th>Nota</th>
<th class="text-center">Action</th>
<th class="text-center">Tindakan</th>
</tr>
</thead>
<tbody>
resources/views/simulasi/senaraisimulasi.blade.php
+22 -22
View File
@@ -16,12 +16,12 @@
<thead class="bg-primary text-white">
<tr>
<th>No</th>
<th>Lelong ID</th>
<th>ID Lelong</th>
<th>Tarikh Lelong</th>
<th>Fasa</th>
<th>Cawangan</th>
<th>Harga Asas (RM)</th>
<th class="text-center">Action</th>
<th class="text-center">Tindakan</th>
</tr>
</thead>
<tbody>
@@ -100,26 +100,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/simulasi/showsimulasi.blade.php
+7 -5
View File
@@ -4,8 +4,10 @@
<div class="container-fluid">
<div class="row ">
<div class="col-md-11 mx-auto card p-4">
<nav>
<div class="nav nav-tabs" id="nav-tab" role="tablist">
<button type="button" class="btn btn-light" ><a href="javascript:window.history.go(-1);"><h3><i class="fas fa-arrow-alt-circle-left"></i></h3></a></button>
<a class="nav-link active" id="nav-simulasi-tab" data-toggle="tab" href="#nav-simulasi" role="tab" aria-controls="nav-simulasi" aria-selected="true">Simulasi</a>
<a class="nav-link" id="nav-hargaasas-tab" data-toggle="tab" href="#nav-hargaasas" role="tab" aria-controls="nav-hargaasas" aria-selected="false">Harga Emas Asas</a>
</div>
@@ -76,13 +78,13 @@
<th>Cawangan</th>
<th>Bil Marhun (Paket)</th>
<th>Berat (gm)</th>
<th>Nilai Marhun (RM)</th>
<th>N. Marhun (RM)</th>
<th>Pembiayaan (RM)</th>
<th>Keuntungan (RM)</th>
<th>Harga Asas (RM)</th>
<th>Caj Lelong (RM)</th>
<th>Baki Lelong (RM)</th>
<th>Rugi Lelong (RM)</th>
<th>Caj (RM)</th>
<th>Baki (RM)</th>
<th>Rugi (RM)</th>
</tr>
</thead>
<tbody>
@@ -154,7 +156,7 @@
</form>
<div class="row">
<div class="text-center">
<a class="btn btn-primary" href="{{ route('lelong.create',$simulasi_id) }}">Create Lelong</a>
<a class="btn btn-primary" href="{{ route('lelong.create',$simulasi_id) }}">Daftar Lelong</a>
</div>
</div>
</div>
resources/views/simulasi/tempbycawsimulasi.blade.php
+2 -1
View File
@@ -5,7 +5,8 @@
<div class="row ">
<div class="col-md-12 mx-auto card">
</div>
<button type="button" class="btn btn-light" ><a href="javascript:window.history.go(-1);"><h3><i class="fas fa-arrow-alt-circle-left"></i></h3></a></button><h3 class="pt-3" style="margin-bottom:2%; margin-top:1%;">Butiran Gadaian Cawangan {{ $details }}</h3>
<button type="button" class="btn btn-light" ><a href="javascript:window.history.go(-1);"><h3><i class="fas fa-arrow-alt-circle-left"></i></h3></a></button>
<h3 class="pt-3" style="margin-bottom:2%; margin-top:1%;">Butiran Gadaian Cawangan {{ $details }}</h3>
@if ($message = Session::get('failed'))
<div class="alert alert-danger">
resources/views/tangguhlelong/senarailelongtangguh.blade.php
+3 -4
View File
@@ -16,10 +16,9 @@
<thead class="bg-primary text-white">
<tr>
<th>No</th>
<th>Lelong ID</th>
<th>Tarikh Lelong</th>
<!-- <th>Cawangan</th> -->
<th>ID Lelong</th>
<th>Tarikh Lelong</th>
<th>Cawangan</th>
<th>Harga Emas Asas</th>
<th>Tempoh</th>
<th>Caj Lelong</th>
resources/views/tangguhlelong/senleltangguh.blade.php
+1 -1
View File
@@ -16,7 +16,7 @@
<thead class="bg-primary text-white">
<tr>
<th>No</th>
<th>Lelong ID</th>
<th>ID Lelong</th>
<th>Tarikh Lelong</th>
<th>Cawangan</th>
<th>Harga Emas Asas</th>
resources/views/welcome.blade.php
+1 -1
View File
@@ -62,7 +62,7 @@
</div>
<div class="text-center">
<button type="submit" class="btn btn-primary">
{{ __('Login') }}
{{ __('Log Masuk') }}
</button>
{{-- <a class="btn navbar-btn text-white mx-2 btn-primary" href="../../lelong-sketch/admin/dashboardadmin.html">Log Masuk</a> --}}
</div>