Merge branch 'MAGETWO-88668' into 2.1.15-bugfixes-210618

Dmytro Voskoboinikov · Dmytro Voskoboinikov · commit 1adc37fcdebb · 2018-06-21T16:45:25.000+03:00
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_guest_print.xml b/app/code/Magento/Sales/view/frontend/layout/sales_guest_print.xml
@@ -12,11 +12,20 @@
     <body>
         <attribute name="class" value="sales-guest-view"/>
         <referenceContainer name="page.main.title">
-            <block class="Magento\Sales\Block\Order\PrintShipment" name="order.status" template="order/order_status.phtml" />
-            <block class="Magento\Sales\Block\Order\PrintShipment" name="order.date" template="order/order_date.phtml" />
+            <block class="Magento\Sales\Block\Order\PrintShipment"
+                   name="order.status"
+                   template="order/order_status.phtml"
+                   cacheable="false" />
+            <block class="Magento\Sales\Block\Order\PrintShipment"
+                   name="order.date"
+                   template="order/order_date.phtml"
+                   cacheable="false" />
         </referenceContainer>
         <referenceContainer name="content">
-            <block class="Magento\Sales\Block\Order\PrintShipment" name="sales.order.print" template="order/view.phtml">
+            <block class="Magento\Sales\Block\Order\PrintShipment"
+                   name="sales.order.print"
+                   template="order/view.phtml"
+                   cacheable="false">
                 <block class="Magento\Sales\Block\Order\PrintShipment" name="order_items" template="order/items.phtml">
                     <block class="Magento\Framework\View\Element\RendererList" name="sales.order.print.renderers" as="renderer.list" />
                     <block class="Magento\Sales\Block\Order\Totals" name="order_totals" template="order/totals.phtml">
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_order_print.xml b/app/code/Magento/Sales/view/frontend/layout/sales_order_print.xml
@@ -12,11 +12,20 @@
     <body>
         <attribute name="class" value="account"/>
         <referenceContainer name="page.main.title">
-            <block class="Magento\Sales\Block\Order\PrintShipment" name="order.status" template="order/order_status.phtml" />
-            <block class="Magento\Sales\Block\Order\PrintShipment" name="order.date" template="order/order_date.phtml" />
+            <block class="Magento\Sales\Block\Order\PrintShipment"
+                   name="order.status"
+                   template="order/order_status.phtml"
+                   cacheable="false" />
+            <block class="Magento\Sales\Block\Order\PrintShipment"
+                   name="order.date"
+                   template="order/order_date.phtml"
+                   cacheable="false" />
         </referenceContainer>
         <referenceContainer name="content">
-            <block class="Magento\Sales\Block\Order\PrintShipment" name="sales.order.print" template="order/view.phtml">
+            <block class="Magento\Sales\Block\Order\PrintShipment"
+                   name="sales.order.print"
+                   template="order/view.phtml"
+                   cacheable="false">
                 <block class="Magento\Sales\Block\Order\Items" name="order_items" template="order/items.phtml">
                     <block class="Magento\Framework\View\Element\RendererList" name="sales.order.print.renderers" as="renderer.list" />
                     <block class="Magento\Sales\Block\Order\Totals" name="order_totals" template="order/totals.phtml">
