Merge branch 'fixkaunter' of https://gitlab.com/online-sistem1/kaunter into fixkaunter

app/Console/Commands/BackupStokAudit.php

@@ -0,0 +1,55 @@
+<?php
+
+namespace App\Console\Commands;
+
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Http;
+
+class BackupStokAudit extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'backup:stokaudit  {--all : all zone} {--1 : update zone 1} {--2 : update zone 2} {--3 : update zone3}';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Backup Stok Audit every month';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle()
+    {
+        if($this->option('all')){
+            $zone = 'all';
+        }else if($this->option('1')){
+            $zone = '1';
+        }else if ($this->option('2')){
+            $zone = '2';
+        }else if ($this->option('3')){
+            $zone = '3';
+        }
+        $updategadai = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/backup/stok/audit',[
+            'zone' => $zone
+        ])->json();
+        $this->info('sucess');
+    }
+}

app/Http/Controllers/KhazanahController.php

@@ -1604,7 +1604,7 @@ class KhazanahController extends Controller
             }
 
             // $lelong = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/senaraibatch/laporan/'. $auth_user['cawangan'],['batchno' => $request->batchno])->json();
-            
+
             $cawangan=Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
             $cawangan_detail=$cawangan[0];
 
@@ -1825,6 +1825,17 @@ class KhazanahController extends Controller
         return view('khazanah.laporan.stokaudit',compact('cawangan_info','api_url'));
     }
 
+    public function laporanStokAuditBackdate(){
+        $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();
+        $stokaudit = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/gadai/cawangan/'. $auth_user['cawangan'])->json();
+
+        return view('khazanah.laporan.stokauditbackdate',compact('cawangan_info','api_url'));
+    }
+
     public function cetakLaporanStokAudit(Request $request){
 
         $api_url = config('api.url');
@@ -1855,6 +1866,55 @@ class KhazanahController extends Controller
         // dd($gadai);
     }
 
+    public function cetakLaporanStokAuditBackdate(Request $request){
+
+        $api_url = config('api.url');
+        $auth_user = Auth::user();
+        $current = Carbon::now();
+        $current = new Carbon();
+        $tarikh_cetak = $current->toDateString();
+
+        $split_date = explode('-',$request->datetimepicker1);
+        $bulan = $split_date[0];
+        $tahun = $split_date[1];
+
+        if($bulan == 1){
+            $namabulan = 'Januari';
+        }elseif($bulan == 2){
+            $namabulan = 'Februari';
+        }elseif($bulan == 3){
+            $namabulan = 'Mac';
+        }elseif($bulan == 4){
+            $namabulan = 'April';
+        }elseif($bulan == 5){
+            $namabulan = 'Mei';
+        }elseif($bulan == 6){
+            $namabulan = 'Jun';
+        }elseif($bulan == 7){
+            $namabulan = 'Julai';
+        }elseif($bulan == 8){
+            $namabulan = 'Ogos';
+        }elseif($bulan == 9){
+            $namabulan = 'September';
+        }elseif($bulan == 10){
+            $namabulan = 'Oktober';
+        }elseif($bulan == 11){
+            $namabulan = 'November';
+        }elseif($bulan == 12){
+            $namabulan = 'Disember';
+        }
+
+        $tebus_date = $namabulan . ' ' . $tahun;
+
+        $cawangan=Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
+        $cawangan_detail=$cawangan[0];
+
+        $stokaudit = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/stokaudit/backdate',['kodcaw' => $auth_user['cawangan'],'tahun'=>$tahun,'bulan'=>$bulan])->json();
+
+        return view('print.laporan_stokauditbackdate', compact('stokaudit','cawangan_detail','tarikh_cetak','tebus_date','api_url'));
+
+    }
+
     public function laporanBatalSuratGadai(){
         $auth_user = Auth::user();
         $api_url = config('api.url');
@@ -3565,7 +3625,7 @@ class KhazanahController extends Controller
             'outstanding' => $request->outstanding,
             'namapemohon' => $auth_user['name']
         ])->json();
-        
+
         if($permohonan == true)
         {
             return redirect()->back()->with('message', 'Permohonan Berjaya Disimpan!');

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

@@ -13,10 +13,10 @@
                   </nav>
 
                 <div class="card-body text-center">
-                   
+
-                    <div class="row form-group justify-content-center">   
+                    <div class="row form-group justify-content-center">
-                        <div class="col-3 mx-1" >    
+                        <div class="col-3 mx-1" >
-                            <div class="row">    
+                            <div class="row">
                                 <a href="{{ route('laporan.gadaian') }}" class="btn btn-dark btn-lg btn-block mb-3">Gadaian</a>
                             </div>
                             <div class="row d-none">
@@ -40,10 +40,13 @@
                             </div>
                              <div class="row">
                                 <a href="{{ route('laporan.hargaemas') }}" class="btn btn-dark btn-lg btn-block mb-3">Harga Emas</a>
-                            </div> 
+                            </div>
                             <div class="row">
                                 <a href="{{route('laporan.wakil')}}" class="btn btn-dark btn-lg btn-block mb-3">Senarai Wakil</a>
                             </div>
+                            <div class="row">
+                                <a href="{{route('laporan.stokauditbackdate')}}" class="btn btn-dark btn-lg btn-block mb-3">Stok Audit Backdate</a>
+                            </div>
                         </div>
                         <div class="col-3 mx-1">
                             <div class="row">

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

@@ -0,0 +1,123 @@
+@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">
+    <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">Stok Audit Backdate</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="container">
+                        <div class="row">
+                            <div class="col-md-5 mx-auto">
+                                <form action="{{ route('stokauditbackdate.laporancetak') }}" target="_blank" method="get">
+                                    @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" required class="form-control" autocomplete="off" 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>
+
+                            </div>
+                        </div>
+                    </form>
+                    </div>
+
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<script type="text/javascript">
+
+    var tablecustomers = $('#myTable').DataTable({
+        "ordering": false
+    });
+
+    $(document).ready( function () {
+        $('#datetimepicker1').datepicker({
+            format: 'mm-yyyy',
+            startView: "months",
+            minViewMode: "months",
+            startDate: '01/05/2022'
+        });
+    });
+
+</script>
+@endsection
+

resources/views/khazanah/permohonanwang.blade.php

@@ -2,7 +2,7 @@
 @section('content')
 @include('modal.permohonanwang')
 @include('modal.CITModal')
-@include('modal.denominasimodalpendahuluanserahan')
+@include('modal.denominasipermohonan')
 
 <div class="container">
     <div class="row justify-content-center">
@@ -201,7 +201,7 @@
         let amaun = $(this).data("amaun");
 
         Swal.fire({
-            title: 'Adakah Wang sudah diterima?',
+            title: 'Adakah wang sudah diterima?',
             showDenyButton: true,
             showCancelButton: false,
             confirmButtonText: 'Terima',
@@ -211,28 +211,131 @@
             /* Read more about isConfirmed, isDenied below */
             if (result.isConfirmed) {
 
-                $('#denominasiHQModal').modal('show');
+                $('#denominasiPermohonan').modal('show');
                 $('#amaundiminta').val(amaun);
+                $('#mohonidpermohonan').val(mid);
 
-                return;
-                $.ajax({
-                        method:"put",
-                        url: api_url + '/admin/permohonan/tagterima',
-                        data: {
-                            "mohonid" : mid,
-                            "namapenerima" : nama
-                        },
-                        success:function(data)
-                        {
-                            if(data === 1)
-                                Swal.fire('Diterima!', '', 'success')
-                        }
-                    });
             } else if (result.isDenied) {
                 // Swal.fire('Belum Diterima!', '', 'info')
             }
         });
     });
 
+    function terimapermohonanwang()
+    {
+        $("#terima_transaksi").prop('disabled', true);
+
+        let amaun = $('#amaundiminta').val();
+        let kiraan = $('#amaunkiraan').val();
+        let keterangan = 'Pendahuluan Wang Daripada HQ';
+        let jenis = 'pendahuluan';
+        let dtacct = '1000/010';
+        let ktacct = '7000/102';
+        let kodcaw = "{{ Auth::user()->cawangan }}";
+        let teller = "{{ Auth::user()->name }}";
+        let mid = $('#mohonidpermohonan').val();
+
+        //denominasi bundle
+        let bundle1 = $('#bundle1').val();let bundle5 = $('#bundle5').val();let bundle10 = $('#bundle10').val();
+        let bundle20 = $('#bundle20').val();let bundle50 = $('#bundle50').val();let bundle100 = $('#bundle100').val();
+
+        //denominasi keping
+        let sen1 = $('#sen1').val();let sen5 = $('#sen5').val();let sen10 = $('#sen10').val();let sen20 = $('#sen20').val();let sen50 = $('#sen50').val();
+        let ringgit1 = $('#ringgit1').val();let ringgit5 = $('#ringgit5').val();let ringgit10 = $('#ringgit10').val();let ringgit20 = $('#ringgit20').val();let ringgit50 = $('#ringgit50').val();
+        let ringgit100 = $('#ringgit100').val();
+
+        if(Number(amaun) !== Number(kiraan))
+        {
+            Swal.fire({
+                icon: 'error',
+                title: 'Sila Periksa Amaun dan Kiraan.'
+            });
+
+            return false;
+        }
+
+        Swal.fire({
+            title: 'Memuatkan...',
+            allowEscapeKey : false,
+            allowOutsideClick: false,
+            didOpen: function () {
+                Swal.showLoading();
+                $('#denominasiPermohonan').modal('hide');
+            }
+        });
+
+        $.ajax({
+            method: 'post',
+            url: '{{ route("khazanah.pendahuluanserahanHQ") }}',
+            data: {
+                "_token": "{{ csrf_token() }}",
+                'amaun' : amaun,
+                'jenisgldetail' : jenis,
+                'keterangan' : keterangan,
+                'kodcaw' : kodcaw,
+                'teller' : teller,
+                'dtacct' : dtacct,
+                'ktacct' : ktacct,
+                'ambilansen1' : sen1,
+                'ambilansen5' : sen5,
+                'ambilansen10' : sen10,
+                'ambilansen20' : sen20,
+                'ambilansen50' : sen50,
+                'ambilanring1' : ringgit1,
+                'ambilanring5' : ringgit5,
+                'ambilanring10' : ringgit10,
+                'ambilanring20' : ringgit20,
+                'ambilanring50' : ringgit50,
+                'ambilanring100' : ringgit100
+            },
+            success:function(data){
+                if(data == 'LULUS'){
+
+                    Swal.fire({
+                        icon: 'success',
+                        title: 'Transaksi Berjaya Diterima',
+                        allowEscapeKey : false,
+                        allowOutsideClick: false
+                    }).then(function(){
+
+                        $('#denominasiPermohonan').modal('hide');
+                        
+                        $.ajax({
+                        method:"put",
+                        url: api_url + '/admin/permohonan/tagterima',
+                        data: {
+                            "mohonid" : mid,
+                            "namapenerima" : teller
+                        },
+                        success:function(data)
+                        {
+                            if(data === 1)
+                            {
+                                location.reload();
+                            }
+                        }
+                        });
+                        
+                    });
+
+                }else if(data == 'GAGAL'){
+                    Swal.fire({
+                        icon: 'error',
+                        title: 'Transaksi Gagal',
+                        allowEscapeKey : false,
+                        allowOutsideClick: false
+                    }).then(function(){
+
+                        $('#denominasiPermohonan').modal('hide');
+                        // $("#terima_transaksi").prop('disabled', false);
+                        
+                    });
+                }
+            },error: function(jqXHR, textStatus, errorThrown) {
+                console.log(textStatus, errorThrown);
+            }
+        });
+    }
+
 </script>
 @endsection

resources/views/modal/denominasipermohonan.blade.php

@@ -132,11 +132,12 @@
           <input type="hidden" id="jenisjenis"/>
           <input type="hidden" id="kodcawangan"/>
           <input type="hidden" id="tellerla"/>
+          <input type="hidden" id="mohonidpermohonan"/>
 
         </div>
         <div class="modal-footer">
             <button type="button" class="btn btn-danger btn-lg" onclick="funcbatal()">Batal</button>
-            <button type="button" class="btn btn-success btn-lg" onclick="terimapost()">Terima</button>
+            <button type="button" class="btn btn-success btn-lg" onclick="terimapermohonanwang()">Terima</button>
         </div>
       </div>
     </div>

resources/views/print/laporan_stokaudit.blade.php

@@ -263,10 +263,3 @@
     <td> </td>
   </tr>
 </table>
-
-
-
-
-
-
-138001.80

resources/views/print/laporan_stokauditbackdate.blade.php

@@ -0,0 +1,259 @@
+<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: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;}
+
+#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>
+  </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>
+
+<table id="scan">
+  <tr>
+    <th colspan ="5"><b>Laporan Stok Audit</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>
+  </tr>
+  <tr>
+    <td style="width:10px"> <b>TARIKH</b></td>
+    <td>{{ $tebus_date }}</td>
+    <td style="width:50px">
+    </td>
+    <td> </td>
+    <td> </td>
+    <td> </td>
+    <td> </td>
+    <td> </td>
+    <td> </td>
+  </tr>
+</table>
+
+<br>
+<table id="details">
+  <thead>
+    <th>Bil</th>
+    <th>Norujukan</th>
+    <th>JBG</th>
+    <th>No. KP</th>
+    <th>Berat</th>
+    <th>Nilai Marhun (RM)</th>
+    <th>Pembiayaan Asal (RM)</th>
+    <th>Baki Pembiayaan (RM)</th>
+    <th>Kadar Upah</th>
+    <th>Tempoh Belum Bayar</th>
+    <th>Keuntungan Belum Bayar (RM)</th>
+    <th>Lanjutan</th>
+  </thead>
+  @php $counter = 1;$totalpinjaman = 0; @endphp
+  @foreach($stokaudit['rekod'] as $index=>$item)
+    <tr>
+      <td>{{ $counter }}</td>
+      <td>{{$item['norujukan']}}</td>
+      <td>{{ $item['tempoh'] }}</td>
+      <td>{{$item['nokp']}}</td>
+      <td>{{ number_format($item['berat'],2) }}</td>
+      <td>{{ number_format($item['nilaimarhun'],2) }}</td>
+      <td>{{ number_format($item['pinjaman'],2) }}</td>
+      <td>{{ number_format($item['bakipjm'],2) }}</td>
+      <td>{{ number_format($item['kadarupah'],2) }}</td>
+      <td>{{ number_format($item['tempohblmbyar'],2) }}</td>
+      <td>{{ number_format($item['upahblmbyar'],2) }}</td>
+      <td>{{$item['lanjutan']}}</td>
+    </tr>
+    @php $counter++; @endphp
+  @endforeach
+  <tfoot>
+    <th colspan='4'>Jumlah</th>
+    <th>{{ number_format($stokaudit['totalberat'],2) }}</th>
+    <th>{{ number_format($stokaudit['totalnilaimarhun'],2) }}</th>
+    <th>{{ number_format($stokaudit['totalpinjaman'],2) }}</th>
+    <th>{{ number_format($stokaudit['totalbakipjm'],2) }}</th>
+    <th></th>
+    <th></th>
+    <th>{{ number_format($stokaudit['totaltunggakan'],2) }}</th>
+    <th></th>
+  </tfoot>
+</table>
+
+<br>
+<br>
+<table id="sign">
+  <tr>
+    <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>

routes/web.php

@@ -242,6 +242,9 @@ Route::post('laporan/saghilang/cetak',['as'=>'saghilang.laporancetak','uses'=>'K
 // 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');
 
+Route::get('/laporan/stokauditbackdate',['as'=>'laporan.stokauditbackdate','uses'=>'KhazanahController@laporanStokAuditBackdate'])->middleware('auth','khazanah');
+Route::get('laporan/stokauditbackdate/cetak',['as'=>'stokauditbackdate.laporancetak','uses'=>'KhazanahController@cetakLaporanStokAuditBackdate'])->middleware('auth','khazanah');
+
 Route::get('laporan/lelongan/notislelong/',['as'=>'lelongan.notis','uses'=>'KhazanahController@NotisLelong']);