Merge branch 'pipi' into 'master'

fix skit2

See merge request online-sistem1/kaunter!79

app/Http/Controllers/KhazanahController.php

@@ -231,8 +231,7 @@ class KhazanahController extends Controller
              
             $totalkeluar = $tebus_detail['addpinjaman'] + $keluar;
             $totalmasuk = $tebus_detail['bakiupah'] + $masuk;
-
-            $bakiakhir = $bakiawal-$totalkeluar+$totalmasuk+$pendahuluan-$serahan;
+            // $bakiakhir = $bakiawal-$totalkeluar+$totalmasuk+$pendahuluan-$serahan;
 
             
             $updateTunai=Http::put( config('api.url').'/api/updateTunaiGT/'.$auth_user['cawangan'], [
@@ -245,7 +244,7 @@ class KhazanahController extends Controller
        }else{
 
             $totalmasuk = $tebus_detail['bakipjm'] + $masuk;
-            $bakiakhir = $bakiawal-$keluar+$totalmasuk+$pendahuluan-$serahan;
+            // $bakiakhir = $bakiawal-$keluar+$totalmasuk+$pendahuluan-$serahan;
 
             $updateTunai=Http::put( config('api.url').'/api/updateTunaiGT/'.$auth_user['cawangan'], [
                 'kodlaluan' => $tebus_detail['teller'],   

resources/views/customers/info.blade.php

@@ -493,7 +493,7 @@
                         urlroute = urlroute.replace(':id', gadai_detail["norujukan"]);
                         tablelelong.row.add([
                             counter,
-                            '<a href=' + urlroute +'>' + gadai_detail['norujukan'] + '</a>',
+                            '<a href="#" onclick="checktuntutbaki(this)" data-norujukan=' + gadai_detail['norujukan'] + ' data-tarikhtuntut=' + gadai_detail['trkhtuntut'] + '>' + gadai_detail['norujukan'] + '</a>',
                             gadai_detail['t_lelong'],
                             gadai_detail['trkhtuntut'],
                             'RM '+ formatter.format(gadai_detail['pinjaman']),
@@ -508,6 +508,30 @@
             });
         });
     }
+
+    function checktuntutbaki(e)
+    {
+        let tarikhtuntut = $(e).data('tarikhtuntut');
+        let norujukan = $(e).data('norujukan');
+
+        var urlroute = '{{ route("lelongan", ":id") }}';
+        urlroute = urlroute.replace(':id', norujukan);
+
+        if (tarikhtuntut == null)
+        {
+            window.location.href = urlroute;
+        }else{
+            Swal.fire({
+                icon: 'error',
+                title: 'Amaran',
+                text: 'Lelongan telah dibayar!'
+            });
+        }
+
+        return false;
+    }
+
+
     $(document).ready( function () {
 
         $('#myTable').parents('div.dataTables_wrapper').first().hide();

resources/views/khazanah/dashboard.blade.php

@@ -181,7 +181,7 @@
                             <!-- small box -->
                             <div class="small-box bg-primary">
                               <div class="inner">
-                                <h3>RM {{ number_format($komuditicheck['unit_komuditi'],2) }}</h3>
+                                <h3>RM {{ ($komuditicheck) ? number_format($komuditicheck['unit_komuditi'],2) : '0.00' }}</h3>
           
                                 <p>Baki Komuditi</p>
                               </div>

resources/views/khazanah/laporan/penebusan.blade.php

@@ -40,7 +40,7 @@
                                         <th>No K/P</th>
                                         <th>No Rujukan</th>
                                         <th>Pembiayaan (RM)</th>
-                                        <th>Upah (RM)</th>
+                                        <th>Keuntungan (RM)</th>
                                         <th>Bayaran (RM)</th>
                                     </tr>
                                 </thead>
@@ -115,8 +115,8 @@
                                 gadai[0][0]['nokp'],
                                 tebus['norujukan'],
                                 tebus['pinjaman'],
-                                tebus['upahasal'],
-                                ''
+                                tebus['bakiupah'],
+                                tebus['bakipjm']
                             ]).draw();
                         }
                     });

resources/views/penebusan/index.blade.php

@@ -1306,9 +1306,19 @@
                     buttonsStyling: false
                 });
 
+                let text = '';
+                if((parseFloat($('#basic-addon2').text()) > 75 && parseFloat($('#basic-addon2').text()) <= 80))
+                {
+                    text  = 'Tetapan margin melebihi 75% untuk Operasi!';
+                }else if(pinjamanbaru >= 10000)
+                {
+                    text  = 'Pembiayaan melebihi RM 10,000!';
+                }
+
+
                 swalWithBootstrapButtons.fire({
                     title: 'Dapatkan Pengesahan Operasi',
-                    text: "Tetapan margin melebihi 75% untuk Operasi!",
+                    text: text,
                     icon: 'info',
                     showCancelButton: true,
                     confirmButtonText: 'Hantar',
@@ -1318,7 +1328,15 @@
                     if (result.isConfirmed) {
                     
                         let nm = $('#nilai_marhun_total').text();let ber = $('#berat_marhun_total').text();let marg = $('#basic-addon2').text();
-                        let komen = "Pembiayaan Melebihi Margin 75%|" + nm + "|" + ber +  "|" + marg + "| Tambah Pinjaman";
+                        let komen = '';
+                        if((parseFloat($('#basic-addon2').text()) > 75 && parseFloat($('#basic-addon2').text()) <= 80))
+                        {
+                            komen = "Pembiayaan Melebihi Margin 75%|" + nm + "|" + ber +  "|" + marg + "| Tambah Pinjaman";
+                        }else if(pinjamanbaru >= 10000)
+                        {
+                            komen = "Pembiayaan Melebihi RM 10,000|" + nm + "|" + ber +  "|" + marg + "| Tambah Pinjaman";
+                        }
+
                         let jumpinjam = $('#pinjamanbaru').val();
                         let teller = "{{ Auth::user()->name }}";
 

resources/views/print/laporan_ringkasanharian.blade.php

@@ -217,14 +217,14 @@
       <td>BIL <br>
       N. MARHUN <br>
       PEMBIAYAAN <br>
-      UPAH SIMPAN
+      KEUNTUNGAN
     </td>
     <td><span>{{ $marhun['tebus'][0]['bilangan'] }}</span><br>
       <span>{{ number_format($marhun['tebus'][0]['jumlahmarhun'],2) }}</span><br>
       <span>{{ number_format($marhun['tebus'][0]['jumlahpinjaman'],2) }}</span><br>
       <span id="tebusupahsimpan">{{ number_format($marhun['tebus'][0]['upahsimpan'],2) }}</span>
     </td>
-    <td>UPAH SIMPAN <br>
+    <td>KEUNTUNGAN <br>
         CAJ LELONG <br>
     </td>
     <td><span id="totalupahsimpan">{{ number_format($keseluruhanupahsimpan,2) }}</span> <br>
@@ -237,7 +237,7 @@
       <td>BIL <br>
         N. MARHUN <br>
         PEMBIAYAAN <br>
-        UPAH SIMPAN
+        KEUNTUNGAN
       </td>
       <td><span>{{ $marhun['advansur'][0]['bilangan'] }}</span><br>
         <span>{{ number_format($marhun['advansur'][0]['jumlahmarhun'],2) }}</span><br>
@@ -252,7 +252,7 @@
       <td>BIL <br>
         N. MARHUN <br>
         PEMBIAYAAN <br>
-        UPAH SIMPAN <br>
+        KEUNTUNGAN <br>
         CAJ LELONG <br>
         LEBIHAN LELONG <br>
         RUGI LELONG <br><br>

resources/views/print/laporan_ringkasanterkumpul.blade.php

@@ -217,14 +217,14 @@
       <td>BIL <br>
       N. MARHUN <br>
       PEMBIAYAAN <br>
-      UPAH SIMPAN
+      KEUNTUNGAN
     </td>
     <td ><span>{{ $marhun['tebus'][0]['bilangan'] }}</span><br>
       <span>{{ number_format($marhun['tebus'][0]['jumlahmarhun'],2) }}</span><br>
       <span>{{ number_format($marhun['tebus'][0]['jumlahpinjaman'],2) }}</span><br>
       <span id="tebusupahsimpan">{{ number_format($marhun['tebus'][0]['upahsimpan'],2) }}</span>
     </td>
-    <td>UPAH SIMPAN <br>
+    <td>KEUNTUNGAN <br>
         CAJ LELONG <br>
     </td>
     <td><span id="totalupahsimpan">{{ number_format($keseluruhanupahsimpan,2) }}</span> <br>
@@ -237,7 +237,7 @@
       <td>BIL<br>
         N. MARHUN <br>
         PEMBIAYAAN <br>
-        UPAH SIMPAN
+        KEUNTUNGAN
       </td>
       <td><span>{{ $marhun['advansur'][0]['bilangan'] }}</span><br>
         <span>{{ number_format($marhun['advansur'][0]['jumlahmarhun'],2) }}</span><br>
@@ -252,7 +252,7 @@
       <td>BIL <br>
         N. MARHUN <br>
         PEMBIAYAAN <br>
-        UPAH SIMPAN <br>
+        KEUNTUNGAN <br>
         CAJ LELONG <br>
         LEBIHAN LELONG <br>
         RUGI LELONG <br><br>