Merge branch '2.3-develop' into 2.3-develop-19099-issue

app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationIndustryTest.xml

@@ -17,6 +17,9 @@
             <severity value="MAJOR"/>
             <testCaseId value="MAGETWO-63898"/>
             <group value="analytics"/>
+            <skip>
+                <issueId value="MAGETWO-96223"/>
+            </skip>
         </annotations>
 
         <actionGroup ref="LoginActionGroup" stepKey="loginAsAdmin"/>

app/code/Magento/Catalog/Block/Product/Compare/ListCompare.php

@@ -122,12 +122,7 @@ public function __construct(
      */
     public function getAddToWishlistParams($product)
     {
-        $continueUrl = $this->urlEncoder->encode($this->getUrl('customer/account'));
-        $urlParamName = Action::PARAM_NAME_URL_ENCODED;
-
-        $continueUrlParams = [$urlParamName => $continueUrl];
-
-        return $this->_wishlistHelper->getAddParams($product, $continueUrlParams);
+        return $this->_wishlistHelper->getAddParams($product);
     }
 
     /**

app/code/Magento/Catalog/Model/Design.php

@@ -5,6 +5,8 @@
  */
 namespace Magento\Catalog\Model;
 
+use \Magento\Framework\TranslateInterface;
+
 /**
  * Catalog Custom Category design Model
  *
@@ -31,14 +33,20 @@ class Design extends \Magento\Framework\Model\AbstractModel
      */
     protected $_localeDate;
 
+    /**
+     * @var TranslateInterface
+     */
+    private $translator;
+
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
      * @param \Magento\Framework\View\DesignInterface $design
-     * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
-     * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
+     * @param \Magento\Framework\Model\ResourceModel\AbstractResource|null $resource
+     * @param \Magento\Framework\Data\Collection\AbstractDb|null $resourceCollection
      * @param array $data
+     * @param TranslateInterface|null $translator
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -47,10 +55,13 @@ public function __construct(
         \Magento\Framework\View\DesignInterface $design,
         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
-        array $data = []
+        array $data = [],
+        TranslateInterface $translator = null
     ) {
         $this->_localeDate = $localeDate;
         $this->_design = $design;
+        $this->translator = $translator ?:
+            \Magento\Framework\App\ObjectManager::getInstance()->get(TranslateInterface::class);
         parent::__construct($context, $registry, $resource, $resourceCollection, $data);
     }
 
@@ -63,6 +74,7 @@ public function __construct(
     public function applyCustomDesign($design)
     {
         $this->_design->setDesignTheme($design);
+        $this->translator->loadData(null, true);
         return $this;
     }
 

app/code/Magento/CatalogGraphQl/Model/Resolver/Product/ProductImage.php

@@ -0,0 +1,44 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogGraphQl\Model\Resolver\Product;
+
+use Magento\Catalog\Model\Product;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+
+/**
+ * Returns product's image data
+ */
+class ProductImage implements ResolverInterface
+{
+    /**
+     * @inheritdoc
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ): array {
+        if (!isset($value['model'])) {
+            throw new LocalizedException(__('"model" value should be specified'));
+        }
+
+        /** @var Product $product */
+        $product = $value['model'];
+        $imageType = $field->getName();
+
+        return [
+            'model' => $product,
+            'image_type' => $imageType,
+        ];
+    }
+}

app/code/Magento/CatalogGraphQl/Model/Resolver/Product/ProductImage/Label.php

@@ -0,0 +1,96 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogGraphQl\Model\Resolver\Product\ProductImage;
+
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\ResourceModel\Product as ProductResourceModel;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Store\Model\StoreManagerInterface;
+
+/**
+ * Returns product's image label
+ */
+class Label implements ResolverInterface
+{
+    /**
+     * @var ProductResourceModel
+     */
+    private $productResource;
+
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * @param ProductResourceModel $productResource
+     * @param StoreManagerInterface $storeManager
+     */
+    public function __construct(
+        ProductResourceModel $productResource,
+        StoreManagerInterface $storeManager
+    ) {
+        $this->productResource = $productResource;
+        $this->storeManager = $storeManager;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+        if (!isset($value['image_type'])) {
+            throw new LocalizedException(__('"image_type" value should be specified'));
+        }
+
+        if (!isset($value['model'])) {
+            throw new LocalizedException(__('"model" value should be specified'));
+        }
+
+        /** @var Product $product */
+        $product = $value['model'];
+        $imageType = $value['image_type'];
+        $imagePath = $product->getData($imageType);
+        $productId = (int)$product->getEntityId();
+
+        // null if image is not set
+        if (null === $imagePath) {
+            return $this->getAttributeValue($productId, 'name');
+        }
+
+        $imageLabel = $this->getAttributeValue($productId, $imageType . '_label');
+        if (null === $imageLabel) {
+            $imageLabel = $this->getAttributeValue($productId, 'name');
+        }
+
+        return $imageLabel;
+    }
+
+    /**
+     * Get attribute value
+     *
+     * @param int $productId
+     * @param string $attributeCode
+     * @return null|string Null if attribute value is not exists
+     */
+    private function getAttributeValue(int $productId, string $attributeCode): ?string
+    {
+        $storeId = $this->storeManager->getStore()->getId();
+
+        $value = $this->productResource->getAttributeRawValue($productId, $attributeCode, $storeId);
+        return is_array($value) && empty($value) ? null : $value;
+    }
+}

app/code/Magento/CatalogGraphQl/Model/Resolver/Product/Image.php → app/code/Magento/CatalogGraphQl/Model/Resolver/Product/ProductImage/Url.php

@@ -5,7 +5,7 @@
  */
 declare(strict_types=1);
 
-namespace Magento\CatalogGraphQl\Model\Resolver\Product;
+namespace Magento\CatalogGraphQl\Model\Resolver\Product\ProductImage;
 
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\Product\ImageFactory;
@@ -15,13 +15,11 @@
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 
 /**
- * Returns product's image. If the image is not set, returns a placeholder
+ * Returns product's image url
  */
-class Image implements ResolverInterface
+class Url implements ResolverInterface
 {
     /**
-     * Product image factory
-     *
      * @var ImageFactory
      */
     private $productImageFactory;
@@ -44,23 +42,36 @@ public function resolve(
         ResolveInfo $info,
         array $value = null,
         array $args = null
-    ): array {
+    ) {
+        if (!isset($value['image_type'])) {
+            throw new LocalizedException(__('"image_type" value should be specified'));
+        }
+
         if (!isset($value['model'])) {
             throw new LocalizedException(__('"model" value should be specified'));
         }
+
         /** @var Product $product */
         $product = $value['model'];
-        $imageType = $field->getName();
-        $path = $product->getData($imageType);
+        $imagePath = $product->getData($value['image_type']);
 
+        $imageUrl = $this->getImageUrl($value['image_type'], $imagePath);
+        return $imageUrl;
+    }
+
+    /**
+     * Get image url
+     *
+     * @param string $imageType
+     * @param string|null $imagePath Null if image is not set
+     * @return string
+     */
+    private function getImageUrl(string $imageType, ?string $imagePath): string
+    {
         $image = $this->productImageFactory->create();
         $image->setDestinationSubdir($imageType)
-            ->setBaseFile($path);
+            ->setBaseFile($imagePath);
         $imageUrl = $image->getUrl();
-
-        return [
-            'url' => $imageUrl,
-            'path' => $path,
-        ];
+        return $imageUrl;
     }
 }

app/code/Magento/CatalogGraphQl/etc/schema.graphqls

@@ -257,16 +257,13 @@ interface ProductInterface @typeResolver(class: "Magento\\CatalogGraphQl\\Model\
     meta_title: String @doc(description: "A string that is displayed in the title bar and tab of the browser and in search results lists")
     meta_keyword: String @doc(description: "A comma-separated list of keywords that are visible only to search engines")
     meta_description: String @doc(description: "A brief overview of the product for search results listings, maximum 255 characters")
-    image: String @doc(description: "The relative path to the main image on the product page")
-    small_image: ProductImage @doc(description: "The relative path to the small image, which is used on catalog pages") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\Image")
-    thumbnail: String @doc(description: "The relative path to the product's thumbnail image")
+    image: ProductImage @doc(description: "The relative path to the main image on the product page") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\ProductImage")
+    small_image: ProductImage @doc(description: "The relative path to the small image, which is used on catalog pages") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\ProductImage")
+    thumbnail: ProductImage @doc(description: "The relative path to the product's thumbnail image") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\ProductImage")
     new_from_date: String @doc(description: "The beginning date for new product listings, and determines if the product is featured as a new product") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\NewFromTo")
     new_to_date: String @doc(description: "The end date for new product listings") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\NewFromTo")
     tier_price: Float @doc(description: "The price when tier pricing is in effect and the items purchased threshold has been reached")
     options_container: String @doc(description: "If the product has multiple options, determines where they appear on the product page")
-    image_label: String @doc(description: "The label assigned to a product image")
-    small_image_label: String @doc(description: "The label assigned to a product's small image")
-    thumbnail_label: String @doc(description: "The label assigned to a product's thumbnail image")
     created_at: String @doc(description: "Timestamp indicating when the product was created")
     updated_at: String @doc(description: "Timestamp indicating when the product was updated")
     country_of_manufacture: String @doc(description: "The product's country of origin")
@@ -352,9 +349,9 @@ type CustomizableFileValue @doc(description: "CustomizableFileValue defines the
     image_size_y: Int @doc(description: "The maximum height of an image")
 }
 
-type ProductImage @doc(description: "Product image information. Contains image relative path and URL") {
-    url: String
-    path: String
+type ProductImage @doc(description: "Product image information. Contains image relative path, URL and label") {
+    url: String @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\ProductImage\\Url")
+    label: String @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\ProductImage\\Label")
 }
 
 interface CustomizableOptionInterface @typeResolver(class: "Magento\\CatalogGraphQl\\Model\\CustomizableOptionTypeResolver") @doc(description: "The CustomizableOptionInterface contains basic information about a customizable option. It can be implemented by several types of configurable options.") {

app/code/Magento/Checkout/Test/Mftf/Section/CheckoutShippingMethodsSection.xml

@@ -14,7 +14,7 @@
         <element name="shippingMethodRow" type="text" selector=".form.methods-shipping table tbody tr"/>
         <element name="checkShippingMethodByName" type="radio" selector="//div[@id='checkout-shipping-method-load']//td[contains(., '{{var1}}')]/..//input" parameterized="true"/>
         <element name="shippingMethodRowByName" type="text" selector="//div[@id='checkout-shipping-method-load']//td[contains(., '{{var1}}')]/.." parameterized="true"/>
-        <element name="shipHereButton" type="button" selector="//button[contains(@class, 'action-select-shipping-item')]/parent::div/following-sibling::div/button[contains(@class, 'action-select-shipping-item')]"/>
+        <element name="shipHereButton" type="button" selector="//div/following-sibling::div/button[contains(@class, 'action-select-shipping-item')]"/>
         <element name="shippingMethodLoader" type="button" selector="//div[contains(@class, 'checkout-shipping-method')]/following-sibling::div[contains(@class, 'loading-mask')]"/>
     </section>
 </sections>

app/code/Magento/Checkout/view/frontend/web/template/shipping-address/address-renderer/default.html

@@ -35,7 +35,9 @@
             click="editAddress">
         <span translate="'Edit'"></span>
     </button>
+    <!-- ko if: (!isSelected()) -->
     <button type="button" click="selectAddress" class="action action-select-shipping-item">
         <span translate="'Ship Here'"></span>
     </button>
+    <!-- /ko -->
 </div>

app/code/Magento/Customer/etc/db_schema.xml

@@ -506,7 +506,7 @@
         <column xsi:type="int" name="customer_id" padding="11" unsigned="false" nullable="true" identity="false"
                 comment="Customer Id"/>
         <column xsi:type="varchar" name="session_id" nullable="true" length="64" comment="Session ID"/>
-        <column xsi:type="timestamp" name="last_visit_at" on_update="true" nullable="true" default="CURRENT_TIMESTAMP"
+        <column xsi:type="timestamp" name="last_visit_at" on_update="true" nullable="false" default="CURRENT_TIMESTAMP"
                 comment="Last Visit Time"/>
         <constraint xsi:type="primary" referenceId="PRIMARY">
             <column name="visitor_id"/>

app/code/Magento/Customer/view/frontend/web/js/password-strength-indicator.js

@@ -83,7 +83,7 @@ define([
                 } else {
                     isValid = $.validator.validateSingleElement(this.options.cache.input);
                     zxcvbnScore = zxcvbn(password).score;
-                    displayScore = isValid ? zxcvbnScore : 1;
+                    displayScore = isValid && zxcvbnScore > 0 ? zxcvbnScore : 1;
                 }
             }
 

app/code/Magento/CustomerImportExport/Model/Import/Address.php

@@ -101,6 +101,13 @@ class Address extends AbstractCustomer
      */
     protected $_entityTable;
 
+    /**
+     * Region collection instance
+     *
+     * @var \Magento\Directory\Model\ResourceModel\Region\Collection
+     */
+    private $_regionCollection;
+
     /**
      * Countries and regions
      *
@@ -781,7 +788,7 @@ public static function getDefaultAddressAttributeMapping()
     }
 
     /**
-     * check if address for import is empty (for customer composite mode)
+     * Check if address for import is empty (for customer composite mode)
      *
      * @param array $rowData
      * @return array
@@ -940,7 +947,7 @@ protected function _checkRowDuplicate($customerId, $addressId)
     }
 
     /**
-     * set customer attributes
+     * Set customer attributes
      *
      * @param array $customerAttributes
      * @return $this