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:27:26 +01:00
parent bcbdd24f15
commit 4108354935
25 changed files with 182 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/M3/Resources/public/liberty-theme/css/styles.css
-4
View File
@@ -2224,7 +2224,6 @@ div.table-responsive > table > tbody > tr:last-child > td{
opacity: 1;
}
.form-control::file-selector-button, .dataTable-input::file-selector-button {
padding: 0.375rem 0.75rem;
margin: -0.375rem -0.75rem;
-webkit-margin-end: 0.75rem;
margin-inline-end: 0.75rem;
@@ -3632,7 +3631,6 @@ textarea.form-control-lg {
.dropend .dropdown-toggle::after {
display: inline-block;
margin-left: 0.255em;
vertical-align: 0.255em;
content: "";
border-top: 0.3em solid transparent;
border-right: 0;
@@ -3652,7 +3650,6 @@ textarea.form-control-lg {
margin-right: 0.125rem;
}
.dropstart .dropdown-toggle::after {
display: inline-block;
margin-left: 0.255em;
vertical-align: 0.255em;
content: "";
@@ -3661,7 +3658,6 @@ textarea.form-control-lg {
.dropstart .dropdown-toggle::before {
display: inline-block;
margin-right: 0.255em;
vertical-align: 0.255em;
content: "";
border-top: 0.3em solid transparent;
border-right: 0.3em solid;
Modules/M3/Resources/views/liberty-theme/pages/M3GetPDF.blade.php
+2 -1
View File
@@ -20,7 +20,8 @@ Sentinel Doc Archive
</div>
<label for="recipient-name" class="col-sm-1 col-form-label">Warehouse:</label>
<div class="col-sm-2">
<select class="form-select" id="WHDDA" tabindex="-1" disabled>
<label for="WHDDA" class="visually-hidden">Warehouse</label>
<select class="form-select" id="WHDDA" aria-label="WHDD" 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
+2 -1
View File
@@ -28,7 +28,8 @@ Solon Sentinel Portal
<div class="row mb-3">
<label for="inputWhs" class="col-sm-2 col-form-label">Warehouse</label>
<div class="col-sm-10">
<select name="whs" class="form-control">
<label for="exec_whs" class="visually-hidden">Warehouse</label>
<select id="exec_whs" aria-label="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 -1
View File
@@ -26,7 +26,8 @@ Solon Sentinel Portal - Daily User Efficiency
<div class="row mb-3">
<label for="inputUser" class="col-sm-2 col-form-label">User</label>
<div class="col-sm-10">
<select name="user" class="form-select">
<label for="picking_user" class="visually-hidden">User</label>
<select id="picking_user" aria-label="User" name="user" class="form-select">
<option value="" selected> </option>
@foreach($user_array as $key=>$val)
<option value={{$val['userprf']}}
Modules/M3/Resources/views/liberty-theme/pages/userPickingStats4_old.blade.php
+2 -1
View File
@@ -28,7 +28,8 @@ Solon Sentinel Portal - userPickingStats v4
<div class="row mb-3">
<label for="inputUser" class="col-sm-2 col-form-label">User</label>
<div class="col-sm-10">
<select name="user" class="form-control">
<label for="picking_user_old" class="visually-hidden">User</label>
<select id="picking_user_old" aria-label="User" name="user" class="form-control">
<option value="" selected> </option>
@foreach($user_array as $key=>$val)
<option value={{$val['userprf']}}
Modules/M3/Resources/views/liberty-theme/pages/userPickingStats5.blade.php
+2 -1
View File
@@ -26,7 +26,8 @@ Solon Sentinel Portal - Graph User Efficiency
<div class="row mb-3">
<label for="inputUser" class="col-sm-2 col-form-label">User</label>
<div class="col-sm-10">
<select name="user" class="form-select">
<label for="picking_user5" class="visually-hidden">User</label>
<select id="picking_user5" aria-label="User" 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
+2 -1
View File
@@ -15,7 +15,8 @@ Sentinel Doc Archive
<div class="mb-2 row">
<label for="date" class="col-sm-1 col-form-label">Select Year and Month</label>
<div class="col-sm-1">
<select name="date_in_yr" id="date_in_yr">
<label for="date_in_yr" class="visually-hidden">Year</label>
<select aria-label="Date In Yr" 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
+33 -30
View File
@@ -4,57 +4,60 @@
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title">Add</h5>
<button type="button" class="btn-close close-modal" data-bs-dismiss="modal"></button>
<button type="button" class="btn-close close-modal" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body">
<div class="table-responsive" id="M3DeliveryAddData">
<input type="hidden" id="addAVCO" name="addAVCO" value="{{$power_user->R428CO}}">
<input type="hidden" id="addAVPLANT" name="addAVPLANT" value="{{$power_user->R428PL}}">
<input type="hidden" id="addAVWHS" name="addAVWHS" value="{{$power_user->R428WH}}">
<div class="sonar-form-layout">
<div>
</div>
<div>
<div class="row g-2 align-items-center mb-2">
<div class="col"><b>Delivery Method</b></div> <!-- ALPHA -->
<div class="col text-right">
<table role="presentation" class="table table-condensed" >
<thead>
</thead>
<tbody>
<tr>
<td><b>Delivery Method</b></td> <!-- ALPHA -->
<td class="text-right">
<label for="addAVDELMETH" class="visually-hidden">addAVDELMETH</label>
<input type="text" maxlength="4" length="4" class="myinput" name="addAVDELMETH" id="addAVDELMETH">
</div>
</div>
<div class="row g-2 align-items-center mb-2">
<div class="col"><b>Ship Via</b></div> <!-- ALPHA -->
<div class="col text-right">
<select id="addAVSHPVIA" name="addAVSHPVIA">
</td>
</tr>
<tr>
<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">
<option value="">Select Ship Via</option>
@foreach($shipvia as $key=>$val)
<option value="{{$val->AXCODE}}">{{$val->AXCODE}} - {{$val->AXDESC}}</option>
@endforeach
</select>
</div>
</div>
<div class="row g-2 align-items-center mb-2">
<div class="col"><b>Sentinel Route</b></div> <!-- ALPHA -->
<div class="col text-right">
<select id="addAVSHSRT" name="addAVSHSRT">
</td>
</tr>
<tr>
<td><b>Sentinel Route</b></td> <!-- ALPHA -->
<td class="text-right">
<label for="addAVSHSRT" class="visually-hidden">addAVSHSRT</label>
<select aria-label="Addavshsrt" id="addAVSHSRT" name="addAVSHSRT">
<option value=" "></option>
<option value="GR">GR</option>
<option value="PU">PU</option>
</select>
</div>
</div>
<div class="row g-2 align-items-center mb-2">
<div class="col"><b>International Code</b></div> <!-- ALPHA -->
<div class="col text-right">
<select id="addAVSHORCL" name="addAVSHORCL">
</td>
</tr>
<tr>
<td><b>International Code</b></td> <!-- ALPHA -->
<td class="text-right">
<label for="addAVSHORCL" class="visually-hidden">addAVSHORCL</label>
<select aria-label="Addavshorcl" id="addAVSHORCL" name="addAVSHORCL">
<option value=" " selected></option>
<option value="Y">002 - International</option>
</select>
</div>
</div>
</td>
</tr>
</div>
</div>
</tbody>
</table>
</div>
</div>
<div class="modal-footer">
Modules/M3/Resources/views/liberty-theme/partials/modals/M3DeliveryEdit.blade.php
+31 -28
View File
@@ -4,62 +4,65 @@
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title">Edit</h5>
<button type="button" class="btn-close close-modal" data-bs-dismiss="modal"></button>
<button type="button" class="btn-close close-modal" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body">
<div class="table-responsive" id="M3DeliveryEditData">
<input type="hidden" id="AVCO" name="AVCO" value="{{$power_user->R428CO}}">
<input type="hidden" id="AVPLANT" name="AVPLANT" value="{{$power_user->R428PL}}">
<input type="hidden" id="AVWHS" name="AVWHS" value="{{$power_user->R428WH}}">
<div class="sonar-form-layout">
<div>
<div class="row g-2 align-items-center mb-2">
<div class="col"><b>Delivery Method</b></div> <!-- ALPHA -->
<div class="col text-right">
<table role="presentation" class="table table-condensed">
<tbody>
<tr>
<td><b>Delivery Method</b></td> <!-- ALPHA -->
<td class="text-right">
<input type="hidden" name="OLD_AVDELMETH" id="OLD_AVDELMETH">
<label for="AVDELMETH" class="visually-hidden">AVDELMETH</label>
<input type="text" maxlength="4" length="4" class="myinput" name="AVDELMETH" id="AVDELMETH" readonly>
</div>
</div>
<div class="row g-2 align-items-center mb-2">
<div class="col"><b>Ship Via</b></div> <!-- ALPHA -->
<div class="col text-right">
</td>
</tr>
<tr>
<td><b>Ship Via</b></td> <!-- ALPHA -->
<td class="text-right">
<label for="OLD_AVSHPVIA" class="visually-hidden">OLD AVSHPVIA</label>
<input type="hidden" name="OLD_AVSHPVIA" id="OLD_AVSHPVIA">
<select id="AVSHPVIA" name="AVSHPVIA">
<label for="AVSHPVIA" class="visually-hidden">AVSHPVIA</label>
<select aria-label="Avshpvia" id="AVSHPVIA" name="AVSHPVIA">
<option value="">Select Ship Via</option>
@foreach($shipvia as $key=>$val)
<option value="{{$val->AXCODE}}">{{$val->AXCODE}} - {{$val->AXDESC}}</option>
@endforeach
</select>
</div>
</div>
<div class="row g-2 align-items-center mb-2">
<div class="col"><b>Sentinel Route</b></div> <!-- ALPHA -->
<div class="col text-right">
</td>
</tr>
<tr>
<td><b>Sentinel Route</b></td> <!-- ALPHA -->
<td class="text-right">
<label for="OLD_AVSHSRT" class="visually-hidden">OLD AVSHSRT</label>
<input type="hidden" name="OLD_AVSHSRT" id="OLD_AVSHSRT">
<select id="AVSHSRT" name="AVSHSRT">
<label for="AVSHSRT" class="visually-hidden">AVSHSRT</label>
<select aria-label="Avshsrt" id="AVSHSRT" name="AVSHSRT">
<option value=" "></option>
<option value="GR">GR</option>
<option value="PU">PU</option>
</select>
</div>
</div>
<div class="row g-2 align-items-center mb-2">
<div class="col"><b>International Code</b></div> <!-- ALPHA -->
<div class="col text-right">
</td>
</tr>
<tr>
<td><b>International Code</b></td> <!-- ALPHA -->
<td class="text-right">
<label for="OLD_AVSHORCL" class="visually-hidden">OLD AVSHORCL</label>
<input type="hidden" name="OLD_AVSHORCL" id="OLD_AVSHORCL">
<select id="AVSHORCL" name="AVSHORCL">
<label for="AVSHORCL" class="visually-hidden">AVSHORCL</label>
<select aria-label="Avshorcl" id="AVSHORCL" name="AVSHORCL">
<option value=" " selected></option>
<option value="Y">002 - International</option>
</select>
</div>
</div>
</td>
</tr>
</div>
</div>
</tbody>
</table>
</div>
</div>
<div class="modal-footer">
Modules/M3/Resources/views/liberty-theme/partials/modals/qtyAdd.blade.php
+29 -28
View File
@@ -4,19 +4,20 @@
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title">ERP/TMS Part Data Add</h5>
<button type="button" class="btn-close close-modal" data-bs-dismiss="modal"></button>
<button type="button" class="btn-close close-modal" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body">
<div class="table-responsive" id="qtyAddData">
<div class="sonar-form-layout">
<div>
</div>
<div>
<div class="row g-2 align-items-center mb-2">
<div class="col"><label for="AT9DPW" class="col-form-label"><b>Div-Plt-Whs:</b></label></div>
<div class="col">
<table role="presentation" class="table table-condensed" >
<thead>
</thead>
<tbody>
<tr>
<td><label for="AT9DPW" class="col-form-label"><b>Div-Plt-Whs:</b></label></td>
<td>
<div class="mb-3">
<select class="form-select-sm" id="addAT9DPW"
<label for="addAT9DPW" class="visually-hidden">addAT9DPW</label>
<select aria-label="Addat9dpw" class="form-select-sm" id="addAT9DPW"
@if($power_user->R428PWRUSR=="N")
disabled
@endif
@@ -30,32 +31,32 @@
@endforeach
</select>
</div>
</div>
</div>
<div class="row g-2 align-items-center mb-2">
<div class="col"><b>Part</b></div> <!-- ALPHA -->
<div class="col text-right">
</td>
</tr>
<tr>
<td><b>Part</b></td> <!-- ALPHA -->
<td class="text-right">
<label for="addAT9PART" class="visually-hidden">addAT9PART</label>
<input type="text" maxlength="15" class="myinput" name="addAT9PART" id="addAT9PART" required>
</div>
</div>
<div class="row g-2 align-items-center mb-2">
<div class="col"><b>Pallet Qty</b></div> <!-- NUMERIC -->
<div class="col text-right">
</td>
</tr>
<tr>
<td><b>Pallet Qty</b></td> <!-- NUMERIC -->
<td class="text-right">
<label for="addAT9QTY" class="visually-hidden">addAT9QTY</label>
<input type="number" min="1" max="999999999" increment=1 class="myinput" name="addAT9QTY" id="addAT9QTY" required>
</div>
</div>
<div class="row g-2 align-items-center mb-2">
<div class="col"><b>Hazardous Material</b></div> <!-- ALPHA -->
<div class="col text-right">
</td>
</tr>
<tr>
<td><b>Hazardous Material</b></td> <!-- ALPHA -->
<td class="text-right">
<label for="addAT9WRN" class="visually-hidden">addAT9WRN</label>
<input type="text" maxlength="5" class="myinput" name="addAT9WRN" id="addAT9WRN">
</div>
</div>
</td>
</tr>
</div>
</div>
</tbody>
</table>
</div>
</div>
<div class="modal-footer">