Merge branch 'new-super' of https://gitlab.com/online-sistem1/kaunter into kaunter

resources/views/customers/info.blade.php

@@ -172,6 +172,7 @@
                                         <th>Pembiayaan</th>
                                         <th>Margin</th>
                                         <th>Tempoh</th>
+                                        <th>Lelong</th>
                                     </tr>
                                 </thead>
                             </table>
@@ -719,6 +720,11 @@
                         var urlroute = '{{ route("penebusan", ":id") }}';
                         urlroute = urlroute.replace(':id', gadai_detail["norujukan"]);
                         if(gadai_detail["bakihargajualan"] == null){
+                            if(gadai_detail['taglel'] == 1){
+                                var taglel = 'Akan Dilelong';
+                            }else{
+                                var taglel = '';
+                            }
                             xtawarruq.row.add([
                                 '<input type="radio" value='+ gadai_detail["norujukan"] +' name="belum"/>',
                                 '<a href="#" onclick="checkserah(this)" data-norujukan='+ gadai_detail['norujukan'] +' data-url=' + urlroute +'>' + gadai_detail['norujukan'] + '</a>',
@@ -726,7 +732,8 @@
                                 gadai_detail['t_matang'],
                                 'RM '+formatter.format(gadai_detail['pinjaman']),
                                 (((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%',
-                                gadai_detail['tempoh']
+                                gadai_detail['tempoh'],
+                                taglel,
                             ]).draw();
                         }else{
                             tablegadai.row.add([
@@ -1599,7 +1606,7 @@
             }
             else {
 		
-		return false;
+		        return false;
 
                 $.ajax({
                     method:'get',
@@ -1745,7 +1752,7 @@
                 Swal.fire({
                     icon: 'error',
                     title: 'Amaran',
-                    text: 'Hapus Gadai Tidak Dibenarkan'
+                    text: 'Hapus Tebus Tidak Dibenarkan'
                 });
                 return false;
             }
@@ -1782,14 +1789,16 @@
                     allowEnterKey: false
                 })
 
-                let mohon = "Hapus Gadai";
+                let mohon = "";
                 let id = 0;
 
                 if($("input[name='options']:checked").val() == 'belum_tebus'){
                     id = hapusid;
+                    mohon = "Hapus Gadai";
                 }
                 else if($("input[name='options']:checked").val() == 'sudah_tebus'){
                     id = hapusidsudah;
+                    mohon = "Hapus Tebus";
                 }
 
                 $.ajax({

resources/views/gadaian/index.blade.php

@@ -771,7 +771,7 @@
                                 return false;
                             }
                             else{
-                                if(pinjaman > Number(pembiyaan_max_pelulus)+10 || pinjaman >= 10000){
+                                if(pinjaman > Number(pembiyaan_max_pelulus) || pinjaman >= 10000){
                                     const swalWithBootstrapButtons = Swal.mixin({
                                         customClass: {
                                             confirmButton: 'btn btn-success',
@@ -780,7 +780,7 @@
                                         buttonsStyling: false
                                     });
 
-                                    if(pinjaman > Number(pembiyaan_max_pelulus)+10){
+                                    if(pinjaman > Number(pembiyaan_max_pelulus)){
                                         var errortext = "Tetapan margin melebihi 75% untuk Operasi!";
                                     }
                                     if(pinjaman >= 10000){
@@ -890,7 +890,7 @@
                                     });
                                     event.preventDefault();
                                     return false;
-                                }else if(pinjaman > Number(pembiayaan_max_teller)+10){
+                                }else if(pinjaman > Number(pembiayaan_max_teller)){
                                     const swalWithBootstrapButtons = Swal.mixin({
                                         customClass: {
                                             confirmButton: 'btn btn-success',

resources/views/penebusan/index.blade.php

@@ -224,7 +224,7 @@
                                     <div class="col-8">
                                         <input type="text" id="jumlahupah" class="form-control" readonly/>
                                     </div>
-                                </diV>
+                                </div>
 
                                 <div class="form-group row" id="divhargaemassemasa">
                                     <div class="col-4">
@@ -255,6 +255,7 @@
                                     </div>
                                 </diV>
                             </div>
+
                             <div class="col-6">
                                 <div class="form-group row" id="divbayaran">
                                     <div class="col-4">
@@ -283,6 +284,14 @@
                                         <input type="text" id="perludibayartawarruq" class="form-control" readonly/>
                                     </div>
                                 </div>
+                                <div class="form-group row" id="divbayaranminima">
+                                    <div class="col-4">
+                                        BAYARAN MINIMA
+                                    </div>
+                                    <div class="col-8">
+                                        <input type="text" id="minimabayaran" value="" class="form-control" readonly/>
+                                    </div>
+                                </div>
                             </div>
 
                             <div class="col-6" id="divbakipinjaman">
@@ -386,6 +395,7 @@
     $('#divperludibayartawarruq').hide();
     $('#divbayarantawarruq').hide();
     $('#divbayaran').hide();
+    $("#divbayaranminima").hide();
 
 
     var array_recno = [];
@@ -422,6 +432,7 @@
 
     var jumlahperlu = 0;
     var jumlahminima = 0;
+    var percent_mora = 0;
  
 
     $( document ).ready(function() {
@@ -435,6 +446,15 @@
             return /^\d*\.?(?:\d{1,2})?$/.test(value);    // Allow digits only, using a RegExp
         });
 
+        $.ajax({
+            method:'get',
+            datatype:'json',
+            url:api + '/api/moratorium/details',
+            success:function(data){
+                percent_mora = data['percent_mora'];
+            }
+        })
+
     });
 
     function tebusan(){
@@ -735,6 +755,7 @@
                 $('#divperludibayartawarruq').hide();
                 $('#divbayarantawarruq').hide();
                 $('#divbayaran').hide();
+                $("#divbayaranminima").hide();
 
                 $('#divtelahdibayar').show();
                 $('#divperludibayar').show();
@@ -762,6 +783,7 @@
                 $('#divtelahdibayar').show();
                 $('#divbayaran').show();
                 $('#divperludibayar').hide();
+                $("#divbayaranminima").hide();
 
                 $('#bayaran').val(formatter.format(jumupah));
 
@@ -787,6 +809,7 @@
                 $('#divtelahdibayar').show();
                 $('#divbayaran').show();
                 $('#divperludibayar').show();
+                $("#divbayaranminima").hide();
 
                 $('#perludibayar').val(formatter.format(jumupahrebet));
                 break;
@@ -807,18 +830,29 @@
                 $('#divbayaran').hide();
                 $('#divperludibayar').hide();
                 $('#divbayarantawarruq').hide();
+                $("#divbayaranminima").hide();
 
                 $("#bayaran").prop("disabled", false);
                 $("#bayaran").val(0);
                 break;
             case "U":
-                $("#terima_transaksi").prop('disabled', false);
+                if(jumupah <= 0){
-
+                    $("#terima_transaksi").prop('disabled', true);
+                }else{
+                    $("#terima_transaksi").prop('disabled', false);
+                }
                 $('input[type="checkbox"]').hide();
                 $('span.spannar').show();
-
+                var taglel = "{{ $gadai['taglel'] }}";
+                var minimum_bayaran = (percent_mora/100)*jumupah;
                 $("#bayaran").prop("disabled", false);
-                $("#perludibayar").prop("readonly", true);
+                if(taglel == 1){
+                    $("#perludibayar").prop("readonly", false);
+                    $("#divbayaranminima").show();
+                }else{
+                    $("#perludibayar").prop("readonly", true);
+                    $("#divbayaranminima").hide();
+                }
                 $("#bayaran").val(0);
 
                 $('#divtambahpinjaman').hide();
@@ -831,7 +865,7 @@
                 $('#divtelahdibayar').hide();
                 $('#divbayaran').hide();
                 $('#divperludibayar').show();
-
+                $('#minimabayaran').val(formatter.format(minimum_bayaran));
                 $('#perludibayar').val(formatter.format(jumupah));
                 break;
             case "AT":
@@ -840,6 +874,7 @@
                 $('input[type="checkbox"]').hide();
                 $('span.spannar').show();
                 $('#divpinjaman').show();
+                $("#divbayaranminima").hide();
                 $('#divtambahpinjaman').hide();
                 $('#divpinjamanbaru').show();
                 $('#divbayaranditerima').hide();
@@ -1786,53 +1821,77 @@
             var marhun = "{{ $gadai['marhun'] }}";
             var nowakil = nw;
 
-            $.ajax({
+            var minimum_bayaran = (percent_mora/100)*bakiupah;
-                method:'post',
+            if(bakipinjaman >= minimum_bayaran){
-                url: api + '/api/ansuran/create/' + kodcaw,
+                if(bakipinjaman > bakiupah){
-                datatype: 'json',
+                    $("#terima_transaksi").prop('disabled', false);
-                data:{
+                    Swal.fire({
-                    'norujukan' : norujukan,
+                        icon: 'error',
-                    'nopelanggan' : nopelanggan,
+                        title: 'Bayaran Melebihi Dari Maksima',
-                    'nilaimarhun' : nilai_marhun,
+                        text: 'Bayaran Maksima Adalah Upah Semasa'
-                    'pinjaman' : pinjaman,
+                    });
-                    'kadarupah' : kadarupah,
+                    event.preventDefault();
-                    'glcode' : "1000/010",
+                    return false;
-                    'upahsebenar' : bakipinjaman,
+                }else{
-                    'upahdibayar' : bakipinjaman,
-                    'teller' : teller,
-                    'prkod' : prkod,
-                    'jbg' : jbg,
-                    'nowakil' : 0,
-                    'hubungan' : 0,
-                    'historygadaian' : norujukan
-                },
-                success:function(data){
                     $.ajax({
-                        method: 'put',
+                        method:'post',
-                        url: "{{ route('alirantunai.advansur') }}",
+                        url: api + '/api/ansuran/create/' + kodcaw,
-                        async:false,
+                        datatype: 'json',
-                        data:{ 
+                        data:{
                             'norujukan' : norujukan,
-                            "_token": "{{ csrf_token() }}"
+                            'nopelanggan' : nopelanggan,
+                            'nilaimarhun' : nilai_marhun,
+                            'pinjaman' : pinjaman,
+                            'kadarupah' : kadarupah,
+                            'glcode' : "1000/010",
+                            'upahsebenar' : bakiupah,
+                            'upahdibayar' : bakipinjaman,
+                            'teller' : teller,
+                            'prkod' : prkod,
+                            'jbg' : jbg,
+                            'nowakil' : 0,
+                            'hubungan' : 0,
+                            'historygadaian' : norujukan
                         },
                         success:function(data){
-                            console.log(data);
+                            $.ajax({
-                        }, error: function(xhr, status, error) {
+                                method: 'put',
-                                    var err = eval("(" + xhr.responseText + ")");
+                                url: "{{ route('alirantunai.advansur') }}",
-                                    alert(xhr.responseText);
+                                async:false,
-                        }
+                                data:{ 
-                    });
+                                    'norujukan' : norujukan,
+                                    "_token": "{{ csrf_token() }}"
+                                },
+                                success:function(data){
+                                    console.log(data);
+                                }, error: function(xhr, status, error) {
+                                            var err = eval("(" + xhr.responseText + ")");
+                                            alert(xhr.responseText);
+                                }
+                            });
 
-                    Swal.fire({
+                            Swal.fire({
-                        icon: 'success',
+                                icon: 'success',
-                        title: 'Berjaya!',
+                                title: 'Berjaya!',
-                        text: 'Pembayaran Upah Berjaya',
+                                text: 'Pembayaran Upah Berjaya',
-                    }).then(function() {
+                            }).then(function() {
-                        window.open(urlroute, '_blank');
+                                window.open(urlroute, '_blank');
-                        window.location.replace("{{  route('customer_info') }}");
+                                window.location.replace("{{  route('customer_info') }}");
+                            })
+                        }
                     })
                 }
-            })
+            }else{
+                $("#terima_transaksi").prop('disabled', false);
+                Swal.fire({
+                    icon: 'error',
+                    title: 'Bayaran Kurang Dari Minimum',
+                    text: 'Bayaran minimum adalah '+percent_mora+' %'
+                });
+                event.preventDefault();
+                return false;
+            }
+            
 
         }else if($('#sltjenistebus').find(":selected").val() == 'AT'){
 

resources/views/print/laporan_gadaian.blade.php

@@ -214,7 +214,7 @@
     <th>Keuntungan</th>
     <th>Peratus (%)</th>
   </tr>
-  @php $counter = 1; $totalpinjaman = 0; $totalberat = 0; $totalnm = 0; $totalupah = 0;@endphp
+  @php $counter = 1; $totalpinjaman = 0; $totalberat = 0; $totalnm = 0; $totalupah = 0; $bil = 0;@endphp
   @foreach($gadai as $index=>$item)
   @php $totalpinjaman += $item['pinjaman']; $totalberat += $item['berat']; $totalnm += $item['nilaimarhun']; $totalupah += $item['upah12']; @endphp
     @if($index > 0)
@@ -250,6 +250,7 @@
     @php $totalpinjamanteller += $item['pinjaman'];$totalnmteller += $item['nilaimarhun'];$totalberatteller += $item['berat'];$totalupah12 += $item['upah12']; @endphp
     @if($index+1 < sizeof($gadai))
         @if($item['teller'] != $gadai[$index + 1]['teller'])
+          @php if($item['teller'] != '')$bil += ($counter-1); @endphp
             <tr>
                 <td colspan="6"><b>{{ $counter-1 }}</b> Jumlah surat bagi teller : <b>{{ $item['teller'] }}</b></td>
                 <td><b>{{ number_format($totalberatteller,2) }} </b></td>
@@ -261,6 +262,7 @@
             @php $counter = 1;$totalupah12 = 0;$totalpinjamanteller = 0;$totalnmteller = 0; @endphp
         @endif
     @else
+        @php $bil += ($counter-1); @endphp
         <tr>
             <td colspan="6"><b>{{ $counter-1 }}</b> Jumlah surat bagi teller : <b>{{ $item['teller'] }}</b></td>
             <td><b>{{ number_format($totalberatteller,2) }} </b></td>
@@ -275,7 +277,7 @@
 <br><br>
 <table id="details" style="border-top:1px solid black;border-bottom:1px solid black;text-align:center;">
   <tr>
-    <th colspan="9"></th>
+    <th colspan="9" style="text-align: center;"><b>JUMLAH BILANGAN = {{ $bil }}</b></th>
     <th style="text-align:center;">Berat (g/m)</th>
     <th style="text-align:center;">Nilai Marhun (RM)</th>
     <th style="text-align:center;">Pembiayaan (RM)</th>

resources/views/print/laporan_penebusan.blade.php

@@ -288,11 +288,13 @@
 <br><br>
 <table id="details" style="border-top:1px solid black;border-bottom:1px solid black;text-align:center;">
   <tr>
-    <th colspan="9"></th>
+    <th colspan="9" style="text-align: center;"><b>JUMLAH BILANGAN = {{ $tebuspengasingan['biltawarruq'] + $tebuspengasingan['bilarrahn'] }}</b></th>
     <th style="text-align:center;">Nilai Marhun (RM)</th>
     <th style="text-align:center;">Pembiayaan Asal(RM)</th>
     <th style="text-align:center;">B. Pembiayaan (RM)</th>
+    <th style="text-align:center;">Keuntungan Rebet(RM)</th>
     <th style="text-align:center;">Upah/Keuntungan (RM)</th>
+    <th style="text-align:center;">Keuntungan Sebenar(RM)</th>
     <th style="text-align:center;">Jumlah (RM)</th>
   </tr>
   <tr>
@@ -300,7 +302,9 @@
     <td>{{ number_format($totalnm,2) }}</td>
     <td>{{ number_format($totalpinjamanasal,2) }}</td>
     <td>{{ number_format($totalpinjaman,2) }}</td>
+    <td>@php $totalkeuntunganrebet = ($totalpinjaman + $totalupah) - $totalbayaran;echo number_format($totalkeuntunganrebet,2); @endphp</td>
     <td>{{ number_format($totalupah,2) }}</td>
+    <td>{{ number_format($totalupah - $totalkeuntunganrebet,2) }}</td>
     <td>{{ number_format($totalbayaran,2) }}</td>
   </tr>
 </table>