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:19:22 +01:00
parent fc7abb3f64
commit 47085e5160
14 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/Company/Resources/views/show.blade.php
+3 -3
View File
@@ -253,7 +253,7 @@
<div class="grid gap-4 md:grid-cols-4 md:items-end"> <div class="grid gap-4 md:grid-cols-4 md:items-end">
<div> <div>
<label for="sonar-input-47ea6fa2d4" class="block text-xs font-bold uppercase tracking-wide text-zinc-500 dark:text-zinc-400">Division name</label> <label for="division_name" class="block text-xs font-bold uppercase tracking-wide text-zinc-500 dark:text-zinc-400">Division name</label>
<input name="name" value="{{ $division->name }}" class="mt-2 h-12 w-full rounded-xl border-zinc-300 bg-white px-4 text-sm font-medium text-zinc-900 shadow-sm outline-none transition focus:border-blue-500 focus:ring-2 focus:ring-blue-500/30 dark:border-zinc-700 dark:bg-zinc-950 dark:text-white" required id="division_name"> <input name="name" value="{{ $division->name }}" class="mt-2 h-12 w-full rounded-xl border-zinc-300 bg-white px-4 text-sm font-medium text-zinc-900 shadow-sm outline-none transition focus:border-blue-500 focus:ring-2 focus:ring-blue-500/30 dark:border-zinc-700 dark:bg-zinc-950 dark:text-white" required id="division_name">
</div> </div>
@@ -275,8 +275,8 @@
</div> </div>
<div> <div>
<label class="block text-xs font-bold uppercase tracking-wide text-zinc-500 dark:text-zinc-400">Description</label> <label for="division_description" class="block text-xs font-bold uppercase tracking-wide text-zinc-500 dark:text-zinc-400">Description</label>
<textarea aria-label="Description" name="description" rows="3" class="mt-2 w-full rounded-xl border-zinc-300 bg-white px-4 py-3 text-sm font-medium text-zinc-900 shadow-sm outline-none transition focus:border-blue-500 focus:ring-2 focus:ring-blue-500/30 dark:border-zinc-700 dark:bg-zinc-950 dark:text-white">{{ $division->description }}</textarea> <textarea id="division_description" name="description" rows="3" class="mt-2 w-full rounded-xl border-zinc-300 bg-white px-4 py-3 text-sm font-medium text-zinc-900 shadow-sm outline-none transition focus:border-blue-500 focus:ring-2 focus:ring-blue-500/30 dark:border-zinc-700 dark:bg-zinc-950 dark:text-white">{{ $division->description }}</textarea>
</div> </div>
</form> </form>
<div class="mt-6"><h4 class="font-semibold">Division address</h4><form method="POST" action="{{ route('platform.companies.divisions.address.update', [$company, $division]) }}" class="mt-4">@csrf @method('PUT')@include('company::partials.address-form', ['address' => $division->address, 'defaultLabel' => 'Operating address'])</form></div> <div class="mt-6"><h4 class="font-semibold">Division address</h4><form method="POST" action="{{ route('platform.companies.divisions.address.update', [$company, $division]) }}" class="mt-4">@csrf @method('PUT')@include('company::partials.address-form', ['address' => $division->address, 'defaultLabel' => 'Operating address'])</form></div>
Modules/Helpdesk/Resources/assets/css/app.css
+4 -4
View File
@@ -116,7 +116,7 @@
.helpdesk-ticket-form [aria-disabled="true"] { .helpdesk-ticket-form [aria-disabled="true"] {
background: #09090b !important; background: #09090b !important;
background-color: #09090b !important; background-color: #09090b !important;
color: #a1a1aa !important; color: #71717a !important;
opacity: 1 !important; opacity: 1 !important;
} }
.helpdesk-ticket-form input:-webkit-autofill, .helpdesk-ticket-form input:-webkit-autofill,
@@ -256,7 +256,7 @@
.helpdesk-ticket-form .select2-container--disabled .select2-selection--single, .helpdesk-ticket-form .select2-container--disabled .select2-selection--single,
.helpdesk-ticket-form .select2-container--disabled .select2-selection--multiple { .helpdesk-ticket-form .select2-container--disabled .select2-selection--multiple {
background: #09090b !important; background: #09090b !important;
color: #a1a1aa !important; color: #71717a !important;
opacity: 1 !important; opacity: 1 !important;
} }
@@ -820,7 +820,7 @@ span.flatpickr-weekday {
.helpdesk-ticket-form [aria-disabled="true"] { .helpdesk-ticket-form [aria-disabled="true"] {
background: #09090b !important; background: #09090b !important;
background-color: #09090b !important; background-color: #09090b !important;
color: #a1a1aa !important; color: #71717a !important;
opacity: 1 !important; opacity: 1 !important;
} }
.helpdesk-ticket-form input:-webkit-autofill, .helpdesk-ticket-form input:-webkit-autofill,
@@ -955,7 +955,7 @@ span.flatpickr-weekday {
.helpdesk-ticket-form [aria-disabled="true"] { .helpdesk-ticket-form [aria-disabled="true"] {
background: #09090b !important; background: #09090b !important;
background-color: #09090b !important; background-color: #09090b !important;
color: #a1a1aa !important; color: #71717a !important;
opacity: 1 !important; opacity: 1 !important;
} }
.helpdesk-ticket-form input:-webkit-autofill, .helpdesk-ticket-form input:-webkit-autofill,
Modules/Helpdesk/Resources/views/livewire/kanban-board.blade.php
+4 -4
View File
@@ -59,7 +59,7 @@
<div class="hd-select-wrap shrink-0 md:w-72"> <div class="hd-select-wrap shrink-0 md:w-72">
<select <select
class="hd-select" class="hd-select"
aria-label="Kanban board" aria-label="Select Kanban board"
onchange="window.location.href = '{{ route('helpdesk.kanban') }}?board_id=' + encodeURIComponent(this.value)" onchange="window.location.href = '{{ route('helpdesk.kanban') }}?board_id=' + encodeURIComponent(this.value)"
> >
@foreach ($boards as $availableBoard) @foreach ($boards as $availableBoard)
@@ -161,15 +161,15 @@
@csrf @csrf
<input type="hidden" name="return_to_board_id" value="{{ $board?->id }}"> <input type="hidden" name="return_to_board_id" value="{{ $board?->id }}">
<label <label
class="mb-1 block text-[11px] font-bold uppercase tracking-wide text-emerald-200/80">Board</label> for="ticket-board-{{ $ticket->id }}" class="mb-1 block text-[11px] font-bold uppercase tracking-wide text-emerald-200/80">Board</label>
<div class="hd-ticket-board-select-wrap"> <div class="hd-ticket-board-select-wrap">
<select name="board_id" <select id="ticket-board-{{ $ticket->id }}" name="board_id"
class="hd-ticket-board-select" class="hd-ticket-board-select"
draggable="false" draggable="false"
onchange="this.form.requestSubmit ? this.form.requestSubmit() : this.form.submit()" onchange="this.form.requestSubmit ? this.form.requestSubmit() : this.form.submit()"
onclick="event.stopPropagation()" onclick="event.stopPropagation()"
onmousedown="event.stopPropagation()" onmousedown="event.stopPropagation()"
aria-label="Move {{ $ticket->reference }} to another board"> aria-label="Board for {{ $ticket->reference }}">
@foreach ($boards as $ticketBoard) @foreach ($boards as $ticketBoard)
<option value="{{ $ticketBoard->id }}" <option value="{{ $ticketBoard->id }}"
@selected((int) $ticket->board_id === (int) $ticketBoard->id)>{{ $ticketBoard->name }}</option> @selected((int) $ticket->board_id === (int) $ticketBoard->id)>{{ $ticketBoard->name }}</option>
Modules/M3/Resources/views/liberty-theme/pages/ReplenishSettings.blade.php
+2 -2
View File
@@ -121,7 +121,7 @@
<div class="col-6"> <div class="col-6">
<div class="mb-3"> <div class="mb-3">
<label for="recipient-name" class="col-form-label">Warehouse:</label> <label for="recipient-name" class="col-form-label">Warehouse:</label>
<select class="form-select" id="WHDDA" aria-label="Warehouse" tabindex="0" required> <select class="form-select" id="WHDDA" aria-label="Select Warehouse" tabindex="0" required>
<option value="">Select Warehouse</option> <option value="">Select Warehouse</option>
@foreach ($IC670M as $key => $IC670MR) @foreach ($IC670M as $key => $IC670MR)
<option value="{{ trim($IC670MR->WDCO).trim($IC670MR->WDPL).trim($IC670MR->WDWHS) }}" <option value="{{ trim($IC670MR->WDCO).trim($IC670MR->WDPL).trim($IC670MR->WDWHS) }}"
@@ -215,7 +215,7 @@
<div class="col-6"> <div class="col-6">
<div class="mb-3"> <div class="mb-3">
<label for="recipient-name" class="col-form-label">Warehouse:</label> <label for="recipient-name" class="col-form-label">Warehouse:</label>
<select class="form-select" id="WHDD" aria-label="Warehouse" tabindex="0" disabled> <select class="form-select" id="WHDD" aria-label="Select Warehouse" tabindex="0" disabled>
<option value="">Select Warehouse</option> <option value="">Select Warehouse</option>
@foreach ($IC670M as $key => $IC670MR) @foreach ($IC670M as $key => $IC670MR)
<option value="{{ trim($IC670MR->WDCO).trim($IC670MR->WDPL).trim($IC670MR->WDWHS) }}" <option value="{{ trim($IC670MR->WDCO).trim($IC670MR->WDPL).trim($IC670MR->WDWHS) }}"
Modules/M3/Resources/views/liberty-theme/pages/execSummary.blade.php
+1 -1
View File
@@ -45,7 +45,7 @@
{{-- Report Period --}} {{-- Report Period --}}
<div class="mb-3"> <div class="mb-3">
<div class="btn-group" role="group" aria-label="Report Period"> <div class="btn-group" aria-label="Report Period">
<input type="radio" class="btn-check" name="reportPeriod" id="periodMonthly" <input type="radio" class="btn-check" name="reportPeriod" id="periodMonthly"
value="monthly" checked> value="monthly" checked>
<label class="btn btn-outline-primary btn-sm" <label class="btn btn-outline-primary btn-sm"
Modules/M3/Resources/views/liberty-theme/pages/execSummaryLine.blade.php
+1 -1
View File
@@ -45,7 +45,7 @@
{{-- Report Period --}} {{-- Report Period --}}
<div class="mb-3"> <div class="mb-3">
<div class="btn-group" role="group" aria-label="Report Period"> <div class="btn-group" aria-label="Report Period">
<input type="radio" class="btn-check" name="reportPeriod" id="periodMonthly" value="monthly" checked> <input type="radio" class="btn-check" name="reportPeriod" id="periodMonthly" value="monthly" checked>
<label class="btn btn-outline-primary btn-sm" for="periodMonthly">Monthly</label> <label class="btn btn-outline-primary btn-sm" for="periodMonthly">Monthly</label>
Modules/M3/Resources/views/liberty-theme/pages/exedashboard.blade.php
+1 -1
View File
@@ -28,7 +28,7 @@ Solon Sentinel Portal
<div class="row mb-3"> <div class="row mb-3">
<label for="inputWhs" class="col-sm-2 col-form-label">Warehouse</label> <label for="inputWhs" class="col-sm-2 col-form-label">Warehouse</label>
<div class="col-sm-10"> <div class="col-sm-10">
<select aria-label="Warehouse" name="whs" class="form-control"> <select aria-label="*ALL" name="whs" class="form-control">
<option value="*ALL">*ALL</option> <option value="*ALL">*ALL</option>
@foreach($whs_array as $key) @foreach($whs_array as $key)
<option value={{$key}} <option value={{$key}}
Modules/M3/Resources/views/liberty-theme/pages/userPickingStats4.blade.php
+1 -1
View File
@@ -26,7 +26,7 @@ Solon Sentinel Portal - Daily User Efficiency
<div class="row mb-3"> <div class="row mb-3">
<label for="inputUser" class="col-sm-2 col-form-label">User</label> <label for="inputUser" class="col-sm-2 col-form-label">User</label>
<div class="col-sm-10"> <div class="col-sm-10">
<select aria-label="User" name="user" class="form-select"> <select aria-label="" name="user" class="form-select">
<option value="" selected> </option> <option value="" selected> </option>
@foreach($user_array as $key=>$val) @foreach($user_array as $key=>$val)
<option value={{$val['userprf']}} <option value={{$val['userprf']}}
Modules/M3/Resources/views/liberty-theme/pages/userPickingStats4_old.blade.php
+1 -1
View File
@@ -28,7 +28,7 @@ Solon Sentinel Portal - userPickingStats v4
<div class="row mb-3"> <div class="row mb-3">
<label for="inputUser" class="col-sm-2 col-form-label">User</label> <label for="inputUser" class="col-sm-2 col-form-label">User</label>
<div class="col-sm-10"> <div class="col-sm-10">
<select aria-label="User" name="user" class="form-control"> <select aria-label="" name="user" class="form-control">
<option value="" selected> </option> <option value="" selected> </option>
@foreach($user_array as $key=>$val) @foreach($user_array as $key=>$val)
<option value={{$val['userprf']}} <option value={{$val['userprf']}}
Modules/M3/Resources/views/liberty-theme/partials/modals/blank.blade.php
+1 -1
View File
@@ -2,7 +2,7 @@
<div class="modal-dialog"> <div class="modal-dialog">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<h5 class="modal-title"></h5> <h5 class="modal-title"><span class="visually-hidden">Section</span></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" aria-label="Close"></button>
</div> </div>
<div class="modal-body blank-body"> <div class="modal-body blank-body">
Modules/M3/Resources/views/liberty-theme/partials/top-navigation.blade.php
+1 -1
View File
@@ -7,7 +7,7 @@
<!-- Navbar--> <!-- Navbar-->
<ul class="navbar-nav ms-auto ms-md-0 me-3 me-lg-4"> <ul class="navbar-nav ms-auto ms-md-0 me-3 me-lg-4">
<li class="nav-item dropdown"> <li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" id="navbarDropdown" href="#" role="button" data-bs-toggle="dropdown" aria-expanded="false"><i class="fas fa-user fa-fw"></i></a> <a class="nav-link dropdown-toggle" id="navbarDropdown" href="#" data-bs-toggle="dropdown" aria-expanded="false"><i class="fas fa-user fa-fw"></i></a>
<ul class="dropdown-menu dropdown-menu-end" aria-labelledby="navbarDropdown"> <ul class="dropdown-menu dropdown-menu-end" aria-labelledby="navbarDropdown">
<li><a class="dropdown-item" href="/logout">Logout</a></li> <li><a class="dropdown-item" href="/logout">Logout</a></li>
@if($execUser=='Y' || $csr=="Y" || $admin_users=='Y') @if($execUser=='Y' || $csr=="Y" || $admin_users=='Y')
resources/js/Pages/Auth/Login.vue
+2 -2
View File
@@ -70,8 +70,8 @@ const submit = () => {
</div> </div>
<div class="block mt-4"> <div class="block mt-4">
<label class="flex items-center"> <label for="remember" class="flex items-center">
<Checkbox v-model:checked="form.remember" name="remember" /> <Checkbox id="remember" v-model:checked="form.remember" name="remember" />
<span class="ms-2 text-sm text-gray-600 dark:text-gray-400">Remember me</span> <span class="ms-2 text-sm text-gray-600 dark:text-gray-400">Remember me</span>
</label> </label>
</div> </div>
resources/js/Pages/Auth/TwoFactorChallenge.vue
+2 -2
View File
@@ -66,7 +66,7 @@ const submit = () => {
inputmode="numeric" inputmode="numeric"
class="mt-1 block w-full" class="mt-1 block w-full"
autofocus autofocus
autocomplete="one-time-code" autocomplete="off"
/> />
<InputError class="mt-2" :message="form.errors.code" /> <InputError class="mt-2" :message="form.errors.code" />
</div> </div>
@@ -79,7 +79,7 @@ const submit = () => {
v-model="form.recovery_code" v-model="form.recovery_code"
type="text" type="text"
class="mt-1 block w-full" class="mt-1 block w-full"
autocomplete="one-time-code" autocomplete="off"
/> />
<InputError class="mt-2" :message="form.errors.recovery_code" /> <InputError class="mt-2" :message="form.errors.recovery_code" />
</div> </div>
resources/views/livewire/auth/two-factor-challenge.blade.php
+1 -1
View File
@@ -68,7 +68,7 @@
<div x-show="showRecoveryInput"> <div x-show="showRecoveryInput">
<div class="my-5"> <div class="my-5">
<flux:input type="text" name="recovery_code" x-ref="recovery_code" <flux:input type="text" name="recovery_code" x-ref="recovery_code"
x-bind:required="showRecoveryInput" autocomplete="one-time-code" x-bind:required="showRecoveryInput" autocomplete="off"
x-model="recovery_code" /> x-model="recovery_code" />
</div> </div>