From fdf8fa3aebd807d4b181bc275a9ccea45797e5fd Mon Sep 17 00:00:00 2001
From: Mark Gregory <mark.gregory@mpba.co.uk>
Date: Thu, 17 Sep 2026 11:49:19 +0100
Subject: [PATCH] M3 Security Fixes for Pass 34

---
 .../ReplenishSettingsController.php           | 59 ++++++-------------
 1 file changed, 19 insertions(+), 40 deletions(-)

diff --git a/Modules/M3/Http/Controllers/ReplenishSettingsController.php b/Modules/M3/Http/Controllers/ReplenishSettingsController.php
index d5384f25..414bb706 100644
--- a/Modules/M3/Http/Controllers/ReplenishSettingsController.php
+++ b/Modules/M3/Http/Controllers/ReplenishSettingsController.php
@@ -2,55 +2,34 @@
 
 namespace Modules\M3\Http\Controllers;
 
-use Config;
-use Datatables;
-use DB;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Schema;
 use Modules\M3\Models\ICM658M;
+use Throwable;
+use Yajra\DataTables\Facades\DataTables;
 
 class ReplenishSettingsController extends Controller
 {
-    public static function index(Request $request)
+    public function index()
     {
-        // Replenishment Table
-        // $rEFCAT658 = DB::connection(config('m3.connection', 'pgsql'))->table('icm658m')->get();
-        // Warehouse Table
-        // $iC670M    = DB::connection(config('m3.connection', 'pgsql'))->table('ic670m')->get();
+        $IC670M = [];
 
-        // Get Logged user Id
-        $userId = m3_user() !== '' ? strtoupper(m3_user()) : '';
-        // $userId     = 'E1135818';  // Brad : E1135818  Malak : E2011812  ACOM_PDF
-        $connection = config('m3.connection', 'pgsql');
-        $iCM428M = Schema::connection($connection)->hasTable('icm428m')
-            ? DB::connection($connection)->table('icm428m')->where('R428US', $userId)->where('R428STS', 'A')->first()
-            : null;
-
-        $userCO = isset($iCM428M->R428CO) ? $iCM428M->R428CO : '';
-        $userPL = isset($iCM428M->R428PL) ? $iCM428M->R428PL : '';
-        $userWH = isset($iCM428M->R428WH) ? $iCM428M->R428WH : '';
-
-        if ($userCO != '') {
-            // Warehouse Table
-            $iC670M = Schema::connection($connection)->hasTable('ic670m')
-                ? DB::connection($connection)->table('ic670m')
-                    ->where('WDCO', $userCO)
-                    ->where('WDPL', $userPL)
-                    ->where('WDWHS', $userWH)
-                    ->get()
-                : [];
-        } else {
-            $iC670M = [];
+        try {
+            if (Schema::connection(config('m3.connection', 'pgsql'))->hasTable('ic670m')) {
+                $IC670M = DB::connection(config('m3.connection', 'pgsql'))
+                    ->table('ic670m')
+                    ->get();
+            }
+        } catch (Throwable $exception) {
+            report($exception);
+            $IC670M = [];
         }
 
-        // FROM PRDAT.REFERPS t1 LEFT JOIN ( SELECT R658CO,R658PL,R658WH,R658LC,R658PN,R658MQ,R658RQ,R658TL,R658RMQ,
-        //  TRIM(R658WH)||TRIM(R658LC)||TRIM(R658PN) AS FULLID FROM EWOBJTST.ICM658M
-        // ) t2 ON t1.REFKEY = t2.FULLID WHERE t1.REFCAT = '658'";
-        // $rEFCAT658 = DB::connection(config('m3.connection', 'pgsql'))->select($sqlstmt);
-        // dd($rEFCAT658);
-
-        return view('m3::liberty-theme.pages.ReplenishSettings', compact('IC670M'));
-        //  'REFCAT658',
+        return view(
+            'm3::liberty-theme.pages.ReplenishSettings',
+            compact('IC670M'),
+        );
     }
 
     public function store(Request $request)
@@ -176,6 +155,6 @@ class ReplenishSettingsController extends Controller
         // $rEFCAT658 = DB::connection(config('m3.connection', 'pgsql'))->select($sqlstmt);
         // dd($rEFCAT658);
 
-        return Datatables::of($rEFCAT658)->addIndexColumn()->make(true);
+        return DataTables::of($rEFCAT658)->addIndexColumn()->make(true);
     }
 }