mag/WMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

M3 Integration fixes

Browse Source
This commit is contained in:
Mark Gregory
2026-09-21 13:59:57 +01:00
parent 2242106309
commit 9167b11f8b
9 changed files with 24 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/Helpdesk/Resources/views/components/html-editor.blade.php
-1
View File
@@ -109,7 +109,6 @@
autocomplete="on"
autocapitalize="sentences"
inputmode="text"
role="textbox"
aria-multiline="true"
data-placeholder="{{ $placeholder }}"
data-wire-model="{{ $model }}"
Modules/Helpdesk/Resources/views/livewire/ticket-show.blade.php
+2 -4
View File
@@ -482,7 +482,7 @@
<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" aria-multiline="true" spellcheck="true" lang="en-GB" autocorrect="on" autocomplete="on" autocapitalize="sentences" inputmode="text"
contenteditable="true" aria-label="Ticket comment body" 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>
@@ -500,9 +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 class="block text-xs font-bold text-zinc-700 dark:text-zinc-200">Attach files
to
this reply</label>
<span class="block text-xs font-bold text-zinc-700 dark:text-zinc-200">Attach files to this reply</span>
<p class="mt-1 truncate text-xs font-semibold text-zinc-500 dark:text-zinc-400"
data-helpdesk-file-label>No files selected</p>
</div>
Modules/M3/Http/Controllers/API/CloseShipment.php
+2 -2
View File
@@ -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);
Modules/M3/Resources/public/liberty-theme/css/styles.css
+7 -113
View File
@@ -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;
Modules/M3/Resources/views/liberty-theme/partials/modals/userAdd.blade.php
+2 -1
View File
@@ -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="Div-Plt-Whs" 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) }}"
@@ -68,6 +68,7 @@
</div>
</td>
</tr>
<!-- <tr> -->
</tr>
</table>
</td>
public/css/wms-dashboard.css
+4 -4
View File
@@ -78,7 +78,7 @@
}
.wms-metric-card__label {
color: #64748b;
color: #475569;
font-size: 0.78rem;
font-weight: 800;
letter-spacing: 0.08em;
@@ -94,7 +94,7 @@
}
.wms-metric-card__hint {
color: #64748b;
color: #475569;
font-size: 0.85rem;
}
@@ -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: #0b4f4a;
color: #0f766e;
display: flex;
font-size: 1.35rem;
height: 56px;
@@ -133,7 +133,7 @@
}
.wms-chart-card__description {
color: #64748b;
color: #475569;
font-size: 0.9rem;
margin: 0;
}
resources/css/wms-dashboard.css
+4 -4
View File
@@ -78,7 +78,7 @@
}
.wms-metric-card__label {
color: #64748b;
color: #475569;
font-size: 0.78rem;
font-weight: 800;
letter-spacing: 0.08em;
@@ -94,7 +94,7 @@
}
.wms-metric-card__hint {
color: #64748b;
color: #475569;
font-size: 0.85rem;
}
@@ -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: #0b4f4a;
color: #0f766e;
display: flex;
font-size: 1.35rem;
height: 56px;
@@ -133,7 +133,7 @@
}
.wms-chart-card__description {
color: #64748b;
color: #475569;
font-size: 0.9rem;
margin: 0;
}
resources/js/Pages/Auth/Register.vue
+1 -2
View File
@@ -42,7 +42,6 @@ const submit = () => {
required
autofocus
autocomplete="name"
name="name"
/>
<InputError class="mt-2" :message="form.errors.name" />
</div>
@@ -55,7 +54,7 @@ const submit = () => {
type="email"
class="mt-1 block w-full"
required
autocomplete="username"
autocomplete="email"
/>
<InputError class="mt-2" :message="form.errors.email" />
</div>
resources/views/livewire/settings/profile.blade.php
+2 -2
View File
@@ -5,10 +5,10 @@
<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" name="name" :label="__('Name')" type="text" required autofocus autocomplete="name" />
<flux:input wire:model="name" :label="__('Name')" type="text" required autofocus autocomplete="name" name="name" />
<div>
<flux:input wire:model="email" :label="__('Email')" type="email" required autocomplete="email" />
<flux:input wire:model="email" :label="__('Email')" type="email" required autocomplete="email" name="email" />
@if ($this->hasUnverifiedEmail)
<div>