Skip to content
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

magento/magento2#29926: Prices should be possibly hidden from products query results #29998

Merged
merged 1 commit into from
Oct 10, 2020
Merged

magento/magento2#29926: Prices should be possibly hidden from products query results #29998

merged 1 commit into from
Oct 10, 2020

Conversation

pmarjan
Copy link
Contributor

@pmarjan pmarjan commented Sep 11, 2020

Description (*)

Fixes #29926

Related Pull Requests

Fixed Issues (if relevant)

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)
  • All automated tests passed successfully (all builds are green)

@pmarjan pmarjan added Project: GraphQL PAP Partners acceleration program labels Sep 11, 2020
@pmarjan pmarjan added this to the 2.4.2 milestone Sep 11, 2020
@pmarjan pmarjan requested a review from cpartica September 11, 2020 10:21
@pmarjan pmarjan self-assigned this Sep 11, 2020
@m2-assistant
Copy link

m2-assistant bot commented Sep 11, 2020

Hi @pmarjan. 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 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

You can find more information about the builds here

ℹ️ Please run only needed test builds instead of all when developing. Please run all test builds before sending your PR for review.

For more details, please, review the Magento Contributor Guide documentation.

⚠️ According to the Magento Contribution requirements, all Pull Requests must go through the Community Contributions Triage process. Community Contributions Triage is a public meeting.

🕙 You can find the schedule on the Magento Community Calendar page.

📞 The triage of Pull Requests happens in the queue order. If you want to speed up the delivery of your contribution, please join the Community Contributions Triage session to discuss the appropriate ticket.

🎥 You can find the recording of the previous Community Contributions Triage on the Magento Youtube Channel

✏️ Feel free to post questions/proposals/feedback related to the Community Contributions Triage process to the corresponding Slack Channel

@ghost ghost unassigned pmarjan Sep 11, 2020
@magento-engcom-team magento-engcom-team added Partner: Comwrap partners-contribution Pull Request is created by Magento Partner labels Sep 11, 2020
@pmarjan
Copy link
Contributor Author

pmarjan commented Sep 11, 2020

@magento run all tests

@pmarjan pmarjan mentioned this pull request Sep 17, 2020
Closed
cpartica
cpartica approved these changes Sep 29, 2020
View reviewed changes
app/code/Magento/CatalogGraphQl/Model/Resolver/Product/PriceRange.php
*/
private function formatEmptyResult(): array
{
return [
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we could make the Money! type not mandatory, would be better.
We won't now though, because it's backward incompatible in schema. I guess we never thought a price can be optional...

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, so this seemed like the good approach under these circumstances.

app/code/Magento/CatalogGraphQl/Model/Resolver/Product/SpecialPrice.php
@@ -28,7 +28,10 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
/** @var PricingSpecialPrice $specialPrice */
$specialPrice = $product->getPriceInfo()->getPrice(PricingSpecialPrice::PRICE_CODE);

if ($specialPrice->getValue()) {
if ((!$product->hasData('can_show_price')
|| ($product->hasData('can_show_price') && $product->getData('can_show_price') === true)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

there's no constant in core for this right? if not..leave it like this

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, no constant as far I can see.

@ghost ghost assigned cpartica Sep 29, 2020
@pmarjan
Copy link
Contributor Author

pmarjan commented Sep 30, 2020

@magento run all tests

@magento-engcom-team magento-engcom-team merged commit 431b2b9 into magento:2.4-develop Oct 10, 2020
@m2-assistant
Copy link

m2-assistant bot commented Oct 10, 2020

Hi @pmarjan, 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.

@barryvdh barryvdh mentioned this pull request Feb 22, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cpartica cpartica cpartica approved these changes

@cspruiell cspruiell Awaiting requested review from cspruiell

@melnikovi melnikovi Awaiting requested review from melnikovi

@prabhuram93 prabhuram93 Awaiting requested review from prabhuram93

@dthampy dthampy Awaiting requested review from dthampy

Assignees

@cpartica cpartica

@pmarjan pmarjan

Labels
Component: CatalogCustomerGraphQl Component: CatalogGraphQl PAP Partners acceleration program Partner: Comwrap partners-contribution Pull Request is created by Magento Partner Progress: ready for testing Project: GraphQL Release Line: 2.4
Projects
None yet
Milestone
2.4.2
Development

Successfully merging this pull request may close these issues.

Prices should be hidden from products query results when the category permissions chooses to hide them
3 participants
@pmarjan @cpartica @magento-engcom-team