Merge branch 'ujrah_master' of bitbucket.org:arrahn-pkb/kaunter into ujrah_master

2023-12-07 00:28:12 +08:00
parent a75918257f 9ace73ff94
commit 42f6e4edbb
5 changed files with 194 additions and 87 deletions
@@ -231,7 +231,7 @@
                    </table>

                    <div class="text-center">
-                        <button class="btn btn-primary" onclick="ubahfunc(this)">Ubah</button>
+                        <button class="btn btn-primary" onclick="ubahfunc(this)" id="button-edit-gadaian">Ubah</button>
                        <button class="btn btn-primary" onclick="hapusfunc()">Hapus</button>
                        <button class="btn btn-primary" onclick="histfunc()">Rekod Gadaian</button>
                    </div>
@@ -528,6 +528,27 @@
        minimumFractionDigits: 2
    });

+    function checkCanChangeGadaianDetail(norujukan){
+        let gadai_tawarruq = fetch(api_url + '/api/gadai/norujukan/' + norujukan );
+
+        gadai_tawarruq
+            .then(response => response.json())
+            .then(response => response[0][0])
+            .then(gadaian => {
+               return gadaian.historygadaian;
+            })
+            .then(historygadaian => {
+                let button_edit_gadaian = document.querySelector('#button-edit-gadaian');
+
+                if(historygadaian === '0' || historygadaian === null || historygadaian.length === 0) {
+                    button_edit_gadaian.disabled = false;
+                    return;
+                }
+
+                button_edit_gadaian.disabled = true;
+            })
+    }
+
    function checkserah(data){
        var urlpenebusan = $(data).data("url");
        var norujukan = $(data).data("norujukan");
@@ -781,8 +802,12 @@
                            }else{
                                var taglel = '';
                            }
+
+                            let table_norujukan = gadai_detail["norujukan"];
+                            let radio_action = "onclick=checkCanChangeGadaianDetail(" + "'" + table_norujukan + "'" + ")";
+
                            xtawarruq.row.add([
-                                '<input type="radio" value='+ gadai_detail["norujukan"] +' name="belum"/>',
+                                '<input type="radio" value='+ gadai_detail["norujukan"] + ' ' + radio_action +' name="belum"/>',
                                '<a href="#" onclick="checkserah(this)" data-pinjaman='+ gadai_detail['pinjaman'] +' data-hargajualan='+ gadai_detail['hargajualan'] +' data-norujukan='+ gadai_detail['norujukan'] +' data-url=' + urlroute +'>' + gadai_detail['norujukan'] + '</a>',
                                gadai_detail['t_gadai'],
                                tarikh_matang,
@@ -799,7 +824,7 @@
                                if(tagarrahnbid == 1){
                                    $.ajax({
                                        method:"GET",
-                                        async:false,                                       
+                                        async:false,
                                        url:api_arrahnbid + 'portalApi?norujukan=' + gadai_detail['norujukan'],

                                        success: function(data){
@@ -822,8 +847,11 @@
                                }
                            }

+                            let table_norujukan = gadai_detail["norujukan"];
+                            let radio_action = "onclick=checkCanChangeGadaianDetail(" + "'" + table_norujukan + "'" + ")";
+
                            tablegadai.row.add([
-                                '<input type="radio" value='+ gadai_detail["norujukan"] +' name="belum"/>',
+                                '<input type="radio" value='+ gadai_detail["norujukan"] + ' ' + radio_action +' name="belum"/>',
                                '<a href="#" onclick="checkserah(this)" data-pinjaman='+ gadai_detail['pinjaman'] +' data-hargajualan='+ gadai_detail['hargajualan'] +' data-norujukan='+ gadai_detail['norujukan'] +' data-url=' + urlroute +'>' + gadai_detail['norujukan'] + '</a>',
                                gadai_detail['t_gadai'],
                                tarikh_matang,
@@ -2397,7 +2425,7 @@
                        allowOutsideClick: false,
                    });
                }
-                
+
            },
            error: function (request, status, error) {
                alert(request.responseText);
@@ -9,7 +9,6 @@
                    <ol class="breadcrumb pb-3">
                      <li class="breadcrumb-item"><a href="{{ route('home') }}">Home</a></li>
                      <li class="breadcrumb-item"><a href="{{ route('laporan') }}">Laporan</a></li>
-                      <li class="breadcrumb-item"><a href="{{ route('homepage.ansuranupah') }}">Ansuran & Upah</a></li>
                      <li class="breadcrumb-item active" aria-current="page">Ansuran</li>
                    </ol>
                  </nav>
@@ -45,15 +44,19 @@
                                        <th width="30%">Nama</th>
                                        <th>No K/P</th>
                                        <th>Tempoh</th>
-                                        <th>Baki Pembiayaan</th>
-                                        <th>Bayaran</th>
-                                        <th>Keuntungan</th>
+                                        <th>Baki Pembiayaan (RM)</th>
+                                        <th>Bayaran (RM)</th>
+                                        <th>Ujrah (RM)</th>
+                                        <th>Keuntungan 1% (RM)</th>
+                                        <th>Keuntungan (RM)</th>
                                    </tr>
                                </thead>
                                <tfoot class="thead-dark">
                                    <th colspan="5">TOTAL</th>
                                    <th id="pinjamantotal"></th>
                                    <th id="bayarantotal"></th>
+                                    <th id="ansuranujrahtotal"></th>
+                                    <th id="ansuranonepercenttotal"></th>
                                    <th id="keuntungantotal"></th>
                                </tfoot>
                            </table>
@@ -114,6 +117,8 @@
        var total_pinjaman = 0;
        var total_bayaran = 0;
        var total_keuntungan = 0;
+        var total_ansuranujrah = 0;
+        var total_ansuranonepercent = 0;
        tabletebus.clear().draw();
        $.each(data,function(index,tebus){
            $.ajax({
@@ -127,6 +132,9 @@
                            total_pinjaman += Number(gadai[0][0]['bakipjm']);
                            total_bayaran += Number(tebus['duit_masuk']);
                            total_keuntungan += Number(tebus['bayaran_keuntungan']);
+                            total_ansuranujrah += Number(tebus['ansuranujrah']);
+                            total_ansuranonepercent += Number(tebus['ansuranonepercent']);
+
                            tabletebus.row.add([
                                counter,
                                tebus['norujukan'],
@@ -135,15 +143,23 @@
                                gadai[0][0]['tempoh'],
                                gadai[0][0]['bakipjm'],
                                tebus['duit_masuk'],
+                                tebus['ansuranujrah'],
+                                tebus['ansuranonepercent'],
                                tebus['bayaran_keuntungan']
                            ]).draw();
                            $('#pinjamantotal').text(formatter.format(total_pinjaman.toFixed(2)));
                            $('#bayarantotal').text(formatter.format(total_bayaran.toFixed(2)));
+                            $('#ansuranujrahtotal').text(formatter.format(total_ansuranujrah.toFixed(2)));
+                            $('#ansuranonepercenttotal').text(formatter.format(total_ansuranonepercent.toFixed(2)));
                            $('#keuntungantotal').text(formatter.format(total_keuntungan.toFixed(2)));
+                            
+                            counter = counter + 1;
                        }
                    });
                }
            });
+
+
        });
        
    }
@@ -90,7 +90,7 @@
                        </div>
                        <div class="col-3 mx-1">
                            <div class="row">
-                                <a href="{{ route('laporan.ansuranujrah') }}" class="btn btn-dark btn-lg btn-block mb-3">Ansuran</a>
+                                <a href="{{ route('laporan.ansuran') }}" class="btn btn-dark btn-lg btn-block mb-3">Ansuran</a>
                            </div>
                            <div class="row">
                                <a href="{{ route('laporan.stokaudit') }}" class="btn btn-dark btn-lg btn-block mb-3">Stok Audit</a>
@@ -203,99 +203,154 @@
    <th>No Rujukan</th>
    <th width="30%">Nama</th>
    <th>No K/P</th>
+    <th>Tarikh Bayaran</th>
    <th>Tempoh</th>
    <th>Baki Pembiayaan (RM)</th>
    <th>Bayaran Pemb. (RM)</th>
+    <th>Ujrah(RM)</th>
+    <th>Keuntungan 1% (RM)</th>
    <th>Keuntungan (RM)</th>
    <th>Bayaran (RM)</th>
  </tr>
-  @php $counter = 1;$totalduitmasuk = 0;$totalkeuntungan = 0; $totalpendahuluan = 0;@endphp
-  @foreach($tebus as $index=>$item)
-  @php $totalduitmasuk += $item['duit_masuk'];$totalkeuntungan += $item['bayaran_keuntungan'];$totalpendahuluan += $item['bayaran_pembiayaan']; @endphp
-  @if($index > 0)
-    @if($item['teller'] != $tebus[$index - 1]['teller'])
-        <tr>
-            <td colspan="11">Teller : <b>{{ $item['teller'] }}</b></td>
-        </tr>
-        @php $totaldmteller = 0;$totalupahteller = 0;$totalpendhteller = 0; @endphp
-    @endif
-  @else
-    <tr>
-        <td colspan="11">Teller : <b>{{ $item['teller'] }}</b></td>
-    </tr>
-    @php $totaldmteller = 0;$totalupahteller = 0;$totalpendhteller = 0; @endphp
+  @php 
+  $counter = 1;
+  $totalduitmasuk = 0;
+  $totalkeuntungan = 0; 
+  $totalpendahuluan = 0;
+  $totalujrah = 0;
+  $totalonepercent = 0;
+@endphp
+@foreach($tebus as $index=>$item)
+@php 
+  $totalduitmasuk += $item['duit_masuk'];
+  $totalkeuntungan += $item['bayaran_keuntungan'];
+  $totalpendahuluan += $item['bayaran_pembiayaan']; 
+  $totalujrah += bcdiv(round($item['ansuranujrah'],2),1,1);
+  $totalonepercent += bcdiv(round($item['ansuranonepercent'],2),1,1); 
+@endphp
+
+@if($index > 0)
+@if($item['teller'] != $tebus[$index - 1]['teller'])
+  <tr>
+      <td colspan="11">Teller : <b>{{ $item['teller'] }}</b></td>
+  </tr>
+  @php 
+      $totaldmteller = 0;
+      $totalupahteller = 0;
+      $totalpendhteller = 0; 
+      $totalujrahteller = 0;
+      $totalonepercentteller = 0;                
+  @endphp
+@endif
+@else
+<tr>
+  <td colspan="11">Teller : <b>{{ $item['teller'] }}</b></td>
+</tr>
+  @php 
+      $totaldmteller = 0;
+      $totalupahteller = 0;
+      $totalpendhteller = 0; 
+      $totalujrahteller = 0;
+      $totalonepercentteller = 0;
+  @endphp
+@endif
+<tr>
+<td>{{ $counter }}</td>
+<td>{{$item['norujukan']}}</td>
+<td>{{ $item['nama'] }}</td>
+<td>{{ $item['nokp'] }}</td>
+<td> @php 
+  $myDateTime = DateTime::createFromFormat('Y-m-d H:i:s', $item['tarikh_bayaran']);
+  $formattedweddingdate = $myDateTime->format('d-m-Y');
+  echo($formattedweddingdate)
+@endphp</td>
+<td>{{ $item['tempoh'] }}</td>
+<td>{{ number_format($item['bakipjm'],2) }}</td>
+<td>{{ number_format($item['bayaran_pembiayaan'],2) }}</td>    
+<td>{{ number_format(bcdiv(round($item['ansuranujrah'],2),1,1),2) }}</td> 
+<td>{{  number_format(bcdiv(round($item['ansuranonepercent'],2),1,1),2) }}</td>           
+<td>{{ number_format($item['bayaran_keuntungan'],2) }}</td>
+<td>{{ number_format($item['duit_masuk'],2) }}</td>
+</tr>
+@php $counter++; @endphp
+@php 
+  $totaldmteller += $item['duit_masuk'];
+  $totalupahteller += $item['bayaran_keuntungan'];
+  $totalpendhteller += $item['bayaran_pembiayaan']; 
+  $totalujrahteller += bcdiv(round($item['ansuranujrah'],2),1,1);
+  $totalonepercentteller += bcdiv(round($item['ansuranonepercent'],2),1,1); 
+@endphp
+
+@if($index+1 < sizeof($tebus))
+  @if($item['teller'] != $tebus[$index + 1]['teller'])
+      <tr>
+          <td colspan="7">{{ $counter-1 }} Jumlah Bagi Teller : {{ $item['teller'] }}</td>
+          <td><b>{{ number_format($totalpendhteller,2) }} </b></td>
+          <td><b>{{ number_format($totalujrahteller,2) }} </b></td>
+          <td><b>{{ number_format($totalonepercentteller,2) }} </b></td>
+          <td><b>{{ number_format($totalupahteller,2) }} </b></td>
+          <td><b>{{ number_format($totaldmteller,2) }} </b></td>
+      </tr>
+      @php 
+          $counter = 1;
+          $totaldmteller = 0;
+          $totalupahteller = 0;
+          $totalpendhteller = 0;
+      @endphp
  @endif
-    <tr>
-      <td>{{ $counter }}</td>
-      <td>{{$item['norujukan']}}</td>
-      <td>{{ $item['nama'] }}</td>
-      <td>{{ $item['nokp'] }}</td>
-      <td>{{ $item['tempoh'] }}</td>
-      <td>{{ number_format($item['bakipjm'],2) }}</td>
-      <td>{{ number_format($item['bayaran_pembiayaan'],2) }}</td>
-      <td>{{ number_format($item['bayaran_keuntungan'],2) }}</td>
-      <td>{{ number_format($item['duit_masuk'],2) }}</td>
-    </tr>
-    @php $counter++; @endphp
-    @php $totaldmteller += $item['duit_masuk'];$totalupahteller += $item['bayaran_keuntungan'];$totalpendhteller += $item['bayaran_pembiayaan']; @endphp
-    @if($index+1 < sizeof($tebus))
-        @if($item['teller'] != $tebus[$index + 1]['teller'])
-            <tr>
-                <td colspan="6">{{ $counter-1 }} Jumlah Bagi Teller : {{ $item['teller'] }}</td>
-                <td><b>{{ number_format($totalpendhteller,2) }} </b></td>
-                <td><b>{{ number_format($totalupahteller,2) }} </b></td>
-		<td><b>{{ number_format($totaldmteller,2) }} </b></td>
-            </tr>
-            @php $counter = 1;$totaldmteller = 0;$totalupahteller = 0;$totalpendhteller = 0;@endphp
-        @endif
-    @else
-        <tr>
-            <td colspan="6">{{ $counter-1 }} Jumlah Bagi Teller : {{ $item['teller'] }}</td>
-            <td><b>{{ number_format($totalpendhteller,2) }} </b></td>
-            <td><b>{{ number_format($totalupahteller,2) }} </b></td>
-	    <td><b>{{ number_format($totaldmteller,2) }} </b></td>
-        </tr>
-    @endif
-  @endforeach
+@else
+  <tr>
+      <td colspan="7">{{ $counter-1 }} Jumlah Bagi Teller : {{ $item['teller'] }}</td>
+      <td><b>{{ number_format($totalpendhteller,2) }} </b></td>
+      <td><b>{{ number_format($totalujrahteller,2) }} </b></td>
+      <td><b>{{ number_format($totalonepercentteller,2) }} </b></td>
+      <td><b>{{ number_format($totalupahteller,2) }} </b></td>
+  <td><b>{{ number_format($totaldmteller,2) }} </b></td>
+  </tr>
+@endif
+@endforeach
 </table>

 <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 style="text-align:center;">Bayaran Pemb. (RM)</th>
-    <th style="text-align:center;">Keuntungan (RM)</th>
-    <th style="text-align:center;">Bayaran (RM)</th>
-  </tr>
-  <tr>
-    <td colspan="9" style="text-align: center;"><b>JUMLAH KESELURUHAN</b></td>
-    <td>{{ number_format($totalpendahuluan,2) }}</td>
-    <td>{{ number_format($totalkeuntungan,2) }}</td>
-    <td>{{ number_format($totalduitmasuk,2) }}</td>
-  </tr>
+<tr>
+<th colspan="9"></th>
+<th style="text-align:center;">Bayaran Pemb. (RM)</th>
+<th style="text-align:center;">Ujrah (RM)</th>
+<th style="text-align:center;">Keuntungan 1% (RM)</th>
+<th style="text-align:center;">Keuntungan (RM)</th>
+<th style="text-align:center;">Bayaran (RM)</th>
+</tr>
+<tr>
+<td colspan="9" style="text-align: center;"><b>JUMLAH KESELURUHAN</b></td>
+<td>{{ number_format($totalpendahuluan,2) }}</td>
+<td>{{ number_format($totalujrah,2) }}</td>
+<td>{{ number_format($totalonepercent,2) }}</td>
+<td>{{ number_format($totalkeuntungan,2) }}</td>
+<td>{{ number_format($totalduitmasuk,2) }}</td>
+</tr>
 </table>

 <br><br>
 <br><br>
 <table id="sign">
-  <tr>
-    <td></td>
-    <td colspan="2"> .................................................................. </td>
-    <td> </td>
-    <td colspan="2">.................................................................. </td>
-    <td> </td>
-  </tr>
-  <tr>
-    <td></td>
-    <td colspan="2"><B> DI SEMAK</B> </td>
-    <td> </td>
-    <td colspan="2"><B>DI SAHKAN </B></td>
-    <td> </td>
-  </tr>
+<tr>
+<td></td>
+<td colspan="2"> .................................................................. </td>
+<td> </td>
+<td colspan="2">.................................................................. </td>
+<td> </td>
+</tr>
+<tr>
+<td></td>
+<td colspan="2"><B> DI SEMAK</B> </td>
+<td> </td>
+<td colspan="2"><B>DI SAHKAN </B></td>
+<td> </td>
+</tr>
 </table>





-
@@ -204,11 +204,14 @@
    <th>Pembiayaan Asal (RM)</th>
    <th>Baki Pembiayaan (RM)</th>
    <th>Kadar Upah</th>
-    <th>Tempoh Belum Bayar</th>
-    <th>Keuntungan Belum Bayar (RM)</th>
+    <th>Tempoh B.Bayar</th>
+    <th>Untung B.Bayar(RM)</th>
+    <th>Utg 1%(RM) </th>
+    <th>Ujrah(RM)</th>
    <th>Lanjutan</th>
  </thead>
  @php $counter = 1;$totalpinjaman = 0; @endphp
+  {{-- {{dd($stokaudit['rekod'])}} --}}
  @foreach($stokaudit['rekod'] as $index=>$item)
    <tr>
      <td>{{ $counter }}</td>
@@ -220,8 +223,13 @@
      <td>{{ number_format($item['pinjaman'],2) }}</td>
      <td>{{ number_format($item['bakipjm'],2) }}</td>
      <td>{{ number_format($item['kadarupah'],2) }}</td>
-      <td>{{ number_format($item['tempohblmbyar'],2) }}</td>
+      <td>{{ number_format($item['tempohblmbyar'],2) }}</td>  
      <td>{{ number_format($item['upahblmbyar'],2) }}</td>
+      <td>{{ number_format($item['pinjaman']* 0.01,2)  }}</td>
+      @if($item['ujrah'] ='')
+      <td> {{ number_format($item['ujrah'],2) }} </td>
+      @endif
+
      <td>{{$item['lanjutan']}}</td>
    </tr>
    @php $counter++; @endphp