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.8.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
@anqaka
anqaka committed Sep 15, 2020
2 parents 5367857 + 92eedaf commit f29397c
Show file tree
Hide file tree
Showing 31 changed files with 372 additions and 139 deletions.
89 changes: 41 additions & 48 deletions Amasty_Gdpr/templates/checkbox.phtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,14 @@ if (method_exists($block, 'getConsents')):
<div
class="
checkbox
amgdpr-checkbox
gdpr
field
choice
<?php if ($consent->isRequired()): ?>
required
<?php endif; ?>
"
id="amprivacy-checkbox"
data-role="amasty-gdpr-consent"
data-amgdpr-content-from="<?= $block->escapeHtmlAttr($block->getScope()) ?>"
>
Expand All @@ -26,59 +28,50 @@ if (method_exists($block, 'getConsents')):
value="0"
>

<div
<input
type="checkbox"
name="amgdpr_agreement[<?= $block->escapeHtmlAttr($consent->getConsentCode()) ?>]"
value="1"
id="<?= $block->escapeHtmlAttr($uniqueKey) ?>"
class="
checkbox
<?php if ($consent->isRequired()): ?>
required
<?php endif; ?>
amprivacy-checkbox-<?= (int) $consent->getConsentId() ?>
checkbox__field
"
<?php if ($consent->isRequired()): ?>
data-validate="{required:true}"
<?php endif; ?>
>
<input
type="checkbox"
name="amgdpr_agreement[<?= $block->escapeHtmlAttr($consent->getConsentCode()) ?>]"
value="1"
id="<?= $block->escapeHtmlAttr($uniqueKey) ?>"
class="
amprivacy-checkbox-<?= (int) $consent->getConsentId() ?>
checkbox__field
"
<?php if ($consent->isRequired()): ?>
data-validate="{required:true}"
<?php endif; ?>
>

<svg
class="
checkbox__icon
checkbox__icon--checked
"
role="presentation"
focusable="false"
>
<use xlink:href="<?= $block->escapeUrl($block->getViewFileUrl('/images/icons-sprite.svg#checked')) ?>"></use>
</svg>
<svg
class="
checkbox__icon
checkbox__icon--checked
"
role="presentation"
focusable="false"
>
<use xlink:href="<?= $block->escapeUrl($block->getViewFileUrl('/images/icons-sprite.svg#checked')) ?>"></use>
</svg>

<svg
class="
checkbox__icon
checkbox__icon--unchecked
"
role="presentation"
focusable="false"
>
<use xlink:href="<?= $block->escapeUrl($block->getViewFileUrl('/images/icons-sprite.svg#unchecked')) ?>"></use>
</svg>
<svg
class="
checkbox__icon
checkbox__icon--unchecked
"
role="presentation"
focusable="false"
>
<use xlink:href="<?= $block->escapeUrl($block->getViewFileUrl('/images/icons-sprite.svg#unchecked')) ?>"></use>
</svg>

<label
for="<?= $block->escapeHtmlAttr($uniqueKey) ?>"
class="checkbox__label"
>
<span>
<?= $block->escapeHtml($block->getConsentText($consent), ['a']) ?>
</span>
</label>
</div>
<label
for="<?= $block->escapeHtmlAttr($uniqueKey) ?>"
class="checkbox__label"
>
<span>
<?= $block->escapeHtml($block->getConsentText($consent), ['a']) ?>
</span>
</label>
</div>
<?php endforeach; ?>
<input
Expand Down
20 changes: 19 additions & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,32 @@ All notable changes to this project will be documented in this file.

## [Released]

## [2.8.0] - 2020-09-15
### Fixed
- missing actions group on Account Information page; Affects: dashboard account information page
- spaces between buttons uneven on EE product list (#68745); Affects: catalog product list
- typo in shipping address config (#68745)
- item checkbox in requisition list (#68745); Affects: Requisition list
- wishlist item actions covering active textarea border (#68745)
- js error on bundle PDP - removed escaping method from bundle options template (#68745); Affects: Bundle PDP
### Added
- customer balance history template (#68745)
- grouped product final price template (#68745); Affects: Grouped PDP
- missing dashboard-table__link class to account dashboard templates (#68745); Affects: dashboard
### Changed
- basic variable with component variable for easier updates of mega menu (#69969); Affects: mega menu
- sidebar 'Compare' link classes (#68745): Affects: catalog sidebar
- bundle product price template and styling (#68745); Affects: Bundle PDP
- make compare__product div take up 100% height of td & space items between (#68745)

## [2.7.0] - 2020-08-20
### Fixed
- gdpr agreements templates after update (#68654)
- wrong name for review input field (#70089)
- Amasty Store Locator template for module version 2.4.2 (#69148)
- jumpung gallery while loading (#70217)
- untranslatable aria-label text for close button in ElasticSuite quicksearch autocomplete template (#67310)
- user registration - gdpr checkbox after validation missing checked icon (#70169)

### Added
- paypal review component (#59142)
Expand All @@ -38,7 +57,6 @@ All notable changes to this project will be documented in this file.
### Removed
- duplicate variables in contact-bar (#67443)


## [2.6.0] - 2020-08-06
### Added
- pointer cursor for zoom in icon (#69031)
Expand Down
2 changes: 1 addition & 1 deletion Magento_Bundle/templates/catalog/product/view/type/bundle/options.phtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ $options = $block->decorateArray($block->getOptions($stripSelection));
{
"#product_addtocart_form": {
"priceBundle": {
"optionConfig": <?= $block->escapeJs($block->getJsonConfig()) ?>,
"optionConfig": <?= /* @noEscape */ $block->getJsonConfig() ?>,
"controlContainer": ".bundle-option"
}
}
Expand Down
83 changes: 51 additions & 32 deletions Magento_Bundle/templates/product/price/final_price.phtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,44 +28,63 @@ $minimalRegularPrice = $regularPriceModel->getMinimalPrice();
<?= /* @noEscape */ $block->renderAmount($minimalPrice, [
'price_id' => $block->getPriceId('from-')
]); ?>

</span>
<?php else: ?>
<?php if ($block->showRangePrice()): ?>
<span class="price-from price__value price__value--between">
<span class="price__text">
<?= $block->escapeHtml(__('From')) ?>
</span>
<?= /* @noEscape */ $block->renderAmount($minimalPrice, [
'price_id' => $block->getPriceId('from-'),
'price_type' => 'minPrice'
]); ?>
<?php if ($minimalPrice < $minimalRegularPrice): ?>
<span class="old-price price__value price__value--old">
<?= /* @noEscape */ $block->renderAmount($minimalRegularPrice, [
'price_id' => $block->getPriceId('old-price-' . $idSuffix),
'skip_adjustments' => true
]); ?>
<div class="price price--between">
<span class="price-from">
<span class="price__text">
<?= $block->escapeHtml(__('From')) ?>
</span>
<?php endif ?>
</span>
<span class="price-to price__value price__value--between">
<span class="price__text">
<?= $block->escapeHtml(__('To')) ?>
<?php if ($minimalPrice < $minimalRegularPrice): ?>
<span class="old-price price__value price__value--old">
<?= /* @noEscape */ $block->renderAmount($minimalRegularPrice, [
'price_id' => $block->getPriceId('old-price-' . $idSuffix),
'skip_adjustments' => true
]); ?>
</span>
<span class="price__value price__value--special">
<?= /* @noEscape */ $block->renderAmount($minimalPrice, [
'price_id' => $block->getPriceId('from-'),
'price_type' => 'minPrice'
]); ?>
</span>
<?php else: ?>
<span class="price__value">
<?= /* @noEscape */ $block->renderAmount($minimalPrice, [
'price_id' => $block->getPriceId('from-'),
'price_type' => 'minPrice'
]); ?>
</span>
<?php endif ?>
</span>
<?php if ($maximalPrice < $maximalRegularPrice): ?>
<span class="old-price price__value price__value--old">
<?= /* @noEscape */ $block->renderAmount($maximalRegularPrice, [
'price_id' => $block->getPriceId('old-price-' . $idSuffix),
'skip_adjustments' => true
]); ?>
<span class="price-to">
<span class="price__text">
<?= $block->escapeHtml(__('To')) ?>
</span>
<?php endif ?>
<?= /* @noEscape */ $block->renderAmount($maximalPrice, [
'price_id' => $block->getPriceId('to-'),
'price_type' => 'maxPrice'
]); ?>
</span>
<?php if ($maximalPrice < $maximalRegularPrice): ?>
<span class="old-price price__value price__value--old">
<?= /* @noEscape */ $block->renderAmount($maximalRegularPrice, [
'price_id' => $block->getPriceId('old-price-' . $idSuffix),
'skip_adjustments' => true
]); ?>
</span>
<span class="price__value price__value--special">
<?= /* @noEscape */ $block->renderAmount($maximalPrice, [
'price_id' => $block->getPriceId('to-'),
'price_type' => 'maxPrice'
]); ?>
</span>
<?php else: ?>
<span class="price__value">
<?= /* @noEscape */ $block->renderAmount($maximalPrice, [
'price_id' => $block->getPriceId('to-'),
'price_type' => 'maxPrice'
]); ?>
</span>
<?php endif ?>
</span>
</div>
<?php else: ?>
<span class="price__value">
<?php if ($minimalPrice < $minimalRegularPrice): ?>
Expand Down
6 changes: 5 additions & 1 deletion Magento_Catalog/templates/product/compare/sidebar.phtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,11 @@
<div class="sidebar-block__actions ">
<a
data-bind="attr: { 'href': compareProducts().listUrl }"
class="link sidebar-block__action"
class="
button
button--link
sidebar-block__action
"
>
<?= $block->escapeHtml(__('Compare')) ?>
</a>
Expand Down
2 changes: 1 addition & 1 deletion Magento_Customer/templates/form/edit.phtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@
</div>
</div>

<div
<fieldset
class="fieldset display-none"
data-container="change-email-password"
aria-labelledby="change-email-password"
Expand Down
102 changes: 102 additions & 0 deletions Magento_CustomerBalance/templates/account/history.phtml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
<?php
// phpcs:disable Magento2.Templates.ThisInTemplate
?>
<?php if ($block->canShow() && $block->getEvents() && count($block->getEvents())) : ?>
<div
class="
dashboard-table
block
block-balance-history
"
>
<div class="dashboard-table__header block-title">
<h2 class="dashboard-table__title">
<?= $block->escapeHtml(__('Balance History')) ?>
</h2>
</div>
<div class="block-content">
<div class="table-wrapper balance-history">
<table
id="customerbalance-history"
class="
data
table
table-balance-history
"
tabindex="0"
role="table"
>
<caption class="table__caption">
<?= $block->escapeHtml(__('Balance History')) ?>
</caption>
<thead>
<tr role="row">
<th
scope="col"
class="col actions"
role="columnheader"
>
<?= $block->escapeHtml(__('Action')) ?>
</th>
<th
scope="col"
class="col change"
role="columnheader"
>
<?= $block->escapeHtml(__('Balance Change')) ?>
</th>
<th
scope="col"
class="col balance"
role="columnheader"
>
<?= $block->escapeHtml(__('Balance')) ?>
</th>
<th
scope="col"
class="col date"
role="columnheader"
>
<?= $block->escapeHtml(__('Date')) ?>
</th>
</tr>
</thead>
<tbody>
<?php foreach ($block->getEvents() as $event) : ?>
<tr role="row">
<td
data-th="<?= $block->escapeHtmlAttr(__('Action')) ?>"
class="col actions"
role="gridcell"
>
<?= $block->escapeHtml($block->getActionLabel($event->getAction())) ?>
</td>
<td
data-th="<?= $block->escapeHtmlAttr(__('Balance Change')) ?>"
class="col change"
role="gridcell"
>
<?= /* @noEscape */ $this->helper(Magento\Framework\Pricing\Helper\Data::class)->currency($event->getBalanceDelta()) ?>
</td>
<td
data-th="<?= $block->escapeHtmlAttr(__('Balance')) ?>"
class="col balance"
role="gridcell"
>
<?= /* @noEscape*/ $this->helper(Magento\Framework\Pricing\Helper\Data::class)->currency($event->getBalanceAmount()) ?>
</td>
<td
data-th="<?= $block->escapeHtmlAttr(__('Date')) ?>"
class="col date"
role="gridcell"
>
<?= /* @noEscape*/ $block->formatDate($event->getUpdatedAt(), \IntlDateFormatter::SHORT, true) ?>
</td>
</tr>
<?php endforeach; ?>
</tbody>
</table>
</div>
</div>
</div>
<?php endif; ?>
2 changes: 1 addition & 1 deletion Magento_Downloadable/templates/customer/products/list.phtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
<a
href="<?= $block->escapeUrl($block->getOrderViewUrl($_item->getPurchased()->getOrderId())) ?>"
title="<?= $block->escapeHtmlAttr(__('View Order')) ?>"
class="link"
class="link dashboard-table__link"
>
<?= $block->escapeHtml($_item->getPurchased()->getOrderIncrementId()) ?>
</a>
Expand Down
Loading

1 comment on commit f29397c

@vercel
Copy link

@vercel vercel bot commented on f29397c Sep 15, 2020

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.