Fix checking active carrier against store #10695
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
When creating orders in backend we must use active store code when checking for available carriers. This fix was introduced in 2.2 dev branch with commit 08b5177
|
|
miguelbalparda
approved these changes
Aug 30, 2017
| @@ -106,7 +106,8 @@ public function createIfActive($carrierCode, $storeId = null) | |||
| { | |||
| return $this->_scopeConfig->isSetFlag( | |||
| 'carriers/' . $carrierCode . '/active', | |||
| \Magento\Store\Model\ScopeInterface::SCOPE_STORE | |||
| \Magento\Store\Model\ScopeInterface::SCOPE_STORE, | |||
| $storeId | |||
There was a problem hiding this comment.
The build is failing because there is an extra space before $storeId.
There was a problem hiding this comment.
- Magento\Test\Php\LiveCodeTest::testCodeStylePsr2
PHP Code Sniffer has found 1 error(s):
FILE: ...ild/magento/magento2/app/code/Magento/Shipping/Model/CarrierFactory.php
FOUND 1 ERROR(S) AFFECTING 1 LINE(S)
110 | ERROR | Multi-line function call not indented correctly; expected 12
| | spaces but found 13
There was a problem hiding this comment.
Yes, that's been fixed in the latest commit
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When creating orders in backend we must use active store code when checking for available carriers.
Description
The same bugfix was introduced in 2.2 dev branch with commit 08b5177
Manual testing scenarios
Enable shipping method in some non-standard store or website, and create a new order in the backend. The shipping option should be listed as available.
Contribution checklist