magento/magento2#25933 : Single Store Mode- Incorrect scope values us…

[sanjay-magecomp]

we have resolve this issue : #25933

Preconditions (*)
Magento 2.3.3 CE & 2.4-develop with sample data
Magento Instance should have one Website, Store and Store View only.
Steps to reproduce (*)

1. Under Default Config, Navigate to Stores > Settings > Configuration > Catalog > Catalog
2. Change the values of field Products per Page on Grid Allowed Values from 9,15,30 to 5,10,20,40,80 (Uncheck Use System value checkbox if ticked - optional)
3. Change the values of field Products per Page on Grid Default Value from 9 to 10 (Uncheck Use System value checkbox if ticked- optional)
4. Click on Save Config
5. Clear the cache if prompted to refresh the cache
6. Switch the scope from Default Config to Default Store View Scope from the drop-down showing on upper-left corner
7. Navigate to Stores > Settings > Configuration > Catalog > Catalog
8. From Default Store View Scope, Uncheck Use Website checkbox for following fields
   . Products per Page on Grid Allowed Values
   . Products per Page on Grid Default Value
9. Change the values of field Products per Page on Grid Allowed Values to 30,60,90
10. Change the values of field Products per Page on Grid Default Value to 30
    Click on Save Config
11. Switch the scope to Default Config from Default Store View Scope
12. From Default Config Scope, Set Enable Single-Store Mode to Yes
13. Click Save Config
14. Clear all the cache
15. Now, Navigate to Stores > Settings > Configuration > Catalog > Catalog
16. Tries to update the values for following fields.
17. Products per Page on Grid Allowed Values 20,40,60
    .Products per Page on Grid Default Value 20
    19.Save Config and Clear all the cache
    20.Open any category page to see the Show per page values.

Expected result (*)
On category page, it should show 20,40,60 in the Show per page drop-down.
Actual result (*)
On category page, it shows values as 30,60,90 in the Show per page drop-down.

Description
showing correct pagination based on system configurations.

Fixed Issues

1. Fixes Single Store Mode- Incorrect scope values using at Storefront for Catalog Section #25933

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)

[m2-assistant]

Hi @sanjay-magecomp. 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

[sanjay-magecomp]

#dmcdindia2020

[sanjay-magecomp]

@magento give me test instance - deploy test instance based on PR changes

[magento-deployment-service]

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

[magento-deployment-service]

Hi @sanjay-magecomp, here is your Magento Instance: https://b4c46820c354d4c8d7afc01683ed1c38.instances.magento-community.engineering
Admin access: https://b4c46820c354d4c8d7afc01683ed1c38.instances.magento-community.engineering/admin_3e70
Login: 09855333
Password: e412e6fc9d11

[pramod-mishra]

#dmcdindia2020

[pramod-mishra]

@magento give me test instance

[magento-deployment-service]

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

[magento-deployment-service]

Hi @pramod-mishra, here is your Magento Instance: https://b4c46820c354d4c8d7afc01683ed1c38.instances.magento-community.engineering
Admin access: https://b4c46820c354d4c8d7afc01683ed1c38.instances.magento-community.engineering/admin_3e70
Login: 09855333
Password: e412e6fc9d11

[yogeshkhasturi]

#dmcdindia2020

[magento-engcom-team]

@yogeshkhasturi thank you for joining. Please accept team invitation here and self-assign the issue.

[sanjay-magecomp]

@magento run all tests

[sinisa-colic]

Suggested change

	$scope=ScopeInterface::SCOPE_STORE;
	if($this->scopeConfig->getValue('general/single_store_mode/enabled', ScopeConfigInterface::SCOPE_TYPE_DEFAULT)) {
	$scope = ScopeConfigInterface::SCOPE_TYPE_DEFAULT;
	}
	$scope = $this->scopeConfig->getValue(\Magento\Store\Model\StoreManager::XML_PATH_SINGLE_STORE_MODE_ENABLED)
	? ScopeConfigInterface::SCOPE_TYPE_DEFAULT
	: ScopeInterface::SCOPE_STORE;

[Bashev]

@magento run all tests

[magento-automated-testing]

The requested builds are added to the queue. You should be able to see them here within a few minutes. Please message the #magento-devops slack channel if they don't show in a reasonable amount of time and a representative will look into any issues.