Merge branch 'fixkaunter' into 'new-super'

Fixkaunter

See merge request online-sistem1/kaunter!201

app/Http/Controllers/KhazanahController.php

@@ -3584,7 +3584,17 @@ class KhazanahController extends Controller
         $permohonan = Http::withOptions(['verify' => config('app.api_verify')])->get( config('api.url').'/admin/permohonan/get/'.$auth_user['cawangan'])->json();
         $bank = Http::withOptions(['verify' => config('app.api_verify')])->get( config('api.url').'/api/bank')->json();
 
-        return view('khazanah.permohonanwang', compact('bank','cawangan_info','api_url','getVault','tarikhsemasa','dashboard','permohonan'));
+        $denominasi=Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/DenominasiController/'.$auth_user['cawangan'])->json();
+
+        if(sizeof($denominasi) == 0)
+        {
+            $denominasi=Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url').'/api/DenominasiCreate/'.$auth_user['cawangan'])->json();
+        }
+        else
+        {
+            $denominasi=$denominasi[0];
+        }
+        return view('khazanah.permohonanwang', compact('bank','cawangan_info','api_url','getVault','tarikhsemasa','dashboard','permohonan','denominasi'));
     }
 
     public function RekodPermohonan()
@@ -3613,7 +3623,8 @@ class KhazanahController extends Controller
             'tarikhmohon' => $request->tarikhmohon,
             'bakipetibesi' => $request->bakipetibesi,
             'outstanding' => $request->outstanding,
-            'namapemohon' => $auth_user['name']
+            'namapemohon' => $auth_user['name'],
+            'jawatanpemohon' => $auth_user['roles']
         ])->json();
 
         if($permohonan == true)
@@ -3639,4 +3650,48 @@ class KhazanahController extends Controller
 
     }
 
+    public function CITPermohonan(Request $request)
+    {
+        $auth_user = Auth::user();
+        $api_url = config('api.url');
+
+
+        $resitname = time().'.'.$request->resit->extension();
+        $resitdata = base64_encode($request->resit->get());
+
+        $invoicename = time().'.'.$request->invoice->extension();
+        $invoicedata = base64_encode($request->invoice->get());
+
+        $updatelulus = Http::accept('application/'.$request->resit->extension() . ',application/'.$request->invoice->extension())->post(config('api.url') . '/admin/permohonan/tagcit',[
+            'resitcit' => $request->noresit,
+            'bank' => $request->selectedbank,
+            'mohonid' => $request->mohonid,
+            'dataresit' => $resitdata,
+            'datainvoice' => $invoicedata,
+            'resittype' => $request->resit->extension(),
+            'invoicetype' => $request->invoice->extension(),
+            'resitname' => $resitname,
+            'invoicename' => $invoicename,
+            
+        ])->json();
+
+        if($updatelulus)
+            return redirect()->back()->with('message', 'Berjaya mengemaskini CIT Permohonan!');
+        else
+        return redirect()->back()->with('error', 'Ralat dalam menjana sebarang kemaskini!');   
+
+    }
+
+    public function DownloadFiles(Request $request){
+
+        $download = Http::get(config('api.url').'/admin/permohonan/viewfiles',[
+            'files_id' => $request->files_id
+        ])->json();
+    
+        return response(base64_decode($download['data']), 200,  [
+            'Content-type' => 'application/' . $download['type'],
+            'Content-Disposition' => 'inline; filename='.$download['filename']
+        ]);
+    }
+    
 }

resources/views/homepage/khazanah/home.blade.php

@@ -180,7 +180,7 @@
                 <a href="{{ url('unjuran') }}" class="btn btn-danger btn-lg btn-block mb-3">Unjuran</a>
             </div>
             <div class="row">
-              <a href="#" class="btn btn-danger btn-lg btn-block mb-3">Permohonan</a>
+              <a href="{{ url('permohonan') }}" class="btn btn-info btn-lg btn-block mb-3">Permohonan</a>
             </div>
                  </div>
 

resources/views/khazanah/permohonanwang.blade.php

@@ -1,6 +1,8 @@
 @extends('layouts.app')
 @section('content')
 @include('modal.permohonanwang')
+@include('modal.CITModal')
+@include('modal.denominasipermohonan')
 
 <div class="container">
     <div class="row justify-content-center">
@@ -37,7 +39,7 @@
                     <div class="d-flex justify-content-between mb-2">
                         <h5 class="mt-2">Senarai Permohonan Masih Aktif</h5>
                         <div>
-                            <button class="btn btn-info" data-toggle="modal" data-target="#PermohonanWang">Mohon</button>
+                            <button class="btn btn-info" data-backdrop="static" data-keyboard="false" data-toggle="modal" data-target="#PermohonanWang">Mohon</button>
                             <a class="btn btn-info" href="{{ route('permohonan.rekod') }}">Rekod Permohonan</a>
                         </div>
                     </div>
@@ -63,17 +65,17 @@
                                         <td>{{ $mohon['tarikh_permohonan'] }}</td>
                                         <td>{{ number_format($mohon['amaun_mohon'],2) }}</td>
                                         <td>
-                                            <a href="{{ route('permohonan.status', ['mohonid' => $mohon['mohonid']]) }}" class="btn btn-info"><i class="fas fa-eye"></i></a>
+                                            <a href="{{ route('permohonan.status', ['mohonid' => $mohon['nopermohonan']]) }}" class="btn btn-info"><i class="fas fa-eye"></i></a>
                                         </td>
                                         <td>{{ $mohon['jenismohon'] }}</td>
                                         <td>
                                             @php
                                                 if($mohon['tagdeposit'] === 1)
                                                 {
-                                                    echo '<button data-mohonid="' . $mohon["mohonid"] . '" id="btnterima" class="btn btn-success"><i class="fas fa-check"></i></button>';
+                                                    echo '<button data-amaun="' . $mohon["jumlah_diluluskan"] . '" data-mohonid="' . $mohon["nopermohonan"] . '" id="btnterima" class="btn btn-success">Telah disahkan</button>';
                                                 }else if(($mohon['tagcit'] === 0 && $mohon['jenismohon'] === 'bayaranbalik'))
                                                 {
-                                                    echo '<button data-mohonid="' . $mohon["mohonid"] . '" id="btncit" class="btn btn-secondary">CIT</button>';
+                                                    echo '<button data-mohonid="' . $mohon["nopermohonan"] . '" id="btncit" class="btn btn-secondary"  data-toggle="modal" data-backdrop="static" data-keyboard="false" data-target="#CITModal">CIT</button>';
                                                 }
                                                 else{
                                                     echo '<span class="p-2 badge badge-info">DALAM PROSES</span>';
@@ -93,6 +95,7 @@
         </div>
     </div>
 </div>
+<script src="{{ asset('js/main.js') }}"></script>
 <script type="text/javascript">
 
     var tablemohon = $('#permohonantable').DataTable({
@@ -105,14 +108,46 @@
     $(this)
         .find("input[name='jumlahmohon']")
         .val('')
+        .removeClass('is-invalid')
         .end()
         .find("input[type=checkbox], input[type=radio]")
         .prop("checked", "")
         .end();
 
+    $("#erroramaun").hide();
+    $("#pilihper").hide();
 
     })
 
+    $('#CITModal').on('shown.bs.modal', function (e) {
+    
+        let mohon = $('#btncit').data('mohonid');
+        $('#mohonid').val(mohon);
+
+    });
+
+    function funcbatal()
+        {
+            $('#denominasiHQModal').modal('hide');
+            // $('#pendahuluanserahanModal').modal('show');
+
+            $("#terima_transaksi").prop('disabled', false);
+
+            $('#bundle1').val('');
+            $('#totalb1').val(0.00);
+            $('#bundle5').val('');
+            $('#totalb5').val(0.00);
+            $('#bundle10').val('');
+            $('#totalb10').val(0.00);
+            $('#bundle20').val('');
+            $('#totalb20').val(0.00);
+            $('#bundle50').val('');
+            $('#totalb50').val(0.00);
+            $('#bundle100').val('');
+            $('#totalb100').val(0.00);
+            $('#amaunkiraan').val('');
+        }
+
     function funcpermohonan(){
 
         let amaun = $('#jumlahmohon').val();
@@ -127,6 +162,11 @@
             $("#erroramaun").show();
             // $("[name='erroramaun']").text("*Isikan amaun dalam input!");
             $("[name='jumlahmohon']").addClass('is-invalid');
+            boolamaun = true;
+        }else{
+            $("#erroramaun").hide();
+            $("[name='jumlahmohon']").removeClass('is-invalid');
+            boolamaun = false;
         }
 
         if(!jenis)
@@ -135,7 +175,7 @@
 
                 booljenis = true;
             }else{
-                $("pilihper").hide();
+                $("#pilihper").hide();
 
                 booljenis = false;
             }
@@ -158,9 +198,10 @@
     $(document).on('click', '#btnterima', function(e) {
         let nama = "{{ Auth::user()->name }}";
         let mid = $(this).data("mohonid");
+        let amaun = $(this).data("amaun");
 
         Swal.fire({
-            title: 'Adakah Wang sudah diterima?',
+            title: 'Adakah wang sudah diterima?',
             showDenyButton: true,
             showCancelButton: false,
             confirmButtonText: 'Terima',
@@ -169,98 +210,187 @@
             }).then((result) => {
             /* Read more about isConfirmed, isDenied below */
             if (result.isConfirmed) {
-                $.ajax({
+
-                        method:"put",
+                $('#denominasiPermohonan').modal('show');
-                        url: api_url + '/admin/permohonan/tagterima',
+                $('#amaundiminta').val(amaun);
-                        data: {
+                $('#mohonidpermohonan').val(mid);
-                            "mohonid" : mid,
+
-                            "namapenerima" : nama
-                        },
-                        success:function(data)
-                        {
-                            if(data === 1)
-                                Swal.fire('Diterima!', '', 'success')
-                        }
-                    });
             } else if (result.isDenied) {
                 // Swal.fire('Belum Diterima!', '', 'info')
             }
         });
     });
 
-    $(document).on('click', '#btncit', function(e) {
+    function terimapermohonanwang()
+    {
+        $("#terima_transaksi").prop('disabled', true);
 
-        let mid = $(this).data("mohonid");
+        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();
 
-        var bank = @php echo json_encode($bank) @endphp;
+        //denominasi bundle
-        var options = {};
+        let bundle1 = $('#bundle1').val();let bundle5 = $('#bundle5').val();let bundle10 = $('#bundle10').val();
-        $.map(bank,
+        let bundle20 = $('#bundle20').val();let bundle50 = $('#bundle50').val();let bundle100 = $('#bundle100').val();
-            function(o) {
+
-                options[o.abbreviation] = o.name;
+        //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.'
             });
 
-        Swal.fire({
+            return false;
-            title: 'BANK CIT',
-            text: 'Sila Pilih Bank',
-            input: 'select',
-            inputOptions: options,
-            showCancelButton: true,
-            animation: 'slide-from-top',
-            inputPlaceholder: 'Sila Pilih Bank',
-            allowOutsideClick: false,
-            preConfirm: (value) => {
-                if(!value){
-                    Swal.showValidationMessage(
-                        `Pilih Bank yang dinyatakan`
-                    );
         }
-            }
-        }).then(function (result) {
-            if (result) {
-                if (result.isConfirmed) {
-
-                    let cit = result.value;
 
         Swal.fire({
-                        title: 'Masukkan No Resit',
+            title: 'Memuatkan...',
-                        input: 'text',
+            allowEscapeKey : false,
-                        animation: 'slide-from-top',
-                        inputPlaceholder: 'No Resit',
             allowOutsideClick: false,
-                        preConfirm: (value) => {
+            didOpen: function () {
-                            if(!value){
+                Swal.showLoading();
-                                Swal.showValidationMessage(
+                $('#denominasiPermohonan').modal('hide');
-                                    `Masukkan No Resit Di dalam kotak disediakan`
-                                );
             }
-                        }
+        });
-                    }).then(function (response) {
+
-                        if(response){
+        $.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/tagcit',
+                        url: api_url + '/admin/permohonan/tagterima',
                         data: {
                             "mohonid" : mid,
-                                    "bank" : cit,
+                            "namapenerima" : teller
-                                    "resitcit" : response.value
                         },
                         success:function(data)
                         {
                             if(data === 1)
-                                        Swal.fire('Diterima!', '', 'success')
+                            {
+                                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);
             }
         });
     }
 
+    function verifyCIT(){
        
-                    });
+        var boolbank = false,boolnorujukan = false,boolresit = false,boolinvoice = false;
+        var bank = $('select[name="selectedbank"]').val();
+        var norujukan = $('input[name="noresit"]').val();
+        var resit = $('input[name="resit"]').val();
+        var invoice = $('input[name="invoice"]').val();
+
+        
+
+        if(bank !== '')
+        {
+            boolbank = true;
         }else{
-
+            boolbank = false;
         }
 
+        if(norujukan !== '')
+        {
+            boolnorujukan = true;
+        }else{
+            boolnorujukan = false;
+        }
+
+        if(resit)
+        {
+            boolresit = true;
+        }else{
+            boolresit = false;
+        }
+
+        if(invoice)
+        {
+            boolinvoice = true;
+        }else{
+            boolinvoice = false;
+        }
+
+        if(boolbank == true && boolnorujukan == true && boolresit == true && boolinvoice == true)
+        {
+            $("#terimahantar").prop('disabled', true);
+            return true;
+            
+        }else{
+            $("#terimahantar").prop('disabled', false);
+            event.preventDefault();
+            return false;
+        }
+
+        event.preventDefault();
+        return false;
+
+       
     }
-        });
-    });
 
 </script>
 @endsection

resources/views/khazanah/rekodpermohonan.blade.php

@@ -9,7 +9,7 @@
                 <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('permohonan.index') }}">Home</a></li>
+                      <li class="breadcrumb-item"><a href="{{ route('permohonan.index') }}">Permohonan</a></li>
                       <li class="breadcrumb-item active" aria-current="page">Rekod</li>
                     </ol>
                 </nav>
@@ -55,11 +55,11 @@
                                         <td>{{ number_format($mohon['amaun_mohon'],2) }}</td>
                                         <td>{{ number_format($mohon['jumlah_diluluskan'],2) }}</td>
                                         <td>
-                                            <a href="{{ route('permohonan.status', ['mohonid' => $mohon['mohonid']]) }}" class="btn btn-info"><i class="fas fa-eye"></i></a>
+                                            <a href="{{ route('permohonan.status', ['mohonid' => $mohon['nopermohonan']]) }}" class="btn btn-info"><i class="fas fa-eye"></i></a>
                                         </td>
                                         <td>{{ $mohon['jenismohon'] }}</td>
                                         <td>@php 
-                                            if($mohon['tagterima'] === 1)
+                                            if($mohon['tagterima'] === 1 || ($mohon['jenismohon'] == 'bayaranbalik' && $mohon['tagoperasi'] === 1 && $mohon['tagcit'] === 1 && $mohon['tagakaun'] === 1))
                                              echo '<span class="p-2 badge badge-success">BERJAYA</span>'; 
                                              else echo '<span class="p-2 badge badge-danger">BATAL</span>'; @endphp</td>
 

resources/views/khazanah/status.blade.php

@@ -125,6 +125,21 @@
 @section('content')
 
 <div class="container">
+    <form id="frminvoice" target="_blank" method="post" action="{{ route('permohonan.download') }}">
+        @csrf
+        <input type="hidden" id="invoice_id" name="files_id"/>
+    </form>
+
+    <form id="frmresit" target="_blank" method="post" action="{{ route('permohonan.download') }}">
+        @csrf
+        <input type="hidden" id="resit_id" name="files_id"/>
+    </form>
+
+    <form id="frmpb" target="_blank" method="post" action="{{ route('permohonan.download') }}">
+        @csrf
+        <input type="hidden" id="pb_id" name="files_id"/>
+    </form>
+
     <div class="row justify-content-center">
         <div class="col-md-12">
             <div class="card">
@@ -181,12 +196,12 @@
                         </div>
                     @else
                         <div class="row d-flex justify-content-center">
-                            <div class="col-12">
+                            <div class="col-10">
-                                <ul id="progressbar" class="text-center flex">
+                                <ul id="progressbar" class="text-center d-flex">
-                                    <li class="{{ ($permohonan['tarikh_permohonan'] !== null) ? 'active' : '' }} step0 col-4"></li>
+                                    <li class="{{ ($permohonan['tarikh_permohonan'] !== null) ? 'active' : '' }} step0 col-3"></li>
-                                    <li class="{{ ($permohonan['tagcit'] === 1) ? 'active' : '' }} step0 col-4"></li>
+                                    <li class="{{ ($permohonan['tagcit'] === 1) ? 'active' : '' }} step0 col-3"></li>
-                                    <li class="{{ ($permohonan['tagoperasi'] === 1) ? 'active' : '' }} step0 col-4"></li>
+                                    <li class="{{ ($permohonan['tagoperasi'] === 1) ? 'active' : '' }} step0 col-3"></li>
-                                    <li class="{{ ($permohonan['tagakaun'] === 1) ? 'active' : '' }} step0 col-4"></li>
+                                    <li class="{{ ($permohonan['tagakaun'] === 1) ? 'active' : '' }} step0 col-3"></li>
                                 </ul>
                             </div>
                         </div>
@@ -238,26 +253,26 @@
                         </div>
                     </div>
                     @else
-                    <div class="d-flex col-12 mx-auto justify-content-center">
+                    <div class="d-flex col-10 mx-auto justify-content-center">
-                        <div class="text-center icon-content col-2"> <img class="icon mx-auto" src="{{ asset('img/proposal.png') }}">
+                        <div class="text-center icon-content col-3"> <img class="icon mx-auto" src="{{ asset('img/proposal.png') }}">
                             <div class="flex flex-column">
                                 <p class="font-weight-bold text-center">Permohonan <br>Cawangan</p>
                             </div>
                         </div>
 
-                        <div class="justify-center text-center icon-content col-2"> <img class="icon mx-auto" src="{{ asset('img/operasicek.png') }}">
+                        <div class="justify-center text-center icon-content col-3"> <img class="icon mx-auto" src="{{ asset('img/operasicek.png') }}">
                             <div class="flex flex-column">
                                 <p class="font-weight-bold text-center">CIT Selesai Deposit ke Bank</p>
                             </div>
                         </div>
             
-                        <div class="justify-center text-center icon-content col-2"> <img class="icon mx-auto" src="{{ asset('img/operasicek.png') }}">
+                        <div class="justify-center text-center icon-content col-3"> <img class="icon mx-auto" src="{{ asset('img/operasicek.png') }}">
                             <div class="flex flex-column">
                                 <p class="font-weight-bold text-center">Pengesahan<br>Operasi</p>
                             </div>
                         </div>
             
-                        <div class="flex flex-col text-center icon-content col-2"> <img class="icon mx-auto" src="{{ asset('img/operasicek.png') }}">
+                        <div class="flex flex-col text-center icon-content col-3"> <img class="icon mx-auto" src="{{ asset('img/operasicek.png') }}">
                             <div class="d-flex flex-column">
                                 <p class="font-weight-bold text-center">Akaun</p>
                             </div>
@@ -290,15 +305,15 @@
                                         break;
                                 case 3: echo $desc['description'] . '<br>' . 'NAMA AKAUN :' . $desc[0]['nama_akaun'];
                                         break;
-                                case 4: echo $desc['description'] . '<br>' . 'JUMLAH DILULUSKAN :RM' . number_format($desc[0]['jumlah_diluluskan'],2);
+                                case 4: echo $desc['description'] . '<br>' . 'JUMLAH DILULUSKAN :RM' . number_format($desc[0]['jumlah_diluluskan'],2) . '<br><button class="mt-2 btn btn-info mr-2" onclick="pbdownload(' . $desc[0]['pbfiles'] . ')">Muat Turun Surat</button>';
                                         break;
-                                case 5: echo $desc['description'] . '<br>' . 'JENIS BANK :' . $desc[0]['jenisbank'] . '<br>' . 'NO RESIT :' . $desc[0]['noresit'];
+                                case 5: echo $desc['description'] . '<br>' . 'JENIS BANK :' . $desc[0]['jenisbank'] . 'JENIS CIT:' . $desc[0]['jeniscit'] . '<br>' . 'NO RESIT :' . $desc[0]['noresit'] . 'NAMA SYARIKAT:' . $desc[0]['namasyarikat'];
                                         break;
                                 case 6: echo $desc['description'] . '<br>' . 'NAMA PENERIMA :' . $desc[0]['nama_penerima'];
                                         break;
                                 case 7: echo $desc['description'];
                                         break;
-                                case 8: echo $desc['description'] . '<br>' . 'JENIS BANK :' . $desc[0]['jenisbank'];
+                                case 8: echo $desc['description'] . '<br>' . 'JENIS BANK :' . $desc[0]['jenisbank'] .'<br><button class="mt-2 btn btn-info mr-2" onclick="resitdownload(' . $desc[0]['resitfiles'] . ')">Muat Turun Resit</button><button class="mt-2 btn btn-info" onclick="invoicedownload('  . $desc[0]['invoicefiles'] . ')">Muat Turun Invoice</button>';
                                         break;
                              }
                              
@@ -319,5 +334,21 @@
 </div>
 <script type="text/javascript">
 
+    function invoicedownload(invoiceid){
+     $('#invoice_id').val(invoiceid);
+
+     $('#frminvoice').submit();
+    }
+
+    function resitdownload(resitid){
+     $('#resit_id').val(resitid);
+     $('#frmresit').submit();
+    }
+
+    function pbdownload(pbid){
+        $('#pb_id').val(pbid);
+        $('#frmpb').submit();
+    }
+
 </script>
 @endsection

resources/views/modal/CITModal.blade.php

@@ -0,0 +1,53 @@
+
+    <div class="modal fade" id="CITModal" tabindex="-1" role="dialog" aria-labelledby="ModalCenterTitle" aria-hidden="true">
+      <div class="modal-dialog  modal-lg modal-dialog-centered" role="document">
+        <div class="modal-content">
+          <div class="modal-header">
+            <h5 class="modal-title text-center" id="ModalTitle">Cash In Transit (CIT)</h5>
+            <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+              <span aria-hidden="true">&times;</span>
+            </button>
+          </div>
+          <div class="modal-body">  
+            
+            <div class="container">
+              <form method="post" action="{{ route('permohonan.cit') }}" enctype="multipart/form-data" onsubmit="verifyCIT()">
+                @csrf
+                <input type="hidden" id="mohonid" name="mohonid" value=""/>
+                <div class="d-flex mb-2">
+                <label class="col-4">Bank</label>
+                <select name="selectedbank" class="form-control col-8">
+                  @foreach($bank as $b)
+                  <option value="{{ $b['abbreviation'] }}">{{ $b['name'] }}</option>
+                  @endforeach
+                </select>
+              </div>
+
+              <div class="d-flex mb-2">
+                <label class="col-4">No Invoice (CIT)</label>
+                <input type="text" name="noresit" class="form-control"/>
+              </div>
+
+              <div class="d-flex mb-2">
+                <label class="col-4">Slip Bank</label>
+                <input type="file" name="resit"/>
+              </div>
+              <div class="d-flex mb-2">
+                <label class="col-4">Invoice (CIT)</label>
+                <input type="file" name="invoice"/>
+              </div>
+            </div>
+          </div>
+  
+          <div class="modal-footer">
+              <button type="button" class="btn btn-danger" data-dismiss="modal">Batal</button>
+              <button type="submit" class="btn btn-success" id="terimahantar">Hantar</button>
+          </div>
+        </form>
+      
+        </div>
+      </div>
+    </div>
+
+
+

resources/views/modal/denominasipermohonan.blade.php

@@ -0,0 +1,147 @@
+<div class="modal fade" id="denominasiPermohonan" tabindex="-1" role="dialog" aria-labelledby="denominasiPermohonanModalCenterTitle" aria-hidden="true">
+    <div class="modal-dialog modal-dialog-centered modal-xl" role="document">
+      <div class="modal-content">
+        <div class="modal-header">
+
+          <ul class="nav nav-pills">
+            <li class="nav-item">
+              <a class="nav-link active" data-toggle="pill" href="#home" role="tab" aria-controls="pills-flamingo" aria-selected="true">Keping</a>
+            </li>
+          </ul>
+
+          <label class="mt-2 ml-3">Amaun Sebenar:</label><input type="text" class="form-control col-3 ml-3" id="amaundiminta" placeholder="0.00" readonly>
+          <label class="mt-2 ml-3">Amaun Kiraan:</label><input type="text" class="form-control col-3 ml-3" id="amaunkiraan" placeholder="0.00" readonly>
+          
+          <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+            <span aria-hidden="true">&times;</span>
+          </button>
+          
+        </div>
+        <div class="modal-body">  
+
+          <div class="tab-content">
+            <div class="tab-pane fade show active" id="home" role="tabpanel" aria-labelledby="flamingo-tab">
+              
+              <table class="table text-center"> 
+                    <tr>
+                          <th></th>
+                          <th style="display:none;" name="denominasi" class="denominasi">Peti Besi</th>
+                          <th>Ambilan</th>
+                          <th>Jumlah (RM)</th>
+                          <th></th>
+                          <th style="display:none;" name="denominasi" class="denominasi">Peti Besi</th>
+                          <th>Ambilan</th>
+                          <th>Jumlah (RM)</th>
+                    </tr>
+                    {{-- <tr>
+                      <td>RM1</td>
+                      <td style="display:none;" name="denominasi" class="denominasi"><input type="text" class="form-control" value="{{ $denominasi['bd1'] }}" readonly/></td>
+                      <td><input type="text" name="ambilanb1" class="form-control" id="bundle1" onkeyup="kiraan(this)"/> </td>
+                      <td><input type="text" name="totalb1" class="form-control" id="totalb1" value="0.00" readonly/> </td>
+                      <td> RM20</td>
+                      <td style="display:none;" name="denominasi" class="denominasi"><input type="text" class="form-control" value="{{ $denominasi['bd20'] }}" readonly/></td>
+                      <td><input type="text" name="ambilanb20" class="form-control" id="bundle20" onkeyup="kiraan(this)"/> </td>
+                      <td><input type="text" name="totalb20" class="form-control" id="totalb20" value="0.00" readonly/> </td>
+                  </tr>
+                  <tr>
+                      <td>RM5</td>
+                      <td style="display:none;" name="denominasi" class="denominasi"><input type="text" class="form-control" value="{{ $denominasi['bd5'] }}" readonly/></td>
+                      <td><input type="text" name="ambilanb5" class="form-control" id="bundle5" onkeyup="kiraan(this)"/> </td>
+                      <td><input type="text" name="totalb5" class="form-control" id="totalb5" value="0.00" readonly/> </td>
+                      <td>RM50</td> 
+                      <td style="display:none;" name="denominasi" class="denominasi"><input type="text" class="form-control" value="{{ $denominasi['bd50'] }}" readonly/></td>
+                      <td><input type="text" name="ambilanb50" class="form-control" id="bundle50" onkeyup="kiraan(this)"/> </td>
+                      <td><input type="text" name="totalb50" class="form-control" id="totalb50" value="0.00" readonly/> </td>
+                  </tr>
+                  <tr>
+                      <td>RM10</td>
+                      <td style="display:none;" name="denominasi" class="denominasi"><input type="text" class="form-control" value="{{ $denominasi['bd10'] }}" readonly/></td>
+                      <td><input type="text" name="ambilanb10" class="form-control" id="bundle10" onkeyup="kiraan(this)"/> </td>
+                      <td><input type="text" name="totalb10" class="form-control" id="totalb10" value="0.00" readonly/> </td>
+                      <td>RM100 </td>
+                      <td style="display:none;" name="denominasi" class="denominasi"><input type="text" class="form-control" value="{{ $denominasi['bd100'] }}" readonly/></td>
+                      <td><input type="text" name="ambilanb100" class="form-control" id="bundle100" onkeyup="kiraan(this)"/> </td>
+                      <td><input type="text" name="totalb100" class="form-control" id="totalb100" value="0.00" readonly/> </td>
+                  </tr> --}}
+
+                  <tr>
+                    <td>RM0.01</td>
+                    <td style="display:none;" name="denominasi" class="denominasi"><input type="text" class="form-control" value="{{ $denominasi['txtsen1'] }}" readonly/></td>
+                    <td><input type="text" name="ambilansen1" class="form-control" id="sen1" data-deno="{{ $denominasi['txtsen1'] }}" onkeyup="kiraan(this)"/> </td>
+                    <td><input type="text" name="totalsen1" id="totalsen1" class="form-control" value="0.00" readonly/> </td>
+                    <td>RM1</td>
+                    <td style="display:none;" name="denominasi" class="denominasi"><input type="text" class="form-control" value="{{ $denominasi['txtring1'] }}" readonly/></td>
+                    <td><input type="text" name="ambilanring1" class="form-control" id="ringgit1" data-deno="{{ $denominasi['txtring1'] }}" onkeyup="kiraan(this)"/> </td>
+                    <td><input type="text" name="totalring1" id="totalring1" class="form-control" value="0.00" readonly/> </td>
+                  </tr>
+                  <tr>
+                      <td>RM0.05</td>
+                      <td style="display:none;" name="denominasi" class="denominasi"><input type="text" class="form-control" value="{{ $denominasi['txtsen5'] }}" readonly/></td>
+                      <td><input type="text" name="ambilansen5" class="form-control" id="sen5" data-deno="{{ $denominasi['txtsen5'] }}" onkeyup="kiraan(this)"/> </td>
+                      <td><input type="text" name="totalsen5" id="totalsen5" class="form-control" value="0.00" readonly/> </td>
+                      <td>RM5</td>
+                      <td style="display:none;" name="denominasi" class="denominasi"><input type="text" class="form-control" value="{{ $denominasi['txtring5'] }}" readonly/></td>
+                      <td><input type="text" name="ambilanring5" class="form-control" id="ringgit5" data-deno="{{ $denominasi['txtring5'] }}" onkeyup="kiraan(this)"/> </td>
+                      <td><input type="text" name="totalring5" id="totalring5" class="form-control" value="0.00" readonly/> </td>
+                  </tr>
+                  <tr>
+                      <td>RM0.10</td>
+                      <td style="display:none;" name="denominasi" class="denominasi"><input type="text" class="form-control" value="{{ $denominasi['txtsen10'] }}" readonly/></td>
+                      <td><input type="text" name="ambilansen10" class="form-control" id="sen10" data-deno="{{ $denominasi['txtsen10'] }}" onkeyup="kiraan(this)"/> </td>
+                      <td><input type="text" name="totalsen10" id="totalsen10" class="form-control" value="0.00" readonly/> </td>
+                      <td>RM10</td>
+                      <td style="display:none;" name="denominasi" class="denominasi"><input type="text" class="form-control" value="{{ $denominasi['txtring10'] }}" readonly/></td>
+                      <td><input type="text" name="ambilanring10" class="form-control" id="ringgit10" data-deno="{{ $denominasi['txtring10'] }}" onkeyup="kiraan(this)"/> </td>
+                      <td><input type="text" name="totalring10" id="totalring10" class="form-control" value="0.00" readonly/> </td>
+                  </tr>
+                  <tr>
+                    <td>RM0.20</td>
+                    <td style="display:none;" name="denominasi" class="denominasi"><input type="text" class="form-control" value="{{ $denominasi['txtsen20'] }}" readonly/></td>
+                    <td><input type="text" name="ambilansen20" class="form-control" id="sen20" data-deno="{{ $denominasi['txtsen20'] }}" onkeyup="kiraan(this)"/> </td>
+                    <td><input type="text" name="totalsen20" id="totalsen20" class="form-control" value="0.00" readonly/> </td>
+                    <td> RM20</td>
+                    <td style="display:none;" name="denominasi" class="denominasi"><input type="text" class="form-control" value="{{ $denominasi['txtring20'] }}" readonly/></td>
+                    <td><input type="text" name="ambilanring20" class="form-control" id="ringgit20" data-deno="{{ $denominasi['txtring20'] }}" onkeyup="kiraan(this)"/> </td>
+                    <td><input type="text" name="totalring20" id="totalring20" class="form-control" value="0.00" readonly/> </td>
+                  </tr>
+                  <tr>
+                    <td>RM0.50</td>
+                    <td style="display:none;" name="denominasi" class="denominasi"><input type="text" class="form-control" value="{{ $denominasi['txtsen50'] }}" readonly/></td>
+                    <td><input type="text" name="ambilansen50" class="form-control" id="sen50" data-deno="{{ $denominasi['txtsen50'] }}" onkeyup="kiraan(this)"/> </td>
+                    <td><input type="text" name="totalsen50" id="totalsen50" class="form-control" value="0.00" readonly/> </td>
+                    <td>RM50</td> 
+                    <td style="display:none;" name="denominasi" class="denominasi"><input type="text" class="form-control" value="{{ $denominasi['txtring50'] }}" readonly/></td>
+                    <td><input type="text" name="ambilanring50" class="form-control" id="ringgit50" data-deno="{{ $denominasi['txtring50'] }}" onkeyup="kiraan(this)"/> </td>
+                    <td><input type="text" name="totalring50" id="totalring50" class="form-control" value="0.00" readonly/> </td>
+                </tr>
+                <tr>
+                  <td></td>
+                  <td></td>
+                  <td></td>
+                  <td td style="display:none;" name="denominasi" class="denominasi"></td>
+                  <td>RM100 </td> 
+                  <td style="display:none;" name="denominasi" class="denominasi"><input type="text" class="form-control" value="{{ $denominasi['txtring100'] }}" readonly/></td>
+                  <td><input type="text" name="ambilanring100" class="form-control" id="ringgit100" onkeyup="kiraan(this)"/> </td>
+                  <td><input type="text" name="totalring100" id="totalring100" class="form-control" value="0.00" readonly/> </td>
+                </tr>
+              </table>
+
+            </div>
+          </div>
+
+          <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="terimapermohonanwang()">Terima</button>
+        </div>
+      </div>
+    </div>
+  </div>
+
+
+

resources/views/modal/permohonanwang.blade.php

@@ -18,21 +18,21 @@
             </div>
 
             <div class="col-12 d-flex mb-2">
-                <label class="col-6">Jumlah Permohonan (RM)</label>
+                <label class="col-8">Jumlah Permohonan (RM)</label>
-                <div class="col-6">
+                <div class="col-4">
                 <input type="text" name="jumlahmohon" id="jumlahmohon" class="form-control" placeholder="Jumlah Permohonan (RM)"/>
                 <div id="erroramaun" class="invalid-feedback">*Nyatakan Jumlah Permohonan</div>
                 </div>
               </div>
 
             <div class="col-12 d-flex mb-2">
-                <label class="col-6">Tarikh Mohon</label>
+                <label class="col-8">Tarikh Mohon</label>
                 <p class="col-6">{{ $tarikhsemasa }}</p>
                 <input type="hidden" id="tarikhmohon" name="tarikhmohon" readonly class="col-6 form-control" value="{{ $tarikhsemasa }}"/>
             </div>
 
             <div class="col-12 d-flex mb-2">
-                <label class="col-6">Baki Peti Besi (RM)</label>
+                <label class="col-8">Baki Peti Besi (RM)</label>
                 <p class="col-6">RM {{ number_format($getVault,2) }}</p>
                 <input type="hidden" id="bakipetibesi" name="bakipetibesi" readonly class="col-6 form-control" value="{{ $getVault }}"/>
             </div>
@@ -43,7 +43,7 @@
             </div> --}}
 
             <div class="col-12 d-flex mb-2">
-                <label class="col-6">Outstanding (RM)</label>
+                <label class="col-8">Outstanding (RM)</label>
                 <p class="col-6">RM {{ number_format($dashboard[0]['outstanding'],2) }}</p>
                 <input type="hidden" id="outstanding" name="outstanding" readonly class="col-6 form-control" value="{{ $dashboard[0]['outstanding'] }}"/>
             </div>

routes/web.php

@@ -141,6 +141,8 @@ Route::get('/permohonan',['as'=>'permohonan.index','uses' => 'KhazanahController
 Route::get('/permohonan/rekod',['as'=>'permohonan.rekod','uses' => 'KhazanahController@RekodPermohonan'])->middleware('auth','khazanah');
 Route::post('/permohonan/simpan',['as'=>'permohonan.simpan','uses' => 'KhazanahController@SimpanPermohonan'])->middleware('auth','khazanah');
 Route::get('/permohonan/status/{mohonid}',['as'=>'permohonan.status','uses' => 'KhazanahController@StatusPermohonan'])->middleware('auth','khazanah');
+Route::post('/permohonan/cit',['as'=>'permohonan.cit','uses' => 'KhazanahController@CITPermohonan'])->middleware('auth','khazanah');
+Route::post('/permohonan/download',['as'=>'permohonan.download','uses' => 'KhazanahController@DownloadFiles'])->middleware('auth','khazanah');
 
 Route::post('/kakitangan/harian',['as'=>'kakitangan.harian','uses'=>'KakitanganController@kakitanganHarian'])->middleware('auth','khazanah');
 Route::get('/lelong',['as'=>'lelong','uses'=>'LelongController@lelong']);