Skip to content

Commit 815d24b

Browse files
🔃 [EngCom] Public Pull Requests - 2.2-develop
Accepted Public Pull Requests: - #21239: [Backport] Fixed #21144 Can't change customer group when placing an admin order (by @amol2jcommerce) - #21238: [Backport] [Catalog] Fixing compare block product removing action from sidebar (by @eduard13) - #21224: [Backport] [Sales] Improves the UX by scrolling down the customer to the Recent Orders (by @eduard13) - #21166: [Backport] Email to a Friend form not full responsive and remove link not positi� (by @amol2jcommerce) Fixed GitHub Issues: - #6162: Can't set customer group when creating a new order in the admin. (reported by @otg-chris) has been fixed in #21239 by @amol2jcommerce in 2.2-develop branch Related commits: 1. d77bc6a - #7974: Can't change customer group when placing an admin order, even after MAGETWO-57077 applied (reported by @mtstedman) has been fixed in #21239 by @amol2jcommerce in 2.2-develop branch Related commits: 1. d77bc6a - #21144: Can't change customer group when placing an admin order (reported by @gauravagarwal1001) has been fixed in #21239 by @amol2jcommerce in 2.2-develop branch Related commits: 1. d77bc6a - #21101: Unable to open the product from sidebar's Compare Products block (reported by @eduard13) has been fixed in #21238 by @eduard13 in 2.2-develop branch Related commits: 1. 544d99c
2 parents 994348f + c03bd64 commit 815d24b

File tree

4 files changed

+34
-2
lines changed

4 files changed

+34
-2
lines changed

app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Account.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ private function extractValuesFromAttributes(array $attributes, int $storeId): a
199199
if (isset($defaultValue) && !isset($formValues[$code])) {
200200
$formValues[$code] = $defaultValue;
201201
}
202-
if ($code === 'group_id' && empty($defaultValue)) {
202+
if ($code === 'group_id' && empty($formValues[$code])) {
203203
$formValues[$code] = $this->getDefaultCustomerGroup($storeId);
204204
}
205205
}

app/code/Magento/Sales/view/frontend/templates/reorder/sidebar.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
</button>
5858
</div>
5959
<div class="secondary">
60-
<a class="action view" href="<?= /* @escapeNotVerified */ $block->getUrl('customer/account') ?>">
60+
<a class="action view" href="<?= /* @escapeNotVerified */ $block->getUrl('customer/account') ?>#my-orders-table">
6161
<span><?= /* @escapeNotVerified */ __('View All') ?></span>
6262
</a>
6363
</div>

app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/_module.less

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -534,6 +534,15 @@
534534
}
535535
}
536536

537+
.block-compare {
538+
.action {
539+
&.delete {
540+
&:extend(.abs-remove-button-for-blocks all);
541+
right: initial;
542+
}
543+
}
544+
}
545+
537546
.action.tocart {
538547
border-radius: 0;
539548
}

app/design/frontend/Magento/luma/Magento_SendFriend/web/css/source/_module.less

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,14 @@
1010
& when (@media-common = true) {
1111
.form.send.friend {
1212
&:extend(.abs-add-fields all);
13+
14+
.fieldset {
15+
.field {
16+
.control {
17+
width: 100%;
18+
}
19+
}
20+
}
1321
}
1422

1523
.product-social-links .action.mailto.friend {
@@ -44,3 +52,18 @@
4452
}
4553
}
4654
}
55+
.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
56+
.form.send.friend {
57+
.fieldset {
58+
padding-bottom: @indent__xs;
59+
}
60+
61+
.action {
62+
&.remove {
63+
margin-left: 0;
64+
right: 0;
65+
top: 100%;
66+
}
67+
}
68+
}
69+
}

0 commit comments

Comments
 (0)