ENGCOM-5511: Resolve Incorrect Quantity Displayed In Admin Area when used 'Qty s Decimals' issue 23940 #23943

VladimirZaets · web-flow · commit 1c5604022419 · 2019-08-08T10:57:39.000-05:00
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/items/column/qty.phtml b/app/code/Magento/Sales/view/adminhtml/templates/items/column/qty.phtml
@@ -8,34 +8,34 @@
     <table class="qty-table">
         <tr>
             <th><?= $block->escapeHtml(__('Ordered')); ?></th>
-            <td><?= (int) $item->getQtyOrdered() ?></td>
+            <td><?= (float) $item->getQtyOrdered() ?></td>
         </tr>
 
         <?php if ((float)$item->getQtyInvoiced()) : ?>
             <tr>
                 <th><?= $block->escapeHtml(__('Invoiced')); ?></th>
-                <td><?= (int) $item->getQtyInvoiced() ?></td>
+                <td><?= (float) $item->getQtyInvoiced() ?></td>
             </tr>
         <?php endif; ?>
 
         <?php if ((float)$item->getQtyShipped()) : ?>
             <tr>
                 <th><?= $block->escapeHtml(__('Shipped')); ?></th>
-                <td><?= (int) $item->getQtyShipped() ?></td>
+                <td><?= (float) $item->getQtyShipped() ?></td>
             </tr>
         <?php endif; ?>
 
         <?php if ((float)$item->getQtyRefunded()) : ?>
             <tr>
                 <th><?= $block->escapeHtml(__('Refunded')); ?></th>
-                <td><?= (int) $item->getQtyRefunded() ?></td>
+                <td><?= (float) $item->getQtyRefunded() ?></td>
             </tr>
         <?php endif; ?>
 
         <?php if ((float)$item->getQtyCanceled()) : ?>
             <tr>
                 <th><?= $block->escapeHtml(__('Canceled')); ?></th>
-                <td><?= (int) $item->getQtyCanceled() ?></td>
+                <td><?= (float) $item->getQtyCanceled() ?></td>
             </tr>
         <?php endif; ?>
 
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/grid.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/grid.phtml
@@ -115,7 +115,7 @@
                         <td class="col-qty">
                             <input name="item[<?= (int) $_item->getId() ?>][qty]"
                                    class="input-text item-qty admin__control-text"
-                                   value="<?= (int) $_item->getQty() ?>"
+                                   value="<?= (float) $_item->getQty() ?>"
                                    maxlength="12" />
                         </td>
                         <td class="col-subtotal col-price">
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar/items.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar/items.phtml
@@ -58,7 +58,7 @@
 
                         <?php if ($block->canDisplayItemQty()) : ?>
                             <td class="col-qty">
-                                <?= (int) $block->getItemQty($_item) ?>
+                                <?= (float) $block->getItemQty($_item) ?>
                             </td>
                         <?php endif; ?>
 
@@ -105,7 +105,7 @@
                                            type="checkbox"
                                            class="admin__control-checkbox"
                                            name="sidebar[<?= $block->escapeHtmlAttr($block->getSidebarStorageAction()) ?>][<?= (int) $block->getIdentifierId($_item) ?>]"
-                                           value="<?= $block->canDisplayItemQty() ? (int) $_item->getQty() : 1 ?>"
+                                           value="<?= $block->canDisplayItemQty() ? (float) $_item->getQty() : 1 ?>"
                                            title="<?= $block->escapeHtml(__('Add To Order')) ?>"/>
                                     <label class="admin__field-label"
                                            for="sidebar-<?= $block->escapeHtmlAttr($block->getSidebarStorageAction()) ?>-<?= (int) $block->getIdentifierId($_item) ?>">
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/items/renderer/default.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/items/renderer/default.phtml
@@ -29,9 +29,9 @@
         <input type="text"
                class="input-text admin__control-text qty-input"
                name="creditmemo[items][<?= (int) $_item->getOrderItemId() ?>][qty]"
-               value="<?= (int) $_item->getQty() ?>"/>
+               value="<?= (float) $_item->getQty() ?>"/>
     <?php else : ?>
-        <?= (int) $_item->getQty() ?>
+        <?= (float) $_item->getQty() ?>
     <?php endif; ?>
     </td>
     <td class="col-subtotal">
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/view/items/renderer/default.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/view/items/renderer/default.phtml
@@ -13,7 +13,7 @@
     <td class="col-price">
         <?= $block->getColumnHtml($_item, 'price') ?>
     </td>
-    <td class="col-qty"><?= (int) $_item->getQty() ?></td>
+    <td class="col-qty"><?= (float) $_item->getQty() ?></td>
     <td class="col-subtotal">
         <?= $block->getColumnHtml($_item, 'subtotal') ?>
     </td>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/details.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/details.phtml
@@ -41,7 +41,7 @@ $_order = $block->getOrder() ?>
             <br /><?= $block->escapeHtml(__('Message:')) ?><br /> <?= $block->escapeHtml($_giftMessage->getMessage()) ?>
             <?php endif; ?>
             </td>
-            <td align="center" valign="top" style="padding:3px 9px"><?= (int) $_item->getQtyOrdered() ?></td>
+            <td align="center" valign="top" style="padding:3px 9px"><?= (float) $_item->getQtyOrdered() ?></td>
             <td align="right" valign="top" style="padding:3px 9px"><?= /* @noEscape */ $_order->formatPrice($_item->getRowTotal()) ?></td>
         </tr>
 <?php endforeach; ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/items/renderer/default.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/items/renderer/default.phtml
@@ -16,9 +16,9 @@
     <?php if ($block->canEditQty()) : ?>
         <input type="text" class="input-text admin__control-text qty-input"
                name="invoice[items][<?= (int) $_item->getOrderItemId() ?>]"
-               value="<?= (int) $_item->getQty() ?>"/>
+               value="<?= (float) $_item->getQty() ?>"/>
     <?php else : ?>
-        <?= (int) $_item->getQty() ?>
+        <?= (float) $_item->getQty() ?>
     <?php endif; ?>
     </td>
     <td class="col-subtotal">
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/view/items/renderer/default.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/view/items/renderer/default.phtml
@@ -13,7 +13,7 @@
     <td class="col-price">
         <?= $block->getColumnHtml($_item, 'price') ?>
     </td>
-    <td class="col-qty"><?= (int) $_item->getQty() ?></td>
+    <td class="col-qty"><?= (float) $_item->getQty() ?></td>
     <td class="col-subtotal">
         <?= $block->getColumnHtml($_item, 'subtotal') ?>
     </td>
diff --git a/app/code/Magento/Sales/view/frontend/templates/email/items/creditmemo/default.phtml b/app/code/Magento/Sales/view/frontend/templates/email/items/creditmemo/default.phtml
@@ -27,7 +27,7 @@
         <?php endif; ?>
         <?= $block->escapeHtml($_item->getDescription()) ?>
     </td>
-    <td class="item-qty"><?= (int) $_item->getQty() ?></td>
+    <td class="item-qty"><?= (float) $_item->getQty() ?></td>
     <td class="item-price">
         <?= /* @noEscape */  $block->getItemPrice($_item) ?>
     </td>
diff --git a/app/code/Magento/Sales/view/frontend/templates/email/items/invoice/default.phtml b/app/code/Magento/Sales/view/frontend/templates/email/items/invoice/default.phtml
@@ -26,7 +26,7 @@
         <?php endif; ?>
         <?= $block->escapeHtml($_item->getDescription()) ?>
     </td>
-    <td class="item-qty"><?= (int) $_item->getQty() ?></td>
+    <td class="item-qty"><?= (float) $_item->getQty() ?></td>
     <td class="item-price">
         <?= /* @noEscape */ $block->getItemPrice($_item->getOrderItem()) ?>
     </td>
diff --git a/app/code/Magento/Sales/view/frontend/templates/email/items/order/default.phtml b/app/code/Magento/Sales/view/frontend/templates/email/items/order/default.phtml
@@ -32,7 +32,7 @@ $_order = $_item->getOrder();
         <?php endif; ?>
         <?= $block->escapeHtml($_item->getDescription()) ?>
     </td>
-    <td class="item-qty"><?= (int) $_item->getQtyOrdered() ?></td>
+    <td class="item-qty"><?= (float) $_item->getQtyOrdered() ?></td>
     <td class="item-price">
         <?= /* @noEscape */ $block->getItemPrice($_item) ?>
     </td>
diff --git a/app/code/Magento/Sales/view/frontend/templates/email/items/shipment/default.phtml b/app/code/Magento/Sales/view/frontend/templates/email/items/shipment/default.phtml
@@ -26,5 +26,5 @@ $_item = $block->getItem() ?>
         <?php endif; ?>
         <?= $block->escapeHtml($_item->getDescription()) ?>
     </td>
-    <td class="item-qty"><?= (int) $_item->getQty() ?></td>
+    <td class="item-qty"><?= (float) $_item->getQty() ?></td>
 </tr>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/creditmemo/items/renderer/default.phtml b/app/code/Magento/Sales/view/frontend/templates/order/creditmemo/items/renderer/default.phtml
@@ -57,7 +57,7 @@
     <td class="col price" data-th="<?= $block->escapeHtml(__('Price')) ?>">
         <?= $block->getItemPriceHtml() ?>
     </td>
-    <td class="col qty" data-th="<?= $block->escapeHtml(__('Qty')) ?>"><?= (int) $_item->getQty() ?></td>
+    <td class="col qty" data-th="<?= $block->escapeHtml(__('Qty')) ?>"><?= (float) $_item->getQty() ?></td>
     <td class="col subtotal" data-th="<?= $block->escapeHtml(__('Subtotal')) ?>">
         <?= $block->getItemRowTotalHtml() ?>
     </td>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/invoice/items/renderer/default.phtml b/app/code/Magento/Sales/view/frontend/templates/order/invoice/items/renderer/default.phtml
@@ -44,7 +44,7 @@
         <?= $block->getItemPriceHtml() ?>
     </td>
     <td class="col qty" data-th="<?= $block->escapeHtml(__('Qty Invoiced')) ?>">
-        <span class="qty summary"><?= (int) $_item->getQty() ?></span>
+        <span class="qty summary"><?= (float) $_item->getQty() ?></span>
     </td>
     <td class="col subtotal" data-th="<?= $block->escapeHtml(__('Subtotal')) ?>">
         <?= $block->getItemRowTotalHtml() ?>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/items/renderer/default.phtml b/app/code/Magento/Sales/view/frontend/templates/order/items/renderer/default.phtml
@@ -46,25 +46,25 @@ $_item = $block->getItem();
         <?php if ($block->getItem()->getQtyOrdered() > 0) : ?>
             <li class="item">
                 <span class="title"><?= $block->escapeHtml(__('Ordered')) ?></span>
-                <span class="content"><?= (int) $block->getItem()->getQtyOrdered() ?></span>
+                <span class="content"><?= (float) $block->getItem()->getQtyOrdered() ?></span>
             </li>
         <?php endif; ?>
         <?php if ($block->getItem()->getQtyShipped() > 0) : ?>
             <li class="item">
                 <span class="title"><?= $block->escapeHtml(__('Shipped')) ?></span>
-                <span class="content"><?= (int) $block->getItem()->getQtyShipped() ?></span>
+                <span class="content"><?= (float) $block->getItem()->getQtyShipped() ?></span>
             </li>
         <?php endif; ?>
         <?php if ($block->getItem()->getQtyCanceled() > 0) : ?>
             <li class="item">
                 <span class="title"><?= $block->escapeHtml(__('Canceled')) ?></span>
-                <span class="content"><?= (int) $block->getItem()->getQtyCanceled() ?></span>
+                <span class="content"><?= (float) $block->getItem()->getQtyCanceled() ?></span>
             </li>
         <?php endif; ?>
         <?php if ($block->getItem()->getQtyRefunded() > 0) : ?>
             <li class="item">
                 <span class="title"><?= $block->escapeHtml(__('Refunded')) ?></span>
-                <span class="content"><?= (int) $block->getItem()->getQtyRefunded() ?></span>
+                <span class="content"><?= (float) $block->getItem()->getQtyRefunded() ?></span>
             </li>
         <?php endif; ?>
         </ul>
