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/partials/left-navigation.blade.php
+9 -9
View File
@@ -4,9 +4,9 @@
<div class="nav">
@if($execUser!='Y' )
@if($csr!="Y" )
<a class="nav-link" href="/">
<div class="sb-nav-link-icon"><i class="fas fa-tachometer-alt"></i></div>
Dashboard
@@ -44,7 +44,7 @@
User Control
</a>
@if($power_users=='Y' || $admin_users=='Y')
@if($power_users=='Y' || $admin_users=='Y')
<a class="nav-link {{ request()->is('carrierMaint') || request()->is('carrierMaint/*') ? 'active' : '' }}"
href="{{ route('m3.carrierMaint') }}">
<i class="fa-fw fas fa-briefcase mr-1"></i>
@@ -62,14 +62,14 @@
<i class="fa-fw fas fa-briefcase mr-1"></i>
M3 Delivery Methods
</a>
<a class="nav-link {{ request()->is('OrderLinesOfClosedOrder') || request()->is('OrderLinesOfClosedOrder/*') ? 'active' : '' }}"
href="{{ route('m3.OrderLinesOfClosedOrder') }}">
<i class="fa-fw fas fa-file-excel mr-1"></i>
Daily Closed order lines report
</a>
@if($power_users=='Y' || $admin_users=='Y')
@if($power_users=='Y' || $admin_users=='Y')
<a class="nav-link {{ request()->is('userPickingStats4') || request()->is('userPickingStats4/*') ? 'active' : '' }}"
href="{{ route('m3.userPickingStats4') }}">
<i class="fa-fw fas fa-user-friends mr-1"></i>
@@ -86,7 +86,7 @@
<i class="fa-fw fas fa-chart-bar mr-1"></i>
Truck pending closure in M3
</a>
@endif
@endif
{{-- Distribution whs addresses --}}
<a class="nav-link {{ request()->is('ship-to') || request()->is('ship-to/*') ? 'active' : '' }}" href="{{ url('ship-to') }}">
@@ -108,21 +108,21 @@
<a class="nav-link {{ request()->is('whsePerf') || request()->is('whsePerf/*') ? 'active' : '' }}"
href="{{ route('m3.whsePerf') }}">
<i class="fa-fw fas fa-chart-bar mr-1"></i>
OTTC
OTTC
</a>
{{-- Scan Boxes to Pallet --}}
{{-- <a class="nav-link {{ request()->is('BoxPackToPallet') || request()->is('BoxPackToPallet/*') ? 'active' : '' }}"
href="{{ route('m3.BoxPackToPallet') }}">
<i class="fa-fw fas fa-chart-bar mr-1"></i>
Scan Boxes to Pallet
Scan Boxes to Pallet
</a> --}}
{{-- Sentinel Home --}}
<a class="nav-link " href="{{ env("APP_URL") }}/php/SentinelHome.php">
<i class="fa-fw fas fa-chart-bar mr-1"></i>Sentinel Home</a>
@endif
@endif
@endif {{-- Exec User --}}
Modules/M3/Resources/views/liberty-theme/partials/modals/carrierEdit.blade.php
+3 -3
View File
@@ -28,7 +28,7 @@
<td><b>2ship Carrier Code</b></td> <!-- NUMERIC -->
<td class="text-right">
<input type="hidden" name="OLD_TWOSHIPCARRIERCODE" id="OLD_TWOSHIPCARRIERCODE">
<input type="number" min="1" max="999" step="1" pattern="[0-9]{3}" class="myinput" name="TWOSHIPCARRIERCODE" id="TWOSHIPCARRIERCODE"
<input type="number" min="1" max="999" step="1" pattern="[0-9]{3}" class="myinput" name="TWOSHIPCARRIERCODE" id="TWOSHIPCARRIERCODE"
onkeypress='return ((event.charCode >= 48 && event.charCode <= 57) || (event.charCode == 32))' required>
</td>
</tr>
@@ -47,7 +47,7 @@
<td><b>ERP Carrier Code</b></td> <!-- ALPHA -->
<td class="text-right">
<input type="hidden" name="OLD_CASPR10A01" id="OLD_CASPR10A01">
<!--#553 <input type="number" min="1" max="999999" step="1" class="myinput" pattern="[0-9]{6}" name="CASPR10A01" id="CASPR10A01"
<!--#553 <input type="number" min="1" max="999999" step="1" class="myinput" pattern="[0-9]{6}" name="CASPR10A01" id="CASPR10A01"
onkeypress='return ((event.charCode >= 48 && event.charCode <= 57) || (event.charCode == 32))' required> -->
<input type="text" maxlength="10" class="myinput" name="CASPR10A01" id="CASPR10A01" required>
</td>
@@ -58,7 +58,7 @@
Overnight
<div class="col-sm-1 form-check form-check-inline form-switch">
<input type="hidden" name="OLD_CASPR1A01" id="OLD_CASPR1A01">
<input type="checkbox" class="form-check-input" role="switch" id="CASPR1A01" name="CASPR1A01" data-on="Y" data-off="">
<input type="checkbox" class="form-check-input" role="switch" id="CASPR1A01" name="CASPR1A01" data-on="Y" data-off="">
</div>
When closing truck
</td>
Modules/M3/Resources/views/liberty-theme/partials/modals/qtyAdd.blade.php
+5 -5
View File
@@ -16,14 +16,14 @@
<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"
@if($power_user->R428PWRUSR=="N")
disabled
<select class="form-select-sm" id="addAT9DPW"
@if($power_user->R428PWRUSR=="N")
disabled
@endif
>
@foreach ($IC670M as $key => $IC670MR)
<option selected value="{{ trim($IC670MR->WDCO).trim($IC670MR->WDPL).trim($IC670MR->WDWHS) }}"
data-AT9CO="{{ trim($IC670MR->WDCO) }}" data-AT9PLT="{{ trim($IC670MR->WDPL) }}" data-AT9WHS="{{ trim($IC670MR->WDWHS) }}"
<option selected value="{{ trim($IC670MR->WDCO).trim($IC670MR->WDPL).trim($IC670MR->WDWHS) }}"
data-AT9CO="{{ trim($IC670MR->WDCO) }}" data-AT9PLT="{{ trim($IC670MR->WDPL) }}" data-AT9WHS="{{ trim($IC670MR->WDWHS) }}"
data-AT9DPW="{{ trim($IC670MR->WDCO).trim($IC670MR->WDPL).trim($IC670MR->WDWHS) }}">
{{ trim(Str::upper($IC670MR->WDWNAM)) }}
</option>
Modules/M3/Resources/views/liberty-theme/partials/modals/qtyEdit.blade.php
+1 -1
View File
@@ -19,7 +19,7 @@
<select class="form-select-sm" name="AT9DPW" id="AT9DPW" required>
<!--<option value="" selected disabled hidden>Select</option>-->
@foreach ($IC670M as $key => $IC670MR)
<option selected value="{{ trim($IC670MR->WDCO).trim($IC670MR->WDPL).trim($IC670MR->WDWHS) }}"
<option selected value="{{ trim($IC670MR->WDCO).trim($IC670MR->WDPL).trim($IC670MR->WDWHS) }}"
data-AT9CO="{{ trim($IC670MR->WDCO) }}" data-AT9PLT="{{ trim($IC670MR->WDPL) }}" data-AT9WHS="{{ trim($IC670MR->WDWHS) }}" >
{{ trim(Str::upper($IC670MR->WDWNAM)) }}
</option>
Modules/M3/Resources/views/liberty-theme/partials/modals/shipToCheckBox.blade.php
+2 -2
View File
@@ -11,7 +11,7 @@
<div class="col-xs-5">
<label class="checkbox-inline">
<input type="checkbox" name="check1" id="check1" value="1"> Ignore address checker for all future releases of this order
</label>
</label>
</div>
</div>
<div class="form-group" style="clear: both; margin-top:20px;">
@@ -20,7 +20,7 @@
<input type="checkbox" name="check2" id="check2" value="1"> Ignore address checker if the above address is re-used on a future order
</label>
</div>
</div>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
Modules/M3/Resources/views/liberty-theme/partials/modals/userAdd.blade.php
+1 -1
View File
@@ -52,7 +52,7 @@
<select class="form-select-sm myinput" name="R428DPW1" id="R428DPW1" aria-label="Div-Plt-Whs" required>
<option value="" selected disabled hidden>Select a value</option>
@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) }}"
data-co="{{ trim($IC670MR->WDCO) }}" data-pl="{{ trim($IC670MR->WDPL) }}" data-wh="{{ trim($IC670MR->WDWHS) }}"
data-dpw="{{ trim($IC670MR->WDCO).trim($IC670MR->WDPL).trim($IC670MR->WDWHS) }}" >
{{ trim(Str::upper($IC670MR->WDWNAM)) }}
Modules/M3/Resources/views/liberty-theme/partials/modals/userEdit.blade.php
+3 -3
View File
@@ -22,7 +22,7 @@
<input type="hidden" id="R428PL" name="R428PL">
<input type="hidden" id="R428WH" name="R428WH">
<td><b>Status</b></td> <!-- Switch Active/Inactive -->
<td class="text-right">
<td class="text-right">
<div class="form-check form-switch">
<input type="hidden" id="OLD_R428STS" name="OLD_R428STS">
<input type="checkbox" class="form-check-input" role="switch" id="R428STS" name="R428STS" data-on="A" data-off="I">
@@ -72,7 +72,7 @@
<select class="form-select-sm" id="R428DPW" required>
<option value="" selected disabled hidden>Select</option>
@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) }}"
data-co="{{ trim($IC670MR->WDCO) }}" data-pl="{{ trim($IC670MR->WDPL) }}" data-wh="{{ trim($IC670MR->WDWHS) }}" >
{{ trim(Str::upper($IC670MR->WDWNAM)) }}
</option>
@@ -90,7 +90,7 @@
<table class="table table-condensed">
<tr>
<td><b>Admin user</b></td> <!-- SWITCH Y/N -->
<td class="text-right">
<td class="text-right">
<div class="form-check form-switch">
<input type="hidden" id="OLD_R428ADMUSR" name="OLD_R428ADMUSR">
<input type="checkbox" class="form-check-input" role="switch" id="R428ADMUSR" name="R428ADMUSR" data-on="Y" data-off="N">
Modules/M3/Resources/views/liberty-theme/partials/modals/userPassword.blade.php
+1 -1
View File
@@ -15,7 +15,7 @@
<table class="table table-condensed">
<tr>
<td><b>Enter a new password to re-enable user</b></td> <!-- Password -->
<td class="text-right">
<td class="text-right">
<div class="form-check form-switch">
<input type="hidden" name="R428US_PWD" id="R428US_PWD" value="">
<input type="password" maxlength="10" length="7" class="myinput" name="NEW_PASSWORD" id="NEW_PASSWORD" required>
Modules/M3/Resources/views/liberty-theme/partials/scripts.blade.php
+3 -3
View File
@@ -5,7 +5,7 @@
<script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js" integrity= "sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo" crossorigin="anonymous"></script>
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.min.js" crossorigin="anonymous"></script>
@php
@php
// ReplenishSettingsController
$routeArray = app('request')->route()->getAction();
$controllerAction = class_basename($routeArray['controller']);
@@ -27,7 +27,7 @@
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.36/pdfmake.min.js"></script>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.36/vfs_fonts.js"></script>
<script type="text/javascript" src="https://cdn.datatables.net/v/bs5/jszip-2.5.0/dt-1.11.3/af-2.3.7/b-2.0.1/b-colvis-2.0.1/b-html5-2.0.1/b-print-2.0.1/cr-1.5.4/date-1.1.1/fc-4.0.0/fh-3.2.0/kt-2.6.4/r-2.2.9/rg-1.1.3/rr-1.2.8/sc-2.0.5/sb-1.2.2/sp-1.4.0/sl-1.3.3/datatables.min.js"></script>
<script type="text/javascript" src="{{ route('m3.assets', ['path' => 'liberty-theme/js/datatables-simple-demo.js']) }}"></script>
{{-- Data Bootstrap Responsive --}}
<script type="text/javascript" src="https://cdn.datatables.net/responsive/2.4.1/js/dataTables.responsive.min.js"></script>
@@ -57,7 +57,7 @@
<script src="//cdn.jsdelivr.net/npm/sweetalert2@11"></script>
<script>
window.addEventListener('DOMContentLoaded', event => {
// Toggle the side navigation
Modules/M3/Resources/views/liberty-theme/partials/tabs/comments.blade.php
+1 -1
View File
@@ -10,7 +10,7 @@
<b>Order Date:</b> {{ date('m/d/Y', strtotime($order->SHORDT)) }}<br>
<b>Order Status:</b> {{ $order->SHOST }}<br>
<b>Fill Code:</b> {{ $order->SHALBO }}<br>
@foreach ($releases as $key=>$val)
@foreach ($releases as $key=>$val)
<b>Open Releases on this order:</b> <a href="./{{ $val->SLONO }}-{{ $val->SLRLNO }}" style="color:white" >{{ $val->SLONO }}-{{ $val->SLRLNO }}
<i class="fa fa-eye pull-right"></i></a><br>
@endforeach
Modules/M3/Resources/views/liberty-theme/partials/tabs/details.blade.php
+2 -2
View File
@@ -10,7 +10,7 @@
<b>Order Date:</b> {{ date('m/d/Y', strtotime($order->SHORDT)) }}<br>
<b>Order Status:</b> {{ $order->SHOST }}<br>
<b>Fill Code:</b> {{ $order->SHALBO }}<br>
@foreach ($releases as $key=>$val)
@foreach ($releases as $key=>$val)
<b>Open Releases on this order:</b> <a href="./{{ $val->SLONO }}-{{ $val->SLRLNO }}" style="color:white" >{{ $val->SLONO }}-{{ $val->SLRLNO }}
<i class="fa fa-eye pull-right"></i></a><br>
@endforeach
@@ -33,7 +33,7 @@
</div>
</div>
</div>
<div class="table-responsive">
<table class="table table-condensed">
<thead>
Modules/M3/Resources/views/liberty-theme/partials/tabs/orders.blade.php
+2 -2
View File
@@ -10,8 +10,8 @@
<b>Order Date:</b> {{ date('m/d/Y', strtotime($order->SHORDT)) }}<br>
<b>Order Status:</b> {{ $order->SHOST }}<br>
<b>Fill Code:</b> {{ $order->SHALBO }}<br>
@foreach ($releases as $key=>$val)
<b>Open Releases on this order:</b> <a href="./{{ $val->SLONO }}-{{ $val->SLRLNO }}" style="color:white"> {{ $val->SLONO }}-{{ $val->SLRLNO }}
@foreach ($releases as $key=>$val)
<b>Open Releases on this order:</b> <a href="./{{ $val->SLONO }}-{{ $val->SLRLNO }}" style="color:white"> {{ $val->SLONO }}-{{ $val->SLRLNO }}
<i class="fa fa-eye pull-right"></i></a><br>
@endforeach
</p>
Modules/M3/Resources/views/liberty-theme/partials/top-navigation.blade.php
+1 -1
View File
@@ -22,7 +22,7 @@
$selected = $UserCO == $IC670MR->WDCO && $UserWHS == $IC670MR->WDWHS && $UserPL == $IC670MR->WDPL ? 'selected' : '';
@endphp
<option value="{{ trim($IC670MR->WDCO).trim($IC670MR->WDPL).trim($IC670MR->WDWHS) }}" {{ $selected }}>
{{ trim(Str::upper($IC670MR->WDWNAM)) }}
{{ trim(Str::upper($IC670MR->WDWNAM)) }}
</option>
@endforeach
</select>