diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php index a2d02e2f..9b8adea2 100644 --- a/app/Http/Controllers/ReportController.php +++ b/app/Http/Controllers/ReportController.php @@ -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']; diff --git a/resources/views/marhun/ubahmarhun.blade.php b/resources/views/marhun/ubahmarhun.blade.php index e8ee1740..07db5462 100644 --- a/resources/views/marhun/ubahmarhun.blade.php +++ b/resources/views/marhun/ubahmarhun.blade.php @@ -41,12 +41,17 @@ @forelse($cawangan as $marhun) {{ $loop->iteration }} - {{ $marhun['norujukan'] }} - @foreach ($marhun['detailmarhun'] as $item) + {{ $marhun['norujukan'] }} + + @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 @@ @foreach ($marhun['detail'] as $item) {{$item['old_marhun']}}
@endforeach - @foreach ($marhun['detailmarhun'] as $item) + @foreach ($marhun['detailmarhun'] as $item) @if($item['request_marhun'] == null) @else @@ -76,7 +81,7 @@ @foreach ($marhun['detail'] as $item) {{$item['old_karat']}}
@endforeach - @foreach ($marhun['detailmarhun'] as $item) + @foreach ($marhun['detailmarhun'] as $item) @if($item['request_karat'] == null) @else @@ -85,7 +90,7 @@ @foreach ($marhun['detail'] as $item) {{$item['old_berat']}}
@endforeach - @foreach ($marhun['detailmarhun'] as $item) + @foreach ($marhun['detailmarhun'] as $item) @if($item['request_berat'] == null) @else diff --git a/resources/views/pdf/laporanubahmarhun.blade.php b/resources/views/pdf/laporanubahmarhun.blade.php index 05ffd67c..5615d121 100644 --- a/resources/views/pdf/laporanubahmarhun.blade.php +++ b/resources/views/pdf/laporanubahmarhun.blade.php @@ -137,11 +137,11 @@ tr:nth-child(even) { {{ $loop->iteration }} {{ $marhun['norujukan'] }} - @foreach ($marhun['detailmarhun'] as $item) + @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)