🔃 [EngCom] Public Pull Requests - 2.2-develop

Accepted Public Pull Requests:
 - #17982: add error message in else condition (by @vaibhavahalpara)
 - #17695: ConfigurableProduct show prices in select options (by @alexeya-ven)
 - #18354: Fix for parsing attribute options labels, when & used. (by @bartoszkubicki)


Fixed GitHub Issues:
 - #17977: Show Method if Not Applicable for Free Shipping doesn't work. (reported by @vaibhavahalpara) has been fixed in #17982 by @vaibhavahalpara in 2.2-develop branch
   Related commits:
     1. 3d13f78
     2. 7107b8d
     3. 49f6549

Author: magento-engcom-team

app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php

@@ -327,7 +327,8 @@ private function preprocessOptionsData(&$data)
             $serializedOptions = json_decode($data['serialized_options'], JSON_OBJECT_AS_ARRAY);
             foreach ($serializedOptions as $serializedOption) {
                 $option = [];
-                parse_str($serializedOption, $option);
+                $serializedOptionWithParsedAmpersand = str_replace('&', '%26', $serializedOption);
+                parse_str($serializedOptionWithParsedAmpersand, $option);
                 $data = array_replace_recursive($data, $option);
             }
         }

app/code/Magento/ConfigurableProduct/view/frontend/web/js/configurable.js

@@ -360,7 +360,11 @@ define([
                 index = 1,
                 allowedProducts,
                 i,
-                j;
+                j,
+                basePrice = parseFloat(this.options.spConfig.prices.basePrice.amount),
+                optionFinalPrice,
+                optionPriceDiff,
+                optionPrices = this.options.spConfig.optionPrices;
 
             this._clearSelect(element);
             element.options[0] = new Option('', '');
@@ -374,6 +378,7 @@ define([
             if (options) {
                 for (i = 0; i < options.length; i++) {
                     allowedProducts = [];
+                    optionPriceDiff = 0;
 
                     /* eslint-disable max-depth */
                     if (prevConfig) {
@@ -387,14 +392,28 @@ define([
                         }
                     } else {
                         allowedProducts = options[i].products.slice(0);
+
+                        if (typeof allowedProducts[0] !== 'undefined' &&
+                            typeof optionPrices[allowedProducts[0]] !== 'undefined') {
+
+                            optionFinalPrice = parseFloat(optionPrices[allowedProducts[0]].finalPrice.amount);
+                            optionPriceDiff = optionFinalPrice - basePrice;
+
+                            if (optionPriceDiff !== 0) {
+                                options[i].label = options[i].label + ' ' + priceUtils.formatPrice(
+                                    optionPriceDiff,
+                                    this.options.priceFormat,
+                                    true);
+                            }
+                        }
                     }
 
                     if (allowedProducts.length > 0) {
                         options[i].allowedProducts = allowedProducts;
                         element.options[index] = new Option(this._getOptionLabel(options[i]), options[i].id);
 
                         if (typeof options[i].price !== 'undefined') {
-                            element.options[index].setAttribute('price', options[i].prices);
+                            element.options[index].setAttribute('price', options[i].price);
                         }
 
                         element.options[index].config = options[i];

app/code/Magento/OfflineShipping/Model/Carrier/Freeshipping.php

@@ -97,8 +97,18 @@ public function collectRates(RateRequest $request)
             $method->setCost('0.00');
 
             $result->append($method);
+        } elseif ($this->getConfigData('showmethod')) {
+            $error = $this->_rateErrorFactory->create();
+            $error->setCarrier($this->_code);
+            $error->setCarrierTitle($this->getConfigData('title'));
+            $errorMsg = $this->getConfigData('specificerrmsg');
+            $error->setErrorMessage(
+                $errorMsg ? $errorMsg : __(
+                    'Sorry, but we can\'t deliver to the destination country with this shipping module.'
+                )
+            );
+            return $error;
         }
-
         return $result;
     }