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

Merged in atie (pull request #29)

Browse Source 
update perubahan marhun papar ubah shj dan masuk lelong shj
This commit is contained in:
izzati zulkifli
2023-11-01 08:59:24 +00:00
parent 3a18aa1269 cbea0331d4
commit c0c6d00db5
3 changed files with 27 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/ReportController.php
+14 -6
View File
@@ -994,11 +994,12 @@ class ReportController extends Controller
public function lapubahmarhunlelongindex ($lelong_id, $kodcaw){
$cawangan = Pengesahan::where('pengesahan.lelong_id', $lelong_id)
$cawangan = Pengesahan::join('lelongbid','lelongbid.norujukan','=','pengesahan.norujukan')
->where('pengesahan.lelong_id', $lelong_id)
->where('pengesahan.status', 1)
->where('pengesahan.norujukan', 'LIKE', '%'.$kodcaw.'%')
->whereNotNull('pengesahan.disahkan_oleh')
->select('pengesahan.lelongbid_id','pengesahan.diminta_oleh','pengesahan.disahkan_oleh', 'pengesahan.disahkan_pada', 'pengesahan.norujukan', 'pengesahan.lelong_id')
->select('pengesahan.lelongbid_id','pengesahan.lelongbidmarhun_id','pengesahan.diminta_oleh','pengesahan.disahkan_oleh', 'pengesahan.disahkan_pada', 'pengesahan.norujukan', 'pengesahan.lelong_id')
->orderBy('pengesahan.lelongbid_id')
->distinct()
->get();
@@ -1013,10 +1014,13 @@ class ReportController extends Controller
$status = Pengesahan::where('lelongbid_id', $caw['lelongbid_id'])
->select('id as sahid','status_ubah', 'request_karat', 'request_berat', 'request_marhun')
->orderBy('pengesahan.lelongbidmarhun_id','asc')
->get();
$marhuns = LelongBidMarhun::where('lelongbid_id', $caw['lelongbid_id'])
$marhuns = LelongBidMarhun::join('pengesahan','pengesahan.lelongbidmarhun_id','=','lelongbidmarhun.id')
->where('pengesahan.lelongbid_id', $caw['lelongbid_id'])
->orderBy('pengesahan.lelongbidmarhun_id','asc')
->get()
->toArray();
$cawangan[$index1]['namacaw'] = $getpengesahan['caw_name'];
@@ -1248,11 +1252,12 @@ class ReportController extends Controller
public function lapubahmarhunlelongindexpdf ($lelong_id, $kodcaw, $t_lelong){
$cawangan = Pengesahan::where('pengesahan.lelong_id', $lelong_id)
$cawangan = Pengesahan::join('lelongbid','lelongbid.norujukan','=','pengesahan.norujukan')
->where('pengesahan.lelong_id', $lelong_id)
->where('pengesahan.status', 1)
->where('pengesahan.norujukan', 'LIKE', '%'.$kodcaw.'%')
->whereNotNull('pengesahan.disahkan_oleh')
->select('pengesahan.lelongbid_id','pengesahan.diminta_oleh','pengesahan.disahkan_oleh', 'pengesahan.disahkan_pada', 'pengesahan.norujukan', 'pengesahan.lelong_id')
->select('pengesahan.lelongbid_id','pengesahan.lelongbidmarhun_id','pengesahan.diminta_oleh','pengesahan.disahkan_oleh', 'pengesahan.disahkan_pada', 'pengesahan.norujukan', 'pengesahan.lelong_id')
->orderBy('pengesahan.lelongbid_id')
->distinct()
->get();
@@ -1267,10 +1272,13 @@ class ReportController extends Controller
$status = Pengesahan::where('lelongbid_id', $caw['lelongbid_id'])
->select('id as sahid','status_ubah', 'request_karat', 'request_berat', 'request_marhun')
->orderBy('pengesahan.lelongbidmarhun_id','asc')
->get();
$marhuns = LelongBidMarhun::where('lelongbid_id', $caw['lelongbid_id'])
$marhuns = LelongBidMarhun::join('pengesahan','pengesahan.lelongbidmarhun_id','=','lelongbidmarhun.id')
->where('pengesahan.lelongbid_id', $caw['lelongbid_id'])
->orderBy('pengesahan.lelongbidmarhun_id','asc')
->get()
->toArray();
$cawangan[$index1]['namacaw'] = $getpengesahan['caw_name'];
resources/views/marhun/ubahmarhun.blade.php
+11 -6
View File
@@ -41,12 +41,17 @@
@forelse($cawangan as $marhun)
<tr>
<td>{{ $loop->iteration }}</td>
<td>{{ $marhun['norujukan'] }}</td>
<td>@foreach ($marhun['detailmarhun'] as $item)
<td style="white-space: nowrap;">{{ $marhun['norujukan'] }}</td>
<td style="white-space: nowrap;">
@php
$count = 1;
@endphp
@foreach ($marhun['detailmarhun'] as $item)
{{ $count++ }}.
@if($item['status_ubah'] == 1)
Mutu
@elseif($item['status_ubah'] == 2)
Pertambahan Marhun
Tambah Marhun
@elseif($item['status_ubah'] == 3)
Hapus Marhun
@elseif($item['status_ubah'] == 4)
@@ -67,7 +72,7 @@
<td>@foreach ($marhun['detail'] as $item)
{{$item['old_marhun']}}<br>
@endforeach</td>
<td>@foreach ($marhun['detailmarhun'] as $item)
<td style="white-space: nowrap;">@foreach ($marhun['detailmarhun'] as $item)
@if($item['request_marhun'] == null)
@else
<i class="btn fa fa-arrow-right" aria-hidden="true" style="font-size: 10px"></i>
@@ -76,7 +81,7 @@
<td>@foreach ($marhun['detail'] as $item)
{{$item['old_karat']}}<br>
@endforeach</td>
<td>@foreach ($marhun['detailmarhun'] as $item)
<td style="white-space: nowrap;">@foreach ($marhun['detailmarhun'] as $item)
@if($item['request_karat'] == null)
@else
<i class="btn fa fa-arrow-right" aria-hidden="true" style="font-size: 10px"></i>
@@ -85,7 +90,7 @@
<td>@foreach ($marhun['detail'] as $item)
{{$item['old_berat']}}<br>
@endforeach</td>
<td>@foreach ($marhun['detailmarhun'] as $item)
<td style="white-space: nowrap;">@foreach ($marhun['detailmarhun'] as $item)
@if($item['request_berat'] == null)
@else
<i class="btn fa fa-arrow-right" aria-hidden="true" style="font-size: 10px"></i>
resources/views/pdf/laporanubahmarhun.blade.php
+2 -2
View File
@@ -137,11 +137,11 @@ tr:nth-child(even) {
<tr>
<td>{{ $loop->iteration }}</td>
<td style="white-space: nowrap;">{{ $marhun['norujukan'] }}</td>
<td>@foreach ($marhun['detailmarhun'] as $item)
<td style="white-space: nowrap;">@foreach ($marhun['detailmarhun'] as $item)
@if($item['status_ubah'] == 1)
Mutu
@elseif($item['status_ubah'] == 2)
Pertambahan Marhun
Tambah Marhun
@elseif($item['status_ubah'] == 3)
Hapus Marhun
@elseif($item['status_ubah'] == 4)