Merged in feature/aiman/laporan-aliran-tunai-teller-v2 (pull request #327)

Feature/aiman/laporan aliran tunai teller v2

Approved-by: Muhd hafifie

app/Http/Controllers/AliranTunaiController.php

@@ -2,12 +2,14 @@
 
 namespace App\Http\Controllers;
 
+use App\User;
+use App\Cawangan;
+use Carbon\Carbon;
 use Illuminate\Http\Request;
 use App\Services\CustomerService;
-use Illuminate\Support\Facades\Session;
-use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\Auth;
-use Carbon\Carbon;
+use Illuminate\Support\Facades\Http;
+use Illuminate\Support\Facades\Session;
 
 
 class AliranTunaiController extends Controller
@@ -599,7 +601,7 @@ class AliranTunaiController extends Controller
         return response($updateTunai);
     }
 
-    public function LaporanAliranTunai($teller)
+    public function LaporanAliranTunai($teller, Request $request)
     {
         $auth_user = Auth::user();
         $api_url = config('api.url');
@@ -611,8 +613,6 @@ class AliranTunaiController 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];
 
-        $tarikh_cetak = $current->toDateString();
-
         $cawangan=Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
 
         $alirantunai = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/GetCurrentTunai/' . $auth_user['cawangan'],['kodlaluan' => $auth_user['name']])->json();
@@ -621,7 +621,67 @@ class AliranTunaiController extends Controller
 
         $teller = $auth_user['name'];
 
-        return view('aliran_tunai.laporan.laporanalirantunai',compact('tarikh_cetak','cawangan_info','cawangan','api_url','cawangan_detail','addtunai','alirantunai','teller'));
+        $bakiLelong = Http::withOptions(['verify' =>config('app.api_verify')])->get(config('api.url') . '/api/lelong/bakilelongbyteller/'.$auth_user['cawangan'],[
+            'tarikh' => $request->datetimepicker1
+        ])->json();
+        
+        return view('aliran_tunai.laporan.laporanalirantunai',compact('tarikh_cetak','cawangan_info','cawangan','api_url','cawangan_detail','addtunai','alirantunai','teller', 'bakiLelong'));
+    }
+
+    public function laporanAliranTunaiTeller()
+    {
+        $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.laporan.alirantunai', compact('api_url', 'cawangan_info'));
+    }
+
+    public function cetakLaporanAliranTunaiTeller(Request $request)
+    {
+        $api_url = config('api_url');
+        $auth_user = Auth::user();
+
+        $current = Carbon::now();
+        $current = new Carbon();
+
+        $tarikh_cetak = $current->toDateString();
+        if($request->datetimepicker1 == null){
+            $tarikh = $current->toDateString();
+        }else{
+            $split_date = explode('-',$request->datetimepicker1);
+            $tarikh = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0];
+        }
+
+        $cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
+        $cawangan=Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
+        $cawangan_detail=$cawangan[0];
+
+        $addtunai = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/getAddTunai/' . $auth_user['cawangan'] . '/kodlaluan/',['kodlaluan' => $auth_user['name']])->json();
+
+        $teller = $auth_user['name'];
+
+        $bakiLelong = Http::withOptions(['verify' =>config('app.api_verify')])->get(config('api.url') . '/api/lelong/bakilelongbyteller/'.$auth_user['cawangan'],[
+            'tarikh' => $tarikh,
+            'kodlaluan' => $auth_user['name']
+        ])->json();
+
+        $tunai = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/getTunaiByTarikh/',[
+            'kodlaluan' => $auth_user['name'],
+            'kodcaw' => $auth_user['cawangan'],
+            'tarikh' => $tarikh
+            ])->json();
+
+            if(!$tunai)
+        {
+            return redirect()->back()->with('errormessage', 'Tiada data pada tarikh tersebut.');
+        }
+
+        $jumlahTambah = $tunai['tambah'] + $tunai['masuk'] + $bakiLelong['rugi_lelong'];
+        $jumlahTolak = $tunai['kurang'] + $tunai['keluar'] + $bakiLelong['baki_lelong'];
+
+        return view('aliran_tunai.laporan.laporanalirantunai',compact('tarikh_cetak','cawangan_info','cawangan','api_url','cawangan_detail','addtunai','tunai','teller', 'bakiLelong', 'jumlahTambah', 'jumlahTolak'));
     }
 
     public function LaporanTunaiTeller(Request $request){

resources/views/aliran_tunai/index.blade.php

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

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

@@ -1,122 +1,146 @@
-<html>
+<style>
-<head>
+#header {
-    <style>
-        .header{
-            font-size:12px;
-            font-weight: bold;
-            margin-left:40px;
-
-        }
-
-        body {
-            background: white; 
-        }
-
-        page {
-            background: white;
-            display: block;
-            margin: 0 auto;
-            margin-bottom: 0.5cm;
-            /* box-shadow: 0 0 0.5cm rgba(0,0,0,0.5); */
-        }
-
-        page[size="A4"] {  
-            width: 21cm;
-            /* height: 29.7cm;  */
-        }
-
-        page[size="A4"][layout="landscape"] {
-            width: 29.7cm;
-            height: 21cm;  
-        }
-
-        @media print {
-            body, page {
-                margin: 0;
-                box-shadow: 0;
-            }
-            
-        }
-
-        .middleheader{
-            text-align: center;  
-        }
-
-        .container{
-            font-family: Arial, Helvetica, sans-serif;
-            width: 25%;
-            border: 2px solid gray;
-            border-radius: 15px;
-            padding: 5px 10px 10px 30px;
-            margin: 0 auto;
-        }
-
-        #header {
   font-family: Arial, Helvetica, sans-serif;
   border-collapse: collapse;
   width: 100%;
-            margin-left:40px;
+}
-        }
+
+#header td, #customers th {
  
-        #header td, #customer th {
   padding:4px;
   font-size:10px;
-        }
+}
 
-        #header tr:nth-child(even){
+#header tr:nth-child(even){background-color: #ffffff;}
-            background-color: #ffffff;
-        }
 
-        /* #header tr:hover {
+#header tr:hover {background-color: #ddd;}
-            background-color: #ddd;
-        } */
 
-        #header th {
+#header th {
   padding-top: 12px;
   padding-bottom: 12px;
   text-align: left;
   padding:4px;
   color:black;
-        }
+}
+</style>
 
-        .statements{
+
+
+
+<style>
+#scan {
   font-family: Arial, Helvetica, sans-serif;
   border-collapse: collapse;
-            width: 95%;
-            margin: 0 auto;
-        }
-        .statements th{
-            font-size:14px;
-            background-color: #f9ca24;
-            border:1px solid gray;
-            color:black;
-            padding:4px 10px 4px 10px;
-        }
-
-        .statements td{
-            border:1px solid gray;
-            padding:4px 4px 4px 4px;
-
-        }
-
-        .center{
-            position: fixed;
-            left: 0;
-            bottom: 0;
   width: 100%;
-            color: white;
+}
+
+#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: 50%;
+}
+
+#details td, #details th {
+ 
+  padding: 8px;
+  font-size:11px;
+}
+
+#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;}
 
-    </style>
+#sign tr:hover {background-color: #ddd;}
-</head>
+
-<body onload="window.print()">
+#sign th {
-<page size="A4">
+  padding-top: 12px;
-    <h6 class="header">SULIT DAN PERSENDIRIAN</h6>
+  padding-bottom: 12px;
-    <table id="header">
+  text-align: left;
+  padding:4px;
+  color:black;
+}
+</style>
+
+
+<table id="header">
   <tr>
-        <th rowspan="4"  style="width:50px"><br><img src="{{ asset('img/icon_pkb.png') }}" style="width:70px"></img></th>
+    <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>
@@ -131,81 +155,144 @@
     <td>{{ $cawangan_detail['alamat2'].' No Tel : '. $cawangan_detail['notel'].' No Faks : '. $cawangan_detail['nofaks'] }}</td>
     <td></td>
   </tr>
-    </table>
+</table>
+<br>
 
-
+<table id="scan">
-    <h6 class="middleheader">PENYATA ALIRAN TUNAI : {{ $teller }}</h6>
-
-    <div class="row" style="display: flex; justify-content: start;">
-        <div class="container" style="flex: 1; margin-left: 20px;">
-            <h3>Baki Awal</h3>
-            <span>RM {{ number_format($alirantunai['bakiawal'], 2) }}</span>
-        </div>
-    
-        <div class="container" style="flex: 1; margin-left: 10px;">
-            <h3>Pendahuluan</h3>
-            <span>RM {{ number_format($alirantunai['tambah'], 2) }}</span>
-        </div>
-    
-        <div class="container" style="flex: 1; margin-left: 10px;">
-            <h3>Penyelesaian Pem.</h3>
-            <span>RM {{ number_format($alirantunai['masuk'], 2) }}</span>
-        </div>
-    </div>
-
-    <div class="row" style="display: flex; justify-content: start; margin-top: 20px;">
-        <div class="container" style="flex: 1; margin-left: 20px;">
-            <h3>Baki Tunai Semasa</h3>
-            <span>RM {{ number_format($alirantunai['baki'], 2) }}</span>
-        </div>
-    
-        <div class="container" style="flex: 1; margin-left: 10px;">
-            <h3>Serahan</h3>
-            <span>RM {{ number_format($alirantunai['kurang'], 2) }}</span>
-        </div>
-    
-        <div class="container" style="flex: 1; margin-left: 10px;">
-            <h3>Pembiayaan</h3>
-            <span>RM {{ number_format($alirantunai['keluar'], 2) }}</span>
-        </div>
-    </div>
-    
-
-    <h6 class="middleheader" style="margin-bottom:-5px;">KEMASUKAN TUNAI</h6>
-    <br>
-
-    <table class="statements">
   <tr>
-            <th>TARIKH</th>
+     <th colspan="3" style="
-            <th>DEBIT (RM)</th>
+      text-align: left;
-            <th>KREDIT (RM)</th>
+      font-size: 16px;
-            <th>NOTA</th>
+      font-weight: bold;
+      text-transform: uppercase;
+      padding-top: 10px;
+      padding-bottom: 10px;
+      letter-spacing: 0.5px;
+    ">
+      LAPORAN ALIRAN TUNAI TELLER
+    </th>
   </tr>
-    @php $totaltambah = 0; $totalkurang = 0; @endphp
+  
-    @foreach($addtunai as $index=>$ad)
+   <tr>
-        @php $totaltambah += $ad['tambah']; $totalkurang += $ad['kurang']; @endphp
+    <td style="width:100px"><b>TARIKH:</b></td>
-        <tr style="text-align:center;">
+    <td><b>
-            <td>{{ $ad['tarikh'] }}</td>  
+      @php 
-            <td>{{ number_format($ad['tambah'],2) }}</td>
+        $tarikhTeller = DateTime::createFromFormat('Y-m-d', $tunai['tarikh']);
-            <td>{{ number_format($ad['kurang'],2) }}</td>
+        echo $tarikhTeller->format('d-m-Y');
-            <td>{{ $ad['nota'] }}</td> 
+      @endphp
+    </b></td>
   </tr>
-    @endforeach
+
-        <tr style="text-align:center;">
+  <tr>
-            <td style="font-weight:bold;">JUMLAH</td>
+    <td><b>TARIKH CETAK:</b></td>
-            <td>{{ number_format($totaltambah,2) }}</td>
+    <td><b>
-            <td>{{ number_format($totalkurang,2) }}</td>
+      @php 
+        $myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_cetak);
+        $formattedweddingdate = $myDateTime->format('d-m-Y');
+        echo $formattedweddingdate;
+      @endphp
+    </b></td>
+  </tr>
+</table>
+
+<br>
+<table id="details">
+  <tr>
+    <th>BAKI AWAL</th>
+  </tr>
+  <tr>
+    <td>Baki Awal</td>
+    <td>:</td>
+    <td>RM {{ number_format($tunai['bakiawal'],2) }}</td>
+  </tr>
+
+  <tr>
+    <th>TAMBAH</th>
+  </tr>
+  <tr>
+    <td>Pendahuluan</td>
+    <td>:</td>
+    <td>RM {{ number_format($tunai['tambah'],2) }}</td>
+  </tr>
+  <tr>
+    <td>Pen. Pembiayaan / Keuntungan</td>
+    <td>:</td>
+    <td>RM {{ number_format($tunai['masuk'],2) }}</td>
+  </tr>
+  <tr>
+    <td>Kerugian Baki Lelong</td>
+    <td>:</td>
+    <td>RM {{ number_format($bakiLelong['rugi_lelong'],2) }}</td>
+  </tr>
+  <tr>
+    <td>Jumlah</td>
+    <td>:</td>
+    <td>RM {{ number_format($jumlahTambah,2) }}</td>
+  </tr>
+
+  <tr>
+    <th>TOLAK</th>
+  </tr>
+  <tr>
+    <td>Serahan</td>
+    <td>:</td>
+    <td>RM {{ number_format($tunai['kurang'],2) }}</td>
+  </tr>
+  <tr>
+    <td>Pembiayaan</td>
+    <td>:</td>
+    <td>RM {{ number_format($tunai['keluar'],2) }}</td>
+  </tr>
+  <tr>
+    <td>Baki Lelong</td>
+    <td>:</td>
+    <td>RM {{ number_format($bakiLelong['baki_lelong'],2) }}</td>
+  </tr>
+  <tr>
+    <td>Jumlah</td>
+    <td>:</td>
+    <td>RM {{ number_format($jumlahTolak,2) }}</td>
+  </tr>
+
+  <tr><th>BAKI AKHIR</th></tr>
+  <tr>
+    <td colspan="3" style="
+        border: 2px solid black;
+        text-align: center;
+        background-color: #f8f8f8;
+        font-weight: bold;
+        font-size: 13px;
+        padding: 10px;
+    ">
+      BAKI AKHIR TELLER: RM {{ number_format($tunai['bakiawal'] + $jumlahTambah - $jumlahTolak,2) }}
+    </td>
+  </tr>
+
+</table>
+
+<br>
+<br>
+<br>
+<br>
+<table id="sign">
+  <tr>
     <td></td>
+    <td colspan="2"> .................................................................. </td>
+    <td> </td>
+    <td colspan="2">.................................................................. </td>
+    <td> </td>
   </tr>
-    </table>
+  <tr>
-
+    <td></td>
-</page>
+    <td colspan="2"><B> DI SEMAK</B> </td>
-
+    <td> </td>
-<script>
+    <td colspan="2"><B>DI SAHKAN </B></td>
+    <td> </td>
+  </tr>
+</table>
+
+
 
 
 
-</script>
 
-</body>
-</html>

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
+

routes/web.php

@@ -112,6 +112,10 @@ Route::get('/firstwakil',['as'=>'wakil.first','uses'=>'PenebusanController@getfi
 Route::get('/history',['as'=>'gadai.history','uses'=>'GadaianController@history'])->middleware('auth','teller');
 Route::get('/history/khazanah',['as'=>'gadai.history.khazanah','uses'=>'GadaianController@history'])->middleware('auth','khazanah');
 
+//Laporan Aliran Tunai Teller
+Route::get('/laporan/alirantunai', ['as' => 'laporan.alirantunai', 'uses'=> 'AliranTunaiController@laporanAliranTunaiTeller'])->middleware('auth','teller');
+Route::post('laporan/alirantunai/cetak', ['as' => 'alirantunai.laporancetak', 'uses' => 'AliranTunaiController@cetakLaporanAliranTunaiTeller'])->middleware('auth', 'teller');
+
 //Kemaskini Upah
 Route::get('/kemaskiniupah',['as'=>'kemaskini.upah','uses'=>'AliranTunaiController@kemaskiniupah'])->middleware('auth','teller');