From 35242fe8de154f61cab9fc1632f33065a9011841 Mon Sep 17 00:00:00 2001
From: faiqahzaman <91926774+faiqahzaman@users.noreply.github.com>
Date: Wed, 16 Mar 2022 13:23:30 +0800
Subject: [PATCH 1/6] senarai tangguh lelong

---
 app/Http/Controllers/MarhunController.php     |  36 +++++-
 resources/views/includes/sidebar.blade.php    |   4 +-
 resources/views/marhun/marhun.blade.php       |   2 +-
 .../views/pengesahan/lelbidmarhun.blade.php   | 118 ++++++++++++++++++
 .../views/pengesahan/senarailelong.blade.php  | 104 +++++++++++++++
 .../pengesahan/senaraitangguhlelong.blade.php | 106 ++++++++++++++++
 routes/web.php                                |   4 +-
 7 files changed, 366 insertions(+), 8 deletions(-)
 create mode 100644 resources/views/pengesahan/lelbidmarhun.blade.php
 create mode 100644 resources/views/pengesahan/senarailelong.blade.php
 create mode 100644 resources/views/pengesahan/senaraitangguhlelong.blade.php

diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php
index 765ceebe..13c59764 100644
--- a/app/Http/Controllers/MarhunController.php
+++ b/app/Http/Controllers/MarhunController.php
@@ -46,12 +46,12 @@ class MarhunController extends Controller
         $user =  Auth::user();
 
         $caw = Cawangan::where('caw_code','=',$user->kodcaw)->first();
-        $lelongbid = LelongBid::where('caw_id','=',$caw->id)->get();
 
-        $lelongid = LelongBid::select('lelong_id')->where('caw_id','=',$caw->id)->groupBy('lelong_id')->get();
-        $lelong = Lelong::whereIn('id', $lelongid)->get();
+        $lelongbid = LelongBid::where('lelong_id', '=', $lelong_id)
+        ->where('caw_id','=', $caw->id)
+        ->get();
 
-        return view('marhun.senaraimarhun',compact('lelongbid','lelong'));
+        return view('marhun.senaraimarhun',compact('lelongbid','lelong_id'));
     }
 
     public function kemaskini(Request $request)
@@ -414,6 +414,34 @@ class MarhunController extends Controller
         return redirect()->route('pengesahan.perubahanmutumarhun')
         ->with('success','Pengesahan Padam Marhun Telah Berjaya');
     }
+
+    public function senarailelong()
+    {
+        $lelong = Lelong::where('sts_lelong', 0)
+        ->get();
+
+        return view('pengesahan.senarailelong',compact('lelong'));
+    }
+
+    public function senaraitangguhlelong($id)
+    {
+        $tangguhlelong = TangguhLelong::join('lelongbid', 'tangguhlelong.lelongbid_id', '=', 'lelongbid.id')
+        ->where('tangguhlelong.lelong_id', $id)
+        ->get();
+
+        return view('pengesahan.senaraitangguhlelong',compact('tangguhlelong','id'));
+
+    }
+
+    public function lelbidmarhun($id)
+    {
+        $marhuns = LelongBidMarhun::join('tangguhlelong', 'lelongbidmarhun.lelongbid_id', '=', 'tangguhlelong.lelongbid_id')
+        ->where('tangguhlelong.lelong_id', $id)
+        ->get();
+
+        return view('pengesahan.lelbidmarhun',compact('marhuns'));
+
+    }
     
 }
        
\ No newline at end of file
diff --git a/resources/views/includes/sidebar.blade.php b/resources/views/includes/sidebar.blade.php
index d0cf44b5..b357e879 100644
--- a/resources/views/includes/sidebar.blade.php
+++ b/resources/views/includes/sidebar.blade.php
@@ -120,8 +120,8 @@
           </li>
         </ul>
         <ul class="list-unstyled collapse {{ (request()->is('pengesahan/*')) ? 'show' : '' }}" id="pengesahanSubmenu" >
-          <li class="{{ (request()->is('pengesahan/senaraitangguhlelong/*') || request()->is('pengesahan/senaraitangguhlelong') ) ? 'active' : '' }}">
-            <a href="{{url('pengesahan/senaraitangguhlelong')}}">Senarai Tangguh Lelong</a>
+          <li class="{{ (request()->is('pengesahan/senarailelong/*') || request()->is('pengesahan/senarailelong') ) ? 'active' : '' }}">
+            <a href="{{url('pengesahan/senarailelong')}}">Senarai Tangguh Lelong</a>
           </li>
         </ul>
       </li>
diff --git a/resources/views/marhun/marhun.blade.php b/resources/views/marhun/marhun.blade.php
index fd8c65aa..4c0dea37 100644
--- a/resources/views/marhun/marhun.blade.php
+++ b/resources/views/marhun/marhun.blade.php
@@ -53,7 +53,7 @@
                 </table>
             </form>
             <div class="modal-footer" style="margin-top:2%;">
-            <a  href="{{ route('marhun.senarailelongmarhun') }}" style="width:7%;" class="btn btn-primary">Kembali</a>
+            <a  href="{{ route('marhun.senaraimarhun', $lelongbid) }}" style="width:7%;" class="btn btn-primary">Kembali</a>
             <a  href="{{ route('marhun.semak', $lelongbid) }}" style="width:7%;" class="btn btn-success">Semak</a>
             </div>
         </div>
diff --git a/resources/views/pengesahan/lelbidmarhun.blade.php b/resources/views/pengesahan/lelbidmarhun.blade.php
new file mode 100644
index 00000000..810fd0bc
--- /dev/null
+++ b/resources/views/pengesahan/lelbidmarhun.blade.php
@@ -0,0 +1,118 @@
+@extends('layouts.app')
+
+@section('content')
+<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>
+                </div>
+            @endif
+            <form id="exportform" action="" method="POST">
+                <input type="hidden" name="type" value="User">
+                <table class="table table-striped  table-xl text-center" id="tablelelong" style="width:100%">
+                    <thead class="bg-primary text-white">
+                        <tr>
+                            <th>Bil</th>
+                            <th>No Rujukan</th>
+                            <th>Marhun</th>
+                            <th>Karat</th>
+                            <th>Berat</th>
+                            <th>Harga (RM)</th>
+                            <th>Nilai Marhun</th>
+                            <th>Harga Asas</th>
+                            <th>Nota</th>
+                            <th>Status</th>
+                            <th class="text-center">Action</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        
+                        @foreach ($marhuns as $marhun)
+                        <tr>
+                            <td>{{ $loop->iteration }}</td>
+                            <td>{{ $marhun->norujukan }}</td>
+                            <td>{{ $marhun->marhun }}</td>
+                            <td>{{ $marhun->karat }}</td>
+                            <td>{{ $marhun->berat }}</td>
+                            <td>{{ $marhun->harga }}</td>
+                            <td>{{ $marhun->n_marhun }}</td>
+                            <td>{{ $marhun->hargaasas }}</td>
+                            <td>{{ $marhun->nota }}</td>
+                            <td></td>
+                            <td>
+                            </td>
+                        </tr>
+                        @endforeach
+                    </tbody>
+                </table>
+            </form>
+        </div>
+        
+    </div>
+</div>
+<script>
+    //Enable tooltips everywhere
+    $(function () {
+        $('[data-toggle="tooltip"]').tooltip()
+    })
+
+    var tablelelong = $('#tablelelong').DataTable( {
+        "columnDefs": [ 
+            {
+            "targets": 0,
+            "orderable": false
+            }, 
+            {
+            "targets": 9,
+            "orderable": false
+            },
+            {
+            "targets": 10,
+            "orderable": false
+            }
+        ],
+        order: [[1, 'asc']],
+        // "ordering": false,
+        "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: '<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();
+    $('.export').tooltip();
+    // $( '.dt-buttons').addClass('btn-group');
+    $( '.addsim').removeClass('dt-button');
+    $( '.export').removeClass('dt-button');
+
+    function selectall(cb) {
+        tablelelong.rows().nodes().to$().find('input[type="checkbox"]').each(function(){
+            $(this).prop('checked', cb.checked);
+        })
+    }
+</script>
+     
+@endsection
diff --git a/resources/views/pengesahan/senarailelong.blade.php b/resources/views/pengesahan/senarailelong.blade.php
new file mode 100644
index 00000000..d89ffb2e
--- /dev/null
+++ b/resources/views/pengesahan/senarailelong.blade.php
@@ -0,0 +1,104 @@
+@extends('layouts.app')
+
+@section('content')
+<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>
+                </div>
+            @endif
+            <form id="exportform" action="" method="POST">
+                <input type="hidden" name="type" value="User">
+                <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>Tarikh Lelong</th>
+                            <th>Harga Emas Asas</th>
+                            <th>JBG</th>
+                            <th>Caj Lelong</th>
+                            <th class="text-center">Action</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        @foreach ($lelong 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>
+                                    <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>
+                            </td>
+                        </tr>
+                        @endforeach
+                    </tbody>
+                </table>
+            </form>
+        </div>
+        
+    </div>
+</div>
+<script>
+    //Enable tooltips everywhere
+    $(function () {
+        $('[data-toggle="tooltip"]').tooltip()
+    })
+
+    var tablelelong = $('#tablelelong').DataTable( {
+        "columnDefs": [ 
+            {
+            "targets": 0,
+            "orderable": false
+            }, 
+            {
+            "targets": 5,
+            "orderable": false
+            }
+        ],
+        order: [[1, 'asc']],
+        // "ordering": false,
+        "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: '<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();
+    $('.export').tooltip();
+    // $( '.dt-buttons').addClass('btn-group');
+    $( '.addsim').removeClass('dt-button');
+    $( '.export').removeClass('dt-button');
+
+    function selectall(cb) {
+        tablelelong.rows().nodes().to$().find('input[type="checkbox"]').each(function(){
+            $(this).prop('checked', cb.checked);
+        })
+    }
+</script>
+     
+@endsection
diff --git a/resources/views/pengesahan/senaraitangguhlelong.blade.php b/resources/views/pengesahan/senaraitangguhlelong.blade.php
new file mode 100644
index 00000000..4070526e
--- /dev/null
+++ b/resources/views/pengesahan/senaraitangguhlelong.blade.php
@@ -0,0 +1,106 @@
+@extends('layouts.app')
+
+@section('content')
+<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>
+                </div>
+            @endif
+            <form id="exportform" action="" method="POST">
+                <input type="hidden" name="type" value="User">
+                <table class="table table-striped  table-xl text-center" id="tablelelong" style="width:100%">
+                    <thead class="bg-primary text-white">
+                        <tr>
+                            <th>Bil</th>
+                            <th>Kod Cawangan</th>
+                            <th>No Rujukan</th>
+                            <th>Tarikh Tangguh</th>
+                            <th class="text-center">Action</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        
+                        @foreach ($tangguhlelong as $tangguhlel)
+                        <tr>
+                            <td>{{ $loop->iteration }}</td>
+                            <td>{{ $tangguhlel->kodcaw }}</td>
+                            <td>{{ $tangguhlel->norujukan }}</td>
+                            <td>{{ $tangguhlel->tarikhtangguh }}</td>
+                            <td>
+                            <a  href="{{ route('pengesahan.lelbidmarhun',$id) }}" data-toggle="tooltip" data-placement="top" title="Butiran" class="text-center" ><i class="far fa-edit"></i></a>
+                            </td>
+                        </tr>
+                        @endforeach
+                    </tbody>
+                </table>
+            </form>
+            <div class="modal-footer" style="margin-top:2%;">
+            <a  href="{{ route('pengesahan.senarailelong') }}" class="btn btn-primary">Kembali</a>
+            </div>
+        </div>
+        
+    </div>
+</div>
+<script>
+    //Enable tooltips everywhere
+    $(function () {
+        $('[data-toggle="tooltip"]').tooltip()
+    })
+
+    var tablelelong = $('#tablelelong').DataTable( {
+        "columnDefs": [ 
+            {
+            "targets": 0,
+            "orderable": false
+            }, 
+            {
+            "targets": 4,
+            "orderable": false
+            }
+        ],
+        order: [[1, 'asc']],
+        // "ordering": false,
+        "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: '<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();
+    $('.export').tooltip();
+    // $( '.dt-buttons').addClass('btn-group');
+    $( '.addsim').removeClass('dt-button');
+    $( '.export').removeClass('dt-button');
+
+    function selectall(cb) {
+        tablelelong.rows().nodes().to$().find('input[type="checkbox"]').each(function(){
+            $(this).prop('checked', cb.checked);
+        })
+    }
+</script>
+     
+@endsection
diff --git a/routes/web.php b/routes/web.php
index fca15acc..1fe7ce5b 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -152,7 +152,9 @@ Route::group(['middleware' => ['permission:pengesahan'],'prefix'=>'pengesahan'],
     Route::get('/mutumarhun/{pengesahan_id}/{norujukan}',['as'=>'pengesahan.mutumarhun','uses'=>'MarhunController@mutumarhun']);
     Route::post('/terimaperubahan',['as'=>'pengesahan.terimaperubahan','uses'=>'MarhunController@terimaperubahan']);
     Route::post('/pcdelete',['as'=>'pengesahan.pcdelete','uses'=>'MarhunController@pcdelete']);
-    Route::post('/senaraitangguhlelong',['as'=>'pengesahan.senaraitangguhlelong','uses'=>'MarhunController@senaraitangguhlelong']);
+    Route::get('/senarailelong',['as'=>'pengesahan.senarailelong','uses'=>'MarhunController@senarailelong']);
+    Route::get('/senaraitangguhlelong/{id}',['as'=>'pengesahan.senaraitangguhlelong','uses'=>'MarhunController@senaraitangguhlelong']);
+    Route::get('/lelbidmarhun/{id}',['as'=>'pengesahan.lelbidmarhun','uses'=>'MarhunController@lelbidmarhun']);
 });
 //Operasi
 

From d731a42a47a8f231c3b6fa6baca6c2b48e82dc3a Mon Sep 17 00:00:00 2001
From: faiqahzaman <91926774+faiqahzaman@users.noreply.github.com>
Date: Thu, 17 Mar 2022 16:22:42 +0800
Subject: [PATCH 2/6] pengesahan tambah, ubah, delete marhun

---
 app/Http/Controllers/MarhunController.php     |  78 +++++++------
 app/Models/Pengesahan.php                     |   3 +-
 ...2_03_07_061858_create_pengesahan_table.php |   6 +
 resources/views/includes/sidebar.blade.php    |   4 +-
 resources/views/marhun/marhun.blade.php       |   4 +-
 .../views/marhun/senaraimarhun.blade.php      |   2 +-
 .../views/pengesahan/mutumarhun.blade.php     |  13 ++-
 .../pengesahan/perubahanmutumarhun.blade.php  |  13 ++-
 .../senarailelongubahmutu.blade.php           | 104 ++++++++++++++++++
 routes/web.php                                |   9 +-
 10 files changed, 191 insertions(+), 45 deletions(-)
 create mode 100644 resources/views/pengesahan/senarailelongubahmutu.blade.php

diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php
index 13c59764..d0689ec7 100644
--- a/app/Http/Controllers/MarhunController.php
+++ b/app/Http/Controllers/MarhunController.php
@@ -100,6 +100,7 @@ class MarhunController extends Controller
                         $karat->norujukan = $lelongbid->norujukan;
                         $karat->diminta_oleh = $user->id;
                         $karat->diminta_pada = $currentdate;
+                        $karat->status_ubah = 1;
                         $karat->save();
                     }
                 }
@@ -124,19 +125,22 @@ class MarhunController extends Controller
         // }
     
 
-        return redirect()->route('marhun.show',$lelongbid->id)
+        return redirect()->route('marhun.show', [$lelongbid->id, $lelong->id])
                         ->with('success','Kemaskini Marhun Berjaya');
     }
 
-    public function show($id)
+    public function show($id, $lelong_id)
     {
         $lelongbid = LelongBid::where('id','=',$id)->first();
-        $marhun = LelongBidMarhun::where('lelongbid_id','=',$id)->get();
+        $marhun = LelongBidMarhun::join('lelongbid', 'lelongbidmarhun.lelongbid_id', '=', 'lelongbid.id')
+        ->where('lelongbid.id','=',$id)
+        ->where('lelongbid.lelong_id', $lelong_id)
+        ->get();
         $lelkarat = LelKarat::where('lelong_id','=',$lelongbid->lelong_id)->get();
         $karatall = JenisKarat::all();
         $emasall = JenisEmas::all();
         // dd($lelkarat);
-        return view('marhun.marhun',compact('marhun','lelongbid','karatall','emasall','lelkarat'));
+        return view('marhun.marhun',compact('marhun','lelongbid','karatall','emasall','lelkarat', 'lelong_id'));
     }
 
 
@@ -203,14 +207,12 @@ class MarhunController extends Controller
         $karat->norujukan = $lelongbid->norujukan;
         $karat->diminta_oleh = $user->id;
         $karat->diminta_pada = $currentdate;
+        $karat->status_ubah = 2;
         $karat->save();
 
         return redirect()->route('marhun.show',$lelongbid->id)
                         ->with('success','Marhun Berjaya Ditambah');
     }
-
-    //Operasi
-
         
     public function exportmarhundetails($lelong_id)
     {
@@ -261,37 +263,56 @@ class MarhunController extends Controller
 
     }
 
+    public function senarailelongubahmutu()
+    {
+        $lelong = Lelong::where('sts_lelong', 0)
+        ->get();
 
-    public function sahubahmutu(Request $request)
+        return view('pengesahan.senarailelongubahmutu',compact('lelong'));
+    }
+
+    public function sahubahmutu($id)
     {
         // dd($request->all());
-        $mutumarhun = Pengesahan::join('lelong', 'pengesahan.lelong_id', '=', 'lelong.id')
+        $mutumarhun = Lelong::join('pengesahan', 'lelong.id', '=', 'pengesahan.lelong_id')
+        ->where('lelong.id', $id)
         ->whereNull('disahkan_oleh')
         ->select(
+            'pengesahan.disahkan_oleh',
             'pengesahan.id as pengesahan_id',
             'pengesahan.norujukan',
+            'lelong.id',
             'lelong.tarikh_lelong',
-            'pengesahan.norujukan'
+            'lelong.harga_emas_asas',
+            'lelong.jbg',
+            'lelong.cajlelong'
         )
         ->get();
 
-        return view('pengesahan.perubahanmutumarhun', compact('mutumarhun'));
+        return view('pengesahan.perubahanmutumarhun', compact('mutumarhun', 'id'));
     }
 
-    public function mutumarhun($pengesahan_id, $norujukan)
+    public function mutumarhun($pengesahan_id, $norujukan, $id)
     {
         $pengesahan = Pengesahan::where('id', $pengesahan_id)
+        ->where('lelong_id', $id)
         ->where('norujukan', $norujukan)
         ->first();
 
         $marhuns = LelongBidMarhun::where('lelongbid_id', $pengesahan->lelongbid_id)
+        ->where('id', $pengesahan->lelongbidmarhun_id)
         ->get()->toArray();
 
         $lelongbid = LelongBid::where('id', $pengesahan->lelongbid_id)->first();
-        $karat = Lelkarat::where('lelong_id', $pengesahan->lelong_id)->get();
+        $karat = Lelkarat::where('lelong_id', $id)->get();
 
         foreach($marhuns as $index1=>$marhun)
-        {
+        {          
+            $status = Pengesahan::where('id', $pengesahan_id)
+            ->where('lelongbid_id', $marhun['lelongbid_id'])
+            ->select('status_ubah')
+            ->value('status_ubah');
+
             $gadaimarhun = GadaiMarhun::where('marhun', $marhun['marhun'])
             ->where('norujukan', $lelongbid->norujukan)
             ->first();
@@ -300,23 +321,16 @@ class MarhunController extends Controller
 
             $total = $karat->harga * $gadaimarhun->berat;
             $hargaasas = round($total); 
-            // if($gadaimarhun->karat == $marhun['karat'])
-            // {
-            //     $status = 0;
-            // }
-            // else
-            // {
-            //     $status = 1;
-            // }
+            
             $marhuns[$index1]['old_marhun'] = $gadaimarhun->marhun;
             $marhuns[$index1]['old_karat'] = $gadaimarhun->karat;
-            // $marhun[$index1]['status_perubahan'] = $status;
             $marhuns[$index1]['old_berat'] = $gadaimarhun->berat;
             $marhuns[$index1]['old_harga'] = $karat->harga;
             $marhuns[$index1]['old_nilaimarhun'] = $total;
             $marhuns[$index1]['old_hargaasas'] = $hargaasas;
+            $marhuns[$index1]['status_ubah'] = $status;
         }
-        return view('pengesahan.mutumarhun', compact('marhuns', 'lelongbid', 'pengesahan_id', 'norujukan'));
+        return view('pengesahan.mutumarhun', compact('marhuns', 'lelongbid', 'pengesahan_id', 'norujukan', 'id'));
     }
 
     public function terimaperubahan(Request $request)
@@ -362,26 +376,28 @@ class MarhunController extends Controller
         return redirect()->route('pengesahan.perubahanmutumarhun')->with('success','Pengesahan Mutu Marhun Berjaya');
     }
 
-    public function submitdelete($id){
+    public function submitdelete($id, $lelong_id){
 
         $user =  Auth::user();
-
+        
         $currentdate = Carbon::now();
         $currentdate = $currentdate->toDateTimeString();
-
+        
         $marhun = LelongBidMarhun::join('lelongbid', 'lelongbidmarhun.lelongbid_id', '=', 'lelongbid.id')
         ->where('lelongbid_id','=',$id)
-        ->get();
+        ->where('lelongbid.lelong_id', $lelong_id)
+        ->first();
 
         $pengesahan = new Pengesahan;
-        $pengesahan->lelong_id = $marhun->lelong_id;
-        $pengesahan->lelongbid = $id;
+        $pengesahan->lelong_id = $lelong_id;
+        $pengesahan->lelongbid_id = $id;
         $pengesahan->norujukan = $marhun->norujukan;
         $pengesahan->diminta_oleh = $user->id;
         $pengesahan->diminta_pada = $currentdate;
+        $pengesahan->status_ubah = 3;
         $pengesahan->save();
 
-        return redirect()->route('pengesahan.pcdelete',$lelongbid->id)
+        return redirect()->route('pengesahan.pcdelete',[$id, $lelong_id])
                         ->with('success','Permohonan Pengesahan Padam Marhun Telah Berjaya Dihantar');
          
     }
diff --git a/app/Models/Pengesahan.php b/app/Models/Pengesahan.php
index 9f48811e..cd242860 100644
--- a/app/Models/Pengesahan.php
+++ b/app/Models/Pengesahan.php
@@ -19,6 +19,7 @@ class Pengesahan extends Model
         'disahkan_pada',
         'diminta_oleh',
         'diminta_pada',
-        'status'
+        'status',
+        'status_ubah'
     ];
 }
diff --git a/database/migrations/2022_03_07_061858_create_pengesahan_table.php b/database/migrations/2022_03_07_061858_create_pengesahan_table.php
index 4758bf0a..98c764a4 100644
--- a/database/migrations/2022_03_07_061858_create_pengesahan_table.php
+++ b/database/migrations/2022_03_07_061858_create_pengesahan_table.php
@@ -17,12 +17,14 @@ class CreatePengesahanTable extends Migration
             $table->id();
             $table->unsignedBigInteger('lelong_id')->unsigned();
             $table->unsignedBigInteger('lelongbid_id')->unsigned();
+            $table->unsignedBigInteger('lelongbidmarhun_id')->unsigned();
             $table->string('norujukan');
             $table->integer('disahkan_oleh')->nullable();
             $table->datetime('disahkan_pada')->nullable();
             $table->integer('diminta_oleh');
             $table->datetime('diminta_pada');
             $table->integer('status')->default(0); //1 = terima
+            $table->integer('status_ubah')->default(0); //1 = ubah mutu, 2 = tambah marhun, 3 = hapus marhun
             $table->timestamps();
 
             $table->foreign('lelong_id')
@@ -32,6 +34,10 @@ class CreatePengesahanTable extends Migration
             $table->foreign('lelongbid_id')
                 ->references('id')->on('lelongbid')
                 ->onDelete('cascade');
+            
+                $table->foreign('lelongbidmarhun_id')
+                ->references('id')->on('lelongbidmarhun')
+                ->onDelete('cascade');
 
         });
     }
diff --git a/resources/views/includes/sidebar.blade.php b/resources/views/includes/sidebar.blade.php
index b357e879..55945b00 100644
--- a/resources/views/includes/sidebar.blade.php
+++ b/resources/views/includes/sidebar.blade.php
@@ -115,8 +115,8 @@
       <li class="{{ (request()->is('Pengesahan/*')) ? 'active' : '' }}">
         <a href="#pengesahanSubmenu" data-toggle="collapse" aria-expanded="false"  style="">Pengesahan</a>
         <ul class="list-unstyled collapse {{ (request()->is('pengesahan/*')) ? 'show' : '' }}" id="pengesahanSubmenu" >
-          <li class="{{ (request()->is('pengesahan/perubahanmutumarhun/*') || request()->is('pengesahan/perubahanmutumarhun') ) ? 'active' : '' }}">
-            <a href="{{url('pengesahan/perubahanmutumarhun')}}">Perubahan Mutu Marhun</a>
+          <li class="{{ (request()->is('pengesahan/senarailelongubahmutu/*') || request()->is('pengesahan/senarailelongubahmutu') ) ? 'active' : '' }}">
+            <a href="{{url('pengesahan/senarailelongubahmutu')}}">Senarai Perubahan Mutu Marhun</a>
           </li>
         </ul>
         <ul class="list-unstyled collapse {{ (request()->is('pengesahan/*')) ? 'show' : '' }}" id="pengesahanSubmenu" >
diff --git a/resources/views/marhun/marhun.blade.php b/resources/views/marhun/marhun.blade.php
index 4c0dea37..557ac1e4 100644
--- a/resources/views/marhun/marhun.blade.php
+++ b/resources/views/marhun/marhun.blade.php
@@ -44,7 +44,7 @@
                             <td>{{ $item->nota }}</td>
                             <td class="text-center">
                             <a  onclick="kemaskini(this)" data-idmarhun="{{ $item->id }}" data-marhun="{{ $item->marhun }}" data-karat="{{ $item->karat }}" data-berat="{{ $item->berat }}" data-harga="{{ $item->harga }}" data-nmarhun="{{ $item->n_marhun }}" data-hargaasas="{{ $item->hargaasas }}" data-nota="{{ $item->nota }}" data-toggle="tooltip" data-placement="top" title="Kemaskini Marhun" style="margin-right:30px"><i class="far fa-edit"></i></a>
-                            <a class="confirmdel" href="{{ route('marhun.submitdelete',$item->id) }}" data-toggle="tooltip" data-placement="top" title="Padam Marhun"><i class="far fa-trash-alt"></i></a>
+                            <a class="confirmdel" href="{{ route('marhun.submitdelete',[$item->id, $item->lelong_id]) }}" data-toggle="tooltip" data-placement="top" title="Padam Marhun"><i class="far fa-trash-alt"></i></a>
                             </td>
                         </tr>
                         @endforeach
@@ -53,7 +53,7 @@
                 </table>
             </form>
             <div class="modal-footer" style="margin-top:2%;">
-            <a  href="{{ route('marhun.senaraimarhun', $lelongbid) }}" style="width:7%;" class="btn btn-primary">Kembali</a>
+            <a  href="{{ route('marhun.senaraimarhun', $lelong_id) }}" style="width:7%;" class="btn btn-primary">Kembali</a>
             <a  href="{{ route('marhun.semak', $lelongbid) }}" style="width:7%;" class="btn btn-success">Semak</a>
             </div>
         </div>
diff --git a/resources/views/marhun/senaraimarhun.blade.php b/resources/views/marhun/senaraimarhun.blade.php
index 3a10f52d..f763a136 100644
--- a/resources/views/marhun/senaraimarhun.blade.php
+++ b/resources/views/marhun/senaraimarhun.blade.php
@@ -29,7 +29,7 @@
                             <td>{{ $bid->norujukan }}</td>
                             <td>{{ $bid->t_lelong }}</td>
                             <td class="text-center">
-                            <a  href="{{ route('marhun.show',$bid->id) }}" data-toggle="tooltip" data-placement="top" title="Senarai Marhun" ><i class="far fa-edit"></i></a>
+                            <a  href="{{ route('marhun.show', [$bid->id, $lelong_id]) }}" data-toggle="tooltip" data-placement="top" title="Senarai Marhun" ><i class="far fa-edit"></i></a>
                             </td>
                         </tr>
                         @endforeach
diff --git a/resources/views/pengesahan/mutumarhun.blade.php b/resources/views/pengesahan/mutumarhun.blade.php
index 91ff5b6f..ec17dcf8 100644
--- a/resources/views/pengesahan/mutumarhun.blade.php
+++ b/resources/views/pengesahan/mutumarhun.blade.php
@@ -8,6 +8,7 @@
                                 @csrf
                     <input type="hidden" name="pengesahan_id" value="{{ $pengesahan_id }}" />
                     <input type="hidden" name="norujukan" value="{{ $norujukan }}" />
+                    <input type="hidden" name="id" value="{{ $id }}" />
             
             @if ($message = Session::get('success'))
                 <div class="alert alert-success">
@@ -25,6 +26,7 @@
                             <th>Harga (RM)</th> 
                             <th>Nilai Marhun</th> 
                             <th>Harga Asas</th> 
+                            <th>Status</th> 
                         </tr>
                     </thead>
                     <tbody>
@@ -68,12 +70,21 @@
                                 @endif
                                 {{ $marhun['hargaasas'] }}
                             </td>
+                            <td>
+                                @if($marhun['status_ubah'] ==  1)
+                                    <button class="btn btn-warning btn-sm hovernone-warning" disabled>PERUBAHAN MUTU</button>
+                                @elseif($marhun['status_ubah'] == 2)
+                                    <button class="btn btn-warning btn-sm hovernone-warning" disabled>PENAMBAHAN MARHUN</button>
+                                @elseif($marhun['status_ubah'] == 3)
+                                    <button class="btn btn-warning btn-sm hovernone-warning" disabled>PENGHAPUSAN MARHUN</button>
+                                @endif
+                            </td>
                         </tr>
                         @endforeach
                     </tbody>
                 </table>
             <div class="modal-footer" style="margin-top:2%;">
-                <a  href="{{ route('pengesahan.perubahanmutumarhun') }}" class="btn btn-primary">Kembali</a>
+                <a  href="{{ route('pengesahan.perubahanmutumarhun', $id) }}" class="btn btn-primary">Kembali</a>
                 <button type="button" class="btn btn-success" onclick="functerima()" >Sahkan</button>
             </div>
         </form>
diff --git a/resources/views/pengesahan/perubahanmutumarhun.blade.php b/resources/views/pengesahan/perubahanmutumarhun.blade.php
index b0a0dd2f..e61b1b5e 100644
--- a/resources/views/pengesahan/perubahanmutumarhun.blade.php
+++ b/resources/views/pengesahan/perubahanmutumarhun.blade.php
@@ -14,8 +14,10 @@
                     <thead class="bg-primary text-white">
                         <tr>
                             <th>Bil</th>
-                            <th>Tarikh Lelong</th>
                             <th>No Rujukan</th>
+                            <th></th>
+                            <th>JBG</th>
+                            <th>Caj Lelong</th>
                             <th class="text-center">Action</th>
                         </tr>
                     </thead>
@@ -23,15 +25,20 @@
                         @foreach($mutumarhun as $marhun)
                         <tr>
                             <td>{{ $loop->iteration }}</td>
-                            <td>{{ $marhun['tarikh_lelong'] }}</td>
                             <td>{{ $marhun['norujukan'] }}</td>
+                            <td>{{ $marhun['harga_emas_asas'] }}</td>
+                            <td>{{ $marhun['jbg'] }}</td>
+                            <td>{{ $marhun['cajlelong'] }}</td>
                             <td>
-                                <a href=" {{ route('pengesahan.mutumarhun', ['pengesahan_id'=>$marhun['pengesahan_id'], 'norujukan'=>$marhun['norujukan'] ] ) }} " data-toggle="tooltip" data-placement="top" title="Butiran Mutu Marhun"><i class="far fa-edit"></i></a>
+                                <a href=" {{ route('pengesahan.mutumarhun', ['pengesahan_id'=>$marhun['pengesahan_id'], 'norujukan'=>$marhun['norujukan'], 'id'=>$marhun['id']]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Mutu Marhun"><i class="far fa-edit"></i></a>
                             </td>
                         </tr>
                         @endforeach
                     </tbody>
                 </table>
+            <div class="modal-footer" style="margin-top:2%;">
+            <a  href="{{ route('pengesahan.senarailelongubahmutu') }}" class="btn btn-primary">Kembali</a>
+            </div>
         </div>
     </div>
 </div>
diff --git a/resources/views/pengesahan/senarailelongubahmutu.blade.php b/resources/views/pengesahan/senarailelongubahmutu.blade.php
new file mode 100644
index 00000000..6caab9bd
--- /dev/null
+++ b/resources/views/pengesahan/senarailelongubahmutu.blade.php
@@ -0,0 +1,104 @@
+@extends('layouts.app')
+
+@section('content')
+<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>
+                </div>
+            @endif
+            <form id="exportform" action="" method="POST">
+                <input type="hidden" name="type" value="User">
+                <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>Tarikh Lelong</th>
+                            <th>Harga Emas Asas</th>
+                            <th>JBG</th>
+                            <th>Caj Lelong</th>
+                            <th class="text-center">Action</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        @foreach ($lelong 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>
+                                    <a  href="{{ route('pengesahan.perubahanmutumarhun', $lel->id) }}" data-toggle="tooltip" data-placement="top" title="Butiran" class="text-center" ><i class="far fa-edit"></i></a>
+                            </td>
+                        </tr>
+                        @endforeach
+                    </tbody>
+                </table>
+            </form>
+        </div>
+        
+    </div>
+</div>
+<script>
+    //Enable tooltips everywhere
+    $(function () {
+        $('[data-toggle="tooltip"]').tooltip()
+    })
+
+    var tablelelong = $('#tablelelong').DataTable( {
+        "columnDefs": [ 
+            {
+            "targets": 0,
+            "orderable": false
+            }, 
+            {
+            "targets": 5,
+            "orderable": false
+            }
+        ],
+        order: [[1, 'asc']],
+        // "ordering": false,
+        "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: '<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();
+    $('.export').tooltip();
+    // $( '.dt-buttons').addClass('btn-group');
+    $( '.addsim').removeClass('dt-button');
+    $( '.export').removeClass('dt-button');
+
+    function selectall(cb) {
+        tablelelong.rows().nodes().to$().find('input[type="checkbox"]').each(function(){
+            $(this).prop('checked', cb.checked);
+        })
+    }
+</script>
+     
+@endsection
diff --git a/routes/web.php b/routes/web.php
index 1fe7ce5b..d19db204 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -122,8 +122,8 @@ Route::group(['prefix'=>'lelong'], function () {
 Route::group(['middleware' => ['permission:semakanmarhun','permission:kemaskinimarhun'],'prefix'=>'marhun'], function () {
     Route::get('/senarailelongmarhun',['as'=>'marhun.senarailelongmarhun','uses'=>'MarhunController@senarailelongmarhun']); 
     Route::get('/senaraimarhun/{lelong_id}',['as'=>'marhun.senaraimarhun','uses'=>'MarhunController@index']); 
-    Route::get('/marhun/{id}',['as'=>'marhun.show','uses'=>'MarhunController@show']); 
-    Route::get('/submitdelete/{id}',['as'=>'marhun.submitdelete','uses'=>'MarhunController@submitdelete']); 
+    Route::get('/marhun/{id}/{lelong_id}',['as'=>'marhun.show','uses'=>'MarhunController@show']); 
+    Route::post('/submitdelete/{id}/{lelong_id}',['as'=>'marhun.submitdelete','uses'=>'MarhunController@submitdelete']); 
 
     Route::post('/kemaskini',['as'=>'marhun.kemaskini','uses'=>'MarhunController@kemaskini']); 
     Route::get('/semakan',['as'=>'marhun.semakan','uses'=>'MarhunController@semakan']); 
@@ -148,8 +148,9 @@ Route::group(['middleware' => ['permission:pengesahanpembida'],'prefix'=>'pembid
 });
 
 Route::group(['middleware' => ['permission:pengesahan'],'prefix'=>'pengesahan'], function () {
-    Route::get('/perubahanmutumarhun',['as'=>'pengesahan.perubahanmutumarhun','uses'=>'MarhunController@sahubahmutu']);
-    Route::get('/mutumarhun/{pengesahan_id}/{norujukan}',['as'=>'pengesahan.mutumarhun','uses'=>'MarhunController@mutumarhun']);
+    Route::get('/senarailelongubahmutu',['as'=>'pengesahan.senarailelongubahmutu','uses'=>'MarhunController@senarailelongubahmutu']); 
+    Route::get('/perubahanmutumarhun/{id}',['as'=>'pengesahan.perubahanmutumarhun','uses'=>'MarhunController@sahubahmutu']);
+    Route::get('/mutumarhun/{pengesahan_id}/{norujukan}/{id}',['as'=>'pengesahan.mutumarhun','uses'=>'MarhunController@mutumarhun']);
     Route::post('/terimaperubahan',['as'=>'pengesahan.terimaperubahan','uses'=>'MarhunController@terimaperubahan']);
     Route::post('/pcdelete',['as'=>'pengesahan.pcdelete','uses'=>'MarhunController@pcdelete']);
     Route::get('/senarailelong',['as'=>'pengesahan.senarailelong','uses'=>'MarhunController@senarailelong']);

From 436101bd27a8804103371c710493928a774b111b Mon Sep 17 00:00:00 2001
From: faiqahzaman <91926774+faiqahzaman@users.noreply.github.com>
Date: Sun, 20 Mar 2022 10:34:31 +0800
Subject: [PATCH 3/6] update marhun blade

---
 app/Http/Controllers/MarhunController.php | 9 ++++-----
 resources/views/marhun/marhun.blade.php   | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php
index d0689ec7..76f9a778 100644
--- a/app/Http/Controllers/MarhunController.php
+++ b/app/Http/Controllers/MarhunController.php
@@ -97,6 +97,7 @@ class MarhunController extends Controller
                         $karat = new Pengesahan;
                         $karat->lelong_id = $lelong->id;
                         $karat->lelongbid_id = $lelongbid->id;
+                        $karat->lelongbidmarhun_id = $marhun->id;
                         $karat->norujukan = $lelongbid->norujukan;
                         $karat->diminta_oleh = $user->id;
                         $karat->diminta_pada = $currentdate;
@@ -132,10 +133,7 @@ class MarhunController extends Controller
     public function show($id, $lelong_id)
     {
         $lelongbid = LelongBid::where('id','=',$id)->first();
-        $marhun = LelongBidMarhun::join('lelongbid', 'lelongbidmarhun.lelongbid_id', '=', 'lelongbid.id')
-        ->where('lelongbid.id','=',$id)
-        ->where('lelongbid.lelong_id', $lelong_id)
-        ->get();
+        $marhun = LelongBidMarhun::where('lelongbid_id','=',$id)->get();
         $lelkarat = LelKarat::where('lelong_id','=',$lelongbid->lelong_id)->get();
         $karatall = JenisKarat::all();
         $emasall = JenisEmas::all();
@@ -376,7 +374,7 @@ class MarhunController extends Controller
         return redirect()->route('pengesahan.perubahanmutumarhun')->with('success','Pengesahan Mutu Marhun Berjaya');
     }
 
-    public function submitdelete($id, $lelong_id){
+    public function submitdeletes($id, $lelong_id){
 
         $user =  Auth::user();
         
@@ -391,6 +389,7 @@ class MarhunController extends Controller
         $pengesahan = new Pengesahan;
         $pengesahan->lelong_id = $lelong_id;
         $pengesahan->lelongbid_id = $id;
+        $pengesahan->lelongbidmarhun_id = $marhun->lelongbidmarhun_id;
         $pengesahan->norujukan = $marhun->norujukan;
         $pengesahan->diminta_oleh = $user->id;
         $pengesahan->diminta_pada = $currentdate;
diff --git a/resources/views/marhun/marhun.blade.php b/resources/views/marhun/marhun.blade.php
index 557ac1e4..007898a9 100644
--- a/resources/views/marhun/marhun.blade.php
+++ b/resources/views/marhun/marhun.blade.php
@@ -44,7 +44,7 @@
                             <td>{{ $item->nota }}</td>
                             <td class="text-center">
                             <a  onclick="kemaskini(this)" data-idmarhun="{{ $item->id }}" data-marhun="{{ $item->marhun }}" data-karat="{{ $item->karat }}" data-berat="{{ $item->berat }}" data-harga="{{ $item->harga }}" data-nmarhun="{{ $item->n_marhun }}" data-hargaasas="{{ $item->hargaasas }}" data-nota="{{ $item->nota }}" data-toggle="tooltip" data-placement="top" title="Kemaskini Marhun" style="margin-right:30px"><i class="far fa-edit"></i></a>
-                            <a class="confirmdel" href="{{ route('marhun.submitdelete',[$item->id, $item->lelong_id]) }}" data-toggle="tooltip" data-placement="top" title="Padam Marhun"><i class="far fa-trash-alt"></i></a>
+                            <a class="confirmdel" href="{{ route('marhun.submitdelete',[$item->id, $lelong_id]) }}" data-toggle="tooltip" data-placement="top" title="Padam Marhun"><i class="far fa-trash-alt"></i></a>
                             </td>
                         </tr>
                         @endforeach

From e3e62f314347b17e881a8a43ff0b49e817689f96 Mon Sep 17 00:00:00 2001
From: faiqahzaman <91926774+faiqahzaman@users.noreply.github.com>
Date: Sun, 20 Mar 2022 13:29:49 +0800
Subject: [PATCH 4/6] tangguh lelong @ terima

---
 app/Http/Controllers/LelongController.php     |  1 +
 app/Http/Controllers/MarhunController.php     | 80 +++++++++++++------
 resources/views/marhun/marhun.blade.php       |  2 +-
 .../views/pengesahan/lelbidmarhun.blade.php   | 16 ++--
 .../views/pengesahan/mutumarhun.blade.php     | 28 +++++--
 .../pengesahan/senaraitangguhlelong.blade.php |  2 +-
 routes/web.php                                |  4 +-
 7 files changed, 93 insertions(+), 40 deletions(-)

diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php
index e468383f..184fd764 100644
--- a/app/Http/Controllers/LelongController.php
+++ b/app/Http/Controllers/LelongController.php
@@ -349,6 +349,7 @@ class LelongController extends Controller
     public function delete($id)
     {
         $lelong = Lelong::where('id','=',$id)->first();
+        
         // dd($role);
         $lelong->delete();
         return redirect()->route('lelong.senarailelong')
diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php
index 76f9a778..19b908b6 100644
--- a/app/Http/Controllers/MarhunController.php
+++ b/app/Http/Controllers/MarhunController.php
@@ -159,13 +159,15 @@ class MarhunController extends Controller
         return view('marhun.senarailelongmarhun',compact('senarai'));
     }
 
-    public function semak($id)
+    public function semak($id, $lelong_id)
     {
-        $lelongbid = LelongBid::where('id','=',$id)->first();
+        $lelongbid = LelongBid::where('id','=',$id)
+        ->where('lelong_id', $lelong_id)
+        ->first();
         $lelongbid->status_semak = 1;
         $lelongbid->save();
 
-        return redirect()->route('marhun.show',$lelongbid->id)
+        return redirect()->route('marhun.show',[ $lelongbid->id, $lelong_id ])
                         ->with('success','Semakan Marhun Berjaya');
     }
 
@@ -333,6 +335,7 @@ class MarhunController extends Controller
 
     public function terimaperubahan(Request $request)
     {
+        // dd($request->all());
         //update mutu marhun - gadaimarhun
         $user =  Auth::user();
 
@@ -344,6 +347,7 @@ class MarhunController extends Controller
         $pengesahan->disahkan_oleh = $user->id;
         $pengesahan->disahkan_pada = $currentdate;
         $pengesahan->update();
+        // dd($pengesahan);
 
         $gadaimarhun = GadaiMarhun::where('norujukan', $pengesahan->norujukan)->delete();
         $lelongbidmarhun = LelongBidMarhun::where('lelongbid_id', $pengesahan->lelongbid_id)->get();
@@ -359,19 +363,50 @@ class MarhunController extends Controller
             $newmarhun->save();
         }
 
-        //update status lelongbidmarhun = tangguh
+        if($request->jenis_button == "terima")
+        {   
+            $lelongbidmarhuns = LelongBidMarhun::join('pengesahan', 'lelongbidmarhun.lelongbid_id', '=', 'pengesahan.lelongbid_id')
+            ->where('pengesahan.lelongbid_id', $pengesahan->lelongbid_id)
+            ->where('pengesahan.id', $request->pengesahan_id)
+            ->get();
 
-        $tangguhlelong = new TangguhLelong;
-        $tangguhlelong->lelong_id = $pengesahan->lelong_id;
-        $tangguhlelong->lelongbid_id = $pengesahan->lelongbid_id;
-        $tangguhlelong->norujukan = $pengesahan->norujukan;
-        $tangguhlelong->tarikhtangguh = $currentdate;
-        $tangguhlelong->ditangguh_oleh = $user->id;
-        $tangguhlelong->ditangguh_pada = $currentdate;
-        $tangguhlelong->nota = 'Ditangguh Kerana Perubahan Mutu/Karat Marhun';
-        $tangguhlelong->save(); 
+            foreach($lelongbidmarhuns as $bidmarhuns)
+            {
+                if($bidmarhuns->status_ubah == 3)
+                {
+                    $bidmarhuns->delete();
+                }
+                else
+                {
+                    $bidmarhuns->bil = $bidmarhun->bil;
+                    $bidmarhuns->marhun = $bidmarhun->marhun;
+                    $bidmarhuns->nota = $bidmarhun->nota;
+                    $bidmarhuns->karat = $bidmarhun->karat;
+                    $bidmarhuns->berat = $bidmarhun->berat;
+                    $bidmarhuns->update();
+                }
+            }
+        }
 
-        return redirect()->route('pengesahan.perubahanmutumarhun')->with('success','Pengesahan Mutu Marhun Berjaya');
+        else if($request->jenis_button == "tangguhlelong")
+        {
+             //add into table tangguhlelong
+             $tangguhlelong = new TangguhLelong;
+             $tangguhlelong->lelong_id = $pengesahan->lelong_id;
+             $tangguhlelong->lelongbid_id = $pengesahan->lelongbid_id;
+             $tangguhlelong->norujukan = $pengesahan->norujukan;
+             $tangguhlelong->tarikhtangguh = $currentdate;
+             $tangguhlelong->ditangguh_oleh = $user->id;
+             $tangguhlelong->ditangguh_pada = $currentdate;
+             $tangguhlelong->nota = 'Ditangguh Kerana Perubahan Mutu/Karat Marhun';
+             $tangguhlelong->save(); 
+             
+             $lelongbidmarhun = LelongBidMarhun::where('lelongbid_id', $pengesahan->lelongbid_id)->delete();
+        }
+
+        $this->pcdelete($request->pengesahan_id);
+
+        return redirect()->route('pengesahan.senarailelongubahmutu')->with('success','Pengesahan Mutu Marhun Berjaya');
     }
 
     public function submitdeletes($id, $lelong_id){
@@ -412,11 +447,6 @@ class MarhunController extends Controller
         ->select('pengesahan.id as pengesahan_id')
         ->first();
 
-        if($pengesahan != null)
-        {
-            $lelongbidmarhun->delete();
-        }
-
         $lelongbid = LelongBid::where('id', $lelongbidmarhun->lelongbid_id)->first();
         // dd($lelongbid);
         $txtmarhun = ",1 " . $lelongbidmarhun->marhun ;
@@ -426,8 +456,8 @@ class MarhunController extends Controller
         $lelongbid->hargaasas = $lelongbid->hargaasas - $lelongbidmarhun->harga_asastambahan;
         $lelongbid->save();
 
-        return redirect()->route('pengesahan.perubahanmutumarhun')
-        ->with('success','Pengesahan Padam Marhun Telah Berjaya');
+        // return redirect()->route('pengesahan.perubahanmutumarhun')
+        // ->with('success','Pengesahan Padam Marhun Telah Berjaya');
     }
 
     public function senarailelong()
@@ -445,16 +475,18 @@ class MarhunController extends Controller
         ->get();
 
         return view('pengesahan.senaraitangguhlelong',compact('tangguhlelong','id'));
-
     }
 
-    public function lelbidmarhun($id)
+    public function lelbidmarhun($id, $norujukan)
     {
         $marhuns = LelongBidMarhun::join('tangguhlelong', 'lelongbidmarhun.lelongbid_id', '=', 'tangguhlelong.lelongbid_id')
         ->where('tangguhlelong.lelong_id', $id)
+        ->where('tangguhlelong.norujukan', $norujukan)
         ->get();
 
-        return view('pengesahan.lelbidmarhun',compact('marhuns'));
+        $status = Pengesahan::where('lelong_id', $id)->where('norujukan', $norujukan)->first();
+
+        return view('pengesahan.lelbidmarhun',compact('marhuns', 'id', 'norujukan', 'status'));
 
     }
     
diff --git a/resources/views/marhun/marhun.blade.php b/resources/views/marhun/marhun.blade.php
index 007898a9..8710bb14 100644
--- a/resources/views/marhun/marhun.blade.php
+++ b/resources/views/marhun/marhun.blade.php
@@ -54,7 +54,7 @@
             </form>
             <div class="modal-footer" style="margin-top:2%;">
             <a  href="{{ route('marhun.senaraimarhun', $lelong_id) }}" style="width:7%;" class="btn btn-primary">Kembali</a>
-            <a  href="{{ route('marhun.semak', $lelongbid) }}" style="width:7%;" class="btn btn-success">Semak</a>
+            <a  href="{{ route('marhun.semak', [ $lelongbid, $lelong_id ]) }}" style="width:7%;" class="btn btn-success">Semak</a>
             </div>
         </div>
         
diff --git a/resources/views/pengesahan/lelbidmarhun.blade.php b/resources/views/pengesahan/lelbidmarhun.blade.php
index 810fd0bc..f519364a 100644
--- a/resources/views/pengesahan/lelbidmarhun.blade.php
+++ b/resources/views/pengesahan/lelbidmarhun.blade.php
@@ -25,7 +25,6 @@
                             <th>Harga Asas</th>
                             <th>Nota</th>
                             <th>Status</th>
-                            <th class="text-center">Action</th>
                         </tr>
                     </thead>
                     <tbody>
@@ -41,14 +40,23 @@
                             <td>{{ $marhun->n_marhun }}</td>
                             <td>{{ $marhun->hargaasas }}</td>
                             <td>{{ $marhun->nota }}</td>
-                            <td></td>
                             <td>
+                                @if($status->status_ubah ==  1)
+                                    <button class="btn btn-warning btn-sm hovernone-warning" disabled>PERUBAHAN MUTU</button>
+                                @elseif($status->status_ubah == 2)
+                                    <button class="btn btn-warning btn-sm hovernone-warning" disabled>PENAMBAHAN MARHUN</button>
+                                @elseif($status->status_ubah == 3)
+                                    <button class="btn btn-warning btn-sm hovernone-warning" disabled>PENGHAPUSAN MARHUN</button>
+                                @endif
                             </td>
                         </tr>
                         @endforeach
                     </tbody>
                 </table>
             </form>
+            <div class="modal-footer" style="margin-top:2%;">
+            <a  href="{{ route('pengesahan.senaraitangguhlelong', $id) }}" class="btn btn-primary">Kembali</a>
+            </div>
         </div>
         
     </div>
@@ -68,10 +76,6 @@
             {
             "targets": 9,
             "orderable": false
-            },
-            {
-            "targets": 10,
-            "orderable": false
             }
         ],
         order: [[1, 'asc']],
diff --git a/resources/views/pengesahan/mutumarhun.blade.php b/resources/views/pengesahan/mutumarhun.blade.php
index ec17dcf8..33b9ff82 100644
--- a/resources/views/pengesahan/mutumarhun.blade.php
+++ b/resources/views/pengesahan/mutumarhun.blade.php
@@ -8,7 +8,8 @@
                                 @csrf
                     <input type="hidden" name="pengesahan_id" value="{{ $pengesahan_id }}" />
                     <input type="hidden" name="norujukan" value="{{ $norujukan }}" />
-                    <input type="hidden" name="id" value="{{ $id }}" />
+                    <input type="hidden" name="lelong_id" value="{{ $id }}" />
+                    <input type="hidden" name="jenis_button" value="terima" id="jenis_button" />
             
             @if ($message = Session::get('success'))
                 <div class="alert alert-success">
@@ -85,7 +86,8 @@
                 </table>
             <div class="modal-footer" style="margin-top:2%;">
                 <a  href="{{ route('pengesahan.perubahanmutumarhun', $id) }}" class="btn btn-primary">Kembali</a>
-                <button type="button" class="btn btn-success" onclick="functerima()" >Sahkan</button>
+                <button type="button" class="btn btn-danger" onclick="functerima(this)" id="tangguhlelong" >Tangguh Lelong</button>
+                <button type="button" class="btn btn-success" onclick="functerima(this)" id="terima" >Terima</button>
             </div>
         </form>
         </div>
@@ -96,15 +98,29 @@
     $(function () {
         $('[data-toggle="tooltip"]').tooltip()
     })
-    function functerima(){
-        $("#formmutumarhun").submit();
+    function functerima(e){
+        let jenis=event.target.id;
+        if(jenis == "terima")
+        {
+            $('#jenis_button').val(jenis);
+            $("#formmutumarhun").submit();
+        }
+        else if(jenis == "tangguhlelong")
+        {
+            $('#jenis_button').val(jenis);
+            $("#formmutumarhun").submit();
+        }
     }
 
-    var tablelelong = $('#tablelelong').DataTable( {
+    var tablemutumarhun = $('#tablemutumarhun').DataTable( {
         "columnDefs": [ 
             {
             "targets": 0,
             "orderable": false
+            },
+            {
+            "targets": 8,
+            "orderable": false
             }
         ],
         order: [[1, 'asc']],
@@ -143,7 +159,7 @@
     // $( '.export').removeClass('dt-button');
 
     // function selectall(cb) {
-    //     tablelelong.rows().nodes().to$().find('input[type="checkbox"]').each(function(){
+    //     tablemutumarhun.rows().nodes().to$().find('input[type="checkbox"]').each(function(){
     //         $(this).prop('checked', cb.checked);
     //     })
     // }
diff --git a/resources/views/pengesahan/senaraitangguhlelong.blade.php b/resources/views/pengesahan/senaraitangguhlelong.blade.php
index 4070526e..2e838123 100644
--- a/resources/views/pengesahan/senaraitangguhlelong.blade.php
+++ b/resources/views/pengesahan/senaraitangguhlelong.blade.php
@@ -31,7 +31,7 @@
                             <td>{{ $tangguhlel->norujukan }}</td>
                             <td>{{ $tangguhlel->tarikhtangguh }}</td>
                             <td>
-                            <a  href="{{ route('pengesahan.lelbidmarhun',$id) }}" data-toggle="tooltip" data-placement="top" title="Butiran" class="text-center" ><i class="far fa-edit"></i></a>
+                            <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>
                         </tr>
                         @endforeach
diff --git a/routes/web.php b/routes/web.php
index d19db204..216235f3 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -127,7 +127,7 @@ Route::group(['middleware' => ['permission:semakanmarhun','permission:kemaskinim
 
     Route::post('/kemaskini',['as'=>'marhun.kemaskini','uses'=>'MarhunController@kemaskini']); 
     Route::get('/semakan',['as'=>'marhun.semakan','uses'=>'MarhunController@semakan']); 
-    Route::get('/semak/{id}',['as'=>'marhun.semak','uses'=>'MarhunController@semak']);
+    Route::get('/semak/{id}/{lelong_id}',['as'=>'marhun.semak','uses'=>'MarhunController@semak']);
     Route::post('/tambahmarhun',['as'=>'marhun.tambahmarhun','uses'=>'MarhunController@tambahmarhun']);
     Route::get('/exportmarhundetails/{lelong_id}',['as'=>'marhun.exportmarhundetails','uses'=>'MarhunController@exportmarhundetails']);
 
@@ -155,7 +155,7 @@ Route::group(['middleware' => ['permission:pengesahan'],'prefix'=>'pengesahan'],
     Route::post('/pcdelete',['as'=>'pengesahan.pcdelete','uses'=>'MarhunController@pcdelete']);
     Route::get('/senarailelong',['as'=>'pengesahan.senarailelong','uses'=>'MarhunController@senarailelong']);
     Route::get('/senaraitangguhlelong/{id}',['as'=>'pengesahan.senaraitangguhlelong','uses'=>'MarhunController@senaraitangguhlelong']);
-    Route::get('/lelbidmarhun/{id}',['as'=>'pengesahan.lelbidmarhun','uses'=>'MarhunController@lelbidmarhun']);
+    Route::get('/lelbidmarhun/{id}/{norujukan}',['as'=>'pengesahan.lelbidmarhun','uses'=>'MarhunController@lelbidmarhun']);
 });
 //Operasi
 

From 15753afcff18148c330671389fc877de5e4e40e6 Mon Sep 17 00:00:00 2001
From: faiqahzaman <91926774+faiqahzaman@users.noreply.github.com>
Date: Sun, 20 Mar 2022 17:02:58 +0800
Subject: [PATCH 5/6] tangguh lelong

edit add delete siappppp
---
 app/Http/Controllers/LelongController.php |  6 +-
 app/Http/Controllers/MarhunController.php | 69 ++++++++++++++++-------
 resources/views/marhun/marhun.blade.php   | 17 ++++--
 routes/web.php                            |  2 +-
 4 files changed, 65 insertions(+), 29 deletions(-)

diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php
index 184fd764..a5e82712 100644
--- a/app/Http/Controllers/LelongController.php
+++ b/app/Http/Controllers/LelongController.php
@@ -32,9 +32,6 @@ use App\Models\LelKarat_temp;
 use App\Models\Resit;
 use Carbon\Carbon;
 
-
-
-
 class LelongController extends Controller
 {
     /**
@@ -349,9 +346,10 @@ class LelongController extends Controller
     public function delete($id)
     {
         $lelong = Lelong::where('id','=',$id)->first();
-        
         // dd($role);
         $lelong->delete();
+
+        // $gadai = Gadai::
         return redirect()->route('lelong.senarailelong')
                         ->with('success','Padam Lelong Berjaya');
     }
diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php
index 19b908b6..241a3253 100644
--- a/app/Http/Controllers/MarhunController.php
+++ b/app/Http/Controllers/MarhunController.php
@@ -347,7 +347,6 @@ class MarhunController extends Controller
         $pengesahan->disahkan_oleh = $user->id;
         $pengesahan->disahkan_pada = $currentdate;
         $pengesahan->update();
-        // dd($pengesahan);
 
         $gadaimarhun = GadaiMarhun::where('norujukan', $pengesahan->norujukan)->delete();
         $lelongbidmarhun = LelongBidMarhun::where('lelongbid_id', $pengesahan->lelongbid_id)->get();
@@ -401,61 +400,93 @@ class MarhunController extends Controller
              $tangguhlelong->nota = 'Ditangguh Kerana Perubahan Mutu/Karat Marhun';
              $tangguhlelong->save(); 
              
-             $lelongbidmarhun = LelongBidMarhun::where('lelongbid_id', $pengesahan->lelongbid_id)->delete();
+            //  $lelongbidmarhun = LelongBidMarhun::where('lelongbid_id', $pengesahan->lelongbid_id)->delete();
         }
 
-        $this->pcdelete($request->pengesahan_id);
+        $this->pcdelete($request->pengesahan_id, $pengesahan->lelongbid_id);
+
+        // $lelongbidmarhunlast = LelongBidMarhun::where('lelongbid_id', $pengesahan->lelongbid_id)->get();
+        
+        // $pengesahanlast = Pengesahan::join('lelongbidmarhun', 'pengesahan.lelongbid_id', '=', 'lelongbidmarhun.lelongbid_id')
+        // ->where('lelongbidmarhun.id', $lelongbidmarhunlast->id)
+        // ->where('lelongbid_id', $pengesahan->lelongbid_id)
+        // ->where('pengesahan.id',  $request->pengesahan_id)
+        // ->first();
+
+        // $marhun = LelongBidMarhun::join('lelongbid', 'lelongbidmarhun.lelongbid_id', '=', 'lelongbid.id')
+        // ->where('lelongbid_id','=', $pengesahan->lelongbid_id)
+        // ->get();
+
+        // $lelongbid = LelongBid::where('lelongbid_id', $lelongbidmarhunlast->lelongbid_id)->first();
+        // $txtmarhun = ",1 " . $lelongbidmarhunlast->marhun ;
+        // $lelongbid->marhun = str_replace( $txtmarhun,"",$lelongbid->marhun);
+        // $lelongbid->berat = $lelongbid->berat - $lelongbidmarhunlast->berat_emastambahan;
+        // $lelongbid->hargaasas = $lelongbid->hargaasas - $lelongbidmarhunlast->harga_asastambahan;
+        // $lelongbid->save();
 
         return redirect()->route('pengesahan.senarailelongubahmutu')->with('success','Pengesahan Mutu Marhun Berjaya');
     }
 
-    public function submitdeletes($id, $lelong_id){
+    public function submitdelete(Request $request){
 
+        // dd($request->all());
         $user =  Auth::user();
         
         $currentdate = Carbon::now();
         $currentdate = $currentdate->toDateTimeString();
+
         
         $marhun = LelongBidMarhun::join('lelongbid', 'lelongbidmarhun.lelongbid_id', '=', 'lelongbid.id')
-        ->where('lelongbid_id','=',$id)
-        ->where('lelongbid.lelong_id', $lelong_id)
+        ->where('lelongbidmarhun.id','=',$request->lelongbidmarhun_id)
+        ->where('lelongbid.id', $request->lelongbid_id)
         ->first();
 
+        $id = $request->lelongbid_id;
+        $lelong_id = $marhun->lelong_id;
+        
         $pengesahan = new Pengesahan;
-        $pengesahan->lelong_id = $lelong_id;
-        $pengesahan->lelongbid_id = $id;
-        $pengesahan->lelongbidmarhun_id = $marhun->lelongbidmarhun_id;
+        $pengesahan->lelong_id = $marhun->lelong_id;
+        $pengesahan->lelongbid_id = $request->lelongbid_id;
+        $pengesahan->lelongbidmarhun_id = $request->lelongbidmarhun_id;
         $pengesahan->norujukan = $marhun->norujukan;
         $pengesahan->diminta_oleh = $user->id;
         $pengesahan->diminta_pada = $currentdate;
         $pengesahan->status_ubah = 3;
         $pengesahan->save();
 
-        return redirect()->route('pengesahan.pcdelete',[$id, $lelong_id])
+        return redirect()->route('marhun.show', compact('id', 'lelong_id'))
                         ->with('success','Permohonan Pengesahan Padam Marhun Telah Berjaya Dihantar');
          
     }
 
-    public function pcdelete($id)
+    public function pcdelete($id, $lelongbid_id)
     {
-        $lelongbidmarhun = LelongBidMarhun::where('id', $id)->first();
-        
-        //save in table pengesahan first  
+        $lelongbidmarhun = LelongBidMarhun::where('lelongbid_id', $lelongbid_id)->first();
+
         $pengesahan = Pengesahan::join('lelongbidmarhun', 'pengesahan.lelongbid_id', '=', 'lelongbidmarhun.lelongbid_id')
-        ->where('lelongbidmarhun.id', $id)
-        ->where('lelongbid_id', $lelongbid_id)
+        ->where('pengesahan.lelongbidmarhun_id', $lelongbidmarhun->id)
+        ->where('pengesahan.lelongbid_id', $lelongbid_id)
         ->select('pengesahan.id as pengesahan_id')
         ->first();
 
-        $lelongbid = LelongBid::where('id', $lelongbidmarhun->lelongbid_id)->first();
-        // dd($lelongbid);
+        if($pengesahan != null)
+        {
+            $lelongbidmarhun->delete();
+        }
+
+        $marhun = LelongBidMarhun::join('lelongbid', 'lelongbidmarhun.lelongbid_id', '=', 'lelongbid.id')
+        ->where('lelongbid_id','=',$lelongbid_id)
+        ->get();
+
+        $lelongbid = LelongBid::where('id', $lelongbid_id)->first();
         $txtmarhun = ",1 " . $lelongbidmarhun->marhun ;
         $lelongbid->marhun = str_replace( $txtmarhun,"",$lelongbid->marhun);
-        // $lelongbid->marhun = $lelongbid->marhun ."1 " . $request->marhuntambahan . "," ;
         $lelongbid->berat = $lelongbid->berat - $lelongbidmarhun->berat_emastambahan;
         $lelongbid->hargaasas = $lelongbid->hargaasas - $lelongbidmarhun->harga_asastambahan;
         $lelongbid->save();
 
+         $marhundelete = LelongBidMarhun::where('lelongbid_id', $pengesahan->lelongbid_id)->delete();
+
         // return redirect()->route('pengesahan.perubahanmutumarhun')
         // ->with('success','Pengesahan Padam Marhun Telah Berjaya');
     }
diff --git a/resources/views/marhun/marhun.blade.php b/resources/views/marhun/marhun.blade.php
index 8710bb14..3fac747b 100644
--- a/resources/views/marhun/marhun.blade.php
+++ b/resources/views/marhun/marhun.blade.php
@@ -10,10 +10,11 @@
                     <p>{{ $message }}</p>
                 </div>
             @endif
-            <form id="exportform"  method="POST">
+            <form id="formdelete" action="{{ route('marhun.submitdelete') }}" method="POST">
                 @csrf
                 <input type="hidden" name="type" value="User">
-                <input type="hidden" name="lelongbid" value="{{ $lelongbid->id }}">
+                <input type="hidden" name="lelongbidmarhun_id" id="lelongbidmarhun_id">
+                <input type="hidden" name="lelongbid_id" id="lelongbid_id">
                 <table class="table table-striped  table-xl" id="marhun" style="width:100%">
                     <thead class="bg-primary text-white">
                         <tr>
@@ -44,7 +45,7 @@
                             <td>{{ $item->nota }}</td>
                             <td class="text-center">
                             <a  onclick="kemaskini(this)" data-idmarhun="{{ $item->id }}" data-marhun="{{ $item->marhun }}" data-karat="{{ $item->karat }}" data-berat="{{ $item->berat }}" data-harga="{{ $item->harga }}" data-nmarhun="{{ $item->n_marhun }}" data-hargaasas="{{ $item->hargaasas }}" data-nota="{{ $item->nota }}" data-toggle="tooltip" data-placement="top" title="Kemaskini Marhun" style="margin-right:30px"><i class="far fa-edit"></i></a>
-                            <a class="confirmdel" href="{{ route('marhun.submitdelete',[$item->id, $lelong_id]) }}" data-toggle="tooltip" data-placement="top" title="Padam Marhun"><i class="far fa-trash-alt"></i></a>
+                            <a class="confirmdel" id="btndelete" data-lelongbidmarhun="{{ $item->id }}" data-lelongbid="{{ $item->lelongbid_id }}" data-toggle="tooltip" data-placement="top" title="Padam Marhun"><i class="far fa-trash-alt"></i></a>
                             </td>
                         </tr>
                         @endforeach
@@ -192,8 +193,14 @@
         buttons: {
             Delete: {
                 btnClass: 'btn-warning',
-                action: function () {
-                    location.href = this.$target.attr('href');
+                action: function (e) {
+                    // location.href = this.$target.attr('href');
+                    let lelongbidmarhun = $(this)[0].$target[0].dataset.lelongbidmarhun;
+                    let lelongbid = $(this)[0].$target[0].dataset.lelongbid;
+                    $('#lelongbid_id').val(lelongbid);
+                    $('#lelongbidmarhun_id').val(lelongbidmarhun);
+                    $("#formdelete").submit();
+
                 }
             },  
             Batal: {
diff --git a/routes/web.php b/routes/web.php
index 216235f3..d391365e 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -123,7 +123,7 @@ Route::group(['middleware' => ['permission:semakanmarhun','permission:kemaskinim
     Route::get('/senarailelongmarhun',['as'=>'marhun.senarailelongmarhun','uses'=>'MarhunController@senarailelongmarhun']); 
     Route::get('/senaraimarhun/{lelong_id}',['as'=>'marhun.senaraimarhun','uses'=>'MarhunController@index']); 
     Route::get('/marhun/{id}/{lelong_id}',['as'=>'marhun.show','uses'=>'MarhunController@show']); 
-    Route::post('/submitdelete/{id}/{lelong_id}',['as'=>'marhun.submitdelete','uses'=>'MarhunController@submitdelete']); 
+    Route::post('/submitdelete',['as'=>'marhun.submitdelete','uses'=>'MarhunController@submitdelete']); 
 
     Route::post('/kemaskini',['as'=>'marhun.kemaskini','uses'=>'MarhunController@kemaskini']); 
     Route::get('/semakan',['as'=>'marhun.semakan','uses'=>'MarhunController@semakan']); 

From d4ab35880fb57f40b5700ce7a6bc839719ed6e6d Mon Sep 17 00:00:00 2001
From: faiqahzaman <91926774+faiqahzaman@users.noreply.github.com>
Date: Mon, 21 Mar 2022 12:05:49 +0800
Subject: [PATCH 6/6] update taglel

---
 app/Http/Controllers/LelongController.php      | 11 ++++++++++-
 app/Http/Controllers/MarhunController.php      | 15 ++++++++-------
 resources/views/lelong/senarailelong.blade.php |  8 +++++++-
 3 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php
index a5e82712..85c18f19 100644
--- a/app/Http/Controllers/LelongController.php
+++ b/app/Http/Controllers/LelongController.php
@@ -345,11 +345,20 @@ class LelongController extends Controller
 
     public function delete($id)
     {
+        $lelongbid = LelongBid::where('lelong_id', $id)
+        ->get()->toArray();
+        
+        foreach($lelongbid as $bid)
+        {
+            $gadai = Gadai::where('norujukan', $bid['norujukan'])->first();
+            $gadai->taglel = 0;
+            $gadai->update();            
+        }
+
         $lelong = Lelong::where('id','=',$id)->first();
         // dd($role);
         $lelong->delete();
 
-        // $gadai = Gadai::
         return redirect()->route('lelong.senarailelong')
                         ->with('success','Padam Lelong Berjaya');
     }
diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php
index 241a3253..bc5c882e 100644
--- a/app/Http/Controllers/MarhunController.php
+++ b/app/Http/Controllers/MarhunController.php
@@ -469,23 +469,24 @@ class MarhunController extends Controller
         ->select('pengesahan.id as pengesahan_id')
         ->first();
 
-        if($pengesahan != null)
-        {
-            $lelongbidmarhun->delete();
-        }
-
+        
         $marhun = LelongBidMarhun::join('lelongbid', 'lelongbidmarhun.lelongbid_id', '=', 'lelongbid.id')
         ->where('lelongbid_id','=',$lelongbid_id)
         ->get();
-
+        
         $lelongbid = LelongBid::where('id', $lelongbid_id)->first();
         $txtmarhun = ",1 " . $lelongbidmarhun->marhun ;
         $lelongbid->marhun = str_replace( $txtmarhun,"",$lelongbid->marhun);
         $lelongbid->berat = $lelongbid->berat - $lelongbidmarhun->berat_emastambahan;
         $lelongbid->hargaasas = $lelongbid->hargaasas - $lelongbidmarhun->harga_asastambahan;
         $lelongbid->save();
+        
+        if($pengesahan != null)
+        {
+            $lelongbidmarhun->delete();
+        }
 
-         $marhundelete = LelongBidMarhun::where('lelongbid_id', $pengesahan->lelongbid_id)->delete();
+        $marhundelete = LelongBidMarhun::where('lelongbid_id', $pengesahan->lelongbid_id)->delete();
 
         // return redirect()->route('pengesahan.perubahanmutumarhun')
         // ->with('success','Pengesahan Padam Marhun Telah Berjaya');
diff --git a/resources/views/lelong/senarailelong.blade.php b/resources/views/lelong/senarailelong.blade.php
index 52363bb3..32afb642 100644
--- a/resources/views/lelong/senarailelong.blade.php
+++ b/resources/views/lelong/senarailelong.blade.php
@@ -50,7 +50,13 @@
                                     <a class="stoplelong" href="{{ route('lelong.stop',$lel->id) }}" data-toggle="tooltip" data-placement="top" title="Tamat Lelong"><i class="fa fa-stop"></i></a>
                                 @endif
                             @endhasrole
-
+                            @hasrole('operasi')
+                                
+                                @if($lel->sts_lelong == 0)
+                                    <a  href="{{ route('lelong.show',$lel->id) }}" data-toggle="tooltip" data-placement="top" title="Butiran" style="margin-right:40px" ><i class="far fa-edit"></i></a>
+                                    <a class="confirmdel" href="{{ route('lelong.delete',$lel->id) }}" data-toggle="tooltip" data-placement="top" title="Padam" ><i class="far fa-trash-alt"></i></a>
+                                @endif
+                            @endhasrole
                             </td>
                         </tr>
                         @endforeach