From 9167b11f8ba1ce6040e451db809d80b4e4bec429 Mon Sep 17 00:00:00 2001 From: Mark Gregory Date: Mon, 21 Sep 2026 13:59:57 +0100 Subject: [PATCH] M3 Integration fixes --- .../views/components/html-editor.blade.php | 1 - .../views/livewire/ticket-show.blade.php | 6 +- .../M3/Http/Controllers/API/CloseShipment.php | 4 +- .../public/liberty-theme/css/styles.css | 120 +----------------- .../partials/modals/userAdd.blade.php | 3 +- public/css/wms-dashboard.css | 8 +- resources/css/wms-dashboard.css | 8 +- resources/js/Pages/Auth/Register.vue | 3 +- .../views/livewire/settings/profile.blade.php | 4 +- 9 files changed, 24 insertions(+), 133 deletions(-) diff --git a/Modules/Helpdesk/Resources/views/components/html-editor.blade.php b/Modules/Helpdesk/Resources/views/components/html-editor.blade.php index c06c1676..0c94b21e 100755 --- a/Modules/Helpdesk/Resources/views/components/html-editor.blade.php +++ b/Modules/Helpdesk/Resources/views/components/html-editor.blade.php @@ -109,7 +109,6 @@ autocomplete="on" autocapitalize="sentences" inputmode="text" - role="textbox" aria-multiline="true" data-placeholder="{{ $placeholder }}" data-wire-model="{{ $model }}" diff --git a/Modules/Helpdesk/Resources/views/livewire/ticket-show.blade.php b/Modules/Helpdesk/Resources/views/livewire/ticket-show.blade.php index 4ea2eb73..676bafc4 100755 --- a/Modules/Helpdesk/Resources/views/livewire/ticket-show.blade.php +++ b/Modules/Helpdesk/Resources/views/livewire/ticket-show.blade.php @@ -482,7 +482,7 @@
{!! $oldCommentBody !!}
@@ -500,9 +500,7 @@ class="rounded-xl border border-zinc-200 bg-zinc-50 p-3 dark:border-zinc-700 dark:bg-zinc-950">
- + Attach files to this reply

No files selected

diff --git a/Modules/M3/Http/Controllers/API/CloseShipment.php b/Modules/M3/Http/Controllers/API/CloseShipment.php index a9bfc09a..c7bae56e 100755 --- a/Modules/M3/Http/Controllers/API/CloseShipment.php +++ b/Modules/M3/Http/Controllers/API/CloseShipment.php @@ -260,7 +260,7 @@ class CloseShipment extends Controller // ->get(); // PFC : Check that Picked / Packed are all Equal - foreach ($iCM688M2SL as $key => $ICM688M2SLR) { + foreach ($iCM688M2SL as $ICM688M2SLR) { $a5PICKED = isset($ICM688M2SLR->A5PICKED) ? $ICM688M2SLR->A5PICKED : 0; $a5RSVQTY = isset($ICM688M2SLR->A5RSVQTY) ? $ICM688M2SLR->A5RSVQTY : 0; $a5ShortShipQty = (int) $a5RSVQTY - (int) $a5PICKED; @@ -783,7 +783,7 @@ class CloseShipment extends Controller elseif (count($iCM695M1TMP) > 0 && $tRANSTYPE == 'Z') { $errorMsgs = ''; - foreach ($iCM695M1TMP as $ICM695M1JOINR) { + foreach ($iCM695M1TMP as $key => $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 bdbc4e20..274d8cf4 100755 --- a/Modules/M3/Resources/public/liberty-theme/css/styles.css +++ b/Modules/M3/Resources/public/liberty-theme/css/styles.css @@ -444,18 +444,11 @@ legend + * { padding: 0; } -::-webkit-file-upload-button { - font: inherit; -} ::file-selector-button { font: inherit; } -::-webkit-file-upload-button { - font: inherit; - -webkit-appearance: button; -} output { display: inline-block; @@ -2230,22 +2223,6 @@ div.table-responsive > table > tbody > tr:last-child > td{ background-color: #e9ecef; opacity: 1; } -.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; - margin-inline-end: 0.75rem; - color: #212529; - background-color: #e9ecef; - pointer-events: none; - border-color: inherit; - border-style: solid; - border-width: 0; - border-inline-end-width: 1px; - border-radius: 0; - -webkit-transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out; - transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out; -} .form-control::file-selector-button, .dataTable-input::file-selector-button { padding: 0.375rem 0.75rem; margin: -0.375rem -0.75rem; @@ -2262,44 +2239,14 @@ div.table-responsive > table > tbody > tr:last-child > td{ transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out; } @media (prefers-reduced-motion: reduce) { - .form-control::-webkit-file-upload-button, .dataTable-input::-webkit-file-upload-button { - -webkit-transition: none; - transition: none; - } .form-control::file-selector-button, .dataTable-input::file-selector-button { transition: none; } } -.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; -} .form-control:hover:not(:disabled):not([readonly])::file-selector-button, .dataTable-input:hover:not(:disabled):not([readonly])::file-selector-button { background-color: #dde0e3; } -.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; - margin-inline-end: 0.75rem; - color: #212529; - background-color: #e9ecef; - pointer-events: none; - border-color: inherit; - border-style: solid; - border-width: 0; - border-inline-end-width: 1px; - border-radius: 0; - -webkit-transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out; - transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out; -} @media (prefers-reduced-motion: reduce) { - .form-control::-webkit-file-upload-button, .dataTable-input::-webkit-file-upload-button { - -webkit-transition: none; - transition: none; - } -} -.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; } .form-control-plaintext { @@ -2324,24 +2271,12 @@ div.table-responsive > table > tbody > tr:last-child > td{ font-size: 0.875rem; border-radius: 0.2rem; } -.form-control-sm::-webkit-file-upload-button { - padding: 0.25rem 0.5rem; - margin: -0.25rem -0.5rem; - -webkit-margin-end: 0.5rem; - margin-inline-end: 0.5rem; -} .form-control-sm::file-selector-button { padding: 0.25rem 0.5rem; margin: -0.25rem -0.5rem; -webkit-margin-end: 0.5rem; margin-inline-end: 0.5rem; } -.form-control-sm::-webkit-file-upload-button { - padding: 0.25rem 0.5rem; - margin: -0.25rem -0.5rem; - -webkit-margin-end: 0.5rem; - margin-inline-end: 0.5rem; -} .form-control-lg { min-height: calc(1.5em + 1rem + 2px); @@ -2349,24 +2284,12 @@ div.table-responsive > table > tbody > tr:last-child > td{ font-size: 1.25rem; border-radius: 0.3rem; } -.form-control-lg::-webkit-file-upload-button { - padding: 0.5rem 1rem; - margin: -0.5rem -1rem; - -webkit-margin-end: 1rem; - margin-inline-end: 1rem; -} .form-control-lg::file-selector-button { padding: 0.5rem 1rem; margin: -0.5rem -1rem; -webkit-margin-end: 1rem; margin-inline-end: 1rem; } -.form-control-lg::-webkit-file-upload-button { - padding: 0.5rem 1rem; - margin: -0.5rem -1rem; - -webkit-margin-end: 1rem; - margin-inline-end: 1rem; -} textarea.form-control, textarea.dataTable-input { min-height: calc(1.5em + 0.75rem + 2px); @@ -3821,7 +3744,7 @@ textarea.form-control-lg { } .dropdown-menu-dark .dropdown-item:hover, .dropdown-menu-dark .dropdown-item:focus { color: #fff; - background-color: #495057; + background-color: rgba(255, 255, 255, 0.15); } .dropdown-menu-dark .dropdown-item.active, .dropdown-menu-dark .dropdown-item:active { color: #fff; @@ -5008,11 +4931,7 @@ textarea.form-control-lg { color: #101214; } -@-webkit-keyframes progress-bar-stripes { - 0% { - background-position-x: 1rem; - } -} + @keyframes progress-bar-stripes { 0% { @@ -6198,11 +6117,7 @@ textarea.form-control-lg { color: #000; } -@-webkit-keyframes spinner-border { - to { - transform: rotate(360deg) /* rtl:ignore */; - } -} + @keyframes spinner-border { to { @@ -6227,15 +6142,7 @@ 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% { @@ -6398,11 +6305,7 @@ textarea.form-control-lg { animation: placeholder-glow 2s ease-in-out infinite; } -@-webkit-keyframes placeholder-glow { - 50% { - opacity: 0.2; - } -} + @keyframes placeholder-glow { 50% { @@ -6418,12 +6321,7 @@ 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% { @@ -7708,7 +7606,7 @@ textarea.form-control-lg { /* rtl:begin:remove */ .text-break { word-wrap: break-word !important; - word-break: break-word !important; + overflow-wrap: break-word !important; } /* rtl:end:remove */ @@ -11752,10 +11650,6 @@ nav { margin-left: 20px; } -.breadcrumb.breadcrumb-custom .breadcrumb-item:before { - content: "" -} - .breadcrumb.breadcrumb-custom .breadcrumb-item a:before, .breadcrumb.breadcrumb-custom .breadcrumb-item a:after { position: absolute; 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 53cb88a2..f11dede1 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 @@ -55,7 +55,7 @@
- @foreach ($IC670M as $key => $IC670MR)
@@ -55,7 +54,7 @@ const submit = () => { type="email" class="mt-1 block w-full" required - autocomplete="username" + autocomplete="email" />
diff --git a/resources/views/livewire/settings/profile.blade.php b/resources/views/livewire/settings/profile.blade.php index 6da3d64e..234c6178 100755 --- a/resources/views/livewire/settings/profile.blade.php +++ b/resources/views/livewire/settings/profile.blade.php @@ -5,10 +5,10 @@
- +
- + @if ($this->hasUnverifiedEmail)