M3 Integration fixes
This commit is contained in:
Mark Gregory
@@ -1,6 +1,6 @@
|
||||
@php
|
||||
# Get Current USER
|
||||
$loggedUser = strtoUpper(m3_user());
|
||||
$loggedUser = strtoUpper(m3User());
|
||||
|
||||
$admin_users = $power_users = $csr = $execUser = "";
|
||||
$UserCO = $UserWHS = $UserPL = '';
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
<div class="col-auto border-start ps-3">
|
||||
<span class="text-muted small">User</span>
|
||||
<span id="hdr-user" class="ms-1">
|
||||
{{ $palletHeader->R659USER ?? (m3_user() !== '' ? Str::upper(m3_user()) : '—') }}
|
||||
{{ $palletHeader->R659USER ?? (m3User() !== '' ? Str::upper(m3User()) : '—') }}
|
||||
</span>
|
||||
</div>
|
||||
<div class="col-auto border-start ps-3">
|
||||
|
||||
@@ -20,7 +20,7 @@ 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" aria-label="Warehouse" 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 }}"
|
||||
|
||||
@@ -28,8 +28,8 @@
|
||||
</div>
|
||||
|
||||
<div class="col">
|
||||
<label for="recipient-name" >Warehouse:</label>
|
||||
<select class="form-select" id="WHDDA" aria-label="Warehouse" tabindex="-1" disabled>
|
||||
<label for="WHDDA" >Warehouse:</label>
|
||||
<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 }}"
|
||||
|
||||
@@ -79,7 +79,7 @@
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<h5 class="modal-title" id="addModalLabel">Add Record</h5>
|
||||
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
|
||||
<button type="button" class="btn-close" data-bs-dismiss="modal"></button>
|
||||
</div>
|
||||
<form class="needs-validation" id="addReplen" method="POST" action="{{ route("m3.replenishmentSettings.store") }}" enctype="multipart/form-data">
|
||||
<div class="modal-body">
|
||||
@@ -87,7 +87,7 @@
|
||||
<div class="row">
|
||||
<div class="col-6">
|
||||
<div class="mb-3">
|
||||
<label for="recipient-name" class="col-form-label">Part:</label>
|
||||
<label for="WHDDA" class="col-form-label">Part:</label>
|
||||
<label for="R658PNA" class="visually-hidden">R658PN</label>
|
||||
<input type="text" class="form-control" name="R658PN" id="R658PNA" required>
|
||||
</div>
|
||||
@@ -121,7 +121,7 @@
|
||||
<div class="col-6">
|
||||
<div class="mb-3">
|
||||
<label for="recipient-name" class="col-form-label">Warehouse:</label>
|
||||
<select class="form-select" id="WHDDA" aria-label="Select Warehouse" tabindex="0" required>
|
||||
<select class="form-select" id="WHDDA" tabindex="0" required>
|
||||
<option value="">Select Warehouse</option>
|
||||
@foreach ($IC670M as $key => $IC670MR)
|
||||
<option value="{{ trim($IC670MR->WDCO).trim($IC670MR->WDPL).trim($IC670MR->WDWHS) }}"
|
||||
@@ -172,7 +172,7 @@
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<h5 class="modal-title" id="editModalLabel">Edit Record</h5>
|
||||
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
|
||||
<button type="button" class="btn-close" data-bs-dismiss="modal"></button>
|
||||
</div>
|
||||
<form class="needs-validation" id="editReplen" method="POST" action="replenishmentSettingsUpdate"
|
||||
enctype="multipart/form-data">
|
||||
@@ -214,8 +214,8 @@
|
||||
|
||||
<div class="col-6">
|
||||
<div class="mb-3">
|
||||
<label for="recipient-name" class="col-form-label">Warehouse:</label>
|
||||
<select class="form-select" id="WHDD" aria-label="Select Warehouse" tabindex="0" disabled>
|
||||
<label for="WHDD" class="col-form-label">Warehouse:</label>
|
||||
<select class="form-select" id="WHDD" tabindex="0" disabled>
|
||||
<option value="">Select Warehouse</option>
|
||||
@foreach ($IC670M as $key => $IC670MR)
|
||||
<option value="{{ trim($IC670MR->WDCO).trim($IC670MR->WDPL).trim($IC670MR->WDWHS) }}"
|
||||
|
||||
@@ -18,8 +18,8 @@ Warehouse Performance Metrics report
|
||||
</div> --}}
|
||||
|
||||
<div class="col">
|
||||
<label for="recipient-name" >Warehouse:</label>
|
||||
<select class="form-select" id="WHDDA" aria-label="Warehouse" tabindex="-1" disabled>
|
||||
<label for="WHDDA" >Warehouse:</label>
|
||||
<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 }}"
|
||||
|
||||
@@ -28,7 +28,7 @@ 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 aria-label="*ALL" name="whs" class="form-control">
|
||||
<select name="whs" class="form-control">
|
||||
<option value="*ALL">*ALL</option>
|
||||
@foreach($whs_array as $key)
|
||||
<option value={{$key}}
|
||||
|
||||
@@ -26,7 +26,7 @@ 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 aria-label="" name="user" class="form-select">
|
||||
<select name="user" class="form-select">
|
||||
<option value="" selected> </option>
|
||||
@foreach($user_array as $key=>$val)
|
||||
<option value={{$val['userprf']}}
|
||||
|
||||
@@ -28,7 +28,7 @@ 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 aria-label="" name="user" class="form-control">
|
||||
<select name="user" class="form-control">
|
||||
<option value="" selected> </option>
|
||||
@foreach($user_array as $key=>$val)
|
||||
<option value={{$val['userprf']}}
|
||||
|
||||
@@ -26,7 +26,7 @@ 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 aria-label="User" name="user" class="form-select">
|
||||
<select name="user" class="form-select">
|
||||
@foreach($user_array as $key=>$val)
|
||||
<option value={{$val['userprf']}}
|
||||
@if($val['userprf']==$user) selected @endif
|
||||
|
||||
@@ -15,7 +15,7 @@ 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 aria-label="Year" 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
|
||||
|
||||
@@ -120,7 +120,7 @@
|
||||
|
||||
{{-- 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>
|
||||
<i class="fa-fw fas fa-chart-bar mr-1"></i>Sentinel Executive Home</a>
|
||||
|
||||
@endif
|
||||
|
||||
@@ -135,11 +135,11 @@
|
||||
</div>
|
||||
<div class="sb-sidenav-footer">
|
||||
<div class="small">Logged in as:</div>
|
||||
{{ m3_user() }}
|
||||
{{ m3User() }}
|
||||
{{-- @if($execUser=='Y')
|
||||
<a class="link-primary" href="/userprofile">{{ m3_user() }}</a>
|
||||
<a class="link-primary" href="/userprofile">{{ m3User() }}</a>
|
||||
@else
|
||||
{{ m3_user() }}
|
||||
{{ m3User() }}
|
||||
@endif --}}
|
||||
</div>
|
||||
</nav>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<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" aria-label="Close"></button>
|
||||
<button type="button" class="btn-close close-modal" data-bs-dismiss="modal"></button>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<div class="table-responsive" id="M3DeliveryAddData">
|
||||
@@ -25,7 +25,7 @@
|
||||
<tr>
|
||||
<td><b>Ship Via</b></td> <!-- ALPHA -->
|
||||
<td class="text-right">
|
||||
<select aria-label="Select Ship Via" 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>
|
||||
@@ -36,7 +36,7 @@
|
||||
<tr>
|
||||
<td><b>Sentinel Route</b></td> <!-- ALPHA -->
|
||||
<td class="text-right">
|
||||
<select aria-label="Addavshsrt" id="addAVSHSRT" name="addAVSHSRT">
|
||||
<select id="addAVSHSRT" name="addAVSHSRT">
|
||||
<option value=" "></option>
|
||||
<option value="GR">GR</option>
|
||||
<option value="PU">PU</option>
|
||||
@@ -46,7 +46,7 @@
|
||||
<tr>
|
||||
<td><b>International Code</b></td> <!-- ALPHA -->
|
||||
<td class="text-right">
|
||||
<select aria-label="Addavshorcl" id="addAVSHORCL" name="addAVSHORCL">
|
||||
<select id="addAVSHORCL" name="addAVSHORCL">
|
||||
<option value=" " selected></option>
|
||||
<option value="Y">002 - International</option>
|
||||
</select>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<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" aria-label="Close"></button>
|
||||
<button type="button" class="btn-close close-modal" data-bs-dismiss="modal"></button>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<div class="table-responsive" id="M3DeliveryEditData">
|
||||
@@ -26,7 +26,7 @@
|
||||
<td class="text-right">
|
||||
<label for="OLD_AVSHPVIA" class="visually-hidden">OLD AVSHPVIA</label>
|
||||
<input type="hidden" name="OLD_AVSHPVIA" id="OLD_AVSHPVIA">
|
||||
<select aria-label="Select Ship Via" 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>
|
||||
@@ -39,7 +39,7 @@
|
||||
<td class="text-right">
|
||||
<label for="OLD_AVSHSRT" class="visually-hidden">OLD AVSHSRT</label>
|
||||
<input type="hidden" name="OLD_AVSHSRT" id="OLD_AVSHSRT">
|
||||
<select aria-label="Avshsrt" id="AVSHSRT" name="AVSHSRT">
|
||||
<select id="AVSHSRT" name="AVSHSRT">
|
||||
<option value=" "></option>
|
||||
<option value="GR">GR</option>
|
||||
<option value="PU">PU</option>
|
||||
@@ -51,7 +51,7 @@
|
||||
<td class="text-right">
|
||||
<label for="OLD_AVSHORCL" class="visually-hidden">OLD AVSHORCL</label>
|
||||
<input type="hidden" name="OLD_AVSHORCL" id="OLD_AVSHORCL">
|
||||
<select aria-label="Avshorcl" id="AVSHORCL" name="AVSHORCL">
|
||||
<select id="AVSHORCL" name="AVSHORCL">
|
||||
<option value=" " selected></option>
|
||||
<option value="Y">002 - International</option>
|
||||
</select>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<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" aria-label="Close"></button>
|
||||
<button type="button" class="btn-close close-modal" data-bs-dismiss="modal"></button>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<div class="table-responsive" id="qtyAddData">
|
||||
@@ -16,7 +16,7 @@
|
||||
<td><label for="AT9DPW" class="col-form-label"><b>Div-Plt-Whs:</b></label></td>
|
||||
<td>
|
||||
<div class="mb-3">
|
||||
<select aria-label="Addat9dpw" class="form-select-sm" id="addAT9DPW"
|
||||
<select class="form-select-sm" id="addAT9DPW"
|
||||
@if($power_user->R428PWRUSR=="N")
|
||||
disabled
|
||||
@endif
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<h5 class="modal-title">User Add</h5>
|
||||
<button type="button" class="btn-close close-modal" data-bs-dismiss="modal" aria-label="Close"></button>
|
||||
<button type="button" class="btn-close close-modal" data-bs-dismiss="modal"></button>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<div class="table-responsive" id="userAddData">
|
||||
@@ -55,7 +55,7 @@
|
||||
<td><label for="R428DPW1" class="col-form-label"><b>Div-Plt-Whs:</b></label></td>
|
||||
<td>
|
||||
<div class="mb-3">
|
||||
<select class="form-select-sm myinput" name="R428DPW1" id="R428DPW1" aria-label="Select a value" required>
|
||||
<select class="form-select-sm myinput" name="R428DPW1" id="R428DPW1" 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) }}"
|
||||
|
||||
@@ -50,7 +50,7 @@
|
||||
</div>
|
||||
<div class="col-sm-6 text-end">
|
||||
@if ($order->SHHLDC=="F" && $order->SHOST=="Open" && $authuser[0]->COUNT!=0)
|
||||
<h5 class="card-title" id="shipToEdit_click" data-toggle="modal" style="cursor:pointer"><i class="fa fa-edit pull-right" ></i></h5>
|
||||
<h5 class="card-title" id="shipToEdit_click" data-toggle="modal" style="cursor:pointer"><i class="fa fa-edit pull-right" aria-hidden="true"></i><span class="visually-hidden">Edit ship-to details</span></h5>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user