ENGCOM-2941: fix notice undefined shipment: revert locale inside loop #18003

ishakhsuvarov · web-flow · commit 3fefd5816245 · 2018-09-11T19:52:57.000+03:00
diff --git a/app/code/Magento/Sales/Model/Order/Pdf/Shipment.php b/app/code/Magento/Sales/Model/Order/Pdf/Shipment.php
@@ -150,11 +150,11 @@ public function getPdf($shipments = [])
                 $this->_drawItem($item, $page, $order);
                 $page = end($pdf->pages);
             }
+            if ($shipment->getStoreId()) {
+                $this->_localeResolver->revert();
+            }
         }
         $this->_afterGetPdf();
-        if ($shipment->getStoreId()) {
-            $this->_localeResolver->revert();
-        }
         return $pdf;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -150,11 +150,11 @@ public function getPdf($shipments = [])`
`150`	`150`	`$this->_drawItem($item, $page, $order);`
`151`	`151`	`$page = end($pdf->pages);`
`152`	`152`	`}`
	`153`	`+ if ($shipment->getStoreId()) {`
	`154`	`+ $this->_localeResolver->revert();`
	`155`	`+ }`
`153`	`156`	`}`
`154`	`157`	`$this->_afterGetPdf();`
`155`		`- if ($shipment->getStoreId()) {`
`156`		`- $this->_localeResolver->revert();`
`157`		`- }`
`158`	`158`	`return $pdf;`
`159`	`159`	`}`
`160`	`160`