-
Notifications
You must be signed in to change notification settings - Fork 9.4k
#10803 update OrderService to return correct bool value for cancel me… #10919
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.
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
Merged
Conversation
This file contains hidden or 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
orlangur
requested changes
Sep 18, 2017
@@ -87,7 +87,8 @@ public function __construct( | |||
public function cancel($id) | |||
{ | |||
$order = $this->orderRepository->get($id); | |||
if ((bool)$order->cancel()) { | |||
if ((bool)$order->canCancel()) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please remove (bool)
casting, it is useless within if
anyway.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
fixed
- update OrderService to return correct bool value for cancel method - removed redundant type casting
orlangur
approved these changes
Sep 18, 2017
magento-team
pushed a commit
that referenced
this pull request
Sep 23, 2017
…e for cancel me… #10919
4 tasks
strell
added a commit
to strell/magento2
that referenced
this pull request
Sep 30, 2017
From db79dbf Mon Sep 17 00:00:00 2001 From: freakphp <[email protected]> Date: Sun, 17 Sep 2017 12:52:00 +0200 Subject: [PATCH 1/2] magento#10803 update OrderService to return correct bool value for cancel method From d4cddf7 Mon Sep 17 00:00:00 2001 From: Ievgen Shakhsuvarov <[email protected]> Date: Mon, 18 Sep 2017 12:22:00 +0200 Subject: [PATCH 2/2] magento#10919: update OrderService to return correct bool value
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.
…thod
Update OrderService to return correct bool value for cancel method
Description
Magento/Sales/Model/Service/OrderService::cancel method was returning always true even if cancel method in Magento/Sales/Model/Order didn't do anything cause of canCancel validation.
OrderService cancel method will invoke canCancel to check if order can be canceled and return correct value.
Fixed Issues (if relevant)
Manual testing scenarios
Contribution checklist