Merge branch 'pipiv2' into 'master'

Pipiv2

See merge request online-sistem1/kaunter!104

resources/views/aliran_tunai/index.blade.php

@@ -124,7 +124,7 @@
                     <div class="card-body">
 
 
-                        <a href="{{ route('laporan.serahanteller') }}" class="btn btn-primary">Teller Serahan</a>
+                        <button type="button" onclick="kemaskiniupah()" class="btn btn-primary float-right" disabled>Kemaskini</button>
                         <nav>
                             <div class="nav nav-tabs mb-4" id="nav-tab" role="tablist">
                               <a class="nav-item nav-link active" id="nav-home-tab" data-toggle="tab" href="#nav-home" role="tab" aria-controls="nav-home" aria-selected="true">Tunai</a>
@@ -235,11 +235,11 @@
     var tabletuntutbaki = $('#tabletuntutbaki').DataTable({
     //   "scrollX": true
     });
+    var tele = "{{ $auth_user['name'] }}";
 
     $(document).ready( function () {
         var api = '{{ $api_url }}';
         var kodcaw = "{{ $auth_user['cawangan'] }}";
-        var tele = "{{ $auth_user['name'] }}";
 
         function getData(){
             $.ajax({
@@ -284,6 +284,19 @@
         });
     }
 
+    function kemaskiniupah()
+    {
+        $.ajax({
+                type: 'get',
+                url: "{{ route('kemaskini.upah') }}",
+                data: { "namateller" : tele },
+                success: function(data){
+                    console.log(data);
+                }
+            });
+
+    }
+
     let pusherenv = "{{ env('PUSHER_APP_KEY') }}";
     let laporanroute = "{{ route('laporan.serahanteller') }}";
 </script>

resources/views/customers/info.blade.php

@@ -713,8 +713,6 @@
         var counter = 1;
         historytebusbayaran.clear().draw();
 
-        console.table(data);
-
         $.each(data,function(index,tebusaz){
 
             switch(tebusaz['jenistebus']) {
@@ -723,8 +721,17 @@
                     urlroute = urlroute.replace(':id', tebusaz['norujukan']);
                     break;
                 case 'T':
-                    var urlroute = '{{ route("resit.tebus", ":id") }}';
-                    urlroute = urlroute.replace(':id', tebusaz['norujukan']);
+
+                    if(tebusaz['hargajualan'] === '')
+                    {
+                        var urlroute = '{{ route("resit.belumtebus", ":id") }}';
+                        urlroute = urlroute.replace(':id', tebusaz['norujukan']);
+
+                    }else{
+                        var urlroute = '{{ route("resit.tebus", ":id") }}';
+                        urlroute = urlroute.replace(':id', tebusaz['norujukan']);
+                    }
+                  
                     break;
                 case 'A':
                     var urlroute = '{{ route("resit.belumansurans", ":id") }}';
@@ -750,7 +757,7 @@
     }
 
 
-    function ubahfunc(e){
+    async function ubahfunc(e){
 
         let ubahid = $('input[name="belum"]:checked').val();
         let harini = new Date();harini.setHours(0, 0, 0, 0);
@@ -792,11 +799,34 @@
         }
 
         if($("input[name='options']:checked").val() == 'sudah_tebus'){
-            Swal.fire({
-                icon: 'error',
-                title: 'Amaran',
-                text: 'Ubah Gadai Tidak Dibenarkan'
+            const { value: amaun } = await Swal.fire({
+                title: 'Kad Pengenalan Wakil',
+                input: 'text',
+                inputPlaceholder: 'Kad Pengenalan',
+                confirmButtonText: 'Terima',
+                showCancelButton:true,
+                cancelButtonText:'Batal',
+                allowOutsideClick: true,
+                inputValidator: (value) => {
+                    if (!value) {
+                        return 'Isikan tempat kosong diatas!'
+                    }
+
+                    if(value <= 0){
+                        return 'Masukkan No Kad Pengenalan yang betul!';
+                    }
+
+                    if(isNaN(value))
+                    {
+                        return 'Kad Pengenalan hendaklah dalam bentuk nombor!'
+                    }
+                }
             });
+
+            if(amaun)
+            {
+                
+            }
             return false;
         }
 

resources/views/homepage/penilai/home.blade.php

@@ -168,8 +168,8 @@
                         </div>
                         <div class="tab-pane fade" id="gadaian-belum-serah" role="tabpanel" aria-labelledby="gadaian-belum-serah-tab">
                             <div class="float-right mb-3">
-                                <button class="btn btn-primary mt-4 pull-left" onclick="checkallfunc()">Check All</button>
-                                <button class="btn btn-primary mt-4 pull-left" onclick="uncheckallfunc()">Uncheck All</button>
+                                <button class="btn btn-primary mt-4 pull-left" onclick="checkallfunc()" disabled>Check All</button>
+                                <button class="btn btn-primary mt-4 pull-left" onclick="uncheckallfunc()" disabled>Uncheck All</button>
                             </div>
                             <table class='table table-striped table-hover' id='table-gadaian-belum-serah'>
                                 <thead class="thead-dark">
@@ -263,16 +263,16 @@
         setTimeout("location.reload(true);",timeoutPeriod);
     }
 
-    window.onload = timedRefresh(300000);
+    window.onload = timedRefresh(100000);
     var table_gadaian_semasa = $('#table-gadaian-semasa').DataTable({
-        "ordering": false
+        "ordering": true
     });
     var table_gadaian_belum_serah = $('#table-gadaian-belum-serah').DataTable({
-        "ordering": false
+        "ordering": true
     });
 
     var table_rekod_gadaian = $('#table-rekod-gadaian').DataTable({
-        "ordering": false
+        "ordering": true
     });
 
     $('#tarikh_rekod').datepicker({
@@ -289,19 +289,26 @@
     });
 
     function checkallfunc(){
-        
+
+        let totalmarhun = 0;
         $(':checkbox').each(function() {
+            let marhun = Number($(this).data("marhun"));
+            totalmarhun += marhun;
             this.checked = true;                        
         });
-
+        $("#btn-serah").prop('disabled', false);
+        $('#marhunpilih').val(formatter.format(totalmarhun.toFixed(2)));
     }
 
     function uncheckallfunc(){
-        
+        let totalmarhun = 0;
         $(':checkbox').each(function() {
+            let marhun = Number($(this).data("marhun"));
+            totalmarhun -= marhun;
             this.checked = false;                        
         });
-
+        $('#marhunpilih').val(0);
+        $("#btn-serah").prop('disabled', true);
     }
 
     function fetchRekodGadaian(){

resources/views/khazanah/gadaian.blade.php

@@ -195,6 +195,19 @@
 <script>
     var api_url = "<?php echo $api_url ?>";
     //modal
+
+    var tablegadaianmasuk = $('#table-gadaian-semasa').DataTable({
+        //   "scrollX": true
+        });
+
+    var pengesahanmarhun = $('#table-gadaian-belum-serah').DataTable({
+    //   "scrollX": true
+    });
+
+    $(document).ready(function(){
+        $('#norujukan_barcode').focus();
+    })
+    
     $('#marhunModal').on('show.bs.modal', function(event) {
         var button = $(event.relatedTarget); // button yg trigger
         var arraymarhun = button.data('marhun');

resources/views/khazanah/tebus.blade.php

@@ -168,13 +168,17 @@
 var api_url = "<?php echo $api_url ?>";
 
 
-var table_gadaian_semasa = $('#table-gadaian-semasa').DataTable({
-        "ordering": false
+    var table_gadaian_semasa = $('#table-gadaian-semasa').DataTable({
+        "ordering": true
     });
     var table_gadaian_belum_serah = $('#table-gadaian-belum-serah').DataTable({
-        "ordering": false
+        "ordering": true
     });
 
+    $(document).ready(function(){
+        $('#norujukan_barcode').focus();
+    })
+
     //modal
     $('#marhunModal').on('show.bs.modal', function(event) {
         var button = $(event.relatedTarget); // button yg trigger

resources/views/layouts/app.blade.php

@@ -71,7 +71,7 @@
     <div id="app">
         <nav class="navbar navbar-expand-md navbar-light bg-white shadow-sm" style="height:100px;">
             <div class="container">
-                <a class="navbar-brand" href="{{ url('/') }}">
+                <a class="navbar-brand" href="#">
                 <img src="{{ asset('img/icon_pkb.png') }}" class="logo-arrahn-header" alt="Logo Ar Rahn" />
                 </a>
                 <div class="col-2">

resources/views/layouts/app_operasi.blade.php

@@ -71,7 +71,7 @@
     <div id="app">
         <nav class="navbar navbar-expand-md navbar-light bg-white shadow-sm" style="height:100px;">
             <div class="container">
-                <a class="navbar-brand" href="{{ url('/') }}">
+                <a class="navbar-brand" href="#">
                     <img src="{{ asset('img/icon_pkb.png') }}" class="logo-arrahn-header" alt="Logo Ar Rahn" />
                 </a>
                

resources/views/print/resitansuran.blade.php

@@ -409,7 +409,7 @@ hr.new5 {
  </tr>
 
  <tr>
-<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td> Tempoh Simpan</td><td>: {{ $gadai['tempoh'] }} </td>
+<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td> <b>Tempoh Simpan</b></td><td>:<b> {{ $gadai['tempoh'] }}</b> </td>
  </tr>
  
  <tr>
@@ -422,6 +422,7 @@ hr.new5 {
   </table>
   <br>
 
+  <h1 style="float:left;position:absolute;margin-left:100px;">A</h1>
 
 <table id="payment">
 
@@ -435,7 +436,7 @@ hr.new5 {
 <td style="width:10px">(-) Bayaran Pelanggan</td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($transaction['duit_masuk'],2) }} </td>
 </tr>
 <tr>
-<td style="width:10px"><b>Baki Harga Jualan</b></td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($transaction['bakiharga'],2) }} </td>
+<td style="width:10px"><b>Baki Harga Jualan</b></td><td style="width:5px"> </td><td style="width:10px">:<b> RM {{ number_format($transaction['bakiharga'],2) }}</b> </td>
 </tr>
 
 
@@ -465,7 +466,7 @@ hr.new5 {
       <td></td> 
       <td colspan="3">Cagaran Diterima </td>
       <td></td> 
-      <td colspan="3"> Ar-Rahn</td>
+      <td colspan="3"> Ar-Rahn <br> <b>{{ Auth::user()->name }}</b></td>
 
 
 </tr>
@@ -502,7 +503,7 @@ hr.new5 {
 </tr>
 
 <tr>
-<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td> Tempoh Simpan</td><td>: {{ $gadai['tempoh'] }} </td>
+<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td> <b>Tempoh Simpan</b></td><td>:<b> {{ $gadai['tempoh'] }}</b> </td>
 </tr>
 
 <tr>
@@ -515,6 +516,8 @@ hr.new5 {
 </table>
 <br>
 
+<h1 style="float:left;position:absolute;margin-left:100px;">A</h1>
+
 
 <table id="payment">
 
@@ -528,7 +531,7 @@ hr.new5 {
 <td style="width:10px">(-) Bayaran Pelanggan</td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($transaction['duit_masuk'],2) }} </td>
 </tr>
 <tr>
-<td style="width:10px"><b>Baki Harga Jualan</b></td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($transaction['bakiharga'],2) }}</td>
+<td style="width:10px"><b>Baki Harga Jualan</b></td><td style="width:5px"> </td><td style="width:10px">:<b> RM {{ number_format($transaction['bakiharga'],2) }}</b></td>
 </tr>
 
 
@@ -558,7 +561,7 @@ hr.new5 {
     <td></td> 
     <td colspan="3">Cagaran Diterima </td>
     <td></td> 
-    <td colspan="3"> Ar-Rahn</td>
+    <td colspan="3"> Ar-Rahn <br> <b>{{ Auth::user()->name }}</b></td>
 
 
 </tr>

resources/views/print/resitansuransebelum.blade.php

@@ -422,6 +422,7 @@ hr.new5 {
   </table>
   <br>
 
+  <h1 style="float:left;position:absolute;margin-left:100px;">A</h1>
 
 <table id="payment">
 
@@ -515,6 +516,7 @@ hr.new5 {
 </table>
 <br>
 
+<h1 style="float:left;position:absolute;margin-left:100px;">A</h1>
 
 <table id="payment">
 

resources/views/print/resittambahpinjam.blade.php

@@ -409,7 +409,7 @@ hr.new5 {
  </tr>
 
  <tr>
-<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td>: Tempoh Simpan</td><td> {{ $gadai['tempoh'] }} </td>
+<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td>: <b>Tempoh Simpan</b></td><td> <b>{{ $gadai['tempoh'] }}</b> </td>
  </tr>
  
  <tr>
@@ -422,6 +422,7 @@ hr.new5 {
   </table>
   <br>
 
+  <h1 style="float:left;position:absolute;margin-left:100px;">P</h1>
 
 <table id="payment">
 
@@ -438,7 +439,7 @@ hr.new5 {
 <td style="width:10px"><b>Pembiayaan Baru</b></td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($gadai['bakipjm'] + $penebusan['addpinjaman'],2) }} </td>
 </tr>
 <tr>
-  <td style="width:10px"><b>Bayaran Keuntungan</b></td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($penebusan['bakiupah'],2) }} </td>
+  <td style="width:10px"><b>Bayaran Keuntungan</b></td><td style="width:5px"> </td><td style="width:10px">:<b> RM {{ number_format($penebusan['bakiupah'],2) }} </b> </td>
 </tr>
 
 
@@ -468,7 +469,7 @@ hr.new5 {
       <td></td> 
       <td colspan="3">Cagaran Diterima </td>
       <td></td> 
-      <td colspan="3"> Ar-Rahn</td>
+      <td colspan="3"> Ar-Rahn <br> <b>{{ Auth::user()->name }}</b></td>
 
 
 </tr>
@@ -505,7 +506,7 @@ hr.new5 {
 </tr>
 
 <tr>
-<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td>: Tempoh Simpan</td><td> {{ $gadai['tempoh'] }} </td>
+<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td>: <b>Tempoh Simpan</b></td><td> <b>{{ $gadai['tempoh'] }}</b> </td>
 </tr>
 <tr>
   <td colspan="3">Nama Wakil </td> <td>: @php if(sizeof($wakil) != 0){ echo $wakil['nama'];} else echo ''; @endphp </td> <td colspan="3"> </td>  <td> </td><td> </td><td> </td><td> </td>
@@ -517,6 +518,8 @@ hr.new5 {
 </table>
 <br>
 
+<h1 style="float:left;position:absolute;margin-left:100px;">P</h1>
+
 
 <table id="payment">
 
@@ -533,7 +536,7 @@ hr.new5 {
 <td style="width:10px"><b>Pembiayaan Baru</b></td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($gadai['bakipjm'] + $penebusan['addpinjaman'],2) }} </td>
 </tr>
 <tr>
-  <td style="width:10px"><b>Bayaran Keuntungan</b></td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($penebusan['bakiupah'],2) }} </td>
+  <td style="width:10px"><b>Bayaran Keuntungan</b></td><td style="width:5px"> </td><td style="width:10px">:<b> RM {{ number_format($penebusan['bakiupah'],2) }} </b> </td>
 </tr>
 
 
@@ -563,7 +566,7 @@ hr.new5 {
     <td></td> 
     <td colspan="3">Cagaran Diterima </td>
     <td></td> 
-    <td colspan="3"> Ar-Rahn</td>
+    <td colspan="3"> Ar-Rahn <br> <b>{{ Auth::user()->name }}</b></td>
 
 
 </tr>

resources/views/print/resittebus.blade.php

@@ -410,7 +410,7 @@ hr.new5 {
  </tr>
 
  <tr>
-<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td> Tempoh Simpan</td><td>: {{ $gadai['tempoh'] }} </td>
+<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td><b> Tempoh Simpan</b></td><td>:<b> {{ $gadai['tempoh'] }} </b></td>
  </tr>
 
  <tr>
@@ -423,6 +423,7 @@ hr.new5 {
   </table>
   <br>
 
+  <h1 style="float:left;position:absolute;margin-left:100px;">T</h1>
 
 <table id="payment">
 
@@ -442,7 +443,7 @@ hr.new5 {
   <td style="width:10px">(-) Rebate</td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($penebusan['rebate'],2) }} </td>
   </tr>
 <tr>
-  <td style="width:10px"><b>Tebus Keseluruhan</b></td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format(($gadai['bakihargajualan'] - $penebusan['rebate']),2) }}</td>
+  <td style="width:10px"><b>Tebus Keseluruhan</b></td><td style="width:5px"> </td><td style="width:10px">:<b> RM {{ number_format(($gadai['bakihargajualan'] - $penebusan['rebate']),2) }} </b></td>
   </tr>
 
 
@@ -472,7 +473,7 @@ hr.new5 {
       <td></td> 
       <td colspan="3">Cagaran Diterima </td>
       <td></td> 
-      <td colspan="3"> Ar-Rahn</td>
+      <td colspan="3"> Ar-Rahn <br> <b>{{ Auth::user()->name }}</b></td>
 
 
 </tr>
@@ -509,7 +510,7 @@ hr.new5 {
 </tr>
 
 <tr>
-<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> <t/d>  <td> </td><td> </td><td> Tempoh Simpan</td><td>: {{ $gadai['tempoh'] }} </td>
+<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> <t/d>  <td> </td><td> </td><td><b> Tempoh Simpan</b></td><td>:<b> {{ $gadai['tempoh'] }} </b></td>
 </tr>
 
 
@@ -525,6 +526,7 @@ hr.new5 {
 </table>
 <br>
 
+<h1 style="float:left;position:absolute;margin-left:100px;">T</h1>
 
 <table id="payment">
 
@@ -544,7 +546,7 @@ hr.new5 {
   <td style="width:10px">(-) Rebate</td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($penebusan['rebate'],2) }} </td>
   </tr>
 <tr>
-  <td style="width:10px"><b>Tebus Keseluruhan</b></td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format(($gadai['bakihargajualan'] - $penebusan['rebate']),2) }}</td>
+  <td style="width:10px"><b>Tebus Keseluruhan</b></td><td style="width:5px"> </td><td style="width:10px">:<b> RM {{ number_format(($gadai['bakihargajualan'] - $penebusan['rebate']),2) }}</b></td>
   </tr>
 
 </table>
@@ -573,7 +575,7 @@ hr.new5 {
     <td></td> 
     <td colspan="3">Cagaran Diterima </td>
     <td></td> 
-    <td colspan="3"> Ar-Rahn</td>
+    <td colspan="3"> Ar-Rahn <br> <b>{{ Auth::user()->name }}</b></td>
 
 
 </tr>

resources/views/print/resittebussebelum.blade.php

@@ -368,6 +368,8 @@ hr.new5 {
     color: black;
     padding:4px;
   }
+
+
  
 </style>
 
@@ -400,6 +402,8 @@ hr.new5 {
 
 <br>
 
+
+
   <table id="inside">
 
  <tr>
@@ -410,7 +414,7 @@ hr.new5 {
  </tr>
 
  <tr>
-<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td> Tempoh Simpan</td><td>: {{ $gadai['jbg'] }} </td>
+<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td><b> Tempoh Simpan</b></td><td>:<b>  {{ $gadai['jbg'] }} </b></td>
  </tr>
 
  <tr>
@@ -423,6 +427,7 @@ hr.new5 {
   </table>
   <br>
 
+<h1 style="float:left;position:absolute;margin-left:100px;">T</h1>
 
 <table id="payment">
 
@@ -436,7 +441,7 @@ hr.new5 {
   <td style="width:10px">Jumlah Upah</td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($penebusan['bakiupah'],2) }} </td>
   </tr>
 <tr>
-  <td style="width:10px"><b>Tebus Keseluruhan</b></td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format(($gadai['pinjaman'] + $penebusan['bakiupah']),2) }}</td>
+  <td style="width:10px"><b>Tebus Keseluruhan</b></td><td style="width:5px"> </td><td style="width:10px">:<b> RM {{ number_format(($gadai['pinjaman'] + $penebusan['bakiupah']),2) }} </b></td>
   </tr>
 
 
@@ -466,9 +471,7 @@ hr.new5 {
       <td></td> 
       <td colspan="3">Cagaran Diterima </td>
       <td></td> 
-      <td colspan="3"> Ar-Rahn</td>
-
-
+      <td colspan="3"> Ar-Rahn<br><b>{{ Auth::user()->name }}</b></td>
 </tr>
   </table>
   <br>
@@ -503,7 +506,7 @@ hr.new5 {
 </tr>
 
 <tr>
-<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> <t/d>  <td> </td><td> </td><td> Tempoh Simpan</td><td>: {{ $gadai['jbg'] }} </td>
+<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> <t/d>  <td> </td><td> </td><td><b> Tempoh Simpan</b></td><td>:<b> {{ $gadai['jbg'] }} </b></td>
 </tr>
 
 
@@ -519,6 +522,8 @@ hr.new5 {
 </table>
 <br>
 
+<h1 style="float:left;position:absolute;margin-left:100px;">T</h1>
+
 
 <table id="payment">
 
@@ -532,7 +537,7 @@ hr.new5 {
   <td style="width:10px">Jumlah Upah</td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($penebusan['bakiupah'],2) }} </td>
   </tr>
 <tr>
-  <td style="width:10px"><b>Tebus Keseluruhan</b></td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format(($gadai['pinjaman'] + $penebusan['bakiupah']),2) }}</td>
+  <td style="width:10px"><b>Tebus Keseluruhan</b></td><td style="width:5px"> </td><td style="width:10px">:<b> RM {{ number_format(($gadai['pinjaman'] + $penebusan['bakiupah']),2) }}</b></td>
   </tr>
 
 </table>
@@ -561,8 +566,7 @@ hr.new5 {
     <td></td> 
     <td colspan="3">Cagaran Diterima </td>
     <td></td> 
-    <td colspan="3"> Ar-Rahn</td>
-
+    <td colspan="3"> Ar-Rahn<br><b>{{ Auth::user()->name }}</b></td>
 
 </tr>
 </table>

resources/views/print/resittebusseparuh.blade.php

@@ -410,7 +410,7 @@ hr.new5 {
  </tr>
 
  <tr>
-<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td> Tempoh Simpan</td><td>: {{ $gadai['tempoh'] }} </td>
+<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td><b> Tempoh Simpan</b></td><td>:<b> {{ $gadai['tempoh'] }} </b></td>
  </tr>
 
  <tr>
@@ -423,6 +423,8 @@ hr.new5 {
   </table>
   <br>
 
+<h1 style="float:left;position:absolute;margin-left:100px;">S</h1>
+
 
 <table id="payment">
 <tr>
@@ -444,7 +446,7 @@ hr.new5 {
   <td style="width:10px"><b>Jumlah Bayaran</b></td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($penebusan['bakipjm'],2) }}</td>
   </tr>
   <tr>
-    <td style="width:10px"><b>Pembiayaan Baru</b></td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format(($gadai['bakihargajualan'] - $penebusan['rebate']-$penebusan['bakipjm']),2) }}</td>
+    <td style="width:10px"><b>Pembiayaan Baru</b></td><td style="width:5px"> </td><td style="width:10px">:<b> RM {{ number_format(($gadai['bakihargajualan'] - $penebusan['rebate']-$penebusan['bakipjm']),2) }}</b></td>
   </tr>
 
 
@@ -474,7 +476,7 @@ hr.new5 {
       <td></td> 
       <td colspan="3">Cagaran Diterima </td>
       <td></td> 
-      <td colspan="3"> Ar-Rahn</td>
+      <td colspan="3"> Ar-Rahn <br> <b>{{ Auth::user()->name }}</b></td>
 
 
 </tr>
@@ -511,7 +513,7 @@ hr.new5 {
 </tr>
 
 <tr>
-<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> <t/d>  <td> </td><td> </td><td> Tempoh Simpan</td><td>: {{ $gadai['tempoh'] }} </td>
+<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> <t/d>  <td> </td><td> </td><td><b> Tempoh Simpan</b></td><td>:<b> {{ $gadai['tempoh'] }} </b></td>
 </tr>
 
 
@@ -527,6 +529,8 @@ hr.new5 {
 </table>
 <br>
 
+<h1 style="float:left;position:absolute;margin-left:100px;">S</h1>
+
 
 <table id="payment">
 <tr>
@@ -548,7 +552,7 @@ hr.new5 {
   <td style="width:10px"><b>Jumlah Bayaran</b></td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($penebusan['bakipjm'],2) }}</td>
   </tr>
   <tr>
-    <td style="width:10px"><b>Pembiayaan Baru</b></td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format(($gadai['bakihargajualan'] - $penebusan['rebate']-$penebusan['bakipjm']),2) }}</td>
+    <td style="width:10px"><b>Pembiayaan Baru</b></td><td style="width:5px"> </td><td style="width:10px">:<b> RM {{ number_format(($gadai['bakihargajualan'] - $penebusan['rebate']-$penebusan['bakipjm']),2) }} </b></td>
   </tr>
 
 
@@ -578,7 +582,7 @@ hr.new5 {
     <td></td> 
     <td colspan="3">Cagaran Diterima </td>
     <td></td> 
-    <td colspan="3"> Ar-Rahn</td>
+    <td colspan="3"> Ar-Rahn <br> <b>{{ Auth::user()->name }}</b></td>
 
 
 </tr>

resources/views/print/resittebusseparuhbelum.blade.php

@@ -423,6 +423,8 @@ hr.new5 {
   </table>
   <br>
 
+  <h1 style="float:left;position:absolute;margin-left:100px;">S</h1>
+
 
 <table id="payment">
 
@@ -519,6 +521,8 @@ hr.new5 {
 </table>
 <br>
 
+<h1 style="float:left;position:absolute;margin-left:100px;">S</h1>
+
 
 <table id="payment">