m3 Security Fixes

Modules/M3/Config/arrays.php

@@ -8,7 +8,7 @@ return [
     #'nonWorkingHourCode' => ['73,85,89,90,91,92,86,99'],
     'autorefresh_all'           => ['00:15'],
     'autorefresh_notall'        => ['00:15'],
-    
+
     'payrollCodes'              => ['33,49,75,94,98,102,171'],
 
     'min_work_hours_for_break'  => ['4'],
@@ -57,7 +57,7 @@ return [
     'PHPTimeOutCL'=> 1000,
     'maxRecDL'    => 20000,
     'maxRecCL'    => 55000,
-    'BadChars'    => ['–','\t','\n','\u20134807','\u20131','\u201333','\u2013671' ,'Ÿ','á', 'é', 'í', 'ó' ,'ú','“','”'],  
+    'BadChars'    => ['–','\t','\n','\u20134807','\u20131','\u201333','\u2013671' ,'Ÿ','á', 'é', 'í', 'ó' ,'ú','“','”'],
     'PdfPath'     => env('M3_LABELS_PATH', storage_path('app/m3/labels') . DIRECTORY_SEPARATOR),    # Warning : The path for PDF storage is shared by all Instances and should not be altered
     'DUMMYPDF'    => '',
     'uom_size'    => ['110-142-303'=>'mm',
@@ -68,7 +68,7 @@ return [
                       '110-143-322'=>'lbs'],  # unit of mesure for boxes weight kg or lbs
 
 #STATUS ARRAY FOR ICM688M1
-'status_ICM688M1_array' => [    
+'status_ICM688M1_array' => [
     "P"=>"Pending error checking by splitting (OP510E2)",
     "H"=>"Hold as error found (OP510E3)",
     "L"=>"Ready to pick",
@@ -81,18 +81,17 @@ return [
     "A"=>"ShipConfirmed" ],
 
     'whsePerf_targets' => [
-        'all_notes'=>'90', 'all_dollars'=>'85', 'all_weight'=>'90', 
+        'all_notes'=>'90', 'all_dollars'=>'85', 'all_weight'=>'90',
         'ltl_notes'=>'90', 'ltl_dollars'=>'95', 'ltl_weight'=>'99',
         'parcel_notes'=>'90', 'parcel_dollars'=>'75', 'parcel_weight'=>'80'
     ],
 '2Ship' => [
     # 2Ship WS_Key
-    # live $TwoShip_Key="FED945D1-5DC7-415E-BDAB-16347E7C1304";   
-    # test $TwoShip_Key="45027F2A-EDA6-4C16-8AD4-9BC70CE94AB8";   
+    # live $TwoShip_Key="FED945D1-5DC7-415E-BDAB-16347E7C1304";
+    # test $TwoShip_Key="45027F2A-EDA6-4C16-8AD4-9BC70CE94AB8";
     'TwoShip_Key' => "45027F2A-EDA6-4C16-8AD4-9BC70CE94AB8",
     'end_point'   =>"https://euroapi.2ship.com/api/",
     'hold_update' =>"UpdateOnHoldOrder_V1",
     ],
 
 ];
-        

Modules/M3/Config/arrays_custom.php

@@ -14,7 +14,7 @@ return [
                             '171'=>'17'
                         ]
 
-                            
+
 ];
 # '75'=>'26',
 # '75'=>'23',
@@ -22,19 +22,19 @@ return [
 
 # Found in BLDPERFST rpg pgm in EWRPGSRC / EWSRCTST
 # PICKING stats
-# when a5sentview in ('7','9') then 33          
-# when a5sentview = 5 then 49                   
-# when a5sentview = 12 then 98                  
-# when a5sentview in ('2','10') then 75         
-# when a5sentview in ('1','3','4','11') then 94 
-# when a5sentview = 8 then 102                  
-# when a5sentview = 6 then 171                  
-# else 999  
+# when a5sentview in ('7','9') then 33
+# when a5sentview = 5 then 49
+# when a5sentview = 12 then 98
+# when a5sentview in ('2','10') then 75
+# when a5sentview in ('1','3','4','11') then 94
+# when a5sentview = 8 then 102
+# when a5sentview = 6 then 171
+# else 999
 
 # PACKING stats
-# case when (select AYTYPE from ICM695M1            
-# where AYINTBOX=AZINTBOX                           
-#   and AYSENTPKR=AZSENTPKR FETCH FIRST ROW ONLY)   
+# case when (select AYTYPE from ICM695M1
+# where AYINTBOX=AZINTBOX
+#   and AYSENTPKR=AZSENTPKR FETCH FIRST ROW ONLY)
 #    in ('','BX') then '16' else '66' end as AYTYPE,
 
 ?>

Modules/M3/Console/CallCloseAPI.php

@@ -65,7 +65,7 @@ class CallCloseAPI extends Command
                 // dump($ICM705M1);
 
                 if (count($ICM705M1)>0) {
-                    # Loop the Results from $ICM705M1 
+                    # Loop the Results from $ICM705M1
                     foreach ($ICM705M1 as $key => $ICM705M1R) {
                         $MANIFESTNum = $ICM705M1R->APMANIFEST;
 
@@ -76,7 +76,7 @@ class CallCloseAPI extends Command
                         $ICM705M1U = DB::connection(config('m3.connection', 'pgsql'))->table('icm705m1')
                             ->where('APMANIFEST',$MANIFESTNum)
                             ->where('APCO',$USERCO)
-                            ->where('APWHS',$USERWH) 
+                            ->where('APWHS',$USERWH)
                             ->update(["APSPARE2"=>"P"]);
 
                         $myRequest = new Request();
@@ -86,7 +86,7 @@ class CallCloseAPI extends Command
                             'COMPANY'   => $USERCO,
                             'TRANSTYPE' => 'M',
                             'MANIFEST'  => $MANIFESTNum
-                        ]); 
+                        ]);
                         $callCloseShipment = CloseShipment::CloseShipmentCoChargeAPI($myRequest);
                         $responseData      = $callCloseShipment->getData();
                         $jsonData          = json_encode($responseData);
@@ -109,7 +109,7 @@ class CallCloseAPI extends Command
                 $ICM705M1U = DB::connection(config('m3.connection', 'pgsql'))->table('icm705m1')
                     ->where('APMANIFEST',$MANIFESTNum)
                     ->where('APCO',$APCO)
-                    ->where('APWHS',$APWHS) 
+                    ->where('APWHS',$APWHS)
                     ->update(["APSPARE2"=>"P"]);
 
                 $myRequest = new Request();

Modules/M3/Console/ClosedOrderSaveXls.php

@@ -68,7 +68,7 @@ class ClosedOrderSaveXls extends Command
             $PPL       = $this->argument('pl');
             $PLANT     = isset($PPL) ? trim($PPL) : '';
 
-            # Generate last Month Report 
+            # Generate last Month Report
             $date               = new \DateTime('FIRST DAY OF THIS MONTH');
             $date->modify('-1 month');
             $fromPreviousMonth  = $date->format('Y-m-d');
@@ -108,10 +108,10 @@ class ClosedOrderSaveXls extends Command
                             (SELECT A4SHSHNM FROM ICM688M1 WHERE A4MACPKR=A5MACPKR) AS A4SHSHNM ,
                             CASE WHEN SHDT IS NULL THEN (SELECT SHDATA FROM ICM699M WHERE SHMACPKR=A5MACPKR AND SHTYPE='M3-Res-out' AND SHSOURCE='CloseShipmentCoChargeAPI' ORDER BY SHDT DESC, SHTIME DESC FETCH FIRST 1 ROWS ONLY) ELSE '' END AS REASON,
                             A1SHCURR,
-                            CASE 
-                            WHEN (SELECT A4SHIPTYPE FROM ICM688M1 WHERE A4MACPKR=A5MACPKR) = 'LTL' 
+                            CASE
+                            WHEN (SELECT A4SHIPTYPE FROM ICM688M1 WHERE A4MACPKR=A5MACPKR) = 'LTL'
                             THEN (SELECT A4RATETCP FROM ICM688M1 WHERE A4MACPKR=A5MACPKR) * ".(100.00 - Config::get('arrays.misc.discountCarrierRateForCustomerPriceLTL'))/100 ."
-                            ELSE (SELECT A4RATETCP FROM ICM688M1 WHERE A4MACPKR=A5MACPKR) * ".(100.00 - Config::get('arrays.misc.discountCarrierRateForCustomerPriceParcel') )/100 ." 
+                            ELSE (SELECT A4RATETCP FROM ICM688M1 WHERE A4MACPKR=A5MACPKR) * ".(100.00 - Config::get('arrays.misc.discountCarrierRateForCustomerPriceParcel') )/100 ."
                             END AS FREIGHT
                         FROM ICM688M2
                         LEFT JOIN ICM699M ON SHMACPKR=A5MACPKR AND SHTYPE='M3-Res-out' AND SHDATA LIKE 'Success%' AND SHSOURCE='CloseShipmentCoChargeAPI'
@@ -120,7 +120,7 @@ class ClosedOrderSaveXls extends Command
                         WHERE A5MACPKR IN (
                             SELECT DISTINCT AYMACPKR
                             FROM ICM695M1
-                            WHERE AYSTATUS IN ('Z','z') AND AYAPR8N002  BETWEEN $reportDate AND $toreportDate 
+                            WHERE AYSTATUS IN ('Z','z') AND AYAPR8N002  BETWEEN $reportDate AND $toreportDate
                         )
                         AND A5CO=$COMPANY AND A5WHS=$WHS AND A5PLANT=$PLANT
                     ");
@@ -140,7 +140,7 @@ class ClosedOrderSaveXls extends Command
 
                 # Count records before exporting to excel : Max 55K records are allowed
                 $ICM688M2Count  = $ICM688M2Col->count();
-                # Set Max allowed records 
+                # Set Max allowed records
                 $maxRecords = Config::get('arrays.maxRecCL');
                 if ($ICM688M2Count>$maxRecords) {
                     Log::channel('dailyCron')->info('Maximum allowed records for Excel export is: '.number_format($maxRecords).' current records: '.number_format($ICM688M2Count));
@@ -162,7 +162,7 @@ class ClosedOrderSaveXls extends Command
                 Log::channel('dailyCron')->info("Monthly report, no records found: Nothing to save...");
             }
 
-            # Generate current Month Report 
+            # Generate current Month Report
             $now                = new \DateTime();
             $first_day_of_month = $now->format('Y-m-01');
             $current_date       = $now->format('Y-m-d');
@@ -197,10 +197,10 @@ class ClosedOrderSaveXls extends Command
                             (SELECT A4SHSHNM FROM ICM688M1 WHERE A4MACPKR=A5MACPKR) AS A4SHSHNM ,
                             CASE WHEN SHDT IS NULL THEN (SELECT SHDATA FROM ICM699M WHERE SHMACPKR=A5MACPKR AND SHTYPE='M3-Res-out' AND SHSOURCE='CloseShipmentCoChargeAPI' ORDER BY SHDT DESC, SHTIME DESC FETCH FIRST 1 ROWS ONLY) ELSE '' END AS REASON,
                             A1SHCURR,
-                            CASE 
-                            WHEN (SELECT A4SHIPTYPE FROM ICM688M1 WHERE A4MACPKR=A5MACPKR) = 'LTL' 
+                            CASE
+                            WHEN (SELECT A4SHIPTYPE FROM ICM688M1 WHERE A4MACPKR=A5MACPKR) = 'LTL'
                             THEN (SELECT A4RATETCP FROM ICM688M1 WHERE A4MACPKR=A5MACPKR) * ".(100.00 - Config::get('arrays.misc.discountCarrierRateForCustomerPriceLTL'))/100 ."
-                            ELSE (SELECT A4RATETCP FROM ICM688M1 WHERE A4MACPKR=A5MACPKR) * ".(100.00 - Config::get('arrays.misc.discountCarrierRateForCustomerPriceParcel') )/100 ." 
+                            ELSE (SELECT A4RATETCP FROM ICM688M1 WHERE A4MACPKR=A5MACPKR) * ".(100.00 - Config::get('arrays.misc.discountCarrierRateForCustomerPriceParcel') )/100 ."
                             END AS FREIGHT
                         FROM ICM688M2
                         LEFT JOIN ICM699M ON SHMACPKR=A5MACPKR AND SHTYPE='M3-Res-out' AND SHDATA LIKE 'Success%' AND SHSOURCE='CloseShipmentCoChargeAPI'
@@ -209,7 +209,7 @@ class ClosedOrderSaveXls extends Command
                         WHERE A5MACPKR IN (
                             SELECT DISTINCT AYMACPKR
                             FROM ICM695M1
-                            WHERE AYSTATUS IN ('Z','z') AND AYAPR8N002  BETWEEN $reportDate2 AND $toreportDate2 
+                            WHERE AYSTATUS IN ('Z','z') AND AYAPR8N002  BETWEEN $reportDate2 AND $toreportDate2
                         )
                         AND A5CO=$COMPANY AND A5WHS=$WHS AND A5PLANT=$PLANT
                     ");
@@ -229,7 +229,7 @@ class ClosedOrderSaveXls extends Command
 
                 # Count records before exporting to excel : Max 55K records are allowed
                 $ICM688M2Count  = $ICM688M2Col2->count();
-                # Set Max allowed records 
+                # Set Max allowed records
                 $maxRecords = Config::get('arrays.maxRecCL');
                 if ($ICM688M2Count>$maxRecords) {
                     Log::channel('dailyCron')->info('Maximum allowed records for Excel export is: '.number_format($maxRecords).' current records: '.number_format($ICM688M2Count));

Modules/M3/Console/DeleteOldLabels.php

@@ -66,8 +66,8 @@ class DeleteOldLabels extends Command
             foreach ($subFolders as $key => $subFolder) {
                 $labelsDirectory = $labelsDirectoryTmp.$subFolder;
 
-                $this->info("Getting Files From Directory: ".$labelsDirectory); 
-                Log::channel('dailyCron')->info("Getting Files From Directory: ".$labelsDirectory); 
+                $this->info("Getting Files From Directory: ".$labelsDirectory);
+                Log::channel('dailyCron')->info("Getting Files From Directory: ".$labelsDirectory);
 
                 exec('find '.$labelsDirectory.' -ctime +180 -type f -exec rm {} \;');
                 # exec('find '.$labelsDirectory.' -ctime +190 -type f -print | wc -l');
@@ -92,7 +92,7 @@ class DeleteOldLabels extends Command
 
             // $this->info("Files to Delete...");
             // dump($filesToDeleteArr);
-            
+
             # Delete Old Files
             File::delete($filesToDeleteArr);
 

Modules/M3/Console/GenerateGS1Cmd.php

@@ -81,7 +81,7 @@ class GenerateGS1Cmd extends Command
             $GSArray1 =  $this->option('gsarray');
             $GSArray  = json_decode($GSArray1, true);
             // dump($GSArray);
-            
+
             # MAK : Used for debug only
             $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",
@@ -98,7 +98,7 @@ class GenerateGS1Cmd extends Command
                     ->select('R428US','R428CO', 'R428WH','R428PL')
                     ->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
@@ -119,25 +119,25 @@ class GenerateGS1Cmd extends Command
                     .border_rght {
                         border-right: 1px solid;
                     }
-        
+
                     .margin_t {
                         padding-top : 10px;
                     }
-        
+
                     .align_lft {
                         text-align: left;
                     }
                     .align_center {
                         text-align: center;
                     }
-        
+
                     @page { margin: 5px; }
                     body { margin: 0px; }
                 </style>
                 </head>
                 <body style="font-family: Arial, sans-serif;">';
 
-                # Get number of Pallets   
+                # Get number of Pallets
                 $packageCount = count($GSArray['PackagesArray']);
                 $packageNum   = 1;
                 foreach ($GSArray['PackagesArray'] as $key => $value) {
@@ -157,7 +157,7 @@ class GenerateGS1Cmd extends Command
                     $this->info(">>> GS1 sequence Id: ".$GS1SEQUENCEID);
 
                     $gs1_128_bc_1      = '00' .$packageType . $manufactID . $GS1SEQUENCEID;
-                    
+
                     # Calculate Check Digit
                     $digits = str_split($gs1_128_bc_1);
                     $sum    = 0;
@@ -181,10 +181,10 @@ class GenerateGS1Cmd extends Command
 
                     $data = [
                         'ship_to'       => $GSArray["Recipient_CompanyName"].'<br>'.$GSArray["Recipient_Address1"].'<br>'.
-                        $GSArray["Recipient_City"].','. $GSArray["Recipient_State"] 
+                        $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"] 
+                        $GSArray["Sender_City"].','. $GSArray["Sender_State"]
                         .'<br>'.$GSArray["Sender_PostalCode"] ,
                         'ship_to_lbl'   => '420'.$GSArray["Recipient_PostalCode"],
                         'ship_to_desc'  => '(420)'.$GSArray["Recipient_PostalCode"],
@@ -194,10 +194,10 @@ class GenerateGS1Cmd extends Command
                         'quantity'      => '1',
                         'serial_shipping_container' => $gs1_128_bc_desc
                     ];
-            
+
                     # Initialize barcode generator
                     $generator = new BarcodeGeneratorPNG();
-            
+
                     # Generate barcodes
                     $shipToPostalCodeBarcode        = $generator->getBarcode($data['ship_to_lbl'], $generator::TYPE_CODE_128);
                     $serialShippingContainerBarcode = $generator->getBarcode($data['serial_shipping_container'], $generator::TYPE_CODE_128, 2 ,50);
@@ -247,7 +247,7 @@ class GenerateGS1Cmd extends Command
                 $html .='</body> </html>';
                 // dump($html);
                 // App::call('App\Http\Controllers\utilitiesContoller@generateGS128');
-               
+
                 ob_start();
 
                 # Initialize Dompdf
@@ -256,7 +256,7 @@ class GenerateGS1Cmd extends Command
                 $dompdf->setPaper('a6', 'portrait');
                 # Render the HTML as PDF
                 $dompdf->render();
-                
+
                 # Output the generated PDF to Browser
                 // $dompdf->stream();
 

Modules/M3/Console/WHSMetricsSaveXls.php

@@ -99,7 +99,7 @@ class WHSMetricsSaveXls extends Command
                         ORDER BY 1,3,2
                     ");
                 // dd($ICM700MHeadSel);
-                    
+
                 $newItem     = ["A4SHIPTYPE" => 'Method', "STATUS" => 'Status', "SOURCE" => 'Source', "PICKERS" => 'Pickers',
                     "WEIGHT" => 'Weight', "LINES" => 'Lines', "DOLLARS" => 'Dollars'];
 
@@ -133,13 +133,13 @@ class WHSMetricsSaveXls extends Command
                         CASE WHEN A4TPCKWGHT>16000 THEN 'FTL' ELSE A4SHIPTYPE END AS A4SHIPTYPE,
                         A4TPCKWGHT,A4NOPICLNS,
                         (SELECT SUM(A5RSVQTY*A5SLUNPR) FROM ICM688M2 WHERE A4MACPKR=A5MACPKR) AS DOLLARS
-                        FROM ICM700M A 
+                        FROM ICM700M A
                         LEFT JOIN ICM688M1 B ON A4MACPKR=A3MACPKR
                         WHERE A3MSMTDATE=(SELECT MAX(A3MSMTDATE) FROM ICM700M) AND A3CO='$COMPANY' AND A3WHS='$WHS' AND A3PLT='$PLANT'
                     )
                     SELECT * FROM TEMPFILE
                 ");
-                    
+
                 $newItem2  = ["A3CO" => 'Co', "A3WHS" => 'Whs', "A3PLT" => 'Plt', "A3MACPKR" => 'Delivery No', "A4PICKCRTS" => 'Date Time Arrived in Sentinel',
                     "SOURCE" => 'Source', "CARRIERASSIGNED" => 'Date carrier Assigned', "A4ONO" => 'Order No', "A4SHSHNM" => 'Customer name',"A4SCAC" => 'Carrier',
                     "A42SSVCNAM" => 'Service', "A4PICKSTS" => 'Picker Status', "STATUS" => 'Open or Closed', "A4SHIPTYPE" => 'Method',
@@ -165,7 +165,7 @@ class WHSMetricsSaveXls extends Command
             }
             // Log::channel('dailyCron')->info(">>> Detail Content");
             // Log::channel('dailyCron')->info($ICM700MDetailsCol);
-            
+
             # Save Head and Details to XLS file
             if ($ICM700MHeadCount>0 && $ICM700MDetailsCount>0) {
                 $this->info("Saving Today WHS Performance Report to Disk...");

Modules/M3/Helpers/Helper.php

@@ -51,7 +51,7 @@ class Helper
                     'Accept: application/json'
                 ),
             ));
-           
+
             $response  = curl_exec($curl);
             // dd($response);
             $responseJ = json_decode($response);
@@ -80,14 +80,14 @@ class Helper
 
             curl_close($curl);
         }
-       
+
         return $IonToken;
         // return response()->json([
         //     'code'    => '200',
-        //     'token'   => $IonToken 
+        //     'token'   => $IonToken
         // ]);
     }
-    
+
     # Check M3 API Token V2
     public static function checkReceiveTokenV2(){
         ini_set('max_execution_time', Config::get('arrays.PHPTimeOut'));
@@ -125,7 +125,7 @@ class Helper
                     'Accept: application/json'
                 ),
             ));
-           
+
             $response  = curl_exec($curl);
             // dd($response);
             $responseJ = json_decode($response);
@@ -156,11 +156,11 @@ class Helper
                 ]);
             }
         }
-       
-        // return $IonToken; 
+
+        // return $IonToken;
         return response()->json([
             'code'    => '200',
-            'token'   => $IonToken 
+            'token'   => $IonToken
         ]);
     }
 
@@ -211,8 +211,8 @@ class Helper
                 // dump($Type);// dump($ErrorMessage);// dump($Result);// dump($responseResult->$Type);
                 if ($ResultT=="N/A") {
                     $typesErrors++;
-                } 
-                
+                }
+
             }
             else{
                 $ErrorMessage = isset($responseResult->$Type->ErrorMessage) ? $responseResult->$Type->ErrorMessage :'';
@@ -226,11 +226,11 @@ class Helper
                 // dump($Type); // dump($ErrorMessage); // dump($Result); // dump($responseResult->$Type);
                 if ($ResultT=="N/A") {
                     $typesErrors++;
-                } 
+                }
             }
         }
         // dd($ErrorMessages);
-        
+
         if ($CloseShipmentErr == count($M3CloseShipmentResp) &&  $typesErrors == count($M3TypesResponse)-1) {
             $ErrorMessages .= '-M3 did not call any method or type ';
         }
@@ -260,7 +260,7 @@ class Helper
         $substring = substr($string, $startPos + strlen($start), $endPos - ($startPos + strlen($start)));
         return $substring;
     }
-    
+
     public static function checkLength($JSONL,$DBL,$TYPE)
     {
         # Check type
@@ -321,7 +321,7 @@ class Helper
         // } else {
         //     $goodString = "";
         // }
-        
+
         // dump($goodString);
         return $goodString;
     }
@@ -330,7 +330,7 @@ class Helper
     public static function removeDuplicateSubstrings($str) {
         $result = '';
         $seenPhrases = [];
-    
+
         $phrases = explode(' ', $str);
         foreach ($phrases as $phrase) {
             if (!in_array($phrase, $seenPhrases)) {
@@ -338,7 +338,7 @@ class Helper
                 $seenPhrases[] = $phrase;
             }
         }
-    
+
         return trim($result);
     }
 
@@ -379,7 +379,7 @@ public static function getUserCOWHSPLT(){
     }
 }
 
-    
-    
+
+
 
 }

Modules/M3/Http/Controllers/API/CloseShipment.php

@@ -50,11 +50,11 @@ class CloseShipment extends Controller
             # PDF File PATH
             $pdfFilePath = Config::get('arrays.PdfPath');
             $DELIVERYNO  = $MANIFEST != '' ? $MANIFEST : '000000';
-            
+
             // Log::channel('dailyCron')->info("Close Manifest:".$MANIFEST.'-WHS: '.$WHS."-CO:".$COMPANY);
 
             if ($urlParams != '') {
-                # Write to Logs : JSON 
+                # Write to Logs : JSON
                 $JSONIN = json_encode([
                     "WHS"              => $WHS,
                     "COMPANY"          => $COMPANY,
@@ -87,7 +87,7 @@ class CloseShipment extends Controller
 
                 if ($tokenData->code == '200') {
                     $IonToken = isset($tokenData->token) ? $tokenData->token : '';
-                } 
+                }
                 else {
                     $SHDATA = isset($tokenData->message) ? $tokenData->message : '';
                     $DELIVERYNO = isset($AYMACPKR) ? $AYMACPKR : '000000';
@@ -107,7 +107,7 @@ class CloseShipment extends Controller
                         'SHWHS' => $WHS
                     ];
                     Helper::logToICM699M($data);
-              
+
                     return $tokenResponse;
                 }
 
@@ -133,7 +133,7 @@ class CloseShipment extends Controller
                         ->where('AYMACPKR',$MANIFEST)
                         ->where('AYWHS',$WHS)
                         ->orderBy('AYMACPKR');
-                        
+
                     # Check Date & Time Before Updating ICM699M
                     if ($SHDT!='' && $SHTIME!='' && $SHTYPE!='' && $NODEBUG) {
                         $ICM699MU = DB::connection(config('m3.connection', 'pgsql'))->table('icm699m')
@@ -141,7 +141,7 @@ class CloseShipment extends Controller
                             ->where('SHDT',$SHDT)
                             ->where('SHTIME',$SHTIME)
                             ->where('SHCO',$COMPANY)
-                            ->where('SHWHS',$WHS) 
+                            ->where('SHWHS',$WHS)
                             ->where('SHSOURCE',$SHSOURCE)
                             ->where('SHERROR','X')
                             ->where('SHTYPE',$SHTYPE)
@@ -153,7 +153,7 @@ class CloseShipment extends Controller
                         ->select()
                         ->where('SHMACPKR',$MANIFEST)
                         ->where('SHCO',$COMPANY)
-                        ->where('SHWHS',$WHS) 
+                        ->where('SHWHS',$WHS)
                         ->where('SHSOURCE','PackSyst4tray')
                         ->where('SHERROR','Z')
                         ->where('SHTYPE','M3-QtyChg')
@@ -176,7 +176,7 @@ class CloseShipment extends Controller
                         ->where('A4MACPKR',$MANIFEST)
                         ->orderBy('A4MACPKR');
                 }
-                
+
                 $ICM695M1TMP = $ICM695M1PREP->get();
                 // dump($ICM695M1TMP);
                 // Log::channel('dailyCron')->info($ICM695M1TMP);
@@ -194,7 +194,7 @@ class CloseShipment extends Controller
                     });
                 }
                 // dump($ICM695M1TMPCOLF);
-                
+
                 $ICM695M1TMPCOLFA = $ICM695M1TMPCOLF->toArray();
                 // dump($ICM695M1TMPCOLFA);
 
@@ -239,7 +239,7 @@ class CloseShipment extends Controller
 
                 # Close Shipment for Manifest or Single MacPKR
                 if (count($ICM695M1TMP)>0 && ($TRANSTYPE=='M' || $TRANSTYPE=='P')) {
-                    # Loop the Results from $ICM595M1TMP 
+                    # Loop the Results from $ICM595M1TMP
                     foreach ($ICM695M1TMP as $key => $ICM695M1R) {
                         $PACKAGES       = [];
                         $AYWHS          = trim($ICM695M1R->AYWHS);
@@ -272,7 +272,7 @@ class CloseShipment extends Controller
                         //     ->where('IMWHS',$AYWHS)
                         //     ->where('IMDELNO',$AYMACPKR)
                         //     ->where('IMLINE',$AYRLNO)
-                        //     ->whereIn('IMTOLOC',['DOCK','PACK'])                        
+                        //     ->whereIn('IMTOLOC',['DOCK','PACK'])
                         //     ->get();
 
                         # PFC : Check that Picked / Packed are all Equal
@@ -283,13 +283,13 @@ class CloseShipment extends Controller
 			                $A5RSVQTY 		    = isset($ICM688M2SLR->A5RSVQTY) ? $ICM688M2SLR->A5RSVQTY : 0;
                             $A5ShortShipQty     = (int) $A5RSVQTY - (int) $A5PICKED;
 
-                            # Set EndFLag=1 for short picks 
+                            # Set EndFLag=1 for short picks
                             if ($A5ShortShipQty > 0) {
                                 $EndFlag = 1;
                             }
                         }
 
-                        # Get TRAILERNUMBER SELECT APTRUCKID FROM ICM705M1 WHERE APCO=110 AND APWHS=321 AND APMANIFEST=22 
+                        # Get TRAILERNUMBER SELECT APTRUCKID FROM ICM705M1 WHERE APCO=110 AND APWHS=321 AND APMANIFEST=22
                         $TRAILERNUMBERS = DB::connection(config('m3.connection', 'pgsql'))->table('icm705m1')
                             ->select('APTRUCKID','APTRACKNO','APMANIFEST')
                             ->where('APCO',$COMPANY)
@@ -313,7 +313,7 @@ class CloseShipment extends Controller
                             ->orderBy('AYINTBOX')
                             ->get();
                         // dd($ICM695M1JOINTMP);
-                        
+
                         foreach ($ICM695M1JOINTMP as $key => $ICM695M1JOINR) {
                             $A4SHIPVIA    = isset($ICM695M1JOINR->A4SHIPVIA) ? trim(str_replace("&", "_",$ICM695M1JOINR->A4SHIPVIA)) : '';
 
@@ -375,18 +375,18 @@ class CloseShipment extends Controller
                                 ->where('A1DELNO',$AYMACPKR)
                                 ->first();
                             $GS1LabelExist = isset($ICM666MSQLSel->A1SPR1A01) ? trim($ICM666MSQLSel->A1SPR1A01) : 0;
-                            
+
                             # Case #566:  BOL = PRONUMBER For SCAC=='RETR'
                             if ($SCAC=='RETR') {
                                 $BILLOFLADING = $PRONUMBER;
                             }
 
-                            # Get Commodities  
+                            # Get Commodities
                             $myRequest = new Request();
                             $myRequest->setMethod('POST');
-            
+
                             $myRequest->request->add([
-                                'MACPKR'       => $AYMACPKR 
+                                'MACPKR'       => $AYMACPKR
                             ]);
                             # Call processShipment
                             $controller   = new GetContentsController();
@@ -411,7 +411,7 @@ class CloseShipment extends Controller
                                 $commodities  = '';
                                 $ErrorMsgs    = $ErrorMsgs ." Could not find Commodities; ";
                             }
-                            # End Commodities 
+                            # End Commodities
 
                             # Check ICM699M for SHERROR=X
                             $ICM699MS = DB::connection(config('m3.connection', 'pgsql'))->table('icm699m')
@@ -433,7 +433,7 @@ class CloseShipment extends Controller
                             }
 
                             if($AYTYPE==""){
-                                # Get AETYPE SELECT APTRUCKID FROM ICM705M1 WHERE APCO=110 AND APWHS=321 AND APMANIFEST=22 
+                                # Get AETYPE SELECT APTRUCKID FROM ICM705M1 WHERE APCO=110 AND APWHS=321 AND APMANIFEST=22
                                 $ICM693MS = DB::connection(config('m3.connection', 'pgsql'))->table('icm693m')
                                     ->select('AEID')
                                     ->where('AESPR1A01','D')
@@ -448,11 +448,11 @@ 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';
-                            
+
                                 if($SHIPTYPE=='LTL') {
-                                    $shippingToBill = $FREIGHT*(100.00 - Config::get('arrays.misc.discountCarrierRateForCustomerPriceLTL'))/100; 
+                                    $shippingToBill = $FREIGHT*(100.00 - Config::get('arrays.misc.discountCarrierRateForCustomerPriceLTL'))/100;
                                 } else {
-                                    $shippingToBill = $FREIGHT*(100.00 - Config::get('arrays.misc.discountCarrierRateForCustomerPriceParcel') )/100; 
+                                    $shippingToBill = $FREIGHT*(100.00 - Config::get('arrays.misc.discountCarrierRateForCustomerPriceParcel') )/100;
                                 }
                                 # Construct Json for COCharge
                                 $JSONCoCharge = [
@@ -478,7 +478,7 @@ class CloseShipment extends Controller
                             # Set PDF URLs for Labels
                             $CarrierLabel    = '';
                             $ContentLabel    = '';
-                            
+
                             $docTypes = ['ContentLabel','CarrierLabel'];
                             foreach ($docTypes as $key => $value) {
                                 switch ($value) {
@@ -489,7 +489,7 @@ class CloseShipment extends Controller
                                         $pdfFileName   = $pdfFilePath.$PDFKey.'.pdf';
                                         // dd($pdfFileName);
 
-                                        if(File::exists($pdfFileName)){ 
+                                        if(File::exists($pdfFileName)){
                                             $CarrierLabel = route('m3.M3GetPDFFromCache.index',['MACPKR'=>$AYMACPKR, 'DOCTYPE'=>$DOCTYPE ]);
                                         }
                                     break;
@@ -524,7 +524,7 @@ class CloseShipment extends Controller
                                 }
                             }
 
-                            # Get Packages Array 
+                            # Get Packages Array
                             $PACKAGES[]=[
                                 "TRACKINGID"      => $TRACKING,
                                 "BUNDLES"         => $AYTYPE,
@@ -617,7 +617,7 @@ class CloseShipment extends Controller
                                 # MAK : Log JSON Manifest #  and MACKPKR #
                                 // Log::channel('dailyCron')->info('1 >>> JSON Sent for Manifest: '.$MANIFEST.' ,Macpicker: '.$AYMACPKR);
                                 Log::channel('dailyCron')->info('1 >>> JSON Sent for Manifest: '.(string)(int)$MANIFEST.' ,Macpicker: '.$AYMACPKR);
-                                
+
                                 $data = [
                                     'SHMACPKR'  => $DELIVERYNO,
                                     'SHDT'      => date('Y-m-d'),
@@ -670,13 +670,13 @@ class CloseShipment extends Controller
                                     $responseMsg    = $responseContents->result->CloseShipment;
                                     $M3APIRESULT    = $responseMsg->PickingListClose->Result;
                                     $M3APIRESULTMsg = isset($responseMsg->PickingListClose->ErrorMessage) ? $responseMsg->PickingListClose->ErrorMessage: '';
-                                    
+
                                     # Check M3 Response for Errors
                                     $responseResult  = $responseContents->result;
                                     $M3Errors        = Helper::checkM3Errors($responseResult);
                                     // dd($M3Errors);
 
-                                    # If you get a successful response,  update database file ICM688M1/A4RATEm3=X 
+                                    # If you get a successful response,  update database file ICM688M1/A4RATEm3=X
                                     # Update ICM688M1 : Change A4RATEM3
                                     if (count($JSONCoCharge)>0 && $M3APIRESULT != 'Error') {
                                         DB::connection(config('m3.connection', 'pgsql'))->table('icm688m1')
@@ -781,7 +781,7 @@ class CloseShipment extends Controller
                     $ICM699MUZ = DB::connection(config('m3.connection', 'pgsql'))->table('icm699m')
                         ->where('SHMACPKR',$AYMACPKR)
                         ->where('SHCO',$COMPANY)
-                        ->where('SHWHS',$WHS) 
+                        ->where('SHWHS',$WHS)
                         ->where('SHSOURCE',$SHSOURCE)
                         ->where('SHERROR','X')
                         ->where('SHTYPE','M3-General')
@@ -793,17 +793,17 @@ class CloseShipment extends Controller
                         $ICM705M1U = DB::connection(config('m3.connection', 'pgsql'))->table('icm705m1')
                             ->where('APMANIFEST',$MANIFEST)
                             ->where('APCO',$COMPANY)
-                            ->where('APWHS',$WHS) 
+                            ->where('APWHS',$WHS)
                             ->update(["APSPARE2"=>"X"]);
                     }
-		    
-                    # Send Response  
+
+                    # Send Response
                     if ($allErrMsgs=='') {
                         return response()->json([
                             'code'   => '200',
                             'status' => 'Success',
                             'message'=> 'All Operations Successful'
-                        ]);  
+                        ]);
                     }
                     else{
                         $allErrMsgsC = Helper::removeDuplicateSubstrings($allErrMsgs);
@@ -812,9 +812,9 @@ class CloseShipment extends Controller
                             'code'   => '206',
                             'status' => 'Success With Warnings',
                             'message'=> $allErrMsgsC ."; Check Transaction Logs for Errors or Warnings."
-                        ]);  
+                        ]);
                     }
-		    
+
                 }
                 # Close Shipment for Zero Picks
                 else if (count($ICM695M1TMP)>0 && $TRANSTYPE=='Z') {
@@ -876,12 +876,12 @@ class CloseShipment extends Controller
                         $responseContents = json_decode($response->getBody()->getContents());
                         $M3SessionId      = $response->hasHeader('x-transaction-id') ? "-sessionID:". $response->header('x-transaction-id') : '-sessionID';
                         $M3Errors         = '';
-                        
+
                         if ($responseContents!=null) {
                             $responseMsg    = $responseContents->result->CloseShipment;
                             $M3APIRESULT    = $responseMsg->PickingListClose->Result;
                             $M3APIRESULTMsg = isset($responseMsg->PickingListClose->ErrorMessage) ? $responseMsg->PickingListClose->ErrorMessage: '';
-                            
+
                             # Check M3 Response for Errors
                             $responseResult   = $responseContents->result;
                             $M3Errors         = Helper::checkM3Errors($responseResult);
@@ -959,21 +959,21 @@ class CloseShipment extends Controller
                         $ICM699MUZ = DB::connection(config('m3.connection', 'pgsql'))->table('icm699m')
                             ->where('SHMACPKR',$AYMACPKR)
                             ->where('SHCO',$COMPANY)
-                            ->where('SHWHS',$WHS) 
+                            ->where('SHWHS',$WHS)
                             ->where('SHSOURCE',$SHSOURCE)
                             ->where('SHERROR','X')
                             ->where('SHTYPE','M3-General')
                             ->where('SHDATA','like','%CommTCP_read%')
                             ->update(["SHERROR"=>"Z","SHACKUSER"=>$SHUSER,"SHACKDATE"=>date('Y-m-d'),"SHACKTIME"=>date('H:i:s'),"SHACKNOTE"=> $SHACKNOTE]);
                     }
-                
-                    # Send Response  
+
+                    # Send Response
                     if ($ErrorMsgs=='') {
                         return response()->json([
                             'code'   => '200',
                             'status' => 'Success',
                             'message'=> 'All Operations Successful'
-                        ]);  
+                        ]);
                     }
                     else{
                         return response()->json([
@@ -988,9 +988,9 @@ class CloseShipment extends Controller
                     $DELIVERYNO = isset($MANIFEST) ? $MANIFEST : '000000';
                     // # Set SHDATA Message
                     $SHDATAMSG = 'No records found in ICM695M1,or URL parameters incomplete';
-                    # count($ICM695M1TMP)==0 ? 'MacPkr already closed' :  
+                    # count($ICM695M1TMP)==0 ? 'MacPkr already closed' :
                     $SHERROR   = 'X';
-                    # count($ICM695M1TMP)==0 ? 'Z' :  
+                    # count($ICM695M1TMP)==0 ? 'Z' :
 
                     # Write to Logs Out : Error
                     $data = [

Modules/M3/Http/Controllers/API/M3Controller.php

@@ -128,7 +128,7 @@ class M3Controller extends Controller
         try {
             $jsonFile = count($request->json()->all()) > 0 ? $request->json()->all() : '';
 
-            # Root 
+            # Root
             $Company            = isset($jsonFile["Company"]) ? $jsonFile["Company"] : '';
             $Plant              = isset($jsonFile["Plant"]) ? $jsonFile["Plant"] : '';
             $Warehouse          = isset($jsonFile["Warehouse"]) ? $jsonFile["Warehouse"] : '';
@@ -148,7 +148,7 @@ class M3Controller extends Controller
             $GS1Label           = isset($jsonFile["GS1-128Label"]) ? $jsonFile["GS1-128Label"] : '0';
             $CurrencyExchangeRate  = isset($jsonFile["CurrencyExchangeRate"]) ? $jsonFile["CurrencyExchangeRate"] : '';
 
-            # Set Carrier BWAY if it's empty for Tilburg only 
+            # Set Carrier BWAY if it's empty for Tilburg only
             if (($CarrierCode=='' || $CarrierCode==null) && $Warehouse=='111' && $Company=='410' && $Plant=='410' ) {
                 $CarrierCode = 'BWAY';
             }
@@ -188,7 +188,7 @@ class M3Controller extends Controller
 
                 # MycarrierDetails
                 $ShipVia     = isset($jsonFile["ShipVia"]) ? $jsonFile["ShipVia"]: '';
-   
+
                 # Comments
                 $Picker     = $Packer = $Carrier = $Other ='';
                 $AXCO       = $Company;
@@ -200,11 +200,11 @@ class M3Controller extends Controller
                 $AXSHNO     = $ShipmentNumber;
 
                 $comments   = isset($jsonFile["Comments"]) ? $jsonFile["Comments"] : '';
-                
+
                 if ($comments!='') {
                     foreach($comments as $key => $comment) {
                         $commentData  = [];
-                        $AXDOCUMENT   = Helper::sanityzeString($key);  
+                        $AXDOCUMENT   = Helper::sanityzeString($key);
 
                         $commentData=["AXCO"=>$AXCO,"AXPLANT"=>$AXPLANT,"AXWHS"=>$AXWHS,"AXDELNO"=>$AXDELNO,"AXONO"=>$AXONO,
                         "AXRLNO"=>$AXRLNO,"AXSHNO"=>$AXSHNO,"AXDOCUMENT"=>$AXDOCUMENT];
@@ -285,17 +285,87 @@ class M3Controller extends Controller
                     $KitPartNumber   = isset($product['KitPartNumber']) ? $product['KitPartNumber']: '';
                     $OrderLineSuffix = isset($product['OrderLineSuffix']) ? $product['OrderLineSuffix']: '';
                     $CustomerPartNumber = isset($product['CustomerPartNumber']) ? substr($product['CustomerPartNumber'], 0, 20): ''; # Limit to 20 Chars
-                    
+
                     # Initialise Table Fields to be filled
-                    $InsertArray = []; 
+                    $InsertArray = [];
+                    $fieldValues = [
+                        'Company' => $Company,
+                        'Warehouse' => $Warehouse,
+                        'Plant' => $Plant,
+                        'PickerNumber' => $PickerNumber,
+                        'OrderNumber' => $OrderNumber,
+                        'ReleaseNumber' => $ReleaseNumber,
+                        'ShipmentNumber' => $ShipmentNumber,
+                        'OrderLine' => $OrderLine,
+                        'PartNumber' => $PartNumber,
+                        'Description' => $Description,
+                        'Quantity' => $Quantity,
+                        'BaseUnitPrice' => $BaseUnitPrice,
+                        'Currency' => $Currency,
+                        'Zone' => $Zone,
+                        'PromDate' => $PromDate,
+                        'RouteCode' => $RouteCode,
+                        'BillToId' => $BillToId,
+                        'ShipToId' => $ShipToId,
+                        'CompanyName' => $CompanyName,
+                        'Address1' => $Address1,
+                        'Address2' => $Address2,
+                        'Address3' => $Address3,
+                        'Address4' => $Address4,
+                        'City' => $City,
+                        'State' => $State,
+                        'PostalCode' => $PostalCode,
+                        'Country' => $Country,
+                        'CountryName' => $CountryName,
+                        'PartWeight' => $PartWeight,
+                        'SellUOM' => $SellUOM,
+                        'PartConv' => $PartConv,
+                        'CarrierCode' => $CarrierCode,
+                        'ShipVia' => $ShipVia,
+                        'PrimaryLocation' => $PrimaryLocation,
+                        'Allocation' => $Allocation,
+                        'AllocatedTo' => $AllocatedTo,
+                        'LocationSeq' => $LocationSeq,
+                        'UOM' => $UOM,
+                        'HazMat' => $HazMat,
+                        'PartUPC' => $PartUPC,
+                        'PartEAN' => $PartEAN,
+                        'LotFlag' => $LotFlag,
+                        'ManOrd' => $ManOrd,
+                        'LotNumber' => $LotNumber,
+                        'ProductArea' => $ProductArea,
+                        'FreightClass' => $FreightClass,
+                        'ShipmentPONumber' => $ShipmentPONumber,
+                        'ShipmentPOLine' => $ShipmentPOLine,
+                        'ShipTerms' => $ShipTerms,
+                        'ExchangeRate' => $ExchangeRate,
+                        'OrderClass' => $OrderClass,
+                        'LocationType' => $LocationType,
+                        'PallSize' => $PallSize,
+                        'MasterCarton' => $MasterCarton,
+                        'MasterQty' => $MasterQty,
+                        'InnerQty' => $InnerQty,
+                        'PalletQty' => $PalletQty,
+                        'CartonQty' => $CartonQty,
+                        'PersonName' => $PersonName,
+                        'AccountNo' => $AccountNo,
+                        'Email' => $Email,
+                        'OrderCategory' => $OrderCategory,
+                        'A1DATEADD' => $A1DATEADD,
+                        'A1TIMEADD' => $A1TIMEADD,
+                        'KitPartNumber' => $KitPartNumber,
+                        'OrderLineSuffix' => $OrderLineSuffix,
+                        'CustomerPartNumber' => $CustomerPartNumber,
+                        'GS1Label' => $GS1Label,
+                        'CurrencyExchangeRate' => $CurrencyExchangeRate,
+                    ];
 
                     # Check JSON fields if empty or > DB Fields
                     foreach ($ICM666MFields as $key => $value) {
-                        $keyVar = $key;
                         # Sanitize String
-                        $$keyVar = Helper::sanityzeString($$keyVar);
+                        $fieldValue = Helper::sanityzeString($fieldValues[$key] ?? '');
                         # Check Var Types & Length
-                        $LengthTest = Helper::checkLength($$keyVar, $value[1], $value[2]);
+                        $LengthTest = Helper::checkLength($fieldValue, $value[1], $value[2]);
 
                         if (!$LengthTest[413] || !$LengthTest[411] || !$LengthTest[417]) {
                             // Log::error($key .' :: '. $value[0].' :: '. $value[1] .' JSONF: '.$$keyVar .' Type: '.$value[2] );
@@ -315,12 +385,12 @@ class M3Controller extends Controller
                             Helper::logToICM699M($data);
 
                             return response()->json($message);
-                        } else if ($$keyVar != '') {
-                            $InsertArray[$value[0]] = $$keyVar;
+                        } else if ($fieldValue != '') {
+                            $InsertArray[$value[0]] = $fieldValue;
                         }
                     }
                     // Log::info($InsertArray);
-                    
+
                     # Check ICM709M
                     $ICM709MSEL = DB::connection(config('m3.connection', 'pgsql'))->table('icm709m')
                         ->select()
@@ -339,7 +409,7 @@ class M3Controller extends Controller
                     $InsertArray['A1MATWRN'] = $HazMat;
 
                     // if ($PalletQty!='') {
-                    //     $InsertArray['A1USRN01']=$palletQty; 
+                    //     $InsertArray['A1USRN01']=$palletQty;
                     // }
 
                     # SQL Insert to ICM666M
@@ -350,16 +420,16 @@ class M3Controller extends Controller
                 if ($Warehouse!='' && $PickerNumber!='' && $Company!='') {
                     $PGMERRORS = '';
                     $AWREQN    = '';
-            
+
                     # connect to toolkit using DB2 credentials (can also leave blank for default authority)
                     try {
                         $conn = app(\Modules\M3\Services\PostgresProgramBridge::class);
-                    } catch (Exception $e) {
+                    } catch (\Exception $e) {
                         # Determine reason for failure.
                         # Probably database authentication error or invalid or unreachable database.
                         $code = $e->getCode();
                         $msg = $e->getMessage();
-                
+
                         switch ($code) {
                             case 8001:
                                 # "Authorization failure on distributed database connection attempt"
@@ -375,10 +445,10 @@ class M3Controller extends Controller
                         }
                     }
                     $conn->setOptions(array('persistent' => false, 'stateless' => true, 'debug' => true,'debugLogFile' => env('TOOLKIT_DEBUG_LOG')));
-                    
+
                     #  Add LIB
                     # $result  = $conn->CLCommand('ADDLIBLE LIB(MPDAT10)');
-                
+
                     # define several input/output params
                     $params     = [];
                     # $params[]   = $conn->AddParameterChar('out',7,'eqNumber');
@@ -391,7 +461,7 @@ class M3Controller extends Controller
 
                     # AddParameterPackDec($io, $length, $scale, $comment, $varName, $value,$dimension)
                     # Add Delivery Note Param
-                    $PickerNumberNoZero  = ltrim(strval($PickerNumber), '0');  
+                    $PickerNumberNoZero  = ltrim(strval($PickerNumber), '0');
                     $params[]   = $conn->AddParameterChar('in', 11, 'PickerNumber','',$PickerNumberNoZero);
                     // $params[]   = $conn->AddParameterZoned('in', 11, 0, 'ParamIn');
 
@@ -427,11 +497,11 @@ class M3Controller extends Controller
             else{
                 # Write to Logs Out : Error & JSON
                 $SHACKNOTE = 'Sentinel automatically closed the error related to this empty data set sent by M3';
-                
+
                 $data = ['SHMACPKR'=>$SHMACPKR,'SHDT'=> date('Y-m-d'),'SHTIME'=> date('H:i:s') ,'SHERROR'=> 'Z','SHINTBOX'=> '','SHTYPE'=> 'M3-Lis-in' ,
                 'SHDATA'=>'No Json File Found...' ,'SHUSER'=> $REQKPKUS,'SHSOURCE'=> $SHSOURCE,'SHCO'=>$Company,'SHWHS'=>$Warehouse,"SHACKNOTE"=> $SHACKNOTE ];
                 Helper::logToICM699M($data);
-                
+
                 return response()->json([
                     'code'=>'415',
                     'status'=>'error',

Modules/M3/Http/Controllers/API/M3InventoryReport.php

@@ -96,7 +96,7 @@ class M3InventoryReport extends Controller
                 $data = ['SHMACPKR'=>$DELIVERYNO,'SHDT'=> date('Y-m-d'),'SHTIME'=> date('H:i:s') ,'SHERROR'=> 'X','SHINTBOX'=> '','SHTYPE'=> 'M3-Res-out' ,
                     'SHDATA'=>$responseStatusCode.$M3Errors.$M3SessionId ,'SHUSER'=> $SHUSER,'SHSOURCE'=> $SHSOURCE,'SHCO'=>'','SHWHS'=>$WHS  ];
                 Helper::logToICM699M($data);
-                
+
                 # Send Response
                 return response()->json([
                     'code'=>'405',
@@ -126,7 +126,7 @@ class M3InventoryReport extends Controller
                 $data = ['SHMACPKR'=>$DELIVERYNO,'SHDT'=> date('Y-m-d'),'SHTIME'=> date('H:i:s') ,'SHERROR'=> 'X','SHINTBOX'=> '','SHTYPE'=> 'M3-Res-out' ,
                     'SHDATA'=>'Curl Error: Communication with M3 Timed Out'.' M3-JSN-out'.$JSON ,'SHUSER'=> $SHUSER,'SHSOURCE'=> $SHSOURCE,'SHCO'=>'','SHWHS'=>$WHS];
                 Helper::logToICM699M($data);
-            
+
                 return response()->json([
                     'code'=>'405',
                     'status'=>'error',
@@ -172,7 +172,7 @@ class M3InventoryReport extends Controller
             $WHS       = isset($urlParams["WHS"]) ? $urlParams["WHS"] : '';
             $MACPKR    = isset($urlParams["MACPKR"]) ? $urlParams["MACPKR"] : '000000';      # Delivery Number
             $PKLN      = isset($urlParams["PKLN"]) ? $urlParams["PKLN"] : '';
-            
+
             if($urlParams!=''){
                 $IncomingParams = ['CO'=> $CO,'WHS'=> $WHS,'MACPKR'=> $MACPKR,'PKLN'=> $PKLN,'REQPKWS'=> $REQPKWS,'REQKPKUS'=> $REQKPKUS];
                 $IncomingParams = json_encode($IncomingParams);
@@ -211,11 +211,11 @@ class M3InventoryReport extends Controller
                         $PARTS[]            = ["PART"=> $PART , "LOT"=>$LOT];
                         $PICKERARR[$PART]   = $ICM688M2->A5SENTPKR;
                     }
-                    // Log::info($PARTS);   
+                    // Log::info($PARTS);
                     // dump($PARTS);
                     $JSON = json_encode( ["WHS" => $WHS,"PARTS"=> $PARTS ] );
-                    // Log::info($JSON);   
-                    
+                    // Log::info($JSON);
+
                     # Get Token
                     $tokenResponse = Helper::checkReceiveTokenV2();
                     $tokenData     = $tokenResponse->getData();
@@ -234,7 +234,7 @@ class M3InventoryReport extends Controller
                     # Call ionapi with Params
                     $endPointURL = env('ENDPOINTURL').'APIFLOWS/Sentinel/M3InventoryReportList?ionapiRespStyle=sync';
                     $token       = $IonToken;
-                    
+
                     $response = Http::withHeaders([
                         'accept' => 'application/json',
                         'Content-Type' => 'application/json'
@@ -260,13 +260,13 @@ class M3InventoryReport extends Controller
                         $M3Errors = 'Error: No Response from M3';
                     }
 
-                    # Validate response From M3 
+                    # Validate response From M3
                     if ($M3Errors!='') {
                         # Write to Logs : Error
                         $data = ['SHMACPKR'=>$MACPKR,'SHDT'=> date('Y-m-d'),'SHTIME'=> date('H:i:s') ,'SHERROR'=> 'X','SHINTBOX'=> '','SHTYPE'=> 'M3-Res-out' ,
                             'SHDATA'=>$responseStatusCode.'-'.$M3Errors.$M3SessionId ,'SHUSER'=> $SHUSER,'SHSOURCE'=> $SHSOURCE,'SHCO'=>$CO,'SHWHS'=>$WHS  ];
                         Helper::logToICM699M($data);
-                        
+
                         # Send Response
                         return response()->json([
                             'code'=>'405',
@@ -285,7 +285,7 @@ class M3InventoryReport extends Controller
                     foreach ($responseTMP as $key => $value) {
                         // dump($value);
                         $dataToWrite = [];
-                        
+
                         foreach ($value as $key2 => $content) {
                             if($key2!='Locations'){
                                 $dataToWrite[$key2] = $content;
@@ -317,12 +317,12 @@ class M3InventoryReport extends Controller
                             ->where('VLOCID',$value['Location'])
                             ->first();
                         // dd($DE640MSQLSEL);
-                        
+
                         $LocationExist = isset($DE640MSQLSEL->VLOCID) ? trim($DE640MSQLSEL->VLOCID) : '';
                         $WHExist       = isset($DE640MSQLSEL->WSELOC) ? trim($DE640MSQLSEL->WSELOC) : '';
                         $COExist       = isset($DE640MSQLSEL->LVCO) ? trim($DE640MSQLSEL->LVCO) : '';
                         // dd($LocationExist .': '.$WHExist.': '.$COExist);
-                        
+
                         # if No records Founds insert New Record
                         if ( $LocationExist=='' && $WHExist=='' && $COExist=='' ) {
                             $SQLInsertPrep640M['LVCO']        = $CO;                    # Company
@@ -364,7 +364,7 @@ class M3InventoryReport extends Controller
                         $SQLInsertPrep630M['LLIZLCF']     = trim($value['LotNumber'])!='' ? '1' : ''; # Lot control flag
                         $SQLInsertPrep630M['LLCMDESC']    = $value['Description'];                    # Description
                         $SQLInsertPrep630M['LLSPR10A01']  = isset($value['Allocation'])  ? $value['Allocation'] : '';  # Allocation
-                        $SQLInsertPrep630M['LLSPR15A01']  = isset($value['AllocatedTo']) ? $value['AllocatedTo'] : ''; # AllocatedTo 
+                        $SQLInsertPrep630M['LLSPR15A01']  = isset($value['AllocatedTo']) ? $value['AllocatedTo'] : ''; # AllocatedTo
 
                         DB::connection(config('m3.connection', 'pgsql'))->table('ic630m')->insert($SQLInsertPrep630M);
                     }
@@ -431,7 +431,7 @@ class M3InventoryReport extends Controller
                 $SHERROR    = 'X';
                 $word       = 'Duplicate key value specified';
                 $position   = strpos($th, $word);
-                
+
                 if ($position !== false) {
                     $SHERROR = 'Z';
                 }
@@ -439,7 +439,7 @@ class M3InventoryReport extends Controller
                 $data   = ['SHMACPKR'=>$MACPKR,'SHDT'=> date('Y-m-d'),'SHTIME'=> date('H:i:s') ,'SHERROR'=> $SHERROR,'SHINTBOX'=> '','SHTYPE'=> 'M3-Res-out' ,
                 'SHDATA'=>'An Error Occured-'.substr($th,0,300) ,'SHUSER'=> $REQKPKUS,'SHSOURCE'=> $SHSOURCE,'SHCO'=>$CO,'SHWHS'=>$WHS];
                 Helper::logToICM699M($data);
-    
+
                 Log::error($th);
                 return response()->json([
                     'code'=>'405',

Modules/M3/Http/Controllers/API/PdfStorage.php

@@ -33,11 +33,11 @@ class PdfStorage extends Controller
             # Get URL PARAMS
             $urlParams = count($request->all())>0 ? $request->all() : '';
             // dd($urlParams);
-            
+
             $COMPANY        = isset($urlParams["COMPANY"]) ? trim($urlParams["COMPANY"]) : '';            # Company
             $WHS            = isset($urlParams["WHS"]) ? trim($urlParams["WHS"]) : '';                    # WareHouse
             $DOCTYPE        = isset($urlParams["DOCTYPE"]) ? trim($urlParams["DOCTYPE"]) : '';            # document type (PackingList, CarrierLabel, ContentLabel)
-            $FILENAME       = isset($urlParams["FILENAME"]) ? trim($urlParams["FILENAME"]) : '';          # PDF File name 
+            $FILENAME       = isset($urlParams["FILENAME"]) ? trim($urlParams["FILENAME"]) : '';          # PDF File name
             $DOCNUM         = isset($urlParams["DOCNUM"]) ? trim($urlParams["DOCNUM"]) : '';              # document number (ie the internal box number, the pick list number)
             $A4MACPKR       = isset($urlParams["A4MACPKR"]) ? trim($urlParams["A4MACPKR"]) : '';          # Delivery note number
 
@@ -52,7 +52,7 @@ class PdfStorage extends Controller
                     'SHDATA'=>json_encode($IncomingParams) ,'SHUSER'=> $SHUSER,'SHSOURCE'=> $SHSOURCE,'SHCO'=>$COMPANY,'SHWHS'=>$WHS ];
                 Helper::logToICM699M($data);
 
-                # Make Key and Test Validity 
+                # Make Key and Test Validity
                 if ($A4MACPKR!='' && $DOCTYPE!='' && $DOCNUM!='' && $COMPANY!='' && $WHS!=''){
                     $cacheKey = $A4MACPKR.$DOCTYPE.$DOCNUM.$COMPANY.$WHS;
                 }
@@ -69,24 +69,24 @@ class PdfStorage extends Controller
 
                     // Parse PDF file and build necessary objects.
                     $parser = new \Smalot\PdfParser\Parser();
-    
+
                     // $pdf = $parser->parseFile('/www/sentm3test/htdocs/labels/E1232824-10826596.pdf');
                     // dump($pdf);
                     // $text = $pdf->getText();
                     // dump("Text Only");
                     // dump($text);
-            
+
                     $pdfFile = File::get($pdfFileName);
-            
+
                     // Transform content to base64
                     $base64PDF = base64_encode($pdfFile);
                     // Output base64 string
                     // dump($base64PDF);
-            
+
                     # Save Cache
                     Cache::forever($cacheKey, $base64PDF);
                     // Cache::put($cacheKey, $base64PDF, now()->addMinutes(60));
-            
+
                     # Retrieve Cache
                     // $cachedPdfFile  = Cache::get($cacheKey);
                     // dump("Retrieve Base64 Encoded PDF saved in Cache:");
@@ -95,7 +95,7 @@ class PdfStorage extends Controller
                     # remove File from Cache
                     // Cache::put(pdfFileName, 'value', -5);
                     // Cache::forget($pdfFileName);
-            
+
                     # Base64 Decode and Display
                     // $pdf  = $parser->parseContent(base64_decode($base64PDF));
                     // $text = $pdf->getText();
@@ -117,7 +117,7 @@ class PdfStorage extends Controller
                 else {
                     $SHDATA = File::exists($pdfFileName) ? '' : 'PDF File Not Found-';
                     $SHDATA = $cacheKey!='' ? $SHDATA.'' : $SHDATA.'Cache Key is missing Params';
-                     
+
                     # Write to Logs Out : Error
                     $data = ['SHMACPKR'=>$DELIVERYNO,'SHDT'=> date('Y-m-d'),'SHTIME'=> date('H:i:s') ,'SHERROR'=> 'X','SHINTBOX'=> $DOCNUM,'SHTYPE'=> 'M3-Res-out' ,
                         'SHDATA'=>'An Error Occured -'.$SHDATA,'SHUSER'=> $SHUSER,'SHSOURCE'=> $SHSOURCE,'SHCO'=>$COMPANY,'SHWHS'=>$WHS];

Modules/M3/Http/Controllers/API/ReplenAPI.php

@@ -24,7 +24,7 @@ class ReplenAPI  extends Controller
         ini_set('max_input_time', Config::get('arrays.PHPTimeOut'));
         ini_set('default_socket_timeout', Config::get('arrays.PHPTimeOut'));
 
-        // dd($request->all()); 
+        // dd($request->all());
         // Log::info( $request->all() );
         # Get The Calling User
         $SHUSER     = m3_user() !== '' ? Str::upper(m3_user()) : 'WebUser';
@@ -35,7 +35,7 @@ class ReplenAPI  extends Controller
         try {
             # Get Json Contents
             $urlParams = count($request->all())>0 ? $request->all() : '';
-            
+
             $CO         = isset($urlParams["CO"]) ? $urlParams["CO"] : '';
             $WHS        = isset($urlParams["WHS"]) ? $urlParams["WHS"] : '';
             $PARTNO     = isset($urlParams["PARTNO"]) ? $urlParams["PARTNO"] : '';
@@ -59,7 +59,7 @@ class ReplenAPI  extends Controller
                 // dump($PARTS);
 
                 $JSON = json_encode( ["WHS" => $WHS,"PARTS"=> $PARTS ] );
-                
+
                 # Write to Logs : Params Sent To M3
                 $data = ['SHMACPKR'=>$MACPKR,'SHDT'=> date('Y-m-d'),'SHTIME'=> date('H:i:s') ,'SHERROR'=> '','SHINTBOX'=> '','SHTYPE'=> 'M3-Req-out' ,
                     'SHDATA'=>'Sent To M3-'.$JSON ,'SHUSER'=> $SHUSER,'SHSOURCE'=> $SHSOURCE,'SHCO'=>$CO,'SHWHS'=>$WHS ];
@@ -116,13 +116,13 @@ class ReplenAPI  extends Controller
                     $M3Errors = 'Error: No Response from M3';
                 }
 
-                # Validate response From M3 
+                # Validate response From M3
                 if ($M3Errors!='') {
                     # Write to Logs : Error
                     $data = ['SHMACPKR'=>$MACPKR,'SHDT'=> date('Y-m-d'),'SHTIME'=> date('H:i:s') ,'SHERROR'=> 'X','SHINTBOX'=> '','SHTYPE'=> 'M3-Res-out' ,
                         'SHDATA'=>$responseStatusCode.'-'.$M3Errors.$M3SessionId ,'SHUSER'=> $SHUSER,'SHSOURCE'=> $SHSOURCE,'SHCO'=>$CO,'SHWHS'=>$WHS  ];
                     Helper::logToICM699M($data);
-                    
+
                     # Send Response
                     return response()->json([
                         'code'=>'405',
@@ -141,7 +141,7 @@ class ReplenAPI  extends Controller
                 foreach ($responseTMP as $key => $value) {
                     // dump($value);
                     $dataToWrite = [];
-                    
+
                     foreach ($value as $key2 => $content) {
                         if($key2!='Locations'){
                             $dataToWrite[$key2] = $content;
@@ -173,12 +173,12 @@ class ReplenAPI  extends Controller
                         ->where('VLOCID',$value['Location'])
                         ->first();
                     // dd($DE640MSQLSEL);
-                    
+
                     $LocationExist = isset($DE640MSQLSEL->VLOCID) ? trim($DE640MSQLSEL->VLOCID) : '';
                     $WHExist       = isset($DE640MSQLSEL->WSELOC) ? trim($DE640MSQLSEL->WSELOC) : '';
                     $COExist       = isset($DE640MSQLSEL->LVCO) ? trim($DE640MSQLSEL->LVCO) : '';
                     // dd($LocationExist .': '.$WHExist.': '.$COExist);
-                    
+
                     # if No records Founds insert New Record
                     if ( $LocationExist=='' && $WHExist=='' && $COExist=='' ) {
                         $SQLInsertPrep640M['LVCO']        = $CO;                    // Company
@@ -189,15 +189,15 @@ class ReplenAPI  extends Controller
                         $SQLInsertPrep640M['LVUSD2']      = $value['LocationType'];
                         $SQLInsertPrep640M['LVZONE']      = $value['Zone'];         // Warehouse zone
                         $SQLInsertPrep640M['LVMAINTTS']   = now();                  // Last maintained time stamp
-                                                                                   
+
                         DB::connection(config('m3.connection', 'pgsql'))->table('de640m')->insert($SQLInsertPrep640M);
                     }
                     # Update
                     else {
                         $SQLUpdatePrep640M['LVSEQN']      = $value['LocationSeq'];
                         $SQLUpdatePrep640M['LVUSD2']      = $value['LocationType'];
-                        $SQLUpdatePrep640M['LVZONE']      = $value['Zone'];         
-                        $SQLUpdatePrep640M['LVMAINTTS']   = now();                  
+                        $SQLUpdatePrep640M['LVZONE']      = $value['Zone'];
+                        $SQLUpdatePrep640M['LVMAINTTS']   = now();
 
                         DB::connection(config('m3.connection', 'pgsql'))->table('de640m')
                             ->where('LVCO',$CO)
@@ -218,15 +218,15 @@ class ReplenAPI  extends Controller
                     $SQLInsertPrep630M['LLIZLCF']     = trim($value['LotNumber'])!='' ? '1' : '';    # Lot control flag
                     $SQLInsertPrep630M['LLSPR10A01']  = $value['Allocation'];                        # Allocation
                     $SQLInsertPrep630M['LLSPR15A01']  = $value['AllocatedTo'];                       # AllocatedTo
-                    
+
                     $DescSanytized =  Helper::sanityzeString($value['Description']);
                     // $DescSanytized = str_replace(['–','\u20131'], '-',$value['Description']);
                     $SQLInsertPrep630M['LLCMDESC']    = $DescSanytized; // Description
-                    
+
                     DB::connection(config('m3.connection', 'pgsql'))->table('ic630m')->insert($SQLInsertPrep630M);
                 }
                 // dump($SQLInsertPrep);
-                
+
                 #Send Response
                 return response()->json([
                     'code'   => '200',
@@ -259,7 +259,7 @@ class ReplenAPI  extends Controller
                 $data = ['SHMACPKR'=>$MACPKR,'SHDT'=> date('Y-m-d'),'SHTIME'=> date('H:i:s') ,'SHERROR'=> 'X','SHINTBOX'=> '','SHTYPE'=> 'M3-Res-out' ,
                     'SHDATA'=> 'Curl Error: Communication with M3 Timed Out'.' M3-JSN-out'.$IncomingParams,'SHUSER'=> $SHUSER,'SHSOURCE'=> $SHSOURCE,'SHCO'=>$CO,'SHWHS'=>$WHS];
                 Helper::logToICM699M($data);
-            
+
                 return response()->json([
                     'code'=>'405',
                     'status'=>'error',
@@ -272,7 +272,7 @@ class ReplenAPI  extends Controller
                 $SHERROR    = 'X';
                 $word       = 'Duplicate key value specified';
                 $position   = strpos($th, $word);
-                
+
                 if ($position !== false) {
                     $SHERROR = 'Z';
                 }

Modules/M3/Http/Controllers/API/TransferAPI.php

@@ -87,7 +87,7 @@ class TransferAPI extends Controller
                         ->where('SHMACPKR', $DELIVERYNO)
                         ->where('SHDT', $SHDT)
                         ->where('SHTIME', $SHTIME)
-                        # ->whereRaw("VARCHAR_FORMAT (TIMESTAMP (CURRENT DATE) + MIDNIGHT_SECONDS (SHTIME) SECONDS, 'HH24:MI') = ?", [$SHTIMEHM])  
+                        # ->whereRaw("VARCHAR_FORMAT (TIMESTAMP (CURRENT DATE) + MIDNIGHT_SECONDS (SHTIME) SECONDS, 'HH24:MI') = ?", [$SHTIMEHM])
                         ->where('SHCO', $DIVI)
                         ->where('SHWHS', $WHS)
                         ->where('SHSOURCE', $SHSOURCE)
@@ -101,7 +101,7 @@ class TransferAPI extends Controller
                     $SHDATA = isset($ICM699MS->SHDATA) ? $ICM699MS->SHDATA : '';
                     $SHDATAJSON = "";
                     $position = strpos($SHDATA, $word);
-                    # Also Read CommTCP_read 
+                    # Also Read CommTCP_read
                     $word2 = 'url:http://127.0.0.1:10005/api/TransferAPIURL?';
                     $SHDATA2 = isset($ICM699MS->SHDATA) ? $ICM699MS->SHDATA : '';
                     $position2 = strpos($SHDATA2, $word2);
@@ -141,7 +141,7 @@ class TransferAPI extends Controller
                     }
                     // dd($JSONTR);
 
-                    # Set SHERROR to Z in ICM699M 
+                    # Set SHERROR to Z in ICM699M
                     $ICM699MU = DB::connection(config('m3.connection', 'pgsql'))->table('icm699m')
                         ->where('SHMACPKR', $DELIVERYNO)
                         ->where('SHDT', $SHDT)
@@ -154,9 +154,9 @@ class TransferAPI extends Controller
                         ->update(["SHERROR" => "Z", "SHACKUSER" => $SHUSER, "SHACKDATE" => date('Y-m-d'), "SHACKTIME" => date('H:i:s')]);
                 }
 
-                # Part Exists : proceed 
+                # Part Exists : proceed
                 if ($PART != '') {
-                    # Read from ICM688M2 
+                    # Read from ICM688M2
                     # Get Parts And Lots from  ICM688M2
                     $ICM688M2SLTMP = DB::connection(config('m3.connection', 'pgsql'))->table('icm688m2')
                         ->select('A5BRADLN', 'A5PKSFX', 'A5PLANT', 'A5SENTPKR')
@@ -470,7 +470,7 @@ class TransferAPI extends Controller
                 // dd($A4SPR15A01);
 
                 if ($A4SPR15A01 != '') {
-                    # Read from ICM688M1 
+                    # Read from ICM688M1
                     $ICM688M1SLTMP = DB::connection(config('m3.connection', 'pgsql'))->table('icm688m1')
                         ->select('A4MACPKR')
                         ->where('A4CO', $DIVI)
@@ -490,7 +490,7 @@ class TransferAPI extends Controller
                     }
                 }
 
-                # A4SPR15A01 Exists : proceed 
+                # A4SPR15A01 Exists : proceed
                 if ($A4SPR15A01 != '' && count($allMacpkrs)>0) {
                     $JSON = json_encode([
                         "DIVI"       => $DIVI,
@@ -631,7 +631,7 @@ class TransferAPI extends Controller
                         'message' => 'Json Payload Not Valid, missing Parameter or no Macpicker # found.'
                     ]);
                 }
-            } 
+            }
             else {
                 # Write to Logs Out : Error
                 $DELIVERYNO = isset($DELIVERYNO) ? $DELIVERYNO : '000000';

Modules/M3/Http/Controllers/API/TwoShipAPIs.php

@@ -25,7 +25,7 @@ class TwoShipAPIs extends Controller
         ini_set('max_input_time', Config::get('arrays.PHPTimeOut'));
         ini_set('default_socket_timeout', Config::get('arrays.PHPTimeOut'));
 
-        // dd($request->all()); 
+        // dd($request->all());
 
         // Log::info( $request->all() );
         # Get The Calling User
@@ -115,12 +115,12 @@ class TwoShipAPIs extends Controller
                 curl_setopt($ch, CURLOPT_VERBOSE, false);
 
                 curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);
-                #When CURLOPT_SSL_VERIFYPEER is enabled (value=1), and the verification fails to prove that the certificate is authentic, the connection fails. 
+                #When CURLOPT_SSL_VERIFYPEER is enabled (value=1), and the verification fails to prove that the certificate is authentic, the connection fails.
                 #When the option is zero, the peer certificate verification succeeds regardless.
 
                 curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 2);
-                #When CURLOPT_SSL_VERIFYHOST is 2, that certificate must indicate that the server is the server to which you meant to connect, 
-                #or the connection fails. Simply put, it means it has to have the same name in the certificate as is in the URL you operate against.                                                                  
+                #When CURLOPT_SSL_VERIFYHOST is 2, that certificate must indicate that the server is the server to which you meant to connect,
+                #or the connection fails. Simply put, it means it has to have the same name in the certificate as is in the URL you operate against.
 
                 # Set data content type
                 curl_setopt(
@@ -157,7 +157,7 @@ class TwoShipAPIs extends Controller
 
                 # Close the session
                 unset($ch);
-                
+
                 // dump($response);
                 // dump($status);
                 // dump($CurlError);
@@ -173,7 +173,7 @@ class TwoShipAPIs extends Controller
                     $TwoShipErrors .= ' -Curl Error: '.$CurlError;
                 }
 
-                # Validate response From 2Ship 
+                # Validate response From 2Ship
                 # Error
                 if ($TwoShipErrors != '') {
                     // dump($TwoShipErrors);

Modules/M3/Http/Controllers/GetContentsController.php

@@ -8,7 +8,7 @@ use Config;
 use Illuminate\Http\Request;
 use Symfony\Component\HttpFoundation\Response;
 // use Modules\M3\Models\ICM709M;
-// 
+//
 
 class GetContentsController extends Controller
 {
@@ -17,8 +17,8 @@ class GetContentsController extends Controller
     {
         # Get Mackpkr from Request
         $macpacPicker = isset($request->MACPKR) ? trim($request->MACPKR) : '';
-        
-        # ESN1 
+
+        # ESN1
         # $macpacPicker='888568'; // LTL example
         # $macpacPicker='894337'; // another LTL example with smaller orders, therefore pallets are more mixed
         # $macpacPicker='1225311'; // parcel example
@@ -27,7 +27,7 @@ class GetContentsController extends Controller
 
         try {
             $icm704mArray = $this->buildNMFCCodesArray();
-            
+
             $shipmentData = $this->getShipmentData($macpacPicker);
             if (empty($shipmentData['orderNumber'])) {
                 return response()->json(['error' => "Picker {$macpacPicker} was not found in ICM688M1"]);
@@ -80,19 +80,19 @@ class GetContentsController extends Controller
     protected function getShipmentData($macpacPicker)
     {
         $result = DB::select("
-            SELECT 
+            SELECT
                 SUM(A4TPCKWGHT) as total_weight,
-                A4MACPKR, A4SHSHA1, A4SHSHA2, A4SHSHCI, A4SHSHNM, 
-                A4SHSHCT, A4SHSHZP, A4SHSHST, A4ONO, A4STCN, A4CO, 
+                A4MACPKR, A4SHSHA1, A4SHSHA2, A4SHSHCI, A4SHSHNM,
+                A4SHSHCT, A4SHSHZP, A4SHSHST, A4ONO, A4STCN, A4CO,
                 A4WHS, A4SHIPVIA, A4SLCO, A4SLWHS, A4CATPID, A42SSVCCOD,
-                A4CARRIER, A4SHPAGGCD, A4SALESLOC, A4SHCSPO, A4OFSTRM, 
+                A4CARRIER, A4SHPAGGCD, A4SALESLOC, A4SHCSPO, A4OFSTRM,
                 A4SCAC, A4PLANT
-            FROM ICM688M1 
+            FROM ICM688M1
             WHERE A4MACPKR = ?
-            GROUP BY A4MACPKR, A4SHSHA1, A4SHSHA2, A4SHSHCI, A4SHSHNM, 
-                     A4SHSHCT, A4SHSHZP, A4SHSHST, A4ONO, A4RLNO, A4SHNO, 
-                     A4STCN, A4CO, A4WHS, A4SHIPVIA, A4SLCO, A4SLWHS, 
-                     A4CATPID, A42SSVCCOD, A4CARRIER, A4SHPAGGCD, 
+            GROUP BY A4MACPKR, A4SHSHA1, A4SHSHA2, A4SHSHCI, A4SHSHNM,
+                     A4SHSHCT, A4SHSHZP, A4SHSHST, A4ONO, A4RLNO, A4SHNO,
+                     A4STCN, A4CO, A4WHS, A4SHIPVIA, A4SLCO, A4SLWHS,
+                     A4CATPID, A42SSVCCOD, A4CARRIER, A4SHPAGGCD,
                      A4SALESLOC, A4SHCSPO, A4OFSTRM, A4SCAC, A4PLANT",
             [$macpacPicker]
         );
@@ -128,13 +128,13 @@ class GetContentsController extends Controller
     protected function getPackagesData($macpkrList)
     {
         $results = DB::select("
-            SELECT 
-                AYINTBOX, 
-                MAX(AYHEIGHT) as height, 
-                MAX(AYWIDTH) as width, 
-                MAX(AYDEPTH) as depth, 
+            SELECT
+                AYINTBOX,
+                MAX(AYHEIGHT) as height,
+                MAX(AYWIDTH) as width,
+                MAX(AYDEPTH) as depth,
                 SUM(AYLNWGHT) as weight
-            FROM ICM695M1 
+            FROM ICM695M1
             WHERE AYMACPKR IN (?)
             GROUP BY AYINTBOX
             ORDER BY AYINTBOX",
@@ -183,16 +183,16 @@ class GetContentsController extends Controller
         $nmfcResults = DB::select("
             WITH tempfile AS (
                 SELECT
-                    (SELECT A5WBFRCT FROM ICM688M2 
-                     WHERE A5MACPKR IN (?) AND A5PART=AZPART 
+                    (SELECT A5WBFRCT FROM ICM688M2
+                     WHERE A5MACPKR IN (?) AND A5PART=AZPART
                      FETCH FIRST 1 ROWS ONLY) as WBFRCT,
-                    az.* 
-                FROM ICM695M2 az 
+                    az.*
+                FROM ICM695M2 az
                 WHERE AZMACPKR IN (?)
             )
-            SELECT azintbox, MIN(WBFRCT) as MIN_WBFRCT 
-            FROM tempfile 
-            GROUP BY azintbox 
+            SELECT azintbox, MIN(WBFRCT) as MIN_WBFRCT
+            FROM tempfile
+            GROUP BY azintbox
             ORDER BY 1",
             [$macpkrList, $macpkrList]
         );
@@ -210,34 +210,34 @@ class GetContentsController extends Controller
     {
         $results = DB::select("
             WITH tempfile1 AS (
-                SELECT 
-                    A5PART, 
-                    MAX(A5CMDESC) as A5CMDESC, 
-                    MAX(A5MUTMS) as A5MUTMS, 
+                SELECT
+                    A5PART,
+                    MAX(A5CMDESC) as A5CMDESC,
+                    MAX(A5MUTMS) as A5MUTMS,
                     MAX(A5PMPWHT) as A5PMPWHT,
-                    MAX(A5SLUNPR) as A5SLUNPR, 
+                    MAX(A5SLUNPR) as A5SLUNPR,
                     TRIM(MIN(A5WBFRCT)) as A5WBFRCT
                 FROM ICM688M2
                 WHERE A5CO = ? AND A5WHS = ? AND A5MACPKR IN (?) AND A5PACKED > 0
                 GROUP BY A5PART
             ),
             tempfile2 AS (
-                SELECT 
-                    AZINTBOX, 
-                    AZPART, 
+                SELECT
+                    AZINTBOX,
+                    AZPART,
                     SUM(AZPACKED) as AZPACKED,
                     MAX(SUBSTR(AZSPR15A01,1,4)) as HAZARDOUS
-                FROM ICM695M2 
-                WHERE AZCO = ? AND AZWHS = ? AND AZMACPKR IN (?) AND AZPACKED <> 0 
+                FROM ICM695M2
+                WHERE AZCO = ? AND AZWHS = ? AND AZMACPKR IN (?) AND AZPACKED <> 0
                 GROUP BY AZINTBOX, AZPART
             )
-            SELECT 
-                A5PART, A5CMDESC, A5MUTMS, 
-                A5PMPWHT * AZPACKED as WEIGHt, 
+            SELECT
+                A5PART, A5CMDESC, A5MUTMS,
+                A5PMPWHT * AZPACKED as WEIGHt,
                 AZPACKED, AZINTBOX,
                 A5WBFRCT, HAZARDOUS, A5SLUNPR
-            FROM tempfile1 
-            LEFT JOIN tempfile2 ON AZPART = A5PART 
+            FROM tempfile1
+            LEFT JOIN tempfile2 ON AZPART = A5PART
             ORDER BY A5PART",
             [$company, $warehouse, $macpkrList, $company, $warehouse, $macpkrList]
         );

Modules/M3/Http/Controllers/M3CallCloseAPIController.php

@@ -21,7 +21,7 @@ class M3CallCloseAPIController extends Controller
         ini_set('default_socket_timeout', Config::get('arrays.PHPTimeOut'));
 
         try {
-            
+
             # Get the Calling User
             # Get URL PARAMS
             $urlParams = count($request->all())>0 ? $request->all() : '';
@@ -31,7 +31,7 @@ class M3CallCloseAPIController extends Controller
             $APCO        = isset($urlParams["APCO"]) ? $urlParams["APCO"] : '';
             $APWHS       = isset($urlParams["APWHS"]) ? $urlParams["APWHS"] : '';
 
-            if ($MANIFEST!='' && $APCO!='' && $APWHS!='') {  // $SHUSER!='' && 
+            if ($MANIFEST!='' && $APCO!='' && $APWHS!='') {  // $SHUSER!='' &&
                 // Log::channel('dailyCron')->info("Cron...Start CallCloseAPI...For user:".$SHUSER." Manifest#: ".$MANIFEST);
 
                 # Get Logged User CO & WH
@@ -62,10 +62,10 @@ class M3CallCloseAPIController extends Controller
                 if (count($ICM705M1)>0) {
                     # Loop the Results from $ICM705M1
                     foreach ($ICM705M1 as $key => $ICM705M1R) {
-                        # Send CO and WHS to CallCloseAPI    
+                        # Send CO and WHS to CallCloseAPI
                         $USERCO = isset($ICM705M1R->APCO) ? $ICM705M1R->APCO : '';
                         $USERWH = isset($ICM705M1R->APWHS) ? $ICM705M1R->APWHS : '';
-                        
+
                         $callCloseShipment = Artisan::call('command:CallCloseAPI', ['user'=> $SHUSER ,'manifest' => $ICM705M1R->APMANIFEST ,
                             'co' => $USERCO ,'whs' => $USERWH]);
                         // dump($callCloseShipment);
@@ -75,14 +75,14 @@ class M3CallCloseAPIController extends Controller
                                 'code'   => '200',
                                 'status' => 'Success',
                                 'message'=> 'Manifest Closing submitted'
-                            ]); 
+                            ]);
                         }
                         else{
                             return response()->json([
                                 'code'   => '206',
                                 'status' => 'Failure',
                                 'message'=> 'Manifest Closing Failed'
-                            ]); 
+                            ]);
                         }
                     }
                 }
@@ -92,7 +92,7 @@ class M3CallCloseAPIController extends Controller
                         'code'   => '206',
                         'status' => 'Error',
                         'message'=> "Manifest CloseAPI: No records found in ICM705M1..."
-                    ]); 
+                    ]);
                 }
             }
             else{
@@ -109,5 +109,5 @@ class M3CallCloseAPIController extends Controller
             Log::error($th);
         }
     }
-    
+
 }

Modules/M3/Http/Controllers/M3DeliveryController.php

@@ -35,15 +35,15 @@ class M3DeliveryController extends Controller
     //
     public static function saveM3DeliveryAdd(Request $request) {
 
-        $icm664m=DB::connection(config('m3.connection', 'pgsql'))->select("select count(*) as COUNT1 from ICM664M 
+        $icm664m=DB::connection(config('m3.connection', 'pgsql'))->select("select count(*) as COUNT1 from ICM664M
             where AVCO='$request->AVCO' and AVWHS='$request->AVWHS' and AVPLANT='$request->AVPLANT' and AVDELMETH='$request->AVDELMETH'");
         if($icm664m[0]->COUNT1=="1") {
             return "exists";
         } else {
 
-            DB::connection(config('m3.connection', 'pgsql'))->insert("insert into ICM664M 
-                (AVCO, AVPLANT, AVWHS, AVDELMETH, AVSHPVIA, AVSHSRT, AVSHORCL) 
-                values ('$request->AVCO', '$request->AVPLANT', '$request->AVWHS', '$request->AVDELMETH', 
+            DB::connection(config('m3.connection', 'pgsql'))->insert("insert into ICM664M
+                (AVCO, AVPLANT, AVWHS, AVDELMETH, AVSHPVIA, AVSHSRT, AVSHORCL)
+                values ('$request->AVCO', '$request->AVPLANT', '$request->AVWHS', '$request->AVDELMETH',
                         '$request->AVSHPVIA', '$request->AVSHSRT', '$request->AVSHORCL')");
             return "success";
 
@@ -56,11 +56,11 @@ class M3DeliveryController extends Controller
     public static function saveM3DeliveryEdit(Request $request) {
         #dd($request);
         // Update record to ICM664M
-        
-        DB::connection(config('m3.connection', 'pgsql'))->update("update ICM664M 
+
+        DB::connection(config('m3.connection', 'pgsql'))->update("update ICM664M
             set AVSHPVIA='$request->AVSHPVIA', AVSHSRT='$request->AVSHSRT', AVSHORCL='$request->AVSHORCL'
             where AVCO='$request->AVCO' and AVPLANT='$request->AVPLANT' and AVWHS='$request->AVWHS' and  AVDELMETH='$request->AVDELMETH'");
-        
+
         return "success";
 
     }

Modules/M3/Http/Controllers/M3ErrorsDispController.php

@@ -294,7 +294,7 @@ class M3ErrorsDispController extends Controller
             # Count records before exporting to excel : Max 20K records are allowed
             $ICM699MCount = $ICM699MC->count();
             // dd($ICM699MCount);
-            # Set Max allowed records 
+            # Set Max allowed records
             $maxRecords = Config::get('arrays.maxRecDL');
             if ($ICM699MCount > $maxRecords) {
                 return redirect()->back()->withInput()->with('message', 'Maximum allowed records for Excel Download is: ' . number_format($maxRecords) .
@@ -318,7 +318,7 @@ class M3ErrorsDispController extends Controller
                 return $value->SHACKUSER = $SHACKUSER;
             });
 
-            # Prepend Header To Excel 
+            # Prepend Header To Excel
             $newItem = ["SHMACPKR" => 'Delivery Note',
                 "DELIVERY_NUM" => 'Order #',
                 "CUSTOMER" => 'Customer',

Modules/M3/Http/Controllers/M3GetPDFFromCacheController.php

@@ -28,7 +28,7 @@ class M3GetPDFFromCacheController extends Controller
         $pdfFilePath =   Config::get('arrays.PdfPath');
         try {
             # Initialise  Vars
-            $PDFArray = $trackingno = $carrier = $ICM688M1 = []; 
+            $PDFArray = $trackingno = $carrier = $ICM688M1 = [];
 
             $SHUSER  = m3_user() !== '' ? Str::upper(trim(m3_user())) : '';
             // dd($SHUSER);
@@ -40,7 +40,7 @@ class M3GetPDFFromCacheController extends Controller
                     ->select('R428US','R428CO', 'R428WH','R428PL')
                     ->where('R428US','=',$SHUSER)
                     ->first();
-  
+
                 $R428US  = isset($ICM428M->R428US) ? $ICM428M->R428US : '';
                 $COMPANY = isset($ICM428M->R428CO) ? $ICM428M->R428CO : '';     # Company
                 $PLANT   = isset($ICM428M->R428PL) ? $ICM428M->R428PL : '';     # Plant
@@ -50,7 +50,7 @@ class M3GetPDFFromCacheController extends Controller
             # Warehouse Table
             $IC670M    = DB::connection(config('m3.connection', 'pgsql'))->table('ic670m')->get();
             // ->where('WDCO',$userCO)->where('WDPL',$userPL)->where('WDWHS',$userWH)
-            
+
             # Get URL PARAMS
             $urlParams = count($request->all())>0 ? $request->all() : '';
             // dump($urlParams);
@@ -78,7 +78,7 @@ class M3GetPDFFromCacheController extends Controller
                 // dump($ICM695M1Agg);
                 $aggno        = isset($ICM695M1Agg->AYTRUCK) ?  trim($ICM695M1Agg->AYTRUCK) : '';
 
-                if($aggno!="" && $aggno!="0") {	
+                if($aggno!="" && $aggno!="0") {
                     // dump($aggno);
 
                     $aggmsg="This delivery note is part of aggregation $aggno ";
@@ -117,7 +117,7 @@ class M3GetPDFFromCacheController extends Controller
 
                 if (count($ICM695M1)>0) {
                     $tmpCacheArr = $carrier = $trackingno = [];
-                    # Loop the Results from $ICM595M1TMP 
+                    # Loop the Results from $ICM595M1TMP
                     foreach ($ICM695M1 as $key => $ICM695M1R) {
                         $WHS       = trim($ICM695M1R->AYWHS);
                         $COMPANY   = trim($ICM695M1R->AYCO);
@@ -177,7 +177,7 @@ class M3GetPDFFromCacheController extends Controller
                             }
                         }
                     }
-                    // dump($tmpCacheArr); 
+                    // dump($tmpCacheArr);
 
                     # Get unique values from array $PDFArray
                     $tmpCacheArr = collect($tmpCacheArr)->unique();
@@ -194,7 +194,7 @@ class M3GetPDFFromCacheController extends Controller
                             // $base64PDF   = $pdfFile;
                             $base64PDF   = base64_encode($pdfFile);
                             // dd($base64PDF);
-                            $PDFArray[]  = $base64PDF; 
+                            $PDFArray[]  = $base64PDF;
                         }
                     }
                     // dump($PDFArray);
@@ -206,7 +206,7 @@ class M3GetPDFFromCacheController extends Controller
 		}
         catch (\Throwable $th) {
             // Log::error($th);
-        }	
+        }
         # dump($PDFArray);
         # dump($AYMACPKR);
         # dump($IC670M);

Modules/M3/Http/Controllers/MFOrdersController.php

@@ -11,7 +11,7 @@ class MFOrdersController extends Controller
     public static function index(Request $request)
     {
         $MF      = isset($request->id) ? trim($request->id) : "";
-        
+
         // dd("MFOrders ".$MF);
         # Get Users from ICM428M
         $ICM428M = DB::connection(config('m3.connection', 'pgsql'))->table('icm428m')
@@ -26,7 +26,7 @@ class MFOrdersController extends Controller
         # ICM705M1  Statement
         $sqlstmt = "select APMANIFEST,APDOCKDOOR,APCARRIER,APTRUCKIDT,APSPARE1,APLDSTRU,APLDSTRD,APLDSTRT,
         APLDCLOU,APLDCLOD,APLDCLOT,APCO,APWHS,APPLT,APSPARE2,APLDCLOZ
-        from ICM705M1 
+        from ICM705M1
         where APMANIFEST = $MF  and APCO='$co' and APWHS='$whs' and APPLT='$plant' limit 1";
 
         $ICM705M1 = DB::connection(config('m3.connection', 'pgsql'))->select($sqlstmt);
@@ -35,8 +35,8 @@ class MFOrdersController extends Controller
 
         if ($MF!='') {
             $status_ICM688M1_array = Config::get('arrays.status_ICM688M1_array');
-            
-            $sqlstmt = "SELECT AYCO,AYPLANT,AYMACPKR,AYONO,A4SHSHNM,A4PICKSTS,AYSPR15A01,SUM(AYLNWGHT) AS TOTWEIGHT,COUNT(*) AS BOXPAL FROM ICM695M1 
+
+            $sqlstmt = "SELECT AYCO,AYPLANT,AYMACPKR,AYONO,A4SHSHNM,A4PICKSTS,AYSPR15A01,SUM(AYLNWGHT) AS TOTWEIGHT,COUNT(*) AS BOXPAL FROM ICM695M1
             LEFT JOIN ICM688M1  ON AYCO=A4CO AND AYPLANT=A4PLANT AND AYMACPKR=A4MACPKR
             WHERE AYAPRF1551= $MF and AYCO='$co' and AYWHS='$whs' and AYPLANT='$plant'
             GROUP BY AYCO,AYPLANT,AYMACPKR,AYONO,A4SHSHNM,A4PICKSTS,AYSPR15A01";

Modules/M3/Http/Controllers/OrderLinesOfClosedOrder.php

@@ -29,7 +29,7 @@ class OrderLinesOfClosedOrder extends Controller
                     ->select('R428US','R428CO', 'R428WH','R428PL')
                     ->where('R428US','=',$SHUSER)
                     ->first();
-  
+
                 $R428US  = isset($ICM428M->R428US) ? $ICM428M->R428US : '';        # User
                 $COMPANY = isset($ICM428M->R428CO) ? $ICM428M->R428CO : '110';     # Company
                 $PLANT   = isset($ICM428M->R428PL) ? $ICM428M->R428PL : '144';     # Plant
@@ -38,7 +38,7 @@ class OrderLinesOfClosedOrder extends Controller
 
             # Warehouse Table
             $IC670M    = DB::connection(config('m3.connection', 'pgsql'))->table('ic670m')->get();
-            
+
             # Get URL PARAMS
             $urlParams      = count($request->all())>0 ? $request->all() : '';
             // dump($urlParams);
@@ -58,10 +58,10 @@ class OrderLinesOfClosedOrder extends Controller
                     SHDT, SHTIME,
                     CASE WHEN SHDT IS NULL THEN (SELECT SHDATA FROM ICM699M WHERE SHMACPKR=A5MACPKR AND SHTYPE='M3-Res-out' AND SHSOURCE='CloseShipmentCoChargeAPI' ORDER BY SHDT DESC, SHTIME DESC FETCH FIRST 1 ROWS ONLY) ELSE '' END AS REASON,
                     A1SHCURR,
-                    CASE 
-                    WHEN (SELECT A4SHIPTYPE FROM ICM688M1 WHERE A4MACPKR=A5MACPKR) = 'LTL' 
+                    CASE
+                    WHEN (SELECT A4SHIPTYPE FROM ICM688M1 WHERE A4MACPKR=A5MACPKR) = 'LTL'
                     THEN (SELECT A4RATETCP FROM ICM688M1 WHERE A4MACPKR=A5MACPKR) * ".(100.00 - Config::get('arrays.misc.discountCarrierRateForCustomerPriceLTL'))/100 ."
-                    ELSE (SELECT A4RATETCP FROM ICM688M1 WHERE A4MACPKR=A5MACPKR) * ".(100.00 - Config::get('arrays.misc.discountCarrierRateForCustomerPriceParcel') )/100 ." 
+                    ELSE (SELECT A4RATETCP FROM ICM688M1 WHERE A4MACPKR=A5MACPKR) * ".(100.00 - Config::get('arrays.misc.discountCarrierRateForCustomerPriceParcel') )/100 ."
                     END AS FREIGHT,
                     A4SHIPTYPE,
                     A4SHIPVIA1,
@@ -69,7 +69,7 @@ class OrderLinesOfClosedOrder extends Controller
                     A4OFSTRM
                 FROM ICM688M2
                 LEFT JOIN ICM699M ON SHMACPKR=A5MACPKR AND SHTYPE='M3-Res-out' AND SHDATA LIKE 'Success%' AND SHSOURCE='CloseShipmentCoChargeAPI'
-                LEFT JOIN ICM666M ON A1DELNO=A5MACPKR AND A1ONO=A5ONO AND A1PKLN=A5BRADLN 
+                LEFT JOIN ICM666M ON A1DELNO=A5MACPKR AND A1ONO=A5ONO AND A1PKLN=A5BRADLN
                 LEFT JOIN ICM688M1 ON A4MACPKR=A5MACPKR
                 WHERE A5MACPKR IN (
                     SELECT DISTINCT AYMACPKR
@@ -99,13 +99,13 @@ class OrderLinesOfClosedOrder extends Controller
             foreach ($files as $file) {
                 # Get the file URL (if URL is configured in filesystems.php)
                 $url = Storage::disk('publicCL')->url($file);
-                $allReportsUrls[$file] = $url; 
+                $allReportsUrls[$file] = $url;
             }
 
 		}
         catch (\Throwable $th) {
             Log::error($th);
-        }	
+        }
 
         return view('m3::liberty-theme.pages.OrderLinesOfClosed',compact('IC670M','ICM688M2','WHDDA','COMPANY','PLANT','WHS','REPORTDATEDisp','allReportsUrls'));
     }
@@ -115,7 +115,7 @@ class OrderLinesOfClosedOrder extends Controller
         ini_set('max_input_time', Config::get('arrays.PHPTimeOut'));
         ini_set('default_socket_timeout', Config::get('arrays.PHPTimeOut'));
         ini_set('memory_limit', '1024M');
-        
+
         try {
             $SHUSER  = m3_user() !== '' ? Str::upper(trim(m3_user())) : '';
             // dd($SHUSER);
@@ -126,7 +126,7 @@ class OrderLinesOfClosedOrder extends Controller
                     ->select('R428US','R428CO', 'R428WH','R428PL')
                     ->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
@@ -135,7 +135,7 @@ class OrderLinesOfClosedOrder extends Controller
 
             # Warehouse Table
             $IC670M    = DB::connection(config('m3.connection', 'pgsql'))->table('ic670m')->get();
-            
+
             # Get URL PARAMS
             $urlParams      = count($request->all())>0 ? $request->all() : '';
             // dd($urlParams);
@@ -161,10 +161,10 @@ class OrderLinesOfClosedOrder extends Controller
                     (SELECT A4SHSHNM FROM ICM688M1 WHERE A4MACPKR=A5MACPKR) AS A4SHSHNM ,
                     CASE WHEN SHDT IS NULL THEN (SELECT SHDATA FROM ICM699M WHERE SHMACPKR=A5MACPKR AND SHTYPE='M3-Res-out' AND SHSOURCE='CloseShipmentCoChargeAPI' ORDER BY SHDT DESC, SHTIME DESC FETCH FIRST 1 ROWS ONLY) ELSE '' END AS REASON,
                     A1SHCURR,
-                    CASE 
-                    WHEN (SELECT A4SHIPTYPE FROM ICM688M1 WHERE A4MACPKR=A5MACPKR) = 'LTL' 
+                    CASE
+                    WHEN (SELECT A4SHIPTYPE FROM ICM688M1 WHERE A4MACPKR=A5MACPKR) = 'LTL'
                     THEN (SELECT A4RATETCP FROM ICM688M1 WHERE A4MACPKR=A5MACPKR) * ".(100.00 - Config::get('arrays.misc.discountCarrierRateForCustomerPriceLTL'))/100 ."
-                    ELSE (SELECT A4RATETCP FROM ICM688M1 WHERE A4MACPKR=A5MACPKR) * ".(100.00 - Config::get('arrays.misc.discountCarrierRateForCustomerPriceParcel'))/100 ." 
+                    ELSE (SELECT A4RATETCP FROM ICM688M1 WHERE A4MACPKR=A5MACPKR) * ".(100.00 - Config::get('arrays.misc.discountCarrierRateForCustomerPriceParcel'))/100 ."
                     END AS FREIGHT
                 FROM ICM688M2
                 LEFT JOIN ICM699M ON SHMACPKR=A5MACPKR AND SHTYPE='M3-Res-out' AND SHDATA LIKE 'Success%' AND SHSOURCE='CloseShipmentCoChargeAPI'
@@ -173,7 +173,7 @@ class OrderLinesOfClosedOrder extends Controller
                 WHERE A5MACPKR IN (
                     SELECT DISTINCT AYMACPKR
                     FROM ICM695M1
-                    WHERE AYSTATUS IN ('Z','z') AND AYAPR8N002  BETWEEN $reportDate AND $toreportDate 
+                    WHERE AYSTATUS IN ('Z','z') AND AYAPR8N002  BETWEEN $reportDate AND $toreportDate
                 )
                 AND A5CO=$COMPANY AND A5WHS=$WHS AND A5PLANT=$PLANT";
 
@@ -191,7 +191,7 @@ class OrderLinesOfClosedOrder extends Controller
 
                 # Count records before exporting to excel : Max 20K records are allowed
                 $ICM688M2Count  = $ICM688M2Col->count();
-                # Set Max allowed records 
+                # Set Max allowed records
                 $maxRecords     = Config::get('arrays.maxRecCL');
                 if ($ICM688M2Count>$maxRecords) {
                     return redirect()->back()->withInput()->with('message', 'Maximum allowed records for Excel Download is: '.number_format($maxRecords).
@@ -209,7 +209,7 @@ class OrderLinesOfClosedOrder extends Controller
 		}
         catch (\Throwable $th) {
             Log::error($th);
-        }	
+        }
     }
 
     public static function StoreExcelToDisk(Request $request){
@@ -217,7 +217,7 @@ class OrderLinesOfClosedOrder extends Controller
         ini_set('max_input_time', Config::get('arrays.PHPTimeOutCL'));
         ini_set('default_socket_timeout', Config::get('arrays.PHPTimeOutCL'));
         ini_set('memory_limit', '1024M');
-        
+
         try {
             $SHUSER  = m3_user() !== '' ? Str::upper(trim(m3_user())) : '';
             // dd($SHUSER);
@@ -228,7 +228,7 @@ class OrderLinesOfClosedOrder extends Controller
                     ->select('R428US','R428CO', 'R428WH','R428PL')
                     ->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
@@ -237,7 +237,7 @@ class OrderLinesOfClosedOrder extends Controller
 
             # Warehouse Table
             $IC670M    = DB::connection(config('m3.connection', 'pgsql'))->table('ic670m')->get();
-            
+
             # Get URL PARAMS
             $urlParams      = count($request->all())>0 ? $request->all() : '';
             // dd($urlParams);
@@ -265,10 +265,10 @@ class OrderLinesOfClosedOrder extends Controller
                         (SELECT A4SHSHNM FROM ICM688M1 WHERE A4MACPKR=A5MACPKR) AS A4SHSHNM ,
                         CASE WHEN SHDT IS NULL THEN (SELECT SHDATA FROM ICM699M WHERE SHMACPKR=A5MACPKR AND SHTYPE='M3-Res-out' AND SHSOURCE='CloseShipmentCoChargeAPI' ORDER BY SHDT DESC, SHTIME DESC FETCH FIRST 1 ROWS ONLY) ELSE '' END AS REASON,
                         A1SHCURR,
-                        CASE 
-                        WHEN (SELECT A4SHIPTYPE FROM ICM688M1 WHERE A4MACPKR=A5MACPKR) = 'LTL' 
+                        CASE
+                        WHEN (SELECT A4SHIPTYPE FROM ICM688M1 WHERE A4MACPKR=A5MACPKR) = 'LTL'
                         THEN (SELECT A4RATETCP FROM ICM688M1 WHERE A4MACPKR=A5MACPKR) * ".(100.00 - Config::get('arrays.misc.discountCarrierRateForCustomerPriceLTL'))/100 ."
-                        ELSE (SELECT A4RATETCP FROM ICM688M1 WHERE A4MACPKR=A5MACPKR) * ".(100.00 - Config::get('arrays.misc.discountCarrierRateForCustomerPriceParcel'))/100 ." 
+                        ELSE (SELECT A4RATETCP FROM ICM688M1 WHERE A4MACPKR=A5MACPKR) * ".(100.00 - Config::get('arrays.misc.discountCarrierRateForCustomerPriceParcel'))/100 ."
                         END AS FREIGHT
                     FROM ICM688M2
                     LEFT JOIN ICM699M ON SHMACPKR=A5MACPKR AND SHTYPE='M3-Res-out' AND SHDATA LIKE 'Success%' AND SHSOURCE='CloseShipmentCoChargeAPI'
@@ -277,7 +277,7 @@ class OrderLinesOfClosedOrder extends Controller
                     WHERE A5MACPKR IN (
                         SELECT DISTINCT AYMACPKR
                         FROM ICM695M1
-                        WHERE AYSTATUS IN ('Z','z') AND AYAPR8N002  BETWEEN $reportDate AND $toreportDate 
+                        WHERE AYSTATUS IN ('Z','z') AND AYAPR8N002  BETWEEN $reportDate AND $toreportDate
                     )
                     AND A5CO=$COMPANY AND A5WHS=$WHS AND A5PLANT=$PLANT
                 ");
@@ -293,7 +293,7 @@ class OrderLinesOfClosedOrder extends Controller
 
                 # Count records before exporting to excel : Max 20K records are allowed
                 $ICM688M2Count  = $ICM688M2Col->count();
-                # Set Max allowed records 
+                # Set Max allowed records
                 $maxRecords = Config::get('arrays.maxRecCL');
                 if ($ICM688M2Count>$maxRecords) {
                     return redirect()->back()->withInput()->with('message', 'Maximum allowed records for Excel Download is: '.number_format($maxRecords).
@@ -315,7 +315,7 @@ class OrderLinesOfClosedOrder extends Controller
             app(\Modules\M3\Services\SpreadsheetExport::class)->store($ICM688M2Col, $prevMonthFile, 'publicCL');
 
             // $ICM688M2Col->storeExcel('Closedorderlinesreport_'.$reportDateWD.'-'.$toreportDateWD.'.csv', 'publicCL',\Maatwebsite\Excel\Excel::CSV);
-            
+
             // $ICM688M2Col->storeExcel('Closedorderlinesreport_'.$reportDateWD.'-'.$toreportDateWD.'.ods', 'publicCL',\Maatwebsite\Excel\Excel::ODS);
 
             // dump('Done Saving Excel...');
@@ -323,7 +323,7 @@ class OrderLinesOfClosedOrder extends Controller
 		}
         catch (\Throwable $th) {
             Log::error($th);
-        }	
+        }
     }
 
     # Download File

Modules/M3/Http/Controllers/ReplenishSettingsController.php

@@ -19,15 +19,15 @@ class ReplenishSettingsController extends Controller
         // $REFCAT658 = DB::connection(config('m3.connection', 'pgsql'))->table('icm658m')->get();
         # Warehouse Table
         // $IC670M    = DB::connection(config('m3.connection', 'pgsql'))->table('ic670m')->get();
-        
-        # Get Logged user Id 
+
+        # Get Logged user Id
         $userId     = m3_user() !== '' ? strtoupper(m3_user()) : '' ;
         // $userId     = 'E1135818';  // Brad : E1135818  Malak : E2011812  ACOM_PDF
         $connection = config('m3.connection', 'pgsql');
         $ICM428M = \Illuminate\Support\Facades\Schema::connection($connection)->hasTable('icm428m')
             ? DB::connection($connection)->table('icm428m')->where('R428US',$userId)->where('R428STS','A')->first()
             : null;
-        
+
         $userCO = isset($ICM428M->R428CO) ? $ICM428M->R428CO : '';
         $userPL = isset($ICM428M->R428PL) ? $ICM428M->R428PL : '';
         $userWH = isset($ICM428M->R428WH) ? $ICM428M->R428WH : '' ;
@@ -68,7 +68,7 @@ class ReplenishSettingsController extends Controller
 
         $formInputs['R658IZLCF'] =  isset($formInputs['R658IZLCF'])  ? $formInputs['R658IZLCF'] : '0';
         // dd($formInputs);
-        
+
         $ICM658MINS      = ICM658M::insert($formInputs);
         // dd($ICM658MINS);
         return redirect()->route('m3.replenishmentSettings.index');
@@ -77,9 +77,9 @@ class ReplenishSettingsController extends Controller
     public function update(Request $request)
     {
         // dd($request->all());
-        $R658PN     = (trim($request->R658PN) ?? trim($request->R658PN)) != null ? trim($request->R658PN) : ""; 
+        $R658PN     = (trim($request->R658PN) ?? trim($request->R658PN)) != null ? trim($request->R658PN) : "";
         $R658CO     = (trim($request->R658CO) ?? trim($request->R658CO)) != null ? trim($request->R658CO) : "";
-        $R658PL     = (trim($request->R658PL) ?? trim($request->R658PL)) != null ? trim($request->R658PL) : ""; 
+        $R658PL     = (trim($request->R658PL) ?? trim($request->R658PL)) != null ? trim($request->R658PL) : "";
         $R658WH     = (trim($request->R658WH) ?? trim($request->R658WH)) != null ? trim($request->R658WH) : "";
         $R658MQ     = trim($request->R658MQ);
         $R658RQ     = trim($request->R658RQ);
@@ -93,7 +93,7 @@ class ReplenishSettingsController extends Controller
             ->where('R658PL', $R658PL)
             ->where('R658WH', $R658WH)
             ->update([ 'R658MQ'=>$R658MQ,'R658RQ'=>$R658RQ,'R658RMQ'=>$R658RMQ,'R658TL'=>$R658TL,'R658IZLCF'=>$R658IZLCF ]);
-        
+
         return redirect()->route('m3.replenishmentSettings.index');
     }
 
@@ -105,7 +105,7 @@ class ReplenishSettingsController extends Controller
         $R658LC = trim($request->R658LC);
         $R658PL = trim($request->R658PL);
         $R658WH = trim($request->R658WH);
-        
+
         $deleteRecord = DB::connection(config('m3.connection', 'pgsql'))->table('icm658m')
         ->where('R658PN', $R658PN)
         ->where('R658CO', $R658CO)
@@ -140,7 +140,7 @@ class ReplenishSettingsController extends Controller
         ->first();
         // dd($recordExists);
         $recordExists = $recordExistSQL == null ? true : false;
-        
+
         return response()->json(['recordExists'=>$recordExists]);
     }
 
@@ -149,15 +149,15 @@ class ReplenishSettingsController extends Controller
         // $REFCAT658 = DB::connection(config('m3.connection', 'pgsql'))->table('icm658m')->get();
         # Warehouse Table
         // $IC670M    = DB::connection(config('m3.connection', 'pgsql'))->table('ic670m')->get();
-        
-        # Get Logged user Id 
+
+        # Get Logged user Id
         $userId     = m3_user() !== '' ? strtoupper(m3_user()) : '' ;
         // $userId     = 'E1135818';  // Brad : E1135818  Malak : E2011812  ACOM_PDF
         $connection = config('m3.connection', 'pgsql');
         $ICM428M = \Illuminate\Support\Facades\Schema::connection($connection)->hasTable('icm428m')
             ? DB::connection($connection)->table('icm428m')->where('R428US',$userId)->where('R428STS','A')->first()
             : null;
-        
+
         $userCO = isset($ICM428M->R428CO) ? $ICM428M->R428CO : '';
         $userPL = isset($ICM428M->R428PL) ? $ICM428M->R428PL : '';
         $userWH = isset($ICM428M->R428WH) ? $ICM428M->R428WH : '' ;
@@ -170,7 +170,7 @@ class ReplenishSettingsController extends Controller
                 ->where('R658PL',$userPL)
                 ->where('R658WH',$userWH)
                 ->orderBy('R658CO','asc');
-        
+
             # Warehouse Table
             // $IC670M    = DB::connection(config('m3.connection', 'pgsql'))->table('ic670m')
             //     ->where('WDCO',$userCO)

Modules/M3/Http/Controllers/WhsPerfMetrics.php

@@ -25,7 +25,7 @@ class WhsPerfMetrics extends Controller
                     ->select('R428US','R428CO', 'R428WH','R428PL')
                     ->where('R428US','=',$SHUSER)
                     ->first();
-  
+
                 $R428US  = isset($ICM428M->R428US) ? $ICM428M->R428US : '';        # User
                 $COMPANY = isset($ICM428M->R428CO) ? $ICM428M->R428CO : '110';     # Company
                 $PLANT   = isset($ICM428M->R428PL) ? $ICM428M->R428PL : '144';     # Plant
@@ -34,7 +34,7 @@ class WhsPerfMetrics extends Controller
 
             # Warehouse Table
             $IC670M    = DB::connection(config('m3.connection', 'pgsql'))->table('ic670m')->get();
-            
+
             # Get URL PARAMS
             $urlParams      = count($request->all())>0 ? $request->all() : '';
             // dump($urlParams);
@@ -53,14 +53,14 @@ class WhsPerfMetrics extends Controller
                     SHDT, SHTIME,
                     CASE WHEN SHDT IS NULL THEN (SELECT SHDATA FROM ICM699M WHERE SHMACPKR=A5MACPKR AND SHTYPE='M3-Res-out' AND SHSOURCE='CloseShipmentCoChargeAPI' ORDER BY SHDT DESC, SHTIME DESC FETCH FIRST 1 ROWS ONLY) ELSE '' END AS REASON,
                     A1SHCURR,
-                    CASE 
-                    WHEN (SELECT A4SHIPTYPE FROM ICM688M1 WHERE A4MACPKR=A5MACPKR) = 'LTL' 
+                    CASE
+                    WHEN (SELECT A4SHIPTYPE FROM ICM688M1 WHERE A4MACPKR=A5MACPKR) = 'LTL'
                     THEN (SELECT A4RATETCP FROM ICM688M1 WHERE A4MACPKR=A5MACPKR) * ".(100.00 - Config::get('arrays.misc.discountCarrierRateForCustomerPriceLTL'))/100 ."
-                    ELSE (SELECT A4RATETCP FROM ICM688M1 WHERE A4MACPKR=A5MACPKR) * ".(100.00 - Config::get('arrays.misc.discountCarrierRateForCustomerPriceParcel') )/100 ." 
+                    ELSE (SELECT A4RATETCP FROM ICM688M1 WHERE A4MACPKR=A5MACPKR) * ".(100.00 - Config::get('arrays.misc.discountCarrierRateForCustomerPriceParcel') )/100 ."
                     END AS FREIGHT
                 FROM ICM688M2
                 LEFT JOIN ICM699M ON SHMACPKR=A5MACPKR AND SHTYPE='M3-Res-out' AND SHDATA LIKE 'Success%' AND SHSOURCE='CloseShipmentCoChargeAPI'
-                LEFT JOIN ICM666M ON A1DELNO=A5MACPKR AND A1ONO=A5ONO AND A1PKLN=A5BRADLN 
+                LEFT JOIN ICM666M ON A1DELNO=A5MACPKR AND A1ONO=A5ONO AND A1PKLN=A5BRADLN
                 WHERE A5MACPKR IN (
                     SELECT DISTINCT AYMACPKR
                     FROM ICM695M1
@@ -80,18 +80,18 @@ class WhsPerfMetrics extends Controller
             # Get List of Files
             $allReportsUrls = [];
             $files = Storage::disk('publicLabels')->allFiles('WhsPerf/'.$WHS);
-            // $whsPerfFile      = 'WhsPerf/'.$WHS.'/WhsPerfMetrics_'.$DateToday.'-'.$WHS.'.xlsx';    
+            // $whsPerfFile      = 'WhsPerf/'.$WHS.'/WhsPerfMetrics_'.$DateToday.'-'.$WHS.'.xlsx';
 
             foreach ($files as $file) {
                 # Get the file URL (if URL is configured in filesystems.php)
                 $url = Storage::disk('publicLabels')->url($file);
-                $allReportsUrls[$file] = $url; 
+                $allReportsUrls[$file] = $url;
             }
             // dd($allReportsUrls);
 		}
         catch (\Throwable $th) {
             Log::error($th);
-        }	
+        }
 
         return view('m3::liberty-theme.pages.WhsPerfMetrics',compact('IC670M','WHDDA','COMPANY','PLANT','WHS','allReportsUrls'));
     }

Modules/M3/Http/Controllers/carrierMaintController.php

@@ -53,7 +53,7 @@ class carrierMaintController extends Controller
             $CASPR10A01 =  isset($request->CASPR10A01) &&  $request->CASPR10A01 != NULL  ?  $request->CASPR10A01 :  ' ';
             $CASPR1A01  =  isset($request->CASPR1A01) && $request->CASPR1A01 != NULL  ?  $request->CASPR1A01 :  ' ';
 
-            $data=['CANUM'=>$request->CANUM, 'CANAM'=>$request->CANAM, 
+            $data=['CANUM'=>$request->CANUM, 'CANAM'=>$request->CANAM,
                 'CATPID'=>str_pad(substr($request->TWOSHIPCARRIERCODE,0,3),3," ").substr($request->PARCELCARRIERCODE,0,1),
                 'CASPR10A01'=>$CASPR10A01, 'CASPR1A01'=>$CASPR1A01,'CACO'=>$UserCO];  // ,'CAPLNT'=>$UserPL,'CAWHS'=>$UserWHS
             $insertSQL = DB::connection(config('m3.connection', 'pgsql'))->table('icm160m')->insert($data);
@@ -75,7 +75,7 @@ class carrierMaintController extends Controller
 
         $CASPR10A01 =  isset($request->CASPR10A01) &&  $request->CASPR10A01 != NULL  ?  $request->CASPR10A01 :  ' ';
         $CASPR1A01  =  isset($request->CASPR1A01) && $request->CASPR1A01 != NULL  ?  $request->CASPR1A01 :  ' ';
-        
+
         $data=['CANUM'=>$request->CANUM, 'CANAM'=>$request->CANAM, 'CATPID'=>str_pad(substr($request->TWOSHIPCARRIERCODE,0,3),3," ").substr($request->PARCELCARRIERCODE,0,1),
             'CASPR10A01'=>$CASPR10A01, 'CASPR1A01'=>$CASPR1A01,'CACO'=>$UserCO];  // ,'CAPLNT'=>$UserPL,'CAWHS'=>$UserWHS
         $insertSQL = DB::connection(config('m3.connection', 'pgsql'))->table('icm160m')->insert($data);
@@ -93,11 +93,11 @@ class carrierMaintController extends Controller
         if($request->CANUM == NULL) {
             return "null";
         }
-        DB::connection(config('m3.connection', 'pgsql'))->update("update ICM160M 
+        DB::connection(config('m3.connection', 'pgsql'))->update("update ICM160M
             set CANAM='$request->CANAM', CATPID='".str_pad(substr($request->TWOSHIPCARRIERCODE,0,3),3," ").substr($request->PARCELCARRIERCODE,0,1)."',
                 CASPR10A01='$request->CASPR10A01', CASPR1A01='$request->CASPR1A01'
             where CANUM='$request->CANUM' AND CACO='$UserCO'");
-        
+
         return "success";
 
     }

Modules/M3/Http/Controllers/execSummaryController.php

@@ -33,7 +33,7 @@ class execSummaryController extends Controller
                 }
 
                 $reportPeriod   = isset($request->reportPeriod) ? $request->reportPeriod : '';  # monthly  , quarter , year , daily
-                # Current 
+                # Current
                 $checkSales     = isset($request->checkSales) ? $request->checkSales : '';      # on
                 $checkWeight    = isset($request->checkWeight) ? $request->checkWeight : '';    # on
                 $checkLines     = isset($request->checkLines) ? $request->checkLines : '';      # on
@@ -49,14 +49,14 @@ class execSummaryController extends Controller
                             $toreportDate = $lastDay->modify('last day of December')->format('Ymd');
 
                             # Build SQL
-                            $selectContent = "with tempfile as ( 
+                            $selectContent = "with tempfile as (
                                 select a5rsvqty,a5packed,a5slunpr*a5packed as dollars,a5lnwght,a5whs,
-                                (select max(ayapr8N002) as ayapr8N002  from icm695m1 where a5macpkr=aymacpkr fetch first 1 rows only) 
-                                from icm688m2 where a5macpkr in ( 
-                                select distinct aymacpkr from icm695m1 where (AYSTATUS in ('Z','z') and ayapr8N002>=$reportDate and ayapr8N002<=$toreportDate ) 
-                                ) and a5co='".$CO."' and a5whs in(".implode(",", $WHArr).") 
-                                ) 
-                                select substr(ayapr8N002,1,4) as years,count(*) as lines,sum(a5rsvqty) as reserveqty,sum(a5packed) as packed,sum(a5lnwght*a5packed/a5rsvqty) as weight,sum(dollars) as dollars,a5whs as whs from tempfile 
+                                (select max(ayapr8N002) as ayapr8N002  from icm695m1 where a5macpkr=aymacpkr fetch first 1 rows only)
+                                from icm688m2 where a5macpkr in (
+                                select distinct aymacpkr from icm695m1 where (AYSTATUS in ('Z','z') and ayapr8N002>=$reportDate and ayapr8N002<=$toreportDate )
+                                ) and a5co='".$CO."' and a5whs in(".implode(",", $WHArr).")
+                                )
+                                select substr(ayapr8N002,1,4) as years,count(*) as lines,sum(a5rsvqty) as reserveqty,sum(a5packed) as packed,sum(a5lnwght*a5packed/a5rsvqty) as weight,sum(dollars) as dollars,a5whs as whs from tempfile
                                 group by substr(ayapr8N002,1,4),a5whs order by 1 ";
                         break;
 
@@ -69,16 +69,16 @@ class execSummaryController extends Controller
                             $toreportDate = $lastDay->modify('last day of December')->format('Ymd');
 
                             # Build SQL
-                            $selectContent = "with tempfile as ( 
+                            $selectContent = "with tempfile as (
                                 select a5rsvqty,a5packed,a5slunpr*a5packed as dollars,a5lnwght,a5whs,
-                                (select max(ayapr8N002) as ayapr8N002  from icm695m1 where a5macpkr=aymacpkr fetch first 1 rows only) 
-                                from icm688m2 where a5macpkr in ( 
-                                select distinct aymacpkr from icm695m1 where (AYSTATUS in ('Z','z') and ayapr8N002>=$reportDate and ayapr8N002<=$toreportDate ) 
+                                (select max(ayapr8N002) as ayapr8N002  from icm695m1 where a5macpkr=aymacpkr fetch first 1 rows only)
+                                from icm688m2 where a5macpkr in (
+                                select distinct aymacpkr from icm695m1 where (AYSTATUS in ('Z','z') and ayapr8N002>=$reportDate and ayapr8N002<=$toreportDate )
                                 ) and a5co='".$CO."' and a5whs in (".implode(",", $WHArr).")
-                                ) 
+                                )
                                 select substr(ayapr8N002,3,2) ||'-' || 'Q' ||  EXTRACT(QUARTER FROM TO_DATE(CAST(ayapr8n002 AS TEXT),'YYYYMMDD'))  as years,count(*) as lines,
                                 sum(a5rsvqty) as reserveqty, sum(a5packed) as packed,sum (a5lnwght*a5packed/a5rsvqty) as weight,sum(dollars) as dollars, a5whs as whs
-                                from tempfile 
+                                from tempfile
                                 group by substr(ayapr8N002,3,2) ||'-' || 'Q' ||  EXTRACT(QUARTER FROM TO_DATE(CAST(ayapr8n002 AS TEXT),'YYYYMMDD')),a5whs order by 1 ";
                         break;
 
@@ -91,16 +91,16 @@ class execSummaryController extends Controller
                             $toreportDate  =$lastDay->modify('last day of this month')->format('Ymd');
 
                             # Build SQL
-                            $selectContent = "with tempfile as ( 
+                            $selectContent = "with tempfile as (
                                 select a5rsvqty,a5packed,a5slunpr*a5packed as dollars,a5lnwght,a5whs,
-                                (select max(ayapr8N002) as ayapr8N002  from icm695m1 where a5macpkr=aymacpkr fetch first 1 rows only) 
-                                from icm688m2 where a5macpkr in ( 
-                                select distinct aymacpkr from icm695m1 where (AYSTATUS in ('Z','z') and ayapr8N002>=$reportDate and ayapr8N002<=$toreportDate ) 
+                                (select max(ayapr8N002) as ayapr8N002  from icm695m1 where a5macpkr=aymacpkr fetch first 1 rows only)
+                                from icm688m2 where a5macpkr in (
+                                select distinct aymacpkr from icm695m1 where (AYSTATUS in ('Z','z') and ayapr8N002>=$reportDate and ayapr8N002<=$toreportDate )
                                 ) and a5co='".$CO."' and a5whs in (".implode(",", $WHArr).")
-                                ) 
+                                )
                                 select substr(ayapr8N002,1,4) || '-' || substr(ayapr8N002,5,2) as years,count(*) as lines,sum(a5rsvqty) as reserveqty,sum(a5packed) as packed,
                                  sum(a5lnwght*a5packed/a5rsvqty) as weight,sum(dollars) as dollars, a5whs as whs
-                                 from tempfile 
+                                 from tempfile
                                 group by substr(ayapr8N002,1,4) || '-' || substr(ayapr8N002,5,2),a5whs order by 1 ";
                         break;
 
@@ -114,16 +114,16 @@ class execSummaryController extends Controller
                             // $toreportDate  =$lastDay->modify('last day of this month')->format('Ymd');
 
                             # Build SQL
-                            $selectContent = "with tempfile as ( 
+                            $selectContent = "with tempfile as (
                                 select a5rsvqty,a5packed,a5slunpr*a5packed as dollars,a5lnwght,a5whs,
-                                (select max(ayapr8N002) as ayapr8N002  from icm695m1 where a5macpkr=aymacpkr fetch first 1 rows only) 
-                                from icm688m2 where a5macpkr in ( 
-                                select distinct aymacpkr from icm695m1 where (AYSTATUS in ('Z','z') and ayapr8N002>=$reportDate and ayapr8N002<=$toreportDate ) 
+                                (select max(ayapr8N002) as ayapr8N002  from icm695m1 where a5macpkr=aymacpkr fetch first 1 rows only)
+                                from icm688m2 where a5macpkr in (
+                                select distinct aymacpkr from icm695m1 where (AYSTATUS in ('Z','z') and ayapr8N002>=$reportDate and ayapr8N002<=$toreportDate )
                                 ) and a5co='".$CO."' and a5whs in (".implode(",", $WHArr).")
-                                ) 
+                                )
                                 select substr(ayapr8N002,7,2) as years,count(*) as lines,sum(a5rsvqty) as reserveqty,sum(a5packed) as packed,
                                 sum(a5lnwght*a5packed/a5rsvqty) as weight, sum(dollars) as  dollars, a5whs as whs
-                                from tempfile 
+                                from tempfile
                                 group by substr(ayapr8N002,7,2),a5whs order by 1 ";
                         break;
 
@@ -155,7 +155,7 @@ class execSummaryController extends Controller
                     ->select('R428US','R428CO', 'R428WH','R428PL')
                     ->where('R428US','=',$SHUSER)
                     ->first();
-  
+
                 $R428US  = isset($ICM428M->R428US) ? $ICM428M->R428US : '';        # User
                 $COMPANY = isset($ICM428M->R428CO) ? $ICM428M->R428CO : '110';     # Company
                 $PLANT   = isset($ICM428M->R428PL) ? $ICM428M->R428PL : '144';     # Plant
@@ -168,7 +168,7 @@ class execSummaryController extends Controller
 		}
         catch (\Throwable $th) {
             Log::error($th);
-        }	
+        }
 
         return view('m3::liberty-theme.pages.execSummary',compact('IC670M','WHDDA'));
         // ,'ICM688M2',,'COMPANY','PLANT','WHS','reportDate'

Modules/M3/Http/Controllers/execSummaryLineController.php

@@ -27,7 +27,7 @@ class execSummaryLineController extends Controller
                 }
 
                 $reportPeriod   = isset($request->reportPeriod) ? $request->reportPeriod : '';  # monthly  , quarter , year , daily
-                # Current 
+                # Current
                 $checkSales     = isset($request->checkSales) ? $request->checkSales : '';      # on
                 $checkWeight    = isset($request->checkWeight) ? $request->checkWeight : '';    # on
                 $checkLines     = isset($request->checkLines) ? $request->checkLines : '';      # on
@@ -43,14 +43,14 @@ class execSummaryLineController extends Controller
                             $toreportDate = $lastDay->modify('last day of December')->format('Ymd');
 
                             # Build SQL
-                            $selectContent = "with tempfile as ( 
+                            $selectContent = "with tempfile as (
                                 select a5rsvqty,a5packed,a5slunpr*a5packed as dollars,a5lnwght,a5whs,
-                                (select max(ayapr8N002) as ayapr8N002  from icm695m1 where a5macpkr=aymacpkr fetch first 1 rows only) 
-                                from icm688m2 where a5macpkr in ( 
-                                select distinct aymacpkr from icm695m1 where (AYSTATUS in ('Z','z') and ayapr8N002>=$reportDate and ayapr8N002<=$toreportDate ) 
-                                ) and a5co='".$CO."' and a5whs in(".implode(",", $WHArr).") 
-                                ) 
-                                select substr(ayapr8N002,1,4) as years,count(*) as lines,sum(a5rsvqty) as reserveqty,sum(a5packed) as packed,sum(a5lnwght*a5packed/a5rsvqty) as weight,sum(dollars) as dollars,a5whs as whs from tempfile 
+                                (select max(ayapr8N002) as ayapr8N002  from icm695m1 where a5macpkr=aymacpkr fetch first 1 rows only)
+                                from icm688m2 where a5macpkr in (
+                                select distinct aymacpkr from icm695m1 where (AYSTATUS in ('Z','z') and ayapr8N002>=$reportDate and ayapr8N002<=$toreportDate )
+                                ) and a5co='".$CO."' and a5whs in(".implode(",", $WHArr).")
+                                )
+                                select substr(ayapr8N002,1,4) as years,count(*) as lines,sum(a5rsvqty) as reserveqty,sum(a5packed) as packed,sum(a5lnwght*a5packed/a5rsvqty) as weight,sum(dollars) as dollars,a5whs as whs from tempfile
                                 group by substr(ayapr8N002,1,4),a5whs order by 1 ";
 
                             $execSummaryResLY = [];
@@ -64,28 +64,28 @@ class execSummaryLineController extends Controller
                             $lastDay      = isset($request->TOREPORTDATE) ? \DateTime::createFromFormat('Y-m', trim($request->TOREPORTDATE))  : '';
                             $toreportDate = $lastDay->modify('last day of December')->format('Ymd');
                             # Build SQL
-                            $selectContent = "with tempfile as ( 
+                            $selectContent = "with tempfile as (
                                 select a5rsvqty,a5packed,a5slunpr*a5packed as dollars,a5lnwght,a5whs,
-                                (select max(ayapr8N002) as ayapr8N002  from icm695m1 where a5macpkr=aymacpkr fetch first 1 rows only) 
-                                from icm688m2 where a5macpkr in ( 
-                                select distinct aymacpkr from icm695m1 where (AYSTATUS in ('Z','z') and ayapr8N002>=$reportDate and ayapr8N002<=$toreportDate ) 
+                                (select max(ayapr8N002) as ayapr8N002  from icm695m1 where a5macpkr=aymacpkr fetch first 1 rows only)
+                                from icm688m2 where a5macpkr in (
+                                select distinct aymacpkr from icm695m1 where (AYSTATUS in ('Z','z') and ayapr8N002>=$reportDate and ayapr8N002<=$toreportDate )
                                 ) and a5co='".$CO."' and a5whs in (".implode(",", $WHArr).")
-                                ) 
+                                )
                                 select 'Q'   ||  EXTRACT(QUARTER FROM TO_DATE(CAST(ayapr8n002 AS TEXT),'YYYYMMDD')) ||'-' || substr(ayapr8N002,3,2) as years,count(*) as lines,
                                 sum(a5rsvqty) as reserveqty, sum(a5packed) as packed,sum (a5lnwght*a5packed/a5rsvqty) as weight,sum(dollars) as dollars, a5whs as whs
-                                from tempfile 
+                                from tempfile
                                 group by 'Q'   ||  EXTRACT(QUARTER FROM TO_DATE(CAST(ayapr8n002 AS TEXT),'YYYYMMDD')) ||'-' || substr(ayapr8N002,3,2),a5whs order by 1 ";
 
                             $execSummaryResLY = [];
-                            
+
                         break;
 
                         case 'monthly':
                             # Set Dates based on reportPeriod type
                             $firstDay      = isset($request->REPORTDATE) ? \DateTime::createFromFormat('Y-m', $request->REPORTDATE) : null;
-                           
+
                             $lastDay       = (clone $firstDay);
-                            $reportDate    = $firstDay->modify('-11 months')->modify('first day of this month')->format('Ymd');  // 
+                            $reportDate    = $firstDay->modify('-11 months')->modify('first day of this month')->format('Ymd');  //
                             $toreportDate  = $lastDay   ? $lastDay->modify('last day of this month')->format('Ymd')   : '';
                             # Last Year Dates
                             // Same period, but for Last Year (LY)
@@ -93,32 +93,32 @@ class execSummaryLineController extends Controller
                             $toreportDateLY = (clone $lastDay)->modify('-1 year')->modify('last day of this month')->format('Ymd');
 
                             # Build SQL
-                            $selectContent = "with tempfile as ( 
+                            $selectContent = "with tempfile as (
                                 select a5rsvqty,a5packed,a5slunpr*a5packed as dollars,a5lnwght,a5whs,
-                                (select max(ayapr8N002) as ayapr8N002  from icm695m1 where a5macpkr=aymacpkr fetch first 1 rows only) 
-                                from icm688m2 where a5macpkr in ( 
-                                select distinct aymacpkr from icm695m1 where (AYSTATUS in ('Z','z') and ayapr8N002>=$reportDate and ayapr8N002<=$toreportDate ) 
+                                (select max(ayapr8N002) as ayapr8N002  from icm695m1 where a5macpkr=aymacpkr fetch first 1 rows only)
+                                from icm688m2 where a5macpkr in (
+                                select distinct aymacpkr from icm695m1 where (AYSTATUS in ('Z','z') and ayapr8N002>=$reportDate and ayapr8N002<=$toreportDate )
                                 ) and a5co='".$CO."' and a5whs in (".implode(",", $WHArr).")
-                                ) 
+                                )
                                 select substr(ayapr8N002,1,4)  || '-' || substr(ayapr8N002,5,2) as years,count(*) as lines,sum(a5rsvqty) as reserveqty,sum(a5packed) as packed,
                                  sum(a5lnwght*a5packed/a5rsvqty) as weight,sum(dollars) as dollars, a5whs as whs
-                                 from tempfile 
+                                 from tempfile
                                 group by substr(ayapr8N002,1,4)  || '-' || substr(ayapr8N002,5,2),a5whs order by 1 ";
 
-                            $selectContentLY = "with tempfile as ( 
+                            $selectContentLY = "with tempfile as (
                                 select a5rsvqty,a5packed,a5slunpr*a5packed as dollars,a5lnwght,a5whs,
-                                (select max(ayapr8N002) as ayapr8N002  from icm695m1 where a5macpkr=aymacpkr fetch first 1 rows only) 
-                                from icm688m2 where a5macpkr in ( 
-                                select distinct aymacpkr from icm695m1 where (AYSTATUS in ('Z','z') and ayapr8N002>=$reportDateLY and ayapr8N002<=$toreportDateLY ) 
+                                (select max(ayapr8N002) as ayapr8N002  from icm695m1 where a5macpkr=aymacpkr fetch first 1 rows only)
+                                from icm688m2 where a5macpkr in (
+                                select distinct aymacpkr from icm695m1 where (AYSTATUS in ('Z','z') and ayapr8N002>=$reportDateLY and ayapr8N002<=$toreportDateLY )
                                 ) and a5co='".$CO."' and a5whs in (".implode(",", $WHArr).")
-                                ) 
+                                )
                                 select substr(ayapr8N002,1,4)  || '-' || substr(ayapr8N002,5,2) as years,count(*) as lines,sum(a5rsvqty) as reserveqty,sum(a5packed) as packed,
                                  sum(a5lnwght*a5packed/a5rsvqty) as weight,sum(dollars) as dollars, a5whs as whs
-                                 from tempfile 
+                                 from tempfile
                                 group by substr(ayapr8N002,1,4)  || '-' || substr(ayapr8N002,5,2),a5whs order by 1 ";
 
                             $execSummaryResLY = DB::connection(config('m3.connection', 'pgsql'))->select($selectContentLY);
-                            
+
                         break;
 
                         case 'custom':
@@ -132,28 +132,28 @@ class execSummaryLineController extends Controller
                             $toreportDateLY = (clone $firstDay)->modify('-1 year')->modify('last day of this month')->format('Ymd');
 
                             # Build SQL
-                            $selectContent = "with tempfile as ( 
+                            $selectContent = "with tempfile as (
                                 select a5rsvqty,a5packed,a5slunpr*a5packed as dollars,a5lnwght,a5whs,
-                                (select max(ayapr8N002) as ayapr8N002  from icm695m1 where a5macpkr=aymacpkr fetch first 1 rows only) 
-                                from icm688m2 where a5macpkr in ( 
-                                select distinct aymacpkr from icm695m1 where (AYSTATUS in ('Z','z') and ayapr8N002>=$reportDate and ayapr8N002<=$toreportDate ) 
+                                (select max(ayapr8N002) as ayapr8N002  from icm695m1 where a5macpkr=aymacpkr fetch first 1 rows only)
+                                from icm688m2 where a5macpkr in (
+                                select distinct aymacpkr from icm695m1 where (AYSTATUS in ('Z','z') and ayapr8N002>=$reportDate and ayapr8N002<=$toreportDate )
                                 ) and a5co='".$CO."' and a5whs in (".implode(",", $WHArr).")
-                                ) 
+                                )
                                 select substr(ayapr8N002,7,2) as years,count(*) as lines,sum(a5rsvqty) as reserveqty,sum(a5packed) as packed,
                                 sum(a5lnwght*a5packed/a5rsvqty) as weight, sum(dollars) as  dollars, a5whs as whs
-                                from tempfile 
+                                from tempfile
                                 group by substr(ayapr8N002,7,2),a5whs order by 1 ";
 
-                            $selectContentLY = "with tempfile as ( 
+                            $selectContentLY = "with tempfile as (
                                 select a5rsvqty,a5packed,a5slunpr*a5packed as dollars,a5lnwght,a5whs,
-                                (select max(ayapr8N002) as ayapr8N002  from icm695m1 where a5macpkr=aymacpkr fetch first 1 rows only) 
-                                from icm688m2 where a5macpkr in ( 
-                                select distinct aymacpkr from icm695m1 where (AYSTATUS in ('Z','z') and ayapr8N002>=$reportDateLY and ayapr8N002<=$toreportDateLY ) 
+                                (select max(ayapr8N002) as ayapr8N002  from icm695m1 where a5macpkr=aymacpkr fetch first 1 rows only)
+                                from icm688m2 where a5macpkr in (
+                                select distinct aymacpkr from icm695m1 where (AYSTATUS in ('Z','z') and ayapr8N002>=$reportDateLY and ayapr8N002<=$toreportDateLY )
                                 ) and a5co='".$CO."' and a5whs in (".implode(",", $WHArr).")
-                                ) 
+                                )
                                 select substr(ayapr8N002,7,2) as years,count(*) as lines,sum(a5rsvqty) as reserveqty,sum(a5packed) as packed,
                                 sum(a5lnwght*a5packed/a5rsvqty) as weight, sum(dollars) as  dollars, a5whs as whs
-                                from tempfile 
+                                from tempfile
                                 group by substr(ayapr8N002,7,2),a5whs order by 1 ";
 
                             $execSummaryResLY = DB::connection(config('m3.connection', 'pgsql'))->select($selectContentLY);
@@ -184,7 +184,7 @@ class execSummaryLineController extends Controller
                     ->select('R428US','R428CO', 'R428WH','R428PL')
                     ->where('R428US','=',$SHUSER)
                     ->first();
-  
+
                 $R428US  = isset($ICM428M->R428US) ? $ICM428M->R428US : '';        # User
                 $COMPANY = isset($ICM428M->R428CO) ? $ICM428M->R428CO : '110';     # Company
                 $PLANT   = isset($ICM428M->R428PL) ? $ICM428M->R428PL : '144';     # Plant
@@ -197,7 +197,7 @@ class execSummaryLineController extends Controller
 		}
         catch (\Throwable $th) {
             Log::error($th);
-        }	
+        }
 
         return view('m3::liberty-theme.pages.execSummaryLine',compact('IC670M','WHDDA'));
         // ,'ICM688M2',,'COMPANY','PLANT','WHS','reportDate'

Modules/M3/Http/Controllers/fillBOL2Controller.php

@@ -90,139 +90,139 @@ Line 5',
             'ckFREIGHTCOLECT'   => 'Yes',
             'ckPREPAY'          => 'Off',
 
-            'DTESHIPED.2'       => '',	
-            'LNITEMWT24'        => '',	
-            'CLASSORATE24'      => '',	
-            'LNITEMCLAS24'      => '',	
-            'TYPEANDESCPTN.24'  => '',	
-            'PKGTYPECOUNT24'    => '',	
-            'LNITEMWT23'        => '',	
-            'CLASSORATE23'      => '',	
-            'LNITEMCLAS23'      => '',	
-            'TYPEANDESCPTN.23'  => '',	
-            'PKGTYPECOUNT23'    => '',	
-            'LNITEMWT22'        => '',	
-            'CLASSORATE22'      => '',	
-            'LNITEMCLAS22'      => '',	
-            'TYPEANDESCPTN.22'  => '',	
-            'PKGTYPECOUNT22'    => '',	
-            'LNITEMWT21'        => '',	
-            'CLASSORATE21'      => '',	
-            'LNITEMCLAS21'      => '',	
-            'TYPEANDESCPTN.21'  => '',	
-            'PKGTYPECOUNT21'    => '',	
-            'LNITEMWT20'        => '',	
-            'CLASSORATE20'      => '',	
-            'LNITEMCLAS20'      => '',	
-            'TYPEANDESCPTN.20'  => '',	
-            'PKGTYPECOUNT20'    => '',	
-            'LNITEMWT19'        => '',	
-            'CLASSORATE19'      => '',	
-            'LNITEMCLAS19'      => '',	
-            'TYPEANDESCPTN.19'  => '',	
-            'PKGTYPECOUNT19'    => '',	
-            'LNITEMWT18'        => '',	
-            'CLASSORATE18'      => '',	
-            'LNITEMCLAS18'      => '',	
-            'TYPEANDESCPTN.18'  => '',	
-            'PKGTYPECOUNT18'    => '',	
-            'LNITEMWT17'        => '',	
-            'CLASSORATE17'      => '',	
-            'LNITEMCLAS17'      => '',	
-            'TYPEANDESCPTN.17'  => '',	
-            'PKGTYPECOUNT17'    => '',	
-            'LNITEMWT16'        => '',	
-            'CLASSORATE16'      => '',	
-            'LNITEMCLAS16'      => '',	
-            'TYPEANDESCPTN.16'  => '',	
-            'PKGTYPECOUNT16'    => '',	
-            'LNITEMWT15'        => '',	
-            'CLASSORATE15'      => '',	
-            'LNITEMCLAS15'      => '',	
-            'TYPEANDESCPTN.15'  => '',	
-            'PKGTYPECOUNT15'    => '',	
-            'LNITEMWT14'        => '',	
-            'CLASSORAT14'       => '',	
-            'LNITEMCLAS14'      => '',	
-            'TYPEANDESCPTN.14'  => '',	
-            'PKGTYPECOUNT14'    => '',	
-            'LNITEMWT13'        => '',	
-            'CLASSORATE13'      => '',	
-            'LNITEMCLAS13'      => '',	
-            'PKGTYPECOUNT13'    => '',	
-            'LNITEMWT12'        => '',	
-            'CLASSORATE12'      => '',	
-            'LNITEMCLAS12'      => '',	
-            'TYPEANDESCPTN.12'  => '',	
-            'PKGTYPECOUNT12'    => '',	
-            'LNITEMWT11'        => '',	
-            'CLASSORATE11'      => '',	
-            'LNITEMCLAS11'      => '',	
-            'TYPEANDESCPTN.11'  => '',	
-            'PKGTYPECOUNT11'    => '',	
-            'LNITEMWT10'        => '',	
-            'CLASSORATE10'      => '',	
-            'LNITEMCLAS10'      => '',	
-            'PKGTYPECOUNT10'    => '',	
-            'LNITEMWT9'         => '',	
-            'CLASSORATE9'       => '',	
-            'LNITEMCLAS8'       => '',	
-            'PKGTYPECOUNT9'     => '',	
-            'LNITEMWT8'         => '',	
-            'CLASSORATE8'       => '',	
-            'TYPEANDESCPTN.8'   => '',	
-            'PKGTYPECOUNT8'     => '',	
-            'LNITEMWT7'         => '',	
-            'CLASSORATE7'       => '',	
-            'LNITEMCLAS7'       => '',	
-            'PKGTYPECOUNT7'     => '',	
-            'LNITEMWT6'         => '',	
-            'CLASSORATE6'       => '',	
-            'LNITEMCLAS6'       => '',	
-            'PKGTYPECOUNT6'     => '',	
-            'LNITEMWT5'         => '',	
-            'CLASSORATE5'       => '',	
-            'LNITEMCLAS5'       => '',	
-            'PKGTYPECOUNT5'     => '',	
-            'LNITEMWT4'         => '',	
-            'CLASSORATE4'       => '',	
-            'LNITEMCLAS4'       => '',	
-            'PKGTYPECOUNT4'     => '',	
-            'LNITEMWT3'         => '',	
-            'CLASSORATE3'       => '',	
-            'LNITEMCLAS3'       => '',	
-            'TYPEANDESCPTN.3'   => '',	
-            'PKGTYPECOUNT3'     => '',	
-            'LNITEMWT2'         => '',	
-            'CLASSORATE2'       => '',	
+            'DTESHIPED.2'       => '',
+            'LNITEMWT24'        => '',
+            'CLASSORATE24'      => '',
+            'LNITEMCLAS24'      => '',
+            'TYPEANDESCPTN.24'  => '',
+            'PKGTYPECOUNT24'    => '',
+            'LNITEMWT23'        => '',
+            'CLASSORATE23'      => '',
+            'LNITEMCLAS23'      => '',
+            'TYPEANDESCPTN.23'  => '',
+            'PKGTYPECOUNT23'    => '',
+            'LNITEMWT22'        => '',
+            'CLASSORATE22'      => '',
+            'LNITEMCLAS22'      => '',
+            'TYPEANDESCPTN.22'  => '',
+            'PKGTYPECOUNT22'    => '',
+            'LNITEMWT21'        => '',
+            'CLASSORATE21'      => '',
+            'LNITEMCLAS21'      => '',
+            'TYPEANDESCPTN.21'  => '',
+            'PKGTYPECOUNT21'    => '',
+            'LNITEMWT20'        => '',
+            'CLASSORATE20'      => '',
+            'LNITEMCLAS20'      => '',
+            'TYPEANDESCPTN.20'  => '',
+            'PKGTYPECOUNT20'    => '',
+            'LNITEMWT19'        => '',
+            'CLASSORATE19'      => '',
+            'LNITEMCLAS19'      => '',
+            'TYPEANDESCPTN.19'  => '',
+            'PKGTYPECOUNT19'    => '',
+            'LNITEMWT18'        => '',
+            'CLASSORATE18'      => '',
+            'LNITEMCLAS18'      => '',
+            'TYPEANDESCPTN.18'  => '',
+            'PKGTYPECOUNT18'    => '',
+            'LNITEMWT17'        => '',
+            'CLASSORATE17'      => '',
+            'LNITEMCLAS17'      => '',
+            'TYPEANDESCPTN.17'  => '',
+            'PKGTYPECOUNT17'    => '',
+            'LNITEMWT16'        => '',
+            'CLASSORATE16'      => '',
+            'LNITEMCLAS16'      => '',
+            'TYPEANDESCPTN.16'  => '',
+            'PKGTYPECOUNT16'    => '',
+            'LNITEMWT15'        => '',
+            'CLASSORATE15'      => '',
+            'LNITEMCLAS15'      => '',
+            'TYPEANDESCPTN.15'  => '',
+            'PKGTYPECOUNT15'    => '',
+            'LNITEMWT14'        => '',
+            'CLASSORAT14'       => '',
+            'LNITEMCLAS14'      => '',
+            'TYPEANDESCPTN.14'  => '',
+            'PKGTYPECOUNT14'    => '',
+            'LNITEMWT13'        => '',
+            'CLASSORATE13'      => '',
+            'LNITEMCLAS13'      => '',
+            'PKGTYPECOUNT13'    => '',
+            'LNITEMWT12'        => '',
+            'CLASSORATE12'      => '',
+            'LNITEMCLAS12'      => '',
+            'TYPEANDESCPTN.12'  => '',
+            'PKGTYPECOUNT12'    => '',
+            'LNITEMWT11'        => '',
+            'CLASSORATE11'      => '',
+            'LNITEMCLAS11'      => '',
+            'TYPEANDESCPTN.11'  => '',
+            'PKGTYPECOUNT11'    => '',
+            'LNITEMWT10'        => '',
+            'CLASSORATE10'      => '',
+            'LNITEMCLAS10'      => '',
+            'PKGTYPECOUNT10'    => '',
+            'LNITEMWT9'         => '',
+            'CLASSORATE9'       => '',
+            'LNITEMCLAS8'       => '',
+            'PKGTYPECOUNT9'     => '',
+            'LNITEMWT8'         => '',
+            'CLASSORATE8'       => '',
+            'TYPEANDESCPTN.8'   => '',
+            'PKGTYPECOUNT8'     => '',
+            'LNITEMWT7'         => '',
+            'CLASSORATE7'       => '',
+            'LNITEMCLAS7'       => '',
+            'PKGTYPECOUNT7'     => '',
+            'LNITEMWT6'         => '',
+            'CLASSORATE6'       => '',
+            'LNITEMCLAS6'       => '',
+            'PKGTYPECOUNT6'     => '',
+            'LNITEMWT5'         => '',
+            'CLASSORATE5'       => '',
+            'LNITEMCLAS5'       => '',
+            'PKGTYPECOUNT5'     => '',
+            'LNITEMWT4'         => '',
+            'CLASSORATE4'       => '',
+            'LNITEMCLAS4'       => '',
+            'PKGTYPECOUNT4'     => '',
+            'LNITEMWT3'         => '',
+            'CLASSORATE3'       => '',
+            'LNITEMCLAS3'       => '',
+            'TYPEANDESCPTN.3'   => '',
+            'PKGTYPECOUNT3'     => '',
+            'LNITEMWT2'         => '',
+            'CLASSORATE2'       => '',
             'LNITEMCLAS2'       => '',
-            'PKGTYPECOUNT2'     => '',	
-            'LNITEMCLAS1'       => '',	
-            'HAZLNITEMWT3'      => '',	
-            'HAZCLASSORATE3'    => '',	
-            'HAZLNITEMCLAS3'    => '',	
-            'HAZMATERDESL3'     => '',	
-            'HAZMATERL3'        => '',	
-            'HAZLNITEMWT2'      => '',	
-            'HAZCLASSORATE2'    => '',	
-            'HAZLNITEMCLAS2'    => '',	
-            'HAZMATERDESL2'     => '',	
-            'HAZMATERL2'        => '',	
-            'HAZLNITEMWT1'      => '',	
-            'HAZCLASSORATE1'    => '',	
-            'HAZLNITEMCLAS1'    => '',	
-            'HAZMATERDESL1'     => '',	
-            'HAZMATERL1'        => '',	
-            '24HREMGCYRSPNS'    => '',	
-            'CARIERFEDEMPID'    => '',	
-            'BILLTOADDR'        => '',	
-            'NUMDROPS'          => '',	
+            'PKGTYPECOUNT2'     => '',
+            'LNITEMCLAS1'       => '',
+            'HAZLNITEMWT3'      => '',
+            'HAZCLASSORATE3'    => '',
+            'HAZLNITEMCLAS3'    => '',
+            'HAZMATERDESL3'     => '',
+            'HAZMATERL3'        => '',
+            'HAZLNITEMWT2'      => '',
+            'HAZCLASSORATE2'    => '',
+            'HAZLNITEMCLAS2'    => '',
+            'HAZMATERDESL2'     => '',
+            'HAZMATERL2'        => '',
+            'HAZLNITEMWT1'      => '',
+            'HAZCLASSORATE1'    => '',
+            'HAZLNITEMCLAS1'    => '',
+            'HAZMATERDESL1'     => '',
+            'HAZMATERL1'        => '',
+            '24HREMGCYRSPNS'    => '',
+            'CARIERFEDEMPID'    => '',
+            'BILLTOADDR'        => '',
+            'NUMDROPS'          => '',
 
         ];
 
         try {
             $filledPdf = $this->bolService->fillBillOfLading($data);
-            
+
             return response()->download($filledPdf)->deleteFileAfterSend(true);
         } catch (\Exception $e) {
             return response()->json(['error' => $e->getMessage()], 500);

Modules/M3/Http/Controllers/fillBOLController.php

@@ -79,133 +79,133 @@ class fillBOLController extends Controller
             'ckFREIGHTCOLECT'   => 'Yes',
             'ckPREPAY'          => 'Off',
 
-            'DTESHIPED.2'       => '',	
-            'LNITEMWT24'        => '',	
-            'CLASSORATE24'      => '',	
-            'LNITEMCLAS24'      => '',	
-            'TYPEANDESCPTN.24'  => '',	
-            'PKGTYPECOUNT24'    => '',	
-            'LNITEMWT23'        => '',	
-            'CLASSORATE23'      => '',	
-            'LNITEMCLAS23'      => '',	
-            'TYPEANDESCPTN.23'  => '',	
-            'PKGTYPECOUNT23'    => '',	
-            'LNITEMWT22'        => '',	
-            'CLASSORATE22'      => '',	
-            'LNITEMCLAS22'      => '',	
-            'TYPEANDESCPTN.22'  => '',	
-            'PKGTYPECOUNT22'    => '',	
-            'LNITEMWT21'        => '',	
-            'CLASSORATE21'      => '',	
-            'LNITEMCLAS21'      => '',	
-            'TYPEANDESCPTN.21'  => '',	
-            'PKGTYPECOUNT21'    => '',	
-            'LNITEMWT20'        => '',	
-            'CLASSORATE20'      => '',	
-            'LNITEMCLAS20'      => '',	
-            'TYPEANDESCPTN.20'  => '',	
-            'PKGTYPECOUNT20'    => '',	
-            'LNITEMWT19'        => '',	
-            'CLASSORATE19'      => '',	
-            'LNITEMCLAS19'      => '',	
-            'TYPEANDESCPTN.19'  => '',	
-            'PKGTYPECOUNT19'    => '',	
-            'LNITEMWT18'        => '',	
-            'CLASSORATE18'      => '',	
-            'LNITEMCLAS18'      => '',	
-            'TYPEANDESCPTN.18'  => '',	
-            'PKGTYPECOUNT18'    => '',	
-            'LNITEMWT17'        => '',	
-            'CLASSORATE17'      => '',	
-            'LNITEMCLAS17'      => '',	
-            'TYPEANDESCPTN.17'  => '',	
-            'PKGTYPECOUNT17'    => '',	
-            'LNITEMWT16'        => '',	
-            'CLASSORATE16'      => '',	
-            'LNITEMCLAS16'      => '',	
-            'TYPEANDESCPTN.16'  => '',	
-            'PKGTYPECOUNT16'    => '',	
-            'LNITEMWT15'        => '',	
-            'CLASSORATE15'      => '',	
-            'LNITEMCLAS15'      => '',	
-            'TYPEANDESCPTN.15'  => '',	
-            'PKGTYPECOUNT15'    => '',	
-            'LNITEMWT14'        => '',	
-            'CLASSORAT14'       => '',	
-            'LNITEMCLAS14'      => '',	
-            'TYPEANDESCPTN.14'  => '',	
-            'PKGTYPECOUNT14'    => '',	
-            'LNITEMWT13'        => '',	
-            'CLASSORATE13'      => '',	
-            'LNITEMCLAS13'      => '',	
-            'PKGTYPECOUNT13'    => '',	
-            'LNITEMWT12'        => '',	
-            'CLASSORATE12'      => '',	
-            'LNITEMCLAS12'      => '',	
-            'TYPEANDESCPTN.12'  => '',	
-            'PKGTYPECOUNT12'    => '',	
-            'LNITEMWT11'        => '',	
-            'CLASSORATE11'      => '',	
-            'LNITEMCLAS11'      => '',	
-            'TYPEANDESCPTN.11'  => '',	
-            'PKGTYPECOUNT11'    => '',	
-            'LNITEMWT10'        => '',	
-            'CLASSORATE10'      => '',	
-            'LNITEMCLAS10'      => '',	
-            'PKGTYPECOUNT10'    => '',	
-            'LNITEMWT9'         => '',	
-            'CLASSORATE9'       => '',	
-            'LNITEMCLAS8'       => '',	
-            'PKGTYPECOUNT9'     => '',	
-            'LNITEMWT8'         => '',	
-            'CLASSORATE8'       => '',	
-            'TYPEANDESCPTN.8'   => '',	
-            'PKGTYPECOUNT8'     => '',	
-            'LNITEMWT7'         => '',	
-            'CLASSORATE7'       => '',	
-            'LNITEMCLAS7'       => '',	
-            'PKGTYPECOUNT7'     => '',	
-            'LNITEMWT6'         => '',	
-            'CLASSORATE6'       => '',	
-            'LNITEMCLAS6'       => '',	
-            'PKGTYPECOUNT6'     => '',	
-            'LNITEMWT5'         => '',	
-            'CLASSORATE5'       => '',	
-            'LNITEMCLAS5'       => '',	
-            'PKGTYPECOUNT5'     => '',	
-            'LNITEMWT4'         => '',	
-            'CLASSORATE4'       => '',	
-            'LNITEMCLAS4'       => '',	
-            'PKGTYPECOUNT4'     => '',	
-            'LNITEMWT3'         => '',	
-            'CLASSORATE3'       => '',	
-            'LNITEMCLAS3'       => '',	
-            'TYPEANDESCPTN.3'   => '',	
-            'PKGTYPECOUNT3'     => '',	
-            'LNITEMWT2'         => '',	
-            'CLASSORATE2'       => '',	
+            'DTESHIPED.2'       => '',
+            'LNITEMWT24'        => '',
+            'CLASSORATE24'      => '',
+            'LNITEMCLAS24'      => '',
+            'TYPEANDESCPTN.24'  => '',
+            'PKGTYPECOUNT24'    => '',
+            'LNITEMWT23'        => '',
+            'CLASSORATE23'      => '',
+            'LNITEMCLAS23'      => '',
+            'TYPEANDESCPTN.23'  => '',
+            'PKGTYPECOUNT23'    => '',
+            'LNITEMWT22'        => '',
+            'CLASSORATE22'      => '',
+            'LNITEMCLAS22'      => '',
+            'TYPEANDESCPTN.22'  => '',
+            'PKGTYPECOUNT22'    => '',
+            'LNITEMWT21'        => '',
+            'CLASSORATE21'      => '',
+            'LNITEMCLAS21'      => '',
+            'TYPEANDESCPTN.21'  => '',
+            'PKGTYPECOUNT21'    => '',
+            'LNITEMWT20'        => '',
+            'CLASSORATE20'      => '',
+            'LNITEMCLAS20'      => '',
+            'TYPEANDESCPTN.20'  => '',
+            'PKGTYPECOUNT20'    => '',
+            'LNITEMWT19'        => '',
+            'CLASSORATE19'      => '',
+            'LNITEMCLAS19'      => '',
+            'TYPEANDESCPTN.19'  => '',
+            'PKGTYPECOUNT19'    => '',
+            'LNITEMWT18'        => '',
+            'CLASSORATE18'      => '',
+            'LNITEMCLAS18'      => '',
+            'TYPEANDESCPTN.18'  => '',
+            'PKGTYPECOUNT18'    => '',
+            'LNITEMWT17'        => '',
+            'CLASSORATE17'      => '',
+            'LNITEMCLAS17'      => '',
+            'TYPEANDESCPTN.17'  => '',
+            'PKGTYPECOUNT17'    => '',
+            'LNITEMWT16'        => '',
+            'CLASSORATE16'      => '',
+            'LNITEMCLAS16'      => '',
+            'TYPEANDESCPTN.16'  => '',
+            'PKGTYPECOUNT16'    => '',
+            'LNITEMWT15'        => '',
+            'CLASSORATE15'      => '',
+            'LNITEMCLAS15'      => '',
+            'TYPEANDESCPTN.15'  => '',
+            'PKGTYPECOUNT15'    => '',
+            'LNITEMWT14'        => '',
+            'CLASSORAT14'       => '',
+            'LNITEMCLAS14'      => '',
+            'TYPEANDESCPTN.14'  => '',
+            'PKGTYPECOUNT14'    => '',
+            'LNITEMWT13'        => '',
+            'CLASSORATE13'      => '',
+            'LNITEMCLAS13'      => '',
+            'PKGTYPECOUNT13'    => '',
+            'LNITEMWT12'        => '',
+            'CLASSORATE12'      => '',
+            'LNITEMCLAS12'      => '',
+            'TYPEANDESCPTN.12'  => '',
+            'PKGTYPECOUNT12'    => '',
+            'LNITEMWT11'        => '',
+            'CLASSORATE11'      => '',
+            'LNITEMCLAS11'      => '',
+            'TYPEANDESCPTN.11'  => '',
+            'PKGTYPECOUNT11'    => '',
+            'LNITEMWT10'        => '',
+            'CLASSORATE10'      => '',
+            'LNITEMCLAS10'      => '',
+            'PKGTYPECOUNT10'    => '',
+            'LNITEMWT9'         => '',
+            'CLASSORATE9'       => '',
+            'LNITEMCLAS8'       => '',
+            'PKGTYPECOUNT9'     => '',
+            'LNITEMWT8'         => '',
+            'CLASSORATE8'       => '',
+            'TYPEANDESCPTN.8'   => '',
+            'PKGTYPECOUNT8'     => '',
+            'LNITEMWT7'         => '',
+            'CLASSORATE7'       => '',
+            'LNITEMCLAS7'       => '',
+            'PKGTYPECOUNT7'     => '',
+            'LNITEMWT6'         => '',
+            'CLASSORATE6'       => '',
+            'LNITEMCLAS6'       => '',
+            'PKGTYPECOUNT6'     => '',
+            'LNITEMWT5'         => '',
+            'CLASSORATE5'       => '',
+            'LNITEMCLAS5'       => '',
+            'PKGTYPECOUNT5'     => '',
+            'LNITEMWT4'         => '',
+            'CLASSORATE4'       => '',
+            'LNITEMCLAS4'       => '',
+            'PKGTYPECOUNT4'     => '',
+            'LNITEMWT3'         => '',
+            'CLASSORATE3'       => '',
+            'LNITEMCLAS3'       => '',
+            'TYPEANDESCPTN.3'   => '',
+            'PKGTYPECOUNT3'     => '',
+            'LNITEMWT2'         => '',
+            'CLASSORATE2'       => '',
             'LNITEMCLAS2'       => '',
-            'PKGTYPECOUNT2'     => '',	
-            'LNITEMCLAS1'       => '',	
-            'HAZLNITEMWT3'      => '',	
-            'HAZCLASSORATE3'    => '',	
-            'HAZLNITEMCLAS3'    => '',	
-            'HAZMATERDESL3'     => '',	
-            'HAZMATERL3'        => '',	
-            'HAZLNITEMWT2'      => '',	
-            'HAZCLASSORATE2'    => '',	
-            'HAZLNITEMCLAS2'    => '',	
-            'HAZMATERDESL2'     => '',	
-            'HAZMATERL2'        => '',	
-            'HAZLNITEMWT1'      => '',	
-            'HAZCLASSORATE1'    => '',	
-            'HAZLNITEMCLAS1'    => '',	
-            'HAZMATERDESL1'     => '',	
-            'HAZMATERL1'        => '',	
-            '24HREMGCYRSPNS'    => '',	
-            'CARIERFEDEMPID'    => '',	
-            'BILLTOADDR'        => '',	
-            'NUMDROPS'          => '',	
+            'PKGTYPECOUNT2'     => '',
+            'LNITEMCLAS1'       => '',
+            'HAZLNITEMWT3'      => '',
+            'HAZCLASSORATE3'    => '',
+            'HAZLNITEMCLAS3'    => '',
+            'HAZMATERDESL3'     => '',
+            'HAZMATERL3'        => '',
+            'HAZLNITEMWT2'      => '',
+            'HAZCLASSORATE2'    => '',
+            'HAZLNITEMCLAS2'    => '',
+            'HAZMATERDESL2'     => '',
+            'HAZMATERL2'        => '',
+            'HAZLNITEMWT1'      => '',
+            'HAZCLASSORATE1'    => '',
+            'HAZLNITEMCLAS1'    => '',
+            'HAZMATERDESL1'     => '',
+            'HAZMATERL1'        => '',
+            '24HREMGCYRSPNS'    => '',
+            'CARIERFEDEMPID'    => '',
+            'BILLTOADDR'        => '',
+            'NUMDROPS'          => '',
 
         ])
         ->needAppearances()   // ensures values are visible in viewer

Modules/M3/Http/Controllers/palletQtyController.php

@@ -38,18 +38,18 @@ class palletQtyController extends Controller
         #var_dump($request);
         #console.log($request);
         // Verify record does not already exist in ICM709M
-        $icm709m=DB::connection(config('m3.connection', 'pgsql'))->select("select count(*) as COUNT1 from ICM709M 
+        $icm709m=DB::connection(config('m3.connection', 'pgsql'))->select("select count(*) as COUNT1 from ICM709M
             where AT9CO='$request->AT9CO' and AT9PLT='$request->AT9PLT' and AT9WHS='$request->AT9WHS' and AT9PART='$request->AT9PART'");
         if($icm709m[0]->COUNT1>="1") {
             return "exists";
         } else {
         // Verify Part# already exists in ICM630M
-            $ic630m= DB::connection(config('m3.connection', 'pgsql'))->select("select count(*) as COUNT1 from IC630M 
+            $ic630m= DB::connection(config('m3.connection', 'pgsql'))->select("select count(*) as COUNT1 from IC630M
                 where LLCO='$request->AT9CO' and LLWHNO='$request->AT9WHS' and LLPPN='$request->AT9PART'");
             if($ic630m[0]->COUNT1=="0") {
                 return "not exist";
             } else {
-                DB::connection(config('m3.connection', 'pgsql'))->insert("insert into ICM709M (AT9CO, AT9PLT, AT9WHS, AT9PART, AT9QTY, AT9WRN) 
+                DB::connection(config('m3.connection', 'pgsql'))->insert("insert into ICM709M (AT9CO, AT9PLT, AT9WHS, AT9PART, AT9QTY, AT9WRN)
                     values ('$request->AT9CO', '$request->AT9PLT', '$request->AT9WHS', '$request->AT9PART', '$request->AT9QTY', '$request->AT9WRN')");
                 return "success";
             }
@@ -61,12 +61,12 @@ class palletQtyController extends Controller
         #var_dump($request);
         #console.log($request);
         // Verify record does not already exist in ICM709M
-        //DB::connection(config('m3.connection', 'pgsql'))->insert("insert into ICM709M (AT9CO, AT9PLT, AT9WHS, AT9PART, AT9QTY) 
+        //DB::connection(config('m3.connection', 'pgsql'))->insert("insert into ICM709M (AT9CO, AT9PLT, AT9WHS, AT9PART, AT9QTY)
         //   values ('$request->AT9CO', '$request->AT9PLT', '$request->AT9WHS', '$request->AT9PART', '$request->AT9QTY')");
-        // $data=['AT9CO'=>$request->AT9CO, 'AT9PLT'=>$request->AT9PLT, 'AT9WHS'=>$request->AT9WHS, 'AT9PART'=>$request->AT9PART, 
+        // $data=['AT9CO'=>$request->AT9CO, 'AT9PLT'=>$request->AT9PLT, 'AT9WHS'=>$request->AT9WHS, 'AT9PART'=>$request->AT9PART,
         //     'AT9QTY'=>$request->AT9QTY, 'AT9WRN'=>$request->AT9WRN];
         // $insertSQL = DB::connection(config('m3.connection', 'pgsql'))->table('icm709m')->insert($data);
-        DB::connection(config('m3.connection', 'pgsql'))->insert("insert into ICM709M (AT9CO, AT9PLT, AT9WHS, AT9PART, AT9QTY, AT9WRN) 
+        DB::connection(config('m3.connection', 'pgsql'))->insert("insert into ICM709M (AT9CO, AT9PLT, AT9WHS, AT9PART, AT9QTY, AT9WRN)
             values ('$request->AT9CO', '$request->AT9PLT', '$request->AT9WHS', '$request->AT9PART', '$request->AT9QTY', '$request->AT9WRN')");
         // if($insertSQL) {
             return "success";
@@ -82,14 +82,14 @@ class palletQtyController extends Controller
         #dump($request);
         #console.log($request);
 
-        //$icm709m=DB::connection(config('m3.connection', 'pgsql'))->select("select count(*) as COUNT1 from ICM709M 
+        //$icm709m=DB::connection(config('m3.connection', 'pgsql'))->select("select count(*) as COUNT1 from ICM709M
         //    where AT9CO='$request->AT9CO' and AT9PLT='$request->AT9PLT' and AT9WHS='$request->AT9WHS' and AT9PART='$request->AT9PART'");
         //var_dump($icm709m);
 
-        DB::connection(config('m3.connection', 'pgsql'))->update("update ICM709M 
+        DB::connection(config('m3.connection', 'pgsql'))->update("update ICM709M
             set AT9QTY='$request->AT9QTY', AT9WRN='$request->AT9WRN'
             where AT9CO='$request->AT9CO' and AT9PLT='$request->AT9PLT' and AT9WHS='$request->AT9WHS' and AT9PART='$request->AT9PART'");
-        
+
         return "success";
 
     }

Modules/M3/Http/Controllers/pendingClosureController.php

@@ -25,7 +25,7 @@ class pendingClosureController extends Controller
         # ICM705M1  Statement
         $sqlstmt = "select APMANIFEST,APDOCKDOOR,APCARRIER,APTRUCKIDT,APSPARE1,APLDSTRU,APLDSTRD,APLDSTRT,
         APLDCLOU,APLDCLOD,APLDCLOT,APCO,APWHS,APPLT,APSPARE2,APLDCLOZ
-        from ICM705M1 
+        from ICM705M1
         where APSPARE2 in ('','P') and APCO='$co' and APWHS='$whs' and APPLT='$plant'";
 
         $ICM705M1 = DB::connection(config('m3.connection', 'pgsql'))->select($sqlstmt);
@@ -33,10 +33,10 @@ class pendingClosureController extends Controller
         $ICM698Ma=array();
         $ICM699Ma=array();
         foreach($ICM705M1 as $key=>$val) {
-            $sqlstmt1="select LGUSER,LGCONFDT,LGCONFTM 
+            $sqlstmt1="select LGUSER,LGCONFDT,LGCONFTM
                     from ICM698M
-                    where LGCO='$val->APCO' and LGWHS='$val->APWHS'and LGURL='op605api.php' 
-                      and LGRESPONSE like 'Close of Sentinel Manifest%' 
+                    where LGCO='$val->APCO' and LGWHS='$val->APWHS'and LGURL='op605api.php'
+                      and LGRESPONSE like 'Close of Sentinel Manifest%'
                       and LGRESPONSE like  '%' || right('000000000' || '$val->APMANIFEST',9) || '%'";
             $ICM698M = DB::connection(config('m3.connection', 'pgsql'))->select($sqlstmt1);
             $ICM698Ma[$val->APMANIFEST]['TMSUSER']='';
@@ -47,10 +47,10 @@ class pendingClosureController extends Controller
                 $ICM698Ma[$val->APMANIFEST]['TMSDATE']=$val2->LGCONFDT;
                 $ICM698Ma[$val->APMANIFEST]['TMSTIME']=$val2->LGCONFTM;
             }
-    
 
-            $ICM699MSel1 ="select SHMACPKR,SHDT,SHTIME from ICM699M 
-                WHERE SHMACPKR='$val->APMANIFEST' AND SHCO='$co' AND SHWHS='$whs' 
+
+            $ICM699MSel1 ="select SHMACPKR,SHDT,SHTIME from ICM699M
+                WHERE SHMACPKR='$val->APMANIFEST' AND SHCO='$co' AND SHWHS='$whs'
                 AND  SHSOURCE='CloseShipmentCoChargeAPI' AND SHERROR='' AND SHTYPE='M3-Req-out' limit 1";
             $ICM699MSel  = DB::connection(config('m3.connection', 'pgsql'))->select($ICM699MSel1);
             foreach($ICM699MSel as $key2=>$val2) {
@@ -61,15 +61,15 @@ class pendingClosureController extends Controller
         // dump($ICM699Ma);
 
 
-        $sqlstmt="select count(*) as COUNT1 from ICM699M 
-            where SHCO='$co' and SHWHS='$whs' and SHTYPE like '%M3%' and SHERROR='X' 
+        $sqlstmt="select count(*) as COUNT1 from ICM699M
+            where SHCO='$co' and SHWHS='$whs' and SHTYPE like '%M3%' and SHERROR='X'
               and SHSOURCE='CloseShipmentCoChargeAPI'";
         $ICM699M = DB::connection(config('m3.connection', 'pgsql'))->select($sqlstmt);
 
         # Get Unprocessed Orders
         $unprocessedArr = array();
         $sqlstmt3       = "WITH TEMPFILE AS (
-            SELECT A4MACPKR,A4SPKRFUD,(SELECT AYAPRF1551 FROM ICM695M1 WHERE AYMACPKR=A4MACPKR AND AYSLWHS='$whs' FETCH FIRST 1 ROWS ONLY) AS MF FROM ICM688M1 
+            SELECT A4MACPKR,A4SPKRFUD,(SELECT AYAPRF1551 FROM ICM695M1 WHERE AYMACPKR=A4MACPKR AND AYSLWHS='$whs' FETCH FIRST 1 ROWS ONLY) AS MF FROM ICM688M1
                 WHERE A4PICKSTS='B' AND A4WHS='$whs' ORDER BY A4SPKRFUD
             )
             SELECT APMANIFEST,APSPARE2 FROM ICM705M1 WHERE APMANIFEST IN (SELECT DISTINCT MF FROM TEMPFILE) AND APSPARE2='X' AND APWHS='$whs'  ";
@@ -110,7 +110,7 @@ class pendingClosureController extends Controller
                     'code'   => '200',
                     'status' => 'Success',
                     'message'=> 'Manifest Closing submitted'
-                ]); 
+                ]);
             } catch (\Throwable $th) {
                 //throw $th;
             }

Modules/M3/Http/Controllers/sentinelController.php

@@ -14,7 +14,7 @@ class sentinelController extends Controller
 {
 
     public static function packSyst5Func(Request $request) {
-        
+
         $AYINTBOX    = isset($request->AYINTBOX)  ? trim($request->AYINTBOX) : '';
         $AYCO        = isset($request->AYCO)  ? trim($request->AYCO) : '';
         $AYWHS       = isset($request->AYWHS)  ? trim($request->AYWHS) : '';
@@ -31,33 +31,33 @@ class sentinelController extends Controller
                 ->first();
 
             $allowDeletion = isset($ICM695M1Sel->AYSENTPKR) ? ($ICM695M1Sel->AYSENTPKR !='' ? true : false ) : false;
-            
+
             if ($allowDeletion) {
                 $timestamp = date('Y-m-d H:i:s.u');
                 $date1     = date('Ymd');
                 $time1     = date('His');
-                
+
                 # Delete Records from ICM695M1 And ICM695M2
                 $ICM695M1Del  = DB::connection(config('m3.connection', 'pgsql'))->table('icm695m1')
                     ->where('AYINTBOX',$AYINTBOX)
                     ->where('AYCO',$AYCO)
                     ->where('AYWHS',$AYWHS)
                     ->delete();
-    
+
                 $ICM695M2Del  = DB::connection(config('m3.connection', 'pgsql'))->table('icm695m2')
                     ->where('AZINTBOX',$AYINTBOX)
                     ->where('AZCO',$AYCO)
                     ->where('AZWHS',$AYWHS)
                     ->delete();
-                
+
                 #  Log the event as an unusual transaction to appear on SPD bottom right:
                 $InsertValues = "'$ICM695M1Sel->AYCO', '$ICM695M1Sel->AYWHS', '$ICM695M1Sel->AYSENTPKR', '$ICM695M1Sel->AYMACPKR', '$ICM695M1Sel->AYONO', '$ICM695M1Sel->AYRLNO', '$ICM695M1Sel->AYSHNO', '', 'Box $AYINTBOX emptied and repacked',
                    '$timestamp', '$date1', '$time1', '$AYUSER','$timestamp', '$date1', '$time1', '$AYUSER','$AYINTBOX'";
-    
-                $ICM689MInsert = DB::connection(config('m3.connection', 'pgsql'))->insert("INSERT INTO ICM689M 
+
+                $ICM689MInsert = DB::connection(config('m3.connection', 'pgsql'))->insert("INSERT INTO ICM689M
                     (A7CO, A7WHS, A7SENTPKR, A7MACPKR, A7ONO, A7RLNO, A7SHNO, A7SOURCE, A7ERRMSG, A7DISRAITS, A7DISRAID, A7DISRAIT, A7DISRAIU, A7DISRESTS ,A7DISRESD ,A7DISREST ,A7DISRESU , A7SPR15A01)
                     values ($InsertValues)");
-    
+
                 return response()->json(['success'=>true , 'message' => 'Line Deleted']);
             }
             else{
@@ -69,5 +69,5 @@ class sentinelController extends Controller
         }
 
     }
- 
+
 }

Modules/M3/Http/Controllers/userControlController.php

@@ -58,9 +58,9 @@ class userControlController extends Controller
         } else {
 
             if($usrprf[0]->COUNT=="1") {
-                DB::connection(config('m3.connection', 'pgsql'))->insert("insert into ICM428M 
-                (R428CO, R428PL, R428WH, R428STS, R428US, R428FIRST, R428FAMILY, R428EMAIL, R428EMPCDE, R428ADMUSR, R428PWRUSR, MENU2OPT, MENU3OPT, MENU4OPT, MENU5OPT, MENU6OPT, R42811A) 
-                values ('$request->R428CO', '$request->R428PL', '$request->R428WH', '$request->R428STS', '$request->R428US', '$request->R428FIRST', 
+                DB::connection(config('m3.connection', 'pgsql'))->insert("insert into ICM428M
+                (R428CO, R428PL, R428WH, R428STS, R428US, R428FIRST, R428FAMILY, R428EMAIL, R428EMPCDE, R428ADMUSR, R428PWRUSR, MENU2OPT, MENU3OPT, MENU4OPT, MENU5OPT, MENU6OPT, R42811A)
+                values ('$request->R428CO', '$request->R428PL', '$request->R428WH', '$request->R428STS', '$request->R428US', '$request->R428FIRST',
                         '$request->R428FAMILY', '$request->R428EMAIL', $request->R428EMPCDE, '$request->R428ADMUSR', '$request->R428PWRUSR',
                         'NN".$request->MENU2OPT3."NNN".$request->MENU2OPT7.$request->MENU2OPT8."N', '".$request->MENU3OPT1.$request->MENU3OPT2."NNNNNNN',
                         '".$request->MENU4OPT1.$request->MENU4OPT2.$request->MENU4OPT3."NNNNNN',
@@ -74,7 +74,7 @@ class userControlController extends Controller
                 try {
                     $conn  = app(\Modules\M3\Services\PostgresProgramBridge::class);
                 }
-                catch (Exception $e)
+                catch (\Exception $e)
                 {
                     // Determine reason for failure.
                     // Probably database authentication error or invalid or unreachable database.
@@ -115,14 +115,14 @@ class userControlController extends Controller
                     // Successful Call : User profile created with default password
                     //dd($result);
                     //echo "<script>alert('User profile $request->R428US was created on the system with default password.');</script>";
-                    DB::connection(config('m3.connection', 'pgsql'))->insert("insert into ICM428M 
-                    (R428CO, R428PL, R428WH, R428STS, R428US, R428FIRST, R428FAMILY, R428EMAIL, R428EMPCDE, R428ADMUSR, R428PWRUSR, MENU2OPT, MENU3OPT, MENU4OPT, MENU5OPT, MENU6OPT, R42811A,R42821A) 
-                    values ('$request->R428CO', '$request->R428PL', '$request->R428WH', '$request->R428STS', '$request->R428US', '$request->R428FIRST', 
+                    DB::connection(config('m3.connection', 'pgsql'))->insert("insert into ICM428M
+                    (R428CO, R428PL, R428WH, R428STS, R428US, R428FIRST, R428FAMILY, R428EMAIL, R428EMPCDE, R428ADMUSR, R428PWRUSR, MENU2OPT, MENU3OPT, MENU4OPT, MENU5OPT, MENU6OPT, R42811A,R42821A)
+                    values ('$request->R428CO', '$request->R428PL', '$request->R428WH', '$request->R428STS', '$request->R428US', '$request->R428FIRST',
                             '$request->R428FAMILY', '$request->R428EMAIL', $request->R428EMPCDE, '$request->R428ADMUSR', '$request->R428PWRUSR',
                             'NN".$request->MENU2OPT3."NNN".$request->MENU2OPT7.$request->MENU2OPT8."N', '".$request->MENU3OPT1.$request->MENU3OPT2."NNNNNNN',
                             '".$request->MENU4OPT1.$request->MENU4OPT2.$request->MENU4OPT3."NNNNNN',
                             '".$request->MENU5OPT1.$request->MENU5OPT2.$request->MENU5OPT3."N".$request->MENU5OPT5."NNNN','".$request->MENU6OPT1.$request->MENU6OPT2.$request->MENU6OPT3."','".$request->R42811A."','".$request->R42821A."')");
-                    return "success2";    
+                    return "success2";
                 }
                 ##kd return "error profile";
             }
@@ -154,13 +154,13 @@ class userControlController extends Controller
         #}
 
         // Update record to ICM428M
-        
+
         $ICM428M=DB::connection(config('m3.connection', 'pgsql'))->select("select * from ICM428M where R428US='$request->R428US'");
         //var_dump($ICM428M);
 
-        DB::connection(config('m3.connection', 'pgsql'))->update("update ICM428M 
-        set R428CO='$request->R428CO', R428PL='$request->R428PL', R428WH='$request->R428WH', R428STS='$request->R428STS', R428FIRST='$request->R428FIRST', 
-            R428FAMILY='$request->R428FAMILY', R428EMAIL='$request->R428EMAIL', R428EMPCDE=$request->R428EMPCDE, R428ADMUSR='$request->R428ADMUSR', 
+        DB::connection(config('m3.connection', 'pgsql'))->update("update ICM428M
+        set R428CO='$request->R428CO', R428PL='$request->R428PL', R428WH='$request->R428WH', R428STS='$request->R428STS', R428FIRST='$request->R428FIRST',
+            R428FAMILY='$request->R428FAMILY', R428EMAIL='$request->R428EMAIL', R428EMPCDE=$request->R428EMPCDE, R428ADMUSR='$request->R428ADMUSR',
             R428PWRUSR='$request->R428PWRUSR',
             MENU2OPT='".substr($ICM428M[0]->MENU2OPT,0,2).$request->MENU2OPT3.substr($ICM428M[0]->MENU2OPT,3,3).$request->MENU2OPT7.$request->MENU2OPT8."',
             MENU3OPT='".$request->MENU3OPT1.$request->MENU3OPT2.substr($ICM428M[0]->MENU3OPT,2,-1)."',
@@ -169,12 +169,12 @@ class userControlController extends Controller
             MENU6OPT='".$request->MENU6OPT1.$request->MENU6OPT2.$request->MENU6OPT3.substr($ICM428M[0]->MENU6OPT,3,-1)."',
             R42811A='".$request->R42811A."',R42821A='".$request->R42821A."'
         where R428US='$request->R428US'");
-        
+
         return "success";
 
     }
 
-    #590 
+    #590
     public static function callCL(Request $request) {
 
         $PGMERRORS = '';
@@ -182,8 +182,8 @@ class userControlController extends Controller
         // connect to toolkit using DB2 credentials (can also leave blank for default authority)
         try {
             $conn  = app(\Modules\M3\Services\PostgresProgramBridge::class);
-        } 
-        catch (Exception $e) 
+        }
+        catch (\Exception $e)
         {
             // Determine reason for failure.
             // Probably database authentication error or invalid or unreachable database.
@@ -206,7 +206,7 @@ class userControlController extends Controller
         }
 
         // $conn->setOptions(array('persistent' => false, 'stateless' => true, 'debug' => true,'debugLogFile' => '/www/sentm3test/htdocs/M3/storage/logs/toolkit_debug.log'));
-        
+
         //  Add LIB
         // $result  = $conn->CLCommand('ADDLIBLE LIB(MPDAT10)');
 
@@ -221,7 +221,7 @@ class userControlController extends Controller
         // AddParameterPackDec($io, $length, $scale, $comment, $varName, $value,$dimension)
         // Add Delivery Note Param
         //$params[]   = $conn->AddParameterPackDec('in', 11, 0, 'ParamIn','','00000087125');
-        
+
         // $params[]   = $conn->AddParameterZoned('in', 11, 0, 'ParamIn');
 
         // Start Time Tracking
@@ -240,7 +240,7 @@ class userControlController extends Controller
             return "error";
             die();
         }
-        // Successful Call 
+        // Successful Call
         else{
             //dump($result);
             // $AWREQN =  $result['io_param']["var0"];
@@ -260,7 +260,7 @@ class userControlController extends Controller
         // }
         // else{
         //     // return  $AWREQN;
-        // }  
+        // }
     }
 
 
@@ -271,7 +271,7 @@ class userControlController extends Controller
         ini_set('max_execution_time', Config::get('arrays.PHPTimeOut'));
         ini_set('max_input_time', Config::get('arrays.PHPTimeOut'));
         ini_set('default_socket_timeout', Config::get('arrays.PHPTimeOut'));
-        
+
         $PGMERRORS = '';
 
 #console_log("request> ");
@@ -283,8 +283,8 @@ class userControlController extends Controller
             $conn  = app(\Modules\M3\Services\PostgresProgramBridge::class);
 #dump($conn);
 #echo "B4<br>";
-        } 
-        catch (Exception $e) 
+        }
+        catch (\Exception $e)
         {
 #echo "B5<br>";
             // Determine reason for failure.
@@ -325,10 +325,10 @@ class userControlController extends Controller
             echo "<script>alert($PGMERRORS);</script>";
             return "error pwd";
         }
-        // Successful Call 
+        // Successful Call
         else{
             return "success";
         }
 
-    }    
+    }
 }

Modules/M3/Http/Controllers/userPickingStats4.php

@@ -13,7 +13,7 @@ class userPickingStats4 extends Controller
     {
 
         #$start = microtime(true);
-        #dd($request);        
+        #dd($request);
         // Filter by date
         if (isset($request->dates)) {
             $date = $request->dates;
@@ -30,7 +30,7 @@ class userPickingStats4 extends Controller
 
         #$user_array = Config::get('arrays.user_array');
         #618
-        # Get Logged User CO & WH  
+        # Get Logged User CO & WH
         # Get Users from ICM428M
         $co = '';
         $whs = '';
@@ -91,7 +91,7 @@ class userPickingStats4 extends Controller
         $mth = substr($starting, 5, 2);
         $day = substr($starting, 8, 2);
         $sqlstmt = "select oppno, sum(cast (hrs as integer)+ (hrs-cast (hrs as integer))/0.6) as hrs from LBPF
-        where empno=$empno and lbyr=$yr and lbmo=$mth and lbdy=$day 
+        where empno=$empno and lbyr=$yr and lbmo=$mth and lbdy=$day
         and oppno in ($payrollCodes)
         group by oppno";
 
@@ -145,7 +145,7 @@ class userPickingStats4 extends Controller
         }
         if (!empty($statistic4)) {
             #echo "in !empty<br>";
-            // Initialize the Monitor array 
+            // Initialize the Monitor array
             foreach ($statistic4 as $key => $val) {
 
                 // Initialize these variables in case not existant in LBPF
@@ -259,8 +259,8 @@ class userPickingStats4 extends Controller
 
         }
 
-        #echo "<pre>"; 
-        #print_r($request); 
+        #echo "<pre>";
+        #print_r($request);
         #print_r($perf_array); print_r($monitor_array);
 
         // return encoded json if input field named format is json
@@ -294,7 +294,7 @@ class userPickingStats4 extends Controller
                 "actualLPH" => $actualLPH,
                 "grossHours" => $grossHours
             );
-            #echo "<pre>"; print_r($json_data); 
+            #echo "<pre>"; print_r($json_data);
             return json_encode($json_data);
 
         } else {

Modules/M3/Http/Controllers/userPickingStats5.php

@@ -94,16 +94,16 @@ class userPickingStats5 extends Controller
         // loop for the days difference and passing proper date to v4 to get json encoded response
         if (isset($request->dates)) {
             for($x=0;$x<=$days;$x++) {
-                
+
                 $next_date      = date("Y-m-d",strtotime($starting."+$x days"));
 
                 $parameters     = ['dates'=>$next_date, 'user'=>$request->user, 'format'=>'json'];
                 #echo "<pre>"; print_r($parameters); echo "$urlStats4</pre>";
 
                 $response       = Http::withBasicAuth($username, $pw)->get($urlStats4, $parameters);
-                #echo $response;                
+                #echo $response;
                 $statusCode     = $response->status();
-                
+
                 #echo "$statusCode json return=".$response->getBody()." <br>";
 
                 $statistic5[$x]  = json_decode($response->getBody(),true);

Modules/M3/Http/Controllers/userProfileController.php

@@ -29,7 +29,7 @@ class userProfileController extends Controller
         # Check if user is eligible for Profile update
         if (isset($ICM428M->R428US)) {
             return view('m3::liberty-theme.pages.userProfile', compact('ICM428M','IC670M'));
-        } 
+        }
         else{
             abort(404);
         }
@@ -41,7 +41,7 @@ class userProfileController extends Controller
 
         $R428US    = isset($request->R428US)  ? trim($request->R428US) : '';
         $R428DPW   = isset($request->R428DPW) ? trim($request->R428DPW) : '';
-        
+
         $R428CO    = substr($R428DPW, 0, 3);
         $R428PL    = substr($R428DPW, 3, 3);
         $R428WH    = substr($R428DPW, 6, 3);
@@ -49,10 +49,10 @@ class userProfileController extends Controller
 
         if ($R428US!='') {
             # Update record to ICM428M
-            DB::connection(config('m3.connection', 'pgsql'))->update("update ICM428M 
+            DB::connection(config('m3.connection', 'pgsql'))->update("update ICM428M
             set R428CO='$R428CO', R428PL='$R428PL', R428WH='$R428WH'
             where R428US='$R428US'");
-            
+
             // return "success";
             return redirect('/userprofile')->with('success', 'Profile updated successfully!');
         }
@@ -67,7 +67,7 @@ class userProfileController extends Controller
 
         $R428US    = isset($request->R428US)  ? trim($request->R428US) : '';
         $R428DPW   = isset($request->R428DPW) ? trim($request->R428DPW) : '';
-        
+
         $R428CO    = substr($R428DPW, 0, 3);
         $R428PL    = substr($R428DPW, 3, 3);
         $R428WH    = substr($R428DPW, 6, 3);
@@ -75,10 +75,10 @@ class userProfileController extends Controller
 
         if ($R428US!='') {
             # Update record to ICM428M
-            DB::connection(config('m3.connection', 'pgsql'))->update("update ICM428M 
+            DB::connection(config('m3.connection', 'pgsql'))->update("update ICM428M
             set R428CO='$R428CO', R428PL='$R428PL', R428WH='$R428WH'
             where R428US='$R428US'");
-            
+
             return response()->json(['success'=>true]);
         }
         else{
@@ -86,5 +86,5 @@ class userProfileController extends Controller
         }
 
     }
- 
+
 }

Modules/M3/Http/Controllers/utilitiesContoller.php

@@ -38,7 +38,7 @@ class utilitiesContoller extends Controller
         // connect to toolkit using DB2 credentials (can also leave blank for default authority)
         try {
             $conn = app(\Modules\M3\Services\PostgresProgramBridge::class);
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             // Determine reason for failure.
             // Probably database authentication error or invalid or unreachable database.
             $code = $e->getCode();
@@ -89,7 +89,7 @@ class utilitiesContoller extends Controller
         if (!$result) {
             $PGMERRORS = 'Error calling program. Code: ' . $conn->getErrorCode() . ' Msg: ' . $conn->getErrorMsg();
         }
-        // Successful Call 
+        // Successful Call
         else {
             dump($result);
             // $AWREQN =  $result['io_param']["var0"];
@@ -245,29 +245,29 @@ class utilitiesContoller extends Controller
                         .border_rght {
                             border-right: 1px solid;
                         }
-            
+
                         .margin_t {
                             padding-top : 10px;
                         }
-            
+
                         .align_lft {
                             text-align: left;
                         }
                         .align_center {
                             text-align: center;
                         }
-            
+
                         @page { margin: 5px; }
                         body { margin: 0px; }
                     </style>
                     </head>
                     <body style="font-family: Arial, sans-serif;">';
 
-                # Get number of Pallets   
+                # Get number of Pallets
                 $packageCount = count($GSArray['PackagesArray']);
                 $packageNum = 1;
 
-                # Get GS1 Label MAX ID from ICM695M3 : 
+                # Get GS1 Label MAX ID from ICM695M3 :
                 $GS1SEQUENCESel = DB::connection(config('m3.connection', 'pgsql'))->table('icm695m3')->max('ID');
                 $GS1SEQUENCE = isset($GS1SEQUENCESel) ? $GS1SEQUENCESel : 0;
 
@@ -601,8 +601,8 @@ class utilitiesContoller extends Controller
         // $GS1SEQUENCEID   = str_pad($GS1SEQUENCE, $total_length, "0", STR_PAD_LEFT);
         // dump($GS1SEQUENCEID);
 
-        # MAK Get Contents 
-        # ESN1 
+        # MAK Get Contents
+        # ESN1
         # $AYMACPKR='888568'; // LTL example
         # $AYMACPKR='894337'; // another LTL example with smaller orders, therefore pallets are more mixed
         # $AYMACPKR='1225311'; // parcel example

Modules/M3/Http/Controllers/whsePerfController.php

@@ -32,10 +32,10 @@ class whsePerfController extends Controller
         $date_in_mth = isset($request->date_in_mth)?$request->date_in_mth:date('m');
         #$date_in = isset($request->date_in)?$request->date_in:date('Ymd');
         $date_in = $date_in_yr.$date_in_mth."01";
-        $sqlstmt = "select AVDATE,  AVANOTESCL,AVADLRCL,AVAWGTCL,AVANOTESCH,AVADLRCH,AVAWGTCH,AVANOTESOP,AVADLROP,AVAWGTOP, 
-                                    AVLNOTESCL,AVLDLRCL,AVLWGTCL,AVLNOTESCH,AVLDLRCH,AVLWGTCH,AVLNOTESOP,AVLDLROP,AVLWGTOP, 
+        $sqlstmt = "select AVDATE,  AVANOTESCL,AVADLRCL,AVAWGTCL,AVANOTESCH,AVADLRCH,AVAWGTCH,AVANOTESOP,AVADLROP,AVAWGTOP,
+                                    AVLNOTESCL,AVLDLRCL,AVLWGTCL,AVLNOTESCH,AVLDLRCH,AVLWGTCH,AVLNOTESOP,AVLDLROP,AVLWGTOP,
                                     AVPNOTESCL,AVPDLRCL,AVPWGTCL,AVPNOTESCH,AVPDLRCH,AVPWGTCH,AVPNOTESOP,AVPDLROP,AVPWGTOP,
-                                    AVINOTESCL,AVIDLRCL,AVIWGTCL,AVINOTESOP,AVIDLROP,AVIWGTOP 
+                                    AVINOTESCL,AVIDLRCL,AVIWGTCL,AVINOTESOP,AVIDLROP,AVIWGTOP
                             from ICM711M
                             where AVDATE between ".date('Ym', strtotime($date_in))."00 and ".date('Ym', strtotime($date_in))."32";
 
@@ -46,7 +46,7 @@ class whsePerfController extends Controller
         $pct_array = Config::get('arrays.whsePerf_targets');
 
         return view('m3::liberty-theme.pages.whsePerf', compact('ICM711M','power_user','USER_INFO','date_in','pct_array'));
-        
+
     }
 
     public function exportTable(Request $request) {
@@ -55,10 +55,10 @@ class whsePerfController extends Controller
         $date_in_mth = isset($request->date_in_mth)?$request->date_in_mth:date('m');
         #$date_in = isset($request->date_in)?$request->date_in:date('Ymd');
         $date_in = $date_in_yr.$date_in_mth."01";
-        $sqlstmt = "select AVDATE,  AVANOTESCL,AVADLRCL,AVAWGTCL,AVANOTESCH,AVADLRCH,AVAWGTCH,AVANOTESOP,AVADLROP,AVAWGTOP, 
-                                    AVLNOTESCL,AVLDLRCL,AVLWGTCL,AVLNOTESCH,AVLDLRCH,AVLWGTCH,AVLNOTESOP,AVLDLROP,AVLWGTOP, 
+        $sqlstmt = "select AVDATE,  AVANOTESCL,AVADLRCL,AVAWGTCL,AVANOTESCH,AVADLRCH,AVAWGTCH,AVANOTESOP,AVADLROP,AVAWGTOP,
+                                    AVLNOTESCL,AVLDLRCL,AVLWGTCL,AVLNOTESCH,AVLDLRCH,AVLWGTCH,AVLNOTESOP,AVLDLROP,AVLWGTOP,
                                     AVPNOTESCL,AVPDLRCL,AVPWGTCL,AVPNOTESCH,AVPDLRCH,AVPWGTCH,AVPNOTESOP,AVPDLROP,AVPWGTOP,
-                                    AVINOTESCL,AVIDLRCL,AVIWGTCL,AVINOTESOP,AVIDLROP,AVIWGTOP 
+                                    AVINOTESCL,AVIDLRCL,AVIWGTCL,AVINOTESOP,AVIDLROP,AVIWGTOP
                             from ICM711M
                             where AVDATE between ".date('Ym', strtotime($date_in))."00 and ".date('Ym', strtotime($date_in))."32";
 
@@ -70,27 +70,27 @@ class whsePerfController extends Controller
 
         $html = view('m3::liberty-theme.pages.whsePerf', compact('ICM711M','power_user','USER_INFO','date_in','pct_array'))->render();
 
-        libxml_use_internal_errors(true);    
-        $doc = new \DOMDocument();    
-        $doc->loadHTML(mb_convert_encoding($html, 'HTML-ENTITIES', 'UTF-8'));    // Extract only table elements    
-        $tables = $doc->getElementsByTagName('table');    
-        if ($tables->length === 0) {        
-            abort(400, 'No table found in HTML');    
-        } 
-        // Create new document with only the table    
-        $newDoc = new \DOMDocument();    
-        $newDoc->appendChild($newDoc->importNode($tables->item(0), true));    
-        $cleanHtml = '<!DOCTYPE html><html><body>' . $newDoc->saveHTML() . '</body></html>';    
-        libxml_clear_errors();    
-        $tempFile = tempnam(sys_get_temp_dir(), 'html') . '.html';    
-        file_put_contents($tempFile, $cleanHtml);    
-        $reader = IOFactory::createReader('Html');    
-        $spreadsheet = $reader->load($tempFile);    
-        $writer = new Xlsx($spreadsheet);    
-        $fileName = 'export.xlsx';    
-        $tempExcel = tempnam(sys_get_temp_dir(), 'excel');    
-        $writer->save($tempExcel);    
-        unlink($tempFile);    
+        libxml_use_internal_errors(true);
+        $doc = new \DOMDocument();
+        $doc->loadHTML(mb_convert_encoding($html, 'HTML-ENTITIES', 'UTF-8'));    // Extract only table elements
+        $tables = $doc->getElementsByTagName('table');
+        if ($tables->length === 0) {
+            abort(400, 'No table found in HTML');
+        }
+        // Create new document with only the table
+        $newDoc = new \DOMDocument();
+        $newDoc->appendChild($newDoc->importNode($tables->item(0), true));
+        $cleanHtml = '<!DOCTYPE html><html><body>' . $newDoc->saveHTML() . '</body></html>';
+        libxml_clear_errors();
+        $tempFile = tempnam(sys_get_temp_dir(), 'html') . '.html';
+        file_put_contents($tempFile, $cleanHtml);
+        $reader = IOFactory::createReader('Html');
+        $spreadsheet = $reader->load($tempFile);
+        $writer = new Xlsx($spreadsheet);
+        $fileName = 'export.xlsx';
+        $tempExcel = tempnam(sys_get_temp_dir(), 'excel');
+        $writer->save($tempExcel);
+        unlink($tempFile);
         return response()->download($tempExcel, $fileName)->deleteFileAfterSend(true);
     }
 

Modules/M3/Http/Controllers/whsePerfDetailsController.php

@@ -33,36 +33,36 @@ class whsePerfDetailsController extends Controller
 
         $all = "tempfile4 as (
             select a5macpkr, a4shshnm, a4shipvia1, interco, a4shiptype, sum(dollarvalue) as dollarvalue, sum(weight) as weight, max(source) as source
-            from tempfile3 
-            where not (a4shipvia1='OCEAN' or interco='interco') and source<>'A2'  
+            from tempfile3
+            where not (a4shipvia1='OCEAN' or interco='interco') and source<>'A2'
             group by a5macpkr, a4shshnm, a4shipvia1, interco, a4shiptype
             )
             select * from tempfile4 order by source";
-        
+
         $ltl = "tempfile4 as (
             select a5macpkr, a4shshnm, a4shipvia1, interco, a4shiptype, sum(dollarvalue) as dollarvalue, sum(weight) as weight, max(source) as source
-            from tempfile3 
-            where not (a4shipvia1='OCEAN' or interco='interco') and source<>'A2' and a4shiptype='LTL' 
+            from tempfile3
+            where not (a4shipvia1='OCEAN' or interco='interco') and source<>'A2' and a4shiptype='LTL'
             group by a5macpkr, a4shshnm, a4shipvia1, interco, a4shiptype
             )
             select * from tempfile4 order by source";
 
         $parcel = "tempfile4 as (
             select a5macpkr, a4shshnm, a4shipvia1, interco, a4shiptype, sum(dollarvalue) as dollarvalue, sum(weight) as weight, max(source) as source
-            from tempfile3 
+            from tempfile3
             where not (a4shipvia1='OCEAN' or interco='interco') and source<>'A2' and a4shiptype='SmallPack'
             group by a5macpkr, a4shshnm, a4shipvia1, interco, a4shiptype
             )
             select * from tempfile4 order by source";
-    
+
         $io = "tempfile4 as (
             select a5macpkr, a4shshnm, a4shipvia1, interco, a4shiptype, sum(dollarvalue) as dollarvalue, sum(weight) as weight, max(source) as source
-            from tempfile3 
-            where (a4shipvia1='OCEAN' or interco='interco') and source<>'A2' 
+            from tempfile3
+            where (a4shipvia1='OCEAN' or interco='interco') and source<>'A2'
             group by a5macpkr, a4shshnm, a4shipvia1, interco, a4shiptype
             )
             select * from tempfile4 order by source";
-        
+
         switch ($for) {
             case "a":
                 $stmt2=$all;

Modules/M3/Resources/views/liberty-theme/layout/main.blade.php

@@ -15,8 +15,8 @@
             ->where('R428US', $loggedUser)
             ->get();
     }
-    
-    foreach ($getUsers as $key=>$user) {	
+
+    foreach ($getUsers as $key=>$user) {
         if(trim($user->R428ADMUSR)=="Y") {
             # Different logic from Qinclude version : this not an Array
             $admin_users=trim($user->R428ADMUSR);

Modules/M3/Resources/views/liberty-theme/pages/M3Delivery.blade.php

@@ -10,17 +10,17 @@
         <div class="card mb-4">
             <div class="card-header">
                 @if($power_user->R428PWRUSR=="Y")
-                <button name="M3DeliveryAdd" type="button" class="btn btn-sm btn-info M3DeliveryAdd_click" id="M3DeliveryAdd_click" 
+                <button name="M3DeliveryAdd" type="button" class="btn btn-sm btn-info M3DeliveryAdd_click" id="M3DeliveryAdd_click"
                     data-AT9DPW="{{$power_user->R428CO.$power_user->R428PL.$power_user->R428WH}}">Add Record</button>
                 @endif
                 <!-- data-AT9DPW="$co.$plant.$whs">Add Record</button> -->
             </div>
    {{-- // AVCO	        AVCO	    CHARACTER	3	No		' '		Division
 		// AVWHS	    AVWHS	    CHARACTER	3	No		' '		Warehouse
-		// AVPLANT	    AVPLANT	    CHARACTER	3	No		' '		Plant	 
+		// AVPLANT	    AVPLANT	    CHARACTER	3	No		' '		Plant
 		// AVDELMETH	AVDELMETH	CHARACTER	4	No		' '		Delivery method
 		// AVSHPVIA	    AVSHPVIA	CHARACTER	4	No		' '		Sentinel ship via
-		// AVSHSRT	    AVSHSRT	    CHARACTER	6	No		' '		Sentinel route	
+		// AVSHSRT	    AVSHSRT	    CHARACTER	6	No		' '		Sentinel route
 		// AVSHORCL	    AVSHORCL	CHARACTER	3	No		' '		Sentinel intl code --}}
 
             <div class="card-body">
@@ -38,7 +38,7 @@
                         </tr>
                     </thead>
                     <tbody>
-                    <!-- if($no_data=="Y") 
+                    <!-- if($no_data=="Y")
                         <tr> <td colspan=10 style="text-align:center; background-color:yellow"> <b>No data retrieved for this user</b> <td> <tr>
                     else -->
                         @foreach($ICM664M as $key=>$val)
@@ -46,9 +46,9 @@
                                 <td></td>
                                 <td align="center">
                                     @if($power_user->R428PWRUSR=="Y")
-                                    <button name="M3DeliveryEdit{{trim($val->AVDELMETH)}}" type="submit" class="btn btn-sm btn-info M3DeliveryEdit_click" id="M3DeliveryEdit_click" 
-                                    data-AVDELMETH="{{$val->AVDELMETH}}" data-AVSHPVIA="{{trim($val->AVSHPVIA)}}" data-AVSHSRT="{{trim($val->AVSHSRT)}}" 
-                                    data-AVSHORCL="{{trim($val->AVSHORCL)}}" 
+                                    <button name="M3DeliveryEdit{{trim($val->AVDELMETH)}}" type="submit" class="btn btn-sm btn-info M3DeliveryEdit_click" id="M3DeliveryEdit_click"
+                                    data-AVDELMETH="{{$val->AVDELMETH}}" data-AVSHPVIA="{{trim($val->AVSHPVIA)}}" data-AVSHSRT="{{trim($val->AVSHSRT)}}"
+                                    data-AVSHORCL="{{trim($val->AVSHORCL)}}"
                                     >Edit</button>
                                     @endif
                                 </td>
@@ -103,11 +103,11 @@
         //
         // AVCO	        AVCO	    CHARACTER	3	No		' '		Division
 		// AVWHS	    AVWHS	    CHARACTER	3	No		' '		Warehouse
-		// AVPLANT	    AVPLANT	    CHARACTER	3	No		' '		Plant	 
+		// AVPLANT	    AVPLANT	    CHARACTER	3	No		' '		Plant
 		// AVDELMETH	AVDELMETH	CHARACTER	4	No		' '		Delivery method
 		// AVSHPVIA	    AVSHPVIA	CHARACTER	4	No		' '		Sentinel ship via
-		// AVSHSRT	    AVSHSRT	    CHARACTER	6	No		' '		Sentinel route	
-		// AVSHORCL	    AVSHORCL	CHARACTER	3	No		' '		Sentinel intl code 
+		// AVSHSRT	    AVSHSRT	    CHARACTER	6	No		' '		Sentinel route
+		// AVSHORCL	    AVSHORCL	CHARACTER	3	No		' '		Sentinel intl code
 
         $(document).on('click', '#M3DeliveryEdit_click', function() {
             // console.log($(this));
@@ -150,7 +150,7 @@
 
             var changes_detected = 0;
             var errors_found = 0;
-            
+
             // Retrieve the values we need to pass on
             var NEW_AVDELMETH   = $("#AVDELMETH").val();
             var NEW_AVSHPVIA    = $("#AVSHPVIA").val();
@@ -177,11 +177,11 @@
                 if(errors_found==0) {
 
                     var csrf = document.querySelector('meta[name="csrf-token"]').content;
-                    var form_post = {    
+                    var form_post = {
                         'AVDELMETH': NEW_AVDELMETH,
-                        'AVSHPVIA': NEW_AVSHPVIA, 
-                        'AVSHSRT':  NEW_AVSHSRT, 
-                        'AVSHORCL': NEW_AVSHORCL, 
+                        'AVSHPVIA': NEW_AVSHPVIA,
+                        'AVSHSRT':  NEW_AVSHSRT,
+                        'AVSHORCL': NEW_AVSHORCL,
                         'AVCO':     NEW_AVCO,
                         'AVPLANT':  NEW_AVPLANT,
                         'AVWHS':    NEW_AVWHS,
@@ -234,11 +234,11 @@
             var NEW_AVWHS       = $("#addAVWHS").val();
 
             var csrf = document.querySelector('meta[name="csrf-token"]').content;
-            var form_post = {    
+            var form_post = {
                 'AVDELMETH':    NEW_AVDELMETH,
-                'AVSHPVIA':     NEW_AVSHPVIA, 
-                'AVSHSRT':      NEW_AVSHSRT, 
-                'AVSHORCL':     NEW_AVSHORCL, 
+                'AVSHPVIA':     NEW_AVSHPVIA,
+                'AVSHSRT':      NEW_AVSHSRT,
+                'AVSHORCL':     NEW_AVSHORCL,
                 'AVCO':         NEW_AVCO,
                 'AVPLANT':      NEW_AVPLANT,
                 'AVWHS':        NEW_AVWHS,
@@ -274,9 +274,9 @@
                 });
             }
         });
-    });        
+    });
 
     //});
-    
+
 </script>
 @endsection

Modules/M3/Resources/views/liberty-theme/pages/M3ErrorsDisplay.blade.php

@@ -370,7 +370,7 @@
                 fixedColumns: true,
                 orderCellsTop: true,
                 order: [
-                    [3, 'asc'] // Order By Date time 
+                    [3, 'asc'] // Order By Date time
                 ],
                 pageLength: 100,
                 "lengthMenu": [
@@ -472,7 +472,7 @@
             // Add event listeners to the date filter inputs
             $('#filterTop,#refresh').on('click', function() {
                 var SHMACPKR = $('#SHMACPKR').val().trim();
-                // Check SHMACPKR for invalid CHARS  
+                // Check SHMACPKR for invalid CHARS
                 var numbersOnly = /^[0-9]+$/;
                 if (!SHMACPKR.match(numbersOnly) && SHMACPKR != '') {
                     alert('Only numeric values are allowed for Delivery Note ');
@@ -818,7 +818,7 @@
             // Export To Excel  exportExcel
             $(document).on('click', '#exportExcel', function() {
                 var SHMACPKR = $('#SHMACPKR').val().trim();
-                // Check SHMACPKR for invalid CHARS  
+                // Check SHMACPKR for invalid CHARS
                 var numbersOnly = /^[0-9]+$/;
                 if (!SHMACPKR.match(numbersOnly) && SHMACPKR != '') {
                     alert('Only numeric values are allowed for Delivery Note ');

Modules/M3/Resources/views/liberty-theme/pages/M3GetPDF.blade.php

@@ -22,8 +22,8 @@ Sentinel Doc Archive
                                     <select class="form-select"  id="WHDDA" aria-label="WHDD" tabindex="-1" disabled>
                                         @foreach ($IC670M as $key => $IC670MR)
                                             @php $currentWHDDA =  trim($IC670MR->WDCO).trim($IC670MR->WDPL).trim($IC670MR->WDWHS); @endphp
-                                            <option  value="{{ $currentWHDDA }}" 
-                                                data-comp="{{ trim($IC670MR->WDCO) }}" data-pl="{{ trim($IC670MR->WDPL) }}" data-wh="{{ trim($IC670MR->WDWHS) }}" 
+                                            <option  value="{{ $currentWHDDA }}"
+                                                data-comp="{{ trim($IC670MR->WDCO) }}" data-pl="{{ trim($IC670MR->WDPL) }}" data-wh="{{ trim($IC670MR->WDWHS) }}"
                                                 {{ ($WHDDA!='' && $WHDDA==$currentWHDDA) ? "selected" : ""  }}>
                                                 {{ trim(Str::upper($IC670MR->WDWNAM)) }}
                                             </option>
@@ -48,7 +48,7 @@ Sentinel Doc Archive
                             </div>
                         </form>
                         @if($aggmsg!="")
-                            <center><b> {{ $aggmsg }} 
+                            <center><b> {{ $aggmsg }}
                             (
                             @foreach($ICM688M1 as $key => $ICM688M1R)
                                 <a href="M3GetPDFFromCache?MACPKR={{$ICM688M1R->A4MACPKR}}&COMPANY={{$COMPANY}}&PLANT={{$PLANT}}&WHS={{$WHS}}">{{$ICM688M1R->A4MACPKR}}</a>
@@ -57,9 +57,9 @@ Sentinel Doc Archive
                         @endif
                         @if(count($trackingno)>0)
                         @foreach($trackingno as $key => $val)
-                            @if(trim($carrier[$key])=="UPSG") 
+                            @if(trim($carrier[$key])=="UPSG")
                                 <center><b> UPSG <a href=https://www.ups.com/track?loc=en_US&tracknum={{$val}}>{{$val}}</a> </b></center>
-                            @elseif(trim($carrier[$key])=="FEDG" || trim($carrier[$key])=="FXFE") 
+                            @elseif(trim($carrier[$key])=="FEDG" || trim($carrier[$key])=="FXFE")
                                 <center><b> Fedex <a href=https://www.fedex.com/fedextrack/?trknbr={{$val}}>{{$val}}</a> </b></center>
                             @endif
                         @endforeach
@@ -78,7 +78,7 @@ Sentinel Doc Archive
                 </div>
             </div>
         </div>
- 
+
     </div>
 @endsection
 
@@ -86,7 +86,7 @@ Sentinel Doc Archive
 <script>
     $(document).ready(function() {
 
-        // Update Division/WH/Plant on Warehouse change 
+        // Update Division/WH/Plant on Warehouse change
         $(document).on('change select','#WHDDA',function(){
             $("#COMPANY").val($(this).find("option:selected").data("comp"));
             $("#PLANT").val($(this).find("option:selected").data("pl"));

Modules/M3/Resources/views/liberty-theme/pages/MFOrders.blade.php

@@ -40,8 +40,8 @@ Solon Sentinel Portal - Manifest Orders
                             @endphp
                             <tr>
                                 <td align="center">
-                                    <a class="btn btn-link" target="_blank" href="{{$sendUrl.'php/AllSentPkr.php?macpkr_input='.$val->AYMACPKR}}" > 
-                                        {{ $val->AYMACPKR }} 
+                                    <a class="btn btn-link" target="_blank" href="{{$sendUrl.'php/AllSentPkr.php?macpkr_input='.$val->AYMACPKR}}" >
+                                        {{ $val->AYMACPKR }}
                                     </a>
                                 </td>
                                 <td> {{ $val->AYONO }} </td>
@@ -87,6 +87,6 @@ Solon Sentinel Portal - Manifest Orders
             ],
         });
     });
-    
+
 </script>
 @endsection

Modules/M3/Resources/views/liberty-theme/pages/OrderLinesOfClosed.blade.php

@@ -19,7 +19,7 @@
                     <div class="card-header">
                         <form class="needs-validation"  enctype="multipart/form-data" method="GET" action="{{ route("m3.OrderLinesOfClosedOrder") }}">
                             <div class="row d-flex flex-row align-items-center">
-                                @php 
+                                @php
                                     $REPORTDATEDisp   = old('REPORTDATEDisp') ?? \DateTime::createFromFormat('Ymd',$REPORTDATEDisp)->format('Y-m-d');
                                 @endphp
                                 <div class="col">
@@ -32,8 +32,8 @@
                                     <select class="form-select"  id="WHDDA" aria-label="WHDD" tabindex="-1" disabled>
                                         @foreach ($IC670M as $key => $IC670MR)
                                             @php $currentWHDDA =  trim($IC670MR->WDCO).trim($IC670MR->WDPL).trim($IC670MR->WDWHS); @endphp
-                                            <option  value="{{ $currentWHDDA }}" 
-                                                data-comp="{{ trim($IC670MR->WDCO) }}" data-pl="{{ trim($IC670MR->WDPL) }}" data-wh="{{ trim($IC670MR->WDWHS) }}" 
+                                            <option  value="{{ $currentWHDDA }}"
+                                                data-comp="{{ trim($IC670MR->WDCO) }}" data-pl="{{ trim($IC670MR->WDPL) }}" data-wh="{{ trim($IC670MR->WDWHS) }}"
                                                 {{ ($WHDDA!='' && $WHDDA==$currentWHDDA) ? "selected" : ""  }}>
                                                 {{ trim(Str::upper($IC670MR->WDWNAM)) }}
                                             </option>
@@ -68,7 +68,7 @@
                                         <th>Close Date</th>
                                         <th>Delivery #</th>
                                         <th>Order #</th>
-                                        
+
                                         <th>Terms</th>
                                         <th>Weight</th>
                                         <th>Carrier</th>
@@ -255,7 +255,7 @@
             ],
             footerCallback: function (row, data, start, end, display) {
                 let api = this.api();
-        
+
                 // Remove the formatting to get integer data for summation
                 let intVal = function (i) {
                     return typeof i === 'string'
@@ -264,19 +264,19 @@
                         ? i
                         : 0;
                 };
-        
+
                 // Total over all pages
                 total = api
                     .column(13)
                     .data()
                     .reduce((a, b) => intVal(a) + intVal(b), 0);
-        
+
                 // Update footer
-                api.column(13).footer().innerHTML = total.toLocaleString('en-US', { minimumFractionDigits: 2, maximumFractionDigits: 2 });;  
+                api.column(13).footer().innerHTML = total.toLocaleString('en-US', { minimumFractionDigits: 2, maximumFractionDigits: 2 });;
             }
         });
 
-        // Update Division/WH/Plant on Warehouse change 
+        // Update Division/WH/Plant on Warehouse change
         $(document).on('change select','#WHDDA',function(){
             $("#COMPANY").val($(this).find("option:selected").data("comp"));
             $("#PLANT").val($(this).find("option:selected").data("pl"));

Modules/M3/Resources/views/liberty-theme/pages/ReplenishSettings.blade.php

@@ -43,7 +43,7 @@
                                 <td> {{ $val->R658RQ }} </td>
                                 <td> {{ $val->R658TL }} </td>
                                 <td> {{ $val->R658RMQ }} </td>
-                                <td class="text-center"> 
+                                <td class="text-center">
                                     {!! ($val->R658IZLCF ?? '')=='1' ? '<i class="fas fa-lg fa-check"></i>' :'<i class="fas fa-lg fa-times"></i>'  !!}
                                 </td>
                                 <td>
@@ -52,7 +52,7 @@
                                         data-part="{{ trim($val->R658PN) }}" data-wh="{{ trim($val->R658WH) }}"
                                         data-minqty="{{ trim($val->R658MQ) }}" data-repqty="{{ trim($val->R658RQ) }}"
                                         data-repminqty="{{ trim($val->R658RMQ) }}" data-tol="{{ trim($val->R658TL) }}"
-                                        data-controlled="{{ trim($val->R658IZLCF) }}" 
+                                        data-controlled="{{ trim($val->R658IZLCF) }}"
                                         title="Edit Replenishment">
                                         Edit
                                     </button>
@@ -118,7 +118,7 @@
                                 <select class="form-select"  id="WHDDA" aria-label="WHDD" tabindex="4" required>
                                     <option value="">Select Warehouse</option>
                                     @foreach ($IC670M as $key => $IC670MR)
-                                        <option  value="{{ trim($IC670MR->WDCO).trim($IC670MR->WDPL).trim($IC670MR->WDWHS) }}" 
+                                        <option  value="{{ trim($IC670MR->WDCO).trim($IC670MR->WDPL).trim($IC670MR->WDWHS) }}"
                                         data-comp="{{ trim($IC670MR->WDCO) }}" data-pl="{{ trim($IC670MR->WDPL) }}" data-wh="{{ trim($IC670MR->WDWHS) }}" >
                                             {{ trim(Str::upper($IC670MR->WDWNAM)) }}
                                         </option>
@@ -202,7 +202,7 @@
                                 <select class="form-select"  id="WHDD" aria-label="WHDD" tabindex="4" disabled>
                                     <option value="">Select Warehouse</option>
                                     @foreach ($IC670M as $key => $IC670MR)
-                                        <option  value="{{ trim($IC670MR->WDCO).trim($IC670MR->WDPL).trim($IC670MR->WDWHS) }}" 
+                                        <option  value="{{ trim($IC670MR->WDCO).trim($IC670MR->WDPL).trim($IC670MR->WDWHS) }}"
                                             data-comp="{{ trim($IC670MR->WDCO) }}" data-pl="{{ trim($IC670MR->WDPL) }}" data-wh="{{ trim($IC670MR->WDWHS) }}" >
                                             {{ trim(Str::upper($IC670MR->WDWNAM)) }}
                                         </option>
@@ -228,7 +228,7 @@
                             </div>
 
                         </div>
-                        
+
                     </div>
                     <div class="modal-footer">
                         <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
@@ -456,10 +456,10 @@ $(document).ready(function() {
             }
         ]
     });
-    
+
     var myTable = $('#datatablesSimple5').DataTable({});
 
-    // Update Division/WH/Plant on Warehouse change 
+    // Update Division/WH/Plant on Warehouse change
     $(document).on('change select','#WHDDA',function(){
         $("#R658COA").val($(this).find("option:selected").data("comp"));
         $("#R658PLA").val($(this).find("option:selected").data("pl"));
@@ -472,7 +472,7 @@ $(document).ready(function() {
         $("#editReplen").trigger('reset');
 
         // console.log($(this).data("comp").toString() + $(this).data("pl").toString() + $(this).data("wh").toString() );
-        // Set WH name 
+        // Set WH name
         WHDD = $(this).data("comp").toString() + $(this).data("pl").toString() + $(this).data("wh").toString();
         $("#WHDD").val(WHDD);
 
@@ -495,13 +495,13 @@ $(document).ready(function() {
         editModal.show();
     });
 
-    // Add Record Btn 
+    // Add Record Btn
     $(document).on('click', '#addRecordBtn', function() {
         $("#addReplen").trigger('reset');
         addModal.show();
     });
 
-    // Delete Record 
+    // Delete Record
     $(document).on('click', '.deleterefcat', function() {
         R658PN = $(this).data("part");
         R658CO = $(this).data("comp");
@@ -533,7 +533,7 @@ $(document).ready(function() {
 
     });
 
-    // Check Record Exist  
+    // Check Record Exist
     checkRecordExist = function(form_post){
         $.ajax({
             url: "{{ route('m3.replenishmentSettingsExist') }}",
@@ -550,7 +550,7 @@ $(document).ready(function() {
             error: function(error) {}
         });
     }
-            
+
 });
 
 // Validate Add Record before Submit
@@ -566,8 +566,8 @@ function validateAdd() {
     $.trim($("#R658PLA").val())  == "" ? $("#R658PLA").addClass("is-invalid")  : $("#R658PLA").removeClass("is-invalid");
     $.trim($("#R658WHA").val())  == "" ? $("#R658WHA").addClass("is-invalid")  : $("#R658WHA").removeClass("is-invalid");
 
-    if ($.trim($("#R658LCA").val()) == "" || $.trim($("#R658PNA").val()) == "" || $.trim($("#R658MQA").val()) == "" || $.trim($("#R658RQA").val()) == "" 
-    || $.trim($("#R658RMQA").val()) == "" || $.trim($("#R658TLA").val()) == "" || $.trim($("#R658COA").val()) == "" || $.trim($("#R658PLA").val()) == "" || 
+    if ($.trim($("#R658LCA").val()) == "" || $.trim($("#R658PNA").val()) == "" || $.trim($("#R658MQA").val()) == "" || $.trim($("#R658RQA").val()) == ""
+    || $.trim($("#R658RMQA").val()) == "" || $.trim($("#R658TLA").val()) == "" || $.trim($("#R658COA").val()) == "" || $.trim($("#R658PLA").val()) == "" ||
     $.trim($("#R658WHA").val()) == "" ) {
         return false;
     }

Modules/M3/Resources/views/liberty-theme/pages/WhsPerfMetrics.blade.php

@@ -9,7 +9,7 @@ Warehouse Performance Metrics report
             <div class="card-header">
                 <form class="needs-validation"  enctype="multipart/form-data" method="GET" action="{{ route("m3.OrderLinesOfClosedOrder") }}">
                     <div class="row d-flex flex-row align-items-center">
-                        @php 
+                        @php
                             // $REPORTDATEDisp   = old('REPORTDATEDisp') ?? \DateTime::createFromFormat('Ymd',$REPORTDATEDisp)->format('Y-m-d');
                         @endphp
                         {{-- <div class="col">
@@ -22,8 +22,8 @@ Warehouse Performance Metrics report
                             <select class="form-select"  id="WHDDA" aria-label="WHDD" tabindex="-1" disabled>
                                 @foreach ($IC670M as $key => $IC670MR)
                                     @php $currentWHDDA =  trim($IC670MR->WDCO).trim($IC670MR->WDPL).trim($IC670MR->WDWHS); @endphp
-                                    <option  value="{{ $currentWHDDA }}" 
-                                        data-comp="{{ trim($IC670MR->WDCO) }}" data-pl="{{ trim($IC670MR->WDPL) }}" data-wh="{{ trim($IC670MR->WDWHS) }}" 
+                                    <option  value="{{ $currentWHDDA }}"
+                                        data-comp="{{ trim($IC670MR->WDCO) }}" data-pl="{{ trim($IC670MR->WDPL) }}" data-wh="{{ trim($IC670MR->WDWHS) }}"
                                         {{ ($WHDDA!='' && $WHDDA==$currentWHDDA) ? "selected" : ""  }}>
                                         {{ trim(Str::upper($IC670MR->WDWNAM)) }}
                                     </option>
@@ -63,7 +63,7 @@ Warehouse Performance Metrics report
 @section('scripts')
 <script>
     $(document).ready(function() {
-        // Update Division/WH/Plant on Warehouse change 
+        // Update Division/WH/Plant on Warehouse change
         $(document).on('change select','#WHDDA',function(){
             $("#COMPANY").val($(this).find("option:selected").data("comp"));
             $("#PLANT").val($(this).find("option:selected").data("pl"));

Modules/M3/Resources/views/liberty-theme/pages/carrierMaint.blade.php

@@ -10,7 +10,7 @@
         <div class="card mb-4">
             <div class="card-header">
                 @if(isset($power_user[0]) && trim((string) ($power_user[0]->R428PWRUSR ?? '')) === 'Y')
-                <button name="carrierAdd" type="button" class="btn btn-sm btn-info carrierAdd_click" id="carrierAdd_click" 
+                <button name="carrierAdd" type="button" class="btn btn-sm btn-info carrierAdd_click" id="carrierAdd_click"
                     data-AT9DPW="{{ ($power_user[0]->R428CO ?? '').($power_user[0]->R428PL ?? '').($power_user[0]->R428WH ?? '') }}">Add Record</button>
                 @endif
                 <!-- data-AT9DPW="$co.$plant.$whs">Add Record</button> -->
@@ -32,7 +32,7 @@
                         </tr>
                     </thead>
                     <tbody>
-                    <!-- if($no_data=="Y") 
+                    <!-- if($no_data=="Y")
                         <tr> <td colspan=10 style="text-align:center; background-color:yellow"> <b>No data retrieved for this user</b> <td> <tr>
                     else -->
                         @foreach($ICM160M as $key=>$val)
@@ -40,9 +40,9 @@
                                 <td></td>
                                 <td align="center">
                                     @if(isset($power_user[0]) && trim((string) ($power_user[0]->R428PWRUSR ?? '')) === 'Y')
-                                    <button name="carrierEdit{{trim($val->CANUM)}}" type="submit" class="btn btn-sm btn-info carrierEdit_click" id="carrierEdit_click" 
-                                    data-CANUM="{{trim($val->CANUM)}}" data-CANAM="{{trim($val->CANAM)}}" data-TWOSHIPCARRIERCODE="{{trim($val->TWOSHIPCARRIERCODE)}}" 
-                                    data-PARCELCARRIERCODE="{{trim($val->PARCELCARRIERCODE)}}" data-CASPR10A01="{{trim($val->CASPR10A01)}}" 
+                                    <button name="carrierEdit{{trim($val->CANUM)}}" type="submit" class="btn btn-sm btn-info carrierEdit_click" id="carrierEdit_click"
+                                    data-CANUM="{{trim($val->CANUM)}}" data-CANAM="{{trim($val->CANAM)}}" data-TWOSHIPCARRIERCODE="{{trim($val->TWOSHIPCARRIERCODE)}}"
+                                    data-PARCELCARRIERCODE="{{trim($val->PARCELCARRIERCODE)}}" data-CASPR10A01="{{trim($val->CASPR10A01)}}"
                                     data-CASPR1A01="{{trim($val->CASPR1A01)}}"
                                     >Edit</button>
                                     @endif
@@ -101,7 +101,7 @@
             } else {
                 $("#PARCELCARRIERCODE").val(" ");
             }
-        }); 
+        });
 
         $("#addPARCELCARRIERCODE").change(function() {
             if($(this).is(":checked")) {
@@ -109,7 +109,7 @@
             } else {
                 $("#addPARCELCARRIERCODE").val(" ");
             }
-        }); 
+        });
 
         $("#CASPR1A01").change(function() {
             if($(this).is(":checked")) {
@@ -117,7 +117,7 @@
             } else {
                 $("#CASPR1A01").val(" ");
             }
-        }); 
+        });
 
         $("#addCASPR1A01").change(function() {
             if($(this).is(":checked")) {
@@ -125,7 +125,7 @@
             } else {
                 $("#addCASPR1A01").val(" ");
             }
-        }); 
+        });
 
         //
         // Open Modal Carrier Edit
@@ -188,7 +188,7 @@
 
             var changes_detected = 0;
             var errors_found = 0;
-            
+
             // Get the right Values
             if($("#PARCELCARRIERCODE").is(":checked")) {
                 $("#PARCELCARRIERCODE").val("X");
@@ -241,15 +241,15 @@
                 $("#PARCELCARRIERCODE").focus();
                 errors_found=1;
             }
-            
+
             if(errors_found==0) {
 
                 var csrf = document.querySelector('meta[name="csrf-token"]').content;
-                var form_post = {    
+                var form_post = {
                     'CANUM':                NEW_CANUM,
-                    'CANAM':                NEW_CANAM, 
-                    'TWOSHIPCARRIERCODE':   NEW_TWOSHIPCARRIERCODE, 
-                    'PARCELCARRIERCODE':    NEW_PARCELCARRIERCODE, 
+                    'CANAM':                NEW_CANAM,
+                    'TWOSHIPCARRIERCODE':   NEW_TWOSHIPCARRIERCODE,
+                    'PARCELCARRIERCODE':    NEW_PARCELCARRIERCODE,
                     'CASPR10A01':           NEW_CASPR10A01,
                     'CASPR1A01':            NEW_CASPR1A01,
                     '_token': csrf
@@ -329,11 +329,11 @@
             var NEW_CASPR1A01           = $("#addCASPR1A01").val();
 
             var csrf = document.querySelector('meta[name="csrf-token"]').content;
-            var form_post = {    
+            var form_post = {
                 'CANUM':                NEW_CANUM,
-                'CANAM':                NEW_CANAM, 
-                'TWOSHIPCARRIERCODE':   NEW_TWOSHIPCARRIERCODE, 
-                'PARCELCARRIERCODE':    NEW_PARCELCARRIERCODE, 
+                'CANAM':                NEW_CANAM,
+                'TWOSHIPCARRIERCODE':   NEW_TWOSHIPCARRIERCODE,
+                'PARCELCARRIERCODE':    NEW_PARCELCARRIERCODE,
                 'CASPR10A01':           NEW_CASPR10A01,
                 'CASPR1A01':            NEW_CASPR1A01,
                 '_token': csrf
@@ -401,9 +401,9 @@
                 });
             }
         });
-    });        
+    });
 
     //});
-    
+
 </script>
 @endsection

Modules/M3/Resources/views/liberty-theme/pages/dashboard.blade.php

@@ -33,7 +33,7 @@ Sentinel API
 
     $(function() {
 
-    });    
+    });
 
 </script>
 @endsection

Modules/M3/Resources/views/liberty-theme/pages/execSummary.blade.php

@@ -214,7 +214,7 @@
 
                 if (isDisabled) {
                     $('#TOREPORTDATEDIV').hide();
-                    // toMonthPicker.input.style.backgroundColor = '#e9ecef'; 
+                    // toMonthPicker.input.style.backgroundColor = '#e9ecef';
                     // toMonthPicker.input.style.cursor = 'not-allowed';
 
                     // Set fromMonthPicker to today
@@ -374,14 +374,14 @@
                                 // Calculate hue variations based on period type
                                 let salesHue = HUE_BLUE;
                                 let weightHue = HUE_GREEN;
-                                
+
                                 // Adjust hue for quarters only
                                 if (period.startsWith("Q")) {
                                     const quarterNum = parseInt(period.substring(1));
                                     salesHue = HUE_BLUE + (quarterNum - 1) * 15;
                                     weightHue = HUE_GREEN + (quarterNum - 1) * 15;
                                 }
-                                
+
                                 // For monthly periods (odd/even), use slight variations
                                 if (period === "odd") {
                                     salesHue = HUE_BLUE + 5;
@@ -390,19 +390,19 @@
                                     salesHue = HUE_BLUE + 20;
                                     weightHue = HUE_GREEN + 20;
                                 }
-                                
+
                                 // Create color maps for each WHS within this period
                                 salesColorMap[period] = {};
                                 weightColorMap[period] = {};
                                 linesColorMap[period] = {};
-                                
+
                                 // Generate different shades for each WHS - darker to lighter
                                 whsArray.forEach((whs, whsIndex) => {
                                     // Vary lightness by WHS - start darker (25%) and get lighter
                                     // Reverse the WHS index calculation to go from dark to light
                                     const reversedIndex = whsArray.length - 1 - whsIndex;
                                     const lightness = 45 + (reversedIndex % 8) * 6;
-                                    
+
                                     // Assign colors for each metric
                                     salesColorMap[period][whs] = `hsl(${salesHue}, 85%, ${lightness}%)`;
                                     weightColorMap[period][whs] = `hsl(${weightHue}, 85%, ${lightness}%)`;
@@ -413,7 +413,7 @@
                             // Function to get the appropriate color based on time period, metric, and WHS
                             function getDatasetColor(yearLabel, metric, whs) {
                                 const period = getTimePeriod(yearLabel);
-                                
+
                                 if (metric === "Sales") {
                                     return salesColorMap[period]?.[whs] || `hsl(${HUE_BLUE}, 85%, 50%)`;
                                 } else if (metric === "Weight") {
@@ -421,7 +421,7 @@
                                 } else if (metric === "Lines") {
                                     return linesColorMap[period]?.[whs] || `hsl(${HUE_GREY}, 0%, 50%)`;
                                 }
-                                
+
                                 return "rgba(200, 200, 200, 0.6)"; // Default fallback
                             }
 
@@ -510,7 +510,7 @@
 
             });
 
-            //// Trigger Click on init 
+            //// Trigger Click on init
             $("#updateCharts").trigger("click");
 
         });

Modules/M3/Resources/views/liberty-theme/pages/execSummaryLine.blade.php

@@ -208,7 +208,7 @@
 
                 if (isDisabled) {
                     $('#TOREPORTDATEDIV').hide();
-                    // toMonthPicker.input.style.backgroundColor = '#e9ecef'; 
+                    // toMonthPicker.input.style.backgroundColor = '#e9ecef';
                     // toMonthPicker.input.style.cursor = 'not-allowed';
 
                     // Set fromMonthPicker to today
@@ -225,7 +225,7 @@
 
             //// Trigger Period change
             $('input[name="reportPeriod"]').trigger("change");
-            
+
             //// Update Charts
             $("#updateCharts").click(function() {
                 //// Validate Fields before calling Ajax
@@ -356,7 +356,7 @@
                                     const h = parseFloat(match[1]);
                                     const s = parseFloat(match[2]);
                                     const l = parseFloat(match[3]);
-                                    
+
                                     // Create lighter version by increasing lightness and reducing saturation
                                     return `hsl(${h}, ${Math.max(s - 20, 30)}%, ${Math.min(l + 15, 85)}%)`;
                                 }
@@ -367,7 +367,7 @@
                             let labels = [];
                             let datasets = [];
                             const whsSet = new Set();
-                            
+
                             // Initialize warehouse set from data
                             data.forEach(entry => whsSet.add(entry.whs));
                             if (dataLY) dataLY.forEach(entry => whsSet.add(entry.whs));
@@ -378,7 +378,7 @@
                                 // Extract unique year-month combinations
                                 const periodData = new Map();
                                 const monthNames = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"];
-                                
+
                                 // Process current year data
                                 data.forEach(entry => {
                                     const [year, month] = entry.year.split("-");
@@ -387,21 +387,21 @@
                                     const yearSuffix = year.substring(2); // Last 2 digits
                                     const periodKey  = `${monthName}`;    // '${yearSuffix}
                                     const periodKey2 = `${monthName} '${yearSuffix}`;
-                                    
+
                                     if (!periodData.has(periodKey)) {
                                         periodData.set(periodKey, { current: {}, ly: {} ,label: periodKey2 });
                                     }
-                                    
+
                                     const whsData = periodData.get(periodKey).current;
                                     if (!whsData[entry.whs]) {
                                         whsData[entry.whs] = { dollars: 0, weight: 0, lines: 0 };
                                     }
-                                    
+
                                     whsData[entry.whs].dollars += entry.dollars;
                                     whsData[entry.whs].weight += entry.weight;
                                     whsData[entry.whs].lines += entry.lines;
                                 });
-                                
+
                                 // Process last year data if available
                                 if (dataLY && dataLY.length > 0) {
                                     dataLY.forEach(entry => {
@@ -411,22 +411,22 @@
                                         const yearSuffix = year.substring(2); // Last 2 digits
                                         const periodKey = `${monthName}`;  // '${yearSuffix}
                                         const periodKey2 = `${monthName} '${yearSuffix}`;
-                                        
+
                                         if (!periodData.has(periodKey)) {
                                             periodData.set(periodKey, { current: {}, ly: {},label: periodKey2 });
                                         }
-                                        
+
                                         const whsData = periodData.get(periodKey).ly;
                                         if (!whsData[entry.whs]) {
                                             whsData[entry.whs] = { dollars: 0, weight: 0, lines: 0 };
                                         }
-                                        
+
                                         whsData[entry.whs].dollars += entry.dollars;
                                         whsData[entry.whs].weight += entry.weight;
                                         whsData[entry.whs].lines += entry.lines;
                                     });
                                 }
-                                
+
                                 // Sort labels chronologically
                                 labels = Array.from(periodData.keys()).sort((a, b) => {
                                     // Parse month and year
@@ -434,18 +434,18 @@
                                     const [monthB, yearB] = b.split(" '");
                                     const yearDiff = parseInt(yearA) - parseInt(yearB);
                                     if (yearDiff !== 0) return yearDiff;
-                                    
+
                                     // Compare months if same year
                                     const monthOrder = { "Jan": 1, "Feb": 2, "Mar": 3, "Apr": 4, "May": 5, "Jun": 6,"Jul": 7, "Aug": 8, "Sep": 9, "Oct": 10, "Nov": 11, "Dec": 12 };
                                     return monthOrder[monthA] - monthOrder[monthB];
                                 });
-                                
+
                                 // Generate colors for each WHS
                                 const whsColors = {};
                                 whsArray.forEach((whs, index) => {
                                     whsColors[whs] = generateDistinctColors(whsArray.length)[index];
                                 });
-                                
+
                                 // Create datasets for each metric and warehouse
                                 whsArray.forEach(whs => {
                                     if (checkSales === 'on') {
@@ -464,7 +464,7 @@
                                             tension: 0.3,
                                             fill: false
                                         });
-                                        
+
                                         // Sales dataset for last year
                                         if (dataLY && dataLY.length > 0) {
                                             datasets.push({
@@ -491,7 +491,7 @@
                                         datasets.push({
                                             type: 'line',
                                             label: `Weight TY (WHS ${whs})`,
-                                            data: labels.map(period => 
+                                            data: labels.map(period =>
                                                 periodData.get(period)?.current[whs]?.weight || 0
                                             ),
                                             borderColor: whsColors[whs],
@@ -501,13 +501,13 @@
                                             tension: 0.3,
                                             fill: false
                                         });
-                                        
+
                                         // Weight dataset for last year
                                         if (dataLY && dataLY.length > 0) {
                                             datasets.push({
                                                 type: 'line',
                                                 label: `Weight LY (WHS ${whs})`,
-                                                data: labels.map(period => 
+                                                data: labels.map(period =>
                                                     periodData.get(period)?.ly[whs]?.weight || 0
                                                 ),
                                                 borderColor: createLighterColor(whsColors[whs]),
@@ -526,7 +526,7 @@
                                         datasets.push({
                                             type: 'line',
                                             label: `Lines TY (WHS ${whs})`,
-                                            data: labels.map(period => 
+                                            data: labels.map(period =>
                                                 periodData.get(period)?.current[whs]?.lines || 0
                                             ),
                                             borderColor: whsColors[whs],
@@ -536,13 +536,13 @@
                                             tension: 0.3,
                                             fill: false
                                         });
-                                        
+
                                         // Lines dataset for last year
                                         if (dataLY && dataLY.length > 0) {
                                             datasets.push({
                                                 type: 'line',
                                                 label: `Lines LY (WHS ${whs})`,
-                                                data: labels.map(period => 
+                                                data: labels.map(period =>
                                                     periodData.get(period)?.ly[whs]?.lines || 0
                                                 ),
                                                 borderColor: createLighterColor(whsColors[whs]),
@@ -557,28 +557,28 @@
                                     }
                                 });
                             }
-                            
+
                             // Quarterly data format handling
                             else if (dataFormat === "quarterly") {
                                 // Extract unique years and quarters
                                 const yearsSet = new Set();
                                 const periodsSet = new Set();
-                                
+
                                 data.forEach(entry => {
                                     const [quarter, year] = entry.year.split("-");
                                     yearsSet.add(year);
                                     periodsSet.add(quarter);
                                 });
-                                
+
                                 const years = Array.from(yearsSet).sort();
-                                const periods = Array.from(periodsSet).sort((a, b) => 
+                                const periods = Array.from(periodsSet).sort((a, b) =>
                                     parseInt(a.substring(1)) - parseInt(b.substring(1))
                                 );
-                                
+
                                 // Create groupedData structure for quarters
                                 const groupedData = new Map();
                                 const groupedDataLY = new Map();
-                                
+
                                 // Initialize data structures
                                 years.forEach(year => {
                                     groupedData.set(year, new Map());
@@ -586,7 +586,7 @@
                                         groupedData.get(year).set(quarter, new Map());
                                     });
                                 });
-                                
+
                                 // Process current year data
                                 data.forEach(entry => {
                                     const [quarter, year] = entry.year.split("-");
@@ -601,13 +601,13 @@
                                             dollars: 0, weight: 0, lines: 0
                                         });
                                     }
-                                    
+
                                     const whsData = groupedData.get(year).get(quarter).get(entry.whs);
                                     whsData.dollars += entry.dollars;
                                     whsData.weight += entry.weight;
                                     whsData.lines += entry.lines;
                                 });
-                                
+
                                 // Process last year data if available
                                 if (dataLY && dataLY.length > 0) {
                                     // Initialize LY structure
@@ -617,7 +617,7 @@
                                             groupedDataLY.get(year).set(quarter, new Map());
                                         });
                                     });
-                                    
+
                                     dataLY.forEach(entry => {
                                         const [quarter, year] = entry.year.split("-");
                                         if (!groupedDataLY.has(year)) {
@@ -631,24 +631,24 @@
                                                 dollars: 0, weight: 0, lines: 0
                                             });
                                         }
-                                        
+
                                         const whsData = groupedDataLY.get(year).get(quarter).get(entry.whs);
                                         whsData.dollars += entry.dollars;
                                         whsData.weight += entry.weight;
                                         whsData.lines += entry.lines;
                                     });
                                 }
-                                
+
                                 // Set labels to quarters
                                 labels = periods;
-                                
+
                                 // Create color map for years
                                 const yearColors = {};
                                 const generatedColors = generateDistinctColors(years.length);
                                 years.forEach((year, index) => {
                                     yearColors[year] = generatedColors[index];
                                 });
-                                
+
                                 // Create datasets
                                 whsArray.forEach(whs => {
                                     years.forEach(year => {
@@ -657,7 +657,7 @@
                                             datasets.push({
                                                 type: 'line',
                                                 label: `Sales (WHS ${whs} - ${year})`,
-                                                data: periods.map(period => 
+                                                data: periods.map(period =>
                                                     groupedData.get(year)?.get(period)?.get(whs)?.dollars || 0
                                                 ),
                                                 borderColor: yearColors[year],
@@ -666,13 +666,13 @@
                                                 tension: 0.3,
                                                 fill: false
                                             });
-                                            
+
                                             // Last year sales
                                             if (dataLY && dataLY.length > 0) {
                                                 datasets.push({
                                                     type: 'line',
                                                     label: `Sales LY (WHS ${whs} - ${year})`,
-                                                    data: periods.map(period => 
+                                                    data: periods.map(period =>
                                                         groupedDataLY.get(year)?.get(period)?.get(whs)?.dollars || 0
                                                     ),
                                                     borderColor: yearColors[year],
@@ -685,13 +685,13 @@
                                                 });
                                             }
                                         }
-                                        
+
                                         if (checkWeight === 'on') {
                                             // Current year weight
                                             datasets.push({
                                                 type: 'line',
                                                 label: `Weight (WHS ${whs} - ${year})`,
-                                                data: periods.map(period => 
+                                                data: periods.map(period =>
                                                     groupedData.get(year)?.get(period)?.get(whs)?.weight || 0
                                                 ),
                                                 borderColor: yearColors[year],
@@ -701,13 +701,13 @@
                                                 tension: 0.3,
                                                 fill: false
                                             });
-                                            
+
                                             // Last year weight
                                             if (dataLY && dataLY.length > 0) {
                                                 datasets.push({
                                                     type: 'line',
                                                     label: `Weight LY (WHS ${whs} - ${year})`,
-                                                    data: periods.map(period => 
+                                                    data: periods.map(period =>
                                                         groupedDataLY.get(year)?.get(period)?.get(whs)?.weight || 0
                                                     ),
                                                     borderColor: yearColors[year],
@@ -720,13 +720,13 @@
                                                 });
                                             }
                                         }
-                                        
+
                                         if (checkLines === 'on') {
                                             // Current year lines
                                             datasets.push({
                                                 type: 'line',
                                                 label: `Lines (WHS ${whs} - ${year})`,
-                                                data: periods.map(period => 
+                                                data: periods.map(period =>
                                                     groupedData.get(year)?.get(period)?.get(whs)?.lines || 0
                                                 ),
                                                 borderColor: yearColors[year],
@@ -736,13 +736,13 @@
                                                 tension: 0.3,
                                                 fill: false
                                             });
-                                            
+
                                             // Last year lines
                                             if (dataLY && dataLY.length > 0) {
                                                 datasets.push({
                                                     type: 'line',
                                                     label: `Lines LY (WHS ${whs} - ${year})`,
-                                                    data: periods.map(period => 
+                                                    data: periods.map(period =>
                                                         groupedDataLY.get(year)?.get(period)?.get(whs)?.lines || 0
                                                     ),
                                                     borderColor: yearColors[year],
@@ -763,7 +763,7 @@
                                 // Group data by year/day and warehouse
                                 const groupedData = new Map();
                                 const groupedDataLY = new Map();
-                                
+
                                 // Process current year data
                                 data.forEach(entry => {
                                     if (!groupedData.has(entry.year)) {
@@ -774,13 +774,13 @@
                                             dollars: 0, weight: 0, lines: 0
                                         });
                                     }
-                                    
+
                                     const whsData = groupedData.get(entry.year).get(entry.whs);
                                     whsData.dollars += entry.dollars;
                                     whsData.weight += entry.weight;
                                     whsData.lines += entry.lines;
                                 });
-                                
+
                                 // Process last year data if available
                                 if (dataLY && dataLY.length > 0) {
                                     dataLY.forEach(entry => {
@@ -792,17 +792,17 @@
                                                 dollars: 0, weight: 0, lines: 0
                                             });
                                         }
-                                        
+
                                         const whsData = groupedDataLY.get(entry.year).get(entry.whs);
                                         whsData.dollars += entry.dollars;
                                         whsData.weight += entry.weight;
                                         whsData.lines += entry.lines;
                                     });
                                 }
-                                
+
                                 // Set labels to sorted years or days
                                 labels = Array.from(groupedData.keys()).sort();
-                                
+
                                 // Helper function to get time key
                                 function getTimeKey(yearLabel) {
                                     if (yearLabel.includes("Q")) {
@@ -814,7 +814,7 @@
                                     }
                                     return yearLabel;
                                 }
-                                
+
                                 // Create color map
                                 let uniqueKeys = new Set();
                                 data.forEach(item => {
@@ -832,22 +832,22 @@
                                     });
                                 });
                                 uniqueKeys = [...uniqueKeys];
-                                
+
                                 let colorMap = {};
                                 let generatedColors = generateDistinctColors(uniqueKeys.length);
                                 uniqueKeys.forEach((key, index) => {
                                     colorMap[key] = generatedColors[index];
                                 });
-                                
+
                                 // Function to get color
                                 function getDatasetColor(year, whs, metric, isLastYear = false) {
                                     const timeKey = getTimeKey(year);
-                                    const key = /^\d{2}$/.test(year) ? 
-                                        `${whs}_${metric}${isLastYear ? '_LY' : ''}` : 
+                                    const key = /^\d{2}$/.test(year) ?
+                                        `${whs}_${metric}${isLastYear ? '_LY' : ''}` :
                                         `${timeKey}_${whs}`;
                                     return colorMap[key] || "rgba(200, 200, 200, 0.6)";
                                 }
-                                
+
                                 // Create datasets
                                 whsArray.forEach(whs => {
                                     // Function to create dataset with unique colors
@@ -868,27 +868,27 @@
                                     if (checkSales === 'on') {
                                         // Current year data
                                         datasets.push(createDataset("Sales", "dollars", "Sales", 'yLeft', "Sales", false, groupedData));
-                                        
+
                                         // Last year data for daily format
                                         if ((dataFormat === "daily" || dataFormat === "yearly") && dataLY && dataLY.length > 0) {
                                             datasets.push(createDataset("Sales", "dollars", "Sales_LY", 'yLeft', "Sales", true, groupedDataLY));
                                         }
                                     }
-                                    
+
                                     if (checkWeight === 'on') {
                                         // Current year data
                                         datasets.push(createDataset("Weight", "weight", "Weight", 'yLeft', "Weight", false, groupedData));
-                                        
+
                                         // Last year data for daily/yearly format
                                         if ((dataFormat === "daily" || dataFormat === "yearly") && dataLY && dataLY.length > 0) {
                                             datasets.push(createDataset("Weight", "weight", "Weight_LY", 'yLeft', "Weight", true, groupedDataLY));
                                         }
                                     }
-                                    
+
                                     if (checkLines === 'on') {
                                         // Current year data
                                         datasets.push(createDataset("Lines", "lines", "Lines", 'yRight', "Lines", false, groupedData));
-                                        
+
                                         // Last year data for daily/yearly format
                                         if ((dataFormat === "daily" || dataFormat === "yearly") && dataLY && dataLY.length > 0) {
                                             datasets.push(createDataset("Lines", "lines", "Lines_LY", 'yRight', "Lines", true, groupedDataLY));
@@ -942,8 +942,8 @@
                                             x: {
                                                 title: {
                                                     display: true,
-                                                    text: dataFormat === "quarterly" ? 'Quarter' : 
-                                                        dataFormat === "monthly" ? 'Month' : 
+                                                    text: dataFormat === "quarterly" ? 'Quarter' :
+                                                        dataFormat === "monthly" ? 'Month' :
                                                         dataFormat === "daily" ? 'Day' : 'Year'
                                                 }
                                             }
@@ -984,7 +984,7 @@
                 //  End Ajax
             });
 
-            //// Trigger Click on init 
+            //// Trigger Click on init
             $("#updateCharts").trigger("click");
 
         });

Modules/M3/Resources/views/liberty-theme/pages/exedashboard.blade.php

@@ -13,16 +13,16 @@ Solon Sentinel Portal
         </div>
         <div class="card-body">
             <div class="card-body">
-                
+
                 <form>
-                    @csrf  
+                    @csrf
 
                     <div class="row mb-3">
                         <label for="inputEmail" class="col-sm-2 col-form-label">Date Range</label>
                             <div class="col-sm-10">
                                 <input value="{{ $starting }} - {{ $ending }}" id="text" name="dates" type="text"  aria-describedby="textHelpBlock" class="form-control">
                             </div>
-                    </div> 
+                    </div>
 
                     <div class="row mb-3">
                         <label for="inputWhs" class="col-sm-2 col-form-label">Warehouse</label>
@@ -30,13 +30,13 @@ Solon Sentinel Portal
                                 <select name="whs" class="form-control">
                                     <option value="*ALL">*ALL</option>
                                     @foreach($whs_array as $key)
-                                        <option value={{$key}}  
+                                        <option value={{$key}}
                                             @if($whs==$key) selected @endif
                                         >{{$key}}</option>
                                     @endforeach
                                 </select>
                             </div>
-                    </div> 
+                    </div>
 
                     <div class="form-group row">
                         <div class="col-xs-offset-2 col-xs-10">
@@ -58,7 +58,7 @@ Solon Sentinel Portal
                     {{($key=="IC")?'INTERCO':'EXTERNAL'}}
                 </div>
                 <div class="card-body">
-                
+
                 <figure class="highcharts-figure">
                 <div id="container{{($key=='IC')?'1':'2'}}"></div>
                 </figure>
@@ -112,7 +112,7 @@ if (s1 > s2){
 
 @foreach ($data as $key=>$value)
     var data{{$key}} = [
-    {id: '0.0',parent: '', name: 'Total', value: '{{ $data[$key]['total'] }}'}, 
+    {id: '0.0',parent: '', name: 'Total', value: '{{ $data[$key]['total'] }}'},
         { id: '1.1', parent: '0.0', name: 'Held', value: '{{ $data[$key]['HLD'] }}'},
             { id: '1.1.1', parent: '1.1', name: 'Financial Hold', value: '{{ $data[$key]['FinHld'] }}'},
                 { id: '1.1.1.1', parent: '1.1.1', name: 'Reserved', value: '{{ $data[$key]['FHResPick'] }}'},
@@ -142,7 +142,7 @@ title: { text: 'Interco Chart'},
 series: [{
     type: 'sunburst',
     data: dataIC,
-    
+
     allowDrillToNode: true,
     cursor: 'pointer',
     dataLabels: {
@@ -199,7 +199,7 @@ title: {  text: 'External Chart' },
 series: [{
     type: 'sunburst',
     data: dataEX,
-    
+
     allowDrillToNode: true,
     cursor: 'pointer',
     dataLabels: {
@@ -249,7 +249,7 @@ tooltip: {
 </script>
 
 <script>
-    
+
     $(document).ready(function() {
 
         // Date range init
@@ -272,6 +272,6 @@ tooltip: {
         });
 
     });
-        
+
 </script>
 @endsection

Modules/M3/Resources/views/liberty-theme/pages/fillBOL.blade.php

@@ -15,7 +15,7 @@
 								{{ session('success') }}
 							</div>
 						@endif
-						
+
 						@if(session('error'))
 							<div class="alert alert-danger">
 								{{ session('error') }}
@@ -51,9 +51,9 @@
     $(document).ready(function() {
 
 
-    });        
+    });
 
     //});
-    
+
 </script>
 @endsection

Modules/M3/Resources/views/liberty-theme/pages/fillBOL2.blade.php

@@ -15,7 +15,7 @@
 								{{ session('success') }}
 							</div>
 						@endif
-						
+
 						@if(session('error'))
 							<div class="alert alert-danger">
 								{{ session('error') }}
@@ -51,9 +51,9 @@
     $(document).ready(function() {
 
 
-    });        
+    });
 
     //});
-    
+
 </script>
 @endsection

Modules/M3/Resources/views/liberty-theme/pages/orderInquiry.blade.php

@@ -25,14 +25,14 @@ Solon Sentinel Portal - Order Inquiry
         <div class="card mb-4">
             <div class="card-header" style="line-height: 34px;">
                 <i class="fas fa-table me-1"></i>
-                
+
             </div>
             <div class="card-body">
                 <div class="card-body">
-                    
+
                     <form action="/gotoOrder" onSubmit="document.forms[0].order.value=document.forms[0].order.value+'-0';" method="POST">
-                        @csrf  
-                        
+                        @csrf
+
                         <div class="row mb-3">
                             <div class="col-sm-10">
                             <label for="inputOrder" class="col-sm-2 col-form-label">Please enter an order number</label>
@@ -40,7 +40,7 @@ Solon Sentinel Portal - Order Inquiry
                                 <input type="text" id="order" name="order" maxlength=6 length=4 aria-describedby="textHelpBlock">
                                 <button name="submit" type="submit" class="btn btn-primary">Submit</button>
                             </div>
-                        </div> 
+                        </div>
                     </form>
 
                 </div>

Modules/M3/Resources/views/liberty-theme/pages/ordersOnHoldReq.blade.php

@@ -29,21 +29,21 @@ Solon Sentinel Portal - Orders On Hold Summary
             </div>
             <div class="card-body">
                 <div class="card-body">
-                    
+
                     <form>
-                        @csrf  
-                        
+                        @csrf
+
                         <div class="row mb-3">
                             <div class="col-sm-10">
                             <label for="inputWhs" class="col-sm-2 col-form-label">Please choose Selling warehouse subset</label>
                                 @foreach($whs_list as $key => $val)
-                                    <input value="{{ $val->SLSRWH }}" id="whs" name="whs[]" type="checkbox" aria-describedby="textHelpBlock" 
+                                    <input value="{{ $val->SLSRWH }}" id="whs" name="whs[]" type="checkbox" aria-describedby="textHelpBlock"
                                     @if(array_key_exists($val->SLSRWH, $checked_whs)) checked @endif
-                                    > {{ $val->SLSRWH }} &nbsp; &nbsp; &nbsp;  
+                                    > {{ $val->SLSRWH }} &nbsp; &nbsp; &nbsp;
                                 @endforeach
                                 <button name="submit" type="submit" class="btn btn-primary">Submit</button>
                             </div>
-                        </div> 
+                        </div>
                     </form>
 
                 </div>
@@ -109,7 +109,7 @@ Solon Sentinel Portal - Orders On Hold Summary
             "columnDefs": [{ targets: [2, 3, 4, 5], className: 'dt-body-right' }, { targets: [1], className: 'dt-body-center' }],
             "footerCallback": function ( row, data, start, end, display ) {
             var api = this.api(), data;
- 
+
             // converting to interger to find total
             var intVal = function ( i ) {
                 return typeof i === 'string' ?
@@ -117,8 +117,8 @@ Solon Sentinel Portal - Orders On Hold Summary
                     typeof i === 'number' ?
                         i : 0;
             };
- 
-            // computing column Total of the complete result 
+
+            // computing column Total of the complete result
             var orderTotal = api
                 .column( 1 )
                 .data()
@@ -132,30 +132,30 @@ Solon Sentinel Portal - Orders On Hold Summary
                 .reduce( function (a, b) {
                     return intVal(a) + intVal(b);
                 }, 0 ).toFixed(2);
-				
+
 	        var whtotal = api
                 .column( 3 )
                 .data()
                 .reduce( function (a, b) {
                     return intVal(a) + intVal(b);
                 }, 0 ).toFixed(2);
-				
+
             var whtotalReserved = api
                 .column( 4 )
                 .data()
                 .reduce( function (a, b) {
                     return intVal(a) + intVal(b);
                 }, 0 ).toFixed(2);
-                    				
+
 	        var whtotalOnpick = api
             .column( 5 )
             .data()
             .reduce( function (a, b) {
                 return intVal(a) + intVal(b);
             }, 0 ).toFixed(2);
-			
-				
-            // Update footer by showing the total with the reference of the column index 
+
+
+            // Update footer by showing the total with the reference of the column index
             $( api.column( 0 ).footer() ).html('Total');
                 $( api.column( 1 ).footer() ).html(Intl.NumberFormat('en-US').format(orderTotal));
                 $( api.column( 2 ).footer() ).html('$ '+Intl.NumberFormat('en-US').format(totalTotal));

Modules/M3/Resources/views/liberty-theme/pages/ordersOnHoldReqOrder.blade.php

@@ -38,7 +38,7 @@
                 </ul>
             </div>
             <div class="card-body">
-                <div class="card-body">               
+                <div class="card-body">
                     <div class="tab-content" id="myTabContent">
                         <div class="tab-pane fade show active" id="order" role="tabpanel" aria-labelledby="order-tab">@include('m3::liberty-theme.partials.tabs.orders')</div>
                         <div class="tab-pane fade" id="details" role="tabpanel" aria-labelledby="details-tab">@include('m3::liberty-theme.partials.tabs.details')</div>
@@ -46,7 +46,7 @@
                     </div>
                 </div>
             </div>
-        </div>        
+        </div>
     </div>
 
     <!-- /.row -->
@@ -61,12 +61,12 @@
 
             $(document).on('click', '#DATE', function(e){
                 e.preventDefault();
-                $(this).attr("autocomplete", "off");  
+                $(this).attr("autocomplete", "off");
             });
 
             $(document).on('click', '#AMSPARE5', function(e){
                 e.preventDefault();
-                $(this).attr("autocomplete", "off");  
+                $(this).attr("autocomplete", "off");
             });
 
             $(document).on('click', '.close', function(e){
@@ -180,7 +180,7 @@
                     $('#blank-submit').html('Close');
                     $('#blank-close').addClass('close-modal3');
                     $('#blank-close').html('Back');
-                    $('#blank-modal').modal('show'); 
+                    $('#blank-modal').modal('show');
 
                 // Send ajax request
                 }else{
@@ -191,7 +191,7 @@
                         type:'POST',
                         url:'/ordersOnHoldReq/{{ $request->reason }}/{{ $request->order }}/saveShipToEdit',
                         data: {
-                            'SHSHA1': NEW_SHSHA1, 
+                            'SHSHA1': NEW_SHSHA1,
                             'SHSHA2': NEW_SHSHA2,
                             'SHSHCI': NEW_SHSHCI,
                             'SHSHST': NEW_SHSHST,
@@ -246,7 +246,7 @@
                     type:'POST',
                     url:'/ordersOnHoldReq/{{ $request->reason }}/{{ $request->order }}/saveShipToCheckBox',
                     data: {
-                        'check1': check1, 
+                        'check1': check1,
                         'check2': check2,
                         '_token': csrf
                     },
@@ -274,7 +274,7 @@
                         }
                     }
                 });
-                
+
             });
 
             // Comment editor / datatable tab

Modules/M3/Resources/views/liberty-theme/pages/ordersOnHoldReqReason.blade.php

@@ -49,7 +49,7 @@
                         </thead>
                         <tbody>
                         </tbody>
-                    </table>   
+                    </table>
                 </div>
             </div>
         </div>
@@ -78,7 +78,7 @@
                 { targets: [0, 1, 2, 3, 4, 5], className: 'text-center' }
             ],
         });
-        
+
     </script>
 
 

Modules/M3/Resources/views/liberty-theme/pages/palletQty.blade.php

@@ -10,7 +10,7 @@
         <div class="card mb-4">
             <div class="card-header">
                 @if($power_user->R428PWRUSR=="Y")
-                <button name="qtyAdd" type="button" class="btn btn-sm btn-info qtyAdd_click" id="qtyAdd_click" 
+                <button name="qtyAdd" type="button" class="btn btn-sm btn-info qtyAdd_click" id="qtyAdd_click"
                     data-AT9DPW="{{$power_user->R428CO.$power_user->R428PL.$power_user->R428WH}}">Add Record</button>
                 @endif
                 <!-- data-AT9DPW="$co.$plant.$whs">Add Record</button> -->
@@ -30,7 +30,7 @@
                         </tr>
                     </thead>
                     <tbody>
-                    <!-- if($no_data=="Y") 
+                    <!-- if($no_data=="Y")
                         <tr> <td colspan=10 style="text-align:center; background-color:yellow"> <b>No data retrieved for this user</b> <td> <tr>
                     else -->
                         @foreach($ICM709M as $key=>$val)
@@ -38,9 +38,9 @@
                                 <td></td>
                                 <td align="center">
                                     @if($power_user->R428PWRUSR=="Y")
-                                    <button name="qtyEdit{{trim($val->AT9PART)}}" type="submit" class="btn btn-sm btn-info qtyEdit_click" id="qtyEdit_click" 
-                                    data-AT9CO="{{$val->AT9CO}}" data-AT9PLT="{{trim($val->AT9PLT)}}" data-AT9WHS="{{trim($val->AT9WHS)}}" 
-                                    data-AT9PART="{{trim($val->AT9PART)}}" data-AT9QTY="{{$val->AT9QTY}}" data-AT9WRN="{{trim($val->AT9WRN)}}" 
+                                    <button name="qtyEdit{{trim($val->AT9PART)}}" type="submit" class="btn btn-sm btn-info qtyEdit_click" id="qtyEdit_click"
+                                    data-AT9CO="{{$val->AT9CO}}" data-AT9PLT="{{trim($val->AT9PLT)}}" data-AT9WHS="{{trim($val->AT9WHS)}}"
+                                    data-AT9PART="{{trim($val->AT9PART)}}" data-AT9QTY="{{$val->AT9QTY}}" data-AT9WRN="{{trim($val->AT9WRN)}}"
                                     data-AT9DPW="{{$val->AT9CO.$val->AT9PLT.$val->AT9WHS}}"
                                     >Edit</button>
                                     @endif
@@ -144,7 +144,7 @@
         $(document).on('click', '#submitQtyEdit', function() {
 
             var changes_detected = 0;
-            
+
             // Retrieve the values we need to pass on
             //var NEW_AT9CO      = $("#AT9CO").val();
             //var NEW_AT9PLT     = $("#AT9PLT").val();
@@ -194,9 +194,9 @@
                         url:'/palletQty/saveQtyEdit',
                         data: {
                             'AT9CO':      NEW_AT9CO,
-                            'AT9PLT':     NEW_AT9PLT, 
-                            'AT9WHS':     NEW_AT9WHS, 
-                            'AT9PART':    NEW_AT9PART, 
+                            'AT9PLT':     NEW_AT9PLT,
+                            'AT9WHS':     NEW_AT9WHS,
+                            'AT9PART':    NEW_AT9PART,
                             'AT9QTY':     NEW_AT9QTY,
                             'AT9WRN':     NEW_AT9WRN,
                             '_token': csrf
@@ -250,11 +250,11 @@
             var NEW_AT9WRN      = $("input[name=addAT9WRN]").val();
 
             var csrf = document.querySelector('meta[name="csrf-token"]').content;
-            var form_post = {    
+            var form_post = {
                 'AT9CO':    NEW_AT9CO,
-                'AT9PLT':   NEW_AT9PLT, 
-                'AT9WHS':   NEW_AT9WHS, 
-                'AT9PART':  NEW_AT9PART, 
+                'AT9PLT':   NEW_AT9PLT,
+                'AT9WHS':   NEW_AT9WHS,
+                'AT9PART':  NEW_AT9PART,
                 'AT9QTY':   NEW_AT9QTY,
                 'AT9WRN':   NEW_AT9WRN,
                 '_token': csrf
@@ -311,9 +311,9 @@
                 });
             }
         });
-    });        
+    });
 
     //});
-    
+
 </script>
 @endsection

Modules/M3/Resources/views/liberty-theme/pages/pendingClosure.blade.php

@@ -20,7 +20,7 @@ Solon Sentinel Portal - Trucks pending closure with M3
                     @php $unprocessedMan = implode(', ', $unprocessedArr); @endphp
                     <b><p style="background-color:tomato;">Manifests: {!! $unprocessedMan !!} have some orders that still have a header picking status of B, and may not have closed in M3. Please investigate</b>
                 @endif
-                
+
             </div>
             <div class="card-body">
                 <table class="table table-striped table-bordered table-hover" id="datatablesSimple5" width="100%">
@@ -47,7 +47,7 @@ Solon Sentinel Portal - Trucks pending closure with M3
                     <tbody>
                         @foreach($ICM705M1 as $key=>$val)
                             @php
-                                $closeinRed    = false; 
+                                $closeinRed    = false;
                                 $APLDCLOD      = trim($val->APLDCLOD)!="0" ? date('Y-m-d', strtotime($val->APLDCLOD)) : "";
                                 $APLDCLOT      = trim($val->APLDCLOT)!="0"?(strlen($val->APLDCLOT)==6?date('H:i:s', strtotime($val->APLDCLOT)):date('H:i:s', strtotime('0'.$val->APLDCLOT))):"";
                                 # Get current time as a timestamp
@@ -83,13 +83,13 @@ Solon Sentinel Portal - Trucks pending closure with M3
                                 <td>
                                     {{-- Link to Manifest Orders --}}
                                     @if( $val->APMANIFEST!="0" )
-                                        <a class="btn btn-link" target="_blank" href="{{ url('MFOrders', ['id' => trim($val->APMANIFEST)]) }}"> 
-                                            {{ trim($val->APMANIFEST)!="0"?$val->APMANIFEST:"" }} 
+                                        <a class="btn btn-link" target="_blank" href="{{ url('MFOrders', ['id' => trim($val->APMANIFEST)]) }}">
+                                            {{ trim($val->APMANIFEST)!="0"?$val->APMANIFEST:"" }}
                                         </a>
                                     @endif
                                     {{-- Close Button --}}
                                     @if( ($val->APMANIFEST!="0" && $val->APSPARE2!="P" && trim($val->APLDCLOD)!="") && !$closeinRed)
-                                        <button class="btn btn-sm btn-warning" id="submitManifest" data-shuser="{{trim($user)}}" data-manifest="{{trim($val->APMANIFEST)}}"  data-apco="{{trim($val->APCO)}}" data-apwhs="{{trim($val->APWHS)}}"> 
+                                        <button class="btn btn-sm btn-warning" id="submitManifest" data-shuser="{{trim($user)}}" data-manifest="{{trim($val->APMANIFEST)}}"  data-apco="{{trim($val->APCO)}}" data-apwhs="{{trim($val->APWHS)}}">
                                            Close
                                         </button>
                                     @elseif($val->APSPARE2=="P")
@@ -97,16 +97,16 @@ Solon Sentinel Portal - Trucks pending closure with M3
                                     @endif
                                 </td>
                                 {{-- MAK Show Retry Message instead of Contact MPBA --}}
-                                <td> {!! $val->APSPARE2=="P" && !$ManifestDelayed ? "In Process" : 
-                                        ( $val->APSPARE2=="P" && $ManifestDelayed ? 
+                                <td> {!! $val->APSPARE2=="P" && !$ManifestDelayed ? "In Process" :
+                                        ( $val->APSPARE2=="P" && $ManifestDelayed ?
                                             '<button class="btn btn-sm btn-danger" id="allowRetry"
                                                 data-shuser="' . trim($user) . '"
                                                 data-manifest="' . trim($val->APMANIFEST) . '"
                                                 data-apco="' . trim($val->APCO) . '"
                                                 data-apwhs="' . trim($val->APWHS) . '">
                                                 Failed – please reset
-                                            </button>' 
-                                        : '') 
+                                            </button>'
+                                        : '')
                                     !!}
                                 </td>
                                 <td> {{ $val->APDOCKDOOR }} </td>
@@ -179,9 +179,9 @@ Solon Sentinel Portal - Trucks pending closure with M3
         });
 
 
-        //  Submit Manifet 
+        //  Submit Manifet
         $(document).on('click','#submitManifest', function () {
-            if (confirm("Do you want to close this manifest in M3 immediately?")) { 
+            if (confirm("Do you want to close this manifest in M3 immediately?")) {
                 SHUSER   = $(this).data('shuser');
                 MANIFEST = $(this).data('manifest');
                 APCO     = $(this).data('apco');
@@ -225,7 +225,7 @@ Solon Sentinel Portal - Trucks pending closure with M3
 
         // Allow Retry
         $(document).on('click','#allowRetry', function () {
-            if (confirm("Do you want to allow manifest Closing?")) { 
+            if (confirm("Do you want to allow manifest Closing?")) {
                 SHUSER   = $(this).data('shuser');
                 MANIFEST = $(this).data('manifest');
                 APCO     = $(this).data('apco');
@@ -286,6 +286,6 @@ Solon Sentinel Portal - Trucks pending closure with M3
         });
 
     });
-    
+
 </script>
 @endsection

Modules/M3/Resources/views/liberty-theme/pages/userControl.blade.php

@@ -26,7 +26,7 @@
 
             <div class="card-body">
                 <div class="table-responsive">
-                
+
                 <table class="table table-striped table-bordered table-hover table-sm" id="datatablesSimple5" style="width:100%">
                     <thead>
                         <tr>
@@ -51,7 +51,7 @@
                         </tr>
                     </thead>
                     <tbody>
-                    <!-- if($no_data=="Y") 
+                    <!-- if($no_data=="Y")
                         <tr> <td colspan=10 style="text-align:center; background-color:yellow"> <b>No data retrieved for this user</b> <td> <tr>
                     else -->
                         @foreach($ICM428M as $key=>$val)
@@ -60,24 +60,24 @@
                                 <td align="center">
                                     @if($power_user[0]->R428PWRUSR=="Y" && trim($val->R428US)!="TWOSHIP" && trim($val->R428US)!="TWOSHIP303" && trim($val->R428US)!="TWOSHIP322")
                                         <!-- <a href="userControl/callCL?ACTION=P&USERID={{trim($val->R428US)}}">
-                                        <button name="userCallCLP{{trim($val->R428US)}}" type="submit" class="btn btn-sm btn-info userCallCL_click" 
+                                        <button name="userCallCLP{{trim($val->R428US)}}" type="submit" class="btn btn-sm btn-info userCallCL_click"
                                         title="Reset password for user {{trim($val->R428US)}}"
                                         ><i class="fas fa-lg fa-key"></i></button></a> -->
 
                                         @foreach($USER_INFO as $key2=>$val2)
                                             @if(trim($val2->USERPRF)==trim($val->R428US))
                                                 {{-- @if((trim($val2->STATUS)=="*DISABLED") ||
-                                                    (substr($val2->DATE_EXPIRED,0,10)!=NULL && substr($val2->DATE_EXPIRED,0,10)<=date('Y-m-d')) 
+                                                    (substr($val2->DATE_EXPIRED,0,10)!=NULL && substr($val2->DATE_EXPIRED,0,10)<=date('Y-m-d'))
                                                     || trim($val2->EXPIRED=='YES')) --}}
 
-                                                    <button name="userPassword{{trim($val->R428US)}}" type="submit" class="btn btn-sm btn-info userPassword_click" 
+                                                    <button name="userPassword{{trim($val->R428US)}}" type="submit" class="btn btn-sm btn-info userPassword_click"
                                                     id="userPassword_click"
                                                     title="Re-enable or Unexpire user {{trim($val->R428US)}}" data-R428US_PWD="{{trim($val->R428US)}}">
                                                     <i class="fas fa-lg fa-unlock-alt"></i></button>
                                                     @break
                                                 {{-- @elseif(trim($val2->STATUS)=="*DISABLED")
                                                     <a href="userControl/callCL?ACTION=R&USERID={{trim($val->R428US)}}">
-                                                    <button name="userCallCLR{{trim($val->R428US)}}" type="submit" class="btn btn-sm btn-info userCallCL_click"  
+                                                    <button name="userCallCLR{{trim($val->R428US)}}" type="submit" class="btn btn-sm btn-info userCallCL_click"
                                                     title="Re-enable user {{trim($val->R428US)}}"
                                                     ><i class="fas fa-lg fa-unlock-alt"></i></button></a>
                                                     @break  --}}
@@ -85,10 +85,10 @@
                                             @endif
                                         @endforeach
 
-                                        <button name="userEdit{{trim($val->R428US)}}" type="submit" class="btn btn-sm btn-info userEdit_click" id="userEdit_click" 
-                                        data-R428STS="{{$val->R428STS}}" data-R428US="{{trim($val->R428US)}}" data-R428FIRST="{{trim($val->R428FIRST)}}" 
-                                        data-R428FAMILY="{{trim($val->R428FAMILY)}}" data-R428EMAIL="{{trim(strtoLower($val->R428EMAIL))}}" 
-                                        data-R428EMPCDE="{{trim($val->R428EMPCDE)}}" data-R428ADMUSR="{{$val->R428ADMUSR}}" data-R428PWRUSR="{{$val->R428PWRUSR}}" 
+                                        <button name="userEdit{{trim($val->R428US)}}" type="submit" class="btn btn-sm btn-info userEdit_click" id="userEdit_click"
+                                        data-R428STS="{{$val->R428STS}}" data-R428US="{{trim($val->R428US)}}" data-R428FIRST="{{trim($val->R428FIRST)}}"
+                                        data-R428FAMILY="{{trim($val->R428FAMILY)}}" data-R428EMAIL="{{trim(strtoLower($val->R428EMAIL))}}"
+                                        data-R428EMPCDE="{{trim($val->R428EMPCDE)}}" data-R428ADMUSR="{{$val->R428ADMUSR}}" data-R428PWRUSR="{{$val->R428PWRUSR}}"
                                         data-R42811A="{{$val->R42811A}}"
                                         data-R42821A="{{$val->R42821A}}"
                                         data-R428DPW="{{$val->R428CO.$val->R428PL.$val->R428WH}}"
@@ -98,11 +98,11 @@
                                         data-MENU2OPT7="{{$val->MENU2OPT[6]}}" data-MENU2OPT8="{{$val->MENU2OPT[7]}}"
                                         data-MENU3OPT1="{{$val->MENU3OPT[0]}}" data-MENU3OPT2="{{$val->MENU3OPT[1]}}"
                                         data-MENU4OPT1="{{$val->MENU4OPT[0]}}" data-MENU4OPT2="{{$val->MENU4OPT[1]}}"
-                                        data-MENU4OPT3="{{$val->MENU4OPT[2]}}" 
+                                        data-MENU4OPT3="{{$val->MENU4OPT[2]}}"
                                         data-MENU5OPT1="{{$val->MENU5OPT[0]}}" data-MENU5OPT2="{{$val->MENU5OPT[1]}}"
                                         data-MENU5OPT3="{{$val->MENU5OPT[2]}}" data-MENU5OPT5="{{$val->MENU5OPT[4]}}"
                                         data-MENU6OPT1="{{$val->MENU6OPT[0]}}" data-MENU6OPT2="{{$val->MENU6OPT[1]}}"
-                                        data-MENU6OPT3="{{$val->MENU6OPT[2]}}" 
+                                        data-MENU6OPT3="{{$val->MENU6OPT[2]}}"
                                         title="Edit user {{trim($val->R428US)}} information">
                                         <i class="fas fa-edit " aria-hidden="true"></i></button>
                                     @endif
@@ -110,7 +110,7 @@
                                 <td> {{ $val->R428CO }} {{ $val->R428PL }} {{ $val->R428WH }} </td>
                                 <td>
                                     @foreach ($IC670M as $key => $IC670MR)
-                                        @if($IC670MR->WDCO==$val->R428CO && $IC670MR->WDPL==$val->R428PL && $IC670MR->WDWHS==$val->R428WH) 
+                                        @if($IC670MR->WDCO==$val->R428CO && $IC670MR->WDPL==$val->R428PL && $IC670MR->WDWHS==$val->R428WH)
                                             {{ trim(Str::upper($IC670MR->WDWNAM)) }}
                                             @break
                                         @endif
@@ -311,7 +311,7 @@
                 $("#R42821A").prop("checked", true);
             } else {
                 $("#R42821A").prop("checked", false);
-            } 
+            }
             // if($(this).data("menu2opt1")=='Y') {
             //     $("#MENU2OPT1").prop("checked", true);
             // } else {
@@ -442,7 +442,7 @@
             } else {
                 $("#R428STS").val("I");
             }
-        }); 
+        });
 
         // Change Admin user switch values (Edit)
         $("#R428ADMUSR").change(function() {
@@ -451,7 +451,7 @@
             } else {
                 $("#R428ADMUSR").val("N");
             }
-        }); 
+        });
 
         // Change Power user switch values (Edit)
         $("#R428PWRUSR").change(function() {
@@ -460,14 +460,14 @@
             } else {
                 $("#R428PWRUSR").val("N");
             }
-        }); 
+        });
         $("#R42811A").change(function() {
             if(this.checked) {
                 $("#R42811A").val("C");
             } else {
                 $("#R42811A").val("");
             }
-        }); 
+        });
 
         $("#R42821A").change(function() {
             if(this.checked) {
@@ -475,7 +475,7 @@
             } else {
                 $("#R42821A").val("N");
             }
-        }); 
+        });
 
         $("#MENU2OPT3").change(function() {
             if(this.checked) {
@@ -483,7 +483,7 @@
             } else {
                 $("#MENU2OPT3").val("N");
             }
-        }); 
+        });
 
         $("#MENU2OPT7").change(function() {
             if(this.checked) {
@@ -491,7 +491,7 @@
             } else {
                 $("#MENU2OPT7").val("N");
             }
-        }); 
+        });
 
         $("#MENU2OPT8").change(function() {
             if(this.checked) {
@@ -499,7 +499,7 @@
             } else {
                 $("#MENU2OPT8").val("N");
             }
-        }); 
+        });
 
         // Change Menu 3 Option switch values (Edit)
         $("#MENU3OPT1").change(function() {
@@ -508,7 +508,7 @@
             } else {
                 $("#MENU3OPT1").val("N");
             }
-        }); 
+        });
 
         $("#MENU3OPT2").change(function() {
             if(this.checked) {
@@ -516,7 +516,7 @@
             } else {
                 $("#MENU3OPT2").val("N");
             }
-        }); 
+        });
 
         // Change Menu 4 Option switch values (Edit)
         $("#MENU4OPT1").change(function() {
@@ -525,7 +525,7 @@
             } else {
                 $("#MENU4OPT1").val("N");
             }
-        }); 
+        });
 
         $("#MENU4OPT2").change(function() {
             if(this.checked) {
@@ -533,7 +533,7 @@
             } else {
                 $("#MENU4OPT2").val("N");
             }
-        }); 
+        });
 
         $("#MENU4OPT3").change(function() {
             if(this.checked) {
@@ -541,7 +541,7 @@
             } else {
                 $("#MENU4OPT3").val("N");
             }
-        }); 
+        });
 
         // Change Menu 5 Option switch values (Edit)
         $("#MENU5OPT1").change(function() {
@@ -550,7 +550,7 @@
             } else {
                 $("#MENU5OPT1").val("N");
             }
-        }); 
+        });
 
         $("#MENU5OPT2").change(function() {
             if(this.checked) {
@@ -558,7 +558,7 @@
             } else {
                 $("#MENU5OPT2").val("N");
             }
-        }); 
+        });
 
         $("#MENU5OPT3").change(function() {
             if(this.checked) {
@@ -566,7 +566,7 @@
             } else {
                 $("#MENU5OPT3").val("N");
             }
-        }); 
+        });
 
         $("#MENU5OPT5").change(function() {
             if(this.checked) {
@@ -574,7 +574,7 @@
             } else {
                 $("#MENU5OPT5").val("N");
             }
-        }); 
+        });
 
         // Change Menu 6 Option switch values (Edit)
         $("#MENU6OPT1").change(function() {
@@ -583,21 +583,21 @@
             } else {
                 $("#MENU6OPT1").val("N");
             }
-        }); 
+        });
         $("#MENU6OPT2").change(function() {
             if(this.checked) {
                 $("#MENU6OPT2").val("Y");
             } else {
                 $("#MENU6OPT2").val("N");
             }
-        }); 
+        });
         $("#MENU6OPT3").change(function() {
             if(this.checked) {
                 $("#MENU6OPT3").val("Y");
             } else {
                 $("#MENU6OPT3").val("N");
             }
-        }); 
+        });
 
         // Change Menu 2 Option switch values (Add)
         $("input[name=R428STS]").change(function() {
@@ -615,7 +615,7 @@
                 $("input[name=R428ADMUSR]").val("N");
             }
         });
-        
+
         $("input[name=R428PWRUSR]").change(function() {
             if(this.checked) {
                 $("input[name=R428PWRUSR]").val("Y");
@@ -796,7 +796,7 @@
         $(document).on('click', '#submitUserEdit', function() {
 
             var changes_detected = 0;
-            
+
             // Retrieve the values we need to pass on
             // R428DV R428PL R428WHS R428STS R428US R428FIRST R428FAMILY R428EMPCDE R428ADMUSR R428PWRUSR MENU2OPT -->
             var NEW_R428CO     = $("#R428DPW").val().substring(0,3);
@@ -817,28 +817,28 @@
 
             // var NEW_MENU2OPT1  = $("#MENU2OPT1").val();
             // var NEW_MENU2OPT2  = $("#MENU2OPT2").val();
-            var NEW_MENU2OPT3  = $("#MENU2OPT3").val(); 
+            var NEW_MENU2OPT3  = $("#MENU2OPT3").val();
             // var NEW_MENU2OPT4  = $("#MENU2OPT4").val();
             // var NEW_MENU2OPT5  = $("#MENU2OPT5").val();
             // var NEW_MENU2OPT6  = $("#MENU2OPT6").val();
             var NEW_MENU2OPT7  = $("#MENU2OPT7").val();
-            var NEW_MENU2OPT8  = $("#MENU2OPT8").val(); 
+            var NEW_MENU2OPT8  = $("#MENU2OPT8").val();
 
-            var NEW_MENU3OPT1  = $("#MENU3OPT1").val(); 
-            var NEW_MENU3OPT2  = $("#MENU3OPT2").val(); 
+            var NEW_MENU3OPT1  = $("#MENU3OPT1").val();
+            var NEW_MENU3OPT2  = $("#MENU3OPT2").val();
 
-            var NEW_MENU4OPT1  = $("#MENU4OPT1").val(); 
-            var NEW_MENU4OPT2  = $("#MENU4OPT2").val(); 
-            var NEW_MENU4OPT3  = $("#MENU4OPT3").val(); 
+            var NEW_MENU4OPT1  = $("#MENU4OPT1").val();
+            var NEW_MENU4OPT2  = $("#MENU4OPT2").val();
+            var NEW_MENU4OPT3  = $("#MENU4OPT3").val();
 
-            var NEW_MENU5OPT1  = $("#MENU5OPT1").val(); 
-            var NEW_MENU5OPT2  = $("#MENU5OPT2").val(); 
-            var NEW_MENU5OPT3  = $("#MENU5OPT3").val(); 
-            var NEW_MENU5OPT5  = $("#MENU5OPT5").val(); 
+            var NEW_MENU5OPT1  = $("#MENU5OPT1").val();
+            var NEW_MENU5OPT2  = $("#MENU5OPT2").val();
+            var NEW_MENU5OPT3  = $("#MENU5OPT3").val();
+            var NEW_MENU5OPT5  = $("#MENU5OPT5").val();
 
-            var NEW_MENU6OPT1  = $("#MENU6OPT1").val(); 
-            var NEW_MENU6OPT2  = $("#MENU6OPT2").val(); 
-            var NEW_MENU6OPT3  = $("#MENU6OPT3").val(); 
+            var NEW_MENU6OPT1  = $("#MENU6OPT1").val();
+            var NEW_MENU6OPT2  = $("#MENU6OPT2").val();
+            var NEW_MENU6OPT3  = $("#MENU6OPT3").val();
 
             // Retrieve old values
             var OLD_R428CO     = $("#OLD_R428CO").val();
@@ -858,28 +858,28 @@
 
             // var OLD_MENU2OPT1  = $("#OLD_MENU2OPT1").val();
             // var OLD_MENU2OPT2  = $("#OLD_MENU2OPT2").val();
-            var OLD_MENU2OPT3  = $("#OLD_MENU2OPT3").val(); 
+            var OLD_MENU2OPT3  = $("#OLD_MENU2OPT3").val();
             // var OLD_MENU2OPT4  = $("#OLD_MENU2OPT4").val();
             // var OLD_MENU2OPT5  = $("#OLD_MENU2OPT5").val();
             // var OLD_MENU2OPT6  = $("#OLD_MENU2OPT6").val();
             var OLD_MENU2OPT7  = $("#OLD_MENU2OPT7").val();
-            var OLD_MENU2OPT8  = $("#OLD_MENU2OPT8").val(); 
+            var OLD_MENU2OPT8  = $("#OLD_MENU2OPT8").val();
 
-            var OLD_MENU3OPT1  = $("#OLD_MENU3OPT1").val(); 
-            var OLD_MENU3OPT2  = $("#OLD_MENU3OPT2").val(); 
+            var OLD_MENU3OPT1  = $("#OLD_MENU3OPT1").val();
+            var OLD_MENU3OPT2  = $("#OLD_MENU3OPT2").val();
 
-            var OLD_MENU4OPT1  = $("#OLD_MENU4OPT1").val(); 
-            var OLD_MENU4OPT2  = $("#OLD_MENU4OPT2").val(); 
-            var OLD_MENU4OPT3  = $("#OLD_MENU4OPT3").val(); 
+            var OLD_MENU4OPT1  = $("#OLD_MENU4OPT1").val();
+            var OLD_MENU4OPT2  = $("#OLD_MENU4OPT2").val();
+            var OLD_MENU4OPT3  = $("#OLD_MENU4OPT3").val();
 
-            var OLD_MENU5OPT1  = $("#OLD_MENU5OPT1").val(); 
-            var OLD_MENU5OPT2  = $("#OLD_MENU5OPT2").val(); 
-            var OLD_MENU5OPT3  = $("#OLD_MENU5OPT3").val(); 
-            var OLD_MENU5OPT5  = $("#OLD_MENU5OPT5").val(); 
+            var OLD_MENU5OPT1  = $("#OLD_MENU5OPT1").val();
+            var OLD_MENU5OPT2  = $("#OLD_MENU5OPT2").val();
+            var OLD_MENU5OPT3  = $("#OLD_MENU5OPT3").val();
+            var OLD_MENU5OPT5  = $("#OLD_MENU5OPT5").val();
 
-            var OLD_MENU6OPT1  = $("#OLD_MENU6OPT1").val(); 
-            var OLD_MENU6OPT2  = $("#OLD_MENU6OPT2").val(); 
-            var OLD_MENU6OPT3  = $("#OLD_MENU6OPT3").val(); 
+            var OLD_MENU6OPT1  = $("#OLD_MENU6OPT1").val();
+            var OLD_MENU6OPT2  = $("#OLD_MENU6OPT2").val();
+            var OLD_MENU6OPT3  = $("#OLD_MENU6OPT3").val();
 
             // test fields that are not supposed to be blank/empty
             if (NEW_R428US=="" || NEW_R428FIRST=="" || NEW_R428FAMILY=="" || NEW_R428EMAIL=="" ) {
@@ -1021,7 +1021,7 @@
                 } else {
 
                     var csrf = document.querySelector('meta[name="csrf-token"]').content;
-                    
+
                     // console.log(NEW_R42821A); return false;
 
                     $.ajax({
@@ -1029,9 +1029,9 @@
                         url:'/userControl/saveUserEdit',
                         data: {
                             'R428CO':     NEW_R428CO,
-                            'R428PL':     NEW_R428PL, 
-                            'R428WH':     NEW_R428WH, 
-                            'R428STS':    NEW_R428STS, 
+                            'R428PL':     NEW_R428PL,
+                            'R428WH':     NEW_R428WH,
+                            'R428STS':    NEW_R428STS,
                             'R428US':     NEW_R428US,
                             'R428FIRST':  NEW_R428FIRST,
                             'R428FAMILY': NEW_R428FAMILY,
@@ -1043,24 +1043,24 @@
                             'R42821A':    NEW_R42821A,
                             // 'MENU2OPT1' : NEW_MENU2OPT1,
                             // 'MENU2OPT2' : NEW_MENU2OPT2,
-                            'MENU2OPT3' : NEW_MENU2OPT3, 
+                            'MENU2OPT3' : NEW_MENU2OPT3,
                             // 'MENU2OPT4' : NEW_MENU2OPT4,
                             // 'MENU2OPT5' : NEW_MENU2OPT5,
                             // 'MENU2OPT6' : NEW_MENU2OPT6,
                             'MENU2OPT7' : NEW_MENU2OPT7,
-                            'MENU2OPT8' : NEW_MENU2OPT8, 
-                            'MENU3OPT1' : NEW_MENU3OPT1, 
-                            'MENU3OPT2' : NEW_MENU3OPT2, 
-                            'MENU4OPT1' : NEW_MENU4OPT1, 
-                            'MENU4OPT2' : NEW_MENU4OPT2, 
-                            'MENU4OPT3' : NEW_MENU4OPT3, 
-                            'MENU5OPT1' : NEW_MENU5OPT1, 
-                            'MENU5OPT2' : NEW_MENU5OPT2, 
-                            'MENU5OPT3' : NEW_MENU5OPT3, 
-                            'MENU5OPT5' : NEW_MENU5OPT5, 
-                            'MENU6OPT1' : NEW_MENU6OPT1, 
-                            'MENU6OPT2' : NEW_MENU6OPT2, 
-                            'MENU6OPT3' : NEW_MENU6OPT3, 
+                            'MENU2OPT8' : NEW_MENU2OPT8,
+                            'MENU3OPT1' : NEW_MENU3OPT1,
+                            'MENU3OPT2' : NEW_MENU3OPT2,
+                            'MENU4OPT1' : NEW_MENU4OPT1,
+                            'MENU4OPT2' : NEW_MENU4OPT2,
+                            'MENU4OPT3' : NEW_MENU4OPT3,
+                            'MENU5OPT1' : NEW_MENU5OPT1,
+                            'MENU5OPT2' : NEW_MENU5OPT2,
+                            'MENU5OPT3' : NEW_MENU5OPT3,
+                            'MENU5OPT5' : NEW_MENU5OPT5,
+                            'MENU6OPT1' : NEW_MENU6OPT1,
+                            'MENU6OPT2' : NEW_MENU6OPT2,
+                            'MENU6OPT3' : NEW_MENU6OPT3,
                             '_token': csrf
                         },
                         success:function(data) {
@@ -1086,24 +1086,24 @@
                                 $("#R42821A").val(NEW_R42821A);
                                 // $("#MENU2OPT1").val(NEW_MENU2OPT1);
                                 // $("#MENU2OPT2").val(NEW_MENU2OPT2);
-                                $("#MENU2OPT3").val(NEW_MENU2OPT3); 
+                                $("#MENU2OPT3").val(NEW_MENU2OPT3);
                                 // $("#MENU2OPT4").val(NEW_MENU2OPT4);
                                 // $("#MENU2OPT5").val(NEW_MENU2OPT5);
                                 // $("#MENU2OPT6").val(NEW_MENU2OPT6);
                                 $("#MENU2OPT7").val(NEW_MENU2OPT7);
-                                $("#MENU2OPT8").val(NEW_MENU2OPT8); 
-                                $("#MENU3OPT1").val(NEW_MENU3OPT1); 
-                                $("#MENU3OPT2").val(NEW_MENU3OPT2); 
-                                $("#MENU4OPT1").val(NEW_MENU4OPT1); 
-                                $("#MENU4OPT2").val(NEW_MENU4OPT2); 
-                                $("#MENU4OPT3").val(NEW_MENU4OPT3); 
-                                $("#MENU5OPT1").val(NEW_MENU5OPT1); 
-                                $("#MENU5OPT2").val(NEW_MENU5OPT2); 
-                                $("#MENU5OPT3").val(NEW_MENU5OPT3); 
-                                $("#MENU5OPT5").val(NEW_MENU5OPT5); 
-                                $("#MENU6OPT1").val(NEW_MENU6OPT1); 
-                                $("#MENU6OPT2").val(NEW_MENU6OPT2); 
-                                $("#MENU6OPT3").val(NEW_MENU6OPT3); 
+                                $("#MENU2OPT8").val(NEW_MENU2OPT8);
+                                $("#MENU3OPT1").val(NEW_MENU3OPT1);
+                                $("#MENU3OPT2").val(NEW_MENU3OPT2);
+                                $("#MENU4OPT1").val(NEW_MENU4OPT1);
+                                $("#MENU4OPT2").val(NEW_MENU4OPT2);
+                                $("#MENU4OPT3").val(NEW_MENU4OPT3);
+                                $("#MENU5OPT1").val(NEW_MENU5OPT1);
+                                $("#MENU5OPT2").val(NEW_MENU5OPT2);
+                                $("#MENU5OPT3").val(NEW_MENU5OPT3);
+                                $("#MENU5OPT5").val(NEW_MENU5OPT5);
+                                $("#MENU6OPT1").val(NEW_MENU6OPT1);
+                                $("#MENU6OPT2").val(NEW_MENU6OPT2);
+                                $("#MENU6OPT3").val(NEW_MENU6OPT3);
                                 $("#OLD_R428CO").val(OLD_R428CO);
                                 $("#OLD_R428PL").val(OLD_R428PL);
                                 $("#OLD_R428WH").val(OLD_R428WH);
@@ -1120,24 +1120,24 @@
                                 $("#OLD_R42821A").val(OLD_R42821A);
                                 // $("#OLD_MENU2OPT1").val(OLD_MENU2OPT1);
                                 // $("#OLD_MENU2OPT2").val(OLD_MENU2OPT2);
-                                $("#OLD_MENU2OPT3").val(OLD_MENU2OPT3); 
+                                $("#OLD_MENU2OPT3").val(OLD_MENU2OPT3);
                                 // $("#OLD_MENU2OPT4").val(OLD_MENU2OPT4);
                                 // $("#OLD_MENU2OPT5").val(OLD_MENU2OPT5);
                                 // $("#OLD_MENU2OPT6").val(OLD_MENU2OPT6);
                                 $("#OLD_MENU2OPT7").val(OLD_MENU2OPT7);
-                                $("#OLD_MENU2OPT8").val(OLD_MENU2OPT8); 
-                                $("#OLD_MENU3OPT1").val(OLD_MENU3OPT1); 
-                                $("#OLD_MENU3OPT2").val(OLD_MENU3OPT2); 
-                                $("#OLD_MENU4OPT1").val(OLD_MENU4OPT1); 
-                                $("#OLD_MENU4OPT2").val(OLD_MENU4OPT2); 
-                                $("#OLD_MENU4OPT3").val(OLD_MENU4OPT3); 
-                                $("#OLD_MENU5OPT1").val(OLD_MENU5OPT1); 
-                                $("#OLD_MENU5OPT2").val(OLD_MENU5OPT2); 
-                                $("#OLD_MENU5OPT3").val(OLD_MENU5OPT3); 
-                                $("#OLD_MENU5OPT5").val(OLD_MENU5OPT5); 
-                                $("#OLD_MENU6OPT1").val(OLD_MENU6OPT1); 
-                                $("#OLD_MENU6OPT2").val(OLD_MENU6OPT2); 
-                                $("#OLD_MENU6OPT3").val(OLD_MENU6OPT3); 
+                                $("#OLD_MENU2OPT8").val(OLD_MENU2OPT8);
+                                $("#OLD_MENU3OPT1").val(OLD_MENU3OPT1);
+                                $("#OLD_MENU3OPT2").val(OLD_MENU3OPT2);
+                                $("#OLD_MENU4OPT1").val(OLD_MENU4OPT1);
+                                $("#OLD_MENU4OPT2").val(OLD_MENU4OPT2);
+                                $("#OLD_MENU4OPT3").val(OLD_MENU4OPT3);
+                                $("#OLD_MENU5OPT1").val(OLD_MENU5OPT1);
+                                $("#OLD_MENU5OPT2").val(OLD_MENU5OPT2);
+                                $("#OLD_MENU5OPT3").val(OLD_MENU5OPT3);
+                                $("#OLD_MENU5OPT5").val(OLD_MENU5OPT5);
+                                $("#OLD_MENU6OPT1").val(OLD_MENU6OPT1);
+                                $("#OLD_MENU6OPT2").val(OLD_MENU6OPT2);
+                                $("#OLD_MENU6OPT3").val(OLD_MENU6OPT3);
 
                                 if (data=="error profile") {
                                     //$('#blank-modal').modal('show');
@@ -1183,21 +1183,21 @@
             var NEW_R428PWRUSR  = $("input[name=R428PWRUSR]").val();
             var NEW_R42811A     = $("input[name=R42811A]").val();
             var NEW_R42821A     = $("input[name=R42821A]").val();
-            var NEW_MENU2OPT3   = $("input[name=MENU2OPT3]").val(); 
-            var NEW_MENU2OPT7   = $("input[name=MENU2OPT7]").val(); 
-            var NEW_MENU2OPT8   = $("input[name=MENU2OPT8]").val(); 
-            var NEW_MENU3OPT1   = $("input[name=MENU3OPT1]").val(); 
-            var NEW_MENU3OPT2   = $("input[name=MENU3OPT2]").val(); 
-            var NEW_MENU4OPT1   = $("input[name=MENU4OPT1]").val(); 
-            var NEW_MENU4OPT2   = $("input[name=MENU4OPT2]").val(); 
-            var NEW_MENU4OPT3   = $("input[name=MENU4OPT3]").val(); 
-            var NEW_MENU5OPT1   = $("input[name=MENU5OPT1]").val(); 
-            var NEW_MENU5OPT2   = $("input[name=MENU5OPT2]").val(); 
-            var NEW_MENU5OPT3   = $("input[name=MENU5OPT3]").val(); 
-            var NEW_MENU5OPT5   = $("input[name=MENU5OPT5]").val(); 
-            var NEW_MENU6OPT1   = $("input[name=MENU6OPT1]").val(); 
-            var NEW_MENU6OPT2   = $("input[name=MENU6OPT2]").val(); 
-            var NEW_MENU6OPT3   = $("input[name=MENU6OPT3]").val(); 
+            var NEW_MENU2OPT3   = $("input[name=MENU2OPT3]").val();
+            var NEW_MENU2OPT7   = $("input[name=MENU2OPT7]").val();
+            var NEW_MENU2OPT8   = $("input[name=MENU2OPT8]").val();
+            var NEW_MENU3OPT1   = $("input[name=MENU3OPT1]").val();
+            var NEW_MENU3OPT2   = $("input[name=MENU3OPT2]").val();
+            var NEW_MENU4OPT1   = $("input[name=MENU4OPT1]").val();
+            var NEW_MENU4OPT2   = $("input[name=MENU4OPT2]").val();
+            var NEW_MENU4OPT3   = $("input[name=MENU4OPT3]").val();
+            var NEW_MENU5OPT1   = $("input[name=MENU5OPT1]").val();
+            var NEW_MENU5OPT2   = $("input[name=MENU5OPT2]").val();
+            var NEW_MENU5OPT3   = $("input[name=MENU5OPT3]").val();
+            var NEW_MENU5OPT5   = $("input[name=MENU5OPT5]").val();
+            var NEW_MENU6OPT1   = $("input[name=MENU6OPT1]").val();
+            var NEW_MENU6OPT2   = $("input[name=MENU6OPT2]").val();
+            var NEW_MENU6OPT3   = $("input[name=MENU6OPT3]").val();
 
             // test fields that are not supposed to be blank/empty
             if (NEW_R428US=="" || NEW_R428FIRST=="" || NEW_R428FAMILY=="" || NEW_R428EMAIL=="" || NEW_R428DPW=="") {
@@ -1228,9 +1228,9 @@
                     url:'/userControl/saveUserAdd',
                     data: {
                         'R428CO':     NEW_R428CO,
-                        'R428PL':     NEW_R428PL, 
-                        'R428WH':     NEW_R428WH, 
-                        'R428STS':    NEW_R428STS, 
+                        'R428PL':     NEW_R428PL,
+                        'R428WH':     NEW_R428WH,
+                        'R428STS':    NEW_R428STS,
                         'R428US':     NEW_R428US,
                         'R428FIRST':  NEW_R428FIRST,
                         'R428FAMILY': NEW_R428FAMILY,
@@ -1240,21 +1240,21 @@
                         'R428PWRUSR': NEW_R428PWRUSR,
                         'R42811A':    NEW_R42811A,
                         'R42821A':    NEW_R42821A,
-                        'MENU2OPT3' : NEW_MENU2OPT3, 
-                        'MENU2OPT7' : NEW_MENU2OPT7, 
-                        'MENU2OPT8' : NEW_MENU2OPT8, 
-                        'MENU3OPT1' : NEW_MENU3OPT1, 
-                        'MENU3OPT2' : NEW_MENU3OPT2, 
-                        'MENU4OPT1' : NEW_MENU4OPT1, 
-                        'MENU4OPT2' : NEW_MENU4OPT2, 
-                        'MENU4OPT3' : NEW_MENU4OPT3, 
-                        'MENU5OPT1' : NEW_MENU5OPT1, 
-                        'MENU5OPT2' : NEW_MENU5OPT2, 
-                        'MENU5OPT3' : NEW_MENU5OPT3, 
-                        'MENU5OPT5' : NEW_MENU5OPT5, 
-                        'MENU6OPT1' : NEW_MENU6OPT1, 
-                        'MENU6OPT2' : NEW_MENU6OPT2, 
-                        'MENU6OPT3' : NEW_MENU6OPT3, 
+                        'MENU2OPT3' : NEW_MENU2OPT3,
+                        'MENU2OPT7' : NEW_MENU2OPT7,
+                        'MENU2OPT8' : NEW_MENU2OPT8,
+                        'MENU3OPT1' : NEW_MENU3OPT1,
+                        'MENU3OPT2' : NEW_MENU3OPT2,
+                        'MENU4OPT1' : NEW_MENU4OPT1,
+                        'MENU4OPT2' : NEW_MENU4OPT2,
+                        'MENU4OPT3' : NEW_MENU4OPT3,
+                        'MENU5OPT1' : NEW_MENU5OPT1,
+                        'MENU5OPT2' : NEW_MENU5OPT2,
+                        'MENU5OPT3' : NEW_MENU5OPT3,
+                        'MENU5OPT5' : NEW_MENU5OPT5,
+                        'MENU6OPT1' : NEW_MENU6OPT1,
+                        'MENU6OPT2' : NEW_MENU6OPT2,
+                        'MENU6OPT3' : NEW_MENU6OPT3,
                         '_token': csrf
                     },
                     success:function(data) {
@@ -1278,21 +1278,21 @@
                             $("#R428PWRUSR").val(NEW_R428PWRUSR);
                             $("#R42811A").val(NEW_R42811A);
                             $("#R42821A").val(NEW_R42821A);
-                            $("#MENU2OPT3").val(NEW_MENU2OPT3); 
-                            $("#MENU2OPT7").val(NEW_MENU2OPT7); 
-                            $("#MENU2OPT8").val(NEW_MENU2OPT8); 
-                            $("#MENU3OPT1").val(NEW_MENU3OPT1); 
-                            $("#MENU3OPT2").val(NEW_MENU3OPT2); 
-                            $("#MENU4OPT1").val(NEW_MENU4OPT1); 
-                            $("#MENU4OPT2").val(NEW_MENU4OPT2); 
-                            $("#MENU4OPT3").val(NEW_MENU4OPT3); 
-                            $("#MENU5OPT1").val(NEW_MENU5OPT1); 
-                            $("#MENU5OPT2").val(NEW_MENU5OPT2); 
-                            $("#MENU5OPT3").val(NEW_MENU5OPT3); 
-                            $("#MENU5OPT5").val(NEW_MENU5OPT5); 
-                            $("#MENU6OPT1").val(NEW_MENU6OPT1); 
-                            $("#MENU6OPT2").val(NEW_MENU6OPT2); 
-                            $("#MENU6OPT3").val(NEW_MENU6OPT3); 
+                            $("#MENU2OPT3").val(NEW_MENU2OPT3);
+                            $("#MENU2OPT7").val(NEW_MENU2OPT7);
+                            $("#MENU2OPT8").val(NEW_MENU2OPT8);
+                            $("#MENU3OPT1").val(NEW_MENU3OPT1);
+                            $("#MENU3OPT2").val(NEW_MENU3OPT2);
+                            $("#MENU4OPT1").val(NEW_MENU4OPT1);
+                            $("#MENU4OPT2").val(NEW_MENU4OPT2);
+                            $("#MENU4OPT3").val(NEW_MENU4OPT3);
+                            $("#MENU5OPT1").val(NEW_MENU5OPT1);
+                            $("#MENU5OPT2").val(NEW_MENU5OPT2);
+                            $("#MENU5OPT3").val(NEW_MENU5OPT3);
+                            $("#MENU5OPT5").val(NEW_MENU5OPT5);
+                            $("#MENU6OPT1").val(NEW_MENU6OPT1);
+                            $("#MENU6OPT2").val(NEW_MENU6OPT2);
+                            $("#MENU6OPT3").val(NEW_MENU6OPT3);
 
                             if (data=="success2") {
                                 $('#blank-modal').modal('hide');
@@ -1388,7 +1388,7 @@
                 $('#userPassword').modal('show');
                 alert("A password must be entered.");
                 $('#NEW_PASSWORD').focus();
-            } 
+            }
 //console.log('B2');
             var csrf = document.querySelector('meta[name="csrf-token"]').content;
 //console.log('B3');
@@ -1425,6 +1425,6 @@
     });
 
     //});
-    
+
 </script>
 @endsection

Modules/M3/Resources/views/liberty-theme/pages/userPickingStats4.blade.php

@@ -15,13 +15,13 @@ Solon Sentinel Portal - Daily User Efficiency
             <div class="card-body">
                 <div class="card-body">
                     <form>
-                        @csrf  
+                        @csrf
                         <div class="row mb-3">
                             <label for="inputEmail" class="col-sm-2 col-form-label">Date</label>
                             <div class="col-sm-10">
                                 <input value="{{ $starting }}" id="text" name="dates" type="text"  aria-describedby="textHelpBlock" class="form-control">
                             </div>
-                        </div> 
+                        </div>
                         <div class="row mb-3">
                         <label for="inputUser" class="col-sm-2 col-form-label">User</label>
                             <div class="col-sm-10">
@@ -34,9 +34,9 @@ Solon Sentinel Portal - Daily User Efficiency
                                     @endforeach
                                 </select>
                             </div>
-                        </div> 
+                        </div>
                         <div class="form-group row">
-                            <div class="col-xs-offset-2 col-xs-10"> 
+                            <div class="col-xs-offset-2 col-xs-10">
                                 <button name="submit" type="submit" class="btn btn-primary">Submit</button>
                             </div>
                         </div>
@@ -70,9 +70,9 @@ Solon Sentinel Portal - Daily User Efficiency
                         </tr>
                     </thead>
                     <tbody>
-                    @if($no_data=="Y") 
+                    @if($no_data=="Y")
                         <tr> <td colspan=12 style="text-align:center; background-color:yellow"> <b>No data retrieved for this user</b> <td> <tr>
-                    @else 
+                    @else
                         @foreach($statistic4 as $key=>$val)
                             <tr>
                                 <td></td>
@@ -85,10 +85,10 @@ Solon Sentinel Portal - Daily User Efficiency
                                 {{-- <!--<td style="text-align:right"> ${{ number_format($val->A5VALUE,2) }} </td>--> --}}
                                 <td style="text-align:right"> {{ number_format($val->A5PICKED,0) }} </td>
                                 <td style="text-align:right"> {{ $val->A5PART }} </td>
-                                <td style="text-align:left"> 
+                                <td style="text-align:left">
                                     <!-- <a href="http://{{$_SERVER['SERVER_NAME']}}:{{ (stristr($_SERVER['DOCUMENT_ROOT'],'liv')?$request->ports['live']:$request->ports['test'])}}/php/AllSentPkr.php?order={{$val->A5ONO}}&release={{$val->A5RLNO}}&shipment={{$val->A5SHNO}}">  -->
-                                    <a href="http://{{$_SERVER['HTTP_HOST']}}/php/AllSentPkr.php?order={{$val->A5ONO}}&release={{$val->A5RLNO}}&shipment={{$val->A5SHNO}}"> 
-                                    {{ $val->A5ONO }}-{{ $val->A5RLNO }}-{{ $val->A5SHNO }} 
+                                    <a href="http://{{$_SERVER['HTTP_HOST']}}/php/AllSentPkr.php?order={{$val->A5ONO}}&release={{$val->A5RLNO}}&shipment={{$val->A5SHNO}}">
+                                    {{ $val->A5ONO }}-{{ $val->A5RLNO }}-{{ $val->A5SHNO }}
                                     </a>
                                 </td>
                                 <td style="text-align:left"> {{ $val->A4SHSHNM }} </td>
@@ -179,7 +179,7 @@ Solon Sentinel Portal - Daily User Efficiency
                         </tr>
                 </table>
             </div>
-        </div>   
+        </div>
         <div class="card mb-4">
             <div class="card-header">
                 <i class="fas fa-table me-1"></i>
@@ -209,7 +209,7 @@ Solon Sentinel Portal - Daily User Efficiency
                     </tr>
                 </table>
             </div>
-        </div>   
+        </div>
 
     </div>
     <!-- /.row -->
@@ -241,6 +241,6 @@ Solon Sentinel Portal - Daily User Efficiency
         });
 
     });
-    
+
 </script>
 @endsection

Modules/M3/Resources/views/liberty-theme/pages/userPickingStats4_old.blade.php

@@ -14,16 +14,16 @@ Solon Sentinel Portal - userPickingStats v4
             </div>
             <div class="card-body">
                 <div class="card-body">
-                    
+
                     <form>
-                        @csrf  
-                        
+                        @csrf
+
                         <div class="row mb-3">
                             <label for="inputEmail" class="col-sm-2 col-form-label">Date</label>
                             <div class="col-sm-10">
                                 <input value="{{ $starting }}" id="text" name="dates" type="text"  aria-describedby="textHelpBlock" class="form-control">
                             </div>
-                        </div> 
+                        </div>
                         <div class="row mb-3">
                         <label for="inputUser" class="col-sm-2 col-form-label">User</label>
                             <div class="col-sm-10">
@@ -36,9 +36,9 @@ Solon Sentinel Portal - userPickingStats v4
                                     @endforeach
                                 </select>
                             </div>
-                        </div> 
+                        </div>
                         <div class="form-group row">
-                            <div class="col-xs-offset-2 col-xs-10"> 
+                            <div class="col-xs-offset-2 col-xs-10">
                                 <button name="submit" type="submit" class="btn btn-primary">Submit</button>
                             </div>
                         </div>
@@ -71,9 +71,9 @@ Solon Sentinel Portal - userPickingStats v4
                         </tr>
                     </thead>
                     <tbody>
-                    @if($no_data=="Y") 
+                    @if($no_data=="Y")
                         <tr> <td colspan=10 style="text-align:center; background-color:yellow"> <b>No data retrieved for this user</b> <td> <tr>
-                    @else 
+                    @else
                         @foreach($statistic4 as $key=>$val)
                             <tr>
                                 <td> {{ $val->CODE }} </td>
@@ -84,9 +84,9 @@ Solon Sentinel Portal - userPickingStats v4
                                 <!--<td style="text-align:right"> ${{ number_format($val->A5VALUE,2) }} </td>-->
                                 <td style="text-align:right"> {{ number_format($val->A5PICKED,0) }} </td>
                                 <td style="text-align:right"> {{ $val->A5PART }} </td>
-                                <td style="text-align:left"> 
-                                    <a href="http://{{$_SERVER['SERVER_ADDR']}}:{{ (stristr($_SERVER['DOCUMENT_ROOT'],'liv')?$request->ports['live']:$request->ports['test'])}}/php/AllSentPkr.php?order={{$val->A5ONO}}&release={{$val->A5RLNO}}&shipment={{$val->A5SHNO}}"> 
-                                    {{ $val->A5ONO }}-{{ $val->A5RLNO }}-{{ $val->A5SHNO }} 
+                                <td style="text-align:left">
+                                    <a href="http://{{$_SERVER['SERVER_ADDR']}}:{{ (stristr($_SERVER['DOCUMENT_ROOT'],'liv')?$request->ports['live']:$request->ports['test'])}}/php/AllSentPkr.php?order={{$val->A5ONO}}&release={{$val->A5RLNO}}&shipment={{$val->A5SHNO}}">
+                                    {{ $val->A5ONO }}-{{ $val->A5RLNO }}-{{ $val->A5SHNO }}
                                     </a>
                                 </td>
                                 <td style="text-align:left"> {{ $val->A4SHSHNM }} </td>
@@ -179,7 +179,7 @@ Solon Sentinel Portal - userPickingStats v4
                         </tr>
                 </table>
             </div>
-        </div>   
+        </div>
         <div class="card mb-4">
             <div class="card-header">
                 <i class="fas fa-table me-1"></i>
@@ -209,7 +209,7 @@ Solon Sentinel Portal - userPickingStats v4
                     </tr>
                 </table>
             </div>
-        </div>   
+        </div>
 
     </div>
     <!-- /.row -->
@@ -241,6 +241,6 @@ Solon Sentinel Portal - userPickingStats v4
         });
 
     });
-    
+
 </script>
 @endsection

Modules/M3/Resources/views/liberty-theme/pages/userPickingStats5.blade.php

@@ -15,13 +15,13 @@ Solon Sentinel Portal - Graph User Efficiency
             <div class="card-body">
                 <div class="card-body">
                     <form>
-                        @csrf  
+                        @csrf
                         <div class="row mb-3">
                             <label for="inputEmail" class="col-sm-2 col-form-label">Date Range</label>
                             <div class="col-sm-10">
                                 <input value="{{ $starting }} - {{ $ending }}" id="text" name="dates" type="text"  aria-describedby="textHelpBlock" class="form-control">
                             </div>
-                        </div> 
+                        </div>
                         <div class="row mb-3">
                             <label for="inputUser" class="col-sm-2 col-form-label">User</label>
                             <div class="col-sm-10">
@@ -33,9 +33,9 @@ Solon Sentinel Portal - Graph User Efficiency
                                     @endforeach
                                 </select>
                             </div>
-                        </div> 
+                        </div>
                         <div class="form-group row">
-                            <div class="col-xs-offset-2 col-xs-10"> 
+                            <div class="col-xs-offset-2 col-xs-10">
                                 <button name="submit" type="submit" class="btn btn-primary">Submit</button>
                             </div>
                         </div>
@@ -126,7 +126,7 @@ Solon Sentinel Portal - Graph User Efficiency
             }
         //}
     @endforeach
-    
+
     var user_name;
     @foreach($user_array as $key=>$val)
         if("{{$val['userprf']}}"=="{{$user}}") {
@@ -162,11 +162,11 @@ Solon Sentinel Portal - Graph User Efficiency
 
         series: [{
             data: performance,
-            showInLegend: false, 
+            showInLegend: false,
         }],
 
     });
-    
+
 
     $(document).ready(function() {
 
@@ -190,6 +190,6 @@ Solon Sentinel Portal - Graph User Efficiency
         });
 
     });
-        
+
 </script>
 @endsection

Modules/M3/Resources/views/liberty-theme/pages/userProfile.blade.php

@@ -15,7 +15,7 @@ Change Warehouse
 								{{ session('success') }}
 							</div>
 						@endif
-						
+
 						@if(session('error'))
 							<div class="alert alert-danger">
 								{{ session('error') }}
@@ -46,7 +46,7 @@ Change Warehouse
 												'selected' : '';
 										@endphp
 										<option value="{{ trim($IC670MR->WDCO).trim($IC670MR->WDPL).trim($IC670MR->WDWHS) }}"  {{ $selected }}>
-											{{ trim(Str::upper($IC670MR->WDWNAM)) }}  
+											{{ trim(Str::upper($IC670MR->WDWNAM)) }}
 										</option>
 									@endforeach
 								</select>

Modules/M3/Resources/views/liberty-theme/partials/left-navigation.blade.php

@@ -4,9 +4,9 @@
             <div class="nav">
 
                 @if($execUser!='Y' )
-                
+
                 @if($csr!="Y" )
-                               
+
                 <a class="nav-link" href="/">
                     <div class="sb-nav-link-icon"><i class="fas fa-tachometer-alt"></i></div>
                     Dashboard
@@ -44,7 +44,7 @@
                     User Control
                 </a>
 
-                @if($power_users=='Y' || $admin_users=='Y') 
+                @if($power_users=='Y' || $admin_users=='Y')
                 <a class="nav-link  {{ request()->is('carrierMaint') || request()->is('carrierMaint/*') ? 'active' : '' }}"
                     href="{{ route('m3.carrierMaint') }}">
                     <i class="fa-fw fas fa-briefcase  mr-1"></i>
@@ -62,14 +62,14 @@
                     <i class="fa-fw fas fa-briefcase  mr-1"></i>
                     M3 Delivery Methods
                 </a>
-                
+
                 <a class="nav-link  {{ request()->is('OrderLinesOfClosedOrder') || request()->is('OrderLinesOfClosedOrder/*') ? 'active' : '' }}"
                     href="{{ route('m3.OrderLinesOfClosedOrder') }}">
                     <i class="fa-fw fas fa-file-excel  mr-1"></i>
                     Daily Closed order lines report
                 </a>
 
-                @if($power_users=='Y' || $admin_users=='Y') 
+                @if($power_users=='Y' || $admin_users=='Y')
                 <a class="nav-link  {{ request()->is('userPickingStats4') || request()->is('userPickingStats4/*') ? 'active' : '' }}"
                     href="{{ route('m3.userPickingStats4') }}">
                     <i class="fa-fw fas fa-user-friends mr-1"></i>
@@ -86,7 +86,7 @@
                     <i class="fa-fw fas fa-chart-bar mr-1"></i>
                     Truck pending closure in M3
                 </a>
-                @endif 
+                @endif
 
                 {{-- Distribution whs addresses --}}
                 <a class="nav-link  {{ request()->is('ship-to') || request()->is('ship-to/*') ? 'active' : '' }}" href="{{ url('ship-to') }}">
@@ -108,21 +108,21 @@
                 <a class="nav-link  {{ request()->is('whsePerf') || request()->is('whsePerf/*') ? 'active' : '' }}"
                     href="{{ route('m3.whsePerf') }}">
                     <i class="fa-fw fas fa-chart-bar  mr-1"></i>
-                    OTTC 
+                    OTTC
                 </a>
 
                 {{-- Scan Boxes to Pallet --}}
                 {{-- <a class="nav-link  {{ request()->is('BoxPackToPallet') || request()->is('BoxPackToPallet/*') ? 'active' : '' }}"
                     href="{{ route('m3.BoxPackToPallet') }}">
                     <i class="fa-fw fas fa-chart-bar  mr-1"></i>
-                    Scan Boxes to Pallet 
+                    Scan Boxes to Pallet
                 </a> --}}
 
                 {{-- Sentinel Home --}}
                 <a class="nav-link " href="{{ env("APP_URL") }}/php/SentinelHome.php">
                     <i class="fa-fw fas fa-chart-bar mr-1"></i>Sentinel Home</a>
 
-                @endif   
+                @endif
 
                 @endif   {{-- Exec User --}}
 

Modules/M3/Resources/views/liberty-theme/partials/modals/carrierEdit.blade.php

@@ -28,7 +28,7 @@
 							<td><b>2ship Carrier Code</b></td> <!-- NUMERIC -->
 							<td class="text-right">
 								<input type="hidden" name="OLD_TWOSHIPCARRIERCODE" id="OLD_TWOSHIPCARRIERCODE">
-								<input type="number" min="1" max="999" step="1" pattern="[0-9]{3}" class="myinput" name="TWOSHIPCARRIERCODE" id="TWOSHIPCARRIERCODE" 
+								<input type="number" min="1" max="999" step="1" pattern="[0-9]{3}" class="myinput" name="TWOSHIPCARRIERCODE" id="TWOSHIPCARRIERCODE"
 									onkeypress='return ((event.charCode >= 48 && event.charCode <= 57) || (event.charCode == 32))' required>
 							</td>
 						</tr>
@@ -47,7 +47,7 @@
 							<td><b>ERP Carrier Code</b></td> <!-- ALPHA -->
 							<td class="text-right">
 								<input type="hidden" name="OLD_CASPR10A01" id="OLD_CASPR10A01">
-								<!--#553 <input type="number" min="1" max="999999" step="1" class="myinput" pattern="[0-9]{6}" name="CASPR10A01" id="CASPR10A01" 
+								<!--#553 <input type="number" min="1" max="999999" step="1" class="myinput" pattern="[0-9]{6}" name="CASPR10A01" id="CASPR10A01"
 									onkeypress='return ((event.charCode >= 48 && event.charCode <= 57) || (event.charCode == 32))' required> -->
 								<input type="text" maxlength="10" class="myinput" name="CASPR10A01" id="CASPR10A01" required>
 							</td>
@@ -58,7 +58,7 @@
 								Overnight
 								<div class="col-sm-1 form-check form-check-inline form-switch">
 									<input type="hidden" name="OLD_CASPR1A01" id="OLD_CASPR1A01">
-									<input type="checkbox" class="form-check-input" role="switch" id="CASPR1A01" name="CASPR1A01" data-on="Y" data-off="">	
+									<input type="checkbox" class="form-check-input" role="switch" id="CASPR1A01" name="CASPR1A01" data-on="Y" data-off="">
 								</div>
 								When closing truck
 							</td>

Modules/M3/Resources/views/liberty-theme/partials/modals/qtyAdd.blade.php

@@ -16,14 +16,14 @@
 							<td><label for="AT9DPW" class="col-form-label"><b>Div-Plt-Whs:</b></label></td>
 							<td>
 							<div class="mb-3">
-                                <select class="form-select-sm" id="addAT9DPW" 
-                                @if($power_user->R428PWRUSR=="N") 
-                                    disabled 
+                                <select class="form-select-sm" id="addAT9DPW"
+                                @if($power_user->R428PWRUSR=="N")
+                                    disabled
                                 @endif
                                 >
                                     @foreach ($IC670M as $key => $IC670MR)
-                                        <option selected value="{{ trim($IC670MR->WDCO).trim($IC670MR->WDPL).trim($IC670MR->WDWHS) }}" 
-                                        data-AT9CO="{{ trim($IC670MR->WDCO) }}" data-AT9PLT="{{ trim($IC670MR->WDPL) }}" data-AT9WHS="{{ trim($IC670MR->WDWHS) }}" 
+                                        <option selected value="{{ trim($IC670MR->WDCO).trim($IC670MR->WDPL).trim($IC670MR->WDWHS) }}"
+                                        data-AT9CO="{{ trim($IC670MR->WDCO) }}" data-AT9PLT="{{ trim($IC670MR->WDPL) }}" data-AT9WHS="{{ trim($IC670MR->WDWHS) }}"
                                         data-AT9DPW="{{ trim($IC670MR->WDCO).trim($IC670MR->WDPL).trim($IC670MR->WDWHS) }}">
                                             {{ trim(Str::upper($IC670MR->WDWNAM)) }}
                                         </option>

Modules/M3/Resources/views/liberty-theme/partials/modals/qtyEdit.blade.php

@@ -19,7 +19,7 @@
                                 <select class="form-select-sm" name="AT9DPW" id="AT9DPW" required>
                                     <!--<option value="" selected disabled hidden>Select</option>-->
                                     @foreach ($IC670M as $key => $IC670MR)
-                                        <option selected value="{{ trim($IC670MR->WDCO).trim($IC670MR->WDPL).trim($IC670MR->WDWHS) }}" 
+                                        <option selected value="{{ trim($IC670MR->WDCO).trim($IC670MR->WDPL).trim($IC670MR->WDWHS) }}"
                                         data-AT9CO="{{ trim($IC670MR->WDCO) }}" data-AT9PLT="{{ trim($IC670MR->WDPL) }}" data-AT9WHS="{{ trim($IC670MR->WDWHS) }}" >
                                             {{ trim(Str::upper($IC670MR->WDWNAM)) }}
                                         </option>

Modules/M3/Resources/views/liberty-theme/partials/modals/shipToCheckBox.blade.php

@@ -11,7 +11,7 @@
 				<div class="col-xs-5">
 					<label class="checkbox-inline">
 						<input type="checkbox" name="check1" id="check1" value="1"> Ignore address checker for all future releases of this order
-					</label> 
+					</label>
 				</div>
 			</div>
 			<div class="form-group" style="clear: both; margin-top:20px;">
@@ -20,7 +20,7 @@
 						<input type="checkbox" name="check2" id="check2" value="1"> Ignore address checker if the above address is re-used on a future order
 					</label>
 				</div>
-			</div> 
+			</div>
         </div>
 		<div class="modal-footer">
 		  <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>

Modules/M3/Resources/views/liberty-theme/partials/modals/userAdd.blade.php

@@ -52,7 +52,7 @@
                                 <select class="form-select-sm myinput" name="R428DPW1" id="R428DPW1" aria-label="Div-Plt-Whs" required>
                                     <option value="" selected disabled hidden>Select a value</option>
                                     @foreach ($IC670M as $key => $IC670MR)
-                                        <option value="{{ trim($IC670MR->WDCO).trim($IC670MR->WDPL).trim($IC670MR->WDWHS) }}" 
+                                        <option value="{{ trim($IC670MR->WDCO).trim($IC670MR->WDPL).trim($IC670MR->WDWHS) }}"
                                         data-co="{{ trim($IC670MR->WDCO) }}" data-pl="{{ trim($IC670MR->WDPL) }}" data-wh="{{ trim($IC670MR->WDWHS) }}"
 										data-dpw="{{ trim($IC670MR->WDCO).trim($IC670MR->WDPL).trim($IC670MR->WDWHS) }}" >
                                             {{ trim(Str::upper($IC670MR->WDWNAM)) }}

Modules/M3/Resources/views/liberty-theme/partials/modals/userEdit.blade.php

@@ -22,7 +22,7 @@
 							<input type="hidden" id="R428PL" name="R428PL">
 							<input type="hidden" id="R428WH" name="R428WH">
 							<td><b>Status</b></td> <!-- Switch Active/Inactive -->
-							<td class="text-right">								
+							<td class="text-right">
 								<div class="form-check form-switch">
 									<input type="hidden" id="OLD_R428STS" name="OLD_R428STS">
 									<input type="checkbox" class="form-check-input" role="switch" id="R428STS" name="R428STS" data-on="A" data-off="I">
@@ -72,7 +72,7 @@
                                 <select class="form-select-sm" id="R428DPW" required>
                                     <option value="" selected disabled hidden>Select</option>
                                     @foreach ($IC670M as $key => $IC670MR)
-                                        <option value="{{ trim($IC670MR->WDCO).trim($IC670MR->WDPL).trim($IC670MR->WDWHS) }}" 
+                                        <option value="{{ trim($IC670MR->WDCO).trim($IC670MR->WDPL).trim($IC670MR->WDWHS) }}"
                                         data-co="{{ trim($IC670MR->WDCO) }}" data-pl="{{ trim($IC670MR->WDPL) }}" data-wh="{{ trim($IC670MR->WDWHS) }}" >
                                             {{ trim(Str::upper($IC670MR->WDWNAM)) }}
                                         </option>
@@ -90,7 +90,7 @@
 				<table class="table table-condensed">
 						<tr>
 							<td><b>Admin user</b></td> <!-- SWITCH Y/N -->
-							<td class="text-right">								
+							<td class="text-right">
 								<div class="form-check form-switch">
 									<input type="hidden" id="OLD_R428ADMUSR" name="OLD_R428ADMUSR">
 									<input type="checkbox" class="form-check-input" role="switch" id="R428ADMUSR" name="R428ADMUSR" data-on="Y" data-off="N">

Modules/M3/Resources/views/liberty-theme/partials/modals/userPassword.blade.php

@@ -15,7 +15,7 @@
                         <table class="table table-condensed">
                         <tr>
                             <td><b>Enter a new password to re-enable user</b></td> <!-- Password -->
-                            <td class="text-right">								
+                            <td class="text-right">
                                 <div class="form-check form-switch">
                                     <input type="hidden" name="R428US_PWD" id="R428US_PWD" value="">
                                     <input type="password" maxlength="10" length="7" class="myinput" name="NEW_PASSWORD" id="NEW_PASSWORD" required>

Modules/M3/Resources/views/liberty-theme/partials/scripts.blade.php

@@ -5,7 +5,7 @@
 <script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js" integrity= "sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo" crossorigin="anonymous"></script>
 <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.min.js" crossorigin="anonymous"></script>
 
-@php 
+@php
     // ReplenishSettingsController
     $routeArray = app('request')->route()->getAction();
     $controllerAction = class_basename($routeArray['controller']);
@@ -27,7 +27,7 @@
 <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.36/pdfmake.min.js"></script>
 <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.36/vfs_fonts.js"></script>
 <script type="text/javascript" src="https://cdn.datatables.net/v/bs5/jszip-2.5.0/dt-1.11.3/af-2.3.7/b-2.0.1/b-colvis-2.0.1/b-html5-2.0.1/b-print-2.0.1/cr-1.5.4/date-1.1.1/fc-4.0.0/fh-3.2.0/kt-2.6.4/r-2.2.9/rg-1.1.3/rr-1.2.8/sc-2.0.5/sb-1.2.2/sp-1.4.0/sl-1.3.3/datatables.min.js"></script>
-    
+
 <script type="text/javascript" src="{{ route('m3.assets', ['path' => 'liberty-theme/js/datatables-simple-demo.js']) }}"></script>
 {{-- Data Bootstrap Responsive --}}
 <script type="text/javascript" src="https://cdn.datatables.net/responsive/2.4.1/js/dataTables.responsive.min.js"></script>
@@ -57,7 +57,7 @@
 <script src="//cdn.jsdelivr.net/npm/sweetalert2@11"></script>
 
 <script>
-    
+
 window.addEventListener('DOMContentLoaded', event => {
 
 // Toggle the side navigation

Modules/M3/Resources/views/liberty-theme/partials/tabs/comments.blade.php

@@ -10,7 +10,7 @@
 						<b>Order Date:</b> {{ date('m/d/Y', strtotime($order->SHORDT)) }}<br>
 						<b>Order Status:</b> {{ $order->SHOST }}<br>
 						<b>Fill Code:</b> {{ $order->SHALBO }}<br>
-						@foreach ($releases as $key=>$val) 
+						@foreach ($releases as $key=>$val)
 							<b>Open Releases on this order:</b> <a href="./{{ $val->SLONO }}-{{ $val->SLRLNO }}" style="color:white" >{{ $val->SLONO }}-{{ $val->SLRLNO }}
 								<i class="fa fa-eye pull-right"></i></a><br>
 						@endforeach

Modules/M3/Resources/views/liberty-theme/partials/tabs/details.blade.php

@@ -10,7 +10,7 @@
 						<b>Order Date:</b> {{ date('m/d/Y', strtotime($order->SHORDT)) }}<br>
 						<b>Order Status:</b> {{ $order->SHOST }}<br>
 						<b>Fill Code:</b> {{ $order->SHALBO }}<br>
-						@foreach ($releases as $key=>$val) 
+						@foreach ($releases as $key=>$val)
 							<b>Open Releases on this order:</b> <a href="./{{ $val->SLONO }}-{{ $val->SLRLNO }}" style="color:white" >{{ $val->SLONO }}-{{ $val->SLRLNO }}
 								<i class="fa fa-eye pull-right"></i></a><br>
 						@endforeach
@@ -33,7 +33,7 @@
 					</div>
 				</div>
 			</div>
-		  
+
 			<div class="table-responsive">
 				<table class="table table-condensed">
 					<thead>

Modules/M3/Resources/views/liberty-theme/partials/tabs/orders.blade.php

@@ -10,8 +10,8 @@
 						<b>Order Date:</b> {{ date('m/d/Y', strtotime($order->SHORDT)) }}<br>
 						<b>Order Status:</b> {{ $order->SHOST }}<br>
 						<b>Fill Code:</b> {{ $order->SHALBO }}<br>
-						@foreach ($releases as $key=>$val) 
-							<b>Open Releases on this order:</b> <a href="./{{ $val->SLONO }}-{{ $val->SLRLNO }}" style="color:white"> {{ $val->SLONO }}-{{ $val->SLRLNO }} 
+						@foreach ($releases as $key=>$val)
+							<b>Open Releases on this order:</b> <a href="./{{ $val->SLONO }}-{{ $val->SLRLNO }}" style="color:white"> {{ $val->SLONO }}-{{ $val->SLRLNO }}
 								<i class="fa fa-eye pull-right"></i></a><br>
 						@endforeach
 					</p>

Modules/M3/Resources/views/liberty-theme/partials/top-navigation.blade.php

@@ -22,7 +22,7 @@
                                         $selected = $UserCO == $IC670MR->WDCO && $UserWHS == $IC670MR->WDWHS && $UserPL == $IC670MR->WDPL ? 'selected' : '';
                                     @endphp
                                     <option value="{{ trim($IC670MR->WDCO).trim($IC670MR->WDPL).trim($IC670MR->WDWHS) }}"  {{ $selected }}>
-                                        {{ trim(Str::upper($IC670MR->WDWNAM)) }}  
+                                        {{ trim(Str::upper($IC670MR->WDWNAM)) }}
                                     </option>
                                 @endforeach
                             </select>