Skip to content

Fix issue #37348: Google GTag add ecommerce data fix. #37349

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

Jump to bottom
Merged
merged 29 commits into from
Jul 4, 2024
Merged

Fix issue #37348: Google GTag add ecommerce data fix. #37349

merged 29 commits into from
Jul 4, 2024

Conversation

Bashev
Copy link
Contributor

@Bashev Bashev commented Apr 8, 2023 •
edited
Loading

  1. Currency was moved to order object.
  2. Escapers was changed to be in harmony of "non-deprecated" ones.

Description (*)

Related Pull Requests

Fixed Issues (if relevant)

  1. Fixes GTag not send transaction prices and totals. #37348

Manual testing scenarios (*)

  1. ...
  2. ...

Questions or comments

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)
  • README.md files for modified modules are updated and included in the pull request if any README.md predefined sections require an update
  • All automated tests passed successfully (all builds are green)
@m2-assistant
Copy link

m2-assistant bot commented Apr 8, 2023

Hi @Bashev. Thank you for your contribution!
Here are some useful tips on 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 give me test instance - deploy test instance based on PR changes
  • @magento give me 2.4-develop instance - deploy vanilla Magento instance

❗ Automated tests can be triggered manually with an appropriate comment:

  • @magento run all tests - run or re-run all required tests against the PR changes
  • @magento run <test-build(s)> - run or re-run specific test build(s)
    For example: @magento run Unit Tests

<test-build(s)> is a comma-separated list of build names.

Allowed build names are:
  1. Database Compare
  2. Functional Tests CE
  3. Functional Tests EE
  4. Functional Tests B2B
  5. Integration Tests
  6. Magento Health Index
  7. Sample Data Tests CE
  8. Sample Data Tests EE
  9. Sample Data Tests B2B
  10. Static Tests
  11. Unit Tests
  12. WebAPI Tests
  13. Semantic Version Checker

You can find more information about the builds here
ℹ️ Run only required test builds during development. Run all test builds before sending your pull request for review.

For more details, review the Code Contributions documentation.
Join Magento Community Engineering Slack and ask your questions in #github channel.
@Bashev Bashev changed the title move currency to order, change escapers and remove developer id. Fix issue #37348: move currency to order, change escapers and remove developer id. Apr 8, 2023
@Bashev
Copy link
Contributor Author

Bashev commented Apr 8, 2023

@magento run all tests
@magento-automated-testing
Copy link

The requested builds are added to the queue. You should be able to see them here within a few minutes. Please re-request them if they don't show in a reasonable amount of time.
@Bashev
Copy link
Contributor Author

Bashev commented Apr 8, 2023

@magento run all tests
@magento-automated-testing
Copy link

The requested builds are added to the queue. You should be able to see them here within a few minutes. Please re-request them if they don't show in a reasonable amount of time.
@Bashev
Copy link
Contributor Author

Bashev commented Apr 8, 2023

@magento run all tests
@magento-automated-testing
Copy link

The requested builds are added to the queue. You should be able to see them here within a few minutes. Please re-request them if they don't show in a reasonable amount of time.
@Bashev
Copy link
Contributor Author

Bashev commented Apr 8, 2023

@magento run all tests
@magento-automated-testing
Copy link

The requested builds are added to the queue. You should be able to see them here within a few minutes. Please re-request them if they don't show in a reasonable amount of time.
@Bashev
Copy link
Contributor Author

Bashev commented Apr 13, 2023

@magento run all tests
@magento-automated-testing
Copy link

The requested builds are added to the queue. You should be able to see them here within a few minutes. Please re-request them if they don't show in a reasonable amount of time.
@Bashev
Copy link
Contributor Author

Bashev commented Apr 13, 2023

@magento run all tests
@magento-automated-testing
Copy link

The requested builds are added to the queue. You should be able to see them here within a few minutes. Please re-request them if they don't show in a reasonable amount of time.
@Bashev
Copy link
Contributor Author

Bashev commented Apr 13, 2023

@magento run Sample Data Tests B2B, Sample Data Tests EE, Functional Tests B2B, Functional Tests EE, Integration Tests, Static Tests, Unit Tests, WebAPI Tests
@magento-automated-testing
Copy link

The requested builds are added to the queue. You should be able to see them here within a few minutes. Please re-request them if they don't show in a reasonable amount of time.
@Bashev Bashev changed the title Fix issue #37348: move currency to order, change escapers and remove developer id. Fix issue #37348: Google GTag add ecommerce data fix. Apr 17, 2023
@kasperth
Copy link

@Bashev Appreciate the good work you are putting into this.

I have also looked into this and found that by including currency and changing the number values to be outputted correctly (removing quotation marks, following Google docs), Google now reads it as e-commerce data and includes it as revenue.

Which issues are you facing? I thought about creating a simple PR, but it looks like you are being more thorough and solving more things than me.
@Bashev
Copy link
Contributor Author

Bashev commented Apr 18, 2023

@kasperth if currency is not on the order level GA not recognize order amount and everytime is reported as 0. When move the currency inside the order start working properly. Your finding is correct,. During the fix i add additional things as coupons and discounts into the datalayer which will be send to GA.

Unfortunately some of these changes reflect to changes of __construct of the Ga Block, composer.json and as result this is the reason for failed jobs.

Someone from the team need to support this PR.
@engcom-Echo
Copy link
Contributor

@magento run all tests
@engcom-Echo
Copy link
Contributor

@magento run all tests
@engcom-Echo
Copy link
Contributor

engcom-Echo commented Jun 6, 2024 •
edited by engcom-Hotel
Loading

Fixed Unit test failures and other failing tests are not related to PR changes and some of them are known failure.
Hence moving it to Pending Review
@engcom-Hotel
Copy link
Contributor

@magento run Functional Tests B2B, Functional Tests CE, Functional Tests EE, WebAPI Tests
@engcom-Bravo engcom-Bravo self-assigned this Jun 10, 2024
@engcom-Bravo
Copy link
Contributor

@magento run all tests
@engcom-Bravo
Copy link
Contributor

Hi @Bashev,

Thanks for the collaboration & contribution!

❌ QA not Passed

✔️ Expected result After Fix 

Coupon and Discount data should be present in gtag data

❌ Actual result After Fix 

Screenshot 2024-06-10 at 13 22 55 Screenshot 2024-06-10 at 12 53 01

Let us know if we are missing anything.

Thanks.
@Bashev
Copy link
Contributor Author

Bashev commented Jun 10, 2024

@engcom-Bravo mentioned improvements are in separate PR #37504 which was closed for unclear reason.

They are 2 separate PRs
@engcom-Bravo
Copy link
Contributor

Hi @Bashev,

Thanks for your update.

✔️ QA Passed

Before: ✖️

Screenshot 2024-06-11 at 10 48 54

After: ✔️

Screenshot 2024-06-11 at 10 48 43

Builds are failed. Hence, moving this PR to Extended Testing.

Thanks.
@engcom-Echo
Copy link
Contributor

@magento run WebAPI Tests,Unit Tests,Functional Tests EE,Functional Tests CE,Functional Tests B2B
@engcom-Echo
Copy link
Contributor

@magento run all tests
@engcom-Echo
Copy link
Contributor

@magento run Functional Tests B2B,Functional Tests CE,Functional Tests EE,Integration Tests,WebAPI Tests
@engcom-Echo
Copy link
Contributor

Functional Tests CE,Functional Tests EE,Functional Tests B2B failure contains some known failure and rest failure are different on last two run on same commit.
Functional Tests CE
Run1
37349-ce

Run2
Screenshot 2024-06-12 at 1 03 33 PM

Functional Tests EE
Run1
37349-ee

Run2
Screenshot 2024-06-12 at 1 03 50 PM

Functional Tests B2B
Run1
37349-b2b

Run2
Screenshot 2024-06-12 at 2 01 25 PM

WebAPI Tests ,Integration Tests contains known failure.
Screenshot 2024-06-12 at 1 06 23 PM

Screenshot 2024-06-12 at 1 06 32 PM

Hence moving it to merge in progress
@magento-devops-reposync-svc magento-devops-reposync-svc merged commit dcc8a61 into magento:2.4-develop Jul 4, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Priority: P2 A defect with this priority could have functionality issues which are not to expectations. Progress: accept Project: Community Picked PRs upvoted by the community
8 participants
@Bashev @kasperth @engcom-Hotel @engcom-Echo @engcom-Bravo @bhoopatparmar @sinhaparul @magento-devops-reposync-svc