fix resit tebus (diskaun promosi)

enable kadar anggota for all branches

.dockerignore

@@ -1,16 +0,0 @@
-.git
-.gitea
-node_modules
-vendor
-.env
-.env.*
-!.env.example
-storage/logs
-storage/framework/cache
-storage/framework/sessions
-storage/framework/views
-storage/debugbar
-npm-debug.log
-Dockerfile
-docker-compose.yml
-docker-compose.staging.yml

.env.domain

@@ -1,55 +0,0 @@
-APP_NAME=Laravel
-APP_ENV=local
-APP_KEY=base64:O1XZDqK4H6+3GdrODgCaLr2l+OoWvgVhYr0GJ1KizW8=
-APP_DEBUG=true
-APP_URL=http://localhost
-# API_URL=http://api-annurv2.test
-API_URL=http://host.docker.internal:8080
-# Server-side Http:: from Docker — same rules as API_URL. Defaults in config/api.php use localhost:8000 which fails inside containers.
-API_URL_KOOP=http://host.docker.internal:8080
-API_URL_PKB=http://host.docker.internal:8080
-API_ARRAHNBID=http://lelong.test/api/
-
-LOG_CHANNEL=stack
-LOG_LEVEL=debug
-
-DB_CONNECTION=mysql
-DB_HOST=mysql
-DB_PORT=3306
-DB_DATABASE=kaunter_erahn
-DB_USERNAME=kaunteruser
-DB_PASSWORD=password
-
-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

.envy

@@ -1,26 +1,19 @@
 APP_NAME=Laravel
-APP_ENV=staging
-APP_KEY=base64:O1XZDqK4H6+3GdrODgCaLr2l+OoWvgVhYr0GJ1KizW8=
+APP_ENV=local
+APP_KEY=base64:WRTHcFTq5YARKVdA8YDUzsh9Ue8vD63ivgZgXNNBiGo=
 APP_DEBUG=true
-APP_URL=http://172.16.6.200:8091
-
-HTTP_PORT=8091
-MYSQL_PUBLISH_PORT=3309
-
-API_URL=http://172.16.6.200:8090
-API_URL_KOOP=http://172.16.6.200:8090
-API_URL_PKB=http://172.16.6.200:8090
-API_ARRAHNBID=http://lelong.test/api/
+APP_URL=http://ujrahkopkb.erahn.com.my
+API_URL=http://apiujrah-kopkb.erahn.com.my
+#API_ARRAHNBID=http://lelong.test/api/
 
 LOG_CHANNEL=stack
-LOG_LEVEL=debug
 
 DB_CONNECTION=mysql
-DB_HOST=mysql
+DB_HOST=127.0.0.1
 DB_PORT=3306
 DB_DATABASE=kaunter_erahn
-DB_USERNAME=kaunteruser
-DB_PASSWORD=password
+DB_USERNAME=spider
+DB_PASSWORD=G0dz!ll4
 
 BROADCAST_DRIVER=pusher
 CACHE_DRIVER=file
@@ -54,4 +47,4 @@ 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
+MYKAD_READER_ENABLED_CAWANGAN=''    # IF NO CAWANGAN STATED, ALL CAWANGAN IS ENABLED

.gitea/workflows/build.yml

@@ -1,49 +0,0 @@
-name: Build Docker Image
-
-on:
-  push:
-    branches:
-      - staging
-    tags:
-      - "v*"
-  workflow_dispatch:
-
-jobs:
-  build-frontend:
-    runs-on: docker
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Login to Docker registry
-        run: |
-          echo "${{ secrets.REGISTRY_PASSWORD }}" | \
-            docker login git.koppkb.com \
-              -u "${{ secrets.REGISTRY_USERNAME }}" \
-              --password-stdin
-
-      - name: Build & push frontend image
-        run: |
-          set -e
-
-          IMAGE="git.koppkb.com/kopkb/kaunter"
-          TAGS="-t ${IMAGE}:${{ gitea.sha }}"
-
-          if [ "${{ gitea.ref_type }}" = "tag" ] && echo "${{ gitea.ref_name }}" | grep -q '^v'; then
-            TAGS="${TAGS} -t ${IMAGE}:${{ gitea.ref_name }}"
-          fi
-
-          if [ "${{ gitea.ref_name }}" = "staging" ]; then
-            TAGS="${TAGS} -t ${IMAGE}:staging"
-          fi
-
-          echo "Building and pushing frontend: ${TAGS}"
-          docker buildx build \
-            --target staging \
-            --platform linux/amd64 \
-            --cache-from type=registry,ref=${IMAGE}:buildcache,ignore-error=true \
-            --cache-to type=registry,ref=${IMAGE}:buildcache,mode=max \
-            -f docker/php/Dockerfile \
-            ${TAGS} \
-            --push .

.gitea/workflows/deploy-staging.yml

@@ -1,123 +0,0 @@
-name: Deploy to Staging
-
-on:
-  workflow_dispatch:
-    inputs:
-      image_tag:
-        description: "Docker image tag to deploy (commit SHA, staging, or v*)"
-        required: true
-        default: "staging"
-        type: string
-
-env:
-  APP_IMAGE: git.koppkb.com/kopkb/kaunter
-  DEPLOY_DIR: /home/arrahn/Project/kaunter
-
-jobs:
-  deploy:
-    runs-on: host
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ inputs.image_tag }}
-
-      - name: Login to Docker registry
-        run: |
-          echo "${{ secrets.REGISTRY_PASSWORD }}" | \
-            docker login git.koppkb.com \
-              -u "${{ secrets.REGISTRY_USERNAME }}" \
-              --password-stdin
-
-      - name: Verify image exists in registry
-        run: |
-          set -e
-          IMAGE_TAG="${{ inputs.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"
-
-      - name: Pull Docker image
-        run: |
-          set -e
-          IMAGE_TAG="${{ inputs.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 }}"
-
-          mkdir -p "${DEPLOY_DIR}/docker/nginx"
-          cp docker-compose.staging.yml "${DEPLOY_DIR}/docker-compose.yml"
-          cp docker/nginx/default.conf "${DEPLOY_DIR}/docker/nginx/default.conf"
-          rm -rf "${DEPLOY_DIR}/public"
-          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
-          fi
-
-          cd "${DEPLOY_DIR}"
-
-          export APP_IMAGE
-          export IMAGE_TAG
-
-          docker compose --env-file .env.staging -f docker-compose.yml pull app
-          docker compose --env-file .env.staging -f docker-compose.yml up -d --no-build --remove-orphans
-
-          echo "✓ Deployed IMAGE_TAG=${IMAGE_TAG}"
-
-      - name: Verify deployment
-        run: |
-          set -e
-          cd "${DEPLOY_DIR}"
-
-          echo "Waiting for services to start..."
-          sleep 10
-
-          for SERVICE in app web mysql; do
-            STATUS=$(docker compose --env-file .env.staging -f docker-compose.yml ps --status running --format '{{.Name}}' "$SERVICE" 2>/dev/null || true)
-            if [ -z "$STATUS" ]; then
-              echo "ERROR: ${SERVICE} is not running"
-              docker compose --env-file .env.staging -f docker-compose.yml ps
-              docker compose --env-file .env.staging -f docker-compose.yml logs --tail=50 "$SERVICE" || true
-              exit 1
-            fi
-            echo "✓ ${SERVICE} is running (${STATUS})"
-          done
-
-          HTTP_PORT=$(grep -E '^HTTP_PORT=' .env.staging 2>/dev/null | cut -d= -f2- | tr -d '"' || true)
-          HTTP_PORT=${HTTP_PORT:-8091}
-
-          check_health() {
-            NAME=$1
-            URL=$2
-            for i in 1 2 3 4 5 6; do
-              if curl -sf "$URL" > /dev/null; then
-                echo "✓ ${NAME} health check passed (${URL})"
-                return 0
-              fi
-              echo "Waiting for ${NAME}... attempt ${i}/6"
-              sleep 5
-            done
-            echo "ERROR: ${NAME} health check failed (${URL})"
-            docker compose --env-file .env.staging -f docker-compose.yml logs --tail=50 app web || true
-            return 1
-          }
-
-          check_health "kaunter" "http://127.0.0.1:${HTTP_PORT}/health"

app/Helper.php

@@ -1,83 +1,20 @@
 <?php
-
 namespace App;
 
 use DateTime;
 
 class Helper
 {
+
     public static function formatNumber($amount)
     {
-        return number_format($amount, 2, '.', ',');
+        $formattedAmount = number_format($amount, 2, '.', ',');
+
+        return $formattedAmount;
     }
 
     public static function formatDate($date_string)
     {
         return (new DateTime($date_string))->format("d-m-Y");
     }
-
-    public static function terbilangBm(int $number): string
-    {
-        $units = [
-            0 => 'kosong',
-            1 => 'satu',
-            2 => 'dua',
-            3 => 'tiga',
-            4 => 'empat',
-            5 => 'lima',
-            6 => 'enam',
-            7 => 'tujuh',
-            8 => 'lapan',
-            9 => 'sembilan',
-            10 => 'sepuluh',
-            11 => 'sebelas'
-        ];
-
-        if ($number < 0) return 'negatif ' . self::terbilangBm(abs($number));
-        if ($number < 12) return $units[$number];
-        if ($number < 20) return self::terbilangBm($number - 10) . ' belas';
-        if ($number < 100) {
-            $tens = intdiv($number, 10);
-            $rest = $number % 10;
-            return self::terbilangBm($tens) . ' puluh' . ($rest ? ' ' . self::terbilangBm($rest) : '');
-        }
-        if ($number < 200) return 'seratus' . ($number > 100 ? ' ' . self::terbilangBm($number - 100) : '');
-        if ($number < 1000) {
-            $hundreds = intdiv($number, 100);
-            $rest = $number % 100;
-            return self::terbilangBm($hundreds) . ' ratus' . ($rest ? ' ' . self::terbilangBm($rest) : '');
-        }
-        if ($number < 2000) return 'seribu' . ($number > 1000 ? ' ' . self::terbilangBm($number - 1000) : '');
-        if ($number < 1000000) {
-            $thousands = intdiv($number, 1000);
-            $rest = $number % 1000;
-            return self::terbilangBm($thousands) . ' ribu' . ($rest ? ' ' . self::terbilangBm($rest) : '');
-        }
-        if ($number < 1000000000) {
-            $millions = intdiv($number, 1000000);
-            $rest = $number % 1000000;
-            return self::terbilangBm($millions) . ' juta' . ($rest ? ' ' . self::terbilangBm($rest) : '');
-        }
-        return 'terlalu besar';
-    }
-
-    public static function ringgitTerbilang($amount, bool $tambahSahaja = true): string
-    {
-        $formatted = number_format((float)$amount, 2, '.', '');
-        [$ringgitStr, $senStr] = explode('.', $formatted);
-
-        $ringgit = (int)$ringgitStr;
-        $sen = (int)$senStr;
-
-        $parts = [];
-        $parts[] = self::terbilangBm($ringgit) . ' ringgit';
-
-        if ($sen > 0) {
-            $parts[] = 'dan ' . self::terbilangBm($sen) . ' sen';
-        } elseif ($tambahSahaja) {
-            $parts[] = 'sahaja';
-        }
-
-        return trim(preg_replace('/\s+/', ' ', implode(' ', $parts)));
-    }
 }

app/Http/Controllers/AliranTunaiController.php

@@ -2,14 +2,12 @@
 
 namespace App\Http\Controllers;
 
-use App\User;
-use App\Cawangan;
-use Carbon\Carbon;
 use Illuminate\Http\Request;
 use App\Services\CustomerService;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\Session;
+use Illuminate\Support\Facades\Http;
+use Illuminate\Support\Facades\Auth;
+use Carbon\Carbon;
 
 
 class AliranTunaiController extends Controller
@@ -601,7 +599,7 @@ class AliranTunaiController extends Controller
         return response($updateTunai);
     }
 
-    public function LaporanAliranTunai($teller, Request $request)
+    public function LaporanAliranTunai($teller)
     {
         $auth_user = Auth::user();
         $api_url = config('api.url');
@@ -613,6 +611,8 @@ class AliranTunaiController extends Controller
         $cawangan=Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
         $cawangan_detail=$cawangan[0];
 
+        $tarikh_cetak = $current->toDateString();
+
         $cawangan=Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
 
         $alirantunai = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/GetCurrentTunai/' . $auth_user['cawangan'],['kodlaluan' => $auth_user['name']])->json();
@@ -621,67 +621,7 @@ class AliranTunaiController extends Controller
 
         $teller = $auth_user['name'];
 
-        $bakiLelong = Http::withOptions(['verify' =>config('app.api_verify')])->get(config('api.url') . '/api/lelong/bakilelongbyteller/'.$auth_user['cawangan'],[
-            'tarikh' => $request->datetimepicker1
-        ])->json();
-        
-        return view('aliran_tunai.laporan.laporanalirantunai',compact('tarikh_cetak','cawangan_info','cawangan','api_url','cawangan_detail','addtunai','alirantunai','teller', 'bakiLelong'));
-    }
-
-    public function laporanAliranTunaiTeller()
-    {
-        $auth_user = Auth::user();
-        $api_url = config('api.url');
-
-        $cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
-
-        return view('khazanah.laporan.alirantunai', compact('api_url', 'cawangan_info'));
-    }
-
-    public function cetakLaporanAliranTunaiTeller(Request $request)
-    {
-        $api_url = config('api_url');
-        $auth_user = Auth::user();
-
-        $current = Carbon::now();
-        $current = new Carbon();
-
-        $tarikh_cetak = $current->toDateString();
-        if($request->datetimepicker1 == null){
-            $tarikh = $current->toDateString();
-        }else{
-            $split_date = explode('-',$request->datetimepicker1);
-            $tarikh = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0];
-        }
-
-        $cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
-        $cawangan=Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
-        $cawangan_detail=$cawangan[0];
-
-        $addtunai = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/getAddTunai/' . $auth_user['cawangan'] . '/kodlaluan/',['kodlaluan' => $auth_user['name']])->json();
-
-        $teller = $auth_user['name'];
-
-        $bakiLelong = Http::withOptions(['verify' =>config('app.api_verify')])->get(config('api.url') . '/api/lelong/bakilelongbyteller/'.$auth_user['cawangan'],[
-            'tarikh' => $tarikh,
-            'kodlaluan' => $auth_user['name']
-        ])->json();
-
-        $tunai = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/getTunaiByTarikh/',[
-            'kodlaluan' => $auth_user['name'],
-            'kodcaw' => $auth_user['cawangan'],
-            'tarikh' => $tarikh
-            ])->json();
-
-            if(!$tunai)
-        {
-            return redirect()->back()->with('errormessage', 'Tiada data pada tarikh tersebut.');
-        }
-
-        $jumlahTambah = $tunai['tambah'] + $tunai['masuk'] + $bakiLelong['rugi_lelong'];
-        $jumlahTolak = $tunai['kurang'] + $tunai['keluar'] + $bakiLelong['baki_lelong'];
-
-        return view('aliran_tunai.laporan.laporanalirantunai',compact('tarikh_cetak','cawangan_info','cawangan','api_url','cawangan_detail','addtunai','tunai','teller', 'bakiLelong', 'jumlahTambah', 'jumlahTolak'));
+        return view('aliran_tunai.laporan.laporanalirantunai',compact('tarikh_cetak','cawangan_info','cawangan','api_url','cawangan_detail','addtunai','alirantunai','teller'));
     }
 
     public function LaporanTunaiTeller(Request $request){

app/Http/Controllers/GadaianController.php

@@ -201,6 +201,8 @@ class GadaianController extends Controller
             'onepercent' => $onepercent,
             'margin_semasa' => $margin_pinjaman,
             'nokp' => $request->nokp,
+            'kadar_rebate' => $request->kadar_rebate,
+            'rebate' => $request->rebate
         ])->json();
 
 

app/Http/Controllers/KhazanahController.php

@@ -2459,6 +2459,7 @@ class KhazanahController extends Controller
         $penghutangkaki = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/PenghutangKakitangan/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json();
         $untungrugi = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/UntungRugiCalculation/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json();
         $bayaranpendahuluan = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/BayaranPendahuluan/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json();
+        $rebetpromo = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/RebetPromoCalculation/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json();
 
         //Tanggungan Semasa
         $panjar = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/CalculationPanjar/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json();
@@ -2469,6 +2470,8 @@ class KhazanahController extends Controller
         $cajperkhidmatan = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/cajperkhidmatanterkumpul/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json();
         $hapuskira = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/CalculationHapusKira/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json();
         $xtra = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/Xtra/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json();
+        $rebetpromo = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/RebetPromoCalculation/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json();
+        $pelarasanrebate = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/PelarasanRebate/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json();
 
 
         //TunaiDitangan Sementara Upah
@@ -2520,6 +2523,8 @@ class KhazanahController extends Controller
         if($imbangduga['pindahkekpkb'] > 0) array_push($hartasemasa,['glcode' => '1000/090','descpt' => 'Pindah Ke KPKB(IP)', 'amaun' => $imbangduga['pindahkekpkb']]);
         if($peruntukanhapuskira > 0) array_push($hartasemasa,['glcode' => '1000/015','descpt' => 'Peruntukan Hapus Kira', 'amaun' => $peruntukanhapuskira]);
         if($belian1stop > 0) array_push($hartasemasa,['glcode' => '8000/501','descpt' => 'Belian 1 Stop', 'amaun' => $belian1stop]);
+        if($rebetpromo > 0) array_push($hartasemasa,['glcode' => '5000/242','descpt' => 'Diskaun Promosi', 'amaun' => ($rebetpromo * -1)]);
+
 
         $totalhartasemasa = 0;
         foreach($hartasemasa as $index => $hs)
@@ -2551,6 +2556,8 @@ class KhazanahController extends Controller
         if($utgterkumpulxtra > 0) array_push($tanggungansemasa,['glcode' => '7000/201','descpt' => 'Untung/Rugi Terkumpul Xtra','amaun' => $utgterkumpulxtra]);
         if($jualan1stop > 0) array_push($tanggungansemasa,['glcode' => '9000/501','descpt' => 'Jualan 1 Stop','amaun' => $jualan1stop]);
         if($hapuskira > 0) array_push($tanggungansemasa,['glcode' => '3000/011','descpt' => 'Hapus Kira','amaun' => -$hapuskira]);
+        if($rebetpromo > 0) array_push($tanggungansemasa,['glcode' => '5000/242','descpt' => 'Diskaun Promosi', 'amaun' => ($rebetpromo * -1)]);
+        if($pelarasanrebate > 0) array_push($tanggungansemasa,['glcode' => '5000/243','descpt' => 'Pelarasan Rebate', 'amaun' => ($pelarasanrebate * -1)]);
 
         $totaltanggungansemasa = 0;
         foreach($tanggungansemasa as $index => $ts)
@@ -4417,274 +4424,4 @@ class KhazanahController extends Controller
     }
 
 
-    public function pampasanDetail($id)
-    {
-        $auth_user = Auth::user();
-        $api_url = config('api.url');
-        $cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])
-                                ->get(config('api.url') . '/api/cawangan/' . $auth_user['cawangan'])
-                                ->json();
-
-    $gadai = Http::withOptions(['verify' => config('app.api_verify')])
-        ->get(config('api.url') . '/api/gadai/norujukan/' . '011237' . '/' . $id)
-        ->json();
-
-    $gadai_info = is_array($gadai) && isset($gadai[0]) ? $gadai[0] : $gadai;
-
-    $customer_info = null;
-    if(isset($gadai_info['nokp'])) {
-        $customer = Http::withOptions(['verify' => config('app.api_verify')])
-            ->get(config('api.url') . '/api/customers/' . $gadai_info['nokp'])
-            ->json();
-
-        $customer_info = null;
-        if (isset($gadai_info['nokp'])) {
-            $customer = Http::withOptions(['verify' => config('app.api_verify')])
-                ->get(config('api.url') . '/api/customers/' . $gadai_info['nokp'])
-                ->json();
-
-            $customer_info = is_array($customer) && isset($customer[0]) ? $customer[0] : $customer;
-        }
-
-
-        $barang_kes = Http::withOptions(['verify' => config('app.api_verify')])
-            ->get(config('api.url') . '/api/palsu/laporan/', ['kodcaw' => $auth_user['cawangan']])
-            ->json();
-
-        // You may need to adjust the array index if the API returns an array of results
-        $gadai_info = is_array($gadai) && isset($gadai[0]) ? $gadai[0] : $gadai;
-        // $pampasan_info = is_array($pampasan) && isset($pampasan[0]) ? $pampasan[0] : $pampasan;
-
-        $barang_kes_collection = collect($barang_kes);
-        $barang_kes_info = $barang_kes_collection->where('norujukan', '=', $id)->first();
-
-        $customer_info = null;
-        if (isset($gadai_info['nokp'])) {
-            $customer = Http::withOptions(['verify' => config('app.api_verify')])
-                ->get(config('api.url') . '/api/customers/' . $gadai_info['nokp'])
-                ->json();
-
-            $customer_info = is_array($customer) && isset($customer[0]) ? $customer[0] : $customer;
-        }
-
-        $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];
-        }
-
-        $pampasan = Http::withOptions(['verify' => config('app.api_verify')])
-            ->get(config('api.url') . '/api/pampasan', ['kodcaw' => '011237', 'norujukan' => $id])
-            ->json()['data'][0];
-
-        $baucerno = $pampasan['baucerno'];
-        $nilaimarhun = $barang_kes_info['nilaimarhun'] ?? 0;
-        $pembiayaan = $barang_kes_info['pembiayaan'] ?? 0;
-        $untung = $barang_kes_info['untung'] ?? 0;
-
-
-        $jumlah_tebus = Http::withOptions(['verify' => config('app.api_verify')])
-            ->get(config('api.url') . '/api/tebus/norujukan/' .  $auth_user['cawangan'] . '/' . $id)
-            ->json()[0]['bakipjm'];
-
-        $jumlah_pampasan = $nilaimarhun - $pembiayaan - $untung;
-
-        $jumlahPanjar = $jumlah_tebus + $jumlah_pampasan;
-
-        return view('khazanah.pampasan_detail', compact('gadai_info', 'barang_kes_info', 'cawangan_info', 'customer_info', 'baucerno', 'denominasi', 'jumlah_pampasan', 'jumlah_tebus', 'jumlahPanjar'));
-        }
-    }
-
-    public function initiatePampasan(Request $request)
-    {
-        $norujukan = $request->input('norujukan');
-        $teller = auth()->user()->name;
-        $kodcaw = auth()->user()->cawangan;
-        $baucerno = $this->generateBaucer($kodcaw);
-
-        $response = Http::post(config('api.url') . '/api/pampasan/initiatePampasan', [
-            'norujukan' => $norujukan,
-            'kodcaw' => $kodcaw,
-            'teller' => $teller,
-            'baucerno' => $baucerno,
-        ]);
-
-        if ($response->failed()) {
-            throw new \Exception("HTTP error! status: " . $response->status(), 1);
-        }
-
-        $result = $response->json();
-
-        // $jumlah_pampasan = $nilaimarhun - $pembiayaan - $untung;
-        // $jumlahTebus = $pembiayaan + $untung;
-        // $jumlahPanjar = $jumlah_pampasan + $jumlahTebus;
-
-        //return view('khazanah.pampasan_detail', compact('gadai_info', 'pampasan_info', 'cawangan_info', 'customer_info','baucerno', 'denominasi','jumlah_pampasan', 'jumlahTebus', 'jumlahPanjar') );
-        return response()->json($result);
-    }
-
-    public function generateBaucer($kodcaw)
-    {
-    $data = Http::withOptions(['verify' => config('app.api_verify')])
-        ->get(config('api.url').'/api/SenaraiPanjar/list/' . $kodcaw)
-        ->json();
-
-    $today = now();
-    $dd = $today->format('d');
-    $mm = $today->format('m');
-    $yy = $today->format('y'); 
-
-    $recno = $data['recno'] ?? 0;
-
-    $baucerno = 'B' . $yy . $mm . $dd . '-' . str_pad($recno, 4, '0', STR_PAD_LEFT);
-
-    return $baucerno;
-    }
-
-    public function terimaPampasan(Request $request)
-    {
-        $responsePampasan = Http::withOptions(['verify' => config('app.api_verify')])
-                        ->post(config('api.url') . '/api/pampasan/terimaPampasan',[
-                            "norujukan" => $request->norujukan,
-                            "kodcaw" => auth()->user()->cawangan,
-                            "jumlah_pampasan" => $request->jumlahpampasan,
-                            "teller" => auth()->user()->name,
-                            "denominasi" => $request->denominasi,
-                        ]
-                         )->json();
-
-        $jumlahTebus = Http::withOptions(['verify' => config('app.api_verify')])
-                          ->get(config('api.url') . '/api/tebus/norujukan/' . auth()->user()->cawangan .'/'.$request->norujukan)->json()[0]['bakipjm'];
-        $bayaranPanjar = $request->jumlahpampasan + $jumlahTebus;
-
-
-        $responsePanjar = Http::withOptions(['verify' => config('app.api_verify')])
-            ->post(
-                config('api.url') . '/api/panjar/createpanjar/' . auth()->user()->cawangan,
-                array_merge(
-                    [
-                        'tarikhbil' => now()->format('Y-m-d'),
-                        'jenismodal' => 'belanjaam',
-                        'deskripsi' => 'BAYARAN PAMPASAN ' . '(' . $request->norujukan . ')',
-                        'bayaran' => $bayaranPanjar,
-                        'kodlaluan' => auth()->user()->name,
-                        'baucer' => $responsePampasan['data']['baucerno'],
-                        'tuntutan' => auth()->user()->name
-                    ],
-                    $request->denominasi
-
-                )
-            )->json();
-
-        if ($responsePampasan['success'] == true) {
-            return redirect()->route('pampasan.resit', ["pampasan" => $responsePampasan['data']]);
-        } else
-            return redirect()->route('khazanah.panjar')->with('pampasaninformation', ['status' => 'error', 'message' => 'Baki perubatan tidak mencukupi.']);
-    }
-
-    public function resitPampasan(Request $request)
-    {
-        $pampasan = $request->pampasan;
-        $kodcaw = $pampasan['kodcaw'];
-        $norujukan = $pampasan['norujukan'] ?? null;
-
-        if ($norujukan) {
-            $gadai_info = Http::withOptions(['verify' => config('app.api_verify')])
-                ->get(config('api.url') . '/api/gadai/norujukan/' . $kodcaw . '/' . $norujukan)
-                ->json();
-
-            $gadai_info = is_array($gadai_info) && isset($gadai_info[0]) ? $gadai_info[0] : $gadai_info;
-
-            $customer_info = null;
-            if (isset($gadai_info['nokp'])) {
-                $customer = Http::withOptions(['verify' => config('app.api_verify')])
-                    ->get(config('api.url') . '/api/customers/' . $gadai_info['nokp'])
-                    ->json();
-
-                $customer_info = is_array($customer) && isset($customer[0]) ? $customer[0] : $customer;
-            }
-
-            $pampasan_info = Http::withOptions(['verify' => config('app.api_verify')])
-                ->get(config('api.url') . '/api/palsu/laporan/', ['kodcaw' => $kodcaw])
-                ->json();
-
-            $norujukan = $norujukan;
-
-            $pampasan_info = collect($pampasan_info)->firstWhere('norujukan', $norujukan);
-
-            $nilaimarhun = $pampasan_info['nilaimarhun'] ?? 0;
-            $pembiayaan = $pampasan_info['pembiayaan'] ?? 0;
-            $untung = $pampasan_info['untung'] ?? 0;
-
-            $jumlah_pampasan = $nilaimarhun - $pembiayaan - $untung;
-
-            $status = Http::withOptions(['verify' => config('app.api_verify')])
-                ->put(config('api.url') . '/api/pampasan/updateStatusPampasan', ['kodcaw' => $kodcaw, 'norujukan' => $norujukan])
-                ->json();
-
-            // dd($pampasan_info, $nilaimarhun, $pembiayaan, $untung, $jumlah_pampasan);
-
-            // dd($norujukan);
-
-            return view('print.resit.resitpampasan', compact(
-                'pampasan',
-                'gadai_info',
-                'customer_info',
-                'pampasan_info',
-                'nilaimarhun',
-                'pembiayaan',
-                'untung',
-                'jumlah_pampasan',
-                'status'
-            ));
-        }
-    }
-
-    public function suratPampasan(Request $request, $norujukan)
-    {
-    $auth_user = Auth::user();
-
-    $cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])
-                    ->get(config('api.url') . '/api/cawangan/'.$auth_user['cawangan'])->json();
-
-    $gadai = Http::withOptions(['verify' => config('app.api_verify')])
-        ->get(config('api.url') . '/api/gadai/norujukan/' . '011237' . '/' . $norujukan)
-        ->json();
-
-    $gadai_info = is_array($gadai) && isset($gadai[0]) ? $gadai[0] : $gadai;
-
-    $customer_info = null;
-    if(isset($gadai_info['nokp'])) {
-        $customer = Http::withOptions(['verify' => config('app.api_verify')])
-            ->get(config('api.url') . '/api/customers/' . $gadai_info['nokp'])
-            ->json();
-
-    $customer_info = is_array($customer) && isset($customer[0]) ? $customer[0] : $customer;
-    }
-
-    $pampasan = Http::withOptions(['verify' => config('app.api_verify')])
-        ->get(config('api.url') . '/api/palsu/laporan/' , ['kodcaw'=>'011237'])
-        ->json();
-        
-    $pampasan_collection = collect($pampasan);
-
-    $pampasan_info = $pampasan_collection->where('norujukan', '=', $norujukan)->first();
-
-    
-    if (!$pampasan_info) {
-        abort(404, 'Maklumat pampasan tidak dijumpai untuk no rujukan tersebut.');
-    }
-
-    $nilaimarhun = $pampasan_info['nilaimarhun'] ?? 0;
-    $pembiayaan = $pampasan_info['pembiayaan'] ?? 0;
-    $untung = $pampasan_info['untung'] ?? 0;
-
-    $jumlah_pampasan = $nilaimarhun - $pembiayaan - $untung;
-    $jumlah = $pampasan_info['jumlah_pampasan'] ?? 0;
-    $jumlah_pampasan_terbilang = Helper::ringgitTerbilang($jumlah_pampasan);
-
-    return view('print.surat_pampasan', compact('cawangan_info', 'gadai', 'gadai_info', 'customer_info', 'pampasan', 'pampasan_info','jumlah_pampasan_terbilang', 'jumlah_pampasan'));
-    }
-}
+}

app/Http/Controllers/LelongController.php

@@ -99,15 +99,6 @@ class LelongController extends Controller
     public function transaksituntutbaki(Request $request){
 
         $auth_user = Auth::user();
-
-        $aliranTunaiController = new AliranTunaiController();
-        $checkCashBox = $aliranTunaiController->periksaAliranTunai($request);
-        
-        if($checkCashBox->getContent() !== 'sama')
-        {
-            return response('kemaskini', 200);
-        }
-        
         $lelong = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/TuntutBaki/resit/' . $auth_user['cawangan'] . '/' . $request->norujukan)->json();
 
         if($lelong)
@@ -115,18 +106,6 @@ class LelongController extends Controller
             return response('Berjaya');
         }
 
-        $getTunai2=Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/GetCurrentTunai/'.$auth_user['cawangan'],['kodlaluan' => $request->teller])->json();
-
-        $keluar = $getTunai2['keluar'];
-        $baki = $getTunai2['baki'];
-        $masuk = $getTunai2['masuk'];
-
-        $bakiakhir = $baki;
-
-        if(($bakiakhir < $request->jumlah) && $request->jenis == 'T'){
-            return response('Baki tidak mencukupi', 200);
-        }
-
         $tuntutbaki = Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url') . '/api/Tuntutbakisimpan/' . $auth_user['cawangan'], [
             'batchno' => $request->batchno,
             'jenis' => $request->jenis,
@@ -143,6 +122,14 @@ class LelongController extends Controller
 
         $updatetuntutbaki = Http::withOptions(['verify' => config('app.api_verify')])->put( config('api.url').'/api/tuntutbakiupdate/' . $auth_user['cawangan'] . '/' . $request->norujukan);
 
+        $getTunai2=Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/GetCurrentTunai/'.$auth_user['cawangan'],['kodlaluan' => $request->teller])->json();
+
+        $keluar = $getTunai2['keluar'];
+        $baki = $getTunai2['baki'];
+        $masuk = $getTunai2['masuk'];
+
+        $bakiakhir = $baki;
+
         if($request->jenis == 'T')
         {
             $bakiakhir -= $request->jumlah;

app/Http/Controllers/PenebusanController.php

@@ -46,10 +46,7 @@ class PenebusanController extends Controller
         $nilaihargasemasa = $this->tukaranhargaemas($norujukan);
 
         $pertambahpinjaman = 0.80;
-
-        $pampasan = $this->getPampasanByNorujukan($norujukan);
-
-        return view('penebusan.' . $cawangan_info['version'] . '.index',compact('cawangan_info','api_url','gadai','marhun','nama','nilaihargasemasa','pertambahpinjaman', 'pampasan'));
+        return view('penebusan.' . $cawangan_info['version'] . '.index',compact('cawangan_info','api_url','gadai','marhun','nama','nilaihargasemasa','pertambahpinjaman'));
     }
 
     public function tebuspenuh(Request $request)
@@ -281,167 +278,6 @@ class PenebusanController extends Controller
         $auth_user = Auth::user();
 
 
-        ////////////////////////
-       /// UPDATE TEBUS API////
-       ///////////////////////
-        $updatetebus = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url').'/api/updatetebus/'. $auth_user['cawangan'] .'/' . $request->norujukan,[
-            'nopelanggan' => $request->nopelanggan,
-            'jenistebus' => $request->jenistebus,
-            'jbg' => $request->jbg,
-            'kadarupah' => $request->kadarupah,
-            'nilai_marhun' => $request->nilai_marhun,
-            'pinjaman' => $request->pinjaman_lama,
-            'ansuran' => $request->ansuran,
-            'nowakil' => $request->nowakil,
-            'addpinjaman'=> $request->addpinjaman,
-            'bakipinjaman' => $request->bakipinjaman,
-            'bakiupah' => $request->bakiupah,
-            'historygadaian' => $request->historygadaian,
-            'marhun' => $request->marhun,
-            'jenisbayarantebus' => $request->jenisbayarantebus,
-            'jeniskeuntungan' => $request->jeniskeuntungan,
-            'teller' => $request->teller,
-            "duitpelanggan" => $request->bayaran,
-            "bakipelanggan" => $request->bakipelanggan,
-        ])->json();
-
-        if($updatetebus == 'duplicate'){
-            return response()->json('duplicate');
-        }
-
-        //////////////////////
-        /// MAKING NEW SAG////
-        /////////////////////
-
-        $gadai_transaction = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/gadai/'. $auth_user['cawangan'] . '/' . $current->toDateString())->json();
-        if($gadai_transaction){
-            $new_sirig = $gadai_transaction['sirig'] + 1;
-
-        }else{
-            $new_sirig = 1;
-        }
-
-        $new_transaction = sprintf("%04d",$new_sirig);
-        $norujukanbaru = strtoupper($auth_user['cawangan']) . $curent_year . $curent_month . $current_day . '-' .$new_transaction;
-
-        $gadai = Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url').'/api/gadai/'.$auth_user['cawangan'],[
-            'norujukan' => $norujukanbaru,
-            'nopelanggan' => $request->nopelanggan,
-            'nokp' => $request->noic,
-            'sirig' => $new_sirig
-        ]);
-
-        ///////////////////////////
-        /// MARHUN UPDATE TABLE////
-        //////////////////////////
-
-
-        $arraymarhunbaru = [];
-
-        $marhunsediada = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/marhun/'. $request->norujukan)->json();
-
-        $marhunyangdiambil = $marhunsediada[0];
-        foreach($marhunyangdiambil as $index=>$marhunloop)
-        {
-            $karatbaru = str_replace('.','-',$marhunloop['karat']);
-            $hargabaru = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/harga_emas/'. $karatbaru)->json();
-
-            $nilaimarhun = (floatval($hargabaru['harga']) * floatval($marhunloop['berat']));
-
-            array_push($arraymarhunbaru, ["bil" => $marhunloop['bil'],"tag_permata" => $marhunloop['tag_permata'],"berat_batu_permata" => $marhunloop['berat_batu_permata'],"marhun" => $marhunloop['marhun'],"nota" => $marhunloop['nota'],"karat" => $marhunloop['karat'], "berat" => $marhunloop['berat'], "harga" => $hargabaru['harga'], "n_marhun" => $nilaimarhun]);
-        }
-
-        foreach($arraymarhunbaru as $array1){
-            $updatemarhun = Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url').'/api/marhun/'. $auth_user['cawangan'],[
-                'norujukan' => $norujukanbaru,
-                'marhun' => $array1['marhun'],
-                'nota' => $array1['nota'],
-                'karat' => $array1['karat'],
-                'berat_emas' => $array1['berat'],
-                'harga' => $array1['harga'],
-                'tag_permata' => $array1['tag_permata'],
-                'berat_batu_permata' => $array1['berat_batu_permata'],
-		'kuantiti' => $array1['bil']
-            ])->json();
-        }
-
-
-
-       //////////////////////
-      ////Update SAG BARU///
-      /////////////////////
-
-        $total_nilai_marhun = $request->nilai_marhun;
-        $margin_pinjaman = $request->pinjaman / $total_nilai_marhun;
-        $kadarupah = $request->kadarkeuntungan * 100;
-
-        $onepercent = Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url').'/api/onepercent',[
-            'pembiayaan' => $request->pinjaman,
-            'nilaimarhun' => $total_nilai_marhun,
-            'kadarujrah' => $request->kadarkeuntungan,
-            'margin' => ($margin_pinjaman*100),
-            'kodcaw' => Auth::user()->cawangan
-        ])->json();
-
-        $keuntungan_sebln = $onepercent['keuntungan'];
-        $keuntungan_sebln = str_replace(',','',$keuntungan_sebln);
-        $keuntungan6bulan = $keuntungan_sebln * 6;
-        $keuntungan12bulan = $keuntungan_sebln * 12;
-        $hargajualan = $request->pinjaman + $keuntungan12bulan;
-
-
-
-
-        $gadai = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url').'/api/gadai/norujukan/'. $auth_user['cawangan'] .'/' . $norujukanbaru,[
-            'kodcaw' => $auth_user['cawangan'],
-            'nilaimarhun' => round($total_nilai_marhun, 2),
-            'berat' => round($request->total_berat, 2),
-            'pinjaman' => round($request->pinjaman, 2),
-            'kadarupah' => round($kadarupah, 2),
-            'marhun' => $request->marhun,
-            'percentpinj' => $margin_pinjaman,
-            'teller'=> $auth_user['name'],
-            'upah6' => $keuntungan6bulan,
-            'upah12' => $keuntungan12bulan,
-            'hargajualan' => $hargajualan,
-            'kuantiti_marhun' => $request->kuantiti_marhun
-        ])->json();
-
-        $komuditi = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url').'/api/komuditi/transaksi',[
-            'unit_komuditi' => round($request->pinjaman, 2),
-            'norujukan' => $norujukanbaru,
-            'kodcaw' => $auth_user['cawangan'],
-            'teller' => $auth_user['name']
-        ]);
-
-        ////////////////////////////
-        ////Update History Gadaian///
-        ////////////////////////////
-
-        $updatehistorygadaian = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url').'/api/gadai/updatehistory/'. $auth_user['cawangan'] .'/' . $norujukanbaru,[
-            'historygadaian' => $request->norujukan,
-            'jenistebus' => $request->jenistebus,
-        ])->json();
-
-
-        event(new TebusNotify('lulus',Auth::user()->cawangan));
-        event(new GadaiNotify('lulus',Auth::user()->cawangan));
-        $this->AliranTunaiController->alirantunaiTebus($request);
-
-    }
-
-    public function tambahpinjaman_latest(Request $request)
-    {
-        $api_url = config('api.url');
-        $current = Carbon::now();
-        $current = new Carbon();
-        $curent_year = substr($current->year,2,2);
-        $curent_month = sprintf("%02d", $current->month);
-        $current_day = sprintf("%02d", $current->day);
-
-        $auth_user = Auth::user();
-
-
         ////////////////////////
        /// UPDATE TEBUS API////
        ///////////////////////
@@ -512,16 +348,252 @@ class PenebusanController extends Controller
             'totalbayaran' => $request->totalbayaran,
             "duitpelanggan" => $request->bayaran,
             "bakipelanggan" => $request->bakipelanggan,
-            "noic" => $request->noic,
-            "jenisAT" => $request->jenisAT,
         ])->json();
-        if($updatetebus['result'] == 'success'){
-            $alirantunai = new AliranTunaiController();
-            event(new TebusNotify('lulus',Auth::user()->cawangan));
-            event(new GadaiNotify('lulus',Auth::user()->cawangan));
-            $alirantunai->alirantunaiTebusAutoTawarruq($request);
+
+        if($updatetebus == 'duplicate'){
+            return response()->json('duplicate');
         }
-        return response()->json($updatetebus['result'],200);
+
+        //////////////////////
+       /// MAKING NEW SAG////
+       /////////////////////
+        $gadai_transaction = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/gadai/'. $auth_user['cawangan'] . '/' . $current->toDateString())->json();
+        if($gadai_transaction){
+            $new_sirig = $gadai_transaction['sirig'] + 1;
+
+        }else{
+            $new_sirig = 1;
+        }
+
+        $new_transaction = sprintf("%04d",$new_sirig);
+        $norujukanbaru = strtoupper($auth_user['cawangan']) . $curent_year . $curent_month . $current_day . '-' .$new_transaction;
+
+        $gadai = Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url').'/api/gadai/'.$auth_user['cawangan'],[
+            'norujukan' => $norujukanbaru,
+            'nopelanggan' => $request->nopelanggan,
+            'nokp' => $request->noic,
+            'sirig' => $new_sirig
+        ]);
+
+        ///////////////////////////
+       /// MARHUN UPDATE TABLE////
+       //////////////////////////
+
+       $arraymarhunbaru = [];
+
+       $marhunsediada = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/marhun/'. $request->norujukan)->json();
+
+       $marhunyangdiambil = $marhunsediada[0];
+       foreach($marhunyangdiambil as $index=>$marhunloop)
+       {
+           $karatbaru = str_replace('.','-',$marhunloop['karat']);
+           $hargabaru = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/harga_emas/'. $karatbaru)->json();
+
+           $harga = ($request->jenisAT == 'hargalama') ? $marhunloop['harga'] : $hargabaru['harga'];
+           $nilaimarhun = (floatval($harga) * floatval($marhunloop['berat']));
+
+           array_push($arraymarhunbaru, ["bil" => $marhunloop['bil'],"tag_permata" => $marhunloop['tag_permata'],"berat_batu_permata" => $marhunloop['berat_batu_permata'],"marhun" => $marhunloop['marhun'],"nota" => $marhunloop['nota'],"karat" => $marhunloop['karat'], "berat" => $marhunloop['berat'], "harga" => $harga, "n_marhun" => $nilaimarhun]);
+       }
+
+       foreach($arraymarhunbaru as $array1){
+           $updatemarhun = Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url').'/api/marhun/'. $auth_user['cawangan'],[
+               'norujukan' => $norujukanbaru,
+               'marhun' => $array1['marhun'],
+               'nota' => $array1['nota'],
+               'karat' => $array1['karat'],
+               'berat_emas' => $array1['berat'],
+               'harga' => $array1['harga'],
+               'nilai_marhun' => $array1['n_marhun'],
+               'tag_permata' => $array1['tag_permata'],
+               'berat_batu_permata' => $array1['berat_batu_permata'],
+               'jenisAT' => $request->jenisAT,
+               'kuantiti' => $array1['bil']
+           ])->json();
+       }
+
+        //////////////////////
+       ////Update SAG BARU///
+       /////////////////////
+
+
+        $total_nilai_marhun = $request->total_nilai_marhun;
+        $margin_pinjaman = ($request->pinjaman / $total_nilai_marhun);
+
+        $onepercent = Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url').'/api/onepercent',[
+            'pembiayaan' => $request->pinjaman,
+            'nilaimarhun' => $total_nilai_marhun,
+            'kadarujrah' => $request->kadarkeuntungan,
+            'margin' => ($margin_pinjaman*100),
+            'kodcaw' => Auth::user()->cawangan
+        ])->json();
+
+        $keuntungan_sebln = $onepercent['keuntungan'];
+        $keuntungan_sebln = str_replace(',','',$keuntungan_sebln);
+
+        $kadarupah = $request->kadarkeuntungan * 100;
+        $keuntungan6bulan = $keuntungan_sebln * 6;
+        $keuntungan12bulan = $keuntungan_sebln * 12;
+        $hargajualan = $request->pinjaman + $keuntungan12bulan;
+
+
+        $gadai = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url').'/api/gadai/norujukan/'. $auth_user['cawangan'] .'/' . $norujukanbaru,[
+            'kodcaw' => $auth_user['cawangan'],
+            'nilaimarhun' => round($total_nilai_marhun, 2),
+            'berat' => round($request->total_berat, 2),
+            'pinjaman' => round($request->pinjaman, 2),
+            'kadarupah' => round($kadarupah, 2),
+            'marhun' => $request->marhun_detail,
+            'percentpinj' => $margin_pinjaman,
+            'teller'=> $auth_user['name'],
+            'upah6' => $keuntungan6bulan,
+            'upah12' => $keuntungan12bulan,
+            'hargajualan' => $hargajualan,
+            'kuantiti_marhun' => $request->kuantiti_marhun,
+        ]);
+
+
+        $komuditi = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url').'/api/komuditi/transaksi',[
+            'unit_komuditi' => round($request->pinjaman, 2),
+            'norujukan' => $norujukanbaru,
+            'kodcaw' => $auth_user['cawangan'],
+            'teller' => $auth_user['name']
+        ]);
+
+        ////////////////////////////
+       ////Update History Gadaian///
+       ////////////////////////////
+
+        $updatehistorygadaian = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url').'/api/gadai/updatehistory/'. $auth_user['cawangan'] .'/' . $norujukanbaru,[
+            'historygadaian' => $request->norujukan,
+            'jenistebus' => $request->jenistebus,
+        ])->json();
+
+        if($updatetebus == 'duplicate'){
+            return response()->json('duplicate');
+        }
+
+        //////////////////////
+       /// MAKING NEW SAG////
+       /////////////////////
+        $gadai_transaction = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/gadai/'. $auth_user['cawangan'] . '/' . $current->toDateString())->json();
+        if($gadai_transaction){
+            $new_sirig = $gadai_transaction['sirig'] + 1;
+
+        }else{
+            $new_sirig = 1;
+        }
+
+        $new_transaction = sprintf("%04d",$new_sirig);
+        $norujukanbaru = strtoupper($auth_user['cawangan']) . $curent_year . $curent_month . $current_day . '-' .$new_transaction;
+
+        $gadai = Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url').'/api/gadai/'.$auth_user['cawangan'],[
+            'norujukan' => $norujukanbaru,
+            'nopelanggan' => $request->nopelanggan,
+            'nokp' => $request->noic,
+            'sirig' => $new_sirig
+        ]);
+
+        ///////////////////////////
+       /// MARHUN UPDATE TABLE////
+       //////////////////////////
+
+       $arraymarhunbaru = [];
+
+       $marhunsediada = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/marhun/'. $request->norujukan)->json();
+
+       $marhunyangdiambil = $marhunsediada[0];
+       foreach($marhunyangdiambil as $index=>$marhunloop)
+       {
+           $karatbaru = str_replace('.','-',$marhunloop['karat']);
+           $hargabaru = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/harga_emas/'. $karatbaru)->json();
+
+           $harga = ($request->jenisAT == 'hargalama') ? $marhunloop['harga'] : $hargabaru['harga'];
+           $nilaimarhun = (floatval($harga) * floatval($marhunloop['berat']));
+
+           array_push($arraymarhunbaru, ["bil" => $marhunloop['bil'],"tag_permata" => $marhunloop['tag_permata'],"berat_batu_permata" => $marhunloop['berat_batu_permata'],"marhun" => $marhunloop['marhun'],"nota" => $marhunloop['nota'],"karat" => $marhunloop['karat'], "berat" => $marhunloop['berat'], "harga" => $harga, "n_marhun" => $nilaimarhun]);
+       }
+
+       foreach($arraymarhunbaru as $array1){
+           $updatemarhun = Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url').'/api/marhun/'. $auth_user['cawangan'],[
+               'norujukan' => $norujukanbaru,
+               'marhun' => $array1['marhun'],
+               'nota' => $array1['nota'],
+               'karat' => $array1['karat'],
+               'berat_emas' => $array1['berat'],
+               'harga' => $array1['harga'],
+               'nilai_marhun' => $array1['n_marhun'],
+               'tag_permata' => $array1['tag_permata'],
+               'berat_batu_permata' => $array1['berat_batu_permata'],
+               'jenisAT' => $request->jenisAT,
+	       'kuantiti' => $array1['bil']
+           ])->json();
+       }
+
+        //////////////////////
+       ////Update SAG BARU///
+       /////////////////////
+
+
+        $total_nilai_marhun = $request->total_nilai_marhun;
+        $margin_pinjaman = ($request->pinjaman / $total_nilai_marhun);
+
+        $onepercent = Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url').'/api/onepercent',[
+            'pembiayaan' => $request->pinjaman,
+            'nilaimarhun' => $total_nilai_marhun,
+            'kadarujrah' => $request->kadarkeuntungan,
+            'margin' => ($margin_pinjaman*100),
+            'kodcaw' => Auth::user()->cawangan
+        ])->json();
+
+        $keuntungan_sebln = $onepercent['keuntungan'];
+        $keuntungan_sebln = str_replace(',','',$keuntungan_sebln);
+
+        $kadarupah = $request->kadarkeuntungan * 100;
+        $keuntungan6bulan = $keuntungan_sebln * 6;
+        $keuntungan12bulan = $keuntungan_sebln * 12;
+        $hargajualan = $request->pinjaman + $keuntungan12bulan;
+
+
+        $gadai = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url').'/api/gadai/norujukan/'. $auth_user['cawangan'] .'/' . $norujukanbaru,[
+            'kodcaw' => $auth_user['cawangan'],
+            'nilaimarhun' => round($total_nilai_marhun, 2),
+            'berat' => round($request->total_berat, 2),
+            'pinjaman' => round($request->pinjaman, 2),
+            'kadarupah' => round($kadarupah, 2),
+            'marhun' => $request->marhun_detail,
+            'percentpinj' => $margin_pinjaman,
+            'teller'=> $auth_user['name'],
+            'upah6' => $keuntungan6bulan,
+            'upah12' => $keuntungan12bulan,
+            'hargajualan' => $hargajualan,
+            'kuantiti_marhun' => $request->kuantiti_marhun,
+        ]);
+
+
+        $komuditi = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url').'/api/komuditi/transaksi',[
+            'unit_komuditi' => round($request->pinjaman, 2),
+            'norujukan' => $norujukanbaru,
+            'kodcaw' => $auth_user['cawangan'],
+            'teller' => $auth_user['name']
+        ]);
+
+        ////////////////////////////
+       ////Update History Gadaian///
+       ////////////////////////////
+
+        $updatehistorygadaian = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url').'/api/gadai/updatehistory/'. $auth_user['cawangan'] .'/' . $norujukanbaru,[
+            'historygadaian' => $request->norujukan,
+            'jenistebus' => $request->jenistebus,
+        ])->json();
+
+
+        $alirantunai = new AliranTunaiController();
+        event(new TebusNotify('lulus',Auth::user()->cawangan));
+        event(new GadaiNotify('lulus',Auth::user()->cawangan));
+        $alirantunai->alirantunaiTebusAutoTawarruq($request);
+
+        return response()->json($updatemarhun,200);
+
     }
 
     public function tebusseparuh(Request $request)
@@ -621,7 +693,7 @@ class PenebusanController extends Controller
                 'tag_permata' => $array1['tag_permata'],
                 'berat_batu_permata' => $array1['berat_batu_permata'],
                 'nilai_marhun' => $array1['n_marhun'],
-                'kuantiti' => $array1['bil']
+		'kuantiti' => $array1['bil']
             ])->json();
 
         }
@@ -789,26 +861,4 @@ class PenebusanController extends Controller
         return view($view, compact('cawangan_info','api_url','gadai','marhun','nama','nilaihargasemasa'));
     }
 
-    public function getPampasanByNorujukan($norujukan)
-    {
-        $auth_user = Auth::user();
-        
-        $pampasanListResponse = Http::get(config('api.url'). '/api/palsu/laporan', [
-            'kodcaw' => $auth_user['cawangan'],
-            'status' => 'all',
-        ]);
-
-        if($pampasanListResponse->failed()){
-            throw new \Exception("Something wrong with API", 1);
-        }
-
-        $pampasanList = array_filter($pampasanListResponse->json(), function($pampasan) use($norujukan){
-            return $pampasan['norujukan'] == $norujukan;
-        });
-
-        $pampasan = sizeof($pampasanList) == 0 ? null : array_pop($pampasanList);
-
-        return $pampasan;
-    }
-
 }

app/Http/Kernel.php

@@ -72,6 +72,5 @@ class Kernel extends HttpKernel
         'admin' => 'App\Http\Middleware\Admin',
         'audit' => 'App\Http\Middleware\Audit',
         'masteradmin' => 'App\Http\Middleware\Masteradmin',
-        'role' => 'App\Http\Middleware\RoleAccess',
     ];
 }

app/Http/Middleware/RoleAccess.php

@@ -1,71 +0,0 @@
-<?php
-
-namespace App\Http\Middleware;
-use Illuminate\Support\Facades\Auth;
-use Closure;
-
-class RoleAccess
-{
-    /**
-     * Handle an incoming request.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Closure  $next
-     * @param  string  ...$roles
-     * @return mixed
-     */
-    public function handle($request, Closure $next, ...$roles)
-    {
-        if (!Auth::check()) {
-            return redirect('/login');
-        }
-
-        $user = Auth::user();
-        $userRole = $user->roles;
-        $userRoleHarian = $user->role_harian ?? null;
-
-        // Check each allowed role
-        foreach ($roles as $role) {
-            switch ($role) {
-                case 'teller':
-                    if ($userRoleHarian == 'teller' || $userRole == 'teller') {
-                        return $next($request);
-                    }
-                    break;
-                    
-                case 'khazanah':
-                    if ($userRole == 'pc' || $userRole == 'ppc') {
-                        return $next($request);
-                    }
-                    break;
-                    
-                case 'admin':
-                    if ($userRole == 'admin') {
-                        return $next($request);
-                    }
-                    break;
-                    
-                case 'penilai':
-                    if ($userRole == 'penilai') {
-                        return $next($request);
-                    }
-                    break;
-                    
-                case 'operasi':
-                    if ($userRole == 'operasi') {
-                        return $next($request);
-                    }
-                    break;
-                    
-                case 'audit':
-                    if ($userRole == 'audit') {
-                        return $next($request);
-                    }
-                    break;
-            }
-        }
-
-        // If no roles matched, deny access
-        abort(403, 'Access denied. Required roles: ' . implode(', ', $roles));
-    }
-}

config/api.php

@@ -1,6 +1,6 @@
 <?php
 return [
   'url' => env('API_URL'),
-  'url_koop' => env('API_URL_KOOP','http://localhost:8000'),
+  'url_koop' => env('API_URL_KOOP','https://apiujrah.erahn.com.my'),
   'url_pkb' => env('API_URL_PKB','http://localhost:8000'),
 ];

docker-compose.staging.yml

@@ -1,77 +0,0 @@
-# Staging stack — isolated from local docker-compose.yml (8081 / 3307)
-# and from api_arrahn staging (8090 / 3308).
-#
-# Local:
-#   docker compose --env-file .env.staging -f docker-compose.staging.yml up -d --build
-#
-# CI (image already in registry):
-#   APP_IMAGE=git.koppkb.com/kopkb/kaunter IMAGE_TAG=<sha> \
-#     docker compose --env-file .env.staging -f docker-compose.staging.yml up -d --no-build
-#
-# Host nginx reverse-proxies the public domain to 127.0.0.1:${HTTP_PORT}.
-# See docker/nginx/host-proxy.example.conf
-#
-# If 8091 or 3309 is already taken, set HTTP_PORT / MYSQL_PUBLISH_PORT in .env.staging.
-
-name: kaunter_staging
-
-services:
-  app:
-    image: ${APP_IMAGE:-kaunter}:${IMAGE_TAG:-staging}
-    build:
-      context: .
-      dockerfile: docker/php/Dockerfile
-      target: staging
-    container_name: kaunter_staging_app
-    working_dir: /var/www/html
-    volumes:
-      - storage_staging:/var/www/html/storage
-      - ./.env.staging:/var/www/html/.env.staging:ro
-    env_file:
-      - .env.staging
-    environment:
-      APP_ENV: staging
-      USE_STAGING_ENV: "true"
-    extra_hosts:
-      - "host.docker.internal:host-gateway"
-    depends_on:
-      mysql:
-        condition: service_healthy
-    restart: unless-stopped
-
-  web:
-    image: nginx:1.25-alpine
-    container_name: kaunter_staging_web
-    ports:
-      - "${HTTP_PORT:-8091}:80"
-    volumes:
-      - ./docker/nginx/default.conf:/etc/nginx/conf.d/default.conf:ro
-      - ./public:/var/www/html/public:ro
-    depends_on:
-      - app
-    restart: unless-stopped
-
-  mysql:
-    image: mysql:8.0
-    container_name: kaunter_staging_mysql
-    command: --default-authentication-plugin=mysql_native_password
-    ports:
-      - "127.0.0.1:${MYSQL_PUBLISH_PORT:-3309}:3306"
-    environment:
-      MYSQL_DATABASE: kaunter_erahn
-      MYSQL_USER: kaunteruser
-      MYSQL_PASSWORD: password
-      MYSQL_ROOT_PASSWORD: root
-    volumes:
-      - mysql_staging_data:/var/lib/mysql
-    healthcheck:
-      test: ["CMD", "mysqladmin", "ping", "-h", "127.0.0.1", "-uroot", "-proot"]
-      interval: 5s
-      timeout: 5s
-      retries: 30
-      start_period: 20s
-    restart: unless-stopped
-
-volumes:
-  mysql_staging_data:
-  storage_staging:

docker-compose.yml

@@ -1,43 +0,0 @@
-services:
-  app:
-    build:
-      context: .
-      dockerfile: docker/php/Dockerfile
-      target: development
-    working_dir: /var/www/html
-    volumes:
-      - ./:/var/www/html:cached
-    environment:
-      APP_ENV: local
-      APP_DEBUG: "true"
-    # Lets PHP resolve host.docker.internal to the host machine (Linux Docker; Desktop already provides this).
-    extra_hosts:
-      - "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
-
-  mysql:
-    image: mysql:8.0
-    command: --default-authentication-plugin=mysql_native_password
-    ports:
-      - "3307:3306"
-    environment:
-      MYSQL_DATABASE: kaunter_erahn
-      MYSQL_USER: kaunteruser
-      MYSQL_PASSWORD: password
-      MYSQL_ROOT_PASSWORD: root
-    volumes:
-      - mysql_data:/var/lib/mysql
-
-volumes:
-  mysql_data:

docker/nginx/default.conf

@@ -1,36 +0,0 @@
-server {
-    listen 80;
-    server_name _;
-
-    root /var/www/html/public;
-    index index.php index.html;
-
-    charset utf-8;
-    client_max_body_size 50M;
-
-    location / {
-        try_files $uri $uri/ @php;
-    }
-
-    location @php {
-        include fastcgi_params;
-        fastcgi_param SCRIPT_FILENAME /var/www/html/public/index.php;
-        fastcgi_param PATH_INFO $fastcgi_path_info;
-        fastcgi_pass app:9000;
-        fastcgi_index index.php;
-        fastcgi_read_timeout 120s;
-    }
-
-    location ~ \.php$ {
-        include fastcgi_params;
-        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
-        fastcgi_param PATH_INFO $fastcgi_path_info;
-        fastcgi_pass app:9000;
-        fastcgi_index index.php;
-        fastcgi_read_timeout 120s;
-    }
-
-    location ~ /\.(?!well-known).* {
-        deny all;
-    }
-}

docker/php/Dockerfile

@@ -1,51 +0,0 @@
-FROM php:7.4-fpm AS base
-
-WORKDIR /var/www/html
-
-RUN apt-get update \
-  && apt-get install -y --no-install-recommends \
-    git \
-    pkg-config \
-    unzip \
-    libonig-dev \
-    libzip-dev \
-    libpng-dev \
-    libjpeg62-turbo-dev \
-    libfreetype6-dev \
-  && docker-php-ext-configure gd --with-freetype --with-jpeg \
-  && docker-php-ext-install -j"$(nproc)" \
-    pdo_mysql \
-    mbstring \
-    bcmath \
-    zip \
-    exif \
-    gd \
-  && rm -rf /var/lib/apt/lists/*
-
-COPY --from=composer:2 /usr/bin/composer /usr/local/bin/composer
-
-COPY docker/php/php.ini /usr/local/etc/php/conf.d/app.ini
-COPY docker/php/zz-clear-env.conf /usr/local/etc/php-fpm.d/zz-clear-env.conf
-COPY docker/php/entrypoint.sh /usr/local/bin/app-entrypoint.sh
-
-RUN chmod +x /usr/local/bin/app-entrypoint.sh \
-  && usermod -u 1000 www-data && groupmod -g 1000 www-data
-
-ENTRYPOINT ["app-entrypoint.sh"]
-CMD ["php-fpm"]
-
-FROM base AS staging
-
-COPY --chown=www-data:www-data . /var/www/html
-
-RUN composer install --no-interaction --prefer-dist --no-dev --optimize-autoloader --no-scripts \
-  && mkdir -p \
-    storage/logs \
-    storage/framework/cache/data \
-    storage/framework/views \
-    storage/framework/sessions \
-    storage/app/public \
-    bootstrap/cache \
-  && chown -R www-data:www-data storage bootstrap/cache vendor
-
-FROM base AS development

docker/php/entrypoint.sh

@@ -1,35 +0,0 @@
-#!/bin/sh
-set -e
-
-cd /var/www/html
-
-if [ "${USE_STAGING_ENV:-false}" = "true" ] && [ -f .env.staging ]; then
-  cp .env.staging .env
-fi
-
-if [ -f composer.json ]; then
-  if [ -f vendor/autoload.php ] && [ "${USE_STAGING_ENV:-false}" = "true" ]; then
-    : # vendor is baked into the staging image
-  elif [ "${USE_STAGING_ENV:-false}" = "true" ]; then
-    composer install --no-interaction --prefer-dist --no-dev --optimize-autoloader --no-scripts
-  else
-    composer install --no-interaction --prefer-dist
-  fi
-fi
-
-mkdir -p \
-  storage/logs \
-  storage/framework/cache/data \
-  storage/framework/views \
-  storage/framework/sessions \
-  storage/app/public \
-  bootstrap/cache
-
-if [ -f artisan ]; then
-  php artisan package:discover --ansi
-  php artisan storage:link --force >/dev/null 2>&1 || true
-fi
-
-chown -R www-data:www-data storage bootstrap/cache
-
-exec docker-php-entrypoint "$@"

docker/php/php.ini

@@ -1,4 +0,0 @@
-memory_limit=512M
-upload_max_filesize=50M
-post_max_size=50M
-max_execution_time=120

docker/php/zz-clear-env.conf

@@ -1,3 +0,0 @@
-[www]
-; Pass container env vars (from compose env_file) through to PHP workers.
-clear_env = no

resources/js/app.js

@@ -1,30 +0,0 @@
-/**
- * First we will load all of this project's JavaScript dependencies which
- * includes Vue and other libraries. It is a great starting point when
- * building robust, powerful web applications using Vue and Laravel.
- */
-
-require('./bootstrap');
-
-window.Vue = require('vue');
-
-/**
- * The following block of code may be used to automatically register your
- * Vue components. It will recursively scan this directory for the Vue
- * components and automatically register them with their "basename".
- *
- * Eg. ./components/ExampleComponent.vue -> <example-component></example-component>
- */
-
-// const files = require.context('./', true, /\.vue$/i)
-// files.keys().map(key => Vue.component(key.split('/').pop().split('.')[0], files(key).default))
-
-/**
- * Next, we will create a fresh Vue application instance and attach it to
- * the page. Then, you may begin adding components to this application
- * or customize the JavaScript scaffolding to fit your unique needs.
- */
-
-const app = new Vue({
-    el: '#app',
-});

resources/js/bootstrap.js

@@ -35,7 +35,7 @@ window.Pusher = require('pusher-js');
 
 window.Echo = new Echo({
     broadcaster: 'pusher',
-    key: process.env.MIX_PUSHER_APP_KEY,
-    cluster: process.env.MIX_PUSHER_APP_CLUSTER,
-    forceTLS: false
+    key: '26b0ec2f297f94b7aa9b',
+    cluster: 'ap1',
+    forceTLS: true
 });

resources/views/aliran_tunai/index.blade.php

@@ -558,11 +558,14 @@
 
     function cetaklaporanalirantunai()
     {
-    let urlroute = '{{ route("laporan.alirantunai") }}';
-    
-    window.location.href = urlroute;
-    }
+        let teller = "{{ Auth::user()->name }}";
 
+        let urlroute = '{{ route("laporan.alirantunai", ":id") }}';
+        urlroute = urlroute.replace(':id', teller);
+
+        window.open(urlroute, '_blank');
+
+    }
 
     function cetakserahankeseluruhan()
     {

resources/views/aliran_tunai/laporan/laporanalirantunai.blade.php

@@ -1,298 +1,211 @@
-<style>
-#header {
-  font-family: Arial, Helvetica, sans-serif;
-  border-collapse: collapse;
-  width: 100%;
-}
+<html>
+<head>
+    <style>
+        .header{
+            font-size:12px;
+            font-weight: bold;
+            margin-left:40px;
+
+        }
+
+        body {
+            background: white; 
+        }
+
+        page {
+            background: white;
+            display: block;
+            margin: 0 auto;
+            margin-bottom: 0.5cm;
+            /* box-shadow: 0 0 0.5cm rgba(0,0,0,0.5); */
+        }
+
+        page[size="A4"] {  
+            width: 21cm;
+            /* height: 29.7cm;  */
+        }
+
+        page[size="A4"][layout="landscape"] {
+            width: 29.7cm;
+            height: 21cm;  
+        }
+
+        @media print {
+            body, page {
+                margin: 0;
+                box-shadow: 0;
+            }
+            
+        }
+
+        .middleheader{
+            text-align: center;  
+        }
+
+        .container{
+            font-family: Arial, Helvetica, sans-serif;
+            width: 25%;
+            border: 2px solid gray;
+            border-radius: 15px;
+            padding: 5px 10px 10px 30px;
+            margin: 0 auto;
+        }
+
+        #header {
+            font-family: Arial, Helvetica, sans-serif;
+            border-collapse: collapse;
+            width: 100%;
+            margin-left:40px;
+        }
+
+        #header td, #customer th {
+            padding:4px;
+            font-size:10px;
+        }
+
+        #header tr:nth-child(even){
+            background-color: #ffffff;
+        }
+
+        /* #header tr:hover {
+            background-color: #ddd;
+        } */
+
+        #header th {
+            padding-top: 12px;
+            padding-bottom: 12px;
+            text-align: left;
+            padding:4px;
+            color:black;
+        }
+
+        .statements{
+            font-family: Arial, Helvetica, sans-serif;
+            border-collapse: collapse;
+            width: 95%;
+            margin: 0 auto;
+        }
+        .statements th{
+            font-size:14px;
+            background-color: #f9ca24;
+            border:1px solid gray;
+            color:black;
+            padding:4px 10px 4px 10px;
+        }
+
+        .statements td{
+            border:1px solid gray;
+            padding:4px 4px 4px 4px;
+
+        }
+
+        .center{
+            position: fixed;
+            left: 0;
+            bottom: 0;
+            width: 100%;
+            color: white;
+            text-align: center;
+
+        }
+
+    </style>
+</head>
+<body onload="window.print()">
+<page size="A4">
+    <h6 class="header">SULIT DAN PERSENDIRIAN</h6>
+    <table id="header">
+        <tr>
+        <th rowspan="4"  style="width:50px"><br><img src="{{ asset('img/icon_pkb.png') }}" style="width:70px"></img></th>
+        <th colspan="1">KOPERASI PERMODALAN KELANTAN BERHAD</th>
+        </tr>
+        <tr>
+        <td>{{ $cawangan_detail['namacaw'] }}</td>
+        <td></td>
+        </tr>
+        <tr>
+        <td>{{ $cawangan_detail['alamat1'] }}</td>
+        <td></td>
+        </tr>
+        <tr>
+        <td>{{ $cawangan_detail['alamat2'].' No Tel : '. $cawangan_detail['notel'].' No Faks : '. $cawangan_detail['nofaks'] }}</td>
+        <td></td>
+        </tr>
+    </table>
+
+
+    <h6 class="middleheader">PENYATA ALIRAN TUNAI : {{ $teller }}</h6>
+
+    <div class="row" style="display: flex; justify-content: start;">
+        <div class="container" style="flex: 1; margin-left: 20px;">
+            <h3>Baki Awal</h3>
+            <span>RM {{ number_format($alirantunai['bakiawal'], 2) }}</span>
+        </div>
+    
+        <div class="container" style="flex: 1; margin-left: 10px;">
+            <h3>Pendahuluan</h3>
+            <span>RM {{ number_format($alirantunai['tambah'], 2) }}</span>
+        </div>
+    
+        <div class="container" style="flex: 1; margin-left: 10px;">
+            <h3>Penyelesaian Pem.</h3>
+            <span>RM {{ number_format($alirantunai['masuk'], 2) }}</span>
+        </div>
+    </div>
+
+    <div class="row" style="display: flex; justify-content: start; margin-top: 20px;">
+        <div class="container" style="flex: 1; margin-left: 20px;">
+            <h3>Baki Tunai Semasa</h3>
+            <span>RM {{ number_format($alirantunai['baki'], 2) }}</span>
+        </div>
+    
+        <div class="container" style="flex: 1; margin-left: 10px;">
+            <h3>Serahan</h3>
+            <span>RM {{ number_format($alirantunai['kurang'], 2) }}</span>
+        </div>
+    
+        <div class="container" style="flex: 1; margin-left: 10px;">
+            <h3>Pembiayaan</h3>
+            <span>RM {{ number_format($alirantunai['keluar'], 2) }}</span>
+        </div>
+    </div>
+    
+
+    <h6 class="middleheader" style="margin-bottom:-5px;">KEMASUKAN TUNAI</h6>
+    <br>
+
+    <table class="statements">
+        <tr>
+            <th>TARIKH</th>
+            <th>DEBIT (RM)</th>
+            <th>KREDIT (RM)</th>
+            <th>NOTA</th>
+        </tr>
+    @php $totaltambah = 0; $totalkurang = 0; @endphp
+    @foreach($addtunai as $index=>$ad)
+        @php $totaltambah += $ad['tambah']; $totalkurang += $ad['kurang']; @endphp
+        <tr style="text-align:center;">
+            <td>{{ $ad['tarikh'] }}</td>  
+            <td>{{ number_format($ad['tambah'],2) }}</td>
+            <td>{{ number_format($ad['kurang'],2) }}</td>
+            <td>{{ $ad['nota'] }}</td> 
+        </tr>
+    @endforeach
+        <tr style="text-align:center;">
+            <td style="font-weight:bold;">JUMLAH</td>
+            <td>{{ number_format($totaltambah,2) }}</td>
+            <td>{{ number_format($totalkurang,2) }}</td>
+            <td></td>
+        </tr>
+    </table>
+
+</page>
+
+<script>
 
-#header td, #customers th {
  
-  padding:4px;
-  font-size:10px;
-}
-
-#header tr:nth-child(even){background-color: #ffffff;}
-
-#header tr:hover {background-color: #ddd;}
-
-#header th {
-  padding-top: 12px;
-  padding-bottom: 12px;
-  text-align: left;
-  padding:4px;
-  color:black;
-}
-</style>
-
-
-
-
-<style>
-#scan {
-  font-family: Arial, Helvetica, sans-serif;
-  border-collapse: collapse;
-  width: 100%;
-}
-
-#scan td, #scan th {
- 
-  padding: 8px;
-  font-size:11px;
-}
-
-#scan tr:nth-child(even){background-color: #ffffff;}
-
-#scan tr:hover {background-color: #ddd;}
-
-#scan th {
-  padding-top: 12px;
-  padding-bottom: 12px;
-  text-align: left;
-  padding:4px;
-  color:black;
-}
-</style>
-
-
-<style>
-#scan {
-  font-family: Arial, Helvetica, sans-serif;
-  border-collapse: collapse;
-  width: 100%;
-}
-
-#scan td, #scan th {
-  border-collapse: collapse;
-  padding: 8px;
-  font-size:11px;
-}
-
-#scan tr:nth-child(even){background-color: #ffffff;}
-
-#scan tr:hover {background-color: #ddd;}
-
-#scan th {
-  border-collapse: collapse;
-  padding-top: 12px;
-  padding-bottom: 12px;
-  text-align: left;
-  padding:4px;
-  color:black;
-}
-</style>
-
-
-
-<style>
-#details {
-  font-family: Arial, Helvetica, sans-serif;
-  border-collapse: collapse;
-  width: 50%;
-}
-
-#details td, #details th {
- 
-  padding: 8px;
-  font-size:11px;
-}
-
-#details tr:nth-child(even){background-color: #ffffff;}
-
-#details tr:hover {background-color: #ddd;}
-
-#details th {
-  padding-top: 12px;
- font-style:bold;
-  padding-bottom: 12px;
-  text-align: left;
-  padding:4px;
-  color:black;
-}
-</style>
-
-<style>
-#sign {
-  font-family: Arial, Helvetica, sans-serif;
-  border-collapse: collapse;
-  width: 100%;
-}
-
-#sign td, #sign th {
-
-  padding: 8px;
-  font-size:11px;
-  text-align: center;
-}
-
-#sign tr:nth-child(even){background-color: #ffffff;}
-
-#sign tr:hover {background-color: #ddd;}
-
-#sign th {
-  padding-top: 12px;
-  padding-bottom: 12px;
-  text-align: left;
-  padding:4px;
-  color:black;
-}
-</style>
-
-
-<table id="header">
-  <tr>
-    <th rowspan="4"  style="width:50px"><br><img src="{{ asset('img/ARRAHN1.png') }}" style="width:70px"></img></th>
-    <th colspan="1">KOPERASI PERMODALAN KELANTAN BERHAD</th>
-  </tr>
-  <tr>
-    <td>{{ $cawangan_detail['namacaw'] }}</td>
-    <td></td>
-  </tr>
-  <tr>
-    <td>{{ $cawangan_detail['alamat1'] }}</td>
-    <td></td>
-  </tr>
-  <tr>
-    <td>{{ $cawangan_detail['alamat2'].' No Tel : '. $cawangan_detail['notel'].' No Faks : '. $cawangan_detail['nofaks'] }}</td>
-    <td></td>
-  </tr>
-</table>
-<br>
-
-<table id="scan">
-  <tr>
-     <th colspan="3" style="
-      text-align: left;
-      font-size: 16px;
-      font-weight: bold;
-      text-transform: uppercase;
-      padding-top: 10px;
-      padding-bottom: 10px;
-      letter-spacing: 0.5px;
-    ">
-      LAPORAN ALIRAN TUNAI TELLER
-    </th>
-  </tr>
-  
-   <tr>
-    <td style="width:100px"><b>TARIKH:</b></td>
-    <td><b>
-      @php 
-        $tarikhTeller = DateTime::createFromFormat('Y-m-d', $tunai['tarikh']);
-        echo $tarikhTeller->format('d-m-Y');
-      @endphp
-    </b></td>
-  </tr>
-
-  <tr>
-    <td><b>TARIKH CETAK:</b></td>
-    <td><b>
-      @php 
-        $myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_cetak);
-        $formattedweddingdate = $myDateTime->format('d-m-Y');
-        echo $formattedweddingdate;
-      @endphp
-    </b></td>
-  </tr>
-</table>
-
-<br>
-<table id="details">
-  <tr>
-    <th>BAKI AWAL</th>
-  </tr>
-  <tr>
-    <td>Baki Awal</td>
-    <td>:</td>
-    <td>RM {{ number_format($tunai['bakiawal'],2) }}</td>
-  </tr>
-
-  <tr>
-    <th>TAMBAH</th>
-  </tr>
-  <tr>
-    <td>Pendahuluan</td>
-    <td>:</td>
-    <td>RM {{ number_format($tunai['tambah'],2) }}</td>
-  </tr>
-  <tr>
-    <td>Pen. Pembiayaan / Keuntungan</td>
-    <td>:</td>
-    <td>RM {{ number_format($tunai['masuk'],2) }}</td>
-  </tr>
-  <tr>
-    <td>Kerugian Baki Lelong</td>
-    <td>:</td>
-    <td>RM {{ number_format($bakiLelong['rugi_lelong'],2) }}</td>
-  </tr>
-  <tr>
-    <td>Jumlah</td>
-    <td>:</td>
-    <td>RM {{ number_format($jumlahTambah,2) }}</td>
-  </tr>
-
-  <tr>
-    <th>TOLAK</th>
-  </tr>
-  <tr>
-    <td>Serahan</td>
-    <td>:</td>
-    <td>RM {{ number_format($tunai['kurang'],2) }}</td>
-  </tr>
-  <tr>
-    <td>Pembiayaan</td>
-    <td>:</td>
-    <td>RM {{ number_format($tunai['keluar'],2) }}</td>
-  </tr>
-  <tr>
-    <td>Baki Lelong</td>
-    <td>:</td>
-    <td>RM {{ number_format($bakiLelong['baki_lelong'],2) }}</td>
-  </tr>
-  <tr>
-    <td>Jumlah</td>
-    <td>:</td>
-    <td>RM {{ number_format($jumlahTolak,2) }}</td>
-  </tr>
-
-  <tr><th>BAKI AKHIR</th></tr>
-  <tr>
-    <td colspan="3" style="
-        border: 2px solid black;
-        text-align: center;
-        background-color: #f8f8f8;
-        font-weight: bold;
-        font-size: 13px;
-        padding: 10px;
-    ">
-      BAKI AKHIR TELLER: RM {{ number_format($tunai['bakiawal'] + $jumlahTambah - $jumlahTolak,2) }}
-    </td>
-  </tr>
-
-</table>
-
-<br>
-<br>
-<br>
-<br>
-<table id="sign">
-  <tr>
-    <td></td>
-    <td colspan="2"> .................................................................. </td>
-    <td> </td>
-    <td colspan="2">.................................................................. </td>
-    <td> </td>
-  </tr>
-  <tr>
-    <td></td>
-    <td colspan="2"><B> DI SEMAK</B> </td>
-    <td> </td>
-    <td colspan="2"><B>DI SAHKAN </B></td>
-    <td> </td>
-  </tr>
-</table>
-
-
-
-
 
+</script>
 
+</body>
+</html>

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

@@ -102,7 +102,7 @@
                             <h5 class="modal-title" id="ModalLabel">Daftar Pelanggan</h5>
                         </div>
                         <div class="modal-body">
-                            <form name="form-store" action="{{ route('customer.store') }}" onsubmit="verifycustomer()" method="POST">
+                            <form action="{{ route('customer.store') }}" onsubmit="verifycustomer()" method="POST">
                                 @csrf
                                 <div class="row form-group">
                                     <div class="col-md-6">
@@ -373,7 +373,7 @@
                             <h5 class="modal-title" id="ModalLabel">Daftar Pelanggan</h5>
                         </div>
                         <div class="modal-body">
-                            <form name="form-store" action="{{ route('customer.store') }}" onsubmit="verifycustomerpassport()" method="POST">
+                            <form action="{{ route('customer.store') }}" onsubmit="verifycustomerpassport()" method="POST">
                                 @csrf
                                 <div class="row form-group">
                                     <div class="col-md-6">
@@ -525,38 +525,36 @@ var api_url = @json($api_url ?? '');
         });
 
         // Logik amaran SweetAlert
-        if("{{ auth()->user()->cawangan }}"  == 'X0301'){
-            if (search === true) {
-                if (blacklist_search === true) {
-                    Swal.fire({
-                        icon: 'warning',
-                        title: 'Amaran!',
-                        text: 'Pelanggan telah disenarai hitamkan dari Pembiayaan.'
-                    });
-                } 
-                else if (isAnggota && !isPelanggan) {
-                    Swal.fire({
-                        icon: 'info',
-                        title: 'Anggota Belum Didaftarkan!',
-                        text: 'Pelanggan ini adalah anggota koperasi tetapi belum berdaftar sebagai pelanggan.'
-                    });
-                } 
-                else if (isPelanggan && !isAnggota) {
-                    Swal.fire({
-                        icon: 'info',
-                        title: 'Pelanggan Bukan Anggota!',
-                        text: 'Pelanggan ini berdaftar tetapi belum menjadi anggota koperasi.'
-                    });
-                } 
-                else if (!isAnggota && !isPelanggan) {
-                    Swal.fire({
-                        icon: 'info',
-                        title: 'Pelanggan Tiada Dalam Rekod!',
-                        text: 'Sila Daftar Pelanggan.'
-                    });
-                }
-            }
-        }
+        if (search === true) {
+    if (blacklist_search === true) {
+        Swal.fire({
+            icon: 'warning',
+            title: 'Amaran!',
+            text: 'Pelanggan telah disenarai hitamkan dari Pembiayaan.'
+        });
+    } 
+    else if (isAnggota && !isPelanggan) {
+        Swal.fire({
+            icon: 'info',
+            title: 'Anggota Belum Didaftarkan!',
+            text: 'Pelanggan ini adalah anggota koperasi tetapi belum berdaftar sebagai pelanggan.'
+        });
+    } 
+    else if (isPelanggan && !isAnggota) {
+        Swal.fire({
+            icon: 'info',
+            title: 'Pelanggan Bukan Anggota!',
+            text: 'Pelanggan ini berdaftar tetapi belum menjadi anggota koperasi.'
+        });
+    } 
+    else if (!isAnggota && !isPelanggan) {
+        Swal.fire({
+            icon: 'info',
+            title: 'Pelanggan Tiada Dalam Rekod!',
+            text: 'Sila Daftar Pelanggan.'
+        });
+    }
+}
 
     });
 
@@ -1394,21 +1392,6 @@ var api_url = @json($api_url ?? '');
         $('#pekerjaan-lain').val('');
         lainContainer.hide();
     }
-  });
-
-document.getElementsByName('form-store')[0].addEventListener('keypress', function(e) { 
-    // Jika tekan Enter
-    if (e.key === 'Enter') {
-
-        // Jika bukan butang submit dan bukan textarea
-        const tag = e.target.tagName.toLowerCase();
-        const type = e.target.type ? e.target.type.toLowerCase() : '';
-
-        if (tag !== 'textarea' && type !== 'submit') {
-            e.preventDefault();
-            return false;
-        }
-    }
 });
 </script>
 @push('additional_scripts')

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

@@ -75,7 +75,8 @@
                                             ->json();
                                     @endphp
                                     <input type="text" class="form-control" name="outstanding_semasa"
-                                        id="outstanding_semasa" readonly value="{{ number_format($outstanding_semasa, 2) }}">
+                                        id="outstanding_semasa" readonly
+                                        value="{{ number_format($outstanding_semasa, 2) }}">
                                 </div>
                             </div>
 
@@ -157,7 +158,7 @@
 
 
                         <!-- Butang Assign Sebagai Anggota -->
-                        @if (isset($showAssignAnggotaBtn) && $showAssignAnggotaBtn && auth()->user()->cawangan == 'X0301')
+                        @if (isset($showAssignAnggotaBtn) && $showAssignAnggotaBtn)
                             <div class="m-0 p-2">
                                 <button type="button" class="btn btn-success d-flex align-items-center"
                                     data-noic="{{ $noic }}" onclick="assignAnggota(this)">
@@ -363,31 +364,31 @@
                                     data-toggle="tab" href="#nav-tawarruq" role="tab" aria-controls="nav-tawarruq"
                                     aria-selected="{{ $aria_selected_SAG_baru }}">SAG Baru</a>
                                 <a class="nav-item nav-link {{ $activate_tab_SAG_lama }}" " id="nav-xtawarruq-tab" data-toggle="tab" href="#nav-xtawarruq" role="tab" aria-controls="nav-xtawarruq" aria-selected="{{ $aria_selected_SAG_lama }}"><span id="textnavsag">SAG Lama</span></a>
-                            </div>
-                        </nav>
-                        <div class="tab-content" id="navtawarruqdannottawarruq">
-                            <div class="tab-pane fade {{ $activate_pane_SAG_baru }}" id="nav-tawarruq" role="tabpanel" aria-labelledby="nav-tawarruq-tab">
-                                <table class="table table-striped table-hover" id="myTable">
-                                    <thead class="thead-dark">
-                                        <tr>
-                                            <th>Bil</th>
-                                            <th>No Rujukan</th>
-                                            <th>Tarikh Pembiayaan</th>
-                                            <th>Tarikh Matang</th>
-                                            <th>Baki Harga Jualan</th>
-                                            <th>Baki Pembiayaan</th>
-                                            <th>Margin</th>
-                                            <th>Tempoh</th>
-                                            <th>Keuntungan</th>
-                                            <th>Lelong</th>
-                                        </tr>
-                                    </thead>
-                                </table>
-                            </div>
-                            <div class="tab-pane fade {{ $activate_pane_SAG_lama }}" id="nav-xtawarruq" role="tabpanel" aria-labelledby="nav-xtawarruq-tab">
-                                <table id="xtawarruq" class="table table-striped table-hover">
-                                    <thead class="thead-dark">
-                                        {{-- <tr>
+                                </div>
+                            </nav>
+                            <div class="tab-content" id="navtawarruqdannottawarruq">
+                                <div class="tab-pane fade {{ $activate_pane_SAG_baru }}" id="nav-tawarruq" role="tabpanel" aria-labelledby="nav-tawarruq-tab">
+                                    <table class="table table-striped table-hover" id="myTable">
+                                        <thead class="thead-dark">
+                                            <tr>
+                                                <th>Bil</th>
+                                                <th>No Rujukan</th>
+                                                <th>Tarikh Pembiayaan</th>
+                                                <th>Tarikh Matang</th>
+                                                <th>Baki Harga Jualan</th>
+                                                <th>Baki Pembiayaan</th>
+                                                <th>Margin</th>
+                                                <th>Tempoh</th>
+                                                <th>Keuntungan</th>
+                                                <th>Lelong</th>
+                                            </tr>
+                                        </thead>
+                                    </table>
+                                </div>
+                                <div class="tab-pane fade {{ $activate_pane_SAG_lama }}" id="nav-xtawarruq" role="tabpanel" aria-labelledby="nav-xtawarruq-tab">
+                                    <table id="xtawarruq" class="table table-striped table-hover">
+                                        <thead class="thead-dark">
+                                            {{-- <tr>
                                         <th>Bil</th>
                                         <th>No Rujukan</th>
                                         <th>Tarikh Gadai</th>
@@ -397,139 +398,139 @@
                                         <th>Tempoh</th>
                                         <th>Lelong</th>
                                     </tr> --}}
-                                        <tr>
-                                            <th>Bil</th>
-                                            <th>No Rujukan</th>
-                                            <th>Tarikh Pembiayaan</th>
-                                            <th>Tarikh Matang</th>
-                                            <th>Baki Harga Jualan</th>
-                                            <th>Baki Pembiayaan</th>
-                                            <th>Margin</th>
-                                            <th>Tempoh</th>
-                                            <th>Keuntungan</th>
-                                            <th>Lelong</th>
-                                        </tr>
-                                    </thead>
-                                </table>
+                                            <tr>
+                                                <th>Bil</th>
+                                                <th>No Rujukan</th>
+                                                <th>Tarikh Pembiayaan</th>
+                                                <th>Tarikh Matang</th>
+                                                <th>Baki Harga Jualan</th>
+                                                <th>Baki Pembiayaan</th>
+                                                <th>Margin</th>
+                                                <th>Tempoh</th>
+                                                <th>Keuntungan</th>
+                                                <th>Lelong</th>
+                                            </tr>
+                                        </thead>
+                                    </table>
+                                </div>
                             </div>
+
+                            {{-- Sudah Tebus --}}
+
+                            <table id="dahtebusTable" class="table table-striped table-hover">
+                                <thead class="thead-dark">
+                                    <tr>
+                                        <th>Bil</th>
+                                        <th>No Rujukan</th>
+                                        <th>Tarikh Penyelesaian Pembiayaan</th>
+                                        <th>Baki Pembiayaan</th>
+                                        <th>Margin</th>
+                                        <th>Tempoh</th>
+                                    </tr>
+                                </thead>
+                            </table>
+
+                            <table id="lelongTable" class="table table-striped table-hover">
+                                <thead class="thead-dark">
+                                    <tr>
+                                        <th>Bil</th>
+                                        <th>No Rujukan</th>
+                                        <th>Tarikh Lelong</th>
+                                        <th>Tarikh Tuntut</th>
+                                        <th>Pembiayaan</th>
+                                        <th>Harga Jual</th>
+                                        <th>Jum Tuntut/Bayar</th>
+                                        <th>Keuntungan</th>
+                                        <th>Caj Lelong</th>
+                                        <th>Status Tuntutan</th>
+                                        <th>Cetak</th>
+                                    </tr>
+                                </thead>
+                            </table>
+
+                            <div class="text-center">
+                                <button class="btn btn-primary" onclick="ubahfunc(this)" id="button-edit-gadaian">Ubah</button>
+                                <button class="btn btn-primary" onclick="hapusfunc()">Hapus</button>
+                                <button class="btn btn-primary" onclick="histfunc()">Rekod Pembiayaan</button>
+                                <button class="btn btn-primary" onclick="removeansuran(this)" id="button-remove-ansuran">Hapus Ansuran</button>
+                            </div>
+
                         </div>
-
-                        {{-- Sudah Tebus --}}
-
-                        <table id="dahtebusTable" class="table table-striped table-hover">
-                            <thead class="thead-dark">
-                                <tr>
-                                    <th>Bil</th>
-                                    <th>No Rujukan</th>
-                                    <th>Tarikh Penyelesaian Pembiayaan</th>
-                                    <th>Baki Pembiayaan</th>
-                                    <th>Margin</th>
-                                    <th>Tempoh</th>
-                                </tr>
-                            </thead>
-                        </table>
-
-                        <table id="lelongTable" class="table table-striped table-hover">
-                            <thead class="thead-dark">
-                                <tr>
-                                    <th>Bil</th>
-                                    <th>No Rujukan</th>
-                                    <th>Tarikh Lelong</th>
-                                    <th>Tarikh Tuntut</th>
-                                    <th>Pembiayaan</th>
-                                    <th>Harga Jual</th>
-                                    <th>Jum Tuntut/Bayar</th>
-                                    <th>Keuntungan</th>
-                                    <th>Caj Lelong</th>
-                                    <th>Status Tuntutan</th>
-                                    <th>Cetak</th>
-                                </tr>
-                            </thead>
-                        </table>
-
-                        <div class="text-center">
-                            <button class="btn btn-primary" onclick="ubahfunc(this)" id="button-edit-gadaian">Ubah</button>
-                            <button class="btn btn-primary" onclick="hapusfunc()">Hapus</button>
-                            <button class="btn btn-primary" onclick="histfunc()">Rekod Pembiayaan</button>
-                            <button class="btn btn-primary" onclick="removeansuran(this)" id="button-remove-ansuran">Hapus Ansuran</button>
-                        </div>
-
                     </div>
                 </div>
             </div>
         </div>
-    </div>
-    </div>
+        </div>
 
-    <!-- Modal -->
-    <div class="modal fade" id="customer_detail" tabindex="-1" aria-labelledby="customer_detailLabel" aria-hidden="true">
-        <div class="modal-dialog modal-dialog-centered modal-xl">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <h5 class="modal-title" id="customer_detailLabel">Maklumat Pelanggan</h5>
-                    <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                    <span aria-hidden="true">&times;</span>
-                    </button>
-                </div>
-                <div class="modal-body">
-                    <form id="kemaskiniform">
-                        <div class='row form-group'>
-                            <div class='col-md-6'>
-                                <div class='form-group row col-md-12'>
-                                    <div class='col-md-5'>
-                                        Nama
+        <!-- Modal -->
+        <div class="modal fade" id="customer_detail" tabindex="-1" aria-labelledby="customer_detailLabel" aria-hidden="true">
+            <div class="modal-dialog modal-dialog-centered modal-xl">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <h5 class="modal-title" id="customer_detailLabel">Maklumat Pelanggan</h5>
+                        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                        <span aria-hidden="true">&times;</span>
+                        </button>
+                    </div>
+                    <div class="modal-body">
+                        <form id="kemaskiniform">
+                            <div class='row form-group'>
+                                <div class='col-md-6'>
+                                    <div class='form-group row col-md-12'>
+                                        <div class='col-md-5'>
+                                            Nama
+                                        </div>
+                                        <div class='col-md-7'>
+                                            <input type="text" readonly name='nama' id='nama' value="{{ $customer_info['nama'] }}" class='form-control'>
+                                        </div>
                                     </div>
-                                    <div class='col-md-7'>
-                                        <input type="text" readonly name='nama' id='nama' value="{{ $customer_info['nama'] }}" class='form-control'>
+                                    <div class='form-group row col-md-12'>
+                                        <div class='col-md-5'>
+                                            No KP
+                                        </div>
+                                        <div class='col-md-7'>
+                                            <input type="text" readonly name='icno' id='icno' value="{{ $customer_info['kpbaru'] ? $customer_info['kpbaru'] : $customer_info['kplama'] }}" class='form-control'>
+                                        </div>
                                     </div>
-                                </div>
-                                <div class='form-group row col-md-12'>
-                                    <div class='col-md-5'>
-                                        No KP
+                                    <div class='form-group row col-md-12'>
+                                        <div class='col-md-5'>
+                                            No Pelanggan
+                                        </div>
+                                        <div class='col-md-7'>
+                                            <input type="text" readonly name='nopelanggan' id='nopelanggan' value="{{ $customer_info['nopelanggan'] }}" class='form-control'>
+                                        </div>
                                     </div>
-                                    <div class='col-md-7'>
-                                        <input type="text" readonly name='icno' id='icno' value="{{ $customer_info['kpbaru'] ? $customer_info['kpbaru'] : $customer_info['kplama'] }}" class='form-control'>
+                                    <div class='form-group row col-md-12'>
+                                        <div class='col-md-5'>
+                                            No Telefon 1
+                                        </div>
+                                        <div class='col-md-7'>
+                                            <input type="text" readonly name='' id='telefon' value="{{ $customer_info['telefon'] ? $customer_info['telefon'] : '' }}" class='form-control'>
+                                            <span id="errortelefon" style="color:red;"></span>
+                                        </div>
                                     </div>
-                                </div>
-                                <div class='form-group row col-md-12'>
-                                    <div class='col-md-5'>
-                                        No Pelanggan
+                                    <div class='form-group row col-md-12'>
+                                        <div class='col-md-5'>
+                                            No Telefon 2
+                                        </div>
+                                        <div class='col-md-7'>
+                                            <input type="text" readonly name='telefon2' id='telefon2' value="{{ $customer_info['telefon2'] ? $customer_info['telefon2'] : '' }}" class='form-control'>
+                                            <span id="errortelefon2" style="color:red;"></span>
+                                        </div>
                                     </div>
-                                    <div class='col-md-7'>
-                                        <input type="text" readonly name='nopelanggan' id='nopelanggan' value="{{ $customer_info['nopelanggan'] }}" class='form-control'>
-                                    </div>
-                                </div>
-                                <div class='form-group row col-md-12'>
-                                    <div class='col-md-5'>
-                                        No Telefon 1
-                                    </div>
-                                    <div class='col-md-7'>
-                                        <input type="text" readonly name='' id='telefon' value="{{ $customer_info['telefon'] ? $customer_info['telefon'] : '' }}" class='form-control'>
-                                        <span id="errortelefon" style="color:red;"></span>
-                                    </div>
-                                </div>
-                                <div class='form-group row col-md-12'>
-                                    <div class='col-md-5'>
-                                        No Telefon 2
-                                    </div>
-                                    <div class='col-md-7'>
-                                        <input type="text" readonly name='telefon2' id='telefon2' value="{{ $customer_info['telefon2'] ? $customer_info['telefon2'] : '' }}" class='form-control'>
-                                        <span id="errortelefon2" style="color:red;"></span>
-                                    </div>
-                                </div>
-                                <div class='form-group row col-md-12'>
-                                    <div class='col-md-5'>
-                                        Bank
-                                    </div>
-                                    <div class='col-md-7'>
-                                        @php
-                                            $bank = Http::withOptions(['verify' => config('app.api_verify')])
-                                                ->get($api_url . '/api/bank')
-                                                ->json();
-                                        @endphp
-                                        <select class="form-control" name="kodbank" data-placeholder="Pilih Bank" id="kodbank" disabled="true">
-                                            <option value="-" selected disabled>-</option>
-                                             @foreach ($bank as $banks)
+                                    <div class='form-group row col-md-12'>
+                                        <div class='col-md-5'>
+                                            Bank
+                                        </div>
+                                        <div class='col-md-7'>
+                                            @php
+                                                $bank = Http::withOptions(['verify' => config('app.api_verify')])
+                                                    ->get($api_url . '/api/bank')
+                                                    ->json();
+                                            @endphp
+                                            <select class="form-control" name="kodbank" data-placeholder="Pilih Bank" id="kodbank" disabled="true">
+                                                <option value="-" selected disabled>-</option>
+                                                  @foreach ($bank as $banks)
                                     <option value="{{ $banks['abbreviation'] }}"
                                         {{ $banks['abbreviation'] == $customer_info['kodbank'] ? 'selected' : '' }}>
                                         {{ $banks['name'] }}</option>
@@ -971,7 +972,7 @@
                                                 var channel = pusher.subscribe(
                                                     'notice-kelulusan');
                                                 channel.bind('my-kelulusan', function(
-                                                data) {
+                                                    data) {
 
 
                                                     if (data.norujukan ==
@@ -995,7 +996,7 @@
                                                                     },
                                                                     success: function(
                                                                         data
-                                                                        ) {
+                                                                    ) {
                                                                         location
                                                                             .reload();
 
@@ -1004,17 +1005,18 @@
                                                                         xhr,
                                                                         status,
                                                                         error
-                                                                        ) {
+                                                                    ) {
                                                                         var err =
                                                                             eval(
                                                                                 "(" +
                                                                                 xhr
                                                                                 .responseText +
                                                                                 ")"
-                                                                                );
+                                                                            );
                                                                         alert
                                                                             (xhr
-                                                                                .responseText);
+                                                                                .responseText
+                                                                                );
                                                                     }
                                                                 });
                                                             });
@@ -1242,7 +1244,7 @@
                                 'RM ' + formatter.format(gadai_detail['bakipjm']),
                                 (((Number(gadai_detail['pinjaman']) / Number(gadai_detail[
                                     'nilaimarhun'])) * 100).toFixed(2)).toLocaleString(
-                                "en-GB") + '%',
+                                    "en-GB") + '%',
                                 gadai_detail['tempoh']
                             ]).draw();
                         } else if (jenistebus == "lelong") {
@@ -1273,7 +1275,7 @@
                                     '<a href="#" onclick="checktuntutbaki(this)" data-norujukan=' +
                                     gadai_detail['norujukan'] + ' data-tarikhtuntut=' +
                                     gadai_detail['trkhtuntut'] + '>' + gadai_detail[
-                                    'norujukan'] + '</a>',
+                                        'norujukan'] + '</a>',
                                     gadai_detail['t_lelong'],
                                     gadai_detail['trkhtuntut'],
                                     'RM ' + formatter.format(gadai_detail['pinjaman']),
@@ -1290,7 +1292,7 @@
                                     '<a href="#" onclick="checktuntutbaki(this)" data-norujukan=' +
                                     gadai_detail['norujukan'] + ' data-tarikhtuntut=' +
                                     gadai_detail['trkhtuntut'] + '>' + gadai_detail[
-                                    'norujukan'] + '</a>',
+                                        'norujukan'] + '</a>',
                                     gadai_detail['t_lelong'],
                                     gadai_detail['trkhtuntut'],
                                     'RM ' + formatter.format(gadai_detail['pinjaman']),
@@ -2164,10 +2166,10 @@
                                                                 cancelButtonText: 'Salah',
                                                                 reverseButtons: true
                                                             }).then((
-                                                            result) => {
+                                                                result) => {
                                                                 if (result
                                                                     .isConfirmed
-                                                                    ) {
+                                                                ) {
 
                                                                     $.ajax({
                                                                         method: 'put',
@@ -2181,11 +2183,11 @@
                                                                         },
                                                                         success: function(
                                                                             data
-                                                                            ) {
+                                                                        ) {
 
                                                                             if (data ===
                                                                                 1
-                                                                                ) {
+                                                                            ) {
                                                                                 Swal.fire({
                                                                                         icon: 'success',
                                                                                         title: 'Berjaya!',
@@ -2220,7 +2222,7 @@
                                                                     Swal
                                                                     .DismissReason
                                                                     .cancel
-                                                                    ) {
+                                                                ) {
                                                                     PengesahanAkhirWakil
                                                                         .fire(
                                                                             'Batal',
@@ -2242,12 +2244,12 @@
                                                             daftarwakilfunction
                                                                 (amaun,
                                                                     norujukan
-                                                                    );
+                                                                );
                                                         });
                                                     }
                                                 },
                                                 error: function(xhr, status,
-                                                error) {
+                                                    error) {
                                                     var err = eval("(" + xhr
                                                         .responseText + ")");
                                                     alert(xhr.responseText);
@@ -2479,7 +2481,7 @@
                                             success: function(data) {},
                                             error: function(xhr, status, error) {
                                                 var err = eval("(" + xhr.responseText +
-                                                ")");
+                                                    ")");
                                                 alert(xhr.responseText);
                                             }
                                         });
@@ -2527,7 +2529,7 @@
                                                                                 location
                                                                                     .reload();
                                                                             }
-                                                                            );
+                                                                        );
                                                                 } else {
                                                                     swalWithBootstrapButtons
                                                                         .fire(
@@ -2540,7 +2542,7 @@
                                                                                 location
                                                                                     .reload();
                                                                             }
-                                                                            );
+                                                                        );
                                                                 }
 
 
@@ -2554,10 +2556,10 @@
                                                                         xhr
                                                                         .responseText +
                                                                         ")"
-                                                                        );
+                                                                    );
                                                                 alert(xhr
                                                                     .responseText
-                                                                    );
+                                                                );
                                                             }
                                                         });
                                                         return true;
@@ -2716,10 +2718,10 @@
                                                                 'Maklumat Pembiayaan telah dihapuskan.',
                                                                 'success'
                                                             ).then(
-                                                            function() {
-                                                                location
-                                                                    .reload();
-                                                            });
+                                                                function() {
+                                                                    location
+                                                                        .reload();
+                                                                });
                                                     }
                                                 })
                                             },

resources/views/gadaian/v2/edit.blade.php

@@ -24,9 +24,6 @@
             </div>
             <div class="col-12 text-right mb-2">
                 <button type="button" style="margin:auto" class="btn btn-primary" data-toggle="modal" data-target="#daftar_marhun">Daftar Marhun</button>
-                <button type="button" id="toggleTableBtn" class="btn btn-info ml-2">
-                    <i class="fas fa-exchange-alt"></i> Papar Margin
-                </button>
             </div>
             <div class="card">
                 <div class="card-body">
@@ -56,33 +53,6 @@
                             <th colspan="5"></th>
                         </tfoot>
                     </table>
-                    
-                    <!-- Margin Summary Table (Hidden by default) -->
-                    <table class="table table-striped table-hover text-center" id="marginTable" style="display: none;">
-                        <thead class="thead-dark">
-                            <tr>
-                                <th>Bil</th>
-                                <th>Karat</th>
-                                <th>Nilai Marhun</th>
-                                <th>Margin Teller (%)</th>
-                                <th>Margin PC (%)</th>
-                                <th>Nilai Marhun Teller</th>
-                                <th>Nilai Marhun PC</th>
-                            </tr>
-                        </thead>
-                        <tbody id="marginTableBody">
-                            <!-- Dynamic content will be inserted here -->
-                        </tbody>
-                        <tfoot class="thead-success">
-                            <tr>
-                                <th colspan="2" class="text-center">Jumlah</th>
-                                <th id="totalNilaiMarhunMargin"></th>
-                                <th colspan="2"></th>
-                                <th id="totalNilaiTellerMargin"></th>
-                                <th id="totalNilaiPCMargin"></th>
-                            </tr>
-                        </tfoot>
-                    </table>
                 </div>
             </div>
             <div class="card">
@@ -541,21 +511,7 @@
                 "visible": false,
                 "searchable": false
             }
-        ],
-        "language": {
-            "lengthMenu": "Papar _MENU_ rekod setiap halaman",
-            "zeroRecords": "Tiada rekod dijumpai",
-            "info": "Memapar halaman _PAGE_ dari _PAGES_",
-            "infoEmpty": "Tiada rekod tersedia",
-            "infoFiltered": "(ditapis dari _MAX_ jumlah rekod)",
-            "search": "Cari:",
-            "paginate": {
-                "first": "Pertama",
-                "last": "Akhir",
-                "next": "Seterusnya",
-                "previous": "Sebelumnya"
-            }
-        }
+        ]
     });
 
     $(".select2").select2({
@@ -611,7 +567,6 @@
         total_berat = 0;
         total_kuantiti = 0;
         var marhun_details = '';
-        var array_mutu = [];
         tablemarhun.clear().draw();
         $.each(data,function(index,marhun){
             $.each(marhun,function(index,marhun_detail){
@@ -621,7 +576,6 @@
                 jumlah_nilai_marhun += Number(marhun_detail['n_marhun']);
                 status_tag_permata = marhun_detail['tag_permata'] == 1 ? 'Ada' : '';
                 total_kuantiti += Number(marhun_detail['bil']);
-                array_mutu.push([marhun_detail['karat'], marhun_detail['n_marhun']]);
                 tablemarhun.row.add([
                     counter,
                     marhun_detail['recno'],
@@ -634,7 +588,7 @@
                     marhun_detail['harga'],
                     status_tag_permata,
                     marhun_detail['berat_batu_permata'],
-                    "<div class='buttonpunya text-center'><button onclick='viewmarhun(this)' class='btn btn-info'><i class='fas fa-eye'></i></button> <button onclick='editmarhun(this)' class='btn btn-primary'><i class='fas fa-edit'></i></button> <button onclick='deletemarhun(this)' class='btn btn-danger'><i class='fas fa-trash-alt'></i></button></div>"
+                    "<div class='buttonpunya text-center'><button onclick='editmarhun(this)' class='btn btn-primary'><i class='fas fa-edit'></i></button> <button onclick='deletemarhun(this)' class='btn btn-danger'><i class='fas fa-trash-alt'></i></button></div>"
                 ]).draw();
                 count++;
                 counter = counter + 1;
@@ -647,7 +601,7 @@
         $('#bilangan_jumlah_kuantiti').val(formatter.format(total_kuantiti));
         $('#jumlah_nilai_marhun').val(formatter.format(jumlah_nilai_marhun));
         if (count == 1){
-            $('.buttonpunya').html("<button onclick='viewmarhun(this)' class='btn btn-info'><i class='fas fa-eye'></i></button> <button onclick='editmarhun(this)' class='btn btn-primary'><i class='fas fa-edit'></i></button>");
+            $('.buttonpunya').html("<button onclick='editmarhun(this)' class='btn btn-primary'><i class='fas fa-edit'></i></button>");
         }
         
         // if(total_nilai_marhun > 0 && total_nilai_marhun < 401){
@@ -702,32 +656,25 @@
         $('#keuntungan_sebulan').val(formatter.format(keuntungan_sebulan.toFixed(2)));
         $('#keuntungan_6bln').val(formatter.format(keuntungan_6bln.toFixed(2)));
 
-        var max_teller = 0;
-        var max_pelulus = 0;
-
         $.ajax({
             method:'GET',
             url: api_url + '/api/maxpinjaman',
-            data: {
-                'mutu': array_mutu,
-                'total_nilai_marhun': total_nilai_marhun,
-            },
             success:function(data){
                 
                 $.each(data,function(index,pinjaman){
-                    if (pinjaman['user_type'] == 'teller') {
+                    if(pinjaman['user_type'] == 'teller'){
                         pinjaman_teller = Number(pinjaman['max']);
-                        max_teller = pinjaman['teller_pinjaman'];
                     }
-                    if (pinjaman['user_type'] == 'khazanah') {
+                    if(pinjaman['user_type'] == 'khazanah'){
                         pinjaman_pelulus = Number(pinjaman['max']);
-                        max_pelulus = pinjaman['pc_pinjaman'];
                     }
                 });
                 $('.span-pinjaman-max-pelulus').text(formatter.format(pinjaman_pelulus) + ' %');
                 $('.span-pinjaman-max').text(formatter.format(pinjaman_teller) + ' %');
+                var max_teller = total_nilai_marhun * (pinjaman_teller/100);
+                var max_pelulus = total_nilai_marhun * (pinjaman_pelulus/100);
                 $('#pembiayaan_max_teller').val(formatter.format(max_teller));
-                $('#pembiyaan_max_pelulus').val(formatter.format(max_pelulus));
+                $('#pembiyaan_max_pelulus').val(formatter.format(max_pelulus.toFixed(2)));
             }
         });
     }
@@ -754,103 +701,6 @@
         });
     }
 
-    function viewmarhun(e){
-        let selectedrow = $(e).closest('tr');
-        let recno = tablemarhun.row(selectedrow).data();
-        let nm = recno[3];
-        let karat = recno[4];
-        let berat = recno[5];
-        let harga = recno[8];
-        let nota = recno[7];
-        let kuantiti = recno[6];
-        let jenismarhun = recno[2];
-        let beratpermata = recno[10];
-        
-        // Call API to get specific MaxMutuEmas data by karat
-        $.ajax({
-            url: '{{ config("api.url") }}/api/maxmutuemas/specific',
-            type: 'GET',
-            data: { karat: karat, nilaimarhun: nm },
-            success: function(response) {
-                let marginInfo = '';
-                let marginTable = '';
-                if (response && response.karat) {
-                    marginTable = `
-                        <table class="table table-bordered table-sm mt-3">
-                            <thead class="thead-light">
-                                <tr><th colspan="2" class="text-center"><strong>Maklumat Margin</strong></th></tr>
-                            </thead>
-                            <tbody>
-                                <tr><td><strong>Margin Teller</strong></td><td>${response.teller}%</td></tr>
-                                <tr><td><strong>Margin PC</strong></td><td>${response.pc}%</td></tr>
-                                <tr><td><strong>Nilai Marhun Teller</strong></td><td>RM${parseFloat(response.maxteller).toLocaleString('en-MY', {minimumFractionDigits: 2, maximumFractionDigits: 2})}</td></tr>
-                                <tr><td><strong>Nilai Marhun PC</strong></td><td>RM${parseFloat(response.maxpc).toLocaleString('en-MY', {minimumFractionDigits: 2, maximumFractionDigits: 2})}</td></tr>
-                            </tbody>
-                        </table>
-                    `;
-                }
-                
-                let details = `
-                    <table class="table table-bordered table-sm">
-                        <thead class="thead-light">
-                            <tr><th colspan="2" class="text-center"><strong>Maklumat Marhun</strong></th></tr>
-                        </thead>
-                        <tbody>
-                            <tr><td><strong>Jenis Marhun</strong></td><td>${jenismarhun}</td></tr>
-                            <tr><td><strong>Nilai Marhun Asal</strong></td><td>${nm}</td></tr>
-                            <tr><td><strong>Karat</strong></td><td>${karat}</td></tr>
-                            <tr><td><strong>Berat</strong></td><td>${berat}g</td></tr>
-                            <tr><td><strong>Kuantiti</strong></td><td>${kuantiti}</td></tr>
-                            <tr><td><strong>Harga</strong></td><td>RM${harga}</td></tr>
-                            <tr><td><strong>Nota</strong></td><td>${nota}</td></tr>
-                            <tr><td><strong>Berat Batu Permata</strong></td><td>${beratpermata}g</td></tr>
-                        </tbody>
-                    </table>
-                    ${marginTable}
-                `;
-                
-                Swal.fire({
-                    title: 'Maklumat Marhun & Margin',
-                    html: details,
-                    icon: 'info',
-                    confirmButtonText: 'OK',
-                    width: '600px'
-                });
-            },
-            error: function(xhr) {
-                // If API call fails, show basic marhun info only
-                let details = `
-                    <table class="table table-bordered table-sm">
-                        <thead class="thead-light">
-                            <tr><th colspan="2" class="text-center"><strong>Maklumat Marhun</strong></th></tr>
-                        </thead>
-                        <tbody>
-                            <tr><td><strong>Jenis Marhun</strong></td><td>${jenismarhun}</td></tr>
-                            <tr><td><strong>Nama</strong></td><td>${nm}</td></tr>
-                            <tr><td><strong>Karat</strong></td><td>${karat}</td></tr>
-                            <tr><td><strong>Berat</strong></td><td>${berat}g</td></tr>
-                            <tr><td><strong>Kuantiti</strong></td><td>${kuantiti}</td></tr>
-                            <tr><td><strong>Harga</strong></td><td>RM${harga}</td></tr>
-                            <tr><td><strong>Nota</strong></td><td>${nota}</td></tr>
-                            <tr><td><strong>Berat Batu Permata</strong></td><td>${beratpermata}g</td></tr>
-                        </tbody>
-                    </table>
-                    <div class="alert alert-warning text-center">
-                        <em>Maklumat margin tidak tersedia</em>
-                    </div>
-                `;
-                
-                Swal.fire({
-                    title: 'Maklumat Marhun',
-                    html: details,
-                    icon: 'info',
-                    confirmButtonText: 'OK',
-                    width: '600px'
-                });
-            }
-        });
-    }
-
     function editmarhun(e){
         let norujuk = $('#norujukan').val();
         let selectedrow = $(e).closest('tr');
@@ -1652,7 +1502,7 @@
 
                     swalWithBootstrapButtons.fire({
                         title: 'Dapatkan Pengesahan Daripada Khazanah?',
-                        text: "Tetapan Margin Melebihi Limit Maksima Teller!",
+                        text: "Tetapan margin melebihi" + pinjaman_teller + "% untuk Khazanah!",
                         icon: 'info',
                         showCancelButton: true,
                         confirmButtonText: 'Hantar',
@@ -1664,7 +1514,7 @@
                             let norujukan = $('#norujukan').val();
                             let nm = parseFloat($('#total_nilai_marhun').val().replace(/[^0-9.-]+/g,""));let ber = $('#total_berat').val();let marg = $('.span-pinjaman').text();
                             // let komen = "Pembiayaan Melebihi Margin 70%|" + nm + "|" + ber +  "|" + marg + "|";
-                            let status = "Tetapan Margin Melebihi Limit Maksima Teller: " + pinjaman_teller + "%";
+                            let status = "Pembiayaan Melebihi Margin " + pinjaman_teller + "%";
                             let jumpinjam = $('#pinjaman').val();
                             let teller = "{{ Auth::user()->name }}";
 
@@ -1768,153 +1618,5 @@
             }
         }
     }
-
-    // Toggle Table Functionality
-    let isMarginTableVisible = false;
-    
-    $('#toggleTableBtn').on('click', function() {
-        if (!isMarginTableVisible) {
-            // Show margin table, hide main table
-            $('#myTable_wrapper').hide();
-            $('#marginTable').show();
-            $(this).html('<i class="fas fa-exchange-alt"></i> Papar Marhun');
-            loadMarginData();
-            isMarginTableVisible = true;
-        } else {
-            // Show main table, hide margin table
-            $('#marginTable_wrapper').hide();
-            $('#myTable_wrapper').show();
-            $(this).html('<i class="fas fa-exchange-alt"></i> Papar Margin');
-            isMarginTableVisible = false;
-        }
-    });
-    
-    function loadMarginData() {
-        let marginData = [];
-        let totalNilaiMarhun = 0;
-        let totalNilaiTeller = 0;
-        let totalNilaiPC = 0;
-        
-        // Process each individual row from the main table
-        let rowsData = [];
-        tablemarhun.rows().data().each(function(row, index) {
-            let recno = row[1]; // Recno column
-            let karat = row[4]; // Karat column
-            let nilaiMarhun = parseFloat(row[3].replace(/[^0-9.-]+/g, "")); // Nilai Marhun column
-            rowsData.push({
-                index: index,
-                recno: recno,
-                karat: karat, 
-                nilaiMarhun: nilaiMarhun
-            });
-        });
-        
-        let bil = 1;
-        let processedCount = 0;
-        let totalEntries = rowsData.length;
-
-        rowsData.forEach((rowData) => {
-            // Call API to get margin data for each individual item
-            $.ajax({
-                url: '{{ config("api.url") }}/api/maxmutuemas/specific',
-                type: 'GET',
-                data: { karat: rowData.karat, nilaimarhun: rowData.nilaiMarhun },
-                success: function(response) {
-                    if (response && response.karat) {
-                        let nilaiTeller = parseFloat(response.maxteller) || 0;
-                        let nilaiPC = parseFloat(response.maxpc) || 0;
-
-                        marginData.push({
-                            index: rowData.index,
-                            bil: rowData.index + 1,
-                            recno: rowData.recno,
-                            karat: rowData.karat,
-                            nilaiMarhun: rowData.nilaiMarhun,
-                            marginTeller: response.teller,
-                            marginPC: response.pc,
-                            nilaiTeller: nilaiTeller,
-                            nilaiPC: nilaiPC
-                        });
-                        
-                        totalNilaiMarhun += rowData.nilaiMarhun;
-                        totalNilaiTeller += nilaiTeller;
-                        totalNilaiPC += nilaiPC;
-                    }
-                    
-                    processedCount++;
-                    if (processedCount === totalEntries) {
-                        // Sort by original index to maintain order
-                        marginData.sort((a, b) => a.index - b.index);
-                        populateMarginTable(marginData, totalNilaiMarhun, totalNilaiTeller, totalNilaiPC);
-                    }
-                },
-                error: function() {
-                    processedCount++;
-                    if (processedCount === totalEntries) {
-                        // Sort by original index to maintain order
-                        marginData.sort((a, b) => a.index - b.index);
-                        populateMarginTable(marginData, totalNilaiMarhun, totalNilaiTeller, totalNilaiPC);
-                    }
-                }
-            });
-        });
-    }
-    
-    let marginDataTable = null;
-    
-    function populateMarginTable(data, totalMarhun, totalTeller, totalPC) {
-        // If DataTable already exists, destroy it first
-        if (marginDataTable !== null) {
-            marginDataTable.destroy();
-            marginDataTable = null;
-        }
-        
-        let tbody = $('#marginTableBody');
-        tbody.empty();
-        
-        data.forEach(function(item) {
-            let row = `
-                <tr>
-                    <td>${item.bil}</td>
-                    <td>${item.karat}</td>
-                    <td>RM${item.nilaiMarhun.toLocaleString('en-MY', {minimumFractionDigits: 2, maximumFractionDigits: 2})}</td>
-                    <td>${item.marginTeller}%</td>
-                    <td>${item.marginPC}%</td>
-                    <td>RM${item.nilaiTeller.toLocaleString('en-MY', {minimumFractionDigits: 2, maximumFractionDigits: 2})}</td>
-                    <td>RM${item.nilaiPC.toLocaleString('en-MY', {minimumFractionDigits: 2, maximumFractionDigits: 2})}</td>
-                </tr>
-            `;
-            tbody.append(row);
-        });
-        
-        // Initialize DataTable
-        marginDataTable = $('#marginTable').DataTable({
-            "pageLength": 10,
-            "ordering": false,
-            "order": [[ 0, "asc" ]],
-            "responsive": true,
-            "language": {
-                "lengthMenu": "Papar _MENU_ rekod setiap halaman",
-                "zeroRecords": "Tiada rekod dijumpai",
-                "info": "Memapar halaman _PAGE_ dari _PAGES_",
-                "infoEmpty": "Tiada rekod tersedia",
-                "infoFiltered": "(ditapis dari _MAX_ jumlah rekod)",
-                "search": "Cari:",
-                "paginate": {
-                    "first": "Pertama",
-                    "last": "Akhir",
-                    "next": "Seterusnya",
-                    "previous": "Sebelumnya"
-                }
-            },
-            "footerCallback": function (row, data, start, end, display) {
-                // Update footer totals
-                $('#totalNilaiMarhunMargin').text('RM' + totalMarhun.toLocaleString('en-MY', {minimumFractionDigits: 2, maximumFractionDigits: 2}));
-                $('#totalNilaiTellerMargin').text('RM' + totalTeller.toLocaleString('en-MY', {minimumFractionDigits: 2, maximumFractionDigits: 2}));
-                $('#totalNilaiPCMargin').text('RM' + totalPC.toLocaleString('en-MY', {minimumFractionDigits: 2, maximumFractionDigits: 2}));
-            }
-        });
-    }
-
 </script>
 @endsection

resources/views/gadaian/v2/index.blade.php

@@ -14,7 +14,7 @@
 @endphp
 
 @if($gadai_session != null)
-<div class="p-4">
+<div class="container">
     <div class="row justify-content-center">
         <div class="col-md-12 col-lg-12">
 
@@ -29,6 +29,7 @@
             <div class="form-group row col-12">
                 <input type="hidden" name="kodcaw" id="kodcaw" value="{{$cawangan_info['kodcaw']}}">
                 <input type="hidden" name="nokp" id="nokp" value="{{ $customer_info['kpbaru'] }}">
+                <input type="hidden" name="tag_anggota" id="tag_anggota" value="{{ $customer_info['tag_anggota'] ?? 0 }}">
 
             </div>
             <div class="col-12 mb-2">
@@ -63,14 +64,6 @@
             </div>
             <div class="card">
                 <div class="card-body">
-                    <!-- Toggle Button -->
-                    <div class="mb-3">
-                        <button type="button" class="btn btn-info" id="toggleTableBtn">
-                            <i class="fas fa-exchange-alt"></i> Papar Margin
-                        </button>
-                    </div>
-                    
-                    <!-- Main Marhun Table -->
                     <table class="table table-striped table-hover text-center" id="myTable">
                         <thead class="thead-dark">
                             <tr>
@@ -97,35 +90,6 @@
                             <th colspan="5"></th>
                         </tfoot>
                     </table>
-                    
-                    <!-- Margin Summary Table (Hidden by default) -->
-                    <table class="table table-striped table-hover text-center" id="marginTable" style="display: none;">
-                        <thead class="thead-dark">
-                            <tr>
-                                <th>Bil</th>
-                                <th>Karat</th>
-                                <th>Nilai Marhun</th>
-                                <th>Margin Teller (%)</th>
-                                <th>Margin PC (%)</th>
-                                <th>Pembiayaan Teller</th>
-                                <th>Pembiayaan PC</th>
-                            </tr>
-                        </thead>
-                        <tbody id="marginTableBody">
-                            <!-- Data will be populated by JavaScript -->
-                        </tbody>
-                        <tfoot class="thead-dark">
-                            <tr>
-                                <th>Jumlah</th>
-                                <th></th>
-                                <th id="totalNilaiMarhunMargin"></th>
-                                <th></th>
-                                <th></th>
-                                <th id="totalNilaiTellerMargin"></th>
-                                <th id="totalNilaiPCMargin"></th>
-                            </tr>
-                        </tfoot>
-                    </table>
                 </div>
             </div>
             <div class="card">
@@ -217,6 +181,17 @@
                                     </div>
                                 </diV>
                             </div>
+                            <div class="col-4">
+                                <div class="form-group row">
+                                    <div class="col-md-6">
+                                        Kadar Rebet
+                                    </div>
+                                    <div class="col-md-6">
+                                        <input type="text" class="form-control" readonly name="rebate" id="rebate">
+                                        <input type="text" class="form-control" readonly name="kadar_rebate" id="kadar_rebate">
+                                    </div>
+                                </div>
+                            </div>
                             <div class="col-12">
                                 <input type="text" name="norujukan_gadai" id="norujukan_gadai" value="{{ $norujukan }}" hidden>
                                 <input type="text" name="marhun_detail" id="marhun_detail" value="" hidden>
@@ -510,34 +485,21 @@
         })
     }
 
-        var tablemarhun = $('#myTable').DataTable({
-            "ordering": false,
-            "columnDefs": [{
-                    "targets": [1],
-                    "visible": false,
-                    "searchable": false
-                },
-                {
-                    "targets": [7],
-                    "visible": true,
-                    "searchable": false
-                }
-            ],
-            "language": {
-                "lengthMenu": "Papar _MENU_ rekod setiap halaman",
-                "zeroRecords": "Tiada rekod dijumpai",
-                "info": "Memapar halaman _PAGE_ dari _PAGES_",
-                "infoEmpty": "Tiada rekod tersedia",
-                "infoFiltered": "(ditapis dari _MAX_ jumlah rekod)",
-                "search": "Cari:",
-                "paginate": {
-                    "first": "Pertama",
-                    "last": "Akhir",
-                    "next": "Seterusnya",
-                    "previous": "Sebelumnya"
-                }
+    var tablemarhun = $('#myTable').DataTable({
+        "ordering": false,
+        "columnDefs": [
+            {
+                "targets": [ 1 ],
+                "visible": false,
+                "searchable": false
             },
-        });
+            {
+                "targets": [ 7 ],
+                "visible": false,
+                "searchable": false
+            }
+        ]
+    });
 
     $(".select2").select2({
         dropdownParent: $('#daftar_marhun'),
@@ -577,106 +539,107 @@
         closeOnSelect: false
     });
 
-        var total_nilai_marhun = 0;
-        var total_berat = 0;
-        var total_kuantiti = 0;
-        var kadarupah = 0;
-        var jumlah_marhun = 0;
-        var jumlah_nilai_marhun = 0;
-        var pinjaman_pelulus = 0;
-        var pinjaman_teller = 0;
-
-        function marhuntable(data) {
-            var counter = 1;
-            total_nilai_marhun = 0;
-            total_berat = 0;
-            total_kuantiti = 0;
-            var marhun_details = '';
-            var array_mutu = [];
-            jumlah_nilai_marhun = 0;
-            tablemarhun.clear().draw();
-            $.each(data, function(index, marhun) {
-                $.each(marhun, function(index, marhun_detail) {
-                    total_nilai_marhun = total_nilai_marhun + Number(marhun_detail['n_marhun']);
-                    total_berat = total_berat + Number(marhun_detail['berat']);
-                    marhun_details = marhun_details + marhun_detail['bil'] + " " + marhun_detail['marhun'] + ",";
-                    jumlah_nilai_marhun += Number(marhun_detail['n_marhun']);
-                    status_tag_permata = marhun_detail['tag_permata'] == 1 ? 'Ada' : '';
-                    total_kuantiti += Number(marhun_detail['bil']);
-                    array_mutu.push([marhun_detail['karat'], marhun_detail['n_marhun']]);
-                    tablemarhun.row.add([
-                        counter,
-                        marhun_detail['recno'],
-                        marhun_detail['marhun'],
-                        formatter.format(marhun_detail['n_marhun']),
-                        marhun_detail['karat'],
-                        formatter.format(marhun_detail['berat']),
-                        marhun_detail['bil'],
-                        marhun_detail['nota'],
-                        marhun_detail['harga'],
-                        status_tag_permata,
-                        marhun_detail['berat_batu_permata'],
-                        "<div class='buttonpunya text-center'><button onclick='editmarhun(this)' class='btn btn-primary'><i class='fas fa-edit'></i></button> <button onclick='deletemarhun(this)' class='btn btn-danger'><i class='fas fa-trash-alt'></i></button></div>"
-                    ]).draw();
-                    counter = counter + 1;
-                });
+    var total_nilai_marhun = 0;
+    var total_berat = 0;
+    var total_kuantiti = 0;
+    var kadarupah = 0;
+    var jumlah_marhun = 0;
+    var jumlah_nilai_marhun = 0;
+    var pinjaman_pelulus = 0;
+    var pinjaman_teller = 0;
+    function marhuntable(data){
+        var counter = 1;
+        total_nilai_marhun = 0;
+        total_berat = 0;
+        total_kuantiti = 0;
+        var marhun_details = '';
+        jumlah_nilai_marhun = 0;
+        tablemarhun.clear().draw();
+        $.each(data,function(index,marhun){
+            $.each(marhun,function(index,marhun_detail){
+                total_nilai_marhun = total_nilai_marhun + Number(marhun_detail['n_marhun']);
+                total_berat = total_berat + Number(marhun_detail['berat']);
+                marhun_details = marhun_details + marhun_detail['bil'] + " " + marhun_detail['marhun'] +",";
+                jumlah_nilai_marhun += Number(marhun_detail['n_marhun']);
+                status_tag_permata = marhun_detail['tag_permata'] == 1 ? 'Ada' : '';
+                total_kuantiti += Number(marhun_detail['bil']);
+                tablemarhun.row.add([
+                    counter,
+                    marhun_detail['recno'],
+                    marhun_detail['marhun'],
+                    formatter.format(marhun_detail['n_marhun']),
+                    marhun_detail['karat'],
+                    formatter.format(marhun_detail['berat']),
+                    marhun_detail['bil'],
+                    marhun_detail['nota'],
+                    marhun_detail['harga'],
+                    status_tag_permata,
+                    marhun_detail['berat_batu_permata'],
+                    "<div class='buttonpunya text-center'><button onclick='editmarhun(this)' class='btn btn-primary'><i class='fas fa-edit'></i></button> <button onclick='deletemarhun(this)' class='btn btn-danger'><i class='fas fa-trash-alt'></i></button></div>"
+                ]).draw();
+                counter = counter + 1;
             });
-            $('#totalberattable').text(formatter.format(total_berat));
-            $('#totalkuantititable').text(total_kuantiti);
-            $('#totalnilaimarhuntable').text(formatter.format(jumlah_nilai_marhun));
-            $('#bilangan_marhun').val(formatter.format(counter - 1));
-            $('#bilangan_jumlah_kuantiti').val(formatter.format(total_kuantiti));
-            $('#jumlah_nilai_marhun').val(formatter.format(jumlah_nilai_marhun));
+        });
+        $('#totalberattable').text(formatter.format(total_berat));
+        $('#totalkuantititable').text(total_kuantiti);
+        $('#totalnilaimarhuntable').text(formatter.format(jumlah_nilai_marhun));
+        $('#bilangan_marhun').val(formatter.format(counter-1));
+        $('#bilangan_jumlah_kuantiti').val(formatter.format(total_kuantiti));
+        $('#jumlah_nilai_marhun').val(formatter.format(jumlah_nilai_marhun));
+        // if(total_nilai_marhun > 0 && total_nilai_marhun < 401){
+        //     kadarupah = 1.2/100;
+        // }else if(total_nilai_marhun >= 401 && total_nilai_marhun < 2001){
+        //     kadarupah = 1.5/100;
+        // }else if(total_nilai_marhun >= 2001 ){
+        //     kadarupah = 1.7/100;
+        // }
 
+        $.ajax({
+    method:'GET',
+    url: api_url + '/api/kadarujrah',
+    async:false,
+    data:{
+        'nokp': $('#nokp').val(),
+        'nilaimarhun' : total_nilai_marhun,
+        'kodcaw' : kodcaw_ujrah
+    },
+    success:function(data){
+        kadarupah = data;
+
+        // Jika anggota (tag_anggota = 1), kadar ujrah dipaksa 0.00
+        if(Number($('#tag_anggota').val()) === 1){
+            kadarupah = 0;
+        }
+    }
+});
+
+        $('#total_nilai_marhun').val(formatter.format(total_nilai_marhun));
+        $('#marhun_detail').val(marhun_details);
+        $('#total_berat').val(formatter.format(total_berat));
+        $('#kadarkeuntungan').val(formatter.format(kadarupah));
+        $('#kuantiti_marhun').val(formatter.format(jumlah_marhun));
 
         $.ajax({
             method:'GET',
-            url: api_url + '/api/kadarujrah',
-            async:false,
-            data:{
-                'nokp': $('#nokp').val(),
-                'nilaimarhun' : total_nilai_marhun,
-                'kodcaw' : kodcaw_ujrah
-            },
+            url: api_url + '/api/maxpinjaman',
             success:function(data){
-                kadarupah = data;
+                $.each(data,function(index,pinjaman){
+                    if(pinjaman['user_type'] == 'teller'){
+                        pinjaman_teller = Number(pinjaman['max']);
+                    }
+                    if(pinjaman['user_type'] == 'khazanah'){
+                        pinjaman_pelulus = Number(pinjaman['max']);
+                    }
+                });
+                $('.span-pinjaman-max-pelulus').text(formatter.format(pinjaman_pelulus) + ' %');
+                $('.span-pinjaman-max').text(formatter.format(pinjaman_teller) + ' %');
+                var max_teller = total_nilai_marhun * (pinjaman_teller/100);
+                var max_pelulus = total_nilai_marhun * (pinjaman_pelulus/100);
+                $('#pembiayaan_max_teller').val(formatter.format(max_teller.toFixed(2)));
+                $('#pembiyaan_max_pelulus').val(formatter.format(max_pelulus.toFixed(2)));
             }
         });
-
-            $('#total_nilai_marhun').val(formatter.format(total_nilai_marhun));
-            $('#marhun_detail').val(marhun_details);
-            $('#total_berat').val(formatter.format(total_berat));
-            $('#kadarkeuntungan').val(formatter.format(kadarupah));
-            $('#kuantiti_marhun').val(formatter.format(jumlah_marhun));
-
-            var max_teller = 0;
-            var max_pelulus = 0;
-
-            $.ajax({
-                method: 'GET',
-                url: api_url + '/api/maxpinjaman',
-                data: {
-                    'mutu': array_mutu,
-                    'total_nilai_marhun': total_nilai_marhun,
-                },
-                success: function(data) {
-                    $.each(data, function(index, pinjaman) {
-                        if (pinjaman['user_type'] == 'teller') {
-                            pinjaman_teller = Number(pinjaman['max']);
-                            max_teller = pinjaman['teller_pinjaman'];
-                        }
-                        if (pinjaman['user_type'] == 'khazanah') {
-                            pinjaman_pelulus = Number(pinjaman['max']);
-                            max_pelulus = pinjaman['pc_pinjaman'];
-                        }
-                    });
-                    $('.span-pinjaman-max-pelulus').text(formatter.format(pinjaman_pelulus) + ' %');
-                    $('.span-pinjaman-max').text(formatter.format(pinjaman_teller) + ' %');
-                    $('#pembiayaan_max_teller').val(formatter.format(max_teller));
-                    $('#pembiyaan_max_pelulus').val(formatter.format(max_pelulus));
-                }
-            });
-        }
+    }
 
     $('#pinjaman').on('input',function(){
         var pinjaman = Number(this.value);
@@ -711,12 +674,35 @@
 
         var keuntungan_sebulan = getRoundedMethod(array_keuntungan['keuntungan']);
         var keuntungan_6bln = getRoundedMethod(keuntungan_sebulan * 6);
+        var ujrah = getRoundedMethod(array_keuntungan['ujrah']);
+            var onepercent = getRoundedMethod(array_keuntungan['onepercent']);
 
+            // **Rebate Calculation**
+            let rebate, kadar_rebate;
+            if (pinjaman < 20000) {
+                rebate = keuntungan_sebulan * 0.05;
+                kadar_rebate = 5;
+            } else if (pinjaman >= 20000 && pinjaman <= 50000) {
+                rebate = keuntungan_sebulan * 0.10;
+                kadar_rebate = 10;
+            } else if (pinjaman > 50000 && pinjaman <= 100000) {
+                rebate = keuntungan_sebulan * 0.15;
+                kadar_rebate = 15;
+            } else {
+                rebate = keuntungan_sebulan * 0.20;
+                kadar_rebate = 20;
+            }
+
+            rebate = getRoundedMethod(rebate); // ✅ Round rebate before displaying
+
+            // **Display values**
         $('.span-pinjaman').text(formatter.format(percent_pinjaman.toFixed(2)) + ' %');
         $('#keuntungan_sebulan').val(formatter.format(keuntungan_sebulan.toFixed(2)));
         $('#keuntungan_6bln').val(formatter.format(keuntungan_6bln.toFixed(2)));
         $('#ujrah').val(formatter.format(getRoundedMethod(array_keuntungan['ujrah']).toFixed(2)));
         $('#onepercent').val(formatter.format(getRoundedMethod(array_keuntungan['onepercent']).toFixed(2)));
+        $('#rebate').val(formatter.format(rebate.toFixed(2))); // Correctly displaying rebate
+        $('#kadar_rebate').val(formatter.format(kadar_rebate.toFixed(2)) + ' %');
 
     });
 
@@ -919,9 +905,8 @@
         var batu_permata_array = $('#batupermata').val();
         var tag_permata = $('input[id=tagpermata]').is(':checked') ? 1 : 0;
 
-            var beratpermata = $('#beratpermata').val();
-            var kuantiti = $('#kuantiti').val();
-
+        var beratpermata = $('#beratpermata').val();
+        var kuantiti = $('#kuantiti').val();
 
         if(kuantiti > 10)
         {
@@ -1486,24 +1471,22 @@
                                                                 buttonsStyling: false
                                                             });
 
-                                        swalWithBootstrapButtons.fire({
-                                            title: 'Dapatkan Pengesahan Khazanah',
-                                            text: "Tetapan Margin Melebihi Limit Maksima Teller!",
-                                            icon: 'info',
-                                            showCancelButton: true,
-                                            confirmButtonText: 'Hantar',
-                                            cancelButtonText: 'Batal',
-                                            reverseButtons: true
-                                        }).then((result) => {
-                                            if (result.isConfirmed) {
+                                                            swalWithBootstrapButtons.fire({
+                                                                title: 'Dapatkan Pengesahan Khazanah',
+                                                                text: "Tetapan margin melebihi " + pinjaman_teller + "% untuk Khazanah!",
+                                                                icon: 'info',
+                                                                showCancelButton: true,
+                                                                confirmButtonText: 'Hantar',
+                                                                cancelButtonText: 'Batal',
+                                                                reverseButtons: true
+                                                            }).then((result) => {
+                                                                if (result.isConfirmed) {
 
-                                                let norujukan = $('#norujukan').val();
-                                                let nm = parseFloat($('#total_nilai_marhun').val().replace(/[^0-9.-]+/g, ""));
-                                                let ber = $('#total_berat').val();
-                                                let marg = $('.span-pinjaman').text();
-                                                let status = "Tetapan Margin Melebihi Limit Maksima Teller: " + pinjaman_teller + "%";
-                                                let jumpinjam = $('#pinjaman').val();
-                                                let teller = "{{ Auth::user()->name }}";
+                                                                    let norujukan = $('#norujukan').val();
+                                                                    let nm = parseFloat($('#total_nilai_marhun').val().replace(/[^0-9.-]+/g,""));let ber = $('#total_berat').val();let marg = $('.span-pinjaman').text();
+                                                                    let status = "Pembiayaan Melebihi Margin " + pinjaman_teller + "%";
+                                                                    let jumpinjam = $('#pinjaman').val();
+                                                                    let teller = "{{ Auth::user()->name }}";
 
                                                                     Swal.fire({
                                                                         title: 'Tunggu Pengesahan Daripada Khazanah.',
@@ -1661,24 +1644,23 @@
         let marhun = $(e).closest('tr').children('td:eq(1)').text();let selectedrow = $(e).closest('tr');let recnozz = tablemarhun.row(selectedrow).data();
         let norujuk = $('#norujukan').val();
 
-            $.ajax({
-                method: 'put',
-                url: '{{ route("gadai.editmarhun") }}',
-                data: {
-                    "_token": "{{ csrf_token() }}",
-                    "norujukan": norujuk,
-                    "recno": recnozz[1],
-                    "teller": "{{ Auth::user()->name }}"
-                },
-                success: function(data) {
-                    location.reload();
-                },
-                error: function(xhr, status, error) {
-                    var err = eval("(" + xhr.responseText + ")");
-                    alert(xhr.responseText);
-                }
-            });
-        }
+        $.ajax({
+            method: 'put',
+            url: '{{ route("gadai.editmarhun") }}',
+            data: {
+                "_token": "{{ csrf_token() }}",
+                "norujukan" : norujuk,
+                "recno" : recnozz[1],
+                "teller": "{{ Auth::user()->name }}"
+            },
+            success:function(data){
+                location.reload();
+            },error: function(xhr, status, error) {
+                var err = eval("(" + xhr.responseText + ")");
+                alert(xhr.responseText);
+            }
+        });
+    }
 
     function editmarhun(e){
         let norujuk = $('#norujukan').val();
@@ -1916,169 +1898,5 @@
         }
     });
 
-    // Toggle Table Functionality
-    let isMarginTableVisible = false;
-    
-    $('#toggleTableBtn').on('click', function() {
-        if (!isMarginTableVisible) {
-            // Check if main table has data before showing margin table
-            let tableData = $('#myTable').DataTable().data();
-            if (tableData.length === 0) {
-                Swal.fire({
-                    icon: 'warning',
-                    title: 'Amaran!',
-                    text: 'Tiada data marhun untuk papar margin. Sila daftar marhun terlebih dahulu.'
-                });
-                return;
-            }
-            
-            // Show margin table, hide main table
-            $('#myTable_wrapper').hide();
-            $('#marginTable').show();
-            $(this).html('<i class="fas fa-exchange-alt"></i> Papar Marhun');
-            loadMarginData();
-            isMarginTableVisible = true;
-            
-            // Disable Daftar Marhun button when margin table is visible
-            $('button[data-target="#daftar_marhun"]').prop('disabled', true);
-        } else {
-            // Show main table, hide margin table
-            $('#marginTable_wrapper').hide();
-            $('#myTable_wrapper').show();
-            $(this).html('<i class="fas fa-exchange-alt"></i> Papar Margin');
-            isMarginTableVisible = false;
-            
-            // Enable Daftar Marhun button when main table is visible
-            $('button[data-target="#daftar_marhun"]').prop('disabled', false);
-        }
-    });
-    
-    function loadMarginData() {
-        let marginData = [];
-        let totalNilaiMarhun = 0;
-        let totalNilaiTeller = 0;
-        let totalNilaiPC = 0;
-        
-        // Process each individual row from the main table
-        let rowsData = [];
-        tablemarhun.rows().data().each(function(row, index) {
-            console.log(row);
-            let recno = row[1]; // Recno column
-            let karat = row[4]; // Karat column
-            let nilaiMarhun = parseFloat(row[3].replace(/[^0-9.-]+/g, "")); // Nilai Marhun column
-            rowsData.push({
-                index: index,
-                recno: recno,
-                karat: karat, 
-                nilaiMarhun: nilaiMarhun
-            });
-        });
-        
-        let bil = 1;
-        let processedCount = 0;
-        let totalEntries = rowsData.length;
-
-        rowsData.forEach((rowData) => {
-            // Call API to get margin data for each individual item
-            $.ajax({
-                url: '{{ config("api.url") }}/api/maxmutuemas/specific',
-                type: 'GET',
-                data: { karat: rowData.karat, nilaimarhun: rowData.nilaiMarhun },
-                success: function(response) {
-                    if (response && response.karat) {
-                        let nilaiTeller = parseFloat(response.maxteller) || 0;
-                        let nilaiPC = parseFloat(response.maxpc) || 0;
-
-                        marginData.push({
-                            index: rowData.index,
-                            bil: rowData.index + 1,
-                            recno: rowData.recno,
-                            karat: rowData.karat,
-                            nilaiMarhun: rowData.nilaiMarhun,
-                            marginTeller: response.teller,
-                            marginPC: response.pc,
-                            nilaiTeller: nilaiTeller,
-                            nilaiPC: nilaiPC
-                        });
-                        
-                        totalNilaiMarhun += rowData.nilaiMarhun;
-                        totalNilaiTeller += nilaiTeller;
-                        totalNilaiPC += nilaiPC;
-                    }
-                    
-                    processedCount++;
-                    if (processedCount === totalEntries) {
-                        // Sort by original index to maintain order
-                        marginData.sort((a, b) => a.index - b.index);
-                        populateMarginTable(marginData, totalNilaiMarhun, totalNilaiTeller, totalNilaiPC);
-                    }
-                },
-                error: function() {
-                    processedCount++;
-                    if (processedCount === totalEntries) {
-                        // Sort by original index to maintain order
-                        marginData.sort((a, b) => a.index - b.index);
-                        populateMarginTable(marginData, totalNilaiMarhun, totalNilaiTeller, totalNilaiPC);
-                    }
-                }
-            });
-        });
-    }
-    
-    let marginDataTable = null;
-    function populateMarginTable(data, totalMarhun, totalTeller, totalPC) {
-        // If DataTable already exists, destroy it first
-        if (marginDataTable !== null) {
-            marginDataTable.destroy();
-            marginDataTable = null;
-        }
-        
-        let tbody = $('#marginTableBody');
-        tbody.empty();
-        
-        data.forEach(function(item) {
-            let row = `
-                <tr>
-                    <td>${item.bil}</td>
-                    <td>${item.karat}</td>
-                    <td>RM${item.nilaiMarhun.toLocaleString('en-MY', {minimumFractionDigits: 2, maximumFractionDigits: 2})}</td>
-                    <td>${item.marginTeller}%</td>
-                    <td>${item.marginPC}%</td>
-                    <td>RM${item.nilaiTeller.toLocaleString('en-MY', {minimumFractionDigits: 2, maximumFractionDigits: 2})}</td>
-                    <td>RM${item.nilaiPC.toLocaleString('en-MY', {minimumFractionDigits: 2, maximumFractionDigits: 2})}</td>
-                </tr>
-            `;
-            tbody.append(row);
-        });
-        
-        // Initialize DataTable
-        marginDataTable = $('#marginTable').DataTable({
-            "pageLength": 10,
-            "ordering": false,
-            "order": [[ 0, "asc" ]],
-            "responsive": true,
-            "language": {
-                "lengthMenu": "Papar _MENU_ rekod setiap halaman",
-                "zeroRecords": "Tiada rekod dijumpai",
-                "info": "Memapar halaman _PAGE_ dari _PAGES_",
-                "infoEmpty": "Tiada rekod tersedia",
-                "infoFiltered": "(ditapis dari _MAX_ jumlah rekod)",
-                "search": "Cari:",
-                "paginate": {
-                    "first": "Pertama",
-                    "last": "Akhir",
-                    "next": "Seterusnya",
-                    "previous": "Sebelumnya"
-                }
-            },
-            "footerCallback": function (row, data, start, end, display) {
-                // Update footer totals
-                $('#totalNilaiMarhunMargin').text('RM' + totalMarhun.toLocaleString('en-MY', {minimumFractionDigits: 2, maximumFractionDigits: 2}));
-                $('#totalNilaiTellerMargin').text('RM' + totalTeller.toLocaleString('en-MY', {minimumFractionDigits: 2, maximumFractionDigits: 2}));
-                $('#totalNilaiPCMargin').text('RM' + totalPC.toLocaleString('en-MY', {minimumFractionDigits: 2, maximumFractionDigits: 2}));
-            }
-        });
-    }
-
 </script>
 @endsection

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

@@ -20,9 +20,7 @@
                     <a href="{{ route('parameter') }}" class="btn btn-info btn-lg">Parameter</a>
                     <a href="{{ route('komuditi') }}" class="btn btn-info btn-lg">Komoditi</a>
                     <a href="{{ route('perubatan') }}" class="btn btn-info btn-lg">Perubatan</a>
-                    <a href="{{ route('operasi.laporan.audit') }}" class="btn btn-info btn-lg">Laporan Audit</a>
                 </div>
-                
             </div>
         </div>
     </div>

resources/views/homepage/operasi/laporan-audit.blade.php

@@ -1,46 +0,0 @@
-@extends('layouts.app_operasi')
-
-@section('content')
-<div class="container">
-    <div class="row justify-content-center mt-5">
-        <div class="col-md-10">
-            <div class="card">
-                <nav aria-label="breadcrumb">
-                    <ol class="breadcrumb pb-3">
-                        <li class="breadcrumb-item"><a href="{{ route('home') }}">Home</a></li>
-                        <li class="breadcrumb-item active" aria-current="page">Laporan Audit</li>
-                    </ol>
-                </nav>
-
-                <div class="card-header">
-                    <h4 class="text-center">Laporan Audit</h4>
-                </div>
-
-                <div class="card-body">
-                    <form action="{{ route('operasi.audittrail.laporancetak') }}" method="GET">
-                        <div class="row">
-                            <div class="col-md-6">
-                                <div class="form-group">
-                                    <label for="dateaudit">Tarikh Mula:</label>
-                                    <input type="date" class="form-control" id="dateaudit" name="dateaudit" required>
-                                </div>
-                            </div>
-                            <div class="col-md-6">
-                                <div class="form-group">
-                                    <label for="dateaudit_till">Tarikh Akhir:</label>
-                                    <input type="date" class="form-control" id="dateaudit_till" name="dateaudit_till" required>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="text-center">
-                            <button type="submit" class="btn btn-info btn-lg">
-                                <i class="fas fa-route"></i> Generate Audit Trail
-                            </button>
-                        </div>
-                    </form>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-@endsection

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

@@ -1,63 +0,0 @@
-@extends('layouts.app')
-
-@section('content')
-<div class="container">
-    <div class="row">
-        <div class="col-md-12">
-            <div class="card">
-                <nav aria-label="breadcrumb">
-                    <ol class="breadcrumb pb-3">
-                      <li class="breadcrumb-item"><a href="{{ route('home') }}">Home</a></li>
-                      <li class="breadcrumb-item active" aria-current="page">Aliran Tunai</li>
-                    </ol>
-                  </nav>
-
-                @if(session()->has('errormessage'))
-                  <div class="alert alert-danger">
-                      {{ session()->get('errormessage') }}
-                  </div>
-                @endif
-
-                <div class="card-body text-center">
-                    <div class="row form-group">
-                        <div class="col-md-2">
-                        </div>
-                        <div class="col-md-10">
-                        </div>
-                    </div>
-                    <div class="row">
-                        <div class="col-md-5">
-                            <form action="{{ route('alirantunai.laporancetak') }}" method="post">
-                                @csrf
-                                <div class="input-group mb-3">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text" id="basic-addon1">Tarikh</span>
-                                    </div>
-                                    <input type="text" class="form-control" placeholder="Pilih Tarikh" aria-label="Tarikh" id="datetimepicker1" name="datetimepicker1" aria-describedby="basic-addon1">
-                                    <input type="submit" class="btn btn-primary ml-md-5" id="submit_button" name="submit_button" value="Cetak">
-                                </div>
-                            </form>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-<script type="text/javascript">
-    var api_url = "<?php echo $api_url ?>";
-    var kodcaw = "<?php echo $cawangan_info['kodcaw'] ?>";
-
-    $(document).ready( function () {
-        $('#datetimepicker1').datepicker({
-            format: 'dd-mm-yyyy'
-        });
-    });
-
-    var tablecustomers = $('#myTable').DataTable({
-        "ordering": false
-    });
-
-</script>
-@endsection
-

resources/views/khazanah/pampasan_detail.blade.php

@@ -1,282 +0,0 @@
-@extends('layouts.app')
-
-@section('content')
-    <div class="container">
-        <h2 class="text-center font-weight-bold my-4">PAMPASAN</h2>
-        <div class="row mb-4">
-            <div class="col-md-6">
-                <label>NAMA</label>
-                <input type="text" class="form-control mb-2" value="{{ $customer_info['nama'] ?? '-' }}" readonly>
-            </div>
-            <div class="col-md-6">
-                <label>NO PELANGGAN</label>
-                <input type="text" class="form-control mb-2" value="{{ $gadai_info['nopelanggan'] ?? '-' }}" readonly>
-            </div>
-            <div class="col-md-6">
-                <label>NO RUJUKAN</label>
-                <input type="text" class="form-control mb-2" value="{{ $gadai_info['norujukan'] ?? '-' }}" readonly>
-            </div>
-            <div class="col-md-6">
-                <label>NO KAD PENGENALAN</label>
-                <input type="text" class="form-control mb-2" value="{{ $gadai_info['nokp'] ?? '-' }}" readonly>
-            </div>
-        </div>
-
-        <div class="card p-4 mx-auto" style="max-width:900px;">
-            <div class="row mb-3">
-                <div class="col-md-6">
-                    <label>BAUCER NO</label>
-                    <input type="text" class="form-control" value="{{ $baucerno ?? '-' }}" readonly>
-                </div>
-                <div class="col-md-6">
-                    <label>NILAI MARHUN</label>
-                    <input type="text" class="form-control"
-                        value="RM {{ number_format($barang_kes_info['nilaimarhun'], 2) }}" readonly>
-                </div>
-                <div class="col-md-6">
-                    <label>BAKI PEMBIAYAAN</label>
-                    <input type="text" class="form-control"
-                        value="RM {{ number_format($barang_kes_info['pembiayaan'], 2) }}" readonly>
-                </div>
-                <div class="col-md-6">
-                    <label>KEUNTUNGAN</label>
-                    <input type="text" class="form-control" value="RM {{ number_format($barang_kes_info['untung'], 2) }}"
-                        readonly>
-                </div>
-                <div class="col-md-6">
-                    <label>JUMLAH PAMPASAN</label>
-                    @php
-                        $nilaimarhun = floatval($barang_kes_info['nilaimarhun'] ?? 0);
-                        $pembiayaan = floatval($barang_kes_info['pembiayaan'] ?? 0);
-                        $untung = floatval($barang_kes_info['untung'] ?? 0);
-                        $jumlah_pampasan = $nilaimarhun - $pembiayaan - $untung;
-                    @endphp
-                    <input type="text" class="form-control" value="RM {{ number_format($jumlah_pampasan, 2) }}" readonly>
-                </div>
-                <div class="col-md-6">
-                    <label>JUMLAH TEBUS</label>
-                    <input type="text" class="form-control" value="RM {{ number_format($jumlah_tebus, 2) }}" readonly>
-                </div>
-
-                <div class="col-md-12 row mb-3 justify-content-center">
-                    <div class="col-md-6 text-center">
-                        <label><strong>JUMLAH PANJAR</strong></label>
-                        <input type="text" class="form-control text-center"
-                            value="RM {{ number_format($jumlahPanjar, 2) }}" readonly>
-                    </div>
-                </div>
-
-            </div>
-            <div class="row mb-3">
-                <div class="col-12">
-                    <div class="alert alert-info text-center font-weight-bold" style="font-size: 1.2rem;">
-                        Cara Pengiraan Jumlah Pampasan:<br>
-                        <span style="font-size:1.3rem;">
-                            <b>Jumlah Pampasan = Nilai Marhun - Baki Pembiayaan - Keuntungan</b>
-                        </span>
-                    </div>
-                </div>
-            </div>
-            <div class="row">
-                <div class="col-md-12 text-right">
-                    <button type="button" class="btn btn-success mr-2" data-toggle="modal"
-                        data-target="#denominasipampasan" data-jumlah="{{ $jumlah_pampasan }}">
-                        DENO
-                    </button>
-
-                    <button type="button" class="btn btn-danger" onclick="window.history.back()">BATAL</button>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <script>
-        const formatter = new Intl.NumberFormat('en-US', {
-            minimumFractionDigits: 2
-        });
-
-        var arrayambilan = [
-            ["bundle1", 0],
-            ["bundle5", 0],
-            ["bundle10", 0],
-            ["bundle20", 0],
-            ["bundle50", 0],
-            ["bundle100", 0],
-            ["sen1", 0],
-            ["sen5", 0],
-            ["sen10", 0],
-            ["sen20", 0],
-            ["sen50", 0],
-            ["ringgit1", 0],
-            ["ringgit5", 0],
-            ["ringgit10", 0],
-            ["ringgit20", 0],
-            ["ringgit50", 0],
-            ["ringgit100", 0]
-        ];
-
-        function totalamount(idwang, bilangan) {
-            var amount = 0;
-            switch (idwang) {
-                case 'bundle1':
-                    amount += (bilangan * 100);
-                    break;
-                case 'bundle20':
-                    amount += (bilangan * 1000);
-                    break;
-                case 'bundle5':
-                    amount += (bilangan * 500);
-                    break;
-                case 'bundle50':
-                    amount += (bilangan * 5000);
-                    break;
-                case 'bundle10':
-                    amount += (bilangan * 1000);
-                    break;
-                case 'bundle100':
-                    amount += (bilangan * 5000);
-                    break;
-                case 'sen1':
-                    amount += (bilangan * 0.01);
-                    break;
-                case 'sen5':
-                    amount += (bilangan * 0.05);
-                    break;
-                case 'sen10':
-                    amount += (bilangan * 0.10);
-                    break;
-                case 'sen20':
-                    amount += (bilangan * 0.20);
-                    break;
-                case 'sen50':
-                    amount += (bilangan * 0.50);
-                    break;
-                case 'ringgit1':
-                    amount += (bilangan * 1);
-                    break;
-                case 'ringgit5':
-                    amount += (bilangan * 5);
-                    break;
-                case 'ringgit10':
-                    amount += (bilangan * 10);
-                    break;
-                case 'ringgit20':
-                    amount += (bilangan * 20);
-                    break;
-                case 'ringgit50':
-                    amount += (bilangan * 50);
-                    break;
-                case 'ringgit100':
-                    amount += (bilangan * 100);
-                    break;
-            }
-
-            return amount;
-        }
-
-        function kiraanpanjar(datakeyin) {
-            var idkey = $(datakeyin).attr('id');
-            var valkey = $(datakeyin).val();
-            var amount = 0;
-            let amountkiraan = 0;
-
-            var validate = parseFloat($(datakeyin).data('amaun'));
-
-            $.each(arrayambilan, function(index, arr) {
-                if (arr[0] == idkey) {
-
-                    arrayambilan[index][1] = totalamount(idkey, valkey);
-                }
-
-                amount += arr[1];
-            });
-
-            if (Number(valkey) > Number(validate)) {
-                Swal.fire({
-                    icon: 'error',
-                    title: 'Amaran',
-                    text: 'Jumlah denominasi melebihi kadar'
-                });
-                $(datakeyin).val('');
-            } else {
-
-                $('#amaunkiraan').val(amount);
-
-            }
-
-            switch (idkey) {
-                case 'bundle1':
-                    amountkiraan += (valkey * 100);
-                    $('#totalb1').val(formatter.format(amountkiraan.toFixed(2)));
-                    break;
-                case 'bundle20':
-                    amountkiraan += (valkey * 1000);
-                    $('#totalb20').val(formatter.format(amountkiraan.toFixed(2)));
-                    break;
-                case 'bundle5':
-                    amountkiraan += (valkey * 500);
-                    $('#totalb5').val(formatter.format(amountkiraan.toFixed(2)));
-                    break;
-                case 'bundle50':
-                    amountkiraan += (valkey * 5000);
-                    $('#totalb50').val(formatter.format(amountkiraan.toFixed(2)));
-                    break;
-                case 'bundle10':
-                    amountkiraan += (valkey * 1000);
-                    $('#totalb10').val(formatter.format(amountkiraan.toFixed(2)));
-                    break;
-                case 'bundle100':
-                    amountkiraan += (valkey * 5000);
-                    $('#totalb100').val(formatter.format(amountkiraan.toFixed(2)));
-                    break;
-                case 'sen1':
-                    amountkiraan += (valkey * 0.01);
-                    $('#totalsen1').val(formatter.format(amountkiraan.toFixed(2)));
-                    break;
-                case 'sen5':
-                    amountkiraan += (valkey * 0.05);
-                    $('#totalsen5').val(formatter.format(amountkiraan.toFixed(2)));
-                    break;
-                case 'sen10':
-                    amountkiraan += (valkey * 0.10);
-                    $('#totalsen10').val(formatter.format(amountkiraan.toFixed(2)));
-                    break;
-                case 'sen20':
-                    amountkiraan += (valkey * 0.20);
-                    $('#totalsen20').val(formatter.format(amountkiraan.toFixed(2)));
-                    break;
-                case 'sen50':
-                    amountkiraan += (valkey * 0.50);
-                    $('#totalsen50').val(formatter.format(amountkiraan.toFixed(2)));
-                    break;
-                case 'ringgit1':
-                    amountkiraan += (valkey * 1);
-                    $('#totalring1').val(formatter.format(amountkiraan.toFixed(2)));
-                    break;
-                case 'ringgit5':
-                    amountkiraan += (valkey * 5);
-                    $('#totalring5').val(formatter.format(amountkiraan.toFixed(2)));
-                    break;
-                case 'ringgit10':
-                    amountkiraan += (valkey * 10);
-                    $('#totalring10').val(formatter.format(amountkiraan.toFixed(2)));
-                    break;
-                case 'ringgit20':
-                    amountkiraan += (valkey * 20);
-                    $('#totalring20').val(formatter.format(amountkiraan.toFixed(2)));
-                    break;
-                case 'ringgit50':
-                    amountkiraan += (valkey * 50);
-                    $('#totalring50').val(formatter.format(amountkiraan.toFixed(2)));
-                    break;
-                case 'ringgit100':
-                    amountkiraan += (valkey * 100);
-                    $('#totalring100').val(formatter.format(amountkiraan.toFixed(2)));
-                    break;
-            }
-
-        }
-    </script>
-
-    @include('modal.denopampasan')
-@endsection

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

@@ -13,7 +13,7 @@
 @include('modal.agh')
 
 
-<div class="container col-12">
+<div class="container">
     <div class="row justify-content-center">
         <div class="col-md-12 col-lg-12">
         <div class="card">
@@ -171,7 +171,7 @@
                     </nav>
                     <div class="tab-content" id="navtawarruqdannottawarruq">
                         <div class="tab-pane fade {{ $activate_pane_SAG_baru }}" id="nav-tawarruq" role="tabpanel" aria-labelledby="nav-tawarruq-tab">
-                            <table class="table table-striped table-hover" id="myTable" style="width: 100%">
+                            <table class="table table-striped table-hover" id="myTable">
                                 <thead class="thead-dark">
                                     <tr>
                                         <th>Bil</th>
@@ -184,14 +184,23 @@
                                         <th>Tempoh</th>
                                         <th>Keuntungan</th>
                                         <th>Lelong</th>
-                                        <th>Pembayaran Terakhir</th>
                                     </tr>
                                 </thead>
                             </table>
                         </div>
                         <div class="tab-pane fade {{ $activate_pane_SAG_lama }}" id="nav-xtawarruq" role="tabpanel" aria-labelledby="nav-xtawarruq-tab">
-                            <table id="xtawarruq" class="table table-striped table-hover" style="width:100%">
+                            <table id="xtawarruq" class="table table-striped table-hover">
                                 <thead class="thead-dark">
+                                    {{-- <tr>
+                                        <th>Bil</th>
+                                        <th>No Rujukan</th>
+                                        <th>Tarikh Gadai</th>
+                                        <th>Tarikh Matang</th>
+                                        <th>Pembiayaan</th>
+                                        <th>Margin</th>
+                                        <th>Tempoh</th>
+                                        <th>Lelong</th>
+                                    </tr> --}}
                                     <tr>
                                         <th>Bil</th>
                                         <th>No Rujukan</th>
@@ -203,7 +212,6 @@
                                         <th>Tempoh</th>
                                         <th>Keuntungan</th>
                                         <th>Lelong</th>
-                                        <th>Pembayaran Terakhir</th>
                                     </tr>
                                 </thead>
                             </table>
@@ -225,9 +233,7 @@
                         </thead>
                     </table>
 
-                    {{-- Lelong --}}
-
-                    <table id="lelongTable" class="table table-striped table-hover" style="width:100%">
+                    <table id="lelongTable" class="table table-striped table-hover">
                         <thead class="thead-dark">
                             <tr>
                                 <th>Bil</th>
@@ -508,7 +514,7 @@
     });
 
     var xtawarruq = $('#xtawarruq').DataTable({
-        "scrollX": true,
+        "scrollX": false
     });
 
     var tabledahtebus = $('#dahtebusTable').DataTable({
@@ -557,26 +563,6 @@
     function checkserah(data){
         var urlpenebusan = $(data).data("url");
         var norujukan = $(data).data("norujukan");
-
-        var isBlocked = $(data).data("blocked");
-            if(isBlocked === true || isBlocked === "true"){
-                Swal.fire({
-                    icon: 'error',
-                    title: 'Amaran',
-                    text: 'Pembiayaan Sedang Dilelong'
-                });
-                return false;
-            }
-
-            Swal.fire({
-            title: 'Memuatkan...',
-            allowEscapeKey : false,
-            allowOutsideClick: false,
-            didOpen: function () {
-                Swal.showLoading()
-            }
-            });
-
         $.ajax({
             method:'get',
             url: api_url + '/api/check/serah/gadai',
@@ -599,49 +585,14 @@
         });
     }
 
-    function getPembayaranTerakhir(tarikhLelong)
-    {
-        if (!tarikhLelong || tarikhLelong === '') {
-            return { tarikh: '', blocked: false };
-        }
-        
-        let lelongDate;
-        if (tarikhLelong.includes('-')) {
-            const parts = tarikhLelong.split('-');
-            if (parts[0].length === 4) {
-                lelongDate = new Date(tarikhLelong);
-            } else {
-                lelongDate = new Date(parts[2], parts[1] - 1, parts[0]);
-            }
-        }
-        
-        let pembayaranTerakhir = new Date(lelongDate);
-        pembayaranTerakhir.setDate(pembayaranTerakhir.getDate() - 3);
-        
-        let today = new Date();
-        today.setHours(0, 0, 0, 0);
-        pembayaranTerakhir.setHours(0, 0, 0, 0);
-        
-        let isBlocked = today > pembayaranTerakhir;
-        
-        let day = String(pembayaranTerakhir.getDate()).padStart(2, '0');
-        let month = String(pembayaranTerakhir.getMonth() + 1).padStart(2, '0');
-        let year = pembayaranTerakhir.getFullYear();
-        
-        return {
-            tarikh: `${year}-${month}-${day}`,
-            blocked: isBlocked
-        };
-    }
-
     function gadaiTable(data,jenistebus){
 
-    var counter = 1;
-    tablegadai.clear().draw();
-    tabledahtebus.clear().draw();
-    tablelelong.clear().draw();
-    xtawarruq.clear().draw();
-    $.each(data,function(index,gadai_detail){
+var counter = 1;
+tablegadai.clear().draw();
+tabledahtebus.clear().draw();
+tablelelong.clear().draw();
+xtawarruq.clear().draw();
+$.each(data,function(index,gadai_detail){
     let jeniskeuntungan = (gadai_detail['tagbaru'] == 1) ? 'onepercent' : 'asal';
     $.ajax({
         method:'get',
@@ -665,7 +616,15 @@
                     var taglel = '';
                     if(gadai_detail['taglel'] == 1){
                                 if(tagarrahnbid == 1){
-                                    taglel = gadai_detail['t_lelong'];
+                                    $.ajax({
+                                        method:"GET",
+                                        async:false,
+                                        url:api_arrahnbid + 'portalApi?norujukan=' + gadai_detail['norujukan'],
+
+                                        success: function(data){
+                                            taglel = data.lelong.t_lelong;
+                                        }
+                                    });
                                 } else {
                                     $.ajax({
                                         method:"GET",
@@ -688,18 +647,7 @@
                     if(gadai_detail["percentpinj"] != 0)
                     xtawarruq.row.add([
                         '<input type="radio" value='+ gadai_detail["norujukan"] + ' name="belum"/>',
-                        // '<a href="#" onclick="checkserah(this)" data-pinjaman='+ gadai_detail['pinjaman'] +' data-hargajualan='+ gadai_detail['hargajualan'] +' data-norujukan='+ gadai_detail['norujukan'] +' data-url=' + urlroute +'>' + gadai_detail['norujukan'] + '</a>',
-                        (function() {
-                                    let bayaranInfo = getPembayaranTerakhir(taglel);
-                                    let blockedAttr = bayaranInfo.blocked ? 'data-blocked="true"' : '';
-                                    return '<a href="#" onclick="checkserah(this)" ' +
-                                        'data-pinjaman='+ gadai_detail['pinjaman'] +' ' +
-                                        'data-hargajualan='+ gadai_detail['hargajualan'] +' ' +
-                                        'data-norujukan='+ gadai_detail['norujukan'] +' ' +
-                                        'data-url=' + urlroute + ' ' +
-                                        blockedAttr + '>' + 
-                                        gadai_detail['norujukan'] + '</a>';
-                                })(),
+                        '<a href="#" onclick="checkserah(this)" data-pinjaman='+ gadai_detail['pinjaman'] +' data-hargajualan='+ gadai_detail['hargajualan'] +' data-norujukan='+ gadai_detail['norujukan'] +' data-url=' + urlroute +'>' + gadai_detail['norujukan'] + '</a>',
                         gadai_detail['t_gadai'],
                         tarikh_matang,
                         'RM '+ formatter.format(gadai_detail['bakihargajualan']),
@@ -708,23 +656,20 @@
                         gadai_detail['tempoh'],
                         'RM '+ upahsemasa,
                         '<div style="white-space: nowrap; color:red; font-weight: bolder">' + taglel + '</div>',
-                        (function() {
-                                    let bayaranInfo = getPembayaranTerakhir(taglel);
-                                    if (!bayaranInfo.tarikh) {
-                                        return '';
-                                    }
-                                    let color = bayaranInfo.blocked ? 'red' : 'green';
-                                    return '<div style="white-space: nowrap; color: ' + color + '; font-weight: bold;">' + 
-                                    bayaranInfo.tarikh + '</div>';
-                                })()        
                     ]).draw();
                 }else{
                     var taglel = '';
                     if(gadai_detail['taglel'] == 1){
                         if(tagarrahnbid == 1){
-                            if(gadai_detail['t_lelong'] != null) {
-                                taglel = gadai_detail['t_lelong'];
-                            } 
+                            $.ajax({
+                                method:"GET",
+                                async:false,
+                                url:api_arrahnbid + 'portalApi?norujukan=' + gadai_detail['norujukan'],
+
+                                success: function(data){
+                                    taglel = data.lelong.t_lelong;
+                                }
+                            });
                         } else {
                             $.ajax({
                                 method:"GET",
@@ -745,18 +690,7 @@
                     // let radio_action = "onclick=checkCanChangeGadaianDetail(" + "'" + table_norujukan + "'" + ")";
                     tablegadai.row.add([
                         '<input type="radio" value='+ gadai_detail["norujukan"] + ' name="belum"/>',
-                        // '<a href="#" onclick="checkserah(this)" data-pinjaman='+ gadai_detail['pinjaman'] +' data-hargajualan='+ gadai_detail['hargajualan'] +' data-norujukan='+ gadai_detail['norujukan'] +' data-url=' + urlroute +'>' + gadai_detail['norujukan'] + '</a>',
-                        (function() {
-                                    let bayaranInfo = getPembayaranTerakhir(taglel);
-                                    let blockedAttr = bayaranInfo.blocked ? 'data-blocked="true"' : '';
-                                    return '<a href="#" onclick="checkserah(this)" ' +
-                                        'data-pinjaman='+ gadai_detail['pinjaman'] +' ' +
-                                        'data-hargajualan='+ gadai_detail['hargajualan'] +' ' +
-                                        'data-norujukan='+ gadai_detail['norujukan'] +' ' +
-                                        'data-url=' + urlroute + ' ' +
-                                        blockedAttr + '>' + 
-                                        gadai_detail['norujukan'] + '</a>';
-                                })(),
+                        '<a href="#" onclick="checkserah(this)" data-pinjaman='+ gadai_detail['pinjaman'] +' data-hargajualan='+ gadai_detail['hargajualan'] +' data-norujukan='+ gadai_detail['norujukan'] +' data-url=' + urlroute +'>' + gadai_detail['norujukan'] + '</a>',
                         gadai_detail['t_gadai'],
                         tarikh_matang,
                         'RM '+ formatter.format(gadai_detail['bakihargajualan']),
@@ -765,15 +699,6 @@
                         gadai_detail['tempoh'],
                         'RM '+ upahsemasa['pendapatan'],
                         '<div style="white-space: nowrap; color:red; font-weight: bolder">' + taglel + '</div>',
-                        (function() {
-                                    let bayaranInfo = getPembayaranTerakhir(taglel);
-                                    if (!bayaranInfo.tarikh) {
-                                        return '';
-                                    }
-                                    let color = bayaranInfo.blocked ? 'red' : 'green';
-                                    return '<div style="white-space: nowrap; color: ' + color + '; font-weight: bold;">' + 
-                                    bayaranInfo.tarikh + '</div>';
-                                })()        
                     ]).draw();
                 }
             }else if(jenistebus == "sudah_tebus"){

resources/views/layouts/app.blade.php

@@ -39,12 +39,12 @@
     <link rel="stylesheet" href="{{ asset('vendor/datepicker/css/bootstrap-datepicker.min.css') }}"/>
     <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
     <script src="{{ asset('js/jquery.min.js') }}"></script>
-    <script src="{{ asset('js/popper.min.js') }}"></script>
     <script src="{{ asset('vendor/bootstrap/js/bootstrap.min.js') }}"></script>
     <script src="{{ asset('js/select2.min.js') }}"></script>
     <script src="{{ asset('js/apexcharts.js') }}"></script>
     <script src="{{ asset('js/numeral.min.js') }}"></script>
     <script src="{{ asset('js/sweetalert.min.js') }}"></script>
+    <script src="{{ asset('js/popper.min.js') }}"></script>
     <script src="{{ asset('vendor/DataTables/datatables.min.js') }}"></script>
     <script src="{{ asset('vendor/datepicker/js/bootstrap-datepicker.min.js') }}"></script>
     <script src="{{ asset('js/typehead.jquery.js') }}"></script>

resources/views/lelongan/index.blade.php

@@ -601,26 +601,9 @@ function ubahwakil(e)
             'hargajual' : hargajual
             },
             success:function(data){
-
-                if(data == 'kemaskini'){
-                    Swal.fire(
-                        'Amaran!',
-                        'Sila kemaskini aliran tunai dahulu!',
-                        'error'
-                    )
-                    return false;
-                }
-                else if(data == 'Baki tidak mencukupi'){
-                    Swal.fire(
-                        'Amaran!',
-                        'Baki tunai tidak mencukupi. Sila tambah baki tunai dahulu!',
-                        'error'
-                    )
-                    return false;
-                }else if(data == 'Berjaya'){
-                    let urlroute = '{{ route("resit.tuntutbaki", ":id") }}';
-                    urlroute = urlroute.replace(':id', norujukan);
-                    Swal.fire(
+                let urlroute = '{{ route("resit.tuntutbaki", ":id") }}';
+                urlroute = urlroute.replace(':id', norujukan);
+                Swal.fire(
                         'Berjaya!',
                         'Tuntut Baki Berjaya',
                         'success'
@@ -628,15 +611,6 @@ function ubahwakil(e)
                         window.open(urlroute, '_blank');
                         window.location.replace("{{  route('customer_info') }}");
                     })
-                }else{
-                    Swal.fire(
-                        'Amaran!',
-                        'Terdapat ralat semasa proses. Sila cuba lagi!',
-                        'error'
-                    )
-                    return false;
-                }
-            
             },error: function(xhr, status, error) {
                 var err = eval("(" + xhr.responseText + ")");
                 alert(xhr.responseText);

resources/views/modal/denopampasan.blade.php

@@ -1,199 +0,0 @@
-<div class="modal fade" id="denominasipampasan" tabindex="-1" role="dialog"
-    aria-labelledby="denominasipampasanModalCenterTitle" 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 Kiraan:</label>
-                <input type="text" class="form-control col-3 ml-3" id="amaunkiraan" placeholder="0.00" readonly>
-                
-                <label class="mt-2 ml-3">Jumlah Panjar:</label>
-                <input type="text" class="form-control col-3 ml-2 bg-light font-weight-bold" id="jumlahPanjar"
-                    value="{{ number_format($jumlahPanjar, 2) }}" readonly>
-
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                    <span aria-hidden="true">&times;</span>
-                </button>
-
-            </div>
-            <div class="modal-body">
-                <form id="formPampasan" method="POST" onsubmit="return terimadeno(event)" action="{{ route('pampasan.terima') }}">
-                @csrf
-                    <input type="hidden" id="norujukan" name="norujukan" value="{{ $gadai_info['norujukan'] }}">
-                    <input type="hidden" id="baucerno" name="baucerno" value="{{ $baucerno }}">
-                    <input type="hidden" name="jumlahpampasan" value="{{ $jumlah_pampasan }}">
-                    <input type="hidden" name="jumlahPanjar" value="{{ $jumlahPanjar }}">
-                    <input type="hidden" name="teller" value="{{ auth()->user()->name }}">
-
-                <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 name="denominasi" class="denominasi">Peti Besi</th>
-                                <th>Ambilan</th>
-                                <th>Jumlah (RM)</th>
-                                <th></th>
-                                <th name="denominasi" class="denominasi">Peti Besi</th>
-                                <th>Ambilan</th>
-                                <th>Jumlah (RM)</th>
-                            </tr>
-                            <tr>
-                                <td>RM0.01</td>
-                                <td name="denominasi" class="denominasi"><input type="text" class="form-control"
-                                        value="{{ $denominasi['txtsen1'] }}" readonly /></td>
-                                <td><input type="text" name="denominasi[ambilansen1]" class="form-control kosong" id="sen1"
-                                        data-amaun="{{ $denominasi['txtsen1'] }}" onkeyup="kiraanpanjar(this)" /> </td>
-                                <td><input type="text" name="denominasi[totalsen1]" id="totalsen1" class="form-control kosong"
-                                        value="0.00" readonly /> </td>
-                                <td>RM1</td>
-                                <td name="denominasi" class="denominasi"><input type="text" class="form-control"
-                                        value="{{ $denominasi['txtring1'] }}" readonly /></td>
-                                <td><input type="text" name="denominasi[ambilanring1]" class="form-control kosong" id="ringgit1"
-                                        data-amaun="{{ $denominasi['txtring1'] }}" onkeyup="kiraanpanjar(this)" /> </td>
-                                <td><input type="text" name="denominasi[totalring1]" id="totalring1" class="form-control kosong"
-                                        value="0.00" readonly /> </td>
-                            </tr>
-                            <tr>
-                                <td>RM0.05</td>
-                                <td name="denominasi" class="denominasi"><input type="text" class="form-control"
-                                        value="{{ $denominasi['txtsen5'] }}" readonly /></td>
-                                <td><input type="text" name="denominasi[ambilansen5]" class="form-control kosong" id="sen5"
-                                        data-amaun="{{ $denominasi['txtsen5'] }}" onkeyup="kiraanpanjar(this)" /> </td>
-                                <td><input type="text" name="denominasi[totalsen5]" id="totalsen5" class="form-control kosong"
-                                        value="0.00" readonly /> </td>
-                                <td>RM5</td>
-                                <td name="denominasi" class="denominasi"><input type="text" class="form-control"
-                                        value="{{ $denominasi['txtring5'] }}" readonly /></td>
-                                <td><input type="text" name="denominasi[ambilanring5]" class="form-control kosong" id="ringgit5"
-                                        data-amaun="{{ $denominasi['txtring5'] }}" onkeyup="kiraanpanjar(this)" />
-                                </td>
-                                <td><input type="text" name="denominasi[totalring5]" id="totalring5"
-                                        class="form-control kosong" value="0.00" readonly /> </td>
-                            </tr>
-                            <tr>
-                                <td>RM0.10</td>
-                                <td name="denominasi" class="denominasi"><input type="text" class="form-control"
-                                        value="{{ $denominasi['txtsen10'] }}" readonly /></td>
-                                <td><input type="text" name="denominasi[ambilansen10]" class="form-control kosong"
-                                        id="sen10" data-amaun="{{ $denominasi['txtsen10'] }}"
-                                        onkeyup="kiraanpanjar(this)" /> </td>
-                                <td><input type="text" name="denominasi[totalsen10]" id="totalsen10"
-                                        class="form-control kosong" value="0.00" readonly /> </td>
-                                <td>RM10</td>
-                                <td name="denominasi" class="denominasi"><input type="text" class="form-control"
-                                        value="{{ $denominasi['txtring10'] }}" readonly /></td>
-                                <td><input type="text" name="denominasi[ambilanring10]" class="form-control kosong"
-                                        id="ringgit10" data-amaun="{{ $denominasi['txtring10'] }}"
-                                        onkeyup="kiraanpanjar(this)" /> </td>
-                                <td><input type="text" name="denominasi[totalring10]" id="totalring10"
-                                        class="form-control kosong" value="0.00" readonly /> </td>
-                            </tr>
-                            <tr>
-                                <td>RM0.20</td>
-                                <td name="denominasi" class="denominasi"><input type="text" class="form-control"
-                                        value="{{ $denominasi['txtsen20'] }}" readonly /></td>
-                                <td><input type="text" name="denominasi[ambilansen20]" class="form-control kosong"
-                                        id="sen20" data-amaun="{{ $denominasi['txtsen20'] }}"
-                                        onkeyup="kiraanpanjar(this)" /> </td>
-                                <td><input type="text" name="denominasi[totalsen20]" id="totalsen20"
-                                        class="form-control kosong" value="0.00" readonly /> </td>
-                                <td> RM20</td>
-                                <td name="denominasi" class="denominasi"><input type="text" class="form-control"
-                                        value="{{ $denominasi['txtring20'] }}" readonly /></td>
-                                <td><input type="text" name="denominasi[ambilanring20]" class="form-control kosong"
-                                        id="ringgit20" data-amaun="{{ $denominasi['txtring20'] }}"
-                                        onkeyup="kiraanpanjar(this)" /> </td>
-                                <td><input type="text" name="denominasi[totalring20]" id="totalring20"
-                                        class="form-control kosong" value="0.00" readonly /> </td>
-                            </tr>
-                            <tr>
-                                <td>RM0.50</td>
-                                <td name="denominasi" class="denominasi"><input type="text" class="form-control"
-                                        value="{{ $denominasi['txtsen50'] }}" readonly /></td>
-                                <td><input type="text" name="denominasi[ambilansen50]" class="form-control kosong"
-                                        id="sen50" data-amaun="{{ $denominasi['txtsen50'] }}"
-                                        onkeyup="kiraanpanjar(this)" /> </td>
-                                <td><input type="text" name="denominasi[totalsen50]" id="totalsen50"
-                                        class="form-control kosong" value="0.00" readonly /> </td>
-                                <td>RM50</td>
-                                <td name="denominasi" class="denominasi"><input type="text" class="form-control"
-                                        value="{{ $denominasi['txtring50'] }}" readonly /></td>
-                                <td><input type="text" name="denominasi[ambilanring50]" class="form-control kosong"
-                                        id="ringgit50" data-amaun="{{ $denominasi['txtring50'] }}"
-                                        onkeyup="kiraanpanjar(this)" /> </td>
-                                <td><input type="text" name="denominasi[totalring50]" id="totalring50"
-                                        class="form-control kosong" value="0.00" readonly /> </td>
-                            </tr>
-                            <tr>
-                                <td></td>
-                                <td></td>
-                                <td></td>
-                                <td></td>
-                                <td>RM100</td>
-                                <td name="denominasi" class="denominasi"><input type="text" class="form-control"
-                                        value="{{ $denominasi['txtring100'] }}" readonly /></td>
-                                <td><input type="text" name="denominasi[ambilanring100]" class="form-control kosong"
-                                        id="ringgit100" data-amaun="{{ $denominasi['txtring100'] }}"
-                                        onkeyup="kiraanpanjar(this)" /> </td>
-                                <td><input type="text" name="denominasi[totalring100]" id="totalring100"
-                                        class="form-control kosong" value="0.00" readonly /> </td>
-                            </tr>
-                        </table>
-
-                    </div>
-                </div>
-
-                <input type="hidden" id="jenisjenis" />
-                <input type="hidden" id="kodcawangan" />
-                <input type="hidden" id="tellerla" />
-
-            </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-danger btn-lg" data-dismiss="modal">Batal</button>
-                <button type="submit" class="btn btn-success btn-lg">Terima</button>
-            </div>
-        </form>
-        </div>
-    </div>
-</div>
-
-<script>
-    function terimadeno(e) {
-        e.preventDefault();
-
-        let amaunKiraan = parseFloat($('#amaunkiraan').val()) || 0;
-        let jumlahPampasan = parseFloat($('input[name="jumlahpampasan"]').val()) || 0;
-        let jumlahPanjar = parseFloat($('input[name="jumlahPanjar"]').val()) || 0;
-
-        // Validation
-        if (amaunKiraan !== jumlahPanjar) {
-            Swal.fire({
-                icon: 'error',
-                title: 'Jumlah Tidak Sama',
-                text: 'Amaun kiraan mesti sama dengan Jumlah Panjar.'
-            });
-            return false; 
-        }
-
-        Swal.fire({
-            icon: 'success',
-            title: 'Berjaya',
-            text: 'Pampasan berjaya!',
-            showConfirmButton: true
-        }).then(() => {
-            $('#formPampasan')[0].submit(); 
-        });
-
-        return false; 
-    }
-</script>

resources/views/modal/editmarhun.blade.php

@@ -63,7 +63,7 @@
                     @endforeach
                   </select>
                 </div>
-                <div class="col-md-4">Berat Bersih</div>
+                <div class="col-md-4">Berat</div>
                 <div class="col-md-8"><input type="text" class="form-control" name="berat_edit" id="berat_edit" onkeyup="calculationharga(this)"/></div>
                 <div class="col-md-4">Harga</div>
                 <div class="col-md-8"><input type="text" name="harga_edit" id="harga_edit" class="form-control" readonly/></div>

resources/views/modal/panjar.blade.php

@@ -1,4 +1,4 @@
-<!-- Modal Keraian -->
+  <!-- Modal Keraian -->
   <div class="modal fade" id="keraianModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalCenterTitle" aria-hidden="true">
     <div class="modal-dialog modal-dialog-centered" role="document">
       <div class="modal-content">
@@ -570,26 +570,6 @@
           </div>
         </div>
       </div>
+  
 
-      <!-- Modal Surat Agreement -->
-<div class="modal fade" id="suratModal" tabindex="-1" role="dialog" aria-labelledby="suratModalLabel" aria-hidden="true">
-  <div class="modal-dialog modal-lg" role="document">
-    <div class="modal-content">
-      <div class="modal-header">
-        <h5 class="modal-title" id="suratModalLabel">Surat Agreement</h5>
-        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-          <span aria-hidden="true">&times;</span>
-        </button>
-      </div>
-      <div class="modal-body" id="surat-content" style="font-family: 'Times New Roman', Times, serif;">
-        <!-- Surat content will be injected here -->
-      </div>
-      <div class="modal-footer">
-        <button type="button" class="btn btn-secondary" data-dismiss="modal">Batal</button>
-        <button type="button" class="btn btn-primary" id="btnPrintSurat">Cetak & Teruskan</button>
-      </div>
-    </div>
-  </div>
-</div>
-
-
+      

resources/views/operasi/edit_marginmutu.blade.php

@@ -1,148 +0,0 @@
-@extends('layouts.app_operasi')
-@section('content')
-
-<div class="container">
-    <div class="row justify-content-center">
-        <div class="col-md-8">
-            <div class="card">
-               
-                <nav aria-label="breadcrumb">
-                    <ol class="breadcrumb pb-3">
-                      <li class="breadcrumb-item"><a href="{{ url('/') }}">Home</a></li>
-                      <li class="breadcrumb-item"><a href="{{ url('operasi/parameter') }}">Parameter</a></li>
-                      <li class="breadcrumb-item"><a href="{{ url('operasi/marginmutu') }}">Margin Mutu Emas</a></li>
-                      <li class="breadcrumb-item active" aria-current="page">Edit Margin Mutu</li>
-                    </ol>
-                </nav>
-                <div class="card-body">
-                    <h4 class="text-center mb-4">Edit Margin Mutu Emas</h4>
-                    
-                    <form id="editMarginForm">
-                        @csrf
-                        <input type="hidden" id="recno" name="recno">
-                        
-                        <div class="form-group">
-                            <label for="karat">Karat</label>
-                            <input type="text" class="form-control" id="karat" name="karat" readonly>
-                        </div>
-                        
-                        <div class="form-group">
-                            <label for="keterangan">Keterangan</label>
-                            <input type="text" class="form-control" id="keterangan" name="keterangan" readonly>
-                        </div>
-                        
-                        <div class="form-group">
-                            <label for="teller">Teller (%)</label>
-                            <input type="number" step="0.01" class="form-control" id="teller" name="teller" required>
-                        </div>
-                        
-                        <div class="form-group">
-                            <label for="pc">PC (%)</label>
-                            <input type="number" step="0.01" class="form-control" id="pc" name="pc" required>
-                        </div>
-                        
-                        <div class="form-group">
-                            <label for="operasi">Operasi (%)</label>
-                            <input readonly type="number" step="0.01" class="form-control" id="operasi" name="operasi" required>
-                        </div>
-                        
-                        <div class="text-center">
-                            <button type="submit" class="btn btn-primary">Update</button>
-                            <a href="{{ route('operasi.marginmutu') }}" class="btn btn-secondary">Cancel</a>
-                        </div>
-                    </form>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-
-<script>
-$(document).ready(function() {
-    // Get data from URL parameters
-    const urlParams = new URLSearchParams(window.location.search);
-    $('#recno').val(urlParams.get('recno'));
-    $('#karat').val(urlParams.get('karat'));
-    $('#keterangan').val(urlParams.get('keterangan'));
-    $('#teller').val(urlParams.get('teller'));
-    $('#pc').val(urlParams.get('pc'));
-    $('#operasi').val(urlParams.get('operasi'));
-
-    var username = '{{ Auth::user()->name }}';
-    
-    $('#editMarginForm').on('submit', function(e) {
-        e.preventDefault();
-        
-        const formData = {
-            recno: $('#recno').val(),
-            karat: $('#karat').val(),
-            keterangan: $('#keterangan').val(),
-            teller: $('#teller').val(),
-            pc: $('#pc').val(),
-            operasi: $('#operasi').val(),
-            _token: $('input[name="_token"]').val(),
-            username : username
-        };
-        
-        $.ajax({
-            url: '{{ config("api.url") }}/api/maxmutuemas/update',
-            type: 'POST',
-            data: formData,
-            success: function(response) {
-                if(response.status === 'success') {
-                    Swal.fire({
-                        title: 'Berjaya!',
-                        text: 'Data berhasil diupdate!',
-                        icon: 'success',
-                        confirmButtonText: 'OK'
-                    }).then((result) => {
-                        window.location.href = '{{ route("operasi.marginmutu") }}';
-                    });
-                } else {
-                    Swal.fire({
-                        title: 'Ralat!',
-                        text: response.message,
-                        icon: 'error',
-                        confirmButtonText: 'OK'
-                    });
-                }
-            },
-            error: function(xhr) {
-                let errorMessage = 'Error updating data';
-                
-                try {
-                    let response = JSON.parse(xhr.responseText);
-                    
-                    // If validation errors exist, show them
-                    if (response.errors) {
-                        let errorMessages = [];
-                        Object.keys(response.errors).forEach(function(key) {
-                            response.errors[key].forEach(function(error) {
-                                errorMessages.push(error);
-                            });
-                        });
-                        errorMessage = errorMessages.join('\n');
-                    } else if (response.message) {
-                        errorMessage = response.message;
-                    }
-                } catch (e) {
-                    // If JSON parsing fails, use the raw responseText
-                    errorMessage = xhr.responseText || 'Unknown error occurred';
-                }
-                
-                Swal.fire({
-                    title: 'Ralat!',
-                    text: errorMessage,
-                    icon: 'error',
-                    confirmButtonText: 'OK'
-                });
-            }
-        });
-    });
-
-    $('input[type="number"]').on('keydown', function(e) {
-        if (['e', 'E', '+', '-'].includes(e.key)) e.preventDefault();
-    });
-});
-</script>
-@endsection

resources/views/operasi/kelulusan.blade.php

@@ -2,97 +2,27 @@
 
 @section('content')
 
-<div class="modal fade" id="kelulusan_pampasan_modal">
-  <div class="modal-dialog modal-lg modal-dialog-centered">
-    <div class="modal-content">
-      <!-- Modal Header -->
-      <div class="modal-header">
-        <h4 class="text-center">Maklumat Lanjut</h4>
-        <button type="button" class="close" data-dismiss="modal">&times;</button>
-      </div>
-      <!-- Modal body -->
-      <div class="modal-body">
-
-        <div class="row col-12 text-center">
-          <div class="row col-7">
-              <label>Nombor Rujukan : </label>
-              <span id="norujukan_pampasan"> </span>
-          </div>
-        </div>
-        <div class="row col-12 text-center">
-          <div class="row col-7">
-            <label>Nama : </label>
-            <span id="namalanjut_pampasan"> </span>
-          </div>
-
-          <div class="row col-5">
-            <label>Kad Pengenalan : </label>
-            <span id="nokplanjut_pampasan"> </span>
-          </div>
-        </div>
-
-        <div class="row mt-3">
-          <div class="col-12">
-            <div class="table-responsive">
-              <table class="table table-hover">
-                <tbody>
-                  <tr>
-                    <th class="bg-secondary text-white" scope="row" style="width: 30%;">Nilai Marhun</th>
-                    <td id="nilaiMarhun">text</td>
-                  </tr>
-                  <tr>
-                    <th class="bg-secondary text-white" scope="row" style="width: 30%;">Baki Pembiayaan</th>
-                    <td id="pembiayaan"></td>
-                  </tr>
-                  <tr>
-                    <th class="bg-secondary text-white" scope="row" style="width: 30%;">Jumlah Pampasan</th>
-                    <td id="jumlahPampasan"></td>
-                  </tr>
-                  <tr>
-                    <th class="bg-secondary text-white" scope="row" style="width: 30%;">Keuntungan</th>
-                    <td id="keuntungan"></td>
-                  </tr>
-                  <tr>
-                    <th class="bg-secondary text-white" scope="row" style="width: 30%;">Ansuran Pembiayaan</th>
-                    <td id="bayaranAnsuran"></td>
-                  </tr>
-                </tbody>
-              </table>
-            </div>
-          </div>
-        </div>
-
-
-      </div>
-      <!-- Modal footer -->
-      <div class="modal-footer">
-        <button type="button" class="btn btn-danger" data-dismiss="modal">Close</button>
-      </div>
-    </div>
-  </div>
-</div>
-
 <div class="modal fade" id="kelulusanmodal">
-  <div class="modal-dialog modal-lg modal-dialog-centered">
-    <div class="modal-content">
-      <!-- Modal Header -->
-      <div class="modal-header">
-        <h4 class="text-center">Maklumat Lanjut</h4>
-        <button type="button" class="close" data-dismiss="modal">&times;</button>
-      </div>
-      <!-- Modal body -->
-      <div class="modal-body">
-
+    <div class="modal-dialog modal-lg modal-dialog-centered">
+      <div class="modal-content">
+        <!-- Modal Header -->
+        <div class="modal-header">
+            <h4 class="text-center">Maklumat Lanjut</h4>
+            <button type="button" class="close" data-dismiss="modal">&times;</button>
+        </div>
+        <!-- Modal body -->
+        <div class="modal-body">
+          
         <div class="row col-12 text-center">
-          <div class="row col-7">
-            <label>Nama : </label>
-            <span id="namalanjut"> </span>
-          </div>
+            <div class="row col-7">   
+                <label>Nama : </label>
+                <span id="namalanjut"> </span>
+             </div>
 
-          <div class="row col-5">
-            <label>Kad Pengenalan : </label>
-            <span id="nokplanjut"> </span>
-          </div>
+            <div class="row col-5">   
+                <label>Kad Pengenalan : </label>
+                <span id="nokplanjut"> </span>
+            </div>
         </div>
 
         <div class="row mt-3">
@@ -141,459 +71,404 @@
         </div>
 
 
-      </div>
-      <!-- Modal footer -->
-      <div class="modal-footer">
-        <button type="button" class="btn btn-danger" data-dismiss="modal">Close</button>
-      </div>
-    </div>
-  </div>
-</div>
-
-
-<div class="container col-12">
-  <div class="row justify-content-center">
-    <div class="col-md-12">
-      <div class="card">
-
-        <nav aria-label="breadcrumb">
-          <ol class="breadcrumb pb-3">
-            <li class="breadcrumb-item"><a href="{{ url('/') }}">Home</a></li>
-            <li class="breadcrumb-item active" aria-current="page">Kelulusan</li>
-          </ol>
-        </nav>
-
-        <div class="card-body text-center">
-
-          <div class="row mb-4">
-            <div class="col-2 justify-content-start">
-            </div>
-            <div class="col-8 mt-3 justify-content-center">
-            </div>
-            <div class="col-2">
-            </div>
-          </div>
-
-          <table class='table mt-2 table-striped table-hover' id='table-kelulusan' style="width:100%;">
-            <thead class="thead-dark">
-              <tr>
-                <th>No Rujukan</th>
-                <th>Cawangan</th>
-                <th>Teller</th>
-                <th>Komen</th>
-                <th>Status</th>
-                <th>Nilai Pembiayaan</th>
-                <th>Ansuran</th>
-                <th>Nilai Marhun</th>
-                <th>Berat</th>
-                <th>Margin</th>
-                <th>Tindakan</th>
-              </tr>
-            </thead>
-            <tbody>
-              @foreach($arraykelulusan as $index=>$k)
-              <tr>
-                @php
-                $targetModal = '#kelulusanmodal';
-                $targetModal = strtolower($k['status']) == 'kelulusan pengeluaran pampasan' ? '#kelulusan_pampasan_modal' : $targetModal;
-
-                @endphp
-                <td><a href="#" data-toggle="modal" data-target="{{$targetModal}}" data-kodcawangan="{{ $k['cawangankod'] }}" data-norujukan="{{ $k['norujukan'] }}">{{ $k['norujukan'] }} </a></td>
-                <td>{{ $k['cawangan'] }}</td>
-                <td>{{ $k['namateller'] }}</td>
-                <th>{{ $k['komen'] }}</th>
-                <td>{{ $k['status'] }}</td>
-                <td>{{ number_format($k['pinjaman'],2) }}</td>
-                @if(isset($k['ansuran']) && $k['ansuran'] != 0)
-                <td>{{ number_format($k['ansuran'],2) }}</td>
-                @else
-                <td></td>
-                @endif
-                <td>{{ $k['nilaimarhun'] }}</td>
-                <td>{{ $k['berat'] }}</td>
-                <td>{{ $k['margin'] }}</td>
-                <td><button class="btn btn-primary mr-2" onclick="updatelulus(this)" data-taglulus="{{ isset($k['mohonid']) ? true : false }}" data-kodcaw="{{ $k['cawangankod'] }}" data-norujukan="{{ $k['norujukan'] }}" data-siri="{{ isset($k['siri']) ? $k['siri'] : $k['recno'] }}" data-status="{{ $k['status'] ?? '' }}"><i class="fas fa-thumbs-up"></i></button>
-                  <button class="btn btn-danger" onclick="updatebatal(this)" data-taglulus="{{ isset($k['mohonid']) ? true : false }}" data-kodcaw="{{ $k['cawangankod'] }}" data-norujukan="{{ $k['norujukan'] }}" data-siri="{{ isset($k['siri']) ? $k['siri'] : $k['recno'] }}"><i class="fas fa-thumbs-down"></i></button>
-                </td>
-              </tr>
-              @endforeach
-            </tbody>
-          </table>
-
-          <div class="row mt-4 d-flex justify-content-end">
-
-            <a href="{{ route ('operasi.rekodlepas') }}" class="btn btn-info mr-3">Rekod Lulus</a>
-
-          </div>
-
+        </div>
+        <!-- Modal footer -->
+        <div class="modal-footer">
+          <button type="button" class="btn btn-danger" data-dismiss="modal">Close</button>
         </div>
       </div>
     </div>
   </div>
+
+
+<div class="container col-12">
+    <div class="row justify-content-center">
+        <div class="col-md-12">
+            <div class="card">
+                
+                <nav aria-label="breadcrumb">
+                    <ol class="breadcrumb pb-3">
+                      <li class="breadcrumb-item"><a href="{{ url('/') }}">Home</a></li>
+                      <li class="breadcrumb-item active" aria-current="page">Kelulusan</li>
+                    </ol>
+                  </nav>
+
+                <div class="card-body text-center">
+                    
+                    <div class="row mb-4">
+                        <div class="col-2 justify-content-start">
+                        </div>
+                        <div class="col-8 mt-3 justify-content-center">
+                        </div>
+                        <div class="col-2">
+                        </div>
+                    </div>
+
+                    <table class='table mt-2 table-striped table-hover' id='table-kelulusan' style="width:100%;">
+                        <thead class="thead-dark">
+                            <tr>
+                                <th>No Rujukan</th>
+                                <th>Cawangan</th>
+                                <th>Teller</th>
+                                <th>Komen</th>
+                                <th>Status</th>
+                                <th>Nilai Pembiayaan</th>
+                                <th>Ansuran</th>
+                                <th>Nilai Marhun</th>
+                                <th>Berat</th>
+                                <th>Margin</th>
+                                <th>Tindakan</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            @foreach($arraykelulusan as $index=>$k)
+                            <tr>    
+                                <td><a href="#" data-toggle="modal" data-target="#kelulusanmodal" data-kodcawangan="{{ $k['cawangankod'] }}" data-norujukan="{{ $k['norujukan'] }}">{{ $k['norujukan'] }} </a></td>
+                                <td>{{ $k['cawangan'] }}</td>
+                                <td>{{ $k['namateller'] }}</td>
+                                <th>{{ $k['komen'] }}</th>
+                                <td>{{ $k['status'] }}</td>
+                                <td>{{ number_format($k['pinjaman'],2) }}</td>
+                                @if(isset($k['ansuran']) && $k['ansuran'] != 0)
+                                <td>{{ number_format($k['ansuran'],2) }}</td>
+                                @else
+                                <td></td>
+                                @endif
+                                <td>{{ $k['nilaimarhun'] }}</td>
+                                <td>{{ $k['berat'] }}</td>
+                                <td>{{ $k['margin'] }}</td>
+                                <td><button class="btn btn-primary mr-2" onclick="updatelulus(this)" data-taglulus="{{ isset($k['mohonid']) ? true : false }}" data-kodcaw="{{ $k['cawangankod'] }}"  data-norujukan="{{ $k['norujukan'] }}" data-siri="{{ isset($k['siri']) ? $k['siri'] : $k['recno'] }}"><i class="fas fa-thumbs-up"></i></button>
+                                    <button class="btn btn-danger" onclick="updatebatal(this)" data-taglulus="{{ isset($k['mohonid']) ? true : false }}" data-kodcaw="{{ $k['cawangankod'] }}" data-norujukan="{{ $k['norujukan'] }}" data-siri="{{ isset($k['siri']) ? $k['siri'] : $k['recno'] }}" ><i class="fas fa-thumbs-down"></i></button></td>
+                            </tr>
+                            @endforeach
+                        </tbody>
+                    </table>
+
+                    <div class="row mt-4 d-flex justify-content-end">
+                
+                        <a href="{{ route ('operasi.rekodlepas') }}" class="btn btn-info mr-3">Rekod Lulus</a>
+
+                    </div>
+                
+                </div>
+            </div>
+        </div>
+    </div>
 </div>
 <script>
-  var tablekelulusan = $('#table-kelulusan').DataTable({
-    "scrollX": true
-  });
 
-  let api = "{{ config('api.url') }}";
+    var tablekelulusan = $('#table-kelulusan').DataTable({
+        "scrollX": true
+        });
 
-  const formatter = new Intl.NumberFormat('en-US', {
-    minimumFractionDigits: 2
-  });
+    let api = "{{ config('api.url') }}";
 
-  var audio = new Audio("{{ asset('sound/3.wav') }}");
+    const formatter = new Intl.NumberFormat('en-US', {
+        minimumFractionDigits: 2
+    });
 
-  if (tablekelulusan.data().any()) {
-    audio.play();
-    audio.addEventListener('ended', function() {
-      this.currentTime = 0;
-      this.play();
-    }, false);
-  } else {
-    audio.loop = false;
-    audio.muted = true;
-  }
+	var audio = new Audio("{{ asset('sound/3.wav') }}");
+
+	if(tablekelulusan.data().any()){
+		audio.play();
+		audio.addEventListener('ended', function() {
+			this.currentTime = 0;
+			this.play();
+		}, false);
+	}else{
+		audio.loop = false;
+		audio.muted = true;
+	}
 
 
-  $('#kelulusanmodal').on('show.bs.modal', function(event) {
-    let button = $(event.relatedTarget);
-    let norujukan = $(button).data('norujukan');
-    let kodcaw = $(button).data('kodcawangan');
-
-    $.ajax({
-      method: 'GET',
-      url: api + '/api/gadai/norujukan/' + norujukan,
-      dataType: 'json',
-      success: function(datagadaiwithnorujukan) {
-
-        let nokp = datagadaiwithnorujukan[0][0].nokp;
+    $('#kelulusanmodal').on('show.bs.modal', function(event) {
+        let button = $(event.relatedTarget);
+        let norujukan = $(button).data('norujukan');
+        let kodcaw = $(button).data('kodcawangan');
 
         $.ajax({
-          method: 'GET',
-          url: api + '/api/customers/' + nokp,
+          method:'GET',
+          url: api + '/api/gadai/norujukan/' + norujukan,
           dataType: 'json',
-          success: function(datagadaiwithnokp) {
+          success:function(datagadaiwithnorujukan){
 
-            let nama = datagadaiwithnokp.nama;
-
-            $('#namalanjut').text(nama);
-            $('#nokplanjut').text(nokp);
+            let nokp = datagadaiwithnorujukan[0][0].nokp;
 
             $.ajax({
-              method: 'GET',
-              url: api + '/api/gadai/customers/' + nokp + '/outstandingsemasa/' + kodcaw,
-              dataType: 'json',
-              success: function(outstandingsemasa) {
+                method:'GET',
+                url: api + '/api/customers/' + nokp,
+                dataType: 'json',
+                success:function(datagadaiwithnokp){
 
-                $('#pinjterkumpul').text('RM' + formatter.format(outstandingsemasa));
+                let nama = datagadaiwithnokp.nama;
 
-              },
-              error: function(xhr, status, error) {
-                var err = eval("(" + xhr.responseText + ")");
-                alert(xhr.responseText);
-              }
+                $('#namalanjut').text(nama);
+                $('#nokplanjut').text(nokp);
+
+                $.ajax({
+                    method:'GET',
+                    url: api + '/api/gadai/customers/' + nokp + '/outstandingsemasa/' + kodcaw,
+                    dataType: 'json',
+                    success:function(outstandingsemasa){
+
+                        $('#pinjterkumpul').text('RM' + formatter.format(outstandingsemasa));
+
+                    },error: function(xhr, status, error) {
+                        var err = eval("(" + xhr.responseText + ")");
+                        alert(xhr.responseText);
+                    }
+                });
+
+
+                }
+            });
+
+            $.ajax({
+            method:'GET',
+            url: api + '/api/customers/' + nokp + '/gadai/belum_tebus',
+            dataType: 'json',
+            success:function(data){
+                let bilanganaktif = 0;
+                if(data == null)
+                {
+                    bilanganaktif = 0;
+                }else{
+                    bilanganaktif = data[0].length;
+                }
+
+                $('#bilaktif').text(bilanganaktif);
+
+
+            }
+            });
+
+
+            $.ajax({
+            method:'GET',
+            url: api + '/api/customers/' + nokp + '/gadai/lelong',
+            dataType: 'json',
+            success:function(data){
+                
+                let bilanganlelong = 0;
+
+                if(data == null)
+                {
+                    bilanganlelong = 0;
+                }else{
+                    bilanganlelong = data.length;
+                }
+
+
+                $('#billelong').text(bilanganlelong);
+            }
             });
 
 
           }
         });
 
-        $.ajax({
-          method: 'GET',
-          url: api + '/api/customers/' + nokp + '/gadai/belum_tebus',
-          dataType: 'json',
-          success: function(data) {
-            let bilanganaktif = 0;
-            if (data == null) {
-              bilanganaktif = 0;
-            } else {
-              bilanganaktif = data[0].length;
-            }
-
-            $('#bilaktif').text(bilanganaktif);
+    });
 
 
-          }
-        });
+    async function updatelulus(e)
+    {
 
+        const { value: katalaluan } = await Swal.fire({
+            title: 'Masukkan Katalaluan Semula',
+            input: 'password',
+            inputPlaceholder: 'Katalaluan',
+            confirmButtonText: 'Hantar',
+            showCancelButton:true,
+            cancelButtonText:'Batal',
+            allowOutsideClick: true
+        })
+
+        let dataminta = '';
 
         $.ajax({
-          method: 'GET',
-          url: api + '/api/customers/' + nokp + '/gadai/lelong',
-          dataType: 'json',
-          success: function(data) {
-
-            let bilanganlelong = 0;
-
-            if (data == null) {
-              bilanganlelong = 0;
-            } else {
-              bilanganlelong = data.length;
+            method:'get',
+            url: "{{ route('operasi.getmintasemulakelulusan') }}",
+            async:false,
+            data:{ passsemula : katalaluan },
+            success:function(data)
+            {
+                if(data == "False")
+                {
+                    dataminta = data;
+                }
             }
-
-
-            $('#billelong').text(bilanganlelong);
-          }
         });
 
-
-      }
-    });
-
-  });
-
-
-  async function updatelulus(e) {
-
-    const {
-      value: katalaluan
-    } = await Swal.fire({
-      title: 'Masukkan Katalaluan Semula',
-      input: 'password',
-      inputPlaceholder: 'Katalaluan',
-      confirmButtonText: 'Hantar',
-      showCancelButton: true,
-      cancelButtonText: 'Batal',
-      allowOutsideClick: true
-    })
-
-    let dataminta = '';
-
-    $.ajax({
-      method: 'get',
-      url: "{{ route('operasi.getmintasemulakelulusan') }}",
-      async: false,
-      data: {
-        passsemula: katalaluan
-      },
-      success: function(data) {
-        if (data == "False") {
-          dataminta = data;
+        if(dataminta == 'False')
+        {
+            Swal.fire({
+                    icon: 'error',
+                    title: 'Pengesahan Katalaluan Tidak Berjaya'
+                })
+            event.preventDefault();
+            return false;
         }
-      }
-    });
 
-    if (dataminta == 'False') {
-      Swal.fire({
-        icon: 'error',
-        title: 'Pengesahan Katalaluan Tidak Berjaya'
-      })
-      event.preventDefault();
-      return false;
+        // var { value: komenkelulusan } = await Swal.fire({
+        //     title: 'Masukkan Komen!',
+        //     input: 'radio',
+        //     customClass: {
+        //         input: 'custom-radio'
+        //     },
+        //     inputOptions: {
+        //         'Pelanggan Baru': 'Pelanggan Baru',
+        //         'Pelanggan Tetap': 'Pelanggan Tetap',
+        //         'Rekod Gadaian Baik': 'Rekod Gadaian Baik',
+        //         'Lain2': 'Lain-Lain'
+        //     },
+        //     confirmButtonText: 'Hantar',
+        //     showCancelButton:false,
+        //     allowOutsideClick: false
+        // })
+
+           // if(komenkelulusan === 'Lain2')
+        // {
+        //     var { value: komenkelulusan } = await Swal.fire({
+        //     title: 'Masukkan Komen!',
+        //     input: 'text',
+        //     inputPlaceholder: 'Komen',
+        //     confirmButtonText: 'Hantar',
+        //     showCancelButton:false,
+        //     allowOutsideClick: false
+        //     });
+        // }
+
+        const { value: komenkelulusan } = await Swal.fire({
+            title: 'Masukkan Komen!',
+            input: 'text',
+            inputPlaceholder: 'Komen',
+            confirmButtonText: 'Hantar',
+            showCancelButton:false,
+            allowOutsideClick: false
+        })
+
+        let norujukan = $(e).data('norujukan');
+        let cawangankod = $(e).data('kodcaw');
+        let siri = $(e).data('siri');
+        let namaoperasi = "{{ Auth::user()->name }}";
+        let teller = $(e).closest('tr').children('td:eq(2)').text();
+        let taglulus = $(e).data('taglulus');
+
+        teller = String(teller);
+
+        $.ajax({
+            method:'put',
+            url: "{{ route('operasi.updatekelulusan') }}",
+            data: {
+                "_token": "{{ csrf_token() }}",
+                "taglulus" : taglulus,
+                "norujukan" : norujukan,
+                "kodcaw" : cawangankod,
+                "komenkelulusan" : komenkelulusan,
+                "siri" : siri,
+                'namaoperasi' : namaoperasi,
+                'teller' : teller
+            },
+            success:function(data){
+                console.log(data);
+                Swal.fire({
+                    icon: 'success',
+                    title: 'Pengesahan Berjaya'
+                }).then(function(){
+                    location.reload();
+                });
+
+            },error: function(xhr, status, error) {
+                var err = eval("(" + xhr.responseText + ")");
+                alert(xhr.responseText);
+            }
+        });  
+
     }
 
-    // var { value: komenkelulusan } = await Swal.fire({
-    //     title: 'Masukkan Komen!',
-    //     input: 'radio',
-    //     customClass: {
-    //         input: 'custom-radio'
-    //     },
-    //     inputOptions: {
-    //         'Pelanggan Baru': 'Pelanggan Baru',
-    //         'Pelanggan Tetap': 'Pelanggan Tetap',
-    //         'Rekod Gadaian Baik': 'Rekod Gadaian Baik',
-    //         'Lain2': 'Lain-Lain'
-    //     },
-    //     confirmButtonText: 'Hantar',
-    //     showCancelButton:false,
-    //     allowOutsideClick: false
-    // })
+    async function updatebatal(e)
+    {
+        const { value: katalaluan } = await Swal.fire({
+            title: 'Masukkan Katalaluan Semula',
+            input: 'password',
+            inputPlaceholder: 'Katalaluan',
+            confirmButtonText: 'Hantar',
+            showCancelButton:true,
+            cancelButtonText:'Batal',
+            allowOutsideClick: true
+        })
 
-    // if(komenkelulusan === 'Lain2')
-    // {
-    //     var { value: komenkelulusan } = await Swal.fire({
-    //     title: 'Masukkan Komen!',
-    //     input: 'text',
-    //     inputPlaceholder: 'Komen',
-    //     confirmButtonText: 'Hantar',
-    //     showCancelButton:false,
-    //     allowOutsideClick: false
-    //     });
-    // }
+        let dataminta = '';
 
-    const {
-      value: komenkelulusan
-    } = await Swal.fire({
-      title: 'Masukkan Komen!',
-      input: 'text',
-      inputPlaceholder: 'Komen',
-      confirmButtonText: 'Hantar',
-      showCancelButton: false,
-      allowOutsideClick: false
-    })
-
-    let norujukan = $(e).data('norujukan');
-    let cawangankod = $(e).data('kodcaw');
-    let siri = $(e).data('siri');
-    let namaoperasi = "{{ Auth::user()->name }}";
-    let teller = $(e).closest('tr').children('td:eq(2)').text();
-    let taglulus = $(e).data('taglulus');
-    let status = $(e).data('status');
-
-    teller = String(teller);
-
-    let requestData = {
-      "_token": "{{ csrf_token() }}",
-      "taglulus": taglulus,
-      "norujukan": norujukan,
-      "kodcaw": cawangankod,
-      "komenkelulusan": komenkelulusan,
-      "siri": siri,
-      'namaoperasi': namaoperasi,
-      'teller': teller
-    };
-
-    if (status === 'Kelulusan Pengeluaran Pampasan') {
-      requestData.actions = 'Pengesahan Pembayaran Pampasan';
-    }
-
-    $.ajax({
-      method: 'put',
-      url: "{{ route('operasi.updatekelulusan') }}",
-      data: requestData,
-      success: function(data) {
-        console.log(data);
-        Swal.fire({
-          icon: 'success',
-          title: 'Pengesahan Berjaya'
-        }).then(function() {
-          location.reload();
+        $.ajax({
+            method:'get',
+            url: "{{ route('operasi.getmintasemulakelulusan') }}",
+            async:false,
+            data:{ passsemula : katalaluan },
+            success:function(data)
+            {
+                if(data == "False")
+                {
+                    dataminta = data;
+                }
+            }
         });
 
-      },
-      error: function(xhr, status, error) {
-        var err = eval("(" + xhr.responseText + ")");
-        alert(xhr.responseText);
-      }
-    });
-
-  }
-
-  async function updatebatal(e) {
-    const {
-      value: katalaluan
-    } = await Swal.fire({
-      title: 'Masukkan Katalaluan Semula',
-      input: 'password',
-      inputPlaceholder: 'Katalaluan',
-      confirmButtonText: 'Hantar',
-      showCancelButton: true,
-      cancelButtonText: 'Batal',
-      allowOutsideClick: true
-    })
-
-    let dataminta = '';
-
-    $.ajax({
-      method: 'get',
-      url: "{{ route('operasi.getmintasemulakelulusan') }}",
-      async: false,
-      data: {
-        passsemula: katalaluan
-      },
-      success: function(data) {
-        if (data == "False") {
-          dataminta = data;
+        if(dataminta == 'False')
+        {
+            Swal.fire({
+                    icon: 'error',
+                    title: 'Pengesahan Katalaluan Tidak Berjaya'
+                })
+            event.preventDefault();
+            return false;
         }
-      }
-    });
 
-    if (dataminta == 'False') {
-      Swal.fire({
-        icon: 'error',
-        title: 'Pengesahan Katalaluan Tidak Berjaya'
-      })
-      event.preventDefault();
-      return false;
+        const { value: komenkelulusan } = await Swal.fire({
+            title: 'Masukkan Komen',
+            input: 'text',
+            inputPlaceholder: 'Komen',
+            confirmButtonText: 'Hantar',
+            showCancelButton:false,
+            allowOutsideClick: false
+        })
+
+        let norujukan = $(e).data('norujukan');
+        let siri = $(e).data('siri');
+        let cawangankod = $(e).data('kodcaw');
+        let namaoperasi = "{{ Auth::user()->name }}";
+        let teller = $(e).closest('tr').children('td:eq(2)').text();
+
+        teller = String(teller);
+
+        $.ajax({
+            method:'put',
+            url: "{{ route('operasi.updatekelulusan') }}",
+            data: {
+                "_token": "{{ csrf_token() }}",
+                "norujukan" : norujukan,
+                "siri" : siri,
+                "kodcaw" : cawangankod,
+                "komenkelulusan" : komenkelulusan,
+                "pembatalan" : "batal",
+                'namaoperasi' : namaoperasi,
+                'teller' : teller
+            },
+            success:function(data){
+                Swal.fire({
+                    icon: 'success',
+                    title: 'Pengesahan Berjaya'
+                }).then(function(){
+                    location.reload();
+                    
+                });
+
+            },error: function(xhr, status, error) {
+                var err = eval("(" + xhr.responseText + ")");
+                alert(xhr.responseText);
+            }
+        });  
     }
 
-    const {
-      value: komenkelulusan
-    } = await Swal.fire({
-      title: 'Masukkan Komen',
-      input: 'text',
-      inputPlaceholder: 'Komen',
-      confirmButtonText: 'Hantar',
-      showCancelButton: false,
-      allowOutsideClick: false
-    })
-
-    let norujukan = $(e).data('norujukan');
-    let siri = $(e).data('siri');
-    let cawangankod = $(e).data('kodcaw');
-    let namaoperasi = "{{ Auth::user()->name }}";
-    let teller = $(e).closest('tr').children('td:eq(2)').text();
-
-    teller = String(teller);
-
-    $.ajax({
-      method: 'put',
-      url: "{{ route('operasi.updatekelulusan') }}",
-      data: {
-        "_token": "{{ csrf_token() }}",
-        "norujukan": norujukan,
-        "siri": siri,
-        "kodcaw": cawangankod,
-        "komenkelulusan": komenkelulusan,
-        "pembatalan": "batal",
-        'namaoperasi': namaoperasi,
-        'teller': teller
-      },
-      success: function(data) {
-        Swal.fire({
-          icon: 'success',
-          title: 'Pengesahan Berjaya'
-        }).then(function() {
-          location.reload();
-
-        });
-
-      },
-      error: function(xhr, status, error) {
-        var err = eval("(" + xhr.responseText + ")");
-        alert(xhr.responseText);
-      }
-    });
-  }
-
-  $('#kelulusan_pampasan_modal').on('show.bs.modal', async function(event) {
-    const triggerModalButton = event.relatedTarget;
-    const norujukan = triggerModalButton.dataset.norujukan;
-    const kodcaw = triggerModalButton.dataset.kodcawangan;
-
-    const pampasan = await fetch(api + `/api/pampasan?norujukan=${norujukan}&kodcaw=${kodcaw}`)
-                           .then(response => response.json())
-                           .then(x => x.data.pop());
-
-    const barangkes = await fetch(api + `/api/palsu/laporan?kodcaw=${kodcaw}`)
-                            .then(response => response.json())
-                            .then(x => x.filter(x => x.norujukan == norujukan))
-                            .then(x => x.pop());
-
-    const tebus = await fetch(api + `/api/tebus/norujukan/${kodcaw}/${norujukan}`)
-                        .then(response => response.json())
-                        .then(x => x[0]);
-    
-    const customer = await fetch(api + `/api/customers/${barangkes.nokp}`)
-                           .then(response => response.json());
-
-    const formatMYR = (value) => {
-      return new Intl.NumberFormat('ms-MY', {
-        style: 'currency',
-        currency: 'MYR'
-      }).format(value);
-    };
-
-  document.getElementById('norujukan_pampasan').textContent = norujukan;
-  document.getElementById('namalanjut_pampasan').textContent = customer.nama;
-  document.getElementById('nokplanjut_pampasan').textContent = customer.kpbaru;
-  document.getElementById('nilaiMarhun').textContent = formatMYR(barangkes.nilaimarhun);
-  document.getElementById('pembiayaan').textContent = formatMYR(barangkes.pembiayaan);
-  document.getElementById('jumlahPampasan').innerHTML = '<strong>' + formatMYR(barangkes.nilaimarhun - barangkes.pembiayaan - barangkes.untung) + '</strong>';
-  document.getElementById('keuntungan').textContent = formatMYR(barangkes.untung);
-  document.getElementById('bayaranAnsuran').textContent = formatMYR(tebus.pinjaman - (tebus.bakipjm - tebus.bakiupah));
-    
-  });
 </script>
-@endsection
+@endsection

resources/views/operasi/marginmutu.blade.php

@@ -1,64 +0,0 @@
-@extends('layouts.app_operasi')
-@section('content')
-
-<div class="container">
-    <div class="row justify-content-center">
-        <div class="col-md-12">
-            <div class="card">
-               
-                <nav aria-label="breadcrumb">
-                    <ol class="breadcrumb pb-3">
-                      <li class="breadcrumb-item"><a href="{{ url('/') }}">Home</a></li>
-                      <li class="breadcrumb-item"><a href="{{ url('operasi/parameter') }}">Parameter</a></li>
-                      <li class="breadcrumb-item active" aria-current="page">Margin Mutu Emas</li>
-                    </ol>
-                </nav>
-                <div class="card-body text-center">
-                    
-                    <div class="mt-3">
-                        
-                        <table class='table table-striped table-hover' id='table-marginmutu' style="width:100%;">
-                            <thead class="thead-dark">
-                                <tr>
-                                    <th>Bil</th>
-                                    <th>Karat</th>
-                                    <th>Keterangan</th>
-                                    <th>Teller (%)</th>
-                                    <th>PC (%)</th>
-                                    <th>Operasi (%)</th>
-                                    <th>Tarikh Update</th>
-                                    <th>Tindakan</th>
-                                </tr>
-                            </thead>
-                            <tbody>
-                                @foreach($maxmutuemas as $index=>$mme)
-                                    <tr>
-                                        <td>{{ $loop->iteration }}</td>
-                                        <td>{{ $mme['karat'] }}</td>
-                                        <td>{{ $mme['keterangan'] }}</td>
-                                        <td>{{ $mme['teller'] }}%</td>
-                                        <td>{{ $mme['pc'] }}%</td>
-                                        <td>{{ $mme['operasi'] }}%</td>
-                                        <td>{{ \Carbon\Carbon::parse($mme['tarikhupdate'])->format('d/m/Y') }}</td>
-                                        <td>
-                                            <a href="{{ route('operasi.marginmutu.edit') }}?recno={{ $mme['recno'] }}&karat={{ $mme['karat'] }}&keterangan={{ $mme['keterangan'] }}&teller={{ $mme['teller'] }}&pc={{ $mme['pc'] }}&operasi={{ $mme['operasi'] }}" 
-                                               class="btn btn-sm btn-warning">Edit</a>
-                                        </td>
-                                    </tr>
-                                @endforeach
-                            </tbody>
-                        </table>
-
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-<script>
-    var table_marginmutu = $('#table-marginmutu').DataTable({
-        "pageLength": 25,
-        "order": [[ 0, "asc" ]]
-    });
-</script>
-@endsection

resources/views/operasi/parameter.blade.php

@@ -16,7 +16,7 @@
                 <div class="card-body text-center">
                     <a href="{{ route('operasi.hargaemas') }}" class="btn btn-info btn-lg">Harga Emas</a>
                     <a href="{{ route('operasi.margin') }}" class="btn btn-info btn-lg">Margin Pembiayaan</a>
-                    <a href="{{ route('operasi.marginmutu') }}" class="btn btn-info btn-lg">Margin Mutu Emas</a>
+                    <a href="#" class="btn btn-info btn-lg">Contoh 2</a>
                 </div>
             </div>
         </div>

resources/views/penebusan/v2/index.blade.php

@@ -131,20 +131,6 @@
                 </div>
             </div>
 
-            @if($pampasan)
-                <div class="bg-white p-3 my-3">
-                    <div class="border text-center p-2 mx-auto" style="border: 2px solid red !important; width: 209px;">
-                        <span class="text-danger font-weight-bold">PAMPASAN</span>
-                    </div>
-                    <div class="text-center mt-2">
-                        <a href="{{ route('pampasan.surat', $gadai['norujukan']) }}" target="_blank"
-                            class="btn surat-perjanjian-btn" data-norujukan="{{ $gadai['norujukan'] }}" title="Lihat Surat" style="background-color: red; color: white; border: 2px solid red;">
-                            <i class="fas fa-file-alt fa-lg"></i> Cetak Surat Perjanjian
-                        </a>
-                    </div>
-                </div>
-            @endif
-
             <div class="card" id="infomarhun">
                 <div class="card-body">
                     <table id="tablemarhun" class="table table-striped table-hover table-bordered text-center">
@@ -222,6 +208,15 @@
                                 </div>
                             </div>
 
+                            {{-- <div class="form-group row">
+                                <div class="col-4">
+                                    JUMLAH PERLU DIBAYAR SELEPAS DISKAUN (RM)
+                                </div>
+                                <div class="col-8">
+                                    <input type="text" id="jumlahselepasdiskaun" class="form-control" readonly/>
+                                </div>
+                            </div>                             --}}
+
                             <div>
                                 <fieldset class="scheduler-border">
                                     <div class="form-group row" id="divduitPelanggan">
@@ -326,6 +321,16 @@
                                     <input type="text" id="jumlahtelahdibayar" class="form-control" readonly/>
                                 </div>
                             </div>
+
+                            <div class="form-group row" id="divtelahdibayar">
+                                <div class="col-4">
+                                    REBET DISKAUN (RM)
+                                </div>
+                                <div class="col-8">
+                                    <input type="text" id="jumlahDiskaun" value="{{ number_format($gadai['diskaun'],2) }}" class="form-control" readonly/>
+                                    
+                                </div>
+                            </div>
                             
                         </div>
                     </div>
@@ -342,6 +347,14 @@
                                 </div>
                             </div>
 
+                            <div class="form-group row">
+                                <div class="col-4">
+                                    JUMLAH PERLU DIBAYAR SELEPAS DISKAUN (RM)
+                                </div>
+                                <div class="col-8">
+                                    <input type="text" id="perludibayarAkhir" class="form-control" readonly/>
+                                </div>
+                            </div>                            
 
                             <div>
                                 <fieldset class="scheduler-border">
@@ -442,6 +455,15 @@
                                 </div>
                             </div>
 
+                            <div class="form-group row" id="divtelahdibayar">
+                                <div class="col-4">
+                                    REBET DISKAUN (RM)
+                                </div>
+                                <div class="col-8">
+                                    <input type="text" id="jumlahDiskaun"  value="{{ number_format($gadai['diskaun'],2) }}" class="form-control" readonly/>
+                                </div>
+                            </div>
+
                             <div id="divbakipinjaman">
                                 <div class="form-group row">
                                     <div class="col-4">
@@ -467,7 +489,7 @@
                                     <input type="text" id="jumlahtelahdibayar" class="form-control" readonly/>
                                 </div>
                             </div>
-                            
+
 
                             <div class="form-group row" id="divbayaran">
                                 <div class="col-4">
@@ -575,6 +597,16 @@
                                 <div class="col-8">
                                     <input type="text" id="jumlahupah" class="form-control" readonly/>
                                 </div>
+                            </div>  
+                            
+                            <div class="form-group row" id="divtelahdibayar">
+                                <div class="col-4">
+                                    REBET DISKAUN (RM)
+                                </div>
+                                <div class="col-8">
+                                    <input type="text" id="jumlahDiskaun" value="{{ number_format($gadai['diskaun'],2) }}" class="form-control" readonly/>
+                                    
+                                </div>
                             </div>
 
                         </div>
@@ -1096,28 +1128,6 @@
     </div>
 </div>
 
-
-<!-- Modal Surat Agreement -->
-<div class="modal fade" id="suratModal" tabindex="-1" role="dialog" aria-labelledby="suratModalLabel" aria-hidden="true">
-  <div class="modal-dialog modal-lg" role="document">
-    <div class="modal-content">
-      <div class="modal-header">
-        <h5 class="modal-title" id="suratModalLabel">Surat Agreement</h5>
-        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-          <span aria-hidden="true">&times;</span>
-        </button>
-      </div>
-      <div class="modal-body" id="surat-content" style="font-family: 'Times New Roman', Times, serif;">
-        <!-- Surat content will be injected here -->
-      </div>
-      <div class="modal-footer">
-        <button type="button" class="btn btn-secondary" data-dismiss="modal">Batal</button>
-        <button type="button" class="btn btn-primary" id="btnPrintSurat">Cetak & Teruskan</button>
-      </div>
-    </div>
-  </div>
-</div>
-
 <script>
 
     let elem_jenisAT = $('#jenisAT').remove();
@@ -1188,7 +1198,6 @@
     var percent_mora = 0;
     var pinjaman_teller = 0;
     var pinjaman_pelulus = 0;
-    var pampasan = @json($pampasan);
 
 
 
@@ -1254,7 +1263,7 @@
             break;
             case "A": 
                 var jumupah = parseFloat($('#jumlahupah').val().replace(/[^0-9.-]+/g,""));
-                // var jumupahrebet = parseFloat($('#bayaranditerima').val().replace(/[^0-9.-]+/g,""));
+                // var jumupahrebet = parseFloat($('#bayaranditerima').val().replace(/[^0-9.-]+/g,""));         
 
                 elem_jenisA.prependTo(".infotransaksi");
                 $('#jenisAT').remove();
@@ -1402,10 +1411,6 @@
                 }
             });
 
-            if(pampasan != null){
-                $('#jumlahupah').val(pampasan.untung);
-            }
-
             $.ajax({
                 method:'GET',
                 url: api + '/api/upahrebettawarruq/' + kodcaw + '/' + norujukan,
@@ -1436,19 +1441,17 @@
                 dataType: 'json',
                 async:false,
                 success:function(harga_tebus){
-                     if(pampasan != null){
-                        let pembiayaan = safeMoneyParse(pampasan.pembiayaan);
-                        let untung = safeMoneyParse(pampasan.untung);
+    // // Ambil nilai diskaun
+    // let diskaun = parseFloat($('#jumlahDiskaun').val().replace(/,/g, '')) || 0;
 
-                        $('#perludibayar').val(formatter.format(pembiayaan + untung));
+    // // Tolak diskaun terus dari harga tebus
+    // let harga_tebus_akhir = parseFloat(harga_tebus) - diskaun;
+
+    // // Set balik ke input 'PERLU DIBAYAR'
+    $('#perludibayar').val(formatter.format(harga_tebus));
+}
 
-                        $('#duitPelanggan').val(formatter.format(pembiayaan + untung));
 
-                        $('#duitPelanggan').prop('readonly', true);
-                    }else {
-                        $('#perludibayar').val(formatter.format(harga_tebus));
-                    }
-                }
             });
 
             // Telah dibayar
@@ -1606,69 +1609,76 @@
 
     function bayarkey(e){
 
-        $('#bakiPelanggan').val('0.00');
-        $('#duitPelanggan').val('');
+$('#bakiPelanggan').val('0.00');
+$('#duitPelanggan').val('');
 
-        if($('#sltjenistebus').find(":selected").val() == 'S'){
-            let byr = $(e).val().replace(/[^0-9.-]+/g,"");
-            let total = 0;
-            let pdbyr = 0;
-            let totalseparuh = 0;
-            let totalnilaimarhunseparuh = 0;
-            var nmsemasa = parseFloat("{{ $nilaihargasemasa }}");
-            let upah = parseFloat($('#jumlahupah').val());
-            let ujrahrebet = parseFloat($('#jumujrahrebet').val().replace(/[^0-9.-]+/g,""));
-            let onepercentrebet = parseFloat($('#jumonepercentrebet').val().replace(/[^0-9.-]+/g,""));
+if($('#sltjenistebus').find(":selected").val() == 'S'){
+    let byr = $(e).val().replace(/[^0-9.-]+/g,"");
+    let total = 0;
+    let pdbyr = 0;
+    let totalseparuh = 0;
+    let totalnilaimarhunseparuh = 0;
+    var nmsemasa = parseFloat("{{ $nilaihargasemasa }}");
+    let upah = parseFloat($('#jumlahupah').val());
+    let ujrahrebet = parseFloat($('#jumujrahrebet').val().replace(/[^0-9.-]+/g,""));
+    let onepercentrebet = parseFloat($('#jumonepercentrebet').val().replace(/[^0-9.-]+/g,""));
 
-            let rebet = ujrahrebet + onepercentrebet;
+    let rebet = ujrahrebet + onepercentrebet;
 
-            $.each( array_nm, function( index, value ) {
-                totalnilaimarhunseparuh += parseFloat(value);
-            });
+    $.each( array_nm, function( index, value ) {
+        totalnilaimarhunseparuh += parseFloat(value);
+    });
 
-            pdbyr = parseFloat(byr);
-            total =  $('#pinjaman').val().replace(/[^0-9.-]+/g,"") - (pdbyr - upah + rebet);
-            let totaldibayar = parseFloat($('#pinjaman').val().replace(/[^0-9.-]+/g,"")) + (upah - rebet);
+    pdbyr = parseFloat(byr);
+    total =  $('#pinjaman').val().replace(/[^0-9.-]+/g,"") - (pdbyr - upah + rebet);
+    let totaldibayar = parseFloat($('#pinjaman').val().replace(/[^0-9.-]+/g,"")) + (upah - rebet);
 
-            let bakinm = nmsemasa - totalnilaimarhunseparuh;
+    let bakinm = nmsemasa - totalnilaimarhunseparuh;
 
-            let totalkurang = bayaranseparuhasal + (upah - rebet);
-            let tenpercentmarhun = bakinm * 0.1;
-            let tenpercentblock =  getRoundedMethod(tenpercentmarhun);
+    let totalkurang = bayaranseparuhasal + (upah - rebet);
+    let tenpercentmarhun = bakinm * 0.1;
+    let tenpercentblock =  getRoundedMethod(tenpercentmarhun);
 
 
-            var totalcalculate = ((total/bakinm)*100);
+    var totalcalculate = ((total/bakinm)*100);
 
-            if(byr < totalkurang){
-                let test = totalkurang - (upah + rebet);
+    if(byr < totalkurang){
+        let test = totalkurang - (upah + rebet);
 
-                let bakipjm = parseFloat($('#pinjaman').val().replace(/[^0-9.-]+/g,"")) - (bayaranseparuhasal);
-                totalcalculate = ((bakipjm/bakinm) * 100);
-                
-                $(e).val(formatter.format(totalkurang.toFixed(2)));
-                $('#bakipinjaman').val(formatter.format(bakipjm.toFixed(2)));
-                $('#basic-separuh').text(formatter.format(Number(totalcalculate.toFixed(2))));
-                return false;
-            }
-
-            if(total < tenpercentblock){
-                let temptotal = totaldibayar - tenpercentblock;
-                let tempbakipjm = $('#pinjaman').val().replace(/[^0-9.-]+/g,"") - (temptotal - upah + rebet);
-
-                totalcalculate = ((tempbakipjm/bakinm) * 100);
-                $(e).val(formatter.format(temptotal.toFixed(2)));
-                $('#bakipinjaman').val(formatter.format(tempbakipjm.toFixed(2)));
-                $('#basic-separuh').text(formatter.format(Number(totalcalculate.toFixed(2))));
-                return false;
-            }
-
-
-
-            $('#bakipinjaman').val(total.toFixed(2));
-            $('#basic-separuh').text(Number(totalcalculate.toFixed(2)));
-        }
+        let bakipjm = parseFloat($('#pinjaman').val().replace(/[^0-9.-]+/g,"")) - (bayaranseparuhasal);
+        totalcalculate = ((bakipjm/bakinm) * 100);
+        
+        $(e).val(formatter.format(totalkurang.toFixed(2)));
+        $('#bakipinjaman').val(formatter.format(bakipjm.toFixed(2)));
+        $('#basic-separuh').text(formatter.format(Number(totalcalculate.toFixed(2))));
+        return false;
     }
 
+    if(total < tenpercentblock){
+        let temptotal = totaldibayar - tenpercentblock;
+        let tempbakipjm = $('#pinjaman').val().replace(/[^0-9.-]+/g,"") - (temptotal - upah + rebet);
+
+        totalcalculate = ((tempbakipjm/bakinm) * 100);
+        $(e).val(formatter.format(temptotal.toFixed(2)));
+        $('#bakipinjaman').val(formatter.format(tempbakipjm.toFixed(2)));
+        $('#basic-separuh').text(formatter.format(Number(totalcalculate.toFixed(2))));
+        return false;
+    }
+
+
+
+    $('#bakipinjaman').val(total.toFixed(2));
+    $('#basic-separuh').text(Number(totalcalculate.toFixed(2)));
+  }
+}
+
+function kiraPerluDibayarSelepasDiskaun() {
+    var perluDibayar = parseFloat(document.getElementById("perludibayar").value.replace(/,/g, '')) || 0;
+    var diskaun = parseFloat(document.getElementById("jumlahDiskaun").value.replace(/,/g, '')) || 0;
+
+    var akhir = perluDibayar - diskaun;
+    document.getElementById("perludibayarAkhir").value = akhir.toFixed(2);
+}
     function bayartawarruq(e){
         var keuntungan = parseFloat($('#jumlahupah').val().replace(/[^0-9.-]+/g,""));
         var bayaran = parseFloat(e.value);
@@ -1805,129 +1815,8 @@
 
     let teller = "{{ Auth::user()->name }}";
 
-    async function getPampasanByNorujukan(norujukan) {
-        
-        const params = new URLSearchParams({
-            kodcaw: kodcaw,
-            status: 'all'
-        });
-        
-        try {
-            const pampasanListResponse = await fetch(`{{ config('api.url') }}/api/palsu/laporan?${params}`, {
-                method: 'GET',
-                headers: {
-                    'Content-Type': 'application/json',
-                    'Accept': 'application/json'
-                }
-            });
-            
-            if (!pampasanListResponse.ok) {
-                throw new Error(`HTTP error! status: ${pampasanListResponse.status}`);
-            }
-            
-            const pampasanListData = await pampasanListResponse.json();
-            const pampasanList = pampasanListData.filter(pampasan => pampasan.norujukan === norujukan);
-            const pampasan = pampasanList.length === 0 ? null : pampasanList.pop();
-            
-            return pampasan;
-            
-        } catch (error) {
-            console.error('Failed to fetch pampasan data:', error);
-            throw new Error("Something wrong with API");
-        }
-    }
-
-    // Helper function for safe money parsing
-    const safeMoneyParse = (value) => {
-        const parsed = parseFloat(value);
-        return isNaN(parsed) ? 0 : Math.round(parsed * 100) / 100; // Round to 2 decimal places
-    };
-
-    async function checkWangPetiBesiEnoughForTuntutanPampasan(pampasan) {
-        const currentDate = new Date().toISOString().split('T')[0];
-        let wangpetibesi = await fetch(api + '/api/TunaiDiTangan/' + kodcaw + '?tarikh=' + currentDate).then(response => response.json());
-
-        const nilaimarhun = safeMoneyParse(pampasan.nilaimarhun);
-        const pembiayaan = safeMoneyParse(pampasan.pembiayaan);
-        const untung = safeMoneyParse(pampasan.untung);
-        
-        const jumlahpampasan = safeMoneyParse(nilaimarhun - pembiayaan - untung);
-
-        const balancewangpetibesiafterdeduct = wangpetibesi - jumlahpampasan < 0 ? false : true; 
-
-        if(! balancewangpetibesiafterdeduct){
-            Swal.fire({
-                title: 'Peringatan',
-                html: `
-                    <p>Wang peti besi tidak mencukupi untuk proses tuntutan pampasan</p>
-                    <br>
-                    <div style="text-align: left; margin: 0 auto; display: inline-block;">
-                        <strong>Wang Peti Besi:</strong> RM ${formatter.format(wangpetibesi)}<br><br>
-                        <strong>Jumlah Diperlukan:</strong> RM ${formatter.format(jumlahpampasan)}<br><br>
-                        <strong>Kekurangan:</strong> <span style="color: red;">RM ${formatter.format(jumlahpampasan - wangpetibesi)}</span>
-                    </div>
-                `,
-                icon: 'warning'
-            });
-
-            return false;
-        }
-
-        return true;
-    }
-
-    async function bayaransemua()
+    function bayaransemua()
     {
-       // Instantiate pampasan using the JavaScript function
-       const pampasan = await getPampasanByNorujukan(norujukan);
-       
-       if(pampasan != null){
-        if(pampasan && !pampasan.hasOwnProperty('agreement_printed_at')){
-            Swal.fire({
-                title: 'Peringatan',
-                text: 'Sila print surat perjanjian',
-                icon: 'warning'
-            });
-            return; // Exit early if agreement not printed
-        }
-
-        const isEnough = await checkWangPetiBesiEnoughForTuntutanPampasan(pampasan);
-
-        if(! isEnough){
-            return;
-        }
-
-      }
-
-      if(pampasan != null){
-            const result = await Swal.fire({
-                title: 'Pengesahan Proses Tuntutan Pampasan',
-                html: `
-                    <div style="text-align: left; margin: 20px 0; min-width: 500px;">
-                        <p><strong>Sila pastikan wang untuk proses tuntutan pampasan adalah mencukupi.</strong></p>
-                        <br>
-                        <p style="color: #d33; font-weight: bold;">⚠️ Proses tidak dapat diundur</p>
-                        <p style="color: #d33;">⚠️ Short wang teller atau peti besi akan ditanggung oleh anda</p>
-                        <br>
-                        <p>Adakah anda ingin meneruskan proses ini?</p>
-                    </div>
-                `,
-                icon: 'question',
-                showCancelButton: true,
-                confirmButtonColor: '#3085d6',
-                cancelButtonColor: '#d33',
-                confirmButtonText: 'Ya, Teruskan',
-                cancelButtonText: 'Batal',
-                allowOutsideClick: false,
-                allowEscapeKey: false,
-                width: '600px'
-            });
-
-            if (!result.isConfirmed) {
-                return; // Exit if user cancels
-            }
-        }
-
         $("#terima_transaksi").prop('disabled', true);
         // Swal.fire({
         //     title: 'Memuatkan...',
@@ -2008,6 +1897,25 @@
                 jeniskeuntungan = "asal";
             }
 
+            //kira rebet diskaun
+            
+            // let diskaun
+            // if (pinjaman < 20000) {
+            //     diskaun = jumupah * 0.05;
+                
+            // } else if (pinjaman >= 20000 && pinjaman <= 50000) {
+            //     diskaun = jumupah * 0.10;
+                
+            // } else if (pinjaman > 50000 && pinjaman <= 100000) {
+            //     diskaun = jumupah * 0.15;
+                
+            // } else {
+            //     diskaun = jumupah * 0.20;
+                
+            // }
+
+            //$('#jumdiskaun').val(formatter.format(diskaun.toFixed(2)));
+
             var nopelanggan = "{{ $gadai['nopelanggan'] }}";
             var jenistebus = $('#sltjenistebus').find(":selected").val();
             var jbg = "{{ $gadai['tempoh'] }}";
@@ -2023,6 +1931,7 @@
             var nowakil = nw;
             var duitpelanggan = $('#duitPelanggan').val().replace(/[^0-9.-]+/g,"");
             var bakipelanggan =  $('#bakiPelanggan').val().replace(/[^0-9.-]+/g,"");
+            //var diskaun =  $('#diskaun').val().replace(/[^0-9.-]+/g,"");
 
 
             if(Number(duitpelanggan) < Number(bakipinjaman)){
@@ -2051,6 +1960,7 @@
                     "addpinjaman" : addpinjaman,
                     "bakipinjaman" : bakipinjaman,
                     "bakiupah" : bakiupah,
+                    //"diskaun": diskaun,
                     "historygadaian" : historygadaian,
                     "marhun" : marhun,
                     "nowakil" : nowakil,
@@ -2152,10 +2062,27 @@
 
             let hadbayaransuran = (parseFloat("{{ $gadai['nilaimarhun']}}") * 0.1);
 
+            //kira rebet diskaun
+            // let diskaun
+            // if (pinjaman < 20000) {
+            //     diskaun = jumupah * 0.05;
+                
+            // } else if (pinjaman >= 20000 && pinjaman <= 50000) {
+            //     diskaun = jumupah * 0.10;
+                
+            // } else if (pinjaman > 50000 && pinjaman <= 100000) {
+            //     diskaun = jumupah * 0.15;
+                
+            // } else {
+            //     diskaun = jumupah * 0.20;
+                
+            // }
+
             var bayar = Number(parseFloat($('#bayaran').val().replace(/[^0-9.-]+/g,"")).toFixed(2));
             var bakipinjam = parseFloat("{{ $gadai['bakipjm'] }}") - hadbayaransuran + jumupah;
             var duitpelanggan = parseFloat($('#duitPelanggan').val().replace(/[^0-9.-]+/g,""));
             var bakipelanggan = parseFloat($('#bakiPelanggan').val().replace(/[^0-9.-]+/g,""));
+            //var diskaun = parseFloat($('#diskaun').val().replace(/[^0-9.-]+/g,""));
 
             if(isNaN(duitpelanggan)) duitpelanggan = 0;
 
@@ -3377,7 +3304,7 @@
             ///////////
         }
 
-    
+    //Bayaran Semua function end file
     }
 
     function gadaiautotawarruq()
@@ -4639,6 +4566,7 @@ return true;
         };
     }(jQuery));
 
+
 </script>
 
 @endsection

resources/views/print/laporan_audittrail_operasi.blade.php

@@ -1,261 +0,0 @@
-<style>
-#header {
-  font-family: Arial, Helvetica, sans-serif;
-  border-collapse: collapse;
-  width: 100%;
-}
-
-#header td, #customers th {
- 
-  padding:4px;
-  font-size:10px;
-}
-
-#header tr:nth-child(even){background-color: #ffffff;}
-
-#header tr:hover {background-color: #ddd;}
-
-#header th {
-  padding-top: 12px;
-  padding-bottom: 12px;
-  text-align: left;
-  padding:4px;
-  color:black;
-}
-</style>
-
-
-
-<style>
-#scan {
-  font-family: Arial, Helvetica, sans-serif;
-  border-collapse: collapse;
-  width: 100%;
-}
-
-#scan td, #scan th {
- 
-  padding: 8px;
-  font-size:11px;
-}
-
-#scan tr:nth-child(even){background-color: #ffffff;}
-
-#scan tr:hover {background-color: #ddd;}
-
-#scan th {
-  padding-top: 12px;
-  padding-bottom: 12px;
-  text-align: left;
-  padding:4px;
-  color:black;
-}
-</style>
-
-
-<style>
-#scan {
-  font-family: Arial, Helvetica, sans-serif;
-  border-collapse: collapse;
-  width: 100%;
-}
-
-#scan td, #scan th {
-  border-collapse: collapse;
-  padding: 8px;
-  font-size:11px;
-}
-
-#scan tr:nth-child(even){background-color: #ffffff;}
-
-#scan tr:hover {background-color: #ddd;}
-
-#scan th {
-  border-collapse: collapse;
-  padding-top: 12px;
-  padding-bottom: 12px;
-  text-align: left;
-  padding:4px;
-  color:black;
-}
-</style>
-
-
-
-<style>
-#details {
-  font-family: Arial, Helvetica, sans-serif;
-  border-collapse: collapse;
-  width: 100%;
-}
-
-#details td, #details th {
- 
-  padding: 8px;
-  font-size:8px;
-}
-
-#details tr:nth-child(even){background-color: #ffffff;}
-
-#details tr:hover {background-color: #ddd;}
-
-#details th {
-  padding-top: 12px;
- font-style:bold;
-  padding-bottom: 12px;
-  text-align: left;
-  padding:4px;
-  color:black;
-}
-</style>
-
-<style>
-#sign {
-  font-family: Arial, Helvetica, sans-serif;
-  border-collapse: collapse;
-  width: 100%;
-}
-
-#sign td, #sign th {
-
-  padding: 8px;
-  font-size:11px;
-  text-align: center;
-}
-
-#sign tr:nth-child(even){background-color: #ffffff;}
-
-#sign tr:hover {background-color: #ddd;}
-
-#sign th {
-  padding-top: 12px;
-  padding-bottom: 12px;
-  text-align: left;
-  padding:4px;
-  color:black;
-}
-
-@media print {
-  .new-page {
-    page-break-before: always;
-  }
-}
-
-</style>
-
-
-
-
-
-
-
-
-<table id="header">
-  <tr>
-    {{-- <th rowspan="4"  style="width:50px"><br><img src="{{ asset('img/ARRAHN1.png') }}" style="width:70px"></img></th> --}}
-    <th colspan="1">KOPERASI PERMODALAN KELANTAN BERHAD</th>
-  </tr>
-  <tr>
-    <td style="font-size:20px;font-weight:bold;">{{ $cawangan_detail['namacaw'] }}</td>
-    <th colspan="1">{{ $cawangan_detail['namacaw'] }}</th>
-  </tr>
-  <tr>
-    <td>{{ $cawangan_detail['alamat1'] }}</td>
-    <td></td>
-  </tr>
-  <tr>
-    <td>{{ $cawangan_detail['alamat2'].' No Tel : '. $cawangan_detail['notel'].' No Faks : '. $cawangan_detail['nofaks'] }}</td>
-    <td></td>
-  </tr>
-</table>
-<br>
-
-<table id="scan">
-  <tr>
-    <th colspan ="5"><b>LAPORAN AUDIT TRAIL OPERASI (arOS V3)</b></th>
-    <th> </th>
-    <th> </th>
-    <th></th>
-  </tr>
-  <tr>
-    <th colspan="5"><b> TARIKH CETAK:</b>
-      @php 
-        $myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_cetak);
-        $formattedweddingdate = $myDateTime->format('d-m-Y');
-        echo($formattedweddingdate);
-      @endphp
-  </th>
-  <td> </td>
-  <td> </td>
-  <td> </td>
-  <td> </td>
-  <td> </td>
-  <td> </td>
-  </tr>
-  <tr>
-    <td style="width:20px"> <b>TARIKH MULA:</b></td>
-    <td>@php 
-          $myDateTime = DateTime::createFromFormat('Y-m-d', $date);
-          $formattedweddingdate = $myDateTime->format('d-m-Y');
-          echo($formattedweddingdate);
-        @endphp</td>
-    <td style="width:20px"> <b>HINGGA:</b></td>
-    <td>@php 
-          $myDateTime = DateTime::createFromFormat('Y-m-d', $date_till);
-          $formattedweddingdate = $myDateTime->format('d-m-Y');
-          echo($formattedweddingdate);
-        @endphp</td>
-    <td> </td>
-    <td> </td>
-    <td> </td>
-    <td> </td>
-  </tr>
-</table>
-
-<br>
-<table id="details">
-  <tr>
-    <th>Bil</th>
-    <th>Tarikh</th>
-    <th>Masa</th>
-    <th>Pengguna</th>
-    <th>Tindakan</th>
-    <th>Perbezaan</th>
-  </tr>
-  @php $counter = 1; @endphp
-  @foreach($audittrail as $index=>$item)
-    <tr>
-      <td>{{ $counter }}</td>
-      <td>{{ $item['tarikh'] }}</td>
-      <td>{{ $item['masa'] }}</td>
-      <td>{{ $item['users'] }}</td>
-      <td>{{ $item['actions'] }}</td>
-      <td>{{ $item['differ'] }}</td>
-    </tr>
-    @php $counter++;@endphp
-  @endforeach
-</table>
-<br><br>
-
-<br>
-<br><br><br>
-<table id="sign">
-  <tr>
-    <td></td>
-    <td colspan="2"> .................................................................. </td>
-    <td> </td>
-    <td colspan="2"> .................................................................. </td>
-    <td> </td>
-    <td colspan="2">.................................................................. </td>
-    <td> </td>
-  </tr>
-  <tr>
-    <td></td>
-    <td colspan="2"><B> Disediakan </B> </td>
-    <td></td>
-    <td colspan="2"><B> Disemak </B> </td>
-    <td> </td>
-    <td colspan="2"><B> Disahkan </B></td>
-    <td> </td>
-  </tr>
-</table>

resources/views/print/laporan_gadaian_ujrah.blade.php

@@ -230,6 +230,7 @@
         <th>Lain-Lain Caj (RM)</th>
         <th>Keuntungan 1% (RM)</th>
         <th>Keuntungan</th>
+        <th>Diskaun Rebet</th>
         <th>Peratus (%)</th>
       </tr>
       @php 
@@ -301,6 +302,7 @@
           <td>{{ number_format($item['ujrah']*12,2) }}</td>
           <td>{{ number_format($item['onepercent']*12,2) }}</td>
           <td>{{ number_format($item['upah12'],2) }}</td>
+          <td>{{ number_format($item['diskaun'],2) }}</td>
           <td>{{ $item['percentpinj'] }}</td>
         </tr>
         @php $counter++; @endphp

resources/views/print/laporan_kawalanstok.blade.php

@@ -471,21 +471,23 @@
     <tr style="font-weight:bold;">
       <td colspan="2">Baki</td>
       <td style="text-align: right;">
-        @php $totalbil1 = $gad1 - $teb1 - $lel1 /*- $ans1*/ - $hpk1; echo number_format($totalbil1);@endphp
+        @php $totalbil1 = $gad1 - $teb1 - $lel1 - $ans1 - $hpk1; echo number_format($totalbil1);@endphp
       </td>
       <td style="text-align: right;">
         @php $totalpinj1 = $gadpinj1 - $tebpinj1 - $lelpinj1 - $anspinj1 - $hpkpinj1; echo number_format($totalpinj1,2);@endphp
-
+        
       </td>
       <td style="text-align: right;">
-        @php $totalbil2 = $gad2 - $teb2 - $lel2 /*- $ans2*/ - $hpk2; echo number_format($totalbil2);@endphp
-
+        @php $totalbil2 = $gad2 - $teb2 - $lel2 - $ans2 - $hpk2; echo number_format($totalbil2);@endphp
+        
       </td>
       <td style="text-align: right;">
         @php $totalpinj2 = $gadpinj2 - $tebpinj2 - $lelpinj2 - $anspinj2 - $hpkpinj2; echo number_format($totalpinj2,2);@endphp
+        
       </td>
       <td style="text-align: right;">
-        @php $totalbil3 = $gad3 - $teb3 - $lel3 /*- $ans3*/ - $hpk3; echo number_format($totalbil3);@endphp
+        @php $totalbil3 = $gad3 - $teb3 - $lel3 = - $ans3 - $hpk3; echo number_format($totalbil3);@endphp
+        
       </td>
       <td style="text-align: right;">
         @php $totalpinj3 = $gadpinj3 - $tebpinj3 - $lelpinj3 - $anspinj3 - $hpkpinj3; echo number_format($totalpinj3,2);@endphp

resources/views/print/laporan_tebus_ujrah.blade.php

@@ -241,6 +241,7 @@
         <th>B.Pembiayaan(RM)</th>
         <th>Lain-Lain Caj (RM)</th>
         <th>Untung 1% (RM)</th>
+        <th>Diskaun Rebet (RM)</th>
         <th>Pendapatan(RM)</th>
         <th>Bayaran(RM)</th>
         <th>Jumlah(RM)</th>
@@ -254,6 +255,7 @@
         $totalupah = 0;
         $totalujrah = 0;
         $totalonepercent = 0;
+        $totaldiskaunrebate = 0;
     @endphp
 
     @foreach ($tebus as $index => $item)
@@ -266,6 +268,7 @@
             $totalnm += $item['nilaimarhun'];
             $totalujrah += $item['ujrah'];
             $totalonepercent += $item['onepercent'];
+            $totaldiskaunrebate += $item['diskaun_rebate'];
 
         @endphp
 
@@ -282,6 +285,7 @@
                     $totalbayaranteller = 0;
                     $totalujrahteller = 0;
                     $totalonepercentteller = 0;
+                    $totaldiskaunrebateteller = 0;
                 @endphp
             @endif
         @else
@@ -297,6 +301,7 @@
                 $totaljumlahteller = 0;
                 $totalujrahteller = 0;
                 $totalonepercentteller = 0;
+                $totaldiskaunrebateteller = 0;
             @endphp
         @endif
 
@@ -337,6 +342,7 @@
             <td>{{ number_format($item['ujrah'], 2) }}</td>
             <td>{{ number_format($item['onepercent'], 2) }}</td>
             {{-- <td>{{ number_format($item['bakiupah'], 2) }}</td> --}}
+            <td>{{ number_format($item['diskaun_rebate'], 2) }}</td>
             <td>
               @php
                   if ($item['tagbaru']) {
@@ -371,6 +377,7 @@
             $totalbayaranteller += $item['bakipjm']; //
             $totalujrahteller += $item['ujrah'];
             $totalonepercentteller += $item['onepercent'];
+            $totaldiskaunrebateteller += $item['diskaun_rebate'];
         @endphp
 
         @php
@@ -388,6 +395,7 @@
                     <td><b>{{ number_format($totalpinjamanteller, 2) }} </b></td>
                     <td><b>{{ number_format($totalujrahteller, 2) }} </b></td>
                     <td><b>{{ number_format($totalonepercentteller, 2) }} </b></td>
+                    <td><b>{{ number_format($totaldiskaunrebateteller, 2) }} </b></td>
                     <td><b>{{ number_format($totalupahteller, 2) }} </b></td>
                     <td><b>{{ number_format($totalbayaranteller, 2) }} </b></td>
                     <td><b>{{ number_format($totaljumlahteller, 2) }} </b></td>
@@ -402,6 +410,7 @@
                     $totaljumlahteller = 0;
                     $totalujrahteller = 0;
                     $totalonepercentteller = 0;
+                    $totaldiskaunrebateteller = 0;
                 @endphp
             @endif
         @else
@@ -412,6 +421,7 @@
                 <td><b>{{ number_format($totalpinjamanteller, 2) }} </b></td>
                 <td><b>{{ number_format($totalujrahteller, 2) }} </b></td>
                 <td><b>{{ number_format($totalonepercentteller, 2) }} </b></td>
+                <td><b>{{ number_format($totaldiskaunrebateteller, 2) }} </b></td>
                 <td><b>{{ number_format($totalupahteller, 2) }} </b></td>
                 <td><b>{{ number_format($totalbayaranteller, 2) }} </b></td>
                 <td><b>{{ number_format($totaljumlahteller, 2) }} </b></td>
@@ -440,12 +450,9 @@
         <td>{{ number_format($totalnm, 2) }}</td>
         <td>{{ number_format($totalpinjamanasal, 2) }}</td>
         <td>{{ number_format($totalpinjaman, 2) }}</td>
-        <td>
-            @php
-                $totalkeuntunganrebet = $totalpinjaman + $totalupah - $totalbayaran;
-                echo number_format($totalkeuntunganrebet, 2);
-            @endphp
-        </td>
+        <td>@php$totalkeuntunganrebet = $totalpinjaman + $totalupah - $totalbayaran;
+                        echo number_format($totalkeuntunganrebet, 2);
+                @endphp ?></td>
         <td>{{ number_format($totalujrah, 2) }}</td>
         <td>{{ number_format($totalonepercent, 2) }}</td>
         <td>{{ number_format($totalupah, 2) }}</td>

resources/views/print/laporan_tuntutbaki.blade.php

@@ -231,7 +231,7 @@
       <td>
         @php
             // $gadaidetail = Http::withOptions(['verify' => config('app.api_verify')])->get($api_url . '/api/gadai/norujukan/' . $item['norujukan'])->json();
-            $gadaidetail = Http::withOptions(['verify' => config('app.api_verify')])->get($api_url . '/api/gadai/norujukan/' . $item['kodcaw'] . '/' . $item['norujukan'])->json();
+            $gadaidetail = Http::withOptions(['verify' => config('app.api_verify')])->get($api_url . '/api/gadai/norujukankodcaw/' . $item['kodcaw'] . '/' . $item['norujukan'])->json();
             $customer_detail = Http::withOptions(['verify' => config('app.api_verify')])->get($api_url . '/api/customers/' . $gadaidetail[0][0]['nokp'])->json();
             echo $customer_detail['nama'];
         @endphp

resources/views/print/notistuntutbaki.blade.php

@@ -137,10 +137,6 @@
       <td style="vertical-align:top;">{{ $cawangan_detail['alamat2'] }}</td>
       <td></td>
     </tr>
-    <tr>
-      <td style="vertical-align:top;">{{ $cawangan_detail['alamat3'] }}</td>
-      <td></td>
-    </tr>
     <tr>
       <td style="vertical-align:top;">{{ ' No Tel : '. $cawangan_detail['notel'] . ' No Faks : '. $cawangan_detail['nofaks'] }}</td>
       <td></td>

resources/views/print/resit/resitpampasan.blade.php

@@ -1,258 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-    <title>Resit Pampasan</title>
-    <style>
-        body {
-            font-family: Arial, sans-serif;
-            font-size: 14px;
-        }
-
-        .resit {
-            width: 700px;
-            margin: 0 auto;
-            border: 1px solid #000;
-            padding: 20px;
-        }
-
-        .header {
-            display: flex;
-            align-items: center;
-            justify-content: space-between;
-            margin-bottom: 20px;
-        }
-
-        .header-left {
-            display: flex;
-            align-items: center;
-            gap: 10px;
-        }
-
-        .header img {
-            height: 20px;
-        }
-
-        .header .tag {
-            border: 1px solid #000;
-            padding: 5px 12px;
-            font-size: 14px;
-            font-weight: bold;
-            background: #f9f9f9;
-        }
-
-        h2 {
-            text-align: right;
-            margin-bottom: 10px;
-        }
-
-        .panel {
-            border-top: 1px dashed #000;
-            margin-top: 30px;
-            padding-top: 20px;
-        }
-
-        table {
-            width: 100%;
-            border-collapse: collapse;
-            margin-top: 10px;
-        }
-
-        td {
-            padding: 6px;
-        }
-
-        .label {
-            width: 200px;
-            font-weight: bold;
-        }
-
-        .signature {
-            margin-top: 40px;
-            display: flex;
-            justify-content: space-between;
-        }
-
-        .signature div {
-            text-align: center;
-            width: 45%;
-        }
-
-        .footer {
-            margin-top: 20px;
-            text-align: center;
-            font-size: 12px;
-        }
-
-        .pelanggan-info {
-            text-align: center;
-            margin-bottom: 20px;
-        }
-
-        .center-table {
-            margin: 0 auto;
-            text-align: left;
-            width: fit-content;
-        }
-
-        .bayaran-info {
-            margin-top: 20px;
-        }
-
-        .jumlah-row {
-            margin-top: 20px;
-        }
-
-        .jumlah-row td {
-            padding-top: 15px;
-            font-weight: bold;
-            text-decoration: underline;
-        }
-    </style>
-</head>
-
-<body onload="window.print()">
-    <div class="resit">
-
-        <div class="header">
-            <div class="header-left">
-                <img src="{{ asset('img/kopkb.png') }}" alt="Logo KOPPKB">
-                <img src="{{ asset('img/ARRAHN1.png') }}" alt="Logo Ar-Rahn">
-            </div>
-            <span class="tag">Resit Pampasan</span>
-            <span class="tag">Untuk Kegunaan Pelanggan</span>
-        </div>
-
-        <div class="pelanggan-info">
-            <table class="center-table">
-                <tr>
-                    <td class="label">Nama:</td>
-                    <td>{{ $customer_info['nama'] }}</td>
-                </tr>
-                <tr>
-                    <td class="label">No. KP:</td>
-                    <td>{{ $gadai_info['nokp'] }}</td>
-                </tr>
-                <tr>
-                    <td class="label">No. SAG:</td>
-                    <td>{{ $pampasan['norujukan'] }}</td>
-                </tr>
-                <tr>
-                    <td class="label">Tarikh Tuntutan:</td>
-                    <td>{{ \Carbon\Carbon::parse($pampasan['created_at'])->format('d/m/Y') }}</td>
-                </tr>
-            </table>
-        </div>
-
-        <div class="bayaran-info">
-            <table class="center-table">
-                <tr>
-                    <td class="label">Nilai Marhun:</td>
-                    <td>RM {{ number_format($pampasan_info['nilaimarhun'], 2) }}</td>
-                </tr>
-                <tr>
-                    <td class="label">(-) Baki Pembiayaan:</td>
-                    <td>RM {{ number_format($pampasan_info['pembiayaan'], 2) }}</td>
-                </tr>
-                <tr>
-                    <td class="label">(-) Keuntungan:</td>
-                    <td>RM {{ number_format($pampasan_info['untung'], 2) }}</td>
-                </tr>
-                <tr class="jumlah-row">
-                    <td class="label"><strong>JUMLAH PAMPASAN</strong></td>
-                    <td><strong>RM {{ number_format($pampasan['jumlah_pampasan'], 2) }}</strong></td>
-                </tr>
-            </table>
-        </div>
-        <div class="signature">
-            <div>
-                <p>__________________________</p>
-                <p>PELANGGAN</p>
-                <p>{{ $customer_info['nama'] }}</p>
-            </div>
-            <div>
-                <p>__________________________</p>
-                <p>AR-RAHN</p>
-                <p>{{ auth()->user()->name }}</p>
-            </div>
-        </div>
-
-        <div class="panel">
-            <div class="header">
-                <div class="header-left">
-                    <img src="{{ asset('img/kopkb.png') }}" alt="Logo KOPPKB">
-                    <img src="{{ asset('img/ARRAHN1.png') }}" alt="Logo Ar-Rahn">
-                </div>
-                <span class="tag">Resit Pampasan</span>
-                <span class="tag">Untuk Kegunaan Pejabat</span>
-            </div>
-
-            <div class="pelanggan-info">
-                <table class="center-table">
-                    <tr>
-                        <td class="label">Nama:</td>
-                        <td>{{ $customer_info['nama'] }}</td>
-                    </tr>
-                    <tr>
-                        <td class="label">No. KP:</td>
-                        <td>{{ $gadai_info['nokp'] }}</td>
-                    </tr>
-                    <tr>
-                        <td class="label">No. SAG:</td>
-                        <td>{{ $pampasan['norujukan'] }}</td>
-                    </tr>
-                    <tr>
-                        <td class="label">Tarikh Tuntutan:</td>
-                        <td>{{ \Carbon\Carbon::parse($pampasan['created_at'])->format('d/m/Y') }}</td>
-                    </tr>
-                </table>
-            </div>
-            <div class="bayaran-info">
-                <table class="center-table">
-                    <tr>
-                        <td class="label">Nilai Marhun:</td>
-                        <td>RM {{ number_format($pampasan_info['nilaimarhun'], 2) }}</td>
-                    </tr>
-                    <tr>
-                        <td class="label">(-) Baki Pembiayaan:</td>
-                        <td>RM {{ number_format($pampasan_info['pembiayaan'], 2) }}</td>
-                    </tr>
-                    <tr>
-                        <td class="label">(-) Keuntungan:</td>
-                        <td>RM {{ number_format($pampasan_info['untung'], 2) }}</td>
-                    </tr>
-                    <tr class="jumlah-row">
-                        <td class="label"><strong>JUMLAH PAMPASAN</strong></td>
-                        <td><strong>RM {{ number_format($pampasan['jumlah_pampasan'], 2) }}</strong></td>
-                    </tr>
-                </table>
-            </div>
-            <div class="signature">
-                <div>
-                    <p>__________________________</p>
-                    <p>PELANGGAN</p>
-                    <p>{{ $customer_info['nama'] }}</p>
-                </div>
-                <div>
-                    <p>__________________________</p>
-                    <p>AR-RAHN</p>
-                    <p>{{ auth()->user()->name }}</p>
-                </div>
-            </div>
-        </div>
-
-    </div>
-</body>
-
-</html>
-
-<script>
-    window.onload = function() {
-        window.print();
-    };
-
-    window.onafterprint = function() {
-
-        window.location.href = "{{ url('/panjar') }}";
-    };
-</script>

resources/views/print/resittebus_ujrah.blade.php

@@ -629,29 +629,35 @@
             </tr>
             <tr>
                 <td style="width:10px">Keuntungan</td>
-                <td style="width:10px">: RM {{ number_format($transaction_tebus['onepercent'],2) }}</td>
+                <td style="width:10px">: RM {{ number_format($penebusan['onepercent'], 2) }}</td>
             </tr>
             <tr>
                 <td style="width:10px">(-) Rebat Untung</td>
                 <td style="width:10px">: RM
-                    {{ number_format($keuntungan_rebate,2) }}
+                    {{ number_format($totalrebate['onepercent'], 2) }}
                 </td>
             </tr>
             <tr>
                 <td style="width:10px">Lain-Lain Caj</td>
-                <td style="width:10px">: RM {{ number_format($transaction_tebus['ujrah'],2) }} </td>
+                <td style="width:10px">: RM {{ number_format($penebusan['ujrah'], 2) }} </td>
             </tr>
             <tr>
                 <td style="width:10px">(-) Rebat Lain-Lain Caj</td>
                 <td style="width:10px">: RM
-                    {{ number_format($ujrah_rebate, 2) }} </td>
+                    {{ number_format($totalrebate['ujrah'], 2) }} </td>
             </tr>
+              
             <tr>
                  <td style="width:10px">Jumlah Keuntungan + Lain-Lain Caj</td>
                  <td style="width:10px">: <strong>RM
                     {{ number_format($penebusan['onepercent'] + $penebusan['ujrah'], 2) }}</strong> 
                 </td>
             </tr>
+            <tr>
+                <td style="width:10px">(-) Diskaun Promosi</td>
+                <td style="width:10px">: RM
+                    {{ number_format($gadai['diskaun'], 2) }} </td>
+            </tr>
             <tr>
                 <td></td>
             </tr>
@@ -862,29 +868,35 @@
             </tr>
             <tr>
                 <td style="width:10px">Keuntungan</td>
-                <td style="width:10px">: RM {{ number_format($transaction_tebus['onepercent'], 2) }}</td>
+                <td style="width:10px">: RM {{ number_format($penebusan['onepercent'], 2) }}</td>
             </tr>
             <tr>
                 <td style="width:10px">(-) Rebat Untung</td>
                 <td style="width:10px">: RM
-                    {{ number_format($keuntungan_rebate, 2) }}
+                    {{ number_format($totalrebate['onepercent'], 2) }}
                 </td>
             </tr>
             <tr>
                 <td style="width:10px">Lain-Lain Caj</td>
-                <td style="width:10px">: RM {{ number_format($transaction_tebus['ujrah'], 2) }} </td>
+                <td style="width:10px">: RM {{ number_format($penebusan['ujrah'], 2) }} </td>
             </tr>
             <tr>
                 <td style="width:10px">(-) Rebat Lain-Lain Caj</td>
                 <td style="width:10px">: RM
-                    {{ number_format($ujrah_rebate, 2) }} </td>
+                    {{ number_format($totalrebate['ujrah'], 2) }} </td>
             </tr>
+            
             <tr>
                  <td style="width:10px">Jumlah Keuntungan + Lain-Lain Caj</td>
                  <td style="width:10px">: <strong>RM
                     {{ number_format($penebusan['onepercent'] + $penebusan['ujrah'], 2) }}</strong> 
                 </td>
             </tr>
+            <tr>
+                <td style="width:10px">(-) Diskaun Promosi</td>
+                <td style="width:10px">: RM
+                    {{ number_format($gadai['diskaun'], 2) }} </td>
+            </tr>
             <tr>
                 <td></td>
             </tr>

resources/views/print/sag_ujrah_3.blade.php

@@ -655,7 +655,7 @@
             </table>
             <table class="main-table text-center" style="border-top: none !important">
                 <tr>
-                    <th colspan="5">JUMLAH KEUNTUNGAN DAN LAIN-LAIN CAJ BERDASARKAN TEMPOH PEMBIAYAAN</th>
+                    <th colspan="5">JUMLAH KEUNTUNGAN BERDASARKAN TEMPOH PEMBIAYAAN</th>
                 </tr>
                 <tr>
                     <th>TEMPOH PEMBIAYAAN</th>
@@ -670,13 +670,13 @@
                     <td>{{ $formatted_t_matang_1 }}</td>
                 </tr>
                 <tr>
-                    <th class="text-left">JUMLAH KEUNTUNGAN (1%) DAN LAIN-LAIN CAJ YANG PERLU DIBAYAR</th>
+                    <th class="text-left">JUMLAH KEUNTUNGAN YANG PERLU DIBAYAR</th>
                     <td style="font-size:12px"><b>RM{{ number_format($gadai_detail['bakiupah'] / 6, 2) }}</b></td>
                     <td style="font-size:12px"><b>RM{{ number_format($gadai_detail['bakiupah'], 2) }}</b></td>
                     <td>RM{{ number_format($gadai_detail['bakiupah'], 2) }}</td>
                 </tr>
                 <tr>
-                    <th class="text-left">JUMLAH KEUNTUNGAN (1%) DAN LAIN-LAIN CAJ TERKUMPUL<br> SEPANJANG TEMPOH
+                    <th class="text-left">JUMLAH KEUNTUNGAN TERKUMPUL<br> SEPANJANG TEMPOH
                         PEMBIAYAAN
                     </th>
                     <td>-</td>
@@ -717,7 +717,7 @@
                                 <tr>
                                     <td colspan="4">
                                         Pelanggan bersetuju dan dengan ini menggadaikan Marhun sebagai cagaran kepada
-                                        Jumlah Pembiayaan termasuk Jumlah Keuntungan dan Lain-Lain Caj Terkumpul
+                                        Jumlah Pembiayaan termasuk Jumlah Keuntungan Terkumpul
                                         mengikut
                                         syarat-syarat pembiayaan dalam SAG ini. KoPKB dengan ini menerima gadaian Marhun
                                         tersebut.
@@ -731,14 +731,12 @@
                         <td style="vertical-align: top">
                             <table class="akad-table">
                                 <tr>
-                                    <td colspan="4"><b><u>AKAD (SIMPAN MARHUN)</u></b></td>
+                                    <td colspan="4"><b><u>KADAR KEUNTUNGAN BULANAN</u></b></td>
                                 </tr>
                                 <tr>
                                     <td colspan="4">
-                                        Pelanggan dengan ini bersetuju marhun disimpan oleh KoPKB dan bersetuju membayar
-                                        lain-lain caj
-                                        sebagaimana jadual dibawah bagi setiap
-                                        RM100.00 Jumlah Marhun Keseluruhan:
+                                        Kadar keuntungan Pembiayaan Ar-Rahn Tawarruq adalah berdasarkan jumlah
+                                        pembiayaan seperti berikut :
                                     </td>
                                 </tr>
                             </table>
@@ -746,35 +744,35 @@
                                 <table class="main-table text-center"
                                     style="font-size: 9px; width: 100%; margin-top: 5px;">
                                     <tr>
-                                        <th>KADAR LAIN-LAIN CAJ / RM100</th>
+                                        <th>KADAR KEUNTUNGAN SEBULAN (%)</th>
                                     </tr>
                                     <tr>
-                                        <td>RM{{ $kadar_ujrah[0]['kadarujrah'] }}/sebulan</td>
+                                        <td>1.00</td>
                                     </tr>
                                 </table>
                             @else
                                 <table class="main-table text-center"
                                     style="font-size: 9px; width: 100%; margin-top: 5px;">
                                     <tr>
-                                        <th>NILAI MARHUN KESELURUHAN</th>
+                                        <th>JUMLAH PEMBIAYAAN</th>
                                         <th></th>
-                                        <th>KADAR LAIN-LAIN CAJ / RM100</th>
+                                        <th>KADAR KEUNTUNGAN SEBULAN (%)</th>
                                     </tr>
                                     <tr>
                                         <td>
                                             < RM400.99</td>
                                         <td>-</td>
-                                        <td>RM{{ $kadar_ujrah[0]['kadarujrah'] }}/sebulan</td>
+                                        <td>{{ $kadar_ujrah[0]['kadarupdah'] }}</td>
                                     </tr>
                                     <tr>
                                         <td>RM401.00 - RM2000.99</td>
                                         <td>-</td>
-                                        <td>RM{{ $kadar_ujrah[1]['kadarujrah'] }}/sebulan</td>
+                                        <td>{{ $kadar_ujrah[1]['kadarupdah'] }}</td>
                                     </tr>
                                     <tr>
                                         <td>> RM2001.00</td>
                                         <td>-</td>
-                                        <td>RM{{ $kadar_ujrah[2]['kadarujrah'] }}/sebulan</td>
+                                        <td>{{ $kadar_ujrah[2]['kadarupdah'] }}</td>
                                     </tr>
                                 </table>
                             @endif
@@ -829,15 +827,15 @@
                                 <tr>
                                     <td></td>
                                     <td>e.</td>
-                                    <td colspan="2">Membayar Jumlah Pembiayaan termasuk Jumlah Keuntungan dan
-                                        Lain-Lain Caj Terkumpul yang diberi mengikut dalam tempoh seperti di SAG ini;
+                                    <td colspan="2">Membayar Jumlah Pembiayaan termasuk Jumlah Keuntungan yang diberi
+                                        mengikut dalam tempoh seperti di SAG ini;
                                     </td>
                                 </tr>
                                 <tr>
                                     <td></td>
                                     <td>f.</td>
                                     <td colspan="2">Tertakluk kepada pembayaran penuh Jumlah Pembiayaan termasuk
-                                        Jumlah Keuntungan dan Lain-Lain Caj Terkumpul, Pelanggan perlu hadir sendiri
+                                        Jumlah Keuntungan Terkumpul, Pelanggan perlu hadir sendiri
                                         menyelesaikan Pembiayaan;</td>
                                 </tr>
                                 <tr>
@@ -1066,8 +1064,7 @@
                                 <td colspan="1"></td>
                                 <td colspan="1">o.</td>
                                 <td colspan="2">KoPKB berhak menuntut Jumlah Pembiayaan termasuk Jumlah Keuntungan
-                                    dan
-                                    Lain-Lain Caj Terkumpul setelah tamat tempoh yang dinyatakan pada notis berkaitan;
+                                    setelah tamat tempoh yang dinyatakan pada notis berkaitan;
                                 </td>
                             </tr>
                             <tr>
@@ -1148,7 +1145,7 @@
                             </tr>
                             <tr>
                                 <td colspan="1"></td>
-                                <td colspan="1">v.</td>
+                                <td colspan="1">u.</td>
                                 <td colspan="2">Jika berlaku kehilangan SAG ini, KoPKB hanya boleh mengeluarkan
                                     salinan
                                     yang disahkan,
@@ -1159,7 +1156,7 @@
                             </tr>
                             <tr>
                                 <td colspan="1"></td>
-                                <td colspan="1">w.</td>
+                                <td colspan="1">v.</td>
                                 <td colspan="2">SAG ini sah diperlakukan sepanjang tempoh matang (daripada tarikh
                                     pembiayaan
                                     sehingga tempoh matang) atau sehingga tempoh lanjutan (sekiranya layak) dan;
@@ -1167,7 +1164,7 @@
                             </tr>
                             <tr>
                                 <td colspan="1"></td>
-                                <td colspan="1">x.</td>
+                                <td colspan="1">w.</td>
                                 <td colspan="2">KoPKB berhak mengubah, mengubahsuai, menambah atau mengeluarkan
                                     terma
                                     dan syarat ini atau
@@ -1212,8 +1209,7 @@
                                 <td colspan="1">a.</td>
                                 <td colspan="2">Marhun akan dilelong atau dijual. KoPKB akan membatalkan
                                     lelongan Marhun sekiranya Pelanggan membayar tunggakan Jumlah Pembiayaan
-                                    termasuk Jumlah Keuntungan dan
-                                    Lain-Lain Caj
+                                    termasuk Jumlah Keuntungan
                                     sepenuhnya tiga (3) hari sebelum tarikh lelongan;</td>
                             </tr>
                             <tr>
@@ -1233,7 +1229,7 @@
                                 <td colspan="1">c.</td>
                                 <td colspan="2">Sebarang lebihan hasil lelongan atau jualan (jika ada) setelah
                                     ditolak
-                                    Jumlah Pembiayaan termasuk Jumlah Keuntungan dan Lain-Lain Caj Terkumpul
+                                    Jumlah Pembiayaan termasuk Jumlah Keuntungan Terkumpul
                                     yang tertunggak dan kos-kos berkaitan akan
                                     dikembalikan
                                     kepada Pelanggan dan;</td>
@@ -1264,7 +1260,7 @@
                                 <td>=</td>
                                 <td><b>BAKI TEMPOH PEMBIAYAAN <br></td>
                                 <td>X</td>
-                                <td><b>JUMLAH KEUNTUNGAN 1% DAN LAIN-LAIN CAJ YANG PERLU DIBAYAR</b></td>
+                                <td><b>JUMLAH KEUNTUNGAN YANG PERLU DIBAYAR</b></td>
                             </tr>
                         </table>
                         <br>
@@ -1280,7 +1276,7 @@
                                 <td colspan="1"></td>
                                 <td colspan="1">a.</td>
                                 <td colspan="2">Pelanggan gagal dan/ingkar menjelaskan Jumlah Pembiayaan,
-                                    Jumlah Keuntungan dan Lain-Lain Caj Terkumpul pada tarikh yang ditetapkan;
+                                    Jumlah Keuntungan Terkumpul pada tarikh yang ditetapkan;
                                 </td>
                             </tr>
                             <tr>
@@ -1306,6 +1302,45 @@
                             <tr>
                                 <td colspan="1"></td>
                                 <td colspan="1"><b>6.</b></td>
+                                <td colspan="2"><b>Pelanggan dengan ini bersetuju, memberi kuasa dan melantik
+                                        Ar-Rahn sebagai wakil (wakil di bawah prinsip Wakalah) untuk menguruskan baki
+                                        hasil lelongan yang menjadi hak Pelanggan,
+                                        sekiranya ada, yang bernilai RM10.00 (Ringgit Malaysia: Sepuluh) atau kurang,
+                                        dan tidak dituntut oleh Pelanggan dalam tempoh tuntutan yang ditetapkan oleh
+                                        Ar-Rahn setelah usaha munasabah telah diambil untuk memaklumkan kepada
+                                        Pelanggan.</b></td>
+                            </tr>
+                            <tr>
+                                <td colspan="1"></td>
+                                <td colspan="1"><b>7.</b></td>
+                                <td colspan="2">
+                                    <b>
+                                        Pelanggan selanjutnya bersetuju bahawa baki hasil lelongan tersebut boleh
+                                        disalurkan oleh Ar-Rahn, bagi pihak Pelanggan, sebagai infaq kepada mana-mana
+                                        institusi agama Islam, badan kebajikan atau institusi lain yang diluluskan
+                                        oleh Jawatankuasa Syariah dan/atau pihak berkuasa yang berkaitan, tanpa
+                                        sebarang liabiliti ke atas Ar-Rahn selepas penyaluran tersebut dibuat dengan
+                                        jumlah tidak melebihi RM10.00.
+                                    </b>
+
+                                    <div style="margin-top: 8px;">
+                                        <span
+                                            style="
+                display: inline-block;
+                width: 13px;
+                height: 13px;
+                border: 1px solid #000;
+                margin-right: 6px;
+                vertical-align: middle;
+            "></span>
+                                        <b>Tandakan (✓) jika tidak bersetuju.</b>
+                                    </div>
+                                </td>
+                            </tr>
+
+                            <tr>
+                                <td colspan="1"></td>
+                                <td colspan="1"><b>8.</b></td>
                                 <td colspan="2"><b>Sekiranya Pelanggan mempunyai sebarang pertanyaan atau
                                         aduan, Pelanggan boleh menghubungi KoPKB sebagaimana berikut:</b></td>
                             </tr>
@@ -1713,6 +1748,7 @@
             {{-- MARHUN DETAIL SECTION --}}
             <div class="main-marhun">
                 <table class="main-table text-center" style="width: 75%">
+
                     <tr>
                         <th>BIL</th>
                         <th>JENIS MARHUN</th>
@@ -1846,7 +1882,7 @@
             </table>
             <table class="main-table text-center" style="border-top: none !important">
                 <tr>
-                    <th colspan="5">JUMLAH KEUNTUNGAN DAN LAIN-LAIN CAJ BERDASARKAN TEMPOH PEMBIAYAAN</th>
+                    <th colspan="5">JUMLAH KEUNTUNGAN BERDASARKAN TEMPOH PEMBIAYAAN</th>
                 </tr>
                 <tr>
                     <th>TEMPOH PEMBIAYAAN</th>
@@ -1861,19 +1897,27 @@
                     <td>{{ $formatted_t_matang_1 }}</td>
                 </tr>
                 <tr>
-                    <th class="text-left">JUMLAH KEUNTUNGAN DAN LAIN-LAIN CAJ YANG PERLU DIBAYAR BULANAN</th>
+                    <th class="text-left">JUMLAH KEUNTUNGAN YANG PERLU DIBAYAR BULANAN</th>
                     <td style="font-size:12px"><b>RM{{ number_format($gadai_detail['bakiupah'] / 6, 2) }}</b></td>
                     <td style="font-size:12px"><b>RM{{ number_format($gadai_detail['bakiupah'], 2) }}</b></td>
                     <td>RM {{ number_format($gadai_detail['bakiupah'], 2) }}</td>
                 </tr>
                 <tr>
-                    <th class="text-left">JUMLAH KEUNTUNGAN DAN LAIN-LAIN CAJ TERKUMPUL <br> SEPANJANG TEMPOH
+                    <th class="text-left">JUMLAH KEUNTUNGAN TERKUMPUL <br> SEPANJANG TEMPOH
                         PEMBIAYAAN</th>
                     <td>-</td>
                     <td>RM{{ number_format($gadai_detail['bakiupah'], 2) }}</td>
                     <td>RM{{ number_format($gadai_detail['upah12'], 2) }}</td>
                 </tr>
             </table>
+
+            <div style="color: black; font-weight: bold; margin-top: 0px; width: 100%;"> 
+                <span>PENGURUSAN HASIL LELONGAN YANG TIDAK DITUNTUT</span>
+
+                <span>
+                    <input type="checkbox" name="hasil_lelongan_tidak_dituntut">
+                </span>
+            </div>
             {{-- SIGNATURE SECTION --}}
             <table class="main-table mt-10">
                 <tr>
@@ -2138,8 +2182,8 @@
                                     </td>
                                 </tr>
                                 <tr>
-                                     <td style="width: 50px;">Nama:</td>
-                                     <td>
+                                    <td style="width: 50px;">Nama:</td>
+                                    <td>
                                         {{ $customer_detail['nama'] }}
                                     </td>
                                 </tr>
@@ -2171,12 +2215,12 @@
                                 </tr>
                                 <tr>
                                     <td style="width: 50px;">Nama:</td>
-                                        <td>
-                                            @if ($gadai_detail['penilai'] == '')
-                                                {{ $auth_username }}
-                                            @else
-                                                {{ $gadai_detail['penilai'] }}
-                                            @endif
+                                    <td>
+                                        @if ($gadai_detail['penilai'] == '')
+                                            {{ $auth_username }}
+                                        @else
+                                            {{ $gadai_detail['penilai'] }}
+                                        @endif
                                     </td>
                                 </tr>
                                 <tr>

resources/views/print/surat_pampasan.blade.php

@@ -1,278 +0,0 @@
-<!DOCTYPE html>
-<html lang="ms">
-
-<head>
-    <meta charset="utf-8">
-    <title>Surat Pampasan</title>
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-
-    <style>
-        @page {
-            size: A4;
-            margin: 20mm;
-        }
-
-        * {
-            box-sizing: border-box;
-        }
-
-        body {
-            margin: 0;
-            font-family: "Times New Roman", Times, serif;
-            color: #000;
-        }
-
-        .page {
-            width: 210mm;
-            min-height: 257mm;
-            margin: 0 auto;
-            position: relative;
-        }
-
-        .header {
-            text-align: center;
-            line-height: 1.4;
-            margin-bottom: 8mm;
-        }
-
-        .header .org-name {
-            font-weight: bold;
-            text-transform: uppercase;
-        }
-
-        .title {
-            text-align: center;
-            font-weight: bold;
-            text-transform: uppercase;
-            margin: 2mm 0 4mm;
-            font-size: 16px;
-            text-decoration: underline;
-        }
-
-        .claim-no {
-            text-align: center;
-            margin: 2mm 0 6mm;
-        }
-
-        .claim-no .label {
-            text-transform: uppercase;
-            font-weight: bold;
-        }
-
-        .content {
-            font-size: 12pt;
-            line-height: 1.65;
-            text-align: justify;
-        }
-
-        .content b {
-            font-weight: bold;
-        }
-
-        .content .emph {
-            font-weight: bold;
-            text-transform: uppercase;
-        }
-
-        .mt-2 {
-            margin-top: 2mm;
-        }
-
-        .mt-4 {
-            margin-top: 4mm;
-        }
-
-        .mt-8 {
-            margin-top: 8mm;
-        }
-
-        .mt-12 {
-            margin-top: 12mm;
-        }
-
-        .date-row {
-            margin-top: 8mm;
-        }
-
-        .line {
-            display: inline-block;
-            border-bottom: 1px solid #000;
-            width: 65mm;
-            height: 8mm;
-            vertical-align: bottom;
-            margin-left: 2mm;
-            margin-right: 6mm;
-        }
-
-        .signatures {
-            display: flex;
-            gap: 10mm;
-            margin-top: 12mm;
-        }
-
-        .sig-col {
-            width: 50%;
-            text-align: center;
-        }
-
-        .sig-line {
-            border-bottom: 1px solid #000;
-            height: 18mm;
-            margin: 0 10mm 2mm;
-        }
-
-        .sig-labels {
-            display: flex;
-            justify-content: space-between;
-            margin: 0 10mm;
-            font-weight: bold;
-        }
-
-        .sig-meta {
-            text-align: left;
-            margin: 2mm 10mm 0;
-            font-weight: bold;
-        }
-
-        .page-break {
-            page-break-after: always;
-        }
-
-        @media print {
-
-            html,
-            body {
-                width: 210mm;
-            }
-
-            .page {
-                min-height: 277mm;
-            }
-
-            .no-print {
-                display: none !important;
-            }
-
-            * {
-                -webkit-print-color-adjust: exact;
-                print-color-adjust: exact;
-            }
-        }
-    </style>
-</head>
-
-<body>
-
-    <div class="page">
-        <div class="header">
-            <div class="org-name">KOPERASI PERMODALAN KELANTAN BERHAD (D-5-0228)</div>
-            <div>Lot PT 448, Tingkat 1, Jalan Kuala Krai, Batu 3 Wakaf Che Yeh, 15150 Kota Bharu, Kelantan</div>
-            <div>Tel : 09-7414331 / 4334 &nbsp;&nbsp; Website : www.koppkb.com &nbsp;&nbsp; Email : admin@koppkb.com
-            </div>
-        </div>
-
-        <div class="title">AKUAN TERIMAAN PAMPASAN DAN PELEPASAN</div>
-
-        <div class="claim-no"><span class="label">NO. TUNTUTAN :</span> <b>{{ $gadai_info['norujukan'] }}</b></div>
-
-        <div class="content">
-            <p>
-                1. Bahawasanya saya, Penama : <b>{{ $customer_info['nama'] }}</b><br>
-                No. Kad Pengenalan : <b>{{ $customer_info['kpbaru'] }}</b><br>
-                Adalah dengan ini atas <span class="emph">BALASAN</span> sebanyak <b>RM {{ number_format($jumlah_pampasan, 2) }}</b>
-                <b> (Ringgit Malaysia : {{ $jumlah_pampasan_terbilang }} sahaja)</b>
-                yang dibayar kepada saya oleh <b>AR-RAHN CAWANGAN SEMPORNA</b> atau
-                <b>KOPERASI PERMODALAN KELANTAN BERHAD (KoPKB)</b> yang mana penerimaan wang bayaran tersebut
-                adalah saya perakui sebagai bayaran muktamad melepaskan <b>AR-RAHN CAWANGAN SEMPORNA</b>
-                atau <b>KOPERASI PERMODALAN KELANTAN BERHAD (KoPKB)</b> daripada segala liabiliti, tindakan, klausa
-                tindakan, tuntutan dan tanggungjawab yang saya boleh kuatkuasakan, punyai atau mungkin mempunyai
-                pada masa ini atau pada bila-bila masa terhadap <b>AR-RAHN CAWANGAN SEMPORNA</b>,<b> KOPERASI PERMODALAN
-                    KELANTAN BERHAD (KoPKB)</b>
-                berkait dengan kehilangan/kecurian barangan kemas pada bulan <b>November 2024</b> yang
-                telah digadaikan di <b>AR-RAHN CAWANGAN SEMPORNA, LOT F9-0 GROUND FLOOR, BANDAR MUTIARA, JALAN HOSPITAL,
-                    91300 SEMPORNA, SABAH</b> atau apa-apa perkara
-                yang timbul berkait/akibat
-                daripada kehilangan/kecurian tersebut.
-            </p>
-
-            <p class="mt-4">
-                2. <span class="emph">DAN</span> saya memberikan sebenar-benar akujanji bahawa saya tidak akan
-                mengambil/memulakan
-                sebarang tindakan perundangan terhadap <b>AR-RAHN CAWANGAN SEMPORNA</b> atau
-                <b>KOPERASI PERMODALAN KELANTAN BERHAD (KoPKB)</b> berkait dengan kehilangan/kecurian tersebut
-                dengan penerimaan wang balasan di atas.
-            </p>
-
-            <p class="mt-4">
-                Adalah saya dengan ini memperakui bahawa dokumen ini telah dibacakan/saya baca dan saya fahami
-                kesan dan implikasi dokumen ini sepenuh-penuhnya.
-            </p>
-
-            <div class="date-row">
-                Bertarikh:
-            </div>
-
-            <div class="signatures">
-                <div class="sig-col">
-                    <div class="sig-line"></div>
-                    <div class="sig-labels"><span>(PELANGGAN)</span></div>
-                    <div class="sig-labels"><span>{{ $customer_info['nama'] }}</span></div>
-                    <div class="sig-meta">No K/P: </div>
-                </div>
-                <div class="sig-col">
-                    <div class="sig-line"></div>
-                    <div class="sig-labels"><span>(SAKSI)</span></div>
-                    <div class="sig-meta">Nama : </div>
-                    <div class="sig-meta">No K/P: </div>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <div class="no-print" style="text-align:center; margin: 10mm 0;">
-        <button onclick="cetakSuratPampasan()" style="padding:8px 16px;font-size:14px;">Cetak</button>
-    </div>
-    <script>
-        window.addEventListener('DOMContentLoaded', function(){
-            cetakSuratPampasan();
-        })
-
-        async function cetakSuratPampasan() {
-             window.print();
-             await initiatePampasan();
-        }
-
-        async function initiatePampasan() {
-            return fetch('/pampasan/initiate', {
-                    method: 'POST',
-                    headers: {
-                        'Content-Type': 'application/json',
-                    },
-                    body: JSON.stringify({
-                        'norujukan': @json($gadai_info['norujukan']),
-                        "_token": "{{ csrf_token() }}",
-                    })
-                })
-                .then(response => {
-                    if (!response.ok) {
-                        throw new Error(`HTTP error! status: ${response.status}`);
-                    }
-                    return response.json();
-                })
-                .then(result => {
-                    return result;
-                })
-                .catch(error => {
-                    console.error('Error initiating pampasan:', error);
-                    Swal.fire({
-                        title: 'Ralat',
-                        text: 'Gagal daftar pampasan',
-                        icon: 'error'
-                    });
-                    throw error;
-                });
-        }
-    </script>
-</body>
-
-</html>

routes/web.php

@@ -1,6 +1,5 @@
 <?php
 
-use App\Http\Controllers\KhazanahController;
 use Illuminate\Support\Facades\Route;
 use App\Services\ImbangdugaServices;
 use Illuminate\Support\Facades\Storage;
@@ -15,10 +14,6 @@ use Illuminate\Support\Facades\Storage;
 |
 */
 
-Route::get('/health', function () {
-    return response()->json(['status' => 'ok']);
-});
-
 Route::get('/',['as'=>'login','uses'=>'HomeController@index']);
 
 Route::get('/testtry',function(ImbangdugaServices $imbangduga){
@@ -117,10 +112,6 @@ Route::get('/history',['as'=>'gadai.history','uses'=>'GadaianController@history'
 Route::get('/history/khazanah',['as'=>'gadai.history.khazanah','uses'=>'GadaianController@history'])->middleware('auth','khazanah');
 Route::post('/customer/assign-anggota', ['as' => 'customer.assignAnggota','uses' => 'CustomersController@assignAnggota'])->middleware('auth', 'teller');
 
-//Laporan Aliran Tunai Teller
-Route::get('/laporan/alirantunai', ['as' => 'laporan.alirantunai', 'uses'=> 'AliranTunaiController@laporanAliranTunaiTeller'])->middleware('auth','teller');
-Route::post('laporan/alirantunai/cetak', ['as' => 'alirantunai.laporancetak', 'uses' => 'AliranTunaiController@cetakLaporanAliranTunaiTeller'])->middleware('auth', 'teller');
-
 //Kemaskini Upah
 Route::get('/kemaskiniupah',['as'=>'kemaskini.upah','uses'=>'AliranTunaiController@kemaskiniupah'])->middleware('auth','teller');
 
@@ -276,8 +267,6 @@ Route::post('laporan/saghilang/cetak',['as'=>'saghilang.laporancetak','uses'=>'K
 // Route::get('/laporan/agingbulanan', [ 'as'=>'laporan.agingbulanan', 'uses'=>'KhazanahController@laporanAging_Bulanan'])->middleware('auth','khazanah');
 // Route::post('/laporan/agingbulanan/cetak', ['as'=>'agingbulan.cetaklaporan', 'uses'=>'KhazanahController@cetaklaporang_Aging'])->middleware('auth','khazanah');
 
-Route::get('laporan/operasi/audittrail/cetak',['as'=>'operasi.audittrail.laporancetak','uses'=>'OperasiController@cetakLaporanAuditTrail'])->middleware('auth','operasi');
-
 Route::get('/laporan/stokauditbackdate',['as'=>'laporan.stokauditbackdate','uses'=>'KhazanahController@laporanStokAuditBackdate'])->middleware('auth','khazanah');
 Route::get('laporan/stokauditbackdate/cetak',['as'=>'stokauditbackdate.laporancetak','uses'=>'KhazanahController@cetakLaporanStokAuditBackdate'])->middleware('auth','khazanah');
 
@@ -350,11 +339,11 @@ Route::post('/barcodescanned',['as'=>'barcode.scanned','uses'=>'KhazanahControll
 Route::get('/operasi/kelulusan','OperasiController@kelulusan')->name('operasi.kelulusan')->middleware('auth','operasi');
 Route::get('/operasi/kelulusan/anggota','OperasiController@kelulusanAnggota')->name('operasi.kelulusananggota')->middleware('auth','operasi');
 Route::post('/operasi/createkelulusan',['as'=>'operasi.createkelulusan','uses'=>'OperasiController@createkelulusan'])->middleware('auth','teller');
+Route::post('/operasi/createkelulusan-anggota',['as'=>'operasi.createkelulusan-anggota','uses'=>'OperasiController@createkelulusanAnggota'])->middleware('auth','teller');
 Route::get('/operasi/getkelulusan',['as'=>'operasi.getkelulusan','uses'=>'OperasiController@getkelulusan'])->middleware('auth','teller');
 Route::put('/operasi/updatekelulusan',['as'=>'operasi.updatekelulusan','uses'=>'OperasiController@updatekelulusan'])->middleware('auth','operasi');
 Route::put('/operasi/updatekelulusananggota',['as'=>'operasi.updatekelulusananggota','uses'=>'OperasiController@updatekelulusananggota'])->middleware('auth','operasi');
 Route::get('/operasi/parameter','OperasiController@parameter')->name('parameter')->middleware('auth','operasi');
-Route::get('/operasi/laporan-audit','OperasiController@laporanAudit')->name('operasi.laporan.audit')->middleware('auth','operasi');
 Route::get('/operasi/hargaemas',['as'=>'operasi.hargaemas','uses'=>'OperasiController@hargaemas'])->middleware('auth','operasi');
 Route::post('/operasi/hargaemas/update',['as'=>'hargaemas.update','uses'=>'OperasiController@updatehargaemas'])->middleware('auth','operasi');
 Route::post('/operasi/hargaemas',['as'=>'hargaemas.create','uses'=>'OperasiController@createhargaemas'])->middleware('auth','operasi');
@@ -371,8 +360,6 @@ Route::post('operasi/kakitangan/edit/store',['as'=>'operasi.kakitangan.edit.stor
 
 
 Route::get('/operasi/margin',['as'=>'operasi.margin','uses'=>'OperasiController@margin'])->middleware('auth','operasi');
-Route::get('/operasi/marginmutu',['as'=>'operasi.marginmutu','uses'=>'OperasiController@marginmutu'])->middleware('auth','operasi');
-Route::get('/operasi/marginmutu/edit',['as'=>'operasi.marginmutu.edit','uses'=>'OperasiController@editMarginMutu'])->middleware('auth','operasi');
 
 Route::get('/komoditi',['as'=>'komuditi','uses'=>'KomuditiController@index']);
 Route::get('/komoditi/rekod',['as'=>'rekod.komoditi','uses'=>'KomuditiController@rekodKomoditi']);
@@ -511,20 +498,3 @@ Route::get('/event/tellercash',['as'=>'event.tellercash','uses'=>'EventTriggerCo
 Route::get('/perubatan',['as'=>'perubatan','uses'=>'PerubatanController@index'])->middleware('auth','operasi');
 Route::get('/perubatan/search',['as'=>'perubatan.search','uses'=>'PerubatanController@search'])->middleware('auth','operasi');
 Route::put('/perubatan/update',['as'=>'perubatan.update','uses'=>'PerubatanController@update'])->middleware('auth','operasi');
-
-/* Pampasan */
-
-//Page Pampasan Detail Payment Customer
-Route::get('/pampasan/detail/{norujukan}', ['as' => 'pampasan.detail','uses' => 'KhazanahController@pampasanDetail'])->middleware('auth', 'khazanah');
-
-//Selepas teller print surat perjanjian pampasan pelanggan
-Route::post('/pampasan/initiate',['as' => 'pampasan.initiate', 'uses' => 'KhazanahController@initiatePampasan'])->middleware('auth', 'teller');
-
-//Selepas PC masukkan Deno dan Submit Jumlah Pampasan
-Route::post('/pampasan/terima',['as' => 'pampasan.terima', 'uses' => 'KhazanahController@terimaPampasan'])->middleware('auth', 'khazanah');
-
-//Cetak Resit Pampasan
-Route::get(('/pampasan/resit'), ['as' => 'pampasan.resit', 'uses' => 'KhazanahController@resitPampasan'])->middleware('auth', 'khazanah');
-
-//Surat Pampasan
-Route::get('/pampasan/surat/{norujukan}', ['as' => 'pampasan.surat', 'uses' => 'KhazanahController@suratPampasan'])->middleware('auth', 'role:teller,khazanah');