mag/WMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

M3 Security Fixes for scan command pass 33 major code smell fixes and style fixes

Browse Source
This commit is contained in:
Mark Gregory
2026-09-17 11:34:41 +01:00
parent 0a05f05843
commit 0c445f89af
69 changed files with 1786 additions and 1752 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/M3/Console/CallCloseAPI.php
+5 -1
View File
@@ -8,11 +8,11 @@ use Illuminate\Console\Command;
use Illuminate\Http\Request;
use Log;
use Modules\M3\Http\Controllers\API\CloseShipment;
use Str;
class CallCloseAPI extends Command
{
protected $signature = 'command:CallCloseAPI {user?} {manifest?} {co?} {whs?} ';
protected $description = 'Call Close API';
public function handle()
@@ -24,9 +24,11 @@ class CallCloseAPI extends Command
return $this->closeSpecificManifest($manifest, (string) ($this->argument('co') ?? ''), (string) ($this->argument('whs') ?? ''));
}
$this->closePendingManifests();
return self::SUCCESS;
} catch (\Throwable $th) {
Log::channel('dailyCron')->error($th);
return self::FAILURE;
}
}
@@ -55,9 +57,11 @@ class CallCloseAPI extends Command
->where('APSPARE2', '')->where('APCO', $co)->where('APWHS', $whs)->where('APMANIFEST', $manifest)->exists();
if (! $exists) {
Log::channel('dailyCron')->warning('Manifest not available for close', compact('manifest', 'co', 'whs'));
return self::FAILURE;
}
$this->closeManifest($manifest, $co, $whs);
return self::SUCCESS;
}
Modules/M3/Console/ClosedOrderSaveXls.php
+5 -6
View File
@@ -100,7 +100,7 @@ class ClosedOrderSaveXls extends Command
str_replace('-', '', $to),
$file,
! Storage::disk('publicCL')->exists($file),
'Last Month'
'Last Month',
);
}
@@ -122,7 +122,7 @@ class ClosedOrderSaveXls extends Command
str_replace('-', '', $to),
$file,
true,
'Current Month'
'Current Month',
);
}
@@ -134,7 +134,7 @@ class ClosedOrderSaveXls extends Command
string $to,
string $file,
bool $shouldGenerate,
string $label
string $label,
): void {
$this->info('From Date: ' . $from);
$this->info('To Date: ' . $to);
@@ -222,8 +222,7 @@ SQL;
Log::channel('dailyCron')->info(
'Maximum allowed records for Excel export is: ' . number_format($maxRecords)
. ' current records: ' . number_format($count)
. ' current records: ' . number_format($count),
);
}
}
}
Modules/M3/Console/GenerateGS1Cmd.php
+39 -39
View File
@@ -59,15 +59,15 @@ class GenerateGS1Cmd extends Command
// Get the Calling User
$userId = $this->argument('user');
$SHUSER = isset($userId) ? $userId : (m3_user() !== '' ? Str::upper(trim(m3_user())) : 'TWOSHIP');
$this->info('User: ' . $SHUSER);
$sHUSER = isset($userId) ? $userId : (m3_user() !== '' ? Str::upper(trim(m3_user())) : 'TWOSHIP');
$this->info('User: ' . $sHUSER);
// Get Manifest Array
$GSArray1 = $this->option('gsarray');
$GSArray = json_decode($GSArray1, true);
$gSArray1 = $this->option('gsarray');
$gSArray = json_decode($gSArray1, true);
// MAK : Used for debug only
$GSArray = ['Macpkr' => '55555', 'Recipient_Address1' => '9571 Pan American DR', 'Recipient_Address2' => 'C/O AEE Solar', 'Recipient_City' => 'El Paso',
$gSArray = ['Macpkr' => '55555', 'Recipient_Address1' => '9571 Pan American DR', 'Recipient_Address2' => 'C/O AEE Solar', 'Recipient_City' => 'El Paso',
'Recipient_CompanyName' => 'SNAPRACK EL PASO PRODUCTION', 'Recipient_CountryCode' => 'US', 'Recipient_PostalCode' => '79927', 'Recipient_State' => 'TX',
'Sender_Address1' => '6800 Arnold Miller Pkwy', 'Sender_Address2' => '', 'Sender_City' => 'Solon',
'Sender_CompanyName' => 'Erico International', 'Sender_Country' => 'US', 'Sender_PostalCode' => '44139', 'Sender_State' => 'OH',
@@ -75,19 +75,19 @@ class GenerateGS1Cmd extends Command
'PackagesArray' => ['package 1', 'package 2'],
];
if ($SHUSER != '') {
if ($sHUSER != '') {
// Get User CO & WH from Table ICM428M
$ICM428M = DB::connection(config('m3.connection', 'pgsql'))->table('icm428m')
$iCM428M = DB::connection(config('m3.connection', 'pgsql'))->table('icm428m')
->select('R428US', 'R428CO', 'R428WH', 'R428PL')
->where('R428US', '=', $SHUSER)
->where('R428US', '=', $sHUSER)
->first();
$R428US = isset($ICM428M->R428US) ? $ICM428M->R428US : ''; // User
$COMPANY = isset($ICM428M->R428CO) ? $ICM428M->R428CO : ''; // Company
$PLANT = isset($ICM428M->R428PL) ? $ICM428M->R428PL : ''; // Plant
$WHS = isset($ICM428M->R428WH) ? $ICM428M->R428WH : ''; // WareHouse
$r428US = isset($iCM428M->R428US) ? $iCM428M->R428US : ''; // User
$cOMPANY = isset($iCM428M->R428CO) ? $iCM428M->R428CO : ''; // Company
$pLANT = isset($iCM428M->R428PL) ? $iCM428M->R428PL : ''; // Plant
$wHS = isset($iCM428M->R428WH) ? $iCM428M->R428WH : ''; // WareHouse
$Macpkr = $GSArray['Macpkr'];
$macpkr = $gSArray['Macpkr'];
$packageType = '0';
$manufactID = '0826528'; // MAK : get ID from Nvent and save to Config File
$total_length = 9;
@@ -121,25 +121,25 @@ class GenerateGS1Cmd extends Command
<body style="font-family: Arial, sans-serif;">';
// Get number of Pallets
$packageCount = count($GSArray['PackagesArray']);
$packageCount = count($gSArray['PackagesArray']);
$packageNum = 1;
foreach ($GSArray['PackagesArray'] as $key => $value) {
foreach ($gSArray['PackagesArray'] as $key => $value) {
$table_style = $packageNum < $packageCount ? ' style="page-break-after: always;" ' : '';
if (Cache::has('GS1SEQUENCE')) {
$GS1SEQUENCE = Cache::get('GS1SEQUENCE');
$GS1SEQUENCE++;
$GS1SEQUENCEID = str_pad($GS1SEQUENCE, $total_length, '0', STR_PAD_LEFT);
$gS1SEQUENCE = Cache::get('GS1SEQUENCE');
$gS1SEQUENCE++;
$gS1SEQUENCEID = str_pad($gS1SEQUENCE, $total_length, '0', STR_PAD_LEFT);
}
// Box Number Not Found Get it from DB
else {
$GS1SEQUENCE = 1;
$GS1SEQUENCEID = str_pad($GS1SEQUENCE, $total_length, '0', STR_PAD_LEFT);
$gS1SEQUENCE = 1;
$gS1SEQUENCEID = str_pad($gS1SEQUENCE, $total_length, '0', STR_PAD_LEFT);
}
Cache::forever('GS1SEQUENCE', $GS1SEQUENCEID);
$this->info('>>> GS1 sequence Id: ' . $GS1SEQUENCEID);
Cache::forever('GS1SEQUENCE', $gS1SEQUENCEID);
$this->info('>>> GS1 sequence Id: ' . $gS1SEQUENCEID);
$gs1_128_bc_1 = '00' . $packageType . $manufactID . $GS1SEQUENCEID;
$gs1_128_bc_1 = '00' . $packageType . $manufactID . $gS1SEQUENCEID;
// Calculate Check Digit
$digits = str_split($gs1_128_bc_1);
@@ -160,17 +160,17 @@ class GenerateGS1Cmd extends Command
$checkDigit = ($remainder == 0) ? 0 : 10 - $remainder;
$gs1_128_bc = $gs1_128_bc_1 . $checkDigit;
$gs1_128_bc_desc = '(00)' . $packageType . $manufactID . $GS1SEQUENCEID . $checkDigit;
$gs1_128_bc_desc = '(00)' . $packageType . $manufactID . $gS1SEQUENCEID . $checkDigit;
$data = [
'ship_to' => $GSArray['Recipient_CompanyName'] . '<br>' . $GSArray['Recipient_Address1'] . '<br>' .
$GSArray['Recipient_City'] . ',' . $GSArray['Recipient_State']
. '<br>' . $GSArray['Recipient_PostalCode'],
'from' => $GSArray['Sender_CompanyName'] . '<br>' . $GSArray['Sender_Address1'] . '<br>' .
$GSArray['Sender_City'] . ',' . $GSArray['Sender_State']
. '<br>' . $GSArray['Sender_PostalCode'],
'ship_to_lbl' => '420' . $GSArray['Recipient_PostalCode'],
'ship_to_desc' => '(420)' . $GSArray['Recipient_PostalCode'],
'ship_to' => $gSArray['Recipient_CompanyName'] . '<br>' . $gSArray['Recipient_Address1'] . '<br>' .
$gSArray['Recipient_City'] . ',' . $gSArray['Recipient_State']
. '<br>' . $gSArray['Recipient_PostalCode'],
'from' => $gSArray['Sender_CompanyName'] . '<br>' . $gSArray['Sender_Address1'] . '<br>' .
$gSArray['Sender_City'] . ',' . $gSArray['Sender_State']
. '<br>' . $gSArray['Sender_PostalCode'],
'ship_to_lbl' => '420' . $gSArray['Recipient_PostalCode'],
'ship_to_desc' => '(420)' . $gSArray['Recipient_PostalCode'],
'pro' => '190071217845706',
'item_number' => '10000B',
'upc' => '098506095310',
@@ -202,14 +202,14 @@ class GenerateGS1Cmd extends Command
' . $data['ship_to_desc'] . '
</td>
<td class="border_btm margin_t align_lft">
Carrier: ' . $GSArray['CarrierName'] . ' <br>
PRO #: ' . $GSArray['ShipmentPONumber'] . ' <br>
B/L #: ' . $GSArray['BOLnumber'] . '
Carrier: ' . $gSArray['CarrierName'] . ' <br>
PRO #: ' . $gSArray['ShipmentPONumber'] . ' <br>
B/L #: ' . $gSArray['BOLnumber'] . '
</td>
</tr>
<tr>
<td colspan="2" class="border_btm margin_t align_lft border_rght">
PURCHASE ORDER: ' . $GSArray['Macpkr'] . ' <br>
PURCHASE ORDER: ' . $gSArray['Macpkr'] . ' <br>
Vendor: ' . $manufactID . '
</td>
<td colspan="2" class="border_btm margin_t align_center">
@@ -246,9 +246,9 @@ class GenerateGS1Cmd extends Command
$labelsPath = Config::get('arrays.PdfPath');
// Put the PDF in labels/CarrierLabel
$GSFolder = 'GSLabel';
$carrierFileName = $GSFolder . '_' . $Macpkr . '_' . $COMPANY . '_' . $WHS;
file_put_contents($labelsPath . $GSFolder . '/' . $carrierFileName . '.pdf', $pdfContent);
$gSFolder = 'GSLabel';
$carrierFileName = $gSFolder . '_' . $macpkr . '_' . $cOMPANY . '_' . $wHS;
file_put_contents($labelsPath . $gSFolder . '/' . $carrierFileName . '.pdf', $pdfContent);
// Check if the PDF was generated correctly
// if (!file_exists($tempPdfPath) || filesize($tempPdfPath) === 0) {