Skip to content

Commit b049f0e

Browse files
🔃 [Magento Community Engineering] Community Contributions - 2.3-develop
Accepted Community Pull Requests: - #23250: Fixed #23238 Apply button act like remove button while create new order from admin (by @gauravagarwal1001) - #23248: fix tooltip toggle selector typo (by @Karlasa) - #23244: Update CONTRIBUTING.md (by @diazwatson) - #23216: Fixed #23213 Static content deploy showing percentage symbol two times in progress bar (by @amitvishvakarma) - #22942: Fixed issue #18337 (by @geet07) Fixed GitHub Issues: - #23238: Apply coupon button act like remove coupon while create new order from admin (reported by @renard123) has been fixed in #23250 by @gauravagarwal1001 in 2.3-develop branch Related commits: 1. 6f5fc6e - #23213: Static content deploy showing percentage(%) two times in progress bar (reported by @amitvishvakarma) has been fixed in #23216 by @amitvishvakarma in 2.3-develop branch Related commits: 1. 559555c - #18337: #search input is missing required attribute aria-expanded. (reported by @BezV8) has been fixed in #22942 by @geet07 in 2.3-develop branch Related commits: 1. eeae4b2 2. c3955b2 3. bf4fbf0 4. 81c722d
2 parents 46d3df3 + d2fce11 commit b049f0e

File tree

6 files changed

+11
-8
lines changed

6 files changed

+11
-8
lines changed

.github/CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ The Magento 2 development team or community maintainers will review all issues a
1111
During the review we might require clarifications from the contributor.
1212
If there is no response from the contributor within two weeks, the pull request will be closed.
1313

14-
For more detialed information on contribution please read our [beginners guide](https://github.com/magento/magento2/wiki/Getting-Started).
14+
For more detailed information on contribution please read our [beginners guide](https://github.com/magento/magento2/wiki/Getting-Started).
1515

1616
## Contribution requirements
1717

app/code/Magento/Deploy/Console/ConsoleLogger.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ private function renderProgressBar(OutputInterface $output, array $process)
271271
return "{$title}{$titlePad}"
272272
. "{$count}{$countPad}"
273273
. "{$this->renderBar($output, $process)} "
274-
. "{$percent}%{$percentPad}"
274+
. "{$percent}{$percentPad}"
275275
. "{$process['elapsed']} ";
276276
}
277277

app/code/Magento/Sales/view/adminhtml/templates/order/create/coupons/form.phtml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,10 @@
1010
<div class="admin__field field-apply-coupon-code">
1111
<label class="admin__field-label"><span><?= $block->escapeHtml(__('Apply Coupon Code')) ?></span></label>
1212
<div class="admin__field-control">
13+
<?php if (!$block->getCouponCode()) : ?>
1314
<input type="text" class="admin__control-text" id="coupons:code" value="" name="coupon_code" />
14-
<?= $block->getButtonHtml(__('Apply'), 'order.applyCoupon($F(\'coupons:code\'))') ?>
15+
<?= $block->getButtonHtml(__('Apply'), 'order.applyCoupon($F(\'coupons:code\'))') ?>
16+
<?php endif; ?>
1517
<?php if ($block->getCouponCode()) : ?>
1618
<p class="added-coupon-code">
1719
<span><?= $block->escapeHtml($block->getCouponCode()) ?></span>

app/code/Magento/Search/view/frontend/templates/form.mini.phtml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ $helper = $this->helper(\Magento\Search\Helper\Data::class);
3535
role="combobox"
3636
aria-haspopup="false"
3737
aria-autocomplete="both"
38-
autocomplete="off"/>
38+
autocomplete="off"
39+
aria-expanded="false"/>
3940
<div id="search_autocomplete" class="search-autocomplete"></div>
4041
<?= $block->getChildHtml() ?>
4142
</div>

app/code/Magento/Search/view/frontend/web/js/form-mini.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ define([
7171
this.isExpandable = true;
7272
}.bind(this),
7373
exit: function () {
74-
this.isExpandable = false;
74+
this.isExpandable = true;
7575
}.bind(this)
7676
});
7777

app/design/frontend/Magento/blank/web/css/source/_tooltips.less

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111

1212
.tooltip.wrapper {
1313
.lib-tooltip(
14-
@_tooltip-position: bottom,
15-
@_tooltip-selector-content: ~'.tooltip.content',
16-
@_tooltip-selector-toggle: ~'tooltip.toggle'
14+
@_tooltip-position: bottom,
15+
@_tooltip-selector-content: ~'.tooltip.content',
16+
@_tooltip-selector-toggle: ~'.tooltip.toggle'
1717
);
1818

1919
.tooltip.content {

0 commit comments

Comments
 (0)