Merge remote-tracking branch 'origin/merchant_beta' into SUPEE-7227

Sergey Nosov · Sergey Nosov · commit 0897100174b2 · 2015-11-02T11:29:22.000+02:00
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product.php b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
@@ -1958,12 +1958,14 @@ protected function _saveStockItem()
                 } else {
                     $row['qty'] = 0;
                 }
-                $stockData[] = $row;
+                if (!isset($stockData[$rowData[self::COL_SKU]])) {
+                    $stockData[$rowData[self::COL_SKU]] = $row;
+                }
             }
 
             // Insert rows
             if (!empty($stockData)) {
-                $this->_connection->insertOnDuplicate($entityTable, $stockData);
+                $this->_connection->insertOnDuplicate($entityTable, array_values($stockData));
             }
 
             if ($productIdsToReindex) {
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Uploader.php b/app/code/Magento/CatalogImportExport/Model/Import/Uploader.php
@@ -155,7 +155,7 @@ public function move($fileName, $renameFileOff = false)
 
         $filePath = $this->_directory->getRelativePath($this->getTmpDir() . '/' . $fileName);
         $this->_setUploadFile($filePath);
-        $result = $this->save($this->getDestDir());
+        $result = $this->save($this->_directory->getAbsolutePath($this->getDestDir()));
         $result['name'] = self::getCorrectFileName($result['name']);
         return $result;
     }
diff --git a/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/UploaderTest.php b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/UploaderTest.php
@@ -71,7 +71,7 @@ protected function setUp()
             ->getMock();
 
         $this->directoryMock = $this->getMockBuilder('\Magento\Framework\Filesystem\Directory\Writer')
-            ->setMethods(['writeFile', 'getRelativePath'])
+            ->setMethods(['writeFile', 'getRelativePath', 'getAbsolutePath'])
             ->disableOriginalConstructor()
             ->getMock();
 
diff --git a/app/code/Magento/Msrp/view/frontend/layout/checkout_cart_sidebar_total_renderers.xml b/app/code/Magento/Msrp/view/frontend/layout/checkout_cart_sidebar_total_renderers.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
+    <body>
+        <referenceBlock name="minicart">
+            <arguments>
+                <argument name="jsLayout" xsi:type="array">
+                    <item name="components" xsi:type="array">
+                        <item name="minicart_content" xsi:type="array">
+                            <item name="children" xsi:type="array">
+                                <item name="subtotal.container" xsi:type="array">
+                                    <item name="children" xsi:type="array">
+                                        <item name="subtotal" xsi:type="array">
+                                            <item name="children" xsi:type="array">
+                                                <item name="subtotal.totals" xsi:type="array">
+                                                    <item name="children" xsi:type="array">
+                                                        <item name="subtotal.totals.msrp" xsi:type="array">
+                                                            <item name="component" xsi:type="string">Magento_Msrp/js/view/checkout/minicart/subtotal/totals</item>
+                                                            <item name="config" xsi:type="array">
+                                                                <item name="displayArea" xsi:type="string">minicart-subtotal-hidden</item>
+                                                                <item name="template" xsi:type="string">Magento_Msrp/checkout/minicart/subtotal/totals</item>
+                                                            </item>
+                                                        </item>
+                                                    </item>
+                                                </item>
+                                            </item>
+                                        </item>
+                                    </item>
+                                </item>
+                            </item>
+                        </item>
+                    </item>
+                </argument>
+            </arguments>
+        </referenceBlock>
+    </body>
+</page>
diff --git a/app/code/Magento/Msrp/view/frontend/layout/default.xml b/app/code/Magento/Msrp/view/frontend/layout/default.xml
diff --git a/app/code/Magento/Msrp/view/frontend/web/js/view/checkout/minicart/subtotal/totals.js b/app/code/Magento/Msrp/view/frontend/web/js/view/checkout/minicart/subtotal/totals.js
@@ -0,0 +1,40 @@
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+define([
+    'Magento_Tax/js/view/checkout/minicart/subtotal/totals',
+    'underscore'
+], function (Component, _) {
+    'use strict';
+
+    return Component.extend({
+
+        /**
+         * @override
+         */
+        initialize: function () {
+            this._super();
+            this.displaySubtotal(this.isMsrpApplied(this.cart().items));
+            this.cart.subscribe(function (updatedCart) {
+
+                this.displaySubtotal(this.isMsrpApplied(updatedCart.items));
+            }, this);
+        },
+
+        /**
+         * Determine if subtotal should be hidden.
+         * @param {Array} cartItems
+         * @return {Boolean}
+         */
+        isMsrpApplied: function (cartItems) {
+            return !_.find(cartItems, function (item) {
+                if (_.has(item, 'canApplyMsrp')) {
+                    return item.canApplyMsrp;
+                }
+
+                return false;
+            });
+        }
+    });
+});
diff --git a/app/code/Magento/Msrp/view/frontend/web/template/checkout/minicart/subtotal/totals.html b/app/code/Magento/Msrp/view/frontend/web/template/checkout/minicart/subtotal/totals.html
@@ -0,0 +1,7 @@
+<!--
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<span class="mark msrp" data-bind="text: $t('Order total will be displayed before you submit the order')"></span>
diff --git a/app/code/Magento/Tax/view/frontend/web/js/view/checkout/minicart/subtotal/totals.js b/app/code/Magento/Tax/view/frontend/web/js/view/checkout/minicart/subtotal/totals.js
@@ -3,12 +3,18 @@
  * See COPYING.txt for license details.
  */
 define([
+    'ko',
     'uiComponent',
     'Magento_Customer/js/customer-data'
-], function (Component, customerData) {
+], function (ko, Component, customerData) {
     'use strict';
 
     return Component.extend({
+        displaySubtotal: ko.observable(true),
+
+        /**
+         * @override
+         */
         initialize: function () {
             this._super();
             this.cart = customerData.get('cart');
diff --git a/app/code/Magento/Tax/view/frontend/web/template/checkout/minicart/subtotal/totals.html b/app/code/Magento/Tax/view/frontend/web/template/checkout/minicart/subtotal/totals.html
@@ -6,21 +6,28 @@
 -->
 
 <div class="amount price-container">
-    <!-- ko if: display_cart_subtotal_excl_tax -->
-        <span class="price-wrapper" data-bind="html: cart().subtotal_excl_tax"></span>
-    <!-- /ko -->
+    <!-- ko if: displaySubtotal() -->
+        <!-- ko if: display_cart_subtotal_excl_tax -->
+            <span class="price-wrapper" data-bind="html: cart().subtotal_excl_tax"></span>
+        <!-- /ko -->
 
-    <!-- ko if: !display_cart_subtotal_excl_tax && display_subtotal_incl_tax -->
-        <span class="price-wrapper" data-bind="html: cart().subtotal_incl_tax"></span>
-    <!-- /ko -->
+        <!-- ko if: !display_cart_subtotal_excl_tax && display_subtotal_incl_tax -->
+            <span class="price-wrapper" data-bind="html: cart().subtotal_incl_tax"></span>
+        <!-- /ko -->
 
-    <!-- ko if: !display_cart_subtotal_excl_tax && !display_subtotal_incl_tax -->
-        <span class="price-wrapper price-including-tax"
-              data-bind="attr: { 'data-label': $t('Incl. Tax') }, html: cart().subtotal_incl_tax">
-        </span>
+        <!-- ko if: !display_cart_subtotal_excl_tax && !display_subtotal_incl_tax -->
+            <span class="price-wrapper price-including-tax"
+                  data-bind="attr: { 'data-label': $t('Incl. Tax') }, html: cart().subtotal_incl_tax">
+            </span>
 
-        <span class="price-wrapper price-excluding-tax"
-              data-bind="attr: { 'data-label': $t('Excl. Tax') }, html: cart().subtotal_excl_tax">
-        </span>
+            <span class="price-wrapper price-excluding-tax"
+                  data-bind="attr: { 'data-label': $t('Excl. Tax') }, html: cart().subtotal_excl_tax">
+            </span>
+        <!-- /ko -->
+    <!-- /ko -->
+    <!-- ko ifnot: displaySubtotal() -->
+        <!-- ko foreach: getRegion('minicart-subtotal-hidden') -->
+            <!-- ko template: getTemplate() --><!-- /ko -->
+        <!-- /ko -->
     <!-- /ko -->
 </div>
diff --git a/app/code/Magento/Theme/view/base/requirejs-config.js b/app/code/Magento/Theme/view/base/requirejs-config.js
@@ -41,7 +41,7 @@ var config = {
         "jquery/jquery.hashchange": "jquery/jquery.ba-hashchange.min",
         "prototype": "legacy-build.min",
         "jquery/jquery-storageapi": "jquery/jquery.storageapi.min",
-        "text": "requirejs/text",
+        "text": "mage/requirejs/text",
         "domReady": "requirejs/domReady",
         "ko": "ko/ko",
         "tinymce": "tiny_mce/tiny_mce_src"
diff --git a/lib/web/mage/requirejs/static.js b/lib/web/mage/requirejs/static.js
@@ -281,7 +281,7 @@ define('jsbuild', [
 define('text', [
     'module',
     'buildTools',
-    'requirejs/text'
+    'mage/requirejs/text'
 ], function (module, tools, text) {
     'use strict';
 
diff --git a/lib/web/mage/requirejs/text.js b/lib/web/mage/requirejs/text.js
@@ -0,0 +1,157 @@
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+/* inspired by http://github.com/requirejs/text */
+/*global XMLHttpRequest, XDomainRequest */
+
+define(['module'], function (module) {
+    'use strict';
+
+    var xmlRegExp = /^\s*<\?xml(\s)+version=[\'\"](\d)*.(\d)*[\'\"](\s)*\?>/im,
+        bodyRegExp = /<body[^>]*>\s*([\s\S]+)\s*<\/body>/im,
+        stripReg = /!strip$/i,
+        defaultConfig = module.config && module.config() || {};
+
+    /**
+     * Strips <?xml ...?> declarations so that external SVG and XML documents can be
+     * added to a document without worry.
+     * Also, if the string is an HTML document, only the part inside the body tag is returned.
+     *
+     * @param {String} external
+     * @returns {String}
+     */
+    function stripContent(external) {
+        var matches;
+
+        if (!external) {
+            return '';
+        }
+
+        matches = external.match(bodyRegExp);
+        external = matches ?
+            matches[1] :
+            external.replace(xmlRegExp, '');
+
+        return external;
+    }
+
+    /**
+     * Checks that url match current location
+     *
+     * @param {String} url
+     * @returns {Boolean}
+     */
+    function sameDomain(url) {
+        var uProtocol, uHostName, uPort,
+            xdRegExp = /^([\w:]+)?\/\/([^\/\\]+)/i,
+            location = window.location,
+            match = xdRegExp.exec(url);
+
+        if (!match) {
+            return true;
+        }
+        uProtocol = match[1];
+        uHostName = match[2];
+
+        uHostName = uHostName.split(':');
+        uPort = uHostName[1] || '';
+        uHostName = uHostName[0];
+
+        return (!uProtocol || uProtocol === location.protocol) &&
+            (!uHostName || uHostName.toLowerCase() === location.hostname.toLowerCase()) &&
+            (!uPort && !uHostName || uPort === location.port);
+    }
+
+    /**
+     * @returns {XMLHttpRequest|XDomainRequest|null}
+     */
+    function createRequest(url) {
+        var xhr = new XMLHttpRequest();
+
+        if (!sameDomain(url) && typeof XDomainRequest !== 'undefined') {
+            xhr = new XDomainRequest();
+        }
+
+        return xhr;
+    }
+
+    /**
+     * XHR requester. Returns value to callback.
+     *
+     * @param {String} url
+     * @param {Function} callback
+     * @param {Function} fail
+     * @param {Object} headers
+     */
+    function getContent(url, callback, fail, headers) {
+        var xhr = createRequest(url),
+            header,
+            errorHandler = fail || Function();
+
+        /*eslint-disable max-depth */
+        if ('setRequestHeader' in xhr && headers) {
+            for (header in headers) {
+                if (headers.hasOwnProperty(header)) {
+                    xhr.setRequestHeader(header.toLowerCase(), headers[header]);
+                }
+            }
+        }
+
+        /*eslint-enable max-depth */
+
+        if (defaultConfig.onXhr) {
+            defaultConfig.onXhr(xhr, url);
+        }
+
+        /**
+         * onload handler
+         */
+        xhr.onload = function () {
+
+            callback(xhr.responseText);
+
+            if (defaultConfig.onXhrComplete) {
+                defaultConfig.onXhrComplete(xhr, url);
+            }
+        };
+
+        /**
+         * onerror handler
+         */
+        xhr.onerror = function (event) {
+            errorHandler(event);
+
+            if (defaultConfig.onXhrFailure) {
+                defaultConfig.onXhrFailure(xhr, url, event);
+            }
+        };
+
+        xhr.open('GET', url);
+        xhr.send();
+    }
+
+    /**
+     * Main method used by RequireJs.
+     *
+     * @param {String} name - has format: some.module.filext!strip
+     * @param {Function} req
+     * @param {Function|undefined} onLoad
+     */
+    function loadContent(name, req, onLoad) {
+
+        var toStrip = stripReg.test(name),
+            url = req.toUrl(name.replace(stripReg, '')),
+            headers = defaultConfig.headers;
+
+        getContent(url, function (content) {
+                content = toStrip ? stripContent(content) : content;
+                onLoad(content);
+            }, onLoad.error, headers);
+    }
+
+    return {
+        load: loadContent,
+        get: getContent
+    };
+});

Original file line number	Diff line number	Diff line change
`@@ -1958,12 +1958,14 @@ protected function _saveStockItem()`
`1958`	`1958`	`} else {`
`1959`	`1959`	`$row['qty'] = 0;`
`1960`	`1960`	`}`
`1961`		`- $stockData[] = $row;`
	`1961`	`+ if (!isset($stockData[$rowData[self::COL_SKU]])) {`
	`1962`	`+ $stockData[$rowData[self::COL_SKU]] = $row;`
	`1963`	`+ }`
`1962`	`1964`	`}`
`1963`	`1965`
`1964`	`1966`	`// Insert rows`
`1965`	`1967`	`if (!empty($stockData)) {`
`1966`		`- $this->_connection->insertOnDuplicate($entityTable, $stockData);`
	`1968`	`+ $this->_connection->insertOnDuplicate($entityTable, array_values($stockData));`
`1967`	`1969`	`}`
`1968`	`1970`
`1969`	`1971`	`if ($productIdsToReindex) {`
Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ public function move($fileName, $renameFileOff = false)`
`155`	`155`
`156`	`156`	`$filePath = $this->_directory->getRelativePath($this->getTmpDir() . '/' . $fileName);`
`157`	`157`	`$this->_setUploadFile($filePath);`
`158`		`- $result = $this->save($this->getDestDir());`
	`158`	`+ $result = $this->save($this->_directory->getAbsolutePath($this->getDestDir()));`
`159`	`159`	`$result['name'] = self::getCorrectFileName($result['name']);`
`160`	`160`	`return $result;`
`161`	`161`	`}`