Fix bug 27490: Can't change customer group when placing an admin order #27501

tna274 · 2020-03-30T15:42:22Z

Description (*)

Fix bug 27490: Can't change customer group when placing an admin order

Related Pull Requests

Fixed Issues (if relevant)

Can't change customer group when placing an admin order #27490: Fix bug 27490: Can't change customer group when placing an admin order

Manual testing scenarios (*)

In Admin System > Configurations > Customers > Customer Configurations > Create New Account Options > Enable Automatic Assignment to Customer Group >> Select YES
In Admin Sales > Orders.
Select Create New Order
Select Create New Customer
Under Account Information, change the group.

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)

m2-assistant · 2020-03-30T15:42:25Z

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

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

Stepa4man

Hi @tna274
Thanks for your contribution.

Please change your code according to Magento technical guideline

Also please consider refactoring this class.
Instead of introducing new code complexity try to separate implementation for adminhtml and frontend introducing 2 observers and declare them at respective levels via events.xml
To avoid code duplication please use decomposition.

app/code/Magento/Quote/Observer/Frontend/Quote/Address/CollectTotalsObserver.php

tna274 · 2020-04-03T14:54:17Z

Hi @Stepa4man
I have updated my pull request

engcom-Charlie · 2020-07-21T10:38:54Z

Hi, @tna274 can you please look through failed tests and merge conflicts?

engcom-Kilo · 2020-07-30T12:58:50Z

@magento run all tests

engcom-Kilo · 2020-07-30T13:28:44Z

Working with MFTF test.

engcom-Kilo · 2020-07-31T10:20:45Z

@magento run Magento Health Index

engcom-Kilo · 2020-07-31T10:21:13Z

@magento run Static Tests

engcom-Kilo · 2020-07-31T12:34:00Z

Added MFTF test.

engcom-Kilo · 2020-07-31T12:40:02Z

@magento run Functional Tests B2B

engcom-Kilo · 2020-08-03T13:10:46Z

@magento run all tests

Stepa4man

Hi @tna274
Thanks for your contribution.

Please take a look at my comments.

Stepa4man · 2020-10-16T12:41:06Z

app/code/Magento/Quote/Observer/Frontend/Quote/Address/CollectTotalsObserver.php

+     */
+    protected function assignCustomerGroupConditions($groupId)
+    {
+        return $groupId !== null ? true : false;


Why do you need it here? Why don't you just write return $groupId !== null?

Stepa4man · 2020-10-16T12:46:56Z

app/code/Magento/Quote/Observer/Backend/Quote/Address/CollectTotalsObserver.php

+        if ($groupId !== null
+            && !(
+                $this->state->getAreaCode() == Area::AREA_ADMINHTML
+                && $groupId == $this->groupManagement->getNotLoggedInGroup()->getId()
+            )) {
+            return true;
+        }
+
+        return false;


Please put those long difficult conditions to separate private methods with proper naming and shorten this function to just return statement:
return $groupId !== null && !($this->isAdminArea() && $this->isNotLoggedInGroup($groupId));
At least like this.

You can think even more to make this code more readable.

Stepa4man · 2020-10-16T12:48:21Z

app/code/Magento/Quote/Test/Unit/Observer/Backend/Quote/Address/CollectTotalsObserverTest.php

+    /**
+     * @var \Magento\Quote\Observer\Backend\Quote\Address\CollectTotalsObserver
+     */
+    protected $model;


Please replace all protected properties with private.

Stepa4man · 2020-10-16T12:49:09Z

app/code/Magento/Quote/Test/Unit/Observer/Backend/Quote/Address/CollectTotalsObserverTest.php

+    protected $model;
+
+    /**
+     * @var MockObject


Please add the proper type annotation to all class properties

Stepa4man · 2020-10-16T12:50:05Z

app/code/Magento/Quote/Test/Unit/Observer/Backend/Quote/Address/CollectTotalsObserverTest.php

+     */
+    protected function setUp()
+    {
+        $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);


Please don't use ObjectManager helper, use new statement instead.

Stepa4man · 2020-10-16T12:52:26Z

app/code/Magento/Quote/Test/Unit/Observer/Backend/Quote/Address/CollectTotalsObserverTest.php

+        $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->storeId = 1;
+        $this->customerMock = $this->getMockForAbstractClass(
+            \Magento\Customer\Api\Data\CustomerInterface::class,


Please import all class names.

Stepa4man · 2020-10-16T13:03:48Z

app/code/Magento/Quote/Observer/Backend/Quote/Address/CollectTotalsObserver.php

+                $this->state->getAreaCode() == Area::AREA_ADMINHTML
+                && $groupId == $this->groupManagement->getNotLoggedInGroup()->getId()


Please use strict comparison operator

Stepa4man · 2020-10-16T13:05:24Z

app/code/Magento/Quote/Test/Unit/Observer/Backend/Quote/Address/CollectTotalsObserverTest.php

@@ -0,0 +1,488 @@
+<?php


Please declare strict types for every php file

sidolov · 2020-11-11T22:23:38Z

@tna274 I am closing this PR now due to inactivity.
Please reopen and update if you wish to continue.
Thank you for the collaboration!

m2-assistant · 2020-11-11T22:23:40Z

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

Fix bug 27490: Can't change customer group when placing an admin order

76acd8a

ghost added the Progress: pending review label Mar 30, 2020

magento-engcom-team added Component: Quote Release Line: 2.4 labels Mar 30, 2020

Fix bug 27490: Fix code standard

72af897

Stepa4man requested changes Mar 30, 2020

View reviewed changes

app/code/Magento/Quote/Observer/Frontend/Quote/Address/CollectTotalsObserver.php Outdated Show resolved Hide resolved

app/code/Magento/Quote/Observer/Frontend/Quote/Address/CollectTotalsObserver.php Outdated Show resolved Hide resolved

ghost assigned Stepa4man Mar 30, 2020

ghost added Progress: needs update and removed Progress: pending review labels Mar 30, 2020

tna274 added 2 commits April 3, 2020 21:53

Fix bug 27490: Fix code standard

ec8b78f

Fix bug 27490: Fix code standard

b8c07a7

tna274 added 4 commits April 5, 2020 18:02

Fix bug 27490: Fix code standard

4f794dc

Fix bug 27490: Fix code standard

a44674e

Merge branch '2.4-develop' into fixbug_27490

a02b006

Fix bug 27490: code standard

1ade5f3

ghost added Severity: S3 Affects non-critical data or functionality and does not force users to employ a workaround. Priority: P3 May be fixed according to the position in the backlog. labels Jul 20, 2020

engcom-Kilo self-assigned this Jul 30, 2020

Merge branch '2.4-develop' into fixbug_27490

a210ce6

Fix Static test.

837b172

Revert changes

3a70db6

MFTF test.

25d5e69

Merge branch '2.4-develop' into fixbug_27490

4fbaa2e

engcom-Kilo requested a review from Stepa4man August 10, 2020 11:48

ghost added Progress: pending review and removed Progress: needs update labels Aug 19, 2020

engcom-Kilo removed their assignment Aug 25, 2020

ghost added Progress: review and removed Progress: pending review labels Oct 1, 2020

Stepa4man requested changes Oct 16, 2020

View reviewed changes

ghost added Progress: needs update and removed Progress: review labels Oct 16, 2020

sidolov closed this Nov 11, 2020

m2-community-project bot removed the Progress: needs update label Nov 11, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix bug 27490: Can't change customer group when placing an admin order #27501

Fix bug 27490: Can't change customer group when placing an admin order #27501

tna274 commented Mar 30, 2020

m2-assistant bot commented Mar 30, 2020

Stepa4man left a comment

tna274 commented Apr 3, 2020

engcom-Charlie commented Jul 21, 2020

engcom-Kilo commented Jul 30, 2020

engcom-Kilo commented Jul 30, 2020

engcom-Kilo commented Jul 31, 2020

engcom-Kilo commented Jul 31, 2020

engcom-Kilo commented Jul 31, 2020

engcom-Kilo commented Jul 31, 2020

engcom-Kilo commented Aug 3, 2020

Stepa4man left a comment

Stepa4man Oct 16, 2020

Stepa4man Oct 16, 2020

Stepa4man Oct 16, 2020

Stepa4man Oct 16, 2020

Stepa4man Oct 16, 2020

Stepa4man Oct 16, 2020

Stepa4man Oct 16, 2020

Stepa4man Oct 16, 2020

sidolov commented Nov 11, 2020

m2-assistant bot commented Nov 11, 2020

		$this->state->getAreaCode() == Area::AREA_ADMINHTML
		&& $groupId == $this->groupManagement->getNotLoggedInGroup()->getId()

Fix bug 27490: Can't change customer group when placing an admin order #27501

Fix bug 27490: Can't change customer group when placing an admin order #27501

Conversation

tna274 commented Mar 30, 2020

Description (*)

Related Pull Requests

Fixed Issues (if relevant)

Manual testing scenarios (*)

Questions or comments

Contribution checklist (*)

m2-assistant bot commented Mar 30, 2020

Stepa4man left a comment

Choose a reason for hiding this comment

tna274 commented Apr 3, 2020

engcom-Charlie commented Jul 21, 2020

engcom-Kilo commented Jul 30, 2020

engcom-Kilo commented Jul 30, 2020

engcom-Kilo commented Jul 31, 2020

engcom-Kilo commented Jul 31, 2020

engcom-Kilo commented Jul 31, 2020

engcom-Kilo commented Jul 31, 2020

engcom-Kilo commented Aug 3, 2020

Stepa4man left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sidolov commented Nov 11, 2020

m2-assistant bot commented Nov 11, 2020