Merge remote-tracking branch 'mainline/develop' into MAGETWO-66067

Oleksandr Dubovyk · Oleksandr Dubovyk · commit d317e13dd451 · 2017-03-17T18:56:08.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -25,6 +25,8 @@ atlassian*
 /.grunt
 /Gruntfile.js
 /package.json
+/grunt-config.json
+/dev/tools/grunt/configs/local-themes.js
 
 /pub/media/*.*
 !/pub/media/.htaccess
diff --git a/app/code/Magento/Backend/i18n/en_US.csv b/app/code/Magento/Backend/i18n/en_US.csv
@@ -250,7 +250,7 @@ Minute,Minute
 "JavaScript may be disabled in your browser.","JavaScript may be disabled in your browser."
 "To use this website you must first enable JavaScript in your browser.","To use this website you must first enable JavaScript in your browser."
 "This is only a demo store. You can browse and place orders, but nothing will be processed.","This is only a demo store. You can browse and place orders, but nothing will be processed."
-"Report a Bug","Report a Bug"
+"Report an Issue","Report an Issue"
 "Store View:","Store View:"
 "Stores Configuration","Stores Configuration"
 "Please confirm scope switching. All data that hasn\'t been saved will be lost.","Please confirm scope switching. All data that hasn\'t been saved will be lost."
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/page/report.phtml b/app/code/Magento/Backend/view/adminhtml/templates/page/report.phtml
@@ -8,5 +8,5 @@
 
 ?>
 <?php if ($block->getBugreportUrl()): ?>
-    <a class="link-report" href="<?php /* @escapeNotVerified */ echo $block->getBugreportUrl(); ?>" id="footer_bug_tracking"><?php /* @escapeNotVerified */ echo __('Report a Bug') ?></a>
+    <a class="link-report" href="<?php /* @escapeNotVerified */ echo $block->getBugreportUrl(); ?>" id="footer_bug_tracking"><?php /* @escapeNotVerified */ echo __('Report an Issue') ?></a>
 <?php endif; ?>
diff --git a/app/code/Magento/Catalog/view/base/web/images/product/placeholder/swatch_image.jpg b/app/code/Magento/Catalog/view/base/web/images/product/placeholder/swatch_image.jpg
diff --git a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Attribute.php b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Attribute.php
@@ -53,7 +53,7 @@ public function __construct(
     public function apply(\Magento\Framework\App\RequestInterface $request)
     {
         $attributeValue = $request->getParam($this->_requestVar);
-        if (empty($attributeValue)) {
+        if (empty($attributeValue) && !is_numeric($attributeValue)) {
             return $this;
         }
         $attribute = $this->getAttributeModel();
@@ -84,9 +84,10 @@ protected function _getItemsData()
             ->getProductCollection();
         $optionsFacetedData = $productCollection->getFacetedData($attribute->getAttributeCode());
 
-        if (count($optionsFacetedData) === 0
-            && $this->getAttributeIsFilterable($attribute) !== static::ATTRIBUTE_OPTIONS_ONLY_WITH_RESULTS
-        ) {
+        $isAttributeFilterable =
+            $this->getAttributeIsFilterable($attribute) === static::ATTRIBUTE_OPTIONS_ONLY_WITH_RESULTS;
+
+        if (count($optionsFacetedData) === 0 && !$isAttributeFilterable) {
             return $this->itemDataBuilder->build();
         }
 
@@ -95,28 +96,64 @@ protected function _getItemsData()
         $options = $attribute->getFrontend()
             ->getSelectOptions();
         foreach ($options as $option) {
-            if (empty($option['value'])) {
-                continue;
-            }
+            $this->buildOptionData($option, $isAttributeFilterable, $optionsFacetedData, $productSize);
+        }
 
-            $value = $option['value'];
+        return $this->itemDataBuilder->build();
+    }
 
-            $count = isset($optionsFacetedData[$value]['count'])
-                ? (int)$optionsFacetedData[$value]['count']
-                : 0;
-            // Check filter type
-            if ($this->getAttributeIsFilterable($attribute) === static::ATTRIBUTE_OPTIONS_ONLY_WITH_RESULTS
-                && (!$this->isOptionReducesResults($count, $productSize) || $count === 0)
-            ) {
-                continue;
-            }
-            $this->itemDataBuilder->addItemData(
-                $this->tagFilter->filter($option['label']),
-                $value,
-                $count
-            );
+    /**
+     * Build option data
+     *
+     * @param array $option
+     * @param boolean $isAttributeFilterable
+     * @param array $optionsFacetedData
+     * @param int $productSize
+     * @return void
+     */
+    private function buildOptionData($option, $isAttributeFilterable, $optionsFacetedData, $productSize)
+    {
+        $value = $this->getOptionValue($option);
+        if ($value === false) {
+            return;
+        }
+        $count = $this->getOptionCount($value, $optionsFacetedData);
+        if ($isAttributeFilterable && (!$this->isOptionReducesResults($count, $productSize) || $count === 0)) {
+            return;
         }
 
-        return $this->itemDataBuilder->build();
+        $this->itemDataBuilder->addItemData(
+            $this->tagFilter->filter($option['label']),
+            $value,
+            $count
+        );
+    }
+
+    /**
+     * Retrieve option value if it exists
+     *
+     * @param array $option
+     * @return bool|string
+     */
+    private function getOptionValue($option)
+    {
+        if (empty($option['value']) && !is_numeric($option['value'])) {
+            return false;
+        }
+        return $option['value'];
+    }
+
+    /**
+     * Retrieve count of the options
+     *
+     * @param int|string $value
+     * @param array $optionsFacetedData
+     * @return int
+     */
+    private function getOptionCount($value, $optionsFacetedData)
+    {
+        return isset($optionsFacetedData[$value]['count'])
+            ? (int)$optionsFacetedData[$value]['count']
+            : 0;
     }
 }
diff --git a/app/code/Magento/Directory/view/adminhtml/templates/js/optional_zip_countries.phtml b/app/code/Magento/Directory/view/adminhtml/templates/js/optional_zip_countries.phtml
@@ -40,6 +40,7 @@ function setPostcodeOptional(zipElement, country) {
             zipElement.removeClassName('required-entry');
         }
         zipElement.up('div.field').removeClassName('required');
+        zipElement.up('div.field').removeClassName('_required');
     } else {
         zipElement.addClassName('required-entry');
         zipElement.up('div.field').addClassName('required');
diff --git a/app/code/Magento/ImportExport/Model/Import/ErrorProcessing/ProcessingErrorAggregator.php b/app/code/Magento/ImportExport/Model/Import/ErrorProcessing/ProcessingErrorAggregator.php
@@ -325,6 +325,7 @@ public function clear()
         $this->items = [];
         $this->errorStatistics = [];
         $this->invalidRows = [];
+        $this->skippedRows = [];
 
         return $this;
     }
diff --git a/app/code/Magento/NewRelicReporting/etc/di.xml b/app/code/Magento/NewRelicReporting/etc/di.xml
@@ -6,7 +6,6 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-    <preference for="Magento\Framework\Module\ModuleListInterface" type="Magento\Framework\Module\ModuleList" />
     <type name="Magento\NewRelicReporting\Model\Module\Collect">
         <arguments>
             <argument name="fullModuleList" xsi:type="object">Magento\Framework\Module\FullModuleList</argument>
diff --git a/app/code/Magento/Paypal/Model/Api/Nvp.php b/app/code/Magento/Paypal/Model/Api/Nvp.php
@@ -1482,9 +1482,9 @@ protected function _exportAddressses($data)
     protected function _applyStreetAndRegionWorkarounds(\Magento\Framework\DataObject $address)
     {
         // merge street addresses into 1
-        if ($address->hasStreet2()) {
-            $address->setStreet(implode("\n", [$address->getStreet(), $address->getStreetLine(2)]));
-            $address->unsStreet2();
+        if ($address->getData('street2') !== null) {
+            $address->setStreet(implode("\n", [$address->getData('street'), $address->getData('street2')]));
+            $address->unsetData('street2');
         }
         // attempt to fetch region_id from directory
         if ($address->getCountryId() && $address->getRegion()) {
diff --git a/app/code/Magento/Paypal/Model/Express/Checkout.php b/app/code/Magento/Paypal/Model/Express/Checkout.php
@@ -900,35 +900,19 @@ public function getCheckoutMethod()
      * @param Address $address
      * @param array $exportedAddress
      * @return void
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     protected function _setExportedAddressData($address, $exportedAddress)
     {
         // Exported data is more priority if we came from Express Checkout button
-        $isButton  = (bool)$this->_quote->getPayment()->getAdditionalInformation(self::PAYMENT_INFO_BUTTON);
+        $isButton = (bool)$this->_quote->getPayment()->getAdditionalInformation(self::PAYMENT_INFO_BUTTON);
         if (!$isButton) {
-            foreach ($exportedAddress->getExportedKeys() as $key) {
-                $oldData = $address->getDataUsingMethod($key);
-                $isEmpty = null;
-                if (is_array($oldData)) {
-                    foreach ($oldData as $val) {
-                        if (!empty($val)) {
-                            $isEmpty = false;
-                            break;
-                        }
-                        $isEmpty = true;
-                    }
-                }
-                if (empty($oldData) || $isEmpty === true) {
-                    $address->setDataUsingMethod($key, $exportedAddress->getData($key));
-                }
-            }
-        } else {
-            foreach ($exportedAddress->getExportedKeys() as $key) {
-                $data = $exportedAddress->getData($key);
-                if (!empty($data)) {
-                    $address->setDataUsingMethod($key, $data);
-                }
+            return;
+        }
+
+        foreach ($exportedAddress->getExportedKeys() as $key) {
+            $data = $exportedAddress->getData($key);
+            if (!empty($data)) {
+                $address->setDataUsingMethod($key, $data);
             }
         }
     }
diff --git a/app/code/Magento/Paypal/Setup/UpgradeSchema.php b/app/code/Magento/Paypal/Setup/UpgradeSchema.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Paypal\Setup;
+
+use Magento\Framework\DB\Ddl\Table;
+use Magento\Framework\Setup\ModuleContextInterface;
+use Magento\Framework\Setup\SchemaSetupInterface;
+use Magento\Framework\Setup\UpgradeSchemaInterface;
+
+/**
+ * Upgrade the Paypal module DB scheme
+ */
+class UpgradeSchema implements UpgradeSchemaInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $context)
+    {
+        if (version_compare($context->getVersion(), '2.0.1', '<')) {
+            $setup->getConnection()->modifyColumn(
+                $setup->getTable('paypal_settlement_report'),
+                'report_date',
+                [
+                    'type' => Table::TYPE_DATE,
+                    'comment' => 'Report Date'
+                ]
+            );
+        }
+    }
+}
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/Api/NvpTest.php b/app/code/Magento/Paypal/Test/Unit/Model/Api/NvpTest.php
@@ -194,9 +194,21 @@ public function testCallGetExpressCheckoutDetails()
             ->method('read')
             ->will($this->returnValue(
                 "\r\n" . 'ACK=Success&SHIPTONAME=Ship%20To%20Name'
+                . '&SHIPTOSTREET=testStreet'
+                . '&SHIPTOSTREET2=testApartment'
+                . '&BUSINESS=testCompany'
+                . '&SHIPTOCITY=testCity'
+                . '&PHONENUM=223322'
+                . '&STATE=testSTATE'
             ));
         $this->model->callGetExpressCheckoutDetails();
-        $this->assertEquals('Ship To Name', $this->model->getExportedShippingAddress()->getData('firstname'));
+        $address = $this->model->getExportedShippingAddress();
+        $this->assertEquals('Ship To Name', $address->getData('firstname'));
+        $this->assertEquals(implode("\n", ['testStreet','testApartment']), $address->getStreet());
+        $this->assertEquals('testCompany', $address->getCompany());
+        $this->assertEquals('testCity', $address->getCity());
+        $this->assertEquals('223322', $address->getTelephone());
+        $this->assertEquals('testSTATE', $address->getRegion());
     }
 
     public function testGetDebugReplacePrivateDataKeys()
diff --git a/app/code/Magento/Paypal/etc/module.xml b/app/code/Magento/Paypal/etc/module.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_Paypal" setup_version="2.0.0">
+    <module name="Magento_Paypal" setup_version="2.0.1">
         <sequence>
             <module name="Magento_Checkout"/>
             <module name="Magento_Sales"/>
diff --git a/app/code/Magento/Quote/Api/GuestCartItemRepositoryInterface.php b/app/code/Magento/Quote/Api/GuestCartItemRepositoryInterface.php
@@ -21,7 +21,7 @@ interface GuestCartItemRepositoryInterface
     public function getList($cartId);
 
     /**
-     * Add the specified item to the specified cart.
+     * Add/update the specified cart item. 
      *
      * @param \Magento\Quote\Api\Data\CartItemInterface $cartItem The item.
      * @return \Magento\Quote\Api\Data\CartItemInterface Item.
diff --git a/app/code/Magento/Quote/Model/Quote.php b/app/code/Magento/Quote/Model/Quote.php
@@ -1626,10 +1626,11 @@ public function addProduct(
 
             // collect errors instead of throwing first one
             if ($item->getHasError()) {
-                $message = $item->getMessage();
-                if (!in_array($message, $errors)) {
-                    // filter duplicate messages
-                    $errors[] = $message;
+                foreach ($item->getMessage(false) as $message) {
+                    if (!in_array($message, $errors)) {
+                        // filter duplicate messages
+                        $errors[] = $message;
+                    }
                 }
             }
         }
diff --git a/app/code/Magento/Sales/Model/OrderRepository.php b/app/code/Magento/Sales/Model/OrderRepository.php
@@ -6,7 +6,6 @@
 namespace Magento\Sales\Model;
 
 use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
-use Magento\Sales\Model\ResourceModel\Order as Resource;
 use Magento\Sales\Model\ResourceModel\Metadata;
 use Magento\Sales\Model\Order\ShippingAssignmentBuilder;
 use Magento\Sales\Api\Data\OrderSearchResultInterfaceFactory as SearchResultFactory;
@@ -16,7 +15,6 @@
 use Magento\Sales\Api\Data\ShippingAssignmentInterface;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Exception\InputException;
-use Magento\Framework\Api\SortOrder;
 
 /**
  * Repository class for @see OrderInterface
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/billing/method/form.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/billing/method/form.phtml
@@ -32,7 +32,7 @@
 
             <label class="admin__field-label" for="p_method_<?php /* @escapeNotVerified */ echo $_code ?>"><?php echo $block->escapeHtml($_method->getTitle()) ?></label>
         </dt>
-        <dd class="admin__payment-method-wapper">
+        <dd class="admin__payment-method-wrapper">
             <?php /* @escapeNotVerified */ echo $block->getChildHtml('payment.method.' . $_code) ?>
         </dd>
     <?php endforeach; ?>
diff --git a/app/code/Magento/Swatches/Helper/Data.php b/app/code/Magento/Swatches/Helper/Data.php
@@ -429,7 +429,7 @@ public function getSwatchesByOptionsId(array $optionIds)
         foreach ($swatchCollection as $item) {
             if ($item['type'] != Swatch::SWATCH_TYPE_TEXTUAL) {
                 $swatches[$item['option_id']] = $item->getData();
-            } elseif ($item['store_id'] == $currentStoreId && $item['value']) {
+            } elseif ($item['store_id'] == $currentStoreId && $item['value'] != '') {
                 $fallbackValues[$item['option_id']][$currentStoreId] = $item->getData();
             } elseif ($item['store_id'] == self::DEFAULT_STORE_ID) {
                 $fallbackValues[$item['option_id']][self::DEFAULT_STORE_ID] = $item->getData();
diff --git a/app/code/Magento/Swatches/Model/Plugin/EavAttribute.php b/app/code/Magento/Swatches/Model/Plugin/EavAttribute.php
@@ -444,7 +444,7 @@ protected function isOptionsValid(array $options, Attribute $attribute)
             if ($this->isOptionForDelete($attribute, $optionId)) {
                 continue;
             }
-            if (empty($option[0])) {
+            if (!isset($option[0]) || $option[0] === '') {
                 return false;
             }
         }
diff --git a/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_payment-shipping.less b/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_payment-shipping.less
@@ -7,7 +7,7 @@
 //  Order Payment & Shipping Information
 //  ---------------------------------------------
 
-.admin__payment-method-wapper {
+.admin__payment-method-wrapper {
     margin: 0;
     .admin__field {
         margin-left: 0;
diff --git a/app/design/adminhtml/Magento/backend/Magento_Signifyd/web/css/source/_module.less b/app/design/adminhtml/Magento/backend/Magento_Signifyd/web/css/source/_module.less
@@ -3,21 +3,5 @@
 //  * See COPYING.txt for license details.
 //  */
 
-//
-//  Order Case Info
-//  ---------------------------------------------
-
-.order-case-table {
-  &:extend(.abs-order-tables all);
-  &:extend(.abs-order-tbody-border all);
-}
-
-//
-//  Layout
-//  ---------------------------------------------
-.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
-  .case-information {
-    float: left;
-    #mix-grid .width(6,12);
-  }
-}
+@import 'module/_order.less';
+@import 'module/_config.less';
diff --git a/app/design/adminhtml/Magento/backend/Magento_Signifyd/web/css/source/module/_config.less b/app/design/adminhtml/Magento/backend/Magento_Signifyd/web/css/source/module/_config.less
diff --git a/app/design/adminhtml/Magento/backend/Magento_Signifyd/web/css/source/module/_order.less b/app/design/adminhtml/Magento/backend/Magento_Signifyd/web/css/source/module/_order.less
diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Model/Express/CheckoutTest.php b/dev/tests/integration/testsuite/Magento/Paypal/Model/Express/CheckoutTest.php

Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,7 @@ function setPostcodeOptional(zipElement, country) {`
`40`	`40`	`zipElement.removeClassName('required-entry');`
`41`	`41`	`}`
`42`	`42`	`zipElement.up('div.field').removeClassName('required');`
	`43`	`+ zipElement.up('div.field').removeClassName('_required');`
`43`	`44`	`} else {`
`44`	`45`	`zipElement.addClassName('required-entry');`
`45`	`46`	`zipElement.up('div.field').addClassName('required');`
Original file line number	Diff line number	Diff line change
`@@ -325,6 +325,7 @@ public function clear()`
`325`	`325`	`$this->items = [];`
`326`	`326`	`$this->errorStatistics = [];`
`327`	`327`	`$this->invalidRows = [];`
	`328`	`+ $this->skippedRows = [];`
`328`	`329`
`329`	`330`	`return $this;`
`330`	`331`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1482,9 +1482,9 @@ protected function _exportAddressses($data)`
`1482`	`1482`	`protected function _applyStreetAndRegionWorkarounds(\Magento\Framework\DataObject $address)`
`1483`	`1483`	`{`
`1484`	`1484`	`// merge street addresses into 1`
`1485`		`- if ($address->hasStreet2()) {`
`1486`		`- $address->setStreet(implode("\n", [$address->getStreet(), $address->getStreetLine(2)]));`
`1487`		`- $address->unsStreet2();`
	`1485`	`+ if ($address->getData('street2') !== null) {`
	`1486`	`+ $address->setStreet(implode("\n", [$address->getData('street'), $address->getData('street2')]));`
	`1487`	`+ $address->unsetData('street2');`
`1488`	`1488`	`}`
`1489`	`1489`	`// attempt to fetch region_id from directory`
`1490`	`1490`	`if ($address->getCountryId() && $address->getRegion()) {`