MAGETWO-99371: Wrong calculation of invoiced items

- Issue testing scenario covering

Author: dyushkin

dev/tests/integration/testsuite/Magento/Sales/Model/Service/InvoiceServiceTest.php

@@ -89,4 +89,99 @@ public function prepareInvoiceSimpleProductDataProvider()
             'partial invoice' => [1]
         ];
     }
+
+    /**
+     * Checks if ordered and invoiced qty of bundle product does match.
+     *
+     * @param array $qtyToInvoice
+     * @param array $qtyInvoiced
+     * @param string $errorMsg
+     * @return void
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @magentoDataFixture Magento/Sales/_files/order_with_bundle.php
+     * @dataProvider bundleProductQtyOrderedDataProvider
+     */
+    public function testPrepareInvoiceBundleProduct(
+        array $qtyToInvoice,
+        array $qtyInvoiced,
+        string $errorMsg
+    ): void
+    {
+        /** @var Order $order */
+        $order = Bootstrap::getObjectManager()->create(Order::class)
+            ->load('100000001', 'increment_id');
+
+        $predefinedQtyToInvoice = $this->getPredefinedQtyToInvoice($order, $qtyToInvoice);
+        $invoice = $this->invoiceService->prepareInvoice($order, $predefinedQtyToInvoice);
+
+        foreach ($invoice->getItems() as $invoiceItem) {
+            if (isset($qtyInvoiced[$invoiceItem->getSku()])) {
+                $this->assertEquals(
+                    $qtyInvoiced[$invoiceItem->getSku()],
+                    $invoiceItem->getQty(),
+                    sprintf($errorMsg, $invoiceItem->getSku())
+                );
+            }
+        }
+    }
+
+    /**
+     * Data provider for invoice creation with and w/o predefined qty to invoice.
+     *
+     * @return array
+     */
+    public function bundleProductQtyOrderedDataProvider(): array
+    {
+        return [
+            'Create invoice w/o predefined qty' => [
+                'Qty to invoice' => [],
+                'Qty ordered' => [
+                    'bundle_1' => 2,
+                    'bundle_simple_1' => 10,
+                ],
+                'Error msg' => 'Invoiced qty for product %s does not match.',
+            ],
+            'Create invoice with predefined qty' => [
+                'Qty to invoice' => [
+                    'bundle_1' => 2,
+                    'bundle_simple_1' => 10,
+                ],
+                'Qty ordered' => [
+                    'bundle_1' => 2,
+                    'bundle_simple_1' => 10,
+                ],
+                'Error msg' => 'Invoiced qty for product %s does not match.',
+            ],
+            'Create invoice with partial predefined qty for bundle' => [
+                'Qty to invoice' => [
+                    'bundle_1' => 1,
+                ],
+                'Qty ordered' => [
+                    'bundle_1' => 1,
+                    'bundle_simple_1' => 5,
+                ],
+                'Error msg' => 'Invoiced qty for product %s does not match.',
+            ],
+        ];
+    }
+
+    /**
+     * Associate product qty to invoice to order item id.
+     *
+     * @param Order $order
+     * @param array $qtyToInvoice
+     * @return array
+     */
+    private function getPredefinedQtyToInvoice(Order $order, array $qtyToInvoice): array
+    {
+        $predefinedQtyToInvoice = [];
+
+        foreach ($order->getAllItems() as $orderItem) {
+            if (array_key_exists($orderItem->getSku(), $qtyToInvoice)) {
+                $predefinedQtyToInvoice[$orderItem->getId()] = $qtyToInvoice[$orderItem->getSku()];
+            }
+        }
+
+        return $predefinedQtyToInvoice;
+    }
 }

dev/tests/integration/testsuite/Magento/Sales/_files/order_with_bundle.php

@@ -18,11 +18,12 @@
 
 $orderItems = [
     [
+        OrderItemInterface::SKU => 'bundle_1',
+        OrderItemInterface::NAME => 'bundle_1',
         OrderItemInterface::PRODUCT_ID => 2,
         OrderItemInterface::BASE_PRICE => 100,
         OrderItemInterface::ORDER_ID => $order->getId(),
         OrderItemInterface::QTY_ORDERED => 2,
-        OrderItemInterface::QTY_INVOICED => 2,
         OrderItemInterface::PRICE => 100,
         OrderItemInterface::ROW_TOTAL => 102,
         OrderItemInterface::PRODUCT_TYPE => 'bundle',
@@ -35,18 +36,17 @@
         ],
         'children' => [
             [
+                OrderItemInterface::SKU => 'bundle_simple_1',
+                OrderItemInterface::NAME => 'bundle_simple_1',
                 OrderItemInterface::PRODUCT_ID => 13,
                 OrderItemInterface::ORDER_ID => $order->getId(),
                 OrderItemInterface::QTY_ORDERED => 10,
-                OrderItemInterface::QTY_INVOICED => 10,
                 OrderItemInterface::BASE_PRICE => 90,
                 OrderItemInterface::PRICE => 90,
                 OrderItemInterface::ROW_TOTAL => 92,
                 OrderItemInterface::PRODUCT_TYPE => 'simple',
                 'product_options' => [
-                    'bundle_selection_attributes' => [
-                        'qty' => 2,
-                    ],
+                    'bundle_selection_attributes' => '{"qty":5}',
                 ],
             ],
         ],