diff --git a/Modules/M3/Http/Controllers/UtilitiesController.php b/Modules/M3/Http/Controllers/UtilitiesController.php index ce8d385c..28071b4f 100755 --- a/Modules/M3/Http/Controllers/UtilitiesController.php +++ b/Modules/M3/Http/Controllers/UtilitiesController.php @@ -267,11 +267,18 @@ class UtilitiesController extends Controller $serialShippingContainerBarcode = $generator->getBarcode($data['serial_shipping_container'], $generator::TYPE_CODE_128, 2, 50); // HTML content for the label - $html .= self::gs128LabelHtml( - $data, $gSArray, $a2INTBOX, $manufactID, $packageTypeDesc, - $packageNum, $packageCount, $table_style, - $shipToPostalCodeBarcode, $serialShippingContainerBarcode - ); + $html .= self::gs128LabelHtml([ + 'data' => $data, + 'gs' => $gSArray, + 'internal_box' => $a2INTBOX, + 'manufacturer_id' => $manufactID, + 'package_type' => $packageTypeDesc, + 'package_number' => $packageNum, + 'package_count' => $packageCount, + 'table_style' => $table_style, + 'postal_barcode' => $shipToPostalCodeBarcode, + 'container_barcode' => $serialShippingContainerBarcode, + ]); $packageNum++; @@ -320,11 +327,19 @@ class UtilitiesController extends Controller return $gS1FileNameNoRoot; } - private static function gs128LabelHtml( - array $data, array $gSArray, string $a2INTBOX, string $manufactID, - string $packageTypeDesc, int $packageNum, int $packageCount, string $table_style, - string $shipToPostalCodeBarcode, string $serialShippingContainerBarcode - ): string { + private static function gs128LabelHtml(array $context): string + { + $data = $context['data']; + $gSArray = $context['gs']; + $a2INTBOX = (string) $context['internal_box']; + $manufactID = (string) $context['manufacturer_id']; + $packageTypeDesc = (string) $context['package_type']; + $packageNum = (int) $context['package_number']; + $packageCount = (int) $context['package_count']; + $table_style = (string) $context['table_style']; + $shipToPostalCodeBarcode = (string) $context['postal_barcode']; + $serialShippingContainerBarcode = (string) $context['container_barcode']; + return '