Fixed calculation of 'Total' column under "Last Orders" listing on the admin dashboard #21283

rav-redchamps · 2019-02-16T05:23:36Z

Description (*)

The calculation of 'Total' column under "Last Orders" listing on the admin dashboard was wrong. It has below problems.

It wasn't considering the refunded discount amount
It was subtracting discount canceled amount instead of adding when viewing data for a particular website or store

Fixed Issues (if relevant)

Wrong order amount on dashboard on Last orders listing when order has discount and it is partially refunded #21281: Wrong order amount on the dashboard on Last orders listing when the order has discount and it is partially refunded
Negative order amount in dashboard latest order when order is cancelled where coupon has been used #18754: Negative order amount in dashboard latest order when order is cancelled where coupon has been used

Manual testing scenarios (*)

Testing fix for issue##18754

Place an order with a coupon code, for example, 4.95 EUR off
Cancel the order
Go to dashboard select a specific store to view data and notice the total column under "Last Orders" listing

Testing fix for issue##21281

Add a product with quantity 3 to Cart
Create a 10% discount coupon from admin and apply it to the cart
Go to checkout and place order
Invoice the order from admin, if placed using the offline payment method
Create a credit memo for the order to refund 2 quantities out of 3
Now notice the "Total" column for order on the admin dashboard under "Last Orders" listing. The refunded discount amount on credit memo is not considered in the total.

Contribution checklist (*)

Pull request has a meaningful description of its purpose
All commits are accompanied by meaningful commit messages
All new or changed code is covered with unit/integration tests (if applicable)
All automated tests passed successfully (all builds on Travis CI are green)

…ixed Negative order amount in dashboard when viewing particular store data

magento-engcom-team · 2019-02-16T05:23:38Z

Hi @rav-redchamps. Thank you for your contribution
Here is some useful tips how you can test your changes using Magento test environment.
Add the comment under your pull request to deploy test or vanilla Magento instance:

@magento-engcom-team give me test instance - deploy test instance based on PR changes
@magento-engcom-team give me 2.3-develop instance - deploy vanilla Magento instance

For more details, please, review the Magento Contributor Assistant documentation

rav-redchamps · 2019-02-16T05:36:17Z

@magento-engcom-team give me 2.3-develop instance

magento-engcom-team · 2019-02-16T05:36:22Z

Hi @rav-redchamps. Thank you for your request. I'm working on Magento 2.3-develop instance for you

magento-engcom-team · 2019-02-16T05:36:59Z

Hi @rav-redchamps, here is your Magento instance.
Admin access: https://i-21283-2-3-develop.instances.magento-community.engineering/admin
Login: admin Password: 123123q
Instance will be terminated in up to 3 hours.

rogyar · 2019-02-16T12:11:53Z

@magento-engcom-team give me test instance

magento-engcom-team · 2019-02-16T12:11:57Z

Hi @rogyar. Thank you for your request. I'm working on Magento instance for you

magento-engcom-team · 2019-02-16T12:12:39Z

Hi @rogyar, here is your new Magento instance.
Admin access: https://pr-21283.instances.magento-community.engineering/admin
Login: admin Password: 123123q

rogyar · 2019-02-16T12:56:21Z

Hi @rav-redchamps. Thank you for your collaboration. There's still an issue in case of partially refunded order with a discount. Steps to reproduce the same as you described for issue #21281. Product price: $10, discount: $5 (per item), qty ordered: 3, qty refunded: 2

Order totals

Dashboard result

Problem: the negative value in dashboard's order total for all store views and for a specific store view.

Could you check it out, please?

…unt is partially refunded

rav-redchamps · 2019-02-16T14:27:08Z

@magento-engcom-team give me test instance

magento-engcom-team · 2019-02-16T14:27:12Z

Hi @rav-redchamps. Thank you for your request. I'm working on Magento instance for you

magento-engcom-team · 2019-02-16T14:28:03Z

Hi @rav-redchamps, here is your new Magento instance.
Admin access: https://pr-21283.instances.magento-community.engineering/admin
Login: admin Password: 123123q

rav-redchamps · 2019-02-16T14:36:49Z

@rogyar just fixed it and tested. Kindly give a check one more time.

rogyar · 2019-02-18T08:07:27Z

@magento-engcom-team give me test instance

magento-engcom-team · 2019-02-18T08:07:32Z

Hi @rogyar. Thank you for your request. I'm working on Magento instance for you

magento-engcom-team · 2019-02-18T08:08:27Z

Hi @rogyar, here is your new Magento instance.
Admin access: https://pr-21283.instances.magento-community.engineering/admin
Login: admin Password: 123123q

rogyar · 2019-02-18T08:15:35Z

@rav-redchamps now it looks much better. Thank you.

VasylShvorak · 2019-03-05T14:58:19Z

✔️ QA passed

sidolov · 2019-03-13T18:28:10Z

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

     * @return string
     */
    protected function getTotalsExpression(
        $storeId,
        $baseSubtotalRefunded,
        $baseSubtotalCanceled,
-        $baseDiscountCanceled
+        $baseDiscountCanceled,
+        $baseDiscountRefunded = '0'


Unfortunately, we are not allowed to change public and protected methods signature according to our Backward Compatible Development Guide

Hi @sidolov

I have observed that you have initialized "$baseDiscountRefunded = '0'" in the method signature. So is this the change you are talking about and already did yourself? or you would like me to remove the additional added parameter to function's signature completely?

sidolov · 2019-03-21T15:09:48Z

@p-bystritsky , please, take a look at changes, we should rework them according to the Backward Compatibility Guide

p-bystritsky · 2019-03-22T10:47:18Z

@sidolov done.

ghost · 2019-03-26T16:56:13Z

Hi @rav-redchamps, thank you for your contribution!
Please, complete Contribution Survey, it will take less than a minute.
Your feedback will help us to improve contribution process.

…listing on the admin dashboard #21283

Added refunded discount amount to the total revenue calculation and f…

d79eb08

…ixed Negative order amount in dashboard when viewing particular store data

magento-engcom-team added Component: Reports Release Line: 2.3 labels Feb 16, 2019

This was referenced Feb 16, 2019

Wrong order amount on dashboard on Last orders listing when order has discount and it is partially refunded #21281

Closed

Negative order amount in dashboard latest order when order is cancelled where coupon has been used #18754

Closed

swnsma self-assigned this Feb 16, 2019

swnsma self-requested a review February 16, 2019 12:36

rogyar self-requested a review February 16, 2019 12:56

swnsma removed their assignment Feb 16, 2019

swnsma removed their request for review February 16, 2019 13:08

Fixed bug that total amount is showing negative when order with disco…

d1e71b9

…unt is partially refunded

rogyar self-assigned this Feb 16, 2019

magento deleted a comment from magento-engcom-team Feb 18, 2019

ghost added the Progress: testing in progress label Mar 5, 2019

ghost added Progress: extended testing and removed Progress: testing in progress labels Mar 5, 2019

p-bystritsky self-assigned this Mar 5, 2019

ENGCOM-4302: Static test fix.

f893a92

p-bystritsky force-pushed the dashboard-last-order-total-fix branch 2 times, most recently from 42f115b to 81c7e26 Compare March 7, 2019 10:15

ghost added Progress: accept and removed Progress: extended testing labels Mar 7, 2019

magento-engcom-team added the Award: bug fix label Mar 7, 2019

ghost assigned sidolov Mar 13, 2019

sidolov requested changes Mar 13, 2019

View reviewed changes

ghost added Progress: needs update and removed Progress: accept labels Mar 13, 2019

rav-redchamps requested a review from sidolov March 18, 2019 04:27

ghost added Progress: extended testing and removed Progress: needs update labels Mar 21, 2019

p-bystritsky force-pushed the dashboard-last-order-total-fix branch from 81c7e26 to de511c0 Compare March 22, 2019 08:38

ENGCOM-4302: Backward compatibility fix.

57c4db4

p-bystritsky force-pushed the dashboard-last-order-total-fix branch from de511c0 to 57c4db4 Compare March 22, 2019 10:55

ghost added Progress: accept and removed Progress: extended testing labels Mar 22, 2019

magento-engcom-team merged commit 57c4db4 into magento:2.3-develop Mar 26, 2019

magento-engcom-team pushed a commit that referenced this pull request Mar 26, 2019

ENGCOM-4302: Fixed calculation of 'Total' column under "Last Orders" …

d8a33b5

…listing on the admin dashboard #21283

magento-engcom-team added this to the Release: 2.3.2 milestone Mar 26, 2019

eduard13 mentioned this pull request Mar 26, 2019

[Backport] Fixed calculation of 'Total' column under "Last Orders" listing on the admin dashboard #21944

Merged

4 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fixed calculation of 'Total' column under "Last Orders" listing on the admin dashboard #21283

Fixed calculation of 'Total' column under "Last Orders" listing on the admin dashboard #21283

rav-redchamps commented Feb 16, 2019 •

edited

Loading

magento-engcom-team commented Feb 16, 2019

rav-redchamps commented Feb 16, 2019

magento-engcom-team commented Feb 16, 2019

magento-engcom-team commented Feb 16, 2019

rogyar commented Feb 16, 2019

magento-engcom-team commented Feb 16, 2019

magento-engcom-team commented Feb 16, 2019

rogyar commented Feb 16, 2019

rav-redchamps commented Feb 16, 2019

magento-engcom-team commented Feb 16, 2019

magento-engcom-team commented Feb 16, 2019

rav-redchamps commented Feb 16, 2019

rogyar commented Feb 18, 2019

magento-engcom-team commented Feb 18, 2019

magento-engcom-team commented Feb 18, 2019

rogyar commented Feb 18, 2019

VasylShvorak commented Mar 5, 2019

sidolov Mar 13, 2019

rav-redchamps Mar 14, 2019

sidolov commented Mar 21, 2019

p-bystritsky commented Mar 22, 2019

ghost commented Mar 26, 2019

Fixed calculation of 'Total' column under "Last Orders" listing on the admin dashboard #21283

Fixed calculation of 'Total' column under "Last Orders" listing on the admin dashboard #21283

Conversation

rav-redchamps commented Feb 16, 2019 • edited Loading

Description (*)

Fixed Issues (if relevant)

Manual testing scenarios (*)

Contribution checklist (*)

magento-engcom-team commented Feb 16, 2019

rav-redchamps commented Feb 16, 2019

magento-engcom-team commented Feb 16, 2019

magento-engcom-team commented Feb 16, 2019

rogyar commented Feb 16, 2019

magento-engcom-team commented Feb 16, 2019

magento-engcom-team commented Feb 16, 2019

rogyar commented Feb 16, 2019

rav-redchamps commented Feb 16, 2019

magento-engcom-team commented Feb 16, 2019

magento-engcom-team commented Feb 16, 2019

rav-redchamps commented Feb 16, 2019

rogyar commented Feb 18, 2019

magento-engcom-team commented Feb 18, 2019

magento-engcom-team commented Feb 18, 2019

rogyar commented Feb 18, 2019

VasylShvorak commented Mar 5, 2019

sidolov Mar 13, 2019

Choose a reason for hiding this comment

rav-redchamps Mar 14, 2019

Choose a reason for hiding this comment

sidolov commented Mar 21, 2019

p-bystritsky commented Mar 22, 2019

ghost commented Mar 26, 2019

rav-redchamps commented Feb 16, 2019 •

edited

Loading