M3 Integration fixes

This commit is contained in:
Mark Gregory
2026-09-22 11:37:58 +01:00
parent 4be07c8456
commit 9f69743dd6
2 changed files with 27 additions and 12 deletions
@@ -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 '
<table ' . $table_style . '>
<tr>
+2 -2
View File
@@ -100,9 +100,9 @@
.wms-metric-card__icon {
align-items: center;
background: linear-gradient(135deg, rgba(15, 118, 110, 0.14), rgba(37, 99, 235, 0.12));
background: #e2e8f0;
border-radius: 18px;
color: #000000;
color: #111827;
display: flex;
font-size: 1.35rem;
height: 56px;