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:40:07 +01:00
parent 66aeefbba5
commit 2242106309
9 changed files with 218 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/M3/Http/Controllers/API/CloseShipment.php
+5 -5
View File
@@ -36,7 +36,7 @@ class CloseShipment extends Controller
$jSONCS = [];
// Get the Calling User
$sHUSER = m3User() !== '' ? Str::upper(m3User()) : 'WebUser';
$sHUSER = m3_user() !== '' ? Str::upper(m3_user()) : 'WebUser';
$sHSOURCE = 'CloseShipmentCoChargeAPI';
try {
@@ -260,7 +260,7 @@ class CloseShipment extends Controller
// ->get();
// PFC : Check that Picked / Packed are all Equal
foreach ($iCM688M2SL as $ICM688M2SLR) {
foreach ($iCM688M2SL as $key => $ICM688M2SLR) {
$a5PICKED = isset($ICM688M2SLR->A5PICKED) ? $ICM688M2SLR->A5PICKED : 0;
$a5RSVQTY = isset($ICM688M2SLR->A5RSVQTY) ? $ICM688M2SLR->A5RSVQTY : 0;
$a5ShortShipQty = (int) $a5RSVQTY - (int) $a5PICKED;
@@ -295,7 +295,7 @@ class CloseShipment extends Controller
->orderBy('AYINTBOX')
->get();
foreach ($iCM695M1JOINTMP as $ICM695M1JOINR) {
foreach ($iCM695M1JOINTMP as $key => $ICM695M1JOINR) {
$a4SHIPVIA = isset($ICM695M1JOINR->A4SHIPVIA) ? trim(str_replace('&', '_', $ICM695M1JOINR->A4SHIPVIA)) : '';
$sHIPTYPE = trim($ICM695M1JOINR->A4SHIPTYPE);
@@ -454,7 +454,7 @@ class CloseShipment extends Controller
$contentLabel = '';
$docTypes = ['ContentLabel', 'CarrierLabel'];
foreach ($docTypes as $value) {
foreach ($docTypes as $key => $value) {
switch ($value) {
case 'CarrierLabel':
$dOCTYPE = 'CarrierLabel';
@@ -783,7 +783,7 @@ class CloseShipment extends Controller
elseif (count($iCM695M1TMP) > 0 && $tRANSTYPE == 'Z') {
$errorMsgs = '';
foreach ($iCM695M1TMP as $key => $ICM695M1JOINR) {
foreach ($iCM695M1TMP as $ICM695M1JOINR) {
$sHIPTYPE = trim($ICM695M1JOINR->A4SHIPTYPE);
$fREIGHTTERMS = trim($ICM695M1JOINR->A4OFSTRM);
$a4RATEM3 = trim($ICM695M1JOINR->A4RATEM3);