From 3521e47ef05cb192328ee47168620850f3737cd3 Mon Sep 17 00:00:00 2001
From: Mark Gregory <mark.gregory@abbeysoftware.com>
Date: Mon, 21 Sep 2026 13:25:44 +0100
Subject: [PATCH] M3 Integration fixes

---
 .../Company/Resources/views/show.blade.php    |  2 +-
 .../Resources/views/documents/index.blade.php |  4 +-
 Modules/Helpdesk/Resources/assets/css/app.css | 40 +++++++++----------
 .../views/components/colour-select.blade.php  |  8 ++--
 .../views/livewire/kanban-board.blade.php     |  9 +----
 .../views/livewire/settings-manager.blade.php |  2 +-
 .../views/livewire/ticket-show.blade.php      |  2 +-
 .../views/partials/time-log-form.blade.php    |  2 +-
 Modules/M3/Console/GenerateGS1Cmd.php         |  2 +-
 Modules/M3/Helpers/Helper.php                 |  2 +-
 Modules/M3/Helpers/M3Auth.php                 |  4 +-
 .../M3/Http/Controllers/API/CloseShipment.php |  4 +-
 .../M3/Http/Controllers/API/M3Controller.php  |  2 +-
 .../M3/Http/Controllers/API/PdfStorage.php    |  6 +--
 Modules/M3/Http/Controllers/API/ReplenAPI.php |  2 +-
 .../M3/Http/Controllers/API/TransferAPI.php   |  4 +-
 .../M3/Http/Controllers/API/TwoShipAPIs.php   |  2 +-
 .../Controllers/BoxPackToPalletController.php |  4 +-
 .../Controllers/CarrierMaintController.php    |  2 +-
 .../Controllers/ExecSummaryController.php     |  2 +-
 .../Controllers/ExecSummaryLineController.php |  2 +-
 .../Http/Controllers/M3DeliveryController.php |  4 +-
 .../Controllers/M3ErrorsDispController.php    |  6 +--
 .../M3GetPDFFromCacheController.php           |  2 +-
 .../Http/Controllers/MFOrdersController.php   |  2 +-
 .../Controllers/OrderLinesOfClosedOrder.php   |  2 +-
 .../Http/Controllers/PalletQtyController.php  |  4 +-
 .../Controllers/PendingClosureController.php  |  2 +-
 .../ReplenishSettingsController.php           |  4 +-
 .../Controllers/UserControlController.php     |  2 +-
 .../M3/Http/Controllers/UserPickingStats4.php |  2 +-
 .../M3/Http/Controllers/UserPickingStats5.php |  2 +-
 .../Controllers/UserProfileController.php     |  2 +-
 .../Http/Controllers/UtilitiesController.php  |  2 +-
 .../M3/Http/Controllers/WhsPerfMetrics.php    |  2 +-
 .../Http/Controllers/WhsePerfController.php   |  4 +-
 Modules/M3/Http/Middleware/BasicAuth.php      |  4 +-
 .../public/liberty-theme/css/styles.css       | 35 ----------------
 .../views/liberty-theme/layout/main.blade.php |  2 +-
 .../pages/BoxPackToPalletScan.blade.php       |  2 +-
 .../liberty-theme/pages/M3GetPDF.blade.php    |  2 +-
 .../pages/OrderLinesOfClosed.blade.php        |  4 +-
 .../pages/ReplenishSettings.blade.php         | 12 +++---
 .../pages/WhsPerfMetrics.blade.php            |  4 +-
 .../pages/exedashboard.blade.php              |  2 +-
 .../pages/userPickingStats4.blade.php         |  2 +-
 .../pages/userPickingStats4_old.blade.php     |  2 +-
 .../pages/userPickingStats5.blade.php         |  2 +-
 .../pages/whsePerfRequest.blade.php           |  2 +-
 .../partials/left-navigation.blade.php        |  8 ++--
 .../partials/modals/M3DeliveryAdd.blade.php   |  8 ++--
 .../partials/modals/M3DeliveryEdit.blade.php  |  8 ++--
 .../partials/modals/qtyAdd.blade.php          |  4 +-
 .../partials/modals/userAdd.blade.php         |  4 +-
 .../partials/tabs/orders.blade.php            |  2 +-
 Modules/M3/Services/PostgresProgramBridge.php |  2 +-
 .../resources/views/licenses/index.blade.php  |  4 +-
 .../resources/views/payments/index.blade.php  |  4 +-
 .../resources/views/rules/index.blade.php     |  4 +-
 public/css/wms-dashboard.css                  |  4 +-
 resources/css/app.css                         | 24 +++++------
 resources/css/wms-dashboard.css               |  4 +-
 62 files changed, 131 insertions(+), 173 deletions(-)

diff --git a/Modules/Company/Resources/views/show.blade.php b/Modules/Company/Resources/views/show.blade.php
index 86bc979f..9e7d463f 100755
--- a/Modules/Company/Resources/views/show.blade.php
+++ b/Modules/Company/Resources/views/show.blade.php
@@ -215,7 +215,7 @@
                             </div>
                             <form method="POST" action="{{ route('platform.companies.warehouses.division.update', [$company, $warehouse]) }}" class="contents">
                                 @csrf @method('PUT')
-                                <select aria-label="Company-level warehouse" name="division_id" class="rounded-xl border-zinc-300 dark:border-zinc-700 dark:bg-zinc-950">
+                                <select name="division_id" class="rounded-xl border-zinc-300 dark:border-zinc-700 dark:bg-zinc-950">
                                     <option value="">Company-level warehouse</option>
                                     @foreach($company->divisions as $divisionOption)
                                         <option value="{{ $divisionOption->id }}" @selected($warehouse->division_id === $divisionOption->id)>{{ $divisionOption->name }}</option>
diff --git a/Modules/Documentation/Resources/views/documents/index.blade.php b/Modules/Documentation/Resources/views/documents/index.blade.php
index d791acc0..279a9d0f 100755
--- a/Modules/Documentation/Resources/views/documents/index.blade.php
+++ b/Modules/Documentation/Resources/views/documents/index.blade.php
@@ -47,13 +47,13 @@
                     <label for="sonar-input-9f8539cc9d" class="visually-hidden">Search title, reference, summary or body</label>
 <input class="doc-input" name="search" value="{{ request('search') }}"
                         placeholder="Search title, reference, summary or body" id="sonar-input-9f8539cc9d">
-                    <select aria-label="All statuses" class="doc-select" name="status">
+                    <select class="doc-select" name="status">
                         <option value="">All statuses</option>
                         @foreach ($statuses as $value => $label)
                             <option value="{{ $value }}" @selected(request('status') === $value)>{{ $label }}</option>
                         @endforeach
                     </select>
-                    <select aria-label="All categories" class="doc-select" name="category">
+                    <select class="doc-select" name="category">
                         <option value="">All categories</option>
                         @foreach ($categories as $category)
                             <option value="{{ $category->id }}" @selected((string) request('category') === (string) $category->id)>{{ $category->name }}
diff --git a/Modules/Helpdesk/Resources/assets/css/app.css b/Modules/Helpdesk/Resources/assets/css/app.css
index 4b76f412..90498756 100755
--- a/Modules/Helpdesk/Resources/assets/css/app.css
+++ b/Modules/Helpdesk/Resources/assets/css/app.css
@@ -31,11 +31,11 @@
 .hd-helpdesk-surface .hd-btn-blue:hover,
 .hd-btn-blue:hover { background: #1d4ed8 !important; }
 .hd-helpdesk-surface .hd-btn-green,
-.hd-btn-green { background: #16a34a !important; }
+.hd-btn-green { background: #15803d !important; }
 .hd-helpdesk-surface .hd-btn-green:hover,
 .hd-btn-green:hover { background: #15803d !important; }
 .hd-helpdesk-surface .hd-btn-amber,
-.hd-btn-amber { background: #f59e0b !important; }
+.hd-btn-amber { background: #92400e !important; }
 .hd-helpdesk-surface .hd-btn-amber:hover,
 .hd-btn-amber:hover { background: #d97706 !important; }
 .hd-helpdesk-surface .hd-btn-red,
@@ -49,13 +49,13 @@
 
 .hd-helpdesk-surface button[type="submit"],
 .hd-helpdesk-surface button[data-flux-button][type="submit"] {
-    background: #16a34a !important;
+    background: #15803d !important;
     color: #ffffff !important;
     border-color: rgba(255,255,255,.14) !important;
 }
 .hd-helpdesk-surface button[wire\:click^="reset"],
 .hd-helpdesk-surface button[wire\:target^="reset"] {
-    background: #f59e0b !important;
+    background: #92400e !important;
     color: #ffffff !important;
     border-color: rgba(255,255,255,.14) !important;
 }
@@ -116,7 +116,7 @@
 .helpdesk-ticket-form [aria-disabled="true"] {
     background: #09090b !important;
     background-color: #09090b !important;
-    color: #71717a !important;
+    color: #a1a1aa !important;
     opacity: 1 !important;
 }
 .helpdesk-ticket-form input:-webkit-autofill,
@@ -166,10 +166,10 @@
 .hd-btn-blue { background: #2563eb !important; }
 .hd-btn-blue:hover { background: #1d4ed8 !important; }
 
-.hd-btn-green { background: #16a34a !important; }
+.hd-btn-green { background: #15803d !important; }
 .hd-btn-green:hover { background: #15803d !important; }
 
-.hd-btn-amber { background: #f59e0b !important; }
+.hd-btn-amber { background: #92400e !important; }
 .hd-btn-amber:hover { background: #d97706 !important; }
 
 .hd-btn-red { background: #dc2626 !important; }
@@ -180,14 +180,14 @@
 
 .hd-helpdesk-surface button[type="submit"],
 .hd-helpdesk-surface button[data-flux-button][type="submit"] {
-    background: #16a34a !important;
+    background: #15803d !important;
     color: #fff !important;
     border-color: rgba(255,255,255,.14) !important;
 }
 
 .hd-helpdesk-surface button[wire\:click^="reset"],
 .hd-helpdesk-surface button[wire\:target^="reset"] {
-    background: #f59e0b !important;
+    background: #92400e !important;
     color: #fff !important;
     border-color: rgba(255,255,255,.14) !important;
 }
@@ -256,7 +256,7 @@
 .helpdesk-ticket-form .select2-container--disabled .select2-selection--single,
 .helpdesk-ticket-form .select2-container--disabled .select2-selection--multiple {
     background: #09090b !important;
-    color: #71717a !important;
+    color: #a1a1aa !important;
     opacity: 1 !important;
 }
 
@@ -673,11 +673,11 @@ span.flatpickr-weekday {
 .hd-helpdesk-surface .hd-btn-blue:hover,
 .hd-btn-blue:hover { background: #1d4ed8 !important; }
 .hd-helpdesk-surface .hd-btn-green,
-.hd-btn-green { background: #16a34a !important; }
+.hd-btn-green { background: #15803d !important; }
 .hd-helpdesk-surface .hd-btn-green:hover,
 .hd-btn-green:hover { background: #15803d !important; }
 .hd-helpdesk-surface .hd-btn-amber,
-.hd-btn-amber { background: #f59e0b !important; }
+.hd-btn-amber { background: #92400e !important; }
 .hd-helpdesk-surface .hd-btn-amber:hover,
 .hd-btn-amber:hover { background: #d97706 !important; }
 .hd-helpdesk-surface .hd-btn-red,
@@ -691,13 +691,13 @@ span.flatpickr-weekday {
 
 .hd-helpdesk-surface button[type="submit"],
 .hd-helpdesk-surface button[data-flux-button][type="submit"] {
-    background: #16a34a !important;
+    background: #15803d !important;
     color: #ffffff !important;
     border-color: rgba(255,255,255,.14) !important;
 }
 .hd-helpdesk-surface button[wire\:click^="reset"],
 .hd-helpdesk-surface button[wire\:target^="reset"] {
-    background: #f59e0b !important;
+    background: #92400e !important;
     color: #ffffff !important;
     border-color: rgba(255,255,255,.14) !important;
 }
@@ -820,7 +820,7 @@ span.flatpickr-weekday {
 .helpdesk-ticket-form [aria-disabled="true"] {
     background: #09090b !important;
     background-color: #09090b !important;
-    color: #71717a !important;
+    color: #a1a1aa !important;
     opacity: 1 !important;
 }
 .helpdesk-ticket-form input:-webkit-autofill,
@@ -870,11 +870,11 @@ span.flatpickr-weekday {
 .hd-helpdesk-surface .hd-btn-blue:hover,
 .hd-btn-blue:hover { background: #1d4ed8 !important; }
 .hd-helpdesk-surface .hd-btn-green,
-.hd-btn-green { background: #16a34a !important; }
+.hd-btn-green { background: #15803d !important; }
 .hd-helpdesk-surface .hd-btn-green:hover,
 .hd-btn-green:hover { background: #15803d !important; }
 .hd-helpdesk-surface .hd-btn-amber,
-.hd-btn-amber { background: #f59e0b !important; }
+.hd-btn-amber { background: #92400e !important; }
 .hd-helpdesk-surface .hd-btn-amber:hover,
 .hd-btn-amber:hover { background: #d97706 !important; }
 .hd-helpdesk-surface .hd-btn-red,
@@ -888,13 +888,13 @@ span.flatpickr-weekday {
 
 .hd-helpdesk-surface button[type="submit"],
 .hd-helpdesk-surface button[data-flux-button][type="submit"] {
-    background: #16a34a !important;
+    background: #15803d !important;
     color: #ffffff !important;
     border-color: rgba(255,255,255,.14) !important;
 }
 .hd-helpdesk-surface button[wire\:click^="reset"],
 .hd-helpdesk-surface button[wire\:target^="reset"] {
-    background: #f59e0b !important;
+    background: #92400e !important;
     color: #ffffff !important;
     border-color: rgba(255,255,255,.14) !important;
 }
@@ -955,7 +955,7 @@ span.flatpickr-weekday {
 .helpdesk-ticket-form [aria-disabled="true"] {
     background: #09090b !important;
     background-color: #09090b !important;
-    color: #71717a !important;
+    color: #a1a1aa !important;
     opacity: 1 !important;
 }
 .helpdesk-ticket-form input:-webkit-autofill,
diff --git a/Modules/Helpdesk/Resources/views/components/colour-select.blade.php b/Modules/Helpdesk/Resources/views/components/colour-select.blade.php
index 08fa8bba..f836221f 100755
--- a/Modules/Helpdesk/Resources/views/components/colour-select.blade.php
+++ b/Modules/Helpdesk/Resources/views/components/colour-select.blade.php
@@ -14,12 +14,12 @@
 <div {{ $attributes->class('rounded-xl border border-zinc-200 bg-white p-3 shadow-sm dark:border-zinc-700 dark:bg-zinc-950/50') }}>
     <div class="grid gap-3 lg:grid-cols-[minmax(0,1fr)_auto] lg:items-end">
         <div class="min-w-0 space-y-2">
-            <label class="block text-xs font-bold uppercase tracking-wide text-zinc-600 dark:text-zinc-300">
+            <label for="colour-select-{{ md5($model) }}" class="block text-xs font-bold uppercase tracking-wide text-zinc-600 dark:text-zinc-300">
                 {{ $label }}
             </label>
 
             <div class="grid gap-2 sm:grid-cols-[minmax(0,1fr)_auto] sm:items-center">
-                <select aria-label="Colour"
+                <select id="colour-select-{{ md5($model) }}"
                     wire:model.live="{{ $model }}"
                     class="h-9 w-full rounded-lg border border-zinc-300 bg-white px-3 text-sm font-semibold text-zinc-900 shadow-sm outline-none transition-colors duration-150 focus:border-blue-500 focus:ring-2 focus:ring-blue-500/30 dark:border-zinc-700 dark:bg-zinc-900 dark:text-zinc-100"
                 >
@@ -38,7 +38,7 @@
                 </span>
             </div>
 
-            <div class="flex flex-wrap items-center gap-1.5" aria-label="Available Helpdesk colours">
+            <div class="flex flex-wrap items-center gap-1.5">
                 @foreach ($options as $key => $option)
                     <button
                         type="button"
@@ -59,7 +59,6 @@
                 value="{{ $currentHex }}"
                 wire:change="$set('{{ $model }}', $event.target.value)"
                 class="h-9 w-11 cursor-pointer rounded-lg border border-zinc-300 bg-white p-1 shadow-sm dark:border-zinc-700 dark:bg-zinc-900"
-                aria-label="Choose a custom hex colour"
             />
 
             <input
@@ -67,7 +66,6 @@
                 wire:model.live.debounce.500ms="{{ $model }}"
                 class="h-9 w-full rounded-lg border border-zinc-300 bg-white px-3 text-xs font-semibold text-zinc-900 placeholder:text-zinc-400 shadow-sm outline-none transition-colors duration-150 focus:border-blue-500 focus:ring-2 focus:ring-blue-500/30 dark:border-zinc-700 dark:bg-zinc-900 dark:text-zinc-100 dark:placeholder:text-zinc-500"
                 placeholder="#ffffff"
-                aria-label="Custom hex colour"
             />
         </div>
     </div>
diff --git a/Modules/Helpdesk/Resources/views/livewire/kanban-board.blade.php b/Modules/Helpdesk/Resources/views/livewire/kanban-board.blade.php
index f0b6f8c1..8506c56c 100755
--- a/Modules/Helpdesk/Resources/views/livewire/kanban-board.blade.php
+++ b/Modules/Helpdesk/Resources/views/livewire/kanban-board.blade.php
@@ -59,7 +59,6 @@
             <div class="hd-select-wrap shrink-0 md:w-72">
                 <select
                     class="hd-select"
-                    aria-label="Select Kanban board"
                     onchange="window.location.href = '{{ route('helpdesk.kanban') }}?board_id=' + encodeURIComponent(this.value)"
                 >
                     @foreach ($boards as $availableBoard)
@@ -154,10 +153,7 @@
 
 
                                     <form method="POST" action="{{ route('helpdesk.tickets.board.update', $ticket) }}"
-                                        class="mt-3 rounded-xl border border-emerald-500/20 bg-emerald-950/20 p-2"
-                                        onclick="event.stopPropagation()"
-                                        onmousedown="event.stopPropagation()"
-                                        ondragstart="event.preventDefault(); event.stopPropagation();">
+                                        class="mt-3 rounded-xl border border-emerald-500/20 bg-emerald-950/20 p-2">
                                         @csrf
                                         <input type="hidden" name="return_to_board_id" value="{{ $board?->id }}">
                                         <label
@@ -168,8 +164,7 @@
                                                 draggable="false"
                                                 onchange="this.form.requestSubmit ? this.form.requestSubmit() : this.form.submit()"
                                                 onclick="event.stopPropagation()"
-                                                onmousedown="event.stopPropagation()"
-                                                aria-label="Board for {{ $ticket->reference }}">
+                                                onmousedown="event.stopPropagation()">
                                                 @foreach ($boards as $ticketBoard)
                                                     <option value="{{ $ticketBoard->id }}"
                                                         @selected((int) $ticket->board_id === (int) $ticketBoard->id)>{{ $ticketBoard->name }}</option>
diff --git a/Modules/Helpdesk/Resources/views/livewire/settings-manager.blade.php b/Modules/Helpdesk/Resources/views/livewire/settings-manager.blade.php
index 5d625776..70abc822 100755
--- a/Modules/Helpdesk/Resources/views/livewire/settings-manager.blade.php
+++ b/Modules/Helpdesk/Resources/views/livewire/settings-manager.blade.php
@@ -371,7 +371,7 @@
                         <flux:textarea wire:model="boardForm.description" label="Description" rows="2" />
                     </div>
                     <div class="md:col-span-full">
-                        <label class="mb-2 block text-sm font-medium text-zinc-700 dark:text-zinc-200">Board
+                        <label for="board-columns" class="mb-2 block text-sm font-medium text-zinc-700 dark:text-zinc-200">Board
                             columns</label>
                         <div class="grid gap-2 sm:grid-cols-2 lg:grid-cols-3 xl:grid-cols-6">
                             @foreach ($statuses as $status)
diff --git a/Modules/Helpdesk/Resources/views/livewire/ticket-show.blade.php b/Modules/Helpdesk/Resources/views/livewire/ticket-show.blade.php
index a7f36f42..9cf5b609 100755
--- a/Modules/Helpdesk/Resources/views/livewire/ticket-show.blade.php
+++ b/Modules/Helpdesk/Resources/views/livewire/ticket-show.blade.php
@@ -486,7 +486,7 @@
                                  class="prose prose-sm min-h-[12rem] max-w-none bg-white p-4 text-sm leading-6 text-zinc-900 outline-none dark:prose-invert dark:bg-zinc-950 dark:text-zinc-100"
                                  data-placeholder="Write a public reply or internal note. Right-click or Ctrl-click underlined words for spelling suggestions.">{!! $oldCommentBody !!}</div>
 
-                            <textarea aria-label="Comment" id="ticket-comment-body" name="commentBody" required spellcheck="true" lang="en-GB" autocorrect="on" autocomplete="on" autocapitalize="sentences" inputmode="text" class="sr-only" tabindex="-1" aria-hidden="true">{{ $oldCommentBody }}</textarea>
+                            <textarea id="ticket-comment-body" name="commentBody" required spellcheck="true" lang="en-GB" autocorrect="on" autocomplete="on" autocapitalize="sentences" inputmode="text" class="sr-only" tabindex="-1" aria-hidden="true">{{ $oldCommentBody }}</textarea>
                         </div>
 
                         <p class="mt-2 flex items-center gap-2 text-xs font-medium text-zinc-500 dark:text-zinc-400">
diff --git a/Modules/Helpdesk/Resources/views/partials/time-log-form.blade.php b/Modules/Helpdesk/Resources/views/partials/time-log-form.blade.php
index 689a9000..71c850ab 100755
--- a/Modules/Helpdesk/Resources/views/partials/time-log-form.blade.php
+++ b/Modules/Helpdesk/Resources/views/partials/time-log-form.blade.php
@@ -18,7 +18,7 @@
         </button>
     </div>
 
-    <textarea aria-label="Optional work note" spellcheck="true" lang="en-GB" name="description" rows="2" placeholder="Optional work note"
+    <textarea spellcheck="true" lang="en-GB" name="description" rows="2" placeholder="Optional work note"
         class="block w-full rounded-lg border border-zinc-300 bg-white p-2 text-xs font-semibold text-zinc-900 shadow-sm focus:border-emerald-500 focus:ring-emerald-500 dark:border-zinc-700 dark:bg-zinc-950 dark:text-zinc-100"
         data-dusk="ticket-time-description">{{ old('description') }}</textarea>
 
diff --git a/Modules/M3/Console/GenerateGS1Cmd.php b/Modules/M3/Console/GenerateGS1Cmd.php
index c7df2240..2676e631 100755
--- a/Modules/M3/Console/GenerateGS1Cmd.php
+++ b/Modules/M3/Console/GenerateGS1Cmd.php
@@ -53,7 +53,7 @@ class GenerateGS1Cmd extends Command
 
             // Get the Calling User
             $userId = $this->argument('user');
-            $sHUSER = $userId ?? (m3_user() !== '' ? Str::upper(trim(m3_user())) : 'TWOSHIP');
+            $sHUSER = $userId ?? (m3User() !== '' ? Str::upper(trim(m3User())) : 'TWOSHIP');
             $this->info('User: ' . $sHUSER);
 
             // Get Manifest Array
diff --git a/Modules/M3/Helpers/Helper.php b/Modules/M3/Helpers/Helper.php
index f95072ac..9a994016 100755
--- a/Modules/M3/Helpers/Helper.php
+++ b/Modules/M3/Helpers/Helper.php
@@ -319,7 +319,7 @@ class Helper
             'UserPL' => '',
         ];
 
-        $loggedUser = strtoupper(trim((string) m3_user()));
+        $loggedUser = strtoupper(trim((string) m3User()));
         if ($loggedUser === '') {
             return $defaults;
         }
diff --git a/Modules/M3/Helpers/M3Auth.php b/Modules/M3/Helpers/M3Auth.php
index 6443abbd..c8daf471 100755
--- a/Modules/M3/Helpers/M3Auth.php
+++ b/Modules/M3/Helpers/M3Auth.php
@@ -5,7 +5,7 @@ if (! function_exists('m3_user')) {
      * Return the current Core username in the format expected by the legacy M3 data.
      * M3 previously depended on PHP Basic Auth and read PHP_AUTH_USER directly.
      */
-    function m3_user(): string
+    function m3User(): string
     {
         $user = auth()->user();
 
@@ -29,7 +29,7 @@ if (! function_exists('m3_legacy_password')) {
      * Passwords are intentionally unavailable in Core. PostgreSQL access uses
      * Laravel's configured connection and never reuses a user's login password.
      */
-    function m3_legacy_password(): string
+    function m3LegacyPassword(): string
     {
         return '';
     }
diff --git a/Modules/M3/Http/Controllers/API/CloseShipment.php b/Modules/M3/Http/Controllers/API/CloseShipment.php
index c7bae56e..cadd3f32 100755
--- a/Modules/M3/Http/Controllers/API/CloseShipment.php
+++ b/Modules/M3/Http/Controllers/API/CloseShipment.php
@@ -36,7 +36,7 @@ class CloseShipment extends Controller
         $jSONCS = [];
 
         // Get the Calling User
-        $sHUSER = m3_user() !== '' ? Str::upper(m3_user()) : 'WebUser';
+        $sHUSER = m3User() !== '' ? Str::upper(m3User()) : 'WebUser';
         $sHSOURCE = 'CloseShipmentCoChargeAPI';
 
         try {
@@ -295,7 +295,7 @@ class CloseShipment extends Controller
                             ->orderBy('AYINTBOX')
                             ->get();
 
-                        foreach ($iCM695M1JOINTMP as $key => $ICM695M1JOINR) {
+                        foreach ($iCM695M1JOINTMP as $ICM695M1JOINR) {
                             $a4SHIPVIA = isset($ICM695M1JOINR->A4SHIPVIA) ? trim(str_replace('&', '_', $ICM695M1JOINR->A4SHIPVIA)) : '';
 
                             $sHIPTYPE = trim($ICM695M1JOINR->A4SHIPTYPE);
diff --git a/Modules/M3/Http/Controllers/API/M3Controller.php b/Modules/M3/Http/Controllers/API/M3Controller.php
index 12442329..54720910 100755
--- a/Modules/M3/Http/Controllers/API/M3Controller.php
+++ b/Modules/M3/Http/Controllers/API/M3Controller.php
@@ -56,7 +56,7 @@ class M3Controller extends Controller
         ini_set('max_input_time', Config::get('arrays.PHPTimeOut'));
         ini_set('default_socket_timeout', Config::get('arrays.PHPTimeOut'));
 
-        $rEQKPKUS = m3_user() !== '' ? Str::upper(m3_user()) : 'WEBUSER';
+        $rEQKPKUS = m3User() !== '' ? Str::upper(m3User()) : 'WEBUSER';
         $sHSOURCE = 'M3ReceiverAPI';
 
         $iCM666MFields = [
diff --git a/Modules/M3/Http/Controllers/API/PdfStorage.php b/Modules/M3/Http/Controllers/API/PdfStorage.php
index ab1cdfbb..2092f36a 100755
--- a/Modules/M3/Http/Controllers/API/PdfStorage.php
+++ b/Modules/M3/Http/Controllers/API/PdfStorage.php
@@ -71,7 +71,7 @@ class PdfStorage extends Controller
         }
 
         $context['DELIVERYNO'] = $context['A4MACPKR'] !== '' ? $context['A4MACPKR'] : self::ZERO_PAD;
-        $context['SHUSER'] = m3_user() !== '' ? Str::upper(m3_user()) : 'WebUser';
+        $context['SHUSER'] = m3User() !== '' ? Str::upper(m3User()) : 'WebUser';
         $context['SHSOURCE'] = 'PdfStorageAPI';
 
         return $context;
@@ -123,7 +123,7 @@ class PdfStorage extends Controller
                 'SHINTBOX' => $context['DOCNUM'] ?? '',
                 'SHTYPE' => $type,
                 'SHDATA' => $message,
-                'SHUSER' => $context['SHUSER'] ?? (m3_user() !== '' ? Str::upper(m3_user()) : 'WebUser'),
+                'SHUSER' => $context['SHUSER'] ?? (m3User() !== '' ? Str::upper(m3User()) : 'WebUser'),
                 'SHSOURCE' => $context['SHSOURCE'] ?? 'PdfStorageAPI',
                 'SHCO' => $context['COMPANY'] ?? '',
                 'SHWHS' => $context['WHS'] ?? '',
@@ -140,7 +140,7 @@ class PdfStorage extends Controller
             'DOCNUM' => $docNum,
             'COMPANY' => $company,
             'WHS' => $warehouse,
-            'SHUSER' => m3_user() !== '' ? Str::upper(m3_user()) : 'WebUser',
+            'SHUSER' => m3User() !== '' ? Str::upper(m3User()) : 'WebUser',
             'SHSOURCE' => 'PdfStorageAPI',
         ];
         $this->safeLog($context, 'An Error Occured -' . $message, true);
diff --git a/Modules/M3/Http/Controllers/API/ReplenAPI.php b/Modules/M3/Http/Controllers/API/ReplenAPI.php
index f1ade14c..d8d5ac80 100755
--- a/Modules/M3/Http/Controllers/API/ReplenAPI.php
+++ b/Modules/M3/Http/Controllers/API/ReplenAPI.php
@@ -28,7 +28,7 @@ class ReplenAPI extends Controller
         // dd($request->all());
         // Log::info( $request->all() );
         // Get The Calling User
-        $sHUSER = m3_user() !== '' ? Str::upper(m3_user()) : 'WebUser';
+        $sHUSER = m3User() !== '' ? Str::upper(m3User()) : 'WebUser';
         $mACPKR = isset($mACPKR) ? $mACPKR : self::ZERO_PAD;
         $sHSOURCE = 'M3InventoryReportReplen';
         $m3Errors = '';
diff --git a/Modules/M3/Http/Controllers/API/TransferAPI.php b/Modules/M3/Http/Controllers/API/TransferAPI.php
index 288ece6d..78d16ee6 100755
--- a/Modules/M3/Http/Controllers/API/TransferAPI.php
+++ b/Modules/M3/Http/Controllers/API/TransferAPI.php
@@ -31,7 +31,7 @@ class TransferAPI extends Controller
         ini_set('default_socket_timeout', Config::get('arrays.PHPTimeOut'));
 
         // Get the Calling User
-        $sHUSER = m3_user() !== '' ? Str::upper(m3_user()) : 'WebUser';
+        $sHUSER = m3User() !== '' ? Str::upper(m3User()) : 'WebUser';
         // Set SHSOURCE
         $sHSOURCE = 'TransferAPIURL';
         $m3Errors = '';
@@ -441,7 +441,7 @@ class TransferAPI extends Controller
         ini_set('default_socket_timeout', Config::get('arrays.PHPTimeOut'));
 
         // Get the Calling User
-        $sHUSER = m3_user() !== '' ? Str::upper(m3_user()) : 'WebUser';
+        $sHUSER = m3User() !== '' ? Str::upper(m3User()) : 'WebUser';
         // Set SHSOURCE
         $sHSOURCE = 'UpdateShipmentNumber';
         $m3Errors = '';
diff --git a/Modules/M3/Http/Controllers/API/TwoShipAPIs.php b/Modules/M3/Http/Controllers/API/TwoShipAPIs.php
index 9ba3e194..bfae73a9 100755
--- a/Modules/M3/Http/Controllers/API/TwoShipAPIs.php
+++ b/Modules/M3/Http/Controllers/API/TwoShipAPIs.php
@@ -20,7 +20,7 @@ class TwoShipAPIs extends Controller
     public function TwoShipUpdateHold(Request $request)
     {
         $this->configureTimeouts();
-        $user = m3_user() !== '' ? Str::upper(m3_user()) : 'WebUser';
+        $user = m3User() !== '' ? Str::upper(m3User()) : 'WebUser';
         $params = $request->all();
         $whs = (string) ($params['WHS'] ?? '');
         $co = (string) ($params['COMPANY'] ?? '');
diff --git a/Modules/M3/Http/Controllers/BoxPackToPalletController.php b/Modules/M3/Http/Controllers/BoxPackToPalletController.php
index cbf12346..246e3742 100755
--- a/Modules/M3/Http/Controllers/BoxPackToPalletController.php
+++ b/Modules/M3/Http/Controllers/BoxPackToPalletController.php
@@ -77,7 +77,7 @@ class BoxPackToPalletController extends Controller
         $box = trim((string) ($request->R659BOX ?? ''));
         abort_if($box === '', 400, 'Box Not Found');
 
-        $user = m3_user() !== '' ? Str::upper(m3_user()) : 'WebUser';
+        $user = m3User() !== '' ? Str::upper(m3User()) : 'WebUser';
         $profile = self::getUserWhsCoPlant();
         $validation = self::validateScannedBox($pallet, $box, $profile);
 
@@ -268,7 +268,7 @@ class BoxPackToPalletController extends Controller
     // Get Logged User CO/WHS/PLANT
     public static function getUserWhsCoPlant()
     {
-        $sHUSER = m3_user() !== '' ? Str::upper(trim(m3_user())) : '';
+        $sHUSER = m3User() !== '' ? Str::upper(trim(m3User())) : '';
         // Get users from ICM428M
         $iCM428M = DB::connection(config('m3.connection', 'pgsql'))->table('icm428m')
             ->select('R428US', 'R428CO', 'R428WH', 'R428PL')
diff --git a/Modules/M3/Http/Controllers/CarrierMaintController.php b/Modules/M3/Http/Controllers/CarrierMaintController.php
index 6ac4972b..1fd31851 100755
--- a/Modules/M3/Http/Controllers/CarrierMaintController.php
+++ b/Modules/M3/Http/Controllers/CarrierMaintController.php
@@ -25,7 +25,7 @@ class CarrierMaintController extends Controller
         if ($schema->hasTable('icm428m')) {
             $power_user = DB::connection(config('m3.connection', 'pgsql'))->table('icm428m')
                 ->select('R428PWRUSR', 'R428CO', 'R428PL', 'R428WH')
-                ->where('R428US', strtoupper(m3_user()))->get()->all();
+                ->where('R428US', strtoupper(m3User()))->get()->all();
         }
 
         return view('m3::liberty-theme.pages.carrierMaint', ['ICM160M' => $iCM160M, 'power_user' => $power_user]);
diff --git a/Modules/M3/Http/Controllers/ExecSummaryController.php b/Modules/M3/Http/Controllers/ExecSummaryController.php
index ef5f97aa..8260749d 100755
--- a/Modules/M3/Http/Controllers/ExecSummaryController.php
+++ b/Modules/M3/Http/Controllers/ExecSummaryController.php
@@ -137,7 +137,7 @@ class ExecSummaryController extends Controller
             }
 
             // Init Page
-            $sHUSER = m3_user() !== '' ? Str::upper(trim(m3_user())) : '';
+            $sHUSER = m3User() !== '' ? Str::upper(trim(m3User())) : '';
             if ($sHUSER != '') {
                 // Get User CO & WH from Table ICM428M
                 $iCM428M = DB::connection(config('m3.connection', 'pgsql'))->table('icm428m')
diff --git a/Modules/M3/Http/Controllers/ExecSummaryLineController.php b/Modules/M3/Http/Controllers/ExecSummaryLineController.php
index 322ebfd5..0b82a612 100755
--- a/Modules/M3/Http/Controllers/ExecSummaryLineController.php
+++ b/Modules/M3/Http/Controllers/ExecSummaryLineController.php
@@ -178,7 +178,7 @@ class ExecSummaryLineController extends Controller
             }
 
             // Init Page
-            $sHUSER = m3_user() !== '' ? Str::upper(trim(m3_user())) : '';
+            $sHUSER = m3User() !== '' ? Str::upper(trim(m3User())) : '';
             if ($sHUSER != '') {
                 // Get User CO & WH from Table ICM428M
                 $iCM428M = DB::connection(config('m3.connection', 'pgsql'))->table('icm428m')
diff --git a/Modules/M3/Http/Controllers/M3DeliveryController.php b/Modules/M3/Http/Controllers/M3DeliveryController.php
index 04e5b288..cff4db6d 100755
--- a/Modules/M3/Http/Controllers/M3DeliveryController.php
+++ b/Modules/M3/Http/Controllers/M3DeliveryController.php
@@ -12,10 +12,10 @@ class M3DeliveryController extends Controller
     public static function index(Request $request)
     {
         $connection = config('m3.connection', 'pgsql');
-        $power_user = (object) ['R428PWRUSR' => 'N', 'R428US' => strtoupper(m3_user()), 'R428CO' => '', 'R428PL' => '', 'R428WH' => ''];
+        $power_user = (object) ['R428PWRUSR' => 'N', 'R428US' => strtoupper(m3User()), 'R428CO' => '', 'R428PL' => '', 'R428WH' => ''];
         if (Schema::connection($connection)->hasTable('icm428m')) {
             $power_user = DB::connection($connection)->table('icm428m')->select('R428PWRUSR', 'R428US', 'R428CO', 'R428PL', 'R428WH')
-                ->where('R428US', strtoupper(m3_user()))->first() ?? $power_user;
+                ->where('R428US', strtoupper(m3User()))->first() ?? $power_user;
         }
         $co = $power_user->R428CO;
         $plant = $power_user->R428PL;
diff --git a/Modules/M3/Http/Controllers/M3ErrorsDispController.php b/Modules/M3/Http/Controllers/M3ErrorsDispController.php
index fcd3cc54..ee8e18b0 100755
--- a/Modules/M3/Http/Controllers/M3ErrorsDispController.php
+++ b/Modules/M3/Http/Controllers/M3ErrorsDispController.php
@@ -73,7 +73,7 @@ class M3ErrorsDispController extends Controller
             'STARTDATE' => trim((string) $request->input('STARTDATE', today()->subDays(1)->format('Y-m-d'))),
             'ENDDATE' => trim((string) $request->input('ENDDATE', today()->format('Y-m-d'))),
             'SHOWERRORS' => trim((string) $request->input('SHOWERRORS', 'N')),
-            'SHUSER' => m3_user() !== '' ? Str::upper(trim(m3_user())) : '',
+            'SHUSER' => m3User() !== '' ? Str::upper(trim(m3User())) : '',
             'SKIPDATES' => trim((string) $request->input('SKIPDATES', 'N')),
         ];
     }
@@ -147,7 +147,7 @@ class M3ErrorsDispController extends Controller
         $sHTIME = $request->SHTIME != null ? trim($request->SHTIME) : '';
         $sHTYPE = $request->SHTYPE != null ? trim($request->SHTYPE) : '';
         $sHACKNOTE = $request->SHACKNOTE != null ? trim(substr($request->SHACKNOTE, 0, 99)) : '';
-        $sHUSER = m3_user() !== '' ? Str::upper(m3_user()) : '';
+        $sHUSER = m3User() !== '' ? Str::upper(m3User()) : '';
         $cLOSESIM = $request->CLOSESIM != null ? trim($request->CLOSESIM) : 'N';
 
         if ($cLOSESIM == 'N') {
@@ -242,7 +242,7 @@ class M3ErrorsDispController extends Controller
             'endDate' => trim((string) $request->input('ENDDATE', today()->format('Y-m-d'))),
             'showErrors' => trim((string) $request->input('SHOWERRORS', 'N')),
             'skipDates' => trim((string) $request->input('SKIPDATES', 'N')),
-            'user' => Str::upper(trim(m3_user())),
+            'user' => Str::upper(trim(m3User())),
         ];
     }
 
diff --git a/Modules/M3/Http/Controllers/M3GetPDFFromCacheController.php b/Modules/M3/Http/Controllers/M3GetPDFFromCacheController.php
index 680d7e6c..c15bb4c2 100755
--- a/Modules/M3/Http/Controllers/M3GetPDFFromCacheController.php
+++ b/Modules/M3/Http/Controllers/M3GetPDFFromCacheController.php
@@ -24,7 +24,7 @@ class M3GetPDFFromCacheController extends Controller
             // Initialise  Vars
             $pDFArray = $trackingno = $carrier = $iCM688M1 = [];
 
-            $sHUSER = m3_user() !== '' ? Str::upper(trim(m3_user())) : '';
+            $sHUSER = m3User() !== '' ? Str::upper(trim(m3User())) : '';
 
             if ($sHUSER != '') {
                 // Get User CO & WH
diff --git a/Modules/M3/Http/Controllers/MFOrdersController.php b/Modules/M3/Http/Controllers/MFOrdersController.php
index 8cd76460..4bd6af5c 100755
--- a/Modules/M3/Http/Controllers/MFOrdersController.php
+++ b/Modules/M3/Http/Controllers/MFOrdersController.php
@@ -16,7 +16,7 @@ class MFOrdersController extends Controller
         // Get Users from ICM428M
         $iCM428M = DB::connection(config('m3.connection', 'pgsql'))->table('icm428m')
             ->select('R428US', 'R428CO', 'R428WH', 'R428PL')
-            ->where('R428US', '=', strtoupper(m3_user()))
+            ->where('R428US', '=', strtoupper(m3User()))
             ->first();
         $co = $iCM428M->R428CO;
         $whs = $iCM428M->R428WH;
diff --git a/Modules/M3/Http/Controllers/OrderLinesOfClosedOrder.php b/Modules/M3/Http/Controllers/OrderLinesOfClosedOrder.php
index 46829dc4..16ab99f9 100755
--- a/Modules/M3/Http/Controllers/OrderLinesOfClosedOrder.php
+++ b/Modules/M3/Http/Controllers/OrderLinesOfClosedOrder.php
@@ -237,7 +237,7 @@ class OrderLinesOfClosedOrder extends Controller
 
     private static function userWarehouseContext(string $defaultCompany = '', string $defaultPlant = '', string $defaultWarehouse = ''): array
     {
-        $user = trim((string) m3_user());
+        $user = trim((string) m3User());
         if ($user === '') {
             return [$defaultCompany, $defaultPlant, $defaultWarehouse];
         }
diff --git a/Modules/M3/Http/Controllers/PalletQtyController.php b/Modules/M3/Http/Controllers/PalletQtyController.php
index a7dea4e3..afc9b038 100755
--- a/Modules/M3/Http/Controllers/PalletQtyController.php
+++ b/Modules/M3/Http/Controllers/PalletQtyController.php
@@ -13,11 +13,11 @@ class PalletQtyController extends Controller
     public static function index(Request $request)
     {
         $connection = config('m3.connection', 'pgsql');
-        $power_user = (object) ['R428PWRUSR' => 'N', 'R428US' => strtoupper(m3_user()), 'R428CO' => '', 'R428PL' => '', 'R428WH' => ''];
+        $power_user = (object) ['R428PWRUSR' => 'N', 'R428US' => strtoupper(m3User()), 'R428CO' => '', 'R428PL' => '', 'R428WH' => ''];
         if (Schema::connection($connection)->hasTable('icm428m')) {
             $power_user = DB::connection($connection)->table('icm428m')
                 ->select('R428PWRUSR', 'R428US', 'R428CO', 'R428PL', 'R428WH')
-                ->where('R428US', '=', strtoupper(m3_user()))->first() ?? $power_user;
+                ->where('R428US', '=', strtoupper(m3User()))->first() ?? $power_user;
         }
         $co = $power_user->R428CO;
         $plant = $power_user->R428PL;
diff --git a/Modules/M3/Http/Controllers/PendingClosureController.php b/Modules/M3/Http/Controllers/PendingClosureController.php
index 97252319..e14db322 100755
--- a/Modules/M3/Http/Controllers/PendingClosureController.php
+++ b/Modules/M3/Http/Controllers/PendingClosureController.php
@@ -15,7 +15,7 @@ class PendingClosureController extends Controller
         // Get Users from ICM428M
         $iCM428M = DB::connection(config('m3.connection', 'pgsql'))->table('icm428m')
             ->select('R428US', 'R428CO', 'R428WH', 'R428PL')
-            ->where('R428US', '=', strtoupper(m3_user()))
+            ->where('R428US', '=', strtoupper(m3User()))
             ->first();
         $user = $iCM428M->R428US;
         $co = $iCM428M->R428CO;
diff --git a/Modules/M3/Http/Controllers/ReplenishSettingsController.php b/Modules/M3/Http/Controllers/ReplenishSettingsController.php
index a3bd9f76..0121110c 100755
--- a/Modules/M3/Http/Controllers/ReplenishSettingsController.php
+++ b/Modules/M3/Http/Controllers/ReplenishSettingsController.php
@@ -19,7 +19,7 @@ class ReplenishSettingsController extends Controller
         // $iC670M    = DB::connection(config('m3.connection', 'pgsql'))->table('ic670m')->get();
 
         // Get Logged user Id
-        $userId = m3_user() !== '' ? strtoupper(m3_user()) : '';
+        $userId = m3User() !== '' ? strtoupper(m3User()) : '';
         // $userId     = 'E1135818';  // Brad : E1135818  Malak : E2011812  ACOM_PDF
         $connection = config('m3.connection', 'pgsql');
         $iCM428M = Schema::connection($connection)->hasTable('icm428m')
@@ -140,7 +140,7 @@ class ReplenishSettingsController extends Controller
         // $iC670M    = DB::connection(config('m3.connection', 'pgsql'))->table('ic670m')->get();
 
         // Get Logged user Id
-        $userId = m3_user() !== '' ? strtoupper(m3_user()) : '';
+        $userId = m3User() !== '' ? strtoupper(m3User()) : '';
         // $userId     = 'E1135818';  // Brad : E1135818  Malak : E2011812  ACOM_PDF
         $connection = config('m3.connection', 'pgsql');
         $iCM428M = Schema::connection($connection)->hasTable('icm428m')
diff --git a/Modules/M3/Http/Controllers/UserControlController.php b/Modules/M3/Http/Controllers/UserControlController.php
index 28452efb..62fca8a3 100755
--- a/Modules/M3/Http/Controllers/UserControlController.php
+++ b/Modules/M3/Http/Controllers/UserControlController.php
@@ -21,7 +21,7 @@ class UserControlController extends Controller
         $connection = config('m3.connection', 'pgsql');
         $profile = null;
         if (Schema::connection($connection)->hasTable('icm428m')) {
-            $profile = DB::connection($connection)->table('icm428m')->where('R428US', strtoupper(m3_user()))->first();
+            $profile = DB::connection($connection)->table('icm428m')->where('R428US', strtoupper(m3User()))->first();
         }
         $co = $profile->R428CO ?? '';
         $whs = $profile->R428WH ?? '';
diff --git a/Modules/M3/Http/Controllers/UserPickingStats4.php b/Modules/M3/Http/Controllers/UserPickingStats4.php
index d9f42cbb..15f037ce 100755
--- a/Modules/M3/Http/Controllers/UserPickingStats4.php
+++ b/Modules/M3/Http/Controllers/UserPickingStats4.php
@@ -38,7 +38,7 @@ class UserPickingStats4 extends Controller
         if ($schema->hasTable('icm428m')) {
             $profile = DB::connection(config('m3.connection', 'pgsql'))->table('icm428m')
                 ->select('R428US', 'R428CO', 'R428WH')
-                ->where('R428US', '=', strtoupper(m3_user()))
+                ->where('R428US', '=', strtoupper(m3User()))
                 ->first();
             $co = $profile->R428CO ?? '';
             $whs = $profile->R428WH ?? '';
diff --git a/Modules/M3/Http/Controllers/UserPickingStats5.php b/Modules/M3/Http/Controllers/UserPickingStats5.php
index 72277a71..6db502c7 100755
--- a/Modules/M3/Http/Controllers/UserPickingStats5.php
+++ b/Modules/M3/Http/Controllers/UserPickingStats5.php
@@ -56,7 +56,7 @@ class UserPickingStats5 extends Controller
 
             $profile = DB::connection($connection)->table('icm428m')
                 ->select('R428CO', 'R428WH')
-                ->where('R428US', strtoupper((string) m3_user()))
+                ->where('R428US', strtoupper((string) m3User()))
                 ->first();
             $co = trim((string) ($profile->R428CO ?? ''));
             $whs = trim((string) ($profile->R428WH ?? ''));
diff --git a/Modules/M3/Http/Controllers/UserProfileController.php b/Modules/M3/Http/Controllers/UserProfileController.php
index aed3d27d..a33a0b1a 100755
--- a/Modules/M3/Http/Controllers/UserProfileController.php
+++ b/Modules/M3/Http/Controllers/UserProfileController.php
@@ -12,7 +12,7 @@ class UserProfileController extends Controller
     {
 
         // Get Current USER
-        $loggedUser = strtoupper(m3_user());
+        $loggedUser = strtoupper(m3User());
 
         $iCM428M = DB::connection(config('m3.connection', 'pgsql'))->table('icm428m')
             ->select('R428US', 'R428CO', 'R428WH', 'R428PL', 'R428FIRST', 'R428FAMILY')
diff --git a/Modules/M3/Http/Controllers/UtilitiesController.php b/Modules/M3/Http/Controllers/UtilitiesController.php
index 9a990b55..f917629a 100755
--- a/Modules/M3/Http/Controllers/UtilitiesController.php
+++ b/Modules/M3/Http/Controllers/UtilitiesController.php
@@ -170,7 +170,7 @@ class UtilitiesController extends Controller
 
             // Get the Calling User
             // $userId  = 'TWOSHIP';
-            // $sHUSER  = isset($userId) ? $userId : (m3_user() !== '' ? Str::upper(trim(m3_user())) : '');
+            // $sHUSER  = isset($userId) ? $userId : (m3User() !== '' ? Str::upper(trim(m3User())) : '');
 
             // Get Manifest Array
             $gSArray = $request->query();
diff --git a/Modules/M3/Http/Controllers/WhsPerfMetrics.php b/Modules/M3/Http/Controllers/WhsPerfMetrics.php
index 5d2a5f5e..e6784a47 100755
--- a/Modules/M3/Http/Controllers/WhsPerfMetrics.php
+++ b/Modules/M3/Http/Controllers/WhsPerfMetrics.php
@@ -60,7 +60,7 @@ class WhsPerfMetrics extends Controller
     private static function loadUserContext(): array
     {
         $connection = config('m3.connection', 'pgsql');
-        $user = Str::upper(trim((string) m3_user()));
+        $user = Str::upper(trim((string) m3User()));
 
         if ($user === '' || ! Schema::connection($connection)->hasTable('icm428m')) {
             return ['COMPANY' => '', 'PLANT' => '', 'WHS' => ''];
diff --git a/Modules/M3/Http/Controllers/WhsePerfController.php b/Modules/M3/Http/Controllers/WhsePerfController.php
index a87d36d9..acb19ac9 100755
--- a/Modules/M3/Http/Controllers/WhsePerfController.php
+++ b/Modules/M3/Http/Controllers/WhsePerfController.php
@@ -35,7 +35,7 @@ class WhsePerfController extends Controller
 
         $iCM711M = DB::connection(config('m3.connection', 'pgsql'))->select($sqlstmt);
         $uSER_INFO = DB::connection(config('m3.connection', 'pgsql'))->table('icm428m')->selectRaw('R428US as USERPRF, R428STS as STATUS, NULL as DATE_EXPIRED, NULL as EXPIRED')->get()->all();
-        $power_user = DB::connection(config('m3.connection', 'pgsql'))->select("select R428PWRUSR, R428CO, R428PL, R428WH from ICM428M where R428US='" . strtoupper(m3_user()) . "'");
+        $power_user = DB::connection(config('m3.connection', 'pgsql'))->select("select R428PWRUSR, R428CO, R428PL, R428WH from ICM428M where R428US='" . strtoupper(m3User()) . "'");
 
         $pct_array = Config::get('arrays.whsePerf_targets');
 
@@ -58,7 +58,7 @@ class WhsePerfController extends Controller
 
         $iCM711M = DB::connection(config('m3.connection', 'pgsql'))->select($sqlstmt);
         $uSER_INFO = DB::connection(config('m3.connection', 'pgsql'))->table('icm428m')->selectRaw('R428US as USERPRF, R428STS as STATUS, NULL as DATE_EXPIRED, NULL as EXPIRED')->get()->all();
-        $power_user = DB::connection(config('m3.connection', 'pgsql'))->select("select R428PWRUSR, R428CO, R428PL, R428WH from ICM428M where R428US='" . strtoupper(m3_user()) . "'");
+        $power_user = DB::connection(config('m3.connection', 'pgsql'))->select("select R428PWRUSR, R428CO, R428PL, R428WH from ICM428M where R428US='" . strtoupper(m3User()) . "'");
 
         $pct_array = Config::get('arrays.whsePerf_targets');
 
diff --git a/Modules/M3/Http/Middleware/BasicAuth.php b/Modules/M3/Http/Middleware/BasicAuth.php
index 7dc997d3..cb0f79d1 100755
--- a/Modules/M3/Http/Middleware/BasicAuth.php
+++ b/Modules/M3/Http/Middleware/BasicAuth.php
@@ -10,8 +10,8 @@ class BasicAuth
 {
     public function handle(Request $request, Closure $next): mixed
     {
-        $login = trim((string) m3_user());
-        $password = (string) m3_legacy_password();
+        $login = trim((string) m3User());
+        $password = (string) m3LegacyPassword();
 
         if ($login !== '' && $this->checkPassword($login, $password, '%%SYSTEM%%')) {
             return $next($request);
diff --git a/Modules/M3/Resources/public/liberty-theme/css/styles.css b/Modules/M3/Resources/public/liberty-theme/css/styles.css
index 95c0c8aa..48c9f01f 100755
--- a/Modules/M3/Resources/public/liberty-theme/css/styles.css
+++ b/Modules/M3/Resources/public/liberty-theme/css/styles.css
@@ -5008,12 +5008,6 @@ textarea.form-control-lg {
   color: #101214;
 }
 
-@-webkit-keyframes progress-bar-stripes {
-  0% {
-    background-position-x: 1rem;
-  }
-}
-
 @keyframes progress-bar-stripes {
   0% {
     background-position-x: 1rem;
@@ -6198,12 +6192,6 @@ textarea.form-control-lg {
   color: #000;
 }
 
-@-webkit-keyframes spinner-border {
-  to {
-    transform: rotate(360deg) /* rtl:ignore */;
-  }
-}
-
 @keyframes spinner-border {
   to {
     transform: rotate(360deg) /* rtl:ignore */;
@@ -6227,16 +6215,6 @@ textarea.form-control-lg {
   border-width: 0.2em;
 }
 
-@-webkit-keyframes spinner-grow {
-  0% {
-    transform: scale(0);
-  }
-  50% {
-    opacity: 1;
-    transform: none;
-  }
-}
-
 @keyframes spinner-grow {
   0% {
     transform: scale(0);
@@ -6398,12 +6376,6 @@ textarea.form-control-lg {
           animation: placeholder-glow 2s ease-in-out infinite;
 }
 
-@-webkit-keyframes placeholder-glow {
-  50% {
-    opacity: 0.2;
-  }
-}
-
 @keyframes placeholder-glow {
   50% {
     opacity: 0.2;
@@ -6418,13 +6390,6 @@ textarea.form-control-lg {
           animation: placeholder-wave 2s linear infinite;
 }
 
-@-webkit-keyframes placeholder-wave {
-  100% {
-    -webkit-mask-position: -200% 0%;
-            mask-position: -200% 0%;
-  }
-}
-
 @keyframes placeholder-wave {
   100% {
     -webkit-mask-position: -200% 0%;
diff --git a/Modules/M3/Resources/views/liberty-theme/layout/main.blade.php b/Modules/M3/Resources/views/liberty-theme/layout/main.blade.php
index cfccd7f1..97eae9c8 100755
--- a/Modules/M3/Resources/views/liberty-theme/layout/main.blade.php
+++ b/Modules/M3/Resources/views/liberty-theme/layout/main.blade.php
@@ -1,6 +1,6 @@
 @php
     # Get Current USER
-    $loggedUser  = strtoUpper(m3_user());
+    $loggedUser  = strtoUpper(m3User());
 
     $admin_users = $power_users = $csr = $execUser = "";
     $UserCO = $UserWHS = $UserPL = '';
diff --git a/Modules/M3/Resources/views/liberty-theme/pages/BoxPackToPalletScan.blade.php b/Modules/M3/Resources/views/liberty-theme/pages/BoxPackToPalletScan.blade.php
index f62f4393..1167c13a 100755
--- a/Modules/M3/Resources/views/liberty-theme/pages/BoxPackToPalletScan.blade.php
+++ b/Modules/M3/Resources/views/liberty-theme/pages/BoxPackToPalletScan.blade.php
@@ -25,7 +25,7 @@
                             <div class="col-auto border-start ps-3">
                                 <span class="text-muted small">User</span>
                                 <span id="hdr-user" class="ms-1">
-                                    {{ $palletHeader->R659USER ?? (m3_user() !== '' ? Str::upper(m3_user()) : '—') }}
+                                    {{ $palletHeader->R659USER ?? (m3User() !== '' ? Str::upper(m3User()) : '—') }}
                                 </span>
                             </div>
                             <div class="col-auto border-start ps-3">
diff --git a/Modules/M3/Resources/views/liberty-theme/pages/M3GetPDF.blade.php b/Modules/M3/Resources/views/liberty-theme/pages/M3GetPDF.blade.php
index f827f412..d04a4ad6 100755
--- a/Modules/M3/Resources/views/liberty-theme/pages/M3GetPDF.blade.php
+++ b/Modules/M3/Resources/views/liberty-theme/pages/M3GetPDF.blade.php
@@ -20,7 +20,7 @@ Sentinel Doc Archive
                                 </div>
                                 <label for="recipient-name" class="col-sm-1 col-form-label">Warehouse:</label>
                                 <div class="col-sm-2">
-                                    <select class="form-select"  id="WHDDA" aria-label="Warehouse" tabindex="-1" disabled>
+                                    <select class="form-select"  id="WHDDA" tabindex="-1" disabled>
                                         @foreach ($IC670M as $key => $IC670MR)
                                             @php $currentWHDDA =  trim($IC670MR->WDCO).trim($IC670MR->WDPL).trim($IC670MR->WDWHS); @endphp
                                             <option  value="{{ $currentWHDDA }}"
diff --git a/Modules/M3/Resources/views/liberty-theme/pages/OrderLinesOfClosed.blade.php b/Modules/M3/Resources/views/liberty-theme/pages/OrderLinesOfClosed.blade.php
index e7029b81..cf63ab03 100755
--- a/Modules/M3/Resources/views/liberty-theme/pages/OrderLinesOfClosed.blade.php
+++ b/Modules/M3/Resources/views/liberty-theme/pages/OrderLinesOfClosed.blade.php
@@ -28,8 +28,8 @@
                                 </div>
 
                                 <div class="col">
-                                    <label for="recipient-name" >Warehouse:</label>
-                                    <select class="form-select"  id="WHDDA" aria-label="Warehouse" tabindex="-1" disabled>
+                                    <label for="WHDDA" >Warehouse:</label>
+                                    <select class="form-select"  id="WHDDA" tabindex="-1" disabled>
                                         @foreach ($IC670M as $key => $IC670MR)
                                             @php $currentWHDDA =  trim($IC670MR->WDCO).trim($IC670MR->WDPL).trim($IC670MR->WDWHS); @endphp
                                             <option  value="{{ $currentWHDDA }}"
diff --git a/Modules/M3/Resources/views/liberty-theme/pages/ReplenishSettings.blade.php b/Modules/M3/Resources/views/liberty-theme/pages/ReplenishSettings.blade.php
index 46bedc25..01e70c4b 100755
--- a/Modules/M3/Resources/views/liberty-theme/pages/ReplenishSettings.blade.php
+++ b/Modules/M3/Resources/views/liberty-theme/pages/ReplenishSettings.blade.php
@@ -79,7 +79,7 @@
             <div class="modal-content">
                 <div class="modal-header">
                     <h5 class="modal-title" id="addModalLabel">Add Record</h5>
-                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
                 </div>
                 <form class="needs-validation" id="addReplen" method="POST" action="{{ route("m3.replenishmentSettings.store") }}" enctype="multipart/form-data">
                     <div class="modal-body">
@@ -87,7 +87,7 @@
                         <div class="row">
                             <div class="col-6">
                                 <div class="mb-3">
-                                    <label for="recipient-name" class="col-form-label">Part:</label>
+                                    <label for="WHDDA" class="col-form-label">Part:</label>
                                     <label for="R658PNA" class="visually-hidden">R658PN</label>
 <input type="text" class="form-control" name="R658PN" id="R658PNA" required>
                                 </div>
@@ -121,7 +121,7 @@
                             <div class="col-6">
                                 <div class="mb-3">
                                 <label for="recipient-name" class="col-form-label">Warehouse:</label>
-                                <select class="form-select"  id="WHDDA" aria-label="Select Warehouse" tabindex="0" required>
+                                <select class="form-select"  id="WHDDA" tabindex="0" required>
                                     <option value="">Select Warehouse</option>
                                     @foreach ($IC670M as $key => $IC670MR)
                                         <option  value="{{ trim($IC670MR->WDCO).trim($IC670MR->WDPL).trim($IC670MR->WDWHS) }}"
@@ -172,7 +172,7 @@
             <div class="modal-content">
                 <div class="modal-header">
                     <h5 class="modal-title" id="editModalLabel">Edit Record</h5>
-                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
                 </div>
                 <form class="needs-validation" id="editReplen" method="POST" action="replenishmentSettingsUpdate"
                     enctype="multipart/form-data">
@@ -214,8 +214,8 @@
 
                             <div class="col-6">
                                 <div class="mb-3">
-                                <label for="recipient-name" class="col-form-label">Warehouse:</label>
-                                <select class="form-select"  id="WHDD" aria-label="Select Warehouse" tabindex="0" disabled>
+                                <label for="WHDD" class="col-form-label">Warehouse:</label>
+                                <select class="form-select"  id="WHDD" tabindex="0" disabled>
                                     <option value="">Select Warehouse</option>
                                     @foreach ($IC670M as $key => $IC670MR)
                                         <option  value="{{ trim($IC670MR->WDCO).trim($IC670MR->WDPL).trim($IC670MR->WDWHS) }}"
diff --git a/Modules/M3/Resources/views/liberty-theme/pages/WhsPerfMetrics.blade.php b/Modules/M3/Resources/views/liberty-theme/pages/WhsPerfMetrics.blade.php
index 4128fb98..1aaab0ee 100755
--- a/Modules/M3/Resources/views/liberty-theme/pages/WhsPerfMetrics.blade.php
+++ b/Modules/M3/Resources/views/liberty-theme/pages/WhsPerfMetrics.blade.php
@@ -18,8 +18,8 @@ Warehouse Performance Metrics report
                         </div> --}}
 
                         <div class="col">
-                            <label for="recipient-name" >Warehouse:</label>
-                            <select class="form-select"  id="WHDDA" aria-label="Warehouse" tabindex="-1" disabled>
+                            <label for="WHDDA" >Warehouse:</label>
+                            <select class="form-select"  id="WHDDA" tabindex="-1" disabled>
                                 @foreach ($IC670M as $key => $IC670MR)
                                     @php $currentWHDDA =  trim($IC670MR->WDCO).trim($IC670MR->WDPL).trim($IC670MR->WDWHS); @endphp
                                     <option  value="{{ $currentWHDDA }}"
diff --git a/Modules/M3/Resources/views/liberty-theme/pages/exedashboard.blade.php b/Modules/M3/Resources/views/liberty-theme/pages/exedashboard.blade.php
index f535d08b..6a216a53 100755
--- a/Modules/M3/Resources/views/liberty-theme/pages/exedashboard.blade.php
+++ b/Modules/M3/Resources/views/liberty-theme/pages/exedashboard.blade.php
@@ -28,7 +28,7 @@ Solon Sentinel Portal
                     <div class="row mb-3">
                         <label for="inputWhs" class="col-sm-2 col-form-label">Warehouse</label>
                             <div class="col-sm-10">
-                                <select aria-label="*ALL" name="whs" class="form-control">
+                                <select name="whs" class="form-control">
                                     <option value="*ALL">*ALL</option>
                                     @foreach($whs_array as $key)
                                         <option value={{$key}}
diff --git a/Modules/M3/Resources/views/liberty-theme/pages/userPickingStats4.blade.php b/Modules/M3/Resources/views/liberty-theme/pages/userPickingStats4.blade.php
index 8cdb7926..afb86169 100755
--- a/Modules/M3/Resources/views/liberty-theme/pages/userPickingStats4.blade.php
+++ b/Modules/M3/Resources/views/liberty-theme/pages/userPickingStats4.blade.php
@@ -26,7 +26,7 @@ Solon Sentinel Portal - Daily User Efficiency
                         <div class="row mb-3">
                         <label for="inputUser" class="col-sm-2 col-form-label">User</label>
                             <div class="col-sm-10">
-                                <select aria-label="" name="user" class="form-select">
+                                <select name="user" class="form-select">
                                     <option value="" selected> </option>
                                     @foreach($user_array as $key=>$val)
                                         <option value={{$val['userprf']}}
diff --git a/Modules/M3/Resources/views/liberty-theme/pages/userPickingStats4_old.blade.php b/Modules/M3/Resources/views/liberty-theme/pages/userPickingStats4_old.blade.php
index 1dfbd5d3..aab2c817 100755
--- a/Modules/M3/Resources/views/liberty-theme/pages/userPickingStats4_old.blade.php
+++ b/Modules/M3/Resources/views/liberty-theme/pages/userPickingStats4_old.blade.php
@@ -28,7 +28,7 @@ Solon Sentinel Portal - userPickingStats v4
                         <div class="row mb-3">
                         <label for="inputUser" class="col-sm-2 col-form-label">User</label>
                             <div class="col-sm-10">
-                                <select aria-label="" name="user" class="form-control">
+                                <select name="user" class="form-control">
                                     <option value="" selected> </option>
                                     @foreach($user_array as $key=>$val)
                                         <option value={{$val['userprf']}}
diff --git a/Modules/M3/Resources/views/liberty-theme/pages/userPickingStats5.blade.php b/Modules/M3/Resources/views/liberty-theme/pages/userPickingStats5.blade.php
index edeb6704..c110b068 100755
--- a/Modules/M3/Resources/views/liberty-theme/pages/userPickingStats5.blade.php
+++ b/Modules/M3/Resources/views/liberty-theme/pages/userPickingStats5.blade.php
@@ -26,7 +26,7 @@ Solon Sentinel Portal - Graph User Efficiency
                         <div class="row mb-3">
                             <label for="inputUser" class="col-sm-2 col-form-label">User</label>
                             <div class="col-sm-10">
-                                <select aria-label="User" name="user" class="form-select">
+                                <select name="user" class="form-select">
                                     @foreach($user_array as $key=>$val)
                                         <option value={{$val['userprf']}}
                                                 @if($val['userprf']==$user) selected @endif
diff --git a/Modules/M3/Resources/views/liberty-theme/pages/whsePerfRequest.blade.php b/Modules/M3/Resources/views/liberty-theme/pages/whsePerfRequest.blade.php
index 90b6bfd9..d5c8a8fe 100755
--- a/Modules/M3/Resources/views/liberty-theme/pages/whsePerfRequest.blade.php
+++ b/Modules/M3/Resources/views/liberty-theme/pages/whsePerfRequest.blade.php
@@ -15,7 +15,7 @@ Sentinel Doc Archive
                             <div class="mb-2 row">
                                 <label for="date" class="col-sm-1 col-form-label">Select Year and Month</label>
                                 <div class="col-sm-1">
-                                    <select aria-label="Year" name="date_in_yr" id="date_in_yr">
+                                    <select name="date_in_yr" id="date_in_yr">
                                         @for($x=date('Y',strtotime(date('Y').'- 5 years'));$x<date('Y');$x++)
                                         <option value={{$x}}>{{$x}}</option>
                                         @endfor
diff --git a/Modules/M3/Resources/views/liberty-theme/partials/left-navigation.blade.php b/Modules/M3/Resources/views/liberty-theme/partials/left-navigation.blade.php
index 9dc5ecaa..6fb10608 100755
--- a/Modules/M3/Resources/views/liberty-theme/partials/left-navigation.blade.php
+++ b/Modules/M3/Resources/views/liberty-theme/partials/left-navigation.blade.php
@@ -120,7 +120,7 @@
 
                 {{-- Sentinel Home --}}
                 <a class="nav-link " href="{{ env("APP_URL") }}/php/SentinelHome.php">
-                    <i class="fa-fw fas fa-chart-bar mr-1"></i>Sentinel Home</a>
+                    <i class="fa-fw fas fa-chart-bar mr-1"></i>Sentinel Executive Home</a>
 
                 @endif
 
@@ -135,11 +135,11 @@
         </div>
         <div class="sb-sidenav-footer">
             <div class="small">Logged in as:</div>
-            {{ m3_user() }}
+            {{ m3User() }}
             {{-- @if($execUser=='Y')
-                <a class="link-primary" href="/userprofile">{{ m3_user() }}</a>
+                <a class="link-primary" href="/userprofile">{{ m3User() }}</a>
             @else
-                {{ m3_user() }}
+                {{ m3User() }}
             @endif --}}
         </div>
     </nav>
diff --git a/Modules/M3/Resources/views/liberty-theme/partials/modals/M3DeliveryAdd.blade.php b/Modules/M3/Resources/views/liberty-theme/partials/modals/M3DeliveryAdd.blade.php
index ca686c8e..038318b0 100755
--- a/Modules/M3/Resources/views/liberty-theme/partials/modals/M3DeliveryAdd.blade.php
+++ b/Modules/M3/Resources/views/liberty-theme/partials/modals/M3DeliveryAdd.blade.php
@@ -4,7 +4,7 @@
       <div class="modal-content">
         <div class="modal-header">
             <h5 class="modal-title">Add</h5>
-            <button type="button" class="btn-close close-modal" data-bs-dismiss="modal" aria-label="Close"></button>
+            <button type="button" class="btn-close close-modal" data-bs-dismiss="modal"></button>
         </div>
         <div class="modal-body">
             <div class="table-responsive" id="M3DeliveryAddData">
@@ -25,7 +25,7 @@
                         <tr>
                             <td><b>Ship Via</b></td> <!-- ALPHA -->
                             <td class="text-right">
-                                <select aria-label="Select Ship Via" id="addAVSHPVIA" name="addAVSHPVIA">
+                                <select id="addAVSHPVIA" name="addAVSHPVIA">
                                     <option value="">Select Ship Via</option>
                                     @foreach($shipvia as $key=>$val)
                                     <option value="{{$val->AXCODE}}">{{$val->AXCODE}} - {{$val->AXDESC}}</option>
@@ -36,7 +36,7 @@
                         <tr>
                             <td><b>Sentinel Route</b></td> <!-- ALPHA -->
                             <td class="text-right">
-                                <select aria-label="Addavshsrt" id="addAVSHSRT" name="addAVSHSRT">
+                                <select id="addAVSHSRT" name="addAVSHSRT">
                                     <option value=" "></option>
                                     <option value="GR">GR</option>
                                     <option value="PU">PU</option>
@@ -46,7 +46,7 @@
                         <tr>
                             <td><b>International Code</b></td> <!-- ALPHA -->
                             <td class="text-right">
-                                <select aria-label="Addavshorcl" id="addAVSHORCL" name="addAVSHORCL">
+                                <select id="addAVSHORCL" name="addAVSHORCL">
                                     <option value=" "  selected></option>
                                     <option value="Y">002 - International</option>
                                 </select>
diff --git a/Modules/M3/Resources/views/liberty-theme/partials/modals/M3DeliveryEdit.blade.php b/Modules/M3/Resources/views/liberty-theme/partials/modals/M3DeliveryEdit.blade.php
index 4ec52228..4817151a 100755
--- a/Modules/M3/Resources/views/liberty-theme/partials/modals/M3DeliveryEdit.blade.php
+++ b/Modules/M3/Resources/views/liberty-theme/partials/modals/M3DeliveryEdit.blade.php
@@ -4,7 +4,7 @@
       <div class="modal-content">
         <div class="modal-header">
           <h5 class="modal-title">Edit</h5>
-          <button type="button" class="btn-close close-modal" data-bs-dismiss="modal" aria-label="Close"></button>
+          <button type="button" class="btn-close close-modal" data-bs-dismiss="modal"></button>
         </div>
         <div class="modal-body">
             <div class="table-responsive" id="M3DeliveryEditData">
@@ -26,7 +26,7 @@
                             <td class="text-right">
                                 <label for="OLD_AVSHPVIA" class="visually-hidden">OLD AVSHPVIA</label>
 <input type="hidden" name="OLD_AVSHPVIA" id="OLD_AVSHPVIA">
-                                <select aria-label="Select Ship Via" id="AVSHPVIA" name="AVSHPVIA">
+                                <select id="AVSHPVIA" name="AVSHPVIA">
                                     <option value="">Select Ship Via</option>
                                     @foreach($shipvia as $key=>$val)
                                     <option value="{{$val->AXCODE}}">{{$val->AXCODE}} - {{$val->AXDESC}}</option>
@@ -39,7 +39,7 @@
                             <td class="text-right">
                                 <label for="OLD_AVSHSRT" class="visually-hidden">OLD AVSHSRT</label>
 <input type="hidden" name="OLD_AVSHSRT" id="OLD_AVSHSRT">
-                                <select aria-label="Avshsrt" id="AVSHSRT" name="AVSHSRT">
+                                <select id="AVSHSRT" name="AVSHSRT">
                                     <option value=" "></option>
                                     <option value="GR">GR</option>
                                     <option value="PU">PU</option>
@@ -51,7 +51,7 @@
                             <td class="text-right">
                                 <label for="OLD_AVSHORCL" class="visually-hidden">OLD AVSHORCL</label>
 <input type="hidden" name="OLD_AVSHORCL" id="OLD_AVSHORCL">
-                                <select aria-label="Avshorcl" id="AVSHORCL" name="AVSHORCL">
+                                <select id="AVSHORCL" name="AVSHORCL">
                                     <option value=" "  selected></option>
                                     <option value="Y">002 - International</option>
                                 </select>
diff --git a/Modules/M3/Resources/views/liberty-theme/partials/modals/qtyAdd.blade.php b/Modules/M3/Resources/views/liberty-theme/partials/modals/qtyAdd.blade.php
index c509c226..9c5e38c0 100755
--- a/Modules/M3/Resources/views/liberty-theme/partials/modals/qtyAdd.blade.php
+++ b/Modules/M3/Resources/views/liberty-theme/partials/modals/qtyAdd.blade.php
@@ -4,7 +4,7 @@
       <div class="modal-content">
         <div class="modal-header">
             <h5 class="modal-title">ERP/TMS Part Data Add</h5>
-            <button type="button" class="btn-close close-modal" data-bs-dismiss="modal" aria-label="Close"></button>
+            <button type="button" class="btn-close close-modal" data-bs-dismiss="modal"></button>
         </div>
         <div class="modal-body">
             <div class="table-responsive" id="qtyAddData">
@@ -16,7 +16,7 @@
                             <td><label for="AT9DPW" class="col-form-label"><b>Div-Plt-Whs:</b></label></td>
                             <td>
                             <div class="mb-3">
-                                <select aria-label="Addat9dpw" class="form-select-sm" id="addAT9DPW"
+                                <select class="form-select-sm" id="addAT9DPW"
                                 @if($power_user->R428PWRUSR=="N")
                                     disabled
                                 @endif
diff --git a/Modules/M3/Resources/views/liberty-theme/partials/modals/userAdd.blade.php b/Modules/M3/Resources/views/liberty-theme/partials/modals/userAdd.blade.php
index 6608fad4..82c164cf 100755
--- a/Modules/M3/Resources/views/liberty-theme/partials/modals/userAdd.blade.php
+++ b/Modules/M3/Resources/views/liberty-theme/partials/modals/userAdd.blade.php
@@ -4,7 +4,7 @@
       <div class="modal-content">
         <div class="modal-header">
             <h5 class="modal-title">User Add</h5>
-            <button type="button" class="btn-close close-modal" data-bs-dismiss="modal" aria-label="Close"></button>
+            <button type="button" class="btn-close close-modal" data-bs-dismiss="modal"></button>
         </div>
         <div class="modal-body">
             <div class="table-responsive" id="userAddData">
@@ -55,7 +55,7 @@
                             <td><label for="R428DPW1" class="col-form-label"><b>Div-Plt-Whs:</b></label></td>
                             <td>
                             <div class="mb-3">
-                                <select class="form-select-sm myinput" name="R428DPW1" id="R428DPW1" aria-label="Select a value" required>
+                                <select class="form-select-sm myinput" name="R428DPW1" id="R428DPW1" required>
                                     <option value="" selected disabled hidden>Select a value</option>
                                     @foreach ($IC670M as $key => $IC670MR)
                                         <option value="{{ trim($IC670MR->WDCO).trim($IC670MR->WDPL).trim($IC670MR->WDWHS) }}"
diff --git a/Modules/M3/Resources/views/liberty-theme/partials/tabs/orders.blade.php b/Modules/M3/Resources/views/liberty-theme/partials/tabs/orders.blade.php
index dcab2785..948f5061 100755
--- a/Modules/M3/Resources/views/liberty-theme/partials/tabs/orders.blade.php
+++ b/Modules/M3/Resources/views/liberty-theme/partials/tabs/orders.blade.php
@@ -50,7 +50,7 @@
                             </div>
                             <div class="col-sm-6 text-end">
                                 @if ($order->SHHLDC=="F" && $order->SHOST=="Open" && $authuser[0]->COUNT!=0)
-                                    <h5 class="card-title"  id="shipToEdit_click" data-toggle="modal" style="cursor:pointer"><i class="fa fa-edit pull-right" ></i></h5>
+                                    <h5 class="card-title" id="shipToEdit_click" data-toggle="modal" style="cursor:pointer"><i class="fa fa-edit pull-right" aria-hidden="true"></i><span class="visually-hidden">Edit ship-to details</span></h5>
                                 @endif
                             </div>
                         </div>
diff --git a/Modules/M3/Services/PostgresProgramBridge.php b/Modules/M3/Services/PostgresProgramBridge.php
index 530d8940..52fb24cc 100755
--- a/Modules/M3/Services/PostgresProgramBridge.php
+++ b/Modules/M3/Services/PostgresProgramBridge.php
@@ -76,7 +76,7 @@ class PostgresProgramBridge
                 'operation' => $operation,
                 'library' => $library,
                 'payload' => json_encode($payload, JSON_THROW_ON_ERROR),
-                'requested_by' => function_exists('m3_user') ? m3_user() : null,
+                'requested_by' => function_exists('m3_user') ? m3User() : null,
                 'status' => 'pending',
                 'created_at' => now(),
                 'updated_at' => now(),
diff --git a/Modules/Platform/resources/views/licenses/index.blade.php b/Modules/Platform/resources/views/licenses/index.blade.php
index 3680bc7b..71595b8a 100755
--- a/Modules/Platform/resources/views/licenses/index.blade.php
+++ b/Modules/Platform/resources/views/licenses/index.blade.php
@@ -11,7 +11,7 @@
             <h2 class="text-lg font-bold text-zinc-900 dark:text-white">Issue licence key</h2>
             <form method="POST" action="{{ route('platform.licenses.store') }}" class="mt-5 grid gap-4 md:grid-cols-5">
                 @csrf
-                <select aria-label="Company" name="company_id" class="rounded-xl border-zinc-300 dark:border-zinc-700 dark:bg-zinc-950">
+                <select name="company_id" class="rounded-xl border-zinc-300 dark:border-zinc-700 dark:bg-zinc-950">
                     @foreach ($companies as $company)
                         <option value="{{ $company->id }}">{{ $company->name }}</option>
                     @endforeach
@@ -19,7 +19,7 @@
                 <label for="sonar-input-959b26bb51" class="visually-hidden">Licence label</label>
 <input name="label" placeholder="Licence label"
                     class="rounded-xl border-zinc-300 dark:border-zinc-700 dark:bg-zinc-950" required id="sonar-input-959b26bb51">
-                <select aria-label="Plan" name="plan" class="rounded-xl border-zinc-300 dark:border-zinc-700 dark:bg-zinc-950">
+                <select name="plan" class="rounded-xl border-zinc-300 dark:border-zinc-700 dark:bg-zinc-950">
                     <option>standard</option>
                     <option>professional</option>
                     <option>enterprise</option>
diff --git a/Modules/Platform/resources/views/payments/index.blade.php b/Modules/Platform/resources/views/payments/index.blade.php
index 75af4e96..84505250 100755
--- a/Modules/Platform/resources/views/payments/index.blade.php
+++ b/Modules/Platform/resources/views/payments/index.blade.php
@@ -7,7 +7,7 @@
             <h2 class="text-lg font-bold text-zinc-900 dark:text-white">Add payment or override</h2>
             <form method="POST" action="{{ route('platform.payments.store') }}" class="mt-5 grid gap-4 md:grid-cols-6">
                 @csrf
-                <select aria-label="Company" name="company_id" class="rounded-xl border-zinc-300 dark:border-zinc-700 dark:bg-zinc-950">
+                <select name="company_id" class="rounded-xl border-zinc-300 dark:border-zinc-700 dark:bg-zinc-950">
                     @foreach ($companies as $company)
                         <option value="{{ $company->id }}">{{ $company->name }}</option>
                     @endforeach
@@ -18,7 +18,7 @@
                 <label for="sonar-input-e17e77c7c9" class="visually-hidden">currency</label>
 <input name="currency" value="gbp"
                     class="rounded-xl border-zinc-300 dark:border-zinc-700 dark:bg-zinc-950" required id="sonar-input-e17e77c7c9">
-                <select aria-label="Status" name="status" class="rounded-xl border-zinc-300 dark:border-zinc-700 dark:bg-zinc-950">
+                <select name="status" class="rounded-xl border-zinc-300 dark:border-zinc-700 dark:bg-zinc-950">
                     <option>paid</option>
                     <option>pending</option>
                     <option>failed</option>
diff --git a/Modules/Warehouse/resources/views/rules/index.blade.php b/Modules/Warehouse/resources/views/rules/index.blade.php
index 85d6dbc5..619478c6 100755
--- a/Modules/Warehouse/resources/views/rules/index.blade.php
+++ b/Modules/Warehouse/resources/views/rules/index.blade.php
@@ -7,7 +7,7 @@
             <h2 class="text-lg font-bold text-zinc-900 dark:text-white">Add validation rule</h2>
             <form method="POST" action="{{ route('warehouse-rules.store') }}" class="mt-5 grid gap-4 md:grid-cols-6">
                 @csrf
-                <select aria-label="Warehouse" name="warehouse_id" class="rounded-xl border-zinc-300 dark:border-zinc-700 dark:bg-zinc-950">
+                <select name="warehouse_id" class="rounded-xl border-zinc-300 dark:border-zinc-700 dark:bg-zinc-950">
                     @foreach ($warehouses as $warehouse)
                         <option value="{{ $warehouse->id }}">{{ $warehouse->name }}</option>
                     @endforeach
@@ -18,7 +18,7 @@
                 <label for="sonar-input-e1cd9e371a" class="visually-hidden">stock.location.required</label>
 <input name="rule_key" placeholder="stock.location.required"
                     class="rounded-xl border-zinc-300 dark:border-zinc-700 dark:bg-zinc-950" required id="sonar-input-e1cd9e371a">
-                <select aria-label="Severity" name="severity" class="rounded-xl border-zinc-300 dark:border-zinc-700 dark:bg-zinc-950">
+                <select name="severity" class="rounded-xl border-zinc-300 dark:border-zinc-700 dark:bg-zinc-950">
                     <option>error</option>
                     <option>warning</option>
                     <option>blocker</option>
diff --git a/public/css/wms-dashboard.css b/public/css/wms-dashboard.css
index abb8964e..72e35f2e 100755
--- a/public/css/wms-dashboard.css
+++ b/public/css/wms-dashboard.css
@@ -102,7 +102,7 @@
     align-items: center;
     background: linear-gradient(135deg, rgba(15, 118, 110, 0.14), rgba(37, 99, 235, 0.12));
     border-radius: 18px;
-    color: #0f766e;
+    color: #115e59;
     display: flex;
     font-size: 1.35rem;
     height: 56px;
@@ -117,7 +117,7 @@
 }
 
 .wms-chart-card__eyebrow {
-    color: #0f766e;
+    color: #115e59;
     font-size: 0.72rem;
     font-weight: 800;
     letter-spacing: 0.12em;
diff --git a/resources/css/app.css b/resources/css/app.css
index c81a0567..f1e685f7 100755
--- a/resources/css/app.css
+++ b/resources/css/app.css
@@ -179,7 +179,7 @@ select:focus[data-flux-control] {
     .wms-mobile-menu {
         border-color: rgb(14 116 144 / 0.22);
         background: linear-gradient(135deg, rgb(255 255 255), rgb(236 254 255));
-        color: rgb(14 116 144);
+        color: rgb(21 94 117);
     }
 
     .dark .wms-mobile-menu {
@@ -200,8 +200,8 @@ select:focus[data-flux-control] {
     .wms-sidebar-toggle:hover,
     .wms-mobile-close:hover,
     .wms-mobile-menu:hover {
-        border-color: rgb(14 116 144);
-        color: rgb(14 116 144);
+        border-color: rgb(21 94 117);
+        color: rgb(21 94 117);
     }
 
     .dark .wms-sidebar-toggle,
@@ -260,12 +260,12 @@ select:focus[data-flux-control] {
 
     .wms-sidebar-link:hover {
         background: rgb(244 244 245);
-        color: rgb(14 116 144);
+        color: rgb(21 94 117);
     }
 
     .wms-sidebar-link.is-active {
         background: rgb(236 254 255);
-        color: rgb(14 116 144);
+        color: rgb(21 94 117);
     }
 
     .dark .wms-sidebar-link {
@@ -319,12 +319,12 @@ select:focus[data-flux-control] {
     }
 
     .wms-user-card-button:hover {
-        border-color: rgb(14 116 144);
+        border-color: rgb(21 94 117);
         background: rgb(244 244 245);
     }
 
     .dark .wms-user-card-button:hover {
-        border-color: rgb(14 116 144);
+        border-color: rgb(21 94 117);
         background: rgb(48 48 52);
     }
 
@@ -758,7 +758,7 @@ select:focus[data-flux-control] {
             border-radius: 999px;
             border: 1px solid rgb(14 116 144 / 0.24);
             background: linear-gradient(135deg, rgb(14 116 144 / 0.14), rgb(37 99 235 / 0.12));
-            color: rgb(14 116 144);
+            color: rgb(21 94 117);
             font-size: 0.72rem;
             font-weight: 900;
             letter-spacing: 0.12em;
@@ -846,7 +846,7 @@ select:focus[data-flux-control] {
             border-radius: 0.9rem;
             border: 1px solid rgb(14 116 144 / 0.28);
             background: linear-gradient(135deg, rgb(255 255 255), rgb(236 254 255));
-            color: rgb(14 116 144);
+            color: rgb(21 94 117);
             font-size: 1.05rem;
             box-shadow: 0 12px 28px rgb(14 116 144 / 0.16);
         }
@@ -883,7 +883,7 @@ select:focus[data-flux-control] {
             border-radius: 999px;
             border: 1px solid rgb(14 116 144 / 0.24);
             background: linear-gradient(135deg, rgb(14 116 144 / 0.14), rgb(37 99 235 / 0.12));
-            color: rgb(14 116 144);
+            color: rgb(21 94 117);
             font-size: 0.72rem;
             font-weight: 900;
             letter-spacing: 0.12em;
@@ -1483,13 +1483,13 @@ html[data-wms-sidebar="collapsed"] .wms-sidebar {
     }
 
     .select2-container--default .select2-results__option--highlighted.select2-results__option--selectable {
-        background: rgb(8 145 178);
+        background: rgb(14 116 144);
         color: white;
     }
 
     .select2-container--default .select2-results__option--selected {
         background: rgb(236 254 255);
-        color: rgb(14 116 144);
+        color: rgb(21 94 117);
     }
 
     .dark .wms-select2-field .select2-container--default .select2-selection--single {
diff --git a/resources/css/wms-dashboard.css b/resources/css/wms-dashboard.css
index abb8964e..72e35f2e 100755
--- a/resources/css/wms-dashboard.css
+++ b/resources/css/wms-dashboard.css
@@ -102,7 +102,7 @@
     align-items: center;
     background: linear-gradient(135deg, rgba(15, 118, 110, 0.14), rgba(37, 99, 235, 0.12));
     border-radius: 18px;
-    color: #0f766e;
+    color: #115e59;
     display: flex;
     font-size: 1.35rem;
     height: 56px;
@@ -117,7 +117,7 @@
 }
 
 .wms-chart-card__eyebrow {
-    color: #0f766e;
+    color: #115e59;
     font-size: 0.72rem;
     font-weight: 800;
     letter-spacing: 0.12em;