diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php
index c606223..eead57b 100644
--- a/app/Http/Controllers/KhazanahController.php
+++ b/app/Http/Controllers/KhazanahController.php
@@ -3192,6 +3192,15 @@ class KhazanahController extends Controller
         return view('khazanah.laporan.ringkasanharian',compact('cawangan_info','api_url'));
     }
 
+    public function laporanRingkasanTerkumpul(){
+        $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.ringkasanterkumpul',compact('cawangan_info','api_url'));
+    }
+
     public function cetakLaporanRingkasanHarian(Request $request){
     
         $api_url = config('api.url');
@@ -3271,6 +3280,30 @@ class KhazanahController extends Controller
         return view('print.laporan_ringkasanharian', compact('cawangan_detail','tarikh_cetak','ringkasan_date','api_url','laporan','totalbilkawalanstok','totalpinjkawalanstok'));
     }
 
+    // public function cetakLaporanRingkasanTerkumpul(Request $request){
+    //     // dd($request);
+    //     $api_url = config('api.url');
+    //     $auth_user = Auth::user();
+    //     $current = Carbon::now();
+    //     $current = new Carbon();
+    //     $tarikh_cetak = $current->toDateString();
+    //     if($request->datetimepicker1 == null){
+    //         $tebus_date = $current->toDateString();
+    //     }else{
+    //         $split_date = explode('-',$request->datetimepicker1);
+    //         $tebus_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0];        
+    //     }
+    //     $marhun = Http::get(config('api.url'). '/api/gadai/laporan/ringkasan/'. $auth_user['cawangan'],['tarikh' => $tebus_date])->json();
+    //     $marhun = $marhun[0];
+
+    //     $keseluruhanupahsimpan = $marhun['lelongupahsimpan'] + $marhun['tebus'][0]['upahsimpan'] + $marhun['advansur'][0]['upahsimpan'];
+
+    //     $cawangan=Http::get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
+    //     $cawangan_detail=$cawangan[0];
+    //     // dd($gadai);
+    //     return view('print.laporan_ringkasanterkumpul', compact('keseluruhanupahsimpan','marhun','cawangan_detail','tarikh_cetak','tebus_date','api_url'));
+    // }
+
     public function cetakLaporanRingkasanTerkumpul(Request $request){
         // dd($request);
         $api_url = config('api.url');
@@ -3278,21 +3311,31 @@ class KhazanahController extends Controller
         $current = Carbon::now();
         $current = new Carbon();
         $tarikh_cetak = $current->toDateString();
-        if($request->datetimepicker1 == null){
-            $tebus_date = $current->toDateString();
-        }else{
-            $split_date = explode('-',$request->datetimepicker1);
-            $tebus_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0];        
-        }
-        $marhun = Http::get(config('api.url'). '/api/gadai/laporan/ringkasan/'. $auth_user['cawangan'],['tarikh' => $tebus_date])->json();
-        $marhun = $marhun[0];
 
-        $keseluruhanupahsimpan = $marhun['lelongupahsimpan'] + $marhun['tebus'][0]['upahsimpan'] + $marhun['advansur'][0]['upahsimpan'];
+        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];        
+        }
+
+        $laporan_ringkasan = Http::get(config('api.url') . '/api/laporan/harian',[
+            'kodcaw' => $auth_user['cawangan'],
+            'mula' => $mula_date,
+            'akhir' => $hingga_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_ringkasanterkumpul', compact('keseluruhanupahsimpan','marhun','cawangan_detail','tarikh_cetak','tebus_date','api_url'));
+        return view('print.laporan_ringkasanterkumpulv2', compact('laporan_ringkasan','cawangan_detail','tarikh_cetak','hingga_date','api_url'));
     }
 
     public function laporanKawalanStok(){
@@ -4517,4 +4560,56 @@ class KhazanahController extends Controller
         return view('print.suratgadaianhilang', compact('polis','gadai','customers','cawangan_detail','api_url'));
     }
 
+    public function PemilihanAnsUpah()
+    {
+        $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.ansuranupah', compact('cawangan_info','api_url'));
+    }
+
+    public function LaporanUpah()
+    {
+        $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.upah', compact('cawangan_info','api_url'));
+    }
+
+    public function cetaklaporan_Upah(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];        
+        }
+
+        $advansur = Http::get(config('api.url'). '/api/AnsuranByRangeTarikh/' . $auth_user['cawangan'],['mula' => $mula_date,'akhir' => $hingga_date])->json();
+
+        $cawangan = Http::get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
+        $cawangan_detail=$cawangan[0];
+
+        return view('print.laporan_upah', compact('advansur','cawangan_detail','tarikh_cetak','mula_date','hingga_date','api_url'));
+    }
+
 }
diff --git a/public/js/main.js b/public/js/main.js
index d422400..8137f25 100644
--- a/public/js/main.js
+++ b/public/js/main.js
@@ -227,7 +227,7 @@ function kiraan(datakeyin)
             $('#totalsen5').val(formatter.format(amountkiraan.toFixed(2)));
             break;
         case 'sen10': 
-            amountkiraan += (valkey * 0.05);
+            amountkiraan += (valkey * 0.10);
             $('#totalsen10').val(formatter.format(amountkiraan.toFixed(2)));
         break;
         case 'sen20': 
@@ -335,7 +335,7 @@ function kiraanpanjar(datakeyin)
             $('#totalsen5').val(formatter.format(amountkiraan.toFixed(2)));
             break;
         case 'sen10': 
-            amountkiraan += (valkey * 0.05);
+            amountkiraan += (valkey * 0.10);
             $('#totalsen10').val(formatter.format(amountkiraan.toFixed(2)));
         break;
         case 'sen20': 
diff --git a/resources/views/khazanah/laporan/ansuran.blade.php b/resources/views/khazanah/laporan/ansuran.blade.php
index a2f478e..c96df2a 100644
--- a/resources/views/khazanah/laporan/ansuran.blade.php
+++ b/resources/views/khazanah/laporan/ansuran.blade.php
@@ -9,6 +9,7 @@
                     <ol class="breadcrumb pb-3">
                       <li class="breadcrumb-item"><a href="{{ route('home') }}">Home</a></li>
                       <li class="breadcrumb-item"><a href="{{ route('laporan') }}">Laporan</a></li>
+                      <li class="breadcrumb-item"><a href="{{ route('homepage.ansuranupah') }}">Ansuran & Upah</a></li>
                       <li class="breadcrumb-item active" aria-current="page">Ansuran</li>
                     </ol>
                   </nav>
diff --git a/resources/views/khazanah/laporan/ansuranupah.blade.php b/resources/views/khazanah/laporan/ansuranupah.blade.php
new file mode 100644
index 0000000..a50bc9b
--- /dev/null
+++ b/resources/views/khazanah/laporan/ansuranupah.blade.php
@@ -0,0 +1,112 @@
+@extends('layouts.app')
+
+@section('content')
+<div class="container">
+    <div class="row justify-content-center">
+        <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">Ansuran & Upah</li>
+                    </ol>
+                  </nav>
+
+                <div class="card-body text-center">
+                   
+                    <div class="row form-group justify-content-center">   
+                        <div class="col-3 mx-1">    
+                            <div class="row">    
+                                <a href="{{ route('laporan.ansuran') }}" class="btn btn-info btn-lg btn-block mb-3">Ansuran</a>
+                            </div>
+                        </div>
+                        <div class="col-3 mx-1">    
+                            <div class="row">    
+                                <a href="{{ route('laporan.upah') }}" class="btn btn-info btn-lg btn-block mb-3">Upah</a>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+<div class="modal" id="myModal">
+    <div class="modal-dialog">
+      <div class="modal-content">
+  
+        <!-- Modal Header -->
+        <div class="modal-header">
+          <h4 class="modal-title">Laporan GL</h4>
+          <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>
+      <center>
+     <table id="details">
+     <tr>
+     <td>    <a href="{{route('laporan.datalejer_am')}}" class="btn btn-primary  btn-lg btn-block mb-1">Lejer Am</a>   </td>
+     </tr>
+     
+     <tr>
+     <td>   <a href="{{route('laporan.datalejer_am')}}" class="btn btn-primary btn-lg btn-block mb-1 ">Data Lejer Am</a>  </td>
+     </tr>
+     
+     
+     
+     
+     
+     
+     
+     </table>
+  
+      </center>
+  
+  
+  
+  
+  
+  
+   
+        </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 959af9b..f7f3e5a 100644
--- a/resources/views/khazanah/laporan/index.blade.php
+++ b/resources/views/khazanah/laporan/index.blade.php
@@ -26,7 +26,7 @@
                                 <a href="{{ route('laporan.pelangganbaru') }}" class="btn btn-dark btn-lg btn-block  mb-3">Pelanggan Baru</a>
                             </div>
                             <div class="row">
-                                <a href="{{ route('ringkasanterkumpul.laporancetak') }}" class="btn btn-dark btn-lg btn-block mb-3">Ringkasan Terkumpul</a>
+                                <a href="{{ route('laporan.ringkasanterkumpul') }}" class="btn btn-dark btn-lg btn-block mb-3">Ringkasan Terkumpul</a>
                             </div>
                             <div class="row">
                                 <a href="{{route('laporan.agingbulanan')}}" class="btn btn-danger btn-lg btn-block mb-3">Aging Bulan</a>
@@ -70,7 +70,7 @@
                         </div>
                         <div class="col-3 mx-1">
                             <div class="row">
-                                <a href="{{ route('laporan.ansuran') }}" class="btn btn-dark btn-lg btn-block mb-3">Ansuran</a>
+                                <a href="{{ route('homepage.ansuranupah') }}" class="btn btn-dark btn-lg btn-block mb-3">Ansuran & Upah</a>
                             </div>
                             <div class="row">
                                 <a href="{{ route('laporan.stokaudit') }}" class="btn btn-dark btn-lg btn-block mb-3">Stok Audit</a>
diff --git a/resources/views/khazanah/laporan/ringkasanterkumpul.blade.php b/resources/views/khazanah/laporan/ringkasanterkumpul.blade.php
new file mode 100644
index 0000000..29e492d
--- /dev/null
+++ b/resources/views/khazanah/laporan/ringkasanterkumpul.blade.php
@@ -0,0 +1,70 @@
+@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 Terkumpul</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('ringkasanterkumpul.laporancetak') }}" target="_blank" method="get">
+                                @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>
+            </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
+    });
+
+    $(document).ready( function () {
+        $('#datemula').datepicker({
+            format: 'dd-mm-yyyy'
+        });
+
+        $('#datehingga').datepicker({
+            format: 'dd-mm-yyyy'
+        });
+    });
+
+</script>
+@endsection
+
diff --git a/resources/views/khazanah/laporan/upah.blade.php b/resources/views/khazanah/laporan/upah.blade.php
new file mode 100644
index 0000000..2600868
--- /dev/null
+++ b/resources/views/khazanah/laporan/upah.blade.php
@@ -0,0 +1,214 @@
+@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"><a href="{{ route('homepage.ansuranupah') }}">Ansuran & Upah</a></li>
+                      <li class="breadcrumb-item active" aria-current="page">Upah</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('upah.laporancetak') }}" 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>No Rujukan</th>
+                                        <th>Teller</th>
+                                        <th>Pinjaman</th>
+                                        <th>JBG</th>
+                                        <th>Upah Dibayar</th>
+                                    </tr>
+                                </thead>
+                                <tfoot class="thead-dark">
+                                    <th colspan="4">TOTAL</th>
+                                    <th id="pinjamantotal"></th>
+                                    <th></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 advansurtable = $('#myTable').DataTable({
+        "ordering": true
+    });
+    $(document).ready( function () {
+        $('#datemula').datepicker({
+            format: 'dd-mm-yyyy',
+            maxDate: 0
+        });
+        $('#datehingga').datepicker({
+            format: 'dd-mm-yyyy',
+            maxDate: 0
+        });
+
+        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/AnsuranByRangeTarikh/'+kodcaw,
+            data:{ 'mula' : today_date, 'akhir' : today_date },
+            success: function(advansur){
+                console.log(advansur);
+                advansurantable(advansur);
+            }
+        });
+    });
+
+    $('#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/AnsuranByRangeTarikh/' + kodcaw,
+            data:{ 'mula' : mula, 'akhir' : hingga },
+            success: function(advansur){
+                advansurantable(advansur);
+            }
+        });
+    });
+    
+    $('#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/AnsuranByRangeTarikh/' + kodcaw,
+            data:{ 'mula' : mula, 'akhir' : hingga },
+            success: function(advansur){
+                advansurantable(advansur);
+            }
+        });
+    });
+
+
+    const formatter = new Intl.NumberFormat('en-US', {
+        minimumFractionDigits: 2
+    });
+    
+    function advansurantable(data){
+        var counter = 1;
+        var total_bayaran = 0;
+        var total_pinjaman = 0;
+        advansurtable.clear().draw();
+        $.each(data,function(index,advansur){
+            total_bayaran += parseFloat(advansur['upahDibayar']);
+            total_pinjaman += parseFloat(advansur['pinjaman']);
+
+            advansurtable.row.add([
+                counter,
+                advansur['tarikh'],
+                advansur['norujukan'],
+                advansur['teller'],
+                formatter.format(advansur['pinjaman']),
+                advansur['jbg'],
+                formatter.format(advansur['upahDibayar'])
+            ]).draw();
+            counter = counter + 1;
+            $('#bayarantotal').text(formatter.format(total_bayaran.toFixed(2)));
+            $('#pinjamantotal').text(formatter.format(total_pinjaman.toFixed(2)));
+        });
+        
+    }
+</script>
+@endsection
+
diff --git a/resources/views/print/laporan_gadaian.blade.php b/resources/views/print/laporan_gadaian.blade.php
index c59f39d..94f43e7 100644
--- a/resources/views/print/laporan_gadaian.blade.php
+++ b/resources/views/print/laporan_gadaian.blade.php
@@ -214,9 +214,9 @@
     <th>Keuntungan</th>
     <th>Peratus (%)</th>
   </tr>
-  @php $counter = 1; $totalpinjaman = 0; @endphp
+  @php $counter = 1; $totalpinjaman = 0; $totalberat = 0; $totalnm = 0; $totalupah = 0;@endphp
   @foreach($gadai as $index=>$item)
-  @php $totalpinjaman += $item['pinjaman'] @endphp
+  @php $totalpinjaman += $item['pinjaman']; $totalberat += $item['berat']; $totalnm += $item['nilaimarhun']; $totalupah += $item['upah12']; @endphp
     @if($index > 0)
         @if($item['teller'] != $gadai[$index - 1]['teller'])
             <tr>
@@ -275,8 +275,25 @@
     @endif
   @endforeach
 </table>
+<br><br>
+<table id="details" style="border-top:1px solid black;border-bottom:1px solid black;text-align:center;">
+  <tr>
+    <th colspan="9"></th>
+    <th style="text-align:center;">Berat (g/m)</th>
+    <th style="text-align:center;">Nilai Marhun (RM)</th>
+    <th style="text-align:center;">Pembiayaan (RM)</th>
+    <th style="text-align:center;">Upah/Keuntungan (RM)</th>
+  </tr>
+  <tr>
+    <td colspan="9" style="text-align: center;"><b>JUMLAH KESELURUHAN</b></td>
+    <td>{{ number_format($totalberat,2) }}</td>
+    <td>{{ number_format($totalnm,2) }}</td>
+    <td>{{ number_format($totalpinjaman,2) }}</td>
+    <td>{{ number_format($totalupah,2) }}</td>
+  </tr>
+</table>
 
-<h5 style="float:right;">JUMLAH KESELURUHAN GADAIAN : RM {{ number_format($totalpinjaman,2) }}</h5>
+{{-- <h5 style="float:right;">JUMLAH KESELURUHAN GADAIAN : RM {{ number_format($totalpinjaman,2) }}</h5> --}}
 
 <br>
 <br>
@@ -298,22 +315,6 @@
 </table>
 
 
-<h4>Laporan Transaksi Gadaian</h4>
-<br>
-
-<table id="details">
-  <thead>
-    <th>Bil</th>
-    <th>Jenis</th>
-    <th>Penebusan(RM)</th>
-  </thead>
-  <tr>
-    <td> 0 </td>
-    <td>Rugi Lelong</td>
-    <td> 0.00 </td>
-  </tr>
-</table>
-
 
 
 
diff --git a/resources/views/print/laporan_penebusan.blade.php b/resources/views/print/laporan_penebusan.blade.php
index 442e8cb..cadd708 100644
--- a/resources/views/print/laporan_penebusan.blade.php
+++ b/resources/views/print/laporan_penebusan.blade.php
@@ -219,9 +219,9 @@
     <th width="6%;">Bayaran(RM)</th>
     <th width="6%;">Jumlah(RM)</th>
   </tr>
-  @php $counter = 1; $totalbayaran = 0;@endphp
+  @php $counter = 1; $totalbayaran = 0; $totalpinjaman = 0; $totalupah = 0;@endphp
   @foreach($tebus as $index=>$item)
-  @php $totalbayaran += ($item['jenistebus'] === 'S') ? ($item['pinjaman']+$item['bakiupah']) : $item['bakipjm']; @endphp
+  @php $totalbayaran += ($item['jenistebus'] === 'S') ? ($item['pinjaman']+$item['bakiupah']) : $item['bakipjm']; $totalpinjaman += $item['pinjaman']; $totalupah += $item['bakiupah'];@endphp
     @if($index > 0)
         @if($item['teller'] != $tebus[$index - 1]['teller'])
             <tr>
@@ -296,24 +296,19 @@
   @endforeach
 </table>
 
-<h5 style="float:right;">JUMLAH KESELURUHAN BAYARAN : RM {{ number_format($totalbayaran,2) }}</h5>
-
-<br>
-<br>
-<table id="sign">
+<br><br>
+<table id="details" style="border-top:1px solid black;border-bottom:1px solid black;text-align:center;">
   <tr>
-    <td></td>
-    <td colspan="2"> .................................................................. </td>
-    <td> </td>
-    <td colspan="2">.................................................................. </td>
-    <td> </td>
+    <th colspan="9"></th>
+    <th style="text-align:center;">Pembiayaan (RM)</th>
+    <th style="text-align:center;">Upah/Keuntungan (RM)</th>
+    <th style="text-align:center;">Jumlah (RM)</th>
   </tr>
   <tr>
-    <td></td>
-    <td colspan="2"><B> DI SEMAK</B> </td>
-    <td> </td>
-    <td colspan="2"><B>DI SAHKAN </B></td>
-    <td> </td>
+    <td colspan="9" style="text-align: center;"><b>JUMLAH KESELURUHAN</b></td>
+    <td>{{ number_format($totalpinjaman,2) }}</td>
+    <td>{{ number_format($totalupah,2) }}</td>
+    <td>{{ number_format($totalbayaran,2) }}</td>
   </tr>
 </table>
 
@@ -349,12 +344,26 @@
     <td>{{ number_format($upahlama['total'],2) }}</td>
     <td> Not Applicable </td>
   </tr>
+</table>
+
+{{-- <h5 style="float:right;">JUMLAH KESELURUHAN BAYARAN : RM {{ number_format($totalbayaran,2) }}</h5> --}}
+
+<br>
+<br>
+<table id="sign">
   <tr>
-    <td> 0 </td>
-    <td>Baki Lelong</td>
-    <td> 0.00 </td>
-    <td> Not Applicable </td>
-    <td> Not Applicable </td>
+    <td></td>
+    <td colspan="2"> .................................................................. </td>
+    <td> </td>
+    <td colspan="2">.................................................................. </td>
+    <td> </td>
+  </tr>
+  <tr>
+    <td></td>
+    <td colspan="2"><B> DI SEMAK</B> </td>
+    <td> </td>
+    <td colspan="2"><B>DI SAHKAN </B></td>
+    <td> </td>
   </tr>
 </table>
 
@@ -363,3 +372,5 @@
 
 
 
+
+
diff --git a/resources/views/print/laporan_ringkasanterkumpulv2.blade.php b/resources/views/print/laporan_ringkasanterkumpulv2.blade.php
new file mode 100644
index 0000000..4dda355
--- /dev/null
+++ b/resources/views/print/laporan_ringkasanterkumpulv2.blade.php
@@ -0,0 +1,188 @@
+<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;
+}
+.box{
+  border:1px solid black;
+  padding:3px;
+}
+</style>
+<link rel="stylesheet" href="{{ asset('vendor/bootstrap/css/bootstrap.min.css') }}">
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
+<script src="{{ asset('vendor/bootstrap/js/bootstrap.min.js') }}"></script>
+
+<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>{{ $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><br>
+<p style="font-weight: bold;margin-left: 10px;">Tarikh Mula: {{ $hingga_date }}  <span style="margin-left:20px;">Tarikh Hingga : {{ $tarikh_cetak }}</span> <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">
+      <div class="col-12">
+        <p><b>A) LAPORAN TERKUMPUL</b></p>
+      </div>
+      <div class="col-6">1. PEMBIAYAAN</div>
+      <div class="col-6"></div>
+      <div class="col-6">2. PENEBUSAN</div>
+      <div class="col-6"></div>
+      <div class="col-6">3. ANSURAN PEMBIAYAAN</div>
+      <div class="col-6"></div>
+      <div class="col-6">4. BAYARAN ONLINE</div>
+      <div class="col-6"> RM 0.00 </div>
+      <div class="col-6">5. KEUNTUNGAN</div>
+      <div class="col-6"></div>
+      <div class="col-6">6. KEUNTUNGAN ONLINE</div>
+      <div class="col-6"> RM 0.00 </div>
+    </div>
+  </div>
+  <div class="col-6 box">
+    <div class="row form-group">
+      <div class="col-12">
+        <p><b>B) BIL TRANSAKSI</b></p>
+      </div>
+      <div class="col-6">1. PEMBIAYAAN</div>
+      <div class="col-6"></div>
+      <div class="col-6">2. PENEBUSAN</div>
+      <div class="col-6"></div>
+      <div class="col-6">3. ANSURAN PEMBIAYAAN</div>
+      <div class="col-6"></div>
+      <div class="col-6">4. BAYARAN ONLINE</div>
+      <div class="col-6"></div>
+      <div class="col-6">5. PELANGGAN BARU</div>
+      <div class="col-6"></div>
+    </div>
+  </div>
+</div>
+
+<div class="row p-4">
+  <div class="col-6 box">
+    <div class="row form-group">
+      <div class="col-12">
+        <p><b>F) LELONG</b></p>
+      </div>
+      <div class="col-6">1. LELONG HARI INI</div>
+      <div class="col-6"></div>
+      <div class="col-6">2. BAKI</div>
+      <div class="col-6"></div>
+      <div class="col-6">3. RUGI</div>
+      <div class="col-6"></div>
+      <div class="col-6">4. CAJ LELONG</div>
+      <div class="col-6"></div>
+      <div class="col-6">5. BIL</div>
+      <div class="col-6"></div>
+    </div>
+  </div>
+  <div class="col-6 box">
+    <div class="row form-group">
+      <div class="col-12">
+        <p><b>G) BAYAR BAKI LELONG</b></p>
+      </div>
+      <div class="col-6">RM</div>
+      <div class="col-6"></div>
+    </div>
+  </div>
+</div>
+
+<div class="row p-4">
+  <div class="col-12 box">
+    <div class="row">
+      <div class="col-12">
+        <p><b>H) PERATUSAN PEMBIAYAAN</b></p>
+      </div>
+    </div>
+    <div class="row">
+      <div class="col-12">
+        <table class="table">
+          <thead>
+            <tr>
+              <th></th>
+              <th>MARGIN</th>
+              <th>70%</th>
+              <th>75%</th>
+              <th>80%</th>
+            </tr>
+          </thead>
+          <tbody>
+            <tr>
+              <td>1</td>
+              <td>PEMBIAYAAN</td>
+              <td></td>
+              <td></td>
+              <td></td>
+            </tr>
+            <tr>
+              <td>2</td>
+              <td>NILAI MARHUN</td>
+              <td></td>
+              <td></td>
+              <td></td>
+            </tr>
+            <tr>
+              <td>3</td>
+              <td>BILANGAN</td>
+              <td></td>
+              <td></td>
+              <td></td>
+            </tr>
+          </tbody>
+        </table>
+      </div>
+    </div>
+  </div>
+</div>
+<br><br>
+<div class="row p-4">
+  <div class="col-6 text-center">
+    <div class="row mb-5">
+      <div class="col-12">DISEMAK</div>
+    </div>
+    <div class="row">
+      <div class="col-12">................................................</div>
+    </div>
+  </div>
+  <div class="col-6 text-center">
+    <div class="row mb-5">
+      <div class="col-12">DISAHKAN</div>
+    </div>
+    <div class="row">
+      <div class="col-12">................................................</div>
+    </div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/resources/views/print/laporan_upah.blade.php b/resources/views/print/laporan_upah.blade.php
new file mode 100644
index 0000000..397a3e5
--- /dev/null
+++ b/resources/views/print/laporan_upah.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 UPAH</b></th>
+    <th> </th>
+    <th> </th>
+    <th></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>
+    <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>No Rujukan</th>
+    <th>Teller</th>
+    <th>Pinjaman</th>
+    <th>JBG</th>
+    <th>Upah Dibayar</th>
+  </tr>
+  @php $counter = 1; $totalbayaran = 0;@endphp
+  @foreach($advansur as $index=>$item)
+  @php $totalbayaran += $item['upahDibayar']; @endphp
+    <tr>
+      <td>{{ $counter }}</td>
+      <td>{{ $item['tarikh'] }}</td>
+      <td><b>{{ $item['norujukan'] }}</b></td>
+      <td>{{ $item['teller'] }}</td>
+      <td>{{ $item['pinjaman'] }}</td>
+      <td>{{$item['jbg']}}</td>
+      <td>{{$item['upahDibayar']}}</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/routes/web.php b/routes/web.php
index fbc9f25..e76aad2 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -133,7 +133,7 @@ Route::post('laporan/tebus/cetak',['as'=>'tebus.laporancetak','uses'=>'KhazanahC
 Route::get('/khazanah/pelanggan',['as'=>'khazanah.pelanggan','uses'=>'KhazanahController@index'])->middleware('auth','khazanah');
 Route::get('/khazanah/customer_info',['as'=>'khazanah.customer_info','uses'=>'KhazanahController@info'])->middleware('auth','khazanah');
 Route::get('/khazanah/searchpelanggan',['as'=>'khazanah.searchpelanggan','uses'=>'KhazanahController@search'])->middleware('auth','khazanah');
-Route::post('/khazanah/pendahuluanserahanHQ',['as'=>'khazanah.pendahuluanserahanHQ','uses'=>'KhazanahController@pendahuluanserahanHQ'])->middleware('auth','khazanah');
+Route::get('/khazanah/pendahuluanserahanHQ',['as'=>'khazanah.pendahuluanserahanHQ','uses'=>'KhazanahController@pendahuluanserahanHQ'])->middleware('auth','khazanah');
 Route::get('/penebusankhazanah/{norujukan}',['as'=>'penebusan.khazanah','uses' => 'PenebusanController@PenebusanKhazanah'])->middleware('auth','khazanah');
 
 Route::post('/kakitangan/harian',['as'=>'kakitangan.harian','uses'=>'KakitanganController@kakitanganHarian'])->middleware('auth','khazanah');
@@ -181,6 +181,9 @@ Route::put('/simpantuntutbaki',['as'=>'lelong.tuntutbaki','uses'=>'LelongControl
 //Laporan Baru
 Route::get('/laporan/lelongan',['as'=>'laporan.lelongan','uses'=>'KhazanahController@laporanLelongan'])->middleware('auth','khazanah');
 Route::post('laporan/lelongan/cetak',['as'=>'lelongan.laporancetak','uses'=>'KhazanahController@cetaklaporanLelongan'])->middleware('auth','khazanah');
+Route::get('/laporan/homepage/ansuranupah',['as'=>'homepage.ansuranupah','uses'=>'KhazanahController@PemilihanAnsUpah'])->middleware('auth','khazanah');
+Route::get('/laporan/upah',['as'=>'laporan.upah','uses'=>'KhazanahController@LaporanUpah'])->middleware('auth','khazanah');
+Route::post('laporan/upah/cetak',['as'=>'upah.laporancetak','uses'=>'KhazanahController@cetaklaporan_Upah'])->middleware('auth','khazanah');
 Route::get('/laporan/ansuran',['as'=>'laporan.ansuran','uses'=>'KhazanahController@laporanAnsuran'])->middleware('auth','khazanah');
 Route::post('laporan/ansuran/cetak',['as'=>'ansuran.laporancetak','uses'=>'KhazanahController@cetakLaporanAnsuran'])->middleware('auth','khazanah');
 Route::get('/laporan/pelangganbaru',['as'=>'laporan.pelangganbaru','uses'=>'KhazanahController@laporanPelangganBaru'])->middleware('auth','khazanah');
@@ -199,6 +202,7 @@ Route::get('/laporan/marhunterkumpul',['as'=>'laporan.marhunterkumpul','uses'=>'
 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/',['as'=>'laporan.ringkasanterkumpul','uses'=>'KhazanahController@laporanRingkasanTerkumpul'])->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');
 Route::post('/laporan/agingbulanan/cetak', ['as'=>'agingbulan.cetaklaporan', 'uses'=>'KhazanahController@cetaklaporang_Aging'])->middleware('auth','khazanah');