fix skti2

.env.example

@@ -15,7 +15,7 @@ DB_DATABASE=laravel
 DB_USERNAME=root
 DB_PASSWORD=
 
-BROADCAST_DRIVER=log
+BROADCAST_DRIVER=pusher
 CACHE_DRIVER=file
 FILESYSTEM_DRIVER=local
 QUEUE_CONNECTION=sync
@@ -43,10 +43,9 @@ AWS_DEFAULT_REGION=us-east-1
 AWS_BUCKET=
 AWS_USE_PATH_STYLE_ENDPOINT=false
 
-PUSHER_APP_ID=
+PUSHER_APP_ID=1132718
-PUSHER_APP_KEY=
+PUSHER_APP_KEY=26b0ec2f297f94b7aa9b
-PUSHER_APP_SECRET=
+PUSHER_APP_SECRET=421b61fb5a8ecce477a6
-PUSHER_APP_CLUSTER=mt1
 
 MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
 MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"

app/Events/NotifikasiKelulusan.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace App\Events;
+
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Broadcasting\InteractsWithSockets;
+use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
+
+class NotifikasiKelulusan implements ShouldBroadcast
+{
+  use Dispatchable, InteractsWithSockets, SerializesModels;
+
+  public $norujukan,$kelulusan,$siri,$komen,$teller;
+
+  public function __construct($norujukan,$kelulusan,$siri,$komen,$teller)
+  {
+      $this->norujukan = $norujukan;
+      $this->kelulusan = $kelulusan;
+      $this->siri = $siri;
+      $this->komen = $komen;
+      $this->teller = $teller;
+  }
+
+  public function broadcastOn()
+  {
+    return ['notice-kelulusan'];
+  }
+
+  public function broadcastAs()
+  {
+    return 'my-kelulusan';
+  }
+}

app/Http/Controllers/KelulusanController.php

@@ -34,7 +34,7 @@ class KelulusanController extends Controller
 
     public function updatekelulusan(Request $request)
     {
-        $auth_user = Auth::user();
+        // $auth_user = Auth::user();
         
         $api_url = config('api.url');
         

composer.json

@@ -14,6 +14,7 @@
         "laravel/tinker": "^2.5",
         "laravel/ui": "^3.3",
         "maatwebsite/excel": "^3.1",
+        "pusher/pusher-php-server": "^7.0",
         "rap2hpoutre/laravel-log-viewer": "^2.0",
         "tightenco/ziggy": "^1.4"
     },

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "6068f570311d494c60bf2d35abbae6b7",
+    "content-hash": "f2ed09714fff2849e484f480ad74451e",
     "packages": [
         {
             "name": "asm89/stack-cors",
@@ -2685,6 +2685,142 @@
             },
             "time": "2021-04-09T13:42:10+00:00"
         },
+        {
+            "name": "paragonie/random_compat",
+            "version": "v9.99.100",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/paragonie/random_compat.git",
+                "reference": "996434e5492cb4c3edcb9168db6fbb1359ef965a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/paragonie/random_compat/zipball/996434e5492cb4c3edcb9168db6fbb1359ef965a",
+                "reference": "996434e5492cb4c3edcb9168db6fbb1359ef965a",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">= 7"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "4.*|5.*",
+                "vimeo/psalm": "^1"
+            },
+            "suggest": {
+                "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes."
+            },
+            "type": "library",
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Paragon Initiative Enterprises",
+                    "email": "security@paragonie.com",
+                    "homepage": "https://paragonie.com"
+                }
+            ],
+            "description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7",
+            "keywords": [
+                "csprng",
+                "polyfill",
+                "pseudorandom",
+                "random"
+            ],
+            "support": {
+                "email": "info@paragonie.com",
+                "issues": "https://github.com/paragonie/random_compat/issues",
+                "source": "https://github.com/paragonie/random_compat"
+            },
+            "time": "2020-10-15T08:29:30+00:00"
+        },
+        {
+            "name": "paragonie/sodium_compat",
+            "version": "v1.17.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/paragonie/sodium_compat.git",
+                "reference": "ac994053faac18d386328c91c7900f930acadf1e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/paragonie/sodium_compat/zipball/ac994053faac18d386328c91c7900f930acadf1e",
+                "reference": "ac994053faac18d386328c91c7900f930acadf1e",
+                "shasum": ""
+            },
+            "require": {
+                "paragonie/random_compat": ">=1",
+                "php": "^5.2.4|^5.3|^5.4|^5.5|^5.6|^7|^8"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^3|^4|^5|^6|^7|^8|^9"
+            },
+            "suggest": {
+                "ext-libsodium": "PHP < 7.0: Better performance, password hashing (Argon2i), secure memory management (memzero), and better security.",
+                "ext-sodium": "PHP >= 7.0: Better performance, password hashing (Argon2i), secure memory management (memzero), and better security."
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "autoload.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "ISC"
+            ],
+            "authors": [
+                {
+                    "name": "Paragon Initiative Enterprises",
+                    "email": "security@paragonie.com"
+                },
+                {
+                    "name": "Frank Denis",
+                    "email": "jedisct1@pureftpd.org"
+                }
+            ],
+            "description": "Pure PHP implementation of libsodium; uses the PHP extension if it exists",
+            "keywords": [
+                "Authentication",
+                "BLAKE2b",
+                "ChaCha20",
+                "ChaCha20-Poly1305",
+                "Chapoly",
+                "Curve25519",
+                "Ed25519",
+                "EdDSA",
+                "Edwards-curve Digital Signature Algorithm",
+                "Elliptic Curve Diffie-Hellman",
+                "Poly1305",
+                "Pure-PHP cryptography",
+                "RFC 7748",
+                "RFC 8032",
+                "Salpoly",
+                "Salsa20",
+                "X25519",
+                "XChaCha20-Poly1305",
+                "XSalsa20-Poly1305",
+                "Xchacha20",
+                "Xsalsa20",
+                "aead",
+                "cryptography",
+                "ecdh",
+                "elliptic curve",
+                "elliptic curve cryptography",
+                "encryption",
+                "libsodium",
+                "php",
+                "public-key cryptography",
+                "secret-key cryptography",
+                "side-channel resistant"
+            ],
+            "support": {
+                "issues": "https://github.com/paragonie/sodium_compat/issues",
+                "source": "https://github.com/paragonie/sodium_compat/tree/v1.17.1"
+            },
+            "time": "2022-03-23T19:32:04+00:00"
+        },
         {
             "name": "phenx/php-font-lib",
             "version": "0.5.4",
@@ -3381,6 +3517,67 @@
             },
             "time": "2021-11-23T15:02:17+00:00"
         },
+        {
+            "name": "pusher/pusher-php-server",
+            "version": "7.0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/pusher/pusher-http-php.git",
+                "reference": "af3eeaefc0c7959f5b3852f0a4dd5547245d33df"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/pusher/pusher-http-php/zipball/af3eeaefc0c7959f5b3852f0a4dd5547245d33df",
+                "reference": "af3eeaefc0c7959f5b3852f0a4dd5547245d33df",
+                "shasum": ""
+            },
+            "require": {
+                "ext-curl": "*",
+                "ext-json": "*",
+                "guzzlehttp/guzzle": "^7.2",
+                "paragonie/sodium_compat": "^1.6",
+                "php": "^7.3|^8.0",
+                "psr/log": "^1.0|^2.0|^3.0"
+            },
+            "require-dev": {
+                "overtrue/phplint": "^2.3",
+                "phpunit/phpunit": "^8.5|^9.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "5.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Pusher\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Library for interacting with the Pusher REST API",
+            "keywords": [
+                "events",
+                "messaging",
+                "php-pusher-server",
+                "publish",
+                "push",
+                "pusher",
+                "real time",
+                "real-time",
+                "realtime",
+                "rest",
+                "trigger"
+            ],
+            "support": {
+                "issues": "https://github.com/pusher/pusher-http-php/issues",
+                "source": "https://github.com/pusher/pusher-http-php/tree/7.0.2"
+            },
+            "time": "2021-12-07T13:09:00+00:00"
+        },
         {
             "name": "ralouphie/getallheaders",
             "version": "3.0.3",

resources/js/Kelulusan/TableKelulusan.vue

@@ -1,8 +1,8 @@
 <template>
-    <div >
+<div>
-      <modal ref="modal"></modal>
+    <modal ref="modal"></modal>
 
-        <div class="bg-white md:items-center md:justify-between shadow rounded-lg p-4 md:p-6 xl:p-8 my-6">
+    <div v-if="this.showloader === true" class="bg-white md:items-center md:justify-between shadow rounded-lg p-4 md:p-6 xl:p-8 my-6">
 
         <template v-if="showkelulusan.data.length > 0">
             <div v-for="(kelulusan,index) in showkelulusan.data" :key="index" class="flex flex-wrap w-full">
@@ -22,19 +22,19 @@
                         <p class="w-1/4 text-sm text-gray-700">Margin: {{ kelulusan.kelulusanall[0].margin }}%</p>
                         <p class="w-1/4 text-sm text-gray-700">Berat: {{ kelulusan.kelulusanall[0].berat }} gm</p>
                     </div>
-                     <div class="flex flex-wrap">
+                    <div class="flex flex-wrap">
                         <p class="font-bold text-green-500 w-3/4">Komen: <span class="text-black font-normal text-md w-1/4">{{ kelulusan.kelulusanall[0].komen }}</span></p>
 
                     </div>
-                        <!-- <p class="font-bold text-xl">KB2210232-00032</p> -->
+                    <!-- <p class="font-bold text-xl">KB2210232-00032</p> -->
 
                     <div class="mx-auto flex justify-between mb-auto text-sm text-gray-500 mt-4">
                         <!-- 10 Jul 2018, 05:56PM -->
                         {{ kelulusan.kelulusanall[0].tarikh | moment("calendar") }}
 
                         <div class="pl-4">
-                            <button class="bg-yellow-500 hover:bg-yellow-700 text-white font-bold py-1 px-6 border border-green-700 rounded mr-1" @click.prevent="ApproveFunc"><i class="fas fa-thumbs-up mr-1 text-md"></i> Lulus</button>
+                            <button class="bg-yellow-500 hover:bg-yellow-700 text-white font-bold py-1 px-6 border border-yellow-500 rounded mr-1" @click.prevent="ApproveFunc"><i class="fas fa-thumbs-up mr-1 text-md"></i> Lulus</button>
-                            <button class="bg-red-500 hover:bg-red-700 text-white font-bold py-1 px-6 border border-red-700 rounded mr-1" @click.prevent="DisapproveFunc"><i class="fas fa-thumbs-down mr-1 text-md"></i> Tidak Lulus</button>
+                            <button class="bg-red-500 hover:bg-red-700 text-white font-bold py-1 px-6 border border-red-500 rounded mr-1" @click.prevent="DisapproveFunc"><i class="fas fa-thumbs-down mr-1 text-md"></i> Tidak Lulus</button>
                         </div>
                     </div>
                 </div>
@@ -51,61 +51,129 @@
             </div>
         </template>
 
-        </div>
-
     </div>
 
+</div>
 </template>
+
 <script>
 import modal from '../components/util/KomenModal.vue'
 import pagination from '../components/pagination.vue'
 
 const formatter = new Intl.NumberFormat('en-US', {
-  minimumFractionDigits: 2
+    minimumFractionDigits: 2
 });
 
 export default {
-  components: {
+    components: {
-    pagination,
+        pagination,
-    modal,
+        modal,
-    // deletemodal
+        // deletemodal
-    
+
-	},
+    },
-    data(){
+    data() {
-        return{
+        return {
-        currentPage: 1,
+            currentPage: 1,
-        showkelulusan:[],
+            showkelulusan: [],
-        paginate:{}
+            paginate: {},
+            showloader: false
         }
     },
     created() {
-    this.getKelulusanList(this.currentPage)
+        this.getKelulusanList(this.currentPage)
-	},
+    },
-    methods:{
+    methods: {
-        changeFormat: function(data){
+        changeFormat: function (data) {
             return formatter.format(data)
         },
-        getKelulusanList(pageNumber){
+        getKelulusanList(pageNumber) {
-            this.axios.get(this.$hostname + '/admin/ListOperasi/Paginate',{
+            this.axios.get('/api/check/ListOperasi/Paginate', {
                 params: {
-                page: pageNumber
+                    page: pageNumber
-            }
+                }
             }).then(response => {
                 this.showkelulusan = response.data
                 this.paginate = response.data
                 this.currentPage = pageNumber
+                this.showloader = true
             });
         },
-        ApproveFunc:function(){
+        ApproveFunc: async function () {
-            this.$refs.modal.showModal = true;
+            const {
+                value: katalaluan
+            } = await this.$swal({
+                title: 'Masukkan Katalaluan Semula',
+                input: 'password',
+                inputPlaceholder: 'Katalaluan',
+                confirmButtonText: 'Hantar',
+                showCancelButton: true,
+                cancelButtonText: 'Batal',
+                allowOutsideClick: false
+            })
+
+            const {
+                value: komen
+            } = await this.$swal({
+                title: 'Masukkan Komen',
+                input: 'text',
+                inputPlaceholder: 'Komen',
+                confirmButtonText: 'Hantar',
+                showCancelButton: true,
+                cancelButtonText: 'Batal',
+                allowOutsideClick: false
+            })
+
+            return this.axios.post('/api/check/kelulusan/operasi', {
+                norujukan: s,
+                komenkelulusan: s,
+                kodcaw: s,
+                namaoperasi: s,
+                teller: s,
+                siri:s
+            });
+
         },
-        DisapproveFunc:function(){
+        DisapproveFunc: async function () {
-            console.log('taklulus');
+
+            const {
+                value: katalaluan
+            } = await this.$swal({
+                title: 'Masukkan Katalaluan Semula',
+                input: 'password',
+                inputPlaceholder: 'Katalaluan',
+                confirmButtonText: 'Hantar',
+                showCancelButton: true,
+                cancelButtonText: 'Batal',
+                allowOutsideClick: false
+            })
+
+            const {
+                value: komen
+            } = await this.$swal({
+                title: 'Masukkan Komen',
+                input: 'text',
+                inputPlaceholder: 'Komen',
+                confirmButtonText: 'Hantar',
+                showCancelButton: true,
+                cancelButtonText: 'Batal',
+                allowOutsideClick: false
+            })
+
+            return this.axios.post('/api/check/kelulusan/operasi', {
+                norujukan: s,
+                komenkelulusan: s,
+                kodcaw: s,
+                namaoperasi: s,
+                teller: s,
+                siri,
+                pembatalan: "batal"
+            });
+
         },
-        RedirectHome:function(){
+        RedirectHome: function () {
             return window.location.href = '/';
         }
     }
-    
+
 }
-</script>
+</script>

resources/js/Permohonan/SenaraiMohon.vue

@@ -80,8 +80,6 @@
                     </p>
                 </td>
             </tr>
-                </tr> 
-            </tr>
 
             <tr v-for="(mohon,i) in showpermohonan.data" :key="i">
 

resources/js/pages/Detailspelanggan.vue

@@ -762,7 +762,7 @@ export default {
       }
     },
     getDataSenaraiSAG: function(pageNumber){
-      this.axios.get('http://localhost:8000/admin/customers/' + this.icnoasal + '/gadai/' + this.selected,{params: {
+      this.axios.get(this.$hostname + '/admin/customers/' + this.icnoasal + '/gadai/' + this.selected,{params: {
         page: pageNumber
       }}).then(response => {
         if(this.selected === 'belum_tebus')
@@ -793,7 +793,7 @@ export default {
 
     },
     searchsag: function(){
-      this.axios.get('http://localhost:8000/admin/customers/' + this.icnoasal + '/gadai/' + this.selected,{params: {
+      this.axios.get(this.$hostname + '/admin/customers/' + this.icnoasal + '/gadai/' + this.selected,{params: {
         page: 0,
         search: this.search
       }}).then(response => {

routes/api.php

@@ -26,5 +26,7 @@ Route::group(['prefix' => 'check'], function () {
 
     Route::get('/cawangan', 'App\Http\Controllers\CawanganController@list');
 
+    Route::put('/kelulusan/operasi', 'App\Http\Controllers\KelulusanController@updatekelulusan');
+
 
 });