Merge branch 'lapfix' into 'new-super'

penambahbaikan online di laporan penebusan

See merge request online-sistem1/kaunter!178

app/Http/Controllers/AliranTunaiController.php

@@ -493,7 +493,7 @@ class AliranTunaiController extends Controller
         if(number_format($penebusanbarcodescanned,2) !== number_format($masuk,2))
             $errorpenebusan = true;
 
-        if(number_format(round($bakisemasa,1),2) !== number_format(round($baki,1),2))
+        if(number_format(round($bakisemasa,2),2) !== number_format(round($baki,2),2))
             $errorbaki = true;
 
         if(number_format($totalpendahuluan,2) != number_format($pendahuluan,2))
@@ -509,7 +509,7 @@ class AliranTunaiController extends Controller
         {
             return response('sama');
         }else{
-            $arraykemaskini = ['pendahuluan' => round($totalpendahuluan,2),'serahan' => round($totalserahan,2), 'penebusan' => round($penebusanbarcodescanned,2), 'gadaian' => round($totalgadaibarcodescanned,2), 'bakisemasa' => round($bakisemasa,1)];
+            $arraykemaskini = ['pendahuluan' => round($totalpendahuluan,2),'serahan' => round($totalserahan,2), 'penebusan' => round($penebusanbarcodescanned,2), 'gadaian' => round($totalgadaibarcodescanned,2), 'bakisemasa' => round($bakisemasa,2)];
             return response()->json($arraykemaskini);
         }
     }

resources/views/khazanah/info.blade.php

@@ -540,7 +540,7 @@
                         var urlroute = '{{ route("lelongan", ":id") }}';
                         urlroute = urlroute.replace(':id', gadai_detail["norujukan"]);
                         tablelelong.row.add([
-                            counter,
+                            '<input type="radio" value='+ gadai_detail["norujukan"] +' name="lelong"/>',
                             '<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'],
@@ -697,12 +697,18 @@
         var koddaerah = $(e).data('koddaerah');
         var noruj = $(e).data('histid');
 
-        console.log(kodnegeri);
-
         if(kodnegeri !== null && koddaerah !== null && kodnegeri !== '' && koddaerah !== '')
         {
-            if($("input[name='options']:checked").val() == 'belum_tebus'){
-            let histid = $('input[name="belum"]:checked').val();
+            if($("input[name='options']:checked").val() == 'belum_tebus' || $("input[name='options']:checked").val() == 'lelong'){
+                
+                let histid = '';
+                if($("input[name='options']:checked").val() == 'belum_tebus'){
+                    histid = $('input[name="belum"]:checked').val();
+                }
+                else{
+                    histid = $('input[name="lelong"]:checked').val();
+                }
+
                 if(histid == null){
                     Swal.fire({
                         icon: 'error',
@@ -728,7 +734,15 @@
     function saghilangfunc()
     {
         if($("input[name='options']:checked").val() == 'belum_tebus' || $("input[name='options']:checked").val() == 'lelong'){
-            let histid = $('input[name="belum"]:checked').val();
+
+            let histid = '';
+            if($("input[name='options']:checked").val() == 'belum_tebus'){
+                histid = $('input[name="belum"]:checked').val();
+            }
+            else{
+                histid = $('input[name="lelong"]:checked').val();
+            }
+
             if(histid == null){
                 Swal.fire({
                     icon: 'error',
@@ -744,7 +758,7 @@
                     {
 
                         var count = Object.keys(data).length;
-
+                        console.log(histid);
                         if(count > 0)
                         {
                             Swal.fire({
@@ -778,7 +792,7 @@
                 title: 'Amaran',
                 text: 'Cetakan Surat Akuan Hilang tidak dibenarkan'
             });
-	}
+        }
 
             
 //        }else if($("input[name='options']:checked").val() == 'lelong'){

resources/views/print/laporan_penebusan.blade.php

@@ -335,17 +335,31 @@
     <td> Not Applicable </td>
   </tr>
   <tr>
-    <td>{{ $upahlama['bil'] }}</td>
+    <td>{{ $upahlama['bilkaunter'] }}</td>
     <td>Bayaran Upah</td>
     <td> Not Applicable </td>
-    <td>{{ number_format($upahlama['total'],2) }}</td>
+    <td>{{ number_format($upahlama['totalkaunter'],2) }}</td>
     <td> Not Applicable </td>
   </tr>
   <tr>
-    <td>{{ $ansuran['bilangan'] }}</td>
+    <td>{{ $upahlama['bilonline'] }}</td>
+    <td>Bayaran Upah Online</td>
+    <td> Not Applicable </td>
+    <td>{{ number_format($upahlama['totalonline'],2) }}</td>
+    <td> Not Applicable </td>
+  </tr>
+  <tr>
+    <td>{{ $ansuran['bilangankaunter'] }}</td>
     <td>Ansuran Pembiayaan</td>
-    <td>{{ number_format($ansuran['totalpendahuluan'],2) }}</td>
-    <td>{{ number_format($ansuran['totalkeuntungan'],2) }}</td>
+    <td>{{ number_format($ansuran['totalpendahuluankaunter'],2) }}</td>
+    <td>{{ number_format($ansuran['totalkeuntungankaunter'],2) }}</td>
+    <td> Not Applicable </td>
+  </tr>
+  <tr>
+    <td>{{ $ansuran['bilanganonline'] }}</td>
+    <td>Ansuran Pembiayaan Online</td>
+    <td>{{ number_format($ansuran['totalpendahuluanonline'],2) }}</td>
+    <td>{{ number_format($ansuran['totalkeuntunganonline'],2) }}</td>
     <td> Not Applicable </td>
   </tr>
 </table>

resources/views/print/laporan_upah.blade.php

@@ -223,23 +223,24 @@
     <th>Teller</th>
     <th>Tempoh</th>
     <th>Pembiayaan (RM)</th>
+    <th>Upah Sebenar (RM)</th>
     <th>Upah Dibayar (RM)</th>
   </tr>
-  @php $counter = 1; $totalbayaran = 0; $totalpembiayaan = 0; $totalpembiayaanteller = 0; $totalbayaranteller = 0; @endphp
+  @php $counter = 1; $totalbayaran = 0; $totalpembiayaan = 0; $totalsebenar = 0; $totalpembiayaanteller = 0; $totalbayaranteller = 0; $totalsebenarteller = 0; @endphp
   @foreach($advansur as $index=>$item)
-  @php $totalbayaran += $item['upahDibayar']; $totalpembiayaan += $item['pinjaman']; @endphp
+  @php $totalbayaran += $item['upahDibayar']; $totalpembiayaan += $item['pinjaman']; $totalsebenar += $item['upahSebenar'];@endphp
     @if($index > 0)
       @if($item['teller'] != $advansur[$index - 1]['teller'])
             <tr>
                 <td colspan=10>Teller : <b>{{ $item['teller'] }}</b></td>
             </tr>
-          @php $counter = 1;$totalpembiayaanteller = 0; $totalbayaranteller = 0; @endphp
+          @php $counter = 1;$totalpembiayaanteller = 0; $totalbayaranteller = 0; $totalsebenarteller = 0; @endphp
         @endif
       @else
         <tr>
             <td colspan=10>Teller : <b>{{ $item['teller'] }}</b></td>
         </tr>
-        @php $counter = 1;$totalpembiayaanteller = 0; $totalbayaranteller = 0; @endphp
+        @php $counter = 1;$totalpembiayaanteller = 0; $totalbayaranteller = 0; $totalsebenarteller = 0; @endphp
 
     @endif
     <tr>
@@ -249,15 +250,17 @@
       <td>{{ $item['teller'] }}</td>
       <td>{{ $item['jbg'] }}</td>
       <td>{{ number_format($item['pinjaman'],2) }}</td>
+      <td>{{ number_format($item['upahSebenar'],2) }}</td>
       <td>{{ number_format($item['upahDibayar'],2) }}</td>
     </tr>
     @php $counter++; @endphp
-    @php $totalbayaranteller += $item['upahDibayar']; $totalpembiayaanteller += $item['pinjaman']; @endphp
+    @php $totalbayaranteller += $item['upahDibayar']; $totalsebenarteller += $item['upahSebenar']; $totalpembiayaanteller += $item['pinjaman']; @endphp
     @if($index+1 < sizeof($advansur))
     @if($item['teller'] != $advansur[$index + 1]['teller'])
         <tr>
             <td colspan="5">{{ $counter-1 }} Jumlah Bagi Teller : {{ $item['teller'] }}</td>
             <td><b>{{ number_format($totalpembiayaanteller,2) }} </b></td>
+            <td><b>{{ number_format($totalsebenarteller,2) }} </b></td>
             <td><b>{{ number_format($totalbayaranteller,2) }} </b></td>
         </tr>
         @php  @endphp
@@ -266,6 +269,7 @@
     <tr>
         <td colspan="5">{{ $counter-1 }} Jumlah Bagi Teller : {{ $item['teller'] }}</td>
         <td><b>{{ number_format($totalpembiayaanteller,2) }} </b></td>
+        <td><b>{{ number_format($totalsebenarteller,2) }} </b></td>
         <td><b>{{ number_format($totalbayaranteller,2) }} </b></td>
     </tr>
 @endif
@@ -276,11 +280,13 @@
   <tr>
     <th colspan="9"></th>
     <th style="text-align:center;">Pembiayaan (RM)</th>
+    <th style="text-align:center;">Upah Sebenar (RM)</th>
     <th style="text-align:center;">Upah Dibayar (RM)</th>
   </tr>
   <tr>
     <td colspan="9" style="text-align: center;"><b>JUMLAH KESELURUHAN</b></td>
     <td>{{ number_format($totalpembiayaan,2) }}</td>
+    <td>{{ number_format($totalsebenar,2) }}</td>
     <td>{{ number_format($totalbayaran,2) }}</td>
   </tr>
 </table>