Merge branch 'master' into social_login_cart_merging
Merged With Master
This commit is contained in:
commit
78805bfcec
|
|
@ -213,7 +213,7 @@ class OrderRepository extends Repository
|
||||||
$totalQtyInvoiced += $item->qty_invoiced;
|
$totalQtyInvoiced += $item->qty_invoiced;
|
||||||
|
|
||||||
if (! $item->isStockable()) {
|
if (! $item->isStockable()) {
|
||||||
$totalQtyShipped += $item->qty_ordered;
|
$totalQtyShipped += $item->qty_invoiced;
|
||||||
} else {
|
} else {
|
||||||
$totalQtyShipped += $item->qty_shipped;
|
$totalQtyShipped += $item->qty_shipped;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue