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 14:43:32 +01:00
parent 4108354935
commit 8ed4106ddf
24 changed files with 51 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/Company/Resources/views/show.blade.php
+2 -2
View File
@@ -216,7 +216,7 @@
<form method="POST" action="{{ route('platform.companies.warehouses.division.update', [$company, $warehouse]) }}" class="contents">
@csrf @method('PUT')
<label class="sr-only" for="division_id">Division</label>
<select id="division_id" aria-label="Division Id" name="division_id" class="rounded-xl border-zinc-300 dark:border-zinc-700 dark:bg-zinc-950">
<select id="division_id" name="division_id" class="rounded-xl border-zinc-300 dark:border-zinc-700 dark:bg-zinc-950">
<option value="">Company-level warehouse</option>
@foreach($company->divisions as $divisionOption)
<option value="{{ $divisionOption->id }}" @selected($warehouse->division_id === $divisionOption->id)>{{ $divisionOption->name }}</option>
@@ -277,7 +277,7 @@
<div>
<label 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 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>
</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>
Modules/Documentation/Resources/views/documents/index.blade.php
+2 -2
View File
@@ -48,14 +48,14 @@
<input class="doc-input" name="search" value="{{ request('search') }}"
placeholder="Search title, reference, summary or body" id="sonar-input-9f8539cc9d">
<label class="sr-only" for="document_status">Status</label>
<select id="document_status" aria-label="Status" class="doc-select" name="status">
<select id="document_status" class="doc-select" name="status">
<option value="">All statuses</option>
@foreach ($statuses as $value => $label)
<option value="{{ $value }}" @selected(request('status') === $value)>{{ $label }}</option>
@endforeach
</select>
<label class="sr-only" for="document_category">Category</label>
<select id="document_category" aria-label="Category" class="doc-select" name="category">
<select id="document_category" class="doc-select" name="category">
<option value="">All categories</option>
@foreach ($categories as $category)
<option value="{{ $category->id }}" @selected((string) request('category') === (string) $category->id)>{{ $category->name }}
Modules/Helpdesk/Resources/views/components/colour-select.blade.php
+2 -2
View File
@@ -14,12 +14,12 @@
<div {{ $attributes->class('rounded-xl border border-zinc-200 bg-white p-3 shadow-sm dark:border-zinc-700 dark:bg-zinc-950/50') }}>
<div class="grid gap-3 lg:grid-cols-[minmax(0,1fr)_auto] lg:items-end">
<div class="min-w-0 space-y-2">
<label class="block text-xs font-bold uppercase tracking-wide text-zinc-600 dark:text-zinc-300">
<label for="colour-select-{{ md5($model) }}" class="block text-xs font-bold uppercase tracking-wide text-zinc-600 dark:text-zinc-300">
{{ $label }}
</label>
<div class="grid gap-2 sm:grid-cols-[minmax(0,1fr)_auto] sm:items-center">
<select aria-label="Form Field"
<select
wire:model.live="{{ $model }}"
class="h-9 w-full rounded-lg border border-zinc-300 bg-white px-3 text-sm font-semibold text-zinc-900 shadow-sm outline-none transition-colors duration-150 focus:border-blue-500 focus:ring-2 focus:ring-blue-500/30 dark:border-zinc-700 dark:bg-zinc-900 dark:text-zinc-100"
>
Modules/Helpdesk/Resources/views/livewire/kanban-board.blade.php
+1 -4
View File
@@ -154,10 +154,7 @@
<form method="POST" action="{{ route('helpdesk.tickets.board.update', $ticket) }}"
class="mt-3 rounded-xl border border-emerald-500/20 bg-emerald-950/20 p-2"
onclick="event.stopPropagation()"
onmousedown="event.stopPropagation()"
ondragstart="event.preventDefault(); event.stopPropagation();">
class="mt-3 rounded-xl border border-emerald-500/20 bg-emerald-950/20 p-2">
@csrf
<input type="hidden" name="return_to_board_id" value="{{ $board?->id }}">
<label
Modules/Helpdesk/Resources/views/livewire/ticket-show.blade.php
+1 -1
View File
@@ -486,7 +486,7 @@
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 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>
<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>
</div>
<p class="mt-2 flex items-center gap-2 text-xs font-medium text-zinc-500 dark:text-zinc-400">
Modules/Helpdesk/Resources/views/partials/time-log-form.blade.php
+1 -1
View File
@@ -19,7 +19,7 @@
</div>
<label class="sr-only" for="time_log_description">Description</label>
<textarea id="time_log_description" aria-label="Description" spellcheck="true" lang="en-GB" name="description" rows="2" placeholder="Optional work note"
<textarea id="time_log_description" spellcheck="true" lang="en-GB" name="description" rows="2" placeholder="Optional work note"
class="block w-full rounded-lg border border-zinc-300 bg-white p-2 text-xs font-semibold text-zinc-900 shadow-sm focus:border-emerald-500 focus:ring-emerald-500 dark:border-zinc-700 dark:bg-zinc-950 dark:text-zinc-100"
data-dusk="ticket-time-description">{{ old('description') }}</textarea>
Modules/M3/Http/Controllers/API/CloseShipment.php
+1 -1
View File
@@ -454,7 +454,7 @@ class CloseShipment extends Controller
$contentLabel = '';
$docTypes = ['ContentLabel', 'CarrierLabel'];
foreach ($docTypes as $key => $value) {
foreach ($docTypes as $value) {
switch ($value) {
case 'CarrierLabel':
$dOCTYPE = 'CarrierLabel';
Modules/M3/Http/Controllers/UtilitiesController.php
+1 -4
View File
@@ -58,10 +58,7 @@ class UtilitiesController extends Controller
// ICM700C EWOBJTST ICM700C ICM700CSBM
$result = $conn->PgmCall('ICM700CSBM', 'EWOBJTST', $params, [], []);
if (! $result) {
}
// Successful Call
else {
if ($result) {
dump($result);
}
Modules/M3/Resources/views/liberty-theme/pages/M3GetPDF.blade.php
+1 -1
View File
@@ -21,7 +21,7 @@ Sentinel Doc Archive
<label for="recipient-name" class="col-sm-1 col-form-label">Warehouse:</label>
<div class="col-sm-2">
<label for="WHDDA" class="visually-hidden">Warehouse</label>
<select class="form-select" id="WHDDA" aria-label="WHDD" tabindex="-1" disabled>
<select class="form-select" id="WHDDA" tabindex="-1" disabled>
@foreach ($IC670M as $key => $IC670MR)
@php $currentWHDDA = trim($IC670MR->WDCO).trim($IC670MR->WDPL).trim($IC670MR->WDWHS); @endphp
<option value="{{ $currentWHDDA }}"
Modules/M3/Resources/views/liberty-theme/pages/exedashboard.blade.php
+1 -1
View File
@@ -29,7 +29,7 @@ Solon Sentinel Portal
<label for="inputWhs" class="col-sm-2 col-form-label">Warehouse</label>
<div class="col-sm-10">
<label for="exec_whs" class="visually-hidden">Warehouse</label>
<select id="exec_whs" aria-label="Whs" name="whs" class="form-control">
<select id="exec_whs" name="whs" class="form-control">
<option value="*ALL">*ALL</option>
@foreach($whs_array as $key)
<option value={{$key}}
Modules/M3/Resources/views/liberty-theme/pages/userPickingStats4.blade.php
+2 -2
View File
@@ -27,7 +27,7 @@ Solon Sentinel Portal - Daily User Efficiency
<label for="inputUser" class="col-sm-2 col-form-label">User</label>
<div class="col-sm-10">
<label for="picking_user" class="visually-hidden">User</label>
<select id="picking_user" aria-label="User" name="user" class="form-select">
<select id="picking_user" name="user" class="form-select">
<option value="" selected> </option>
@foreach($user_array as $key=>$val)
<option value={{$val['userprf']}}
@@ -184,7 +184,7 @@ Solon Sentinel Portal - Daily User Efficiency
<div class="card-body">
<table class="table table-striped table-bordered table-hover" id="datatablesSimple4">
<tr>
<td>Total in hours (based on Greg time entry)</td>
<th scope="row">Total in hours (based on Greg time entry)</th>
<td>{{(isset($perf_array['tot_hours'])?number_format($perf_array['tot_hours'],1):"")}}</td>
</tr>
<tr>
Modules/M3/Resources/views/liberty-theme/pages/userPickingStats4_old.blade.php
+2 -2
View File
@@ -29,7 +29,7 @@ Solon Sentinel Portal - userPickingStats v4
<label for="inputUser" class="col-sm-2 col-form-label">User</label>
<div class="col-sm-10">
<label for="picking_user_old" class="visually-hidden">User</label>
<select id="picking_user_old" aria-label="User" name="user" class="form-control">
<select id="picking_user_old" name="user" class="form-control">
<option value="" selected> </option>
@foreach($user_array as $key=>$val)
<option value={{$val['userprf']}}
@@ -188,7 +188,7 @@ Solon Sentinel Portal - userPickingStats v4
<div class="card-body">
<table class="table table-striped table-bordered table-hover" id="datatablesSimple4">
<tr>
<td>Total in hours (based on Greg time entry)</td>
<th scope="row">Total in hours (based on Greg time entry)</th>
<td>{{(isset($perf_array['tot_hours'])?number_format($perf_array['tot_hours'],1):"")}}</td>
</tr>
<tr>
Modules/M3/Resources/views/liberty-theme/pages/userPickingStats5.blade.php
+1 -1
View File
@@ -27,7 +27,7 @@ Solon Sentinel Portal - Graph User Efficiency
<label for="inputUser" class="col-sm-2 col-form-label">User</label>
<div class="col-sm-10">
<label for="picking_user5" class="visually-hidden">User</label>
<select id="picking_user5" aria-label="User" name="user" class="form-select">
<select id="picking_user5" name="user" class="form-select">
@foreach($user_array as $key=>$val)
<option value={{$val['userprf']}}
@if($val['userprf']==$user) selected @endif
Modules/M3/Resources/views/liberty-theme/pages/whsePerfRequest.blade.php
+1 -1
View File
@@ -16,7 +16,7 @@ Sentinel Doc Archive
<label for="date" class="col-sm-1 col-form-label">Select Year and Month</label>
<div class="col-sm-1">
<label for="date_in_yr" class="visually-hidden">Year</label>
<select aria-label="Date In Yr" name="date_in_yr" id="date_in_yr">
<select name="date_in_yr" id="date_in_yr">
@for($x=date('Y',strtotime(date('Y').'- 5 years'));$x<date('Y');$x++)
<option value={{$x}}>{{$x}}</option>
@endfor
Modules/M3/Resources/views/liberty-theme/partials/modals/M3DeliveryAdd.blade.php
+1 -1
View File
@@ -26,7 +26,7 @@
<td><b>Ship Via</b></td> <!-- ALPHA -->
<td class="text-right">
<label for="addAVSHPVIA" class="visually-hidden">addAVSHPVIA</label>
<select aria-label="Addavshpvia" id="addAVSHPVIA" name="addAVSHPVIA">
<select id="addAVSHPVIA" name="addAVSHPVIA">
<option value="">Select Ship Via</option>
@foreach($shipvia as $key=>$val)
<option value="{{$val->AXCODE}}">{{$val->AXCODE}} - {{$val->AXDESC}}</option>
Modules/M3/Resources/views/liberty-theme/partials/modals/M3DeliveryEdit.blade.php
+1 -1
View File
@@ -27,7 +27,7 @@
<label for="OLD_AVSHPVIA" class="visually-hidden">OLD AVSHPVIA</label>
<input type="hidden" name="OLD_AVSHPVIA" id="OLD_AVSHPVIA">
<label for="AVSHPVIA" class="visually-hidden">AVSHPVIA</label>
<select aria-label="Avshpvia" id="AVSHPVIA" name="AVSHPVIA">
<select id="AVSHPVIA" name="AVSHPVIA">
<option value="">Select Ship Via</option>
@foreach($shipvia as $key=>$val)
<option value="{{$val->AXCODE}}">{{$val->AXCODE}} - {{$val->AXDESC}}</option>
Modules/M3/Resources/views/liberty-theme/partials/modals/qtyAdd.blade.php
+1 -1
View File
@@ -17,7 +17,7 @@
<td>
<div class="mb-3">
<label for="addAT9DPW" class="visually-hidden">addAT9DPW</label>
<select aria-label="Addat9dpw" class="form-select-sm" id="addAT9DPW"
<select class="form-select-sm" id="addAT9DPW"
@if($power_user->R428PWRUSR=="N")
disabled
@endif
Modules/M3/Resources/views/liberty-theme/partials/tabs/details.blade.php
+12 -12
View File
@@ -38,18 +38,18 @@
<table class="table table-condensed">
<thead>
<tr>
<td><strong>Status</strong></td>
<td><strong>Src Whse</strong></td>
<td><strong>Part</strong></td>
<td><strong>Description</strong></td>
<td><strong>Fill Code</strong></td>
<td><strong>Ord</strong></td>
<td><strong>Bal</strong></td>
<td><strong>Res</strong></td>
<td><strong>onPick</strong></td>
<td><strong>Price</strong></td>
<td><strong>Extension</strong></td>
<td><strong>Promise Date</strong></td>
<th scope="col"><strong>Status</strong></th>
<th scope="col"><strong>Src Whse</strong></th>
<th scope="col"><strong>Part</strong></th>
<th scope="col"><strong>Description</strong></th>
<th scope="col"><strong>Fill Code</strong></th>
<th scope="col"><strong>Ord</strong></th>
<th scope="col"><strong>Bal</strong></th>
<th scope="col"><strong>Res</strong></th>
<th scope="col"><strong>onPick</strong></th>
<th scope="col"><strong>Price</strong></th>
<th scope="col"><strong>Extension</strong></th>
<th scope="col"><strong>Promise Date</strong></th>
</tr>
</thead>
<tbody>
Modules/M3/Resources/views/liberty-theme/partials/tabs/orders.blade.php
+7 -7
View File
@@ -90,9 +90,9 @@
<table class="table table-condensed">
<thead>
<tr>
<td><strong>Date/Time</strong></td>
<td><strong>Message</strong></td>
<td class="text-end"><strong>Code</strong></td>
<th scope="col"><strong>Date/Time</strong></th>
<th scope="col"><strong>Message</strong></th>
<th scope="col" class="text-end"><strong>Code</strong></th>
</tr>
</thead>
<tbody>
@@ -121,7 +121,7 @@
<table class="table table-condensed">
<thead>
<tr>
<td><strong>Message</strong></td>
<th scope="col"><strong>Message</strong></th>
</tr>
</thead>
<tbody>
@@ -144,9 +144,9 @@
<table class="table table-condensed">
<thead>
<tr>
<td><strong>Date</strong></td>
<td><strong>Comment</strong></td>
<td class="text-end"><strong>Print Code</strong></td>
<th scope="col"><strong>Date</strong></th>
<th scope="col"><strong>Comment</strong></th>
<th scope="col" class="text-end"><strong>Print Code</strong></th>
</tr>
</thead>
<tbody>
Modules/Platform/resources/views/licenses/index.blade.php
+1 -1
View File
@@ -12,7 +12,7 @@
<form method="POST" action="{{ route('platform.licenses.store') }}" class="mt-5 grid gap-4 md:grid-cols-5">
@csrf
<label class="sr-only" for="license_company_id">Company</label>
<select id="license_company_id" aria-label="Company Id" name="company_id" class="rounded-xl border-zinc-300 dark:border-zinc-700 dark:bg-zinc-950">
<select id="license_company_id" name="company_id" class="rounded-xl border-zinc-300 dark:border-zinc-700 dark:bg-zinc-950">
@foreach ($companies as $company)
<option value="{{ $company->id }}">{{ $company->name }}</option>
@endforeach
Modules/Platform/resources/views/payments/index.blade.php
+1 -1
View File
@@ -8,7 +8,7 @@
<form method="POST" action="{{ route('platform.payments.store') }}" class="mt-5 grid gap-4 md:grid-cols-6">
@csrf
<label class="sr-only" for="payment_company_id">Company</label>
<select id="payment_company_id" aria-label="Company Id" name="company_id" class="rounded-xl border-zinc-300 dark:border-zinc-700 dark:bg-zinc-950">
<select id="payment_company_id" name="company_id" class="rounded-xl border-zinc-300 dark:border-zinc-700 dark:bg-zinc-950">
@foreach ($companies as $company)
<option value="{{ $company->id }}">{{ $company->name }}</option>
@endforeach
Modules/Warehouse/resources/views/rules/index.blade.php
+1 -1
View File
@@ -8,7 +8,7 @@
<form method="POST" action="{{ route('warehouse-rules.store') }}" class="mt-5 grid gap-4 md:grid-cols-6">
@csrf
<label class="sr-only" for="rule_warehouse_id">Warehouse</label>
<select id="rule_warehouse_id" aria-label="Warehouse Id" name="warehouse_id" class="rounded-xl border-zinc-300 dark:border-zinc-700 dark:bg-zinc-950">
<select id="rule_warehouse_id" name="warehouse_id" class="rounded-xl border-zinc-300 dark:border-zinc-700 dark:bg-zinc-950">
@foreach ($warehouses as $warehouse)
<option value="{{ $warehouse->id }}">{{ $warehouse->name }}</option>
@endforeach
public/css/wms-dashboard.css
+2 -2
View File
@@ -100,9 +100,9 @@
.wms-metric-card__icon {
align-items: center;
background: linear-gradient(135deg, rgba(15, 118, 110, 0.14), rgba(37, 99, 235, 0.12));
background: #dbeafe;
border-radius: 18px;
color: #075e59;
color: #064e3b;
display: flex;
font-size: 1.35rem;
height: 56px;
resources/css/app.css
+5 -5
View File
@@ -480,7 +480,7 @@ select:focus[data-flux-control] {
gap: 0.25rem;
border-radius: 0.85rem;
border: 1px solid rgb(255 255 255 / 0.18);
background: rgb(255 255 255 / 0.10);
background: rgb(30 64 175);
padding: 0.7rem 0.85rem;
color: rgb(255 255 255);
box-shadow: 0 10px 24px rgb(0 0 0 / 0.18);
@@ -757,8 +757,8 @@ select:focus[data-flux-control] {
height: 2rem;
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(7 89 110);
background: rgb(224 242 254);
color: rgb(12 74 110);
font-size: 0.72rem;
font-weight: 900;
letter-spacing: 0.12em;
@@ -882,8 +882,8 @@ select:focus[data-flux-control] {
height: 2rem;
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(7 89 110);
background: rgb(224 242 254);
color: rgb(12 74 110);
font-size: 0.72rem;
font-weight: 900;
letter-spacing: 0.12em;