- = $block->escapeHtml(__('Delivered on:')) ?> |
+ = $block->escapeHtml($parentBlock->getDeliveryDateTitle()->getTitle($track)) ?> |
= /* @noEscape */ $parentBlock->formatDeliveryDateTime($track->getDeliverydate(), $track->getDeliverytime()) ?>
|
diff --git a/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js b/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js
index bd611d0cc1863..a18e03ad52a9e 100644
--- a/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js
+++ b/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js
@@ -511,7 +511,7 @@ define([
// Add more button
if (moreLimit === countAttributes++) {
- html += '' + moreText + '';
+ html += '' + moreText + '';
}
id = this.id;
diff --git a/app/code/Magento/Tax/Test/Unit/Model/Calculation/RateRepositoryTest.php b/app/code/Magento/Tax/Test/Unit/Model/Calculation/RateRepositoryTest.php
index bf49f3d479132..77da6950fecf7 100644
--- a/app/code/Magento/Tax/Test/Unit/Model/Calculation/RateRepositoryTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Model/Calculation/RateRepositoryTest.php
@@ -252,7 +252,7 @@ private function getTaxRateMock(array $taxRateData)
foreach ($taxRateData as $key => $value) {
// convert key from snake case to upper case
$taxRateMock->expects($this->any())
- ->method('get' . str_replace(' ', '', ucwords(str_replace('_', ' ', $key))))
+ ->method('get' . str_replace('_', '', ucwords($key, '_')))
->will($this->returnValue($value));
}
diff --git a/app/code/Magento/Tax/Test/Unit/Model/Sales/Total/Quote/ShippingTest.php b/app/code/Magento/Tax/Test/Unit/Model/Sales/Total/Quote/ShippingTest.php
index 77e25d6f14574..2bfebc984bb81 100644
--- a/app/code/Magento/Tax/Test/Unit/Model/Sales/Total/Quote/ShippingTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Model/Sales/Total/Quote/ShippingTest.php
@@ -133,7 +133,7 @@ private function getMockObject($className, array $objectState)
$getterValueMap = [];
$methods = ['__wakeup'];
foreach ($objectState as $key => $value) {
- $getterName = 'get' . str_replace(' ', '', ucwords(str_replace('_', ' ', $key)));
+ $getterName = 'get' . str_replace('_', '', ucwords($key, '_'));
$getterValueMap[$getterName] = $value;
$methods[] = $getterName;
}
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/class/page/edit.phtml b/app/code/Magento/Tax/view/adminhtml/templates/class/page/edit.phtml
deleted file mode 100644
index 18e86549a1ff9..0000000000000
--- a/app/code/Magento/Tax/view/adminhtml/templates/class/page/edit.phtml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
- = $block->getBackButtonHtml() ?>
- = $block->getResetButtonHtml() ?>
- = $block->getDeleteButtonHtml() ?>
- = $block->getSaveButtonHtml() ?>
-
-= $block->getRenameFormHtml() ?>
-
diff --git a/app/code/Magento/Tax/view/adminhtml/web/js/page/validate.js b/app/code/Magento/Tax/view/adminhtml/web/js/page/validate.js
deleted file mode 100644
index a49f199ba56b6..0000000000000
--- a/app/code/Magento/Tax/view/adminhtml/web/js/page/validate.js
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-define([
- 'jquery',
- 'mage/mage'
-], function (jQuery) {
- 'use strict';
-
- return function (data, element) {
- jQuery(element).mage('form').mage('validation');
- };
-});
diff --git a/app/code/Magento/Ui/Component/Wysiwyg/Config.php b/app/code/Magento/Ui/Component/Wysiwyg/Config.php
index 48014a0160c41..d88a255927876 100644
--- a/app/code/Magento/Ui/Component/Wysiwyg/Config.php
+++ b/app/code/Magento/Ui/Component/Wysiwyg/Config.php
@@ -13,7 +13,7 @@ class Config implements ConfigInterface
/**
* Return WYSIWYG configuration
*
- * @return \Magento\Framework\DataObject
+ * @return array
*/
public function getConfig()
{
diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/file-uploader.js b/app/code/Magento/Ui/view/base/web/js/form/element/file-uploader.js
index 2c5bc1159dd3a..f28569caa0053 100644
--- a/app/code/Magento/Ui/view/base/web/js/form/element/file-uploader.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/element/file-uploader.js
@@ -16,7 +16,8 @@ define([
'Magento_Ui/js/form/element/abstract',
'mage/backend/notification',
'mage/translate',
- 'jquery/file-uploader'
+ 'jquery/file-uploader',
+ 'mage/adminhtml/tools'
], function ($, _, utils, uiAlert, validator, Element, notification, $t) {
'use strict';
diff --git a/app/code/Magento/Ui/view/base/web/js/grid/data-storage.js b/app/code/Magento/Ui/view/base/web/js/grid/data-storage.js
index dad67da3ea8ad..547cdab16cdf1 100644
--- a/app/code/Magento/Ui/view/base/web/js/grid/data-storage.js
+++ b/app/code/Magento/Ui/view/base/web/js/grid/data-storage.js
@@ -199,7 +199,7 @@ define([
},
/**
- * Caches requests object with provdided parameters
+ * Caches requests object with provided parameters
* and data object associated with it.
*
* @param {Object} data - Data associated with request.
diff --git a/app/code/Magento/Ui/view/base/web/templates/form/element/uploader/uploader.html b/app/code/Magento/Ui/view/base/web/templates/form/element/uploader/uploader.html
index a92b85cb47401..cf4e2243b5886 100644
--- a/app/code/Magento/Ui/view/base/web/templates/form/element/uploader/uploader.html
+++ b/app/code/Magento/Ui/view/base/web/templates/form/element/uploader/uploader.html
@@ -6,7 +6,7 @@
-->
-