Skip to content

Commit d84cb64

Browse files
xmavxmav
committed
MAGETWO-56954: CLONE - Shopping cart page - Reordered items count is not getting updated at mini cart
2 parents 7a9dab9 + 1630c06 commit d84cb64

File tree

34 files changed

+469
-118
lines changed

34 files changed

+469
-118
lines changed

‎app/code/Magento/Catalog/view/frontend/layout/catalog_product_view.xml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,33 @@
101101
</block>
102102
</container>
103103
<container name="product.info.media" htmlTag="div" htmlClass="product media" after="product.info.main">
104+
<block class="Magento\Framework\View\Element\Template" name="skip_gallery_after.target" before="skip_gallery_before.wrapper" template="Magento_Theme::html/skiptarget.phtml">
105+
<arguments>
106+
<argument name="target_id" xsi:type="string">gallery-prev-area</argument>
107+
</arguments>
108+
</block>
109+
<container name="skip_gallery_before.wrapper" htmlTag="div" htmlClass="action-skip-wrapper">
110+
<block class="Magento\Framework\View\Element\Template" before="product.info.media.image" name="skip_gallery_before" template="Magento_Theme::html/skip.phtml">
111+
<arguments>
112+
<argument name="target" xsi:type="string">gallery-next-area</argument>
113+
<argument name="label" translate="true" xsi:type="string">Skip to the end of the images gallery</argument>
114+
</arguments>
115+
</block>
116+
</container>
104117
<block class="Magento\Catalog\Block\Product\View\Gallery" name="product.info.media.image" template="product/view/gallery.phtml"/>
118+
<container name="skip_gallery_after.wrapper" htmlTag="div" htmlClass="action-skip-wrapper">
119+
<block class="Magento\Framework\View\Element\Template" after="product.info.media.image" name="skip_gallery_after" template="Magento_Theme::html/skip.phtml">
120+
<arguments>
121+
<argument name="target" xsi:type="string">gallery-prev-area</argument>
122+
<argument name="label" translate="true" xsi:type="string">Skip to the beginning of the images gallery</argument>
123+
</arguments>
124+
</block>
125+
</container>
126+
<block class="Magento\Framework\View\Element\Template" name="skip_gallery_before.target" after="skip_gallery_after.wrapper" template="Magento_Theme::html/skiptarget.phtml">
127+
<arguments>
128+
<argument name="target_id" xsi:type="string">gallery-next-area</argument>
129+
</arguments>
130+
</block>
105131
</container>
106132
<block class="Magento\Catalog\Block\Product\View\Description" name="product.info.details" template="product/view/details.phtml" after="product.info.media">
107133
<block class="Magento\Catalog\Block\Product\View\Description" name="product.info.description" template="product/view/attribute.phtml" group="detailed_info">

‎app/code/Magento/CatalogSearch/view/frontend/templates/advanced/result.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<?php endif; ?>
2222
</div>
2323
<?php else: ?>
24-
<div class="message error">
24+
<div role="alert" class="message error">
2525
<div>
2626
<?php /* @escapeNotVerified */ echo __('We can\'t find any items matching these search criteria.');?> <a href="<?php /* @escapeNotVerified */ echo $block->getFormUrl(); ?>"><?php /* @escapeNotVerified */ echo __('Modify your search.'); ?></a>
2727
</div>

‎app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -260,11 +260,13 @@ define(
260260
this.source.trigger('shippingAddress.custom_attributes.data.validate');
261261
}
262262

263-
if (this.source.get('params.invalid') ||
263+
if (emailValidationResult &&
264+
this.source.get('params.invalid') ||
264265
!quote.shippingMethod().method_code ||
265-
!quote.shippingMethod().carrier_code ||
266-
!emailValidationResult
266+
!quote.shippingMethod().carrier_code
267267
) {
268+
this.focusInvalid();
269+
268270
return false;
269271
}
270272

‎app/code/Magento/Checkout/view/frontend/web/template/shipping.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
<!-- ko if: method.error_message -->
121121
<tr class="row row-error">
122122
<td class="col col-error" colspan="4">
123-
<div class="message error">
123+
<div role="alert" class="message error">
124124
<div data-bind="text: method.error_message"></div>
125125
</div>
126126
<span class="no-display">
@@ -141,7 +141,7 @@
141141
<!-- /ko -->
142142
</div>
143143
<!-- ko if: errorValidationMessage().length > 0 -->
144-
<div class="message notice">
144+
<div role="alert" class="message notice">
145145
<span><!-- ko text: errorValidationMessage()--><!-- /ko --></span>
146146
</div>
147147
<!-- /ko -->

‎app/code/Magento/Cookie/view/frontend/templates/html/notices.phtml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,17 @@
99
/** @var \Magento\Cookie\Block\Html\Notices $block */
1010
?>
1111
<?php if ($this->helper(\Magento\Cookie\Helper\Cookie::class)->isUserNotAllowSaveCookie()): ?>
12-
<div class="message global cookie" id="notice-cookie-block" style="display: none">
13-
<div class="content">
12+
<div role="alertdialog"
13+
tabindex="-1"
14+
class="message global cookie"
15+
id="notice-cookie-block"
16+
style="display: none;">
17+
<div role="document" class="content" tabindex="0">
1418
<p>
1519
<strong><?php /* @escapeNotVerified */ echo __('We use cookies to make your experience better.') ?></strong>
1620
<span><?php /* @escapeNotVerified */ echo __('To comply with the new e-Privacy directive, we need to ask for your consent to set the cookies.') ?></span>
17-
<?php /* @escapeNotVerified */ echo __('<a href="%1">Learn more</a>.', $block->getPrivacyPolicyLink()) ?></p>
21+
<?php /* @escapeNotVerified */ echo __('<a href="%1">Learn more</a>.', $block->getPrivacyPolicyLink()) ?>
22+
</p>
1823
<div class="actions">
1924
<button id="btn-cookie-allow" class="action allow primary">
2025
<span><?php /* @escapeNotVerified */ echo __('Allow Cookies');?></span>

‎app/code/Magento/ImportExport/view/adminhtml/templates/busy.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</div><br>
1111
<div class="messages">
1212
<div class="message message-success success">
13-
<div><?php /* @escapeNotVerified */ echo $block->getStatusMessage(); ?>hh</div>
13+
<div><?php /* @escapeNotVerified */ echo $block->getStatusMessage(); ?></div>
1414
</div>
1515
</div>
1616
</div>

‎app/code/Magento/Swatches/view/frontend/templates/product/layered/renderer.phtml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,19 @@
1010
?>
1111
<?php $swatchData = $block->getSwatchData(); ?>
1212
<div class="swatch-attribute swatch-layered <?php /* @escapeNotVerified */ echo $swatchData['attribute_code'] ?>"
13-
attribute-code="<?php /* @escapeNotVerified */ echo $swatchData['attribute_code'] ?>" attribute-id="<?php /* @escapeNotVerified */ echo $swatchData['attribute_id'] ?>">
13+
attribute-code="<?php /* @escapeNotVerified */ echo $swatchData['attribute_code'] ?>"
14+
attribute-id="<?php /* @escapeNotVerified */ echo $swatchData['attribute_id'] ?>">
1415
<div class="swatch-attribute-options clearfix">
1516
<?php foreach ($swatchData['options'] as $option => $label): ?>
16-
<a href="<?php /* @escapeNotVerified */ echo $label['link'] ?>" class="swatch-option-link-layered">
17+
<a href="<?php /* @escapeNotVerified */ echo $label['link'] ?>"
18+
aria-label="<?php /* @escapeNotVerified */ echo $label['label'] ?>"
19+
class="swatch-option-link-layered">
1720
<?php if (isset($swatchData['swatches'][$option]['type'])) { ?>
1821
<?php switch ($swatchData['swatches'][$option]['type']) {
1922
case '3':
2023
?>
2124
<div class="swatch-option <?php /* @escapeNotVerified */ echo $label['custom_style'] ?>"
25+
tabindex="-1"
2226
option-type="3"
2327
option-id="<?php /* @escapeNotVerified */ echo $option ?>"
2428
option-label="<?php /* @escapeNotVerified */ echo $label['label'] ?>"
@@ -33,6 +37,7 @@
3337
<?php $swatchImagePath = $block->getSwatchPath('swatch_image',
3438
$swatchData['swatches'][$option]['value']); ?>
3539
<div class="swatch-option image <?php /* @escapeNotVerified */ echo $label['custom_style'] ?>"
40+
tabindex="-1"
3641
option-type="2"
3742
option-id="<?php /* @escapeNotVerified */ echo $option ?>"
3843
option-label="<?php /* @escapeNotVerified */ echo $label['label'] ?>"
@@ -43,6 +48,7 @@
4348
case '1':
4449
?>
4550
<div class="swatch-option color <?php /* @escapeNotVerified */ echo $label['custom_style'] ?>"
51+
tabindex="-1"
4652
option-type="1"
4753
option-id="<?php /* @escapeNotVerified */ echo $option ?>"
4854
option-label="<?php /* @escapeNotVerified */ echo $label['label'] ?>"
@@ -54,6 +60,7 @@
5460
default:
5561
?>
5662
<div class="swatch-option text <?php /* @escapeNotVerified */ echo $label['custom_style'] ?>"
63+
tabindex="-1"
5764
option-type="0"
5865
option-id="<?php /* @escapeNotVerified */ echo $option ?>"
5966
option-label="<?php /* @escapeNotVerified */ echo $label['label'] ?>"

‎app/code/Magento/Swatches/view/frontend/web/css/swatches.css

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,10 @@
210210
padding: 0 !important;
211211
}
212212

213+
.swatch-option-link-layered:focus > div {
214+
box-shadow: 0 0 3px 1px #68a8e0;
215+
}
216+
213217
.swatch-option-tooltip-layered {
214218
width: 140px;
215219
position: absolute;
@@ -276,3 +280,9 @@
276280
.swatch-option-loading {
277281
content: url("../images/loader-2.gif");
278282
}
283+
284+
.swatch-input {
285+
left: -1000px;
286+
position: absolute;
287+
visibility: hidden;
288+
}

0 commit comments

Comments
 (0)