Skip to content

Fixed decimal handling in order quantities #14346

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 4, 2018
+112 −2
Merged

Fixed decimal handling in order quantities #14346

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7a0534a
Fixed decimal handling in order quantities
barbazul Mar 24, 2018
5b58a34
Fixed an empty line at the end of the class and reduced the number of
barbazul Mar 25, 2018
3c65999
Merged to test methods into one.
barbazul Mar 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/code/Magento/Sales/Model/Order/Item.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ public function getQtyToShip()
public function getSimpleQtyToShip()
{
$qty = $this->getQtyOrdered() - $this->getQtyShipped() - $this->getQtyRefunded() - $this->getQtyCanceled();
return max($qty, 0);
return max(round($qty, 8), 0);
}

/**
Expand All @@ -248,7 +248,7 @@ public function getQtyToInvoice()
}

$qty = $this->getQtyOrdered() - $this->getQtyInvoiced() - $this->getQtyCanceled();
return max($qty, 0);
return max(round($qty, 8), 0);
}

/**
Expand Down
110 changes: 110 additions & 0 deletions app/code/Magento/Sales/Test/Unit/Model/Order/ItemTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,4 +235,114 @@ public function getProductOptionsDataProvider()
]
];
}

/**
* Test different combinations of item qty setups
*
* @param array $options
* @param float $expectedResult
*
* @dataProvider getItemQtyVariants
*/
public function testGetSimpleQtyToMethods(array $options, $expectedResult)
{
$this->model->setData($options);
$this->assertSame($this->model->getSimpleQtyToShip(), $expectedResult['to_ship']);
$this->assertSame($this->model->getQtyToInvoice(), $expectedResult['to_invoice']);
}

/**
* Provides different combinations of qty options for an item and the
* expected qtys pending shipment and invoice
*
* @return array
*/
public function getItemQtyVariants()
{
return [
'empty_item' => [
'options' => [
'qty_ordered' => 0, 'qty_invoiced' => 0, 'qty_refunded' => 0, 'qty_shipped' => 0,
'qty_canceled' => 0
],
'expectedResult' => ['to_ship' => 0.0, 'to_invoice' => 0.0]
],
'ordered_item' => [
'options' => [
'qty_ordered' => 12, 'qty_invoiced' => 0, 'qty_refunded' => 0, 'qty_shipped' => 0,
'qty_canceled' => 0
],
'expectedResult' => ['to_ship' => 12.0, 'to_invoice' => 12.0]
],
'partially_invoiced' => [
'options' => ['qty_ordered' => 12, 'qty_invoiced' => 4, 'qty_refunded' => 0, 'qty_shipped' => 0,
'qty_canceled' => 0,
],
'expectedResult' => ['to_ship' => 12.0, 'to_invoice' => 8.0]
],
'completely_invoiced' => [
'options' => [
'qty_ordered' => 12, 'qty_invoiced' => 12, 'qty_refunded' => 0, 'qty_shipped' => 0,
'qty_canceled' => 0,
],
'expectedResult' => ['to_ship' => 12.0, 'to_invoice' => 0.0]
],
'partially_invoiced_refunded' => [
'options' => [
'qty_ordered' => 12, 'qty_invoiced' => 5, 'qty_refunded' => 5, 'qty_shipped' => 0,
'qty_canceled' => 0,
],
'expectedResult' => ['to_ship' => 7.0, 'to_invoice' => 7.0]
],
'partially_refunded' => [
'options' => [
'qty_ordered' => 12, 'qty_invoiced' => 12, 'qty_refunded' => 5, 'qty_shipped' => 0,
'qty_canceled' => 0,
],
'expectedResult' => ['to_ship' => 7.0, 'to_invoice' => 0.0]
],
'partially_shipped' => [
'options' => [
'qty_ordered' => 12, 'qty_invoiced' => 0, 'qty_refunded' => 0, 'qty_shipped' => 4,
'qty_canceled' => 0
],
'expectedResult' => ['to_ship' => 8.0, 'to_invoice' => 12.0]
],
'partially_refunded_partially_shipped' => [
'options' => [
'qty_ordered' => 12, 'qty_invoiced' => 12, 'qty_refunded' => 5, 'qty_shipped' => 4,
'qty_canceled' => 0
],
'expectedResult' => ['to_ship' => 3.0, 'to_invoice' => 0.0]
],
'complete' => [
'options' => [
'qty_ordered' => 12, 'qty_invoiced' => 12, 'qty_refunded' => 0, 'qty_shipped' => 12,
'qty_canceled' => 0
],
'expectedResult' => ['to_ship' => 0.0, 'to_invoice' => 0.0]
],
'canceled' => [
'options' => [
'qty_ordered' => 12, 'qty_invoiced' => 0, 'qty_refunded' => 0, 'qty_shipped' => 0,
'qty_canceled' => 12
],
'expectedResult' => ['to_ship' => 0.0, 'to_invoice' => 0.0]
],
'completely_shipped_using_decimals' => [
'options' => [
'qty_ordered' => 4.4, 'qty_invoiced' => 0.4, 'qty_refunded' => 0.4, 'qty_shipped' => 4,
'qty_canceled' => 0,
],
'expectedResult' => ['to_ship' => 0.0, 'to_invoice' => 4.0]
],
'completely_invoiced_using_decimals' => [
'options' => [
'qty_ordered' => 4.4, 'qty_invoiced' => 4, 'qty_refunded' => 0, 'qty_shipped' => 4,
'qty_canceled' => 0.4
],
'expectedResult' => ['to_ship' => 0.0, 'to_invoice' => 0.0]
]
];
}
}