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