M3 Security Fixes for Pass 35

This commit is contained in:
Mark Gregory
2026-09-17 12:28:47 +01:00
parent 502b226e44
commit a4fd6709f4
8 changed files with 10 additions and 15 deletions
+5 -6
View File
@@ -32,7 +32,7 @@ class ClosedOrderSaveXls extends Command
* *
* @return void * @return void
*/ */
/** /**
* Execute the console command. * Execute the console command.
* *
* @return int * @return int
@@ -95,7 +95,7 @@ class ClosedOrderSaveXls extends Command
str_replace('-', '', $to), str_replace('-', '', $to),
$file, $file,
! Storage::disk('publicCL')->exists($file), ! Storage::disk('publicCL')->exists($file),
'Last Month' 'Last Month',
); );
} }
@@ -117,7 +117,7 @@ class ClosedOrderSaveXls extends Command
str_replace('-', '', $to), str_replace('-', '', $to),
$file, $file,
true, true,
'Current Month' 'Current Month',
); );
} }
@@ -129,7 +129,7 @@ class ClosedOrderSaveXls extends Command
string $to, string $to,
string $file, string $file,
bool $shouldGenerate, bool $shouldGenerate,
string $label string $label,
): void { ): void {
$this->info('From Date: ' . $from); $this->info('From Date: ' . $from);
$this->info('To Date: ' . $to); $this->info('To Date: ' . $to);
@@ -217,8 +217,7 @@ SQL;
Log::channel('dailyCron')->info( Log::channel('dailyCron')->info(
'Maximum allowed records for Excel export is: ' . number_format($maxRecords) 'Maximum allowed records for Excel export is: ' . number_format($maxRecords)
. ' current records: ' . number_format($count) . ' current records: ' . number_format($count),
); );
} }
} }
+1 -1
View File
@@ -28,7 +28,7 @@ class DeleteOldLabels extends Command
* *
* @return void * @return void
*/ */
/** /**
* Execute the console command. * Execute the console command.
* *
* @return int * @return int
+1 -1
View File
@@ -36,7 +36,7 @@ class GenerateGS1Cmd extends Command
* *
* @return void * @return void
*/ */
/** /**
* Execute the console command. * Execute the console command.
* *
* @return int * @return int
+1 -1
View File
@@ -29,7 +29,7 @@ class UtilitiesCmd extends Command
* *
* @return void * @return void
*/ */
/** /**
* Execute the console command. * Execute the console command.
* *
* @return int * @return int
+1 -1
View File
@@ -29,7 +29,7 @@ class WHSMetricsSaveXls extends Command
* *
* @return void * @return void
*/ */
/** /**
* Execute the console command. * Execute the console command.
* *
* @return int * @return int
@@ -5,7 +5,6 @@ namespace Modules\M3\Http\Controllers\API;
use Config; use Config;
use DB; use DB;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Log;
use Modules\M3\Helpers\Helper; use Modules\M3\Helpers\Helper;
use Modules\M3\Http\Controllers\Controller; use Modules\M3\Http\Controllers\Controller;
use Modules\M3\Services\PostgresProgramBridge; use Modules\M3\Services\PostgresProgramBridge;
@@ -14,6 +13,7 @@ use Str;
class M3Controller extends Controller class M3Controller extends Controller
{ {
private const FIELD_PREFIX = 'Field: '; private const FIELD_PREFIX = 'Field: ';
private const M3_LIST_SUFFIX = ' M3-Lis-JSN'; private const M3_LIST_SUFFIX = ' M3-Lis-JSN';
// Split Data and Write to ICM666M2 // Split Data and Write to ICM666M2
@@ -176,7 +176,6 @@ class ReplenishSettingsController extends Controller
// $rEFCAT658 = DB::connection(config('m3.connection', 'pgsql'))->select($sqlstmt); // $rEFCAT658 = DB::connection(config('m3.connection', 'pgsql'))->select($sqlstmt);
// dd($rEFCAT658); // dd($rEFCAT658);
return Datatables::of($rEFCAT658)->addIndexColumn()->make(true); return Datatables::of($rEFCAT658)->addIndexColumn()->make(true);
} }
} }
@@ -66,7 +66,6 @@ class utilitiesContoller extends Controller
// Add Delivery Note Param // Add Delivery Note Param
$params[] = $conn->AddParameterPackDec('in', 11, 0, 'ParamIn', '', '00000087125'); $params[] = $conn->AddParameterPackDec('in', 11, 0, 'ParamIn', '', '00000087125');
// Start Time Tracking // Start Time Tracking
$start = microtime(true); $start = microtime(true);
@@ -402,7 +401,6 @@ class utilitiesContoller extends Controller
// DB::connection(config('m3.connection', 'pgsql'))->table('icm695m3') // DB::connection(config('m3.connection', 'pgsql'))->table('icm695m3')
// ->insert(['A2CO'=> $cOMPANY,'A2WHS'=> $wHS,'A2MACPKR'=> $macpkr,'A2GS1LABEL'=> $gs1_128_bc]); // ->insert(['A2CO'=> $cOMPANY,'A2WHS'=> $wHS,'A2MACPKR'=> $macpkr,'A2GS1LABEL'=> $gs1_128_bc]);
return json_encode(['result' => 'success', 'GS1File' => $gS1FileNameNoRoot]); return json_encode(['result' => 'success', 'GS1File' => $gS1FileNameNoRoot]);
} catch (\Throwable $th) { } catch (\Throwable $th) {
@@ -519,7 +517,6 @@ class utilitiesContoller extends Controller
</body> </body>
</html>'; </html>';
// Initialize Dompdf // Initialize Dompdf
$dompdf = new Dompdf; $dompdf = new Dompdf;
$dompdf->loadHtml($html); $dompdf->loadHtml($html);