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-17 10:24:14 +01:00
parent 74f2387dfe
commit c9856d58c1
20 changed files with 234 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/M3/Http/Controllers/API/CloseShipment.php
+34 -27
View File
@@ -17,6 +17,10 @@ use Str;
// use Request;
class CloseShipment extends Controller
{
private const ZERO_PAD = '000000';
private const JSON_CONTENT_TYPE = 'application/json';
private const NULL_M3_RESPONSE = 'M3 API responded with null value';
// CloseShipmentCoChargeAPI : with URL PARAMS COCharge
public static function CloseShipmentCoChargeAPI(Request $request)
{
@@ -49,7 +53,7 @@ class CloseShipment extends Controller
$LineAck = [];
// PDF File PATH
$pdfFilePath = Config::get('arrays.PdfPath');
$DELIVERYNO = $MANIFEST != '' ? $MANIFEST : '000000';
$DELIVERYNO = $MANIFEST != '' ? $MANIFEST : self::ZERO_PAD;
// Log::channel('dailyCron')->info("Close Manifest:".$MANIFEST.'-WHS: '.$WHS."-CO:".$COMPANY);
@@ -89,7 +93,7 @@ class CloseShipment extends Controller
$IonToken = isset($tokenData->token) ? $tokenData->token : '';
} else {
$SHDATA = isset($tokenData->message) ? $tokenData->message : '';
$DELIVERYNO = isset($AYMACPKR) ? $AYMACPKR : '000000';
$DELIVERYNO = isset($AYMACPKR) ? $AYMACPKR : self::ZERO_PAD;
// Write to Logs : Error
$data = [
@@ -439,7 +443,7 @@ class CloseShipment extends Controller
// If billable=Y and a4ratetcp(FREIGHT)>0 and a4ratem3=blank, then call the freight API CoCharge
if ($BILLABLE == 'Y' && $FREIGHT > 0 && $A4RATEM3 == '') {
$DELIVERYNO = isset($AYMACPKR) ? $AYMACPKR : '000000';
$DELIVERYNO = isset($AYMACPKR) ? $AYMACPKR : self::ZERO_PAD;
if ($SHIPTYPE == 'LTL') {
$shippingToBill = $FREIGHT * (100.00 - Config::get('arrays.misc.discountCarrierRateForCustomerPriceLTL')) / 100;
@@ -496,6 +500,9 @@ class CloseShipment extends Controller
$ContentLabel = route('m3.M3GetPDFFromCache.index', ['MACPKR' => $AYMACPKR, 'DOCTYPE' => $DOCTYPE]);
}
break;
default:
break;
}
}
@@ -602,7 +609,7 @@ class CloseShipment extends Controller
// No Errors Proceed in Calling M3 CLose API
if ($ErrorMsgs == '') {
// Write to Logs Out : Send JSON Request To M3
$DELIVERYNO = isset($AYMACPKR) ? $AYMACPKR : '000000';
$DELIVERYNO = isset($AYMACPKR) ? $AYMACPKR : self::ZERO_PAD;
// dump($DELIVERYNO);
// MAK : Log JSON Manifest # and MACKPKR #
// Log::channel('dailyCron')->info('1 >>> JSON Sent for Manifest: '.$MANIFEST.' ,Macpicker: '.$AYMACPKR);
@@ -624,12 +631,12 @@ class CloseShipment extends Controller
Helper::logToICM699M($data);
$response = Http::withHeaders([
'accept' => 'application/json',
'Content-Type' => 'application/json',
'Connection' => 'close',
])
'accept' => self::JSON_CONTENT_TYPE,
'Content-Type' => self::JSON_CONTENT_TYPE,
'Connection' => 'close',
])
->withToken($token)
->withBody($JSONCS, 'application/json')
->withBody($JSONCS, self::JSON_CONTENT_TYPE)
->timeout(Config::get('arrays.curlTimeOut'))
->retry(3, 100)
->post($endPointURL);
@@ -683,8 +690,8 @@ class CloseShipment extends Controller
}
} else {
$M3APIRESULT = 'Error';
$responseMsg = 'M3 API responded with null value';
$M3APIRESULTMsg = 'M3 API responded with null value';
$responseMsg = self::NULL_M3_RESPONSE;
$M3APIRESULTMsg = self::NULL_M3_RESPONSE;
$responseResult = '';
$M3Errors = $responseStatusCode;
}
@@ -692,7 +699,7 @@ class CloseShipment extends Controller
// If you get a successful response
if ($M3APIRESULT != 'Error') {
// Write to Logs Out : Success
$DELIVERYNO = isset($AYMACPKR) ? $AYMACPKR : '000000';
$DELIVERYNO = isset($AYMACPKR) ? $AYMACPKR : self::ZERO_PAD;
$data = [
'SHMACPKR' => $DELIVERYNO,
'SHDT' => date('Y-m-d'),
@@ -718,7 +725,7 @@ class CloseShipment extends Controller
->update(['A4PICKSTS' => 'a']);
// Write to Logs Out : Error
$DELIVERYNO = isset($AYMACPKR) ? $AYMACPKR : '000000';
$DELIVERYNO = isset($AYMACPKR) ? $AYMACPKR : self::ZERO_PAD;
$data = [
'SHMACPKR' => $DELIVERYNO,
'SHDT' => date('Y-m-d'),
@@ -743,7 +750,7 @@ class CloseShipment extends Controller
// Write to Logs : Error
// Clear Duplicate messages
$ErrorMsgsC = Helper::removeDuplicateSubstrings($ErrorMsgs);
$DELIVERYNO = isset($AYMACPKR) ? $AYMACPKR : '000000';
$DELIVERYNO = isset($AYMACPKR) ? $AYMACPKR : self::ZERO_PAD;
$data = [
'SHMACPKR' => $DELIVERYNO,
'SHDT' => date('Y-m-d'),
@@ -831,7 +838,7 @@ class CloseShipment extends Controller
]);
// Write to Logs Out : JSON Request To M3
$DELIVERYNO = isset($AYMACPKR) ? $AYMACPKR : '000000';
$DELIVERYNO = isset($AYMACPKR) ? $AYMACPKR : self::ZERO_PAD;
$data = [
'SHMACPKR' => $DELIVERYNO,
'SHDT' => date('Y-m-d'),
@@ -848,12 +855,12 @@ class CloseShipment extends Controller
Helper::logToICM699M($data);
$response = Http::withHeaders([
'accept' => 'application/json',
'Content-Type' => 'application/json',
'Connection' => 'close',
])
'accept' => self::JSON_CONTENT_TYPE,
'Content-Type' => self::JSON_CONTENT_TYPE,
'Connection' => 'close',
])
->withToken($token)
->withBody($JSONCS, 'application/json')
->withBody($JSONCS, self::JSON_CONTENT_TYPE)
->timeout(Config::get('arrays.curlTimeOut'))
->retry(2, 100)
->post($endPointURL);
@@ -884,14 +891,14 @@ class CloseShipment extends Controller
} else {
$M3APIRESULT = 'Error';
$responseMsg = 'M3 API responded with null value';
$M3APIRESULTMsg = 'M3 API responded with null value';
$responseMsg = self::NULL_M3_RESPONSE;
$M3APIRESULTMsg = self::NULL_M3_RESPONSE;
}
// If you get a successful response
if ($M3APIRESULT != 'Error') {
// Write to Logs Out : Success
$DELIVERYNO = isset($AYMACPKR) ? $AYMACPKR : '000000';
$DELIVERYNO = isset($AYMACPKR) ? $AYMACPKR : self::ZERO_PAD;
$data = [
'SHMACPKR' => $DELIVERYNO,
'SHDT' => date('Y-m-d'),
@@ -918,7 +925,7 @@ class CloseShipment extends Controller
->update(['A4PICKSTS' => 'a']);
// Write to Logs Out : Error
$DELIVERYNO = isset($AYMACPKR) ? $AYMACPKR : '000000';
$DELIVERYNO = isset($AYMACPKR) ? $AYMACPKR : self::ZERO_PAD;
$data = [
'SHMACPKR' => $DELIVERYNO,
'SHDT' => date('Y-m-d'),
@@ -968,7 +975,7 @@ class CloseShipment extends Controller
}
// ## End Zero Pick
else {
$DELIVERYNO = isset($MANIFEST) ? $MANIFEST : '000000';
$DELIVERYNO = isset($MANIFEST) ? $MANIFEST : self::ZERO_PAD;
// # Set SHDATA Message
$SHDATAMSG = 'No records found in ICM695M1,or URL parameters incomplete';
// count($ICM695M1TMP)==0 ? 'MacPkr already closed' :
@@ -1000,7 +1007,7 @@ class CloseShipment extends Controller
}
} else {
// Write to Logs Out : Error
$DELIVERYNO = isset($AYMACPKR) ? $AYMACPKR : '000000';
$DELIVERYNO = isset($AYMACPKR) ? $AYMACPKR : self::ZERO_PAD;
$data = [
'SHMACPKR' => $DELIVERYNO,
'SHDT' => date('Y-m-d'),
@@ -1051,7 +1058,7 @@ class CloseShipment extends Controller
]);
} else {
// Write to Logs Out : Error
$DELIVERYNO = isset($AYMACPKR) ? $AYMACPKR : '000000';
$DELIVERYNO = isset($AYMACPKR) ? $AYMACPKR : self::ZERO_PAD;
$data = [
'SHMACPKR' => $DELIVERYNO,
'SHDT' => date('Y-m-d'),
Modules/M3/Http/Controllers/API/M3Controller.php
+9 -6
View File
@@ -13,6 +13,9 @@ use Str;
class M3Controller extends Controller
{
private const FIELD_PREFIX = 'Field: ';
private const M3_LIST_SUFFIX = ' M3-Lis-JSN';
// Split Data and Write to ICM666M2
public function insertToICM666M2($dataSplit, $commentData)
{
@@ -377,18 +380,18 @@ class M3Controller extends Controller
if (! $lengthTest[413] || ! $lengthTest[411] || ! $lengthTest[417]) {
if (! $lengthTest[413]) {
$message[] = ['code' => '413', 'status' => 'error', 'message' => 'Field: ' . $key . ' is larger then expected'];
$message[] = ['code' => '413', 'status' => 'error', 'message' => self::FIELD_PREFIX . $key . ' is larger then expected'];
}
if (! $lengthTest[411]) {
$message[] = ['code' => '411', 'status' => 'error', 'message' => 'Field: ' . $key . ' is empty'];
$message[] = ['code' => '411', 'status' => 'error', 'message' => self::FIELD_PREFIX . $key . ' is empty'];
}
if (! $lengthTest[417]) {
$message[] = ['code' => '417', 'status' => 'error', 'message' => 'Field: ' . $key . 'type is different then Expected type: ' . $value[2]];
$message[] = ['code' => '417', 'status' => 'error', 'message' => self::FIELD_PREFIX . $key . 'type is different then Expected type: ' . $value[2]];
}
// Write to Logs Out : Error & JSON
$data = ['SHMACPKR' => $SHMACPKR, 'SHDT' => date('Y-m-d'), 'SHTIME' => date('H:i:s'), 'SHERROR' => 'X', 'SHINTBOX' => '', 'SHTYPE' => 'M3-Lis-spl',
'SHDATA' => json_encode($message) . ' M3-Lis-JSN' . json_encode($jsonFile), 'SHUSER' => $REQKPKUS, 'SHSOURCE' => $SHSOURCE, 'SHCO' => $Company, 'SHWHS' => $Warehouse];
'SHDATA' => json_encode($message) . self::M3_LIST_SUFFIX . json_encode($jsonFile), 'SHUSER' => $REQKPKUS, 'SHSOURCE' => $SHSOURCE, 'SHCO' => $Company, 'SHWHS' => $Warehouse];
Helper::logToICM699M($data);
return response()->json($message);
@@ -485,7 +488,7 @@ class M3Controller extends Controller
if ($PGMERRORS != '') {
// Write to Logs Out : Error & JSON
$data = ['SHMACPKR' => $SHMACPKR, 'SHDT' => date('Y-m-d'), 'SHTIME' => date('H:i:s'), 'SHERROR' => 'X', 'SHINTBOX' => '', 'SHTYPE' => 'M3-Lis-spl',
'SHDATA' => $PGMERRORS . ' M3-Lis-JSN' . json_encode($jsonFile), 'SHUSER' => $REQKPKUS, 'SHSOURCE' => $SHSOURCE, 'SHCO' => $Company, 'SHWHS' => $Warehouse];
'SHDATA' => $PGMERRORS . self::M3_LIST_SUFFIX . json_encode($jsonFile), 'SHUSER' => $REQKPKUS, 'SHSOURCE' => $SHSOURCE, 'SHCO' => $Company, 'SHWHS' => $Warehouse];
Helper::logToICM699M($data);
}
}
@@ -517,7 +520,7 @@ class M3Controller extends Controller
} catch (\Throwable $th) {
// Write to Logs Out : Error & JSON
$data = ['SHMACPKR' => $SHMACPKR, 'SHDT' => date('Y-m-d'), 'SHTIME' => date('H:i:s'), 'SHERROR' => 'X', 'SHINTBOX' => '', 'SHTYPE' => 'M3-Lis-in',
'SHDATA' => 'General Catchable Error - ' . substr($th, 0, 300) . ' M3-Lis-JSN' . json_encode($jsonFile), 'SHUSER' => $REQKPKUS, 'SHSOURCE' => $SHSOURCE, 'SHCO' => $Company, 'SHWHS' => $Warehouse];
'SHDATA' => 'General Catchable Error - ' . substr($th, 0, 300) . self::M3_LIST_SUFFIX . json_encode($jsonFile), 'SHUSER' => $REQKPKUS, 'SHSOURCE' => $SHSOURCE, 'SHCO' => $Company, 'SHWHS' => $Warehouse];
Helper::logToICM699M($data);
// Log::error($th);
Modules/M3/Http/Controllers/API/M3InventoryReport.php
+18 -14
View File
@@ -15,6 +15,10 @@ use Str;
class M3InventoryReport extends Controller
{
private const ZERO_PAD = '000000';
private const JSON_CONTENT_TYPE = 'application/json';
private const NO_M3_RESPONSE = 'Error: No Response from M3';
// M3InventoryReport for Single Part
public function M3InventoryReport(Request $request)
{
@@ -28,7 +32,7 @@ class M3InventoryReport extends Controller
// Set SHSOURCE
$SHSOURCE = 'M3InventoryReport';
$M3Errors = '';
$DELIVERYNO = isset($DELIVERYNO) ? $DELIVERYNO : '000000';
$DELIVERYNO = isset($DELIVERYNO) ? $DELIVERYNO : self::ZERO_PAD;
try {
// Get Json Contents
@@ -49,7 +53,7 @@ class M3InventoryReport extends Controller
} else {
$SHDATA = isset($tokenData->message) ? $tokenData->message : '';
// Write to Logs : Error
$data = ['SHMACPKR' => '000000', 'SHDT' => date('Y-m-d'), 'SHTIME' => date('H:i:s'), 'SHERROR' => '', 'SHINTBOX' => '', 'SHTYPE' => 'M3-Res-out',
$data = ['SHMACPKR' => self::ZERO_PAD, 'SHDT' => date('Y-m-d'), 'SHTIME' => date('H:i:s'), 'SHERROR' => '', 'SHINTBOX' => '', 'SHTYPE' => 'M3-Res-out',
'SHDATA' => $SHDATA, 'SHUSER' => $SHUSER, 'SHSOURCE' => $SHSOURCE, 'SHCO' => '', 'SHWHS' => $WHS];
Helper::logToICM699M($data);
@@ -66,8 +70,8 @@ class M3InventoryReport extends Controller
];
$response = Http::withHeaders([
'accept' => 'application/json',
'Content-Type' => 'application/json',
'accept' => self::JSON_CONTENT_TYPE,
'Content-Type' => self::JSON_CONTENT_TYPE,
])
->withToken($token)
->timeout(Config::get('arrays.curlTimeOut'))
@@ -82,7 +86,7 @@ class M3InventoryReport extends Controller
$responseJSON = $response->getBody()->getContents();
$JsonSanytized = Helper::sanityzeString($responseJSON);
} else {
$M3Errors = 'Error: No Response from M3';
$M3Errors = self::NO_M3_RESPONSE;
}
if ($M3Errors != '') {
@@ -162,7 +166,7 @@ class M3InventoryReport extends Controller
$REQKPKUS = isset($urlParams['REQKPKUS']) ? $urlParams['REQKPKUS'] : 'WebUser';
$CO = isset($urlParams['CO']) ? $urlParams['CO'] : '';
$WHS = isset($urlParams['WHS']) ? $urlParams['WHS'] : '';
$MACPKR = isset($urlParams['MACPKR']) ? $urlParams['MACPKR'] : '000000'; // Delivery Number
$MACPKR = isset($urlParams['MACPKR']) ? $urlParams['MACPKR'] : self::ZERO_PAD; // Delivery Number
$PKLN = isset($urlParams['PKLN']) ? $urlParams['PKLN'] : '';
if ($urlParams != '') {
@@ -228,11 +232,11 @@ class M3InventoryReport extends Controller
$token = $IonToken;
$response = Http::withHeaders([
'accept' => 'application/json',
'Content-Type' => 'application/json',
'accept' => self::JSON_CONTENT_TYPE,
'Content-Type' => self::JSON_CONTENT_TYPE,
])
->withToken($token)
->withBody($JSON, 'application/json')
->withBody($JSON, self::JSON_CONTENT_TYPE)
->timeout(Config::get('arrays.curlTimeOut'))
->post($endPointURL);
@@ -248,7 +252,7 @@ class M3InventoryReport extends Controller
$responseArray = json_decode($JsonSanytized, true);
$responseTMP = $responseArray['result'];
} else {
$M3Errors = 'Error: No Response from M3';
$M3Errors = self::NO_M3_RESPONSE;
}
// Validate response From M3
@@ -262,7 +266,7 @@ class M3InventoryReport extends Controller
return response()->json([
'code' => '405',
'status' => 'error',
'message' => 'Error: No Response from M3',
'message' => self::NO_M3_RESPONSE,
]);
} else {
// Write to Logs : JSON
@@ -366,7 +370,7 @@ class M3InventoryReport extends Controller
]);
} else {
// Write to Logs Out : Error
$MACPKR = isset($MACPKR) ? $MACPKR : '000000';
$MACPKR = isset($MACPKR) ? $MACPKR : self::ZERO_PAD;
$data = ['SHMACPKR' => $MACPKR, 'SHDT' => date('Y-m-d'), 'SHTIME' => date('H:i:s'), 'SHERROR' => 'X', 'SHINTBOX' => '', 'SHTYPE' => 'M3-Res-out',
'SHDATA' => 'No Records Found in ICM688M2', 'SHUSER' => $REQKPKUS, 'SHSOURCE' => $SHSOURCE, 'SHCO' => $CO, 'SHWHS' => $WHS];
Helper::logToICM699M($data);
@@ -381,7 +385,7 @@ class M3InventoryReport extends Controller
} else {
// Write to Logs Out : Error
$MACPKR = isset($MACPKR) ? $MACPKR : '000000';
$MACPKR = isset($MACPKR) ? $MACPKR : self::ZERO_PAD;
$data = ['SHMACPKR' => $MACPKR, 'SHDT' => date('Y-m-d'), 'SHTIME' => date('H:i:s'), 'SHERROR' => 'X', 'SHINTBOX' => '', 'SHTYPE' => 'M3-Res-out',
'SHDATA' => 'No URL Parameters Sent', 'SHUSER' => $REQKPKUS, 'SHSOURCE' => $SHSOURCE, 'SHCO' => $CO, 'SHWHS' => $WHS];
Helper::logToICM699M($data);
@@ -395,7 +399,7 @@ class M3InventoryReport extends Controller
}
} catch (\Throwable $th) {
// Write to Logs Out : Error
$MACPKR = isset($MACPKR) ? $MACPKR : '000000';
$MACPKR = isset($MACPKR) ? $MACPKR : self::ZERO_PAD;
$getCurlErrors = str_contains($th->getMessage(), 'cURL error');
if ($getCurlErrors) {
// dd($getCurlErrors);
Modules/M3/Http/Controllers/API/PdfStorage.php
+6 -4
View File
@@ -14,6 +14,8 @@ use Str;
class PdfStorage extends Controller
{
private const ZERO_PAD = '000000';
// PdfStorageAPI : PDF file read and save to Cache
public function PdfStorageAPI(Request $request)
{
@@ -41,8 +43,8 @@ class PdfStorage extends Controller
if ($urlParams != '') {
// Key Combination : COMPANY WHS A4MACPKR DOCTYPE DOCNUM
// Document type (PackingList, CarrierLabel, ContentLabel)
$DELIVERYNO = isset($A4MACPKR) ? $A4MACPKR : '000000';
$DELIVERYNO = $DELIVERYNO != '' && $DELIVERYNO != null ? $DELIVERYNO : '000000';
$DELIVERYNO = isset($A4MACPKR) ? $A4MACPKR : self::ZERO_PAD;
$DELIVERYNO = $DELIVERYNO != '' && $DELIVERYNO != null ? $DELIVERYNO : self::ZERO_PAD;
// Write to Logs : Params In
$IncomingParams = ['COMPANY' => $COMPANY, 'WHS' => $WHS, 'DOCTYPE' => $DOCTYPE, 'FILENAME' => $FILENAME, 'A4MACPKR' => $A4MACPKR, 'DOCNUM' => $DOCNUM];
$data = ['SHMACPKR' => $DELIVERYNO, 'SHDT' => date('Y-m-d'), 'SHTIME' => date('H:i:s'), 'SHERROR' => '', 'SHINTBOX' => $DOCNUM, 'SHTYPE' => 'M3-Req-out',
@@ -127,7 +129,7 @@ class PdfStorage extends Controller
}
} else {
// Write to Logs Out : Error
$DELIVERYNO = isset($DELIVERYNO) ? $DELIVERYNO : '000000';
$DELIVERYNO = isset($DELIVERYNO) ? $DELIVERYNO : self::ZERO_PAD;
$data = ['SHMACPKR' => $DELIVERYNO, 'SHDT' => date('Y-m-d'), 'SHTIME' => date('H:i:s'), 'SHERROR' => 'X', 'SHINTBOX' => '', 'SHTYPE' => 'M3-Res-out',
'SHDATA' => 'No URL Parameters Sent.', 'SHUSER' => $SHUSER, 'SHSOURCE' => $SHSOURCE, 'SHCO' => $COMPANY, 'SHWHS' => $WHS];
Helper::logToICM699M($data);
@@ -143,7 +145,7 @@ class PdfStorage extends Controller
// Log::error($th);
// Write to Logs Out : Error
$DELIVERYNO = isset($DELIVERYNO) ? $DELIVERYNO : '000000';
$DELIVERYNO = isset($DELIVERYNO) ? $DELIVERYNO : self::ZERO_PAD;
$data = ['SHMACPKR' => $DELIVERYNO, 'SHDT' => date('Y-m-d'), 'SHTIME' => date('H:i:s'), 'SHERROR' => 'X', 'SHINTBOX' => '', 'SHTYPE' => 'M3-Res-out',
'SHDATA' => 'An Error Occured - ' . substr($th, 0, 300), 'SHUSER' => $SHUSER, 'SHSOURCE' => $SHSOURCE, 'SHCO' => $COMPANY, 'SHWHS' => $WHS];
Helper::logToICM699M($data);
Modules/M3/Http/Controllers/API/ReplenAPI.php
+10 -7
View File
@@ -14,6 +14,9 @@ use Str;
class ReplenAPI extends Controller
{
private const ZERO_PAD = '000000';
private const JSON_CONTENT_TYPE = 'application/json';
// M3Replenishement with URL Params
public function M3InventoryReportReplen(Request $request)
{
@@ -25,7 +28,7 @@ class ReplenAPI extends Controller
// Log::info( $request->all() );
// Get The Calling User
$SHUSER = m3_user() !== '' ? Str::upper(m3_user()) : 'WebUser';
$MACPKR = isset($MACPKR) ? $MACPKR : '000000';
$MACPKR = isset($MACPKR) ? $MACPKR : self::ZERO_PAD;
$SHSOURCE = 'M3InventoryReportReplen';
$M3Errors = '';
@@ -83,11 +86,11 @@ class ReplenAPI extends Controller
$token = $IonToken;
$response = Http::withHeaders([
'accept' => 'application/json',
'Content-Type' => 'application/json',
])
'accept' => self::JSON_CONTENT_TYPE,
'Content-Type' => self::JSON_CONTENT_TYPE,
])
->withToken($token)
->withBody($JSON, 'application/json')
->withBody($JSON, self::JSON_CONTENT_TYPE)
->timeout(Config::get('arrays.curlTimeOut'))
->retry(3, 100)
->post($endPointURL);
@@ -226,7 +229,7 @@ class ReplenAPI extends Controller
]);
} else {
// Write to Logs Out : Error
$MACPKR = isset($MACPKR) ? $MACPKR : '000000';
$MACPKR = isset($MACPKR) ? $MACPKR : self::ZERO_PAD;
$data = ['SHMACPKR' => $MACPKR, 'SHDT' => date('Y-m-d'), 'SHTIME' => date('H:i:s'), 'SHERROR' => 'X', 'SHINTBOX' => '', 'SHTYPE' => 'M3-Res-out',
'SHDATA' => 'No URL Parameters Sent', 'SHUSER' => $SHUSER, 'SHSOURCE' => $SHSOURCE, 'SHCO' => $CO, 'SHWHS' => $WHS];
Helper::logToICM699M($data);
@@ -240,7 +243,7 @@ class ReplenAPI extends Controller
}
} catch (\Throwable $th) {
// Write to Logs Out : Error
$MACPKR = isset($MACPKR) ? $MACPKR : '000000';
$MACPKR = isset($MACPKR) ? $MACPKR : self::ZERO_PAD;
$getCurlErrors = str_contains($th->getMessage(), 'cURL error');
if ($getCurlErrors) {
Modules/M3/Http/Controllers/API/TransferAPI.php
+25 -20
View File
@@ -15,6 +15,11 @@ use Str;
class TransferAPI extends Controller
{
private const ZERO_PAD = '000000';
private const JSON_CONTENT_TYPE = 'application/json';
private const ORDER_CATEGORY_LABEL = ' Order Category: ';
private const NO_URL_PARAMETERS = 'No URL Parameters Sent';
// TransferAPIURL : with URL PARAMS
public function TransferAPIURL(Request $request)
{
@@ -44,7 +49,7 @@ class TransferAPI extends Controller
$LOTNUMBER = isset($urlParams['LOTNUMBER']) ? $urlParams['LOTNUMBER'] : '';
$CONUMBER = isset($urlParams['CONUMBER']) ? $urlParams['CONUMBER'] : '';
$COLINENO = isset($urlParams['COLINENO']) ? $urlParams['COLINENO'] : '';
$DELIVERYNO = isset($urlParams['DELIVERYNO']) ? $urlParams['DELIVERYNO'] : '000000';
$DELIVERYNO = isset($urlParams['DELIVERYNO']) ? $urlParams['DELIVERYNO'] : self::ZERO_PAD;
$PICKLISTSUFFIX = isset($urlParams['PICKLISTSUFFIX']) ? $urlParams['PICKLISTSUFFIX'] : '';
$ENDFLAG = isset($urlParams['ENDFLAG']) ? $urlParams['ENDFLAG'] : '';
$TYPE = isset($urlParams['TYPE']) ? $urlParams['TYPE'] : '';
@@ -65,7 +70,7 @@ class TransferAPI extends Controller
// 5 = Distribution Order
// 9 = Move order
$DELIVERYNO = isset($DELIVERYNO) ? $DELIVERYNO : '000000';
$DELIVERYNO = isset($DELIVERYNO) ? $DELIVERYNO : self::ZERO_PAD;
$TRANSTYPE = isset($urlParams['TRANSTYPE']) ? $urlParams['TRANSTYPE'] : ''; // R for Retry
$SHDT = isset($urlParams['SHDT']) ? $urlParams['SHDT'] : '';
@@ -129,7 +134,7 @@ class TransferAPI extends Controller
$LOTNUMBER = isset($JSONTR->LOTNUMBER) ? $JSONTR->LOTNUMBER : '';
$CONUMBER = isset($JSONTR->CONUMBER) ? $JSONTR->CONUMBER : '';
$COLINENO = isset($JSONTR->COLINENO) ? $JSONTR->COLINENO : '';
$DELIVERYNO = isset($JSONTR->DELIVERYNO) ? $JSONTR->DELIVERYNO : '000000';
$DELIVERYNO = isset($JSONTR->DELIVERYNO) ? $JSONTR->DELIVERYNO : self::ZERO_PAD;
$PICKLISTSUFFIX = isset($JSONTR->PICKLISTSUFFIX) ? $JSONTR->PICKLISTSUFFIX : '';
$ENDFLAG = isset($JSONTR->ENDFLAG) ? $JSONTR->ENDFLAG : '';
$TYPE = isset($JSONTR->TYPE) ? $JSONTR->TYPE : '';
@@ -255,11 +260,11 @@ class TransferAPI extends Controller
$token = $IonToken;
$response = Http::withHeaders([
'accept' => 'application/json',
'Content-Type' => 'application/json',
'accept' => self::JSON_CONTENT_TYPE,
'Content-Type' => self::JSON_CONTENT_TYPE,
])
->withToken($token)
->withBody($JSON, 'application/json')
->withBody($JSON, self::JSON_CONTENT_TYPE)
->timeout(Config::get('arrays.curlTimeOut'))
->post($endPointURL);
$responseStatusCode = $response->getStatusCode();
@@ -294,7 +299,7 @@ class TransferAPI extends Controller
'SHERROR' => '',
'SHINTBOX' => '',
'SHTYPE' => 'M3-Res-out',
'SHDATA' => $responseStatusCode . 'TYPE :' . $TYPE . ' Order Category: ' . $ORDERCATEGORY . '-' . $M3JSONResponse . $M3SessionId . $M3ResponseTime . $M3transferTime,
'SHDATA' => $responseStatusCode . 'TYPE :' . $TYPE . self::ORDER_CATEGORY_LABEL . $ORDERCATEGORY . '-' . $M3JSONResponse . $M3SessionId . $M3ResponseTime . $M3transferTime,
'SHUSER' => $SHUSER,
'SHSOURCE' => $SHSOURCE,
'SHCO' => $DIVI,
@@ -334,7 +339,7 @@ class TransferAPI extends Controller
'SHERROR' => 'X',
'SHINTBOX' => '',
'SHTYPE' => 'M3-Res-out',
'SHDATA' => $responseStatusCode . '-' . $M3Errors . '-TYPE:' . $TYPE . ' Order Category: ' . $ORDERCATEGORY . '-' . $M3JSONResponse .
'SHDATA' => $responseStatusCode . '-' . $M3Errors . '-TYPE:' . $TYPE . self::ORDER_CATEGORY_LABEL . $ORDERCATEGORY . '-' . $M3JSONResponse .
'M3-JSN-out' . $JSONIN . $M3SessionId . $M3ResponseTime . $M3transferTime,
'SHUSER' => $SHUSER,
'SHSOURCE' => $SHSOURCE,
@@ -346,7 +351,7 @@ class TransferAPI extends Controller
return response()->json([
'code' => '206',
'status' => 'Error',
'message' => $responseStatusCode . '-' . $M3Errors . '- TYPE :' . $TYPE . ' Order Category: ' . $ORDERCATEGORY . '-' . $M3JSONResponse,
'message' => $responseStatusCode . '-' . $M3Errors . '- TYPE :' . $TYPE . self::ORDER_CATEGORY_LABEL . $ORDERCATEGORY . '-' . $M3JSONResponse,
]);
}
}
@@ -361,14 +366,14 @@ class TransferAPI extends Controller
}
} else {
// Write to Logs Out : Error
$DELIVERYNO = isset($DELIVERYNO) ? $DELIVERYNO : '000000';
$DELIVERYNO = isset($DELIVERYNO) ? $DELIVERYNO : self::ZERO_PAD;
$data = ['SHMACPKR' => $DELIVERYNO,
'SHDT' => date('Y-m-d'),
'SHTIME' => date('H:i:s'),
'SHERROR' => 'X',
'SHINTBOX' => '',
'SHTYPE' => 'M3-Res-out',
'SHDATA' => 'No URL Parameters Sent',
'SHDATA' => self::NO_URL_PARAMETERS,
'SHUSER' => $SHUSER,
'SHSOURCE' => $SHSOURCE,
'SHCO' => $DIVI,
@@ -380,7 +385,7 @@ class TransferAPI extends Controller
return response()->json([
'code' => '405',
'status' => 'Error',
'message' => 'No URL Parameters Sent',
'message' => self::NO_URL_PARAMETERS,
]);
}
} catch (\Throwable $th) {
@@ -409,7 +414,7 @@ class TransferAPI extends Controller
]);
} else {
// Write to Logs Out : Error
$DELIVERYNO = isset($DELIVERYNO) ? $DELIVERYNO : '000000';
$DELIVERYNO = isset($DELIVERYNO) ? $DELIVERYNO : self::ZERO_PAD;
$data = ['SHMACPKR' => $DELIVERYNO,
'SHDT' => date('Y-m-d'),
'SHTIME' => date('H:i:s'),
@@ -545,11 +550,11 @@ class TransferAPI extends Controller
$token = $IonToken;
$response = Http::withHeaders([
'accept' => 'application/json',
'Content-Type' => 'application/json',
'accept' => self::JSON_CONTENT_TYPE,
'Content-Type' => self::JSON_CONTENT_TYPE,
])
->withToken($token)
->withBody($JSON, 'application/json')
->withBody($JSON, self::JSON_CONTENT_TYPE)
->timeout(Config::get('arrays.curlTimeOut'))
->post($endPointURL);
$responseStatusCode = $response->getStatusCode();
@@ -628,14 +633,14 @@ class TransferAPI extends Controller
}
} else {
// Write to Logs Out : Error
$DELIVERYNO = isset($DELIVERYNO) ? $DELIVERYNO : '000000';
$DELIVERYNO = isset($DELIVERYNO) ? $DELIVERYNO : self::ZERO_PAD;
$data = ['SHMACPKR' => $DELIVERYNO,
'SHDT' => date('Y-m-d'),
'SHTIME' => date('H:i:s'),
'SHERROR' => 'X',
'SHINTBOX' => '',
'SHTYPE' => 'M3-Res-out',
'SHDATA' => 'No URL Parameters Sent',
'SHDATA' => self::NO_URL_PARAMETERS,
'SHUSER' => $SHUSER,
'SHSOURCE' => $SHSOURCE,
'SHCO' => $DIVI,
@@ -647,7 +652,7 @@ class TransferAPI extends Controller
return response()->json([
'code' => '405',
'status' => 'Error',
'message' => 'No URL Parameters Sent',
'message' => self::NO_URL_PARAMETERS,
]);
}
} catch (\Throwable $th) {
@@ -676,7 +681,7 @@ class TransferAPI extends Controller
]);
} else {
// Write to Logs Out : Error
$DELIVERYNO = isset($DELIVERYNO) ? $DELIVERYNO : '000000';
$DELIVERYNO = isset($DELIVERYNO) ? $DELIVERYNO : self::ZERO_PAD;
$data = ['SHMACPKR' => $DELIVERYNO,
'SHDT' => date('Y-m-d'),
'SHTIME' => date('H:i:s'),