From 3c2fdd07a774d9c2bef7fd622e9eaff7beac4856 Mon Sep 17 00:00:00 2001
From: Amir <amirhassan.hamzan@gmail.com>
Date: Tue, 23 Aug 2022 07:56:19 +0800
Subject: [PATCH] add file upload, function null

---
 resources/views/marhun/marhun.blade.php       | 544 ++++++++++--------
 .../views/marhun/senaraimarhun.blade.php      | 320 ++++++-----
 .../views/pengesahan/mutumarhun.blade.php     |   3 +-
 3 files changed, 475 insertions(+), 392 deletions(-)

diff --git a/resources/views/marhun/marhun.blade.php b/resources/views/marhun/marhun.blade.php
index eb4b03b4..e61c55dd 100644
--- a/resources/views/marhun/marhun.blade.php
+++ b/resources/views/marhun/marhun.blade.php
@@ -4,11 +4,11 @@
 <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>
+            <div class="alert alert-success">
+                <p>{{ $message }}</p>
+            </div>
             @endif
             <form id="formdelete" action="{{ route('marhun.submitdelete') }}" method="POST">
                 @csrf
@@ -22,237 +22,296 @@
                 <input type="hidden" name="lelongbidmarhun_id" id="lelongbidmarhun_id">
                 <input type="hidden" name="lelongbid_id" id="lelongbid_id">
             </form>
-                <br>
-                <h4> No Rujukan :  <td>{{ $lelongbid->norujukan }}</td></h4>
-                <br>
-                <table class="table table-striped  table-xl" id="marhun" style="width:100%">
-                    <thead class="bg-primary text-white">
-                        <tr>
-                            <th  class="text-center">Barang</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 class="text-center">Tindakan</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        
-                        @foreach ($marhun as $item)
-                        <tr>
-                            <td class="text-center"> {{ $loop->iteration }} </td>
-                            <td>{{ $item->marhun }}</td>
-                            <td>
-                                @if($item->karat != null)
-                                    {{ $item->karat }}
-                                @else
-                                    {{ $item->old_karat }}
-                                @endif
-                            </td>
-                            <td>
-                                @if($item->berat != null)
-                                    {{ $item->berat }}
-                                @else
-                                    {{ $item->old_berat }}
-                                @endif
-                            </td>
-                            <td>
-                                @if($item->harga != null)
-                                    {{ $item->harga }}
-                                @else
-                                    {{ $item->old_harga }}
-                                @endif
-                            </td>
-                            <td>
-                                @if($item->n_marhun != null)
-                                    {{ number_format($item->n_marhun, 2, '.', ',') }}
-                                @else
-                                    {{ number_format($item->old_nmarhun, 2, '.', ',') }}
-                                @endif
-                            </td>
-                            <td>
-                                @if($item->hargaasas != null)
-                                    {{ number_format($item->hargaasas, 2, '.', ',') }}
-                                @else
-                                    {{ number_format($item->old_hargaasas, 2, '.', ',') }}
-                                @endif
-                            </td>
-                            <td>{{ $item->nota }}</td>
-                            <td class="text-center">
-                                @if($lelongbid->status_semak == 1)
-                                @else
-                                    <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" 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>
-                                @endif
-                            </td>
-                        </tr>
-                        @endforeach
-                    </tbody>
-                    
-                </table>
-            <div class="modal-footer" style="margin-top:2%;">
-            @if($lelongbid->status_semak == 0)
+            <br>
+            <h4> No Rujukan : <td>{{ $lelongbid->norujukan }}</td>
+            </h4>
+            <div class="row justify-content-center">
+                <div class="col-6">
+                    <div class="card">
+                        <div class="card-body">
+                            -Tiada Data-
+                        </div>
+                        <div class="card-footer">
 
-            @else
-                <a  href="{{ route('marhun.senaraimarhun', $lelong_id) }}" style="width:7%;" class="btn btn-primary">Kembali</a>
-            @endif
-            @if($lelongbid->status_semak == 0)
+                            <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#modaluploadgambar">
+                                Muat Naik Gambar Marhun
+                            </button>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <br>
+            <table class="table table-striped  table-xl" id="marhun" style="width:100%">
+                <thead class="bg-primary text-white">
+                    <tr>
+                        <th class="text-center">Barang</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 class="text-center">Tindakan</th>
+                    </tr>
+                </thead>
+                <tbody>
+
+                    @foreach ($marhun as $item)
+                    <tr>
+                        <td class="text-center"> {{ $loop->iteration }} </td>
+                        <td>{{ $item->marhun }}</td>
+                        <td>
+                            @if($item->karat != null)
+                            {{ $item->karat }}
+                            @else
+                            {{ $item->old_karat }}
+                            @endif
+                        </td>
+                        <td>
+                            @if($item->berat != null)
+                            {{ $item->berat }}
+                            @else
+                            {{ $item->old_berat }}
+                            @endif
+                        </td>
+                        <td>
+                            @if($item->harga != null)
+                            {{ $item->harga }}
+                            @else
+                            {{ $item->old_harga }}
+                            @endif
+                        </td>
+                        <td>
+                            @if($item->n_marhun != null)
+                            {{ number_format($item->n_marhun, 2, '.', ',') }}
+                            @else
+                            {{ number_format($item->old_nmarhun, 2, '.', ',') }}
+                            @endif
+                        </td>
+                        <td>
+                            @if($item->hargaasas != null)
+                            {{ number_format($item->hargaasas, 2, '.', ',') }}
+                            @else
+                            {{ number_format($item->old_hargaasas, 2, '.', ',') }}
+                            @endif
+                        </td>
+                        <td>{{ $item->nota }}</td>
+                        <td class="text-center">
+                            @if($lelongbid->status_semak == 1)
+                            @else
+                            <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" 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>
+                            @endif
+                        </td>
+                    </tr>
+                    @endforeach
+                </tbody>
+
+            </table>
+            <div class="modal-footer" style="margin-top:2%;">
+                @if($lelongbid->status_semak == 0)
+
+                @else
+                <a href="{{ route('marhun.senaraimarhun', $lelong_id) }}" style="width:7%;" class="btn btn-primary">Kembali</a>
+                @endif
+                @if($lelongbid->status_semak == 0)
                 <button style="width:7%;" class="btn btn-success" onclick="confirm()">Semak</button>
-            @elseif($lelongbid->status_semak == 1)
+                @elseif($lelongbid->status_semak == 1)
                 <button class="btn btn-success btn-sm hovernone-success" disabled>SUDAH DISEMAK</button>
-            @endif
+                @endif
             </div>
         </div>
-        
+
     </div>
     <div class="modal fade" tabindex="-1" id="modalkemaskini">
         <div class="modal-dialog modal-lg">
-          <div class="modal-content">
-            <div class="modal-header">
-              <h5 class="modal-title">Kemaskini Marhun</h5>
-              <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                <span aria-hidden="true">&times;</span>
-              </button>
-            </div>
-            <div class="modal-body">
-                <form action="{{ route('marhun.kemaskiniMarhun') }}" method="POST" id="formkemaskini">
-                    @csrf
-                    <div class="row justify-content-center">
-                        <div class="col-md-8">
-                            <div class="form-group row">
-                                <input type="hidden" name="idmarhun" id="idmarhun" >
-                                <div class="col-md-4">No Rujukan</div>
-                                <div class="col-md-8"><input class="form-control" type="text" name="norujukan_marhun" id="norujukan_marhun" value="{{ $lelongbid->norujukan }}" readonly></div>
-                                <div class="col-md-4">Marhun</div>
-                                <div class="col-md-8">
-                                    <select class="form-control" name="marhun" id="selectmarhun">
-                                        <option disabled selected value> -- Pilih Jenis Marhun -- </option>
-                                        @foreach ($emasall as $emas)
-                                        <option value="{{$emas->marhun}}"> {{ $emas->descpt}}</option>
-                                        @endforeach
-                                    </select>
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h5 class="modal-title">Kemaskini Marhun</h5>
+                    <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                        <span aria-hidden="true">&times;</span>
+                    </button>
+                </div>
+                <div class="modal-body">
+                    <form action="{{ route('marhun.kemaskiniMarhun') }}" method="POST" id="formkemaskini">
+                        @csrf
+                        <div class="row justify-content-center">
+                            <div class="col-md-8">
+                                <div class="form-group row">
+                                    <input type="hidden" name="idmarhun" id="idmarhun">
+                                    <div class="col-md-4">No Rujukan</div>
+                                    <div class="col-md-8"><input class="form-control" type="text" name="norujukan_marhun" id="norujukan_marhun" value="{{ $lelongbid->norujukan }}" readonly></div>
+                                    <div class="col-md-4">Marhun</div>
+                                    <div class="col-md-8">
+                                        <select class="form-control" name="marhun" id="selectmarhun">
+                                            <option disabled selected value> -- Pilih Jenis Marhun -- </option>
+                                            @foreach ($emasall as $emas)
+                                            <option value="{{$emas->marhun}}"> {{ $emas->descpt}}</option>
+                                            @endforeach
+                                        </select>
+                                    </div>
+                                    <div class="col-md-4">Karat</div>
+                                    <div class="col-md-8">
+                                        <select class="form-control" name="karat" id="selectkarat" data-karatall="{{$lelkarat}}" onchange="calc(this,'karat')">
+                                            <option disabled selected value> -- Pilih Karat -- </option>
+                                            @foreach ($karatall as $karat)
+                                            <option value="{{$karat->karat}}"> {{ $karat->keterangan}}</option>
+                                            @endforeach
+                                        </select>
+                                    </div>
+                                    <div class="col-md-4">Berat</div>
+                                    <div class="col-md-8"><input class="form-control" type="text" name="berat_emas" id="berat_emas" oninput="calc(this,'berat')"></div>
+                                    <div class="col-md-4">Harga</div>
+                                    <div class="col-md-8"><input class="form-control .harga" type="text" name="harga" id="harga" readonly></div>
+                                    <div class="col-md-4">Nilai Marhun</div>
+                                    <div class="col-md-8"><input class="form-control" type="text" name="nilai_marhun" id="nilai_marhun" readonly></div>
+                                    <div class="col-md-4">Harga Asas</div>
+                                    <div class="col-md-8"><input class="form-control" type="text" name="harga_asas" id="harga_asas" readonly></div>
+                                    <div class="col-md-4">Nota</div>
+                                    <div class="col-md-8"><input class="form-control" type="text" name="nota" id="nota" readonly></div>
                                 </div>
-                                <div class="col-md-4">Karat</div>
-                                <div class="col-md-8">
-                                    <select class="form-control" name="karat" id="selectkarat" data-karatall="{{$lelkarat}}" onchange="calc(this,'karat')">
-                                        <option disabled selected value> -- Pilih Karat -- </option>
-                                        @foreach ($karatall as $karat)
-                                        <option value="{{$karat->karat}}"> {{ $karat->keterangan}}</option>
-                                        @endforeach
-                                    </select>
-                                </div>
-                                <div class="col-md-4">Berat</div>
-                                <div class="col-md-8"><input class="form-control" type="text" name="berat_emas" id="berat_emas" oninput="calc(this,'berat')"></div>
-                                <div class="col-md-4">Harga</div>
-                                <div class="col-md-8"><input class="form-control .harga" type="text" name="harga" id="harga" readonly></div>
-                                <div class="col-md-4">Nilai Marhun</div>
-                                <div class="col-md-8"><input class="form-control" type="text" name="nilai_marhun" id="nilai_marhun" readonly></div>
-                                <div class="col-md-4">Harga Asas</div>
-                                <div class="col-md-8"><input class="form-control" type="text" name="harga_asas" id="harga_asas" readonly></div>
-                                <div class="col-md-4">Nota</div>
-                                <div class="col-md-8"><input class="form-control" type="text" name="nota" id="nota" readonly></div>
                             </div>
-                        </div>                       
-                      </div>
-                  </form>
+                        </div>
+                    </form>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-secondary" style="width:15%;" data-dismiss="modal">Tutup</button>
+                    <button type="button" class="btn btn-primary" style="width:15%;" onclick="updateform()">Simpan</button>
+                </div>
+
             </div>
-            <div class="modal-footer">
-              <button type="button" class="btn btn-secondary" style="width:15%;" data-dismiss="modal">Tutup</button>
-              <button type="button" class="btn btn-primary" style="width:15%;" onclick="updateform()">Simpan</button>
-            </div>
-            
-          </div>
         </div>
     </div>
     <div class="modal fade" tabindex="-1" id="modaltambahmarhun">
         <div class="modal-dialog modal-lg">
-          <div class="modal-content">
-            <div class="modal-header">
-              <h5 class="modal-title">Tambah Marhun</h5>
-              <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                <span aria-hidden="true">&times;</span>
-              </button>
-            </div>
-            <div class="modal-body">
-                <form action="{{ route('marhun.tambahmarhun') }}" method="POST" id="formtambahmarhun">
-                    @csrf
-                    <div class="row justify-content-center">
-                        <div class="col-md-8">
-                            <div class="form-group row">
-                                <input type="hidden" name="tambahmarhun" id="tambahmarhun" >
-                                <div class="col-md-4">No Rujukan</div>
-                                <div class="col-md-8"><input class="form-control" type="text" name="norujukan_marhuntambahan" id="norujukan_marhuntambahan" value="{{ $lelongbid->norujukan }}" readonly></div>
-                                <div class="col-md-4">Marhun</div>
-                                <div class="col-md-8">
-                                    <select class="form-control" name="marhuntambahan" id="selectmarhuntambahan">
-                                        <option disabled selected value> -- Pilih Jenis Marhun -- </option>
-                                        @foreach ($emasall as $emas)
-                                        <option value="{{$emas->marhun}}"> {{ $emas->descpt}}</option>
-                                        @endforeach
-                                    </select>
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h5 class="modal-title">Tambah Marhun</h5>
+                    <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                        <span aria-hidden="true">&times;</span>
+                    </button>
+                </div>
+                <div class="modal-body">
+                    <form action="{{ route('marhun.tambahmarhun') }}" method="POST" id="formtambahmarhun">
+                        @csrf
+                        <div class="row justify-content-center">
+                            <div class="col-md-8">
+                                <div class="form-group row">
+                                    <input type="hidden" name="tambahmarhun" id="tambahmarhun">
+                                    <div class="col-md-4">No Rujukan</div>
+                                    <div class="col-md-8"><input class="form-control" type="text" name="norujukan_marhuntambahan" id="norujukan_marhuntambahan" value="{{ $lelongbid->norujukan }}" readonly></div>
+                                    <div class="col-md-4">Marhun</div>
+                                    <div class="col-md-8">
+                                        <select class="form-control" name="marhuntambahan" id="selectmarhuntambahan">
+                                            <option disabled selected value> -- Pilih Jenis Marhun -- </option>
+                                            @foreach ($emasall as $emas)
+                                            <option value="{{$emas->marhun}}"> {{ $emas->descpt}}</option>
+                                            @endforeach
+                                        </select>
+                                    </div>
+                                    <div class="col-md-4">Karat</div>
+                                    <div class="col-md-8">
+                                        <select class="form-control" name="karattambahan" id="selectkarattambahan" data-karatalltambahan="{{$lelkarat}}" onchange="calc_tambahan(this,'karattambahan')">
+                                            <option disabled selected value> -- Pilih Karat -- </option>
+                                            @foreach ($karatall as $karat)
+                                            <option value="{{$karat->karat}}">{{ $karat->keterangan}}</option>
+                                            @endforeach
+                                        </select>
+                                    </div>
+                                    <div class="col-md-4">Berat</div>
+                                    <div class="col-md-8"><input class="form-control" type="text" name="berat_emastambahan" id="berat_emastambahan" oninput="calc_tambahan(this,'berattambahan')" value="0"></div>
+                                    <div class="col-md-4">Harga</div>
+                                    <div class="col-md-8"><input class="form-control .hargatambahan" type="text" name="hargatambahan" id="hargatambahan" readonly></div>
+                                    <div class="col-md-4">Nilai Marhun</div>
+                                    <div class="col-md-8"><input class="form-control" type="text" name="nilai_marhuntambahan" id="nilai_marhuntambahan" readonly></div>
+                                    <div class="col-md-4">Harga Asas</div>
+                                    <div class="col-md-8"><input class="form-control" type="text" name="harga_asastambahan" id="harga_asastambahan" readonly></div>
+                                    <div class="col-md-4">Nota</div>
+                                    <div class="col-md-8"><input class="form-control" type="text" name="notatambahan" id="notatambahan"></div>
                                 </div>
-                                <div class="col-md-4">Karat</div>
-                                <div class="col-md-8">
-                                    <select class="form-control" name="karattambahan" id="selectkarattambahan" data-karatalltambahan="{{$lelkarat}}" onchange="calc_tambahan(this,'karattambahan')">
-                                        <option disabled selected value> -- Pilih Karat -- </option>
-                                        @foreach ($karatall as $karat)
-                                        <option value="{{$karat->karat}}">{{ $karat->keterangan}}</option>
-                                        @endforeach
-                                    </select>
-                                </div>
-                                <div class="col-md-4">Berat</div>
-                                <div class="col-md-8"><input class="form-control" type="text" name="berat_emastambahan" id="berat_emastambahan" oninput="calc_tambahan(this,'berattambahan')" value="0"></div>
-                                <div class="col-md-4">Harga</div>
-                                <div class="col-md-8"><input class="form-control .hargatambahan" type="text" name="hargatambahan" id="hargatambahan" readonly></div>
-                                <div class="col-md-4">Nilai Marhun</div>
-                                <div class="col-md-8"><input class="form-control" type="text" name="nilai_marhuntambahan" id="nilai_marhuntambahan" readonly></div>
-                                <div class="col-md-4">Harga Asas</div>
-                                <div class="col-md-8"><input class="form-control" type="text" name="harga_asastambahan" id="harga_asastambahan" readonly></div>
-                                <div class="col-md-4">Nota</div>
-                                <div class="col-md-8"><input class="form-control" type="text" name="notatambahan" id="notatambahan"></div>
                             </div>
-                        </div>                       
-                      </div>
-                  </form>
+                        </div>
+                    </form>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-secondary" style="width:15%;" data-dismiss="modal">Tutup</button>
+                    <button type="button" class="btn btn-primary" style="width:15%;" onclick="tambahanmarhun()">Simpan</button>
+                </div>
+
             </div>
-            <div class="modal-footer">
-              <button type="button" class="btn btn-secondary" style="width:15%;" data-dismiss="modal">Tutup</button>
-              <button type="button" class="btn btn-primary" style="width:15%;" onclick="tambahanmarhun()">Simpan</button>
+        </div>
+    </div>
+    <div class="modal fade" tabindex="-1" id="modaluploadgambar">
+        <div class="modal-dialog modal-dialog-centered modal-lg">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h5 class="modal-title">Muat Naik Gambar Marhun</h5>
+                    <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                        <span aria-hidden="true">&times;</span>
+                    </button>
+                </div>
+                <div class="modal-body justify-content-center">
+                    <form id="form1">
+                        <div class="row justify-content-center">
+                            <img id="blah" style="max-width: 400px; max-height: 400px;" src="#" alt="gambar marhun" />
+                        </div>
+                        <div class="row justify-content-center">
+                            <input type='file' accept="image/*;capture=camera" id="imgInp" />
+                        </div>
+                    </form>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-secondary" style="width:15%;" data-dismiss="modal">Tutup</button>
+                    <button type="button" class="btn btn-primary" style="width:15%;" data-dismiss="modal">Simpan</button>
+                </div>
+
             </div>
-            
-          </div>
         </div>
     </div>
 </div>
 <script>
+    function readURL(input) {
+        if (input.files && input.files[0]) {
+            var reader = new FileReader();
+
+            reader.onload = function(e) {
+                $('#blah').attr('src', e.target.result);
+            }
+
+            reader.readAsDataURL(input.files[0]);
+        }
+    }
+
+    $("#imgInp").change(function() {
+        readURL(this);
+    });
+
     function confirm() {
         $.confirm({
-        title: 'Perhatian!',
-        content: 'Anda pasti telah membuat semakan untuk kesemua marhun?',
-        type: 'green',
-        typeAnimated: true,
-        buttons: {
-            Batal: {
-                btnClass: 'btn-default',
-                action: function () {}
-            },
-            Sahkan: {
-                btnClass: 'btn-success',
-                action: function () {
-                    $("#formsemak").submit();
+            title: 'Perhatian!',
+            content: 'Anda pasti telah membuat semakan untuk kesemua marhun?',
+            type: 'green',
+            typeAnimated: true,
+            buttons: {
+                Batal: {
+                    btnClass: 'btn-default',
+                    action: function() {}
+                },
+                Sahkan: {
+                    btnClass: 'btn-success',
+                    action: function() {
+                        $("#formsemak").submit();
+                    }
                 }
             }
-        }
         });
     }
     //Enable tooltips everywhere
-    $(function () {
+    $(function() {
         $('[data-toggle="tooltip"]').tooltip()
     })
-    
+
     $('a.confirmdel').confirm({
         title: 'Confirmation',
         content: 'Anda pasti?',
@@ -261,7 +320,7 @@
         buttons: {
             Delete: {
                 btnClass: 'btn-warning',
-                action: function (e) {
+                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;
@@ -270,41 +329,38 @@
                     $("#formdelete").submit();
 
                 }
-            },  
+            },
             Batal: {
                 btnClass: 'btn-default',
-                action: function () {}
+                action: function() {}
             }
         }
     });
 
-    var tablemarhun = $('#marhun').DataTable( {
-        "orderFixed": [ 0, 'asc' ],
+    var tablemarhun = $('#marhun').DataTable({
+        "orderFixed": [0, 'asc'],
         "info": false,
         "lengthChange": false,
         "pageLength": 15,
         dom: 'Bfrtip',
-        buttons: [
-            {
-                className: 'btn btn-outline-success pl-4 pr-4 btn-sm addsim',
-                text: '<i class="fas fa-plus" id="test"></i>',
-                titleAttr: 'Tambah Marhun',
-                action: function ( e, dt, node, config ) {
-                    $('#modaltambahmarhun').modal("show");
-                }
+        buttons: [{
+            className: 'btn btn-outline-success pl-4 pr-4 addsim',
+            text: 'Tambah Marhun <i class="fas fa-plus" id="test"></i>',
+            action: function(e, dt, node, config) {
+                $('#modaltambahmarhun').modal("show");
             }
-        ]
+        }]
     });
 
     $('.addsim').tooltip();
     $('.export').tooltip();
     // $( '.dt-buttons').addClass('btn-group');
-    $( '.addsim').removeClass('dt-button');
-    $( '.export').removeClass('dt-button');
+    $('.addsim').removeClass('dt-button');
+    $('.export').removeClass('dt-button');
 
 
     function selectall(cb) {
-        tablemarhun.rows().nodes().to$().find('input[type="checkbox"]').each(function(){
+        tablemarhun.rows().nodes().to$().find('input[type="checkbox"]').each(function() {
             $(this).prop('checked', cb.checked);
         })
     }
@@ -313,14 +369,11 @@
         $("#formtambahmarhun").submit();
     }
 
-    function calc_tambahan(e,type)
-    {
-        if(type =='karattambahan' )
-        {
+    function calc_tambahan(e, type) {
+        if (type == 'karattambahan') {
             var karatalltambahan = $(e).data('karatalltambahan');
-            karatalltambahan.forEach((item) =>{
-                if(item.karat == $(e).val())
-                {
+            karatalltambahan.forEach((item) => {
+                if (item.karat == $(e).val()) {
                     console.log(item);
                     var beratemas = $('#berat_emastambahan').val();
                     var total_tambahan = item.harga2 * parseFloat(beratemas);
@@ -330,22 +383,19 @@
                     $('#harga_asastambahan').val(parseFloat(harga_asastambahan).toFixed(2));
                 }
 
-                
+
             });
-        }
-        else
-        {
+        } else {
             var total_tambahan = $('#hargatambahan').val() * $('#berat_emastambahan').val();
             var harga_asastambahan = Math.round(total_tambahan);
             $('#nilai_marhuntambahan').val(parseFloat(total_tambahan).toFixed(2));
             $('#harga_asastambahan').val(parseFloat(harga_asastambahan).toFixed(2));
         }
     }
-    
-    function kemaskini(e) 
-    {
+
+    function kemaskini(e) {
         $('#modalkemaskini').modal("show");
-        $('#modalkemaskini').on('shown.bs.modal', function () {
+        $('#modalkemaskini').on('shown.bs.modal', function() {
             $('#rolename').trigger('focus')
         })
         let idmarhun = $(e).data('idmarhun');
@@ -367,14 +417,11 @@
         $('#nota').val(nota);
     }
 
-    function calc(e,type)
-    {
-        if(type =='karat')
-        {
+    function calc(e, type) {
+        if (type == 'karat') {
             var karatall = $(e).data('karatall');
-            karatall.forEach((item) =>{
-                if(item.karat == $(e).val())
-                {
+            karatall.forEach((item) => {
+                if (item.karat == $(e).val()) {
                     var total = item.harga2 * $('#berat_emas').val();
                     var hargaasas = Math.round(total);
                     $('#harga').val(parseFloat(item.harga2).toFixed(2));
@@ -382,11 +429,9 @@
                     $('#harga_asas').val(parseFloat(hargaasas).toFixed(2));
                 }
 
-                
+
             });
-        }
-        else
-        {
+        } else {
             var total = $('#harga').val() * $('#berat_emas').val();
             var hargaasas = Math.round(total);
             $('#nilai_marhun').val(parseFloat(total).toFixed(2));
@@ -394,10 +439,9 @@
         }
     }
 
-    function updateform()
-    {
+    function updateform() {
         $("#formkemaskini").submit();
     }
 </script>
-     
-@endsection
+
+@endsection
\ No newline at end of file
diff --git a/resources/views/marhun/senaraimarhun.blade.php b/resources/views/marhun/senaraimarhun.blade.php
index efbb7e9b..a8d3c14b 100644
--- a/resources/views/marhun/senaraimarhun.blade.php
+++ b/resources/views/marhun/senaraimarhun.blade.php
@@ -2,95 +2,114 @@
 
 @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
-            <div class="container">
-                <div class="row">
-                        <div class="col-6 col-sm-4">
-                            <p><u><b>Bilangan SAG : </b></u><p>
-                            <p><b>Keseluruhan : {{ sizeof($lelongbid) }}</b> </p>
-                            {{-- <p><b>Belum Disemak : {{ sizeof($sag) }}</b></p> --}}
-                            <p><b>Dalam Proses : {{ sizeof($dalamproses) }}</b></p>
-                            <p><b>Sudah Disemak : {{ sizeof($sdhdisemak) }}</b></p>
-                            <p><b>Sudah Disahkan Oleh Operasi : {{ sizeof($sdhdisahkan) }}</b></p>
+    <div class="card">
+        <div class="card-header">Semakan Marhun</div>
+        <div class="card-body">
+            <div class="row ">
+                <div class="col">
+
+                    @if ($message = Session::get('success'))
+                    <div class="alert alert-success">
+                        <p>{{ $message }}</p>
+                    </div>
+                    @endif
+                    <div class="container">
+                        <div class="row">
+                            <div class="col-6 col-sm-4">
+                                <p><u><b>Bilangan SAG : </b></u>
+                                <p>
+                                <p><b>Keseluruhan : {{ sizeof($lelongbid) }}</b> </p>
+                                {{-- <p><b>Belum Disemak : {{ sizeof($sag) }}</b></p> --}}
+                                <p><b>Dalam Proses : {{ sizeof($dalamproses) }}</b></p>
+                                <p><b>Sudah Disemak : {{ sizeof($sdhdisemak) }}</b></p>
+                                <p><b>Sudah Disahkan Oleh Operasi : {{ sizeof($sdhdisahkan) }}</b></p>
+                            </div>
+                            <div class="col-6 col-sm-4">
+                                <p><b><u> Tangguh Lelong Oleh Pengurus Cawangan </u></b></p>
+                                <p><b>Sudah Disemak : {{ sizeof($sdhdisemaktangguhlel) }}</b></p>
+                                <p><b>Dalam Proses : {{ sizeof($dalamprosestangguhlel) }}</b></p>
+                                <p><b>Sudah Disahkan Oleh Operasi : {{ sizeof($sdhdisahkantangguhlel) }}</b></p>
+                            </div>
                         </div>
-                        <div class="col-6 col-sm-4">
-                            <p><b><u> Tangguh Lelong Oleh Pengurus Cawangan </u></b></p>
-                            <p><b>Sudah Disemak : {{ sizeof($sdhdisemaktangguhlel) }}</b></p>
-                            <p><b>Dalam Proses : {{ sizeof($dalamprosestangguhlel) }}</b></p>
-                            <p><b>Sudah Disahkan Oleh Operasi : {{ sizeof($sdhdisahkantangguhlel) }}</b></p>
-                        </div>
-                </div>
-            </div>
-            <form id="exportform" action="" method="POST">
-                <input type="hidden" name="type" value="User">
-                <table class="table table-striped  table-xl text-center" id="senaraimarhun" style="width:100%">
-                    <thead class="bg-primary text-white">
-                        <tr>
-                            <th>Bil</th>
-                            <th>No Rujukan</th>
-                            <th>Tarikh Lelong</th>
-                            <th>Status Semak</th>
-                            <th>Pengesahan</th>
-                            <th class="text-center">Tindakan</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        @foreach ($lelongbid as $bid)
-                        <tr>
-                            <td>{{ $loop->iteration }}</td>
-                            <td>{{ $bid->norujukan }}</td>
-                            <td>{{ $bid->t_lelong }}</td>
-                            <td>
-                                @if($bid->status_semak == 0)
-                                    <button class="btn btn-danger btn-sm hovernone-danger" disabled>BELUM DISEMAK</button>
-                                @elseif(($bid['pengesahan'] !== null) && ($bid->status_semak == 1))
+                    </div>
+                    <form id="exportform" action="" method="POST">
+                        <input type="hidden" name="type" value="User">
+                        <table class="table table-striped table-bordered table-xl text-center" id="senaraimarhun" style="width:100%">
+                            <thead class="bg-primary text-white">
+                                <tr>
+                                    <th>Bil</th>
+                                    <th>No Rujukan</th>
+                                    <th>Tarikh Lelong</th>
+                                    <th>Status Semak</th>
+                                    <th>Pengesahan</th>
+                                    <th class="text-center">Semakan Marhun</th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                @foreach ($lelongbid as $bid)
+                                <tr>
+                                    <td>{{ $loop->iteration }}</td>
+                                    <td>{{ $bid->norujukan }}</td>
+                                    <td>{{ $bid->t_lelong }}</td>
+                                    <td>
+                                        @if($bid->status_semak == 0)
+                                        <button class="btn btn-danger btn-sm hovernone-danger" disabled>BELUM DISEMAK</button>
+                                        @elseif(($bid['pengesahan'] !== null) && ($bid->status_semak == 1))
                                         @if($bid['pengesahan']['disahkan_oleh'] !== null)
-                                            <button class="btn btn-success btn-sm hovernone-success" disabled>SUDAH DISAHKAN</button>
+                                        <button class="btn btn-success btn-sm hovernone-success" disabled>SUDAH DISAHKAN</button>
                                         @else
-                                            <button class="btn btn-warning btn-sm hovernone-warning" disabled>DALAM PROSES</button>
+                                        <button class="btn btn-warning btn-sm hovernone-warning" disabled>DALAM PROSES</button>
                                         @endif
-                                @elseif(($bid->status_semak == 1) && ($bid['pengesahan'] === null))
-                                    <button class="btn btn-outline-success btn-sm" disabled>SUDAH DISEMAK</button>
-                                @endif
-                            </td>
-                            <td>
-                                @if($bid['statustangguhlel'] != null)
-                                    <button class="btn btn-secondary btn-sm hovernone-secondary" disabled>TANGGUH LELONG PC</button>
-                                @endif
-                            </td>
-                            <td class="text-center">
-                                <button type="button" class="btn btn-primary" onclick="kemaskini(this)" data-lelong="{{$bid->lelong_id}}" data-all="{{$bid}}" data-surat="{{$bid->id}}" data-marhun="{{ json_encode($bid->marhun) }}" data-toggle="modal" data-target="#noRujukanModal" ><i class="far fa-edit"></i></button>
-                            </td>
-                        </tr>
-                        @endforeach
-                    </tbody>
-                </table>
-            </form>
-            <div class="modal-footer" style="margin-top:2%;">
-            <a  href="{{ route('marhun.senarailelongmarhun') }}" class="btn btn-primary">Kembali</a>
+                                        @elseif(($bid->status_semak == 1) && ($bid['pengesahan'] === null))
+                                        <button class="btn btn-outline-success btn-sm" disabled>SUDAH DISEMAK</button>
+                                        @endif
+                                    </td>
+                                    <td>
+                                        @if($bid['statustangguhlel'] != null)
+                                        <button class="btn btn-secondary btn-sm hovernone-secondary" disabled>TANGGUH LELONG PC</button>
+                                        @endif
+                                    </td>
+                                    <td class="text-center">
+                                        <button type="button" class="btn btn-primary" onclick="kemaskini(this)" data-lelong="{{$bid->lelong_id}}" data-all="{{$bid}}" data-surat="{{$bid->id}}" data-marhun="{{ json_encode($bid->marhun) }}" data-toggle="modal" data-target="#noRujukanModal"><i class="far fa-edit"></i></button>
+                                        <a type="button" class="btn btn-secondary" data-toggle="tooltip" data-placement="top" title="Lihat Butiran" href="{{ route('marhun.show', [$bid->id, $bid->lelong_id]) }}"><i class="far fa-edit"></i></a>
+                                    </td>
+                                </tr>
+                                @endforeach
+                            </tbody>
+                        </table>
+                    </form>
+                    <div class="row justify-content-end">
+                        <a href="{{ route('marhun.senarailelongmarhun') }}" class="btn m-3 btn-primary">Kembali</a>
+                    </div>
+                </div>
             </div>
         </div>
-        
     </div>
     <div class="modal fade" id="noRujukanModal" data-backdrop="static" data-keyboard="false" tabindex="-1" aria-labelledby="noRujukanModalLabel" aria-hidden="true">
         <div class="modal-dialog modal-xl modal-dialog-centered">
             <div class="modal-content">
-                    <form id="formsemak" action="" method="GET">
+                <form id="formsemak" action="" method="GET">
                     <div class="modal-header">
                         <h5 class="modal-title" id="titleHeader" value="titleHeader"></h5>
                         <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                        <span aria-hidden="true">&times;</span>
+                            <span aria-hidden="true">&times;</span>
                         </button>
                     </div>
                     <div class="modal-body">
-                    <table class="table table-striped text-center table-xl" id="tablemarhun" style="width:100%">
+                        <div class="row justify-content-center">
+                            <div class="col-6">
+                                <form id="form1">
+                                    <div class="row justify-content-center">
+                                        <img id="blah" style="max-width: 400px; max-height: 400px;" src="#" alt="gambar marhun" />
+                                    </div>
+                                    <div class="row justify-content-center">
+                                        <input type='file' accept="image/*;capture=camera" id="imgInp" />
+                                    </div>
+                                </form>
+                            </div>
+                        </div>
+                        <br>
+                        <table class="table table-striped text-center table-xl" id="tablemarhun" style="width:100%">
                             <thead class="bg-primary text-white">
                                 <tr>
                                     <th>Barang</th>
@@ -104,7 +123,7 @@
                                     <th>Kemaskini Marhun</th>
                                 </tr>
                             </thead>
-                            
+
                         </table>
                     </div>
                     <div class="modal-footer">
@@ -117,14 +136,32 @@
     </div>
 </div>
 <script>
+    $("#imgInp").change(function() {
+        readURL(this);
+    });
 
+    function readURL(input) {
+        if (input.files && input.files[0]) {
+            var reader = new FileReader();
+
+            reader.onload = function(e) {
+                $('#blah').attr('src', e.target.result);
+            }
+
+            reader.readAsDataURL(input.files[0]);
+        }
+    }
+
+    $(function() {
+        $('[data-toggle="tooltip"]').tooltip()
+    })
     let all = [];
     let surat = '0'
     let lelongId = '0'
     let marhun = '0'
 
     function kemaskini(e) {
-        
+
         tablemarhun.clear().draw();
         all = $(e).data('all');
         document.getElementById("titleHeader").innerHTML = all.norujukan;
@@ -156,37 +193,37 @@
         });
 
     }
-    var tablemarhun = $('#tablemarhun').DataTable( {
-        "orderFixed": [ 0, 'asc' ],
+    var tablemarhun = $('#tablemarhun').DataTable({
+        "orderFixed": [0, 'asc'],
     })
 
     function confirm() {
         $.confirm({
-        title: 'Perhatian!',
-        content: 'Anda pasti telah membuat semakan untuk kesemua marhun?',
-        type: 'green',
-        typeAnimated: true,
-        buttons: {
-            Batal: {
-                btnClass: 'btn-default',
-                action: function () {}
-            },
-            Sahkan: {
-                btnClass: 'btn-success',
-                action: function () {
-                    var urlroute = '{{ route("marhun.semak", [":id", ":id2"]) }}';
-                    urlroute = urlroute.replace(':id', surat);
-                    urlroute = urlroute.replace(':id2', lelongId);
-                    console.log(urlroute);
-                    $('#formsemak').attr('action', urlroute);
-                    $("#formsemak").submit();
+            title: 'Perhatian!',
+            content: 'Anda pasti telah membuat semakan untuk kesemua marhun?',
+            type: 'green',
+            typeAnimated: true,
+            buttons: {
+                Batal: {
+                    btnClass: 'btn-default',
+                    action: function() {}
+                },
+                Sahkan: {
+                    btnClass: 'btn-success',
+                    action: function() {
+                        var urlroute = '{{ route("marhun.semak", [":id", ":id2"]) }}';
+                        urlroute = urlroute.replace(':id', surat);
+                        urlroute = urlroute.replace(':id2', lelongId);
+                        console.log(urlroute);
+                        $('#formsemak').attr('action', urlroute);
+                        $("#formsemak").submit();
+                    }
                 }
             }
-        }
         });
     }
     //Enable tooltips everywhere
-    $(function () {
+    $(function() {
         $('[data-toggle="tooltip"]').tooltip()
     })
 
@@ -198,68 +235,69 @@
         buttons: {
             Delete: {
                 btnClass: 'btn-warning',
-                action: function () {
+                action: function() {
                     location.href = this.$target.attr('href');
                 }
-            },  
+            },
             Batal: {
                 btnClass: 'btn-default',
-                action: function () {}
+                action: function() {}
             }
         }
     });
 
-        var tablesenaraimarhun = $('#senaraimarhun').DataTable( {
-            "columnDefs": [ 
-                {
+    var tablesenaraimarhun = $('#senaraimarhun').DataTable({
+        "columnDefs": [{
                 "targets": 0,
                 "orderable": false
-                }, 
-                {
+            },
+            {
                 "targets": 5,
                 "orderable": false
+            }
+        ],
+        order: [
+            [0, 'asc']
+        ],
+        // "ordering": false,
+        "info": false,
+        "lengthChange": false,
+        "pageLength": 999999,
+        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 Marhun',
+            //     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();
                 }
-            ],
-            order: [[0, 'asc']],
-            // "ordering": false,
-            "info": false,
-            "lengthChange": false,
-            "pageLength": 999999,
-            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 Marhun',
-                //     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');
+    // $('.addsim').tooltip();
+    $('.export').tooltip();
+    // $( '.dt-buttons').addClass('btn-group');
+    // $( '.addsim').removeClass('dt-button');
+    $('.export').removeClass('dt-button');
 
 
     function selectall(cb) {
-        tablesenaraimarhun.rows().nodes().to$().find('input[type="checkbox"]').each(function(){
+        tablesenaraimarhun.rows().nodes().to$().find('input[type="checkbox"]').each(function() {
             $(this).prop('checked', cb.checked);
         })
     }
 </script>
-     
-@endsection
+
+@endsection
\ No newline at end of file
diff --git a/resources/views/pengesahan/mutumarhun.blade.php b/resources/views/pengesahan/mutumarhun.blade.php
index 9ce27b7a..66399a19 100644
--- a/resources/views/pengesahan/mutumarhun.blade.php
+++ b/resources/views/pengesahan/mutumarhun.blade.php
@@ -73,7 +73,7 @@
                         {{-- <td>
                             {{ number_format($detail[0]['harga_gadai'], 2, '.', ',') }} 
                         </td> --}}
-                        <td>{{ number_format ($gadai[$index1]['harga'], 2, '.', ',')  }}</td>
+                        <td>{{ number_format ($gadai[0]['harga'], 2, '.', ',')  }}</td>
                         <td>
                             @if($detail[0]['old_harga'] != $detail[0]['harga'])
                                 {{ number_format($detail[0]['old_harga'], 2, '.', ',') }}  <i class="btn fa fa-arrow-right" aria-hidden="true"></i> 
@@ -116,6 +116,7 @@
             </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-warning">Batal Permohonan</button>
                 <button type="button" class="btn btn-danger" onclick="functerima(this)" data-idmarhun="{{ $lelongbid->id }}" data-norujukan="{{ $lelongbid->norujukan }}" data-kodcaw="{{ $lelongbid->kodcaw }}" id="tangguhlelong" >Tangguh Lelong</button>
                 <button type="button" class="btn btn-success" onclick="functerima(this)" id="terima" >Sahkan</button>
             </div>