Enable datepicker, new route for laporan aliran tunai teller

resources/views/aliran_tunai/index.blade.php

@@ -558,15 +558,12 @@
 
     function cetaklaporanalirantunai()
     {
-        let teller = "{{ Auth::user()->name }}";
-
-        let urlroute = '{{ route("laporan.alirantunai", ":id") }}';
-        urlroute = urlroute.replace(':id', teller);
-
-        window.open(urlroute, '_blank');
-
+    let urlroute = '{{ route("laporan.alirantunai") }}';
+    
+    window.location.href = urlroute;
     }
 
+
     function cetakserahankeseluruhan()
     {
         let urlroute = '{{ route("laporan.serahanteller") }}';

resources/views/aliran_tunai/laporan/laporanalirantunai.blade.php

@@ -174,7 +174,7 @@
   </tr>
   <tr>
     <td style="width:10px"> <b>TARIKH</b></td>
-    <td>{{ $alirantunai['tarikh'] }}</td>
+    <td><b>{{ $tunai['tarikh'] }}</b></td>
     <td style="width:50px">   
     </td>
     <td> </td>
@@ -194,76 +194,64 @@
   <tr>
     <td>Baki Awal</td>
     <td>:</td>
-    <td>RM {{ number_format($alirantunai['bakiawal'],2) }}</td>
+    <td>RM {{ number_format($tunai['bakiawal'],2) }}</td>
   </tr>
 
   <tr>
     <th>TAMBAH</th>
   </tr>
   <tr>
-    <td>Pendahuluan Kepada Teller</td>
+    <td>Pendahuluan</td>
     <td>:</td>
-    <td>RM {{ number_format($alirantunai['tambah'],2) }}</td>
+    <td>RM {{ number_format($tunai['tambah'],2) }}</td>
   </tr>
   <tr>
     <td>Pen. Pembiayaan / Keuntungan</td>
     <td>:</td>
-    <td>RM {{ number_format($alirantunai['masuk'],2) }}</td>
+    <td>RM {{ number_format($tunai['masuk'],2) }}</td>
   </tr>
   <tr>
     <td>Kerugian Baki Lelong</td>
     <td>:</td>
-    {{-- <td>RM {{ number_format($petibesi['totpanjar'],2) }}</td> --}}
+    <td>RM {{ number_format($bakiLelong['rugi_lelong'],2) }}</td>
   </tr>
   <tr>
     <td>Jumlah</td>
     <td>:</td>
-    {{-- <td>RM {{ number_format($petibesi['totpanjar'],2) }}</td> --}}
+    <td>RM {{ number_format($jumlahTambah,2) }}</td>
   </tr>
 
   <tr>
     <th>TOLAK</th>
   </tr>
   <tr>
-    <td>Serahan Daripada Teller</td>
+    <td>Serahan</td>
     <td>:</td>
-    {{-- <td>RM {{ number_format($petibesi['masuk'],2) }}</td> --}}
+    <td>RM {{ number_format($tunai['kurang'],2) }}</td>
   </tr>
   <tr>
     <td>Pembiayaan</td>
     <td>:</td>
-    <td>RM {{ number_format($alirantunai['keluar'],2) }}</td>
+    <td>RM {{ number_format($tunai['keluar'],2) }}</td>
   </tr>
   <tr>
     <td>Baki Lelong</td>
     <td>:</td>
-    {{-- <td>RM {{ number_format($petibesi['pendahuluan'],2) }}</td> --}}
+    <td>RM {{ number_format($bakiLelong['baki_lelong'],2) }}</td>
   </tr>
   <tr>
     <td>Jumlah</td>
     <td>:</td>
-    {{-- <td>RM {{ number_format($petibesi['pendahuluan'],2) }}</td> --}}
+    <td>RM {{ number_format($jumlahTolak,2) }}</td>
   </tr>
 
   <tr>
     <th>BAKI AKHIR</th>
   </tr>
-  <tr>
-    <td>Baki Akhir</td>
-    <td>:</td>
-    {{-- <td>RM {{ number_format($petibesi['bakiakhir'],2) }}</td> --}}
-  </tr>
   <tr>
     <td>Baki Akhir Teller</td>
     <td>:</td>
-    <td>RM 0.00</td>
-  </tr>
-
-
-  <tr>
-    <th>Baki Dibawa Kedepan </th>
-    <th>:</th>
-    {{-- <th>RM {{ number_format($petibesi['bakieod'],2) }}</th> --}}
+    <td>RM {{ number_format($tunai['bakiawal'] +$jumlahTambah + $jumlahTolak,2) }}</td>
   </tr>
 
 </table>

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

@@ -0,0 +1,63 @@
+@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 active" aria-current="page">Aliran Tunai</li>
+                    </ol>
+                  </nav>
+
+                @if(session()->has('errormessage'))
+                  <div class="alert alert-danger">
+                      {{ session()->get('errormessage') }}
+                  </div>
+                @endif
+
+                <div class="card-body text-center">
+                    <div class="row form-group">
+                        <div class="col-md-2">
+                        </div>
+                        <div class="col-md-10">
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col-md-5">
+                            <form action="{{ route('alirantunai.laporancetak') }}" method="post">
+                                @csrf
+                                <div class="input-group mb-3">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text" id="basic-addon1">Tarikh</span>
+                                    </div>
+                                    <input type="text" class="form-control" placeholder="Pilih Tarikh" aria-label="Tarikh" id="datetimepicker1" name="datetimepicker1" 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'] ?>";
+
+    $(document).ready( function () {
+        $('#datetimepicker1').datepicker({
+            format: 'dd-mm-yyyy'
+        });
+    });
+
+    var tablecustomers = $('#myTable').DataTable({
+        "ordering": false
+    });
+
+</script>
+@endsection
+