Merge remote-tracking branch 'mainline/develop' into MAGETWO-52914-setup-ui-modifications

Author: Ivan Gavryshko

app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/hosted-fields.js

@@ -24,7 +24,8 @@ define([
                  * {String}
                  */
                 id: 'co-transparent-form-braintree'
-            }
+            },
+            isValidCardNumber: false
         },
 
         /**
@@ -113,11 +114,7 @@ define([
                 }
 
                 if (event.target.fieldKey === 'number' && event.card) {
-                    if (event.isValid) {
-                        self.cardNumber = event.card;
-                    } else {
-                        self.cardNumber = null;
-                    }
+                    self.isValidCardNumber = event.isValid;
                     self.selectedCardType(
                         validator.getMageCardType(event.card.type, self.getCcAvailableTypes())
                     );
@@ -137,7 +134,7 @@ define([
 
             $selector.removeClass(invalidClass);
 
-            if (this.selectedCardType() === null) {
+            if (this.selectedCardType() === null || !this.isValidCardNumber) {
                 $(this.getSelector('cc_number')).addClass(invalidClass);
 
                 return false;

app/code/Magento/CatalogImportExport/Model/Export/Product.php

@@ -919,7 +919,7 @@ protected function collectRawData()
                                 $additionalAttributes[$fieldName] = $fieldName .
                                     ImportProduct::PAIR_NAME_VALUE_SEPARATOR . $attrValue;
                             }
-                            $data[$itemId][$storeId][$fieldName] = $attrValue;
+                            $data[$itemId][$storeId][$fieldName] = htmlspecialchars_decode($attrValue);
                         }
                     } else {
                         $this->collectMultiselectValues($item, $code, $storeId);
@@ -934,6 +934,7 @@ protected function collectRawData()
                 }
 
                 if (!empty($additionalAttributes)) {
+                    $additionalAttributes = array_map('htmlspecialchars_decode', $additionalAttributes);
                     $data[$itemId][$storeId][self::COL_ADDITIONAL_ATTRIBUTES] =
                         implode(Import::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR, $additionalAttributes);
                 } else {

app/code/Magento/CatalogImportExport/Model/Import/Product.php

@@ -259,7 +259,7 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
         ValidatorInterface::ERROR_MEDIA_PATH_NOT_ACCESSIBLE => 'Imported resource (image) does not exist in the local media storage',
         ValidatorInterface::ERROR_MEDIA_URL_NOT_ACCESSIBLE => 'Imported resource (image) could not be downloaded from external resource due to timeout or access permissions',
         ValidatorInterface::ERROR_INVALID_WEIGHT => 'Product weight is invalid',
-        ValidatorInterface::ERROR_DUPLICATE_URL_KEY => 'Specified url key already exists',
+        ValidatorInterface::ERROR_DUPLICATE_URL_KEY => 'Specified URL key already exists',
     ];
 
     /**

app/code/Magento/CheckoutAgreements/view/frontend/web/js/model/agreement-validator.js

@@ -25,9 +25,18 @@ define(
                     return true;
                 }
 
-                var form = $('.payment-method._active form[data-role=checkout-agreements]');
-                form.validation();
-                return form.validation('isValid');
+                return $('#co-payment-form').validate({
+                    errorClass: 'mage-error',
+                    errorElement: 'div',
+                    meta: 'validate',
+                    errorPlacement: function (error, element) {
+                        var errorPlacement = element;
+                        if (element.is(':checkbox') || element.is(':radio')) {
+                            errorPlacement = element.siblings('label').last();
+                        }
+                        errorPlacement.after(error);
+                    }
+                }).element('.payment-method._active div.checkout-agreements input');
             }
         }
     }

app/code/Magento/Eav/Model/Entity/AbstractEntity.php

@@ -35,7 +35,7 @@ abstract class AbstractEntity extends AbstractResource implements EntityInterfac
     /**
      * @var \Magento\Eav\Model\Entity\AttributeLoaderInterface
      */
-    private $attributeLoader;
+    protected $attributeLoader;
 
     /**
      * Connection name
@@ -1859,7 +1859,7 @@ protected function _isAttributeValueEmpty(AbstractAttribute $attribute, $value)
      *
      * @deprecated
      */
-    private function getAttributeLoader()
+    protected function getAttributeLoader()
     {
         if ($this->attributeLoader === null) {
             $this->attributeLoader= ObjectManager::getInstance()->get(AttributeLoaderInterface::class);

app/code/Magento/ImportExport/Controller/Adminhtml/Import/Validate.php

@@ -55,7 +55,7 @@ public function execute()
                 $errorAggregator = $import->getErrorAggregator();
                 if (!$validationResult) {
                     $resultBlock->addError(
-                        __('Data validation is failed. Please fix errors and re-upload the file..')
+                        __('Data validation failed. Please fix the following errors and upload the file again.')
                     );
                     $this->addErrorMessages($resultBlock, $errorAggregator);
                 } else {

app/code/Magento/ImportExport/Controller/Adminhtml/ImportResult.php

@@ -84,7 +84,7 @@ protected function addErrorMessages(
             try {
                 $resultBlock->addNotice(
                     '<strong>' . __('Following Error(s) has been occurred during importing process:') . '</strong><br>'
-                    . '<div class="import-error-wrapper">' . __('Only first 100 errors are displayed here. ')
+                    . '<div class="import-error-wrapper">' . __('Only the first 100 errors are shown. ')
                     . '<a href="'
                     . $this->createDownloadUrlImportHistoryFile($this->createErrorReport($errorAggregator))
                     . '">' . __('Download full report') . '</a><br>'
@@ -109,7 +109,7 @@ protected function getErrorMessages(ProcessingErrorAggregatorInterface $errorAgg
         $messages = [];
         $rowMessages = $errorAggregator->getRowsGroupedByErrorCode([], [AbstractEntity::ERROR_CODE_SYSTEM_EXCEPTION]);
         foreach ($rowMessages as $errorCode => $rows) {
-            $messages[] = $errorCode . ' ' . __('in rows:') . ' ' . implode(', ', $rows);
+            $messages[] = $errorCode . ' ' . __('in row(s):') . ' ' . implode(', ', $rows);
         }
         return $messages;
     }

app/code/Magento/ImportExport/Model/Import.php

@@ -280,11 +280,11 @@ public function getOperationResultMessages(ProcessingErrorAggregatorInterface $v
         $messages = [];
         if ($this->getProcessedRowsCount()) {
             if ($validationResult->getErrorsCount()) {
-                $messages[] = __('Data validation is failed. Please fix errors and re-upload the file.');
+                $messages[] = __('Data validation failed. Please fix the following errors and upload the file again.');
 
                 // errors info
                 foreach ($validationResult->getRowsGroupedByErrorCode() as $errorMessage => $rows) {
-                    $error = $errorMessage . ' ' . __('in rows') . ': ' . implode(', ', $rows);
+                    $error = $errorMessage . ' ' . __('in row(s)') . ': ' . implode(', ', $rows);
                     $messages[] = $error;
                 }
             } else {

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

@@ -37,18 +37,18 @@ Status,Status
 "Maximum error count has been reached or system error is occurred!","Maximum error count has been reached or system error is occurred!"
 "Import successfully done","Import successfully done"
 "This file is empty. Please try another one.","This file is empty. Please try another one."
-"Data validation is failed. Please fix errors and re-upload the file..","Data validation is failed. Please fix errors and re-upload the file.."
+"Data validation failed. Please fix the following errors and upload the file again.","Data validation failed. Please fix the following errors and upload the file again."
 "File is valid! To start import process press ""Import"" button","File is valid! To start import process press ""Import"" button"
 "The file is valid, but we can\'t import it for some reason.","The file is valid, but we can\'t import it for some reason."
 "Checked rows: %1, checked entities: %2, invalid rows: %3, total errors: %4","Checked rows: %1, checked entities: %2, invalid rows: %3, total errors: %4"
 "The file was not uploaded.","The file was not uploaded."
 "Sorry, but the data is invalid or the file is not uploaded.","Sorry, but the data is invalid or the file is not uploaded."
 "Show more","Show more"
 "Additional data","Additional data"
-"Following Error(s) has been occurred during importing process:","Following Error(s) has been occurred during importing process:"
-"Only first 100 errors are displayed here. ","Only first 100 errors are displayed here. "
+"The following error(s) occurred when importing the data:","The following error(s) occurred when importing the data:"
+"Only the first 100 errors are shown. ","Only the first 100 errors are shown. "
 "Download full report","Download full report"
-"in rows:","in rows:"
+"in row(s):","in row(s):"
 "Make sure your file isn\'t more than %1M.","Make sure your file isn\'t more than %1M."
 "We can\'t provide the upload settings right now.","We can\'t provide the upload settings right now."
 "Created: %1, Updated: %2, Deleted: %3","Created: %1, Updated: %2, Deleted: %3"
@@ -72,8 +72,8 @@ Status,Status
 "The destination directory is not writable.","The destination directory is not writable."
 "Destination file is not writable","Destination file is not writable"
 "The header column names are already set.","The header column names are already set."
-"Data validation is failed. Please fix errors and re-upload the file.","Data validation is failed. Please fix errors and re-upload the file."
-"in rows","in rows"
+"Data validation failed. Please fix the following errors and upload the file again.","Data validation failed. Please fix the following errors and upload the file again."
+"in row(s)","in row(s)"
 "The validation is complete.","The validation is complete."
 "This file does not contain any data.","This file does not contain any data."
 "Begin import of ""%1"" with ""%2"" behavior","Begin import of ""%1"" with ""%2"" behavior"

app/code/Magento/Quote/Model/Quote/ShippingAssignment/ShippingAssignmentProcessor.php

@@ -68,7 +68,8 @@ public function save(CartInterface $quote, ShippingAssignmentInterface $shipping
     {
         /** @var \Magento\Quote\Model\Quote $quote */
         foreach ($shippingAssignment->getItems() as $item) {
-            if (!$quote->getItemById($item->getItemId())) {
+            /** @var \Magento\Quote\Model\Quote\Item $item */
+            if (!$quote->getItemById($item->getItemId()) && !$item->isDeleted()) {
                 $this->cartItemPersister->save($quote, $item);
             }
         }