diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php index a004d5c3..0253e083 100644 --- a/app/Http/Controllers/MarhunController.php +++ b/app/Http/Controllers/MarhunController.php @@ -150,6 +150,10 @@ class MarhunController extends Controller { // } + + $marhun = LelongBidMarhun::where('lelongbid_id','=',$bid['id'])->get()->toArray();; + $lelongbid[$index1]['marhun'] = $marhun; + } return view('marhun.senaraimarhun',compact('lelongbid','lelong_id', 'caw', 'sag', 'dalamproses', 'sdhdisemak', 'sdhdisahkan', 'sdhdisemaktangguhlel', @@ -403,7 +407,7 @@ class MarhunController extends Controller $lelongbid->status_semak = 1; $lelongbid->save(); - return redirect()->route('marhun.show',[ $lelongbid->id, $lelong_id ]) + return redirect()->route('marhun.senaraimarhun',[ $lelong_id ]) ->with('success','Semakan Marhun Berjaya'); } @@ -844,9 +848,9 @@ class MarhunController extends Controller $tangguhlelong->nota = $request->nota;} $tangguhlelong->save(); - $updategadai = Gadai::where('norujukan','=',$request->norujukan)->first(); - $updategadai->taglel = 0; - $updategadai->update(); + // $updategadai = Gadai::where('norujukan','=',$request->norujukan)->first(); + // $updategadai->taglel = 0; + // $updategadai->update(); $marhundelete = LelongBid::where('id', $request->lelongbid_id)->delete(); } diff --git a/resources/views/marhun/marhun.blade.php b/resources/views/marhun/marhun.blade.php index de92482d..b52c5194 100644 --- a/resources/views/marhun/marhun.blade.php +++ b/resources/views/marhun/marhun.blade.php @@ -279,25 +279,12 @@ }); var tablemarhun = $('#marhun').DataTable( { - "columnDefs": [ - { - "targets": 0, - "orderable": false - }, - { - "targets": 9, - "orderable": false - } - ], - order: [[1, 'asc']], - // "ordering": false, + "orderFixed": [ 0, 'asc' ], "info": false, "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: '', diff --git a/resources/views/marhun/senaraimarhun.blade.php b/resources/views/marhun/senaraimarhun.blade.php index 44488c80..fa6f219a 100644 --- a/resources/views/marhun/senaraimarhun.blade.php +++ b/resources/views/marhun/senaraimarhun.blade.php @@ -17,7 +17,7 @@

Keseluruhan : {{ sizeof($lelongbid) }}

{{--

Belum Disemak : {{ sizeof($sag) }}

--}}

Dalam Proses : {{ sizeof($dalamproses) }}

-

Sudah Disemak : {{ sizeof($sdhdisemak) }}

+ {{--

Sudah Disemak : {{ sizeof($sdhdisemak) }}

--}}

Sudah Disahkan Oleh Operasi : {{ sizeof($sdhdisahkan) }}

@@ -66,6 +66,7 @@ @endif + @@ -79,8 +80,112 @@
+