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'] ?? '');