ACP2E-1216: Large area customizable option not able to render for print invoice PDF

thiaramus · thiaramus · commit b3aa13f492a5 · 2022-12-02T12:43:46.000-06:00
diff --git a/app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/Creditmemo.php b/app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/Creditmemo.php
@@ -199,9 +199,10 @@ public function draw()
                 if ($option['value']) {
                     $text = [];
                     $printValue = $option['print_value'] ?? $this->filterManager->stripTags($option['value']);
+                    $printValue = str_replace(PHP_EOL, ', ', $printValue);
                     $values = explode(', ', $printValue);
                     foreach ($values as $value) {
-                        foreach ($this->string->split($value, 30, true, true) as $subValue) {
+                        foreach ($this->string->split($value, 50, true, true) as $subValue) {
                             $text[] = $subValue;
                         }
                     }
diff --git a/app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/Shipment.php b/app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/Shipment.php
@@ -169,20 +169,21 @@ public function draw()
                         true
                     ),
                     'font' => 'italic',
-                    'feed' => 60,
+                    'feed' => 110,
                 ];
 
                 if ($option['value']) {
                     $text = [];
                     $printValue = $option['print_value'] ?? $this->filterManager->stripTags($option['value']);
+                    $printValue = str_replace(PHP_EOL, ', ', $printValue);
                     $values = explode(', ', $printValue);
                     foreach ($values as $value) {
                         foreach ($this->string->split($value, 50, true, true) as $subValue) {
                             $text[] = $subValue;
                         }
                     }
 
-                    $lines[][] = ['text' => $text, 'feed' => 65];
+                    $lines[][] = ['text' => $text, 'feed' => 115];
                 }
 
                 $drawItems[] = ['lines' => $lines, 'height' => 15, 'shift' => 5];
diff --git a/app/code/Magento/Sales/Model/Order/Pdf/Items/Creditmemo/DefaultCreditmemo.php b/app/code/Magento/Sales/Model/Order/Pdf/Items/Creditmemo/DefaultCreditmemo.php
@@ -140,11 +140,20 @@ public function draw()
                 ) ? $option['print_value'] : $this->filterManager->stripTags(
                     $option['value']
                 );
-                $lines[][] = ['text' => $this->string->split($printValue, 30, true, true), 'feed' => 40];
+
+                $values = explode(PHP_EOL, $printValue);
+                $text = [];
+                foreach ($values as $value) {
+                    foreach ($this->string->split($value, 50, true, true) as $subValue) {
+                        $text[] = $subValue;
+                    }
+                }
+
+                $lines[][] = ['text' => $text, 'feed' => 40];
             }
         }
 
-        $lineBlock = ['lines' => $lines, 'height' => 20];
+        $lineBlock = ['lines' => $lines, 'height' => 20, 'shift' => 5];
 
         $page = $pdf->drawLineBlocks($page, [$lineBlock], ['table_header' => true]);
         $this->setPage($page);
diff --git a/app/code/Magento/Sales/Model/Order/Pdf/Items/Invoice/DefaultInvoice.php b/app/code/Magento/Sales/Model/Order/Pdf/Items/Invoice/DefaultInvoice.php
@@ -151,15 +151,21 @@ public function draw()
                     } else {
                         $printValue = $this->filterManager->stripTags($option['value']);
                     }
+                    $printValue = str_replace(PHP_EOL, ', ', $printValue);
                     $values = explode(', ', $printValue);
+                    $text = [];
                     foreach ($values as $value) {
-                        $lines[][] = ['text' => $this->string->split($value, 30, true, true), 'feed' => 40];
+                        foreach ($this->string->split($value, 50, true, true) as $subValue) {
+                            $text[] = $subValue;
+                        }
                     }
+
+                    $lines[][] = ['text' => $text, 'feed' => 40];
                 }
             }
         }
 
-        $lineBlock = ['lines' => $lines, 'height' => 20];
+        $lineBlock = ['lines' => $lines, 'height' => 20, 'shift' => 5];
 
         $page = $pdf->drawLineBlocks($page, [$lineBlock], ['table_header' => true]);
         $this->setPage($page);
diff --git a/app/code/Magento/Sales/Model/Order/Pdf/Items/Shipment/DefaultShipment.php b/app/code/Magento/Sales/Model/Order/Pdf/Items/Shipment/DefaultShipment.php
@@ -104,15 +104,21 @@ public function draw()
                     ) ? $option['print_value'] : $this->filterManager->stripTags(
                         $option['value']
                     );
+                    $printValue = str_replace(PHP_EOL, ', ', $printValue);
                     $values = explode(', ', $printValue);
+                    $text = [];
                     foreach ($values as $value) {
-                        $lines[][] = ['text' => $this->string->split($value, 50, true, true), 'feed' => 115];
+                        foreach ($this->string->split($value, 50, true, true) as $subValue) {
+                            $text[] = $subValue;
+                        }
                     }
+
+                    $lines[][] = ['text' => $text, 'feed' => 115];
                 }
             }
         }
 
-        $lineBlock = ['lines' => $lines, 'height' => 20];
+        $lineBlock = ['lines' => $lines, 'height' => 20, 'shift' => 5];
 
         $page = $pdf->drawLineBlocks($page, [$lineBlock], ['table_header' => true]);
         $this->setPage($page);

Original file line number	Diff line number	Diff line change
`@@ -199,9 +199,10 @@ public function draw()`
`199`	`199`	`if ($option['value']) {`
`200`	`200`	`$text = [];`
`201`	`201`	`$printValue = $option['print_value'] ?? $this->filterManager->stripTags($option['value']);`
	`202`	`+ $printValue = str_replace(PHP_EOL, ', ', $printValue);`
`202`	`203`	`$values = explode(', ', $printValue);`
`203`	`204`	`foreach ($values as $value) {`
`204`		`- foreach ($this->string->split($value, 30, true, true) as $subValue) {`
	`205`	`+ foreach ($this->string->split($value, 50, true, true) as $subValue) {`
`205`	`206`	`$text[] = $subValue;`
`206`	`207`	`}`
`207`	`208`	`}`
Original file line number	Diff line number	Diff line change
`@@ -151,15 +151,21 @@ public function draw()`
`151`	`151`	`} else {`
`152`	`152`	`$printValue = $this->filterManager->stripTags($option['value']);`
`153`	`153`	`}`
	`154`	`+ $printValue = str_replace(PHP_EOL, ', ', $printValue);`
`154`	`155`	`$values = explode(', ', $printValue);`
	`156`	`+ $text = [];`
`155`	`157`	`foreach ($values as $value) {`
`156`		`- $lines[][] = ['text' => $this->string->split($value, 30, true, true), 'feed' => 40];`
	`158`	`+ foreach ($this->string->split($value, 50, true, true) as $subValue) {`
	`159`	`+ $text[] = $subValue;`
	`160`	`+ }`
`157`	`161`	`}`
	`162`	`+`
	`163`	`+ $lines[][] = ['text' => $text, 'feed' => 40];`
`158`	`164`	`}`
`159`	`165`	`}`
`160`	`166`	`}`
`161`	`167`
`162`		`- $lineBlock = ['lines' => $lines, 'height' => 20];`
	`168`	`+ $lineBlock = ['lines' => $lines, 'height' => 20, 'shift' => 5];`
`163`	`169`
`164`	`170`	`$page = $pdf->drawLineBlocks($page, [$lineBlock], ['table_header' => true]);`
`165`	`171`	`$this->setPage($page);`
Original file line number	Diff line number	Diff line change
`@@ -104,15 +104,21 @@ public function draw()`
`104`	`104`	`) ? $option['print_value'] : $this->filterManager->stripTags(`
`105`	`105`	`$option['value']`
`106`	`106`	`);`
	`107`	`+ $printValue = str_replace(PHP_EOL, ', ', $printValue);`
`107`	`108`	`$values = explode(', ', $printValue);`
	`109`	`+ $text = [];`
`108`	`110`	`foreach ($values as $value) {`
`109`		`- $lines[][] = ['text' => $this->string->split($value, 50, true, true), 'feed' => 115];`
	`111`	`+ foreach ($this->string->split($value, 50, true, true) as $subValue) {`
	`112`	`+ $text[] = $subValue;`
	`113`	`+ }`
`110`	`114`	`}`
	`115`	`+`
	`116`	`+ $lines[][] = ['text' => $text, 'feed' => 115];`
`111`	`117`	`}`
`112`	`118`	`}`
`113`	`119`	`}`
`114`	`120`
`115`		`- $lineBlock = ['lines' => $lines, 'height' => 20];`
	`121`	`+ $lineBlock = ['lines' => $lines, 'height' => 20, 'shift' => 5];`
`116`	`122`
`117`	`123`	`$page = $pdf->drawLineBlocks($page, [$lineBlock], ['table_header' => true]);`
`118`	`124`	`$this->setPage($page);`