diff --git a/app/code/Magento/CatalogWidget/view/frontend/templates/product/widget/content/grid.phtml b/app/code/Magento/CatalogWidget/view/frontend/templates/product/widget/content/grid.phtml
index 201d6ffe4c68344608f274589dd647f69a336d9f..574cbe1107e883b110fff30fcc384b8415d0b205 100644
--- a/app/code/Magento/CatalogWidget/view/frontend/templates/product/widget/content/grid.phtml
+++ b/app/code/Magento/CatalogWidget/view/frontend/templates/product/widget/content/grid.phtml
@@ -35,8 +35,7 @@
<ol class="product-items <?= /* @noEscape */ $type ?>">
<?php $iterator = 1; ?>
<?php foreach ($items as $_item): ?>
- <?php if ($iterator++ != 1): ?></li><?php endif ?>
- <li class="product-item">
+ <?= /* @noEscape */ ($iterator++ == 1) ? '<li class="product-item">' : '</li><li class="product-item">' ?>
<div class="product-item-info">
<a href="<?= $block->escapeUrl($block->getProductUrl($_item)) ?>" class="product-item-photo">
<?= $block->getImage($_item, $image)->toHtml() ?>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/coupon.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/coupon.phtml
index b224c96f07e9bb42c1c24a4bc8a752821e15b3ec..1d67b325e01c5d07e709144cdc0fec7745f94e1d 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/cart/coupon.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/coupon.phtml
@@ -24,7 +24,7 @@
<div class="field">
<label for="coupon_code" class="label"><span><?= /* @escapeNotVerified */ __('Enter discount code') ?></span></label>
<div class="control">
- <input type="text" class="input-text" id="coupon_code" name="coupon_code" value="<?= $block->escapeHtml($block->getCouponCode()) ?>" placeholder="<?= $block->escapeHtml(__('Enter discount code')) ?>" />
+ <input type="text" class="input-text" id="coupon_code" name="coupon_code" value="<?= $block->escapeHtml($block->getCouponCode()) ?>" placeholder="<?= $block->escapeHtml(__('Enter discount code')) ?>" <?php if (strlen($block->getCouponCode())): ?> disabled="disabled" <?php endif; ?> />
</div>
</div>
<div class="actions-toolbar">
diff --git a/app/code/Magento/Quote/Model/Quote/Validator/MinimumOrderAmount/ValidationMessage.php b/app/code/Magento/Quote/Model/Quote/Validator/MinimumOrderAmount/ValidationMessage.php
index 3113721f8a59781406107f23a54f832b11fb976b..38bfcbf1d30ca445785faee62117cd4dfa57957f 100644
--- a/app/code/Magento/Quote/Model/Quote/Validator/MinimumOrderAmount/ValidationMessage.php
+++ b/app/code/Magento/Quote/Model/Quote/Validator/MinimumOrderAmount/ValidationMessage.php
@@ -19,22 +19,32 @@ class ValidationMessage
/**
* @var \Magento\Framework\Locale\CurrencyInterface
+ * @deprecated since 101.0.0
*/
private $currency;
+ /**
+ * @var \Magento\Framework\Pricing\Helper\Data
+ */
+ private $priceHelper;
+
/**
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\Locale\CurrencyInterface $currency
+ * @param \Magento\Framework\Pricing\Helper\Data $priceHelper
*/
public function __construct(
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
\Magento\Store\Model\StoreManagerInterface $storeManager,
- \Magento\Framework\Locale\CurrencyInterface $currency
+ \Magento\Framework\Locale\CurrencyInterface $currency,
+ \Magento\Framework\Pricing\Helper\Data $priceHelper = null
) {
$this->scopeConfig = $scopeConfig;
$this->storeManager = $storeManager;
$this->currency = $currency;
+ $this->priceHelper = $priceHelper ?: \Magento\Framework\App\ObjectManager::getInstance()
+ ->get(\Magento\Framework\Pricing\Helper\Data::class);
}
/**
@@ -50,13 +60,11 @@ class ValidationMessage
\Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
if (!$message) {
- $currencyCode = $this->storeManager->getStore()->getCurrentCurrencyCode();
- $minimumAmount = $this->currency->getCurrency($currencyCode)->toCurrency(
- $this->scopeConfig->getValue(
- 'sales/minimum_order/amount',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
- )
- );
+ $minimumAmount = $this->priceHelper->currency($this->scopeConfig->getValue(
+ 'sales/minimum_order/amount',
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ ), true, false);
+
$message = __('Minimum order amount is %1', $minimumAmount);
} else {
//Added in order to address the issue: https://github.com/magento/magento2/issues/8287
diff --git a/app/code/Magento/Quote/Test/Unit/Model/Quote/Validator/MinimumOrderAmount/ValidationMessageTest.php b/app/code/Magento/Quote/Test/Unit/Model/Quote/Validator/MinimumOrderAmount/ValidationMessageTest.php
index 64204ea1fb93dbeb35cf0b5f66bbd85632c787eb..272a4e3a4ba49206273330c8d864b262ea402bdf 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/Quote/Validator/MinimumOrderAmount/ValidationMessageTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/Quote/Validator/MinimumOrderAmount/ValidationMessageTest.php
@@ -26,19 +26,27 @@ class ValidationMessageTest extends \PHPUnit\Framework\TestCase
/**
* @var \PHPUnit_Framework_MockObject_MockObject
+ * @deprecated since 101.0.0
*/
private $currencyMock;
+ /**
+ * @var \PHPUnit_Framework_MockObject_MockObject
+ */
+ private $priceHelperMock;
+
protected function setUp()
{
$this->scopeConfigMock = $this->createMock(\Magento\Framework\App\Config\ScopeConfigInterface::class);
$this->storeManagerMock = $this->createMock(\Magento\Store\Model\StoreManagerInterface::class);
$this->currencyMock = $this->createMock(\Magento\Framework\Locale\CurrencyInterface::class);
+ $this->priceHelperMock = $this->createMock(\Magento\Framework\Pricing\Helper\Data::class);
$this->model = new \Magento\Quote\Model\Quote\Validator\MinimumOrderAmount\ValidationMessage(
$this->scopeConfigMock,
$this->storeManagerMock,
- $this->currencyMock
+ $this->currencyMock,
+ $this->priceHelperMock
);
}
@@ -46,8 +54,6 @@ class ValidationMessageTest extends \PHPUnit\Framework\TestCase
{
$minimumAmount = 20;
$minimumAmountCurrency = '$20';
- $currencyCode = 'currency_code';
-
$this->scopeConfigMock->expects($this->at(0))
->method('getValue')
->with('sales/minimum_order/description', \Magento\Store\Model\ScopeInterface::SCOPE_STORE)
@@ -58,27 +64,13 @@ class ValidationMessageTest extends \PHPUnit\Framework\TestCase
->with('sales/minimum_order/amount', \Magento\Store\Model\ScopeInterface::SCOPE_STORE)
->willReturn($minimumAmount);
- $storeMock = $this->createPartialMock(\Magento\Store\Model\Store::class, ['getCurrentCurrencyCode']);
- $storeMock->expects($this->once())->method('getCurrentCurrencyCode')->willReturn($currencyCode);
- $this->storeManagerMock->expects($this->once())->method('getStore')->willReturn($storeMock);
+ $this->priceHelperMock->expects($this->once())
+ ->method('currency')
+ ->with($minimumAmount, true, false)
+ ->will($this->returnValue($minimumAmountCurrency));
- $currencyMock = $this->createMock(\Magento\Framework\Currency::class);
- $this->currencyMock->expects($this->once())
- ->method('getCurrency')
- ->with($currencyCode)
- ->willReturn($currencyMock);
-
- $currencyMock->expects($this->once())
- ->method('toCurrency')
- ->with($minimumAmount)
- ->willReturn($minimumAmountCurrency);
-
- $this->assertEquals(
- __('Minimum order amount is %1', $minimumAmountCurrency),
- $this->model->getMessage()
- );
+ $this->assertEquals(__('Minimum order amount is %1', $minimumAmountCurrency), $this->model->getMessage());
}
-
public function testGetConfigMessage()
{
$configMessage = 'config_message';
diff --git a/app/code/Magento/SalesRule/view/frontend/web/template/payment/discount.html b/app/code/Magento/SalesRule/view/frontend/web/template/payment/discount.html
index 7246460382fa75e371257ee8d0646cf007d17f82..d622b5ea5762d7fa796f3a8999c0e16b844c461d 100644
--- a/app/code/Magento/SalesRule/view/frontend/web/template/payment/discount.html
+++ b/app/code/Magento/SalesRule/view/frontend/web/template/payment/discount.html
@@ -27,7 +27,7 @@
id="discount-code"
name="discount_code"
data-validate="{'required-entry':true}"
- data-bind="value: couponCode, attr:{placeholder: $t('Enter discount code')} " />
+ data-bind="value: couponCode, attr:{disabled:isApplied() , placeholder: $t('Enter discount code')} " />
</div>
</div>
</div>
diff --git a/app/code/Magento/Vault/Setup/InstallSchema.php b/app/code/Magento/Vault/Setup/InstallSchema.php
index 32e1d62754439f5324c474f848517d48fce84b10..dd65f7a8c9772883318ce2f91d559c06a68f94f2 100644
--- a/app/code/Magento/Vault/Setup/InstallSchema.php
+++ b/app/code/Magento/Vault/Setup/InstallSchema.php
@@ -90,13 +90,13 @@ class InstallSchema implements InstallSchemaInterface
'is_active',
Table::TYPE_BOOLEAN,
null,
- ['nullable' => false, 'dafault' => true],
+ ['nullable' => false, 'default' => true],
'Is active flag'
)->addColumn(
'is_visible',
Table::TYPE_BOOLEAN,
null,
- ['nullable' => false, 'dafault' => true],
+ ['nullable' => false, 'default' => true],
'Is visible flag'
)->addIndex(
$setup->getIdxName(
diff --git a/app/code/Magento/Vault/Setup/UpgradeSchema.php b/app/code/Magento/Vault/Setup/UpgradeSchema.php
new file mode 100644
index 0000000000000000000000000000000000000000..643bd1751f6689a7b41ba4caffea7c4f11318bab
--- /dev/null
+++ b/app/code/Magento/Vault/Setup/UpgradeSchema.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Vault\Setup;
+
+use Magento\Framework\Setup\ModuleContextInterface;
+use Magento\Framework\Setup\SchemaSetupInterface;
+use Magento\Framework\Setup\UpgradeSchemaInterface;
+use Magento\Framework\DB\Ddl\Table;
+
+/**
+ * Upgrade the Vault module DB scheme
+ */
+class UpgradeSchema implements UpgradeSchemaInterface
+{
+ /**
+ * @inheritdoc
+ */
+ public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $context)
+ {
+ $setup->startSetup();
+ if (version_compare($context->getVersion(), '2.0.3', '<')) {
+ $this->upgradeTokenTableDefaultValues($setup);
+ }
+ $setup->endSetup();
+ }
+
+ /**
+ * @param SchemaSetupInterface $setup
+ * @return void
+ */
+ private function upgradeTokenTableDefaultValues(SchemaSetupInterface $setup)
+ {
+ $columns = ['is_active', 'is_visible'];
+
+ foreach ($columns as $columnName) {
+ $setup->getConnection()->modifyColumn(
+ $setup->getTable(InstallSchema::PAYMENT_TOKEN_TABLE),
+ $columnName,
+ [
+ 'type' => Table::TYPE_BOOLEAN,
+ 'nullable' => false,
+ 'default' => '1'
+ ]
+ );
+ }
+ }
+}
diff --git a/app/code/Magento/Vault/etc/module.xml b/app/code/Magento/Vault/etc/module.xml
index 1a7d1fe7d09fd17c7d6109c81f83b7ac83e1fbf2..253e7f13aaadc4171ae26e4a877c231d69bac9d3 100644
--- a/app/code/Magento/Vault/etc/module.xml
+++ b/app/code/Magento/Vault/etc/module.xml
@@ -6,7 +6,7 @@
*/
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
- <module name="Magento_Vault" setup_version="2.0.2">
+ <module name="Magento_Vault" setup_version="2.0.3">
<sequence>
<module name="Magento_Sales"/>
<module name="Magento_Store"/>
diff --git a/lib/web/mage/apply/main.js b/lib/web/mage/apply/main.js
index 60b737e59e11089fd269f963720f8954ce3275ed..489e467f9b1100aa128d33fefe95324a75b7f36b 100644
--- a/lib/web/mage/apply/main.js
+++ b/lib/web/mage/apply/main.js
@@ -32,6 +32,12 @@ define([
} else if ($(el)[component]) {
$(el)[component](config);
}
+ }, function (error) {
+ if ('console' in window && typeof window.console.error === 'function') {
+ console.error(error);
+ }
+
+ return true;
});
}