From d5ce8d0df1cbe884c90e8e0496c1e4cb45d628b1 Mon Sep 17 00:00:00 2001
From: MUHD HAFIFIE <Cyclonepipi@fidin-3.local>
Date: Tue, 27 Apr 2021 15:58:20 +0800
Subject: [PATCH 1/8] laporan ansuran panjaran

---
 app/Http/Controllers/KhazanahController.php   |  45 ++-
 .../views/homepage/penilai/home.blade.php     |   1 -
 .../views/khazanah/laporan/ansuran.blade.php  |  50 ++--
 .../views/khazanah/laporan/index.blade.php    |   8 +-
 .../khazanah/laporan/perbelanjaan.blade.php   | 202 +++++++++++++
 .../khazanah/laporan/stokaudit.blade.php      |   6 +-
 .../views/print/laporan_ansuran.blade.php     |  28 +-
 .../views/print/laporan_kawalanstok.blade.php | 269 ++++++++++-------
 .../print/laporan_perbelanjaan.blade.php      | 273 ++++++++++++++++++
 .../views/print/laporan_stokaudit.blade.php   |   7 +-
 .../laporan_stokauditbelumaktif.blade.php     |   7 +-
 routes/web.php                                |   7 +-
 12 files changed, 744 insertions(+), 159 deletions(-)
 create mode 100644 resources/views/khazanah/laporan/perbelanjaan.blade.php
 create mode 100644 resources/views/print/laporan_perbelanjaan.blade.php

diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php
index 9f2eb5a..e98dfed 100644
--- a/app/Http/Controllers/KhazanahController.php
+++ b/app/Http/Controllers/KhazanahController.php
@@ -2032,7 +2032,7 @@ class KhazanahController extends Controller
             $split_date = explode('-',$request->datetimepicker1);
             $tebus_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0];        
         }
-        $tebus = Http::get(config('api.url'). '/api/ansuran/laporan/'. $auth_user['cawangan'] .'/'. $tebus_date)->json();
+        $tebus = Http::get(config('api.url'). '/api/ansuran/laporan/'. $auth_user['cawangan'],['tarikh' => $tebus_date])->json();
         $cawangan=Http::get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
         $cawangan_detail=$cawangan[0];
         // dd($gadai);
@@ -3085,6 +3085,49 @@ class KhazanahController extends Controller
     }
 
 
+    public function laporan_Perbelanjaan(Request $request)
+    {
+        $auth_user = Auth::user();
+        $api_url = config('api.url');
+        $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
+
+
+        return view('khazanah.laporan.perbelanjaan', compact('cawangan_info','api_url'));
+    }
+
+    public function cetaklaporan_Perbelanjaan(Request $request)
+    {
+        $api_url = config('api.url');
+        $auth_user = Auth::user();
+        $current = Carbon::now();
+        $current = new Carbon();
+        $tarikh_cetak = $current->toDateString();
+
+        if($request->datemula == null){
+            $mula_date = '2017-01-01';
+        }else{
+            $split_date = explode('-', $request->datemula);
+            $mula_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0];        
+        }
+
+        if($request->datehingga == null){
+            $hingga_date = $current->toDateString();
+        }else{
+            $split_date = explode('-', $request->datehingga);
+            $hingga_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0];        
+        }
+
+        $perbelanjaan = Http::get(config('api.url'). '/api/SenaraiPanjar/' . $auth_user['cawangan'] . '/' . $mula_date . '/' . $hingga_date)->json();
+
+        $cawangan = Http::get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
+        $cawangan_detail=$cawangan[0];
+
+        return view('print.laporan_perbelanjaan', compact('perbelanjaan','cawangan_detail','tarikh_cetak','mula_date','hingga_date','api_url'));
+    }
+
+    
+
+
     public function RequestPembatalan(Request $request)
     {
        $kodcaw = $request->kodcaw;
diff --git a/resources/views/homepage/penilai/home.blade.php b/resources/views/homepage/penilai/home.blade.php
index 5d54857..f5fc33d 100644
--- a/resources/views/homepage/penilai/home.blade.php
+++ b/resources/views/homepage/penilai/home.blade.php
@@ -470,7 +470,6 @@
         let norujukan = $('#norujukan_modal1').val();
         let mohon = "Print SAG";
 
-
         const swalWithBootstrapButtons = Swal.mixin({
             customClass: {
                 confirmButton: 'btn btn-success ml-1',
diff --git a/resources/views/khazanah/laporan/ansuran.blade.php b/resources/views/khazanah/laporan/ansuran.blade.php
index 65450c2..a2f478e 100644
--- a/resources/views/khazanah/laporan/ansuran.blade.php
+++ b/resources/views/khazanah/laporan/ansuran.blade.php
@@ -41,23 +41,24 @@
                                     <tr>
                                         <th>Bil</th>
                                         <th>No Rujukan</th>
-                                        <th>Nama</th>
+                                        <th width="30%">Nama</th>
                                         <th>No K/P</th>
-                                        <th>JBG</th>
-                                        <th>Pembiayaan</th>
-                                        <th>Ansuran Upah</th>
-                                        <th>Nilai Marhun</th>
+                                        <th>Tempoh</th>
+                                        <th>Baki Pembiayaan</th>
+                                        <th>Bayaran</th>
+                                        <th>Keuntungan</th>
                                     </tr>
                                 </thead>
+                                <tfoot class="thead-dark">
+                                    <th colspan="5">TOTAL</th>
+                                    <th id="pinjamantotal"></th>
+                                    <th id="bayarantotal"></th>
+                                    <th id="keuntungantotal"></th>
+                                </tfoot>
                             </table>
                         </div>
                     </div>
-                    <div class="row">
-                        <div class="col-md-12 text-right">
-                            Bilangan Surat : <span id="bilangan_surat">3</span>
-                            Jumlah Pinjaman : <span id="jumlah_pinjaman">RM 3,000.00</span>
-                        </div>
-                    </div>
+
                 </div>
             </div>
         </div>
@@ -81,7 +82,8 @@
         var today_date = current_year + '-' +current_month+'-'+current_date;
         $.ajax({
             method:'get',
-            url: api_url + '/api/ansuran/laporan/'+kodcaw+'/' + today_date,
+            url: api_url + '/api/ansuran/laporan/'+kodcaw,
+            data:{ 'tarikh' : today_date },
             success: function(tebus){
                 tebustable(tebus);
             }
@@ -94,16 +96,23 @@
         var today_date = split_date[2] + '-' +split_date[1]+'-'+split_date[0];
         $.ajax({
             method:'get',
-            url: api_url + '/api/ansuran/laporan/'+kodcaw+'/' + today_date,
+            url: api_url + '/api/ansuran/laporan/'+kodcaw,
+            data:{ 'tarikh' : today_date },
             success: function(tebus){
                 tebustable(tebus);
             }
         });
     });
     
+    const formatter = new Intl.NumberFormat('en-US', {
+        minimumFractionDigits: 2
+    });
+    
     function tebustable(data){
         var counter = 1;
         var total_pinjaman = 0;
+        var total_bayaran = 0;
+        var total_keuntungan = 0;
         tabletebus.clear().draw();
         $.each(data,function(index,tebus){
             $.ajax({
@@ -114,17 +123,22 @@
                         url:api_url + '/api/customers/' + gadai[0][0]['nokp'],
                         method:'get',
                         success: function(customer){
+                            total_pinjaman += Number(gadai[0][0]['bakipjm']);
+                            total_bayaran += Number(tebus['duit_masuk']);
+                            total_keuntungan += Number(tebus['bayaran_keuntungan']);
                             tabletebus.row.add([
                                 counter,
                                 tebus['norujukan'],
                                 customer[0]['nama'],
                                 gadai[0][0]['nokp'],
-                                tebus['jbg'],
-                                tebus['pinjaman'],
-                                tebus['ansuran'],
-                                tebus['nilaimarhun'],
-                                ''
+                                gadai[0][0]['tempoh'],
+                                gadai[0][0]['bakipjm'],
+                                tebus['duit_masuk'],
+                                tebus['bayaran_keuntungan']
                             ]).draw();
+                            $('#pinjamantotal').text(formatter.format(total_pinjaman.toFixed(2)));
+                            $('#bayarantotal').text(formatter.format(total_bayaran.toFixed(2)));
+                            $('#keuntungantotal').text(formatter.format(total_keuntungan.toFixed(2)));
                         }
                     });
                 }
diff --git a/resources/views/khazanah/laporan/index.blade.php b/resources/views/khazanah/laporan/index.blade.php
index f3e55f8..43207fc 100644
--- a/resources/views/khazanah/laporan/index.blade.php
+++ b/resources/views/khazanah/laporan/index.blade.php
@@ -81,12 +81,14 @@
                                 <a href="" class="btn btn-danger btn-lg btn-block mb-3">Aging Kawalan Stok</a>
                             </div>
                             <div class="row">
-                                <a href="{{route('laporan.imbangduga')}}" class="btn btn-danger btn-lg btn-block mb-3">Laporan ImbangDuga </a>
+                                <a href="{{route('laporan.imbangduga')}}" class="btn btn-danger btn-lg btn-block mb-3">Imbang Duga</a>
                             </div>
                             <div class="row">
-                                <a href="{{route('laporan.petibesi')}}" class="btn btn-dark btn-lg btn-block mb-3">Laporan Peti Besi</a>
+                                <a href="{{route('laporan.petibesi')}}" class="btn btn-dark btn-lg btn-block mb-3">Peti Besi</a>
+                            </div>
+                            <div class="row">
+                                <a href="{{ route('laporan.perbelanjaan') }}" class="btn btn-dark btn-lg btn-block mb-3">Perbelanjaan</a>
                             </div>
-                            
                         </div>
                     </div>
                 </div>
diff --git a/resources/views/khazanah/laporan/perbelanjaan.blade.php b/resources/views/khazanah/laporan/perbelanjaan.blade.php
new file mode 100644
index 0000000..f0f4904
--- /dev/null
+++ b/resources/views/khazanah/laporan/perbelanjaan.blade.php
@@ -0,0 +1,202 @@
+@extends('layouts.app')
+
+@section('content')
+<div class="container">
+    <div class="row">
+        <div class="col-md-12">
+            <div class="card">
+                <nav aria-label="breadcrumb">
+                    <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 active" aria-current="page">Perbelanjaan</li>
+                    </ol>
+                  </nav>
+
+                <div class="card-body text-center">
+                    <div class="row form-group">
+                        <div class="col-md-2">
+                        </div>
+                        <div class="col-md-10">
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col-md-">
+                            <form action="{{ route('perbelanjaan.cetaklaporan') }}" target="_blank" method="post">
+                                @csrf
+                                <div class="input-group mb-3">
+                                    <div class="input-group-prepend ml-3">
+                                        <span class="input-group-text" id="basic-addon1">Mula</span>
+                                    </div>
+                                    <input type="text" class="form-control col-4" placeholder="Pilih Tarikh" aria-label="Tarikh" id="datemula" name="datemula" aria-describedby="basic-addon1">
+                                    
+                                    <div class="input-group-prepend ml-2 ">
+                                        <span class="input-group-text" id="basic-addon1">Hingga</span>
+                                    </div>
+                                    <input type="text" class="form-control col-4" placeholder="Pilih Tarikh" aria-label="Tarikh" id="datehingga" name="datehingga" aria-describedby="basic-addon1">
+
+                                    
+                                    <input type="submit" class="btn btn-primary ml-md-5" id="submit_button" name="submit_button" value="Cetak">
+                                </div>
+                            </form>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col-md-12">
+                            <table class="table table-striped table-hover" id="myTable">
+                                <thead class="thead-dark">
+                                    <tr>
+                                        <th>Bil</th>
+                                        <th>Tarikh</th>
+                                        <th>Tuntutan Oleh</th>
+                                        <th>Perkara</th>
+                                        <th>J. Perbelanjaan</th>
+                                        <th>Baucer</th>
+                                        <th>Jumlah(RM)</th>
+                                    </tr>
+                                </thead>
+                                <tfoot class="thead-dark">
+                                    <th colspan="6">TOTAL</th>
+                                    <th id="bayarantotal"></th>
+                                </tfoot>
+                            </table>
+                        </div>
+                    </div>
+
+
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<script type="text/javascript">
+    var api_url = "<?php echo $api_url ?>";
+    var kodcaw = "<?php echo $cawangan_info['kodcaw'] ?>";
+
+    var panjartebus = $('#myTable').DataTable({
+        "ordering": false
+    });
+    $(document).ready( function () {
+        $('#datemula').datepicker({
+            format: 'dd-mm-yyyy'
+        });
+        $('#datehingga').datepicker({
+            format: 'dd-mm-yyyy'
+        });
+
+        //current time
+        var current = new Date();
+        var current_date = current.getDate();
+        var current_month = current.getMonth()+1;
+        var current_year = current.getFullYear();
+        var today_date = current_year + '-' +current_month+'-'+current_date;
+
+        $.ajax({
+            method:'get',
+            url: api_url + '/api/SenaraiPanjar/'+ kodcaw + '/' + today_date + '/' + today_date,
+            success: function(panjar){
+                panjartable(panjar);
+            }
+        });
+    });
+
+    $('#datemula').change(function(){
+
+        //mula
+        var input_date = this.value;
+        var split_date = input_date.split('-');
+        var mula_date = split_date[2] + '-' +split_date[1]+'-'+split_date[0];
+
+        var mula = mula_date;
+
+        //current time
+        var hinggainput = $('#datehingga').val();
+
+        if(hinggainput != '')
+        {
+            var input_date = hinggainput;
+            var split_date = input_date.split('-');
+            var hingga_date = split_date[2] + '-' +split_date[1]+'-'+split_date[0];
+
+            var hingga = hingga_date;
+
+        }else{
+            var current = new Date();
+            var current_date = current.getDate();
+            var current_month = current.getMonth()+1;
+            var current_year = current.getFullYear();
+            var today_date = current_year + '-' +current_month+'-'+current_date;
+
+            var hingga = today_date;
+        }
+
+        $.ajax({
+            method:'get',
+            url: api_url + '/api/SenaraiPanjar/'+ kodcaw + '/' + mula + '/' + hingga,
+            success: function(panjar){
+                panjartable(panjar);
+            }
+        });
+    });
+
+    $('#datehingga').change(function(){
+        var input_date = this.value;
+        var split_date = input_date.split('-');
+        var hingga_date = split_date[2] + '-' +split_date[1]+'-'+split_date[0];
+
+        var hingga = hingga_date;
+
+        //current time
+        var mulainput = $('#datemula').val();
+
+        if(mulainput != '')
+        {
+            var input_date = mulainput;
+            var split_date = input_date.split('-');
+            var mula_date = split_date[2] + '-' +split_date[1]+'-'+split_date[0];
+
+            var mula = mula_date;
+
+        }else{
+
+            var dulu_date = '2017-01-01';
+
+            var mula = dulu_date;
+        }
+
+        $.ajax({
+            method:'get',
+            url: api_url + '/api/SenaraiPanjar/'+ kodcaw + '/' + mula + '/' + hingga,
+            success: function(panjar){
+                panjartable(panjar);
+            }
+        });
+    });
+
+    const formatter = new Intl.NumberFormat('en-US', {
+        minimumFractionDigits: 2
+    });
+    
+    function panjartable(data){
+        var counter = 1;
+        var total_bayaran = 0;
+        panjartebus.clear().draw();
+        $.each(data,function(index,panjar){
+            total_bayaran += parseFloat(panjar['bayaran']);
+            panjartebus.row.add([
+                counter,
+                panjar['tarikh'],
+                panjar['tuntutoleh'],
+                panjar['deskripsi'],
+                '<b>' + panjar['kategori'] + '</b>',
+                panjar['nobaucer'],
+                formatter.format(panjar['bayaran'])
+            ]).draw();
+            counter = counter + 1;
+            $('#bayarantotal').text(formatter.format(total_bayaran.toFixed(2)));
+        });
+        
+    }
+</script>
+@endsection
+
diff --git a/resources/views/khazanah/laporan/stokaudit.blade.php b/resources/views/khazanah/laporan/stokaudit.blade.php
index 50f89fb..752efa6 100644
--- a/resources/views/khazanah/laporan/stokaudit.blade.php
+++ b/resources/views/khazanah/laporan/stokaudit.blade.php
@@ -100,13 +100,11 @@
                             
                             <div class="btn-group-toggle col-md-12 col-sm-12 mb-4 radiostyle" data-toggle="buttons">
                                 <label class="btn btn-lg radio-yellow">
-                                    <input autocomplete="off" type="radio" name="radaktif" id="option1" value="aktif" autocomplete="off" checked><i
-                                        class="fas fa-money-bill-alt fa-2x"></i><br>
+                                    <input autocomplete="off" type="radio" name="radaktif" id="option1" value="aktif" autocomplete="off" checked><i></i><br>
                                     <span>Aktif</span>
                                 </label>
                                 <label class="btn btn-lg radio-green">
-                                    <input autocomplete="off" type="radio" name="radaktif" id="option2" value="takaktif" autocomplete="off"><i
-                                        class="fas fa-thumbs-up fa-2x"></i><br><span>Tak Aktif</span>
+                                    <input autocomplete="off" type="radio" name="radaktif" id="option2" value="takaktif" autocomplete="off"><i></i><br><span>Tak Aktif</span>
                                 </label>
                             </div>
 
diff --git a/resources/views/print/laporan_ansuran.blade.php b/resources/views/print/laporan_ansuran.blade.php
index 3b0ad46..71b5791 100644
--- a/resources/views/print/laporan_ansuran.blade.php
+++ b/resources/views/print/laporan_ansuran.blade.php
@@ -200,13 +200,13 @@
 <table id="details">
   <tr>
     <th>Bil</th>
-    <th>Norujukan</th>
-    <th>Nama</th>
-    <th>No KP</th>
-    <th>JBG</th>
-    <th>Pembiayaan</th>
-    <th>Ansuran Upah</th>
-    <th>N Marhun</th>
+    <th>No Rujukan</th>
+    <th width="30%">Nama</th>
+    <th>No K/P</th>
+    <th>Tempoh</th>
+    <th>Baki Pembiayaan (RM)</th>
+    <th>Bayaran (RM)</th>
+    <th>Keuntungan (RM)</th>
   </tr>
   @php $counter = 1; @endphp
   @foreach($tebus as $index=>$item)
@@ -221,24 +221,24 @@
             echo $customer_detail[0]['nama'];
         @endphp
       </td>
-      <td>{{$gadai_detail[0][0]['nokp']}}</td>
-        <td>{{$item['jbg']}}</td>
-      <td>{{$item['pinjaman']}}</td>
-      <td>{{$item['ansuran']}}</td>
-      <td>{{$item['nilaimarhun']}}</td>
+      <td>{{ $gadai_detail[0][0]['nokp'] }}</td>
+        <td>{{ $gadai_detail[0][0]['tempoh'] }}</td>
+      <td>{{ number_format($gadai_detail[0][0]['bakipjm'],2) }}</td>
+      <td>{{ number_format($item['duit_masuk'],2) }}</td>
+      <td>{{ number_format($item['bayaran_keuntungan'],2) }}</td>
 
     </tr>
     @php $counter++; @endphp
     @if($index+1 < sizeof($tebus))
         @if($item['teller'] != $tebus[$index + 1]['teller'])
             <tr>
-                <td colspan=12>{{ $counter }} Jumlah Bagi Teller : {{$item['teller']}}</td>
+                <td colspan=12>{{ $counter-1 }} Jumlah Bagi Teller : {{ $item['teller'] }}</td>
             </tr>
             @php $counter = 0; @endphp
         @endif
     @else
         <tr>
-            <td colspan=12>{{ $counter }} Jumlah Bagi Teller : {{$item['teller']}}</td>
+            <td colspan=12>{{ $counter-1 }} Jumlah Bagi Teller : {{ $item['teller'] }}</td>
         </tr>
     @endif
   @endforeach
diff --git a/resources/views/print/laporan_kawalanstok.blade.php b/resources/views/print/laporan_kawalanstok.blade.php
index fc61eb2..ebbef87 100644
--- a/resources/views/print/laporan_kawalanstok.blade.php
+++ b/resources/views/print/laporan_kawalanstok.blade.php
@@ -97,6 +97,8 @@
   padding: 8px;
   font-size:11px;
   text-align:center;
+  border:1px solid black;
+
   
 }
 
@@ -111,6 +113,7 @@
   text-align: left;
   padding:4px;
   color:black;
+  border:1px solid black;
 }
 </style>
 
@@ -203,22 +206,22 @@
 <br>
 <table id="details">
   <tr>
-    <th colspan="2">Nilai Marhun</th>
-    <th colspan="2">RM1.00 - RM400.99</th>
-    <th colspan="2">RM401.00 - RM2,000.99</th>
-    <th colspan="2">RM2,001.00 - RM1,000,000.00</th>
-    <th colspan="2">Jumlah</th>
+    <th colspan="2" style="text-align: center;">Nilai Marhun</th>
+    <th colspan="2" style="text-align: center;">RM1.00 - RM400.99</th>
+    <th colspan="2" style="text-align: center;">RM401.00 - RM2,000.99</th>
+    <th colspan="2" style="text-align: center;">RM2,001.00 - RM1,000,000.00</th>
+    <th colspan="2" style="text-align: center;">Jumlah</th>
   </tr>
   <tr>
     <th colspan="2"></th>
-    <th>Bil</th>
-    <th>Pinjaman</th>
-    <th>Bil</th>
-    <th>Pinjaman</th>
-    <th>Bil</th>
-    <th>Pinjaman</th>
-    <th>Bil</th>
-    <th>Pinjaman</th>
+    <th style="text-align: center;">Bil</th>
+    <th style="text-align: center;">Pembiayaan</th>
+    <th style="text-align: center;">Bil</th>
+    <th style="text-align: center;">Pembiayaan</th>
+    <th style="text-align: center;">Bil</th>
+    <th style="text-align: center;">Pembiayaan</th>
+    <th style="text-align: center;">Bil</th>
+    <th style="text-align: center;">Pembiayaan</th>
   </tr>
   @php $counter = 1;@endphp
 
@@ -231,44 +234,44 @@
         <span>Jumlah</span>
       </td>
       <td>
-        <span>{{ $kawalanstok[0]['gadai1'][0]['bil']}}</span><br>
-        <span>{{ $kawalanstok[0]['gadaiini1'][0]['bil']}}</span><br>
+        <span>{{ number_format($kawalanstok[0]['gadai1'][0]['bil']) }}</span><br>
+        <span>{{ number_format($kawalanstok[0]['gadaiini1'][0]['bil']) }}</span><br>
         <span>{{ $gad1 = ($kawalanstok[0]['gadai1'][0]['bil'] + $kawalanstok[0]['gadaiini1'][0]['bil']) }}</span>
       </td>
       <td>
-        <span>{{ $kawalanstok[0]['gadai1'][0]['pinj']}}</span><br>
-        <span>{{ floatval($kawalanstok[0]['gadaiini1'][0]['pinj']) }}</span><br>
-        <span>{{ $gadpinj1 = ($kawalanstok[0]['gadai1'][0]['pinj'] + $kawalanstok[0]['gadaiini1'][0]['pinj']) }}</span>
+        <span>{{ number_format($kawalanstok[0]['gadai1'][0]['pinj'],2) }}</span><br>
+        <span>{{ number_format(floatval($kawalanstok[0]['gadaiini1'][0]['pinj']),2) }}</span><br>
+        <span>@php $gadpinj1 = ($kawalanstok[0]['gadai1'][0]['pinj'] + $kawalanstok[0]['gadaiini1'][0]['pinj']); echo number_format($gadpinj1,2) @endphp</span>
       </td>
       <td>
-        <span>{{ $kawalanstok[0]['gadai2'][0]['bil']}}</span><br>
-        <span>{{ $kawalanstok[0]['gadaiini2'][0]['bil']}}</span><br>
-        <span>{{ $gad2 = ($kawalanstok[0]['gadai2'][0]['bil'] + $kawalanstok[0]['gadaiini2'][0]['bil']) }}</span>
+        <span>{{ number_format($kawalanstok[0]['gadai2'][0]['bil']) }}</span><br>
+        <span>{{ number_format($kawalanstok[0]['gadaiini2'][0]['bil']) }}</span><br>
+        <span>@php $gad2 = ($kawalanstok[0]['gadai2'][0]['bil'] + $kawalanstok[0]['gadaiini2'][0]['bil']); echo number_format($gad2); @endphp</span>
       </td>
       <td>
-        <span>{{ $kawalanstok[0]['gadai2'][0]['pinj']}}</span><br>
-        <span>{{ floatval($kawalanstok[0]['gadaiini2'][0]['pinj']) }}</span><br>
-        <span>{{ $gadpinj2 = ($kawalanstok[0]['gadai2'][0]['pinj'] + $kawalanstok[0]['gadaiini2'][0]['pinj']) }}</span>
+        <span>{{ number_format($kawalanstok[0]['gadai2'][0]['pinj'],2) }}</span><br>
+        <span>{{ number_format(floatval($kawalanstok[0]['gadaiini2'][0]['pinj']),2) }}</span><br>
+        <span>@php $gadpinj2 = ($kawalanstok[0]['gadai2'][0]['pinj'] + $kawalanstok[0]['gadaiini2'][0]['pinj']); echo number_format($gadpinj2,2); @endphp</span>
       </td>
       <td>
-        <span>{{ $kawalanstok[0]['gadai3'][0]['bil']}}</span><br>
-        <span>{{ $kawalanstok[0]['gadaiini3'][0]['bil']}}</span><br>
-        <span>{{ $gad3 = ($kawalanstok[0]['gadai3'][0]['bil'] + $kawalanstok[0]['gadaiini3'][0]['bil']) }}</span>
+        <span>{{ number_format($kawalanstok[0]['gadai3'][0]['bil']) }}</span><br>
+        <span>{{ number_format($kawalanstok[0]['gadaiini3'][0]['bil']) }}</span><br>
+        <span>@php $gad3 = ($kawalanstok[0]['gadai3'][0]['bil'] + $kawalanstok[0]['gadaiini3'][0]['bil']); echo number_format($gad3); @endphp</span>
       </td>
       <td>
-        <span>{{ $kawalanstok[0]['gadai3'][0]['pinj']}}</span><br>
-        <span>{{ floatval($kawalanstok[0]['gadaiini3'][0]['pinj']) }}</span><br>
-        <span>{{ $gadpinj3 = ($kawalanstok[0]['gadai3'][0]['pinj'] + $kawalanstok[0]['gadaiini3'][0]['pinj']) }}</span>
+        <span>{{ number_format($kawalanstok[0]['gadai3'][0]['pinj'],2) }}</span><br>
+        <span>{{ number_format(floatval($kawalanstok[0]['gadaiini3'][0]['pinj']),2) }}</span><br>
+        <span>@php $gadpinj3 = ($kawalanstok[0]['gadai3'][0]['pinj'] + $kawalanstok[0]['gadaiini3'][0]['pinj']); echo number_format($gadpinj3,2); @endphp</span>
       </td>
       <td>
-        <span>{{ $totalbilgadaikeseluruhan = $kawalanstok[0]['gadai1'][0]['bil'] + $kawalanstok[0]['gadai2'][0]['bil'] + $kawalanstok[0]['gadai3'][0]['bil']}}</span><br>
-        <span>{{ $totalbilgadaisehari = $kawalanstok[0]['gadaiini1'][0]['bil'] + $kawalanstok[0]['gadaiini2'][0]['bil'] + $kawalanstok[0]['gadaiini3'][0]['bil']}}</span><br>
-        <span>{{ $totalbilgadai = $totalbilgadaikeseluruhan + $totalbilgadaisehari }}</span>
+        <span>@php $totalbilgadaikeseluruhan = $kawalanstok[0]['gadai1'][0]['bil'] + $kawalanstok[0]['gadai2'][0]['bil'] + $kawalanstok[0]['gadai3'][0]['bil']; echo number_format($totalbilgadaikeseluruhan); @endphp</span><br>
+        <span>@php $totalbilgadaisehari = $kawalanstok[0]['gadaiini1'][0]['bil'] + $kawalanstok[0]['gadaiini2'][0]['bil'] + $kawalanstok[0]['gadaiini3'][0]['bil']; echo number_format($totalbilgadaisehari); @endphp</span><br>
+        <span>@php $totalbilgadai = $totalbilgadaikeseluruhan + $totalbilgadaisehari; echo number_format($totalbilgadai); @endphp</span>
       </td>
       <td>
-        <span>{{ $totalpinjgadaikeseluruhan = $kawalanstok[0]['gadai1'][0]['pinj'] + $kawalanstok[0]['gadai2'][0]['pinj'] + $kawalanstok[0]['gadai3'][0]['pinj']}}</span><br>
-        <span>{{ $totalpinjgadaisehari = $kawalanstok[0]['gadaiini1'][0]['pinj'] + $kawalanstok[0]['gadaiini2'][0]['pinj'] + $kawalanstok[0]['gadaiini3'][0]['pinj']}}</span><br>
-        <span>{{ $totalpinjgadai = $totalpinjgadaikeseluruhan + $totalpinjgadaisehari }}</span>
+        <span>@php $totalpinjgadaikeseluruhan = $kawalanstok[0]['gadai1'][0]['pinj'] + $kawalanstok[0]['gadai2'][0]['pinj'] + $kawalanstok[0]['gadai3'][0]['pinj']; echo number_format($totalpinjgadaikeseluruhan,2); @endphp</span><br>
+        <span>@php $totalpinjgadaisehari = $kawalanstok[0]['gadaiini1'][0]['pinj'] + $kawalanstok[0]['gadaiini2'][0]['pinj'] + $kawalanstok[0]['gadaiini3'][0]['pinj']; echo number_format($totalpinjgadaisehari,2); @endphp</span><br>
+        <span>@php $totalpinjgadai = $totalpinjgadaikeseluruhan + $totalpinjgadaisehari; echo number_format($totalpinjgadai,2); @endphp</span>
       </td>
 
     </tr>
@@ -280,44 +283,92 @@
         <span>Jumlah</span>
       </td>
       <td>
-        <span>{{ $kawalanstok[1]['tebus1'][0]['bil']}}</span><br>
-        <span>{{ $kawalanstok[1]['tebusini1'][0]['bil']}}</span><br>
-        <span>{{ $teb1 = ($kawalanstok[1]['tebus1'][0]['bil'] + $kawalanstok[1]['tebusini1'][0]['bil']) }}</span>
+        <span>{{ number_format($kawalanstok[1]['tebus1'][0]['bil']) }}</span><br>
+        <span>{{ number_format($kawalanstok[1]['tebusini1'][0]['bil']) }}</span><br>
+        <span>@php $teb1 = ($kawalanstok[1]['tebus1'][0]['bil'] + $kawalanstok[1]['tebusini1'][0]['bil']); echo number_format($teb1); @endphp</span>
       </td>
       <td>
-        <span>{{ $kawalanstok[1]['tebus1'][0]['pinj']}}</span><br>
-        <span>{{ floatval($kawalanstok[1]['tebusini1'][0]['pinj']) }}</span><br>
-        <span>{{ $tebpinj1 = ($kawalanstok[1]['tebus1'][0]['pinj'] + $kawalanstok[1]['tebusini1'][0]['pinj']) }}</span>
+        <span>{{ number_format($kawalanstok[1]['tebus1'][0]['pinj'],2) }}</span><br>
+        <span>{{ number_format(floatval($kawalanstok[1]['tebusini1'][0]['pinj']),2) }}</span><br>
+        <span>@php $tebpinj1 = ($kawalanstok[1]['tebus1'][0]['pinj'] + $kawalanstok[1]['tebusini1'][0]['pinj']); echo number_format($tebpinj1,2); @endphp</span>
       </td>
       <td>
-        <span>{{ $kawalanstok[1]['tebus2'][0]['bil']}}</span><br>
-        <span>{{ $kawalanstok[1]['tebusini2'][0]['bil']}}</span><br>
-        <span>{{ $teb2 = ($kawalanstok[1]['tebus2'][0]['bil'] + $kawalanstok[1]['tebusini2'][0]['bil']) }}</span>
+        <span>{{ number_format($kawalanstok[1]['tebus2'][0]['bil']) }}</span><br>
+        <span>{{ number_format($kawalanstok[1]['tebusini2'][0]['bil']) }}</span><br>
+        <span>@php $teb2 = ($kawalanstok[1]['tebus2'][0]['bil'] + $kawalanstok[1]['tebusini2'][0]['bil']); echo number_format($teb2); @endphp</span>
       </td>
       <td>
-        <span>{{ $kawalanstok[1]['tebus2'][0]['pinj']}}</span><br>
-        <span>{{ floatval($kawalanstok[1]['tebusini2'][0]['pinj']) }}</span><br>
-        <span>{{ $tebpinj2 = ($kawalanstok[1]['tebus2'][0]['pinj'] + $kawalanstok[1]['tebusini2'][0]['pinj']) }}</span>
+        <span>{{ number_format($kawalanstok[1]['tebus2'][0]['pinj'],2) }}</span><br>
+        <span>{{ number_format(floatval($kawalanstok[1]['tebusini2'][0]['pinj']),2) }}</span><br>
+        <span>@php $tebpinj2 = ($kawalanstok[1]['tebus2'][0]['pinj'] + $kawalanstok[1]['tebusini2'][0]['pinj']); echo number_format($tebpinj2,2); @endphp</span>
       </td>
       <td>
-        <span>{{ $kawalanstok[1]['tebus3'][0]['bil']}}</span><br>
-        <span>{{ $kawalanstok[1]['tebusini3'][0]['bil']}}</span><br>
-        <span>{{ $teb3 = ($kawalanstok[1]['tebus3'][0]['bil'] + $kawalanstok[1]['tebusini3'][0]['bil']) }}</span>
+        <span>{{ number_format($kawalanstok[1]['tebus3'][0]['bil']) }}</span><br>
+        <span>{{ number_format($kawalanstok[1]['tebusini3'][0]['bil']) }}</span><br>
+        <span>@php $teb3 = ($kawalanstok[1]['tebus3'][0]['bil'] + $kawalanstok[1]['tebusini3'][0]['bil']); echo number_format($teb3); @endphp</span>
       </td>
       <td>
-        <span>{{ $kawalanstok[1]['tebus3'][0]['pinj']}}</span><br>
-        <span>{{ floatval($kawalanstok[1]['tebusini3'][0]['pinj']) }}</span><br>
-        <span>{{ $tebpinj3 = ($kawalanstok[1]['tebus3'][0]['pinj'] + $kawalanstok[1]['tebusini3'][0]['pinj']) }}</span>
+        <span>{{ number_format($kawalanstok[1]['tebus3'][0]['pinj'],2) }}</span><br>
+        <span>{{ number_format(floatval($kawalanstok[1]['tebusini3'][0]['pinj']),2) }}</span><br>
+        <span>@php $tebpinj3 = ($kawalanstok[1]['tebus3'][0]['pinj'] + $kawalanstok[1]['tebusini3'][0]['pinj']); echo number_format($tebpinj3,2); @endphp</span>
       </td>
       <td>
-        <span>{{ $totalbiltebuskeseluruhan = $kawalanstok[1]['tebus1'][0]['bil'] + $kawalanstok[1]['tebus2'][0]['bil'] + $kawalanstok[1]['tebus3'][0]['bil']}}</span><br>
-        <span>{{ $totalbiltebussehari = $kawalanstok[1]['tebusini1'][0]['bil'] + $kawalanstok[1]['tebusini2'][0]['bil'] + $kawalanstok[1]['tebusini3'][0]['bil']}}</span><br>
-        <span>{{ $totalbiltebus = $totalbiltebuskeseluruhan + $totalbiltebussehari }}</span>
+        <span>@php $totalbiltebuskeseluruhan = $kawalanstok[1]['tebus1'][0]['bil'] + $kawalanstok[1]['tebus2'][0]['bil'] + $kawalanstok[1]['tebus3'][0]['bil']; echo number_format($totalbiltebuskeseluruhan); @endphp</span><br>
+        <span>@php $totalbiltebussehari = $kawalanstok[1]['tebusini1'][0]['bil'] + $kawalanstok[1]['tebusini2'][0]['bil'] + $kawalanstok[1]['tebusini3'][0]['bil']; echo number_format($totalbiltebussehari); @endphp</span><br>
+        <span>@php $totalbiltebus = $totalbiltebuskeseluruhan + $totalbiltebussehari; echo number_format($totalbiltebus); @endphp</span>
       </td>
       <td>
-        <span>{{ $totalpinjtebuskeseluruhan = $kawalanstok[1]['tebus1'][0]['pinj'] + $kawalanstok[1]['tebus2'][0]['pinj'] + $kawalanstok[1]['tebus3'][0]['pinj']}}</span><br>
-        <span>{{ $totalpinjtebussehari = $kawalanstok[1]['tebusini1'][0]['pinj'] + $kawalanstok[1]['tebusini2'][0]['pinj'] + $kawalanstok[1]['tebusini3'][0]['pinj']}}</span><br>
-        <span>{{ $totalpinjtebus = $totalpinjtebuskeseluruhan + $totalpinjtebussehari }}</span>
+        <span>@php $totalpinjtebuskeseluruhan = $kawalanstok[1]['tebus1'][0]['pinj'] + $kawalanstok[1]['tebus2'][0]['pinj'] + $kawalanstok[1]['tebus3'][0]['pinj']; echo number_format($totalpinjtebuskeseluruhan,2); @endphp</span><br>
+        <span>@php $totalpinjtebussehari = $kawalanstok[1]['tebusini1'][0]['pinj'] + $kawalanstok[1]['tebusini2'][0]['pinj'] + $kawalanstok[1]['tebusini3'][0]['pinj']; echo number_format($totalpinjtebussehari,2); @endphp</span><br>
+        <span>@php $totalpinjtebus = $totalpinjtebuskeseluruhan + $totalpinjtebussehari; echo number_format($totalpinjtebus,2); @endphp</span>
+      </td>
+    </tr>
+    <tr>
+      <td>Ansuran Pembiayaan</td>
+      <td>
+        <span>Baki C/F</span><br>
+        <span>Hari Ini</span><br>
+        <span>Jumlah</span>
+      </td>
+      <td>
+        <span>{{ number_format($kawalanstok[2]['lelong1'][0]['bil']) }}</span><br>
+        <span>{{ number_format($kawalanstok[2]['lelongini1'][0]['bil']) }}</span><br>
+        <span>@php $lel1 = ($kawalanstok[2]['lelong1'][0]['bil'] + $kawalanstok[2]['lelongini1'][0]['bil']); echo number_format($lel1); @endphp</span>
+      </td>
+      <td>
+        <span>{{ number_format($kawalanstok[2]['lelong1'][0]['pinj'],2) }}</span><br>
+        <span>{{ number_format(floatval($kawalanstok[2]['lelongini1'][0]['pinj']),2) }}</span><br>
+        <span>@php $lelpinj1 = ($kawalanstok[2]['lelong1'][0]['pinj'] + $kawalanstok[2]['lelongini1'][0]['pinj']); echo number_format($lelpinj1); @endphp</span>
+      </td>
+      <td>
+        <span>{{ number_format($kawalanstok[2]['lelong2'][0]['bil']) }}</span><br>
+        <span>{{ number_format($kawalanstok[2]['lelongini2'][0]['bil']) }}</span><br>
+        <span>@php $lel2 = ($kawalanstok[2]['lelong2'][0]['bil'] + $kawalanstok[2]['lelongini2'][0]['bil']); echo number_format($lel2); @endphp</span>
+      </td>
+      <td>
+        <span>{{ number_format($kawalanstok[2]['lelong2'][0]['pinj'],2) }}</span><br>
+        <span>{{ number_format(floatval($kawalanstok[2]['lelongini2'][0]['pinj']),2) }}</span><br>
+        <span>@php $lelpinj2 = ($kawalanstok[2]['lelong2'][0]['pinj'] + $kawalanstok[2]['lelongini2'][0]['pinj']); echo number_format($lelpinj2); @endphp</span>
+      </td>
+      <td>
+        <span>{{ number_format(intval($kawalanstok[2]['lelong3'][0]['bil'])) }}</span><br>
+        <span>{{ number_format(intval($kawalanstok[2]['lelongini3'][0]['bil'])) }}</span><br>
+        <span>@php $lel3 = ($kawalanstok[2]['lelong3'][0]['bil'] + $kawalanstok[2]['lelongini3'][0]['bil']); echo number_format($lel3); @endphp</span>
+      </td>
+      <td>
+        <span>{{ number_format($kawalanstok[2]['lelong3'][0]['pinj'],2) }}</span><br>
+        <span>{{ number_format(floatval($kawalanstok[2]['lelongini3'][0]['pinj']),2) }}</span><br>
+        <span>@php $lelpinj3 = ($kawalanstok[2]['lelong3'][0]['pinj'] + $kawalanstok[2]['lelongini3'][0]['pinj']); echo number_format($lelpinj3,2); @endphp</span>
+      </td>
+      <td>
+        <span>@php $totalbillelongkeseluruhan = $kawalanstok[2]['lelong1'][0]['bil'] + $kawalanstok[2]['lelong2'][0]['bil'] + $kawalanstok[2]['lelong3'][0]['bil']; echo number_format($totalbillelongkeseluruhan); @endphp</span><br>
+        <span>@php $totalbillelongsehari = $kawalanstok[2]['lelongini1'][0]['bil'] + $kawalanstok[2]['lelongini2'][0]['bil'] + $kawalanstok[2]['lelongini3'][0]['bil']; echo number_format($totalbillelongsehari); @endphp</span><br>
+       <span>@php $totalbillelong = $totalbillelongkeseluruhan + $totalbillelongsehari; echo number_format($totalbillelong); @endphp</span>
+      </td>
+      <td>
+        <span>@php $totalpinjlelongkeseluruhan = $kawalanstok[2]['lelong1'][0]['pinj'] + $kawalanstok[2]['lelong2'][0]['pinj'] + $kawalanstok[2]['lelong3'][0]['pinj']; echo number_format($totalpinjlelongkeseluruhan,2); @endphp</span><br>
+        <span>@php $totalpinjlelongsehari = $kawalanstok[2]['lelongini1'][0]['pinj'] + $kawalanstok[2]['lelongini2'][0]['pinj'] + $kawalanstok[2]['lelongini3'][0]['pinj']; echo number_format($totalpinjlelongsehari,2); @endphp</span><br>
+        <span>@php $totalpinjlelong = floatval($totalpinjlelongkeseluruhan + $totalpinjlelongsehari); echo number_format($totalpinjlelong,2); @endphp</span>
       </td>
     </tr>
     <tr>
@@ -328,44 +379,44 @@
         <span>Jumlah</span>
       </td>
       <td>
-        <span>{{ $kawalanstok[2]['lelong1'][0]['bil']}}</span><br>
-        <span>{{ $kawalanstok[2]['lelongini1'][0]['bil']}}</span><br>
-        <span>{{ $lel1 = ($kawalanstok[2]['lelong1'][0]['bil'] + $kawalanstok[2]['lelongini1'][0]['bil']) }}</span>
+        <span>{{ number_format($kawalanstok[2]['lelong1'][0]['bil']) }}</span><br>
+        <span>{{ number_format($kawalanstok[2]['lelongini1'][0]['bil']) }}</span><br>
+        <span>@php $lel1 = ($kawalanstok[2]['lelong1'][0]['bil'] + $kawalanstok[2]['lelongini1'][0]['bil']); echo number_format($lel1); @endphp</span>
       </td>
       <td>
-        <span>{{ $kawalanstok[2]['lelong1'][0]['pinj']}}</span><br>
-        <span>{{ floatval($kawalanstok[2]['lelongini1'][0]['pinj']) }}</span><br>
-        <span>{{ $lelpinj1 = ($kawalanstok[2]['lelong1'][0]['pinj'] + $kawalanstok[2]['lelongini1'][0]['pinj']) }}</span>
+        <span>{{ number_format($kawalanstok[2]['lelong1'][0]['pinj'],2) }}</span><br>
+        <span>{{ number_format(floatval($kawalanstok[2]['lelongini1'][0]['pinj']),2) }}</span><br>
+        <span>@php $lelpinj1 = ($kawalanstok[2]['lelong1'][0]['pinj'] + $kawalanstok[2]['lelongini1'][0]['pinj']); echo number_format($lelpinj1); @endphp</span>
       </td>
       <td>
-        <span>{{ $kawalanstok[2]['lelong2'][0]['bil']}}</span><br>
-        <span>{{ $kawalanstok[2]['lelongini2'][0]['bil']}}</span><br>
-        <span>{{ $lel2 = ($kawalanstok[2]['lelong2'][0]['bil'] + $kawalanstok[2]['lelongini2'][0]['bil']) }}</span>
+        <span>{{ number_format($kawalanstok[2]['lelong2'][0]['bil']) }}</span><br>
+        <span>{{ number_format($kawalanstok[2]['lelongini2'][0]['bil']) }}</span><br>
+        <span>@php $lel2 = ($kawalanstok[2]['lelong2'][0]['bil'] + $kawalanstok[2]['lelongini2'][0]['bil']); echo number_format($lel2); @endphp</span>
       </td>
       <td>
-        <span>{{ $kawalanstok[2]['lelong2'][0]['pinj']}}</span><br>
-        <span>{{ floatval($kawalanstok[2]['lelongini2'][0]['pinj']) }}</span><br>
-        <span>{{ $lelpinj2 = ($kawalanstok[2]['lelong2'][0]['pinj'] + $kawalanstok[2]['lelongini2'][0]['pinj']) }}</span>
+        <span>{{ number_format($kawalanstok[2]['lelong2'][0]['pinj'],2) }}</span><br>
+        <span>{{ number_format(floatval($kawalanstok[2]['lelongini2'][0]['pinj']),2) }}</span><br>
+        <span>@php $lelpinj2 = ($kawalanstok[2]['lelong2'][0]['pinj'] + $kawalanstok[2]['lelongini2'][0]['pinj']); echo number_format($lelpinj2); @endphp</span>
       </td>
       <td>
-        <span>{{ intval($kawalanstok[2]['lelong3'][0]['bil']) }}</span><br>
-        <span>{{ intval($kawalanstok[2]['lelongini3'][0]['bil']) }}</span><br>
-        <span>{{ $lel3 = ($kawalanstok[2]['lelong3'][0]['bil'] + $kawalanstok[2]['lelongini3'][0]['bil']) }}</span>
+        <span>{{ number_format(intval($kawalanstok[2]['lelong3'][0]['bil'])) }}</span><br>
+        <span>{{ number_format(intval($kawalanstok[2]['lelongini3'][0]['bil'])) }}</span><br>
+        <span>@php $lel3 = ($kawalanstok[2]['lelong3'][0]['bil'] + $kawalanstok[2]['lelongini3'][0]['bil']); echo number_format($lel3); @endphp</span>
       </td>
       <td>
-        <span>{{ $kawalanstok[2]['lelong3'][0]['pinj'] }}</span><br>
-        <span>{{ floatval($kawalanstok[2]['lelongini3'][0]['pinj']) }}</span><br>
-        <span>{{ $lelpinj3 = ($kawalanstok[2]['lelong3'][0]['pinj'] + $kawalanstok[2]['lelongini3'][0]['pinj']) }}</span>
+        <span>{{ number_format($kawalanstok[2]['lelong3'][0]['pinj'],2) }}</span><br>
+        <span>{{ number_format(floatval($kawalanstok[2]['lelongini3'][0]['pinj']),2) }}</span><br>
+        <span>@php $lelpinj3 = ($kawalanstok[2]['lelong3'][0]['pinj'] + $kawalanstok[2]['lelongini3'][0]['pinj']); echo number_format($lelpinj3,2); @endphp</span>
       </td>
       <td>
-        <span>{{ $totalbillelongkeseluruhan = $kawalanstok[2]['lelong1'][0]['bil'] + $kawalanstok[2]['lelong2'][0]['bil'] + $kawalanstok[2]['lelong3'][0]['bil'] }}</span><br>
-        <span>{{ $totalbillelongsehari = $kawalanstok[2]['lelongini1'][0]['bil'] + $kawalanstok[2]['lelongini2'][0]['bil'] + $kawalanstok[2]['lelongini3'][0]['bil'] }}</span><br>
-       <span>{{ $totalbillelong = $totalbillelongkeseluruhan + $totalbillelongsehari }}</span>
+        <span>@php $totalbillelongkeseluruhan = $kawalanstok[2]['lelong1'][0]['bil'] + $kawalanstok[2]['lelong2'][0]['bil'] + $kawalanstok[2]['lelong3'][0]['bil']; echo number_format($totalbillelongkeseluruhan); @endphp</span><br>
+        <span>@php $totalbillelongsehari = $kawalanstok[2]['lelongini1'][0]['bil'] + $kawalanstok[2]['lelongini2'][0]['bil'] + $kawalanstok[2]['lelongini3'][0]['bil']; echo number_format($totalbillelongsehari); @endphp</span><br>
+       <span>@php $totalbillelong = $totalbillelongkeseluruhan + $totalbillelongsehari; echo number_format($totalbillelong); @endphp</span>
       </td>
       <td>
-        <span>{{ $totalpinjlelongkeseluruhan = $kawalanstok[2]['lelong1'][0]['pinj'] + $kawalanstok[2]['lelong2'][0]['pinj'] + $kawalanstok[2]['lelong3'][0]['pinj'] }}</span><br>
-        <span>{{ $totalpinjlelongsehari = $kawalanstok[2]['lelongini1'][0]['pinj'] + $kawalanstok[2]['lelongini2'][0]['pinj'] + $kawalanstok[2]['lelongini3'][0]['pinj'] }}</span><br>
-        <span>{{ $totalpinjlelong = floatval($totalpinjlelongkeseluruhan + $totalpinjlelongsehari) }}</span>
+        <span>@php $totalpinjlelongkeseluruhan = $kawalanstok[2]['lelong1'][0]['pinj'] + $kawalanstok[2]['lelong2'][0]['pinj'] + $kawalanstok[2]['lelong3'][0]['pinj']; echo number_format($totalpinjlelongkeseluruhan,2); @endphp</span><br>
+        <span>@php $totalpinjlelongsehari = $kawalanstok[2]['lelongini1'][0]['pinj'] + $kawalanstok[2]['lelongini2'][0]['pinj'] + $kawalanstok[2]['lelongini3'][0]['pinj']; echo number_format($totalpinjlelongsehari,2); @endphp</span><br>
+        <span>@php $totalpinjlelong = floatval($totalpinjlelongkeseluruhan + $totalpinjlelongsehari); echo number_format($totalpinjlelong,2); @endphp</span>
       </td>
     </tr>
     <tr>
@@ -376,44 +427,44 @@
         <span>Jumlah</span>
       </td>
       <td>
-        <span>{{ $kawalanstok[3]['hapuskira1'][0]['bil'] }}</span><br>
-        <span>{{ $kawalanstok[3]['hapuskiraini1'][0]['bil'] }}</span><br>
-        <span>{{ $hpk1 = $kawalanstok[3]['hapuskira1'][0]['bil'] + $kawalanstok[3]['hapuskiraini1'][0]['bil'] }}</span>
+        <span>{{ number_format($kawalanstok[3]['hapuskira1'][0]['bil']) }}</span><br>
+        <span>{{ number_format($kawalanstok[3]['hapuskiraini1'][0]['bil']) }}</span><br>
+        <span>@php $hpk1 = $kawalanstok[3]['hapuskira1'][0]['bil'] + $kawalanstok[3]['hapuskiraini1'][0]['bil']; echo number_format($hpk1); @endphp</span>
       </td>
       <td>
-        <span>{{ floatval($kawalanstok[3]['hapuskira1'][0]['pinj']) }}</span><br>
-        <span>{{ floatval($kawalanstok[3]['hapuskiraini1'][0]['pinj']) }}</span><br>
-        <span>{{ $hpkpinj1 = ($kawalanstok[3]['hapuskira1'][0]['pinj'] + $kawalanstok[3]['hapuskiraini1'][0]['pinj']) }}</span>
+        <span>{{ number_format(floatval($kawalanstok[3]['hapuskira1'][0]['pinj']),2) }}</span><br>
+        <span>{{ number_format(floatval($kawalanstok[3]['hapuskiraini1'][0]['pinj']),2) }}</span><br>
+        <span>@php $hpkpinj1 = ($kawalanstok[3]['hapuskira1'][0]['pinj'] + $kawalanstok[3]['hapuskiraini1'][0]['pinj']); echo number_format($hpkpinj1); @endphp</span>
       </td>
       <td>
-        <span>{{ $kawalanstok[3]['hapuskira2'][0]['bil'] }}</span><br>
-        <span>{{ $kawalanstok[3]['hapuskiraini2'][0]['bil'] }}</span><br>
-        <span>{{ $hpk2 = ($kawalanstok[3]['hapuskira2'][0]['bil'] + $kawalanstok[3]['hapuskiraini2'][0]['bil']) }}</span>
+        <span>{{ number_format($kawalanstok[3]['hapuskira2'][0]['bil']) }}</span><br>
+        <span>{{ number_format($kawalanstok[3]['hapuskiraini2'][0]['bil']) }}</span><br>
+        <span>@php $hpk2 = ($kawalanstok[3]['hapuskira2'][0]['bil'] + $kawalanstok[3]['hapuskiraini2'][0]['bil']); echo number_format($hpk2); @endphp</span>
       </td>
       <td>
-        <span>{{ floatval($kawalanstok[3]['hapuskira2'][0]['pinj']) }}</span><br>
-        <span>{{ floatval($kawalanstok[3]['hapuskiraini2'][0]['pinj']) }}</span><br>
-        <span>{{ $hpkpinj2 = ($kawalanstok[3]['hapuskira2'][0]['pinj'] + $kawalanstok[3]['hapuskiraini2'][0]['pinj']) }}</span>
+        <span>{{ number_format(floatval($kawalanstok[3]['hapuskira2'][0]['pinj']),2) }}</span><br>
+        <span>{{ number_format(floatval($kawalanstok[3]['hapuskiraini2'][0]['pinj']),2) }}</span><br>
+        <span>@php $hpkpinj2 = ($kawalanstok[3]['hapuskira2'][0]['pinj'] + $kawalanstok[3]['hapuskiraini2'][0]['pinj']); echo number_format($hpkpinj2); @endphp</span>
       </td>
       <td>
-        <span>{{ $kawalanstok[3]['hapuskira3'][0]['bil'] }}</span><br>
-        <span>{{ $kawalanstok[3]['hapuskiraini3'][0]['bil'] }}</span><br>
-        <span>{{ $hpk3 = ($kawalanstok[3]['hapuskira3'][0]['bil'] + $kawalanstok[3]['hapuskiraini3'][0]['bil']) }}</span>
+        <span>{{ number_format($kawalanstok[3]['hapuskira3'][0]['bil']) }}</span><br>
+        <span>{{ number_format($kawalanstok[3]['hapuskiraini3'][0]['bil']) }}</span><br>
+        <span>@php $hpk3 = ($kawalanstok[3]['hapuskira3'][0]['bil'] + $kawalanstok[3]['hapuskiraini3'][0]['bil']); echo number_format($hpk3); @endphp</span>
       </td>
       <td>
-        <span>{{ floatval($kawalanstok[3]['hapuskira3'][0]['pinj']) }}</span><br>
-        <span>{{ floatval($kawalanstok[3]['hapuskiraini3'][0]['pinj']) }}</span><br>
-        <span>{{ $hpkpinj3 = $kawalanstok[3]['hapuskira3'][0]['pinj'] + $kawalanstok[3]['hapuskiraini3'][0]['pinj'] }}</span>
+        <span>{{ number_format(floatval($kawalanstok[3]['hapuskira3'][0]['pinj']),2) }}</span><br>
+        <span>{{ number_format(floatval($kawalanstok[3]['hapuskiraini3'][0]['pinj']),2) }}</span><br>
+        <span>@php $hpkpinj3 = $kawalanstok[3]['hapuskira3'][0]['pinj'] + $kawalanstok[3]['hapuskiraini3'][0]['pinj']; echo number_format($hpkpinj3); @endphp</span>
       </td>
       <td>
-        <span>{{ $totalbilhapuskirakeseluruhan = $kawalanstok[3]['hapuskira1'][0]['bil'] + $kawalanstok[3]['hapuskira2'][0]['bil'] + $kawalanstok[3]['hapuskira3'][0]['bil'] }}</span><br>
-        <span>{{ $totalbilhapuskirasehari = $kawalanstok[3]['hapuskiraini1'][0]['bil'] + $kawalanstok[3]['hapuskiraini2'][0]['bil'] + $kawalanstok[3]['hapuskiraini3'][0]['bil'] }}</span><br>
-        <span>{{ $totalbilhapuskira = $totalbilhapuskirakeseluruhan + $totalbilhapuskirasehari }}</span>
+        <span>@php $totalbilhapuskirakeseluruhan = $kawalanstok[3]['hapuskira1'][0]['bil'] + $kawalanstok[3]['hapuskira2'][0]['bil'] + $kawalanstok[3]['hapuskira3'][0]['bil']; echo number_format($totalbilhapuskirakeseluruhan); @endphp</span><br>
+        <span>@php $totalbilhapuskirasehari = $kawalanstok[3]['hapuskiraini1'][0]['bil'] + $kawalanstok[3]['hapuskiraini2'][0]['bil'] + $kawalanstok[3]['hapuskiraini3'][0]['bil']; echo number_format($totalbilhapuskirasehari); @endphp</span><br>
+        <span>@php $totalbilhapuskira = $totalbilhapuskirakeseluruhan + $totalbilhapuskirasehari; echo number_format($totalbilhapuskira); @endphp</span>
       </td>
       <td>
-        <span>{{ $totalpinjhapuskirakeseluruhan = $kawalanstok[3]['hapuskira1'][0]['pinj'] + $kawalanstok[3]['hapuskira2'][0]['pinj'] + $kawalanstok[3]['hapuskira3'][0]['pinj'] }}</span><br>
-        <span>{{ $totalpinjhapuskirasehari = $kawalanstok[3]['hapuskiraini1'][0]['pinj'] + $kawalanstok[3]['hapuskiraini2'][0]['pinj'] + $kawalanstok[3]['hapuskiraini3'][0]['pinj'] }}</span><br>
-        <span>{{ $totalpinjhapuskira = $totalpinjhapuskirakeseluruhan + $totalpinjhapuskirasehari }}</span>
+        <span>@php $totalpinjhapuskirakeseluruhan = $kawalanstok[3]['hapuskira1'][0]['pinj'] + $kawalanstok[3]['hapuskira2'][0]['pinj'] + $kawalanstok[3]['hapuskira3'][0]['pinj']; echo number_format($totalpinjhapuskirakeseluruhan,2); @endphp</span><br>
+        <span>@php $totalpinjhapuskirasehari = $kawalanstok[3]['hapuskiraini1'][0]['pinj'] + $kawalanstok[3]['hapuskiraini2'][0]['pinj'] + $kawalanstok[3]['hapuskiraini3'][0]['pinj']; echo number_format($totalpinjhapuskirasehari,2); @endphp</span><br>
+        <span>@php $totalpinjhapuskira = $totalpinjhapuskirakeseluruhan + $totalpinjhapuskirasehari; echo number_format($totalpinjhapuskira,2); @endphp</span>
       </td>
     </tr>
     @php $counter++;@endphp
@@ -425,7 +476,7 @@
         
       </td>
       <td>
-        {{ $gadpinj1 - $tebpinj1 - $lelpinj1 - $hpkpinj1,2 }}
+        {{ $gadpinj1 - $tebpinj1 - $lelpinj1 - $hpkpinj1 }}
         
       </td>
       <td>
diff --git a/resources/views/print/laporan_perbelanjaan.blade.php b/resources/views/print/laporan_perbelanjaan.blade.php
new file mode 100644
index 0000000..f879714
--- /dev/null
+++ b/resources/views/print/laporan_perbelanjaan.blade.php
@@ -0,0 +1,273 @@
+<style>
+#header {
+  font-family: Arial, Helvetica, sans-serif;
+  border-collapse: collapse;
+  width: 100%;
+}
+
+#header td, #customers th {
+ 
+  padding:4px;
+  font-size:10px;
+}
+
+#header tr:nth-child(even){background-color: #ffffff;}
+
+#header tr:hover {background-color: #ddd;}
+
+#header th {
+  padding-top: 12px;
+  padding-bottom: 12px;
+  text-align: left;
+  padding:4px;
+  color:black;
+}
+</style>
+
+
+
+<style>
+#scan {
+  font-family: Arial, Helvetica, sans-serif;
+  border-collapse: collapse;
+  width: 100%;
+}
+
+#scan td, #scan th {
+ 
+  padding: 8px;
+  font-size:11px;
+}
+
+#scan tr:nth-child(even){background-color: #ffffff;}
+
+#scan tr:hover {background-color: #ddd;}
+
+#scan th {
+  padding-top: 12px;
+  padding-bottom: 12px;
+  text-align: left;
+  padding:4px;
+  color:black;
+}
+</style>
+
+
+<style>
+#scan {
+  font-family: Arial, Helvetica, sans-serif;
+  border-collapse: collapse;
+  width: 100%;
+}
+
+#scan td, #scan th {
+  border-collapse: collapse;
+  padding: 8px;
+  font-size:11px;
+}
+
+#scan tr:nth-child(even){background-color: #ffffff;}
+
+#scan tr:hover {background-color: #ddd;}
+
+#scan th {
+  border-collapse: collapse;
+  padding-top: 12px;
+  padding-bottom: 12px;
+  text-align: left;
+  padding:4px;
+  color:black;
+}
+</style>
+
+
+
+<style>
+#details {
+  font-family: Arial, Helvetica, sans-serif;
+  border-collapse: collapse;
+  width: 100%;
+}
+
+#details td, #details th {
+ 
+  padding: 8px;
+  font-size:8px;
+}
+
+#details tr:nth-child(even){background-color: #ffffff;}
+
+#details tr:hover {background-color: #ddd;}
+
+#details th {
+  padding-top: 12px;
+ font-style:bold;
+  padding-bottom: 12px;
+  text-align: left;
+  padding:4px;
+  color:black;
+}
+</style>
+
+<style>
+#sign {
+  font-family: Arial, Helvetica, sans-serif;
+  border-collapse: collapse;
+  width: 100%;
+}
+
+#sign td, #sign th {
+
+  padding: 8px;
+  font-size:11px;
+  text-align: center;
+}
+
+#sign tr:nth-child(even){background-color: #ffffff;}
+
+#sign tr:hover {background-color: #ddd;}
+
+#sign th {
+  padding-top: 12px;
+  padding-bottom: 12px;
+  text-align: left;
+  padding:4px;
+  color:black;
+}
+
+@media print {
+  .new-page {
+    page-break-before: always;
+  }
+}
+
+</style>
+
+
+
+
+
+
+
+
+<table id="header">
+  <tr>
+    {{-- <th rowspan="4"  style="width:50px"><br><img src="{{ asset('img/ARRAHN1.png') }}" style="width:70px"></img></th> --}}
+    {{-- <th colspan="1">KOPERASI PERMODALAN KELANTAN BERHAD</th> --}}
+  </tr>
+  <tr>
+    <td style="font-size:20px;font-weight:bold;">{{ $cawangan_detail['namacaw'] }}</td>
+    <td></td>
+  </tr>
+  {{-- <tr>
+    <td>{{ $cawangan_detail['alamat1'] }}</td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>{{ $cawangan_detail['alamat2'].' No Tel : '. $cawangan_detail['notel'].' No Faks : '. $cawangan_detail['nofaks'] }}</td>
+    <td></td>
+  </tr> --}}
+</table>
+<br>
+
+<table id="scan">
+  <tr>
+    <th colspan ="5"><b>LAPORAN WANG PERBELANJAAN</b></th>
+    <th> </th>
+    <th> </th>
+    <th></th>
+  </tr>
+  <tr>
+    <th colspan="5"><b> TARIKH:</b>
+      @php 
+        $myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_cetak);
+        $formattedweddingdate = $myDateTime->format('d-m-Y');
+        echo($formattedweddingdate);
+      @endphp
+  </th>
+  <td> </td>
+  <td> </td>
+  <td> </td>
+  <td> </td>
+  <td> </td>
+  <td> </td>
+  </tr>
+  <tr>
+    <td style="width:10px"> <b>MULA:</b></td>
+    <td>@php 
+          $myDateTime = DateTime::createFromFormat('Y-m-d', $mula_date);
+          $formattedweddingdate = $myDateTime->format('d-m-Y');
+          echo($formattedweddingdate);
+        @endphp</td>
+     <td style="width:10px"> <b>HINGGA:</b></td>
+     <td>@php 
+           $myDateTime = DateTime::createFromFormat('Y-m-d', $hingga_date);
+           $formattedweddingdate = $myDateTime->format('d-m-Y');
+           echo($formattedweddingdate);
+         @endphp</td>
+    <td> </td>
+    <td> </td>
+    <td> </td>
+    <td> </td>
+    <td> </td>
+    <td> </td>
+  </tr>
+</table>
+
+<br>
+<table id="details">
+  <tr>
+    <th>Bil</th>
+    <th>Tarikh</th>
+    <th>Kategori</th>
+    <th>Tuntutan Oleh</th>
+    <th>Perkara/Item</th>
+    <th>Baucer#</th>
+    <th>Jumlah (RM)</th>
+  </tr>
+  @php $counter = 1; $totalbayaran = 0;@endphp
+  @foreach($perbelanjaan as $index=>$item)
+  @php $totalbayaran += $item['bayaran']; @endphp
+    <tr>
+      <td>{{ $counter }}</td>
+      <td>{{ $item['tarikh'] }}</td>
+      <td><b>{{ $item['kategori'] }}</b></td>
+      <td>{{ $item['tuntutoleh'] }}</td>
+      <td>{{ $item['deskripsi'] }}</td>
+      <td>{{$item['nobaucer']}}</td>
+      <td>{{$item['bayaran']}}</td>
+    </tr>
+    @php $counter++; @endphp
+  @endforeach
+</table>
+
+<h5 style="float:right;">JUMLAH KESELURUHAN BAYARAN : RM {{ number_format($totalbayaran,2) }}</h5>
+
+<br>
+<br>
+<table id="sign">
+  <tr>
+    <td></td>
+    <td colspan="2"> .................................................................. </td>
+    <td> </td>
+    <td colspan="2"> .................................................................. </td>
+    <td> </td>
+    <td colspan="2">.................................................................. </td>
+    <td> </td>
+  </tr>
+  <tr>
+    <td></td>
+    <td colspan="2"><B> Disediakan </B> </td>
+    <td></td>
+    <td colspan="2"><B> Disemak </B> </td>
+    <td> </td>
+    <td colspan="2"><B> Disahkan </B></td>
+    <td> </td>
+  </tr>
+</table>
+
+
+
+
+
+
diff --git a/resources/views/print/laporan_stokaudit.blade.php b/resources/views/print/laporan_stokaudit.blade.php
index 0d5a442..de071c4 100644
--- a/resources/views/print/laporan_stokaudit.blade.php
+++ b/resources/views/print/laporan_stokaudit.blade.php
@@ -208,8 +208,9 @@
     <th>Pembiayaan</th>
     <th>Lanjutan</th>
   </thead>
-  @php $counter = 1; @endphp
+  @php $counter = 1;$totalpinjaman = 0; @endphp
   @foreach($stokaudit['rekod'] as $index=>$item)
+  @php if($item['hargajualan'] == null) $totalpinjaman += $item['pinjaman']; else $totalpinjaman += $item['bakipjm']; @endphp
     <tr>
       <td>{{ $counter }}</td>
       <td>{{$item['norujukan']}}</td>
@@ -217,7 +218,7 @@
       <td>{{$item['nokp']}}</td>
       <td>{{ number_format($item['berat'],2) }}</td>
       <td>{{ number_format($item['nilaimarhun'],2) }}</td>
-      <td>{{ number_format($item['pinjaman'],2) }}</td>
+      <td>@php if($item['hargajualan'] == null) echo number_format($item['pinjaman'],2); else echo number_format($item['bakipjm'],2); @endphp</td>
       <td>{{$item['lelong_tawarruq']}}</td>
     </tr>
     @php $counter++; @endphp
@@ -226,7 +227,7 @@
     <th colspan='4'>Jumlah</th>
     <th>{{ number_format($stokaudit['totalberat'],2) }}</th>
     <th>{{ number_format($stokaudit['totalnilaimarhun'],2) }}</th>
-    <th>{{ number_format($stokaudit['total'],2) }}</th>
+    <th>{{ number_format($totalpinjaman,2) }}</th>
     <th></th>
   </tfoot>
 </table>
diff --git a/resources/views/print/laporan_stokauditbelumaktif.blade.php b/resources/views/print/laporan_stokauditbelumaktif.blade.php
index 0d5a442..de071c4 100644
--- a/resources/views/print/laporan_stokauditbelumaktif.blade.php
+++ b/resources/views/print/laporan_stokauditbelumaktif.blade.php
@@ -208,8 +208,9 @@
     <th>Pembiayaan</th>
     <th>Lanjutan</th>
   </thead>
-  @php $counter = 1; @endphp
+  @php $counter = 1;$totalpinjaman = 0; @endphp
   @foreach($stokaudit['rekod'] as $index=>$item)
+  @php if($item['hargajualan'] == null) $totalpinjaman += $item['pinjaman']; else $totalpinjaman += $item['bakipjm']; @endphp
     <tr>
       <td>{{ $counter }}</td>
       <td>{{$item['norujukan']}}</td>
@@ -217,7 +218,7 @@
       <td>{{$item['nokp']}}</td>
       <td>{{ number_format($item['berat'],2) }}</td>
       <td>{{ number_format($item['nilaimarhun'],2) }}</td>
-      <td>{{ number_format($item['pinjaman'],2) }}</td>
+      <td>@php if($item['hargajualan'] == null) echo number_format($item['pinjaman'],2); else echo number_format($item['bakipjm'],2); @endphp</td>
       <td>{{$item['lelong_tawarruq']}}</td>
     </tr>
     @php $counter++; @endphp
@@ -226,7 +227,7 @@
     <th colspan='4'>Jumlah</th>
     <th>{{ number_format($stokaudit['totalberat'],2) }}</th>
     <th>{{ number_format($stokaudit['totalnilaimarhun'],2) }}</th>
-    <th>{{ number_format($stokaudit['total'],2) }}</th>
+    <th>{{ number_format($totalpinjaman,2) }}</th>
     <th></th>
   </tfoot>
 </table>
diff --git a/routes/web.php b/routes/web.php
index c37b4ec..a2b9420 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -186,9 +186,10 @@ Route::get('laporan/ringkasanharian/cetak',['as'=>'ringkasanharian.laporancetak'
 Route::get('laporan/ringkasanterkumpul/cetak',['as'=>'ringkasanterkumpul.laporancetak','uses'=>'KhazanahController@cetakLaporanRingkasanTerkumpul'])->middleware('auth','khazanah');
 Route::get('/laporan/agingbulanan', [ 'as'=>'laporan.agingbulanan', 'uses'=>'KhazanahController@laporanAging_Bulanan'])->middleware('auth','khazanah');
 Route::post('/laporan/agingbulanan/cetak', ['as'=>'agingbulan.cetaklaporan', 'uses'=>'KhazanahController@cetaklaporang_Aging'])->middleware('auth','khazanah');
-
-Route::get('/laporan/agingbulanan', [ 'as'=>'laporan.agingbulanan', 'uses'=>'KhazanahController@laporanAging_Bulanan'])->middleware('auth','khazanah');
-Route::post('/laporan/agingbulanan/cetak', ['as'=>'agingbulan.cetaklaporan', 'uses'=>'KhazanahController@cetaklaporang_Aging'])->middleware('auth','khazanah');
+Route::get('/laporan/perbelanjaan', [ 'as'=>'laporan.perbelanjaan', 'uses'=>'KhazanahController@laporan_Perbelanjaan'])->middleware('auth','khazanah');
+Route::post('/laporan/perbelanjaan/cetak', ['as'=>'perbelanjaan.cetaklaporan', 'uses'=>'KhazanahController@cetaklaporan_Perbelanjaan'])->middleware('auth','khazanah');
+// Route::get('/laporan/agingbulanan', [ 'as'=>'laporan.agingbulanan', 'uses'=>'KhazanahController@laporanAging_Bulanan'])->middleware('auth','khazanah');
+// Route::post('/laporan/agingbulanan/cetak', ['as'=>'agingbulan.cetaklaporan', 'uses'=>'KhazanahController@cetaklaporang_Aging'])->middleware('auth','khazanah');
 
 
 Route::get('/laporan/komoditi',['as'=>'laporan.komoditi','uses'=>'KomuditiController@cetakRekodKomoditi']);

From 5b3dee5c0634ca2c1273d3c72c3ca42a10177fe6 Mon Sep 17 00:00:00 2001
From: MUHD HAFIFIE <Cyclonepipi@fidin-3.local>
Date: Wed, 28 Apr 2021 15:50:18 +0800
Subject: [PATCH 2/8] kawalanstoklama

---
 resources/views/gadaian/edit.blade.php        |  2 +-
 resources/views/gadaian/index.blade.php       |  2 +-
 resources/views/penebusan/index.blade.php     |  4 +-
 .../views/print/laporan_kawalanstok.blade.php | 41 +++++++++----------
 resources/views/print/resitansuran.blade.php  |  4 +-
 .../views/print/resittambahpinjam.blade.php   |  4 +-
 resources/views/print/resittebus.blade.php    |  4 +-
 .../views/print/resittebussebelum.blade.php   |  4 +-
 .../views/print/resittebusseparuh.blade.php   |  4 +-
 .../print/resittebusseparuhbelum.blade.php    |  4 +-
 10 files changed, 35 insertions(+), 38 deletions(-)

diff --git a/resources/views/gadaian/edit.blade.php b/resources/views/gadaian/edit.blade.php
index c9e1447..84d2902 100644
--- a/resources/views/gadaian/edit.blade.php
+++ b/resources/views/gadaian/edit.blade.php
@@ -889,7 +889,7 @@
                             let teller = "{{ Auth::user()->name }}";
 
                             Swal.fire({
-                                title: 'Tunggu Pengesahan Daripada Operasi.',
+                                title: 'Tunggu Pengesahan Daripada Khazanah-Operasi.',
                                 icon: 'info',
                                 width: 600,
                                 padding: '3em',
diff --git a/resources/views/gadaian/index.blade.php b/resources/views/gadaian/index.blade.php
index f7b9d86..220133f 100644
--- a/resources/views/gadaian/index.blade.php
+++ b/resources/views/gadaian/index.blade.php
@@ -804,7 +804,7 @@
                                             let teller = "{{ Auth::user()->name }}";
 
                                             Swal.fire({
-                                                title: 'Tunggu Pengesahan Daripada Operasi.',
+                                                title: 'Tunggu Pengesahan Daripada Khazanah-Operasi.',
                                                 icon: 'info',
                                                 width: 600,
                                                 padding: '3em',
diff --git a/resources/views/penebusan/index.blade.php b/resources/views/penebusan/index.blade.php
index 46e1d01..3ca6b1d 100644
--- a/resources/views/penebusan/index.blade.php
+++ b/resources/views/penebusan/index.blade.php
@@ -1305,7 +1305,7 @@
                         let teller = "{{ Auth::user()->name }}";
 
                         Swal.fire({
-                            title: 'Tunggu Pengesahan Daripada Operasi.',
+                            title: 'Tunggu Pengesahan Daripada Khazanah-Operasi.',
                             icon: 'info',
                             width: 600,
                             padding: '3em',
@@ -1579,7 +1579,7 @@
                         let teller = "{{ Auth::user()->name }}";
 
                         Swal.fire({
-                            title: 'Tunggu Pengesahan Daripada Operasi.',
+                            title: 'Tunggu Pengesahan Daripada Khazanah-Operasi.',
                             icon: 'info',
                             width: 600,
                             padding: '3em',
diff --git a/resources/views/print/laporan_kawalanstok.blade.php b/resources/views/print/laporan_kawalanstok.blade.php
index ebbef87..72be36c 100644
--- a/resources/views/print/laporan_kawalanstok.blade.php
+++ b/resources/views/print/laporan_kawalanstok.blade.php
@@ -323,7 +323,7 @@
         <span>@php $totalpinjtebus = $totalpinjtebuskeseluruhan + $totalpinjtebussehari; echo number_format($totalpinjtebus,2); @endphp</span>
       </td>
     </tr>
-    <tr>
+    {{-- <tr>
       <td>Ansuran Pembiayaan</td>
       <td>
         <span>Baki C/F</span><br>
@@ -370,7 +370,7 @@
         <span>@php $totalpinjlelongsehari = $kawalanstok[2]['lelongini1'][0]['pinj'] + $kawalanstok[2]['lelongini2'][0]['pinj'] + $kawalanstok[2]['lelongini3'][0]['pinj']; echo number_format($totalpinjlelongsehari,2); @endphp</span><br>
         <span>@php $totalpinjlelong = floatval($totalpinjlelongkeseluruhan + $totalpinjlelongsehari); echo number_format($totalpinjlelong,2); @endphp</span>
       </td>
-    </tr>
+    </tr> --}}
     <tr>
       <td>Lelongan</td>
       <td>
@@ -469,66 +469,63 @@
     </tr>
     @php $counter++;@endphp
   <tfoot>
-    <tr>
+    <tr style="font-weight:bold;">
       <td colspan="2">Baki</td>
       <td>
-        {{ $gad1 - $teb1 - $lel1 - $hpk1 }}
+        @php $totalbil1 = $gad1 - $teb1 - $lel1 - $hpk1; echo number_format($totalbil1);@endphp
+      </td>
+      <td>
+        @php $totalpinj1 = $gadpinj1 - $tebpinj1 - $lelpinj1 - $hpkpinj1; echo number_format($totalpinj1,2);@endphp
         
       </td>
       <td>
-        {{ $gadpinj1 - $tebpinj1 - $lelpinj1 - $hpkpinj1 }}
+        @php $totalbil2 = $gad2 - $teb2 - $lel2 - $hpk2; echo number_format($totalbil2);@endphp
         
       </td>
       <td>
-        {{ $gad2 - $teb2 - $lel2 - $hpk2 }}
+        @php $totalpinj2 = $gadpinj2 - $tebpinj2 - $lelpinj2 - $hpkpinj2; echo number_format($totalpinj2,2);@endphp
         
       </td>
       <td>
-        {{ $gadpinj2 - $tebpinj2 - $lelpinj2 - $hpkpinj2 }}
+        @php $totalbil3 = $gad3 - $teb3 - $lel3 - $hpk3; echo number_format($totalbil3);@endphp
         
       </td>
       <td>
-        {{ $gad3 - $teb3 - $lel3 - $hpk3 }}
+        @php $totalpinj3 = $gadpinj3 - $tebpinj3 - $lelpinj3 - $hpkpinj3; echo number_format($totalpinj3,2);@endphp
         
       </td>
       <td>
-        {{ $gadpinj3 - $tebpinj3 - $lelpinj3 - $hpkpinj3 }}
+        @php $totalbil = $totalbilgadai-$totalbiltebus-$totalbillelong-$totalbilhapuskira; echo number_format($totalbil);@endphp
         
       </td>
       <td>
-        {{ $totalbil = $totalbilgadai-$totalbiltebus-$totalbillelong-$totalbilhapuskira }}
-        
-      </td>
-      <td>
-        {{ $totalpinjgadai-$totalpinjtebus-$totalpinjlelong-$totalpinjhapuskira }}
-        
+        @php $totalpinj = $totalpinjgadai-$totalpinjtebus-$totalpinjlelong-$totalpinjhapuskira; echo number_format($totalpinj,2);@endphp
       </td>
     </tr>
     <tr>
       <td colspan="2"></td>
       <td>
-        {{ (($gad1 - $teb1 - $lel1 - $hpk1)/$totalbil)*100 }}
+        @php $percentbil1 = (($gad1 - $teb1 - $lel1 - $hpk1)/$totalbil)*100; echo number_format($percentbil1,2) . ' %';@endphp
         
       </td>
       <td>
-        {{ $gadpinj1 - $tebpinj1 - $lelpinj1 - $hpkpinj1 }}
+        @php $percentpinj1 = (($gadpinj1 - $tebpinj1 - $lelpinj1 - $hpkpinj1)/$totalpinj)*100; echo number_format($percentpinj1,2) . ' %';@endphp
         
       </td>
       <td>
-        {{ (($gad2 - $teb2 - $lel2 - $hpk2)/$totalbil)*100 }}
+        @php $percentbil2 = (($gad2 - $teb2 - $lel2 - $hpk2)/$totalbil)*100; echo number_format($percentbil2,2) . ' %';@endphp
         
       </td>
       <td>
-        {{ $gadpinj2 - $tebpinj2 - $lelpinj2 - $hpkpinj2 }}
+        @php $percentpinj2 = (($gadpinj2 - $tebpinj2 - $lelpinj2 - $hpkpinj2)/$totalpinj)*100; echo number_format($percentpinj2,2) . ' %';@endphp
         
       </td>
       <td>
-        {{ (($gad3 - $teb3 - $lel3 - $hpk3)/$totalbil)*100 }}
+        @php $percentbil3 = (($gad3 - $teb3 - $lel3 - $hpk3)/$totalbil)*100; echo number_format($percentbil3,2) . ' %';@endphp
         
       </td>
       <td>
-        {{ $gadpinj3 - $tebpinj3 - $lelpinj3 - $hpkpinj3 }}
-        
+        @php $percentpinj3 = (($gadpinj3 - $tebpinj3 - $lelpinj3 - $hpkpinj3)/$totalpinj)*100;; echo number_format($percentpinj3,2) . ' %';@endphp
       </td>
       <td></td>
       <td></td>
diff --git a/resources/views/print/resitansuran.blade.php b/resources/views/print/resitansuran.blade.php
index 1f6695e..ff61051 100644
--- a/resources/views/print/resitansuran.blade.php
+++ b/resources/views/print/resitansuran.blade.php
@@ -499,7 +499,7 @@ hr.new5 {
 <td colspan="3">Marhun</td> <td>: {{ $gadai['marhun'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td> No SAG</td><td>: {{ $transaction['norujukan'] }} </td>
 </tr>
 <tr>
-<td colspan="3">Nama</td> <td>: {{ $customers_info['nama'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td> Tarikh Bayar</td><td>: @php $time = new DateTime($transaction['created_at']); $date = $time->format('d/m/y'); echo $date; @endphp </td>
+<td colspan="3">Nama</td> <td>: {{ $customers_info['nama'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td> Tarikh Bayar</td><td>: @php $time = new DateTime($transaction['created_at']); $date = $time->format('d/m/Y'); echo $date; @endphp </td>
 </tr>
 
 <tr>
@@ -522,7 +522,7 @@ hr.new5 {
 <table id="payment">
 
 <tr>
-<td style="width:10px"> Tarikh Bayaran</td><td style="width:5px"> </td><td style="width:10px">: @php $time = new DateTime($transaction['created_at']); $date = $time->format('d/m/y'); echo $date; @endphp</td>
+<td style="width:10px"> Tarikh Bayaran</td><td style="width:5px"> </td><td style="width:10px">: @php $time = new DateTime($transaction['created_at']); $date = $time->format('d/m/Y'); echo $date; @endphp</td>
 </tr>
 <tr>
 <td style="width:10px">Harga Jualan</td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format(($transaction['bakiharga'] + $transaction['duit_masuk']),2) }} </td>
diff --git a/resources/views/print/resittambahpinjam.blade.php b/resources/views/print/resittambahpinjam.blade.php
index 5dce90e..cfe1a1a 100644
--- a/resources/views/print/resittambahpinjam.blade.php
+++ b/resources/views/print/resittambahpinjam.blade.php
@@ -502,7 +502,7 @@ hr.new5 {
 <td colspan="3">Marhun</td> <td>: {{ $gadai['marhun'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td>: No SAG</td><td> {{ $gadai['norujukan'] }} </td>
 </tr>
 <tr>
-<td colspan="3">Nama</td> <td>: {{ $customers_info['nama'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td>: Tarikh Bayar</td><td> @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/y'); echo $date; @endphp </td>
+<td colspan="3">Nama</td> <td>: {{ $customers_info['nama'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td>: Tarikh Bayar</td><td> @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/Y'); echo $date; @endphp </td>
 </tr>
 
 <tr>
@@ -524,7 +524,7 @@ hr.new5 {
 <table id="payment">
 
 <tr>
-<td style="width:10px"> Tarikh Bayaran</td><td style="width:5px"> </td><td style="width:10px">: @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/y'); echo $date; @endphp</td>
+<td style="width:10px"> Tarikh Bayaran</td><td style="width:5px"> </td><td style="width:10px">: @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/Y'); echo $date; @endphp</td>
 </tr>
 <tr>
 <td style="width:10px">Pembiayaan</td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($gadai['bakipjm'],2) }} </td>
diff --git a/resources/views/print/resittebus.blade.php b/resources/views/print/resittebus.blade.php
index 76cdca2..0f167d3 100644
--- a/resources/views/print/resittebus.blade.php
+++ b/resources/views/print/resittebus.blade.php
@@ -506,7 +506,7 @@ hr.new5 {
 <td colspan="3">Marhun</td> <td>: {{ $gadai['marhun'] }} </td> <td colspan="3"> <t/d>  <td> </td><td> </td><td> No SAG</td><td>: {{ $gadai['norujukan'] }} </td>
 </tr>
 <tr>
-<td colspan="3">Nama</td> <td>: {{ $customers_info['nama'] }} </td> <td colspan="3"> <t/d>  <td> </td><td> </td><td> Tarikh Bayar</td><td>: @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/y'); echo $date; @endphp </td>
+<td colspan="3">Nama</td> <td>: {{ $customers_info['nama'] }} </td> <td colspan="3"> <t/d>  <td> </td><td> </td><td> Tarikh Bayar</td><td>: @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/Y'); echo $date; @endphp </td>
 </tr>
 
 <tr>
@@ -531,7 +531,7 @@ hr.new5 {
 <table id="payment">
 
 <tr>
-<td style="width:10px"> Tarikh Bayaran</td><td style="width:5px"> </td><td style="width:10px">: @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/y'); echo $date; @endphp</td>
+<td style="width:10px"> Tarikh Bayaran</td><td style="width:5px"> </td><td style="width:10px">: @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/Y'); echo $date; @endphp</td>
 </tr>
 <tr>
 <td style="width:10px">Harga Jualan</td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format(($gadai['hargajualan']),2) }} </td>
diff --git a/resources/views/print/resittebussebelum.blade.php b/resources/views/print/resittebussebelum.blade.php
index 7903f10..a953339 100644
--- a/resources/views/print/resittebussebelum.blade.php
+++ b/resources/views/print/resittebussebelum.blade.php
@@ -410,7 +410,7 @@ hr.new5 {
 <td colspan="3">Marhun</td> <td>: {{ $gadai['marhun'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td> No SAG</td><td>: {{ $gadai['norujukan'] }} </td>
  </tr>
  <tr>
-<td colspan="3">Nama</td> <td>: {{ $customers_info['nama'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td> Tarikh Bayar</td><td>: @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/y'); echo $date; @endphp</td>
+<td colspan="3">Nama</td> <td>: {{ $customers_info['nama'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td> Tarikh Bayar</td><td>: @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/Y'); echo $date; @endphp</td>
  </tr>
 
  <tr>
@@ -432,7 +432,7 @@ hr.new5 {
 <table id="payment">
 
 <tr>
-<td style="width:10px"> Tarikh Bayaran</td><td style="width:5px"> </td><td style="width:10px">: @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/y'); echo $date; @endphp</td>
+<td style="width:10px"> Tarikh Bayaran</td><td style="width:5px"> </td><td style="width:10px">: @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/Y'); echo $date; @endphp</td>
 </tr>
 <tr>
 <td style="width:10px">Pembiayaan</td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format(($gadai['pinjaman']),2) }} </td>
diff --git a/resources/views/print/resittebusseparuh.blade.php b/resources/views/print/resittebusseparuh.blade.php
index 9652349..745377c 100644
--- a/resources/views/print/resittebusseparuh.blade.php
+++ b/resources/views/print/resittebusseparuh.blade.php
@@ -406,7 +406,7 @@ hr.new5 {
 <td colspan="3">Marhun</td> <td>: {{ $gadai['marhun'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td> No SAG</td><td>: {{ $gadai['norujukan'] }} </td>
  </tr>
  <tr>
-<td colspan="3">Nama</td> <td>: {{ $customers_info['nama'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td> Tarikh Bayar</td><td>: @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/y'); echo $date; @endphp</td>
+<td colspan="3">Nama</td> <td>: {{ $customers_info['nama'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td> Tarikh Bayar</td><td>: @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/Y'); echo $date; @endphp</td>
  </tr>
 
  <tr>
@@ -428,7 +428,7 @@ hr.new5 {
 
 <table id="payment">
 <tr>
-<td style="width:10px"> Tarikh Bayaran</td><td style="width:5px"> </td><td style="width:10px">: @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/y'); echo $date; @endphp</td>
+<td style="width:10px"> Tarikh Bayaran</td><td style="width:5px"> </td><td style="width:10px">: @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/Y'); echo $date; @endphp</td>
 </tr>
 <tr>
 <td style="width:10px">Harga Jualan</td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format(($gadai['hargajualan']),2) }} </td>
diff --git a/resources/views/print/resittebusseparuhbelum.blade.php b/resources/views/print/resittebusseparuhbelum.blade.php
index a933d35..4d79e2d 100644
--- a/resources/views/print/resittebusseparuhbelum.blade.php
+++ b/resources/views/print/resittebusseparuhbelum.blade.php
@@ -501,7 +501,7 @@ hr.new5 {
 <td colspan="3">Marhun</td> <td>: {{ $gadai['marhun'] }} </td> <td colspan="3"> <t/d>  <td> </td><td> </td><td> No SAG</td><td>: {{ $gadai['norujukan'] }} </td>
 </tr>
 <tr>
-<td colspan="3">Nama</td> <td>: {{ $customers_info['nama'] }} </td> <td colspan="3"> <t/d>  <td> </td><td> </td><td> Tarikh Bayar</td><td>: @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/y'); echo $date; @endphp </td>
+<td colspan="3">Nama</td> <td>: {{ $customers_info['nama'] }} </td> <td colspan="3"> <t/d>  <td> </td><td> </td><td> Tarikh Bayar</td><td>: @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/Y'); echo $date; @endphp </td>
 </tr>
 
 <tr>
@@ -527,7 +527,7 @@ hr.new5 {
 <table id="payment">
 
 <tr>
-<td style="width:10px"> Tarikh Bayaran</td><td style="width:5px"> </td><td style="width:10px">: @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/y'); echo $date; @endphp</td>
+<td style="width:10px"> Tarikh Bayaran</td><td style="width:5px"> </td><td style="width:10px">: @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/Y'); echo $date; @endphp</td>
 </tr>
 <tr>
 <td style="width:10px">Pembiayaan</td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format(($gadai['pinjaman']),2) }} </td>

From 08560a49f0edd7ad9d33d92f577acd7fbe6b5036 Mon Sep 17 00:00:00 2001
From: fifi97 <gamingfin@live.com>
Date: Mon, 3 May 2021 09:37:27 +0800
Subject: [PATCH 3/8] kawalan stok

---
 app/Http/Controllers/KhazanahController.php   |  20 +-
 .../khazanah/laporan/perbelanjaan.blade.php   |   6 +-
 .../khazanah/laporan/stokaudit.blade.php      |  10 +-
 .../views/print/laporan_kawalanstok.blade.php |  14 +-
 .../laporan_perbelanjaan_baucer.blade.php     | 255 ++++++++++++++++++
 routes/web.php                                |   1 +
 6 files changed, 293 insertions(+), 13 deletions(-)
 create mode 100644 resources/views/print/laporan_perbelanjaan_baucer.blade.php

diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php
index e98dfed..cf00e6c 100644
--- a/app/Http/Controllers/KhazanahController.php
+++ b/app/Http/Controllers/KhazanahController.php
@@ -2424,7 +2424,7 @@ class KhazanahController extends Controller
 
         $cawangan=Http::get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
         $cawangan_detail=$cawangan[0];
-        // dd($gadai);
+       
         return view('print.laporan_kawalanstok', compact('kawalanstok','cawangan_detail','tarikh_cetak','tebus_date','api_url'));
     }
 
@@ -3125,9 +3125,23 @@ class KhazanahController extends Controller
         return view('print.laporan_perbelanjaan', compact('perbelanjaan','cawangan_detail','tarikh_cetak','mula_date','hingga_date','api_url'));
     }
 
+    public function cetaklaporan_Perbelanjaan_Baucer($baucer)
+    {
+        $api_url = config('api.url');
+        $auth_user = Auth::user();
+        $current = Carbon::now();
+        $current = new Carbon();
+        $tarikh_cetak = $current->toDateString();
+
+        $perbelanjaan = Http::get(config('api.url'). '/api/SenaraiPanjar/listeach/' . $auth_user['cawangan'],['nobaucer' => $baucer])->json();
+
+        $cawangan = Http::get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
+        $cawangan_detail=$cawangan[0];
+
+        return view('print.laporan_perbelanjaan_baucer', compact('perbelanjaan','cawangan_detail','tarikh_cetak','api_url'));
+    }
+
     
-
-
     public function RequestPembatalan(Request $request)
     {
        $kodcaw = $request->kodcaw;
diff --git a/resources/views/khazanah/laporan/perbelanjaan.blade.php b/resources/views/khazanah/laporan/perbelanjaan.blade.php
index f0f4904..0bd14ff 100644
--- a/resources/views/khazanah/laporan/perbelanjaan.blade.php
+++ b/resources/views/khazanah/laporan/perbelanjaan.blade.php
@@ -183,13 +183,17 @@
         panjartebus.clear().draw();
         $.each(data,function(index,panjar){
             total_bayaran += parseFloat(panjar['bayaran']);
+
+            var urlroute = '{{ route("perbelanjaan.cetaklaporanbaucer", ":id") }}';
+            urlroute = urlroute.replace(':id', panjar['nobaucer']);
+
             panjartebus.row.add([
                 counter,
                 panjar['tarikh'],
                 panjar['tuntutoleh'],
                 panjar['deskripsi'],
                 '<b>' + panjar['kategori'] + '</b>',
-                panjar['nobaucer'],
+                '<a href='+ urlroute +' target="_blank">' + panjar['nobaucer'] + '</a>',
                 formatter.format(panjar['bayaran'])
             ]).draw();
             counter = counter + 1;
diff --git a/resources/views/khazanah/laporan/stokaudit.blade.php b/resources/views/khazanah/laporan/stokaudit.blade.php
index 752efa6..05c190a 100644
--- a/resources/views/khazanah/laporan/stokaudit.blade.php
+++ b/resources/views/khazanah/laporan/stokaudit.blade.php
@@ -100,11 +100,11 @@
                             
                             <div class="btn-group-toggle col-md-12 col-sm-12 mb-4 radiostyle" data-toggle="buttons">
                                 <label class="btn btn-lg radio-yellow">
-                                    <input autocomplete="off" type="radio" name="radaktif" id="option1" value="aktif" autocomplete="off" checked><i></i><br>
+                                    <input autocomplete="off" type="radio" name="radaktif" id="option1" value="aktif" autocomplete="off" checked>
                                     <span>Aktif</span>
                                 </label>
                                 <label class="btn btn-lg radio-green">
-                                    <input autocomplete="off" type="radio" name="radaktif" id="option2" value="takaktif" autocomplete="off"><i></i><br><span>Tak Aktif</span>
+                                    <input autocomplete="off" type="radio" name="radaktif" id="option2" value="takaktif" autocomplete="off"><span>Tak Aktif</span>
                                 </label>
                             </div>
 
@@ -122,6 +122,12 @@
     var tablecustomers = $('#myTable').DataTable({
         "ordering": false
     });
+
+    $(document).ready( function () {
+        $('#datetimepicker1').datepicker({
+            format: 'dd-mm-yyyy'
+        });
+    });
    
 </script>
 @endsection
diff --git a/resources/views/print/laporan_kawalanstok.blade.php b/resources/views/print/laporan_kawalanstok.blade.php
index 72be36c..0d474a5 100644
--- a/resources/views/print/laporan_kawalanstok.blade.php
+++ b/resources/views/print/laporan_kawalanstok.blade.php
@@ -225,7 +225,6 @@
   </tr>
   @php $counter = 1;@endphp
 
-    {{-- {{ dd($kawalanstok) }} --}}
     <tr>
       <td>Gadai</td>
       <td>
@@ -505,27 +504,28 @@
     <tr>
       <td colspan="2"></td>
       <td>
-        @php $percentbil1 = (($gad1 - $teb1 - $lel1 - $hpk1)/$totalbil)*100; echo number_format($percentbil1,2) . ' %';@endphp
+      
+        @php $percentbil1 = (($totalbil1)/$totalbil)*100; echo number_format($percentbil1,2) . ' %';@endphp
         
       </td>
       <td>
-        @php $percentpinj1 = (($gadpinj1 - $tebpinj1 - $lelpinj1 - $hpkpinj1)/$totalpinj)*100; echo number_format($percentpinj1,2) . ' %';@endphp
+        @php $percentpinj1 = (($totalpinj1)/$totalpinj)*100; echo number_format($percentpinj1,2) . ' %';@endphp
         
       </td>
       <td>
-        @php $percentbil2 = (($gad2 - $teb2 - $lel2 - $hpk2)/$totalbil)*100; echo number_format($percentbil2,2) . ' %';@endphp
+        @php $percentbil2 = (($totalbil2)/$totalbil)*100; echo number_format($percentbil2,2) . ' %';@endphp
         
       </td>
       <td>
-        @php $percentpinj2 = (($gadpinj2 - $tebpinj2 - $lelpinj2 - $hpkpinj2)/$totalpinj)*100; echo number_format($percentpinj2,2) . ' %';@endphp
+        @php $percentpinj2 = (($totalpinj2)/$totalpinj)*100; echo number_format($percentpinj2,2) . ' %';@endphp
         
       </td>
       <td>
-        @php $percentbil3 = (($gad3 - $teb3 - $lel3 - $hpk3)/$totalbil)*100; echo number_format($percentbil3,2) . ' %';@endphp
+        @php $percentbil3 = (($totalbil3)/$totalbil)*100; echo number_format($percentbil3,2) . ' %';@endphp
         
       </td>
       <td>
-        @php $percentpinj3 = (($gadpinj3 - $tebpinj3 - $lelpinj3 - $hpkpinj3)/$totalpinj)*100;; echo number_format($percentpinj3,2) . ' %';@endphp
+        @php $percentpinj3 = (($totalpinj3)/$totalpinj)*100;; echo number_format($percentpinj3,2) . ' %';@endphp
       </td>
       <td></td>
       <td></td>
diff --git a/resources/views/print/laporan_perbelanjaan_baucer.blade.php b/resources/views/print/laporan_perbelanjaan_baucer.blade.php
new file mode 100644
index 0000000..f82eb96
--- /dev/null
+++ b/resources/views/print/laporan_perbelanjaan_baucer.blade.php
@@ -0,0 +1,255 @@
+<style>
+#header {
+  font-family: Arial, Helvetica, sans-serif;
+  border-collapse: collapse;
+  width: 100%;
+}
+
+#header td, #customers th {
+ 
+  padding:4px;
+  font-size:10px;
+}
+
+#header tr:nth-child(even){background-color: #ffffff;}
+
+#header tr:hover {background-color: #ddd;}
+
+#header th {
+  padding-top: 12px;
+  padding-bottom: 12px;
+  text-align: left;
+  padding:4px;
+  color:black;
+}
+</style>
+
+
+
+<style>
+#scan {
+  font-family: Arial, Helvetica, sans-serif;
+  border-collapse: collapse;
+  width: 100%;
+}
+
+#scan td, #scan th {
+ 
+  padding: 8px;
+  font-size:11px;
+}
+
+#scan tr:nth-child(even){background-color: #ffffff;}
+
+#scan tr:hover {background-color: #ddd;}
+
+#scan th {
+  padding-top: 12px;
+  padding-bottom: 12px;
+  text-align: left;
+  padding:4px;
+  color:black;
+}
+</style>
+
+
+<style>
+#scan {
+  font-family: Arial, Helvetica, sans-serif;
+  border-collapse: collapse;
+  width: 100%;
+}
+
+#scan td, #scan th {
+  border-collapse: collapse;
+  padding: 8px;
+  font-size:11px;
+}
+
+#scan tr:nth-child(even){background-color: #ffffff;}
+
+#scan tr:hover {background-color: #ddd;}
+
+#scan th {
+  border-collapse: collapse;
+  padding-top: 12px;
+  padding-bottom: 12px;
+  text-align: left;
+  padding:4px;
+  color:black;
+}
+</style>
+
+
+
+<style>
+#details {
+  font-family: Arial, Helvetica, sans-serif;
+  border-collapse: collapse;
+  width: 100%;
+}
+
+#details td, #details th {
+ 
+  padding: 8px;
+  font-size:8px;
+}
+
+#details tr:nth-child(even){background-color: #ffffff;}
+
+#details tr:hover {background-color: #ddd;}
+
+#details th {
+  padding-top: 12px;
+ font-style:bold;
+  padding-bottom: 12px;
+  text-align: left;
+  padding:4px;
+  color:black;
+}
+</style>
+
+<style>
+#sign {
+  font-family: Arial, Helvetica, sans-serif;
+  border-collapse: collapse;
+  width: 100%;
+}
+
+#sign td, #sign th {
+
+  padding: 8px;
+  font-size:11px;
+  text-align: center;
+}
+
+#sign tr:nth-child(even){background-color: #ffffff;}
+
+#sign tr:hover {background-color: #ddd;}
+
+#sign th {
+  padding-top: 12px;
+  padding-bottom: 12px;
+  text-align: left;
+  padding:4px;
+  color:black;
+}
+
+@media print {
+  .new-page {
+    page-break-before: always;
+  }
+}
+
+</style>
+
+
+
+
+
+
+
+
+<table id="header">
+  <tr>
+    {{-- <th rowspan="4"  style="width:50px"><br><img src="{{ asset('img/ARRAHN1.png') }}" style="width:70px"></img></th> --}}
+    {{-- <th colspan="1">KOPERASI PERMODALAN KELANTAN BERHAD</th> --}}
+  </tr>
+  <tr>
+    <td style="font-size:20px;font-weight:bold;">{{ $cawangan_detail['namacaw'] }}</td>
+    <td></td>
+  </tr>
+  {{-- <tr>
+    <td>{{ $cawangan_detail['alamat1'] }}</td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>{{ $cawangan_detail['alamat2'].' No Tel : '. $cawangan_detail['notel'].' No Faks : '. $cawangan_detail['nofaks'] }}</td>
+    <td></td>
+  </tr> --}}
+</table>
+<br>
+
+<table id="scan">
+  <tr>
+    <th colspan ="8"><b>BAUCER WANG PANJAR</b></th>
+  </tr>
+  <tr>
+    <th colspan="5"><b> Tarikh Cetak:</b>
+      @php 
+        $myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_cetak);
+        $formattedweddingdate = $myDateTime->format('d-m-Y');
+        echo($formattedweddingdate);
+      @endphp
+  </th>
+  <td> </td>
+  <td> </td>
+  <td> </td>
+  <td> </td>
+  <td> </td>
+  <td> </td>
+  </tr>
+  <tr>
+    <th colspan="5"><b> Bayar Kepada:</b>
+     {{ $perbelanjaan['tuntutoleh'] }}
+  </th>
+  <td> </td>
+  <td> </td>
+  <td> </td>
+  <td> </td>
+  <th><b> No Baucer#:</b>
+    {{ $perbelanjaan['nobaucer'] }}
+  </th>
+  <td> </td>
+  </tr>
+</table>
+
+<br>
+<table id="details">
+  <tr>
+    <th>Tarikh Bil</th>
+    <th>Perkara/Item</th>
+    <th>Kategori</th>
+    <th>Jumlah (RM)</th>
+  </tr>
+    <tr>
+      <td>{{ $perbelanjaan['tarikh'] }}</td>
+      <td>{{ $perbelanjaan['deskripsi'] }}</td>
+      <td><b>{{ $perbelanjaan['kategori'] }}</b></td>
+      <td>{{ number_format($perbelanjaan['bayaran'],2) }}</td>
+    </tr>
+    <tfoot>
+      <th colspan="3" style="text-align:right;">JUMLAH BAYARAN : RM </th>
+      <th style="text-align:left;padding-left:8px;">{{ number_format($perbelanjaan['bayaran'],2) }}</th>
+    </tfoot>
+</table>
+
+
+<br>
+<br>
+<table id="sign">
+  <tr>
+    <td></td>
+    <td colspan="2"> .................................................................. </td>
+    <td> </td>
+    <td colspan="2"> .................................................................. </td>
+    <td> </td>
+    <td colspan="2">.................................................................. </td>
+    <td> </td>
+  </tr>
+  <tr>
+    <td></td>
+    <td colspan="2"><B> Disediakan </B> </td>
+    <td></td>
+    <td colspan="2"><B> Disemak </B> </td>
+    <td> </td>
+    <td colspan="2"><B> Disahkan </B></td>
+    <td> </td>
+  </tr>
+</table>
+
+
+
+
+
+
diff --git a/routes/web.php b/routes/web.php
index a2b9420..78253a8 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -188,6 +188,7 @@ Route::get('/laporan/agingbulanan', [ 'as'=>'laporan.agingbulanan', 'uses'=>'Kha
 Route::post('/laporan/agingbulanan/cetak', ['as'=>'agingbulan.cetaklaporan', 'uses'=>'KhazanahController@cetaklaporang_Aging'])->middleware('auth','khazanah');
 Route::get('/laporan/perbelanjaan', [ 'as'=>'laporan.perbelanjaan', 'uses'=>'KhazanahController@laporan_Perbelanjaan'])->middleware('auth','khazanah');
 Route::post('/laporan/perbelanjaan/cetak', ['as'=>'perbelanjaan.cetaklaporan', 'uses'=>'KhazanahController@cetaklaporan_Perbelanjaan'])->middleware('auth','khazanah');
+Route::get('/laporan/perbelanjaan/cetak/{baucer}', ['as'=>'perbelanjaan.cetaklaporanbaucer', 'uses'=>'KhazanahController@cetaklaporan_Perbelanjaan_Baucer'])->middleware('auth','khazanah');
 // Route::get('/laporan/agingbulanan', [ 'as'=>'laporan.agingbulanan', 'uses'=>'KhazanahController@laporanAging_Bulanan'])->middleware('auth','khazanah');
 // Route::post('/laporan/agingbulanan/cetak', ['as'=>'agingbulan.cetaklaporan', 'uses'=>'KhazanahController@cetaklaporang_Aging'])->middleware('auth','khazanah');
 

From 1c500be45d0961f4faf39678bdf75916d6657a63 Mon Sep 17 00:00:00 2001
From: MUHD HAFIFIE <Cyclonepipi@fidin-3.local>
Date: Mon, 3 May 2021 16:02:41 +0800
Subject: [PATCH 4/8] fix skit2

---
 app/Http/Controllers/KhazanahController.php         | 2 ++
 resources/views/print/laporan_kawalanstok.blade.php | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php
index cf00e6c..c127b4f 100644
--- a/app/Http/Controllers/KhazanahController.php
+++ b/app/Http/Controllers/KhazanahController.php
@@ -2369,7 +2369,9 @@ class KhazanahController extends Controller
             'kodcaw'=>$auth_user['cawangan'],
             'tarikh'=>$tarikh_cetak
         ])->json();
+
         $laporan = $laporan_ringkasan[0];
+
         return view('print.laporan_ringkasanharian', compact('cawangan_detail','tarikh_cetak','api_url','laporan'));
     }
 
diff --git a/resources/views/print/laporan_kawalanstok.blade.php b/resources/views/print/laporan_kawalanstok.blade.php
index 0d474a5..29b8f7a 100644
--- a/resources/views/print/laporan_kawalanstok.blade.php
+++ b/resources/views/print/laporan_kawalanstok.blade.php
@@ -322,7 +322,7 @@
         <span>@php $totalpinjtebus = $totalpinjtebuskeseluruhan + $totalpinjtebussehari; echo number_format($totalpinjtebus,2); @endphp</span>
       </td>
     </tr>
-    {{-- <tr>
+    <tr>
       <td>Ansuran Pembiayaan</td>
       <td>
         <span>Baki C/F</span><br>
@@ -369,7 +369,7 @@
         <span>@php $totalpinjlelongsehari = $kawalanstok[2]['lelongini1'][0]['pinj'] + $kawalanstok[2]['lelongini2'][0]['pinj'] + $kawalanstok[2]['lelongini3'][0]['pinj']; echo number_format($totalpinjlelongsehari,2); @endphp</span><br>
         <span>@php $totalpinjlelong = floatval($totalpinjlelongkeseluruhan + $totalpinjlelongsehari); echo number_format($totalpinjlelong,2); @endphp</span>
       </td>
-    </tr> --}}
+    </tr>
     <tr>
       <td>Lelongan</td>
       <td>

From b92dc1a71017e3f624bfc5870df1cbad1cc9af31 Mon Sep 17 00:00:00 2001
From: fifi97 <gamingfin@live.com>
Date: Tue, 4 May 2021 09:31:09 +0800
Subject: [PATCH 5/8] fix ringkasan

---
 .../views/print/laporan_kawalanstok.blade.php | 64 +++++++++----------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/resources/views/print/laporan_kawalanstok.blade.php b/resources/views/print/laporan_kawalanstok.blade.php
index 29b8f7a..63a5b46 100644
--- a/resources/views/print/laporan_kawalanstok.blade.php
+++ b/resources/views/print/laporan_kawalanstok.blade.php
@@ -330,44 +330,44 @@
         <span>Jumlah</span>
       </td>
       <td>
-        <span>{{ number_format($kawalanstok[2]['lelong1'][0]['bil']) }}</span><br>
-        <span>{{ number_format($kawalanstok[2]['lelongini1'][0]['bil']) }}</span><br>
-        <span>@php $lel1 = ($kawalanstok[2]['lelong1'][0]['bil'] + $kawalanstok[2]['lelongini1'][0]['bil']); echo number_format($lel1); @endphp</span>
+        <span>{{ number_format($kawalanstok[4]['ans1']['bil']) }}</span><br>
+        <span>{{ number_format($kawalanstok[4]['ansini1']['bil']) }}</span><br>
+        <span>@php $ans1 = ($kawalanstok[4]['ans1']['bil'] + $kawalanstok[4]['ansini1']['bil']); echo number_format($ans1); @endphp</span>
       </td>
       <td>
-        <span>{{ number_format($kawalanstok[2]['lelong1'][0]['pinj'],2) }}</span><br>
-        <span>{{ number_format(floatval($kawalanstok[2]['lelongini1'][0]['pinj']),2) }}</span><br>
-        <span>@php $lelpinj1 = ($kawalanstok[2]['lelong1'][0]['pinj'] + $kawalanstok[2]['lelongini1'][0]['pinj']); echo number_format($lelpinj1); @endphp</span>
+        <span>{{ number_format($kawalanstok[4]['ans1']['pinj'],2) }}</span><br>
+        <span>{{ number_format(floatval($kawalanstok[4]['ansini1']['pinj']),2) }}</span><br>
+        <span>@php $anspinj1 = ($kawalanstok[4]['ans1']['pinj'] + $kawalanstok[4]['ansini1']['pinj']); echo number_format($anspinj1); @endphp</span>
       </td>
       <td>
-        <span>{{ number_format($kawalanstok[2]['lelong2'][0]['bil']) }}</span><br>
-        <span>{{ number_format($kawalanstok[2]['lelongini2'][0]['bil']) }}</span><br>
-        <span>@php $lel2 = ($kawalanstok[2]['lelong2'][0]['bil'] + $kawalanstok[2]['lelongini2'][0]['bil']); echo number_format($lel2); @endphp</span>
+        <span>{{ number_format($kawalanstok[4]['ans2']['bil']) }}</span><br>
+        <span>{{ number_format($kawalanstok[4]['ansini2']['bil']) }}</span><br>
+        <span>@php $ans2 = ($kawalanstok[4]['ans2']['bil'] + $kawalanstok[4]['ansini2']['bil']); echo number_format($ans2); @endphp</span>
       </td>
       <td>
-        <span>{{ number_format($kawalanstok[2]['lelong2'][0]['pinj'],2) }}</span><br>
-        <span>{{ number_format(floatval($kawalanstok[2]['lelongini2'][0]['pinj']),2) }}</span><br>
-        <span>@php $lelpinj2 = ($kawalanstok[2]['lelong2'][0]['pinj'] + $kawalanstok[2]['lelongini2'][0]['pinj']); echo number_format($lelpinj2); @endphp</span>
+        <span>{{ number_format($kawalanstok[4]['ans2']['pinj'],2) }}</span><br>
+        <span>{{ number_format(floatval($kawalanstok[4]['ansini2']['pinj']),2) }}</span><br>
+        <span>@php $anspinj2 = ($kawalanstok[4]['ans2']['pinj'] + $kawalanstok[4]['ansini2']['pinj']); echo number_format($anspinj2); @endphp</span>
       </td>
       <td>
-        <span>{{ number_format(intval($kawalanstok[2]['lelong3'][0]['bil'])) }}</span><br>
-        <span>{{ number_format(intval($kawalanstok[2]['lelongini3'][0]['bil'])) }}</span><br>
-        <span>@php $lel3 = ($kawalanstok[2]['lelong3'][0]['bil'] + $kawalanstok[2]['lelongini3'][0]['bil']); echo number_format($lel3); @endphp</span>
+        <span>{{ number_format(intval($kawalanstok[4]['ans3']['bil'])) }}</span><br>
+        <span>{{ number_format(intval($kawalanstok[4]['ansini3']['bil'])) }}</span><br>
+        <span>@php $ans3 = ($kawalanstok[4]['ans3']['bil'] + $kawalanstok[4]['ansini3']['bil']); echo number_format($ans3); @endphp</span>
       </td>
       <td>
-        <span>{{ number_format($kawalanstok[2]['lelong3'][0]['pinj'],2) }}</span><br>
-        <span>{{ number_format(floatval($kawalanstok[2]['lelongini3'][0]['pinj']),2) }}</span><br>
-        <span>@php $lelpinj3 = ($kawalanstok[2]['lelong3'][0]['pinj'] + $kawalanstok[2]['lelongini3'][0]['pinj']); echo number_format($lelpinj3,2); @endphp</span>
+        <span>{{ number_format($kawalanstok[4]['ans3']['pinj'],2) }}</span><br>
+        <span>{{ number_format(floatval($kawalanstok[4]['ansini3']['pinj']),2) }}</span><br>
+        <span>@php $anspinj3 = ($kawalanstok[4]['ans3']['pinj'] + $kawalanstok[4]['ansini3']['pinj']); echo number_format($anspinj3,2); @endphp</span>
       </td>
       <td>
-        <span>@php $totalbillelongkeseluruhan = $kawalanstok[2]['lelong1'][0]['bil'] + $kawalanstok[2]['lelong2'][0]['bil'] + $kawalanstok[2]['lelong3'][0]['bil']; echo number_format($totalbillelongkeseluruhan); @endphp</span><br>
-        <span>@php $totalbillelongsehari = $kawalanstok[2]['lelongini1'][0]['bil'] + $kawalanstok[2]['lelongini2'][0]['bil'] + $kawalanstok[2]['lelongini3'][0]['bil']; echo number_format($totalbillelongsehari); @endphp</span><br>
-       <span>@php $totalbillelong = $totalbillelongkeseluruhan + $totalbillelongsehari; echo number_format($totalbillelong); @endphp</span>
+        <span>@php $totalbilanskeseluruhan = $kawalanstok[4]['ans1']['bil'] + $kawalanstok[4]['ans2']['bil'] + $kawalanstok[4]['ans3']['bil']; echo number_format($totalbilanskeseluruhan); @endphp</span><br>
+        <span>@php $totalbilanssehari = $kawalanstok[4]['ansini1']['bil'] + $kawalanstok[4]['ansini2']['bil'] + $kawalanstok[4]['ansini3']['bil']; echo number_format($totalbilanssehari); @endphp</span><br>
+       <span>@php $totalbilans = $totalbilanskeseluruhan + $totalbilanssehari; echo number_format($totalbilans); @endphp</span>
       </td>
       <td>
-        <span>@php $totalpinjlelongkeseluruhan = $kawalanstok[2]['lelong1'][0]['pinj'] + $kawalanstok[2]['lelong2'][0]['pinj'] + $kawalanstok[2]['lelong3'][0]['pinj']; echo number_format($totalpinjlelongkeseluruhan,2); @endphp</span><br>
-        <span>@php $totalpinjlelongsehari = $kawalanstok[2]['lelongini1'][0]['pinj'] + $kawalanstok[2]['lelongini2'][0]['pinj'] + $kawalanstok[2]['lelongini3'][0]['pinj']; echo number_format($totalpinjlelongsehari,2); @endphp</span><br>
-        <span>@php $totalpinjlelong = floatval($totalpinjlelongkeseluruhan + $totalpinjlelongsehari); echo number_format($totalpinjlelong,2); @endphp</span>
+        <span>@php $totalpinjanskeseluruhan = $kawalanstok[4]['ans1']['pinj'] + $kawalanstok[4]['ans2']['pinj'] + $kawalanstok[4]['ans3']['pinj']; echo number_format($totalpinjanskeseluruhan,2); @endphp</span><br>
+        <span>@php $totalpinjanssehari = $kawalanstok[4]['ansini1']['pinj'] + $kawalanstok[4]['ansini2']['pinj'] + $kawalanstok[4]['ansini3']['pinj']; echo number_format($totalpinjanssehari,2); @endphp</span><br>
+        <span>@php $totalpinjans = floatval($totalpinjanskeseluruhan + $totalpinjanssehari); echo number_format($totalpinjans,2); @endphp</span>
       </td>
     </tr>
     <tr>
@@ -471,34 +471,34 @@
     <tr style="font-weight:bold;">
       <td colspan="2">Baki</td>
       <td>
-        @php $totalbil1 = $gad1 - $teb1 - $lel1 - $hpk1; echo number_format($totalbil1);@endphp
+        @php $totalbil1 = $gad1 - $teb1 - $lel1 - $ans1 - $hpk1; echo number_format($totalbil1);@endphp
       </td>
       <td>
-        @php $totalpinj1 = $gadpinj1 - $tebpinj1 - $lelpinj1 - $hpkpinj1; echo number_format($totalpinj1,2);@endphp
+        @php $totalpinj1 = $gadpinj1 - $tebpinj1 - $lelpinj1 - $anspinj1 - $hpkpinj1; echo number_format($totalpinj1,2);@endphp
         
       </td>
       <td>
-        @php $totalbil2 = $gad2 - $teb2 - $lel2 - $hpk2; echo number_format($totalbil2);@endphp
+        @php $totalbil2 = $gad2 - $teb2 - $lel2 - $ans2 - $hpk2; echo number_format($totalbil2);@endphp
         
       </td>
       <td>
-        @php $totalpinj2 = $gadpinj2 - $tebpinj2 - $lelpinj2 - $hpkpinj2; echo number_format($totalpinj2,2);@endphp
+        @php $totalpinj2 = $gadpinj2 - $tebpinj2 - $lelpinj2 - $anspinj2 - $hpkpinj2; echo number_format($totalpinj2,2);@endphp
         
       </td>
       <td>
-        @php $totalbil3 = $gad3 - $teb3 - $lel3 - $hpk3; echo number_format($totalbil3);@endphp
+        @php $totalbil3 = $gad3 - $teb3 - $lel3 = - $ans3 - $hpk3; echo number_format($totalbil3);@endphp
         
       </td>
       <td>
-        @php $totalpinj3 = $gadpinj3 - $tebpinj3 - $lelpinj3 - $hpkpinj3; echo number_format($totalpinj3,2);@endphp
+        @php $totalpinj3 = $gadpinj3 - $tebpinj3 - $lelpinj3 - $anspinj3 - $hpkpinj3; echo number_format($totalpinj3,2);@endphp
         
       </td>
       <td>
-        @php $totalbil = $totalbilgadai-$totalbiltebus-$totalbillelong-$totalbilhapuskira; echo number_format($totalbil);@endphp
+        @php $totalbil = $totalbilgadai-$totalbiltebus-$totalbilans-$totalbillelong-$totalbilhapuskira; echo number_format($totalbil);@endphp
         
       </td>
       <td>
-        @php $totalpinj = $totalpinjgadai-$totalpinjtebus-$totalpinjlelong-$totalpinjhapuskira; echo number_format($totalpinj,2);@endphp
+        @php $totalpinj = $totalpinjgadai-$totalpinjtebus-$totalpinjans-$totalpinjlelong-$totalpinjhapuskira; echo number_format($totalpinj,2);@endphp
       </td>
     </tr>
     <tr>

From b46d62e7e9c8bfbd7876c02ee76c91fbcfffc1f0 Mon Sep 17 00:00:00 2001
From: MUHD HAFIFIE <Cyclonepipi@fidin-3.local>
Date: Tue, 4 May 2021 16:34:47 +0800
Subject: [PATCH 6/8] fix laporan

---
 app/Http/Controllers/KhazanahController.php   | 16 +++++++--
 .../views/khazanah/alirantunai.blade.php      |  4 +--
 .../views/print/laporan_ansuran.blade.php     | 11 ++++--
 .../views/print/laporan_gadaian.blade.php     | 10 ++++--
 .../views/print/laporan_penebusan.blade.php   | 34 +++++++++++++++++++
 .../print/laporan_ringkasanharian.blade.php   |  2 +-
 6 files changed, 67 insertions(+), 10 deletions(-)

diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php
index c127b4f..a0b6055 100644
--- a/app/Http/Controllers/KhazanahController.php
+++ b/app/Http/Controllers/KhazanahController.php
@@ -1978,10 +1978,13 @@ class KhazanahController extends Controller
             $tebus_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0];        
         }
         $tebus = Http::get(config('api.url'). '/api/tebus/laporan/'. $auth_user['cawangan'] .'/'. $tebus_date)->json();
+        $tebuspengasingan = Http::get(config('api.url'). '/api/tebus/laporanjenistawarruq/'. $auth_user['cawangan'],['tarikh' => $tebus_date])->json();
+        $upahlama = Http::get(config('api.url'). '/api/advansurdetails/'. $auth_user['cawangan'],['tarikh' => $tebus_date])->json();
+
         $cawangan=Http::get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
         $cawangan_detail=$cawangan[0];
         // dd($gadai);
-        return view('print.laporan_penebusan', compact('tebus','cawangan_detail','tarikh_cetak','tebus_date','api_url'));
+        return view('print.laporan_penebusan', compact('tebus','cawangan_detail','tarikh_cetak','tebus_date','tebuspengasingan','api_url','upahlama'));
     }
 
     public function laporanLelongan(){
@@ -2353,6 +2356,15 @@ class KhazanahController extends Controller
         return view('print.laporan_marhunterkumpul', compact('marhun','cawangan_detail','tarikh_cetak','tebus_date','api_url'));
     }
 
+    public function laporanRingkasanHarian(){
+        $auth_user = Auth::user();
+        $api_url = config('api.url');
+
+        
+        $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
+       
+        return view('khazanah.laporan.ringkasanharian',compact('cawangan_info','api_url'));
+    }
 
     public function cetakLaporanRingkasanHarian(Request $request){
         // dd($request);
@@ -2859,7 +2871,7 @@ class KhazanahController extends Controller
         // $tanggungansemasa = ['pendahuluan' => $imbangduga['pendahuluan'],'bds' => $panjar['bds'],'perubatan' => $panjar['perubatan'],'keraian' => $panjar['keraian'],'bakilelong' => $bakilelong['bakilelong'],'rugilelong' => $bakilelong['rugilelong'],'wtd' => $wtd,'cajlelong' => $cajlelong];
 
         array_push($tanggungansemasa,['glcode' => '2000/007','descpt' => 'Keuntungan Tergantung', 'amaun' => $keuntungan]);
-        array_push($tanggungansemasa,['glcode' => '5000/013','descpt' => 'Keuntungan Sebenar','amaun' => $keuntungansebenar]);
+        array_push($tanggungansemasa,['glcode' => '5000/013','descpt' => 'Upah Simpan','amaun' => $keuntungansebenar]);
         array_push($tanggungansemasa,['glcode' => '5000/241','descpt' => 'Rebet','amaun' => ($rebet * -1)]);
         array_push($tanggungansemasa,['glcode' => '7000/102','descpt' => 'Pendahuluan Daripada HQ','amaun' => $imbangduga['pendahuluan']]);
         array_push($tanggungansemasa,['glcode' => '3000/017','descpt' => 'PANJAR - Baiki dan Selenggara','amaun' => -$panjar['bds']]);
diff --git a/resources/views/khazanah/alirantunai.blade.php b/resources/views/khazanah/alirantunai.blade.php
index 94f8573..9a00108 100644
--- a/resources/views/khazanah/alirantunai.blade.php
+++ b/resources/views/khazanah/alirantunai.blade.php
@@ -152,7 +152,7 @@
                                         <div class="inner">
                                           <h5>RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['tambah'],2) }}</h5>
                     
-                                          <p>Tunai Diterima</p>
+                                          <p>Pendahuluan</p>
                                         </div>
                                         <div class="icon">
                                         </div>
@@ -165,7 +165,7 @@
                                         <div class="inner">
                                           <h5>RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['kurang'],2) }}</h5>
                     
-                                          <p>Tunai Dikeluar</p>
+                                          <p>Serahan</p>
                                         </div>
                                         <div class="icon">
                                         </div>
diff --git a/resources/views/print/laporan_ansuran.blade.php b/resources/views/print/laporan_ansuran.blade.php
index 71b5791..c72a728 100644
--- a/resources/views/print/laporan_ansuran.blade.php
+++ b/resources/views/print/laporan_ansuran.blade.php
@@ -208,8 +208,9 @@
     <th>Bayaran (RM)</th>
     <th>Keuntungan (RM)</th>
   </tr>
-  @php $counter = 1; @endphp
+  @php $counter = 1;$totalduitmasuk = 0;$totalkeuntungan = 0; @endphp
   @foreach($tebus as $index=>$item)
+  @php $totalduitmasuk += $item['duit_masuk'];$totalkeuntungan += $item['bayaran_keuntungan']; @endphp
     <tr>
       <td>{{ $counter }}</td>
       <td>{{$item['norujukan']}}</td>
@@ -232,13 +233,17 @@
     @if($index+1 < sizeof($tebus))
         @if($item['teller'] != $tebus[$index + 1]['teller'])
             <tr>
-                <td colspan=12>{{ $counter-1 }} Jumlah Bagi Teller : {{ $item['teller'] }}</td>
+                <td colspan="6">{{ $counter-1 }} Jumlah Bagi Teller : {{ $item['teller'] }}</td>
+                <td><b>{{ number_format($totalduitmasuk,2) }} </b></td>
+                <td><b>{{ number_format($totalkeuntungan,2) }} </b></td>
             </tr>
             @php $counter = 0; @endphp
         @endif
     @else
         <tr>
-            <td colspan=12>{{ $counter-1 }} Jumlah Bagi Teller : {{ $item['teller'] }}</td>
+            <td colspan="6">{{ $counter-1 }} Jumlah Bagi Teller : {{ $item['teller'] }}</td>
+            <td><b>{{ number_format($totalduitmasuk,2) }} </b></td>
+            <td><b>{{ number_format($totalkeuntungan,2) }} </b></td>
         </tr>
     @endif
   @endforeach
diff --git a/resources/views/print/laporan_gadaian.blade.php b/resources/views/print/laporan_gadaian.blade.php
index 2e0567f..031a6b8 100644
--- a/resources/views/print/laporan_gadaian.blade.php
+++ b/resources/views/print/laporan_gadaian.blade.php
@@ -211,6 +211,7 @@
     <th>Berat</th>
     <th>N Marhun</th>
     <th>Pembiayaan</th>
+    <th>Keuntungan</th>
     <th>Peratus (%)</th>
   </tr>
   @php $counter = 1; $totalpinjaman = 0; @endphp
@@ -227,7 +228,7 @@
         <tr>
             <td colspan=10>Teller : <b>{{ $item['teller'] }}</b></td>
         </tr>
-        @php $totalpinjamanteller = 0;$totalnmteller = 0;$totalberatteller = 0; @endphp
+        @php $totalpinjamanteller = 0;$totalnmteller = 0;$totalberatteller = 0;$totalupah12 = 0; @endphp
 
     @endif
     <tr>
@@ -245,10 +246,11 @@
       <td>{{ number_format($item['berat'],2) }}</td>
       <td>{{ number_format($item['nilaimarhun'],2) }}</td>
       <td>{{ number_format($item['pinjaman'],2) }}</td>
+      <td>{{ number_format($item['upah12'],2) }}</td>
       <td>{{ $item['percentpinj'] }}</td>
     </tr>
     @php $counter++; @endphp
-    @php $totalpinjamanteller += $item['pinjaman'];$totalnmteller += $item['nilaimarhun'];$totalberatteller += $item['berat']; @endphp
+    @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'])
             <tr>
@@ -256,6 +258,8 @@
                 <td><b>{{ number_format($totalberatteller,2) }} </b></td>
                 <td><b>{{ number_format($totalnmteller,2) }} </b></td>
                 <td><b>{{ number_format($totalpinjamanteller,2) }} </b></td>
+                <td><b>{{ number_format($totalupah12,2) }} </b></td>
+
             </tr>
             @php $counter = 1; @endphp
         @endif
@@ -265,6 +269,8 @@
             <td><b>{{ number_format($totalberatteller,2) }} </b></td>
             <td><b>{{ number_format($totalnmteller,2) }} </b></td>
             <td><b>{{ number_format($totalpinjamanteller,2) }} </b></td>
+            <td><b>{{ number_format($totalupah12,2) }} </b></td>
+
         </tr>
     @endif
   @endforeach
diff --git a/resources/views/print/laporan_penebusan.blade.php b/resources/views/print/laporan_penebusan.blade.php
index a4c31c5..0a0a048 100644
--- a/resources/views/print/laporan_penebusan.blade.php
+++ b/resources/views/print/laporan_penebusan.blade.php
@@ -302,6 +302,40 @@
   </tr>
 </table>
 
+<h4>Laporan Transaksi Penebusan</h4>
+<br>
+
+<table id="details">
+  <thead>
+    <th>Bil</th>
+    <th>Jenis</th>
+    <th>Penebusan(RM)</th>
+    <th>Keuntungan(RM)</th>
+    <th>Rebate(RM)</th>
+  </thead>
+  <tr>
+    <td>{{ $tebuspengasingan['biltawarruq'] }}</td>
+    <td>Tawarruq</td>
+    <td>{{ number_format($tebuspengasingan['totaltawarruq'],2) }}</td>
+    <td>{{ number_format($tebuspengasingan['keuntungantawarruq'],2) }}</td>
+    <td>{{ number_format($tebuspengasingan['totalrebate'],2) }}</td>
+  </tr>
+  <tr>
+    <td>{{ $tebuspengasingan['bilarrahn'] }}</td>
+    <td>Ar-Rahn</td>
+    <td>{{ number_format($tebuspengasingan['totalarrahn'],2) }}</td>
+    <td>{{ number_format($tebuspengasingan['keuntunganarrahn'],2) }}</td>
+    <td> Not Applicable </td>
+  </tr>
+  <tr>
+    <td>{{ $upahlama['bil'] }}</td>
+    <td>Bayaran Upah</td>
+    <td> Not Applicable </td>
+    <td>{{ number_format($upahlama['total'],2) }}</td>
+    <td> Not Applicable </td>
+  </tr>
+</table>
+
 
 
 
diff --git a/resources/views/print/laporan_ringkasanharian.blade.php b/resources/views/print/laporan_ringkasanharian.blade.php
index 4b6c6fb..fb57412 100644
--- a/resources/views/print/laporan_ringkasanharian.blade.php
+++ b/resources/views/print/laporan_ringkasanharian.blade.php
@@ -65,7 +65,7 @@
       <div class="col-6">4. BAYARAN ONLINE</div>
       <div class="col-6"></div>
       <div class="col-6">5. KEUNTUNGAN</div>
-      <div class="col-6"></div>
+      <div class="col-6">{{ 'RM '. number_format($laporan['total_keuntungan'],2) }}</div>
     </div>
   </div>
   <div class="col-6 box">

From 768649af62bae9b2b4958e23c29832c120d631a5 Mon Sep 17 00:00:00 2001
From: fifi97 <gamingfin@live.com>
Date: Wed, 5 May 2021 09:11:54 +0800
Subject: [PATCH 7/8] fix laporan2

---
 app/Http/Controllers/KhazanahController.php   |  11 +-
 .../khazanah/laporan/imbangduga.blade.php     | 250 ++----------------
 .../views/khazanah/laporan/index.blade.php    |   4 +-
 .../laporan/ringkasanharian.blade.php         |  53 ++++
 .../print/laporan_ringkasanharian.blade.php   |  10 +-
 routes/web.php                                |   1 +
 6 files changed, 86 insertions(+), 243 deletions(-)
 create mode 100644 resources/views/khazanah/laporan/ringkasanharian.blade.php

diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php
index 134e473..d0b2710 100644
--- a/app/Http/Controllers/KhazanahController.php
+++ b/app/Http/Controllers/KhazanahController.php
@@ -2836,17 +2836,24 @@ class KhazanahController extends Controller
         $current = new Carbon();
         $tarikh_cetak = $current->toDateString();
 
+        if($request->dateringkasanharian == null){
+            $ringkasan_date = $current->toDateString();
+        }else{
+            $split_date = explode('-',$request->dateringkasanharian);
+            $ringkasan_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0];        
+        }
+
         $cawangan=Http::get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
         $cawangan_detail=$cawangan[0];
 
         $laporan_ringkasan = Http::get(config('api.url') . '/api/laporan/harian',[
             'kodcaw'=>$auth_user['cawangan'],
-            'tarikh'=>$tarikh_cetak
+            'tarikh'=>$ringkasan_date
         ])->json();
 
         $laporan = $laporan_ringkasan[0];
 
-        return view('print.laporan_ringkasanharian', compact('cawangan_detail','tarikh_cetak','api_url','laporan'));
+        return view('print.laporan_ringkasanharian', compact('cawangan_detail','tarikh_cetak','ringkasan_date','api_url','laporan'));
     }
 
     public function cetakLaporanRingkasanTerkumpul(Request $request){
diff --git a/resources/views/khazanah/laporan/imbangduga.blade.php b/resources/views/khazanah/laporan/imbangduga.blade.php
index a4d0031..e105bc6 100644
--- a/resources/views/khazanah/laporan/imbangduga.blade.php
+++ b/resources/views/khazanah/laporan/imbangduga.blade.php
@@ -7,7 +7,13 @@
         <div class="col-md-12">
 
             <div class="card">
-                <div class="card-header">{{ __('Data Imbangduga') }}</div>
+                <nav aria-label="breadcrumb">
+                    <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 active" aria-current="page">Imbang Duga</li>
+                    </ol>
+                  </nav>
 
                 <div class="card-body text-center">
                     <div class="row form-group">
@@ -19,15 +25,8 @@
                       <div class="container">
                       <form method="post">
                       @csrf
-                    <div class="row">
-                      
-
-
-                    <div class="col-sm-2">Mula</div>
-                     <div class="col-sm-4"><input type="text" class="form-control" placeholder="Pilih Tarikh" aria-label="Tarikh" id="datetimepicker1" name="datetimepicker1"    autocomplete="off"  aria-describedby="basic-addon1"></div>
-                      </div>
-                     <br> <div class="row">
-                  <div class="col-sm-2">Hingga</div>
+                <div class="row">
+                  <div class="col-sm-2">Tarikh</div>
                  <div class="col-sm-4"><input type="text" class="form-control" placeholder="Pilih Tarikh" aria-label="Tarikh" id="datetimepicker2" name="datetimepicker2"    autocomplete="off"  aria-describedby="basic-addon1"></div>
                  </div>
                     <br> 
@@ -38,43 +37,9 @@
                       </div>
                     </div>
 
-                       <br>
-                     <div class="row">
-                     
-                     <div class="col-sm-1"> </div>  
-                     <div class="col-sm-6"> </div>  
-                     <div class="col-sm-6"> </div>  
-             
-                    
-                     </div>
-
-
-
                       </form>
                     </div><!--end section form-->
 
-
-
-
-                    <br>
-                    <br>
-                    <div class="row">
-                        <div class="col-md-12">
-                            <table class="" id="myTable">
-                                <thead>
-                                    <tr>
-                                        <th>Bil</th>
-                                        <th>Bil Gadaian</th>
-                                        <th>Jumlah Pinjaman (RM)</th>
-                                        <th>Peratusan %</th>
-                                    
-                             
-                                    </tr>
-                                </thead>
-                            </table>
-                        </div>
-                    </div>
-
                 </div>
             </div>
         </div>
@@ -83,205 +48,20 @@
 </div>
 
 <script type="text/javascript">
+
     var api_url = "<?php echo $api_url ?>";
     var kodcaw = "<?php echo $cawangan_info['kodcaw'] ?>";
 
-    var tablecustomers = $('#myTable').DataTable({
-        "ordering": false
-    });
     $(document).ready( function () {
-        console.log('dsasa');
-        $('#datetimepicker1').datepicker({
-            format: 'dd-mm-yyyy'
+            console.log('dsasa');
+            $('#datetimepicker2').datepicker({
+                format: 'dd-mm-yyyy'
+            });
+
         });
 
-      
-
-        var current = new Date();
-        var current_date = current.getDate();
-        var current_month = current.getMonth()+1;
-        var current_year = current.getFullYear();
-        var today_date = current_year + '-' +current_month+'-'+current_date;
-        $.ajax({
-            method:'get',
-            url: api_url + '/api/marhun/laporan/'+kodcaw+'/' + today_date,
-            success: function(customers){
-                customertable(customers);
-            },error: function(XMLHttpRequest, textStatus, errorThrown) {
-                console.log(textStatus);
-            }
-        });
-    });
-
-    $('#datetimepicker1').change(function(){
-        var input_date = this.value;
-        var split_date = input_date.split('-');
-        var today_date = split_date[2] + '-' +split_date[1]+'-'+split_date[0];
-        $.ajax({
-            method:'get',
-            url: api_url + '/api/marhun/laporan/'+kodcaw+'/' + today_date,
-            success: function(customers){
-                customertable(customers);
-            }
-        });
-    });
-    
-
-
-
-    
-    function customertable(data){
-        var counter = 1;
-        tablecustomers.clear().draw();
-        $.each(data,function(index,customers){
-            
-            tablecustomers.row.add([
-                counter,
-                customers['norujukan'],
-                customers['nokp'],
-                customers['nama'],
-                customers['marhun'],
-                customers['nota'],
-                customers['berat'],
-                customers['karat'],
-                customers['harga'],
-                customers['n_marhun'],
-            ]).draw();
-     
-        });
-        
-    }
 </script>
 
-
-<script type="text/javascript">
-
-
-$(document).ready( function () {
-        console.log('dsasa');
-        $('#datetimepicker2').datepicker({
-            format: 'dd-mm-yyyy'
-        });
-
-    });
-</script>
-
-
-
-
-<script type="text/javascript">
-
-
-$(document).ready( function () {
-        console.log('dsasa');
-        $('#datetimepicker3').datepicker({
-            format: 'dd-mm-yyyy'
-        });
-
-    });
-</script>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<div class="modal" id="myModal">
-  <div class="modal-dialog">
-    <div class="modal-content">
- 
-      <!-- Modal Header -->
-      <div class="modal-header">
-        <h5 class="modal-title">Laporan Imbangan Duga Cawangan</h5>
-        <button type="button" class="close" data-dismiss="modal">&times;</button>
-      </div>
-
-
-      <!-- Modal body -->
-      <div class="modal-body">
-
-      <style>
-#details {
-  font-family: Arial, Helvetica, sans-serif;
-  border-collapse: collapse;
-  width: 50%;
-}
-
-#details td, #details th {
- 
-  padding: 8px;
-  font-size:11px;
-}
-
-#details tr:nth-child(even){background-color: #ffffff;}
-
-#details tr:hover {background-color: #ffffff;}
-
-#details th {
-  padding-top: 12px;
- font-style:bold;
-  padding-bottom: 12px;
-  text-align: left;
-  padding:4px;
-  color:black;
-}
-</style>
-
-<form action="{{route('imbangduga.cetak')}}" method="post">
-  
-@csrf
-   
-   <table id="details">
-   <tr>
-   <td>  <input type="text" class="form-control" placeholder="Pilih Tarikh" aria-label="Tarikh" id="datetimepicker3" name="datetimepicker3"    autocomplete="off"  aria-describedby="basic-addon1">     </td>
-   </tr>
-   
-   <tr>
-   <td>    <input type="submit" class="btn btn-success ml-md-5" id="submit_button" name="submit_button" value="Jana Laporan" >   </td>
-   </tr>
-   
-   </table>
-
-</form>
-
-
-      </div>
-
-      <!-- Modal footer -->
-      <div class="modal-footer">
-        <button type="button" class="btn btn-danger" data-dismiss="modal">Kembali</button>
-      </div>
-
-    </div>
-  </div>
-</div>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 @endsection
 
 
diff --git a/resources/views/khazanah/laporan/index.blade.php b/resources/views/khazanah/laporan/index.blade.php
index 43207fc..22d14b5 100644
--- a/resources/views/khazanah/laporan/index.blade.php
+++ b/resources/views/khazanah/laporan/index.blade.php
@@ -72,7 +72,7 @@
                                 <a href="{{ route('laporan.stokaudit') }}" class="btn btn-dark btn-lg btn-block mb-3">Stok Audit</a>
                             </div>
                             <div class="row">
-                                <a href="{{ route('ringkasanharian.laporancetak') }}" class="btn btn-dark btn-lg btn-block mb-3">Ringkasan Harian</a>
+                                <a href="{{ route('laporan.ringkasanharian') }}" class="btn btn-dark btn-lg btn-block mb-3">Ringkasan Harian</a>
                             </div>
                             <div class="row">
                                 <a href="{{ route('laporan.marhunterkumpul') }}" class="btn btn-dark btn-lg btn-block mb-3">Marhun Terkumpul</a>
@@ -81,7 +81,7 @@
                                 <a href="" class="btn btn-danger btn-lg btn-block mb-3">Aging Kawalan Stok</a>
                             </div>
                             <div class="row">
-                                <a href="{{route('laporan.imbangduga')}}" class="btn btn-danger btn-lg btn-block mb-3">Imbang Duga</a>
+                                <a href="{{route('laporan.imbangduga')}}" class="btn btn-dark btn-lg btn-block mb-3">Imbang Duga</a>
                             </div>
                             <div class="row">
                                 <a href="{{route('laporan.petibesi')}}" class="btn btn-dark btn-lg btn-block mb-3">Peti Besi</a>
diff --git a/resources/views/khazanah/laporan/ringkasanharian.blade.php b/resources/views/khazanah/laporan/ringkasanharian.blade.php
new file mode 100644
index 0000000..8931414
--- /dev/null
+++ b/resources/views/khazanah/laporan/ringkasanharian.blade.php
@@ -0,0 +1,53 @@
+@extends('layouts.app')
+
+@section('content')
+<div class="container">
+    <div class="row">
+        <div class="col-md-12">
+            <div class="card">
+                <nav aria-label="breadcrumb">
+                    <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 active" aria-current="page">Ringkasan Harian</li>
+                    </ol>
+                  </nav>
+
+                <div class="card-body text-center">
+                    <div class="row form-group">
+                        <div class="col-md-2">
+                        </div>
+                        <div class="col-md-10">
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col-md-5">
+                            <form action="{{ route('ringkasanharian.laporancetak') }}" target="_blank" method="get">
+                                @csrf
+                                <div class="input-group mb-3">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text" id="basic-addon1">Tarikh</span>
+                                    </div>
+                                    <input type="text" class="form-control" placeholder="Pilih Tarikh" aria-label="Tarikh" id="datetimepicker1" name="dateringkasanharian" aria-describedby="basic-addon1">
+                                    <input type="submit" class="btn btn-primary ml-md-5" id="submit_button" name="submit_button" value="Cetak">
+                                </div>
+                            </form>
+                        </div>
+                    </div>
+                  
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<script type="text/javascript">
+    var api_url = "<?php echo $api_url ?>";
+    var kodcaw = "<?php echo $cawangan_info['kodcaw'] ?>";
+
+    var tablecustomers = $('#myTable').DataTable({
+        "ordering": false
+    });
+
+</script>
+@endsection
+
diff --git a/resources/views/print/laporan_ringkasanharian.blade.php b/resources/views/print/laporan_ringkasanharian.blade.php
index fb57412..41c8aa0 100644
--- a/resources/views/print/laporan_ringkasanharian.blade.php
+++ b/resources/views/print/laporan_ringkasanharian.blade.php
@@ -50,6 +50,8 @@
   </tr>
 </table>
 
+<p style="font-weight: bold;margin-left: 10px;">Tarikh : {{ $ringkasan_date }} <span style="margin-left:20px;">Tarikh Cetak : {{ $tarikh_cetak }}</span></p>
+
 <div class="row p-4">
   <div class="col-6 box">
     <div class="row form-group">
@@ -94,11 +96,11 @@
         <p><b>C) WANG PETI BESI</b></p>
       </div>
       <div class="col-6">1. SISTEM</div>
-      <div class="col-6"></div>
+      <div class="col-6">{{ 'RM '. number_format($laporan['petibesi_sistem'],2) }}</div>
       <div class="col-6">2. IMBANG DUGA</div>
-      <div class="col-6"></div>
+      <div class="col-6">{{ 'RM '. number_format($laporan['petibesiimbangduga'],2) }}</div>
       <div class="col-6">3. DENOMINASI</div>
-      <div class="col-6"></div>
+      <div class="col-6">{{ 'RM '. number_format($laporan['petibesi_deno'],2) }}</div>
     </div>
   </div>
   <div class="col-6 box">
@@ -146,7 +148,7 @@
             <tr>
               <td>2</td>
               <td>STOK AUDIT</td>
-              <td></td>
+              <td>{{ 'RM '. number_format($laporan['stokaudit'],2) }}</td>
               <td></td>
               <td></td>
             </tr>
diff --git a/routes/web.php b/routes/web.php
index 93da917..f902cba 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -183,6 +183,7 @@ Route::get('/laporan/petibesi',['as'=>'laporan.petibesi','uses'=>'KhazanahContro
 Route::post('laporan/petibesi/cetak',['as'=>'petibesi.laporancetak','uses'=>'KhazanahController@cetakLaporanPetiBesi'])->middleware('auth','khazanah');
 Route::get('/laporan/marhunterkumpul',['as'=>'laporan.marhunterkumpul','uses'=>'KhazanahController@laporanMarhunTerkumpul'])->middleware('auth','khazanah');
 Route::post('laporan/marhunterkumpul/cetak',['as'=>'marhunterkumpul.laporancetak','uses'=>'KhazanahController@cetakLaporanMarhunTerkumpul'])->middleware('auth','khazanah');
+Route::get('laporan/ringkasanharian/',['as'=>'laporan.ringkasanharian','uses'=>'KhazanahController@laporanRingkasanHarian'])->middleware('auth','khazanah');
 Route::get('laporan/ringkasanharian/cetak',['as'=>'ringkasanharian.laporancetak','uses'=>'KhazanahController@cetakLaporanRingkasanHarian'])->middleware('auth','khazanah');
 Route::get('laporan/ringkasanterkumpul/cetak',['as'=>'ringkasanterkumpul.laporancetak','uses'=>'KhazanahController@cetakLaporanRingkasanTerkumpul'])->middleware('auth','khazanah');
 Route::get('/laporan/agingbulanan', [ 'as'=>'laporan.agingbulanan', 'uses'=>'KhazanahController@laporanAging_Bulanan'])->middleware('auth','khazanah');

From eb1c0a2cf0efd275db9fa3825c881583aa053f79 Mon Sep 17 00:00:00 2001
From: MUHD HAFIFIE <Cyclonepipi@fidin-3.local>
Date: Wed, 5 May 2021 15:55:34 +0800
Subject: [PATCH 8/8] fixing laporan

---
 app/Http/Controllers/KhazanahController.php   | 70 +++++++++++++++++--
 resources/views/aliran_tunai/index.blade.php  | 56 +++++++--------
 .../laporan/ringkasanharian.blade.php         |  6 ++
 resources/views/khazanah/panjar.blade.php     |  9 +++
 .../print/laporan_ringkasanharian.blade.php   | 24 ++++---
 resources/views/print/resitansuran.blade.php  | 28 ++++----
 .../views/print/resitansuransebelum.blade.php | 32 ++++-----
 .../views/print/resittambahpinjam.blade.php   | 28 ++++----
 resources/views/print/resittebus.blade.php    | 32 ++++-----
 .../views/print/resittebussebelum.blade.php   | 32 ++++-----
 .../views/print/resittebusseparuh.blade.php   | 30 ++++----
 .../print/resittebusseparuhbelum.blade.php    | 40 +++++------
 12 files changed, 228 insertions(+), 159 deletions(-)

diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php
index d0b2710..4586746 100644
--- a/app/Http/Controllers/KhazanahController.php
+++ b/app/Http/Controllers/KhazanahController.php
@@ -1172,7 +1172,7 @@ class KhazanahController extends Controller
     public function createpanjar(Request $request)
     {
         $auth_user = Auth::user();
-
+        $api_url = config('api.url');
         $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
 
         $bakiperubatan = 0;
@@ -1719,11 +1719,20 @@ class KhazanahController extends Controller
             // lejer am panjar tamat...
 
 
-
         $updateVault = Http::put( config('api.url').'/api/UpdateVault/Panjar/'.$auth_user['cawangan'],[
             'totpanjar'=>$request->bayaran
         ]); 
-    
+
+        $upVault = $updateVault->getStatusCode();
+        $upDeno = $denominasicreate->getStatusCode();
+
+        if($upVault == 200 && empty($panjar) == false && $upDeno == 200)
+        {
+            return redirect('/panjar')->with('messageinformation','Panjar Berjaya Disimpan.');
+        }else{
+            return redirect('/panjar')->with('messageinformation','Panjar Mengalami Masalah UntukDisimpan.');
+        }
+
         return response($updateVault);
     }
 
@@ -2853,7 +2862,58 @@ class KhazanahController extends Controller
 
         $laporan = $laporan_ringkasan[0];
 
-        return view('print.laporan_ringkasanharian', compact('cawangan_detail','tarikh_cetak','ringkasan_date','api_url','laporan'));
+        $kawalanstok = Http::get(config('api.url'). '/api/kawalanstok/laporan/'. $auth_user['cawangan'] .'/'. $ringkasan_date)->json();
+
+        /* Kawalan Stok */
+        //Gadai
+        $totalbilgadaikeseluruhan = $kawalanstok[0]['gadai1'][0]['bil'] + $kawalanstok[0]['gadai2'][0]['bil'] + $kawalanstok[0]['gadai3'][0]['bil'];
+        $totalbilgadaisehari = $kawalanstok[0]['gadaiini1'][0]['bil'] + $kawalanstok[0]['gadaiini2'][0]['bil'] + $kawalanstok[0]['gadaiini3'][0]['bil'];
+        $totalbilgadai = $totalbilgadaikeseluruhan + $totalbilgadaisehari; 
+    
+        $totalpinjgadaikeseluruhan = $kawalanstok[0]['gadai1'][0]['pinj'] + $kawalanstok[0]['gadai2'][0]['pinj'] + $kawalanstok[0]['gadai3'][0]['pinj']; 
+        $totalpinjgadaisehari = $kawalanstok[0]['gadaiini1'][0]['pinj'] + $kawalanstok[0]['gadaiini2'][0]['pinj'] + $kawalanstok[0]['gadaiini3'][0]['pinj']; 
+        $totalpinjgadai = $totalpinjgadaikeseluruhan + $totalpinjgadaisehari; 
+
+        //Tebus
+        $totalbiltebuskeseluruhan = $kawalanstok[1]['tebus1'][0]['bil'] + $kawalanstok[1]['tebus2'][0]['bil'] + $kawalanstok[1]['tebus3'][0]['bil'];
+        $totalbiltebussehari = $kawalanstok[1]['tebusini1'][0]['bil'] + $kawalanstok[1]['tebusini2'][0]['bil'] + $kawalanstok[1]['tebusini3'][0]['bil'];
+        $totalbiltebus = $totalbiltebuskeseluruhan + $totalbiltebussehari; 
+
+        $totalpinjtebuskeseluruhan = $kawalanstok[1]['tebus1'][0]['pinj'] + $kawalanstok[1]['tebus2'][0]['pinj'] + $kawalanstok[1]['tebus3'][0]['pinj']; 
+        $totalpinjtebussehari = $kawalanstok[1]['tebusini1'][0]['pinj'] + $kawalanstok[1]['tebusini2'][0]['pinj'] + $kawalanstok[1]['tebusini3'][0]['pinj']; 
+        $totalpinjtebus = $totalpinjtebuskeseluruhan + $totalpinjtebussehari; 
+
+        //Ansuran
+
+        $totalbilanskeseluruhan = $kawalanstok[4]['ans1']['bil'] + $kawalanstok[4]['ans2']['bil'] + $kawalanstok[4]['ans3']['bil']; 
+        $totalbilanssehari = $kawalanstok[4]['ansini1']['bil'] + $kawalanstok[4]['ansini2']['bil'] + $kawalanstok[4]['ansini3']['bil'];
+        $totalbilans = $totalbilanskeseluruhan + $totalbilanssehari; 
+
+        $totalpinjanskeseluruhan = $kawalanstok[4]['ans1']['pinj'] + $kawalanstok[4]['ans2']['pinj'] + $kawalanstok[4]['ans3']['pinj'];
+        $totalpinjanssehari = $kawalanstok[4]['ansini1']['pinj'] + $kawalanstok[4]['ansini2']['pinj'] + $kawalanstok[4]['ansini3']['pinj']; 
+        $totalpinjans = floatval($totalpinjanskeseluruhan + $totalpinjanssehari);
+
+        //Lelong
+        $totalbillelongkeseluruhan = $kawalanstok[2]['lelong1'][0]['bil'] + $kawalanstok[2]['lelong2'][0]['bil'] + $kawalanstok[2]['lelong3'][0]['bil'];
+        $totalbillelongsehari = $kawalanstok[2]['lelongini1'][0]['bil'] + $kawalanstok[2]['lelongini2'][0]['bil'] + $kawalanstok[2]['lelongini3'][0]['bil'];
+        $totalbillelong = $totalbillelongkeseluruhan + $totalbillelongsehari; 
+     
+        $totalpinjlelongkeseluruhan = $kawalanstok[2]['lelong1'][0]['pinj'] + $kawalanstok[2]['lelong2'][0]['pinj'] + $kawalanstok[2]['lelong3'][0]['pinj']; 
+        $totalpinjlelongsehari = $kawalanstok[2]['lelongini1'][0]['pinj'] + $kawalanstok[2]['lelongini2'][0]['pinj'] + $kawalanstok[2]['lelongini3'][0]['pinj'];
+        $totalpinjlelong = floatval($totalpinjlelongkeseluruhan + $totalpinjlelongsehari); 
+
+        $totalbilhapuskirakeseluruhan = $kawalanstok[3]['hapuskira1'][0]['bil'] + $kawalanstok[3]['hapuskira2'][0]['bil'] + $kawalanstok[3]['hapuskira3'][0]['bil'];
+        $totalbilhapuskirasehari = $kawalanstok[3]['hapuskiraini1'][0]['bil'] + $kawalanstok[3]['hapuskiraini2'][0]['bil'] + $kawalanstok[3]['hapuskiraini3'][0]['bil'];
+        $totalbilhapuskira = $totalbilhapuskirakeseluruhan + $totalbilhapuskirasehari; echo number_format($totalbilhapuskira); 
+    
+        $totalpinjhapuskirakeseluruhan = $kawalanstok[3]['hapuskira1'][0]['pinj'] + $kawalanstok[3]['hapuskira2'][0]['pinj'] + $kawalanstok[3]['hapuskira3'][0]['pinj'];
+        $totalpinjhapuskirasehari = $kawalanstok[3]['hapuskiraini1'][0]['pinj'] + $kawalanstok[3]['hapuskiraini2'][0]['pinj'] + $kawalanstok[3]['hapuskiraini3'][0]['pinj'];
+        $totalpinjhapuskira = $totalpinjhapuskirakeseluruhan + $totalpinjhapuskirasehari; echo number_format($totalpinjhapuskira,2); 
+
+        $totalbilkawalanstok = $totalbilgadai-$totalbiltebus-$totalbilans-$totalbillelong-$totalbilhapuskira;
+        $totalpinjkawalanstok = $totalpinjgadai-$totalpinjtebus-$totalpinjans-$totalpinjlelong-$totalpinjhapuskira;
+
+        return view('print.laporan_ringkasanharian', compact('cawangan_detail','tarikh_cetak','ringkasan_date','api_url','laporan','totalbilkawalanstok','totalpinjkawalanstok'));
     }
 
     public function cetakLaporanRingkasanTerkumpul(Request $request){
@@ -3303,7 +3363,7 @@ class KhazanahController extends Controller
         $cajperkhidmatan = Http::get(config('api.url').'/api/cajperkhidmatanterkumpul/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json();
         
         //TunaiDitangan Sementara Upah
-        if($tarikh_imbangan2 >= '2021-04-22')
+        if($tarikh_imbangan2 >= '2021-04-22' && $tarikh_imbangan2 < '2021-05-05')
         {
             $advansurharini = Http::get(config('api.url').'/api/advansurharini/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json();
             $totaltunaiditangan = floatval($tunaiditangan) - floatval($advansurharini);
diff --git a/resources/views/aliran_tunai/index.blade.php b/resources/views/aliran_tunai/index.blade.php
index 3e65099..e9bf5a9 100644
--- a/resources/views/aliran_tunai/index.blade.php
+++ b/resources/views/aliran_tunai/index.blade.php
@@ -124,7 +124,7 @@
                     <div class="card-body">
 
 
-                        <button type="button" onclick="kemaskiniupah()" class="btn btn-primary float-right">Kemaskini</button>
+                        {{-- <button type="button" onclick="kemaskiniupah()" class="btn btn-primary float-right">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>
@@ -317,35 +317,35 @@
         });
     }
 
-    function kemaskiniupah()
-    {
-        $.ajax({
-                type: 'get',
-                url: "{{ route('kemaskini.upah') }}",
-                // data: { "namateller" : tele },
-                success: function(data){
-                    console.log(data);
-                    if(data == 1)
-                    {
-                        Swal.fire({
-                            icon: 'success',
-                            title: 'Kemaskini!',
-                            text: 'Proses Kemaskini!'
-                        }).then(function() {
-                            location.reload();
-                        });
+    // function kemaskiniupah()
+    // {
+    //     $.ajax({
+    //             type: 'get',
+    //             url: "{{ route('kemaskini.upah') }}",
+    //             // data: { "namateller" : tele },
+    //             success: function(data){
+    //                 console.log(data);
+    //                 if(data == 1)
+    //                 {
+    //                     Swal.fire({
+    //                         icon: 'success',
+    //                         title: 'Kemaskini!',
+    //                         text: 'Proses Kemaskini!'
+    //                     }).then(function() {
+    //                         location.reload();
+    //                     });
                         
-                    }else{
-                        Swal.fire({
-                            icon: 'warning',
-                            title: 'Peringatan',
-                            text: 'Telah Dikemaskini!'
-                        });
-                    }
-                }
-            });
+    //                 }else{
+    //                     Swal.fire({
+    //                         icon: 'warning',
+    //                         title: 'Peringatan',
+    //                         text: 'Telah Dikemaskini!'
+    //                     });
+    //                 }
+    //             }
+    //         });
 
-    }
+    // }
 
     let pusherenv = "{{ env('PUSHER_APP_KEY') }}";
     let laporanroute = "{{ route('laporan.serahanteller') }}";
diff --git a/resources/views/khazanah/laporan/ringkasanharian.blade.php b/resources/views/khazanah/laporan/ringkasanharian.blade.php
index 8931414..14338d2 100644
--- a/resources/views/khazanah/laporan/ringkasanharian.blade.php
+++ b/resources/views/khazanah/laporan/ringkasanharian.blade.php
@@ -48,6 +48,12 @@
         "ordering": false
     });
 
+    $(document).ready( function () {
+        $('#datetimepicker1').datepicker({
+            format: 'dd-mm-yyyy'
+        });
+    });
+
 </script>
 @endsection
 
diff --git a/resources/views/khazanah/panjar.blade.php b/resources/views/khazanah/panjar.blade.php
index 979283a..2a5f9e7 100644
--- a/resources/views/khazanah/panjar.blade.php
+++ b/resources/views/khazanah/panjar.blade.php
@@ -18,6 +18,15 @@
                   </nav>
 
                 <div class="card-body text-center">
+
+                    @if(Session::has('messageinformation'))
+                    <script>  Swal.fire({
+                        icon: 'info',
+                        title: 'Status!',
+                        text: '{!! Session::get("messageinformation") !!}'
+                    });
+                    </script>
+                    @endif
                     
                     <div class="row mb-4">
                         <div class="col-2 justify-content-start">
diff --git a/resources/views/print/laporan_ringkasanharian.blade.php b/resources/views/print/laporan_ringkasanharian.blade.php
index 41c8aa0..c156367 100644
--- a/resources/views/print/laporan_ringkasanharian.blade.php
+++ b/resources/views/print/laporan_ringkasanharian.blade.php
@@ -65,9 +65,11 @@
       <div class="col-6">3. ANSURAN PEMBIAYAAN</div>
       <div class="col-6">{{ 'RM '. number_format($laporan['total_ansuran'],2) }}</div>
       <div class="col-6">4. BAYARAN ONLINE</div>
-      <div class="col-6"></div>
+      <div class="col-6"> RM 0.00 </div>
       <div class="col-6">5. KEUNTUNGAN</div>
       <div class="col-6">{{ 'RM '. number_format($laporan['total_keuntungan'],2) }}</div>
+      <div class="col-6">6. KEUNTUNGAN ONLINE</div>
+      <div class="col-6"> RM 0.00 </div>
     </div>
   </div>
   <div class="col-6 box">
@@ -82,7 +84,7 @@
       <div class="col-6">3. ANSURAN PEMBIAYAAN</div>
       <div class="col-6">{{ $laporan['bilangan_ansuran'] }}</div>
       <div class="col-6">4. BAYARAN ONLINE</div>
-      <div class="col-6"></div>
+      <div class="col-6"> 0 </div>
       <div class="col-6">5. PELANGGAN BARU</div>
       <div class="col-6">{{ $laporan['bilangan_customer_baru'] }}</div>
     </div>
@@ -141,23 +143,23 @@
             <tr>
               <td>1</td>
               <td>IMBANG DUGA</td>
-              <td></td>
-              <td></td>
-              <td></td>
+              <td>{{ 'RM '. number_format($laporan['outstandingimbangduga'],2) }}</td>
+              <td> Not Applicable </td>
+              <td> Not Applicable </td>
             </tr>
             <tr>
               <td>2</td>
               <td>STOK AUDIT</td>
-              <td>{{ 'RM '. number_format($laporan['stokaudit'],2) }}</td>
-              <td></td>
-              <td></td>
+              <td>{{ 'RM '. number_format($laporan['stokauditpembiayaan'],2) }}</td>
+              <td>{{ 'RM '. number_format($laporan['stokauditnilaimarhun'],2) }}</td>
+              <td>{{ number_format($laporan['stokauditcount']) }}</td>
             </tr>
             <tr>
               <td>3</td>
               <td>KAWALAN STOK</td>
-              <td></td>
-              <td></td>
-              <td></td>
+              <td>{{ 'RM '. number_format($totalpinjkawalanstok,2) }}</td>
+              <td> Not Applicable </td>
+              <td>{{ number_format($totalbilkawalanstok) }}</td>
             </tr>
           </tbody>
         </table>
diff --git a/resources/views/print/resitansuran.blade.php b/resources/views/print/resitansuran.blade.php
index ff61051..8361d30 100644
--- a/resources/views/print/resitansuran.blade.php
+++ b/resources/views/print/resitansuran.blade.php
@@ -46,7 +46,7 @@ hr.new5 {
     font-family: Arial, Helvetica, sans-serif;
     border-collapse:collapse;
     width:20%;
-    font-size:10px;
+    font-size:12px;
     border: 1px solid black;
 
   }
@@ -54,7 +54,7 @@ hr.new5 {
   #cust td, #cust th {
     border: 0px solid;
     padding: 3px;
-    font-size:9px;
+    font-size:10px;
     text-align:right;
 
   }
@@ -109,7 +109,7 @@ hr.new5 {
     font-family: Arial, Helvetica, sans-serif;
     border-collapse:collapse;
     width:100%;
-    font-size:10px;
+    font-size:15px;
   }
 
   #inside td, #inside th {
@@ -137,7 +137,7 @@ hr.new5 {
     border-collapse:collapse;
     width:100%;
     margin-top:40px;
-    font-size:10px;
+    font-size:12px;
   }
 
   #semakan td, #semakan th {
@@ -195,14 +195,14 @@ hr.new5 {
     font-family: Arial, Helvetica, sans-serif;
     border-collapse:collapse;
     width: 100%;
-    font-size:10px;
+    font-size:12px;
 
   }
 
   #perjanjian td, #perjanjian th {
     border: 1px solid #ddd;
     padding: 2px;
-    font-size:9px;
+    font-size:10px;
   }
 
   #perjanjian tr:nth-child(even){background-color:#ffffff}
@@ -221,14 +221,14 @@ hr.new5 {
     font-family: Arial, Helvetica, sans-serif;
     border-collapse:collapse;
     width: 100%;
-    font-size:10px;
+    font-size:12px;
 
   }
 
   #keuntungan td, #keuntungan th {
     border: 1px solid #ddd;
     padding: 2px;
-    font-size:9px;
+    font-size:10px;
   }
 
   #keuntungan tr:nth-child(even){background-color: #ffffff;}
@@ -248,7 +248,7 @@ hr.new5 {
     font-family: Arial, Helvetica, sans-serif;
     border-collapse:collapse;
     width: 45%;
-    font-size:10px;
+    font-size:13px;
     border: 1px solid black;
 
   }
@@ -256,7 +256,7 @@ hr.new5 {
   #payment td, #payment th {
     border: 0px solid;
     padding: 3px;
-    font-size:9px;
+    font-size:10px;
     text-align: left;
 
   }
@@ -281,7 +281,7 @@ hr.new5 {
 
   #akuan td, #akuan th {
     padding: 7px;
-    font-size:9px;
+    font-size:10px;
     padding:4px;
   }
 
@@ -303,14 +303,14 @@ hr.new5 {
   
   .formula{
     font-family: Arial, Helvetica, sans-serif;
-    font-size:12px;
+    font-size:14px;
   }
   
   #copy_cust {
     font-family: Arial, Helvetica, sans-serif;
     border-collapse:collapse;
     width:10%;
-    font-size:10px;
+    font-size:12px;
 
   }
 
@@ -334,7 +334,7 @@ hr.new5 {
     font-family: Arial, Helvetica, sans-serif;
     border-collapse:collapse;
     width: 50%;
-    font-size:10px;
+    font-size:12px;
 
 
   }
diff --git a/resources/views/print/resitansuransebelum.blade.php b/resources/views/print/resitansuransebelum.blade.php
index 47478c3..cfb28ff 100644
--- a/resources/views/print/resitansuransebelum.blade.php
+++ b/resources/views/print/resitansuransebelum.blade.php
@@ -46,7 +46,7 @@ hr.new5 {
     font-family: Arial, Helvetica, sans-serif;
     border-collapse:collapse;
     width:20%;
-    font-size:10px;
+    font-size:12px;
     border: 1px solid black;
 
   }
@@ -54,7 +54,7 @@ hr.new5 {
   #cust td, #cust th {
     border: 0px solid;
     padding: 3px;
-    font-size:9px;
+    font-size:10px;
     text-align:right;
 
   }
@@ -102,14 +102,14 @@ hr.new5 {
     padding:10px;
     width : 250px;
     transform: rotate(-90deg);
-    font-size:11px;
+    font-size:12px;
   }
 
   #inside {
     font-family: Arial, Helvetica, sans-serif;
     border-collapse:collapse;
     width:100%;
-    font-size:10px;
+    font-size:15px;
   }
 
   #inside td, #inside th {
@@ -137,7 +137,7 @@ hr.new5 {
     border-collapse:collapse;
     width:100%;
     margin-top:40px;
-    font-size:10px;
+    font-size:12px;
   }
 
   #semakan td, #semakan th {
@@ -171,7 +171,7 @@ hr.new5 {
     font-family: Arial, Helvetica, sans-serif;
     border-collapse:collapse;
     width:100%;
-    font-size:11px;
+    font-size:12px;
   }
 
   #salinan td, #salinan th {
@@ -195,14 +195,14 @@ hr.new5 {
     font-family: Arial, Helvetica, sans-serif;
     border-collapse:collapse;
     width: 100%;
-    font-size:10px;
+    font-size:12px;
 
   }
 
   #perjanjian td, #perjanjian th {
     border: 1px solid #ddd;
     padding: 2px;
-    font-size:9px;
+    font-size:10px;
   }
 
   #perjanjian tr:nth-child(even){background-color:#ffffff}
@@ -221,14 +221,14 @@ hr.new5 {
     font-family: Arial, Helvetica, sans-serif;
     border-collapse:collapse;
     width: 100%;
-    font-size:10px;
+    font-size:12px;
 
   }
 
   #keuntungan td, #keuntungan th {
     border: 1px solid #ddd;
     padding: 2px;
-    font-size:9px;
+    font-size:10px;
   }
 
   #keuntungan tr:nth-child(even){background-color: #ffffff;}
@@ -248,7 +248,7 @@ hr.new5 {
     font-family: Arial, Helvetica, sans-serif;
     border-collapse:collapse;
     width: 45%;
-    font-size:10px;
+    font-size:12px;
     border: 1px solid black;
 
   }
@@ -256,7 +256,7 @@ hr.new5 {
   #payment td, #payment th {
     border: 0px solid;
     padding: 3px;
-    font-size:9px;
+    font-size:10px;
     text-align: left;
 
   }
@@ -281,7 +281,7 @@ hr.new5 {
 
   #akuan td, #akuan th {
     padding: 7px;
-    font-size:9px;
+    font-size:10px;
     padding:4px;
   }
 
@@ -310,7 +310,7 @@ hr.new5 {
     font-family: Arial, Helvetica, sans-serif;
     border-collapse:collapse;
     width:10%;
-    font-size:10px;
+    font-size:12px;
 
   }
 
@@ -334,7 +334,7 @@ hr.new5 {
     font-family: Arial, Helvetica, sans-serif;
     border-collapse:collapse;
     width: 50%;
-    font-size:10px;
+    font-size:12px;
 
 
   }
@@ -342,7 +342,7 @@ hr.new5 {
   #copy_cust td, #copy_cust th {
     border: 1px solid #ddd;
     padding: 2px;
-    font-size:9px;
+    font-size:10px;
     text-align:right;
     width: 10%;
 
diff --git a/resources/views/print/resittambahpinjam.blade.php b/resources/views/print/resittambahpinjam.blade.php
index cfe1a1a..56fbe11 100644
--- a/resources/views/print/resittambahpinjam.blade.php
+++ b/resources/views/print/resittambahpinjam.blade.php
@@ -102,14 +102,14 @@ hr.new5 {
     padding:10px;
     width : 250px;
     transform: rotate(-90deg);
-    font-size:11px;
+    font-size:12px;
   }
 
   #inside {
     font-family: Arial, Helvetica, sans-serif;
     border-collapse:collapse;
     width:100%;
-    font-size:10px;
+    font-size:15px;
   }
 
   #inside td, #inside th {
@@ -137,7 +137,7 @@ hr.new5 {
     border-collapse:collapse;
     width:100%;
     margin-top:40px;
-    font-size:10px;
+    font-size:12px;
   }
 
   #semakan td, #semakan th {
@@ -171,7 +171,7 @@ hr.new5 {
     font-family: Arial, Helvetica, sans-serif;
     border-collapse:collapse;
     width:100%;
-    font-size:11px;
+    font-size:12px;
   }
 
   #salinan td, #salinan th {
@@ -195,14 +195,14 @@ hr.new5 {
     font-family: Arial, Helvetica, sans-serif;
     border-collapse:collapse;
     width: 100%;
-    font-size:10px;
+    font-size:12px;
 
   }
 
   #perjanjian td, #perjanjian th {
     border: 1px solid #ddd;
     padding: 2px;
-    font-size:9px;
+    font-size:10px;
   }
 
   #perjanjian tr:nth-child(even){background-color:#ffffff}
@@ -221,14 +221,14 @@ hr.new5 {
     font-family: Arial, Helvetica, sans-serif;
     border-collapse:collapse;
     width: 100%;
-    font-size:10px;
+    font-size:12px;
 
   }
 
   #keuntungan td, #keuntungan th {
     border: 1px solid #ddd;
     padding: 2px;
-    font-size:9px;
+    font-size:10px;
   }
 
   #keuntungan tr:nth-child(even){background-color: #ffffff;}
@@ -248,7 +248,7 @@ hr.new5 {
     font-family: Arial, Helvetica, sans-serif;
     border-collapse:collapse;
     width: 45%;
-    font-size:10px;
+    font-size:13px;
     border: 1px solid black;
 
   }
@@ -256,7 +256,7 @@ hr.new5 {
   #payment td, #payment th {
     border: 0px solid;
     padding: 3px;
-    font-size:9px;
+    font-size:10px;
     text-align: left;
 
   }
@@ -281,7 +281,7 @@ hr.new5 {
 
   #akuan td, #akuan th {
     padding: 7px;
-    font-size:9px;
+    font-size:10px;
     padding:4px;
   }
 
@@ -310,7 +310,7 @@ hr.new5 {
     font-family: Arial, Helvetica, sans-serif;
     border-collapse:collapse;
     width:10%;
-    font-size:10px;
+    font-size:12px;
 
   }
 
@@ -334,7 +334,7 @@ hr.new5 {
     font-family: Arial, Helvetica, sans-serif;
     border-collapse:collapse;
     width: 50%;
-    font-size:10px;
+    font-size:12px;
 
 
   }
@@ -342,7 +342,7 @@ hr.new5 {
   #copy_cust td, #copy_cust th {
     border: 1px solid #ddd;
     padding: 2px;
-    font-size:9px;
+    font-size:10px;
     text-align:right;
     width: 10%;
 
diff --git a/resources/views/print/resittebus.blade.php b/resources/views/print/resittebus.blade.php
index 0f167d3..daf5bc6 100644
--- a/resources/views/print/resittebus.blade.php
+++ b/resources/views/print/resittebus.blade.php
@@ -46,7 +46,7 @@ hr.new5 {
     font-family: Arial, Helvetica, sans-serif;
     border-collapse:collapse;
     width:20%;
-    font-size:10px;
+    font-size:12px;
     border: 1px solid black;
 
   }
@@ -54,7 +54,7 @@ hr.new5 {
   #cust td, #cust th {
     border: 0px solid;
     padding: 3px;
-    font-size:9px;
+    font-size:10px;
     text-align:right;
 
   }
@@ -102,14 +102,14 @@ hr.new5 {
     padding:10px;
     width : 250px;
     transform: rotate(-90deg);
-    font-size:11px;
+    font-size:12px;
   }
 
   #inside {
     font-family: Arial, Helvetica, sans-serif;
     border-collapse:collapse;
     width:100%;
-    font-size:10px;
+    font-size:15px;
   }
 
   #inside td, #inside th {
@@ -137,7 +137,7 @@ hr.new5 {
     border-collapse:collapse;
     width:100%;
     margin-top:40px;
-    font-size:10px;
+    font-size:12px;
   }
 
   #semakan td, #semakan th {
@@ -171,7 +171,7 @@ hr.new5 {
     font-family: Arial, Helvetica, sans-serif;
     border-collapse:collapse;
     width:100%;
-    font-size:11px;
+    font-size:12px;
   }
 
   #salinan td, #salinan th {
@@ -195,14 +195,14 @@ hr.new5 {
     font-family: Arial, Helvetica, sans-serif;
     border-collapse:collapse;
     width: 100%;
-    font-size:10px;
+    font-size:12px;
 
   }
 
   #perjanjian td, #perjanjian th {
     border: 1px solid #ddd;
     padding: 2px;
-    font-size:9px;
+    font-size:10px;
   }
 
   #perjanjian tr:nth-child(even){background-color:#ffffff}
@@ -221,14 +221,14 @@ hr.new5 {
     font-family: Arial, Helvetica, sans-serif;
     border-collapse:collapse;
     width: 100%;
-    font-size:10px;
+    font-size:12px;
 
   }
 
   #keuntungan td, #keuntungan th {
     border: 1px solid #ddd;
     padding: 2px;
-    font-size:9px;
+    font-size:10px;
   }
 
   #keuntungan tr:nth-child(even){background-color: #ffffff;}
@@ -248,7 +248,7 @@ hr.new5 {
     font-family: Arial, Helvetica, sans-serif;
     border-collapse:collapse;
     width: 45%;
-    font-size:10px;
+    font-size:12px;
     border: 1px solid black;
 
   }
@@ -256,7 +256,7 @@ hr.new5 {
   #payment td, #payment th {
     border: 0px solid;
     padding: 3px;
-    font-size:9px;
+    font-size:13px;
     text-align: left;
 
   }
@@ -281,7 +281,7 @@ hr.new5 {
 
   #akuan td, #akuan th {
     padding: 7px;
-    font-size:9px;
+    font-size:10px;
     padding:4px;
   }
 
@@ -310,7 +310,7 @@ hr.new5 {
     font-family: Arial, Helvetica, sans-serif;
     border-collapse:collapse;
     width:10%;
-    font-size:10px;
+    font-size:12px;
 
   }
 
@@ -334,7 +334,7 @@ hr.new5 {
     font-family: Arial, Helvetica, sans-serif;
     border-collapse:collapse;
     width: 50%;
-    font-size:10px;
+    font-size:12px;
 
 
   }
@@ -342,7 +342,7 @@ hr.new5 {
   #copy_cust td, #copy_cust th {
     border: 1px solid #ddd;
     padding: 2px;
-    font-size:9px;
+    font-size:10px;
     text-align:right;
     width: 10%;
 
diff --git a/resources/views/print/resittebussebelum.blade.php b/resources/views/print/resittebussebelum.blade.php
index a953339..71b07fb 100644
--- a/resources/views/print/resittebussebelum.blade.php
+++ b/resources/views/print/resittebussebelum.blade.php
@@ -46,7 +46,7 @@ hr.new5 {
     font-family: Arial, Helvetica, sans-serif;
     border-collapse:collapse;
     width:20%;
-    font-size:10px;
+    font-size:12px;
     border: 1px solid black;
 
   }
@@ -54,7 +54,7 @@ hr.new5 {
   #cust td, #cust th {
     border: 0px solid;
     padding: 3px;
-    font-size:9px;
+    font-size:10px;
     text-align:right;
 
   }
@@ -102,14 +102,14 @@ hr.new5 {
     padding:10px;
     width : 250px;
     transform: rotate(-90deg);
-    font-size:11px;
+    font-size:12px;
   }
 
   #inside {
     font-family: Arial, Helvetica, sans-serif;
     border-collapse:collapse;
     width:100%;
-    font-size:10px;
+    font-size:15px;
   }
 
   #inside td, #inside th {
@@ -137,7 +137,7 @@ hr.new5 {
     border-collapse:collapse;
     width:100%;
     margin-top:40px;
-    font-size:10px;
+    font-size:12px;
   }
 
   #semakan td, #semakan th {
@@ -171,7 +171,7 @@ hr.new5 {
     font-family: Arial, Helvetica, sans-serif;
     border-collapse:collapse;
     width:100%;
-    font-size:11px;
+    font-size:12px;
   }
 
   #salinan td, #salinan th {
@@ -195,14 +195,14 @@ hr.new5 {
     font-family: Arial, Helvetica, sans-serif;
     border-collapse:collapse;
     width: 100%;
-    font-size:10px;
+    font-size:12px;
 
   }
 
   #perjanjian td, #perjanjian th {
     border: 1px solid #ddd;
     padding: 2px;
-    font-size:9px;
+    font-size:10px;
   }
 
   #perjanjian tr:nth-child(even){background-color:#ffffff}
@@ -221,14 +221,14 @@ hr.new5 {
     font-family: Arial, Helvetica, sans-serif;
     border-collapse:collapse;
     width: 100%;
-    font-size:10px;
+    font-size:12px;
 
   }
 
   #keuntungan td, #keuntungan th {
     border: 1px solid #ddd;
     padding: 2px;
-    font-size:9px;
+    font-size:10px;
   }
 
   #keuntungan tr:nth-child(even){background-color: #ffffff;}
@@ -248,7 +248,7 @@ hr.new5 {
     font-family: Arial, Helvetica, sans-serif;
     border-collapse:collapse;
     width: 45%;
-    font-size:10px;
+    font-size:12px;
     border: 1px solid black;
 
   }
@@ -256,7 +256,7 @@ hr.new5 {
   #payment td, #payment th {
     border: 0px solid;
     padding: 3px;
-    font-size:9px;
+    font-size:13px;
     text-align: left;
 
   }
@@ -281,7 +281,7 @@ hr.new5 {
 
   #akuan td, #akuan th {
     padding: 7px;
-    font-size:9px;
+    font-size:10px;
     padding:4px;
   }
 
@@ -310,7 +310,7 @@ hr.new5 {
     font-family: Arial, Helvetica, sans-serif;
     border-collapse:collapse;
     width:10%;
-    font-size:10px;
+    font-size:12px;
 
   }
 
@@ -334,7 +334,7 @@ hr.new5 {
     font-family: Arial, Helvetica, sans-serif;
     border-collapse:collapse;
     width: 50%;
-    font-size:10px;
+    font-size:12px;
 
 
   }
@@ -342,7 +342,7 @@ hr.new5 {
   #copy_cust td, #copy_cust th {
     border: 1px solid #ddd;
     padding: 2px;
-    font-size:9px;
+    font-size:10px;
     text-align:right;
     width: 10%;
 
diff --git a/resources/views/print/resittebusseparuh.blade.php b/resources/views/print/resittebusseparuh.blade.php
index 745377c..c88c4de 100644
--- a/resources/views/print/resittebusseparuh.blade.php
+++ b/resources/views/print/resittebusseparuh.blade.php
@@ -54,7 +54,7 @@ hr.new5 {
   #cust td, #cust th {
     border: 0px solid;
     padding: 3px;
-    font-size:9px;
+    font-size:10px;
     text-align:right;
 
   }
@@ -102,14 +102,14 @@ hr.new5 {
     padding:10px;
     width : 250px;
     transform: rotate(-90deg);
-    font-size:11px;
+    font-size:12px;
   }
 
   #inside {
     font-family: Arial, Helvetica, sans-serif;
     border-collapse:collapse;
     width:100%;
-    font-size:10px;
+    font-size:15px;
   }
 
   #inside td, #inside th {
@@ -137,7 +137,7 @@ hr.new5 {
     border-collapse:collapse;
     width:100%;
     margin-top:40px;
-    font-size:10px;
+    font-size:12px;
   }
 
   #semakan td, #semakan th {
@@ -171,7 +171,7 @@ hr.new5 {
     font-family: Arial, Helvetica, sans-serif;
     border-collapse:collapse;
     width:100%;
-    font-size:11px;
+    font-size:12px;
   }
 
   #salinan td, #salinan th {
@@ -195,14 +195,14 @@ hr.new5 {
     font-family: Arial, Helvetica, sans-serif;
     border-collapse:collapse;
     width: 100%;
-    font-size:10px;
+    font-size:12px;
 
   }
 
   #perjanjian td, #perjanjian th {
     border: 1px solid #ddd;
     padding: 2px;
-    font-size:9px;
+    font-size:10px;
   }
 
   #perjanjian tr:nth-child(even){background-color:#ffffff}
@@ -221,14 +221,14 @@ hr.new5 {
     font-family: Arial, Helvetica, sans-serif;
     border-collapse:collapse;
     width: 100%;
-    font-size:10px;
+    font-size:12px;
 
   }
 
   #keuntungan td, #keuntungan th {
     border: 1px solid #ddd;
     padding: 2px;
-    font-size:9px;
+    font-size:10px;
   }
 
   #keuntungan tr:nth-child(even){background-color: #ffffff;}
@@ -248,7 +248,7 @@ hr.new5 {
     font-family: Arial, Helvetica, sans-serif;
     border-collapse:collapse;
     width: 45%;
-    font-size:10px;
+    font-size:13px;
     border: 1px solid black;
 
   }
@@ -256,7 +256,7 @@ hr.new5 {
   #payment td, #payment th {
     border: 0px solid;
     padding: 3px;
-    font-size:9px;
+    font-size:10px;
     text-align: left;
 
   }
@@ -281,7 +281,7 @@ hr.new5 {
 
   #akuan td, #akuan th {
     padding: 7px;
-    font-size:9px;
+    font-size:10px;
     padding:4px;
   }
 
@@ -310,7 +310,7 @@ hr.new5 {
     font-family: Arial, Helvetica, sans-serif;
     border-collapse:collapse;
     width:10%;
-    font-size:10px;
+    font-size:12px;
 
   }
 
@@ -334,7 +334,7 @@ hr.new5 {
     font-family: Arial, Helvetica, sans-serif;
     border-collapse:collapse;
     width: 50%;
-    font-size:10px;
+    font-size:12px;
 
 
   }
@@ -342,7 +342,7 @@ hr.new5 {
   #copy_cust td, #copy_cust th {
     border: 1px solid #ddd;
     padding: 2px;
-    font-size:9px;
+    font-size:10px;
     text-align:right;
     width: 10%;
 
diff --git a/resources/views/print/resittebusseparuhbelum.blade.php b/resources/views/print/resittebusseparuhbelum.blade.php
index 4d79e2d..99953f0 100644
--- a/resources/views/print/resittebusseparuhbelum.blade.php
+++ b/resources/views/print/resittebusseparuhbelum.blade.php
@@ -46,7 +46,7 @@ hr.new5 {
     font-family: Arial, Helvetica, sans-serif;
     border-collapse:collapse;
     width:20%;
-    font-size:10px;
+    font-size:12px;
     border: 1px solid black;
 
   }
@@ -54,7 +54,7 @@ hr.new5 {
   #cust td, #cust th {
     border: 0px solid;
     padding: 3px;
-    font-size:9px;
+    font-size:10px;
     text-align:right;
 
   }
@@ -102,14 +102,14 @@ hr.new5 {
     padding:10px;
     width : 250px;
     transform: rotate(-90deg);
-    font-size:11px;
+    font-size:12px;
   }
 
   #inside {
     font-family: Arial, Helvetica, sans-serif;
     border-collapse:collapse;
     width:100%;
-    font-size:10px;
+    font-size:15px;
   }
 
   #inside td, #inside th {
@@ -137,7 +137,7 @@ hr.new5 {
     border-collapse:collapse;
     width:100%;
     margin-top:40px;
-    font-size:10px;
+    font-size:12px;
   }
 
   #semakan td, #semakan th {
@@ -159,19 +159,11 @@ hr.new5 {
   }
 
 
-
-
-
-
-
-
-
-
   #salinan {
     font-family: Arial, Helvetica, sans-serif;
     border-collapse:collapse;
     width:100%;
-    font-size:11px;
+    font-size:12px;
   }
 
   #salinan td, #salinan th {
@@ -195,14 +187,14 @@ hr.new5 {
     font-family: Arial, Helvetica, sans-serif;
     border-collapse:collapse;
     width: 100%;
-    font-size:10px;
+    font-size:12px;
 
   }
 
   #perjanjian td, #perjanjian th {
     border: 1px solid #ddd;
     padding: 2px;
-    font-size:9px;
+    font-size:10px;
   }
 
   #perjanjian tr:nth-child(even){background-color:#ffffff}
@@ -221,14 +213,14 @@ hr.new5 {
     font-family: Arial, Helvetica, sans-serif;
     border-collapse:collapse;
     width: 100%;
-    font-size:10px;
+    font-size:12px;
 
   }
 
   #keuntungan td, #keuntungan th {
     border: 1px solid #ddd;
     padding: 2px;
-    font-size:9px;
+    font-size:10px;
   }
 
   #keuntungan tr:nth-child(even){background-color: #ffffff;}
@@ -248,7 +240,7 @@ hr.new5 {
     font-family: Arial, Helvetica, sans-serif;
     border-collapse:collapse;
     width: 45%;
-    font-size:10px;
+    font-size:13px;
     border: 1px solid black;
 
   }
@@ -256,7 +248,7 @@ hr.new5 {
   #payment td, #payment th {
     border: 0px solid;
     padding: 3px;
-    font-size:9px;
+    font-size:10px;
     text-align: left;
 
   }
@@ -281,7 +273,7 @@ hr.new5 {
 
   #akuan td, #akuan th {
     padding: 7px;
-    font-size:9px;
+    font-size:10px;
     padding:4px;
   }
 
@@ -310,7 +302,7 @@ hr.new5 {
     font-family: Arial, Helvetica, sans-serif;
     border-collapse:collapse;
     width:10%;
-    font-size:10px;
+    font-size:12px;
 
   }
 
@@ -334,7 +326,7 @@ hr.new5 {
     font-family: Arial, Helvetica, sans-serif;
     border-collapse:collapse;
     width: 50%;
-    font-size:10px;
+    font-size:12px;
 
 
   }
@@ -342,7 +334,7 @@ hr.new5 {
   #copy_cust td, #copy_cust th {
     border: 1px solid #ddd;
     padding: 2px;
-    font-size:9px;
+    font-size:10px;
     text-align:right;
     width: 10%;