Merge pull request magento#1024 from magento-folks/develop

Olexii Korshenko · Olexii Korshenko · commit 0ea6083f66f0 · 2014-12-16T18:00:46.000+02:00
Bug Fixes: Firedrakes, Vanilla, UI
diff --git a/app/code/Magento/Captcha/view/frontend/templates/default.phtml b/app/code/Magento/Captcha/view/frontend/templates/default.phtml
@@ -15,6 +15,7 @@
                  data-captcha="<?php echo $this->getFormId()?>"
                  id="captcha-container-<?php echo $this->getFormId()?>"
                  data-mage-init='{"captcha":{"url": "<?php echo $this->getRefreshUrl()?>",
+                                            "imageLoader": "<?php echo $this->getViewFileUrl('images/loader-2.gif') ?>",
                                              "type": "<?php echo $this->getFormId() ?>"}}'>
                 <div class="control captcha-image">
                     <img alt="<?php echo __('Please type the letters below')?>" class="captcha-img" height="<?php echo $this->getImgHeight() ?>" src="<?php echo $captcha->getImgSrc() ?>"/>
diff --git a/app/code/Magento/Captcha/view/frontend/web/captcha.js b/app/code/Magento/Captcha/view/frontend/web/captcha.js
@@ -12,7 +12,8 @@ define([
         options: {
             refreshClass: 'refreshing',
             reloadSelector: '.captcha-reload',
-            imageSelector: '.captcha-img'
+            imageSelector: '.captcha-img',
+            imageLoader: ''
         },
 
         /**
@@ -28,8 +29,13 @@ define([
          * @param e - Event
          */
         refresh: function(e) {
-            var reloadImage = $(e.currentTarget);
-            reloadImage.addClass(this.options.refreshClass);
+            var imageLoader = this.options.imageLoader;
+
+            if (imageLoader) {
+                this.element.find(this.options.imageSelector).attr('src', imageLoader);
+            }
+            this.element.addClass(this.options.refreshClass);
+
             $.ajax({
                 url: this.options.url,
                 type: 'post',
@@ -45,7 +51,7 @@ define([
                     }
                 },
                 complete: function() {
-                    reloadImage.removeClass(this.options.refreshClass);
+                    this.element.removeClass(this.options.refreshClass);
                 }
             });
         }
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit.phtml
@@ -56,10 +56,11 @@
 <script type="text/javascript">
 require([
     "jquery",
+    "underscore",
     "mage/mage",
     "Magento_Catalog/catalog/type-switcher",
     "mage/backend/tabs",
-    "underscore"
+    "domReady"
 ], function($){
     var $form = $('[data-form=edit-product]');
     $form.data('typeSwitcher', new TypeSwitcher(<?php echo $this->getTypeSwitcherData();?>).bindAll());
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/opc-checkout-method.js b/app/code/Magento/Checkout/view/frontend/web/js/opc-checkout-method.js
@@ -218,9 +218,7 @@ define([
                     }
                     if ($.type(response) === 'object' && !$.isEmptyObject(response)) {
                         if (response.error) {
-                            var msg = response.message || response.error_messages || response.error,
-                                billingEmailId,
-                                hasBillingEmail;
+                            var msg = response.message || response.error_messages || response.error;
 
                             if (msg) {
                                 if (Array.isArray(msg)) {
@@ -234,17 +232,6 @@ define([
 
                                 $(this.options.countrySelector).trigger('change');
 
-                                billingEmailId = this.options.billing.emailAddressName;
-                                hasBillingEmail = $('[name="' + billingEmailId + '"]').length;
-
-                                if (hasBillingEmail) {
-                                    var emailAddress = {};
-                                    emailAddress[billingEmailId] = msg;
-
-                                    var billingFormValidator = $(this.options.billing.form).validate();
-                                    billingFormValidator.showErrors(emailAddress);
-                                }
-
                                 alert(msg);
                             }
 
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/config.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/config.phtml
@@ -14,7 +14,7 @@ use \Magento\ConfigurableProduct\Model\Product\Type\Configurable;
             </strong>
         </div>
 
-        <div class="fieldset-wrapper-content collapse" id="<?php echo $this->getId() ?>-content">
+        <div class="fieldset-wrapper-content collapse" data-collapsed="true" id="<?php echo $this->getId() ?>-content">
             <fieldset class="fieldset">
                 <div class="field" id="variations-search-field">
                     <label class="label" for="configurable-attribute-selector"><span>Search</span></label>
@@ -81,7 +81,6 @@ require([
 
             attributesInput.prop('disabled', false);
 
-            stockAvailabilityField.val(1);
             inventoryQty.prop('disabled', true);
             inventoryAvailabilityField.removeProp('disabled');
             disableElement(qtyField);
diff --git a/app/code/Magento/Core/Model/Theme.php b/app/code/Magento/Core/Model/Theme.php
@@ -5,6 +5,7 @@
 namespace Magento\Core\Model;
 
 use Magento\Framework\View\Design\ThemeInterface;
+use Magento\Framework\App\Filesystem\DirectoryList;
 
 /**
  * Theme model class
@@ -117,7 +118,6 @@ public function __construct(
         $this->_imageFactory = $imageFactory;
         $this->_validator = $validator;
         $this->_customFactory = $customizationFactory;
-
         $this->addData(['type' => self::TYPE_VIRTUAL]);
     }
 
diff --git a/app/code/Magento/Core/Model/Theme/Image/Path.php b/app/code/Magento/Core/Model/Theme/Image/Path.php
@@ -60,12 +60,7 @@ public function __construct(
      */
     public function getPreviewImageUrl(ThemeInterface $theme)
     {
-        return $theme->isPhysical()
-            ? $this->assetRepo->getUrlWithParams(
-                $theme->getPreviewImage(),
-                ['area' => $theme->getData('area'), 'themeModel' => $theme]
-            )
-            : $this->storeManager->getStore()->getBaseUrl(\Magento\Framework\UrlInterface::URL_TYPE_MEDIA)
+        return $this->storeManager->getStore()->getBaseUrl(\Magento\Framework\UrlInterface::URL_TYPE_MEDIA)
                 . self::PREVIEW_DIRECTORY_PATH . '/' . $theme->getPreviewImage();
     }
 
@@ -77,13 +72,7 @@ public function getPreviewImageUrl(ThemeInterface $theme)
      */
     public function getPreviewImagePath(ThemeInterface $theme)
     {
-        return $theme->isPhysical()
-            ? $this->assetRepo->createAsset(
-                $theme->getPreviewImage(),
-                ['area' => $theme->getData('area'), 'themeModel' => $theme]
-            )
-            ->getSourceFile()
-            : $this->mediaDirectory->getAbsolutePath(self::PREVIEW_DIRECTORY_PATH . '/' . $theme->getPreviewImage());
+        return $this->mediaDirectory->getAbsolutePath(self::PREVIEW_DIRECTORY_PATH . '/' . $theme->getPreviewImage());
     }
 
     /**
diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/popup.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/popup.phtml
@@ -105,7 +105,7 @@ require([
                             $customsValueValidation = '';
                         }
                         ?>
-                        <td <?php echo $customsValueDisplay ?>>
+                        <td class="col-custom" <?php echo $customsValueDisplay ?>>
                             <input type="text" class="customs-value input-text <?php echo $customsValueValidation ?>" name="package_customs_value" />
                             <span class="customs-value-currency">[<?php echo $this->getCustomValueCurrencyCode(); ?>]</span>
                         </td>
diff --git a/app/design/adminhtml/Magento/backend/web/css/pages.less b/app/design/adminhtml/Magento/backend/web/css/pages.less
@@ -1745,7 +1745,8 @@ table.items-to-invoice tbody tr:hover td {
 .packaging-window .col-width,
 .packaging-window .col-height,
 .packaging-window .col-length,
-.packaging-window .data-table .col-total-weight input[type="text"] {
+.packaging-window .data-table .col-total-weight input[type="text"],
+.packaging-window .data-table .col-custom input[type="text"] {
     width: 60px;
 }
 
@@ -1759,7 +1760,8 @@ table.items-to-invoice tbody tr:hover td {
 }
 
 .packaging-window .data-table .col-actions,
-.packaging-window .col-total-weight {
+.packaging-window .col-total-weight,
+.packaging-window .data-table .col-custom {
     white-space: nowrap;
 }
 
diff --git a/app/design/adminhtml/Magento/backend/web/js/theme.js b/app/design/adminhtml/Magento/backend/web/js/theme.js
@@ -364,7 +364,9 @@ define([
         /* @TODO refactor collapsable as widget and avoid logic binding with such a general selectors */
         $('.collapse').collapsable();
         $.each($('.entry-edit'), function(i, entry) {
-            $('.collapse:first', entry).collapse('show');
+            $('.collapse:first', entry).filter(function(){
+                return $(this).data('collapsed') !== true;    
+            }).collapse('show');
         });
 
         // TODO: Move to VDE js widjets
diff --git a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/InvoiceCaptureTest.php b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/InvoiceCaptureTest.php
@@ -15,7 +15,7 @@ class InvoiceCaptureTest extends WebapiAbstract
 {
     const SERVICE_VERSION = 'V1';
 
-    const SERVICE_NAME = 'salesInvoiceServiceV1';
+    const SERVICE_NAME = 'salesInvoiceManagementV1';
 
     /**
      * @magentoApiDataFixture Magento/Sales/_files/invoice.php
diff --git a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/InvoiceVoidTest.php b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/InvoiceVoidTest.php
@@ -15,7 +15,7 @@ class InvoiceVoidTest extends WebapiAbstract
 {
     const SERVICE_VERSION = 'V1';
 
-    const SERVICE_NAME = 'salesInvoiceServiceV1';
+    const SERVICE_NAME = 'salesInvoiceManagementV1';
 
     /**
      * @magentoApiDataFixture Magento/Sales/_files/invoice.php
diff --git a/dev/tests/integration/testsuite/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tab/GeneralTest.php b/dev/tests/integration/testsuite/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tab/GeneralTest.php
@@ -4,6 +4,9 @@
  */
 namespace Magento\Theme\Block\Adminhtml\System\Design\Theme\Edit\Tab;
 
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Store\Model\StoreManager;
+
 /**
  * @magentoAppArea adminhtml
  */
@@ -45,4 +48,16 @@ public function testToHtmlPreviewImageNote()
         $noticeText = $this->_block->getForm()->getElement('preview_image')->getNote();
         $this->assertNotEmpty($noticeText);
     }
+
+    public function testToHtmlPreviewImageUrl()
+    {
+        /** @var $objectManager \Magento\TestFramework\ObjectManager */
+        $this->_theme->setType(\Magento\Framework\View\Design\ThemeInterface::TYPE_PHYSICAL);
+        $this->_theme->setPreviewImage('preview_image_test.jpg');
+        $this->_block->setArea('adminhtml');
+
+        $html = $this->_block->toHtml();
+        preg_match_all('/pub\/static\/adminhtml\/_view\/en_US/', $html, $result);
+        $this->assertEmpty($result[0]);
+    }
 }
diff --git a/dev/tests/js/testsuite/mage/zoom/zoom-test.js b/dev/tests/js/testsuite/mage/zoom/zoom-test.js
@@ -352,19 +352,14 @@ ZoomTest.prototype.testRefreshLargeImage = function() {
     assertEquals(zoomInstance.largeImage.css('left'), css.left + 'px');
 };
 ZoomTest.prototype.testRenderLargeImage = function() {
-    var zoomInstance = this.zoomCreate(),
-        processStartTriggered = false;
+    var zoomInstance = this.zoomCreate();
 
     zoomInstance.element.append(jQuery('<p data-role="test-image" />'));
     zoomInstance.options.selectors.image = '[data-role=test-image]';
-    jQuery(zoomInstance.options.selectors.image).on('processStart', function() {
-        processStartTriggered = true;
-    });
 
     var image = zoomInstance._renderLargeImage();
     assertTrue(image.is('img'));
     assertTrue(image.is(zoomInstance.largeImage));
-    assertTrue(processStartTriggered);
 };
 ZoomTest.prototype.testGetZoomRatio = function() {
     var zoomInstance = this.zoomCreate(),
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Theme/Image/PathTest.php b/dev/tests/unit/testsuite/Magento/Core/Model/Theme/Image/PathTest.php
@@ -9,6 +9,7 @@
 namespace Magento\Core\Model\Theme\Image;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\View\Design\Theme\Image\PathInterface;
 
 class PathTest extends \PHPUnit_Framework_TestCase
 {
@@ -46,11 +47,6 @@ protected function setUp()
         $this->_assetRepo = $this->getMock('Magento\Framework\View\Asset\Repository', [], [], '', false);
         $this->_storeManager = $this->getMock('Magento\Store\Model\StoreManager', [], [], '', false);
 
-        $this->mediaDirectory->expects($this->any())
-            ->method('getAbsolutePath')
-            ->with(\Magento\Framework\View\Design\Theme\Image\PathInterface::PREVIEW_DIRECTORY_PATH)
-            ->will($this->returnValue('/theme/preview'));
-
         $this->mediaDirectory->expects($this->any())
             ->method('getRelativePath')
             ->with('/theme/origin')
@@ -69,34 +65,31 @@ protected function setUp()
         $this->_model = new Path($this->filesystem, $this->_assetRepo, $this->_storeManager);
     }
 
-    public function testGetPreviewImageUrlPhysicalTheme()
-    {
-        $theme = $this->getGetTheme(true);
-
-        $this->_assetRepo->expects($this->any())
-            ->method('getUrlWithParams')
-            ->with($theme->getPreviewImage(), ['area' => $theme->getData('area'), 'themeModel' => $theme])
-            ->will($this->returnValue('http://localhost/theme/preview/image.png'));
-
-        $this->assertEquals('http://localhost/theme/preview/image.png', $this->model->getPreviewImageUrl($theme));
-    }
-
-    public function testGetPreviewImageUrlVirtualTheme()
+    public function testGetPreviewImageUrl()
     {
-        $theme = $this->getGetTheme(false);
+        /** @var $theme \Magento\Core\Model\Theme|\PHPUnit_Framework_MockObject_MockObject */
+        $theme = $this->getMock(
+            'Magento\Core\Model\Theme',
+            ['getPreviewImage', 'isPhysical', '__wakeup'],
+            [],
+            '',
+            false
+        );
+        $theme->expects($this->any())
+            ->method('getPreviewImage')
+            ->will($this->returnValue('image.png'));
 
         $store = $this->getMock('Magento\Store\Model\Store', [], [], '', false);
         $store->expects($this->any())->method('getBaseUrl')->will($this->returnValue('http://localhost/'));
         $this->_storeManager->expects($this->any())->method('getStore')->will($this->returnValue($store));
         $this->assertEquals('http://localhost/theme/preview/image.png', $this->model->getPreviewImageUrl($theme));
     }
 
-    /**
-     * @param bool $isPhysical
-     * @return \Magento\Core\Model\Theme|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected function getGetTheme($isPhysical)
+    public function testGetPreviewImagePath()
     {
+        $previewImage = 'preview.jpg';
+        $expectedPath = 'theme/preview/preview.jpg';
+
         /** @var $theme \Magento\Core\Model\Theme|\PHPUnit_Framework_MockObject_MockObject */
         $theme = $this->getMock(
             'Magento\Core\Model\Theme',
@@ -106,17 +99,18 @@ protected function getGetTheme($isPhysical)
             false
         );
 
-        $theme->setData('area', 'frontend');
-
-        $theme->expects($this->any())
-            ->method('isPhysical')
-            ->will($this->returnValue($isPhysical));
+        $this->mediaDirectory->expects($this->once())
+            ->method('getAbsolutePath')
+            ->with(PathInterface::PREVIEW_DIRECTORY_PATH . '/' . $previewImage)
+            ->willReturn($expectedPath);
 
-        $theme->expects($this->any())
+        $theme->expects($this->once())
             ->method('getPreviewImage')
-            ->will($this->returnValue('image.png'));
+            ->will($this->returnValue($previewImage));
+
+        $result = $this->model->getPreviewImagePath($theme);
 
-        return $theme;
+        $this->assertEquals($expectedPath, $result);
     }
 
     /**
@@ -134,6 +128,10 @@ public function testDefaultPreviewImageUrlGetter()
      */
     public function testImagePreviewDirectoryGetter()
     {
+        $this->mediaDirectory->expects($this->any())
+            ->method('getAbsolutePath')
+            ->with(\Magento\Framework\View\Design\Theme\Image\PathInterface::PREVIEW_DIRECTORY_PATH)
+            ->will($this->returnValue('/theme/preview'));
         $this->assertEquals(
             '/theme/preview',
             $this->model->getImagePreviewDirectory()
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/ThemeTest.php b/dev/tests/unit/testsuite/Magento/Core/Model/ThemeTest.php
@@ -9,6 +9,8 @@
 namespace Magento\Core\Model;
 
 use Magento\Framework\View\Design\ThemeInterface;
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\View\Design\Theme\Image\PathInterface;
 
 class ThemeTest extends \PHPUnit_Framework_TestCase
 {
@@ -54,7 +56,7 @@ protected function setUp()
                 'customizationFactory' => $customizationFactory,
                 'customizationConfig' => $customizationConfig,
                 'imageFactory' => $this->_imageFactory,
-                'resourceCollection' => $resourceCollection
+                'resourceCollection' => $resourceCollection,
             ]
         );
 
diff --git a/lib/web/app-config.js b/lib/web/app-config.js
@@ -31,6 +31,7 @@ require.config({
         "jquery/jquery.hashchange": "jquery/jquery.ba-hashchange.min",
         "prototype": "prototype/prototype-amd",
         "text": "requirejs/text",
+        "domReady": "requirejs/domReady",
         "ko": "ko/ko"
     }
 });
diff --git a/lib/web/mage/zoom.js b/lib/web/mage/zoom.js
diff --git a/lib/web/requirejs/domReady.js b/lib/web/requirejs/domReady.js
diff --git a/setup/pub/magento/setup/create-admin-account.js b/setup/pub/magento/setup/create-admin-account.js

Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ require([`
`105`	`105`	`$customsValueValidation = '';`
`106`	`106`	`}`
`107`	`107`	`?>`
`108`		`- <td <?php echo $customsValueDisplay ?>>`
	`108`	`+ <td class="col-custom" <?php echo $customsValueDisplay ?>>`
`109`	`109`	`<input type="text" class="customs-value input-text <?php echo $customsValueValidation ?>" name="package_customs_value" />`
`110`	`110`	`<span class="customs-value-currency">[<?php echo $this->getCustomValueCurrencyCode(); ?>]</span>`
`111`	`111`	`</td>`
Original file line number	Diff line number	Diff line change
`@@ -1745,7 +1745,8 @@ table.items-to-invoice tbody tr:hover td {`
`1745`	`1745`	`.packaging-window .col-width,`
`1746`	`1746`	`.packaging-window .col-height,`
`1747`	`1747`	`.packaging-window .col-length,`
`1748`		`-.packaging-window .data-table .col-total-weight input[type="text"] {`
	`1748`	`+.packaging-window .data-table .col-total-weight input[type="text"],`
	`1749`	`+.packaging-window .data-table .col-custom input[type="text"] {`
`1749`	`1750`	`width: 60px;`
`1750`	`1751`	`}`
`1751`	`1752`
`@@ -1759,7 +1760,8 @@ table.items-to-invoice tbody tr:hover td {`
`1759`	`1760`	`}`
`1760`	`1761`
`1761`	`1762`	`.packaging-window .data-table .col-actions,`
`1762`		`-.packaging-window .col-total-weight {`
	`1763`	`+.packaging-window .col-total-weight,`
	`1764`	`+.packaging-window .data-table .col-custom {`
`1763`	`1765`	`white-space: nowrap;`
`1764`	`1766`	`}`
`1765`	`1767`