-
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 @@
-
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 @@