From 83e062cdf06b136d47f6fd823f6302abb05ec61f Mon Sep 17 00:00:00 2001
From: nishaMuhd <nurulnisha84@gmail.com>
Date: Mon, 22 Aug 2022 09:46:54 +0800
Subject: [PATCH] correction comment by abe lah

---
 resources/views/includes/sidebar.blade.php             | 2 +-
 resources/views/marhun/senaraimarhun.blade.php         | 2 +-
 resources/views/pengesahan/mutumarhun.blade.php        | 2 +-
 resources/views/simulasi/senaraitempsimulasi.blade.php | 3 +++
 resources/views/simulasi/showsimulasi.blade.php        | 2 +-
 5 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/resources/views/includes/sidebar.blade.php b/resources/views/includes/sidebar.blade.php
index 0ec3f852..bcb4282f 100644
--- a/resources/views/includes/sidebar.blade.php
+++ b/resources/views/includes/sidebar.blade.php
@@ -49,7 +49,7 @@
       @endhasrole
       @hasrole('khazanah')
       <li class="{{ (request()->is('marhun/senarailelongmarhun') || request()->is('marhun/senarailelongmarhun/*')) ? 'active' : '' }}">
-        <a href="{{url('marhun/senarailelongmarhun')}}">Marhun</a>
+        <a href="{{url('marhun/senarailelongmarhun')}}">Semakan Marhun</a>
       </li>
 
       <li class="{{ (request()->is('tangguhlelmarhun/*')) ? 'active' : '' }}">
diff --git a/resources/views/marhun/senaraimarhun.blade.php b/resources/views/marhun/senaraimarhun.blade.php
index a3b6cae2..efbb7e9b 100644
--- a/resources/views/marhun/senaraimarhun.blade.php
+++ b/resources/views/marhun/senaraimarhun.blade.php
@@ -101,7 +101,7 @@
                                     <th>Nilai Marhun</th>
                                     <th>Harga Asas</th>
                                     <th>Nota</th>
-                                    <th>Tindakan</th>
+                                    <th>Kemaskini Marhun</th>
                                 </tr>
                             </thead>
                             
diff --git a/resources/views/pengesahan/mutumarhun.blade.php b/resources/views/pengesahan/mutumarhun.blade.php
index d498e967..9ce27b7a 100644
--- a/resources/views/pengesahan/mutumarhun.blade.php
+++ b/resources/views/pengesahan/mutumarhun.blade.php
@@ -117,7 +117,7 @@
             <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-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" >Teruskan Lelong</button>
+                <button type="button" class="btn btn-success" onclick="functerima(this)" id="terima" >Sahkan</button>
             </div>
         </form>
         </div>
diff --git a/resources/views/simulasi/senaraitempsimulasi.blade.php b/resources/views/simulasi/senaraitempsimulasi.blade.php
index 9298c2e4..a9a3e50c 100644
--- a/resources/views/simulasi/senaraitempsimulasi.blade.php
+++ b/resources/views/simulasi/senaraitempsimulasi.blade.php
@@ -68,6 +68,8 @@
                 </thead>
                 <tbody>
                     @foreach($senarai as $send)
+                        @if($send['bil_lelong'] > 0)
+                                
                         <tr>
                             <td><input type="checkbox" aria-label="Checkbox for following text input" name="caw[]" id="caw" value = "{{ $send['kodcaw'] }}" class="custom_name"></td>
                             <td>{{ $send['kodcaw'] }}</td>
@@ -81,6 +83,7 @@
                                 <a href=" {{ route('analisa.tempbycawsimulasi', [$send['kodcaw'],$t_gadai1,$fasa]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Gadaian"><i class="far fa-edit"></i></a>
                             </td>
                         </tr>
+                        @endif       
                     @endforeach
                 </tbody>
             </table>
diff --git a/resources/views/simulasi/showsimulasi.blade.php b/resources/views/simulasi/showsimulasi.blade.php
index 42ff7af6..16ae1503 100644
--- a/resources/views/simulasi/showsimulasi.blade.php
+++ b/resources/views/simulasi/showsimulasi.blade.php
@@ -160,7 +160,7 @@
                             <button class="btn btn-primary float-right " onclick="kemaskini()" id="btnkemaskini" >Kemaskini</button>
 
                             <div id="hideform">
-                                <label for="hargaasas" class="d-inline float-left pr-2 pl-2 pt-2" id="lblhargaasas">Harga Emas Asas</label>
+                                <label for="hargaasas" class="d-inline float-left pr-2 pl-2 pt-2" id="lblhargaasas">Harga Emas Per Gram (916)</label>
                                 <input type="text" class="form-control col-md-4 d-inline float-left" id="txthargaasas" name="hargaasas" placeholder="RM" data-jeniskarat="{{$jeniskarat}}" oninput="calculate(this)">
                                 <button class="btn btn-success float-right" onclick="save()" id="btnsimpan">Simpan</button>
                                 <button class="btn btn-danger float-right" onclick="kemaskini()" id="btncancel">Batal</button>