Merge pull request #6141 from magento-tsg-csl3/2.4-develop-pr40

viktym · web-flow · commit 711b09ced5fd · 2020-09-18T09:13:36.000-05:00
[TSG-CSL3] For 2.4 (pr40)
diff --git a/app/code/Magento/Checkout/Model/ShippingInformationManagement.php b/app/code/Magento/Checkout/Model/ShippingInformationManagement.php
@@ -209,8 +209,11 @@ public function saveAddressInformation(
         if (!$quote->getIsVirtual()
             && !$shippingAddress->getShippingRateByCode($shippingAddress->getShippingMethod())
         ) {
-            throw new NoSuchEntityException(
+            $errorMessage = $methodCode ?
                 __('Carrier with such method not found: %1, %2', $carrierCode, $methodCode)
+                : __('The shipping method is missing. Select the shipping method and try again.');
+            throw new NoSuchEntityException(
+                $errorMessage
             );
         }
 
diff --git a/app/code/Magento/Checkout/Test/Mftf/Data/ConfigData.xml b/app/code/Magento/Checkout/Test/Mftf/Data/ConfigData.xml
@@ -81,6 +81,13 @@
         <data key="label">All Allowed Countries</data>
         <data key="value">0</data>
     </entity>
+    <entity name="EnableFlatRateShowMethodNoApplicableConfigData">
+        <data key="path">carriers/flatrate/showmethod</data>
+        <data key="scope">carriers</data>
+        <data key="scope_id">1</data>
+        <data key="label">Show Method if Not Applicable</data>
+        <data key="value">1</data>
+    </entity>
     <entity name="DisableFlatRateConfigData">
         <data key="path">carriers/flatrate/active</data>
         <data key="scope">carriers</data>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutShippingMethodsSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutShippingMethodsSection.xml
@@ -20,5 +20,6 @@
         <element name="shippingMethodLoader" type="button" selector="//div[contains(@class, 'checkout-shipping-method')]/following-sibling::div[contains(@class, 'loading-mask')]"/>
         <element name="freeShippingShippingMethod" type="input" selector="#s_method_freeshipping_freeshipping" timeout="30"/>
         <element name="noQuotesMsg" type="text" selector="#checkout-step-shipping_method div"/>
+        <element name="price" type="text" selector="//*[@id='checkout-shipping-method-load']//td[@class='col col-price']"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckoutForShowShippingMethodNoApplicableTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckoutForShowShippingMethodNoApplicableTest.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontCheckoutForShowShippingMethodNoApplicableTest">
+        <annotations>
+            <stories value="Checkout for not applicable shipping method"/>
+            <title value="Storefront checkout for not applicable shipping method test"/>
+            <description value="Checkout flow if shipping rates are not applicable"/>
+            <severity value="AVERAGE"/>
+            <testCaseId value="MC-37420"/>
+            <group value="checkout"/>
+        </annotations>
+        <before>
+            <!-- Create simple product -->
+            <createData entity="SimpleProduct2" stepKey="createProduct"/>
+            <!-- Enable flat rate shipping to specific country -  Afghanistan -->
+            <magentoCLI command="config:set {{EnableFlatRateConfigData.path}} {{EnableFlatRateConfigData.value}}" stepKey="enableFlatRate"/>
+            <magentoCLI command="config:set {{EnableFlatRateToSpecificCountriesConfigData.path}} {{EnableFlatRateToSpecificCountriesConfigData.value}}" stepKey="allowFlatRateSpecificCountries"/>
+            <magentoCLI command="config:set {{EnableFlatRateToAfghanistanConfigData.path}} {{EnableFlatRateToAfghanistanConfigData.value}}" stepKey="enableFlatRateToAfghanistan"/>
+            <!-- Enable Show Method if Not Applicable-->
+            <magentoCLI command="config:set {{EnableFlatRateShowMethodNoApplicableConfigData.path}} {{EnableFlatRateShowMethodNoApplicableConfigData.value}}" stepKey="enableShowMethodNoApplicable"/>
+            <!-- Create Customer with filled Shipping & Billing Address -->
+            <createData entity="CustomerEntityOne" stepKey="createCustomer"/>
+        </before>
+        <after>
+            <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutFromStorefront"/>
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+            <magentoCLI command="config:set {{EnableFlatRateToAllAllowedCountriesConfigData.path}} {{EnableFlatRateToAllAllowedCountriesConfigData.value}}" stepKey="allowFlatRateToAllCountries"/>
+            <magentoCLI command="config:set {{EnableFlatRateShowMethodNoApplicableConfigData.path}} 0" stepKey="disableShowMethodNoApplicable"/>
+            <!-- Delete product -->
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+        </after>
+        <!-- Login with created Customer -->
+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginAsCustomer">
+            <argument name="Customer" value="$$createCustomer$$"/>
+        </actionGroup>
+        <!-- Add product to cart -->
+        <actionGroup ref="OpenStoreFrontProductPageActionGroup" stepKey="openProductPage">
+            <argument name="productUrlKey" value="$$createProduct.custom_attributes[url_key]$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontAddProductToCartActionGroup" stepKey="addProductToCart">
+            <argument name="product" value="$$createProduct$$"/>
+            <argument name="productCount" value="1"/>
+        </actionGroup>
+        <!-- Go to checkout page -->
+        <actionGroup ref="OpenStoreFrontCheckoutShippingPageActionGroup" stepKey="openCheckoutShippingPage"/>
+        <!-- Assert shipping price for US > California -->
+        <dontSeeElement selector="{{CheckoutShippingMethodsSection.price}}" stepKey="dontSeePrice"/>
+        <!-- Assert Next button is available -->
+        <seeElement selector="{{CheckoutShippingMethodsSection.next}}" stepKey="seeNextButton"/>
+        <click selector="{{CheckoutShippingMethodsSection.next}}" stepKey="clickNextButton"/>
+        <!--  Assert order cannot be placed and error message will shown. -->
+        <waitForPageLoad stepKey="waitForError"/>
+        <see stepKey="seeShippingMethodError" userInput="The shipping method is missing. Select the shipping method and try again."/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Checkout/i18n/en_US.csv b/app/code/Magento/Checkout/i18n/en_US.csv
@@ -185,3 +185,4 @@ Payment,Payment
 "Close","Close"
 "Show Cross-sell Items in the Shopping Cart","Show Cross-sell Items in the Shopping Cart"
 "You added %1 to your <a href=""%2"">shopping cart</a>.","You added %1 to your <a href=""%2"">shopping cart</a>."
+"The shipping method is missing. Select the shipping method and try again.","The shipping method is missing. Select the shipping method and try again."
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js b/app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js
@@ -299,6 +299,12 @@ define([
                 this.source.set('params.invalid', false);
                 this.triggerShippingDataValidateEvent();
 
+                if (!quote.shippingMethod()['method_code']) {
+                    this.errorValidationMessage(
+                        $t('The shipping method is missing. Select the shipping method and try again.')
+                    );
+                }
+
                 if (emailValidationResult &&
                     this.source.get('params.invalid') ||
                     !quote.shippingMethod()['method_code'] ||
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/shipping-address/shipping-method-item.html b/app/code/Magento/Checkout/view/frontend/web/template/shipping-address/shipping-method-item.html
@@ -15,9 +15,11 @@
                attr="'aria-labelledby': 'label_method_' + method.method_code + '_' + method.carrier_code + ' ' + 'label_carrier_' + method.method_code + '_' + method.carrier_code,
                     'checked': element.rates().length == 1 || element.isSelected" />
     </td>
+    <!-- ko ifnot: (method.error_message) -->
     <td class="col col-price">
         <each args="element.getRegion('price')" render="" />
     </td>
+    <!-- /ko -->
     <td class="col col-method"
         attr="'id': 'label_method_' + method.method_code + '_' + method.carrier_code"
         text="method.method_title" />
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_products.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_products.php
@@ -44,7 +44,6 @@
     $product = $objectManager->create(Product::class);
     $productId = array_shift($productIds);
     $product->setTypeId(Type::TYPE_SIMPLE)
-        ->setId($productId)
         ->setAttributeSetId($attributeSetId)
         ->setWebsiteIds([1])
         ->setName('Configurable Option' . $option->getLabel())
@@ -84,7 +83,6 @@
 $product->setExtensionAttributes($extensionConfigurableAttributes);
 
 $product->setTypeId(Configurable::TYPE_CODE)
-    ->setId(1)
     ->setAttributeSetId($attributeSetId)
     ->setWebsiteIds([1])
     ->setName('Configurable Product')
@@ -110,7 +108,6 @@
     $product = $objectManager->create(Product::class);
     $productId = array_shift($productIds);
     $product->setTypeId(Type::TYPE_SIMPLE)
-        ->setId($productId)
         ->setAttributeSetId($attributeSetId)
         ->setWebsiteIds([1])
         ->setName('Configurable Option' . $option->getLabel())
@@ -155,7 +152,6 @@
 $product->setExtensionAttributes($extensionConfigurableAttributes);
 
 $product->setTypeId(Configurable::TYPE_CODE)
-    ->setId(11)
     ->setAttributeSetId($attributeSetId)
     ->setWebsiteIds([1])
     ->setName('Configurable Product 12345')
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/quote_with_configurable_product_last_variation.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/quote_with_configurable_product_last_variation.php
@@ -14,11 +14,11 @@
 $quote = $objectManager->create(\Magento\Quote\Model\Quote::class);
 /** @var ProductRepositoryInterface $productRepository */
 $productRepository = $objectManager->create(ProductRepositoryInterface::class);
-$product = $productRepository->getById(10);
+$product = $productRepository->get('simple_10');
 $product->setStockData(['use_config_manage_stock' => 1, 'qty' => 1, 'is_qty_decimal' => 0, 'is_in_stock' => 1]);
 $productRepository->save($product);
 
-$product = $productRepository->getById(20);
+$product = $productRepository->get('simple_20');
 $product->setStockData(['use_config_manage_stock' => 1, 'qty' => 0, 'is_qty_decimal' => 0, 'is_in_stock' => 0]);
 $productRepository->save($product);
 
diff --git a/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/quote_with_configurable_product.php b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/quote_with_configurable_product.php
@@ -24,7 +24,7 @@
 $objectManager = Bootstrap::getObjectManager();
 /** @var ProductRepositoryInterface $productRepository */
 $productRepository = $objectManager->create(ProductRepositoryInterface::class);
-$product = $productRepository->getById(10);
+$product = $productRepository->get('simple_10');
 $product->setStockData(['use_config_manage_stock' => 1, 'qty' => 4, 'is_qty_decimal' => 0, 'is_in_stock' => 1]);
 $productRepository->save($product);
 
diff --git a/lib/internal/Magento/Framework/Stdlib/DateTime/Timezone.php b/lib/internal/Magento/Framework/Stdlib/DateTime/Timezone.php
@@ -30,6 +30,11 @@ class Timezone implements TimezoneInterface
         \IntlDateFormatter::SHORT,
     ];
 
+    /**
+     * @var array
+     */
+    private $dateFormatterCache = [];
+
     /**
      * @var string
      */
@@ -174,16 +179,9 @@ public function date($date = null, $locale = null, $useTimezone = true, $include
             case ($date instanceof \DateTimeImmutable):
                 return new \DateTime($date->format('Y-m-d H:i:s'), $date->getTimezone());
             case (!is_numeric($date)):
-                $timeType = $includeTime ? \IntlDateFormatter::SHORT : \IntlDateFormatter::NONE;
-                $formatter = new \IntlDateFormatter(
-                    $locale,
-                    \IntlDateFormatter::MEDIUM,
-                    $timeType,
-                    new \DateTimeZone($timezone)
-                );
-
                 $date = $this->appendTimeIfNeeded($date, $includeTime, $timezone, $locale);
-                $date = $formatter->parse($date) ?: (new \DateTime($date))->getTimestamp();
+                $date = $this->parseLocaleDate($date, $locale, $timezone, $includeTime)
+                    ?: (new \DateTime($date))->getTimestamp();
                 break;
         }
 
@@ -343,33 +341,77 @@ public function convertConfigTimeToUtc($date, $format = 'Y-m-d H:i:s')
     private function appendTimeIfNeeded($date, $includeTime, $timezone, $locale)
     {
         if ($includeTime && !preg_match('/\d{1}:\d{2}/', $date)) {
-
-            $formatterWithoutHour = new \IntlDateFormatter(
-                $locale,
-                \IntlDateFormatter::MEDIUM,
-                \IntlDateFormatter::NONE,
-                new \DateTimeZone($timezone)
-            );
-            $convertedDate = $formatterWithoutHour->parse($date);
-
+            $convertedDate = $this->parseLocaleDate($date, $locale, $timezone, false);
             if (!$convertedDate) {
                 throw new LocalizedException(
                     new Phrase(
                         'Could not append time to DateTime'
                     )
                 );
-
             }
 
-            $formatterWithHour = new \IntlDateFormatter(
+            $formatterWithHour = $this->getDateFormatter(
                 $locale,
+                $timezone,
                 \IntlDateFormatter::MEDIUM,
-                \IntlDateFormatter::SHORT,
-                new \DateTimeZone($timezone)
+                \IntlDateFormatter::SHORT
             );
-
             $date = $formatterWithHour->format($convertedDate);
         }
         return $date;
     }
+
+    /**
+     * Parse date by locale format through IntlDateFormatter
+     *
+     * @param string $date
+     * @param string $locale
+     * @param string $timeZone
+     * @param bool $includeTime
+     * @return int|null Timestamp of date
+     */
+    private function parseLocaleDate(string $date, string $locale, string $timeZone, bool $includeTime): ?int
+    {
+        $allowedStyles = [\IntlDateFormatter::MEDIUM, \IntlDateFormatter::SHORT];
+        $timeStyle = $includeTime ? \IntlDateFormatter::SHORT : \IntlDateFormatter::NONE;
+
+        /**
+         * Try to parse date with different styles
+         */
+        foreach ($allowedStyles as $style) {
+            $formatter = $this->getDateFormatter($locale, $timeZone, $style, $timeStyle);
+            $timeStamp = $formatter->parse($date);
+            if ($timeStamp) {
+                return $timeStamp;
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Get date formatter for locale
+     *
+     * @param string $locale
+     * @param string $timeZone
+     * @param int $style
+     * @param int $timeStyle
+     * @return \IntlDateFormatter
+     */
+    private function getDateFormatter(string $locale, string $timeZone, int $style, int $timeStyle): \IntlDateFormatter
+    {
+        $cacheKey = "{$locale}_{$timeZone}_{$style}_{$timeStyle}";
+        if (isset($this->dateFormatterCache[$cacheKey])) {
+            return $this->dateFormatterCache[$cacheKey];
+        }
+
+        $this->dateFormatterCache[$cacheKey] = new \IntlDateFormatter(
+            $locale,
+            $style,
+            $timeStyle,
+            new \DateTimeZone($timeZone)
+        );
+
+        return $this->dateFormatterCache[$cacheKey];
+    }
 }
diff --git a/lib/internal/Magento/Framework/Stdlib/Test/Unit/DateTime/TimezoneTest.php b/lib/internal/Magento/Framework/Stdlib/Test/Unit/DateTime/TimezoneTest.php
@@ -101,7 +101,12 @@ public function testDateIncludeTime($date, $locale, $includeTime, $expectedTimes
 
         /** @var \DateTime $dateTime */
         $dateTime = $timezone->date($date, $locale, true, $includeTime);
-        $this->assertEquals($expectedTimestamp, $dateTime->getTimestamp());
+        if (is_numeric($expectedTimestamp)) {
+            $this->assertEquals($expectedTimestamp, $dateTime->getTimestamp());
+        } else {
+            $format = $includeTime ? DateTime::DATETIME_PHP_FORMAT : DateTime::DATE_PHP_FORMAT;
+            $this->assertEquals($expectedTimestamp, date($format, $dateTime->getTimestamp()));
+        }
     }
 
     /**
@@ -151,7 +156,25 @@ public function dateIncludeTimeDataProvider(): array
                 'el_GR', // locale
                 false, // include time
                 1635570000 // expected timestamp
-            ]
+            ],
+            'Parse Saudi Arabia date without time' => [
+                '31‏/8‏/2020 02020',
+                'ar_SA',
+                false,
+                '2020-08-31'
+            ],
+            'Parse date in short style with long year 1999' => [
+                '9/11/1999',
+                'en_US',
+                false,
+                '1999-09-11'
+            ],
+            'Parse date in short style with long year 2099' => [
+                '9/2/2099',
+                'en_US',
+                false,
+                '2099-09-02'
+            ],
         ];
     }
 
