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.9.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
Jarek committed Sep 21, 2020
2 parents f29397c + 7ff61a5 commit 20080a8
Show file tree
Hide file tree
Showing 32 changed files with 1,373 additions and 177 deletions.
23 changes: 13 additions & 10 deletions Amasty_Gdpr/web/template/checkout/gdpr-consent.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
checkbox
"
data-bind="
visible: $data.visible,
visible: $data.visible,
attr: {
class: $data.required ? 'amasty-gdpr-consent checkbox required' : 'amasty-gdpr-consent checkbox'
}
Expand All @@ -17,8 +17,8 @@
value="1"
data-bind="
attr: {
'title': title,
'name': name,
'title': title,
'name': name,
'id': checkbox_code + $parent.getUniqId(),
'data-checkbox-code': checkbox_code,
'data-validate': $data.required ? '{required:true}' : null,
Expand Down Expand Up @@ -46,16 +46,19 @@
class="checkbox__label"
data-bind="attr: {'for': checkbox_code + $parent.getUniqId()}"
>
<span
lass="action"
<span
lass="action"
data-bind="html: checkbox_text"
></span>
</label>
</div>
</div>
<!-- /ko -->
<input
hidden
name="am-gdpr-checkboxes-from"
data-bind="attr: {'value': metaInfo.where}"
>

<!-- ko if: isEnabled -->
<input
hidden
name="am-gdpr-checkboxes-from"
data-bind="attr: {'value': metaInfo.where}"
>
<!-- /ko -->
141 changes: 79 additions & 62 deletions Amasty_GiftCard/templates/product/view/type/giftcard.phtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,10 @@
<select
id="am_giftcard_amount"
name="am_giftcard_amount"
class="required-entry select__field"
class="
select__field
required-entry
"
data-amgiftcard-js="amgiftcard-amount"
data-mage-init='{"select": {}}'
>
Expand Down Expand Up @@ -111,45 +114,54 @@
>
<?= $block->escapeHtml(__('Choose card type')); ?>
</label>
<select
id="am_giftcard_type"
name="am_giftcard_type"
class="required-entry"
data-amgiftcard-js="amgiftcard-type"
>
<option value="">
<?= $block->escapeHtml(__('-- Please Select --')); ?>
</option>
<?php foreach ($block->getListCardTypes() as $_cardType): ?>
<option
value="<?= $block->escapeHtmlAttr($_cardType['value']); ?>"
<?php if ($block->getDefaultValue('am_giftcard_type') == $_cardType['value']): ?>
selected
<?php endif; ?>
>
<?= $block->escapeHtml($_cardType['label']); ?>
<div class="select select--native">
<select
id="am_giftcard_type"
name="am_giftcard_type"
class="select__field required-entry"
data-amgiftcard-js="amgiftcard-type"
>
<option value="">
<?= $block->escapeHtml(__('-- Please Select --')); ?>
</option>
<?php endforeach; ?>
</select>
<?php foreach ($block->getListCardTypes() as $_cardType): ?>
<option
value="<?= $block->escapeHtmlAttr($_cardType['value']); ?>"
<?php if ($block->getDefaultValue('am_giftcard_type') == $_cardType['value']): ?>
selected
<?php endif; ?>
>
<?= $block->escapeHtml($_cardType['label']); ?>
</option>
<?php endforeach; ?>
</select>
</div>
<p class="note amgiftcard-delivery-info">
<?= $block->escapeHtml(__('Please be aware that printed gift card will be sent to the shipping address you specify during checkout.')); ?>
</p>
</div>
<?php endif; ?>

<?php if ($_images = $block->getImages()): ?>
<div data-amgiftcard-js="amgiftcard-images">
<div
class="margin-bottom-m"
data-amgiftcard-js="amgiftcard-images"
>
<div class="input required">
<label
for="am_giftcard_image"
class="label"
class="input__label label"
>
<?= $block->escapeHtml(__('Choose card Image')); ?>
</label>
<input
type="text"
name="am_giftcard_image"
class="amgiftcard-image-input required-entry"
class="
input__field
amgiftcard-image-input
required-entry
"
value="<?= $block->escapeHtmlAttr($block->getDefaultValue('am_giftcard_image')); ?>"
data-amgiftcard-js="amgiftcard-image-input"
/>
Expand Down Expand Up @@ -184,7 +196,7 @@
></span>
</div>
<div class="amgiftcard-browse-container margin-top-xs">
<div class="file-upload ">
<div class="file-upload">
<input
class="amgiftcard-image-input file-upload__input"
type="file"
Expand Down Expand Up @@ -212,18 +224,18 @@
</label>
</div>
</div>
<p
class="amgiftcard-error"
data-amgiftcard-js="amgiftcard-userimage-error"
></p>
<p
class="amgiftcard-error"
data-amgiftcard-js="amgiftcard-userimage-error"
></p>
<?php endif; ?>
</div>
<?php endif; ?>
<?php if ($block->isOptionEnable('am_giftcard_sender_name')): ?>
<div class="input required">
<label
for="am_giftcard_sender_name"
class="label"
class="input__label label"
>
<?= $block->escapeHtml(__('Sender Name')); ?>
</label>
Expand All @@ -240,7 +252,7 @@
<div class="input required">
<label
for="am_giftcard_sender_email"
class="label"
class="input__label label"
>
<?= $block->escapeHtml(__('Sender Email')); ?>
</label>
Expand Down Expand Up @@ -269,7 +281,7 @@
>
<label
for="am_giftcard_recipient_name"
class="label"
class="input__label label"
>
<?= $block->escapeHtml(__('Recipient Name')); ?>
</label>
Expand All @@ -292,7 +304,7 @@
>
<label
for="am_giftcard_recipient_email"
class="label"
class="input__label label"
>
<?= $block->escapeHtml(__('Recipient Email')); ?>
</label>
Expand All @@ -318,18 +330,21 @@
>
<?= $block->escapeHtml(__('Date of Certificate Delivery')); ?>
</label>
<input
name="am_giftcard_date_delivery"
id="am_giftcard_date_delivery"
value="<?= $block->escapeHtmlAttr($block->getDefaultValue('am_giftcard_date_delivery')); ?>"
class="
required-entry
datetime-picker
validate-date date
"
type="text"
data-amgiftcard-js="amgiftcard-delivery-date"
>
<div class="input input--datepicker">
<input
name="am_giftcard_date_delivery"
id="am_giftcard_date_delivery"
value="<?= $block->escapeHtmlAttr($block->getDefaultValue('am_giftcard_date_delivery')); ?>"
class="
required-entry
datetime-picker
validate-date
date
"
type="text"
data-amgiftcard-js="amgiftcard-delivery-date"
>
</div>
<p
class="amgiftcard-delivery-info display-none"
data-amgiftcard-js="amgiftcard-delivery-info"
Expand All @@ -348,31 +363,33 @@
>
<?= $block->escapeHtml(__('Select timezone')); ?>
</label>
<select
class="required-entry"
name="am_giftcard_date_delivery_timezone"
id="am_giftcard_date_delivery_timezone"
>
<option value=""></option>
<?php foreach ($block->getListTimezones() as $_timezone): ?>
<option
value="<?= $block->escapeHtmlAttr($_timezone['value']); ?>"
<?php if ($block->getDefaultValue('am_giftcard_date_delivery_timezone') == $_timezone['value']): ?>
selected
<?php endif; ?>
>
<?= $block->escapeHtml($_timezone['label']); ?>
</option>
<?php endforeach; ?>
</select>
<div class="select select--native">
<select
class="select__field required-entry"
name="am_giftcard_date_delivery_timezone"
id="am_giftcard_date_delivery_timezone"
>
<option value=""></option>
<?php foreach ($block->getListTimezones() as $_timezone): ?>
<option
value="<?= $block->escapeHtmlAttr($_timezone['value']); ?>"
<?php if ($block->getDefaultValue('am_giftcard_date_delivery_timezone') == $_timezone['value']): ?>
selected
<?php endif; ?>
>
<?= $block->escapeHtml($_timezone['label']); ?>
</option>
<?php endforeach; ?>
</select>
</div>
</div>
<?php endif; ?>

<?php if ($block->isOptionEnable(\Amasty\GiftCard\Model\Options::GIFT_MESSAGE)): ?>
<div class="input">
<label
for="am_giftcard_message"
class="label"
class="input__label label"
>
<?= $block->escapeHtml(__('Message')); ?>
</label>
Expand Down
82 changes: 82 additions & 0 deletions AuthorizeNet_CreditCard/templates/customer/vault/credit_card.phtml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
<?php

use Magento\Framework\View\Element\Template;
use Magento\Vault\Api\Data\PaymentTokenInterface;
use Magento\Vault\Block\CardRendererInterface;

/** @var CardRendererInterface|Template $block */

$ccNumberView = $block->escapeHtml($block->getNumberLast4Digits());
?>

<tr role="row">
<td
data-th="<?= $block->escapeHtmlAttr(__('Card Number')) ?>"
class="col card-number"
role="gridcell"
>
</span>
<?= /* @noEscape */ $ccNumberView ?>
</td>
<td
data-th="<?= $block->escapeHtmlAttr(__('Expiration Date')) ?>"
class="col card-expire"
role="gridcell"
>
<?= $block->escapeHtml($block->getExpDate()) ?>
</td>
<td
data-th="<?= $block->escapeHtmlAttr(__('Type')) ?>"
class="col card-type"
role="gridcell"
>
<img
class="width-initial"
src="<?= /* @noEscape */ $block->getIconUrl() ?>"
width="<?= /* @noEscape */ $block->getIconWidth() ?>"
height="<?= /* @noEscape */ $block->getIconHeight() ?>"
>
</td>
<td
data-th="<?= $block->escapeHtmlAttr(__('Actions')) ?>"
class="col actions"
role="gridcell"
>
<form
class="form"
action="<?= $block->escapeUrl($block->getUrl('vault/cards/deleteaction')) ?>"
method="post"
>
<?= $block->getBlockHtml('formkey') ?>
<input
name="<?= /* @noEscape */ PaymentTokenInterface::PUBLIC_HASH ?>"
value="<?= /* @noEscape */ $block->getToken()->getPublicHash() ?>"
type="hidden"
/>
<button
type="submit"
class="
button
button--link
padding-hz-0
dashboard-table__link
action
delete
"
data-mage-init='{
"Magento_Vault/js/customer_account/deleteWidget":{
"type": "popup",
"modalClass": "my-credit-cards-popup",
"toggleEvent": "click",
"title": "<?= $block->escapeHtml(__('Delete')) ?>",
"content": "Are you sure you want to delete this card: <?=
/* @noEscape */ $ccNumberView
?>?"
}
}'
>
<?= $block->escapeHtml(__('Delete')) ?>
</button>
</form>
</td>
</tr>
12 changes: 11 additions & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,19 @@ All notable changes to this project will be documented in this file.
### Changed
### Removed


## [Released]

## [2.9.0] - 2020-09-21
### Fixed
- input and select styles in poduct gift card template (#70690); Affects: gift card PDP
- review snippets (#69786)
- amasty gdpr module error on checkout page (#71078)
- account - stored payment methods table (#70628)
### Added
- minimum advertised price on grid and product page (#70656); Info: @import '../Magento_Msrp/styles/module'; should be added to /styles/theme.scss
### Changed
- recaptcha badge position on mobile PDP (#70725); Affects: PDP

## [2.8.0] - 2020-09-15
### Fixed
- missing actions group on Account Information page; Affects: dashboard account information page
Expand Down
Loading

1 comment on commit 20080a8

@vercel
Copy link

@vercel vercel bot commented on 20080a8 Sep 21, 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.