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 13:25:44 +01:00
parent 47085e5160
commit 3521e47ef0
62 changed files with 131 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/M3/Console/GenerateGS1Cmd.php
+1 -1
View File
@@ -53,7 +53,7 @@ class GenerateGS1Cmd extends Command
// Get the Calling User
$userId = $this->argument('user');
$sHUSER = $userId ?? (m3_user() !== '' ? Str::upper(trim(m3_user())) : 'TWOSHIP');
$sHUSER = $userId ?? (m3User() !== '' ? Str::upper(trim(m3User())) : 'TWOSHIP');
$this->info('User: ' . $sHUSER);
// Get Manifest Array
Modules/M3/Helpers/Helper.php
+1 -1
View File
@@ -319,7 +319,7 @@ class Helper
'UserPL' => '',
];
$loggedUser = strtoupper(trim((string) m3_user()));
$loggedUser = strtoupper(trim((string) m3User()));
if ($loggedUser === '') {
return $defaults;
}
Modules/M3/Helpers/M3Auth.php
+2 -2
View File
@@ -5,7 +5,7 @@ if (! function_exists('m3_user')) {
* Return the current Core username in the format expected by the legacy M3 data.
* M3 previously depended on PHP Basic Auth and read PHP_AUTH_USER directly.
*/
function m3_user(): string
function m3User(): string
{
$user = auth()->user();
@@ -29,7 +29,7 @@ if (! function_exists('m3_legacy_password')) {
* Passwords are intentionally unavailable in Core. PostgreSQL access uses
* Laravel's configured connection and never reuses a user's login password.
*/
function m3_legacy_password(): string
function m3LegacyPassword(): string
{
return '';
}
Modules/M3/Http/Controllers/API/CloseShipment.php
+2 -2
View File
@@ -36,7 +36,7 @@ class CloseShipment extends Controller
$jSONCS = [];
// Get the Calling User
$sHUSER = m3_user() !== '' ? Str::upper(m3_user()) : 'WebUser';
$sHUSER = m3User() !== '' ? Str::upper(m3User()) : 'WebUser';
$sHSOURCE = 'CloseShipmentCoChargeAPI';
try {
@@ -295,7 +295,7 @@ class CloseShipment extends Controller
->orderBy('AYINTBOX')
->get();
foreach ($iCM695M1JOINTMP as $key => $ICM695M1JOINR) {
foreach ($iCM695M1JOINTMP as $ICM695M1JOINR) {
$a4SHIPVIA = isset($ICM695M1JOINR->A4SHIPVIA) ? trim(str_replace('&', '_', $ICM695M1JOINR->A4SHIPVIA)) : '';
$sHIPTYPE = trim($ICM695M1JOINR->A4SHIPTYPE);
Modules/M3/Http/Controllers/API/M3Controller.php
+1 -1
View File
@@ -56,7 +56,7 @@ class M3Controller extends Controller
ini_set('max_input_time', Config::get('arrays.PHPTimeOut'));
ini_set('default_socket_timeout', Config::get('arrays.PHPTimeOut'));
$rEQKPKUS = m3_user() !== '' ? Str::upper(m3_user()) : 'WEBUSER';
$rEQKPKUS = m3User() !== '' ? Str::upper(m3User()) : 'WEBUSER';
$sHSOURCE = 'M3ReceiverAPI';
$iCM666MFields = [
Modules/M3/Http/Controllers/API/PdfStorage.php
+3 -3
View File
@@ -71,7 +71,7 @@ class PdfStorage extends Controller
}
$context['DELIVERYNO'] = $context['A4MACPKR'] !== '' ? $context['A4MACPKR'] : self::ZERO_PAD;
$context['SHUSER'] = m3_user() !== '' ? Str::upper(m3_user()) : 'WebUser';
$context['SHUSER'] = m3User() !== '' ? Str::upper(m3User()) : 'WebUser';
$context['SHSOURCE'] = 'PdfStorageAPI';
return $context;
@@ -123,7 +123,7 @@ class PdfStorage extends Controller
'SHINTBOX' => $context['DOCNUM'] ?? '',
'SHTYPE' => $type,
'SHDATA' => $message,
'SHUSER' => $context['SHUSER'] ?? (m3_user() !== '' ? Str::upper(m3_user()) : 'WebUser'),
'SHUSER' => $context['SHUSER'] ?? (m3User() !== '' ? Str::upper(m3User()) : 'WebUser'),
'SHSOURCE' => $context['SHSOURCE'] ?? 'PdfStorageAPI',
'SHCO' => $context['COMPANY'] ?? '',
'SHWHS' => $context['WHS'] ?? '',
@@ -140,7 +140,7 @@ class PdfStorage extends Controller
'DOCNUM' => $docNum,
'COMPANY' => $company,
'WHS' => $warehouse,
'SHUSER' => m3_user() !== '' ? Str::upper(m3_user()) : 'WebUser',
'SHUSER' => m3User() !== '' ? Str::upper(m3User()) : 'WebUser',
'SHSOURCE' => 'PdfStorageAPI',
];
$this->safeLog($context, 'An Error Occured -' . $message, true);
Modules/M3/Http/Controllers/API/ReplenAPI.php
+1 -1
View File
@@ -28,7 +28,7 @@ class ReplenAPI extends Controller
// dd($request->all());
// Log::info( $request->all() );
// Get The Calling User
$sHUSER = m3_user() !== '' ? Str::upper(m3_user()) : 'WebUser';
$sHUSER = m3User() !== '' ? Str::upper(m3User()) : 'WebUser';
$mACPKR = isset($mACPKR) ? $mACPKR : self::ZERO_PAD;
$sHSOURCE = 'M3InventoryReportReplen';
$m3Errors = '';
Modules/M3/Http/Controllers/API/TransferAPI.php
+2 -2
View File
@@ -31,7 +31,7 @@ class TransferAPI extends Controller
ini_set('default_socket_timeout', Config::get('arrays.PHPTimeOut'));
// Get the Calling User
$sHUSER = m3_user() !== '' ? Str::upper(m3_user()) : 'WebUser';
$sHUSER = m3User() !== '' ? Str::upper(m3User()) : 'WebUser';
// Set SHSOURCE
$sHSOURCE = 'TransferAPIURL';
$m3Errors = '';
@@ -441,7 +441,7 @@ class TransferAPI extends Controller
ini_set('default_socket_timeout', Config::get('arrays.PHPTimeOut'));
// Get the Calling User
$sHUSER = m3_user() !== '' ? Str::upper(m3_user()) : 'WebUser';
$sHUSER = m3User() !== '' ? Str::upper(m3User()) : 'WebUser';
// Set SHSOURCE
$sHSOURCE = 'UpdateShipmentNumber';
$m3Errors = '';
Modules/M3/Http/Controllers/API/TwoShipAPIs.php
+1 -1
View File
@@ -20,7 +20,7 @@ class TwoShipAPIs extends Controller
public function TwoShipUpdateHold(Request $request)
{
$this->configureTimeouts();
$user = m3_user() !== '' ? Str::upper(m3_user()) : 'WebUser';
$user = m3User() !== '' ? Str::upper(m3User()) : 'WebUser';
$params = $request->all();
$whs = (string) ($params['WHS'] ?? '');
$co = (string) ($params['COMPANY'] ?? '');
Modules/M3/Http/Controllers/BoxPackToPalletController.php
+2 -2
View File
@@ -77,7 +77,7 @@ class BoxPackToPalletController extends Controller
$box = trim((string) ($request->R659BOX ?? ''));
abort_if($box === '', 400, 'Box Not Found');
$user = m3_user() !== '' ? Str::upper(m3_user()) : 'WebUser';
$user = m3User() !== '' ? Str::upper(m3User()) : 'WebUser';
$profile = self::getUserWhsCoPlant();
$validation = self::validateScannedBox($pallet, $box, $profile);
@@ -268,7 +268,7 @@ class BoxPackToPalletController extends Controller
// Get Logged User CO/WHS/PLANT
public static function getUserWhsCoPlant()
{
$sHUSER = m3_user() !== '' ? Str::upper(trim(m3_user())) : '';
$sHUSER = m3User() !== '' ? Str::upper(trim(m3User())) : '';
// Get users from ICM428M
$iCM428M = DB::connection(config('m3.connection', 'pgsql'))->table('icm428m')
->select('R428US', 'R428CO', 'R428WH', 'R428PL')
Modules/M3/Http/Controllers/CarrierMaintController.php
+1 -1
View File
@@ -25,7 +25,7 @@ class CarrierMaintController extends Controller
if ($schema->hasTable('icm428m')) {
$power_user = DB::connection(config('m3.connection', 'pgsql'))->table('icm428m')
->select('R428PWRUSR', 'R428CO', 'R428PL', 'R428WH')
->where('R428US', strtoupper(m3_user()))->get()->all();
->where('R428US', strtoupper(m3User()))->get()->all();
}
return view('m3::liberty-theme.pages.carrierMaint', ['ICM160M' => $iCM160M, 'power_user' => $power_user]);
Modules/M3/Http/Controllers/ExecSummaryController.php
+1 -1
View File
@@ -137,7 +137,7 @@ class ExecSummaryController extends Controller
}
// Init Page
$sHUSER = m3_user() !== '' ? Str::upper(trim(m3_user())) : '';
$sHUSER = m3User() !== '' ? Str::upper(trim(m3User())) : '';
if ($sHUSER != '') {
// Get User CO & WH from Table ICM428M
$iCM428M = DB::connection(config('m3.connection', 'pgsql'))->table('icm428m')
Modules/M3/Http/Controllers/ExecSummaryLineController.php
+1 -1
View File
@@ -178,7 +178,7 @@ class ExecSummaryLineController extends Controller
}
// Init Page
$sHUSER = m3_user() !== '' ? Str::upper(trim(m3_user())) : '';
$sHUSER = m3User() !== '' ? Str::upper(trim(m3User())) : '';
if ($sHUSER != '') {
// Get User CO & WH from Table ICM428M
$iCM428M = DB::connection(config('m3.connection', 'pgsql'))->table('icm428m')
Modules/M3/Http/Controllers/M3DeliveryController.php
+2 -2
View File
@@ -12,10 +12,10 @@ class M3DeliveryController extends Controller
public static function index(Request $request)
{
$connection = config('m3.connection', 'pgsql');
$power_user = (object) ['R428PWRUSR' => 'N', 'R428US' => strtoupper(m3_user()), 'R428CO' => '', 'R428PL' => '', 'R428WH' => ''];
$power_user = (object) ['R428PWRUSR' => 'N', 'R428US' => strtoupper(m3User()), 'R428CO' => '', 'R428PL' => '', 'R428WH' => ''];
if (Schema::connection($connection)->hasTable('icm428m')) {
$power_user = DB::connection($connection)->table('icm428m')->select('R428PWRUSR', 'R428US', 'R428CO', 'R428PL', 'R428WH')
->where('R428US', strtoupper(m3_user()))->first() ?? $power_user;
->where('R428US', strtoupper(m3User()))->first() ?? $power_user;
}
$co = $power_user->R428CO;
$plant = $power_user->R428PL;
Modules/M3/Http/Controllers/M3ErrorsDispController.php
+3 -3
View File
@@ -73,7 +73,7 @@ class M3ErrorsDispController extends Controller
'STARTDATE' => trim((string) $request->input('STARTDATE', today()->subDays(1)->format('Y-m-d'))),
'ENDDATE' => trim((string) $request->input('ENDDATE', today()->format('Y-m-d'))),
'SHOWERRORS' => trim((string) $request->input('SHOWERRORS', 'N')),
'SHUSER' => m3_user() !== '' ? Str::upper(trim(m3_user())) : '',
'SHUSER' => m3User() !== '' ? Str::upper(trim(m3User())) : '',
'SKIPDATES' => trim((string) $request->input('SKIPDATES', 'N')),
];
}
@@ -147,7 +147,7 @@ class M3ErrorsDispController extends Controller
$sHTIME = $request->SHTIME != null ? trim($request->SHTIME) : '';
$sHTYPE = $request->SHTYPE != null ? trim($request->SHTYPE) : '';
$sHACKNOTE = $request->SHACKNOTE != null ? trim(substr($request->SHACKNOTE, 0, 99)) : '';
$sHUSER = m3_user() !== '' ? Str::upper(m3_user()) : '';
$sHUSER = m3User() !== '' ? Str::upper(m3User()) : '';
$cLOSESIM = $request->CLOSESIM != null ? trim($request->CLOSESIM) : 'N';
if ($cLOSESIM == 'N') {
@@ -242,7 +242,7 @@ class M3ErrorsDispController extends Controller
'endDate' => trim((string) $request->input('ENDDATE', today()->format('Y-m-d'))),
'showErrors' => trim((string) $request->input('SHOWERRORS', 'N')),
'skipDates' => trim((string) $request->input('SKIPDATES', 'N')),
'user' => Str::upper(trim(m3_user())),
'user' => Str::upper(trim(m3User())),
];
}
Modules/M3/Http/Controllers/M3GetPDFFromCacheController.php
+1 -1
View File
@@ -24,7 +24,7 @@ class M3GetPDFFromCacheController extends Controller
// Initialise Vars
$pDFArray = $trackingno = $carrier = $iCM688M1 = [];
$sHUSER = m3_user() !== '' ? Str::upper(trim(m3_user())) : '';
$sHUSER = m3User() !== '' ? Str::upper(trim(m3User())) : '';
if ($sHUSER != '') {
// Get User CO & WH
Modules/M3/Http/Controllers/MFOrdersController.php
+1 -1
View File
@@ -16,7 +16,7 @@ class MFOrdersController extends Controller
// Get Users from ICM428M
$iCM428M = DB::connection(config('m3.connection', 'pgsql'))->table('icm428m')
->select('R428US', 'R428CO', 'R428WH', 'R428PL')
->where('R428US', '=', strtoupper(m3_user()))
->where('R428US', '=', strtoupper(m3User()))
->first();
$co = $iCM428M->R428CO;
$whs = $iCM428M->R428WH;
Modules/M3/Http/Controllers/OrderLinesOfClosedOrder.php
+1 -1
View File
@@ -237,7 +237,7 @@ class OrderLinesOfClosedOrder extends Controller
private static function userWarehouseContext(string $defaultCompany = '', string $defaultPlant = '', string $defaultWarehouse = ''): array
{
$user = trim((string) m3_user());
$user = trim((string) m3User());
if ($user === '') {
return [$defaultCompany, $defaultPlant, $defaultWarehouse];
}
Modules/M3/Http/Controllers/PalletQtyController.php
+2 -2
View File
@@ -13,11 +13,11 @@ class PalletQtyController extends Controller
public static function index(Request $request)
{
$connection = config('m3.connection', 'pgsql');
$power_user = (object) ['R428PWRUSR' => 'N', 'R428US' => strtoupper(m3_user()), 'R428CO' => '', 'R428PL' => '', 'R428WH' => ''];
$power_user = (object) ['R428PWRUSR' => 'N', 'R428US' => strtoupper(m3User()), 'R428CO' => '', 'R428PL' => '', 'R428WH' => ''];
if (Schema::connection($connection)->hasTable('icm428m')) {
$power_user = DB::connection($connection)->table('icm428m')
->select('R428PWRUSR', 'R428US', 'R428CO', 'R428PL', 'R428WH')
->where('R428US', '=', strtoupper(m3_user()))->first() ?? $power_user;
->where('R428US', '=', strtoupper(m3User()))->first() ?? $power_user;
}
$co = $power_user->R428CO;
$plant = $power_user->R428PL;
Modules/M3/Http/Controllers/PendingClosureController.php
+1 -1
View File
@@ -15,7 +15,7 @@ class PendingClosureController extends Controller
// Get Users from ICM428M
$iCM428M = DB::connection(config('m3.connection', 'pgsql'))->table('icm428m')
->select('R428US', 'R428CO', 'R428WH', 'R428PL')
->where('R428US', '=', strtoupper(m3_user()))
->where('R428US', '=', strtoupper(m3User()))
->first();
$user = $iCM428M->R428US;
$co = $iCM428M->R428CO;
Modules/M3/Http/Controllers/ReplenishSettingsController.php
+2 -2
View File
@@ -19,7 +19,7 @@ class ReplenishSettingsController extends Controller
// $iC670M = DB::connection(config('m3.connection', 'pgsql'))->table('ic670m')->get();
// Get Logged user Id
$userId = m3_user() !== '' ? strtoupper(m3_user()) : '';
$userId = m3User() !== '' ? strtoupper(m3User()) : '';
// $userId = 'E1135818'; // Brad : E1135818 Malak : E2011812 ACOM_PDF
$connection = config('m3.connection', 'pgsql');
$iCM428M = Schema::connection($connection)->hasTable('icm428m')
@@ -140,7 +140,7 @@ class ReplenishSettingsController extends Controller
// $iC670M = DB::connection(config('m3.connection', 'pgsql'))->table('ic670m')->get();
// Get Logged user Id
$userId = m3_user() !== '' ? strtoupper(m3_user()) : '';
$userId = m3User() !== '' ? strtoupper(m3User()) : '';
// $userId = 'E1135818'; // Brad : E1135818 Malak : E2011812 ACOM_PDF
$connection = config('m3.connection', 'pgsql');
$iCM428M = Schema::connection($connection)->hasTable('icm428m')
Modules/M3/Http/Controllers/UserControlController.php
+1 -1
View File
@@ -21,7 +21,7 @@ class UserControlController extends Controller
$connection = config('m3.connection', 'pgsql');
$profile = null;
if (Schema::connection($connection)->hasTable('icm428m')) {
$profile = DB::connection($connection)->table('icm428m')->where('R428US', strtoupper(m3_user()))->first();
$profile = DB::connection($connection)->table('icm428m')->where('R428US', strtoupper(m3User()))->first();
}
$co = $profile->R428CO ?? '';
$whs = $profile->R428WH ?? '';
Modules/M3/Http/Controllers/UserPickingStats4.php
+1 -1
View File
@@ -38,7 +38,7 @@ class UserPickingStats4 extends Controller
if ($schema->hasTable('icm428m')) {
$profile = DB::connection(config('m3.connection', 'pgsql'))->table('icm428m')
->select('R428US', 'R428CO', 'R428WH')
->where('R428US', '=', strtoupper(m3_user()))
->where('R428US', '=', strtoupper(m3User()))
->first();
$co = $profile->R428CO ?? '';
$whs = $profile->R428WH ?? '';
Modules/M3/Http/Controllers/UserPickingStats5.php
+1 -1
View File
@@ -56,7 +56,7 @@ class UserPickingStats5 extends Controller
$profile = DB::connection($connection)->table('icm428m')
->select('R428CO', 'R428WH')
->where('R428US', strtoupper((string) m3_user()))
->where('R428US', strtoupper((string) m3User()))
->first();
$co = trim((string) ($profile->R428CO ?? ''));
$whs = trim((string) ($profile->R428WH ?? ''));
Modules/M3/Http/Controllers/UserProfileController.php
+1 -1
View File
@@ -12,7 +12,7 @@ class UserProfileController extends Controller
{
// Get Current USER
$loggedUser = strtoupper(m3_user());
$loggedUser = strtoupper(m3User());
$iCM428M = DB::connection(config('m3.connection', 'pgsql'))->table('icm428m')
->select('R428US', 'R428CO', 'R428WH', 'R428PL', 'R428FIRST', 'R428FAMILY')
Modules/M3/Http/Controllers/UtilitiesController.php
+1 -1
View File
@@ -170,7 +170,7 @@ class UtilitiesController extends Controller
// Get the Calling User
// $userId = 'TWOSHIP';
// $sHUSER = isset($userId) ? $userId : (m3_user() !== '' ? Str::upper(trim(m3_user())) : '');
// $sHUSER = isset($userId) ? $userId : (m3User() !== '' ? Str::upper(trim(m3User())) : '');
// Get Manifest Array
$gSArray = $request->query();
Modules/M3/Http/Controllers/WhsPerfMetrics.php
+1 -1
View File
@@ -60,7 +60,7 @@ class WhsPerfMetrics extends Controller
private static function loadUserContext(): array
{
$connection = config('m3.connection', 'pgsql');
$user = Str::upper(trim((string) m3_user()));
$user = Str::upper(trim((string) m3User()));
if ($user === '' || ! Schema::connection($connection)->hasTable('icm428m')) {
return ['COMPANY' => '', 'PLANT' => '', 'WHS' => ''];
Modules/M3/Http/Controllers/WhsePerfController.php
+2 -2
View File
@@ -35,7 +35,7 @@ class WhsePerfController extends Controller
$iCM711M = DB::connection(config('m3.connection', 'pgsql'))->select($sqlstmt);
$uSER_INFO = DB::connection(config('m3.connection', 'pgsql'))->table('icm428m')->selectRaw('R428US as USERPRF, R428STS as STATUS, NULL as DATE_EXPIRED, NULL as EXPIRED')->get()->all();
$power_user = DB::connection(config('m3.connection', 'pgsql'))->select("select R428PWRUSR, R428CO, R428PL, R428WH from ICM428M where R428US='" . strtoupper(m3_user()) . "'");
$power_user = DB::connection(config('m3.connection', 'pgsql'))->select("select R428PWRUSR, R428CO, R428PL, R428WH from ICM428M where R428US='" . strtoupper(m3User()) . "'");
$pct_array = Config::get('arrays.whsePerf_targets');
@@ -58,7 +58,7 @@ class WhsePerfController extends Controller
$iCM711M = DB::connection(config('m3.connection', 'pgsql'))->select($sqlstmt);
$uSER_INFO = DB::connection(config('m3.connection', 'pgsql'))->table('icm428m')->selectRaw('R428US as USERPRF, R428STS as STATUS, NULL as DATE_EXPIRED, NULL as EXPIRED')->get()->all();
$power_user = DB::connection(config('m3.connection', 'pgsql'))->select("select R428PWRUSR, R428CO, R428PL, R428WH from ICM428M where R428US='" . strtoupper(m3_user()) . "'");
$power_user = DB::connection(config('m3.connection', 'pgsql'))->select("select R428PWRUSR, R428CO, R428PL, R428WH from ICM428M where R428US='" . strtoupper(m3User()) . "'");
$pct_array = Config::get('arrays.whsePerf_targets');
Modules/M3/Http/Middleware/BasicAuth.php
+2 -2
View File
@@ -10,8 +10,8 @@ class BasicAuth
{
public function handle(Request $request, Closure $next): mixed
{
$login = trim((string) m3_user());
$password = (string) m3_legacy_password();
$login = trim((string) m3User());
$password = (string) m3LegacyPassword();
if ($login !== '' && $this->checkPassword($login, $password, '%%SYSTEM%%')) {
return $next($request);
Modules/M3/Resources/public/liberty-theme/css/styles.css
-35
View File
@@ -5008,12 +5008,6 @@ textarea.form-control-lg {
color: #101214;
}
@-webkit-keyframes progress-bar-stripes {
0% {
background-position-x: 1rem;
}
}
@keyframes progress-bar-stripes {
0% {
background-position-x: 1rem;
@@ -6198,12 +6192,6 @@ textarea.form-control-lg {
color: #000;
}
@-webkit-keyframes spinner-border {
to {
transform: rotate(360deg) /* rtl:ignore */;
}
}
@keyframes spinner-border {
to {
transform: rotate(360deg) /* rtl:ignore */;
@@ -6227,16 +6215,6 @@ textarea.form-control-lg {
border-width: 0.2em;
}
@-webkit-keyframes spinner-grow {
0% {
transform: scale(0);
}
50% {
opacity: 1;
transform: none;
}
}
@keyframes spinner-grow {
0% {
transform: scale(0);
@@ -6398,12 +6376,6 @@ textarea.form-control-lg {
animation: placeholder-glow 2s ease-in-out infinite;
}
@-webkit-keyframes placeholder-glow {
50% {
opacity: 0.2;
}
}
@keyframes placeholder-glow {
50% {
opacity: 0.2;
@@ -6418,13 +6390,6 @@ textarea.form-control-lg {
animation: placeholder-wave 2s linear infinite;
}
@-webkit-keyframes placeholder-wave {
100% {
-webkit-mask-position: -200% 0%;
mask-position: -200% 0%;
}
}
@keyframes placeholder-wave {
100% {
-webkit-mask-position: -200% 0%;
Modules/M3/Resources/views/liberty-theme/layout/main.blade.php
+1 -1
View File
@@ -1,6 +1,6 @@
@php
# Get Current USER
$loggedUser = strtoUpper(m3_user());
$loggedUser = strtoUpper(m3User());
$admin_users = $power_users = $csr = $execUser = "";
$UserCO = $UserWHS = $UserPL = '';
Modules/M3/Resources/views/liberty-theme/pages/BoxPackToPalletScan.blade.php
+1 -1
View File
@@ -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">
Modules/M3/Resources/views/liberty-theme/pages/M3GetPDF.blade.php
+1 -1
View File
@@ -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 }}"
Modules/M3/Resources/views/liberty-theme/pages/OrderLinesOfClosed.blade.php
+2 -2
View File
@@ -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 }}"
Modules/M3/Resources/views/liberty-theme/pages/ReplenishSettings.blade.php
+6 -6
View File
@@ -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) }}"
Modules/M3/Resources/views/liberty-theme/pages/WhsPerfMetrics.blade.php
+2 -2
View File
@@ -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 }}"
Modules/M3/Resources/views/liberty-theme/pages/exedashboard.blade.php
+1 -1
View File
@@ -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}}
Modules/M3/Resources/views/liberty-theme/pages/userPickingStats4.blade.php
+1 -1
View File
@@ -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']}}
Modules/M3/Resources/views/liberty-theme/pages/userPickingStats4_old.blade.php
+1 -1
View File
@@ -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']}}
Modules/M3/Resources/views/liberty-theme/pages/userPickingStats5.blade.php
+1 -1
View File
@@ -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
Modules/M3/Resources/views/liberty-theme/pages/whsePerfRequest.blade.php
+1 -1
View File
@@ -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
Modules/M3/Resources/views/liberty-theme/partials/left-navigation.blade.php
+4 -4
View File
@@ -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>
Modules/M3/Resources/views/liberty-theme/partials/modals/M3DeliveryAdd.blade.php
+4 -4
View File
@@ -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>
Modules/M3/Resources/views/liberty-theme/partials/modals/M3DeliveryEdit.blade.php
+4 -4
View File
@@ -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>
Modules/M3/Resources/views/liberty-theme/partials/modals/qtyAdd.blade.php
+2 -2
View File
@@ -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
Modules/M3/Resources/views/liberty-theme/partials/modals/userAdd.blade.php
+2 -2
View File
@@ -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) }}"
Modules/M3/Resources/views/liberty-theme/partials/tabs/orders.blade.php
+1 -1
View File
@@ -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>
Modules/M3/Services/PostgresProgramBridge.php
+1 -1
View File
@@ -76,7 +76,7 @@ class PostgresProgramBridge
'operation' => $operation,
'library' => $library,
'payload' => json_encode($payload, JSON_THROW_ON_ERROR),
'requested_by' => function_exists('m3_user') ? m3_user() : null,
'requested_by' => function_exists('m3_user') ? m3User() : null,
'status' => 'pending',
'created_at' => now(),
'updated_at' => now(),