fix ringkasan terkumpul dan penambahan data filter dalam bajet

app/Http/Controllers/KhazanahController.php

@@ -2215,7 +2215,7 @@ class KhazanahController extends Controller
         $cawangan=Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
         $cawangan_detail=$cawangan[0];
 
-        return view('print.laporan_ringkasanterkumpulv2', compact('laporan_ringkasan','cawangan_detail','tarikh_cetak','mula_date','hingga_date','api_url'));
+        return view('print.laporan_ringkasanterkumpul', compact('laporan_ringkasan','cawangan_detail','tarikh_cetak','mula_date','hingga_date','api_url'));
     }
 
     public function laporanKawalanStok(){
@@ -2309,7 +2309,12 @@ class KhazanahController extends Controller
         $auth_user = Auth::user();
         $api_url = config('api.url');
         $cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
-        return view('khazanah.bajet',compact('cawangan_info','api_url'));
+        
+        $data_sebenar = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/admin/dashboard/aging',['kodcaw' => $auth_user['cawangan'], 'options' => 'sebenar'])->json();
+        $data_lelong = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/admin/dashboard/aging',['kodcaw' => $auth_user['cawangan'], 'options' => 'datalelong'])->json();
+        $data_filter = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/admin/dashboard/aging',['kodcaw' => $auth_user['cawangan'], 'options' => 'filter'])->json();
+        
+        return view('khazanah.bajet',compact('cawangan_info','api_url','data_sebenar','data_lelong','data_filter'));
     }
 
 

resources/views/khazanah/bajet.blade.php

@@ -22,7 +22,10 @@
                             <div class="card-header font-weight-bold">Pembiayaan</div>
                             <div class="card-body">
                                 <div class="progress mb-2">
-                                    <div id="pembprogress" class="progress-bar progress-bar-striped progress-bar-animated" role="progressbar" style="width: 0%;" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100">0%</div>
+                                    <div id="pembprogress"
+                                        class="progress-bar progress-bar-striped progress-bar-animated"
+                                        role="progressbar" style="width: 0%;" aria-valuenow="0" aria-valuemin="0"
+                                        aria-valuemax="100">0%</div>
                                 </div>
 
                                 <div class="d-flex justify-content-between col-12">
@@ -51,7 +54,10 @@
                             <div class="card-header font-weight-bold">Penebusan</div>
                             <div class="card-body">
                                 <div class="progress mb-2">
-                                    <div id="penbprogress" class="progress-bar progress-bar-striped progress-bar-animated" role="progressbar" style="width: 0%;" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100">0%</div>
+                                    <div id="penbprogress"
+                                        class="progress-bar progress-bar-striped progress-bar-animated"
+                                        role="progressbar" style="width: 0%;" aria-valuenow="0" aria-valuemin="0"
+                                        aria-valuemax="100">0%</div>
                                 </div>
 
                                 <div class="d-flex justify-content-between col-12">
@@ -80,7 +86,10 @@
                             <div class="card-header font-weight-bold">Keuntungan</div>
                             <div class="card-body">
                                 <div class="progress mb-2">
-                                    <div id="keunprogress" class="progress-bar progress-bar-striped progress-bar-animated" role="progressbar" style="width: 0%;" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100">0%</div>
+                                    <div id="keunprogress"
+                                        class="progress-bar progress-bar-striped progress-bar-animated"
+                                        role="progressbar" style="width: 0%;" aria-valuenow="0" aria-valuemin="0"
+                                        aria-valuemax="100">0%</div>
                                 </div>
 
                                 <div class="d-flex justify-content-between col-12">
@@ -188,6 +197,103 @@
 
                     </div>
 
+                    <div class="mt-3 row">
+                        <div class="card bg-light mb-3 col-4">
+                            <div class="card-header font-weight-bold">Data Sebenar</div>
+                            <div class="card-body">
+                                <table class="table">
+                                    <thead class="thead-dark">
+                                        <tr>
+                                            <th scope="col">Tempoh</th>
+                                            <th scope="col">Bil</th>
+                                            <th scope="col">RM</th>
+                                        </tr>
+                                    </thead>
+                                    <tbody>
+                                        @for($i=0;$i<13;$i++)
+                                        <tr>
+                                            <td>{{ ($i == 12) ? '12 >' : ($i + 1)  }} bulan</td>
+                                            <td>{{ number_format($data_sebenar['count'][$i]) }}</td>
+                                            <td>{{ number_format($data_sebenar['sum'][$i],2) }}</td>
+                                        </tr>
+                                        @endfor
+                                    </tbody>
+                                    <tfoot class="thead-light">
+                                        <tr>
+                                            <th scope="col">Keseluruhan</th>
+                                            <th scope="col">{{ number_format($data_sebenar['count'][13]) }}</th>
+                                            <th scope="col">{{ number_format($data_sebenar['sum'][13],2) }}</th>
+                                        </tr>
+                                    </tfoot>
+                                </table>
+
+                            </div>
+                        </div>
+                        <div class="card bg-light mb-3 col-4">
+                            <div class="card-header font-weight-bold">Data Lelong</div>
+                            <div class="card-body">
+                                <table class="table">
+                                    <table class="table">
+                                        <thead class="thead-dark">
+                                            <tr>
+                                                <th scope="col">Tempoh</th>
+                                                <th scope="col">Bil</th>
+                                                <th scope="col">RM</th>
+                                            </tr>
+                                        </thead>
+                                        <tbody>
+                                            @for($i=0;$i<13;$i++)
+                                            <tr>
+                                                <td>{{ ($i == 12) ? '12 >' : ($i + 1)  }} bulan</td>
+                                                <td>{{ number_format($data_lelong['count'][$i]) }}</td>
+                                                <td>{{ number_format($data_lelong['sum'][$i],2) }}</td>
+                                            </tr>
+                                            @endfor
+                                        </tbody>
+                                        <tfoot class="thead-light">
+                                            <tr>
+                                                <th scope="col">Keseluruhan</th>
+                                                <th scope="col">{{ number_format($data_lelong['count'][13]) }}</th>
+                                                <th scope="col">{{ number_format($data_lelong['sum'][13],2) }}</th>
+                                            </tr>
+                                        </tfoot>
+                                    </table>
+
+                            </div>
+                        </div>
+                        <div class="card bg-light mb-3 col-4">
+                            <div class="card-header font-weight-bold">Data Filter</div>
+                            <div class="card-body">
+                                <table class="table">
+                                    <thead class="thead-dark">
+                                        <tr>
+                                            <th scope="col">Tempoh</th>
+                                            <th scope="col">Bil</th>
+                                            <th scope="col">RM</th>
+                                        </tr>
+                                    </thead>
+                                    <tbody>
+                                        @for($i=0;$i<13;$i++)
+                                        <tr>
+                                            <td>{{ ($i == 12) ? '12 >' : ($i + 1)  }} bulan</td>
+                                            <td>{{ number_format($data_filter['count'][$i]) }}</td>
+                                            <td>{{ number_format($data_filter['sum'][$i],2) }}</td>
+                                        </tr>
+                                        @endfor
+                                    </tbody>
+                                    <tfoot class="thead-light">
+                                        <tr>
+                                            <th scope="col">Keseluruhan</th>
+                                            <th scope="col">{{ number_format($data_filter['count'][13]) }}</th>
+                                            <th scope="col">{{ number_format($data_filter['sum'][13],2) }}</th>
+                                        </tr>
+                                    </tfoot>
+                                </table>
+
+                            </div>
+                        </div>
+                    </div>
+
                     <div class="mt-3 d-flex justify-content-center">
 
                         <div class="card bg-light mb-3 col-10">
@@ -206,7 +312,6 @@
     </div>
 </div>
 <script>
-
     const d = new Date();
     let tahunsemasa = d.getFullYear();
     let pusherenv = "{{ env('PUSHER_APP_KEY') }}";
@@ -249,16 +354,14 @@
             },
             offsetY: -30,
             formatter: function (val, opt) {
-                let total = ((val - opt.w.globals.seriesGoals[0][opt.dataPointIndex][0]['value']) / opt.w.globals.seriesGoals[0][opt.dataPointIndex][0]['value']) * 100
+                let total = ((val - opt.w.globals.seriesGoals[0][opt.dataPointIndex][0]['value']) / opt.w
+                    .globals.seriesGoals[0][opt.dataPointIndex][0]['value']) * 100
 
-                if(isNaN(total))
+                if (isNaN(total)) {
-                {
                     return 0.00
                 } else {
-                    if(isFinite(total))
+                    if (isFinite(total)) {
-                    {
+                        if (total == -100) {
-                    if(total == -100)
-                    {
                             return 0.00
                         } else {
                             return total.toFixed(2)
@@ -328,16 +431,14 @@
                 borderColor: '#fff'
             },
             formatter: function (val, opt) {
-                    let total = ((val - opt.w.globals.seriesGoals[0][opt.dataPointIndex][0]['value']) / opt.w.globals.seriesGoals[0][opt.dataPointIndex][0]['value']) * 100
+                let total = ((val - opt.w.globals.seriesGoals[0][opt.dataPointIndex][0]['value']) / opt.w
+                    .globals.seriesGoals[0][opt.dataPointIndex][0]['value']) * 100
 
-                    if(isNaN(total))
+                if (isNaN(total)) {
-                    {
                     return 0.00
                 } else {
-                        if(isFinite(total))
+                    if (isFinite(total)) {
-                        {
+                        if (total == -100) {
-                            if(total == -100)
-                            {
                             return 0.00
                         } else {
                             return total.toFixed(2)
@@ -382,9 +483,15 @@
 
     var caw = "{{ $cawangan_info['kodcaw'] }}";
     //Declaration of Engine --> 0:idle 1:waiting 2:success
-    var pembbul = 0;penbbul = 0;keunbul = 0;
+    var pembbul = 0;
-    var pembtah = 0;penbtah = 0;keuntah = 0;
+    penbbul = 0;
-    var pembhar = 0;penbhar = 0;keunhar = 0;
+    keunbul = 0;
+    var pembtah = 0;
+    penbtah = 0;
+    keuntah = 0;
+    var pembhar = 0;
+    penbhar = 0;
+    keunhar = 0;
     var bilangan = 0;
 
 
@@ -397,10 +504,8 @@
     var channel = pusher.subscribe('gadai-notify');
     channel.bind('trigger-gadai', function (data) {
 
-        if(pembbul == 0 && pembtah == 0 && pembhar == 0 && bilangan == 0)
+        if (pembbul == 0 && pembtah == 0 && pembhar == 0 && bilangan == 0) {
-        {
+            if (data.cawangan === caw) {
-            if(data.cawangan === caw)
-            {
                 CallPembBulanan();
                 CallPembTahunan();
                 CallPembToday();
@@ -412,10 +517,8 @@
 
     var channel = pusher.subscribe('tebus-notify');
     channel.bind('trigger-tebus', function (data) {
-        if(penbbul == 0 && penbtah == 0 && penbhar == 0 && bilangan == 0)
+        if (penbbul == 0 && penbtah == 0 && penbhar == 0 && bilangan == 0) {
-        {
+            if (data.cawangan === caw) {
-            if(data.cawangan === caw)
-            {
                 CallPenbBulanan();
                 CallPenbTahunan();
                 CallPenbToday();
@@ -427,10 +530,8 @@
 
     var channel = pusher.subscribe('keuntungan-notify');
     channel.bind('trigger-keuntungan', function (data) {
-        if(keunbul == 0 && keuntah == 0 && keunhar == 0)
+        if (keunbul == 0 && keuntah == 0 && keunhar == 0) {
-        {
+            if (data.cawangan === caw) {
-            if(data.cawangan === caw)
-            {
                 CallKeunBulanan();
                 CallKeunTahunan();
                 CallKeunToday();
@@ -697,46 +798,47 @@
 
     });
 
-    function datapembiayaan(datapemb)
+    function datapembiayaan(datapemb) {
-    {
         let chartpemb = new ApexCharts(document.querySelector("#chartpembiayaan"), options);
         chartpemb.render();
         chartpemb.updateSeries([{
             data: datapemb
         }]);
 
-        pembbul = 0;pembtah = 0;pembhar = 0;
+        pembbul = 0;
+        pembtah = 0;
+        pembhar = 0;
     }
 
-    function datapenebusan(datapen)
+    function datapenebusan(datapen) {
-    {
         var chartpen = new ApexCharts(document.querySelector("#chartpenebusan"), options);
         chartpen.render();
         chartpen.updateSeries([{
             data: datapen
         }]);
 
-        penbbul = 0;penbtah = 0;penbhar = 0;
+        penbbul = 0;
+        penbtah = 0;
+        penbhar = 0;
     }
 
-    function datakeuntungan(datakeun)
+    function datakeuntungan(datakeun) {
-    {
         var charkeun = new ApexCharts(document.querySelector("#chartkeuntungan"), options);
         charkeun.render();
         charkeun.updateSeries([{
             data: datakeun
         }]);
 
-        keunbul = 0;keuntah = 0;keunhar = 0;
+        keunbul = 0;
+        keuntah = 0;
+        keunhar = 0;
     }
 
-    function bilanganbulanan(datagadai,datatebus)
+    function bilanganbulanan(datagadai, datatebus) {
-    {
         var charbil = new ApexCharts(document.querySelector("#chartbilangan"), optionsbilangan);
         charbil.render();
         charbil.updateSeries(
-            [ 
+            [{
-                {
                     name: 'Gadai',
                     data: datagadai
                 },
@@ -750,8 +852,6 @@
         bilangan = 0;
     }
 
-
-
 </script>
 
 @endsection

resources/views/khazanah/laporan/index.blade.php

@@ -27,7 +27,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('laporan.ringkasanterkumpul') }}" 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-dark btn-lg btn-block mb-3">Aging Bulan</a>

resources/views/print/laporan_ringkasanterkumpul.blade.php

@@ -1,3 +1,29 @@
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+
+  <!-- CSRF Token -->
+  <meta name="csrf-token" content="{{ csrf_token() }}">
+
+  <title>Pengeluaran Cetakan Pengurus Besar</title>
+
+  <link rel="icon" type="image/x-icon" href="{{ asset('img/icon_pkb.png') }}" />
+
+
+  <link href="{{ asset('css/all.min.css') }}" rel="stylesheet">
+  
+  <!-- Scripts -->
+  <script src="{{ asset('js/app.js') }}" defer></script>
+
+  <!-- Fonts -->
+  <link rel="dns-prefetch" href="//fonts.gstatic.com">
+  <link href="https://fonts.googleapis.com/css?family=Nunito" rel="stylesheet">
+
+  <!-- Styles -->
+  <link href="{{ asset('css/app.css') }}" rel="stylesheet">
+
+</head>
+
 <style>
   #header {
     font-family: Arial, Helvetica, sans-serif;
@@ -22,125 +48,15 @@
     padding:4px;
     color:black;
   }
-</style>
+  .box{
-
+    border:1px solid black;
-
+    padding:3px;
-
-
-<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>
-
+  {{-- <link href="{{ asset('css/bootstrap.min.css') }}" rel="stylesheet">
-
+  <script src="{{ asset('js/bootstrap.bundle.min.js') }}"></script>
-<style>
+   --}}
-#scan {
+  {{-- <table id="header">
-  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%;
-  /* border:1px solid black; */
-}
-
-#details td, #details th {
- 
-  padding: 8px;
-  font-size:11px;
-  /* border:1px solid black; */
-}
-
-#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;
-}
-</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>
@@ -157,161 +73,190 @@
       <td>{{ $cawangan_detail['alamat2'].' No Tel : '. $cawangan_detail['notel'].' No Faks : '. $cawangan_detail['nofaks'] }}</td>
       <td></td>
     </tr>
-</table>
+  </table> --}}
-<br>
   
-<table id="scan">
+  <h5 class="mb-4 pl-2 font-weight-bold">LAPORAN RINGKASAN TRANSAKSI TERKUMPUL - {{ $cawangan_detail['namacaw'] }}</h5>
+  
+  <p style="font-weight: bold;margin-left: 10px;">Tarikh Mula: {{ $mula_date }}  <span style="margin-left:20px;">Tarikh Hingga : {{ $hingga_date }}</span> <span style="margin-left:20px;">Tarikh Cetak : {{ $tarikh_cetak }}</span></p>
+  
+  <div class="row pl-4 pr-4 pb-4">
+    <div class="col-7 box">
+      <div class="row form-group">
+          <div class="col-12">
+            <p><b>A) TRANSAKSI TERKUMPUL</b></p>
+          </div>
+  
+          <div class="col-5">1. PEMBIAYAAN</div>
+          <div class="col-4">RM {{ number_format($laporan_ringkasan['total_gadai'],2) }}</div>
+          <div class="col-3 font-weight-bold">{{ $laporan_ringkasan['bilangan_gadai'] }}</div>
+         
+          <div class="col-12">2. PENYELESAIAN PEMBIAYAAN</div>
+  
+          <div class="col-5 pl-5">a. <span style="font-size:14px;">PEMBIAYAAN DIBAYAR</span></div>
+          <div class="col-4">{{ 'RM '. number_format($laporan_ringkasan['total_tebus'],2) }}</div>
+          <div class="col-3 font-weight-bold">{{ $laporan_ringkasan['bilangan_tebus'] + $laporan_ringkasan['bilangan_lelong'] }}</div>
+  
+          <div class="col-5 pl-5">b. <span style="font-size:14px;">KEUNTUNGAN DIBAYAR</span></div>
+          <div class="col-4">{{ 'RM '. number_format($laporan_ringkasan['upahsimpankaunter'],2) }}</div>
+          <div class="col-3 font-weight-bold"></div>
+  
+          <div class="col-12">3. ANSURAN PEMBIAYAAN</div>
+  
+          <div class="col-5 pl-5">a. <span style="font-size:14px;">PEMBIAYAAN DIBAYAR</span></div>
+          <div class="col-4">{{ 'RM '. number_format($laporan_ringkasan['total_ansuran'],2) }}</div>
+          <div class="col-3 font-weight-bold">{{ $laporan_ringkasan['bilangan_ansuran'] }}</div>
+  
+          <div class="col-5 pl-5">b. <span style="font-size:14px;">KEUNTUNGAN DIBAYAR</span></div>
+          <div class="col-4">{{ 'RM '. number_format($laporan_ringkasan['keuntungansebenarkaunter'],2) }}</div>
+          <div class="col-3 font-weight-bold"></div>
+  
+          <div class="col-12">4. BAYARAN ONLINE</div>
+  
+          <div class="col-5 pl-5">a. <span style="font-size:14px;">PEMBIAYAAN DIBAYAR</span></div>
+          <div class="col-4">{{ 'RM '. number_format($laporan_ringkasan['total_ansuranonline'],2) }}</div>
+          <div class="col-3 font-weight-bold">{{ $laporan_ringkasan['bilangan_ansuranonline'] }}</div>
+  
+          <div class="col-5 pl-5">b. <span style="font-size:14px;">KEUNTUNGAN DIBAYAR</span></div>
+          <div class="col-4">{{ 'RM '. number_format($laporan_ringkasan['total_keuntungan_online'],2) }}</div>
+          <div class="col-3 font-weight-bold"></div>
+  
+          <div class="col-5">5. PELANGGAN BARU</div>
+          <div class="col-4"></div>
+          <div class="col-3 font-weight-bold">{{ $laporan_ringkasan['bilangan_customer_baru'] }}</div>
+        
+      </div>
+    </div>
+    <div class="col-5 box">
+      <div class="row form-group">
+          <div class="col-12">
+            <p><b>B) PENDAHULUAN/SERAHAN HQ</b></p>
+          </div>
+  
+          <div class="col-6">1. PENDAHULUAN</div>
+          <div class="col-6">{{ 'RM '. number_format($laporan_ringkasan['totalpendahuluan'],2) }}</div>
+         
+          <div class="col-6">2. SERAHAN</div>
+          <div class="col-6">{{ 'RM '. number_format($laporan_ringkasan['totalserahan'],2) }}</div>
+         
+          <div class="col-6">3. SERAHAN ONLINE</div>
+          <div class="col-6">{{ 'RM '. number_format($laporan_ringkasan['serahanbayaranOnline'],2) }}</div>
+        
+      </div>
+    </div>
+  </div>
+  
+  <div class="row pl-4 pr-4 pb-4">
+    <div class="col-7 box">
+
+      <div class="row form-group">
+        <div class="col-6">
+          <p><b>C) LELONG</b></p>
+        </div>
+        <div class="col-6">
+          <p><b>D) BAYARAN LELONG</b></p>
+        </div>
+        <div class="col-4">1. LELONG HARI INI</div>
+        <div class="col-4">RM  {{ number_format($laporan_ringkasan['jumlah_lelong'],2) }}</div>
+        <div class="col-4"></div>
+        <div class="col-4">2. BAKI</div>
+        <div class="col-2">RM {{ number_format($laporan_ringkasan['baki_lelong'],2) }}</div>
+        <div class="col-3">{{ 'RM '. number_format($laporan_ringkasan['bayar_baki_lelong'],2) }}</div>
+        <div class="col-4">3. RUGI</div>
+        <div class="col-2">RM {{ number_format($laporan_ringkasan['rugi_lelong'],2) }}</div>
+        <div class="col-3">{{ 'RM '. number_format($laporan_ringkasan['bayar_rugi_lelong'],2) }}</div>
+        <div class="col-4">4. CAJ LELONG</div>
+        <div class="col-4">RM {{ number_format($laporan_ringkasan['cas_lelong'],2) }}</div>
+        <div class="col-3"></div>
+        <div class="col-4">5. BIL</div>
+        <div class="col-4">{{ $laporan_ringkasan['bilangan_lelong'] }}</div>
+        <div class="col-4"></div>
+      </div>
+
+    </div>
+    <div class="col-5 box">
+      <div class="row form-group">
+        <div class="col-12">
+          <p><b>E) PERBELANJAAN</b></p>
+        </div>
+        <div class="col-6">1. BELANJA AM</div>
+        <div class="col-6">{{ 'RM '. number_format($laporan_ringkasan['belanjaam'],2) }}</div>
+        <div class="col-6">2. BAIKI DAN SELENGGARA</div>
+        <div class="col-6">{{ 'RM '. number_format($laporan_ringkasan['baikidanselenggara'],2) }}</div>
+        <div class="col-6">3. KERAIAN & PROMOSI</div>
+        <div class="col-6">{{ 'RM '. number_format($laporan_ringkasan['keraian'],2) }}</div>
+        <div class="col-6 font-weight-bold">4. JUMLAH</div>
+        <div class="col-6 font-weight-bold">@php $total = $laporan_ringkasan['belanjaam'] + $laporan_ringkasan['baikidanselenggara'] + $laporan_ringkasan['keraian']; echo 'RM '. number_format($total,2); @endphp</div>
+      </div>
+    </div>
+  </div>
+      
+  <div class="row pl-4 pr-4 pb-4">
+    <div class="col-12 box">
+      <div class="row">
+        <div class="col-12">
+          <p><b>F) PERATUSAN PEMBIAYAAN</b></p>
+        </div>
+      </div>
+      <div class="row">
+        <div class="col-12">
+          <table class="table">
+            <thead>
               <tr>
-    <th colspan ="5"><b>LAPORAN RINGKASAN TERKUMPUL</b></th>
-    <th> </th>
-    <th> </th>
-    <th><b> Tarikh Cetak:</b>
-        @php 
-          $myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_cetak);
-          $formattedweddingdate = $myDateTime->format('d-m-Y');
-          echo($formattedweddingdate)
-        @endphp
-    </th>
                 <th></th>
+                <th>MARGIN</th>
+                <th>70%</th>
+                <th>75%</th>
+                <th>80%</th>
+                <th>JUMLAH</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr>
+                <td>1</td>
+                <td>PEMBIAYAAN</td>
+                <td>RM {{ number_format($laporan_ringkasan['gadai_70'],2) }}</td>
+                <td>RM {{ number_format($laporan_ringkasan['gadai_75'],2) }}</td>
+                <td>RM {{ number_format($laporan_ringkasan['gadai_80'],2) }}</td>
+                <td>RM {{ number_format($laporan_ringkasan['total_gadaian'],2) }}</td>
               </tr>
               <tr>
-    <td style="width:10px"> <b>TARIKH</b></td>
+                <td>2</td>
-    <td>@php 
+                <td>NILAI MARHUN</td>
-          $myDateTime = DateTime::createFromFormat('Y-m-d', $tebus_date);
+                <td>RM {{ number_format($laporan_ringkasan['nilaimarhun_70'],2) }}</td>
-          $formattedweddingdate = $myDateTime->format('d-m-Y');
+                <td>RM {{ number_format($laporan_ringkasan['nilaimarhun_75'],2) }}</td>
-          echo($formattedweddingdate)
+                <td>RM {{ number_format($laporan_ringkasan['nilaimarhun_80'],2) }}</td>
-        @endphp</td>
+                <td>RM {{ number_format($laporan_ringkasan['total_nm'],2) }}</td>
-    <td style="width:50px">   
-    </td>
-    <td> </td>
-    <td> </td>
-    <td> </td>
-    <td> </td>
-    <td> </td>
-    <td> </td>
               </tr>
+              <tr>
+                <td>3</td>
+                <td>BILANGAN</td>
+                <td>{{ $laporan_ringkasan['bilangan_70'] }}</td>
+                <td>{{ $laporan_ringkasan['bilangan_75'] }}</td>
+                <td>{{ $laporan_ringkasan['bilangan_80'] }}</td>
+                <td>{{ number_format($laporan_ringkasan['total_bilangan']) }}</td>
+              </tr>
+            </tbody>
           </table>
+        </div>
+      </div>
+    </div>
+  </div>
   
-<br>
+  <div class="row p-4">
-<table id="details">
+    <div class="col-6 text-center">
-  <tr>
+      <div class="row mb-5">
-    <th colspan='3' width="65%">JUMLAH</th>
+        <div class="col-12">DISEMAK</div>
-   
+      </div>
-    <th  colspan="2" width="35%" style="text-align: center;">JUMLAH PENDAPATAN</th>
+      <div class="row">
-  </tr>
+        <div class="col-12">................................................</div>
-    <tr>
+      </div>
-      <td width="20%"><b>GADAI</b></td>
+    </div>
-      <td>BIL <br>
+    <div class="col-6 text-center">
-        N. MARHUN <br>
+      <div class="row mb-5">
-        PEMBIAYAAN
+        <div class="col-12">DISAHKAN</div>
-       
+      </div>
-      </td>
+      <div class="row">
-      <td width="20%"><span>{{ $marhun['gadai'][0]['bilangan'] }}</span><br>
+        <div class="col-12">................................................</div>
-        <span>{{ number_format($marhun['gadai'][0]['jumlahmarhun'],2) }}</span><br>
+      </div>
-        <span>{{ number_format($marhun['gadai'][0]['jumlahpinjaman'],2) }}</span><br>
+    </div>
-      </td>
+  </div>
-      <td></td>
-    </tr>
-    <tr>
-      <td><b>PENEBUSAN</b></td>
-      <td>BIL <br>
-      N. MARHUN <br>
-      PEMBIAYAAN <br>
-      KEUNTUNGAN
-    </td>
-    <td ><span>{{ $marhun['tebus'][0]['bilangan'] }}</span><br>
-      <span>{{ number_format($marhun['tebus'][0]['jumlahmarhun'],2) }}</span><br>
-      <span>{{ number_format($marhun['tebus'][0]['jumlahpinjaman'],2) }}</span><br>
-      <span id="tebusupahsimpan">{{ number_format($marhun['tebus'][0]['upahsimpan'],2) }}</span>
-    </td>
-    <td>KEUNTUNGAN <br>
-        CAJ LELONG <br>
-    </td>
-    <td><span id="totalupahsimpan">{{ number_format($keseluruhanupahsimpan,2) }}</span> <br>
-      <span id="totalcajlelong">{{ number_format($marhun['cajlelong'],2) }}</span> <br>
-  </td>
-      
-    </tr>
-    <tr>
-      <td><b>ANSURAN</b></td>
-      <td>BIL<br>
-        N. MARHUN <br>
-        PEMBIAYAAN <br>
-        KEUNTUNGAN
-      </td>
-      <td><span>{{ $marhun['advansur'][0]['bilangan'] }}</span><br>
-        <span>{{ number_format($marhun['advansur'][0]['jumlahmarhun'],2) }}</span><br>
-        <span>{{ number_format($marhun['advansur'][0]['jumlahpinjaman'],2) }}</span><br>
-        <span id="tebusupahsimpan">{{ number_format($marhun['advansur'][0]['upahsimpan'],2) }}</span>
-      </td>
-      <td></td>
-     
-    </tr>
-    <tr>
-      <td><b>LELONGAN</b></td>
-      <td>BIL <br>
-        N. MARHUN <br>
-        PEMBIAYAAN <br>
-        KEUNTUNGAN <br>
-        CAJ LELONG <br>
-        LEBIHAN LELONG <br>
-        RUGI LELONG <br><br>
-        TERIMA RUGI LELONG <br><br>
-        BAYAR LEBIHAN LELONG 
-      </td>
-      <td>
-        
-        <span>{{ $marhun['lelong'][0]['bilangan'] }}</span><br>
-        <span>{{ number_format($marhun['lelong'][0]['jumlahmarhun'],2) }}</span><br>
-        <span>{{ number_format($marhun['lelong'][0]['jumlahpinjaman'],2) }}</span><br>
-        <span id="lelongupahsimpan">{{ number_format($marhun['lelongupahsimpan'],2) }}</span><br>
-        <span>{{ number_format($marhun['cajlelong'],2) }}</span><br>
-        <span>{{ number_format($marhun['lelongbaki'],2) }}</span><br>
-        <span>{{ number_format($marhun['lelongrugi'],2) }}</span><br><br>
-        <span>{{ number_format($marhun['terimarugilelong'],2) }}</span><br><br>
-        <span>{{ number_format($marhun['bayarlebihanlelong'],2) }}</span>
-      
-      </td>
-      <td> 
-        <table id="sign">
-          <tr>
-            <td></td>
-            <td colspan="2"> .................................................................. <br>
-              <p style="margin-bottom:50px;">DI SEMAK</p> 
-              .................................................................. <br>
-              <p>DI SAHKAN</p> 
-            
-            </td>
-            <td> </td>
-            <td colspan="2"></td>
-            <td> </td>
-          </tr>
-        </table>
-
-
-      </td>
-    </tr>
-    <tr>
-      <td><b>HAPUS KIRA</b></td>
-      <td>BIL  <br>
-        N. MARHUN <br>
-      PEMBIAYAAN 
-    </td>
-      <td>  <span>{{ $marhun['hapuskira'][0]['bilangan'] }}</span><br>
-        <span>{{ number_format($marhun['hapuskira'][0]['jumlahmarhun'],2) }}</span><br>
-        <span>{{ number_format($marhun['hapuskira'][0]['jumlahpinjaman'],2) }}</span><br>
-        
-      </td>
-      <td></td>
-    </tr>
-</table>
-<br>
-<br>
-
-
-
-
-
-
-
-