Skip to content

Commit 781e84a

Browse files
ENGCOM-3982: [Backport] fixed Negative order amount in dashboard #20647
- Merge Pull Request #20647 from amol2jcommerce/magento2:2.2-develop-PR-port-19372 - Merged commits: 1. a8c0b35 2. 5eba9a4
2 parents d8ec98c + 5eba9a4 commit 781e84a

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

app/code/Magento/Reports/Model/ResourceModel/Order/Collection.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
76
namespace Magento\Reports\Model\ResourceModel\Order;
87

98
use Magento\Framework\DB\Select;
@@ -81,7 +80,7 @@ class Collection extends \Magento\Sales\Model\ResourceModel\Order\Collection
8180
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
8281
* @param \Magento\Sales\Model\Order\Config $orderConfig
8382
* @param \Magento\Sales\Model\ResourceModel\Report\OrderFactory $reportOrderFactory
84-
* @param null $connection
83+
* @param \Magento\Framework\DB\Adapter\AdapterInterface $connection
8584
* @param \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource
8685
*
8786
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
@@ -825,7 +824,7 @@ protected function getTotalsExpression(
825824
) {
826825
$template = ($storeId != 0)
827826
? '(main_table.base_subtotal - %2$s - %1$s - ABS(main_table.base_discount_amount) - %3$s)'
828-
: '((main_table.base_subtotal - %1$s - %2$s - ABS(main_table.base_discount_amount) - %3$s) '
827+
: '((main_table.base_subtotal - %1$s - %2$s - ABS(main_table.base_discount_amount) + %3$s) '
829828
. ' * main_table.base_to_global_rate)';
830829
return sprintf($template, $baseSubtotalRefunded, $baseSubtotalCanceled, $baseDiscountCanceled);
831830
}

0 commit comments

Comments
 (0)