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

Merge branch 'main' into amirah

Browse Source
This commit is contained in:
Amirah22
2022-04-20 14:09:12 +08:00
parent ff37edd4bb 0a28314fbc
commit fa177ce070
4 changed files with 113 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/views/pengesahan/lelbidmarhun.blade.php
+2 -5
View File
@@ -22,13 +22,11 @@
<th>Berat</th>
<th>Harga (RM)</th>
<th>Nilai Marhun</th>
<th>Harga Asas</th>
<th>Nota</th>
<th>Status</th>
</tr>
</thead>
<tbody>
<tbody>
@foreach ($marhuns as $marhun)
<tr>
<td>{{ $loop->iteration }}</td>
@@ -38,7 +36,6 @@
<td>{{ $marhun->berat }}</td>
<td>{{ $marhun->harga }}</td>
<td>{{ $marhun->n_marhun }}</td>
<td>{{ $marhun->hargaasas }}</td>
<td>{{ $marhun->nota }}</td>
<td>
@if($status->status_ubah == 1)
@@ -74,7 +71,7 @@
"orderable": false
},
{
"targets": 9,
"targets": 8,
"orderable": false
}
],
resources/views/pengesahan/senarailelong.blade.php
+14 -8
View File
@@ -15,8 +15,9 @@
<table class="table table-striped table-xl text-center" id="tablelelong" 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>No</th>
<th>Tarikh Lelong</th>
<th>Nama Cawangan</th>
<th>Harga Emas Asas</th>
<th>JBG</th>
<th>Caj Lelong</th>
@@ -24,15 +25,20 @@
</tr>
</thead>
<tbody>
@foreach ($lelong as $lel)
@foreach ($arrayinfo as $lel)
<tr>
<td><input type="checkbox" aria-label="Checkbox for following text input" name="checkboxdata[]" value="{{ $lel->id }}"></td>
<td>{{ $lel->tarikh_lelong }}</td>
<td>{{ $lel->harga_emas_asas }}</td>
<td>{{ $lel->jbg }}</td>
<td>{{ $lel->cajlelong }}</td>
<td>{{$loop->iteration}}</td>
<td>{{ $lel['detail']['tarikh_lelong']}}</td>
<td>
<a href="{{ route('pengesahan.senaraitangguhlelong',$lel->id) }}" data-toggle="tooltip" data-placement="top" title="Butiran" class="text-center" ><i class="far fa-edit"></i></a>
@foreach($lel['detailsinfo'] as $details)
<span class="m-2">{{$details['caw_name']}}</span><br>
@endforeach
</td>
<td>{{$lel['detail']['harga_emas_asas']}}</td>
<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>
</td>
</tr>
@endforeach
resources/views/pengesahan/senaraitangguhlelong.blade.php
+6 -4
View File
@@ -16,9 +16,10 @@
<thead class="bg-primary text-white">
<tr>
<th>Bil</th>
<th>Kod Cawangan</th>
<th>No Rujukan</th>
<th>Nama Cawangan</th>
<th>Tarikh Lelong Asal</th>
<th>Tarikh Tangguh</th>
<th>No Rujukan</th>
<th class="text-center">Action</th>
</tr>
</thead>
@@ -27,9 +28,10 @@
@foreach ($tangguhlelong as $tangguhlel)
<tr>
<td>{{ $loop->iteration }}</td>
<td>{{ $tangguhlel->kodcaw }}</td>
<td>{{ $tangguhlel->norujukan }}</td>
<td>{{ $tangguhlel['nama_caw'] }}</td>
<td>{{ $tangguhlel->tarikh_lelong }}</td>
<td>{{ $tangguhlel->tarikhtangguh }}</td>
<td>{{ $tangguhlel->norujukan }}</td>
<td>
<a href="{{ route('pengesahan.lelbidmarhun', [ $id, $tangguhlel->norujukan ]) }}" data-toggle="tooltip" data-placement="top" title="Butiran" class="text-center" ><i class="far fa-edit"></i></a>
</td>