Skip to content
This repository has been archived by the owner on Apr 26, 2023. It is now read-only.

Commit

Permalink
Merge branch 'release/2.18.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
Jarek committed Apr 21, 2021
2 parents 1c49d5c + 420e43d commit 1ef56c3
Show file tree
Hide file tree
Showing 17 changed files with 1,077 additions and 63 deletions.
2 changes: 1 addition & 1 deletion Amasty_Gdpr/web/template/checkout/gdpr-consent.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
</div>
<!-- /ko -->

<!-- ko if: isEnabled -->
<!-- ko if: metaInfo -->
<input
hidden
name="am-gdpr-checkboxes-from"
Expand Down
7 changes: 3 additions & 4 deletions Amasty_GiftCardAccount/web/template/payment/gift-card.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,7 @@
data-validate="{'required-entry':true}"
/>
</div>
<input
type="button"
<button
class="
amcard-button
button
Expand All @@ -127,12 +126,12 @@
"
data-bind="
click: apply.bind($data),
i18n: 'Add Code',
attr: {
value: $t('Add Code'),
'aria-label': $t('Add Code')
}
"
/>
></button>
</div>

<button
Expand Down
147 changes: 147 additions & 0 deletions Amasty_GiftCardAccount/web/template/payment/paypal-giftcard.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,147 @@
<!-- ko if: isGiftCardEnable() -->
<div
class="
amcard-field-container
-cart
-paypal
cart-discount
"
data-bind="
mageInit: {
'collapsible': {
'openedState': 'active'
}
}
"
>
<form
method="post"
class="amcard-form-container"
data-amcard-js="paypal-form"
data-bind="attr: {action: addCardUrl}"
>
<!-- ko foreach: getRegion('messages') -->
<!-- ko template: getTemplate() --><!-- /ko -->
<!--/ko-->
<div
class="cart-discount__button"
data-role="title"
>
<span
class="
action
action-toggle
cart-discount__button-text
"
role="heading"
data-bind="i18n: 'Apply Gift Card Code'"
>
</span>

<svg
class="
icon
cart-discount__button-icon
"
role="presentation"
>
<use data-bind="attr: {'xlink:href': require.toUrl('images/icons-sprite.svg#angle-down')}" xlink:href=''></use>
</svg>
</div>
<div
class="cart-discount__content"
data-role="content"
>
<div class="amcard-codes-list">
<!-- ko foreach: codes -->
<div>
<span data-bind="text: $data.code"></span>
<a
class="
amcard-delete
button
button--secondary
margin-left-l
margin-top-s
"
data-bind="
attr: {
href: $parent.deleteCardUrl + 'gcard_code/' + $data.code,
title: $t('Remove')
},
text: $t('Remove')
"
></a>
</div>
<!-- /ko -->
</div>
<div
class="
amcard-field-block
-double
-code
cart-discount__controls
padding-top-s
"
>
<div class="cart-discount__content-input">
<label
class="
label
label--hidden
input__label
"
for="gift-code"
>
<span
data-bind="i18n: 'Enter gift card code'"
></span>
</label>
<input
type="text"
id="gift-code"
name="am_giftcard_code"
class="
amcard-field
input__field
cart-discount__content-field
"
data-bind="
attr: {
placeholder: $t('Enter gift card code')
},
value: cardCode
"
data-validate="{'required-entry':true}"
/>
</div>
<button
class="
amcard-button
button
cart-discount__content-button
amgift-card__content-button
"
data-bind="
click: apply.bind($data, event),
i18n: 'Add Code'
"
></button>
</div>
<button
class="
amcard-check
button
"
data-bind="
i18n: 'Check Status',
click: check.bind($data)
"
></button>
</div>
</form>
</div>
<div data-bind="scope: 'amcard-cart-render'">
<!-- ko template: getTemplate() --><!-- /ko -->
</div>
<!-- /ko -->
9 changes: 8 additions & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,15 @@ All notable changes to this project will be documented in this file.
### Removed
### Fixed


## [Released]
## [2.18.0] - 2021-04-21
### Added
- titles for compare and wishlist buttons (#77368)
### Fixed
- error on paypal payment submit (#77324)
### Updated
- markup for gift card code on paypal express review page (#70133)
- default image width set to `auto` and `max-wdith` to `100%` Affects: all images width
## [2.17.0] - 2021-03-30
### Added
- images in snowdog menu desktop template (#70218), compatible with `snowdog/module-menu` version `2.14.0`
Expand Down
3 changes: 2 additions & 1 deletion Magento_Catalog/templates/category/image.phtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,9 @@
$categoryImageViewModel = $block->getCategoryImageViewModel();
$_category = $block->getCurrentCategory();
$_imgHtml = '';
$_imgUrl = $block->getImage()? $block->getImage()->getUrl($_category): null;
?>
<?php if ($_imgUrl = $block->getImage()->getUrl($_category)): ?>
<?php if ($_imgUrl): ?>
<?php
$imgSize = $categoryImageViewModel->get($_category);
$imgWidth = $imgSize['width'];
Expand Down
3 changes: 2 additions & 1 deletion Magento_Catalog/templates/product/view/addto/compare.phtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ $additionalClass = $block->getAdditionalClass();
data-role="add-to-links"
type="button"
data-testid="product-compare-button"
aria-label="<?= $block->escapeHtmlAttr(__('Add to compare')) ?>"
aria-label="<?= $block->escapeHtmlAttr(__('Add to Compare')) ?>"
title="<?= $block->escapeHtmlAttr(__('Add to Compare')) ?>"
>
<svg
class="icon button__icon"
Expand Down
103 changes: 51 additions & 52 deletions Magento_Paypal/templates/express/review.phtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
<?php if ($block->getShippingAddress()) : ?>
<div
class="
box
box-order-shipping-method
payapal-review__details-item
col-lg-4
margin-right-auto
Expand All @@ -28,72 +30,71 @@
class="form"
>
<fieldset class="fieldset">
<legend class="fieldset__legend fieldset__legend--hidden">
<legend
class="
fieldset__legend
fieldset__legend--hidden
box-title
"
>
<?= $block->escapeHtml(__('Shipping Method')) ?>
</legend>
<?php if ($block->canEditShippingMethod()) : ?>
<?php if ($groups = $block->getShippingRateGroups()) : ?>
<?php $currentRate = $block->getCurrentShippingRate(); ?>
<label
class="label"
for="shipping-method"
<div
class="
select
select--native
field
shipping
required
"
>
<?= $block->escapeHtml(__('Shipping Method')) ?>
</label>
<div class="control">
<div
class="
select
select--native
field
shipping
"
<label
class="label select__label"
for="shipping-method"
>
<select
name="shipping_method"
id="shipping-method"
class="select__field"
required
>
<?php if (!$currentRate) : ?>
<option value="">
<?= $block->escapeHtml(__('Please select a shipping method...')); ?>
</option>
<?php endif; ?>
<?php foreach ($groups as $code => $rates) : ?>
<optgroup
label="<?= $block->escapeHtmlAttr($block->getCarrierName($code)); ?>"
>
<?php foreach ($rates as $rate) : ?>
<option
value="
<?=
$block->escapeHtml(
$block->renderShippingRateValue($rate)
);
?>
"
<?= ($currentRate === $rate) ? ' selected="selected"' : ''; ?>
>
<?= /* @noEscape */ $block->renderShippingRateOption($rate); ?>
</option>
<?php endforeach; ?>
</optgroup>
<?php endforeach; ?>
</select>
</div>
<?= $block->escapeHtml(__('Shipping Method')) ?>
</label>
<select
name="shipping_method"
id="shipping-method"
class="select__field"
required
>
<?php if (!$currentRate) : ?>
<option value="">
<?= $block->escapeHtml(__('Please select a shipping method...')); ?>
</option>
<?php endif; ?>
<?php foreach ($groups as $code => $rates) : ?>
<optgroup
label="<?= $block->escapeHtmlAttr($block->getCarrierName($code)); ?>"
>
<?php foreach ($rates as $rate) : ?>
<option
value="<?= $block->escapeHtml($block->renderShippingRateValue($rate)); ?>"
<?= ($currentRate === $rate) ? ' selected="selected"' : ''; ?>
>
<?= /* @noEscape */ $block->renderShippingRateOption($rate); ?>
</option>
<?php endforeach; ?>
</optgroup>
<?php endforeach; ?>
</select>
</div>
<div class="actions-group actions-toolbar">
<div class="actions-group__handler">
<div class="actions-group__handler primary">
<button
id="update-shipping-method-submit"
type="submit"
class="
button
actions-group__button
action
update
primary
display-none
"
>
<?= $block->escapeHtml(__('Update Shipping Method')) ?>
Expand All @@ -107,9 +108,7 @@
<?php endif; ?>
<?php else : ?>
<p>
<?= /* @noEscape */ $block->renderShippingRateOption(
$block->getCurrentShippingRate()
); ?>
<?= /* @noEscape */ $block->renderShippingRateOption($block->getCurrentShippingRate()); ?>
</p>
<?php endif; ?>
</fieldset>
Expand Down
3 changes: 2 additions & 1 deletion Magento_Wishlist/templates/catalog/product/view/addto/wishlist.phtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ $productId = $block->getProduct()->getId();
"
type="button"
data-testid="add-to-wishlist-button"
aria-label="<?= $block->escapeHtmlAttr(__('Add product to wishlist')) ?>"
aria-label="<?= $block->escapeHtmlAttr(__('Add to Wish List')) ?>"
title="<?= $block->escapeHtmlAttr(__('Add to Wish List')) ?>"
data-multiplewishlist='<?= /* @noEscape */ $block->getWishlistParams() ?>'
data-mage-init='{
"wishlistItem": {
Expand Down
3 changes: 3 additions & 0 deletions PayPal_Braintree/styles/_module.scss
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
@import 'modules/braintree';
@import 'modules/google-pay';
@import 'modules/apple-pay';
Loading

1 comment on commit 1ef56c3

@vercel
Copy link

@vercel vercel bot commented on 1ef56c3 Apr 21, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

Please sign in to comment.