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