mag/WMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

m3 Security Fixes

Browse Source
This commit is contained in:
Mark Gregory
2026-09-16 17:14:26 +01:00
parent 1602bdd72e
commit d68687f062
78 changed files with 1297 additions and 1228 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/M3/Resources/views/liberty-theme/pages/pendingClosure.blade.php
+13 -13
View File
@@ -20,7 +20,7 @@ Solon Sentinel Portal - Trucks pending closure with M3
@php $unprocessedMan = implode(', ', $unprocessedArr); @endphp
<b><p style="background-color:tomato;">Manifests: {!! $unprocessedMan !!} have some orders that still have a header picking status of B, and may not have closed in M3. Please investigate</b>
@endif
</div>
<div class="card-body">
<table class="table table-striped table-bordered table-hover" id="datatablesSimple5" width="100%">
@@ -47,7 +47,7 @@ Solon Sentinel Portal - Trucks pending closure with M3
<tbody>
@foreach($ICM705M1 as $key=>$val)
@php
$closeinRed = false;
$closeinRed = false;
$APLDCLOD = trim($val->APLDCLOD)!="0" ? date('Y-m-d', strtotime($val->APLDCLOD)) : "";
$APLDCLOT = trim($val->APLDCLOT)!="0"?(strlen($val->APLDCLOT)==6?date('H:i:s', strtotime($val->APLDCLOT)):date('H:i:s', strtotime('0'.$val->APLDCLOT))):"";
# Get current time as a timestamp
@@ -83,13 +83,13 @@ Solon Sentinel Portal - Trucks pending closure with M3
<td>
{{-- Link to Manifest Orders --}}
@if( $val->APMANIFEST!="0" )
<a class="btn btn-link" target="_blank" href="{{ url('MFOrders', ['id' => trim($val->APMANIFEST)]) }}">
{{ trim($val->APMANIFEST)!="0"?$val->APMANIFEST:"" }}
<a class="btn btn-link" target="_blank" href="{{ url('MFOrders', ['id' => trim($val->APMANIFEST)]) }}">
{{ trim($val->APMANIFEST)!="0"?$val->APMANIFEST:"" }}
</a>
@endif
{{-- Close Button --}}
@if( ($val->APMANIFEST!="0" && $val->APSPARE2!="P" && trim($val->APLDCLOD)!="") && !$closeinRed)
<button class="btn btn-sm btn-warning" id="submitManifest" data-shuser="{{trim($user)}}" data-manifest="{{trim($val->APMANIFEST)}}" data-apco="{{trim($val->APCO)}}" data-apwhs="{{trim($val->APWHS)}}">
<button class="btn btn-sm btn-warning" id="submitManifest" data-shuser="{{trim($user)}}" data-manifest="{{trim($val->APMANIFEST)}}" data-apco="{{trim($val->APCO)}}" data-apwhs="{{trim($val->APWHS)}}">
Close
</button>
@elseif($val->APSPARE2=="P")
@@ -97,16 +97,16 @@ Solon Sentinel Portal - Trucks pending closure with M3
@endif
</td>
{{-- MAK Show Retry Message instead of Contact MPBA --}}
<td> {!! $val->APSPARE2=="P" && !$ManifestDelayed ? "In Process" :
( $val->APSPARE2=="P" && $ManifestDelayed ?
<td> {!! $val->APSPARE2=="P" && !$ManifestDelayed ? "In Process" :
( $val->APSPARE2=="P" && $ManifestDelayed ?
'<button class="btn btn-sm btn-danger" id="allowRetry"
data-shuser="' . trim($user) . '"
data-manifest="' . trim($val->APMANIFEST) . '"
data-apco="' . trim($val->APCO) . '"
data-apwhs="' . trim($val->APWHS) . '">
Failed – please reset
</button>'
: '')
</button>'
: '')
!!}
</td>
<td> {{ $val->APDOCKDOOR }} </td>
@@ -179,9 +179,9 @@ Solon Sentinel Portal - Trucks pending closure with M3
});
// Submit Manifet
// Submit Manifet
$(document).on('click','#submitManifest', function () {
if (confirm("Do you want to close this manifest in M3 immediately?")) {
if (confirm("Do you want to close this manifest in M3 immediately?")) {
SHUSER = $(this).data('shuser');
MANIFEST = $(this).data('manifest');
APCO = $(this).data('apco');
@@ -225,7 +225,7 @@ Solon Sentinel Portal - Trucks pending closure with M3
// Allow Retry
$(document).on('click','#allowRetry', function () {
if (confirm("Do you want to allow manifest Closing?")) {
if (confirm("Do you want to allow manifest Closing?")) {
SHUSER = $(this).data('shuser');
MANIFEST = $(this).data('manifest');
APCO = $(this).data('apco');
@@ -286,6 +286,6 @@ Solon Sentinel Portal - Trucks pending closure with M3
});
});
</script>
@endsection