merge magento/2.2-develop into magento-techdivision/php72_update

magento-cicd2 · web-flow · commit c5243e89f78c · 2019-06-27T14:08:04.000-07:00
diff --git a/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/multishipping/cc-form.js b/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/multishipping/cc-form.js
@@ -12,7 +12,7 @@ define([
     'Magento_Ui/js/model/messageList',
     'mage/translate',
     'Magento_Checkout/js/model/full-screen-loader',
-    'Magento_Checkout/js/action/set-payment-information',
+    'Magento_Checkout/js/action/set-payment-information-extended',
     'Magento_Checkout/js/model/payment/additional-validators',
     'Magento_Braintree/js/view/payment/validator-handler'
 ], function (
@@ -22,7 +22,7 @@ define([
     messageList,
     $t,
     fullScreenLoader,
-    setPaymentInformationAction,
+    setPaymentInformationExtended,
     additionalValidators,
     validatorManager
 ) {
@@ -51,9 +51,10 @@ define([
             if (additionalValidators.validate()) {
                 fullScreenLoader.startLoader();
                 $.when(
-                    setPaymentInformationAction(
+                    setPaymentInformationExtended(
                         this.messageContainer,
-                        this.getData()
+                        this.getData(),
+                        true
                     )
                 ).done(this.done.bind(this))
                     .fail(this.fail.bind(this));
diff --git a/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/multishipping/paypal.js b/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/multishipping/paypal.js
@@ -8,14 +8,14 @@ define([
     'jquery',
     'underscore',
     'Magento_Braintree/js/view/payment/method-renderer/paypal',
-    'Magento_Checkout/js/action/set-payment-information',
+    'Magento_Checkout/js/action/set-payment-information-extended',
     'Magento_Checkout/js/model/payment/additional-validators',
     'Magento_Checkout/js/model/full-screen-loader'
 ], function (
     $,
     _,
     Component,
-    setPaymentInformationAction,
+    setPaymentInformationExtended,
     additionalValidators,
     fullScreenLoader
 ) {
@@ -131,9 +131,10 @@ define([
         placeOrder: function () {
             fullScreenLoader.startLoader();
             $.when(
-                setPaymentInformationAction(
+                setPaymentInformationExtended(
                     this.messageContainer,
-                    this.getData()
+                    this.getData(),
+                    true
                 )
             ).done(this.done.bind(this))
                 .fail(this.fail.bind(this));
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product.php b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
@@ -2525,6 +2525,12 @@ public function validateRow(array $rowData, $rowNum)
      */
     private function isNeedToValidateUrlKey($rowData)
     {
+        if (!empty($rowData[self::COL_SKU]) && empty($rowData[self::URL_KEY])
+            && $this->getBehavior() === Import::BEHAVIOR_APPEND
+            && $this->isSkuExist($rowData[self::COL_SKU])) {
+            return false;
+        }
+
         return (!empty($rowData[self::URL_KEY]) || !empty($rowData[self::COL_NAME]))
             && (empty($rowData[self::COL_VISIBILITY])
                 || $rowData[self::COL_VISIBILITY]
@@ -2842,7 +2848,8 @@ protected function getUrlKey($rowData)
             return trim(strtolower($urlKey));
         }
 
-        if (!empty($rowData[self::COL_NAME])) {
+        if (!empty($rowData[self::COL_NAME])
+            && (array_key_exists(self::URL_KEY, $rowData) || !$this->isSkuExist($rowData[self::COL_SKU]))) {
             return $this->productUrl->formatUrlKey($rowData[self::COL_NAME]);
         }
 
diff --git a/app/code/Magento/CatalogUrlRewrite/Observer/AfterImportDataObserver.php b/app/code/Magento/CatalogUrlRewrite/Observer/AfterImportDataObserver.php
@@ -232,11 +232,8 @@ public function execute(Observer $observer)
     protected function _populateForUrlGeneration($rowData)
     {
         $newSku = $this->import->getNewSku($rowData[ImportProduct::COL_SKU]);
-        if (empty($newSku) || !isset($newSku['entity_id'])) {
-            return null;
-        }
-        if ($this->import->getRowScope($rowData) == ImportProduct::SCOPE_STORE
-            && empty($rowData[self::URL_KEY_ATTRIBUTE_CODE])) {
+        $oldSku = $this->import->getOldSku();
+        if (!$this->isNeedToPopulateForUrlGeneration($rowData, $newSku, $oldSku)) {
             return null;
         }
         $rowData['entity_id'] = $newSku['entity_id'];
@@ -268,6 +265,27 @@ protected function _populateForUrlGeneration($rowData)
         return $this;
     }
 
+    /**
+     * Check is need to populate data for url generation
+     *
+     * @param array $rowData
+     * @param array $newSku
+     * @param array $oldSku
+     * @return bool
+     */
+    private function isNeedToPopulateForUrlGeneration($rowData, $newSku, $oldSku): bool
+    {
+        if ((empty($newSku) || !isset($newSku['entity_id']))
+            || ($this->import->getRowScope($rowData) == ImportProduct::SCOPE_STORE
+                && empty($rowData[self::URL_KEY_ATTRIBUTE_CODE]))
+            || (array_key_exists($rowData[ImportProduct::COL_SKU], $oldSku)
+                && !isset($rowData[self::URL_KEY_ATTRIBUTE_CODE])
+                && $this->import->getBehavior() === ImportExport::BEHAVIOR_APPEND)) {
+            return false;
+        }
+        return true;
+    }
+
     /**
      * Add store id to product data.
      *
diff --git a/app/code/Magento/CatalogUrlRewrite/Observer/UrlRewriteHandler.php b/app/code/Magento/CatalogUrlRewrite/Observer/UrlRewriteHandler.php
@@ -280,7 +280,7 @@ private function generateChangedProductUrls(
             /* @var Collection $collection */
             $collection = $this->productCollectionFactory->create()
                 ->setStoreId($categoryStoreId)
-                ->addIdFilter($category->getAffectedProductIds())
+                ->addIdFilter($category->getChangedProductIds())
                 ->addAttributeToSelect('visibility')
                 ->addAttributeToSelect('name')
                 ->addAttributeToSelect('url_key')
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/action/set-payment-information-extended.js b/app/code/Magento/Checkout/view/frontend/web/js/action/set-payment-information-extended.js
@@ -0,0 +1,60 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/**
+ * @api
+ */
+define([
+    'Magento_Checkout/js/model/quote',
+    'Magento_Checkout/js/model/url-builder',
+    'mage/storage',
+    'Magento_Checkout/js/model/error-processor',
+    'Magento_Customer/js/model/customer',
+    'Magento_Checkout/js/action/get-totals',
+    'Magento_Checkout/js/model/full-screen-loader'
+], function (quote, urlBuilder, storage, errorProcessor, customer, getTotalsAction, fullScreenLoader) {
+    'use strict';
+
+    return function (messageContainer, paymentData, skipBilling) {
+        var serviceUrl,
+            payload;
+
+        skipBilling = skipBilling || false;
+        payload = {
+            cartId: quote.getQuoteId(),
+            paymentMethod: paymentData
+        };
+
+        /**
+         * Checkout for guest and registered customer.
+         */
+        if (!customer.isLoggedIn()) {
+            serviceUrl = urlBuilder.createUrl('/guest-carts/:cartId/set-payment-information', {
+                cartId: quote.getQuoteId()
+            });
+            payload.email = quote.guestEmail;
+        } else {
+            serviceUrl = urlBuilder.createUrl('/carts/mine/set-payment-information', {});
+        }
+
+        if (skipBilling === false) {
+            payload.billingAddress = quote.billingAddress();
+        }
+
+        fullScreenLoader.startLoader();
+
+        return storage.post(
+            serviceUrl, JSON.stringify(payload)
+        ).fail(
+            function (response) {
+                errorProcessor.process(response, messageContainer);
+            }
+        ).always(
+            function () {
+                fullScreenLoader.stopLoader();
+            }
+        );
+    };
+});
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/action/set-payment-information.js b/app/code/Magento/Checkout/view/frontend/web/js/action/set-payment-information.js
@@ -7,54 +7,13 @@
  * @api
  */
 define([
-    'Magento_Checkout/js/model/quote',
-    'Magento_Checkout/js/model/url-builder',
-    'mage/storage',
-    'Magento_Checkout/js/model/error-processor',
-    'Magento_Customer/js/model/customer',
-    'Magento_Checkout/js/action/get-totals',
-    'Magento_Checkout/js/model/full-screen-loader'
-], function (quote, urlBuilder, storage, errorProcessor, customer, getTotalsAction, fullScreenLoader) {
+    'Magento_Checkout/js/action/set-payment-information-extended'
+
+], function (setPaymentInformationExtended) {
     'use strict';
 
     return function (messageContainer, paymentData) {
-        var serviceUrl,
-            payload;
-
-        /**
-         * Checkout for guest and registered customer.
-         */
-        if (!customer.isLoggedIn()) {
-            serviceUrl = urlBuilder.createUrl('/guest-carts/:cartId/set-payment-information', {
-                cartId: quote.getQuoteId()
-            });
-            payload = {
-                cartId: quote.getQuoteId(),
-                email: quote.guestEmail,
-                paymentMethod: paymentData,
-                billingAddress: quote.billingAddress()
-            };
-        } else {
-            serviceUrl = urlBuilder.createUrl('/carts/mine/set-payment-information', {});
-            payload = {
-                cartId: quote.getQuoteId(),
-                paymentMethod: paymentData,
-                billingAddress: quote.billingAddress()
-            };
-        }
-
-        fullScreenLoader.startLoader();
 
-        return storage.post(
-            serviceUrl, JSON.stringify(payload)
-        ).fail(
-            function (response) {
-                errorProcessor.process(response, messageContainer);
-            }
-        ).always(
-            function () {
-                fullScreenLoader.stopLoader();
-            }
-        );
+        return setPaymentInformationExtended(messageContainer, paymentData, false);
     };
 });
diff --git a/app/code/Magento/Payment/view/frontend/web/js/view/payment/iframe.js b/app/code/Magento/Payment/view/frontend/web/js/view/payment/iframe.js
@@ -125,12 +125,7 @@ define([
                 this.isPlaceOrderActionAllowed(false);
 
                 $.when(
-                    setPaymentInformationAction(
-                        this.messageContainer,
-                        {
-                            method: this.getCode()
-                        }
-                    )
+                    this.setPaymentInformation()
                 ).done(
                     this.done.bind(this)
                 ).fail(
@@ -145,6 +140,18 @@ define([
             }
         },
 
+        /**
+         * {Function}
+         */
+        setPaymentInformation: function () {
+            setPaymentInformationAction(
+                this.messageContainer,
+                {
+                    method: this.getCode()
+                }
+            );
+        },
+
         /**
          * {Function}
          */
diff --git a/app/code/Magento/SalesRule/Model/Coupon/Massgenerator.php b/app/code/Magento/SalesRule/Model/Coupon/Massgenerator.php
@@ -168,16 +168,10 @@ public function generatePool()
                 ++$attempt;
             } while ($this->getResource()->exists($code));
 
-            $expirationDate = $this->getToDate();
-            if ($expirationDate instanceof \DateTimeInterface) {
-                $expirationDate = $expirationDate->format('Y-m-d H:i:s');
-            }
-
             $coupon->setId(null)
                 ->setRuleId($this->getRuleId())
                 ->setUsageLimit($this->getUsesPerCoupon())
                 ->setUsagePerCustomer($this->getUsagePerCustomer())
-                ->setExpirationDate($expirationDate)
                 ->setCreatedAt($nowTimestamp)
                 ->setType(\Magento\SalesRule\Helper\Coupon::COUPON_TYPE_SPECIFIC_AUTOGENERATED)
                 ->setCode($code)
diff --git a/app/code/Magento/SalesRule/Model/CouponRepository.php b/app/code/Magento/SalesRule/Model/CouponRepository.php
@@ -119,7 +119,6 @@ public function save(\Magento\SalesRule\Api\Data\CouponInterface $coupon)
                     __('Specified rule does not allow auto generated coupons')
                 );
             }
-            $coupon->setExpirationDate($rule->getToDate());
             $coupon->setUsageLimit($rule->getUsesPerCoupon());
             $coupon->setUsagePerCustomer($rule->getUsesPerCustomer());
         } catch (\Exception $e) {
diff --git a/app/code/Magento/SalesRule/Model/ResourceModel/Coupon.php b/app/code/Magento/SalesRule/Model/ResourceModel/Coupon.php
@@ -34,14 +34,6 @@ protected function _construct()
      */
     public function _beforeSave(AbstractModel $object)
     {
-        if (!$object->getExpirationDate()) {
-            $object->setExpirationDate(null);
-        } elseif ($object->getExpirationDate() instanceof \DateTimeInterface) {
-            $object->setExpirationDate(
-                $object->getExpirationDate()->format('Y-m-d H:i:s')
-            );
-        }
-
         // maintain single primary coupon per rule
         $object->setIsPrimary($object->getIsPrimary() ? 1 : null);
 
@@ -126,13 +118,6 @@ public function updateSpecificCoupons(\Magento\SalesRule\Model\Rule $rule)
             $updateArray['usage_per_customer'] = $rule->getUsesPerCustomer();
         }
 
-        $ruleNewDate = new \DateTime($rule->getToDate());
-        $ruleOldDate = new \DateTime($rule->getOrigData('to_date'));
-
-        if ($ruleNewDate != $ruleOldDate) {
-            $updateArray['expiration_date'] = $rule->getToDate();
-        }
-
         if (!empty($updateArray)) {
             $this->getConnection()->update(
                 $this->getTable('salesrule_coupon'),
diff --git a/app/code/Magento/SalesRule/Model/ResourceModel/Rule/Collection.php b/app/code/Magento/SalesRule/Model/ResourceModel/Rule/Collection.php
@@ -231,11 +231,6 @@ private function getCouponCodeSelect($couponCode)
 
         $this->joinCouponTable($couponCode, $couponSelect);
 
-        $notExpired = $this->getConnection()->quoteInto(
-            '(rule_coupons.expiration_date IS NULL OR rule_coupons.expiration_date >= ?)',
-            $this->_date->date()->format('Y-m-d')
-        );
-
         $isAutogenerated =
             $this->getConnection()->quoteInto('main_table.coupon_type = ?', Rule::COUPON_TYPE_AUTO)
             . ' AND ' .
@@ -250,7 +245,7 @@ private function getCouponCodeSelect($couponCode)
             . ')';
 
         $couponSelect->where(
-            "$notExpired AND ($isAutogenerated OR $isValidSpecific)",
+            "$isAutogenerated OR $isValidSpecific",
             null,
             Select::TYPE_CONDITION
         );
diff --git a/app/code/Magento/SalesRule/Model/Rule.php b/app/code/Magento/SalesRule/Model/Rule.php
@@ -296,8 +296,6 @@ public function afterSave()
                 $this->getUsesPerCoupon() ? $this->getUsesPerCoupon() : null
             )->setUsagePerCustomer(
                 $this->getUsesPerCustomer() ? $this->getUsesPerCustomer() : null
-            )->setExpirationDate(
-                $this->getToDate()
             )->save();
         } else {
             $this->getPrimaryCoupon()->delete();
@@ -499,8 +497,6 @@ public function acquireCoupon($saveNewlyCreated = true, $saveAttemptCount = 10)
             $this->getUsesPerCoupon() ? $this->getUsesPerCoupon() : null
         )->setUsagePerCustomer(
             $this->getUsesPerCustomer() ? $this->getUsesPerCustomer() : null
-        )->setExpirationDate(
-            $this->getToDate()
         )->setType(
             \Magento\SalesRule\Api\Data\CouponInterface::TYPE_GENERATED
         );
diff --git a/app/code/Magento/SalesRule/Test/Unit/Model/Coupon/MassgeneratorTest.php b/app/code/Magento/SalesRule/Test/Unit/Model/Coupon/MassgeneratorTest.php
@@ -109,7 +109,6 @@ public function testGeneratePool()
                 'setRuleId',
                 'setUsageLimit',
                 'setUsagePerCustomer',
-                'setExpirationDate',
                 'setCreatedAt',
                 'setType',
                 'setCode',
@@ -120,7 +119,6 @@ public function testGeneratePool()
         $couponMock->expects($this->any())->method('setRuleId')->will($this->returnSelf());
         $couponMock->expects($this->any())->method('setUsageLimit')->will($this->returnSelf());
         $couponMock->expects($this->any())->method('setUsagePerCustomer')->will($this->returnSelf());
-        $couponMock->expects($this->any())->method('setExpirationDate')->will($this->returnSelf());
         $couponMock->expects($this->any())->method('setCreatedAt')->will($this->returnSelf());
         $couponMock->expects($this->any())->method('setType')->will($this->returnSelf());
         $couponMock->expects($this->any())->method('setCode')->will($this->returnSelf());
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/products_to_import_without_url_key_column.csv b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/products_to_import_without_url_key_column.csv
diff --git a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Observer/UrlRewriteHandlerTest.php b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Observer/UrlRewriteHandlerTest.php
diff --git a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/category_with_products.php b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/category_with_products.php
diff --git a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/category_with_products_rollback.php b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/category_with_products_rollback.php
diff --git a/lib/web/css/source/lib/_resets.less b/lib/web/css/source/lib/_resets.less

Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,6 @@ public function save(\Magento\SalesRule\Api\Data\CouponInterface $coupon)`
`119`	`119`	`__('Specified rule does not allow auto generated coupons')`
`120`	`120`	`);`
`121`	`121`	`}`
`122`		`- $coupon->setExpirationDate($rule->getToDate());`
`123`	`122`	`$coupon->setUsageLimit($rule->getUsesPerCoupon());`
`124`	`123`	`$coupon->setUsagePerCustomer($rule->getUsesPerCustomer());`
`125`	`124`	`} catch (\Exception $e) {`