[EngCom] Public Pull Requests

Public Pull Requests

#10056
#10047
#10033
#9314
#7729

Author: Oleksii Korshenko

app/code/Magento/Checkout/view/frontend/web/template/form/element/email.html

@@ -39,7 +39,10 @@
                 </label>
                 <div class="control">
                     <input class="input-text"
-                           placeholder="optional"
+                           data-bind="
+                                attr: {
+                                    placeholder: $t('optional'),
+                                }"
                            type="password"
                            name="password"
                            id="customer-password"

app/code/Magento/ConfigurableImportExport/Model/Import/Product/Type/Configurable.php

@@ -40,8 +40,8 @@ class Configurable extends \Magento\CatalogImportExport\Model\Import\Product\Typ
      * @var array
      */
     protected $_messageTemplates = [
-        self::ERROR_ATTRIBUTE_CODE_IS_NOT_SUPER => 'Attribute with this code is not super',
-        self::ERROR_INVALID_OPTION_VALUE => 'Invalid option value',
+        self::ERROR_ATTRIBUTE_CODE_IS_NOT_SUPER => 'Attribute with code "%s" is not super',
+        self::ERROR_INVALID_OPTION_VALUE => 'Invalid option value for attribute "%s"',
         self::ERROR_INVALID_WEBSITE => 'Invalid website code for super attribute',
         self::ERROR_DUPLICATED_VARIATIONS => 'SKU %s contains duplicated variations',
     ];
@@ -291,12 +291,12 @@ protected function _isParticularAttributesValid(array $rowData, $rowNum)
 
             if (!$this->_isAttributeSuper($superAttrCode)) {
                 // check attribute superity
-                $this->_entityModel->addRowError(self::ERROR_ATTRIBUTE_CODE_IS_NOT_SUPER, $rowNum);
+                $this->_entityModel->addRowError(self::ERROR_ATTRIBUTE_CODE_IS_NOT_SUPER, $rowNum, $superAttrCode);
                 return false;
             } elseif (isset($rowData['_super_attribute_option']) && strlen($rowData['_super_attribute_option'])) {
                 $optionKey = strtolower($rowData['_super_attribute_option']);
                 if (!isset($this->_superAttributes[$superAttrCode]['options'][$optionKey])) {
-                    $this->_entityModel->addRowError(self::ERROR_INVALID_OPTION_VALUE, $rowNum);
+                    $this->_entityModel->addRowError(self::ERROR_INVALID_OPTION_VALUE, $rowNum, $superAttrCode);
                     return false;
                 }
             }

app/code/Magento/Ui/view/base/web/js/form/element/file-uploader.js

@@ -330,7 +330,7 @@ define([
 
             if (allowed.passed) {
                 target.on('fileuploadsend', function (event, postData) {
-                    postData.data.set('param_name', this.paramName);
+                    postData.data.append('param_name', this.paramName);
                 }.bind(data));
 
                 target.fileupload('process', data).done(function () {

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

@@ -2067,6 +2067,11 @@ 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())) {
+            return true;
+        }
+
         foreach ($service->ExtraServices->children() as $child) {
             if (filter_var($child->Available, FILTER_VALIDATE_BOOLEAN)) {
                 return true;

lib/internal/Magento/Framework/Webapi/ServiceInputProcessor.php

@@ -264,7 +264,7 @@ private function processCustomAttribute($customAttribute)
             throw new SerializationException(new Phrase('There is an empty custom attribute specified.'));
         } elseif (!$customAttributeCode) {
             throw new SerializationException(new Phrase('A custom attribute is specified without an attribute code.'));
-        } elseif (!isset($customAttribute[AttributeValue::VALUE])) {
+        } elseif (!array_key_exists(AttributeValue::VALUE, $customAttribute)) {
             throw new SerializationException(
                 new Phrase('Value is not set for attribute code "' . $customAttributeCode . '"')
             );