From 22421063090ca49c84514b113e0ed1c91c01f579 Mon Sep 17 00:00:00 2001
From: Mark Gregory <mark.gregory@abbeysoftware.com>
Date: Mon, 21 Sep 2026 13:40:07 +0100
Subject: [PATCH] M3 Integration fixes

---
 .../views/livewire/ticket-show.blade.php      |   7 +-
 .../M3/Http/Controllers/API/CloseShipment.php |  10 +-
 .../public/liberty-theme/css/styles.css       |  65 ++++-
 .../partials/modals/userAdd.blade.php         | 267 +++++++++---------
 public/css/wms-dashboard.css                  |   4 +-
 resources/css/app.css                         |  40 +--
 resources/css/wms-dashboard.css               |   4 +-
 resources/js/Pages/Auth/Register.vue          |   1 +
 .../views/livewire/settings/profile.blade.php |   2 +-
 9 files changed, 218 insertions(+), 182 deletions(-)

diff --git a/Modules/Helpdesk/Resources/views/livewire/ticket-show.blade.php b/Modules/Helpdesk/Resources/views/livewire/ticket-show.blade.php
index f9dc82a3..4ea2eb73 100755
--- a/Modules/Helpdesk/Resources/views/livewire/ticket-show.blade.php
+++ b/Modules/Helpdesk/Resources/views/livewire/ticket-show.blade.php
@@ -482,11 +482,11 @@
 
                             <div id="ticket-comment-body-editor" dusk="comment-body" data-dusk="comment-body"
                                  data-helpdesk-rich-editor data-helpdesk-sync-target="ticket-comment-body"
-                                 contenteditable="true" role="textbox" aria-multiline="true" spellcheck="true" lang="en-GB" autocorrect="on" autocomplete="on" autocapitalize="sentences" inputmode="text"
+                                 contenteditable="true" aria-multiline="true" spellcheck="true" lang="en-GB" autocorrect="on" autocomplete="on" autocapitalize="sentences" inputmode="text"
                                  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 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 aria-label="Ticket Comment Body" 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">
@@ -500,7 +500,7 @@
                             class="rounded-xl border border-zinc-200 bg-zinc-50 p-3 dark:border-zinc-700 dark:bg-zinc-950">
                             <div class="flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between">
                                 <div class="min-w-0">
-                                    <label for="sonar-input-cc351ecc57" class="block text-xs font-bold text-zinc-700 dark:text-zinc-200">Attach files
+                                    <label class="block text-xs font-bold text-zinc-700 dark:text-zinc-200">Attach files
                                         to
                                         this reply</label>
                                     <p class="mt-1 truncate text-xs font-semibold text-zinc-500 dark:text-zinc-400"
@@ -511,6 +511,7 @@
                                        class="inline-flex cursor-pointer items-center justify-center rounded-lg bg-blue-600 px-3 py-2 text-xs font-bold text-white shadow-sm transition hover:bg-blue-700 focus-within:outline-none focus-within:ring-2 focus-within:ring-blue-400/70">
                                     <i class="fa-solid fa-paperclip mr-2 text-xs" aria-hidden="true"></i>
                                     <span>Choose files</span>
+                                    <label for="sonar-input-cc351ecc57" class="visually-hidden">comment attachments[]</label>
 <input name="comment_attachments[]" type="file" multiple accept="{{ $helpdeskAttachmentAccept }}" class="sr-only"
                                            data-helpdesk-file-input id="sonar-input-cc351ecc57">
                                 </label>
diff --git a/Modules/M3/Http/Controllers/API/CloseShipment.php b/Modules/M3/Http/Controllers/API/CloseShipment.php
index b9470c60..a9bfc09a 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 = m3User() !== '' ? Str::upper(m3User()) : 'WebUser';
+        $sHUSER = m3_user() !== '' ? Str::upper(m3_user()) : 'WebUser';
         $sHSOURCE = 'CloseShipmentCoChargeAPI';
 
         try {
@@ -260,7 +260,7 @@ class CloseShipment extends Controller
                         //     ->get();
 
                         // PFC : Check that Picked / Packed are all Equal
-                        foreach ($iCM688M2SL as $ICM688M2SLR) {
+                        foreach ($iCM688M2SL as $key => $ICM688M2SLR) {
                             $a5PICKED = isset($ICM688M2SLR->A5PICKED) ? $ICM688M2SLR->A5PICKED : 0;
                             $a5RSVQTY = isset($ICM688M2SLR->A5RSVQTY) ? $ICM688M2SLR->A5RSVQTY : 0;
                             $a5ShortShipQty = (int) $a5RSVQTY - (int) $a5PICKED;
@@ -295,7 +295,7 @@ class CloseShipment extends Controller
                             ->orderBy('AYINTBOX')
                             ->get();
 
-                        foreach ($iCM695M1JOINTMP as $ICM695M1JOINR) {
+                        foreach ($iCM695M1JOINTMP as $key => $ICM695M1JOINR) {
                             $a4SHIPVIA = isset($ICM695M1JOINR->A4SHIPVIA) ? trim(str_replace('&', '_', $ICM695M1JOINR->A4SHIPVIA)) : '';
 
                             $sHIPTYPE = trim($ICM695M1JOINR->A4SHIPTYPE);
@@ -454,7 +454,7 @@ class CloseShipment extends Controller
                             $contentLabel = '';
 
                             $docTypes = ['ContentLabel', 'CarrierLabel'];
-                            foreach ($docTypes as $value) {
+                            foreach ($docTypes as $key => $value) {
                                 switch ($value) {
                                     case 'CarrierLabel':
                                         $dOCTYPE = 'CarrierLabel';
@@ -783,7 +783,7 @@ class CloseShipment extends Controller
                 elseif (count($iCM695M1TMP) > 0 && $tRANSTYPE == 'Z') {
                     $errorMsgs = '';
 
-                    foreach ($iCM695M1TMP as $key => $ICM695M1JOINR) {
+                    foreach ($iCM695M1TMP as $ICM695M1JOINR) {
                         $sHIPTYPE = trim($ICM695M1JOINR->A4SHIPTYPE);
                         $fREIGHTTERMS = trim($ICM695M1JOINR->A4OFSTRM);
                         $a4RATEM3 = trim($ICM695M1JOINR->A4RATEM3);
diff --git a/Modules/M3/Resources/public/liberty-theme/css/styles.css b/Modules/M3/Resources/public/liberty-theme/css/styles.css
index 2aa7658d..bdbc4e20 100755
--- a/Modules/M3/Resources/public/liberty-theme/css/styles.css
+++ b/Modules/M3/Resources/public/liberty-theme/css/styles.css
@@ -452,7 +452,7 @@ legend + * {
   font: inherit;
 }
 
-:where(html) ::-webkit-file-upload-button {
+::-webkit-file-upload-button {
   font: inherit;
   -webkit-appearance: button;
 }
@@ -2276,7 +2276,7 @@ div.table-responsive > table > tbody > tr:last-child > td{
 .form-control:hover:not(:disabled):not([readonly])::file-selector-button, .dataTable-input:hover:not(:disabled):not([readonly])::file-selector-button {
   background-color: #dde0e3;
 }
-:where(html) .form-control::-webkit-file-upload-button, .dataTable-input::-webkit-file-upload-button {
+.form-control::-webkit-file-upload-button, .dataTable-input::-webkit-file-upload-button {
   padding: 0.375rem 0.75rem;
   margin: -0.375rem -0.75rem;
   -webkit-margin-end: 0.75rem;
@@ -2298,7 +2298,7 @@ div.table-responsive > table > tbody > tr:last-child > td{
     transition: none;
   }
 }
-:where(html) .form-control:hover:not(:disabled):not([readonly])::-webkit-file-upload-button, .dataTable-input:hover:not(:disabled):not([readonly])::-webkit-file-upload-button {
+.form-control:hover:not(:disabled):not([readonly])::-webkit-file-upload-button, .dataTable-input:hover:not(:disabled):not([readonly])::-webkit-file-upload-button {
   background-color: #dde0e3;
 }
 
@@ -2336,7 +2336,7 @@ div.table-responsive > table > tbody > tr:last-child > td{
   -webkit-margin-end: 0.5rem;
           margin-inline-end: 0.5rem;
 }
-:where(html) .form-control-sm::-webkit-file-upload-button {
+.form-control-sm::-webkit-file-upload-button {
   padding: 0.25rem 0.5rem;
   margin: -0.25rem -0.5rem;
   -webkit-margin-end: 0.5rem;
@@ -2361,7 +2361,7 @@ div.table-responsive > table > tbody > tr:last-child > td{
   -webkit-margin-end: 1rem;
           margin-inline-end: 1rem;
 }
-:where(html) .form-control-lg::-webkit-file-upload-button {
+.form-control-lg::-webkit-file-upload-button {
   padding: 0.5rem 1rem;
   margin: -0.5rem -1rem;
   -webkit-margin-end: 1rem;
@@ -3721,7 +3721,7 @@ textarea.form-control-lg {
 .dropend .dropdown-toggle:empty::after {
   margin-left: 0;
 }
-:where(html) .dropend .dropdown-toggle::after {
+.dropend .dropdown-toggle::after {
   vertical-align: 0;
 }
 
@@ -3738,7 +3738,7 @@ textarea.form-control-lg {
   vertical-align: 0.255em;
   content: "";
 }
-:where(html) .dropstart .dropdown-toggle::after {
+.dropstart .dropdown-toggle::after {
   display: none;
 }
 .dropstart .dropdown-toggle::before {
@@ -3753,7 +3753,7 @@ textarea.form-control-lg {
 .dropstart .dropdown-toggle:empty::after {
   margin-left: 0;
 }
-:where(html) .dropstart .dropdown-toggle::before {
+.dropstart .dropdown-toggle::before {
   vertical-align: 0;
 }
 
@@ -3821,7 +3821,7 @@ textarea.form-control-lg {
 }
 .dropdown-menu-dark .dropdown-item:hover, .dropdown-menu-dark .dropdown-item:focus {
   color: #fff;
-  background-color: rgba(255, 255, 255, 0.25);
+  background-color: #495057;
 }
 .dropdown-menu-dark .dropdown-item.active, .dropdown-menu-dark .dropdown-item:active {
   color: #fff;
@@ -4849,7 +4849,7 @@ textarea.form-control-lg {
   border-color: #dee2e6;
 }
 
-:where(html) .page-link, .dataTable-pagination a {
+.page-link, .dataTable-pagination a {
   padding: 0.375rem 0.75rem;
 }
 
@@ -5008,6 +5008,12 @@ 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;
@@ -6192,6 +6198,12 @@ 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 */;
@@ -6215,6 +6227,16 @@ 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);
@@ -6376,6 +6398,12 @@ 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;
@@ -6390,6 +6418,13 @@ 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%;
@@ -7673,7 +7708,7 @@ textarea.form-control-lg {
 /* rtl:begin:remove */
 .text-break {
   word-wrap: break-word !important;
-  overflow-wrap: anywhere !important;
+  word-break: break-word !important;
 }
 
 /* rtl:end:remove */
@@ -11652,11 +11687,11 @@ body {
   border-color: #dbe3e6
 }
 
-:where(html) .breadcrumb {
+.breadcrumb {
   border: 1px solid #f3f3f3
 }
 
-:where(body) .breadcrumb {
+.breadcrumb {
   display: flex;
   flex-wrap: wrap;
   padding: 0.56rem 1.13rem;
@@ -11717,7 +11752,7 @@ nav {
   margin-left: 20px;
 }
 
-:where(html) .breadcrumb.breadcrumb-custom .breadcrumb-item:before {
+.breadcrumb.breadcrumb-custom .breadcrumb-item:before {
   content: ""
 }
 
@@ -11736,7 +11771,7 @@ a:link {
   text-decoration: none
 }
 
-:where(html) .breadcrumb-item+.breadcrumb-item::before {
+.breadcrumb-item+.breadcrumb-item::before {
   display: inline-block;
   padding-right: 0.5rem;
   color: #6c757d;
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 647234d0..53cb88a2 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,58 +4,58 @@
       <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"></button>
+            <button type="button" class="btn-close close-modal" data-bs-dismiss="modal" aria-label="Close"></button>
         </div>
         <div class="modal-body">
             <div class="table-responsive" id="userAddData">
-                <div class="sonar-form-layout">
-                    <div>
+                <table role="presentation" class="table table-condensed">
+                    <tbody>
                     <!-- R428DV R428PL R428WHS R428STS R428US R428FIRST R428FAMILY R428EMAIL R428EMPCDE R428ADMUSR R428PWRUSR  -->
-                        <div class="row g-2 align-items-center mb-2">
-                <div class="col">
-                <div class="sonar-form-layout">
-                <div class="row g-2 align-items-center mb-2">
+                        <tr>
+                <td>
+                <table role="presentation" class="table table-condensed">
+                <tr>
                             <input type="hidden" id="R428CO" name="R428CO">
                             <input type="hidden" id="R428PL" name="R428PL">
                             <input type="hidden" id="R428WH" name="R428WH">
-                            <div class="col"><b>Status</b></div> <!-- Switch Active/Inactive -->
-                            <div class="col text-center">
+                            <td><b>Status</b></td> <!-- Switch Active/Inactive -->
+                            <td class="text-center">
                                 <div class="form-check form-switch">
                                     <label for="sonar-input-63da19b195" class="visually-hidden">R428STS</label>
 <input class="form-check-input" type="checkbox" role="switch" name="R428STS" value="A" checked data-on="A" data-off="I" aria-checked="false" id="sonar-input-63da19b195">
                                 </div>
-                            </div>
-                        </div>
-                        <div class="row g-2 align-items-center mb-2">
-                            <div class="col"><b>User profile</b></div> <!-- ALPHA -->
-                            <div class="col text-right"><label for="sonar-input-afd6168b6c" class="visually-hidden">R428US</label>
-<input type="text" maxlength="10" class="myinput" oninput="this.value = this.value.toUpperCase()" name="R428US" required id="sonar-input-afd6168b6c"></div>
-                        </div>
-                        <div class="row g-2 align-items-center mb-2">
-                            <div class="col"><b>First Name</b></div> <!-- ALPHA -->
-                            <div class="col text-right"><label for="sonar-input-9e6c6eaa8b" class="visually-hidden">R428FIRST</label>
-<input type="text" maxlength="20" class="myinput" oninput="this.value = this.value.toUpperCase()" name="R428FIRST" required id="sonar-input-9e6c6eaa8b"></div>
-                        </div>
-                        <div class="row g-2 align-items-center mb-2">
-                            <div class="col"><b>Family Name</b></div> <!-- ALPHA -->
-                            <div class="col text-right"><label for="sonar-input-22147e2614" class="visually-hidden">R428FAMILY</label>
-<input type="text" maxlength="30" class="myinput" oninput="this.value = this.value.toUpperCase()" name="R428FAMILY" required id="sonar-input-22147e2614"></div>
-                        </div>
-                        <div class="row g-2 align-items-center mb-2">
-                            <div class="col"><b>Email</b></div> <!-- ALPHA -->
-                            <div class="col text-right"><label for="sonar-input-a7fe91c914" class="visually-hidden">R428EMAIL</label>
-<input type="text" maxlength="100" class="myinput" oninput="this.value = this.value.toLowerCase()" name="R428EMAIL" required id="sonar-input-a7fe91c914"></div>
-                        </div>
-                        <div class="row g-2 align-items-center mb-2">
-                            <div class="col"><b>Employee code</b></div> <!-- MAX -->
-                            <div class="col text-right"><label for="sonar-input-8e3a421fd3" class="visually-hidden">R428EMPCDE</label>
-<input type="number" min=0 max=9999 class="myinput" name="R428EMPCDE" value=0 required id="sonar-input-8e3a421fd3"></div>
-                        </div>
-                        <div class="row g-2 align-items-center mb-2">
-                            <div class="col"><label for="R428DPW1" class="col-form-label"><b>Div-Plt-Whs:</b></label></div>
-                            <div class="col">
+                            </td>
+                        </tr>
+                        <tr>
+                            <td><b>User profile</b></td> <!-- ALPHA -->
+                            <td class="text-right"><label for="sonar-input-afd6168b6c" class="visually-hidden">R428US</label>
+<input type="text" maxlength="10" class="myinput" oninput="this.value = this.value.toUpperCase()" name="R428US" required id="sonar-input-afd6168b6c"></td>
+                        </tr>
+                        <tr>
+                            <td><b>First Name</b></td> <!-- ALPHA -->
+                            <td class="text-right"><label for="sonar-input-9e6c6eaa8b" class="visually-hidden">R428FIRST</label>
+<input type="text" maxlength="20" class="myinput" oninput="this.value = this.value.toUpperCase()" name="R428FIRST" required id="sonar-input-9e6c6eaa8b"></td>
+                        </tr>
+                        <tr>
+                            <td><b>Family Name</b></td> <!-- ALPHA -->
+                            <td class="text-right"><label for="sonar-input-22147e2614" class="visually-hidden">R428FAMILY</label>
+<input type="text" maxlength="30" class="myinput" oninput="this.value = this.value.toUpperCase()" name="R428FAMILY" required id="sonar-input-22147e2614"></td>
+                        </tr>
+                        <tr>
+                            <td><b>Email</b></td> <!-- ALPHA -->
+                            <td class="text-right"><label for="sonar-input-a7fe91c914" class="visually-hidden">R428EMAIL</label>
+<input type="text" maxlength="100" class="myinput" oninput="this.value = this.value.toLowerCase()" name="R428EMAIL" required id="sonar-input-a7fe91c914"></td>
+                        </tr>
+                        <tr>
+                            <td><b>Employee code</b></td> <!-- MAX -->
+                            <td class="text-right"><label for="sonar-input-8e3a421fd3" class="visually-hidden">R428EMPCDE</label>
+<input type="number" min=0 max=9999 class="myinput" name="R428EMPCDE" value=0 required id="sonar-input-8e3a421fd3"></td>
+                        </tr>
+                        <tr>
+                            <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" required>
+                                <select class="form-select-sm myinput" name="R428DPW1" id="R428DPW1" aria-label="Div-Plt-Whs" 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) }}"
@@ -66,180 +66,179 @@
                                     @endforeach
                                 </select>
                             </div>
-                            </div>
-                        </div>
-                        <!-- <div class="row g-2 align-items-center mb-2"> -->
-                </div>
-                </div>
-                </div>
-                </div>
-                <div class="row g-2 align-items-center mb-2">
-                <div class="col">
-                <div class="sonar-form-layout">
-                        <div class="row g-2 align-items-center mb-2">
-                            <div class="col"><b>Admin user</b></div> <!-- SWITCH Y/N -->
-                            <div class="col text-center">
+                            </td>
+                        </tr>
+                </tr>
+                </table>
+                </td>
+                </tr>
+                <tr>
+                <td>
+                <table class="table table-condensed">
+                        <tr>
+                            <td><b>Admin user</b></td> <!-- SWITCH Y/N -->
+                            <td class="text-center">
                                 <div class="form-check form-switch">
                                     <label for="sonar-input-d30d801b67" class="visually-hidden">R428ADMUSR</label>
 <input class="form-check-input" type="checkbox" role="switch" name="R428ADMUSR" value="N" data-on="Y" data-off="N" aria-checked="false" id="sonar-input-d30d801b67">
                                 </div>
-                            </div>
-                            <div class="col"><b>Power user</b></div> <!-- SWITCH Y/N -->
-                            <div class="col text-center">
+                            </td>
+                            <td><b>Power user</b></td> <!-- SWITCH Y/N -->
+                            <td class="text-center">
                                 <div class="form-check form-switch">
                                     <label for="sonar-input-aeca45ced5" class="visually-hidden">R428PWRUSR</label>
 <input class="form-check-input" type="checkbox" role="switch" name="R428PWRUSR" value="N" data-on="Y" data-off="N" aria-checked="false" id="sonar-input-aeca45ced5">
                                 </div>
-                            </div>
-                            <div class="col"><b>CSR</b></div> <!-- SWITCH Y/N -->
-                            <div class="col text-center">
+                            </td>
+                            <td><b>CSR</b></td> <!-- SWITCH Y/N -->
+                            <td class="text-center">
                                 <div class="form-check form-switch">
                                     <label for="sonar-input-41e1a8347c" class="visually-hidden">R42811A</label>
 <input class="form-check-input" type="checkbox" role="switch" name="R42811A" value="N" data-on="C" data-off="" aria-checked="false" id="sonar-input-41e1a8347c">
                                 </div>
-                            </div>
+                            </td>
 
-                            <div class="col"><b>Executive</b></div> <!-- SWITCH Y/N -->
-                            <div class="col text-right">
+                            <td><b>Executive</b></td> <!-- SWITCH Y/N -->
+                            <td class="text-right">
                                 <div class="form-check form-switch">
                                     <label for="sonar-input-34ca226a28" class="visually-hidden">R42821A</label>
 <input type="checkbox" class="form-check-input" role="switch" name="R42821A" data-on="Y" data-off="N" aria-checked="false" id="sonar-input-34ca226a28">
                                 </div>
-                            </div>
-                        </div>
-                        <div class="row g-2 align-items-center mb-2">
-                            <div class="col"> </div><div class="col"> </div><div class="col"> </div>
-                        </div>
-                        <div class="row g-2 align-items-center mb-2">
+                            </td>
+                        </tr>
+                        <tr>
+                            <td colspan=2> </td><td colspan=2> </td><td colspan=2> </td>
+                        </tr>
+                        <tr>
                             <th scope="col" colspan=2><u>Inventory Options menu</u></th><th scope="col" colspan=2><u>Replenishment menu</u></th><th scope="col" colspan=2><u>Document Reprints</u></th>
-                        </div>
-                        <div class="col"><b>Picking</b></div> <!-- SWITCH Y/N -->
-                            <div class="col text-center">
+                        </tr>
+                        <td><b>Picking</b></td> <!-- SWITCH Y/N -->
+                            <td class="text-center">
                                 <div class="form-check form-switch">
                                     <label for="sonar-input-6600a098cd" class="visually-hidden">MENU2OPT3</label>
 <input class="form-check-input" type="checkbox" role="switch" name="MENU2OPT3" value="N" data-on="Y" data-off="N" aria-checked="false" id="sonar-input-6600a098cd">
                                 </div>
-                            </div>
-                            <div class="col"><b>Ticket processing</b></div> <!-- SWITCH Y/N Replenishment menu -->
-                            <div class="col text-right">
+                            </td>
+                            <td><b>Ticket processing</b></td> <!-- SWITCH Y/N Replenishment menu -->
+                            <td class="text-right">
                                 <div class="form-check form-switch">
                                     <label for="sonar-input-34905fd14f" class="visually-hidden">MENU3OPT1</label>
 <input class="form-check-input" type="checkbox" role="switch" name="MENU3OPT1" value="N" data-on="Y" data-off="N" aria-checked="false" id="sonar-input-34905fd14f">
                                 </div>
-                            </div>
-                            <div class="col"><b>Document Reprints1</b></div> <!-- SWITCH Y/N Document Reprints menu -->
-                            <div class="col text-right">
+                            </td>
+                            <td><b>Document Reprints1</b></td> <!-- SWITCH Y/N Document Reprints menu -->
+                            <td class="text-right">
                                 <div class="form-check form-switch">
                                     <label for="sonar-input-962b09fa8c" class="visually-hidden">MENU4OPT1</label>
 <input class="form-check-input" type="checkbox" role="switch" name="MENU4OPT1" value="N" data-on="Y" data-off="N" aria-checked="false" id="sonar-input-962b09fa8c">
                                 </div>
-                            </div>
-                        </div>
-                        <div class="row g-2 align-items-center mb-2">
-                        <div class="col"><b>Stock View Program</b></div> <!-- SWITCH Y/N -->
-                            <div class="col text-center">
+                            </td>
+                        </tr>
+                        <tr>
+                        <td><b>Stock View Program</b></td> <!-- SWITCH Y/N -->
+                            <td class="text-center">
                                 <div class="form-check form-switch">
                                     <label for="sonar-input-2d1307dd34" class="visually-hidden">MENU2OPT7</label>
 <input class="form-check-input" type="checkbox" role="switch" name="MENU2OPT7" value="N" data-on="Y" data-off="N" aria-checked="false" id="sonar-input-2d1307dd34">
                                 </div>
-                            </div>
-                            <div class="col"><b>Ticket reset</b></div> <!-- SWITCH Y/N Replenishment menu -->
-                            <div class="col text-right">
+                            </td>
+                            <td><b>Ticket reset</b></td> <!-- SWITCH Y/N Replenishment menu -->
+                            <td class="text-right">
                                 <div class="form-check form-switch">
                                     <label for="sonar-input-c82fe0a38a" class="visually-hidden">MENU3OPT2</label>
 <input class="form-check-input" type="checkbox" role="switch"name="MENU3OPT2" value="N" data-on="Y" data-off="N" aria-checked="false" id="sonar-input-c82fe0a38a">
                                 </div>
-                            </div>
-                            <div class="col"><b>Document Reprints2</b></div> <!-- SWITCH Y/N Document Reprints menu -->
-                            <div class="col text-right">
+                            </td>
+                            <td><b>Document Reprints2</b></td> <!-- SWITCH Y/N Document Reprints menu -->
+                            <td class="text-right">
                                 <div class="form-check form-switch">
                                     <label for="sonar-input-9de73b8a95" class="visually-hidden">MENU4OPT2</label>
 <input class="form-check-input" type="checkbox" role="switch" name="MENU4OPT2" value="N" data-on="Y" data-off="N" aria-checked="false" id="sonar-input-9de73b8a95">
                                 </div>
-                            </div>
-                        </div>
-                            <div class="col"><b>Split Box Labels</b></div> <!-- SWITCH Y/N -->
-                            <div class="col text-center">
+                            </td>
+                        </tr>
+                            <td><b>Split Box Labels</b></td> <!-- SWITCH Y/N -->
+                            <td class="text-center">
                                 <div class="form-check form-switch">
                                     <label for="sonar-input-5afc785c7f" class="visually-hidden">MENU2OPT8</label>
 <input class="form-check-input" type="checkbox" role="switch" name="MENU2OPT8" value="N" data-on="Y" data-off="N" aria-checked="false" id="sonar-input-5afc785c7f">
                                 </div>
-                            </div>
-                            <div class="col"></div>
-                            <div class="col"><b>Document Reprints3</b></div> <!-- SWITCH Y/N Document Reprints menu -->
-                            <div class="col text-right">
+                            </td>
+                            <td colspan=2></td>
+                            <td><b>Document Reprints3</b></td> <!-- SWITCH Y/N Document Reprints menu -->
+                            <td class="text-right">
                                 <div class="form-check form-switch">
                                     <label for="sonar-input-d11c3d9636" class="visually-hidden">MENU4OPT3</label>
 <input class="form-check-input" type="checkbox" role="switch" name="MENU4OPT3" value="N" data-on="Y" data-off="N" aria-checked="false" id="sonar-input-d11c3d9636">
                                 </div>
-                            </div>
-                        </div>
-                        <div class="row g-2 align-items-center mb-2">
+                            </td>
+                        </tr>
+                        <tr>
                             <th scope="col" colspan=2><u>Loading menu</u></th><th scope="col" colspan=2><u>Main menu</u></th>
-                        </div>
-                        <div class="row g-2 align-items-center mb-2">
-                            <div class="col"><b>Small parcel loading/closing</b></div> <!-- SWITCH Y/N -->
-                            <div class="col text-center">
+                        </tr>
+                        <tr>
+                            <td><b>Small parcel loading/closing</b></td> <!-- SWITCH Y/N -->
+                            <td class="text-center">
                                 <div class="form-check form-switch">
                                     <label for="sonar-input-7f45697209" class="visually-hidden">MENU5OPT1</label>
 <input class="form-check-input" type="checkbox" role="switch" name="MENU5OPT1" value="N" data-on="Y" data-off="N" aria-checked="false" id="sonar-input-7f45697209">
                                 </div>
-                            </div>
-                            <div class="col"><b>Weekly Labor card entry</b></div> <!-- SWITCH Y/N -->
-                            <div class="col text-center">
+                            </td>
+                            <td><b>Weekly Labor card entry</b></td> <!-- SWITCH Y/N -->
+                            <td class="text-center">
                                 <div class="form-check form-switch">
                                     <label for="sonar-input-97bd3e4192" class="visually-hidden">MENU6OPT1</label>
 <input class="form-check-input" type="checkbox" role="switch" name="MENU6OPT1" value="N" data-on="Y" data-off="N" aria-checked="false" id="sonar-input-97bd3e4192">
                                 </div>
-                            </div>
-                        </div>
-                        <div class="row g-2 align-items-center mb-2">
-                            <div class="col"><b>Open dock door</b></div> <!-- SWITCH Y/N -->
-                            <div class="col text-center">
+                            </td>
+                        </tr>
+                        <tr>
+                            <td><b>Open dock door</b></td> <!-- SWITCH Y/N -->
+                            <td class="text-center">
                                 <div class="form-check form-switch">
                                     <label for="sonar-input-2a6256fe9b" class="visually-hidden">MENU5OPT2</label>
 <input class="form-check-input" type="checkbox" role="switch" name="MENU5OPT2" value="N" data-on="Y" data-off="N" aria-checked="false" id="sonar-input-2a6256fe9b">
                                 </div>
-                            </div>
-                            <div class="col"><b>MACPAC</b></div> <!-- SWITCH Y/N -->
-                            <div class="col text-center">
+                            </td>
+                            <td><b>MACPAC</b></td> <!-- SWITCH Y/N -->
+                            <td class="text-center">
                                 <div class="form-check form-switch">
                                     <label for="sonar-input-ad632b9e62" class="visually-hidden">MENU6OPT2</label>
 <input class="form-check-input" type="checkbox" role="switch" name="MENU6OPT2" value="N" data-on="Y" data-off="N" aria-checked="false" id="sonar-input-ad632b9e62">
                                 </div>
-                            </div>
-                        </div>
-                        <div class="row g-2 align-items-center mb-2">
-                            <div class="col"><b>Close dock door</b></div> <!-- SWITCH Y/N -->
-                            <div class="col text-center">
+                            </td>
+                        </tr>
+                        <tr>
+                            <td><b>Close dock door</b></td> <!-- SWITCH Y/N -->
+                            <td class="text-center">
                                 <div class="form-check form-switch">
                                     <label for="sonar-input-a07d5c2573" class="visually-hidden">MENU5OPT3</label>
 <input class="form-check-input" type="checkbox" role="switch" name="MENU5OPT3" value="N" data-on="Y" data-off="N" aria-checked="false" id="sonar-input-a07d5c2573">
                                 </div>
-                            </div>
-                            <div class="col"><b>2Ship send/aggregate</b></div> <!-- SWITCH Y/N -->
-                            <div class="col text-center">
+                            </td>
+                            <td><b>2Ship send/aggregate</b></td> <!-- SWITCH Y/N -->
+                            <td class="text-center">
                                 <div class="form-check form-switch">
                                     <label for="sonar-input-36ffe64b74" class="visually-hidden">MENU6OPT3</label>
 <input class="form-check-input" type="checkbox" role="switch" name="MENU6OPT3" value="N" data-on="Y" data-off="N" aria-checked="false" id="sonar-input-36ffe64b74">
                                 </div>
-                            </div>
-                        </div>
-                        <div class="row g-2 align-items-center mb-2">
-                            <div class="col"><b>LTL loading</b></div> <!-- SWITCH Y/N -->
-                            <div class="col text-center">
+                            </td>
+                        </tr>
+                        <tr>
+                            <td><b>LTL loading</b></td> <!-- SWITCH Y/N -->
+                            <td class="text-center">
                                 <div class="form-check form-switch">
                                     <label for="sonar-input-debe99b4bd" class="visually-hidden">MENU5OPT5</label>
 <input class="form-check-input" type="checkbox" role="switch" name="MENU5OPT5" value="N" data-on="Y" data-off="N" aria-checked="false" id="sonar-input-debe99b4bd">
                                 </div>
-                            </div>
-                        </div>
-                </div>
-                </div>
-                </div>
+                            </td>
+                        </tr>
+                </table>
+                </td>
+                </tr>
 
-                    </div>
-                </div>
+                    </tbody>
+                </table>
             </div>
         </div>
         <div class="modal-footer">
diff --git a/public/css/wms-dashboard.css b/public/css/wms-dashboard.css
index bdfa6541..08768be7 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: #064e3b;
+    color: #0b4f4a;
     display: flex;
     font-size: 1.35rem;
     height: 56px;
@@ -117,7 +117,7 @@
 }
 
 .wms-chart-card__eyebrow {
-    color: #064e3b;
+    color: #0f766e;
     font-size: 0.72rem;
     font-weight: 800;
     letter-spacing: 0.12em;
diff --git a/resources/css/app.css b/resources/css/app.css
index 5fba8685..aa8dc738 100755
--- a/resources/css/app.css
+++ b/resources/css/app.css
@@ -179,13 +179,13 @@ 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(12 74 110);
+        color: rgb(8 81 99);
     }
 
     .dark .wms-mobile-menu {
         border-color: rgb(103 232 249 / 0.22);
         background: linear-gradient(135deg, rgb(24 24 27), rgb(8 47 73));
-        color: white;
+        color: rgb(165 243 252);
     }
 
     .wms-sidebar-toggle {
@@ -200,8 +200,8 @@ select:focus[data-flux-control] {
     .wms-sidebar-toggle:hover,
     .wms-mobile-close:hover,
     .wms-mobile-menu:hover {
-        border-color: rgb(12 74 110);
-        color: rgb(12 74 110);
+        border-color: rgb(8 81 99);
+        color: rgb(14 116 144);
     }
 
     .dark .wms-sidebar-toggle,
@@ -260,12 +260,12 @@ select:focus[data-flux-control] {
 
     .wms-sidebar-link:hover {
         background: rgb(244 244 245);
-        color: rgb(12 74 110);
+        color: rgb(14 116 144);
     }
 
     .wms-sidebar-link.is-active {
         background: rgb(236 254 255);
-        color: rgb(12 74 110);
+        color: rgb(14 116 144);
     }
 
     .dark .wms-sidebar-link {
@@ -319,12 +319,12 @@ select:focus[data-flux-control] {
     }
 
     .wms-user-card-button:hover {
-        border-color: rgb(12 74 110);
+        border-color: rgb(14 116 144);
         background: rgb(244 244 245);
     }
 
     .dark .wms-user-card-button:hover {
-        border-color: rgb(12 74 110);
+        border-color: rgb(14 116 144);
         background: rgb(48 48 52);
     }
 
@@ -462,7 +462,7 @@ select:focus[data-flux-control] {
     .wms-page-hero-description {
         max-width: 48rem;
         margin: 0.5rem 0 0;
-        color: white;
+        color: rgb(255 255 255);
         font-size: 0.875rem;
         line-height: 1.35rem;
     }
@@ -482,7 +482,7 @@ select:focus[data-flux-control] {
         border: 1px solid rgb(255 255 255 / 0.18);
         background: rgb(255 255 255 / 0.10);
         padding: 0.7rem 0.85rem;
-        color: white;
+        color: rgb(219 234 254 / 0.90);
         box-shadow: 0 10px 24px rgb(0 0 0 / 0.18);
     }
 
@@ -540,7 +540,7 @@ select:focus[data-flux-control] {
         place-items: center;
         align-self: flex-start;
         border-radius: 0.85rem;
-        background: rgb(255 255 255 / 0.12);
+        background: rgb(30 64 175);
         color: white;
     }
 
@@ -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(12 74 110);
+            color: rgb(14 116 144);
             font-size: 0.72rem;
             font-weight: 900;
             letter-spacing: 0.12em;
@@ -767,7 +767,7 @@ select:focus[data-flux-control] {
         .dark .wms-mobile-badge {
             border-color: rgb(103 232 249 / 0.26);
             background: linear-gradient(135deg, rgb(8 145 178 / 0.26), rgb(37 99 235 / 0.20));
-            color: white;
+            color: rgb(165 243 252);
         }
 
         .wms-page-hero {
@@ -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(12 74 110);
+            color: rgb(14 116 144);
             font-size: 1.05rem;
             box-shadow: 0 12px 28px rgb(14 116 144 / 0.16);
         }
@@ -854,7 +854,7 @@ select:focus[data-flux-control] {
         .dark .wms-mobile-menu {
             border-color: rgb(103 232 249 / 0.30);
             background: linear-gradient(135deg, rgb(24 24 27), rgb(8 47 73));
-            color: white;
+            color: rgb(165 243 252);
         }
 
         .wms-mobile-title {
@@ -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(12 74 110);
+            color: rgb(14 116 144);
             font-size: 0.72rem;
             font-weight: 900;
             letter-spacing: 0.12em;
@@ -892,7 +892,7 @@ select:focus[data-flux-control] {
         .dark .wms-mobile-badge {
             border-color: rgb(103 232 249 / 0.26);
             background: linear-gradient(135deg, rgb(8 145 178 / 0.26), rgb(37 99 235 / 0.20));
-            color: white;
+            color: rgb(165 243 252);
         }
 
         .wms-sidebar {
@@ -1483,13 +1483,13 @@ html[data-wms-sidebar="collapsed"] .wms-sidebar {
     }
 
     .select2-container--default .select2-results__option--highlighted.select2-results__option--selectable {
-        background: rgb(14 116 144);
+        background: rgb(8 145 178);
         color: white;
     }
 
     .select2-container--default .select2-results__option--selected {
         background: rgb(236 254 255);
-        color: rgb(12 74 110);
+        color: rgb(14 116 144);
     }
 
     .dark .wms-select2-field .select2-container--default .select2-selection--single {
@@ -1523,7 +1523,7 @@ html[data-wms-sidebar="collapsed"] .wms-sidebar {
 
     .dark .select2-container--default .select2-results__option--selected {
         background: rgb(8 47 73);
-        color: white;
+        color: rgb(165 243 252);
     }
 }
 
diff --git a/resources/css/wms-dashboard.css b/resources/css/wms-dashboard.css
index bdfa6541..08768be7 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: #064e3b;
+    color: #0b4f4a;
     display: flex;
     font-size: 1.35rem;
     height: 56px;
@@ -117,7 +117,7 @@
 }
 
 .wms-chart-card__eyebrow {
-    color: #064e3b;
+    color: #0f766e;
     font-size: 0.72rem;
     font-weight: 800;
     letter-spacing: 0.12em;
diff --git a/resources/js/Pages/Auth/Register.vue b/resources/js/Pages/Auth/Register.vue
index d1a07e79..a664e409 100755
--- a/resources/js/Pages/Auth/Register.vue
+++ b/resources/js/Pages/Auth/Register.vue
@@ -42,6 +42,7 @@ const submit = () => {
                     required
                     autofocus
                     autocomplete="name"
+                    name="name"
                 />
                 <InputError class="mt-2" :message="form.errors.name" />
             </div>
diff --git a/resources/views/livewire/settings/profile.blade.php b/resources/views/livewire/settings/profile.blade.php
index a66fd9f3..6da3d64e 100755
--- a/resources/views/livewire/settings/profile.blade.php
+++ b/resources/views/livewire/settings/profile.blade.php
@@ -5,7 +5,7 @@
 
     <x-settings.layout :heading="__('Profile')" :subheading="__('Update your name and email address')">
         <form wire:submit="updateProfileInformation" class="my-6 w-full space-y-6">
-            <flux:input wire:model="name" :label="__('Name')" type="text" required autofocus autocomplete="name" />
+            <flux:input wire:model="name" name="name" :label="__('Name')" type="text" required autofocus autocomplete="name" />
 
             <div>
                 <flux:input wire:model="email" :label="__('Email')" type="email" required autocomplete="email" />