[EngCom] Public Pull Requests

Public Pull Requests:
#10062
#10060
#10031
#9681
#7139

Author: Oleksii Korshenko

app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/steps/summary.js

@@ -91,14 +91,15 @@ define([
             var productSku = this.variationsComponent().getProductValue('sku'),
                 productPrice = this.variationsComponent().getProductPrice(),
                 productWeight = this.variationsComponent().getProductValue('weight'),
+                productName = this.variationsComponent().getProductValue('name'),
                 variationsKeys = [],
                 gridExisting = [],
                 gridNew = [],
                 gridDeleted = [];
 
             this.variations = [];
             _.each(variations, function (options) {
-                var product, images, sku, quantity, price, variation,
+                var product, images, sku, name, quantity, price, variation,
                     productId = this.variationsComponent().getProductIdByOptions(options);
 
                 if (productId) {
@@ -110,6 +111,9 @@ define([
                 sku = productSku + _.reduce(options, function (memo, option) {
                     return memo + '-' + option.label;
                 }, '');
+                name = productName + _.reduce(options, function (memo, option) {
+                        return memo + '-' + option.label;
+                    }, '');
                 quantity = getSectionValue('quantity', options);
 
                 if (!quantity && productId) {
@@ -128,7 +132,7 @@ define([
                     options: options,
                     images: images,
                     sku: sku,
-                    name: sku,
+                    name: name,
                     quantity: quantity,
                     price: price,
                     productId: productId,

app/code/Magento/Newsletter/view/frontend/templates/subscribe.phtml

@@ -10,7 +10,7 @@
 
 ?>
 <div class="block newsletter">
-    <div class="title"><strong><?php /* @escapeNotVerified */ echo __('Newsletter') ?></strong></div>
+    <div class="title"><strong><?php echo $block->escapeHtml(__('Newsletter')) ?></strong></div>
     <div class="content">
         <form class="form subscribe"
             novalidate

app/code/Magento/Ui/view/base/web/js/lib/knockout/bindings/optgroup.js

@@ -297,11 +297,16 @@ define([
                 ko.utils.arrayForEach(options, function (option) {
                     var value = applyToObject(option, optionsValue, option),
                         label = applyToObject(option, optionsText, value) || '',
+                        disabled = applyToObject(option, 'disabled', false) || false,
                         obj = {},
                         space = '\u2007\u2007\u2007';
 
                     obj[optionTitle] = applyToObject(option, optionsText + 'title', value);
 
+                    if (disabled) {
+                        obj.disabled = disabled;
+                    }
+
                     label = label.replace(nbspRe, '').trim();
 
                     if (Array.isArray(value)) {

app/code/Magento/Usps/Model/Carrier.php

@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 namespace Magento\Usps\Model;
 
 use Magento\Framework\App\ObjectManager;
@@ -413,7 +411,6 @@ protected function _getXmlQuotes()
 
         if ($this->_isUSCountry($r->getDestCountryId())) {
             $xml = $this->_xmlElFactory->create(
-
                 ['data' => '<?xml version="1.0" encoding="UTF-8"?><RateV4Request/>']
             );
             $xml->addAttribute('USERID', $r->getUserId());
@@ -461,7 +458,6 @@ protected function _getXmlQuotes()
             $api = 'RateV4';
         } else {
             $xml = $this->_xmlElFactory->create(
-
                 ['data' => '<?xml version = "1.0" encoding = "UTF-8"?><IntlRateV2Request/>']
             );
             $xml->addAttribute('USERID', $r->getUserId());
@@ -1946,7 +1942,7 @@ protected function _doShipmentRequest(\Magento\Framework\DataObject $request)
      */
     public function getContainerTypes(\Magento\Framework\DataObject $params = null)
     {
-        if (is_null($params)) {
+        if ($params === null) {
             return $this->_getAllowedContainers();
         }
 
@@ -2068,7 +2064,7 @@ protected function _parseZip($zipString, $returnFull = false)
     private function isServiceAvailable(\SimpleXMLElement $service)
     {
         // Allow services which which don't provide any ExtraServices
-        if(empty($service->ExtraServices->children()->count())) {
+        if (empty($service->ExtraServices->children()->count())) {
             return true;
         }
 

lib/web/mage/sticky.js

@@ -11,7 +11,48 @@ define([
 
     $.widget('mage.sticky', {
         options: {
-            container: ''
+            /**
+             * Element selector, who's height will be used to restrict the
+             * maximum offsetTop position of the stuck element.
+             * Default uses document body.
+             * @type {String}
+             */
+            container: '',
+
+            /**
+             * Spacing in pixels above the stuck element
+             * @type {Number|Function} Number or Function that will return a Number
+             */
+            spacingTop: 0,
+
+            /**
+             * Allows postponing sticking, until element will go out of the
+             * screen for the number of pixels.
+             * @type {Number|Function} Number or Function that will return a Number
+             */
+            stickAfter: 0,
+
+            /**
+             * CSS class for active sticky state
+             * @type {String}
+             */
+            stickyClass: '_sticky'
+        },
+
+        /**
+         * Retrieve option value
+         * @param  {String} option
+         * @return {*}
+         * @private
+         */
+        _getOptionValue: function (option) {
+            var value = this.options[option] || 0;
+
+            if (typeof value === 'function') {
+                value = this.options[option]();
+            }
+
+            return value;
         },
 
         /**
@@ -35,14 +76,29 @@ define([
          */
         _stick: function () {
             var offset,
-                isStatic;
+                isStatic,
+                stuck,
+                stickAfter;
 
             isStatic = this.element.css('position') === 'static';
 
             if (!isStatic && this.element.is(':visible')) {
-                offset = $(document).scrollTop() - this.parentOffset;
+                offset = $(document).scrollTop() -
+                    this.parentOffset +
+                    this._getOptionValue('spacingTop');
+
                 offset = Math.max(0, Math.min(offset, this.maxOffset));
-                this.element.css('top', offset);
+
+                stuck = this.element.hasClass(this.options.stickyClass);
+                stickAfter = this._getOptionValue('stickAfter');
+
+                if (offset && !stuck && offset < stickAfter) {
+                    offset = 0;
+                }
+
+                this.element
+                    .toggleClass(this.options.stickyClass, offset > 0)
+                    .css('top', offset);
             }
         },