From ec7c29250add117693e2660834b17cc09c3ce7ad Mon Sep 17 00:00:00 2001
From: hafifierahman <muhdhafifie97@gmail.com>
Date: Fri, 12 Nov 2021 01:16:54 +0800
Subject: [PATCH] buat laporan

---
 .../views/homepage/khazanah/home.blade.php    |   2 -
 .../khazanah/laporan/agingbulanan.blade.php   |  45 ++------
 .../khazanah/laporan/audittrail.blade.php     |  65 ++---------
 .../views/khazanah/laporan/index.blade.php    | 102 ++++--------------
 .../khazanah/laporan/pelangganbaru.blade.php  |  12 +--
 .../print/laporan_pelangganbaru.blade.php     |  24 +----
 6 files changed, 41 insertions(+), 209 deletions(-)

diff --git a/resources/views/homepage/khazanah/home.blade.php b/resources/views/homepage/khazanah/home.blade.php
index fdfe7ac..a0eef2e 100644
--- a/resources/views/homepage/khazanah/home.blade.php
+++ b/resources/views/homepage/khazanah/home.blade.php
@@ -557,8 +557,6 @@
               confirmButtonText: 'Simpan'
             }).then((result) => {
 
-              console.log(result);
-              return false;
               if (result.isConfirmed) {
 
                 saveData();
diff --git a/resources/views/khazanah/laporan/agingbulanan.blade.php b/resources/views/khazanah/laporan/agingbulanan.blade.php
index 227dddd..1d5bc1f 100644
--- a/resources/views/khazanah/laporan/agingbulanan.blade.php
+++ b/resources/views/khazanah/laporan/agingbulanan.blade.php
@@ -5,20 +5,16 @@
     <div class="row">
         <div class="col-md-12">
             <div class="card">
-                <div class="card-header">{{ __('Laporan Aging Bulanan') }}</div>
-
-                <div class="card-body text-center">
-                    <div class="row form-group">
-                        <div class="col-md-2">
-                            <a href="{{ route('laporan') }}" class="ion-backspace" style="font-size:50px;color:blue;"></a>
-                        </div>
-                        <div class="col-md-10">
-                            <h3>Laporan Aging Bulanan </h3>
-                        </div>
-                    </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">Aging Bulanan</li>
+                    </ol>
+                  </nav>
                     
-                    <div class="row">
+                    <div class="row ml-5">
                         <div class="col-md-5">
                             <form action="{{ route('agingbulan.cetaklaporan') }}" target="_blank" method="post">
                                 @csrf
@@ -48,28 +44,7 @@
                             </form>
                         </div>
                     </div>
-                    <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 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>
diff --git a/resources/views/khazanah/laporan/audittrail.blade.php b/resources/views/khazanah/laporan/audittrail.blade.php
index 37a1c4e..b4436d5 100644
--- a/resources/views/khazanah/laporan/audittrail.blade.php
+++ b/resources/views/khazanah/laporan/audittrail.blade.php
@@ -1,63 +1,4 @@
 @extends('layouts.app')
-<style>
-
-.radiostyle .radio-green {
-            background-color: #27ae60;
-            color:white;
-            box-shadow: 5px 10px #888888;
-            width:200px;
-            margin-right:5px;
-            transition: 0.5s ease;
-        }
-
-        .radiostyle .radio-red {
-            background-color: #e74c3c;
-            color:white;
-            width:200px;
-            margin-right:5px;
-            box-shadow: 5px 10px #888888;
-            transition: 0.5s ease;
-        }
-
-        .radiostyle .radio-yellow {
-            background-color: #3498db;
-            color:white;
-            width:200px;
-            margin-right:5px;
-            box-shadow: 5px 10px #888888;
-            transition: 0.5s ease;
-        }
-
-        .radiostyle .radio-green:hover {
-            box-shadow: 5px 5px #888888;
-            
-            
-        }
-
-        .radiostyle .radio-red:hover {
-            box-shadow: 5px 5px #888888;
-            
-        }
-
-        .radiostyle .radio-yellow:hover {
-            box-shadow: 5px 5px #888888;
-            
-        }
-
-        .radiostyle .radio-green input[type="radio"]:checked{
-            box-shadow: 5px 10px #888888;
-        }
-
-        .radiostyle .radio-yellow input[type="radio"]:checked{
-            box-shadow: 5px 10px #888888;
-        }
-
-        .radiostyle .radio-red input[type="radio"]:checked{
-            box-shadow: 5px 10px #888888;
-        }
-
-
-</style>
 
 @section('content')
 <div class="container">
@@ -80,6 +21,12 @@
                         </div>
                     </div>
 
+                    @if(session()->has('errormessage'))
+                  <div class="alert alert-danger">
+                      {{ session()->get('errormessage') }}
+                  </div>
+                @endif
+
                     <div class="container">
                         <div class="row">
                             <div class="col-md-5 mx-auto">
diff --git a/resources/views/khazanah/laporan/index.blade.php b/resources/views/khazanah/laporan/index.blade.php
index bfef71c..9430ce4 100644
--- a/resources/views/khazanah/laporan/index.blade.php
+++ b/resources/views/khazanah/laporan/index.blade.php
@@ -15,7 +15,7 @@
                 <div class="card-body text-center">
                    
                     <div class="row form-group justify-content-center">   
-                        <div class="col-3 mx-1">    
+                        <div class="col-3 mx-1" >    
                             <div class="row">    
                                 <a href="{{ route('laporan.gadaian') }}" class="btn btn-dark btn-lg btn-block mb-3">Gadaian</a>
                             </div>
@@ -29,7 +29,7 @@
                                 <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>
+                                <a href="{{route('laporan.agingbulanan')}}" class="btn btn-dark btn-lg btn-block mb-3">Aging Bulan</a>
                             </div>
                             <div class="row">
                                 <a href="{{ route('laporan.pendserahan') }}" class="btn btn-dark btn-lg btn-block mb-3">Laporan HQ</a>
@@ -41,6 +41,12 @@
                                 {{-- <a href="{{ route('laporan.stokauditdetails')}}" class="btn btn-danger btn-lg btn-block mb-3">Stok Audit Details</a> --}}
                                 <a href="{{ route('laporan.hargaemas') }}" class="btn btn-dark btn-lg btn-block mb-3">Harga Emas</a>
                             </div> 
+                            <div class="row">
+                                <a href="{{route('laporan.tuntutbaki')}}" class="btn btn-dark btn-lg btn-block mb-3">Senarai Wakil</a>
+                            </div>
+                            <div class="row">
+                                <a href="{{ route('laporan.perbelanjaan') }}" class="btn btn-dark btn-lg btn-block mb-3">Hapus S/P HQ</a>
+                            </div>
                         </div>
                         <div class="col-3 mx-1">
                             <div class="row">
@@ -55,9 +61,6 @@
                             <div class="row">
                                 <a href="{{ route('laporan.marhunharian') }}" class="btn btn-dark btn-lg btn-block mb-3">Marhun Harian</a>
                             </div>
-                            <div class="row">
-                                <a href="" class="btn btn-danger btn-lg btn-block mb-3">Aging Pinjaman</a>
-                            </div>
                             <div class="row">
                                 <a href="{{ route('laporan.senaraipetibesi') }}" class="btn btn-dark btn-lg btn-block mb-3">Senarai Peti Besi</a>
                             </div>
@@ -67,7 +70,12 @@
                             <div class="row">
                                 <a href="{{ route('laporan.denominasi') }}" class="btn btn-dark btn-lg btn-block mb-3">Denominasi</a>
                             </div>
-                          
+                            <div class="row">
+                                <a href="{{ route('laporan.perbelanjaan') }}" class="btn btn-dark btn-lg btn-block mb-3">Hapus Ansuran</a>
+                            </div>
+                            <div class="row">
+                                <a href="{{ route('laporan.perbelanjaan') }}" class="btn btn-dark btn-lg btn-block mb-3">Rebet</a>
+                            </div>
                         </div>
                         <div class="col-3 mx-1">
                             <div class="row">
@@ -94,6 +102,12 @@
                             <div class="row">
                                 <a href="{{ route('laporan.perbelanjaan') }}" class="btn btn-dark btn-lg btn-block mb-3">Perbelanjaan</a>
                             </div>
+                            <div class="row">
+                                <a href="{{ route('laporan.perbelanjaan') }}" class="btn btn-dark btn-lg btn-block mb-3">Transaksi Komoditi</a>
+                            </div>
+                            <div class="row">
+                                <a href="{{ route('laporan.perbelanjaan') }}" class="btn btn-dark btn-lg btn-block mb-3">SAG Hilang</a>
+                            </div>
                         </div>
                     </div>
                 </div>
@@ -102,80 +116,4 @@
     </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/pelangganbaru.blade.php b/resources/views/khazanah/laporan/pelangganbaru.blade.php
index dd3c930..1f58559 100644
--- a/resources/views/khazanah/laporan/pelangganbaru.blade.php
+++ b/resources/views/khazanah/laporan/pelangganbaru.blade.php
@@ -41,21 +41,13 @@
                                 <thead class="thead-dark">
                                     <tr>
                                         <th>Bil</th>
-                                        <th>No Pelanggan</th>
                                         <th>No K/P</th>
                                         <th>Nama</th>
-                                        <th>Yuran Ahli</th>
                                     </tr>
                                 </thead>
                             </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>
@@ -107,10 +99,8 @@
         $.each(data,function(index,customers){
             tablecustomers.row.add([
                 counter,
-                customers['nopelanggan'],
                 customers['kpbaru'],
-                customers['nama'],
-                customers['yuranahli']
+                customers['nama']
             ]).draw();
      
         });
diff --git a/resources/views/print/laporan_pelangganbaru.blade.php b/resources/views/print/laporan_pelangganbaru.blade.php
index c6e8ccd..7bb29aa 100644
--- a/resources/views/print/laporan_pelangganbaru.blade.php
+++ b/resources/views/print/laporan_pelangganbaru.blade.php
@@ -166,9 +166,8 @@
 
 <table id="scan">
   <tr>
-    <th colspan ="5"><b>SENARAI PELANGGAN BARU</b></th>
-    <th> </th>
-    <th> </th>
+    <th colspan ="2"><b>SENARAI PELANGGAN BARU</b></th>
+
     <th><b> Tarikh Cetak:</b>
         @php 
           $myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_cetak);
@@ -185,12 +184,6 @@
           $formattedweddingdate = $myDateTime->format('d-m-Y');
           echo($formattedweddingdate)
         @endphp</td>
-    <td style="width:50px">   
-    </td>
-    <td> </td>
-    <td> </td>
-    <td> </td>
-    <td> </td>
     <td> </td>
     <td> </td>
   </tr>
@@ -200,30 +193,21 @@
 <table id="details">
   <tr>
     <th>Bil</th>
-    <th>No Pelanggan</th>
     <th>No KP</th>
     <th>Nama</th>
-    <th>Yuran Ahli</th>
   </tr>
-  @php $counter = 1;$totalyuran = 0; @endphp
+  @php $counter = 1; @endphp
 
   @foreach($senaraipelanggan as $index=>$item)
     <tr>
       <td>{{ $counter }}</td>
-      <td>{{$item['nopelanggan']}}</td>
       <td>{{$item['kpbaru']}}</td>
       <td>{{$item['nama']}}</td>
-      <td>{{$item['yuranahli']}}</td>
 
     </tr>
-    @php $counter++; $totalyuran += $item['yuranahli'];@endphp
+    @php $counter++;@endphp
      
   @endforeach
-  <tfoot>
-    <tr>
-      <td colspan="3"><b>JUMLAH KESELURUHAN : RM {{ number_format($totalyuran,2) }}</td>
-    </tr>
-  </tfoot>
 </table>
 
 <br>