Skip to content

Commit 633c9ef

Browse files
author
Stanislav Idolov
authored
🔃 [EngCom] Public Pull Requests - 2.1-develop
Accepted Public Pull Requests: - #16491: Fix for #8222 (by @gelanivishal) - #16392: [Backport]Fixes updating wishlist item if an item object is passed instead its id. (by @eduard13) - #16229: [Backport] #16079 translation possibility for moreButtonText (by @Karlasa) Fixed GitHub Issues: - #8222: Estimate Shipping and Tax Form not works due to js error in collapsible.js [proposed fix] (reported by @Dart18) has been fixed in #16491 by @gelanivishal in 2.1-develop branch Related commits: 1. f0a8ba8 2. f388069 - #16079: Need information about translating issue (Magento Swatches Js) (reported by @mageho) has been fixed in #16229 by @Karlasa in 2.1-develop branch Related commits: 1. d09dbe4 2. f523032
2 parents aa79287 + 8edf53b commit 633c9ef

File tree

4 files changed

+7
-3
lines changed

4 files changed

+7
-3
lines changed

app/code/Magento/Swatches/i18n/en_US.csv

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,4 @@ Image,Image
3535
"Image Position","Image Position"
3636
"The value of Admin must be unique.","The value of Admin must be unique."
3737
"Description","Description"
38+
"More","More"

app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ define([
235235
controlLabelId: '',
236236

237237
// text for more button
238-
moreButtonText: 'More',
238+
moreButtonText: $t('More'),
239239

240240
// Callback url for media
241241
mediaCallback: '',

app/code/Magento/Wishlist/Model/Wishlist.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
67
namespace Magento\Wishlist\Model;
78

89
use Magento\Catalog\Api\ProductRepositoryInterface;
@@ -611,6 +612,7 @@ public function updateItem($itemId, $buyRequest, $params = null)
611612
$item = null;
612613
if ($itemId instanceof Item) {
613614
$item = $itemId;
615+
$itemId = $item->getId();
614616
} else {
615617
$item = $this->getItem((int)$itemId);
616618
}

lib/web/mage/collapsible.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,8 @@ define([
100100
_processState: function () {
101101
var anchor = window.location.hash,
102102
isValid = $.mage.isValidSelector(anchor),
103-
urlPath = window.location.pathname.replace('.', '');
103+
urlPath = window.location.pathname.replace(/\./g, ''),
104+
state;
104105

105106
this.stateKey = encodeURIComponent(urlPath + this.element.attr("id"));
106107

@@ -113,7 +114,7 @@ define([
113114
}
114115
}
115116
} else if (this.options.saveState && !this.options.disabled) {
116-
var state = this.storage.get(this.stateKey);
117+
state = this.storage.get(this.stateKey);
117118
if (typeof state === 'undefined' || state === null) {
118119
this.storage.set(this.stateKey,this.options.active);
119120
} else if (state === true) {

0 commit comments

Comments
 (0)