Fix/gadai online details (#30)

Co-authored-by: afrina <afrina@koppkb.com>
Reviewed-on: #30

.env.example

@@ -50,3 +50,5 @@ MYKAD_READER_PORT=17321
 MYKAD_READER_ENABLED_CAWANGAN=''
 
 INTERNAL_NOTIFICATION_SECRET=
+
+LOGVIEWER_PASSWORD=

.env.production

@@ -7,6 +7,7 @@ APP_URL=https://ujrah.erahn.com.my
 API_URL=https://apiujrah.erahn.com.my
 
 LOG_CHANNEL=stack
+LOGVIEWER_PASSWORD="$2y$10$k7eiUyZdm3BruwAaT1gbmelTm.PPgZptOEQT1nlBjyiR84a4KBMlm"
 
 DB_CONNECTION=mysql
 DB_HOST=192.168.1.216

.env.staging

@@ -4,17 +4,14 @@ APP_VERSION=v2.2-staging
 APP_KEY=base64:O1XZDqK4H6+3GdrODgCaLr2l+OoWvgVhYr0GJ1KizW8=
 APP_DEBUG=true
 APP_URL=https://staging.erahn.com.my
+API_URL=https://api-staging.erahn.com.my
 
 HTTP_PORT=8091
 MYSQL_PUBLISH_PORT=3309
 
-API_URL=https://api-staging.erahn.com.my
-API_URL_KOOP=https://api-staging.erahn.com.my
-API_URL_PKB=https://api-staging.erahn.com.my
-API_ARRAHNBID=http://lelong.test/api/
-
 LOG_CHANNEL=stack
 LOG_LEVEL=debug
+LOGVIEWER_PASSWORD=test123
 
 DB_CONNECTION=mysql
 DB_HOST=mysql

.envy

@@ -1,50 +0,0 @@
-APP_NAME=Laravel
-APP_ENV=local
-APP_KEY=base64:WRTHcFTq5YARKVdA8YDUzsh9Ue8vD63ivgZgXNNBiGo=
-APP_DEBUG=true
-APP_URL=http://ujrahkopkb.erahn.com.my
-API_URL=http://apiujrah-kopkb.erahn.com.my
-#API_ARRAHNBID=http://lelong.test/api/
-
-LOG_CHANNEL=stack
-
-DB_CONNECTION=mysql
-DB_HOST=127.0.0.1
-DB_PORT=3306
-DB_DATABASE=kaunter_erahn
-DB_USERNAME=spider
-DB_PASSWORD=G0dz!ll4
-
-BROADCAST_DRIVER=pusher
-CACHE_DRIVER=file
-QUEUE_CONNECTION=sync
-SESSION_DRIVER=file
-SESSION_LIFETIME=120
-
-REDIS_HOST=127.0.0.1
-REDIS_PASSWORD=null
-REDIS_PORT=6379
-
-PUSHER_APP_ID=1132718
-PUSHER_APP_KEY=26b0ec2f297f94b7aa9b
-PUSHER_APP_SECRET=421b61fb5a8ecce477a6
-
-MAIL_MAILER=smtp
-MAIL_HOST=smtp.mailtrap.io
-MAIL_PORT=2525
-MAIL_USERNAME=null
-MAIL_PASSWORD=null
-MAIL_ENCRYPTION=null
-MAIL_FROM_ADDRESS=null
-MAIL_FROM_NAME="${APP_NAME}"
-
-AWS_ACCESS_KEY_ID=
-AWS_SECRET_ACCESS_KEY=
-AWS_DEFAULT_REGION=us-east-1
-AWS_BUCKET=
-
-MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
-MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
-
-MYKAD_READER_PORT=8085
-MYKAD_READER_ENABLED_CAWANGAN=''    # IF NO CAWANGAN STATED, ALL CAWANGAN IS ENABLED

.gitea/workflows/deploy-staging.yml

@@ -1,6 +1,9 @@
 name: Deploy to Staging
 
 on:
+  push:
+    tags:
+      - "v*"
   workflow_dispatch:
     inputs:
       image_tag:
@@ -18,10 +21,22 @@ jobs:
     runs-on: host
 
     steps:
+      - name: Resolve image tag
+        id: resolve
+        run: |
+          set -e
+          if [ "${{ gitea.event_name }}" = "workflow_dispatch" ]; then
+            IMAGE_TAG="${{ inputs.image_tag }}"
+          else
+            IMAGE_TAG="${{ gitea.ref_name }}"
+          fi
+          echo "IMAGE_TAG=${IMAGE_TAG}" >> "$GITHUB_OUTPUT"
+          echo "Deploying image tag: ${IMAGE_TAG}"
+
       - name: Checkout repository
         uses: actions/checkout@v4
         with:
-          ref: ${{ inputs.image_tag }}
+          ref: ${{ steps.resolve.outputs.IMAGE_TAG }}
 
       - name: Login to Docker registry
         run: |
@@ -33,28 +48,35 @@ jobs:
       - name: Verify image exists in registry
         run: |
           set -e
-          IMAGE_TAG="${{ inputs.image_tag }}"
+          IMAGE_TAG="${{ steps.resolve.outputs.IMAGE_TAG }}"
           IMAGE="${APP_IMAGE}:${IMAGE_TAG}"
 
           echo "Checking if image exists: ${IMAGE}"
-          if ! docker manifest inspect "${IMAGE}" > /dev/null 2>&1; then
-            echo "ERROR: Image ${IMAGE} does not exist in registry!"
-            echo "Run the Build Docker Image workflow first."
-            exit 1
-          fi
-          echo "✓ ${IMAGE} found"
+          # Tag pushes build in parallel — wait for the image to appear
+          for i in $(seq 1 30); do
+            if docker manifest inspect "${IMAGE}" > /dev/null 2>&1; then
+              echo "✓ ${IMAGE} found"
+              exit 0
+            fi
+            echo "Image not ready yet (attempt ${i}/30), waiting 20s..."
+            sleep 20
+          done
+
+          echo "ERROR: Image ${IMAGE} does not exist in registry after waiting!"
+          echo "Run the Build Docker Image workflow first."
+          exit 1
 
       - name: Pull Docker image
         run: |
           set -e
-          IMAGE_TAG="${{ inputs.image_tag }}"
+          IMAGE_TAG="${{ steps.resolve.outputs.IMAGE_TAG }}"
           docker pull "${APP_IMAGE}:${IMAGE_TAG}"
           echo "✓ Image pulled successfully"
 
       - name: Sync compose file and deploy
         run: |
           set -e
-          IMAGE_TAG="${{ inputs.image_tag }}"
+          IMAGE_TAG="${{ steps.resolve.outputs.IMAGE_TAG }}"
 
           mkdir -p "${DEPLOY_DIR}/docker/nginx" "${DEPLOY_DIR}/public"
           cp docker-compose.staging.yml "${DEPLOY_DIR}/docker-compose.yml"
@@ -62,15 +84,12 @@ jobs:
           find "${DEPLOY_DIR}/public" -mindepth 1 -delete
           cp -R public/. "${DEPLOY_DIR}/public/"
 
-          if [ ! -f "${DEPLOY_DIR}/.env.staging" ]; then
-            if [ -f .env.staging ]; then
-              cp .env.staging "${DEPLOY_DIR}/.env.staging"
-              echo "Copied .env.staging from repo (first deploy). Edit ${DEPLOY_DIR}/.env.staging on the server if needed."
-            else
-              echo "ERROR: ${DEPLOY_DIR}/.env.staging is missing on the server"
-              exit 1
-            fi
+          if [ ! -f .env.staging ]; then
+            echo "ERROR: .env.staging is missing in the repository"
+            exit 1
           fi
+          cp .env.staging "${DEPLOY_DIR}/.env.staging"
+          echo "✓ Synced .env.staging from repo"
 
           cd "${DEPLOY_DIR}"
 

app/Http/Controllers/Auth/LoginController.php

@@ -5,15 +5,12 @@ namespace App\Http\Controllers\Auth;
 use App\Http\Controllers\Controller;
 use App\Providers\RouteServiceProvider;
 use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Session;
-use Illuminate\Support\Facades\Redirect;
 use Illuminate\Foundation\Auth\AuthenticatesUsers;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Http;
 
 use App\Dashboard;
 use App\User;
-use Carbon\Carbon;
 
 class LoginController extends Controller
 {
@@ -144,25 +141,26 @@ class LoginController extends Controller
         }
     }
 
-    public function logout(){
-        $current = Carbon::now();
-        $current = new Carbon();
-        $current = $current->toDateString();
+    public function logout(Request $request)
+    {
         $auth_user = Auth::guard('web')->user();
-        Auth::logout();
-        Session::flush();
-        $session = Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url') . '/api/logoutsession/' . $auth_user['cawangan'], [
-            'id' => $auth_user['id'],
-            'nama' => $auth_user['name'],
-            'nokp' => $auth_user['no_kp'],
-            'email' => $auth_user['email'],
-            'taraf' => $auth_user['role_harian'],
-            'tarikh' => $current,
-            
 
-        ]);
+        Auth::guard('web')->logout();
+        $request->session()->invalidate();
+        $request->session()->regenerateToken();
 
-        return Redirect::to('/');
+        if ($auth_user) {
+            Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url') . '/api/logoutsession/' . $auth_user['cawangan'], [
+                'id' => $auth_user['id'],
+                'nama' => $auth_user['name'],
+                'nokp' => $auth_user['no_kp'],
+                'email' => $auth_user['email'],
+                'taraf' => $auth_user['role_harian'],
+                'tarikh' => now()->toDateString(),
+            ]);
+        }
+
+        return redirect('/');
     }
 
     public function GetRolesHarian(Request $request, $kodcaw){

app/Http/Controllers/GadaianController.php

@@ -680,7 +680,11 @@ class GadaianController extends Controller
         $kuantiti = $gadai_detail['pinjaman'] / $komoditi['nilai'];
 
         if ($gadai_detail['tagbaru'] == 1) {
-            return view('print.sag_ujrah_3', compact('komoditi', 'product', 'kuantiti', 'gadai_detail', 'customer_detail', 'marhun_detail', 'cawangan_detail', 'api_url', 'pembayaran_segera', 'auth_username', 'mutu', 'kadar_ujrah', 'kakitangan'));
+            $cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])
+                ->get($api_url . '/api/cawangan/' . $kodcaw)->json();
+            $pembiayaanOnlineEnabled = !empty(($cawangan_info['features'] ?? [])['pembiayaan_online']);
+
+            return view('print.sag_ujrah_3', compact('komoditi', 'product', 'kuantiti', 'gadai_detail', 'customer_detail', 'marhun_detail', 'cawangan_detail', 'api_url', 'pembayaran_segera', 'auth_username', 'mutu', 'kadar_ujrah', 'kakitangan'))->with('pembiayaanOnlineEnabled', $pembiayaanOnlineEnabled);
         } else {
             return view('print.sag', compact('gadai_detail', 'customer_detail', 'marhun_detail', 'cawangan_detail', 'api_url', 'pembayaran_segera', 'auth_username', 'mutu', 'kakitangan'));
         }

app/Http/Controllers/PembiayaanOnlineController.php

@@ -156,7 +156,6 @@ class PembiayaanOnlineController extends Controller
             'kodbank' => $request->input('kodbank'),
             'noakaun' => $request->input('noakaun'),
             'nama_bank' => $request->input('nama_bank'),
-            'nama_akaun' => $request->input('nama_akaun'),
             'nota' => $request->input('nota'),
             'update_customer_bank' => true,
         ];
@@ -174,6 +173,19 @@ class PembiayaanOnlineController extends Controller
             $payload['bukti_akaun_type'] = $file->getMimeType() ?: 'application/octet-stream';
         }
 
+        if ($request->hasFile('borang')) {
+            $file = $request->file('borang');
+            if (!$file->isValid()) {
+                return redirect()->back()->with('error', 'Fail borang pengesahan tidak sah.');
+            }
+            if ($file->getSize() > 4 * 1024 * 1024) {
+                return redirect()->back()->with('error', 'Saiz fail maksimum 4MB.');
+            }
+            $payload['borang_data'] = base64_encode(file_get_contents($file->getRealPath()));
+            $payload['borang_filename'] = $file->getClientOriginalName();
+            $payload['borang_type'] = $file->getMimeType() ?: 'application/octet-stream';
+        }
+
         $res = $this->api()
             ->asForm()
             ->put($api_url . '/api/pembiayaan-online/' . $kodcaw . '/lines/' . $id, $payload);
@@ -394,6 +406,22 @@ class PembiayaanOnlineController extends Controller
         return $this->streamBase64File($file, 'slip-bank-' . $id);
     }
 
+    /**
+     * PC: view uploaded Borang Pengesahan Penerimaan Pembiayaan Secara Atas Talian.
+     */
+    public function viewBorang($id)
+    {
+        $this->abortUnlessPembiayaanOnline();
+        return $this->streamLineFile(
+            $this->kodcaw(),
+            $id,
+            '/borang',
+            'Borang pengesahan tidak dijumpai.',
+            'Fail borang pengesahan kosong.',
+            'borang-pengesahan-' . $id
+        );
+    }
+
     /**
      * PC: view SAG for a queue line (does not mark SAG as printed).
      */
@@ -426,6 +454,21 @@ class PembiayaanOnlineController extends Controller
         return $this->streamBase64File($file, 'slip-bank-' . $id);
     }
 
+    /**
+     * Operasi: view uploaded Borang Pengesahan Penerimaan Pembiayaan Secara Atas Talian.
+     */
+    public function operasiViewBorang($kodcaw, $id)
+    {
+        return $this->streamLineFile(
+            $kodcaw,
+            $id,
+            '/borang',
+            'Borang pengesahan tidak dijumpai.',
+            'Fail borang pengesahan kosong.',
+            'borang-pengesahan-' . $id
+        );
+    }
+
     /**
      * Operasi: view SAG for a batch line.
      */
@@ -434,6 +477,26 @@ class PembiayaanOnlineController extends Controller
         return $this->renderLineSag($kodcaw, $id);
     }
 
+    protected function streamLineFile($kodcaw, $id, $path, $missingMessage, $emptyMessage, $fallbackName)
+    {
+        $res = $this->api()
+            ->get(config('api.url') . '/api/pembiayaan-online/' . $kodcaw . '/lines/' . $id . $path);
+
+        if (!$res->successful()) {
+            $body = $res->json();
+            $msg = is_array($body) && isset($body['message']) ? $body['message'] : $missingMessage;
+            return redirect()->back()->with('error', $msg);
+        }
+
+        $payload = $res->json();
+        $file = $payload['file'] ?? null;
+        if (!$file || empty($file['data'])) {
+            return redirect()->back()->with('error', $emptyMessage);
+        }
+
+        return $this->streamBase64File($file, $fallbackName);
+    }
+
     protected function streamBase64File(array $file, $fallbackName)
     {
         $raw = $file['data'];
@@ -533,6 +596,10 @@ class PembiayaanOnlineController extends Controller
         $kuantiti = $nilai > 0 ? ((float) ($gadai_detail['pinjaman'] ?? 0) / $nilai) : 0;
 
         if (($gadai_detail['tagbaru'] ?? 0) == 1) {
+            $cawangan_info = $this->api()
+                ->get($api_url . '/api/cawangan/' . $kodcaw)->json();
+            $pembiayaanOnlineEnabled = !empty(($cawangan_info['features'] ?? [])['pembiayaan_online']);
+
             return view('print.sag_ujrah_3', compact(
                 'komoditi',
                 'product',
@@ -547,7 +614,7 @@ class PembiayaanOnlineController extends Controller
                 'mutu',
                 'kadar_ujrah',
                 'kakitangan'
-            ));
+            ))->with('pembiayaanOnlineEnabled', $pembiayaanOnlineEnabled);
         }
 
         return view('print.sag', compact(

app/Http/Middleware/LogViewerPassword.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+
+class LogViewerPassword
+{
+    public function handle($request, Closure $next)
+    {
+        $passwordHash = config('logviewer.password');
+
+        if (!is_string($passwordHash) || $passwordHash === '') {
+            return response('Akses log belum dikonfigurasi.', 503)
+                ->header('Cache-Control', 'no-store');
+        }
+
+        $provided = $request->getPassword();
+        if ($request->getUser() !== 'logviewer' || !is_string($provided) ||
+            !password_verify($provided, $passwordHash)) {
+            return response('Kata laluan diperlukan untuk mengakses log.', 401, [
+                'WWW-Authenticate' => 'Basic realm="Log Viewer", charset="UTF-8"',
+                'Cache-Control' => 'no-store',
+            ]);
+        }
+
+        $response = $next($request);
+        $response->headers->set('Cache-Control', 'no-store');
+
+        return $response;
+    }
+}

app/Http/Middleware/RoleAccess.php

@@ -44,6 +44,12 @@ class RoleAccess
                         return $next($request);
                     }
                     break;
+
+                case 'masteradmin':
+                    if ($userRole == 'masteradmin') {
+                        return $next($request);
+                    }
+                    break;
                     
                 case 'penilai':
                     if ($userRole == 'penilai') {

config/logviewer.php

@@ -1,6 +1,7 @@
 <?php
 
 return [
+    'password' => env('LOGVIEWER_PASSWORD'),
     /*
     |--------------------------------------------------------------------------
     | Pattern and storage path settings

docker-compose.yml

@@ -5,6 +5,8 @@ services:
       dockerfile: docker/php/Dockerfile
       target: development
     working_dir: /var/www/html
+    ports:
+      - "8081:8000"
     volumes:
       - ./:/var/www/html:cached
     environment:
@@ -15,16 +17,7 @@ services:
       - "host.docker.internal:host-gateway"
     depends_on:
       - mysql
-
-  web:
-    image: nginx:1.25-alpine
-    ports:
-      - "8081:80"
-    volumes:
-      - ./:/var/www/html:cached
-      - ./docker/nginx/default.conf:/etc/nginx/conf.d/default.conf:ro
-    depends_on:
-      - app
+    command: ["php", "artisan", "serve", "--host=0.0.0.0", "--port=8000"]
 
   mysql:
     image: mysql:8.0

env.docker.example/base.env

@@ -1,50 +0,0 @@
-APP_NAME=Laravel
-APP_ENV=local
-APP_KEY=base64:FFRogE6mJj8FaDSSHl/KpXpzqi2M+P4plxVSRgVM8JI=
-APP_DEBUG=true
-APP_URL=http://kaunterv2.localhost
-API_URL=http://apiv2.localhost
-API_ARRAHNBID=http://lelong.localhost/api/
-
-LOG_CHANNEL=stack
-
-DB_CONNECTION=mysql
-DB_HOST=database_zone2
-DB_PORT=3306
-DB_DATABASE=kaunterpkb
-DB_USERNAME=root
-DB_PASSWORD=secret
-
-BROADCAST_DRIVER=pusher
-CACHE_DRIVER=file
-QUEUE_CONNECTION=sync
-SESSION_DRIVER=file
-SESSION_LIFETIME=120
-
-REDIS_HOST=127.0.0.1
-REDIS_PASSWORD=null
-REDIS_PORT=6379
-
-PUSHER_APP_ID=1132718
-PUSHER_APP_KEY=26b0ec2f297f94b7aa9b
-PUSHER_APP_SECRET=421b61fb5a8ecce477a6
-
-MAIL_MAILER=smtp
-MAIL_HOST=smtp.mailtrap.io
-MAIL_PORT=2525
-MAIL_USERNAME=null
-MAIL_PASSWORD=null
-MAIL_ENCRYPTION=null
-MAIL_FROM_ADDRESS=null
-MAIL_FROM_NAME="${APP_NAME}"
-
-AWS_ACCESS_KEY_ID=
-AWS_SECRET_ACCESS_KEY=
-AWS_DEFAULT_REGION=us-east-1
-AWS_BUCKET=
-
-MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
-MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
-
-MYKAD_READER_PORT=8085
-MYKAD_READER_ENABLED_CAWANGAN=''    # IF NO CAWANGAN STATED, ALL CAWANGAN IS ENABLED

env.docker.example/kgmk.env

@@ -1,50 +0,0 @@
-APP_NAME=Laravel
-APP_ENV=local
-APP_KEY=base64:FFRogE6mJj8FaDSSHl/KpXpzqi2M+P4plxVSRgVM8JI=
-APP_DEBUG=true
-APP_URL=http://kaunterv2.localhost
-API_URL=http://apiv2.kgmk.localhost
-API_ARRAHNBID=http://lelong.localhost/api/
-
-LOG_CHANNEL=stack
-
-DB_CONNECTION=mysql
-DB_HOST=database_zone_franchise
-DB_PORT=3306
-DB_DATABASE=kaunter_koopguru
-DB_USERNAME=root
-DB_PASSWORD=secret
-
-BROADCAST_DRIVER=pusher
-CACHE_DRIVER=file
-QUEUE_CONNECTION=sync
-SESSION_DRIVER=file
-SESSION_LIFETIME=120
-
-REDIS_HOST=127.0.0.1
-REDIS_PASSWORD=null
-REDIS_PORT=6379
-
-PUSHER_APP_ID=1132718
-PUSHER_APP_KEY=26b0ec2f297f94b7aa9b
-PUSHER_APP_SECRET=421b61fb5a8ecce477a6
-
-MAIL_MAILER=smtp
-MAIL_HOST=smtp.mailtrap.io
-MAIL_PORT=2525
-MAIL_USERNAME=null
-MAIL_PASSWORD=null
-MAIL_ENCRYPTION=null
-MAIL_FROM_ADDRESS=null
-MAIL_FROM_NAME="${APP_NAME}"
-
-AWS_ACCESS_KEY_ID=
-AWS_SECRET_ACCESS_KEY=
-AWS_DEFAULT_REGION=us-east-1
-AWS_BUCKET=
-
-MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
-MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
-
-MYKAD_READER_PORT=8085
-MYKAD_READER_ENABLED_CAWANGAN=''    # IF NO CAWANGAN STATED, ALL CAWANGAN IS ENABLED

env.docker.example/krk.env

@@ -1,50 +0,0 @@
-APP_NAME=Laravel
-APP_ENV=local
-APP_KEY=base64:FFRogE6mJj8FaDSSHl/KpXpzqi2M+P4plxVSRgVM8JI=
-APP_DEBUG=true
-APP_URL=http://kaunterv2.localhost
-API_URL=http://apiv2.krk.localhost
-API_ARRAHNBID=http://lelong.localhost/api/
-
-LOG_CHANNEL=stack
-
-DB_CONNECTION=mysql
-DB_HOST=database_zone_franchise
-DB_PORT=3306
-DB_DATABASE=kaunter_krk
-DB_USERNAME=root
-DB_PASSWORD=secret
-
-BROADCAST_DRIVER=pusher
-CACHE_DRIVER=file
-QUEUE_CONNECTION=sync
-SESSION_DRIVER=file
-SESSION_LIFETIME=120
-
-REDIS_HOST=127.0.0.1
-REDIS_PASSWORD=null
-REDIS_PORT=6379
-
-PUSHER_APP_ID=1132718
-PUSHER_APP_KEY=26b0ec2f297f94b7aa9b
-PUSHER_APP_SECRET=421b61fb5a8ecce477a6
-
-MAIL_MAILER=smtp
-MAIL_HOST=smtp.mailtrap.io
-MAIL_PORT=2525
-MAIL_USERNAME=null
-MAIL_PASSWORD=null
-MAIL_ENCRYPTION=null
-MAIL_FROM_ADDRESS=null
-MAIL_FROM_NAME="${APP_NAME}"
-
-AWS_ACCESS_KEY_ID=
-AWS_SECRET_ACCESS_KEY=
-AWS_DEFAULT_REGION=us-east-1
-AWS_BUCKET=
-
-MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
-MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
-
-MYKAD_READER_PORT=8085
-MYKAD_READER_ENABLED_CAWANGAN=''    # IF NO CAWANGAN STATED, ALL CAWANGAN IS ENABLED

resources/views/customers/v2/info.blade.php

@@ -801,9 +801,12 @@
             }
         });
 
+        var pembiayaanOnlineEnabled = @json(!empty(($cawangan_info['features'] ?? [])['pembiayaan_online']));
+
         var tablegadai = initErahnDatatable('#myTable', {
             order: [[1, 'desc']],
             columnDefs: [
+                { targets: 2, visible: pembiayaanOnlineEnabled, className: pembiayaanOnlineEnabled ? '' : 'no-export' },
                 { targets: 0, orderable: false, width: '40px' },
                 { targets: -1, orderable: false, searchable: false, width: '70px' }
             ]
@@ -811,6 +814,7 @@
 
         var xtawarruq = initErahnDatatable('#xtawarruq', {
             columnDefs: [
+                { targets: 2, visible: pembiayaanOnlineEnabled, className: pembiayaanOnlineEnabled ? '' : 'no-export' },
                 { targets: 0, orderable: false, width: '40px' }
             ]
         });
@@ -2067,7 +2071,8 @@
             harini.setHours(0, 0, 0, 0);
 
             if ($("input[name='options']:checked").val() == 'belum_tebus') {
-                let test1 = $('input[name="belum"]:checked').closest('tr').children('td:eq(3)').text();
+                let selectedRow = $('input[name="belum"]:checked').closest('tr');
+                let test1 = selectedRow.length ? selectedRow.closest('table').DataTable().row(selectedRow).data()[3] : '';
                 let tarikhgadai2 = new Date(test1);
                 tarikhgadai2.setHours(0, 0, 0, 0);
                 if (+harini !== +tarikhgadai2) {
@@ -2484,7 +2489,8 @@
             }
 
             if ($("input[name='options']:checked").val() == 'belum_tebus') {
-                let test1 = $('input[name="belum"]:checked').closest('tr').children('td:eq(3)').text();
+                let selectedRow = $('input[name="belum"]:checked').closest('tr');
+                let test1 = selectedRow.length ? selectedRow.closest('table').DataTable().row(selectedRow).data()[3] : '';
                 let tarikhgadai2 = new Date(test1);
                 tarikhgadai2.setHours(0, 0, 0, 0);
 

resources/views/pembiayaan_online/operasi/batch.blade.php

@@ -74,7 +74,7 @@
                         id="batch_lines"
                         class="table-sm text-center"
                         :filename="'Batch_' . ($batch['batch_no'] ?? $batch['id'])"
-                        :columns="['Bil', 'Status', 'SAG', 'Pelanggan', 'No KP', 'Bank', 'No Akaun', 'Nama Akaun', 'Pinjaman (RM)', 'Rujukan Bayaran', 'Dokumen', 'Tindakan']"
+                        :columns="['Bil', 'Status', 'SAG', 'Pelanggan', 'No KP', 'Bank', 'No Akaun', 'Pinjaman (RM)', 'Rujukan Bayaran', 'Dokumen', 'Tindakan']"
                         :skipExport="['Dokumen', 'Tindakan']"
                     >
                         @foreach($lines as $line)
@@ -94,7 +94,6 @@
                                 <td>{{ $line['nokp'] ?? '-' }}</td>
                                 <td>{{ $line['nama_bank'] ?? $line['kodbank'] ?? '-' }}</td>
                                 <td>{{ $line['noakaun'] ?? '-' }}</td>
-                                <td class="text-left">{{ $line['nama_akaun'] ?? '-' }}</td>
                                 <td class="text-right">{{ number_format((float)($line['pinjaman'] ?? 0), 2) }}</td>
                                 <td>{{ $line['no_rujukan_bayaran'] ?? '-' }}</td>
                                 <td class="text-nowrap">
@@ -113,6 +112,13 @@
                                     @else
                                         <span class="text-muted small">Tiada slip</span>
                                     @endif
+                                    @if(!empty($line['borang_file_id']))
+                                        <a class="btn btn-sm btn-outline-primary"
+                                           href="{{ route('pembiayaan.online.operasi.borang', ['kodcaw' => $kodcaw, 'id' => $line['id']]) }}"
+                                           target="_blank">
+                                            Borang Pengesahan
+                                        </a>
+                                    @endif
                                 </td>
                                 <td class="text-nowrap">
                                     @if(in_array($st, ['IN_BATCH', 'OPS_REVIEW'], true))

resources/views/pembiayaan_online/pc/batch.blade.php

@@ -70,6 +70,13 @@
                                         @else
                                             <span class="text-muted small">Tiada slip</span>
                                         @endif
+                                        @if(!empty($line['borang_file_id']))
+                                            <a class="btn btn-sm btn-outline-primary"
+                                               href="{{ route('pembiayaan.online.pc.borang', ['id' => $line['id']]) }}"
+                                               target="_blank">
+                                                Borang Pengesahan
+                                            </a>
+                                        @endif
                                     </td>
                                 </tr>
                             @endforeach

resources/views/pembiayaan_online/pc/senarai.blade.php

@@ -274,11 +274,11 @@
                                                             data-nokp="{{ $line['nokp'] ?? '' }}"
                                                             data-namabank="{{ $line['nama_bank'] ?? $line['kodbank'] ?? '' }}"
                                                             data-noakaun="{{ $line['noakaun'] ?? '' }}"
-                                                            data-namaakaun="{{ $line['nama_akaun'] ?? '' }}"
                                                             data-pinjaman="{{ number_format((float)($line['pinjaman'] ?? 0), 2) }}"
                                                             data-nota="{{ $line['nota'] ?? '' }}"
                                                             data-sebab="{{ $line['reject_reason'] ?? '' }}"
-                                                            data-bukti-akaun="{{ $line['bukti_akaun_file_id'] ?? '' }}">
+                                                            data-bukti-akaun="{{ $line['bukti_akaun_file_id'] ?? '' }}"
+                                                            data-borang-file="{{ $line['borang_file_id'] ?? '' }}">
                                                         Semak
                                                     </button>
                                                 @endif
@@ -286,11 +286,11 @@
                                                     data-id="{{ $line['id'] }}"
                                                     data-kodbank="{{ $line['kodbank'] ?? '' }}"
                                                     data-noakaun="{{ $line['noakaun'] ?? '' }}"
-                                                    data-namaakaun="{{ $line['nama_akaun'] ?? '' }}"
                                                     data-namabank="{{ $line['nama_bank'] ?? '' }}"
                                                     data-nota="{{ $line['nota'] ?? '' }}"
                                                     data-norujukan="{{ $line['norujukan'] ?? '' }}"
-                                                    data-bukti-akaun="{{ $line['bukti_akaun_file_id'] ?? '' }}">
+                                                    data-bukti-akaun="{{ $line['bukti_akaun_file_id'] ?? '' }}"
+                                                    data-borang-file="{{ $line['borang_file_id'] ?? '' }}">
                                                     Edit
                                                 </button>
                                             </td>
@@ -390,10 +390,6 @@
                                 <label>No. Akaun</label>
                                 <input type="text" name="noakaun" id="editNoakaun" class="form-control" required>
                             </div>
-                            <div class="form-group">
-                                <label>Nama Akaun</label>
-                                <input type="text" name="nama_akaun" id="editNamaakaun" class="form-control">
-                            </div>
                             <div class="form-group">
                                 <label>Slip Bank / Bukti Akaun</label>
                                 <input type="file" name="bukti_akaun" id="editBuktiAkaun" class="form-control-file"
@@ -405,6 +401,17 @@
                                 </div>
                                 <small class="text-muted">PDF / imej slip akaun bank pelanggan (maks 4MB)</small>
                             </div>
+                            <div class="form-group">
+                                <label>Borang Pengesahan Penerimaan Pembiayaan Secara Atas Talian (Online)</label>
+                                <input type="file" name="borang" id="editBorang" class="form-control-file"
+                                       accept=".pdf,.jpg,.jpeg,.png,.gif">
+                                <div id="editBorangExisting" class="mt-2" style="display:none;">
+                                    <a href="#" id="editBorangLink" class="btn btn-sm btn-outline-primary" target="_blank">
+                                        Lihat borang sedia ada
+                                    </a>
+                                </div>
+                                <small class="text-muted">PDF / imej borang yang ditandatangani pelanggan (maks 4MB). Kosongkan jika tidak mahu ganti fail sedia ada.</small>
+                            </div>
                             <div class="form-group">
                                 <label>Nota</label>
                                 <textarea name="nota" id="editNota" class="form-control" rows="2"></textarea>
@@ -462,10 +469,6 @@
                                     <th>No Akaun</th>
                                     <td id="verifyNoakaun"></td>
                                 </tr>
-                                <tr>
-                                    <th>Nama Akaun</th>
-                                    <td id="verifyNamaakaun"></td>
-                                </tr>
                                 <tr>
                                     <th>Pinjaman</th>
                                     <td>RM <span id="verifyPinjaman"></span></td>
@@ -485,9 +488,12 @@
                                     Saya sahkan maklumat pelanggan, bank dan amaun adalah betul.
                                 </label>
                             </div>
-                            <a href="#" id="verifyBuktiAkaunLink" class="btn btn-sm btn-outline-primary" target="_blank" style="display:none;">
+                            <a href="#" id="verifyBuktiAkaunLink" class="btn btn-sm btn-outline-primary mb-2" target="_blank" style="display:none;">
                                 Lihat Bukti Akaun Bank
                             </a>
+                            <a href="#" id="verifyBorangLink" class="btn btn-sm btn-outline-primary" target="_blank" style="display:none;">
+                                Lihat Borang Pengesahan
+                            </a>
                         </div>
                         <div class="col-md-8">
                             <label class="d-block">Pratonton SAG</label>
@@ -576,7 +582,6 @@
         $('#verifyNokp').text($(this).data('nokp') || '-');
         $('#verifyBank').text($(this).data('namabank') || '-');
         $('#verifyNoakaun').text($(this).data('noakaun') || '-');
-        $('#verifyNamaakaun').text($(this).data('namaakaun') || '-');
         $('#verifyPinjaman').text($(this).data('pinjaman') || '0.00');
         $('#verifyNota').text($(this).data('nota') || '-');
         if (sebab) {
@@ -592,6 +597,11 @@
         } else {
             $('#verifyBuktiAkaunLink').hide();
         }
+        if ($(this).data('borangFile')) {
+            $('#verifyBorangLink').attr('href', "{{ url('/pembiayaan-online/pc/lines') }}/" + id + "/borang").show();
+        } else {
+            $('#verifyBorangLink').hide();
+        }
         $('#verifyModal').modal('show');
     });
 
@@ -605,10 +615,10 @@
         $('#editNorujukan').text($(this).data('norujukan'));
         $('#editKodbank').val($(this).data('kodbank'));
         $('#editNoakaun').val($(this).data('noakaun'));
-        $('#editNamaakaun').val($(this).data('namaakaun'));
         $('#editNamabank').val($(this).data('namabank'));
         $('#editNota').val($(this).data('nota'));
         $('#editBuktiAkaun').val('');
+        $('#editBorang').val('');
         $('#editSagFrame').attr('src', "{{ url('/pembiayaan-online/pc/lines') }}/" + id + "/sag");
         if ($(this).data('buktiAkaun')) {
             $('#editBuktiAkaunLink').attr('href', "{{ url('/pembiayaan-online/pc/lines') }}/" + id + "/bukti-akaun");
@@ -616,6 +626,12 @@
         } else {
             $('#editBuktiAkaunExisting').hide();
         }
+        if ($(this).data('borangFile')) {
+            $('#editBorangLink').attr('href', "{{ url('/pembiayaan-online/pc/lines') }}/" + id + "/borang");
+            $('#editBorangExisting').show();
+        } else {
+            $('#editBorangExisting').hide();
+        }
         $('#editModal').modal('show');
     });
 

resources/views/print/borang_batch_pembiayaan_online.blade.php

@@ -258,7 +258,7 @@
                         <th style="width:13%">No. KP</th>
                         <th style="width:11%">Bank</th>
                         <th style="width:13%">No. Akaun</th>
-                        <th>Nama Akaun</th>
+                        <th>No. Telefon</th>
                         <th style="width:12%">Pinjaman (RM)</th>
                     </tr>
                 </thead>
@@ -271,7 +271,7 @@
                             <td class="num">{{ $line['nokp'] ?? '-' }}</td>
                             <td>{{ $line['nama_bank'] ?? ($line['kodbank'] ?? '-') }}</td>
                             <td class="num">{{ $line['noakaun'] ?? '-' }}</td>
-                            <td>{{ $line['nama_akaun'] ?? '-' }}</td>
+                            <td>{{ !empty($line['telefon']) ? $line['telefon'] : '-' }}</td>
                             <td class="amt">{{ number_format((float) ($line['pinjaman'] ?? 0), 2) }}</td>
                         </tr>
                     @empty
@@ -306,7 +306,7 @@
 
         <div class="signs">
             <div class="sign-box">
-                <div class="role">Tandatangan Operasi</div>
+                <div class="role">Disemak oleh</div>
                 <div class="sign-line">
                     <p>Nama: {{ $opsBy }}</p>
                     <p>Jawatan: Operasi</p>
@@ -314,10 +314,10 @@
                 </div>
             </div>
             <div class="sign-box">
-                <div class="role">Pengurus Besar</div>
+                <div class="role">Disahkan oleh</div>
                 <div class="sign-line">
                     <p>Nama:</p>
-                    <p>Cop:</p>
+                    <p>Jawatan:</p>
                     <p>Tarikh:</p>
                 </div>
             </div>

resources/views/print/sag_ujrah_3.blade.php

@@ -2112,6 +2112,7 @@
     </div>
     <div class="main-page" style="font-family: Arial, Helvetica, sans-serif;">
         <div class="sub-page" style="font-size: 11px;">
+            @if ($pembiayaanOnlineEnabled ?? false)
             @php
                 $caraTerimaBayaran = strtoupper(trim((string) ($gadai_detail['cara_terima'] ?? '')));
             @endphp
@@ -2128,6 +2129,7 @@
                     </span>
                 </div>
             </div>
+            @endif
             {{-- HEADER SECTION --}}
             <table style="width: 100%; margin-top: 0;">
                 <tr style="vertical-align: top;">

routes/web.php

@@ -63,7 +63,13 @@ Route::get('test', function () {
     return "event test je";
 });
 
-Route::get('logs', '\Rap2hpoutre\LaravelLogViewer\LogViewerController@index');
+Route::get('logs', '\Rap2hpoutre\LaravelLogViewer\LogViewerController@index')
+    ->middleware([
+        'auth',
+        'role:admin,masteradmin,operasi',
+        'throttle:10,1',
+        \App\Http\Middleware\LogViewerPassword::class,
+    ]);
 Route::get('change-password', ['as'=>'user.password','uses'=>'ChangePasswordController@index']);
 Route::post('change-password', ['as'=>'change.password','uses'=>'ChangePasswordController@store']);
 
@@ -206,6 +212,7 @@ Route::put('/pembiayaan-online/pc/lines/{id}',['as'=>'pembiayaan.online.pc.updat
 Route::post('/pembiayaan-online/pc/lines/{id}/verify',['as'=>'pembiayaan.online.pc.verify','uses'=>'PembiayaanOnlineController@verifyLine'])->middleware('auth','khazanah');
 Route::post('/pembiayaan-online/pc/lines/{id}/unverify',['as'=>'pembiayaan.online.pc.unverify','uses'=>'PembiayaanOnlineController@unverifyLine'])->middleware('auth','khazanah');
 Route::get('/pembiayaan-online/pc/lines/{id}/bukti-akaun',['as'=>'pembiayaan.online.pc.bukti.akaun','uses'=>'PembiayaanOnlineController@viewBuktiAkaun'])->middleware('auth','khazanah');
+Route::get('/pembiayaan-online/pc/lines/{id}/borang',['as'=>'pembiayaan.online.pc.borang','uses'=>'PembiayaanOnlineController@viewBorang'])->middleware('auth','khazanah');
 Route::get('/pembiayaan-online/pc/lines/{id}/sag',['as'=>'pembiayaan.online.pc.sag','uses'=>'PembiayaanOnlineController@viewSag'])->middleware('auth','khazanah');
 Route::post('/pembiayaan-online/pc/batches/submit',['as'=>'pembiayaan.online.pc.submit','uses'=>'PembiayaanOnlineController@submitBatch'])->middleware('auth','khazanah');
 Route::get('/pembiayaan-online/pc/batches/{batchId}',['as'=>'pembiayaan.online.pc.batch','uses'=>'PembiayaanOnlineController@showBatch'])->middleware('auth','khazanah');
@@ -232,6 +239,7 @@ Route::post('/pembiayaan-online/operasi/{kodcaw}/batches/{batchId}/approve',['as
 Route::post('/pembiayaan-online/operasi/{kodcaw}/lines/{id}/paid',['as'=>'pembiayaan.online.operasi.paid','uses'=>'PembiayaanOnlineController@operasiMarkPaid'])->middleware('auth','operasi');
 Route::post('/pembiayaan-online/operasi/{kodcaw}/batches/{batchId}/paid',['as'=>'pembiayaan.online.operasi.paid.batch','uses'=>'PembiayaanOnlineController@operasiMarkPaidBatch'])->middleware('auth','operasi');
 Route::get('/pembiayaan-online/operasi/{kodcaw}/lines/{id}/bukti-akaun',['as'=>'pembiayaan.online.operasi.bukti.akaun','uses'=>'PembiayaanOnlineController@operasiViewBuktiAkaun'])->middleware('auth','operasi');
+Route::get('/pembiayaan-online/operasi/{kodcaw}/lines/{id}/borang',['as'=>'pembiayaan.online.operasi.borang','uses'=>'PembiayaanOnlineController@operasiViewBorang'])->middleware('auth','operasi');
 Route::get('/pembiayaan-online/operasi/{kodcaw}/lines/{id}/sag',['as'=>'pembiayaan.online.operasi.sag','uses'=>'PembiayaanOnlineController@operasiViewSag'])->middleware('auth','operasi');
 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');

tests/Feature/LogViewerPasswordTest.php

@@ -0,0 +1,55 @@
+<?php
+
+namespace Tests\Feature;
+
+use App\Http\Middleware\LogViewerPassword;
+use Illuminate\Http\Request;
+use Tests\TestCase;
+
+class LogViewerPasswordTest extends TestCase
+{
+    public function test_missing_configuration_denies_access()
+    {
+        config(['logviewer.password' => null]);
+        $response = $this->checkAccess();
+        $this->assertSame(503, $response->getStatusCode());
+    }
+
+    public function test_missing_or_incorrect_credentials_are_rejected()
+    {
+        config(['logviewer.password' => password_hash('test-only-secret', PASSWORD_DEFAULT)]);
+        foreach ([[], ['PHP_AUTH_USER' => 'logs', 'PHP_AUTH_PW' => 'wrong'],
+            ['PHP_AUTH_USER' => 'other', 'PHP_AUTH_PW' => 'test-only-secret']] as $server) {
+            $response = $this->checkAccess($server);
+            $this->assertSame(401, $response->getStatusCode());
+            $this->assertStringContainsString('Basic realm=', $response->headers->get('WWW-Authenticate'));
+        }
+    }
+
+    public function test_correct_credentials_allow_access_without_caching()
+    {
+        config(['logviewer.password' => password_hash('test-only-secret', PASSWORD_DEFAULT)]);
+        $response = $this->checkAccess(['PHP_AUTH_USER' => 'logs', 'PHP_AUTH_PW' => 'test-only-secret']);
+        $this->assertSame(200, $response->getStatusCode());
+        $this->assertSame('allowed', $response->getContent());
+        $this->assertStringContainsString('no-store', $response->headers->get('Cache-Control'));
+    }
+
+    public function test_logs_route_has_auth_role_password_and_throttle_middleware()
+    {
+        $route = app('router')->getRoutes()->match(Request::create('/logs'));
+        $middleware = $route->gatherMiddleware();
+        $this->assertContains('auth', $middleware);
+        $this->assertContains('role:admin,masteradmin', $middleware);
+        $this->assertContains(LogViewerPassword::class, $middleware);
+        $this->assertContains('throttle:10,1', $middleware);
+    }
+
+    private function checkAccess(array $server = [])
+    {
+        $request = Request::create('/logs?dl=example', 'GET', [], [], [], $server);
+        return (new LogViewerPassword)->handle($request, function () {
+            return response('allowed');
+        });
+    }
+}