Merge branch 'simulasi' into 'master'

sumulasi

See merge request online-sistem1/kaunter!89

resources/views/customers/info.blade.php

@@ -351,7 +351,6 @@
                             </table>
                         </div>
                     </div>
-                    
 
                     {{-- Sudah Tebus --}}
 
@@ -408,8 +407,8 @@
                 if(check_komuditi == 0){
                     Swal.fire({
                         icon: 'error',
-                        title: 'Unit Komuditi Berbaki Minumum',
+                        title: 'Unit Komoditi Berbaki Minima',
-                        text: 'Sila Hubungi Operasi Untuk Membuat Pembelian Komuditi'
+                        text: 'Sila Hubungi Operasi Untuk Membuat Pembelian Komoditi'
                     });
                     event.preventDefault();
                     return false;
@@ -417,8 +416,8 @@
                     if(Number(data['unit_komuditi']) < 10000){
                         Swal.fire({
                             icon: 'error',
-                            title: 'Unit Komuditi Berbaki Minumum',
+                            title: 'Unit Komoditi Berbaki Minumum',
-                            text: 'Sila Hubungi Operasi Untuk Membuat Pembelian Komuditi'
+                            text: 'Sila Hubungi Operasi Untuk Membuat Pembelian Komoditi'
                         });
                         event.preventDefault();
                         return false;
@@ -494,7 +493,6 @@
                     if(jenistebus == "belum_tebus"){
                         var urlroute = '{{ route("penebusan", ":id") }}';
                         urlroute = urlroute.replace(':id', gadai_detail["norujukan"]);
-                        console.log(gadai_detail['bakihargajualan']);
                         if(gadai_detail["bakihargajualan"] == null){
                             xtawarruq.row.add([
                                 '<input type="radio" value='+ gadai_detail["norujukan"] +' name="belum"/>',
@@ -720,7 +718,6 @@
                     urlroute = urlroute.replace(':id', tebusaz['norujukan']);
                     break;
                 case 'T':
-                    console.log("tebusan" + tebusaz['norujukan']);
                     var urlroute = '{{ route("resit.tebus", ":id") }}';
                     urlroute = urlroute.replace(':id', tebusaz['norujukan']);
                     break;
@@ -756,27 +753,27 @@
         if($("input[name='options']:checked").val() == 'belum_tebus'){
             let test1 = $('input[name="belum"]:checked').closest('tr').children('td:eq(2)').text();
             let tarikhgadai2 = new Date(test1);tarikhgadai2.setHours(0, 0, 0, 0);
-            // if(+harini !== +tarikhgadai2){
+            if(+harini !== +tarikhgadai2){
-            //     Swal.fire({
+                Swal.fire({
-            //         icon: 'error',
+                    icon: 'error',
-            //         title: 'Amaran',
+                    title: 'Amaran',
-            //         text: 'Ubah Gadai Tidak Dibenarkan'
+                    text: 'Ubah Gadai Tidak Dibenarkan'
-            //     });
+                });
-            //     return false;
+                return false;
-            // }
+            }
         }else if($("input[name='options']:checked").val() == 'sudah_tebus'){
 
             let test = $('input[name="sudahtebus"]:checked').closest('tr').children('td:eq(2)').text();
             let tarikhgadai1 = new Date(test);tarikhgadai1.setHours(0, 0, 0, 0);
 
-            // if(+harini !== +tarikhgadai1){
+            if(+harini !== +tarikhgadai1){
-            //     Swal.fire({
+                Swal.fire({
-            //         icon: 'error',
+                    icon: 'error',
-            //         title: 'Amaran',
+                    title: 'Amaran',
-            //         text: 'Ubah Gadai Tidak Dibenarkan'
+                    text: 'Ubah Gadai Tidak Dibenarkan'
-            //     });
+                });
-            //     return false;
+                return false;
-            // }
+            }
         }
 
         if(ubahid == null && $("input[name='options']:checked").val() == 'belum_tebus'){
@@ -856,9 +853,6 @@
                     var channel = pusher.subscribe('notice-ubahhapus');
                     channel.bind('my-ubahhapus', function(data) {
 
-                        console.log(data);
-                    
-
                         if(data.norujukan == ubahid)
                         {
                             if(data.kelulusan == 'lulus')
@@ -927,26 +921,26 @@
         if($("input[name='options']:checked").val() == 'belum_tebus'){
             let test1 = $('input[name="belum"]:checked').closest('tr').children('td:eq(2)').text();
             let tarikhgadai2 = new Date(test1);tarikhgadai2.setHours(0, 0, 0, 0);
-            // if(+harini !== +tarikhgadai2){
+            if(+harini !== +tarikhgadai2){
-            //     Swal.fire({
+                Swal.fire({
-            //         icon: 'error',
+                    icon: 'error',
-            //         title: 'Amaran',
+                    title: 'Amaran',
-            //         text: 'Hapus Gadai Tidak Dibenarkan'
+                    text: 'Hapus Gadai Tidak Dibenarkan'
-            //     });
+                });
-            //     return false;
+                return false;
-            // }
+            }
         }else if($("input[name='options']:checked").val() == 'sudah_tebus'){
             let test = $('input[name="sudahtebus"]:checked').closest('tr').children('td:eq(2)').text();
             let tarikhgadai1 = new Date(test);tarikhgadai1.setHours(0, 0, 0, 0);
 
-            // if(+harini !== +tarikhgadai1){
+            if(+harini !== +tarikhgadai1){
-            //     Swal.fire({
+                Swal.fire({
-            //         icon: 'error',
+                    icon: 'error',
-            //         title: 'Amaran',
+                    title: 'Amaran',
-            //         text: 'Hapus Gadai Tidak Dibenarkan'
+                    text: 'Hapus Gadai Tidak Dibenarkan'
-            //     });
+                });
-            //     return false;
+                return false;
-            // }
+            }
         }
 
         const swalWithBootstrapButtons = Swal.mixin({

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

@@ -198,7 +198,7 @@
                 <a href="{{ route('lelong') }}" class="btn btn-danger btn-lg btn-block mb-3">Lelong</a>
             </div>
             <div class="row">
-                <a href="{{ url('panjar') }}" class="btn btn-primary btn-lg btn-block mb-3">Panjar</a>
+                <a href="{{ url('panjar') }}" class="btn btn-primary btn-lg btn-block mb-3">Perbelanjaan</a>
             </div>
             <div class="row">
                 <a href="{{ url('alirantunai') }}" class="btn btn-primary btn-lg btn-block  mb-3">Aliran Tunai</a>

resources/views/khazanah/dashboard.blade.php

@@ -22,8 +22,6 @@
 
 
                     <div class="row mt-4 col-12 d-flex justify-content-center">
-                
-                        {{-- {{ dd($ringkasanharian) }} --}}
                         {{-- First Column --}}
 
                         <div class="col-lg-6 col-xl-4 col-12">

resources/views/khazanah/panjar.blade.php

@@ -8,7 +8,7 @@
     <div class="row justify-content-center">
         <div class="col-md-12">
             <div class="card">
-                <div class="card-header">{{ __('Dashboard') }}</div>
+                <div class="card-header">{{ __('Perbelanjaan') }}</div>
 
                 <div class="card-body text-center">
                     

resources/views/test.blade.php

@@ -1,133 +0,0 @@
-<!DOCTYPE html>
-<html lang="{{ str_replace('_', '-', app()->getLocale()) }}">
-    <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-
-    <!-- CSRF Token -->
-    <meta name="csrf-token" content="{{ csrf_token() }}">
-
-    <title>SISTEM AR-RAHN</title>
-
-    <!-- Scripts -->
-    <script src="{{ asset('js/app.js') }}" defer></script>
-    <script src="{{ asset('vendor/adminlte/dist/js/adminlte.js') }}" defer></script>
-
-    <!-- Fonts -->
-    <link rel="dns-prefetch" href="//fonts.gstatic.com">
-    <link href="https://fonts.googleapis.com/css?family=Nunito" rel="stylesheet">
-
-    <!-- Styles -->
-    <link href="{{ asset('css/app.css') }}" rel="stylesheet">
-    <link href="{{ asset('css/main.css') }}" rel="stylesheet">
-    <link href="{{ asset('vendor/adminlte/dist/css/adminlte.css') }}" rel="stylesheet">
-    <link href="{{ asset('vendor/fontawesome-free/css/all.css') }}" rel="stylesheet">
-    <link href="{{ asset('vendor/DataTables/datatables.min.css') }}" rel="stylesheet">
-    <link rel="stylesheet" href="https://code.ionicframework.com/ionicons/2.0.1/css/ionicons.min.css">
-    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css">
-    <link href="{{ asset('css/select2.min.css') }}" rel="stylesheet" />
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datepicker/1.9.0/css/bootstrap-datepicker.min.css"/>
-    
-    <script src="{{ asset('js/jquery.min.js') }}"></script>
-    <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js"></script>
-    <script src="{{ asset('js/select2.min.js') }}"></script>
-    <script src="//cdnjs.cloudflare.com/ajax/libs/numeral.js/2.0.6/numeral.min.js"></script>
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@10"></script>
-    <script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.1/dist/umd/popper.min.js"></script>
-    <script src="{{ asset('vendor/DataTables/datatables.min.js') }}"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datepicker/1.9.0/js/bootstrap-datepicker.min.js"></script>
-
-    {{-- Pusher --}}
-    <script src="https://js.pusher.com/7.0/pusher.min.js"></script>
-
-    {{-- jquery validation --}}
-    <script src="{{ asset('js/jquery.validate.min.js') }}"></script>
-    <script src="{{ asset('js/additional-methods.min.js') }}"></script>
-
-
-        <!-- Styles -->
-        <style>
-            html, body {
-                background-color: #fff;
-                color: #636b6f;
-                font-family: 'Nunito', sans-serif;
-                font-weight: 200;
-                height: 100vh;
-                margin: 0;
-            }
-
-            .full-height {
-                height: 100vh;
-            }
-
-            .flex-center {
-                align-items: center;
-                display: flex;
-                justify-content: center;
-            }
-
-            .position-ref {
-                position: relative;
-            }
-
-            .top-right {
-                position: absolute;
-                right: 10px;
-                top: 18px;
-            }
-
-            .content {
-                text-align: center;
-            }
-
-            .title {
-                font-size: 84px;
-            }
-
-            .links > a {
-                color: #636b6f;
-                padding: 0 25px;
-                font-size: 13px;
-                font-weight: 600;
-                letter-spacing: .1rem;
-                text-decoration: none;
-                text-transform: uppercase;
-            }
-
-            .m-b-md {
-                margin-bottom: 30px;
-            }
-        </style>
-    </head>
-    <body>
-        <h1>Pusher Test</h1>
-        <p>
-          Try publishing an event to channel <code>my-channel</code>
-          with event name <code>my-event</code>.
-        </p>
-        <button>Click</button>
-      </body>
-      
-
-    <script>
-
-        // Enable pusher logging - don't include this in production
-        Pusher.logToConsole = true;
-    
-        var pusher = new Pusher('26b0ec2f297f94b7aa9b', {
-          cluster: 'ap1',
-          encrypted: true
-        });
-    
-        var channel = pusher.subscribe('status-liked');
-        channel.bind('my-event', function(data) {
-
-        console.log(data);
-
-        if(data.message == 'KOK LANAS')
-          console.log(data.message);
-
-        });
-
-      </script>
-</html>

resources/views/testing.blade.php

@@ -1,20 +0,0 @@
-<div class="container">
-    <h1>Team A Score</h1>
-    <div id="team1_score"></div>
-  </div>
-  <script src="https://cdn.socket.io/socket.io-1.3.4.js"> </script>
-  <script>
-    var sock = io("{{ env('PUBLISHER_URL') }}:{{ env('BROADCAST_PORT') }}");
-    sock.on('action-channel-one:App\\Events\\ActionEvent', function (data){
-        //data.actionId and data.actionData hold the data that was broadcast
-        //process the data, add needed functionality here
-        var action = data.actionId;
-        var actionData = data.actionData;
-  if(action == "score_update" && actionData.team1_score) {
-
-            console.log(actionData.team1_score);
-            $("#team1_score").html(actionData.team1_score);
-            alert('jadi dok');
-      }
-  });
-  </script>

resources/views/user/index.blade.php

@@ -7,22 +7,24 @@
             <h3 class="text-center text-uppercase">maklumat pengguna</h3>
             <div class="card">
                 <div class="card-body text-center">
-                    <img src="{{ asset('img/logo_arrahn.png') }}" style="width:200px" alt="User Image">
+                    <div class="col-md-12" style="margin-right:auto;margin-left:auto">
-                    <div class="col-md-8" style="margin-right:auto;margin-left:auto">
                         <div class="row form-group">
-                            <div class="col-md-4">NAMA</div>
+                            <div class="col-md-6">
-                            <div class="col-md-8"><input type="text"></div>
+                                <div class="row form-group">
-                            <div class="col-md-4">NOMBOR KAD PENGENALAN</div>
+                                    <div class="col-md-6">NAMA</div>
-                            <div class="col-md-8"><input type="text"></div>
+                                    <div class="col-md-6"><input type="text" class="form-control"></div>
-                            <div class="col-md-4">JAWATAN</div>
+                                    <div class="col-md-6">NO TELEFON</div>
-                            <div class="col-md-8"><input type="text"></div>
+                                    <div class="col-md-6"><input type="text" class="form-control"></div>
-                            <div class="col-md-4">NO TELEFON</div>
+                                </div>
-                            <div class="col-md-8"><input type="text"></div>
+                            </div>
-                            <div class="col-md-4">KATALALUAN BARU</div>
+                            <div class="col-md-6">
-                            <div class="col-md-8"><input type="text"></div>
+                                <div class="row form-group">
-                            <div class="col-md-4">ULANG KATALALUAN</div>
+                                    <div class="col-md-6">NO KP</div>
-                            <div class="col-md-8"><input type="text"></div>
+                                    <div class="col-md-6"><input type="text" class="form-control"></div>
-                            <div style="margin-left:auto;margin-right:auto;margin-top:5px"><input type="button" class="btn btn-primary" value="KEMASKINI"></div>
+                                    <div class="col-md-6">JAWATAN</div>
+                                    <div class="col-md-6"><input type="text" class="form-control"></div>
+                                </div>
+                            </div>
                         </div>
                     </div>
                 </div>

resources/views/welcome.blade.php

@@ -1,144 +0,0 @@
-<!DOCTYPE html>
-<html lang="{{ str_replace('_', '-', app()->getLocale()) }}">
-    <head>
-        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-
-        <title>Laravel</title>
-
-        <!-- Fonts -->
-        <link href="https://fonts.googleapis.com/css?family=Nunito:200,600" rel="stylesheet">
-
-        <script src="{{ asset('js/jquery.min.js') }}"></script>
-
-        <!-- Styles -->
-        <style>
-            html, body {
-                background-color: #fff;
-                color: #636b6f;
-                font-family: 'Nunito', sans-serif;
-                font-weight: 200;
-                height: 100vh;
-                margin: 0;
-            }
-
-            .full-height {
-                height: 100vh;
-            }
-
-            .flex-center {
-                align-items: center;
-                display: flex;
-                justify-content: center;
-            }
-
-            .position-ref {
-                position: relative;
-            }
-
-            .top-right {
-                position: absolute;
-                right: 10px;
-                top: 18px;
-            }
-
-            .content {
-                text-align: center;
-            }
-
-            .title {
-                font-size: 84px;
-            }
-
-            .links > a {
-                color: #636b6f;
-                padding: 0 25px;
-                font-size: 13px;
-                font-weight: 600;
-                letter-spacing: .1rem;
-                text-decoration: none;
-                text-transform: uppercase;
-            }
-
-            .m-b-md {
-                margin-bottom: 30px;
-            }
-        </style>
-    </head>
-    <body>
-        <div class="flex-center position-ref full-height">
-            @if (Route::has('login'))
-                <div class="top-right links">
-                    @auth
-                        <a href="{{ url('/home') }}">Home</a>
-                    @else
-                        <a href="{{ route('login') }}">Login</a>
-
-                        @if (Route::has('register'))
-                            <a href="{{ route('register') }}">Register</a>
-                        @endif
-                    @endauth
-                </div>
-            @endif
-
-            <div class="content">
-                <div class="title m-b-md">
-                    Laravel
-                </div>
-
-                <button onclick="login()">Login</button>
-                <button onclick="logout()">Logout</button>
-
-                <div class="links">
-                    <a href="https://laravel.com/docs">Docs</a>
-                    <a href="https://laracasts.com">Laracasts</a>
-                    <a href="https://laravel-news.com">News</a>
-                    <a href="https://blog.laravel.com">Blog</a>
-                    <a href="https://nova.laravel.com">Nova</a>
-                    <a href="https://forge.laravel.com">Forge</a>
-                    <a href="https://vapor.laravel.com">Vapor</a>
-                    <a href="https://github.com/laravel/laravel">GitHub</a>
-                </div>
-            </div>
-        </div>
-
-    </body>
-    <script>
-
-        function login()
-        {
-
-            $.ajax({
-                method:'post',
-                url: 'http://e-arrahn.test/api/mobile/login',
-                data: {
-                    email : "afiqbasari@outlook.com",
-                    password : "Abc123"
-                },
-            success:function(data){
-                console.log(data);
-            }
-        });
-
-        }
-
-        function logout()
-        {
-            $.ajax({
-                method:'post',
-                url: 'http://e-arrahn.test/api/mobile/logout',
-                headers: {
-                    Authorization : "Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJhdWQiOiIxIiwianRpIjoiN2RiMTIxNjcwZDMxMzhkMDdkZTBmZGE0ODcwOGRkMDk2MTdlYzIyM2VkYjk5ZWE4ZTM5Mjg4YTk5YjQ4MDM3YjI0MWJjYzJkMWFmNzM3YzIiLCJpYXQiOjE2MDkyOTE5NzYsIm5iZiI6MTYwOTI5MTk3NiwiZXhwIjoxNjQwODI3OTc2LCJzdWIiOiIzOCIsInNjb3BlcyI6W119.XsDYDfxdb7DHHvF38nC7Mz-sKTZ1G5tLdHgOtdtPbK5-FaQyn9N4DuWsNjgLUS4gj2f3Hq4qojzCn8n3wunkLwA9WxguHKx2npvaw7lhyrLOLHeR2kpsnmHBN4xm9PHVjZyYJrdN6ud3rIfa01ZLRKiLcaPNEDIFpt6iPbemMa7bUTgUzQlKKgABwBcJeTgR5kqG79PP6j4twoysI6d03flugP5hkJOEnec-5zDOwIO8dbPcbkMOB4udJpSZ0CGcqqz7-8YXc_a-n_GRA3vRXjMh-3N58gLrw8RZv9Oj-A6l9KBoChJ7osLB47BcPppgdupzIsVGpmYaNfMisg6mbNVfml5x6WbhSv0xJ0fUvjQevuM3cLNQR4WZO_Y1YOCcDAyACvWSAUph8x53LXxZ-Z9tcBOZAWon1c5ISFTvwNhVn2zFTVH9iZddATOwRiapPwZxwZ2eZSlRqs6yiqBPC1BoVyhdxDG9AO4ua3QN-NIn7q16pqtEUmLcW2K9lVJXiz8Ux7nQSir1bn2UhiWjBA1mk2x9mTJpkWi_eRcG0rroqEEHNWIdfj0BJ27p2XGPo2u0dGYqXB5P9EKMs9d4_Px7q5Mo2euTaSsw8Z5gHXVvPk9eq9XBg0qkzlBe4VcH_ceyRO3oRSMra2Irl4tp2BuJB9Qleu1KVg4AxEgHlbA",
-                    Accept: "application/json",
-                    'Access-Control-Allow-Origin' : '*',
-                    'Access-Control-Allow-Methods':'GET,PUT,POST,DELETE,PATCH,OPTIONS'
-                },
-            success:function(data){
-                console.log(data);
-            }
-        });
-
-        }
-
-    </script>
-</html>