update

resources/views/khazanah/dashboard.blade.php

@@ -60,7 +60,7 @@
                               <div class="inner">
                                 <h3>RM {{ number_format($keseluruhanupahharian,2) }}</h3>
           
-                                <p>Upah Hari Ini</p>
+                                <p>Keuntungan Hari Ini</p>
                               </div>
                               <div class="icon">
                               </div>
@@ -105,7 +105,7 @@
                               <div class="inner">
                                 <h3>RM {{ number_format($keseluruhanupahterkumpul) }}</h3>
           
-                                <p>Upah Terkumpul</p>
+                                <p>Keuntungan Terkumpul</p>
                               </div>
                               <div class="icon">
                               </div>

resources/views/khazanah/gadaian.blade.php

@@ -23,7 +23,7 @@
                                     <th>Berat</th>
                                     <th>Karat</th>
                                     <th>Nilai Marhun</th>
-                                    <th>Nota test</th>
+                                    <th>Nota</th>
                                 </tr>
                             </thead>
                             <tbody id="tablemarhun">
@@ -201,7 +201,7 @@
         var total_berat = button.data('berat');
 
         $('#jumlah_berat').val(total_berat);
-
+        var bil_count = 0;
         $('#tablemarhun').empty();
         $.each(arraymarhun,function(index,marhun){
             $.each(marhun, function(index,marhun_detail){
@@ -214,7 +214,8 @@
                         marhun:marhun_detail['marhun']
                     },
                     success:function(marhun_ajax){
-                        $("#tablemarhun").append("<tr><td>" + marhun_detail['bil'] + "</td><td>" + marhun_ajax['descpt'] +"</td><td>" + marhun_detail['berat'] +"</td><td>" + marhun_detail['karat'] +"</td><td>RM " + marhun_detail['n_marhun'].toLocaleString(undefined,{minimumFractionDigits:2}) +"</td><td>"+ marhun_detail['nota'] +"</td></tr>");
+                        bil_count++;
+                        $("#tablemarhun").append("<tr><td>" + bil_count + "</td><td>" + marhun_ajax['descpt'] +"</td><td>" + marhun_detail['berat'] +"</td><td>" + marhun_detail['karat'] +"</td><td>RM " + marhun_detail['n_marhun'].toLocaleString(undefined,{minimumFractionDigits:2}) +"</td><td>"+ marhun_detail['nota'] +"</td></tr>");
                     }
                 });
             });

resources/views/khazanah/kelulusan.blade.php

@@ -37,7 +37,7 @@
                             <tr>
                                 <td>{{ $k['norujukan'] }}</td>
                                 <td>{{ $k['komen'] }}</td>
-                                <td>{{ $k['pinjaman'] }}</td>
+                                <td>{{ number_format($k['pinjaman'],2) }}</td>
                                 <td>{{ $k['nilaimarhun'] }}</td>
                                 <td>{{ $k['berat'] }}</td>
                                 <td>{{ $k['margin'] }}</td>

resources/views/khazanah/pendahuluanserah.blade.php

@@ -35,7 +35,7 @@
   <div class="col-2"> </div>
   <div class="col-6">
     <button type="button"  data-toggle="modal" data-target="#marhunModal" class="btn btn-info">Panduan Format Bundle</button>
-    <input type="button" onclick="triggersubmit();" class="btn btn-primary" value="Lulus"/>
+    <input type="button" onclick="triggersubmit();" class="btn btn-success" value="Lulus"/>
     <a href="{{ url('/pendahuluan') }}" class="btn btn-danger">Batal</a>
   </div>
 </div>