Skip to content

Resolved Cannot create shipment for remaining items #27414

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 10 commits into from
May 18, 2020
Merged

Resolved Cannot create shipment for remaining items #27414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8e4c3bf
Merge pull request #15 from magento/2.4-develop
niravkrish Mar 1, 2020
ec55a63
Merge remote-tracking branch 'upstream/2.4-develop' into 2.4-develop
niravkrish Mar 11, 2020
b7e99de
Merge remote-tracking branch 'upstream/2.4-develop' into 2.4-develop
niravkrish Mar 24, 2020
cbc352e
resolve can not create shipment for remaining item issue
niravkrish Mar 24, 2020
c85bcd0
added unit test changes
niravkrish Mar 25, 2020
01aeae6
Merge branch '2.4-develop' into Fixed-27141
ihor-sviziev Apr 29, 2020
20e30c6
Resolved Cannot create shipment for remaining items
ihor-sviziev May 4, 2020
2d34f05
Resolved Cannot create shipment for remaining items
ihor-sviziev May 5, 2020
f6938af
Merge branch '2.4-develop' into Fixed-27141
engcom-Charlie May 7, 2020
f5c4dc4
Merge branch '2.4.0-develop' into Fixed-27141
ihor-sviziev May 9, 2020
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
2 changes: 1 addition & 1 deletion 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 @@ -232,7 +232,7 @@ public function getQtyToShip()
*/
public function getSimpleQtyToShip()
{
$qty = $this->getQtyOrdered() - $this->getQtyShipped() - $this->getQtyRefunded() - $this->getQtyCanceled();
$qty = $this->getQtyOrdered() - max($this->getQtyShipped(), $this->getQtyRefunded()) - $this->getQtyCanceled();
return max(round($qty, 8), 0);
}

Expand Down
4 changes: 2 additions & 2 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 @@ -321,7 +321,7 @@ public function getItemQtyVariants()
'qty_ordered' => 12, 'qty_invoiced' => 12, 'qty_refunded' => 5, 'qty_shipped' => 4,
'qty_canceled' => 0
],
'expectedResult' => ['to_ship' => 3.0, 'to_invoice' => 0.0]
'expectedResult' => ['to_ship' => 7.0, 'to_invoice' => 0.0]
],
'complete' => [
'options' => [
Expand All @@ -342,7 +342,7 @@ public function getItemQtyVariants()
'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]
'expectedResult' => ['to_ship' => 0.4, 'to_invoice' => 4.0]
],
'completely_invoiced_using_decimals' => [
'options' => [
Expand Down