🔃 [EngCom] Public Pull Requests - 2.2-develop

magento-team · web-flow · commit 7d475912496d · 2018-01-03T06:45:07.000-08:00
Accepted Public Pull Requests: - #12951: [Bug] Correctly construct Magento\Framework\Phrase (by @punkstar) - #12946: Respect "Learn More Link" in Recently Viewed Products widget options (by @JeroenVanLeusden) - #12931: Display scroll bar of admin store switcher in OSX computers. (by @jalogut) - #12857: Update progress.phtml (by @jonashrem) - #12887: Remove unused if statement in order invoice save (by @JeroenVanLeusden) - #12845: Add missing preference for ObjectManager\ConfigInterface in integrati… (by @schmengler) - #12768: magento/magento2: Missing ext-bcmath dependency added (by @Mobecls) - #12401: Correctly set payment information when using paypal (by @therool) Fixed GitHub Issues: - #12844: "Cannot instantiate interface Magento\Framework\Interception\ObjectManager\ConfigInterface" error in integration tests (reported by @schmengler) has been fixed in #12845 by @schmengler in 2.2-develop branch Related commits: 1. 50ffc6a - #11885: Magento 2.2 Paypal Can't Accept Checkout Agreements Before Routing to PayPal (reported by @Silarn) has been fixed in #12401 by @therool in 2.2-develop branch Related commits: 1. ba0472f 2. 48923e1 3. 774cb4c 4. 12145bc 5. 7bdb921 6. 70f5e38 7. 92f620f 8. 1c7123f 9. 9d5fa49 10. a35b468
diff --git a/app/bootstrap.php b/app/bootstrap.php
@@ -14,12 +14,12 @@
 if (!defined('PHP_VERSION_ID') || !(PHP_VERSION_ID === 70002 || PHP_VERSION_ID === 70004 || PHP_VERSION_ID >= 70006)) {
     if (PHP_SAPI == 'cli') {
         echo 'Magento supports 7.0.2, 7.0.4, and 7.0.6 or later. ' .
-            'Please read http://devdocs.magento.com/guides/v1.0/install-gde/system-requirements.html';
+            'Please read http://devdocs.magento.com/guides/v2.2/install-gde/system-requirements.html';
     } else {
         echo <<<HTML
 <div style="font:12px/1.35em arial, helvetica, sans-serif;">
     <p>Magento supports PHP 7.0.2, 7.0.4, and 7.0.6 or later. Please read
-    <a target="_blank" href="http://devdocs.magento.com/guides/v1.0/install-gde/system-requirements.html">
+    <a target="_blank" href="http://devdocs.magento.com/guides/v2.2/install-gde/system-requirements.html">
     Magento System Requirements</a>.
 </div>
 HTML;
diff --git a/app/code/Magento/Catalog/view/base/web/template/product/link.html b/app/code/Magento/Catalog/view/base/web/template/product/link.html
@@ -4,6 +4,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<a class="product-item-link"
+<a if="isAllowed()"
+   class="product-item-link"
    attr="href: $row().url"
    text="label"/>
diff --git a/app/code/Magento/Paypal/Model/Express.php b/app/code/Magento/Paypal/Model/Express.php
@@ -669,14 +669,19 @@ public function getApi()
     public function assignData(\Magento\Framework\DataObject $data)
     {
         parent::assignData($data);
-        
+
         $additionalData = $data->getData(PaymentInterface::KEY_ADDITIONAL_DATA);
 
         if (!is_array($additionalData)) {
             return $this;
         }
 
         foreach ($additionalData as $key => $value) {
+            // Skip extension attributes
+            if ($key === \Magento\Framework\Api\ExtensibleDataInterface::EXTENSION_ATTRIBUTES_KEY) {
+                continue;
+            }
+
             $this->getInfoInstance()->setAdditionalInformation($key, $value);
         }
         return $this;
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/ExpressTest.php b/app/code/Magento/Paypal/Test/Unit/Model/ExpressTest.php
@@ -161,12 +161,21 @@ public function testAssignData()
     {
         $transportValue = 'something';
 
+        $extensionAttribute = $this->getMockForAbstractClass(
+            \Magento\Quote\Api\Data\PaymentExtensionInterface::class,
+            [],
+            '',
+            false,
+            false
+        );
+
         $data = new DataObject(
             [
                 PaymentInterface::KEY_ADDITIONAL_DATA => [
                     Express\Checkout::PAYMENT_INFO_TRANSPORT_BILLING_AGREEMENT => $transportValue,
                     Express\Checkout::PAYMENT_INFO_TRANSPORT_PAYER_ID => $transportValue,
-                    Express\Checkout::PAYMENT_INFO_TRANSPORT_TOKEN => $transportValue
+                    Express\Checkout::PAYMENT_INFO_TRANSPORT_TOKEN => $transportValue,
+                    \Magento\Framework\Api\ExtensibleDataInterface::EXTENSION_ATTRIBUTES_KEY => $extensionAttribute
                 ]
             ]
         );
diff --git a/app/code/Magento/Paypal/view/frontend/web/js/action/set-payment-method.js b/app/code/Magento/Paypal/view/frontend/web/js/action/set-payment-method.js
@@ -4,48 +4,12 @@
  */
 
 define([
-    'jquery',
     '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/model/full-screen-loader'
-], function ($, quote, urlBuilder, storage, errorProcessor, customer, fullScreenLoader) {
+    'Magento_Checkout/js/action/set-payment-information'
+], function (quote, setPaymentInformation) {
     'use strict';
 
     return function (messageContainer) {
-        var serviceUrl,
-            payload,
-            paymentData = quote.paymentMethod();
-
-        /**
-         * 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
-            };
-        } else {
-            serviceUrl = urlBuilder.createUrl('/carts/mine/set-payment-information', {});
-            payload = {
-                cartId: quote.getQuoteId(),
-                paymentMethod: paymentData
-            };
-        }
-        fullScreenLoader.startLoader();
-
-        return storage.post(
-            serviceUrl, JSON.stringify(payload)
-        ).fail(function (response) {
-            errorProcessor.process(response, messageContainer);
-        }).always(function () {
-            fullScreenLoader.stopLoader();
-        });
+        return setPaymentInformation(messageContainer, quote.paymentMethod());
     };
 });
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Save.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Save.php
@@ -191,14 +191,7 @@ public function execute()
             }
             $transactionSave->save();
 
-            if (isset($shippingResponse) && $shippingResponse->hasErrors()) {
-                $this->messageManager->addError(
-                    __(
-                        'The invoice and the shipment  have been created. ' .
-                        'The shipping label cannot be created now.'
-                    )
-                );
-            } elseif (!empty($data['do_shipment'])) {
+            if (!empty($data['do_shipment'])) {
                 $this->messageManager->addSuccess(__('You created the invoice and shipment.'));
             } else {
                 $this->messageManager->addSuccess(__('The invoice has been created.'));
diff --git a/app/code/Magento/Sales/i18n/en_US.csv b/app/code/Magento/Sales/i18n/en_US.csv
@@ -233,7 +233,6 @@ Sales,Sales
 "You can't create an invoice without products.","You can't create an invoice without products."
 "New Invoice","New Invoice"
 "We can't save the invoice right now.","We can't save the invoice right now."
-"The invoice and the shipment  have been created. The shipping label cannot be created now.","The invoice and the shipment  have been created. The shipping label cannot be created now."
 "You created the invoice and shipment.","You created the invoice and shipment."
 "The invoice has been created.","The invoice has been created."
 "We can't send the invoice email right now.","We can't send the invoice email right now."
diff --git a/app/code/Magento/Ui/Controller/Adminhtml/Index/Render.php b/app/code/Magento/Ui/Controller/Adminhtml/Index/Render.php
@@ -88,7 +88,7 @@ public function execute()
         } catch (\Exception $e) {
             $this->logger->critical($e);
             $result = [
-                'error' => _('UI component could not be rendered because of system exception'),
+                'error' => __('UI component could not be rendered because of system exception'),
                 'errorcode' => $this->escaper->escapeHtml($e->getCode())
             ];
             /** @var \Magento\Framework\Controller\Result\Json $resultJson */
diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/actions-bar/_store-switcher.less b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/actions-bar/_store-switcher.less
@@ -42,6 +42,14 @@
         max-height: 250px;
         overflow-y: auto;
         padding-top: .25em;
+        &::-webkit-scrollbar {
+            -webkit-appearance: none;
+            width: 7px;
+        }
+        &::-webkit-scrollbar-thumb {
+            border-radius: 4px;
+            background-color: rgba(0, 0, 0, .5);
+        }
 
         li {
             border: 0;
diff --git a/composer.json b/composer.json
@@ -59,6 +59,7 @@
         "ext-dom": "*",
         "ext-simplexml": "*",
         "ext-mcrypt": "*",
+        "ext-bcmath": "*",
         "ext-hash": "*",
         "ext-curl": "*",
         "ext-iconv": "*",
diff --git a/composer.lock b/composer.lock
diff --git a/dev/tests/integration/etc/di/preferences/ce.php b/dev/tests/integration/etc/di/preferences/ce.php
@@ -16,6 +16,8 @@
     \Magento\Framework\App\Response\Http::class => \Magento\TestFramework\Response::class,
     \Magento\Framework\Interception\PluginListInterface::class =>
         \Magento\TestFramework\Interception\PluginList::class,
+    \Magento\Framework\Interception\ObjectManager\ConfigInterface::class =>
+        \Magento\TestFramework\ObjectManager\Config::class,
     \Magento\Framework\Interception\ObjectManager\Config\Developer::class =>
         \Magento\TestFramework\ObjectManager\Config::class,
     \Magento\Framework\View\LayoutInterface::class => \Magento\TestFramework\View\Layout::class,
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/CheckoutAgreements/frontend/js/model/place-order-mixin.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/CheckoutAgreements/frontend/js/model/place-order-mixin.test.js
@@ -0,0 +1,55 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'squire'
+], function (Squire) {
+    'use strict';
+
+    var injector = new Squire(),
+        mocks = {
+            'Magento_Checkout/js/action/place-order': jasmine.createSpy('placeOrderAction'),
+            'Magento_CheckoutAgreements/js/model/agreements-assigner': jasmine.createSpy('agreementsAssigner')
+        },
+        defaultContext = require.s.contexts._,
+        mixin,
+        placeOrderAction;
+
+    beforeEach(function (done) {
+        window.checkoutConfig = {
+            checkoutAgreements: {
+                isEnabled: true
+            }
+        };
+        injector.mock(mocks);
+        injector.require([
+            'Magento_CheckoutAgreements/js/model/place-order-mixin',
+            'Magento_Checkout/js/action/place-order'
+        ], function (Mixin, placeOrder) {
+            mixin = Mixin;
+            placeOrderAction = placeOrder;
+            done();
+        });
+    });
+
+    describe('Magento_CheckoutAgreements/js/model/place-order-mixin', function () {
+        it('mixin is applied to Magento_Checkout/js/action/place-order', function () {
+            var placeOrderMixins = defaultContext.config.config.mixins['Magento_Checkout/js/action/place-order'];
+
+            expect(placeOrderMixins['Magento_CheckoutAgreements/js/model/place-order-mixin']).toBe(true);
+        });
+
+        it('Magento_CheckoutAgreements/js/model/agreements-assigner is called', function () {
+            var messageContainer = jasmine.createSpy('messageContainer'),
+                paymentData = {};
+
+            mixin(placeOrderAction)(paymentData, messageContainer);
+            expect(mocks['Magento_CheckoutAgreements/js/model/agreements-assigner'])
+                .toHaveBeenCalledWith(paymentData);
+            expect(mocks['Magento_Checkout/js/action/place-order'])
+                .toHaveBeenCalledWith(paymentData, messageContainer);
+        });
+    });
+});
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/CheckoutAgreements/frontend/js/model/set-payment-information-mixin.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/CheckoutAgreements/frontend/js/model/set-payment-information-mixin.test.js
@@ -0,0 +1,56 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'squire'
+], function (Squire) {
+    'use strict';
+
+    var injector = new Squire(),
+        mocks = {
+            'Magento_Checkout/js/action/set-payment-information': jasmine.createSpy('placeOrderAction'),
+            'Magento_CheckoutAgreements/js/model/agreements-assigner': jasmine.createSpy('agreementsAssigner')
+        },
+        defaultContext = require.s.contexts._,
+        mixin,
+        placeOrderAction;
+
+    beforeEach(function (done) {
+        window.checkoutConfig = {
+            checkoutAgreements: {
+                isEnabled: true
+            }
+        };
+        injector.mock(mocks);
+        injector.require([
+            'Magento_CheckoutAgreements/js/model/set-payment-information-mixin',
+            'Magento_Checkout/js/action/set-payment-information'
+        ], function (Mixin, setPaymentInformation) {
+            mixin = Mixin;
+            placeOrderAction = setPaymentInformation;
+            done();
+        });
+    });
+
+    describe('Magento_CheckoutAgreements/js/model/set-payment-information-mixin', function () {
+        it('mixin is applied to Magento_Checkout/js/action/set-payment-information', function () {
+            var placeOrderMixins = defaultContext
+                .config.config.mixins['Magento_Checkout/js/action/set-payment-information'];
+
+            expect(placeOrderMixins['Magento_CheckoutAgreements/js/model/set-payment-information-mixin']).toBe(true);
+        });
+
+        it('Magento_CheckoutAgreements/js/model/agreements-assigner is called', function () {
+            var messageContainer = jasmine.createSpy('messageContainer'),
+                paymentData = {};
+
+            mixin(placeOrderAction)(messageContainer, paymentData);
+            expect(mocks['Magento_CheckoutAgreements/js/model/agreements-assigner'])
+                .toHaveBeenCalledWith(paymentData);
+            expect(mocks['Magento_Checkout/js/action/set-payment-information'])
+                .toHaveBeenCalledWith(messageContainer, paymentData);
+        });
+    });
+});
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Paypal/frontend/js/view/payment/method-renderer/paypal-express-abstract.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Paypal/frontend/js/view/payment/method-renderer/paypal-express-abstract.test.js
@@ -16,13 +16,24 @@ define([
 
     describe('paypal/js/view/payment/method-renderer/paypal-express-abstract', function () {
         var injector = new Squire(),
+            successPromise = jasmine.createSpyObj('successPromise', ['done']),
+            setPaymentMock = jasmine.createSpy('set-payment-information', function () {
+                return successPromise;
+            }).and.callThrough(),
+            validateMock = jasmine.createSpy('validate', function () {
+                return true;
+            }).and.callThrough(),
             mocks = {
                 'Magento_Checkout/js/model/quote': {
                     billingAddress: ko.observable(),
                     shippingAddress: ko.observable(),
                     paymentMethod: ko.observable(),
                     totals: ko.observable({})
 
+                },
+                'Magento_Checkout/js/action/set-payment-information': setPaymentMock,
+                'Magento_Checkout/js/model/payment/additional-validators': {
+                    validate: validateMock
                 }
             },
             paypalExpressAbstract,
@@ -85,6 +96,23 @@ define([
             }, 500);
         });
 
+        it('setPaymentMethodAction is called before redirect to paypal', function () {
+            spyOn(paypalExpressAbstract, 'selectPaymentMethod');
+            paypalExpressAbstract.continueToPayPal();
+            expect(paypalExpressAbstract.selectPaymentMethod).toHaveBeenCalled();
+            expect(validateMock).toHaveBeenCalled();
+            expect(validateMock.calls.mostRecent()).toEqual(jasmine.objectContaining({
+                object: mocks['Magento_Checkout/js/model/payment/additional-validators'],
+                args: [],
+                returnValue: true
+            }));
+            expect(setPaymentMock).toHaveBeenCalled();
+            expect(setPaymentMock.calls.mostRecent()).toEqual(jasmine.objectContaining({
+                returnValue: successPromise
+            }));
+            expect(successPromise.done).toHaveBeenCalledWith(jasmine.any(Function));
+        });
+
         afterAll(function (done) {
             tplElement.remove();
             done();
diff --git a/lib/internal/Magento/Framework/composer.json b/lib/internal/Magento/Framework/composer.json
@@ -20,6 +20,7 @@
         "ext-openssl": "*",
         "lib-libxml": "*",
         "ext-xsl": "*",
+        "ext-bcmath": "*",
         "symfony/process": "~2.1",
         "colinmollenhour/php-redis-session-abstract": "1.3.4",
         "composer/composer": "1.4.1",
diff --git a/setup/view/magento/setup/readiness-check/progress.phtml b/setup/view/magento/setup/readiness-check/progress.phtml

Original file line number	Diff line number	Diff line change
`@@ -669,14 +669,19 @@ public function getApi()`
`669`	`669`	`public function assignData(\Magento\Framework\DataObject $data)`
`670`	`670`	`{`
`671`	`671`	`parent::assignData($data);`
`672`		`-`
	`672`	`+`
`673`	`673`	`$additionalData = $data->getData(PaymentInterface::KEY_ADDITIONAL_DATA);`
`674`	`674`
`675`	`675`	`if (!is_array($additionalData)) {`
`676`	`676`	`return $this;`
`677`	`677`	`}`
`678`	`678`
`679`	`679`	`foreach ($additionalData as $key => $value) {`
	`680`	`+ // Skip extension attributes`
	`681`	`+ if ($key === \Magento\Framework\Api\ExtensibleDataInterface::EXTENSION_ATTRIBUTES_KEY) {`
	`682`	`+ continue;`
	`683`	`+ }`
	`684`	`+`
`680`	`685`	`$this->getInfoInstance()->setAdditionalInformation($key, $value);`
`681`	`686`	`}`
`682`	`687`	`return $this;`
Original file line number	Diff line number	Diff line change
`@@ -161,12 +161,21 @@ public function testAssignData()`
`161`	`161`	`{`
`162`	`162`	`$transportValue = 'something';`
`163`	`163`
	`164`	`+ $extensionAttribute = $this->getMockForAbstractClass(`
	`165`	`+ \Magento\Quote\Api\Data\PaymentExtensionInterface::class,`
	`166`	`+ [],`
	`167`	`+ '',`
	`168`	`+ false,`
	`169`	`+ false`
	`170`	`+ );`
	`171`	`+`
`164`	`172`	`$data = new DataObject(`
`165`	`173`	`[`
`166`	`174`	`PaymentInterface::KEY_ADDITIONAL_DATA => [`
`167`	`175`	`Express\Checkout::PAYMENT_INFO_TRANSPORT_BILLING_AGREEMENT => $transportValue,`
`168`	`176`	`Express\Checkout::PAYMENT_INFO_TRANSPORT_PAYER_ID => $transportValue,`
`169`		`- Express\Checkout::PAYMENT_INFO_TRANSPORT_TOKEN => $transportValue`
	`177`	`+ Express\Checkout::PAYMENT_INFO_TRANSPORT_TOKEN => $transportValue,`
	`178`	`+ \Magento\Framework\Api\ExtensibleDataInterface::EXTENSION_ATTRIBUTES_KEY => $extensionAttribute`
`170`	`179`	`]`
`171`	`180`	`]`
`172`	`181`	`);`