From 34ab5502ce12306607bf87c69105be00a038e078 Mon Sep 17 00:00:00 2001 From: Olga Matviienko Date: Mon, 12 Oct 2015 12:50:49 +0300 Subject: [PATCH 01/83] MAGETWO-42358: Action buttons are displayed shuffled in Storefront Wish List --- .../web/css/source/_module.less | 268 +++++++++--------- 1 file changed, 140 insertions(+), 128 deletions(-) diff --git a/app/design/frontend/Magento/blank/Magento_Wishlist/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Wishlist/web/css/source/_module.less index 506bbbd71fe10..49720b30a2cf6 100644 --- a/app/design/frontend/Magento/blank/Magento_Wishlist/web/css/source/_module.less +++ b/app/design/frontend/Magento/blank/Magento_Wishlist/web/css/source/_module.less @@ -4,143 +4,143 @@ // */ // -// Common -//-------------------------------------- +// Common +// _____________________________________________ & when (@media-common = true) { -.form.wishlist.items { - .actions-toolbar { - &:extend(.abs-reset-left-margin all); + .form.wishlist.items { + .actions-toolbar { + &:extend(.abs-reset-left-margin all); + } } -} -.product-info-main, -.product-options-bottom, -.block-bundle-summary { - .action.towishlist { - &:extend(.abs-action-addto-product all); + .product-info-main, + .product-options-bottom, + .block-bundle-summary { + .action.towishlist { + &:extend(.abs-action-addto-product all); + } } -} -.products.list.items, -.table-comparison { - .action { - &.towishlist { - &:extend(.abs-actions-addto-gridlist all); - .lib-icon-font-symbol( - @icon-wishlist-empty - ); + .products.list.items, + .table-comparison { + .action { + &.towishlist { + &:extend(.abs-actions-addto-gridlist all); + .lib-icon-font-symbol( + @icon-wishlist-empty + ); + } } } -} -.account .table-wrapper .data.table.wishlist { - .lib-table-bordered( - @_table_type: horizontal - ); - thead > tr > th { - border-bottom: 0; - } - tbody > tr:last-child > td { - border-bottom: 1px solid @table__border-color; - } - .product.name { - display: inline-block; - margin-bottom: @indent__s; - } - .box-tocart { - margin: @indent__s 0; - .qty { - vertical-align: middle; - &:extend(.abs-input-qty all); + .account .table-wrapper .data.table.wishlist { + .lib-table-bordered( + @_table_type: horizontal + ); + thead > tr > th { + border-bottom: 0; } - } - .col { - &.item { - width: 50%; + tbody > tr:last-child > td { + border-bottom: 1px solid @table__border-color; } - &.photo { - max-width: 150px; + .product.name { + display: inline-block; + margin-bottom: @indent__s; } - &.selector { - max-width: 15px; + .box-tocart { + margin: @indent__s 0; + .qty { + vertical-align: middle; + &:extend(.abs-input-qty all); + } + } + .col { + &.item { + width: 50%; + } + &.photo { + max-width: 150px; + } + &.selector { + max-width: 15px; + } + } + textarea { + margin: @indent__s 0; + } + .input-text.qty { + margin-bottom: @indent__s; + } + .action.primary { + vertical-align: top; + } + .price { + font-weight: @font-weight__bold; } } - textarea { - margin: 10px 0; - } - .input-text.qty { - margin-bottom: 10px; - } - .action.primary { - vertical-align: top; - } - .price { - font-weight: @font-weight__bold; - } -} -.block-wishlist { - .block-title { - &:extend(.abs-block-title all); - } - .counter { - &:extend(.abs-block-items-counter all); - } - .product-item-name { - margin-right: @indent__m; + .block-wishlist { + .block-title { + &:extend(.abs-block-title all); + } + .counter { + &:extend(.abs-block-items-counter all); + } + .product-item-name { + margin-right: @indent__m; + } } -} -.products-grid.wishlist { - .product { - &-item { - &-photo { - margin-bottom: @indent__s; - display: block; - } - &-name { - margin-top: 0; - } - .price-box { - margin: 0; - } - &-tooltip { - } - .comment-box { - .label { - &:extend(.abs-visually-hidden all); + .products-grid.wishlist { + .product { + &-item { + &-photo { + display: block; + margin-bottom: @indent__s; } - } - &-comment { - display: block; - margin: @indent__s 0; - height: 42px; - } - &-actions { - > * { - margin-right: 15px; - &:last-child { - margin-right: 0; + &-name { + margin-top: 0; + } + .price-box { + margin: 0; + } + &-tooltip { + } + .comment-box { + .label { + &:extend(.abs-visually-hidden all); } } - } - .box-tocart { - input.qty { - height: 32px; - &:extend(.abs-input-qty all); + &-comment { + display: block; + height: 42px; + margin: @indent__s 0; + } + &-actions { + > * { + margin-right: 15px; + &:last-child { + margin-right: 0; + } + } + } + .box-tocart { + input.qty { + height: 32px; + &:extend(.abs-input-qty all); + } } } } } } -} - // -// Mobile -//-------------------------------------- +// Mobile +// _____________________________________________ + .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__s) { .products-grid.wishlist { .product-item { @@ -154,15 +154,15 @@ .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) { .products-grid.wishlist { - margin-right: -@indent__s; margin-bottom: @indent__l; + margin-right: -@indent__s; .product { &-item { padding: @indent__base @indent__s @indent__base @indent__base; position: relative; &-photo { - margin-right: @indent__base; float: left; + margin-right: @indent__base; } &-name { .lib-font-size(16); @@ -211,8 +211,9 @@ } // - // Grid view for wishlist - //-------------------------------------- + // Grid view for wishlist + // ----------------------------------------- + .wishlist-index-index { .product { &-item { @@ -229,7 +230,7 @@ .wishlist-index-index { .products-grid { .product-item { - margin-bottom: 20px; + margin-bottom: @indent__base; width: 50%; } .product-item-actions { @@ -240,8 +241,9 @@ } // -// Desktop -//-------------------------------------- +// Desktop +// _____________________________________________ + .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) { .products-grid.wishlist { .product { @@ -253,12 +255,9 @@ margin: @indent__s 0 0; } .fieldset { - .field.qty, - .product-item-actions { - } .field.qty { - padding-right: @indent__s; margin-bottom: @indent__s; + padding-right: @indent__s; .label { width: auto; } @@ -275,7 +274,7 @@ } } } - .wishlist-index-index { + .wishlist-index-index { .product { &-item { &-info { @@ -283,17 +282,30 @@ } } } + .main { + .form-wishlist-items { + .actions-toolbar { + &:extend(.abs-reset-left-margin-desktop all); + } + } + } } } .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__l) { - .wishlist-index-index .products-grid .product-items { margin: 0; } - .wishlist-index-index .products-grid .product-item { - width: 24.439%; - margin-left: calc(~"(100% - 4 * 24.439%) / 3"); - padding: 0; - &:nth-child(4n+1) { - margin-left: 0; + .wishlist-index-index { + .products-grid { + .product-items { + margin: 0; + } + .product-item { + margin-left: calc(~"(100% - 4 * 24.439%) / 3"); + padding: 0; + width: 24.439%; + &:nth-child(4n+1) { + margin-left: 0; + } + } } } } From 9861ef93e6e2936f0193fbb756541dd72e9372d2 Mon Sep 17 00:00:00 2001 From: Ievgen Shakhsuvarov Date: Mon, 12 Oct 2015 13:01:24 +0300 Subject: [PATCH 02/83] MAGETWO-43929: Regression scope functional tests maintenance - Fixes for AddProductToShoppingCart --- .../Constraint/AssertGrandTotalInShoppingCart.php | 1 + .../TestCase/AddProductsToShoppingCartEntityTest.xml | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertGrandTotalInShoppingCart.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertGrandTotalInShoppingCart.php index ee7f596cc053d..13068aa03c618 100644 --- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertGrandTotalInShoppingCart.php +++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertGrandTotalInShoppingCart.php @@ -28,6 +28,7 @@ public function processAssert(CheckoutCart $checkoutCart, Cart $cart, $requireRe { if ($requireReload) { $checkoutCart->open(); + $checkoutCart->getTotalsBlock()->waitForUpdatedTotals(); } $fixtureGrandTotal = number_format($cart->getGrandTotal(), 2); diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/AddProductsToShoppingCartEntityTest.xml b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/AddProductsToShoppingCartEntityTest.xml index 69ab253de55c0..87bb8d8e3b97c 100644 --- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/AddProductsToShoppingCartEntityTest.xml +++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/AddProductsToShoppingCartEntityTest.xml @@ -9,7 +9,7 @@ bundleProduct::bundle_dynamic_product - 200 + 210 @@ -18,7 +18,7 @@ bundleProduct::bundle_fixed_product - 756 + 761 @@ -27,7 +27,7 @@ catalogProductSimple::with_two_custom_option - 340 + 345 @@ -45,7 +45,7 @@ configurableProduct::default - 120 + 135 @@ -63,7 +63,7 @@ groupedProduct::three_simple_products - 1920 + 1950 @@ -72,7 +72,7 @@ catalogProductSimple::with_two_custom_option, catalogProductVirtual::product_50_dollar, downloadableProduct::with_two_separately_links, groupedProduct::three_simple_products, configurableProduct::default, bundleProduct::bundle_dynamic_product, bundleProduct::bundle_dynamic_product - 2852.43 + 2922.43 From 4f1cfb72b578dd5852110b1f51b9333bab535f2d Mon Sep 17 00:00:00 2001 From: Oleh Posyniak Date: Mon, 12 Oct 2015 15:06:57 +0300 Subject: [PATCH 03/83] MAGETWO-42984: Remove Section from Customer Data --- .../Magento/Customer/Block/CustomerData.php | 32 +------------------ .../frontend/templates/js/customer-data.phtml | 1 - .../view/frontend/web/js/customer-data.js | 8 ----- 3 files changed, 1 insertion(+), 40 deletions(-) diff --git a/app/code/Magento/Customer/Block/CustomerData.php b/app/code/Magento/Customer/Block/CustomerData.php index 66d4043f152e6..9d30a56de217b 100644 --- a/app/code/Magento/Customer/Block/CustomerData.php +++ b/app/code/Magento/Customer/Block/CustomerData.php @@ -7,24 +7,14 @@ class CustomerData extends \Magento\Framework\View\Element\Template { - /** - * Sections that can not be cached on frontend-side - * - * @var array - */ - protected $nonCachedSections = []; - /** * @param \Magento\Framework\View\Element\Template\Context $context * @param array $data - * @param array $nonCachedSections */ public function __construct( \Magento\Framework\View\Element\Template\Context $context, - array $data = [], - array $nonCachedSections = [] + array $data = [] ) { - $this->nonCachedSections = $nonCachedSections; parent::__construct($context, $data); } @@ -50,24 +40,4 @@ public function getCustomerDataUrl($route) { return $this->getUrl($route, ['_secure' => $this->getRequest()->isSecure()]); } - - /** - * Get sections that can not be cached on frontend-side - * - * @return array - */ - public function getNotCachedSections() - { - return $this->nonCachedSections; - } - - /** - * Get keys of sections that can not be cached on frontend-side - * - * @return array - */ - public function getNonCachedSectionKeys() - { - return array_keys($this->nonCachedSections); - } } diff --git a/app/code/Magento/Customer/view/frontend/templates/js/customer-data.phtml b/app/code/Magento/Customer/view/frontend/templates/js/customer-data.phtml index 60441eb039d72..b34e7c871d3bf 100644 --- a/app/code/Magento/Customer/view/frontend/templates/js/customer-data.phtml +++ b/app/code/Magento/Customer/view/frontend/templates/js/customer-data.phtml @@ -13,7 +13,6 @@ '*' => ['Magento_Customer/js/customer-data' => [ 'sectionLoadUrl' => $block->getCustomerDataUrl('customer/section/load'), 'cookieLifeTime' => $block->getCookieLifeTime(), - 'nonCachedSections' => $block->getNonCachedSectionKeys(), ]], ]); ?> diff --git a/app/code/Magento/Customer/view/frontend/web/js/customer-data.js b/app/code/Magento/Customer/view/frontend/web/js/customer-data.js index 726fa0816d71d..f76913fee604f 100644 --- a/app/code/Magento/Customer/view/frontend/web/js/customer-data.js +++ b/app/code/Magento/Customer/view/frontend/web/js/customer-data.js @@ -23,8 +23,6 @@ define([ storage.removeAll(); var date = new Date(Date.now() + parseInt(options.cookieLifeTime, 10) * 1000); $.localStorage.set('mage-cache-timeout', date); - } else { - invalidateNonCachedSections(options); } }; @@ -35,12 +33,6 @@ define([ } }; - var invalidateNonCachedSections = function(options) { - _.each(options.nonCachedSections, function (sectionName) { - storageInvalidation.set(sectionName, true); - }); - } - var dataProvider = { getFromStorage: function (sectionNames) { var result = {}; From 537ef9982515dbcbd34079a62f66b747c5ac5875 Mon Sep 17 00:00:00 2001 From: Oleh Posyniak Date: Mon, 12 Oct 2015 16:29:26 +0300 Subject: [PATCH 04/83] MAGETWO-42984: Remove Section from Customer Data --- .../Customer/Test/TestCase/UpdateCustomerFrontendEntityTest.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerFrontendEntityTest.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerFrontendEntityTest.php index 63308bbea50d1..e432b6c13ebd0 100644 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerFrontendEntityTest.php +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerFrontendEntityTest.php @@ -127,6 +127,7 @@ public function test( $this->customerAccountIndex->getInfoBlock()->openEditContactInfo(); $this->customerAccountEdit->getAccountInfoForm()->fill($customer); $this->customerAccountEdit->getAccountInfoForm()->submit(); + $this->cmsIndex->getCmsPageBlock()->waitPageInit(); \PHPUnit_Framework_Assert::assertThat($this->getName(), $assertCustomerInfoSuccessSavedMessage); @@ -134,5 +135,6 @@ public function test( $this->customerAccountIndex->getDashboardAddress()->editBillingAddress(); $this->customerAddressEdit->getEditForm()->fill($address); $this->customerAddressEdit->getEditForm()->saveAddress(); + $this->cmsIndex->getCmsPageBlock()->waitPageInit(); } } From d02e4195a3580a5e7c5ffbcf39703bd10480bce8 Mon Sep 17 00:00:00 2001 From: Ievgen Shakhsuvarov Date: Tue, 13 Oct 2015 15:49:20 +0300 Subject: [PATCH 05/83] MAGETWO-43929: Regression scope functional tests maintenance - Fixes for CheckoutWithGiftMessagesTest --- .../Test/Block/Cart/GiftOptions.php | 40 ++++++++++++++- .../Test/Block/Cart/Item/GiftOptions.php | 49 ++++++++++++++++--- .../AssertGiftMessageInFrontendOrderItems.php | 10 +--- .../TestCase/CheckoutWithGiftMessagesTest.xml | 4 +- .../Magento/GiftMessage/Test/etc/testcase.xml | 15 +++--- 5 files changed, 91 insertions(+), 27 deletions(-) diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Cart/GiftOptions.php b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Cart/GiftOptions.php index 0cdd46da28ece..00a96731c134c 100644 --- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Cart/GiftOptions.php +++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Cart/GiftOptions.php @@ -7,7 +7,12 @@ namespace Magento\GiftMessage\Test\Block\Cart; use Magento\GiftMessage\Test\Fixture\GiftMessage; +use Magento\Mtf\Block\BlockFactory; use Magento\Mtf\Block\Form; +use Magento\Mtf\Block\Mapper; +use Magento\Mtf\Client\BrowserInterface; +use Magento\Mtf\Client\Element\SimpleElement; +use Magento\Mtf\Fixture\FixtureFactory; /** * Class GiftOptions @@ -43,6 +48,33 @@ class GiftOptions extends Form */ protected $giftMessageSummary = ".gift-message-summary"; + /** + * Fixture factory. + * + * @var FixtureFactory + */ + protected $fixtureFactory; + + /** + * @param SimpleElement $element + * @param BlockFactory $blockFactory + * @param Mapper $mapper + * @param BrowserInterface $browser + * @param FixtureFactory $fixtureFactory + * @param array $config [optional] + */ + public function __construct( + SimpleElement $element, + BlockFactory $blockFactory, + Mapper $mapper, + BrowserInterface $browser, + FixtureFactory $fixtureFactory, + array $config = [] + ) { + $this->fixtureFactory = $fixtureFactory; + parent::__construct($element, $blockFactory, $mapper, $browser, $config); + } + /** * Fill gift message form on order level * @@ -58,7 +90,13 @@ public function fillGiftMessageOrder(GiftMessage $giftMessage) 'Magento\GiftMessage\Test\Block\Cart\GiftOptions\GiftMessageForm', ['element' => $this->_rootElement->find($this->giftMessageOrderForm)] ); - $giftMessageForm->fill($giftMessage); + $formData = [ + 'sender' => $giftMessage->getSender(), + 'recipient' => $giftMessage->getRecipient(), + 'message' => $giftMessage->getMessage() + ]; + $formData = $this->fixtureFactory->createByCode('giftMessage', ['data' => $formData]); + $giftMessageForm->fill($formData); $this->_rootElement->find($this->giftMessageOrderButton)->click(); $this->waitForElementVisible($this->giftMessageSummary); } diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Cart/Item/GiftOptions.php b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Cart/Item/GiftOptions.php index 5443274248669..e6683a07d4cec 100644 --- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Cart/Item/GiftOptions.php +++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Cart/Item/GiftOptions.php @@ -6,9 +6,14 @@ namespace Magento\GiftMessage\Test\Block\Cart\Item; +use Magento\Mtf\Block\BlockFactory; use Magento\GiftMessage\Test\Fixture\GiftMessage; use Magento\Mtf\Block\Form; +use Magento\Mtf\Block\Mapper; +use Magento\Mtf\Client\BrowserInterface; +use Magento\Mtf\Client\Element\SimpleElement; use Magento\Mtf\Client\Locator; +use Magento\Mtf\Fixture\FixtureFactory; /** * Add gift options on checkout cart item level @@ -20,7 +25,7 @@ class GiftOptions extends Form * * @var string */ - protected $giftMessageItemForm = '//div[@class="gift-message"]//fieldset[ancestor::tbody[contains(.,"%s")]]'; + protected $giftMessageItemForm = '.gift-message fieldset'; /** * Allow Gift Options for items @@ -43,6 +48,33 @@ class GiftOptions extends Form */ protected $giftMessageSummary = '//div[@class="gift-message-summary"][ancestor::tbody[contains(.,"%s")]]'; + /** + * Fixture factory. + * + * @var FixtureFactory + */ + protected $fixtureFactory; + + /** + * @param SimpleElement $element + * @param BlockFactory $blockFactory + * @param Mapper $mapper + * @param BrowserInterface $browser + * @param FixtureFactory $fixtureFactory + * @param array $config [optional] + */ + public function __construct( + SimpleElement $element, + BlockFactory $blockFactory, + Mapper $mapper, + BrowserInterface $browser, + FixtureFactory $fixtureFactory, + array $config = [] + ) { + $this->fixtureFactory = $fixtureFactory; + parent::__construct($element, $blockFactory, $mapper, $browser, $config); + } + /** * Fill gift message form on item level * @@ -62,14 +94,15 @@ public function fillGiftMessageItem(GiftMessage $giftMessage, $products = []) )->click(); $giftMessageForm = $this->blockFactory->create( 'Magento\GiftMessage\Test\Block\Cart\GiftOptions\GiftMessageForm', - [ - 'element' => $this->_rootElement->find( - sprintf($this->giftMessageItemForm, $product->getName()), - Locator::SELECTOR_XPATH - ) - ] + ['element' => $this->_rootElement->find($this->giftMessageItemForm)] ); - $giftMessageForm->fill($giftMessage); + $formData = [ + 'sender' => $giftMessage->getSender(), + 'recipient' => $giftMessage->getRecipient(), + 'message' => $giftMessage->getMessage() + ]; + $formData = $this->fixtureFactory->createByCode('giftMessage', ['data' => $formData]); + $giftMessageForm->fill($formData); $this->_rootElement->find($this->giftMessageItemButton)->click(); $this->waitForElementVisible( sprintf($this->giftMessageSummary, $product->getName()), diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Constraint/AssertGiftMessageInFrontendOrderItems.php b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Constraint/AssertGiftMessageInFrontendOrderItems.php index 9adbac82bef1a..c5fea6f7719b7 100644 --- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Constraint/AssertGiftMessageInFrontendOrderItems.php +++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Constraint/AssertGiftMessageInFrontendOrderItems.php @@ -53,15 +53,7 @@ public function processAssert( $orderHistory->open(); $orderHistory->getOrderHistoryBlock()->openOrderById($orderId); - foreach ($giftMessage->getItems() as $key => $itemGiftMessage) { - $product = $products[$key]; - if ($giftMessage->hasData('items')) { - $expectedData = [ - 'sender' => $itemGiftMessage->getSender(), - 'recipient' => $itemGiftMessage->getRecipient(), - 'message' => $itemGiftMessage->getMessage(), - ]; - } + foreach ($products as $product) { if ($product->getProductHasWeight() !== 'Yes') { $expectedData = []; } diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/TestCase/CheckoutWithGiftMessagesTest.xml b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/TestCase/CheckoutWithGiftMessagesTest.xml index 1aa0128c20a6b..1937fd24c0c3c 100644 --- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/TestCase/CheckoutWithGiftMessagesTest.xml +++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/TestCase/CheckoutWithGiftMessagesTest.xml @@ -10,7 +10,7 @@ catalogProductSimple::default, catalogProductVirtual::default default - US_address_1 + US_address_1_without_email login Flat Rate Fixed @@ -27,7 +27,7 @@ catalogProductSimple::default, catalogProductVirtual::default default - US_address_1 + US_address_1_without_email login Flat Rate Fixed diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/etc/testcase.xml b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/etc/testcase.xml index 0dfdf20437f1c..fcd1c8bf41640 100644 --- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/etc/testcase.xml +++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/etc/testcase.xml @@ -11,15 +11,16 @@ - - + - - - - - + + + + + + + From df8ce6c46a1553bdf6ea378ac2a861b32c6c7913 Mon Sep 17 00:00:00 2001 From: Ievgen Shakhsuvarov Date: Tue, 13 Oct 2015 16:02:11 +0300 Subject: [PATCH 06/83] MAGETWO-43929: Regression scope functional tests maintenance - Improved checkout payment method selection --- .../app/Magento/Checkout/Test/Block/Onepage/Payment.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Payment.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Payment.php index cc62ddd13e1df..4eb6d81d6f57b 100644 --- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Payment.php +++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Payment.php @@ -81,10 +81,11 @@ class Payment extends Block */ public function selectPaymentMethod(array $payment, CreditCard $creditCard = null) { - $paymentSelector = $this->_rootElement->find(sprintf($this->paymentMethodInput, $payment['method'])); - if ($paymentSelector->isVisible()) { - $paymentSelector->click(); - } else { + $paymentSelector = sprintf($this->paymentMethodInput, $payment['method']); + try { + $this->waitForElementVisible($paymentSelector); + $this->_rootElement->find($paymentSelector)->click(); + } catch (\Exception $exception) { $paymentLabel = $this->_rootElement->find(sprintf($this->paymentMethodLabel, $payment['method'])); $this->waitForElementNotVisible($this->waitElement); if (!$paymentLabel->isVisible()) { From 64c72658f2819c24828484f3a63ceaa15e211b9d Mon Sep 17 00:00:00 2001 From: Ievgen Shakhsuvarov Date: Tue, 13 Oct 2015 17:49:11 +0300 Subject: [PATCH 07/83] MAGETWO-43929: Regression scope functional tests maintenance --- .../tests/app/Magento/Backend/Test/Block/Widget/Grid.php | 1 + 1 file changed, 1 insertion(+) diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/Grid.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/Grid.php index 8e1e7be037137..ff465a7239146 100644 --- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/Grid.php +++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/Grid.php @@ -252,6 +252,7 @@ public function searchAndOpen(array $filter) } else { throw new \Exception("Searched item was not found by filter\n" . print_r($filter, true)); } + $this->waitLoader(); } /** From 6510322da93d5e1673d69b3cb79281b227230cfd Mon Sep 17 00:00:00 2001 From: Dubovyk Oleksandr Date: Tue, 13 Oct 2015 19:59:21 +0300 Subject: [PATCH 08/83] MAGETWO-38963: Storefront "Layered Navigation" menu items' titles are overlapped by "Expand" button - Removed overlapping --- .../luma/Magento_LayeredNavigation/web/css/source/_module.less | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/design/frontend/Magento/luma/Magento_LayeredNavigation/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_LayeredNavigation/web/css/source/_module.less index 898ddc99afdfa..dfdb366f731b6 100644 --- a/app/design/frontend/Magento/luma/Magento_LayeredNavigation/web/css/source/_module.less +++ b/app/design/frontend/Magento/luma/Magento_LayeredNavigation/web/css/source/_module.less @@ -102,10 +102,11 @@ font-weight: @font-weight__semibold; margin: 0; overflow: hidden; - padding: @indent__s 20px+@indent__s 0 @indent__s; + padding: @indent__s 30px+@indent__s 0 @indent__s; position: relative; z-index: 1; text-transform: uppercase; + word-break: break-all; .lib-icon-font( @_icon-font-content: @icon-down, From 032004cf6fa432260085ff6b1572325ddde5ae03 Mon Sep 17 00:00:00 2001 From: Ievgen Shakhsuvarov Date: Thu, 15 Oct 2015 18:02:38 +0300 Subject: [PATCH 09/83] MAGETWO-43929: Regression scope functional tests maintenance --- .../AssertGiftMessageInBackendOrder.php | 19 +++++++++++++++---- .../AssertGiftMessageInFrontendOrderItems.php | 10 +++++++++- .../TestCase/CheckoutWithGiftMessagesTest.xml | 1 + .../TestStep/AddGiftMessageBackendStep.php | 13 ++++++++----- .../Magento/GiftMessage/Test/etc/testcase.xml | 3 +-- .../Test/Block/Adminhtml/Order/Create.php | 10 +++++++++- .../Adminhtml/Order/Create/Billing/Method.php | 2 -- .../Order/Create/Shipping/Method.php | 2 -- 8 files changed, 43 insertions(+), 17 deletions(-) diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Constraint/AssertGiftMessageInBackendOrder.php b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Constraint/AssertGiftMessageInBackendOrder.php index 7ebe75449ad20..32447e0181ad4 100644 --- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Constraint/AssertGiftMessageInBackendOrder.php +++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Constraint/AssertGiftMessageInBackendOrder.php @@ -10,6 +10,7 @@ use Magento\Sales\Test\Page\Adminhtml\OrderIndex; use Magento\Sales\Test\Page\Adminhtml\SalesOrderView; use Magento\Mtf\Constraint\AbstractAssertForm; +use Magento\Mtf\Fixture\FixtureFactory; /** * Assert that message from dataset is displayed on order(s) view page on backend. @@ -34,6 +35,7 @@ class AssertGiftMessageInBackendOrder extends AbstractAssertForm * @param GiftMessage $giftMessage * @param SalesOrderView $salesOrderView * @param OrderIndex $orderIndex + * @param FixtureFactory $fixtureFactory * @param array $products * @param string $orderId * @return void @@ -42,6 +44,7 @@ public function processAssert( GiftMessage $giftMessage, SalesOrderView $salesOrderView, OrderIndex $orderIndex, + FixtureFactory $fixtureFactory, array $products, $orderId ) { @@ -49,12 +52,20 @@ public function processAssert( $actualData = []; $orderIndex->open()->getSalesOrderGrid()->searchAndOpen(['id' => $orderId]); - if ($giftMessage->getAllowGiftMessagesForOrder()) { - $expectedData[] = $giftMessage->getData(); - $actualData[] = $salesOrderView->getGiftOptionsBlock()->getData($giftMessage); + if ($giftMessage->getAllowGiftMessagesForOrder() === 'Yes') { + $formData = [ + 'sender' => $giftMessage->getSender(), + 'recipient' => $giftMessage->getRecipient(), + 'message' => $giftMessage->getMessage() + ]; + $giftMessageForm = $fixtureFactory->createByCode('giftMessage', ['data' => $formData]); + + $expectedData[] = $giftMessageForm->getData(); + $actualData[] = $salesOrderView->getGiftOptionsBlock()->getData($giftMessageForm); + } - if ($giftMessage->getAllowGiftOptionsForItems()) { + if ($giftMessage->getAllowGiftOptionsForItems() === 'Yes') { foreach ($giftMessage->getItems() as $key => $giftMessageItem) { $expectedData[] = $giftMessageItem->getData(); $product = $products[$key]; diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Constraint/AssertGiftMessageInFrontendOrderItems.php b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Constraint/AssertGiftMessageInFrontendOrderItems.php index c5fea6f7719b7..9adbac82bef1a 100644 --- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Constraint/AssertGiftMessageInFrontendOrderItems.php +++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Constraint/AssertGiftMessageInFrontendOrderItems.php @@ -53,7 +53,15 @@ public function processAssert( $orderHistory->open(); $orderHistory->getOrderHistoryBlock()->openOrderById($orderId); - foreach ($products as $product) { + foreach ($giftMessage->getItems() as $key => $itemGiftMessage) { + $product = $products[$key]; + if ($giftMessage->hasData('items')) { + $expectedData = [ + 'sender' => $itemGiftMessage->getSender(), + 'recipient' => $itemGiftMessage->getRecipient(), + 'message' => $itemGiftMessage->getMessage(), + ]; + } if ($product->getProductHasWeight() !== 'Yes') { $expectedData = []; } diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/TestCase/CheckoutWithGiftMessagesTest.xml b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/TestCase/CheckoutWithGiftMessagesTest.xml index 1937fd24c0c3c..d91f2b5a10140 100644 --- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/TestCase/CheckoutWithGiftMessagesTest.xml +++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/TestCase/CheckoutWithGiftMessagesTest.xml @@ -37,6 +37,7 @@ John Doe Jane Doe text_gift_message + default cashondelivery diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/TestStep/AddGiftMessageBackendStep.php b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/TestStep/AddGiftMessageBackendStep.php index 18848d9e75d2c..e089fb4bf7cb2 100644 --- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/TestStep/AddGiftMessageBackendStep.php +++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/TestStep/AddGiftMessageBackendStep.php @@ -60,12 +60,15 @@ public function __construct( */ public function run() { - if ($this->giftMessage->getAllowGiftMessagesForOrder()) { - $this->orderCreateIndex->getGiftMessageForOrderBlock()->fill($this->giftMessage); + if ($this->giftMessage->getAllowGiftMessagesForOrder() === 'Yes') { + $giftMessageForOrderBlock = $this->orderCreateIndex->getGiftMessageForOrderBlock(); + $giftMessageForOrderBlock->fill($this->giftMessage); + $giftMessageForOrderBlock->waitForElementNotVisible('.loading-mask'); } - if ($this->giftMessage->getAllowGiftOptionsForItems()) { - $this->orderCreateIndex->getCreateGiftMessageBlock() - ->fillGiftMessageForItems($this->products, $this->giftMessage); + if ($this->giftMessage->getAllowGiftOptionsForItems() === 'Yes') { + $giftMessageBlock = $this->orderCreateIndex->getCreateGiftMessageBlock(); + $giftMessageBlock->fillGiftMessageForItems($this->products, $this->giftMessage); + $giftMessageBlock->waitForElementNotVisible('.loading-mask'); } return ['giftMessage' => $this->giftMessage]; diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/etc/testcase.xml b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/etc/testcase.xml index fcd1c8bf41640..b4bf95dc501ca 100644 --- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/etc/testcase.xml +++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/etc/testcase.xml @@ -31,8 +31,7 @@ - - + diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create.php index 6eb392b6d8ccf..5949d930822bb 100644 --- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create.php +++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create.php @@ -101,6 +101,13 @@ class Create extends Block */ protected $accountInformationBlock = '#order-form_account'; + /** + * Payment and Shipping methods block. + * + * @var string + */ + protected $orderMethodsSelector = '#order-methods'; + /** * Getter for order selected products grid. * @@ -278,6 +285,7 @@ public function fillAddresses(FixtureInterface $address, $saveAddress = 'No', $s */ public function selectShippingMethod(array $shippingMethod) { + $this->_rootElement->find($this->orderMethodsSelector)->click(); $this->getShippingMethodBlock()->selectShippingMethod($shippingMethod); $this->getTemplateBlock()->waitLoader(); } @@ -291,7 +299,7 @@ public function selectShippingMethod(array $shippingMethod) public function selectPaymentMethod(array $paymentCode) { $this->getTemplateBlock()->waitLoader(); - $this->_rootElement->click(); + $this->_rootElement->find($this->orderMethodsSelector)->click(); $this->getBillingMethodBlock()->selectPaymentMethod($paymentCode); $this->getTemplateBlock()->waitLoader(); } diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Billing/Method.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Billing/Method.php index 6397d53754a38..24b42e5020a2b 100644 --- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Billing/Method.php +++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Billing/Method.php @@ -35,8 +35,6 @@ class Method extends Block */ public function selectPaymentMethod(array $paymentCode) { - // Click on rootElement to solve overlapping inner elements by header menu. - $this->_rootElement->click(); $paymentInput = $this->_rootElement->find(sprintf($this->paymentMethod, $paymentCode['method'])); if ($paymentInput->isVisible()) { $paymentInput->click(); diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Shipping/Method.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Shipping/Method.php index 4f9877eeca53a..25deecd31dea2 100644 --- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Shipping/Method.php +++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Shipping/Method.php @@ -36,8 +36,6 @@ class Method extends Block */ public function selectShippingMethod(array $shippingMethod) { - // Click on rootElement to solve overlapping inner elements by header menu. - $this->_rootElement->click(); $this->_rootElement->find($this->shippingMethodsLink)->click(); $selector = sprintf( $this->shippingMethod, From 7dfd4afcbed337e04430e18dc55f778861401197 Mon Sep 17 00:00:00 2001 From: Ievgen Shakhsuvarov Date: Thu, 15 Oct 2015 18:24:27 +0300 Subject: [PATCH 10/83] MAGETWO-43929: Regression scope functional tests maintenance --- .../app/Magento/GiftMessage/Test/Block/Cart/Item/GiftOptions.php | 1 + 1 file changed, 1 insertion(+) diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Cart/Item/GiftOptions.php b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Cart/Item/GiftOptions.php index e6683a07d4cec..9281d05031ba2 100644 --- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Cart/Item/GiftOptions.php +++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Cart/Item/GiftOptions.php @@ -96,6 +96,7 @@ public function fillGiftMessageItem(GiftMessage $giftMessage, $products = []) 'Magento\GiftMessage\Test\Block\Cart\GiftOptions\GiftMessageForm', ['element' => $this->_rootElement->find($this->giftMessageItemForm)] ); + $giftMessage = $giftMessage->getItems()[0]; $formData = [ 'sender' => $giftMessage->getSender(), 'recipient' => $giftMessage->getRecipient(), From 83423597d8335979932d79ac9b4848dd8d4270ff Mon Sep 17 00:00:00 2001 From: Ievgen Shakhsuvarov Date: Thu, 15 Oct 2015 19:06:40 +0300 Subject: [PATCH 11/83] MAGETWO-43929: Regression scope functional tests maintenance --- .../GiftMessage/Test/TestStep/AddGiftMessageStep.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/TestStep/AddGiftMessageStep.php b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/TestStep/AddGiftMessageStep.php index 35c7994df9e54..6cb87dd9d4a78 100644 --- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/TestStep/AddGiftMessageStep.php +++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/TestStep/AddGiftMessageStep.php @@ -51,14 +51,16 @@ public function __construct(CheckoutCart $checkoutCart, GiftMessage $giftMessage } /** - * Add gift message to order + * Add gift message to items and/or order. * - * @return void + * @return array */ public function run() { $this->checkoutCart->open(); $this->checkoutCart->getGiftMessagesItemBlock()->fillGiftMessageItem($this->giftMessage, $this->products); $this->checkoutCart->getGiftMessagesOrderBlock()->fillGiftMessageOrder($this->giftMessage, $this->products); + + return ['giftMessage' => $this->giftMessage]; } } From 25e4f7a480841b5277f8621704746cdb2c1aa4af Mon Sep 17 00:00:00 2001 From: Oleh Posyniak Date: Fri, 16 Oct 2015 10:21:40 +0300 Subject: [PATCH 12/83] MAGETWO-42984: Remove Section from Customer Data --- .../Test/TestCase/UpdateCustomerFrontendEntityTest.php | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerFrontendEntityTest.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerFrontendEntityTest.php index 8a31cb657a0b7..63308bbea50d1 100644 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerFrontendEntityTest.php +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerFrontendEntityTest.php @@ -124,12 +124,9 @@ public function test( 'Magento\Customer\Test\TestStep\LoginCustomerOnFrontendStep', ['customer' => $initialCustomer] )->run(); - $this->cmsIndex->getCmsPageBlock()->waitPageInit(); - sleep(3); // TODO: remove after resolving an issue with ajax on Frontend. $this->customerAccountIndex->getInfoBlock()->openEditContactInfo(); $this->customerAccountEdit->getAccountInfoForm()->fill($customer); $this->customerAccountEdit->getAccountInfoForm()->submit(); - $this->cmsIndex->getCmsPageBlock()->waitPageInit(); \PHPUnit_Framework_Assert::assertThat($this->getName(), $assertCustomerInfoSuccessSavedMessage); @@ -137,8 +134,5 @@ public function test( $this->customerAccountIndex->getDashboardAddress()->editBillingAddress(); $this->customerAddressEdit->getEditForm()->fill($address); $this->customerAddressEdit->getEditForm()->saveAddress(); - $this->cmsIndex->getCmsPageBlock()->waitPageInit(); - $this->cmsIndex->getCmsPageBlock()->waitPageInit(); - sleep(3); // TODO: remove after resolving an issue with ajax on Frontend. } } From d38bb2ac935fdbb60386092b2252bee0b06ed53a Mon Sep 17 00:00:00 2001 From: Bohdan Korablov Date: Tue, 20 Oct 2015 15:32:46 +0300 Subject: [PATCH 13/83] MAGETWO-44116: JS bundling file size exceeded --- lib/internal/Magento/Framework/View/Asset/Bundle.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/internal/Magento/Framework/View/Asset/Bundle.php b/lib/internal/Magento/Framework/View/Asset/Bundle.php index 380d87d31155e..d19d667d61216 100644 --- a/lib/internal/Magento/Framework/View/Asset/Bundle.php +++ b/lib/internal/Magento/Framework/View/Asset/Bundle.php @@ -150,7 +150,7 @@ protected function getMaxPartSize(LocalInterface $asset) */ protected function getAssetSize(LocalInterface $asset) { - return mb_strlen(utf8_encode($asset->getContent()), 'utf-8') / 1024; + return mb_strlen(json_encode(utf8_encode($asset->getContent()), JSON_UNESCAPED_SLASHES), 'utf-8') / 1024; } /** From ddf543aba443c336be95db583b8e521d5067e575 Mon Sep 17 00:00:00 2001 From: Olga Lytvynenko Date: Tue, 20 Oct 2015 16:21:35 +0300 Subject: [PATCH 14/83] MAGETWO-44188: "Thumbnails" section is displayed too close to "Reviews" tab on "view Product" Storefront page --- .../Magento/blank/Magento_Catalog/web/css/source/_module.less | 4 ++++ .../Magento/luma/Magento_Catalog/web/css/source/_module.less | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_module.less index d65fc3090a9fa..67d9400be23c9 100644 --- a/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_module.less +++ b/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_module.less @@ -558,9 +558,12 @@ .product-info-main { float: right; } + .product.media { float: left; + margin-bottom: @indent__m; } + .page-layout-1column { .product-info-main { width: 40%; @@ -569,6 +572,7 @@ width: 57%; } } + .page-layout-2columns-left, .page-layout-2columns-right, .page-layout-3columns { diff --git a/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/_module.less index e322d35fe9c55..555101ccdbd5c 100644 --- a/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/_module.less +++ b/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/_module.less @@ -579,9 +579,12 @@ .product-info-main { float: right; } + .product.media { float: left; + margin-bottom: @indent__m; } + .page-layout-1column { .product-info-main { width: 40%; @@ -590,6 +593,7 @@ width: 57%; } } + .page-layout-2columns-left, .page-layout-2columns-right, .page-layout-3columns { From 84372e00efd267586bb716afb3f3142379632809 Mon Sep 17 00:00:00 2001 From: Oleh Posyniak Date: Wed, 21 Oct 2015 10:58:15 +0300 Subject: [PATCH 15/83] MAGETWO-44321: Magento\Email\Model\TemplateTest integration test fails in PHP 7 --- .../Magento/Email/Model/TemplateTest.php | 38 ++++++++++++++++--- 1 file changed, 32 insertions(+), 6 deletions(-) diff --git a/dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php b/dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php index 48d237cd8d627..26e30abc245de 100644 --- a/dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php +++ b/dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php @@ -122,17 +122,19 @@ public function testGetProcessedTemplate() ->getArea(Area::AREA_FRONTEND) ->load(); - $this->setNotDefaultThemeForFixtureStore(); $expectedViewUrl = 'static/frontend/Magento/blank/en_US/Magento_Theme/favicon.ico'; - $this->model->setTemplateText('{{view url="Magento_Theme::favicon.ico"}}'); - $this->assertStringEndsNotWith($expectedViewUrl, $this->model->getProcessedTemplate()); $this->model->setDesignConfig([ 'area' => 'frontend', 'store' => $this->objectManager->get('Magento\Store\Model\StoreManagerInterface') ->getStore('fixturestore') ->getId(), ]); + $this->model->setTemplateText('{{view url="Magento_Theme::favicon.ico"}}'); + $this->setNotDefaultThemeForFixtureStore(); + $this->assertStringEndsNotWith($expectedViewUrl, $this->model->getProcessedTemplate()); + + $this->setDefaultThemeForFixtureStore(); $this->assertStringEndsWith($expectedViewUrl, $this->model->getProcessedTemplate()); } @@ -524,11 +526,33 @@ protected function setUpThemeFallback($area) } /** - * Set 'Magento/luma' for the 'fixturestore' store. + * Set 'Magento/blank' for the 'fixturestore' store. * Application isolation is required, if a test uses this method. */ protected function setNotDefaultThemeForFixtureStore() { + /** @var \Magento\Framework\View\Design\ThemeInterface $theme */ + $theme = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create( + 'Magento\Framework\View\Design\ThemeInterface' + ); + $theme->load('Magento/luma', 'theme_path'); + \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get( + 'Magento\Framework\App\Config\MutableScopeConfigInterface' + )->setValue( + \Magento\Framework\View\DesignInterface::XML_PATH_THEME_ID, + $theme->getId(), + \Magento\Store\Model\ScopeInterface::SCOPE_STORE, + 'fixturestore' + ); + } + + /** + * Set 'Magento/blank' for the 'fixturestore' store. + * Application isolation is required, if a test uses this method. + */ + protected function setDefaultThemeForFixtureStore() + { + /** @var \Magento\Framework\View\Design\ThemeInterface $theme */ $theme = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create( 'Magento\Framework\View\Design\ThemeInterface' ); @@ -554,10 +578,8 @@ public function testGetProcessedTemplateSubject() ->getArea(Area::AREA_FRONTEND) ->load(); - $this->setNotDefaultThemeForFixtureStore(); $expectedViewUrl = 'static/frontend/Magento/blank/en_US/Magento_Theme/favicon.ico'; $this->model->setTemplateSubject('{{view url="Magento_Theme::favicon.ico"}}'); - $this->assertStringEndsNotWith($expectedViewUrl, $this->model->getProcessedTemplateSubject([])); $this->model->setDesignConfig([ 'area' => 'frontend', 'store' => $this->objectManager->get('Magento\Store\Model\StoreManagerInterface') @@ -565,6 +587,10 @@ public function testGetProcessedTemplateSubject() ->getId(), ]); + $this->setNotDefaultThemeForFixtureStore(); + $this->assertStringEndsNotWith($expectedViewUrl, $this->model->getProcessedTemplateSubject([])); + + $this->setDefaultThemeForFixtureStore(); $this->assertStringEndsWith($expectedViewUrl, $this->model->getProcessedTemplateSubject([])); } From 932d984cedfa49816effd38dd3c5c01995d20ddd Mon Sep 17 00:00:00 2001 From: Olga Matviienko Date: Wed, 21 Oct 2015 12:16:07 +0300 Subject: [PATCH 16/83] MAGETWO-44303: "Gift options" block is not aligned on Multishipping Checkout --- .../web/css/source/_module.less | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/app/design/frontend/Magento/blank/Magento_Multishipping/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Multishipping/web/css/source/_module.less index fd2eb640f58f3..9e80d9980430e 100644 --- a/app/design/frontend/Magento/blank/Magento_Multishipping/web/css/source/_module.less +++ b/app/design/frontend/Magento/blank/Magento_Multishipping/web/css/source/_module.less @@ -253,8 +253,8 @@ margin-bottom: @indent__m; } > .primary { - margin-right: 0; margin-bottom: @indent__m; + margin-right: 0; } } } @@ -295,9 +295,19 @@ width: 25%; } .box-shipping-method { - padding-right: @indent__m; padding-left: @indent__m; + padding-right: @indent__m; width: 50%; + .fieldset { + .legend { + &:extend(.abs-reset-left-margin-desktop-s all); + } + .field { + &:before { + display: none; + } + } + } } } From 0b633ca9f7218b1146feae2c3a0e3c821f7a0a96 Mon Sep 17 00:00:00 2001 From: Bohdan Korablov Date: Wed, 21 Oct 2015 12:16:28 +0300 Subject: [PATCH 17/83] MAGETWO-44346: Error in browser console about Captcha on Multi Shipping Flow --- .../frontend/layout/multishipping_checkout.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout.xml b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout.xml index 097574d310747..46ec2dcccadd7 100644 --- a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout.xml +++ b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout.xml @@ -7,6 +7,24 @@ --> + + + + + + + + Magento_Captcha/js/view/checkout/loginCaptcha + additional-login-form-fields + user_login + authenticationPopup + + + + + + + From 441e3f43a52a88efcf458f02c9ffb994baf7dc1b Mon Sep 17 00:00:00 2001 From: Oleh Posyniak Date: Wed, 21 Oct 2015 12:46:03 +0300 Subject: [PATCH 18/83] MAGETWO-44321: Magento\Email\Model\TemplateTest integration test fails in PHP 7 --- .../integration/testsuite/Magento/Email/Model/TemplateTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php b/dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php index 26e30abc245de..5680b57d0fc2c 100644 --- a/dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php +++ b/dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php @@ -526,7 +526,7 @@ protected function setUpThemeFallback($area) } /** - * Set 'Magento/blank' for the 'fixturestore' store. + * Set 'Magento/luma' for the 'fixturestore' store. * Application isolation is required, if a test uses this method. */ protected function setNotDefaultThemeForFixtureStore() From dde0f563f9dbe8625ce559e482bcdbae88b0f7ae Mon Sep 17 00:00:00 2001 From: Olga Matviienko Date: Wed, 21 Oct 2015 16:09:24 +0300 Subject: [PATCH 19/83] MAGETWO-44311: Items in Mini Shopping Cart have action buttons not aligned for Blank Theme --- .../web/css/source/module/_minicart.less | 22 ++--- .../web/css/source/module/_minicart.less | 83 +++++++++---------- 2 files changed, 52 insertions(+), 53 deletions(-) diff --git a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/_minicart.less b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/_minicart.less index fb76486d5287a..a0396d053157f 100644 --- a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/_minicart.less +++ b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/_minicart.less @@ -49,8 +49,6 @@ } .subtitle { display: none; - } - .subtitle { &.empty { display: block; font-size: 14px; @@ -124,10 +122,14 @@ right: 26px; } } - .product.actions { - text-align: right; - > .primary, > .secondary { - display: inline; + .product { + .actions { + float: right; + margin: -24px 0 0; + text-align: right; + > .primary, > .secondary { + display: inline; + } } } @@ -165,7 +167,7 @@ text-align: center; white-space: normal; &.empty { - &:extend(.abs-no-display all); + display: none; } .loader { > img { @@ -184,8 +186,8 @@ } .minicart-items-wrapper { - .lib-css(margin, 0 -@minicart__padding-horizontal); .lib-css(border, 1px solid @minicart__border-color); + .lib-css(margin, 0 -@minicart__padding-horizontal); border-left: 0; border-right: 0; overflow-x: auto; @@ -301,12 +303,12 @@ text-align: center; width: 40px; } - .item-update { + .update-cart-item { .lib-font-size(11); vertical-align: top; } .subtitle { - &:extend(.abs-no-display all); + display: none; } .action { &.edit, diff --git a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_minicart.less b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_minicart.less index e4a039fac1df3..10a28b07bdd6b 100644 --- a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_minicart.less +++ b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_minicart.less @@ -12,7 +12,6 @@ @minicart-qty__height: 24px; - // // Common // _____________________________________________ @@ -52,9 +51,9 @@ display: none; &.empty { display: block; + font-size: 14px; padding: @indent__l 0 @indent__base; text-align: center; - font-size: 14px; } } .text { @@ -95,18 +94,18 @@ .minicart-wrapper { .lib-dropdown( - @_toggle-selector: ~".action.showcart", - @_options-selector: ~".block-minicart", - @_dropdown-toggle-icon-content: @icon-cart, - @_dropdown-toggle-active-icon-content: @icon-cart, - @_dropdown-list-item-padding: false, - @_dropdown-list-item-hover: false, - @_icon-font-position: before, - @_icon-font-size: 22px, - @_icon-font-line-height: 28px, - @_icon-font-color: @minicart-icons-color, - @_icon-font-color-hover: @minicart-icons-color-hover, - @_icon-font-color-active: @minicart-icons-color + @_toggle-selector: ~".action.showcart", + @_options-selector: ~".block-minicart", + @_dropdown-toggle-icon-content: @icon-cart, + @_dropdown-toggle-active-icon-content: @icon-cart, + @_dropdown-list-item-padding: false, + @_dropdown-list-item-hover: false, + @_icon-font-position: before, + @_icon-font-size: 22px, + @_icon-font-line-height: 28px, + @_icon-font-color: @minicart-icons-color, + @_icon-font-color-hover: @minicart-icons-color-hover, + @_icon-font-color-active: @minicart-icons-color ); float: right; .block-minicart { @@ -140,11 +139,11 @@ } .action { &.close { - width: 40px; height: 40px; - top: 0; - right: 0; position: absolute; + right: 0; + top: 0; + width: 40px; .lib-button-reset(); .lib-button-icon( @icon-remove, @@ -155,10 +154,10 @@ ); } &.showcart { + white-space: nowrap; .text { &:extend(.abs-visually-hidden all); } - white-space: nowrap; .counter.qty { .lib-css(background, @active__color); .lib-css(color, @page__background-color); @@ -203,10 +202,10 @@ .minicart-items { .lib-list-reset-styles(); .product-item { + padding: @indent__base 0; &:not(:first-child) { .lib-css(border-top, 1px solid @minicart__border-color); } - padding: @indent__base 0; &:first-child { padding-top: 0; } @@ -260,9 +259,9 @@ .toggle { &:extend(.abs-toggling-title all); &:after { - position: static; - margin: 0 0 0 @indent__xs; .lib-css(color, @color-gray56); + margin: 0 0 0 @indent__xs; + position: static; } border: 0; padding: 0 @indent__xl @indent__xs 0; @@ -281,12 +280,12 @@ &.options { .tooltip.toggle { .lib-icon-font( - @icon-down, - @_icon-font-size: 12px, - @_icon-font-line-height: 12px, - @_icon-font-text-hide: true, - @_icon-font-margin: -3px 0 0 7px, - @_icon-font-position: after + @icon-down, + @_icon-font-size: 12px, + @_icon-font-line-height: 12px, + @_icon-font-text-hide: true, + @_icon-font-margin: -3px 0 0 7px, + @_icon-font-position: after ); } .details { @@ -301,38 +300,37 @@ } } .item-qty { - width: 40px; - text-align: center; margin-right: @indent__s; + text-align: center; + width: 40px; } .update-cart-item { - vertical-align: top; .lib-font-size(11); + vertical-align: top; + } + .subtitle { + display: none; } .action { &.edit, &.delete { .lib-icon-font( - @icon-edit, - @_icon-font-size: 18px, - @_icon-font-line-height: 20px, - @_icon-font-text-hide: true, - @_icon-font-color: @minicart-icons-color, - @_icon-font-color-hover: @primary__color, - @_icon-font-color-active: @minicart-icons-color + @icon-edit, + @_icon-font-size: 18px, + @_icon-font-line-height: 20px, + @_icon-font-text-hide: true, + @_icon-font-color: @minicart-icons-color, + @_icon-font-color-hover: @primary__color, + @_icon-font-color-active: @minicart-icons-color ); } &.delete { .lib-icon-font-symbol( - @_icon-font-content: @icon-trash + @_icon-font-content: @icon-trash ); } } - .subtitle { - display: none; - } } - } // @@ -351,7 +349,6 @@ } } - // // Desktop // _____________________________________________ From cf3c476ac241b139e2d567fde31712be21125a32 Mon Sep 17 00:00:00 2001 From: Oleh Posyniak Date: Wed, 21 Oct 2015 16:25:32 +0300 Subject: [PATCH 20/83] MAGETWO-44306: Backend Page "Find Partners & Extensions" is untranslatable --- .../Marketplace/view/adminhtml/templates/index.phtml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/code/Magento/Marketplace/view/adminhtml/templates/index.phtml b/app/code/Magento/Marketplace/view/adminhtml/templates/index.phtml index 53c60cf1d7a00..df3056645645d 100644 --- a/app/code/Magento/Marketplace/view/adminhtml/templates/index.phtml +++ b/app/code/Magento/Marketplace/view/adminhtml/templates/index.phtml @@ -6,7 +6,7 @@ ?>
-

Platinum Partners

+

Representing Magento's highest level of partner engagement, Magento Platinum Partners have established themselves as @@ -17,7 +17,7 @@ functions, and tools, as well as back-end systems and operations, to extend and enhance the power of the Magento commerce platform.

-

Featured Platinum Partners

+

From 071e731248e17e661dcddc216976c990c4def9cc Mon Sep 17 00:00:00 2001 From: Bohdan Korablov Date: Wed, 21 Oct 2015 16:55:10 +0300 Subject: [PATCH 21/83] MAGETWO-43793: [github] broken references when viewing admin after initial install #1795 --- .../Framework/View/Layout/Data/Structure.php | 19 +++- .../View/Layout/ScheduledStructure/Helper.php | 22 +++- .../Test/Unit/Layout/Data/StructureTest.php | 94 ++++++++++++++++ .../Layout/ScheduledStructure/HelperTest.php | 105 ++++++++++++++++-- 4 files changed, 222 insertions(+), 18 deletions(-) create mode 100644 lib/internal/Magento/Framework/View/Test/Unit/Layout/Data/StructureTest.php diff --git a/lib/internal/Magento/Framework/View/Layout/Data/Structure.php b/lib/internal/Magento/Framework/View/Layout/Data/Structure.php index 79e514b42b23a..643b2cdf9429f 100644 --- a/lib/internal/Magento/Framework/View/Layout/Data/Structure.php +++ b/lib/internal/Magento/Framework/View/Layout/Data/Structure.php @@ -6,6 +6,7 @@ namespace Magento\Framework\View\Layout\Data; use Magento\Framework\Data\Structure as DataStructure; +use Magento\Framework\App\State; /** * An associative data structure, that features "nested set" parent-child relations @@ -24,17 +25,25 @@ class Structure extends DataStructure */ protected $logger; + /** + * @var \Magento\Framework\App\State + */ + protected $state; + /** * Constructor * * @param \Psr\Log\LoggerInterface $logger + * @param \Magento\Framework\App\State $state * @param array $elements */ public function __construct( \Psr\Log\LoggerInterface $logger, + \Magento\Framework\App\State $state, array $elements = null ) { $this->logger = $logger; + $this->state = $state; parent::__construct($elements); } @@ -109,10 +118,12 @@ public function reorderChildElement($parentName, $childName, $offsetOrSibling, $ if ($childName !== $sibling) { $siblingParentName = $this->getParentId($sibling); if ($parentName !== $siblingParentName) { - $this->logger->critical( - "Broken reference: the '{$childName}' tries to reorder itself towards '{$sibling}', but " . - "their parents are different: '{$parentName}' and '{$siblingParentName}' respectively." - ); + if ($this->state->getMode() == State::MODE_DEVELOPER) { + $this->logger->critical( + "Broken reference: the '{$childName}' tries to reorder itself towards '{$sibling}', but " . + "their parents are different: '{$parentName}' and '{$siblingParentName}' respectively." + ); + } return; } $this->reorderToSibling($parentName, $childName, $sibling, $after ? 1 : -1); diff --git a/lib/internal/Magento/Framework/View/Layout/ScheduledStructure/Helper.php b/lib/internal/Magento/Framework/View/Layout/ScheduledStructure/Helper.php index aaa2e5fe1ecdd..e433a42056f0c 100644 --- a/lib/internal/Magento/Framework/View/Layout/ScheduledStructure/Helper.php +++ b/lib/internal/Magento/Framework/View/Layout/ScheduledStructure/Helper.php @@ -6,6 +6,7 @@ namespace Magento\Framework\View\Layout\ScheduledStructure; use Magento\Framework\View\Layout; +use Magento\Framework\App\State; class Helper { @@ -31,13 +32,21 @@ class Helper */ protected $logger; + /** + * @var \Magento\Framework\App\State + */ + protected $state; + /** * @param \Psr\Log\LoggerInterface $logger + * @param \Magento\Framework\App\State $state */ public function __construct( - \Psr\Log\LoggerInterface $logger + \Psr\Log\LoggerInterface $logger, + \Magento\Framework\App\State $state ) { $this->logger = $logger; + $this->state = $state; } /** @@ -190,10 +199,13 @@ public function scheduleElement( } } else { $scheduledStructure->setElementToBrokenParentList($key); - $this->logger->critical( - "Broken reference: the '{$name}' element cannot be added as child to '{$parentName}', " . - 'because the latter doesn\'t exist' - ); + + if ($this->state->getMode() == State::MODE_DEVELOPER) { + $this->logger->critical( + "Broken reference: the '{$name}' element cannot be added as child to '{$parentName}', " . + 'because the latter doesn\'t exist' + ); + } } } diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Data/StructureTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Data/StructureTest.php new file mode 100644 index 0000000000000..b6e836b24416b --- /dev/null +++ b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Data/StructureTest.php @@ -0,0 +1,94 @@ +loggerMock = $this->getMock('Psr\Log\LoggerInterface'); + $this->stateMock = $this->getMock('Magento\Framework\App\State', [], [], '', false); + + $this->objectManagerHelper = new ObjectManagerHelper($this); + $this->dataStructure = $this->objectManagerHelper->getObject( + 'Magento\Framework\View\Layout\Data\Structure', + [ + 'logger' => $this->loggerMock, + 'state' => $this->stateMock + ] + ); + } + + /** + * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $loggerExpects + * @param string $stateMode + * @return void + * @dataProvider reorderChildElementLogDataProvider + */ + public function testReorderChildElementLog($loggerExpects, $stateMode) + { + $parentName = 'parent'; + $childName = 'child'; + $offsetOrSibling = '-'; + + $this->stateMock->expects($this->once()) + ->method('getMode') + ->willReturn($stateMode); + + $this->loggerMock->expects($loggerExpects) + ->method('critical') + ->with("Broken reference: the '{$childName}' tries to reorder itself towards '', but " . + "their parents are different: '{$parentName}' and '' respectively."); + + $this->dataStructure->reorderChildElement($parentName, $childName, $offsetOrSibling); + } + + /** + * @return array + */ + public function reorderChildElementLogDataProvider() + { + return [ + [ + 'loggerExpects' => $this->once(), + 'stateMode' => State::MODE_DEVELOPER + ], + [ + 'loggerExpects' => $this->never(), + 'stateMode' => State::MODE_DEFAULT + ], + [ + 'loggerExpects' => $this->never(), + 'stateMode' => State::MODE_PRODUCTION + ] + ]; + } +} diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Layout/ScheduledStructure/HelperTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Layout/ScheduledStructure/HelperTest.php index 4aeff78304d31..1157ea287774f 100644 --- a/lib/internal/Magento/Framework/View/Test/Unit/Layout/ScheduledStructure/HelperTest.php +++ b/lib/internal/Magento/Framework/View/Test/Unit/Layout/ScheduledStructure/HelperTest.php @@ -7,6 +7,7 @@ namespace Magento\Framework\View\Test\Unit\Layout\ScheduledStructure; use Magento\Framework\View\Layout; +use Magento\Framework\App\State; /** * Class HelperTest @@ -22,7 +23,17 @@ class HelperTest extends \PHPUnit_Framework_TestCase /** * @var \Magento\Framework\View\Layout\Data\Structure|\PHPUnit_Framework_MockObject_MockObject */ - protected $dataStructure; + protected $dataStructureMock; + + /** + * @var \Psr\Log\LoggerInterface|\PHPUnit_Framework_MockObject_MockObject + */ + protected $loggerMock; + + /** + * @var \Magento\Framework\App\State|\PHPUnit_Framework_MockObject_MockObject + */ + protected $stateMock; /** * @var \Magento\Framework\View\Layout\ScheduledStructure\Helper @@ -37,13 +48,20 @@ public function setUp() $this->scheduledStructureMock = $this->getMockBuilder('Magento\Framework\View\Layout\ScheduledStructure') ->disableOriginalConstructor() ->getMock(); - - $this->dataStructure = $this->getMockBuilder('Magento\Framework\View\Layout\Data\Structure') + $this->dataStructureMock = $this->getMockBuilder('Magento\Framework\View\Layout\Data\Structure') ->disableOriginalConstructor() ->getMock(); + $this->loggerMock = $this->getMock('Psr\Log\LoggerInterface'); + $this->stateMock = $this->getMock('Magento\Framework\App\State', [], [], '', false); $helperObjectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this); - $this->helper = $helperObjectManager->getObject('Magento\Framework\View\Layout\ScheduledStructure\Helper'); + $this->helper = $helperObjectManager->getObject( + 'Magento\Framework\View\Layout\ScheduledStructure\Helper', + [ + 'logger' => $this->loggerMock, + 'state' => $this->stateMock + ] + ); } /** @@ -122,7 +140,76 @@ public function testScheduleNonExistentElement() $this->scheduledStructureMock->expects($this->once())->method('unsetPathElement')->with($key); $this->scheduledStructureMock->expects($this->once())->method('unsetStructureElement')->with($key); - $this->helper->scheduleElement($this->scheduledStructureMock, $this->dataStructure, $key); + $this->helper->scheduleElement($this->scheduledStructureMock, $this->dataStructureMock, $key); + } + + /** + * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $loggerExpects + * @param string $stateMode + * @return void + * @dataProvider scheduleElementLogDataProvider + */ + public function testScheduleElementLog($loggerExpects, $stateMode) + { + $key = 'key'; + $parentName = 'parent'; + $alias = 'alias'; + $block = 'block'; + $siblingName = null; + $isAfter = false; + + $this->scheduledStructureMock->expects($this->once()) + ->method('getStructureElement') + ->willReturn( + [ + Layout\ScheduledStructure\Helper::SCHEDULED_STRUCTURE_INDEX_TYPE => $block, + Layout\ScheduledStructure\Helper::SCHEDULED_STRUCTURE_INDEX_ALIAS => $alias, + Layout\ScheduledStructure\Helper::SCHEDULED_STRUCTURE_INDEX_PARENT_NAME => $parentName, + Layout\ScheduledStructure\Helper::SCHEDULED_STRUCTURE_INDEX_SIBLING_NAME => $siblingName, + Layout\ScheduledStructure\Helper::SCHEDULED_STRUCTURE_INDEX_IS_AFTER => $isAfter + ] + ); + $this->scheduledStructureMock->expects($this->once()) + ->method('hasStructureElement') + ->with($parentName) + ->willReturn(false); + + $this->dataStructureMock->expects($this->once()) + ->method('hasElement') + ->with($parentName) + ->willReturn(false); + + $this->stateMock->expects($this->once()) + ->method('getMode') + ->willReturn($stateMode); + + $this->loggerMock->expects($loggerExpects) + ->method('critical') + ->with("Broken reference: the '{$key}' element cannot be added as child to '{$parentName}', " . + 'because the latter doesn\'t exist'); + + $this->helper->scheduleElement($this->scheduledStructureMock, $this->dataStructureMock, $key); + } + + /** + * @return array + */ + public function scheduleElementLogDataProvider() + { + return [ + [ + 'loggerExpects' => $this->once(), + 'stateMode' => State::MODE_DEVELOPER + ], + [ + 'loggerExpects' => $this->never(), + 'stateMode' => State::MODE_DEFAULT + ], + [ + 'loggerExpects' => $this->never(), + 'stateMode' => State::MODE_PRODUCTION + ] + ]; } /** @@ -171,9 +258,9 @@ public function testScheduleElement($hasParent, $setAsChild, $toRemoveList, $sib $this->scheduledStructureMock->expects($this->any())->method('hasStructureElement')->willReturn(true); $this->scheduledStructureMock->expects($this->once())->method('setElement')->with($key, [$block, $data]); - $this->dataStructure->expects($this->once())->method('createElement')->with($key, ['type' => $block]); - $this->dataStructure->expects($this->once())->method('hasElement')->with($parentName)->willReturn($hasParent); - $this->dataStructure->expects($this->exactly($setAsChild)) + $this->dataStructureMock->expects($this->once())->method('createElement')->with($key, ['type' => $block]); + $this->dataStructureMock->expects($this->once())->method('hasElement')->with($parentName)->willReturn($hasParent); + $this->dataStructureMock->expects($this->exactly($setAsChild)) ->method('setAsChild') ->with($key, $parentName, $alias) ->willReturn(true); @@ -185,7 +272,7 @@ public function testScheduleElement($hasParent, $setAsChild, $toRemoveList, $sib ->method('setElementToSortList') ->with($parentName, $key, $siblingName, $isAfter); - $this->helper->scheduleElement($this->scheduledStructureMock, $this->dataStructure, $key); + $this->helper->scheduleElement($this->scheduledStructureMock, $this->dataStructureMock, $key); } /** From 53b49147bd1342951add2e68c4fc28e6f8b0dffa Mon Sep 17 00:00:00 2001 From: Oleh Posyniak Date: Wed, 21 Oct 2015 17:07:49 +0300 Subject: [PATCH 22/83] MAGETWO-44306: Backend Page "Find Partners & Extensions" is untranslatable --- app/code/Magento/Marketplace/i18n/en_US.csv | 8 +++++++ .../view/adminhtml/templates/index.phtml | 22 +++---------------- 2 files changed, 11 insertions(+), 19 deletions(-) create mode 100644 app/code/Magento/Marketplace/i18n/en_US.csv diff --git a/app/code/Magento/Marketplace/i18n/en_US.csv b/app/code/Magento/Marketplace/i18n/en_US.csv new file mode 100644 index 0000000000000..3d18ce49acd77 --- /dev/null +++ b/app/code/Magento/Marketplace/i18n/en_US.csv @@ -0,0 +1,8 @@ +"Platinum Partners","Platinum Partners" +"Representing Magento's highest level of partner engagement, Magento Platinum Partners have established themselves as leaders and innovators of key products and services designed to help merchants and brands grow their business. Magento reserves the Platinum level for select trusted partners that are committed to offering integrations of commerce features, functions, and tools, as well as back-end systems and operations, to extend and enhance the power of the Magento commerce platform.","Representing Magento's highest level of partner engagement, Magento Platinum Partners have established themselves as leaders and innovators of key products and services designed to help merchants and brands grow their business. Magento reserves the Platinum level for select trusted partners that are committed to offering integrations of commerce features, functions, and tools, as well as back-end systems and operations, to extend and enhance the power of the Magento commerce platform." +"Featured Platinum Partners","Featured Platinum Partners" +"Partner search","Partner search" +"Magento has a thriving ecosystem of technology partners to help merchants and brands deliver the best possiblecustomer experiences. They are recognized as experts in eCommerce, search, email marketing, payments, tax, fraud, optimization and analytics, fulfillment, and more. Visit the Magento Partner Directory to see all of our trusted partners.","Magento has a thriving ecosystem of technology partners to help merchants and brands deliver the best possiblecustomer experiences. They are recognized as experts in eCommerce, search, email marketing, payments, tax, fraud, optimization and analytics, fulfillment, and more. Visit the Magento Partner Directory to see all of our trusted partners." +"Magento Marketplace","Magento Marketplace" +"Extensions and Themes are an essential component of the Magento Ecosystem. Please visit the Magento Marketplace to see the latest innovations that developers have created to enhance your Magento Store.","Extensions and Themes are an essential component of the Magento Ecosystem. Please visit the Magento Marketplace to see the latest innovations that developers have created to enhance your Magento Store." +"Visit Magento Marketplaces","Visit Magento Marketplaces" diff --git a/app/code/Magento/Marketplace/view/adminhtml/templates/index.phtml b/app/code/Magento/Marketplace/view/adminhtml/templates/index.phtml index df3056645645d..4b3a62e49d133 100644 --- a/app/code/Magento/Marketplace/view/adminhtml/templates/index.phtml +++ b/app/code/Magento/Marketplace/view/adminhtml/templates/index.phtml @@ -8,14 +8,7 @@

- Representing Magento's highest level of partner engagement, - Magento Platinum Partners have established themselves as - leaders and innovators of key products and services designed - to help merchants and brands grow their business. Magento - reserves the Platinum level for select trusted partners that - are committed to offering integrations of commerce features, - functions, and tools, as well as back-end systems and operations, - to extend and enhance the power of the Magento commerce platform. +

@@ -32,13 +25,7 @@

- Magento has a thriving ecosystem of technology partners to - help merchants and brands deliver the best possible - customer experiences. They are recognized as experts in - eCommerce, search, email marketing, payments, tax, - fraud, optimization and analytics, fulfillment, and more. - Visit the Magento Partner Directory to see all of - our trusted partners. +

@@ -57,10 +44,7 @@

- Extensions and Themes are an essential component of the Magento - Ecosystem. Please visit the Magento Marketplace - to see the latest innovations that developers - have created to enhance your Magento Store. +

From dae56d5b5fdb2d51ac3be93ff625ccd456aa0ac7 Mon Sep 17 00:00:00 2001 From: Bohdan Korablov Date: Wed, 21 Oct 2015 17:15:42 +0300 Subject: [PATCH 23/83] MAGETWO-43793: [github] broken references when viewing admin after initial install #1795 --- .../View/Test/Unit/Layout/Data/StructureTest.php | 9 ++++++--- .../Unit/Layout/ScheduledStructure/HelperTest.php | 11 ++++++++--- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Data/StructureTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Data/StructureTest.php index b6e836b24416b..da88b71ac3884 100644 --- a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Data/StructureTest.php +++ b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Data/StructureTest.php @@ -3,11 +3,12 @@ * Copyright © 2015 Magento. All rights reserved. * See COPYING.txt for license details. */ +namespace Magento\Framework\View\Test\Unit\Layout\Data; use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper; use Magento\Framework\App\State; -class StructureTest extends PHPUnit_Framework_TestCase +class StructureTest extends \PHPUnit_Framework_TestCase { /** * @var \Psr\Log\LoggerInterface|\PHPUnit_Framework_MockObject_MockObject @@ -65,8 +66,10 @@ public function testReorderChildElementLog($loggerExpects, $stateMode) $this->loggerMock->expects($loggerExpects) ->method('critical') - ->with("Broken reference: the '{$childName}' tries to reorder itself towards '', but " . - "their parents are different: '{$parentName}' and '' respectively."); + ->with( + "Broken reference: the '{$childName}' tries to reorder itself towards '', but " . + "their parents are different: '{$parentName}' and '' respectively." + ); $this->dataStructure->reorderChildElement($parentName, $childName, $offsetOrSibling); } diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Layout/ScheduledStructure/HelperTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Layout/ScheduledStructure/HelperTest.php index 1157ea287774f..66bcad039431a 100644 --- a/lib/internal/Magento/Framework/View/Test/Unit/Layout/ScheduledStructure/HelperTest.php +++ b/lib/internal/Magento/Framework/View/Test/Unit/Layout/ScheduledStructure/HelperTest.php @@ -185,8 +185,10 @@ public function testScheduleElementLog($loggerExpects, $stateMode) $this->loggerMock->expects($loggerExpects) ->method('critical') - ->with("Broken reference: the '{$key}' element cannot be added as child to '{$parentName}', " . - 'because the latter doesn\'t exist'); + ->with( + "Broken reference: the '{$key}' element cannot be added as child to '{$parentName}', " . + 'because the latter doesn\'t exist' + ); $this->helper->scheduleElement($this->scheduledStructureMock, $this->dataStructureMock, $key); } @@ -259,7 +261,10 @@ public function testScheduleElement($hasParent, $setAsChild, $toRemoveList, $sib $this->scheduledStructureMock->expects($this->once())->method('setElement')->with($key, [$block, $data]); $this->dataStructureMock->expects($this->once())->method('createElement')->with($key, ['type' => $block]); - $this->dataStructureMock->expects($this->once())->method('hasElement')->with($parentName)->willReturn($hasParent); + $this->dataStructureMock->expects($this->once()) + ->method('hasElement') + ->with($parentName) + ->willReturn($hasParent); $this->dataStructureMock->expects($this->exactly($setAsChild)) ->method('setAsChild') ->with($key, $parentName, $alias) From 13b741c54c0fb77c1d85c0b35a6aa74a6e9687c0 Mon Sep 17 00:00:00 2001 From: Oleh Posyniak Date: Wed, 21 Oct 2015 18:33:34 +0300 Subject: [PATCH 24/83] MAGETWO-44306: Backend Page "Find Partners & Extensions" is untranslatable --- .../view/adminhtml/templates/index.phtml | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/app/code/Magento/Marketplace/view/adminhtml/templates/index.phtml b/app/code/Magento/Marketplace/view/adminhtml/templates/index.phtml index 4b3a62e49d133..4a2301057c6e5 100644 --- a/app/code/Magento/Marketplace/view/adminhtml/templates/index.phtml +++ b/app/code/Magento/Marketplace/view/adminhtml/templates/index.phtml @@ -3,12 +3,18 @@ * Copyright © 2015 Magento. All rights reserved. * See COPYING.txt for license details. */ + +// @codingStandardsIgnoreFile ?>

- +

@@ -25,7 +31,12 @@

- +

@@ -44,7 +55,10 @@

- +

From 3b963bf809989253bc7b220f8063aab631e4644e Mon Sep 17 00:00:00 2001 From: Oleh Posyniak Date: Wed, 21 Oct 2015 18:58:56 +0300 Subject: [PATCH 25/83] MAGETWO-44199: "Choose Files" button is missing on the "Insert File..." popup --- .../backend/web/css/source/components/_file-insertion.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/design/adminhtml/Magento/backend/web/css/source/components/_file-insertion.less b/app/design/adminhtml/Magento/backend/web/css/source/components/_file-insertion.less index cdc66d477555d..9dd4fec9c3c71 100644 --- a/app/design/adminhtml/Magento/backend/web/css/source/components/_file-insertion.less +++ b/app/design/adminhtml/Magento/backend/web/css/source/components/_file-insertion.less @@ -18,7 +18,7 @@ display: none; } input { - -moz-transforms: none; + -moz-transform: none; border: none; opacity: 1; position: static; From 57391a4601642a159a233b93dba9450d78a81dbf Mon Sep 17 00:00:00 2001 From: Oleh Posyniak Date: Wed, 21 Oct 2015 19:05:38 +0300 Subject: [PATCH 26/83] MAGETWO-44306: Backend Page "Find Partners & Extensions" is untranslatable --- app/code/Magento/Marketplace/i18n/en_US.csv | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/code/Magento/Marketplace/i18n/en_US.csv b/app/code/Magento/Marketplace/i18n/en_US.csv index 3d18ce49acd77..88f374fd13df2 100644 --- a/app/code/Magento/Marketplace/i18n/en_US.csv +++ b/app/code/Magento/Marketplace/i18n/en_US.csv @@ -2,7 +2,8 @@ "Representing Magento's highest level of partner engagement, Magento Platinum Partners have established themselves as leaders and innovators of key products and services designed to help merchants and brands grow their business. Magento reserves the Platinum level for select trusted partners that are committed to offering integrations of commerce features, functions, and tools, as well as back-end systems and operations, to extend and enhance the power of the Magento commerce platform.","Representing Magento's highest level of partner engagement, Magento Platinum Partners have established themselves as leaders and innovators of key products and services designed to help merchants and brands grow their business. Magento reserves the Platinum level for select trusted partners that are committed to offering integrations of commerce features, functions, and tools, as well as back-end systems and operations, to extend and enhance the power of the Magento commerce platform." "Featured Platinum Partners","Featured Platinum Partners" "Partner search","Partner search" -"Magento has a thriving ecosystem of technology partners to help merchants and brands deliver the best possiblecustomer experiences. They are recognized as experts in eCommerce, search, email marketing, payments, tax, fraud, optimization and analytics, fulfillment, and more. Visit the Magento Partner Directory to see all of our trusted partners.","Magento has a thriving ecosystem of technology partners to help merchants and brands deliver the best possiblecustomer experiences. They are recognized as experts in eCommerce, search, email marketing, payments, tax, fraud, optimization and analytics, fulfillment, and more. Visit the Magento Partner Directory to see all of our trusted partners." +"Magento has a thriving ecosystem of technology partners to help merchants and brands deliver the best possible customer experiences. They are recognized as experts in eCommerce, search, email marketing, payments, tax, fraud, optimization and analytics, fulfillment, and more. Visit the Magento Partner Directory to see all of our trusted partners.","Magento has a thriving ecosystem of technology partners to help merchants and brands deliver the best possible customer experiences. They are recognized as experts in eCommerce, search, email marketing, payments, tax, fraud, optimization and analytics, fulfillment, and more. Visit the Magento Partner Directory to see all of our trusted partners." +"More Partners","More Partners" "Magento Marketplace","Magento Marketplace" "Extensions and Themes are an essential component of the Magento Ecosystem. Please visit the Magento Marketplace to see the latest innovations that developers have created to enhance your Magento Store.","Extensions and Themes are an essential component of the Magento Ecosystem. Please visit the Magento Marketplace to see the latest innovations that developers have created to enhance your Magento Store." "Visit Magento Marketplaces","Visit Magento Marketplaces" From 219d6ce082edbcf811fb30c030e6e7f5b5ccc643 Mon Sep 17 00:00:00 2001 From: Oleh Posyniak Date: Wed, 21 Oct 2015 19:20:07 +0300 Subject: [PATCH 27/83] MAGETWO-44306: Backend Page "Find Partners & Extensions" is untranslatable --- app/code/Magento/Marketplace/i18n/en_US.csv | 3 +++ .../Marketplace/view/adminhtml/templates/partners.phtml | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/code/Magento/Marketplace/i18n/en_US.csv b/app/code/Magento/Marketplace/i18n/en_US.csv index 88f374fd13df2..7c0bc69e5c695 100644 --- a/app/code/Magento/Marketplace/i18n/en_US.csv +++ b/app/code/Magento/Marketplace/i18n/en_US.csv @@ -7,3 +7,6 @@ "Magento Marketplace","Magento Marketplace" "Extensions and Themes are an essential component of the Magento Ecosystem. Please visit the Magento Marketplace to see the latest innovations that developers have created to enhance your Magento Store.","Extensions and Themes are an essential component of the Magento Ecosystem. Please visit the Magento Marketplace to see the latest innovations that developers have created to enhance your Magento Store." "Visit Magento Marketplaces","Visit Magento Marketplaces" +"Read More","Read More" +"Partner Page","Partner Page" +"No partners were found","No partners were found" diff --git a/app/code/Magento/Marketplace/view/adminhtml/templates/partners.phtml b/app/code/Magento/Marketplace/view/adminhtml/templates/partners.phtml index ae31e3005513a..7787b9d33a47d 100644 --- a/app/code/Magento/Marketplace/view/adminhtml/templates/partners.phtml +++ b/app/code/Magento/Marketplace/view/adminhtml/templates/partners.phtml @@ -23,11 +23,11 @@ $partners = $block->getPartners(); escapeHtml($partner['description']);?>
- Read More +
- Partner Page +

@@ -35,6 +35,6 @@ $partners = $block->getPartners();

- No partners were found +

From 97a997ec3887cedd746fe99163525d8bb2d135eb Mon Sep 17 00:00:00 2001 From: Stanislav Idolov Date: Thu, 22 Oct 2015 12:24:08 +0300 Subject: [PATCH 28/83] MAGETWO-44417: Mini Cart: Can't clear "qty" field with "back space" and "delete" buttons --- .../Checkout/view/frontend/web/js/sidebar.js | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js b/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js index 34501bbeb1078..1f0df987b0284 100644 --- a/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js +++ b/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js @@ -64,6 +64,9 @@ define([ event.stopPropagation(); self._updateItemQty($(event.currentTarget)); }; + events['focusout ' + this.options.item.qty] = function(event) { + self._validateQty($(event.currentTarget)); + }; this._on(this.element, events); this._calcHeight(); @@ -92,7 +95,6 @@ define([ if (this._isValidQty(itemQty, elem.val())) { $('#update-cart-item-' + itemId).show('fade', 300); } else if (elem.val() == 0) { - elem.val(itemQty); this._hideItemButton(elem); } else { this._hideItemButton(elem); @@ -112,6 +114,18 @@ define([ && (changed - 0 > 0); }, + /** + * @param {Object} elem + * @private + */ + _validateQty: function(elem) { + var itemQty = elem.data('item-qty'); + + if (!this._isValidQty(itemQty, elem.val())) { + elem.val(itemQty); + } + }, + _hideItemButton: function(elem) { var itemId = elem.data('cart-item'); $('#update-cart-item-' + itemId).hide('fade', 300); From 3f9889c62c1db55f10c8990585b18b998ba318e9 Mon Sep 17 00:00:00 2001 From: Dmytro Poperechnyy Date: Thu, 22 Oct 2015 13:29:19 +0300 Subject: [PATCH 29/83] MAGETWO-44327: Fatal error trying to create catalog price rule when there is website with no store --- app/code/Magento/CatalogRule/Model/Rule.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/code/Magento/CatalogRule/Model/Rule.php b/app/code/Magento/CatalogRule/Model/Rule.php index 66f3affdcea91..dcd36cfaf3086 100644 --- a/app/code/Magento/CatalogRule/Model/Rule.php +++ b/app/code/Magento/CatalogRule/Model/Rule.php @@ -342,6 +342,10 @@ protected function _getWebsitesMap() $map = []; $websites = $this->_storeManager->getWebsites(true); foreach ($websites as $website) { + // Continue if website has no store to be able to create catalog rule for website without store + if ($website->getDefaultStore() === null) { + continue; + } $map[$website->getId()] = $website->getDefaultStore()->getId(); } return $map; From ef9a1011ba42feb9cd4382a5f20513989e5d75ed Mon Sep 17 00:00:00 2001 From: Stanislav Idolov Date: Thu, 22 Oct 2015 13:42:35 +0300 Subject: [PATCH 30/83] MAGETWO-44391: Credit Card validation is not performed after changing focus from field --- app/code/Magento/Payment/view/frontend/web/transparent.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/code/Magento/Payment/view/frontend/web/transparent.js b/app/code/Magento/Payment/view/frontend/web/transparent.js index 66b3203d7bc51..bbbd6ce1b3aa2 100644 --- a/app/code/Magento/Payment/view/frontend/web/transparent.js +++ b/app/code/Magento/Payment/view/frontend/web/transparent.js @@ -46,6 +46,11 @@ define([ .off('click') .on('click', $.proxy(this._placeOrderHandler, this)); } + + this.element.validation(); + $('[data-container="' + this.options.gateway + '-cc-number"]').on('focusout', function () { + $(this).valid(); + }); }, /** From 8d281be9e2e79d1203794c43f5c2016737c74988 Mon Sep 17 00:00:00 2001 From: Oleh Posyniak Date: Thu, 22 Oct 2015 11:16:44 +0300 Subject: [PATCH 31/83] MAGETWO-44434: Some untranslatable fields in Magento backend --- .../Magento/Backend/Block/Widget/Form.php | 2 +- .../Adminhtml/System/Account/SaveTest.php | 2 +- app/code/Magento/Backend/i18n/en_US.csv | 6 ++++ app/code/Magento/Catalog/i18n/en_US.csv | 20 +++++++++++ app/code/Magento/Developer/i18n/en_US.csv | 36 +++++++++++++++++++ .../Attribute/Frontend/AbstractFrontend.php | 12 ++++++- .../Attribute/Frontend/DatetimeTest.php | 33 +++++++++++++++-- 7 files changed, 106 insertions(+), 5 deletions(-) diff --git a/app/code/Magento/Backend/Block/Widget/Form.php b/app/code/Magento/Backend/Block/Widget/Form.php index 02ef3b1135009..3f258a48ca383 100644 --- a/app/code/Magento/Backend/Block/Widget/Form.php +++ b/app/code/Magento/Backend/Block/Widget/Form.php @@ -187,7 +187,7 @@ protected function _setFieldset($attributes, $fieldset, $exclude = []) $fieldType, [ 'name' => $attribute->getAttributeCode(), - 'label' => $attribute->getFrontend()->getLabel(), + 'label' => $attribute->getFrontend()->getLocalizedLabel(), 'class' => $attribute->getFrontend()->getClass(), 'required' => $attribute->getIsRequired(), 'note' => $attribute->getNote() diff --git a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/System/Account/SaveTest.php b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/System/Account/SaveTest.php index b63c4f1e1a5ad..0262c212175ba 100644 --- a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/System/Account/SaveTest.php +++ b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/System/Account/SaveTest.php @@ -136,7 +136,7 @@ public function testSaveAction() \Magento\Backend\Block\System\Account\Edit\Form::IDENTITY_VERIFICATION_PASSWORD_FIELD => 'current_password', ]; - $testedMessage = 'You saved the account.'; + $testedMessage = __('You saved the account.'); $this->_authSessionMock->expects($this->any())->method('getUser')->will($this->returnValue($this->_userMock)); diff --git a/app/code/Magento/Backend/i18n/en_US.csv b/app/code/Magento/Backend/i18n/en_US.csv index 8bd82b41c2050..98b2dd19f78de 100644 --- a/app/code/Magento/Backend/i18n/en_US.csv +++ b/app/code/Magento/Backend/i18n/en_US.csv @@ -606,3 +606,9 @@ Tags,Tags Options,Options "Magento Admin","Magento Admin" "Community Edition","Community Edition" +"Last Orders","Last Orders" +"Last Search Terms","Last Search Terms" +"Top Search Terms","Top Search Terms" +"Your Password","Your Password" +"You saved the account.","You saved the account." + diff --git a/app/code/Magento/Catalog/i18n/en_US.csv b/app/code/Magento/Catalog/i18n/en_US.csv index 2cfe7083932dd..402e5915ce191 100644 --- a/app/code/Magento/Catalog/i18n/en_US.csv +++ b/app/code/Magento/Catalog/i18n/en_US.csv @@ -630,3 +630,23 @@ Set,Set none,none Overview,Overview "Field ""%1"" was not found in DO ""%2"".","Field ""%1"" was not found in DO ""%2""." +"Is Active","Is Active" +"URL Key","URL Key" +"Description","Description" +"Image","Image" +"Page Title","Page Title" +"Meta Keywords","Meta Keywords" +"Meta Description","Meta Description" +"Include in Navigation Menu","Include in Navigation Menu" +"Display Mode","Display Mode" +"CMS Block","CMS Block" +"Is Anchor","Is Anchor" +"Available Product Listing Sort By","Available Product Listing Sort By" +"Default Product Listing Sort By","Default Product Listing Sort By" +"Layered Navigation Price Step","Layered Navigation Price Step" +"Use Parent Category Settings","Use Parent Category Settings" +"Apply To Products","Apply To Products" +"Active From","Active From" +"Active To","Active To" +"Page Layout","Page Layout" +"Custom Layout Update","Custom Layout Update" diff --git a/app/code/Magento/Developer/i18n/en_US.csv b/app/code/Magento/Developer/i18n/en_US.csv index e69de29bb2d1d..3a1804555a6fc 100644 --- a/app/code/Magento/Developer/i18n/en_US.csv +++ b/app/code/Magento/Developer/i18n/en_US.csv @@ -0,0 +1,36 @@ +"Front-end development workflow","Front-end development workflow" +"Workflow type","Workflow type" +"Not available in production mode","Not available in production mode" +"Developer Client Restrictions","Developer Client Restrictions" +"Allowed IPs (comma separated)","Allowed IPs (comma separated)" +"Leave empty for access from any location.","Leave empty for access from any location." +"Debug","Debug" +"Enabled Template Path Hints for Storefront","Enabled Template Path Hints for Storefront" +"Enabled Template Path Hints for Admin","Enabled Template Path Hints for Admin" +"Add Block Names to Hints","Add Block Names to Hints" +"Template Settings","Template Settings" +"Allow Symlinks","Allow Symlinks" +"Warning! Enabling this feature is not recommended on production environments because it represents a potential security risk.","Warning! Enabling this feature is not recommended on production environments because it represents a potential security risk." +"Minify Html","Minify Html" +"Translate Inline","Translate Inline" +"Enabled for Storefront","Enabled for Storefront" +"Enabled for Admin","Enabled for Admin" +"Translate, blocks and other output caches should be disabled for both Storefront and Admin inline translations.","Translate, blocks and other output caches should be disabled for both Storefront and Admin inline translations." +"JavaScript Settings","JavaScript Settings" +"Enable Javascript Bundling","Enable Javascript Bundling" +"Merge JavaScript Files","Merge JavaScript Files" +"Minify JavaScript Files","Minify JavaScript Files" +"Translation Strategy","Translation Strategy" +"Dictionary (Translation on Storefront side)","Dictionary (Translation on Storefront side)" +"Embedded (Translation on Admin side)","Embedded (Translation on Admin side)" +"Log JS Errors to Session Storage","Log JS Errors to Session Storage" +"Log JS Errors to Session Storage Key","Log JS Errors to Session Storage Key" +"CSS Settings","CSS Settings" +"Merge CSS Files","Merge CSS Files" +"Minify CSS Files","Minify CSS Files" +"Image Processing Settings","Image Processing Settings" +"Image Adapter","Image Adapter" +"Static Files Settings","Static Files Settings" +"Sign Static Files","Sign Static Files" +"Grid Settings","Grid Settings" +"Asynchronous indexing","Asynchronous indexing" diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Frontend/AbstractFrontend.php b/app/code/Magento/Eav/Model/Entity/Attribute/Frontend/AbstractFrontend.php index 65644c94f2605..943cf2d3530de 100644 --- a/app/code/Magento/Eav/Model/Entity/Attribute/Frontend/AbstractFrontend.php +++ b/app/code/Magento/Eav/Model/Entity/Attribute/Frontend/AbstractFrontend.php @@ -70,7 +70,7 @@ public function getInputType() } /** - * Retrieve lable + * Retrieve label * * @return string */ @@ -84,6 +84,16 @@ public function getLabel() return $label; } + /** + * Retrieve localized label + * + * @return \Magento\Framework\Phrase + */ + public function getLocalizedLabel() + { + return __($this->getLabel()); + } + /** * Retrieve attribute value * diff --git a/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Frontend/DatetimeTest.php b/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Frontend/DatetimeTest.php index f28fe8386eee3..03858a596f463 100644 --- a/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Frontend/DatetimeTest.php +++ b/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Frontend/DatetimeTest.php @@ -43,12 +43,11 @@ protected function setUp() $this->attributeMock = $this->getMock( '\Magento\Eav\Model\Entity\Attribute\AbstractAttribute', - [], + ['getAttributeCode', 'getFrontendLabel'], [], '', false ); - $this->attributeMock->expects($this->any())->method('getAttributeCode')->will($this->returnValue('datetime')); $this->model = new Datetime($this->booleanFactoryMock, $this->localeDateMock); $this->model->setAttribute($this->attributeMock); @@ -59,6 +58,7 @@ public function testGetValue() $attributeValue = '11-11-2011'; $date = new \DateTime($attributeValue); $object = new \Magento\Framework\DataObject(['datetime' => $attributeValue]); + $this->attributeMock->expects($this->any())->method('getAttributeCode')->will($this->returnValue('datetime')); $this->attributeMock->expects($this->any())->method('getData')->with('frontend_input') ->will($this->returnValue('text')); @@ -68,4 +68,33 @@ public function testGetValue() $this->assertEquals($attributeValue, $this->model->getValue($object)); } + + /** + * @param mixed $labelText + * @param mixed $attributeCode + * @param string $expectedResult + * @dataProvider getLabelDataProvider + */ + public function testGetLocalizedLabel($labelText, $attributeCode, $expectedResult) { + $this->attributeMock->expects($this->exactly(2)) + ->method('getFrontendLabel') + ->willReturn($labelText); + $this->attributeMock->expects($this->any()) + ->method('getAttributeCode') + ->willReturn($attributeCode); + + $this->assertInstanceOf('\Magento\Framework\Phrase', $this->model->getLocalizedLabel()); + $this->assertSame($expectedResult, (string)$this->model->getLocalizedLabel()); + } + + /** + * @return array + */ + public function getLabelDataProvider() { + return [ + [null, 'test code', 'test code'], + ['', 'test code', 'test code'], + ['test label', 'test code', 'test label'], + ]; + } } From c56ddf41c4e1c58ba005998886dd18f8a14c78d4 Mon Sep 17 00:00:00 2001 From: Bohdan Korablov Date: Thu, 22 Oct 2015 16:33:15 +0300 Subject: [PATCH 32/83] MAGETWO-44146: ERR_TOO_MANY_REDIRECTS after setting "Add Store Code to Urls" and trying to login --- app/etc/di.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/etc/di.xml b/app/etc/di.xml index 598bc2c341ed3..3932bcf133661 100755 --- a/app/etc/di.xml +++ b/app/etc/di.xml @@ -176,7 +176,7 @@ - Magento\Store\App\Request\PathInfoProcessor\Proxy + Magento\Backend\App\Request\PathInfoProcessor\Proxy From 138fd656c5ccd2983d96a6a9076b3524c69463c6 Mon Sep 17 00:00:00 2001 From: Ievgen Shakhsuvarov Date: Thu, 22 Oct 2015 16:45:07 +0300 Subject: [PATCH 33/83] MAGETWO-43929: Regression scope functional tests maintenance --- .../Magento/Catalog/Test/Block/Product/View.php | 9 ++++++++- .../Checkout/Test/Block/Onepage/Payment.php | 17 ++++++++++------- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View.php index 3b8c0dac5ebad..1495125992d31 100755 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View.php +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View.php @@ -49,6 +49,13 @@ class View extends AbstractConfigureBlock */ protected $qty = '#qty'; + /** + * Add to cart form id. + * + * @var string + */ + protected $addToCartForm = '#product_addtocart_form'; + /** * 'Check out with PayPal' button. * @@ -223,7 +230,7 @@ public function setQtyAndClickAddToCart($qty) public function setQty($qty) { $this->_rootElement->find($this->qty)->setValue($qty); - $this->_rootElement->click(); + $this->_rootElement->find($this->addToCartForm)->click(); } /** diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Payment.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Payment.php index 4eb6d81d6f57b..744e5d27fad77 100644 --- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Payment.php +++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Payment.php @@ -82,16 +82,19 @@ class Payment extends Block public function selectPaymentMethod(array $payment, CreditCard $creditCard = null) { $paymentSelector = sprintf($this->paymentMethodInput, $payment['method']); + $paymentLabelSelector = sprintf($this->paymentMethodLabel, $payment['method']); + try { - $this->waitForElementVisible($paymentSelector); - $this->_rootElement->find($paymentSelector)->click(); + $this->waitForElementVisible($paymentLabelSelector); } catch (\Exception $exception) { - $paymentLabel = $this->_rootElement->find(sprintf($this->paymentMethodLabel, $payment['method'])); - $this->waitForElementNotVisible($this->waitElement); - if (!$paymentLabel->isVisible()) { - throw new \Exception('Such payment method is absent.'); - } + throw new \Exception('Such payment method is absent.'); + } + + $paymentRadioButton = $this->_rootElement->find($paymentSelector); + if ($paymentRadioButton->isVisible()) { + $paymentRadioButton->click(); } + if ($payment['method'] == "purchaseorder") { $this->_rootElement->find($this->purchaseOrderNumber)->setValue($payment['po_number']); } From 4966479bf08ffabdb8986fcd8578c21b6e240a77 Mon Sep 17 00:00:00 2001 From: Oleh Posyniak Date: Thu, 22 Oct 2015 17:11:03 +0300 Subject: [PATCH 34/83] MAGETWO-44434: Some untranslatable fields in Magento backend --- .../Unit/Model/Entity/Attribute/Frontend/DatetimeTest.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Frontend/DatetimeTest.php b/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Frontend/DatetimeTest.php index 03858a596f463..4bb5a0fcabe07 100644 --- a/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Frontend/DatetimeTest.php +++ b/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Frontend/DatetimeTest.php @@ -75,7 +75,8 @@ public function testGetValue() * @param string $expectedResult * @dataProvider getLabelDataProvider */ - public function testGetLocalizedLabel($labelText, $attributeCode, $expectedResult) { + public function testGetLocalizedLabel($labelText, $attributeCode, $expectedResult) + { $this->attributeMock->expects($this->exactly(2)) ->method('getFrontendLabel') ->willReturn($labelText); @@ -90,7 +91,8 @@ public function testGetLocalizedLabel($labelText, $attributeCode, $expectedResul /** * @return array */ - public function getLabelDataProvider() { + public function getLabelDataProvider() + { return [ [null, 'test code', 'test code'], ['', 'test code', 'test code'], From b79c09d71c58cae6590661333678a4093df2e981 Mon Sep 17 00:00:00 2001 From: Iryna Lagno Date: Thu, 22 Oct 2015 17:42:53 +0300 Subject: [PATCH 35/83] MAGETWO-44229: There is no ability to load products using *.csv file --- lib/web/mage/validation.js | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/lib/web/mage/validation.js b/lib/web/mage/validation.js index 98240eb8cfa40..36a8db34b3f43 100644 --- a/lib/web/mage/validation.js +++ b/lib/web/mage/validation.js @@ -1167,11 +1167,26 @@ }, 'This is a required field.' ], - 'required-if-all-sku-empty': [ + 'required-if-all-sku-empty-and-file-not-loaded': [ function (value, element, params) { var valid = false; + var alternate = $(params.specifiedId); - $('input[' + params + '=true]').each(function () { + if (alternate.length > 0) { + valid = this.check(alternate); + // if valid, it may be blank, so check for that + if (valid) { + var alternateValue = alternate.val(); + if (typeof alternateValue == 'undefined' || alternateValue.length === 0) { + valid = false; + } + } + } + + if (!valid) + valid = !this.optional(element); + + $('input[' + params.dataSku + '=true]').each(function () { if ($(this).val() !== '') { valid = true; } From 23d629c60872e1b82b885a59487d3c122c044246 Mon Sep 17 00:00:00 2001 From: Ievgen Shakhsuvarov Date: Thu, 22 Oct 2015 17:53:05 +0300 Subject: [PATCH 36/83] MAGETWO-40150: Empty space is displayed in Mini Shopping Cart where the Product was deleted --- app/code/Magento/Checkout/view/frontend/web/js/sidebar.js | 5 +++++ .../Magento/Checkout/view/frontend/web/js/view/minicart.js | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js b/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js index 1f0df987b0284..2600ada8b3cc3 100644 --- a/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js +++ b/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js @@ -163,6 +163,11 @@ define([ * @private */ _removeItemAfter: function(elem, response) { + /** TODO: Extra options support. Should be refactored after MAGETWO-43159. */ + var self = this; + setTimeout(function(){ + self._calcHeight(); + }, 500); }, /** * @param url - ajax url diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/minicart.js b/app/code/Magento/Checkout/view/frontend/web/js/view/minicart.js index 7c4025a51c2e5..933b5725638d6 100644 --- a/app/code/Magento/Checkout/view/frontend/web/js/view/minicart.js +++ b/app/code/Magento/Checkout/view/frontend/web/js/view/minicart.js @@ -74,7 +74,7 @@ define([ initSidebar(); /**TODO: Extra options support. Should be refactored after MAGETWO-43159. */ - setInterval(function(){ + setTimeout(function(){ minicart.trigger('contentUpdated'); }, 500); From 7d565f2bf551b0cda09aa042ff8c2034adbd9b58 Mon Sep 17 00:00:00 2001 From: Oleh Posyniak Date: Fri, 23 Oct 2015 10:22:23 +0300 Subject: [PATCH 37/83] MAGETWO-44434: Some untranslatable fields in Magento backend --- app/code/Magento/Backend/i18n/en_US.csv | 2 +- app/code/Magento/Catalog/i18n/en_US.csv | 1 + app/code/Magento/Developer/i18n/en_US.csv | 4 ++++ .../Unit/Model/Entity/Attribute/Frontend/DatetimeTest.php | 2 +- 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Backend/i18n/en_US.csv b/app/code/Magento/Backend/i18n/en_US.csv index 98b2dd19f78de..8552a7208cddd 100644 --- a/app/code/Magento/Backend/i18n/en_US.csv +++ b/app/code/Magento/Backend/i18n/en_US.csv @@ -611,4 +611,4 @@ Options,Options "Top Search Terms","Top Search Terms" "Your Password","Your Password" "You saved the account.","You saved the account." - +"Current User Identity Verification","Current User Identity Verification" diff --git a/app/code/Magento/Catalog/i18n/en_US.csv b/app/code/Magento/Catalog/i18n/en_US.csv index 402e5915ce191..9dd3eddc752b9 100644 --- a/app/code/Magento/Catalog/i18n/en_US.csv +++ b/app/code/Magento/Catalog/i18n/en_US.csv @@ -650,3 +650,4 @@ Overview,Overview "Active To","Active To" "Page Layout","Page Layout" "Custom Layout Update","Custom Layout Update" +"Name","Name" diff --git a/app/code/Magento/Developer/i18n/en_US.csv b/app/code/Magento/Developer/i18n/en_US.csv index 3a1804555a6fc..1cf1f79536095 100644 --- a/app/code/Magento/Developer/i18n/en_US.csv +++ b/app/code/Magento/Developer/i18n/en_US.csv @@ -34,3 +34,7 @@ "Sign Static Files","Sign Static Files" "Grid Settings","Grid Settings" "Asynchronous indexing","Asynchronous indexing" +"Client side less compilation","Client side less compilation" +"Server side less compilation","Server side less compilation" +"Disable","Disable" +"Enable","Enable" diff --git a/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Frontend/DatetimeTest.php b/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Frontend/DatetimeTest.php index 4bb5a0fcabe07..b8b447086977d 100644 --- a/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Frontend/DatetimeTest.php +++ b/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Frontend/DatetimeTest.php @@ -71,7 +71,7 @@ public function testGetValue() /** * @param mixed $labelText - * @param mixed $attributeCode + * @param string $attributeCode * @param string $expectedResult * @dataProvider getLabelDataProvider */ From 87e6182da52a0f971322f460fae3a488de343199 Mon Sep 17 00:00:00 2001 From: Ievgen Shakhsuvarov Date: Fri, 23 Oct 2015 10:40:19 +0300 Subject: [PATCH 38/83] MAGETWO-44070: [GITHUB] Attribute Code issue #1978 - Changed diagnostic message semantic slightly. --- app/code/Magento/Eav/Model/Entity/Attribute.php | 2 +- app/code/Magento/Eav/Setup/EavSetup.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Eav/Model/Entity/Attribute.php b/app/code/Magento/Eav/Model/Entity/Attribute.php index e26146bc9aa23..2c8cc458caa90 100644 --- a/app/code/Magento/Eav/Model/Entity/Attribute.php +++ b/app/code/Magento/Eav/Model/Entity/Attribute.php @@ -242,7 +242,7 @@ public function beforeSave() ) ) { throw new LocalizedException( - __('An attribute code must be fewer than %1 characters.', self::ATTRIBUTE_CODE_MAX_LENGTH) + __('An attribute code must not be more than %1 characters.', self::ATTRIBUTE_CODE_MAX_LENGTH) ); } diff --git a/app/code/Magento/Eav/Setup/EavSetup.php b/app/code/Magento/Eav/Setup/EavSetup.php index a1dba20110f86..828523bb0c08f 100644 --- a/app/code/Magento/Eav/Setup/EavSetup.php +++ b/app/code/Magento/Eav/Setup/EavSetup.php @@ -728,7 +728,7 @@ private function _validateAttributeData($data) ) ) { throw new LocalizedException( - __('An attribute code must be fewer than %1 characters.', $attributeCodeMaxLength) + __('An attribute code must not be more than %1 characters.', $attributeCodeMaxLength) ); } From 7c787ff66d8636de219c241bac5340925296bca9 Mon Sep 17 00:00:00 2001 From: Valeriy Nayda Date: Fri, 23 Oct 2015 13:51:16 +0300 Subject: [PATCH 39/83] MAGETWO-43973: [HHVM] Functional tests failed on start on HHVM build --- app/code/Magento/ConfigurableProduct/Helper/Data.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/ConfigurableProduct/Helper/Data.php b/app/code/Magento/ConfigurableProduct/Helper/Data.php index 91dd722424219..8ab8a52a9ee65 100644 --- a/app/code/Magento/ConfigurableProduct/Helper/Data.php +++ b/app/code/Magento/ConfigurableProduct/Helper/Data.php @@ -40,7 +40,7 @@ public function getGalleryImages(\Magento\Catalog\Api\Data\ProductInterface $pro { $images = $product->getMediaGalleryImages(); if ($images instanceof \Magento\Framework\Data\Collection) { - foreach ($images as &$image) { + foreach ($images as $image) { /** @var $image \Magento\Catalog\Model\Product\Image */ $image->setData( 'small_image_url', From 5a9dea12544db321bcc34cb058373562b02e302a Mon Sep 17 00:00:00 2001 From: Oleh Posyniak Date: Fri, 23 Oct 2015 15:04:01 +0300 Subject: [PATCH 40/83] MAGETWO-44455: Email Templates - When new email template created, clicking Preview button, display empty page. --- .../Block/Adminhtml/Template/Preview.php | 21 ++-- .../Adminhtml/Email/Template/Preview.php | 3 +- .../Adminhtml/Email/Template/PreviewTest.php | 116 ++++++++++++++++++ .../adminhtml_email_template_preview.xml | 16 +++ .../view/adminhtml/layout/systemPreview.xml | 14 --- .../templates/template/preview.phtml | 2 + 6 files changed, 146 insertions(+), 26 deletions(-) create mode 100644 app/code/Magento/Email/Test/Unit/Controller/Adminhtml/Email/Template/PreviewTest.php create mode 100644 app/code/Magento/Email/view/adminhtml/layout/adminhtml_email_template_preview.xml delete mode 100644 app/code/Magento/Email/view/adminhtml/layout/systemPreview.xml diff --git a/app/code/Magento/Email/Block/Adminhtml/Template/Preview.php b/app/code/Magento/Email/Block/Adminhtml/Template/Preview.php index eb34ed100fd5c..d215d37d7df3a 100644 --- a/app/code/Magento/Email/Block/Adminhtml/Template/Preview.php +++ b/app/code/Magento/Email/Block/Adminhtml/Template/Preview.php @@ -23,6 +23,11 @@ class Preview extends \Magento\Backend\Block\Widget */ protected $_emailFactory; + /** + * @var string + */ + protected $profilerName = 'email_template_proccessing'; + /** * @param \Magento\Backend\Block\Template\Context $context * @param \Magento\Framework\Filter\Input\MaliciousCode $maliciousCode @@ -48,16 +53,10 @@ public function __construct( protected function _toHtml() { $storeId = $this->getAnyStoreView()->getId(); - /** @var $template \Magento\Email\Model\Template */ - $template = $this->_emailFactory->create( - ['data' => [ - 'area' => \Magento\Framework\App\Area::AREA_FRONTEND, - 'store' => $storeId - ]] - ); - $id = (int) $this->getRequest()->getParam('id'); - if ($id) { + $template = $this->_emailFactory->create(); + + if ($id = (int)$this->getRequest()->getParam('id')) { $template->load($id); } else { $template->setTemplateType($this->getRequest()->getParam('type')); @@ -67,7 +66,7 @@ protected function _toHtml() $template->setTemplateText($this->_maliciousCode->filter($template->getTemplateText())); - \Magento\Framework\Profiler::start("email_template_proccessing"); + \Magento\Framework\Profiler::start($this->profilerName); $template->emulateDesign($storeId); $templateProcessed = $this->_appState->emulateAreaCode( @@ -80,7 +79,7 @@ protected function _toHtml() $templateProcessed = "
" . htmlspecialchars($templateProcessed) . "
"; } - \Magento\Framework\Profiler::stop("email_template_proccessing"); + \Magento\Framework\Profiler::stop($this->profilerName); return $templateProcessed; } diff --git a/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Preview.php b/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Preview.php index fceea747f03b9..c85cc7d4a6c48 100644 --- a/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Preview.php +++ b/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Preview.php @@ -16,7 +16,8 @@ class Preview extends \Magento\Email\Controller\Adminhtml\Email\Template public function execute() { try { - $this->_view->loadLayout('systemPreview'); + $this->_view->loadLayout(); + $this->_view->getPage()->getConfig()->getTitle()->prepend(__('Email Preview')); $this->_view->renderLayout(); } catch (\Exception $e) { $this->messageManager->addError(__('An error occurred. The email template can not be opened for preview.')); diff --git a/app/code/Magento/Email/Test/Unit/Controller/Adminhtml/Email/Template/PreviewTest.php b/app/code/Magento/Email/Test/Unit/Controller/Adminhtml/Email/Template/PreviewTest.php new file mode 100644 index 0000000000000..3ea858e356bbe --- /dev/null +++ b/app/code/Magento/Email/Test/Unit/Controller/Adminhtml/Email/Template/PreviewTest.php @@ -0,0 +1,116 @@ +coreRegistryMock = $this->getMockBuilder('Magento\Framework\Registry') + ->disableOriginalConstructor() + ->getMock(); + $this->viewMock = $this->getMockBuilder('Magento\Framework\App\View') + ->disableOriginalConstructor() + ->getMock(); + $this->requestMock = $this->getMockBuilder('Magento\Framework\App\RequestInterface') + ->disableOriginalConstructor() + ->getMock(); + $this->pageMock = $this->getMockBuilder('Magento\Framework\View\Result\Page') + ->disableOriginalConstructor() + ->setMethods(['getConfig']) + ->getMock(); + $this->pageConfigMock = $this->getMockBuilder('Magento\Framework\View\Page\Config') + ->setMethods(['getTitle']) + ->disableOriginalConstructor() + ->getMock(); + $this->pageTitleMock = $this->getMockBuilder('Magento\Framework\View\Page\Title') + ->setMethods(['prepend']) + ->disableOriginalConstructor() + ->getMock(); + + $this->context = $objectManager->getObject('Magento\Backend\App\Action\Context', [ + 'request' => $this->requestMock, + 'view' => $this->viewMock + ]); + $this->object = $objectManager->getObject('Magento\Email\Controller\Adminhtml\Email\Template\Preview', [ + 'context' => $this->context, + 'coreRegistry' => $this->coreRegistryMock, + ]); + } + + public function testExecute() + { + $this->viewMock->expects($this->once()) + ->method('getPage') + ->willReturn($this->pageMock); + $this->pageMock->expects($this->once()) + ->method('getConfig') + ->willReturn($this->pageConfigMock); + $this->pageConfigMock->expects($this->once()) + ->method('getTitle') + ->willReturn($this->pageTitleMock); + $this->pageTitleMock->expects($this->once()) + ->method('prepend') + ->willReturnSelf(); + + $this->assertNull($this->object->execute()); + } +} diff --git a/app/code/Magento/Email/view/adminhtml/layout/adminhtml_email_template_preview.xml b/app/code/Magento/Email/view/adminhtml/layout/adminhtml_email_template_preview.xml new file mode 100644 index 0000000000000..242cda682c53f --- /dev/null +++ b/app/code/Magento/Email/view/adminhtml/layout/adminhtml_email_template_preview.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + diff --git a/app/code/Magento/Email/view/adminhtml/layout/systemPreview.xml b/app/code/Magento/Email/view/adminhtml/layout/systemPreview.xml deleted file mode 100644 index f58984cc6ed62..0000000000000 --- a/app/code/Magento/Email/view/adminhtml/layout/systemPreview.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - diff --git a/app/code/Magento/Email/view/adminhtml/templates/template/preview.phtml b/app/code/Magento/Email/view/adminhtml/templates/template/preview.phtml index d54075edcb69b..c90ad26855528 100644 --- a/app/code/Magento/Email/view/adminhtml/templates/template/preview.phtml +++ b/app/code/Magento/Email/view/adminhtml/templates/template/preview.phtml @@ -3,6 +3,8 @@ * Copyright © 2015 Magento. All rights reserved. * See COPYING.txt for license details. */ + +/* @var $block \Magento\Email\Block\Adminhtml\Template\Preview */ ?> From a086aeb9bfae9b78bfbf21806dab6317f0c7bc21 Mon Sep 17 00:00:00 2001 From: Oleh Posyniak Date: Fri, 23 Oct 2015 15:17:01 +0300 Subject: [PATCH 41/83] MAGETWO-44434: Some untranslatable fields in Magento backend --- .../Entity/Attribute/Frontend/DatetimeTest.php | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Frontend/DatetimeTest.php b/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Frontend/DatetimeTest.php index b8b447086977d..6c1263ef01ece 100644 --- a/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Frontend/DatetimeTest.php +++ b/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Frontend/DatetimeTest.php @@ -38,9 +38,7 @@ protected function setUp() '', false ); - $this->localeDateMock = $this->getMock('\Magento\Framework\Stdlib\DateTime\TimezoneInterface'); - $this->attributeMock = $this->getMock( '\Magento\Eav\Model\Entity\Attribute\AbstractAttribute', ['getAttributeCode', 'getFrontendLabel'], @@ -58,11 +56,16 @@ public function testGetValue() $attributeValue = '11-11-2011'; $date = new \DateTime($attributeValue); $object = new \Magento\Framework\DataObject(['datetime' => $attributeValue]); - $this->attributeMock->expects($this->any())->method('getAttributeCode')->will($this->returnValue('datetime')); - $this->attributeMock->expects($this->any())->method('getData')->with('frontend_input') - ->will($this->returnValue('text')); - $this->localeDateMock->expects($this->once())->method('formatDateTime') + $this->attributeMock->expects($this->any()) + ->method('getAttributeCode') + ->willReturn('datetime'); + $this->attributeMock->expects($this->any()) + ->method('getData') + ->with('frontend_input') + ->willReturn('text'); + $this->localeDateMock->expects($this->once()) + ->method('formatDateTime') ->with($date, \IntlDateFormatter::MEDIUM, \IntlDateFormatter::NONE, null, null, null) ->willReturn($attributeValue); From 5ad2fd694901f1d0e0605cef559bc2c2fd28639f Mon Sep 17 00:00:00 2001 From: Oleksandr Dubovyk Date: Fri, 23 Oct 2015 15:51:54 +0300 Subject: [PATCH 42/83] MAGETWO-38963: Storefront "Layered Navigation" menu items' titles are overlapped by "Expand" button --- .../web/css/source/_module.less | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/app/design/frontend/Magento/blank/Magento_LayeredNavigation/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_LayeredNavigation/web/css/source/_module.less index 8b3d0a38fe55d..679f8c3db46ec 100644 --- a/app/design/frontend/Magento/blank/Magento_LayeredNavigation/web/css/source/_module.less +++ b/app/design/frontend/Magento/blank/Magento_LayeredNavigation/web/css/source/_module.less @@ -11,21 +11,25 @@ .block.filter { margin-bottom: 40px; - .title { + .filter-title { margin-bottom: 20px; strong { font-size: 18px; } } - .subtitle { + .filter-subtitle { display: none; } + .filter-options-title { + word-break: break-all; + } + .filter-options-content { .filter-count-label { &:extend(.abs-visually-hidden all); } } - .options { + .filter-options { margin: 0; > dt { .lib-heading(h4); From f30b5787123e16941ec7b8a5a3638f05e6a19d80 Mon Sep 17 00:00:00 2001 From: Oleksandr Dubovyk Date: Fri, 23 Oct 2015 15:53:51 +0300 Subject: [PATCH 43/83] MAGETWO-38963: Storefront "Layered Navigation" menu items' titles are overlapped by "Expand" button --- .../web/css/source/_module.less | 115 +++++++++--------- 1 file changed, 59 insertions(+), 56 deletions(-) diff --git a/app/design/frontend/Magento/blank/Magento_LayeredNavigation/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_LayeredNavigation/web/css/source/_module.less index 679f8c3db46ec..b1c5b18a4d4de 100644 --- a/app/design/frontend/Magento/blank/Magento_LayeredNavigation/web/css/source/_module.less +++ b/app/design/frontend/Magento/blank/Magento_LayeredNavigation/web/css/source/_module.less @@ -4,79 +4,82 @@ // */ // -// Common -//-------------------------------------- +// Common +// _____________________________________________ & when (@media-common = true) { -.block.filter { - margin-bottom: 40px; - .filter-title { - margin-bottom: 20px; - strong { - font-size: 18px; + .block.filter { + margin-bottom: 40px; + .filter-title { + margin-bottom: 20px; + strong { + font-size: 18px; + } } - } - .filter-subtitle { - display: none; - } - .filter-options-title { - word-break: break-all; - } - .filter-options-content { - .filter-count-label { - &:extend(.abs-visually-hidden all); + .filter-subtitle { + display: none; } - } - .filter-options { - margin: 0; - > dt { - .lib-heading(h4); - margin: 0 0 10px; + + .filter-options-title { + word-break: break-all; } - > dd { - margin: 0 0 25px; - .item { - margin-bottom: 3px; + .filter-options-content { + .filter-count-label { + &:extend(.abs-visually-hidden all); } } - .count { - .lib-css(color, @text__color__muted); - &:before { - content: '('; + + .filter-options { + margin: 0; + > dt { + .lib-heading(h4); + margin: 0 0 10px; + } + > dd { + margin: 0 0 25px; + + .item { + margin-bottom: 3px; + } } - &:after { - content: ')'; + .count { + .lib-css(color, @text__color__muted); + &:before { + content: '('; + } + &:after { + content: ')'; + } } } - } - .items { - &:extend(.abs-reset-list all); - } - .filtered { .items { - margin: 15px 0; + &:extend(.abs-reset-list all); } - .item { - position: relative; - padding-left: 22px; - margin-bottom: 6px; - .label { - font-weight: @font-weight__bold; + + .filtered { + .items { + margin: 15px 0; } - .action.remove { - &:extend(.abs-remove-button-for-blocks all); - position: absolute; - left: -6px; - top: 0; + .item { + margin-bottom: 6px; + padding-left: 22px; + position: relative; + .label { + font-weight: @font-weight__bold; + } + .action.remove { + &:extend(.abs-remove-button-for-blocks all); + left: -6px; + position: absolute; + top: 0; + } + } + & + .actions { + margin-bottom: 35px; } - } - & + .actions { - margin-bottom: 35px; } } } - -} From a189658ce53fdad61cb9970c29ccb4d2ad208d90 Mon Sep 17 00:00:00 2001 From: Oleh Posyniak Date: Fri, 23 Oct 2015 16:16:07 +0300 Subject: [PATCH 44/83] MAGETWO-44455: Email Templates - When new email template created, clicking Preview button, display empty page. --- .../Block/Adminhtml/Template/PreviewTest.php | 46 +++++++++---------- 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/app/code/Magento/Email/Test/Unit/Block/Adminhtml/Template/PreviewTest.php b/app/code/Magento/Email/Test/Unit/Block/Adminhtml/Template/PreviewTest.php index 599c1b81010d4..dbad5f98eaa93 100644 --- a/app/code/Magento/Email/Test/Unit/Block/Adminhtml/Template/PreviewTest.php +++ b/app/code/Magento/Email/Test/Unit/Block/Adminhtml/Template/PreviewTest.php @@ -46,42 +46,38 @@ public function testToHtml($requestParamMap) 'revertDesign' ]) ->disableOriginalConstructor() - ->getMock() - ; + ->getMock(); $template->expects($this->once()) ->method('getProcessedTemplate') ->with($this->equalTo([])) - ->will($this->returnValue(self::MALICIOUS_TEXT)); - $designConfigData = [ - 'area' => \Magento\Framework\App\Area::AREA_FRONTEND, - 'store' => $storeId - ]; + ->willReturn(self::MALICIOUS_TEXT); + $designConfigData = []; $template->expects($this->atLeastOnce()) ->method('getDesignConfig') - ->will($this->returnValue(new \Magento\Framework\DataObject( + ->willReturn(new \Magento\Framework\DataObject( $designConfigData - ))); + )); $emailFactory = $this->getMock('Magento\Email\Model\TemplateFactory', ['create'], [], '', false); $emailFactory->expects($this->once()) ->method('create') - ->with($this->equalTo(['data' => $designConfigData])) - ->will($this->returnValue($template)); + ->with([]) + ->willReturn($template); $request = $this->getMock('Magento\Framework\App\RequestInterface'); - $request->expects($this->any())->method('getParam')->will($this->returnValueMap($requestParamMap)); + $request->expects($this->any())->method('getParam')->willReturnMap($requestParamMap); $eventManage = $this->getMock('Magento\Framework\Event\ManagerInterface'); $scopeConfig = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface'); $design = $this->getMock('Magento\Framework\View\DesignInterface'); $store = $this->getMock('Magento\Store\Model\Store', ['getId', '__wakeup'], [], '', false); - $store->expects($this->any())->method('getId')->will($this->returnValue($storeId)); + $store->expects($this->any())->method('getId')->willReturn($storeId); $storeManager = $this->getMockBuilder('\Magento\Store\Model\StoreManagerInterface') ->disableOriginalConstructor() ->getMock(); $storeManager->expects($this->atLeastOnce()) ->method('getDefaultStoreView') - ->will($this->returnValue($store)); - $storeManager->expects($this->any())->method('getDefaultStoreView')->will($this->returnValue(null)); - $storeManager->expects($this->any())->method('getStores')->will($this->returnValue([$store])); + ->willReturn($store); + $storeManager->expects($this->any())->method('getDefaultStoreView')->willReturn(null); + $storeManager->expects($this->any())->method('getStores')->willReturn([$store]); $appState = $this->getMockBuilder('Magento\Framework\App\State') ->setConstructorArgs([ $scopeConfig @@ -94,12 +90,12 @@ public function testToHtml($requestParamMap) ['getRequest', 'getEventManager', 'getScopeConfig', 'getDesignPackage', 'getStoreManager', 'getAppState'], [], '', false ); - $context->expects($this->any())->method('getRequest')->will($this->returnValue($request)); - $context->expects($this->any())->method('getEventManager')->will($this->returnValue($eventManage)); - $context->expects($this->any())->method('getScopeConfig')->will($this->returnValue($scopeConfig)); - $context->expects($this->any())->method('getDesignPackage')->will($this->returnValue($design)); - $context->expects($this->any())->method('getStoreManager')->will($this->returnValue($storeManager)); - $context->expects($this->once())->method('getAppState')->will($this->returnValue($appState)); + $context->expects($this->any())->method('getRequest')->willReturn($request); + $context->expects($this->any())->method('getEventManager')->willReturn($eventManage); + $context->expects($this->any())->method('getScopeConfig')->willReturn($scopeConfig); + $context->expects($this->any())->method('getDesignPackage')->willReturn($design); + $context->expects($this->any())->method('getStoreManager')->willReturn($storeManager); + $context->expects($this->once())->method('getAppState')->willReturn($appState); $maliciousCode = $this->getMock( 'Magento\Framework\Filter\Input\MaliciousCode', @@ -108,8 +104,10 @@ public function testToHtml($requestParamMap) '', false ); - $maliciousCode->expects($this->once())->method('filter')->with($this->equalTo($requestParamMap[1][2])) - ->will($this->returnValue(self::MALICIOUS_TEXT)); + $maliciousCode->expects($this->once()) + ->method('filter') + ->with($this->equalTo($requestParamMap[1][2])) + ->willReturn(self::MALICIOUS_TEXT); $preview = $this->objectManagerHelper->getObject( 'Magento\Email\Block\Adminhtml\Template\Preview', From 55c0a624f7f698dfc34af3cfe3255e9ff13b01e3 Mon Sep 17 00:00:00 2001 From: Oleh Posyniak Date: Fri, 23 Oct 2015 17:01:06 +0300 Subject: [PATCH 45/83] MAGETWO-44434: Some untranslatable fields in Magento backend --- .../Adminhtml/System/Account/SaveTest.php | 238 +++++++++--------- 1 file changed, 118 insertions(+), 120 deletions(-) diff --git a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/System/Account/SaveTest.php b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/System/Account/SaveTest.php index 0262c212175ba..b36c9a59ab9d4 100644 --- a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/System/Account/SaveTest.php +++ b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/System/Account/SaveTest.php @@ -9,88 +9,105 @@ class SaveTest extends \PHPUnit_Framework_TestCase { - /** @var \Magento\Backend\Controller\Adminhtml\System\Account */ - protected $_controller; - - /** @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\App\RequestInterface */ - protected $_requestMock; - - /** @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\App\ResponseInterface */ - protected $_responseMock; - - /** @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\ObjectManager\ObjectManager */ - protected $_objectManagerMock; - - /** @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\Message\ManagerInterface */ - protected $_messagesMock; - - /** @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Backend\Helper\Data */ - protected $_helperMock; - - /** @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Backend\Model\Auth\Session */ - protected $_authSessionMock; - - /** @var \PHPUnit_Framework_MockObject_MockObject|\Magento\User\Model\User */ - protected $_userMock; - - /** @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\Validator\locale */ - protected $_validatorMock; - - /** @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Backend\Model\Locale\Manager */ - protected $_managerMock; - - /** @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\TranslateInterface */ - protected $_translatorMock; + /** + * @var \Magento\Backend\Controller\Adminhtml\System\Account\Save + */ + protected $controller; + + /** + * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\App\RequestInterface + */ + protected $requestMock; + + /** + * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\App\ResponseInterface + */ + protected $responseMock; + + /** + * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\ObjectManager\ObjectManager + */ + protected $objectManagerMock; + + /** + * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\Message\ManagerInterface + */ + protected $messagesMock; + + /** + * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Backend\Helper\Data + */ + protected $helperMock; + + /** + * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Backend\Model\Auth\Session + */ + protected $authSessionMock; + + /** + * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\User\Model\User + */ + protected $userMock; + + /** + * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\Validator\locale + */ + protected $validatorMock; + + /** + * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Backend\Model\Locale\Manager + */ + protected $managerMock; + + /** + * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\TranslateInterface + */ + protected $translatorMock; protected function setUp() { - $this->_requestMock = $this->getMockBuilder('Magento\Framework\App\Request\Http') + $frontControllerMock = $this->getMockBuilder('Magento\Framework\App\FrontController') + ->disableOriginalConstructor() + ->getMock(); + + $this->requestMock = $this->getMockBuilder('Magento\Framework\App\Request\Http') ->disableOriginalConstructor()->setMethods(['getOriginalPathInfo']) ->getMock(); - $this->_responseMock = $this->getMockBuilder('Magento\Framework\App\Response\Http') + $this->responseMock = $this->getMockBuilder('Magento\Framework\App\Response\Http') ->disableOriginalConstructor() ->setMethods([]) ->getMock(); - $this->_objectManagerMock = $this->getMockBuilder('Magento\Framework\ObjectManager\ObjectManager') + $this->objectManagerMock = $this->getMockBuilder('Magento\Framework\ObjectManager\ObjectManager') ->disableOriginalConstructor() ->setMethods(['get', 'create']) ->getMock(); - $frontControllerMock = $this->getMockBuilder('Magento\Framework\App\FrontController') - ->disableOriginalConstructor() - ->getMock(); - - $this->_helperMock = $this->getMockBuilder('Magento\Backend\Helper\Data') + $this->helperMock = $this->getMockBuilder('Magento\Backend\Helper\Data') ->disableOriginalConstructor() ->setMethods(['getUrl']) ->getMock(); - $this->_messagesMock = $this->getMockBuilder('Magento\Framework\Message\Manager') + $this->messagesMock = $this->getMockBuilder('Magento\Framework\Message\Manager') ->disableOriginalConstructor() ->setMethods(['addSuccess']) ->getMockForAbstractClass(); - - $this->_authSessionMock = $this->getMockBuilder('Magento\Backend\Model\Auth\Session') + $this->authSessionMock = $this->getMockBuilder('Magento\Backend\Model\Auth\Session') ->disableOriginalConstructor() ->setMethods(['getUser']) ->getMock(); - - $this->_userMock = $this->getMockBuilder('Magento\User\Model\User') + $this->userMock = $this->getMockBuilder('Magento\User\Model\User') ->disableOriginalConstructor() ->setMethods( ['load', 'save', 'sendPasswordResetNotificationEmail', 'verifyIdentity', '__sleep', '__wakeup'] ) ->getMock(); - - $this->_validatorMock = $this->getMockBuilder('Magento\Framework\Validator\Locale') + $this->validatorMock = $this->getMockBuilder('Magento\Framework\Validator\Locale') ->disableOriginalConstructor() ->setMethods(['isValid']) ->getMock(); - - $this->_managerMock = $this->getMockBuilder('Magento\Backend\Model\Locale\Manager') + $this->managerMock = $this->getMockBuilder('Magento\Backend\Model\Locale\Manager') ->disableOriginalConstructor() ->setMethods(['switchBackendInterfaceLocale']) ->getMock(); - - $this->_translatorMock = $this->getMockBuilder('Magento\Framework\TranslateInterface') + $this->translatorMock = $this->getMockBuilder('Magento\Framework\TranslateInterface') ->disableOriginalConstructor() ->getMock(); @@ -107,19 +124,19 @@ protected function setUp() ->willReturn($resultRedirect); $contextMock = $this->getMock('Magento\Backend\App\Action\Context', [], [], '', false); - $contextMock->expects($this->any())->method('getRequest')->willReturn($this->_requestMock); - $contextMock->expects($this->any())->method('getResponse')->willReturn($this->_responseMock); - $contextMock->expects($this->any())->method('getObjectManager')->willReturn($this->_objectManagerMock); + $contextMock->expects($this->any())->method('getRequest')->willReturn($this->requestMock); + $contextMock->expects($this->any())->method('getResponse')->willReturn($this->responseMock); + $contextMock->expects($this->any())->method('getObjectManager')->willReturn($this->objectManagerMock); $contextMock->expects($this->any())->method('getFrontController')->willReturn($frontControllerMock); - $contextMock->expects($this->any())->method('getHelper')->willReturn($this->_helperMock); - $contextMock->expects($this->any())->method('getMessageManager')->willReturn($this->_messagesMock); - $contextMock->expects($this->any())->method('getTranslator')->willReturn($this->_translatorMock); + $contextMock->expects($this->any())->method('getHelper')->willReturn($this->helperMock); + $contextMock->expects($this->any())->method('getMessageManager')->willReturn($this->messagesMock); + $contextMock->expects($this->any())->method('getTranslator')->willReturn($this->translatorMock); $contextMock->expects($this->once())->method('getResultFactory')->willReturn($resultFactory); $args = ['context' => $contextMock]; $testHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this); - $this->_controller = $testHelper->getObject('Magento\Backend\Controller\Adminhtml\System\Account\Save', $args); + $this->controller = $testHelper->getObject('Magento\Backend\Controller\Adminhtml\System\Account\Save', $args); } public function testSaveAction() @@ -138,67 +155,48 @@ public function testSaveAction() $testedMessage = __('You saved the account.'); - $this->_authSessionMock->expects($this->any())->method('getUser')->will($this->returnValue($this->_userMock)); - - $this->_userMock->expects($this->any())->method('load')->will($this->returnSelf()); - $this->_validatorMock->expects( - $this->once() - )->method( - 'isValid' - )->with( - $this->equalTo($requestParams['interface_locale']) - )->will( - $this->returnValue(true) - ); - $this->_managerMock->expects($this->any())->method('switchBackendInterfaceLocale'); - - $this->_objectManagerMock->expects( - $this->at(0) - )->method( - 'get' - )->with( - $this->equalTo('Magento\Backend\Model\Auth\Session') - )->will( - $this->returnValue($this->_authSessionMock) - ); - $this->_objectManagerMock->expects( - $this->at(1) - )->method( - 'create' - )->with( - $this->equalTo('Magento\User\Model\User') - )->will( - $this->returnValue($this->_userMock) - ); - $this->_objectManagerMock->expects( - $this->at(2) - )->method( - 'get' - )->with( - $this->equalTo('Magento\Framework\Validator\Locale') - )->will( - $this->returnValue($this->_validatorMock) - ); - $this->_objectManagerMock->expects( - $this->at(3) - )->method( - 'get' - )->with( - $this->equalTo('Magento\Backend\Model\Locale\Manager') - )->will( - $this->returnValue($this->_managerMock) - ); - - $this->_userMock->setUserId($userId); - - $this->_userMock->expects($this->once())->method('save'); - $this->_userMock->expects($this->once())->method('verifyIdentity')->will($this->returnValue(true)); - $this->_userMock->expects($this->once())->method('sendPasswordResetNotificationEmail'); - - $this->_requestMock->setParams($requestParams); - - $this->_messagesMock->expects($this->once())->method('addSuccess')->with($this->equalTo($testedMessage)); - - $this->_controller->execute(); + $this->authSessionMock->expects($this->any()) + ->method('getUser') + ->willReturn($this->userMock); + $this->userMock->expects($this->any()) + ->method('load') + ->will($this->returnSelf()); + $this->validatorMock->expects($this->once()) + ->method('isValid') + ->with($this->equalTo($requestParams['interface_locale'])) + ->willReturn(true); + $this->managerMock->expects($this->any()) + ->method('switchBackendInterfaceLocale'); + $this->objectManagerMock->expects($this->at(0)) + ->method('get') + ->with($this->equalTo('Magento\Backend\Model\Auth\Session')) + ->willReturn($this->authSessionMock); + $this->objectManagerMock->expects($this->at(1)) + ->method('create') + ->with($this->equalTo('Magento\User\Model\User')) + ->willReturn($this->userMock); + $this->objectManagerMock->expects($this->at(2)) + ->method('get') + ->with($this->equalTo('Magento\Framework\Validator\Locale')) + ->willReturn($this->validatorMock); + $this->objectManagerMock->expects($this->at(3)) + ->method('get') + ->with($this->equalTo('Magento\Backend\Model\Locale\Manager')) + ->willReturn($this->managerMock); + $this->userMock->expects($this->once()) + ->method('save'); + $this->userMock->expects($this->once()) + ->method('verifyIdentity') + ->willReturn(true); + $this->userMock->expects($this->once()) + ->method('sendPasswordResetNotificationEmail'); + $this->messagesMock->expects($this->once()) + ->method('addSuccess') + ->with($this->equalTo($testedMessage)); + + $this->userMock->setUserId($userId); + $this->requestMock->setParams($requestParams); + + $this->controller->execute(); } } From d4a33b38b2829143af863cd3330ecb3578df5b66 Mon Sep 17 00:00:00 2001 From: Iryna Lagno Date: Fri, 23 Oct 2015 17:21:27 +0300 Subject: [PATCH 46/83] MAGETWO-44453: Required address attribute is not require for checkout flow --- .../Checkout/view/frontend/web/js/view/billing-address.js | 3 +++ .../Magento/Checkout/view/frontend/web/js/view/shipping.js | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/billing-address.js b/app/code/Magento/Checkout/view/frontend/web/js/view/billing-address.js index b69365ebc0f17..4c77250a87237 100644 --- a/app/code/Magento/Checkout/view/frontend/web/js/view/billing-address.js +++ b/app/code/Magento/Checkout/view/frontend/web/js/view/billing-address.js @@ -145,6 +145,9 @@ define( } else { this.source.set('params.invalid', false); this.source.trigger(this.dataScopePrefix + '.data.validate'); + if (this.source.get('billingAddress.custom_attributes')) { + this.source.trigger('billingAddress.custom_attributes.data.validate'); + }; if (!this.source.get('params.invalid')) { var addressData = this.source.get(this.dataScopePrefix), 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 index 562266434dd89..e650f6269c910 100644 --- a/app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js +++ b/app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js @@ -201,7 +201,7 @@ define( } }, - validateShippingInformation: function() { + validateShippingInformation: function () { var shippingAddress, addressData, loginFormSelector = 'form[data-role=email-with-possible-login]', @@ -224,6 +224,9 @@ define( if (this.isFormInline) { this.source.set('params.invalid', false); this.source.trigger('shippingAddress.data.validate'); + if (this.source.get('shippingAddress.custom_attributes')) { + this.source.trigger('shippingAddress.custom_attributes.data.validate'); + }; if (this.source.get('params.invalid') || !quote.shippingMethod().method_code || !quote.shippingMethod().carrier_code From d3c5d3715744c871e52f4e67bc83f0054053a689 Mon Sep 17 00:00:00 2001 From: Stanislav Idolov Date: Fri, 23 Oct 2015 17:21:21 +0300 Subject: [PATCH 47/83] MAGETWO-39588: store_id value is not honored when creating simple product through API in multi-websites / multi-stores setup --- .../Catalog/Model/ProductRepository.php | 7 +++- .../Model/Indexer/Fulltext/Plugin/Product.php | 34 +++++++++++++------ app/code/Magento/CatalogSearch/etc/di.xml | 2 +- 3 files changed, 31 insertions(+), 12 deletions(-) diff --git a/app/code/Magento/Catalog/Model/ProductRepository.php b/app/code/Magento/Catalog/Model/ProductRepository.php index ccd62fb3d3361..42923ef4310df 100644 --- a/app/code/Magento/Catalog/Model/ProductRepository.php +++ b/app/code/Magento/Catalog/Model/ProductRepository.php @@ -286,7 +286,12 @@ protected function initializeProductData(array $productData, $createNew) if ($createNew) { $product = $this->productFactory->create(); if ($this->storeManager->hasSingleStore()) { - $product->setWebsiteIds([$this->storeManager->getStore(true)->getWebsite()->getId()]); + $product->setWebsiteIds([$this->storeManager->getStore(true)->getWebsiteId()]); + } elseif (isset($productData['store_id']) + && !empty($productData['store_id']) + && $this->storeManager->getStore($productData['store_id']) + ) { + $product->setWebsiteIds([$this->storeManager->getStore($productData['store_id'])->getWebsiteId()]); } } else { unset($this->instances[$productData['sku']]); diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Product.php b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Product.php index 04c89e9ecf23d..ad68fe0899878 100644 --- a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Product.php +++ b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Product.php @@ -11,24 +11,38 @@ class Product extends AbstractPlugin /** * Reindex on product save * - * @param \Magento\Catalog\Model\Product $product - * @return \Magento\Catalog\Model\Product + * @param \Magento\Catalog\Model\ResourceModel\Product $productResource + * @param \Closure $proceed + * @param \Magento\Framework\Model\AbstractModel $product + * @return \Magento\Catalog\Model\ResourceModel\Product + * @SuppressWarnings(PHPMD.UnusedFormalParameter) */ - public function afterSave(\Magento\Catalog\Model\Product $product) - { + public function aroundSave( + \Magento\Catalog\Model\ResourceModel\Product $productResource, + \Closure $proceed, + \Magento\Framework\Model\AbstractModel $product + ) { + $result = $proceed($product); $this->reindexRow($product->getId()); - return $product; + return $result; } /** * Reindex on product delete * - * @param \Magento\Catalog\Model\Product $product - * @return \Magento\Catalog\Model\Product + * @param \Magento\Catalog\Model\ResourceModel\Product $productResource + * @param \Closure $proceed + * @param \Magento\Framework\Model\AbstractModel $product + * @return \Magento\Catalog\Model\ResourceModel\Product + * @SuppressWarnings(PHPMD.UnusedFormalParameter) */ - public function afterDelete(\Magento\Catalog\Model\Product $product) - { + public function aroundDelete( + \Magento\Catalog\Model\ResourceModel\Product $productResource, + \Closure $proceed, + \Magento\Framework\Model\AbstractModel $product + ) { + $result = $proceed($product); $this->reindexRow($product->getId()); - return $product; + return $result; } } diff --git a/app/code/Magento/CatalogSearch/etc/di.xml b/app/code/Magento/CatalogSearch/etc/di.xml index adc76b143fa3e..815f2b223f04e 100644 --- a/app/code/Magento/CatalogSearch/etc/di.xml +++ b/app/code/Magento/CatalogSearch/etc/di.xml @@ -33,7 +33,7 @@ - + From f13116fab67f3bbbde358feb87ec31cdcde8bd4d Mon Sep 17 00:00:00 2001 From: Stanislav Idolov Date: Fri, 23 Oct 2015 17:37:38 +0300 Subject: [PATCH 48/83] MAGETWO-39588: store_id value is not honored when creating simple product through API in multi-websites / multi-stores setup --- .../Indexer/Fulltext/Plugin/ProductTest.php | 49 ++++++++++++++----- 1 file changed, 37 insertions(+), 12 deletions(-) diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/Indexer/Fulltext/Plugin/ProductTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/Indexer/Fulltext/Plugin/ProductTest.php index 49f37b71f1a10..cb6c83ea3dc45 100644 --- a/app/code/Magento/CatalogSearch/Test/Unit/Model/Indexer/Fulltext/Plugin/ProductTest.php +++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/Indexer/Fulltext/Plugin/ProductTest.php @@ -16,10 +16,20 @@ class ProductTest extends \PHPUnit_Framework_TestCase protected $indexerMock; /** - * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Catalog\Model\Product + * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Catalog\Model\ResourceModel\Product */ protected $subjectMock; + /** + * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Catalog\Model\Product + */ + protected $productMock; + + /** + * @var \Closure + */ + protected $proceed; + /** * @var \Magento\Framework\Indexer\IndexerRegistry|\PHPUnit_Framework_MockObject_MockObject */ @@ -32,8 +42,8 @@ class ProductTest extends \PHPUnit_Framework_TestCase protected function setUp() { - $this->subjectMock = $this->getMock('Magento\Catalog\Model\Product', [], [], '', false); - + $this->productMock = $this->getMock('Magento\Catalog\Model\Product', [], [], '', false); + $this->subjectMock = $this->getMock('Magento\Catalog\Model\ResourceModel\Product', [], [], '', false); $this->indexerMock = $this->getMockForAbstractClass( 'Magento\Framework\Indexer\IndexerInterface', [], @@ -43,7 +53,6 @@ protected function setUp() true, ['getId', 'getState', '__wakeup'] ); - $this->indexerRegistryMock = $this->getMock( 'Magento\Framework\Indexer\IndexerRegistry', ['get'], @@ -52,6 +61,10 @@ protected function setUp() false ); + $this->proceed = function () { + return $this->subjectMock; + }; + $this->model = new Product($this->indexerRegistryMock); } @@ -61,9 +74,12 @@ public function testAfterSaveNonScheduled() $this->indexerMock->expects($this->once())->method('reindexRow')->with(1); $this->prepareIndexer(); - $this->subjectMock->expects($this->once())->method('getId')->will($this->returnValue(1)); + $this->productMock->expects($this->once())->method('getId')->will($this->returnValue(1)); - $this->assertEquals($this->subjectMock, $this->model->afterSave($this->subjectMock)); + $this->assertEquals( + $this->subjectMock, + $this->model->aroundSave($this->subjectMock, $this->proceed, $this->productMock) + ); } public function testAfterSaveScheduled() @@ -72,9 +88,12 @@ public function testAfterSaveScheduled() $this->indexerMock->expects($this->never())->method('reindexRow'); $this->prepareIndexer(); - $this->subjectMock->expects($this->once())->method('getId')->will($this->returnValue(1)); + $this->productMock->expects($this->once())->method('getId')->will($this->returnValue(1)); - $this->assertEquals($this->subjectMock, $this->model->afterSave($this->subjectMock)); + $this->assertEquals( + $this->subjectMock, + $this->model->aroundSave($this->subjectMock, $this->proceed, $this->productMock) + ); } public function testAfterDeleteNonScheduled() @@ -83,9 +102,12 @@ public function testAfterDeleteNonScheduled() $this->indexerMock->expects($this->once())->method('reindexRow')->with(1); $this->prepareIndexer(); - $this->subjectMock->expects($this->once())->method('getId')->will($this->returnValue(1)); + $this->productMock->expects($this->once())->method('getId')->will($this->returnValue(1)); - $this->assertEquals($this->subjectMock, $this->model->afterDelete($this->subjectMock)); + $this->assertEquals( + $this->subjectMock, + $this->model->aroundDelete($this->subjectMock, $this->proceed, $this->productMock) + ); } public function testAfterDeleteScheduled() @@ -94,9 +116,12 @@ public function testAfterDeleteScheduled() $this->indexerMock->expects($this->never())->method('reindexRow'); $this->prepareIndexer(); - $this->subjectMock->expects($this->once())->method('getId')->will($this->returnValue(1)); + $this->productMock->expects($this->once())->method('getId')->will($this->returnValue(1)); - $this->assertEquals($this->subjectMock, $this->model->afterDelete($this->subjectMock)); + $this->assertEquals( + $this->subjectMock, + $this->model->aroundDelete($this->subjectMock, $this->proceed, $this->productMock) + ); } protected function prepareIndexer() From cd29c58c5eee006372e43500ecb95e5d0b4258d0 Mon Sep 17 00:00:00 2001 From: Oleh Posyniak Date: Fri, 23 Oct 2015 18:07:25 +0300 Subject: [PATCH 49/83] MAGETWO-44455: Email Templates - When new email template created, clicking Preview button, display empty page. --- .../Email/Test/Unit/Block/Adminhtml/Template/PreviewTest.php | 4 ++-- .../Unit/Controller/Adminhtml/Email/Template/PreviewTest.php | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/code/Magento/Email/Test/Unit/Block/Adminhtml/Template/PreviewTest.php b/app/code/Magento/Email/Test/Unit/Block/Adminhtml/Template/PreviewTest.php index dbad5f98eaa93..3a7d91dfefb72 100644 --- a/app/code/Magento/Email/Test/Unit/Block/Adminhtml/Template/PreviewTest.php +++ b/app/code/Magento/Email/Test/Unit/Block/Adminhtml/Template/PreviewTest.php @@ -58,9 +58,8 @@ public function testToHtml($requestParamMap) $designConfigData )); $emailFactory = $this->getMock('Magento\Email\Model\TemplateFactory', ['create'], [], '', false); - $emailFactory->expects($this->once()) + $emailFactory->expects($this->any()) ->method('create') - ->with([]) ->willReturn($template); $request = $this->getMock('Magento\Framework\App\RequestInterface'); @@ -109,6 +108,7 @@ public function testToHtml($requestParamMap) ->with($this->equalTo($requestParamMap[1][2])) ->willReturn(self::MALICIOUS_TEXT); + /** @var \Magento\Email\Block\Adminhtml\Template\Preview $preview */ $preview = $this->objectManagerHelper->getObject( 'Magento\Email\Block\Adminhtml\Template\Preview', [ diff --git a/app/code/Magento/Email/Test/Unit/Controller/Adminhtml/Email/Template/PreviewTest.php b/app/code/Magento/Email/Test/Unit/Controller/Adminhtml/Email/Template/PreviewTest.php index 3ea858e356bbe..59fccebfe3858 100644 --- a/app/code/Magento/Email/Test/Unit/Controller/Adminhtml/Email/Template/PreviewTest.php +++ b/app/code/Magento/Email/Test/Unit/Controller/Adminhtml/Email/Template/PreviewTest.php @@ -71,7 +71,6 @@ protected function setUp() ->disableOriginalConstructor() ->getMock(); $this->requestMock = $this->getMockBuilder('Magento\Framework\App\RequestInterface') - ->disableOriginalConstructor() ->getMock(); $this->pageMock = $this->getMockBuilder('Magento\Framework\View\Result\Page') ->disableOriginalConstructor() From b74a6ff0f2ad7e5105960ed4a79b6395a472a752 Mon Sep 17 00:00:00 2001 From: Bohdan Korablov Date: Fri, 23 Oct 2015 18:11:01 +0300 Subject: [PATCH 50/83] MAGETWO-43793: [github] broken references when viewing admin after initial install #1795 --- .../Magento/Framework/View/Layout/Data/Structure.php | 8 ++++---- .../Framework/View/Layout/ScheduledStructure/Helper.php | 6 +++--- .../View/Test/Unit/Layout/Data/StructureTest.php | 3 +-- .../Test/Unit/Layout/ScheduledStructure/HelperTest.php | 7 +------ 4 files changed, 9 insertions(+), 15 deletions(-) diff --git a/lib/internal/Magento/Framework/View/Layout/Data/Structure.php b/lib/internal/Magento/Framework/View/Layout/Data/Structure.php index 643b2cdf9429f..ee2fe6bd206a8 100644 --- a/lib/internal/Magento/Framework/View/Layout/Data/Structure.php +++ b/lib/internal/Magento/Framework/View/Layout/Data/Structure.php @@ -26,7 +26,7 @@ class Structure extends DataStructure protected $logger; /** - * @var \Magento\Framework\App\State + * @var State */ protected $state; @@ -34,12 +34,12 @@ class Structure extends DataStructure * Constructor * * @param \Psr\Log\LoggerInterface $logger - * @param \Magento\Framework\App\State $state + * @param State $state * @param array $elements */ public function __construct( \Psr\Log\LoggerInterface $logger, - \Magento\Framework\App\State $state, + State $state, array $elements = null ) { $this->logger = $logger; @@ -118,7 +118,7 @@ public function reorderChildElement($parentName, $childName, $offsetOrSibling, $ if ($childName !== $sibling) { $siblingParentName = $this->getParentId($sibling); if ($parentName !== $siblingParentName) { - if ($this->state->getMode() == State::MODE_DEVELOPER) { + if ($this->state->getMode() === State::MODE_DEVELOPER) { $this->logger->critical( "Broken reference: the '{$childName}' tries to reorder itself towards '{$sibling}', but " . "their parents are different: '{$parentName}' and '{$siblingParentName}' respectively." diff --git a/lib/internal/Magento/Framework/View/Layout/ScheduledStructure/Helper.php b/lib/internal/Magento/Framework/View/Layout/ScheduledStructure/Helper.php index e433a42056f0c..07d6f688e1550 100644 --- a/lib/internal/Magento/Framework/View/Layout/ScheduledStructure/Helper.php +++ b/lib/internal/Magento/Framework/View/Layout/ScheduledStructure/Helper.php @@ -39,11 +39,11 @@ class Helper /** * @param \Psr\Log\LoggerInterface $logger - * @param \Magento\Framework\App\State $state + * @param State $state */ public function __construct( \Psr\Log\LoggerInterface $logger, - \Magento\Framework\App\State $state + State $state ) { $this->logger = $logger; $this->state = $state; @@ -200,7 +200,7 @@ public function scheduleElement( } else { $scheduledStructure->setElementToBrokenParentList($key); - if ($this->state->getMode() == State::MODE_DEVELOPER) { + if ($this->state->getMode() === State::MODE_DEVELOPER) { $this->logger->critical( "Broken reference: the '{$name}' element cannot be added as child to '{$parentName}', " . 'because the latter doesn\'t exist' diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Data/StructureTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Data/StructureTest.php index da88b71ac3884..f5d47e87b95cd 100644 --- a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Data/StructureTest.php +++ b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Data/StructureTest.php @@ -16,7 +16,7 @@ class StructureTest extends \PHPUnit_Framework_TestCase protected $loggerMock; /** - * @var \Magento\Framework\App\State|\PHPUnit_Framework_MockObject_MockObject + * @var State|\PHPUnit_Framework_MockObject_MockObject */ protected $stateMock; @@ -63,7 +63,6 @@ public function testReorderChildElementLog($loggerExpects, $stateMode) $this->stateMock->expects($this->once()) ->method('getMode') ->willReturn($stateMode); - $this->loggerMock->expects($loggerExpects) ->method('critical') ->with( diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Layout/ScheduledStructure/HelperTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Layout/ScheduledStructure/HelperTest.php index 66bcad039431a..82619fa03d207 100644 --- a/lib/internal/Magento/Framework/View/Test/Unit/Layout/ScheduledStructure/HelperTest.php +++ b/lib/internal/Magento/Framework/View/Test/Unit/Layout/ScheduledStructure/HelperTest.php @@ -31,7 +31,7 @@ class HelperTest extends \PHPUnit_Framework_TestCase protected $loggerMock; /** - * @var \Magento\Framework\App\State|\PHPUnit_Framework_MockObject_MockObject + * @var State|\PHPUnit_Framework_MockObject_MockObject */ protected $stateMock; @@ -173,16 +173,13 @@ public function testScheduleElementLog($loggerExpects, $stateMode) ->method('hasStructureElement') ->with($parentName) ->willReturn(false); - $this->dataStructureMock->expects($this->once()) ->method('hasElement') ->with($parentName) ->willReturn(false); - $this->stateMock->expects($this->once()) ->method('getMode') ->willReturn($stateMode); - $this->loggerMock->expects($loggerExpects) ->method('critical') ->with( @@ -259,7 +256,6 @@ public function testScheduleElement($hasParent, $setAsChild, $toRemoveList, $sib ); $this->scheduledStructureMock->expects($this->any())->method('hasStructureElement')->willReturn(true); $this->scheduledStructureMock->expects($this->once())->method('setElement')->with($key, [$block, $data]); - $this->dataStructureMock->expects($this->once())->method('createElement')->with($key, ['type' => $block]); $this->dataStructureMock->expects($this->once()) ->method('hasElement') @@ -269,7 +265,6 @@ public function testScheduleElement($hasParent, $setAsChild, $toRemoveList, $sib ->method('setAsChild') ->with($key, $parentName, $alias) ->willReturn(true); - $this->scheduledStructureMock->expects($this->exactly($toRemoveList)) ->method('setElementToBrokenParentList') ->with($key); From 7d032ee1149fc2143b70921031af159f87536482 Mon Sep 17 00:00:00 2001 From: Bohdan Korablov Date: Fri, 23 Oct 2015 18:18:44 +0300 Subject: [PATCH 51/83] MAGETWO-43793: [github] broken references when viewing admin after initial install #1795 --- .../Magento/Framework/View/Layout/ScheduledStructure/Helper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/internal/Magento/Framework/View/Layout/ScheduledStructure/Helper.php b/lib/internal/Magento/Framework/View/Layout/ScheduledStructure/Helper.php index 07d6f688e1550..c71c27beeb470 100644 --- a/lib/internal/Magento/Framework/View/Layout/ScheduledStructure/Helper.php +++ b/lib/internal/Magento/Framework/View/Layout/ScheduledStructure/Helper.php @@ -33,7 +33,7 @@ class Helper protected $logger; /** - * @var \Magento\Framework\App\State + * @var State */ protected $state; From af9504a901aff2ad4cf4809479bd837639368733 Mon Sep 17 00:00:00 2001 From: Michail Slabko Date: Fri, 23 Oct 2015 18:26:27 +0300 Subject: [PATCH 52/83] MAGETWO-44460: Wrong price conversation for Configurable product --- .../Block/Product/View/Type/Configurable.php | 33 ++------- .../Model/Product/Type/Configurable/Price.php | 28 +++++--- .../Pricing/Price/BasePrice.php | 68 ------------------- .../Price/ConfigurablePriceResolver.php | 24 +++---- .../Price/ConfigurableRegularPrice.php | 12 ++-- .../Pricing/Price/FinalPrice.php | 19 +----- .../Product/Type/Configurable/PriceTest.php | 24 ++----- .../Magento/ConfigurableProduct/etc/di.xml | 1 - 8 files changed, 49 insertions(+), 160 deletions(-) delete mode 100644 app/code/Magento/ConfigurableProduct/Pricing/Price/BasePrice.php diff --git a/app/code/Magento/ConfigurableProduct/Block/Product/View/Type/Configurable.php b/app/code/Magento/ConfigurableProduct/Block/Product/View/Type/Configurable.php index fce1979115e66..356f9b2f2b8cd 100644 --- a/app/code/Magento/ConfigurableProduct/Block/Product/View/Type/Configurable.php +++ b/app/code/Magento/ConfigurableProduct/Block/Product/View/Type/Configurable.php @@ -184,15 +184,15 @@ public function getJsonConfig() 'optionPrices' => $this->getOptionPrices(), 'prices' => [ 'oldPrice' => [ - 'amount' => $this->_registerJsPrice($this->_convertPrice($regularPrice->getAmount()->getValue())), + 'amount' => $this->_registerJsPrice($regularPrice->getAmount()->getValue()), ], 'basePrice' => [ 'amount' => $this->_registerJsPrice( - $this->_convertPrice($finalPrice->getAmount()->getBaseAmount()) + $finalPrice->getAmount()->getBaseAmount() ), ], 'finalPrice' => [ - 'amount' => $this->_registerJsPrice($this->_convertPrice($finalPrice->getAmount()->getValue())), + 'amount' => $this->_registerJsPrice($finalPrice->getAmount()->getValue()), ], ], 'productId' => $currentProduct->getId(), @@ -223,17 +223,17 @@ protected function getOptionPrices() [ 'oldPrice' => [ 'amount' => $this->_registerJsPrice( - $this->_convertPrice($priceInfo->getPrice('regular_price')->getAmount()->getValue()) + $priceInfo->getPrice('regular_price')->getAmount()->getValue() ), ], 'basePrice' => [ 'amount' => $this->_registerJsPrice( - $this->_convertPrice($priceInfo->getPrice('final_price')->getAmount()->getBaseAmount()) + $priceInfo->getPrice('final_price')->getAmount()->getBaseAmount() ), ], 'finalPrice' => [ 'amount' => $this->_registerJsPrice( - $this->_convertPrice($priceInfo->getPrice('final_price')->getAmount()->getValue()) + $priceInfo->getPrice('final_price')->getAmount()->getValue() ), ] ]; @@ -251,25 +251,4 @@ protected function _registerJsPrice($price) { return str_replace(',', '.', $price); } - - /** - * Convert price from default currency to current currency - * - * @param float $price - * @param bool $round - * @return float - */ - protected function _convertPrice($price, $round = false) - { - if (empty($price)) { - return 0; - } - - $price = $this->priceCurrency->convert($price); - if ($round) { - $price = $this->priceCurrency->round($price); - } - - return $price; - } } diff --git a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable/Price.php b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable/Price.php index bd74b867c8610..aeae1374a9813 100644 --- a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable/Price.php +++ b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable/Price.php @@ -7,8 +7,6 @@ */ namespace Magento\ConfigurableProduct\Model\Product\Type\Configurable; -use Magento\Framework\Pricing\PriceCurrencyInterface; - class Price extends \Magento\Catalog\Model\Product\Type\Price { /** @@ -24,17 +22,27 @@ public function getFinalPrice($qty, $product) return $product->getCalculatedFinalPrice(); } if ($product->getCustomOption('simple_product')) { - $simpleProduct = $product->getCustomOption('simple_product')->getProduct(); - $product->setSelectedConfigurableOption($simpleProduct); - $priceInfo = $simpleProduct->getPriceInfo(); + return parent::getFinalPrice($qty, $product->getCustomOption('simple_product')->getProduct()); } else { $priceInfo = $product->getPriceInfo(); + $finalPrice = $priceInfo->getPrice('final_price')->getAmount()->getValue(); + $finalPrice = $this->_applyOptionsPrice($product, $qty, $finalPrice); + $finalPrice = max(0, $finalPrice); + $product->setFinalPrice($finalPrice); + + return $finalPrice; } - $finalPrice = $priceInfo->getPrice('final_price')->getAmount()->getValue(); - $finalPrice = $this->_applyOptionsPrice($product, $qty, $finalPrice); - $finalPrice = max(0, $finalPrice); - $product->setFinalPrice($finalPrice); + } - return $finalPrice; + /** + * {@inheritdoc} + */ + public function getPrice($product) + { + if ($product->getCustomOption('simple_product')) { + return $product->getCustomOption('simple_product')->getProduct()->getPrice(); + } else { + return 0; + } } } diff --git a/app/code/Magento/ConfigurableProduct/Pricing/Price/BasePrice.php b/app/code/Magento/ConfigurableProduct/Pricing/Price/BasePrice.php deleted file mode 100644 index 76f2ef5cdd900..0000000000000 --- a/app/code/Magento/ConfigurableProduct/Pricing/Price/BasePrice.php +++ /dev/null @@ -1,68 +0,0 @@ -product->getSelectedConfigurableOption(); - $productId = $selectedConfigurableOption ? $selectedConfigurableOption->getId() : $this->product->getId(); - if (!isset($this->values[$productId])) { - $this->value = null; - if (!$selectedConfigurableOption) { - $this->values[$productId] = parent::getValue(); - } else { - if (false !== $this->getMinimumAdditionalPrice()) { - $this->values[$productId] = $this->getMinimumAdditionalPrice(); - } else { - $this->values[$productId] = parent::getValue(); - } - } - } - return $this->values[$productId]; - } - - /** - * @return bool|float - */ - protected function getMinimumAdditionalPrice() - { - if (null === $this->minimumAdditionalPrice) { - $priceCodes = [ - \Magento\Catalog\Pricing\Price\SpecialPrice::PRICE_CODE, - \Magento\Catalog\Pricing\Price\TierPrice::PRICE_CODE, - ]; - $this->minimumAdditionalPrice = false; - foreach ($priceCodes as $priceCode) { - $price = $this->product->getPriceInfo()->getPrice($priceCode); - if ($price instanceof BasePriceProviderInterface && $price->getValue() !== false) { - $this->minimumAdditionalPrice = min( - $price->getValue(), - $this->minimumAdditionalPrice ?: $price->getValue() - ); - } - } - } - return $this->minimumAdditionalPrice; - } -} diff --git a/app/code/Magento/ConfigurableProduct/Pricing/Price/ConfigurablePriceResolver.php b/app/code/Magento/ConfigurableProduct/Pricing/Price/ConfigurablePriceResolver.php index d0f2461c96a3e..d04e4fb79f261 100644 --- a/app/code/Magento/ConfigurableProduct/Pricing/Price/ConfigurablePriceResolver.php +++ b/app/code/Magento/ConfigurableProduct/Pricing/Price/ConfigurablePriceResolver.php @@ -37,22 +37,22 @@ public function __construct( } /** - * @param \Magento\Framework\Pricing\SaleableInterface $product + * @param \Magento\Framework\Pricing\SaleableInterface|\Magento\Catalog\Model\Product $product * @return float + * @throws \Magento\Framework\Exception\LocalizedException */ public function resolvePrice(\Magento\Framework\Pricing\SaleableInterface $product) { - $selectedConfigurableOption = $product->getSelectedConfigurableOption(); - if ($selectedConfigurableOption) { - $price = $this->priceResolver->resolvePrice($selectedConfigurableOption); - } else { - $price = null; - foreach ($this->configurable->getUsedProducts($product) as $subProduct) { - $productPrice = $this->priceResolver->resolvePrice($subProduct); - $price = $price ? min($price, $productPrice) : $productPrice; - } + $price = null; + foreach ($this->configurable->getUsedProducts($product) as $subProduct) { + $productPrice = $this->priceResolver->resolvePrice($subProduct); + $price = $price ? min($price, $productPrice) : $productPrice; } - $priceInCurrentCurrency = $this->priceCurrency->convertAndRound($price); - return $priceInCurrentCurrency ? (float)$priceInCurrentCurrency : false; + if (!$price) { + throw new \Magento\Framework\Exception\LocalizedException( + __('Configurable product "%s" do not have sub-products', $product->getName()) + ); + } + return (float)$price; } } diff --git a/app/code/Magento/ConfigurableProduct/Pricing/Price/ConfigurableRegularPrice.php b/app/code/Magento/ConfigurableProduct/Pricing/Price/ConfigurableRegularPrice.php index de5ea0dcb0716..936698cef3567 100644 --- a/app/code/Magento/ConfigurableProduct/Pricing/Price/ConfigurableRegularPrice.php +++ b/app/code/Magento/ConfigurableProduct/Pricing/Price/ConfigurableRegularPrice.php @@ -61,20 +61,19 @@ public function __construct( */ public function getValue() { - $selectedConfigurableOption = $this->product->getSelectedConfigurableOption(); - $productId = $selectedConfigurableOption ? $selectedConfigurableOption->getId() : $this->product->getId(); - if (!isset($this->values[$productId])) { - $this->values[$productId] = $this->priceResolver->resolvePrice($this->product); + if (!isset($this->values[$this->product->getId()])) { + $this->values[$this->product->getId()] = $this->priceResolver->resolvePrice($this->product); } - return $this->values[$productId]; + return $this->values[$this->product->getId()]; } + /** * {@inheritdoc} */ public function getAmount() { - return $this->getMinRegularAmount($this->product); + return $this->getMinRegularAmount(); } /** @@ -116,7 +115,6 @@ public function getMinRegularAmount() $this->minRegularAmount = $this->doGetMinRegularAmount() ?: false; } return $this->minRegularAmount; - } /** diff --git a/app/code/Magento/ConfigurableProduct/Pricing/Price/FinalPrice.php b/app/code/Magento/ConfigurableProduct/Pricing/Price/FinalPrice.php index 3d7cfd251d54e..834df6ffd429a 100644 --- a/app/code/Magento/ConfigurableProduct/Pricing/Price/FinalPrice.php +++ b/app/code/Magento/ConfigurableProduct/Pricing/Price/FinalPrice.php @@ -34,28 +34,15 @@ public function __construct( $this->priceResolver = $priceResolver; } - /** - * {@inheritdoc} - */ - public function getAmount() - { - if ($this->product->getSelectedConfigurableOption()) { - $this->amount = null; - } - return parent::getAmount(); - } - /** * {@inheritdoc} */ public function getValue() { - $selectedConfigurableOption = $this->product->getSelectedConfigurableOption(); - $productId = $selectedConfigurableOption ? $selectedConfigurableOption->getId() : $this->product->getId(); - if (!isset($this->values[$productId])) { - $this->values[$productId] = $this->priceResolver->resolvePrice($this->product); + if (!isset($this->values[$this->product->getId()])) { + $this->values[$this->product->getId()] = $this->priceResolver->resolvePrice($this->product); } - return $this->values[$productId]; + return $this->values[$this->product->getId()]; } } diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Type/Configurable/PriceTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Type/Configurable/PriceTest.php index 7d14671ec0d7d..7757b43562442 100644 --- a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Type/Configurable/PriceTest.php +++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Type/Configurable/PriceTest.php @@ -31,11 +31,7 @@ public function testGetFinalPrice() $qty = 1; $configurableProduct = $this->getMockBuilder('Magento\Catalog\Model\Product') ->disableOriginalConstructor() - ->setMethods(['getCustomOption', 'setSelectedConfigurableOption', 'setFinalPrice', '__wakeUp']) - ->getMock(); - $childProduct = $this->getMockBuilder('Magento\Catalog\Model\Product') - ->disableOriginalConstructor() - ->setMethods(['getPriceInfo', '__wakeUp']) + ->setMethods(['getCustomOption', 'getPriceInfo', 'setFinalPrice', '__wakeUp']) ->getMock(); $customOption = $this->getMockBuilder('Magento\Catalog\Model\Product\Configuration\Item\Option') ->disableOriginalConstructor() @@ -52,24 +48,14 @@ public function testGetFinalPrice() ->disableOriginalConstructor() ->getMock(); - $configurableProduct->expects($this->at(0)) - ->method('getCustomOption') - ->with('simple_product') - ->willReturn($customOption); - $configurableProduct->expects($this->at(1)) + $configurableProduct->expects($this->any()) ->method('getCustomOption') - ->with('simple_product') - ->willReturn($customOption); - $customOption->expects($this->once())->method('getProduct')->willReturn($childProduct); - $configurableProduct->expects($this->once()) - ->method('setSelectedConfigurableOption') - ->with($childProduct) - ->willReturnSelf(); - $childProduct->expects($this->once())->method('getPriceInfo')->willReturn($priceInfo); + ->willReturnMap([['simple_product', false], ['option_ids', false]]); + $customOption->expects($this->never())->method('getProduct'); + $configurableProduct->expects($this->once())->method('getPriceInfo')->willReturn($priceInfo); $priceInfo->expects($this->once())->method('getPrice')->with('final_price')->willReturn($price); $price->expects($this->once())->method('getAmount')->willReturn($amount); $amount->expects($this->once())->method('getValue')->willReturn($finalPrice); - $configurableProduct->expects($this->at(3))->method('getCustomOption')->with('option_ids')->willReturn(false); $configurableProduct->expects($this->once())->method('setFinalPrice')->with($finalPrice)->willReturnSelf(); $this->assertEquals($finalPrice, $this->model->getFinalPrice($qty, $configurableProduct)); diff --git a/app/code/Magento/ConfigurableProduct/etc/di.xml b/app/code/Magento/ConfigurableProduct/etc/di.xml index ff1173c2e0908..e2463e52daa81 100644 --- a/app/code/Magento/ConfigurableProduct/etc/di.xml +++ b/app/code/Magento/ConfigurableProduct/etc/di.xml @@ -70,7 +70,6 @@ Magento\ConfigurableProduct\Pricing\Price\ConfigurableRegularPrice Magento\ConfigurableProduct\Pricing\Price\FinalPrice - Magento\ConfigurableProduct\Pricing\Price\BasePrice Magento\Catalog\Pricing\Price\Pool From ab59b5c21dddad6966e571b8e1e05a7c800537f4 Mon Sep 17 00:00:00 2001 From: Vitalii Zabaznov Date: Sat, 24 Oct 2015 16:40:38 +0300 Subject: [PATCH 53/83] MAGETWO-43505: Check-boxes are avoided on "create Downloadable Product" Admin page --- .../Product/Edit/Tab/Downloadable/Links.php | 22 ++--------- .../product/edit/downloadable/links.phtml | 39 ++++++++++++++++--- 2 files changed, 38 insertions(+), 23 deletions(-) diff --git a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php index fb92f2bc3fffd..dd31516d03a24 100644 --- a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php +++ b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php @@ -157,27 +157,13 @@ public function getPurchasedSeparatelyAttribute() } /** - * Retrieve Purchased Separately HTML select + * Get Links can be purchased separately value for current product * - * @return string + * @return bool */ - public function getPurchasedSeparatelySelect() + public function getProductLinksCanBePurchasedSeparately() { - $select = $this->getLayout()->createBlock( - 'Magento\Framework\View\Element\Html\Select' - )->setName( - 'product[links_purchased_separately]' - )->setId( - 'downloadable_link_purchase_type' - )->setOptions( - $this->_sourceModel->toOptionArray() - )->setValue( - $this->getProduct()->getLinksPurchasedSeparately() - )->setClass( - 'admin__control-select' - ); - - return $select->getHtml(); + return (bool) $this->getProduct()->getData('links_purchased_separately'); } /** diff --git a/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/links.phtml b/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/links.phtml index cf43aa7d3f4f6..b47b69f0cb0f9 100644 --- a/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/links.phtml +++ b/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/links.phtml @@ -34,7 +34,34 @@
isSingleStoreMode() ? ' data-config-scope="' . __('[GLOBAL]') . '"' : ''; ?>>
- getPurchasedSeparatelySelect()?> +
+
+
+ getProductLinksCanBePurchasedSeparately()): ?> + checked="checked" + + > + +
+
+ getProductLinksCanBePurchasedSeparately()): ?> + checked="checked" + + > + +
+
+
@@ -357,9 +384,9 @@ require([ } }, togglePriceFields : function(){ - var toogleTo = $('downloadable_link_purchase_type').value; + var toogleTo = jQuery('#link-switcher1').is(':checked'); var disableFlag = true; - if (toogleTo == '1') { + if (toogleTo) { disableFlag = false; } $$('.link-prices[type="text"]').each(function(elm){ @@ -443,8 +470,10 @@ require([ }; - if ($('downloadable_link_purchase_type')) { - Event.observe('downloadable_link_purchase_type', 'change', linkItems.togglePriceFields.bind()); + if (jQuery('#link-switcher1')) { + jQuery('#link-switcher1, #link-switcher0').on('change', function () { + linkItems.togglePriceFields.bind() + }); } if($('add_link_item')) { From 8043832b4acf797cbaeaa9d032b02aebf6a1fd52 Mon Sep 17 00:00:00 2001 From: Dmytro Poperechnyy Date: Sat, 24 Oct 2015 18:55:59 +0300 Subject: [PATCH 54/83] MAGETWO-44539: Issues with "Orders and Returns" widget --- app/code/Magento/Sales/Helper/Guest.php | 5 +- app/code/Magento/Sales/Model/Order.php | 42 +++++++ .../Sales/Test/Unit/Helper/GuestTest.php | 104 +++++++++--------- .../Sales/Test/Unit/Model/OrderTest.php | 39 ++++++- 4 files changed, 134 insertions(+), 56 deletions(-) diff --git a/app/code/Magento/Sales/Helper/Guest.php b/app/code/Magento/Sales/Helper/Guest.php index baf3512eed4c3..d61a3af66cbf4 100644 --- a/app/code/Magento/Sales/Helper/Guest.php +++ b/app/code/Magento/Sales/Helper/Guest.php @@ -139,8 +139,9 @@ public function loadValidOrder(App\RequestInterface $request) $lastName = $post['oar_billing_lastname']; $email = $post['oar_email']; $zip = $post['oar_zip']; + $storeId = $this->_storeManager->getStore()->getId(); - if (empty($incrementId) || empty($lastName) || empty($type) || !in_array( + if (empty($incrementId) || empty($lastName) || empty($type) || empty($storeId) || !in_array( $type, ['email', 'zip'] ) || $type == 'email' && empty($email) || $type == 'zip' && empty($zip) @@ -149,7 +150,7 @@ public function loadValidOrder(App\RequestInterface $request) } if (!$errors) { - $order->loadByIncrementId($incrementId); + $order = $order->loadByIncrementIdAndStore($incrementId, $storeId); } $errors = true; diff --git a/app/code/Magento/Sales/Model/Order.php b/app/code/Magento/Sales/Model/Order.php index e53438bd6844b..233f554507160 100644 --- a/app/code/Magento/Sales/Model/Order.php +++ b/app/code/Magento/Sales/Model/Order.php @@ -252,6 +252,11 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface */ protected $_trackCollectionFactory; + /** + * @var \Magento\Sales\Model\ResourceModel\Order\CollectionFactory + */ + protected $salesOrderCollectionFactory; + /** * @var PriceCurrencyInterface */ @@ -284,6 +289,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface * @param \Magento\Sales\Model\ResourceModel\Order\Shipment\CollectionFactory $shipmentCollectionFactory * @param \Magento\Sales\Model\ResourceModel\Order\Creditmemo\CollectionFactory $memoCollectionFactory * @param \Magento\Sales\Model\ResourceModel\Order\Shipment\Track\CollectionFactory $trackCollectionFactory + * @param ResourceModel\Order\CollectionFactory $salesOrderCollectionFactory * @param PriceCurrencyInterface $priceCurrency * @param \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $productListFactory * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource @@ -313,6 +319,7 @@ public function __construct( \Magento\Sales\Model\ResourceModel\Order\Shipment\CollectionFactory $shipmentCollectionFactory, \Magento\Sales\Model\ResourceModel\Order\Creditmemo\CollectionFactory $memoCollectionFactory, \Magento\Sales\Model\ResourceModel\Order\Shipment\Track\CollectionFactory $trackCollectionFactory, + \Magento\Sales\Model\ResourceModel\Order\CollectionFactory $salesOrderCollectionFactory, PriceCurrencyInterface $priceCurrency, \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $productListFactory, \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null, @@ -337,6 +344,7 @@ public function __construct( $this->_shipmentCollectionFactory = $shipmentCollectionFactory; $this->_memoCollectionFactory = $memoCollectionFactory; $this->_trackCollectionFactory = $trackCollectionFactory; + $this->salesOrderCollectionFactory = $salesOrderCollectionFactory; $this->priceCurrency = $priceCurrency; parent::__construct( $context, @@ -435,6 +443,40 @@ public function loadByIncrementId($incrementId) return $this->loadByAttribute('increment_id', $incrementId); } + /** + * Load order by system increment identifier and store + * + * @param string $incrementId + * @param string $storeId + * @return \Magento\Sales\Model\Order + */ + public function loadByIncrementIdAndStore($incrementId, $storeId) + { + $orderCollection = $this->getSalesOrderCollection( + [ + 'increment_id' => $incrementId, + 'store_id' => $storeId + ] + ); + return $orderCollection->getFirstItem(); + } + + /** + * Get sales Order collection model populated with data + * + * @param array $filters + * @return \Magento\Sales\Model\ResourceModel\Order\Collection + */ + protected function getSalesOrderCollection(array $filters = []) + { + /** @var \Magento\Sales\Model\ResourceModel\Order\Collection $salesOrderCollection */ + $salesOrderCollection = $this->salesOrderCollectionFactory->create(); + foreach ($filters as $field => $condition) { + $salesOrderCollection->addFieldToFilter($field, $condition); + } + return $salesOrderCollection->load(); + } + /** * Load order by custom attribute value. Attribute value should be unique * diff --git a/app/code/Magento/Sales/Test/Unit/Helper/GuestTest.php b/app/code/Magento/Sales/Test/Unit/Helper/GuestTest.php index 208fc66106dfb..a8baaac6336e9 100644 --- a/app/code/Magento/Sales/Test/Unit/Helper/GuestTest.php +++ b/app/code/Magento/Sales/Test/Unit/Helper/GuestTest.php @@ -3,15 +3,12 @@ * Copyright © 2015 Magento. All rights reserved. * See COPYING.txt for license details. */ - namespace Magento\Sales\Test\Unit\Helper; -use \Magento\Sales\Helper\Guest; - +use Magento\Sales\Helper\Guest; use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper; /** - * Class GuestTest * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ class GuestTest extends \PHPUnit_Framework_TestCase @@ -49,6 +46,12 @@ class GuestTest extends \PHPUnit_Framework_TestCase /** @var \Magento\Framework\App\ViewInterface|\PHPUnit_Framework_MockObject_MockObject */ protected $viewInterfaceMock; + /** @var \Magento\Store\Model\Store|\PHPUnit_Framework_MockObject_MockObject */ + protected $storeModelMock; + + /** @var \Magento\Sales\Model\Order|\PHPUnit_Framework_MockObject_MockObject */ + protected $salesOrderMock; + protected function setUp() { $this->appContextHelperMock = $this->getMock('Magento\Framework\App\Helper\Context', [], [], '', false); @@ -66,6 +69,19 @@ protected function setUp() $this->managerInterfaceMock = $this->getMock('Magento\Framework\Message\ManagerInterface'); $this->orderFactoryMock = $this->getMock('Magento\Sales\Model\OrderFactory', ['create'], [], '', false); $this->viewInterfaceMock = $this->getMock('Magento\Framework\App\ViewInterface'); + $this->storeModelMock = $this->getMockBuilder('Magento\Store\Model\Store') + ->disableOriginalConstructor() + ->getMock(); + $this->salesOrderMock = $this->getMock( + 'Magento\Sales\Model\Order', + [ + 'getProtectCode', 'loadByIncrementIdAndStore', 'loadByIncrementId', + 'getId', 'getBillingAddress', '__wakeup' + ], + [], + '', + false + ); $this->objectManagerHelper = new ObjectManagerHelper($this); $this->guest = $this->objectManagerHelper->getObject( @@ -86,8 +102,6 @@ protected function setUp() public function testLoadValidOrderNotEmptyPost() { - $this->sessionMock->expects($this->once())->method('isLoggedIn')->will($this->returnValue(false)); - $post = [ 'oar_order_id' => 1, 'oar_type' => 'email', @@ -96,20 +110,17 @@ public function testLoadValidOrderNotEmptyPost() 'oar_zip' => 'oar_zip', ]; + $storeId = '1'; $incrementId = $post['oar_order_id']; + $protectedCode = 'protectedCode'; + $this->sessionMock->expects($this->once())->method('isLoggedIn')->willReturn(false); $requestMock = $this->getMock('Magento\Framework\App\Request\Http', [], [], '', false); - $requestMock->expects($this->once())->method('getPostValue')->will($this->returnValue($post)); - - $orderMock = $this->getMock( - 'Magento\Sales\Model\Order', - ['getProtectCode', 'loadByIncrementId', 'getId', 'getBillingAddress', '__wakeup'], - [], - '', - false - ); - $this->orderFactoryMock->expects($this->once())->method('create')->will($this->returnValue($orderMock)); - $orderMock->expects($this->once())->method('loadByIncrementId')->with($incrementId); - $orderMock->expects($this->exactly(2))->method('getId')->will($this->returnValue($incrementId)); + $requestMock->expects($this->once())->method('getPostValue')->willReturn($post); + $this->storeManagerInterfaceMock->expects($this->once())->method('getStore')->willReturn($this->storeModelMock); + $this->storeModelMock->expects($this->once())->method('getId')->willReturn($storeId); + $this->orderFactoryMock->expects($this->once())->method('create')->willReturn($this->salesOrderMock); + $this->salesOrderMock->expects($this->once())->method('loadByIncrementIdAndStore')->willReturnSelf(); + $this->salesOrderMock->expects($this->any())->method('getId')->willReturn($incrementId); $billingAddressMock = $this->getMock( 'Magento\Sales\Model\Order\Address', @@ -118,15 +129,10 @@ public function testLoadValidOrderNotEmptyPost() '', false ); - $billingAddressMock->expects($this->once())->method('getLastname')->will( - $this->returnValue($post['oar_billing_lastname']) - ); - $billingAddressMock->expects($this->once())->method('getEmail')->will( - $this->returnValue($post['oar_email']) - ); - $orderMock->expects($this->once())->method('getBillingAddress')->will($this->returnValue($billingAddressMock)); - $protectedCode = 'protectedCode'; - $orderMock->expects($this->once())->method('getProtectCode')->will($this->returnValue($protectedCode)); + $billingAddressMock->expects($this->once())->method('getLastname')->willReturn(($post['oar_billing_lastname'])); + $billingAddressMock->expects($this->once())->method('getEmail')->willReturn(($post['oar_email'])); + $this->salesOrderMock->expects($this->once())->method('getBillingAddress')->willReturn($billingAddressMock); + $this->salesOrderMock->expects($this->once())->method('getProtectCode')->willReturn($protectedCode); $metaDataMock = $this->getMock( 'Magento\Framework\Stdlib\Cookie\PublicCookieMetadata', [], @@ -134,17 +140,16 @@ public function testLoadValidOrderNotEmptyPost() '', false ); - $metaDataMock->expects($this->once()) - ->method('setPath') + $metaDataMock->expects($this->once())->method('setPath') ->with(Guest::COOKIE_PATH) - ->will($this->returnSelf()); + ->willReturnSelf(); $metaDataMock->expects($this->once()) ->method('setHttpOnly') ->with(true) - ->will($this->returnSelf()); + ->willReturnSelf(); $this->cookieMetadataFactoryMock->expects($this->once()) ->method('createPublicCookieMetadata') - ->will($this->returnValue($metaDataMock)); + ->willReturn($metaDataMock); $this->cookieManagerMock->expects($this->once()) ->method('setPublicCookie') ->with(Guest::COOKIE_NAME, $this->anything(), $metaDataMock); @@ -153,26 +158,22 @@ public function testLoadValidOrderNotEmptyPost() public function testLoadValidOrderStoredCookie() { - $this->sessionMock->expects($this->once())->method('isLoggedIn')->will($this->returnValue(false)); - $orderMock = $this->getMock( - 'Magento\Sales\Model\Order', - ['getProtectCode', 'loadByIncrementId', 'getId', 'getBillingAddress', '__wakeup'], - [], - '', - false - ); $protectedCode = 'protectedCode'; $incrementId = 1; $cookieData = $protectedCode . ':' . $incrementId; $cookieDataHash = base64_encode($cookieData); - $this->orderFactoryMock->expects($this->once())->method('create')->will($this->returnValue($orderMock)); - - $this->cookieManagerMock->expects($this->once())->method('getCookie')->with(Guest::COOKIE_NAME)->will( - $this->returnValue($cookieDataHash) - ); - $orderMock->expects($this->once())->method('loadByIncrementId')->with($incrementId); - $orderMock->expects($this->exactly(1))->method('getId')->will($this->returnValue($incrementId)); - $orderMock->expects($this->once())->method('getProtectCode')->will($this->returnValue($protectedCode)); + $this->sessionMock->expects($this->once())->method('isLoggedIn')->willReturn(false); + $this->orderFactoryMock->expects($this->once())->method('create')->willReturn($this->salesOrderMock); + $this->cookieManagerMock->expects($this->once()) + ->method('getCookie') + ->with(Guest::COOKIE_NAME) + ->willReturn($cookieDataHash); + $this->salesOrderMock->expects($this->once()) + ->method('loadByIncrementId') + ->with($incrementId) + ->willReturnSelf(); + $this->salesOrderMock->expects($this->exactly(1))->method('getId')->willReturn($incrementId); + $this->salesOrderMock->expects($this->once())->method('getProtectCode')->willReturn($protectedCode); $metaDataMock = $this->getMock( 'Magento\Framework\Stdlib\Cookie\PublicCookieMetadata', [], @@ -183,18 +184,17 @@ public function testLoadValidOrderStoredCookie() $metaDataMock->expects($this->once()) ->method('setPath') ->with(Guest::COOKIE_PATH) - ->will($this->returnSelf()); + ->willReturnSelf(); $metaDataMock->expects($this->once()) ->method('setHttpOnly') ->with(true) - ->will($this->returnSelf()); + ->willReturnSelf(); $this->cookieMetadataFactoryMock->expects($this->once()) ->method('createPublicCookieMetadata') - ->will($this->returnValue($metaDataMock)); + ->willReturn($metaDataMock); $this->cookieManagerMock->expects($this->once()) ->method('setPublicCookie') ->with(Guest::COOKIE_NAME, $this->anything(), $metaDataMock); - $requestMock = $this->getMock('Magento\Framework\App\Request\Http', [], [], '', false); $this->assertTrue($this->guest->loadValidOrder($requestMock)); } diff --git a/app/code/Magento/Sales/Test/Unit/Model/OrderTest.php b/app/code/Magento/Sales/Test/Unit/Model/OrderTest.php index e334be584109f..f3da5e9ac4191 100644 --- a/app/code/Magento/Sales/Test/Unit/Model/OrderTest.php +++ b/app/code/Magento/Sales/Test/Unit/Model/OrderTest.php @@ -5,8 +5,7 @@ */ namespace Magento\Sales\Test\Unit\Model; -use \Magento\Sales\Model\Order; - +use Magento\Sales\Model\Order; use Magento\Sales\Model\ResourceModel\Order\Status\History\CollectionFactory as HistoryCollectionFactory; /** @@ -54,6 +53,16 @@ class OrderTest extends \PHPUnit_Framework_TestCase */ protected $priceCurrency; + /** + * @var \Magento\Sales\Model\ResourceModel\Order\CollectionFactory|\PHPUnit_Framework_MockObject_MockObject + */ + protected $salesOrderCollectionFactoryMock; + + /** + * @var \Magento\Sales\Model\ResourceModel\Order\Collection|\PHPUnit_Framework_MockObject_MockObject + */ + protected $salesOrderCollectionMock; + protected function setUp() { $helper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this); @@ -78,6 +87,13 @@ protected function setUp() '', false ); + $this->salesOrderCollectionFactoryMock = $this->getMock( + 'Magento\Sales\Model\ResourceModel\Order\CollectionFactory', + ['create'], + [], + '', + false + ); $this->item = $this->getMock( 'Magento\Sales\Model\ResourceModel\Order\Item', ['isDeleted', 'getQtyToInvoice', 'getParentItemId', 'getQuoteItemId', 'getLockedDoInvoice'], @@ -85,6 +101,10 @@ protected function setUp() '', false ); + $this->salesOrderCollectionMock = $this->getMockBuilder('Magento\Sales\Model\ResourceModel\Order\Collection') + ->disableOriginalConstructor() + ->setMethods(['addFieldToFilter', 'load', 'getFirstItem']) + ->getMock(); $collection = $this->getMock('Magento\Sales\Model\ResourceModel\Order\Item\Collection', [], [], '', false); $collection->expects($this->any()) ->method('setOrderFilter') @@ -121,6 +141,7 @@ protected function setUp() 'data' => ['increment_id' => $this->incrementId], 'context' => $context, 'historyCollectionFactory' => $this->historyCollectionFactoryMock, + 'salesOrderCollectionFactory' => $this->salesOrderCollectionFactoryMock, 'priceCurrency' => $this->priceCurrency ] ); @@ -722,6 +743,20 @@ public function testGetStatusHistories() } } + public function testLoadByIncrementIdAndStore() + { + $incrementId = '000000001'; + $storeId = '2'; + $this->salesOrderCollectionFactoryMock + ->expects($this->once()) + ->method('create') + ->willReturn($this->salesOrderCollectionMock); + $this->salesOrderCollectionMock->expects($this->any())->method('addFieldToFilter')->willReturnSelf(); + $this->salesOrderCollectionMock->expects($this->once())->method('load')->willReturnSelf(); + $this->salesOrderCollectionMock->expects($this->once())->method('getFirstItem')->willReturn($this->order); + $this->assertSame($this->order , $this->order->loadByIncrementIdAndStore($incrementId, $storeId)); + } + public function notInvoicingStatesProvider() { return [ From da880473b1f3aace37b0c78d3f84929f08a9b0c2 Mon Sep 17 00:00:00 2001 From: Oleh Posyniak Date: Sun, 25 Oct 2015 18:29:36 +0200 Subject: [PATCH 55/83] MAGETWO-44469: There are errors while switching Magento to "production" mode --- app/code/Magento/Deploy/Model/Deployer.php | 9 ++++----- lib/internal/Magento/Framework/View/Asset/Source.php | 7 +++++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/app/code/Magento/Deploy/Model/Deployer.php b/app/code/Magento/Deploy/Model/Deployer.php index 60480c220e23c..c63bed567703b 100644 --- a/app/code/Magento/Deploy/Model/Deployer.php +++ b/app/code/Magento/Deploy/Model/Deployer.php @@ -312,12 +312,11 @@ private function deployFile($filePath, $area, $themePath, $locale, $module) } } - $logMessage = "Processing file '$filePath' for area '$area', theme '$themePath', locale '$locale'"; - if ($module) { - $logMessage .= ", module '$module'"; - } - if ($this->output->isVeryVerbose()) { + $logMessage = "Processing file '$filePath' for area '$area', theme '$themePath', locale '$locale'"; + if ($module) { + $logMessage .= ", module '$module'"; + } $this->output->writeln($logMessage); } diff --git a/lib/internal/Magento/Framework/View/Asset/Source.php b/lib/internal/Magento/Framework/View/Asset/Source.php index d47a76a4fe58c..53965c612a41e 100644 --- a/lib/internal/Magento/Framework/View/Asset/Source.php +++ b/lib/internal/Magento/Framework/View/Asset/Source.php @@ -128,9 +128,12 @@ private function preProcess(LocalInterface $asset) $this->preProcessorPool->process($chain); $chain->assertValid(); $dirCode = DirectoryList::ROOT; - if ($chain->isChanged()) { + $directoryReader = $this->filesystem->getDirectoryRead(DirectoryList::STATIC_VIEW); + $targetPath = DirectoryList::TMP_MATERIALIZATION_DIR . '/source/' . $chain->getTargetAssetPath(); + + if ($chain->isChanged() || !$directoryReader->isExist($targetPath)) { $dirCode = DirectoryList::VAR_DIR; - $path = DirectoryList::TMP_MATERIALIZATION_DIR . '/source/' . $chain->getTargetAssetPath(); + $path = $targetPath; $this->varDir->writeFile($path, $chain->getContent()); } $result = [$dirCode, $path]; From d24d66d3759fd031c15e16fb466d0fb18a8e2d95 Mon Sep 17 00:00:00 2001 From: Dmytro Poperechnyy Date: Mon, 26 Oct 2015 10:28:53 +0200 Subject: [PATCH 56/83] MAGETWO-44539: Issues with "Orders and Returns" widget - Redundant space eliminated; --- app/code/Magento/Sales/Test/Unit/Model/OrderTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Sales/Test/Unit/Model/OrderTest.php b/app/code/Magento/Sales/Test/Unit/Model/OrderTest.php index f3da5e9ac4191..be95921d77874 100644 --- a/app/code/Magento/Sales/Test/Unit/Model/OrderTest.php +++ b/app/code/Magento/Sales/Test/Unit/Model/OrderTest.php @@ -754,7 +754,7 @@ public function testLoadByIncrementIdAndStore() $this->salesOrderCollectionMock->expects($this->any())->method('addFieldToFilter')->willReturnSelf(); $this->salesOrderCollectionMock->expects($this->once())->method('load')->willReturnSelf(); $this->salesOrderCollectionMock->expects($this->once())->method('getFirstItem')->willReturn($this->order); - $this->assertSame($this->order , $this->order->loadByIncrementIdAndStore($incrementId, $storeId)); + $this->assertSame($this->order, $this->order->loadByIncrementIdAndStore($incrementId, $storeId)); } public function notInvoicingStatesProvider() From bb0d99aa7488495adde10f8ce238d8b353688f12 Mon Sep 17 00:00:00 2001 From: Oleh Posyniak Date: Mon, 26 Oct 2015 11:14:18 +0200 Subject: [PATCH 57/83] MAGETWO-44469: There are errors while switching Magento to "production" mode --- .../View/Test/Unit/Asset/SourceTest.php | 50 ++++++++++--------- 1 file changed, 27 insertions(+), 23 deletions(-) diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Asset/SourceTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Asset/SourceTest.php index 6901f2d06062e..427ed2bc15578 100644 --- a/lib/internal/Magento/Framework/View/Test/Unit/Asset/SourceTest.php +++ b/lib/internal/Magento/Framework/View/Test/Unit/Asset/SourceTest.php @@ -94,7 +94,7 @@ protected function setUp() $themeList->expects($this->any()) ->method('getThemeByFullPath') ->with('frontend/magento_theme') - ->will($this->returnValue($this->theme)); + ->willReturn($this->theme); $this->initFilesystem(); @@ -104,32 +104,36 @@ protected function setUp() } /** - * @param $origFile - * @param $origPath - * @param $origContent - * @param $isMaterialization + * @param string $origFile + * @param string $origPath + * @param string $origContent + * @param bool $isMaterialization + * @param bool $isExist * * @dataProvider getFileDataProvider */ - public function testGetFile($origFile, $origPath, $origContent, $isMaterialization) + public function testGetFile($origFile, $origPath, $origContent, $isMaterialization, $isExist) { $filePath = 'some/file.ext'; $this->viewFileResolution->expects($this->once()) ->method('getFile') ->with('frontend', $this->theme, 'en_US', $filePath, 'Magento_Module') - ->will($this->returnValue($origFile)); + ->willReturn($origFile); $this->rootDirRead->expects($this->once()) ->method('getRelativePath') ->with($origFile) - ->will($this->returnValue($origPath)); + ->willReturn($origPath); $this->rootDirRead->expects($this->once()) ->method('readFile') ->with($origPath) - ->will($this->returnValue($origContent)); + ->willReturn($origContent); $this->preProcessorPool->expects($this->once()) ->method('process') ->with($this->chain); - if ($isMaterialization) { + $this->staticDirRead->expects($this->any()) + ->method('isExist') + ->willReturn($isExist); + if ($isMaterialization || !$isExist) { $this->chain ->expects($this->once()) ->method('isChanged') @@ -147,13 +151,13 @@ public function testGetFile($origFile, $origPath, $origContent, $isMaterializati ->with('view_preprocessed/source/some/file.ext', 'processed'); $this->varDir->expects($this->once()) ->method('getAbsolutePath') - ->with('view_preprocessed/source/some/file.ext')->will($this->returnValue('result')); + ->with('view_preprocessed/source/some/file.ext')->willReturn('result'); } else { $this->varDir->expects($this->never())->method('writeFile'); $this->rootDirRead->expects($this->once()) ->method('getAbsolutePath') ->with('source/some/file.ext') - ->will($this->returnValue('result')); + ->willReturn('result'); } $this->assertSame('result', $this->object->getFile($this->getAsset())); } @@ -197,10 +201,10 @@ public function chainTestCallback(Chain $chain) public function getFileDataProvider() { return [ - ['/root/some/file.ext', 'source/some/file.ext', 'processed', false], - ['/root/some/file.ext', 'source/some/file.ext', 'not_processed', true], - ['/root/some/file.ext2', 'source/some/file.ext2', 'processed', true], - ['/root/some/file.ext2', 'source/some/file.ext2', 'not_processed', true], + ['/root/some/file.ext', 'source/some/file.ext', 'processed', false, true], + ['/root/some/file.ext', 'source/some/file.ext', 'not_processed', true, false], + ['/root/some/file.ext2', 'source/some/file.ext2', 'processed', true, true], + ['/root/some/file.ext2', 'source/some/file.ext2', 'not_processed', true, false], ]; } @@ -219,11 +223,11 @@ protected function initFilesystem() $this->filesystem->expects($this->any()) ->method('getDirectoryRead') - ->will($this->returnValueMap($readDirMap)); + ->willReturnMap($readDirMap); $this->filesystem->expects($this->any()) ->method('getDirectoryWrite') ->with(DirectoryList::VAR_DIR) - ->will($this->returnValue($this->varDir)); + ->willReturn($this->varDir); } /** @@ -252,19 +256,19 @@ protected function getAsset($isFallback = true) $asset = $this->getMock('Magento\Framework\View\Asset\File', [], [], '', false); $asset->expects($this->any()) ->method('getContext') - ->will($this->returnValue($context)); + ->willReturn($context); $asset->expects($this->any()) ->method('getFilePath') - ->will($this->returnValue('some/file.ext')); + ->willReturn('some/file.ext'); $asset->expects($this->any()) ->method('getPath') - ->will($this->returnValue('some/file.ext')); + ->willReturn('some/file.ext'); $asset->expects($this->any()) ->method('getModule') - ->will($this->returnValue('Magento_Module')); + ->willReturn('Magento_Module'); $asset->expects($this->any()) ->method('getContentType') - ->will($this->returnValue('ext')); + ->willReturn('ext'); return $asset; } From e72011a42457061f9272fd0344d7d1a25049fd3d Mon Sep 17 00:00:00 2001 From: Vitalii Zabaznov Date: Mon, 26 Oct 2015 11:16:45 +0200 Subject: [PATCH 58/83] MAGETWO-43505: Check-boxes are avoided on "create Downloadable Product" Admin page --- .../templates/product/edit/downloadable/links.phtml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/links.phtml b/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/links.phtml index b47b69f0cb0f9..70c90cf84161a 100644 --- a/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/links.phtml +++ b/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/links.phtml @@ -469,9 +469,8 @@ require([ })(jQuery); }; - - if (jQuery('#link-switcher1')) { - jQuery('#link-switcher1, #link-switcher0').on('change', function () { + if (jQuery('input[name="product[links_purchased_separately]"]')) { + jQuery('input[name="product[links_purchased_separately]"]').on('change', function () { linkItems.togglePriceFields.bind() }); } From ffb15d2b4a5ca1eb8c957d23be2893a51858e441 Mon Sep 17 00:00:00 2001 From: Dmytro Poperechnyy Date: Mon, 26 Oct 2015 11:20:21 +0200 Subject: [PATCH 59/83] MAGETWO-44539: Issues with "Orders and Returns" widget - Renamed method loadByIncrementIdAndStore to loadByIncrementIdAndStoreId; --- app/code/Magento/Sales/Helper/Guest.php | 2 +- app/code/Magento/Sales/Model/Order.php | 4 ++-- app/code/Magento/Sales/Test/Unit/Helper/GuestTest.php | 4 ++-- app/code/Magento/Sales/Test/Unit/Model/OrderTest.php | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/code/Magento/Sales/Helper/Guest.php b/app/code/Magento/Sales/Helper/Guest.php index d61a3af66cbf4..a69fa337b8da2 100644 --- a/app/code/Magento/Sales/Helper/Guest.php +++ b/app/code/Magento/Sales/Helper/Guest.php @@ -150,7 +150,7 @@ public function loadValidOrder(App\RequestInterface $request) } if (!$errors) { - $order = $order->loadByIncrementIdAndStore($incrementId, $storeId); + $order = $order->loadByIncrementIdAndStoreId($incrementId, $storeId); } $errors = true; diff --git a/app/code/Magento/Sales/Model/Order.php b/app/code/Magento/Sales/Model/Order.php index 233f554507160..e289e654b98d6 100644 --- a/app/code/Magento/Sales/Model/Order.php +++ b/app/code/Magento/Sales/Model/Order.php @@ -444,13 +444,13 @@ public function loadByIncrementId($incrementId) } /** - * Load order by system increment identifier and store + * Load order by system increment and store identifiers * * @param string $incrementId * @param string $storeId * @return \Magento\Sales\Model\Order */ - public function loadByIncrementIdAndStore($incrementId, $storeId) + public function loadByIncrementIdAndStoreId($incrementId, $storeId) { $orderCollection = $this->getSalesOrderCollection( [ diff --git a/app/code/Magento/Sales/Test/Unit/Helper/GuestTest.php b/app/code/Magento/Sales/Test/Unit/Helper/GuestTest.php index a8baaac6336e9..6772ac7276d68 100644 --- a/app/code/Magento/Sales/Test/Unit/Helper/GuestTest.php +++ b/app/code/Magento/Sales/Test/Unit/Helper/GuestTest.php @@ -75,7 +75,7 @@ protected function setUp() $this->salesOrderMock = $this->getMock( 'Magento\Sales\Model\Order', [ - 'getProtectCode', 'loadByIncrementIdAndStore', 'loadByIncrementId', + 'getProtectCode', 'loadByIncrementIdAndStoreId', 'loadByIncrementId', 'getId', 'getBillingAddress', '__wakeup' ], [], @@ -119,7 +119,7 @@ public function testLoadValidOrderNotEmptyPost() $this->storeManagerInterfaceMock->expects($this->once())->method('getStore')->willReturn($this->storeModelMock); $this->storeModelMock->expects($this->once())->method('getId')->willReturn($storeId); $this->orderFactoryMock->expects($this->once())->method('create')->willReturn($this->salesOrderMock); - $this->salesOrderMock->expects($this->once())->method('loadByIncrementIdAndStore')->willReturnSelf(); + $this->salesOrderMock->expects($this->once())->method('loadByIncrementIdAndStoreId')->willReturnSelf(); $this->salesOrderMock->expects($this->any())->method('getId')->willReturn($incrementId); $billingAddressMock = $this->getMock( diff --git a/app/code/Magento/Sales/Test/Unit/Model/OrderTest.php b/app/code/Magento/Sales/Test/Unit/Model/OrderTest.php index be95921d77874..7ed438f3ce7f1 100644 --- a/app/code/Magento/Sales/Test/Unit/Model/OrderTest.php +++ b/app/code/Magento/Sales/Test/Unit/Model/OrderTest.php @@ -743,7 +743,7 @@ public function testGetStatusHistories() } } - public function testLoadByIncrementIdAndStore() + public function testLoadByIncrementIdAndStoreId() { $incrementId = '000000001'; $storeId = '2'; @@ -754,7 +754,7 @@ public function testLoadByIncrementIdAndStore() $this->salesOrderCollectionMock->expects($this->any())->method('addFieldToFilter')->willReturnSelf(); $this->salesOrderCollectionMock->expects($this->once())->method('load')->willReturnSelf(); $this->salesOrderCollectionMock->expects($this->once())->method('getFirstItem')->willReturn($this->order); - $this->assertSame($this->order, $this->order->loadByIncrementIdAndStore($incrementId, $storeId)); + $this->assertSame($this->order, $this->order->loadByIncrementIdAndStoreId($incrementId, $storeId)); } public function notInvoicingStatesProvider() From 71e2259d0e82c2272d26b387e620209e8121dcbc Mon Sep 17 00:00:00 2001 From: Ievgen Shakhsuvarov Date: Fri, 23 Oct 2015 17:55:08 +0300 Subject: [PATCH 60/83] MAGETWO-44514: Products are duplicated in Shopping Cart on Storefront --- app/code/Magento/Checkout/Model/Cart.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/code/Magento/Checkout/Model/Cart.php b/app/code/Magento/Checkout/Model/Cart.php index 9cc015b2271cd..470af073fef90 100644 --- a/app/code/Magento/Checkout/Model/Cart.php +++ b/app/code/Magento/Checkout/Model/Cart.php @@ -324,6 +324,7 @@ protected function _getProductRequest($requestInfo) if (!$request->hasQty()) { $request->setQty(1); } + !$request->hasFormKey() ?: $request->unsFormKey(); return $request; } From 1d6d1ce250921b567ff0b3dcdf17e40a3e4f1def Mon Sep 17 00:00:00 2001 From: Iryna Lagno Date: Fri, 23 Oct 2015 17:55:28 +0300 Subject: [PATCH 61/83] MAGETWO-44453: Required address attribute is not require for checkout flow --- .../Checkout/view/frontend/web/js/view/billing-address.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/billing-address.js b/app/code/Magento/Checkout/view/frontend/web/js/view/billing-address.js index 4c77250a87237..0b3290b3c3960 100644 --- a/app/code/Magento/Checkout/view/frontend/web/js/view/billing-address.js +++ b/app/code/Magento/Checkout/view/frontend/web/js/view/billing-address.js @@ -145,8 +145,8 @@ define( } else { this.source.set('params.invalid', false); this.source.trigger(this.dataScopePrefix + '.data.validate'); - if (this.source.get('billingAddress.custom_attributes')) { - this.source.trigger('billingAddress.custom_attributes.data.validate'); + if (this.source.get(this.dataScopePrefix + '.custom_attributes')) { + this.source.trigger(this.dataScopePrefix + '.custom_attributes.data.validate'); }; if (!this.source.get('params.invalid')) { From 97e78c94d30ebc18a005a2c2467178f0b97360dc Mon Sep 17 00:00:00 2001 From: Iryna Lagno Date: Fri, 23 Oct 2015 18:33:58 +0300 Subject: [PATCH 62/83] MAGETWO-44541: Incorrect currency symbol on Checkout --- .../Magento/Checkout/Model/DefaultConfigProvider.php | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/app/code/Magento/Checkout/Model/DefaultConfigProvider.php b/app/code/Magento/Checkout/Model/DefaultConfigProvider.php index d0cc39ceaafe1..8e59581f35196 100644 --- a/app/code/Magento/Checkout/Model/DefaultConfigProvider.php +++ b/app/code/Magento/Checkout/Model/DefaultConfigProvider.php @@ -62,11 +62,6 @@ class DefaultConfigProvider implements ConfigProviderInterface */ private $httpContext; - /** - * @var CurrencyManager - */ - private $currencyManager; - /** * @var QuoteRepository */ @@ -174,7 +169,6 @@ class DefaultConfigProvider implements ConfigProviderInterface * @param CustomerSession $customerSession * @param CustomerUrlManager $customerUrlManager * @param HttpContext $httpContext - * @param CurrencyManager $currencyManager * @param QuoteRepository $quoteRepository * @param QuoteItemRepository $quoteItemRepository * @param ShippingMethodManager $shippingMethodManager @@ -205,7 +199,6 @@ public function __construct( CustomerSession $customerSession, CustomerUrlManager $customerUrlManager, HttpContext $httpContext, - CurrencyManager $currencyManager, QuoteRepository $quoteRepository, QuoteItemRepository $quoteItemRepository, ShippingMethodManager $shippingMethodManager, @@ -233,7 +226,6 @@ public function __construct( $this->customerSession = $customerSession; $this->customerUrlManager = $customerUrlManager; $this->httpContext = $httpContext; - $this->currencyManager = $currencyManager; $this->quoteRepository = $quoteRepository; $this->quoteItemRepository = $quoteItemRepository; $this->shippingMethodManager = $shippingMethodManager; @@ -282,7 +274,7 @@ public function getConfig() ); $output['basePriceFormat'] = $this->localeFormat->getPriceFormat( null, - $this->currencyManager->getDefaultCurrency() + $this->checkoutSession->getQuote()->getBaseCurrencyCode() ); $output['postCodes'] = $this->postCodesConfig->getPostCodes(); $output['imageData'] = $this->imageProvider->getImages($quoteId); From bb02063a8ceae868a1496cb0d53926842e9b0a66 Mon Sep 17 00:00:00 2001 From: Stanislav Idolov Date: Fri, 23 Oct 2015 20:20:23 +0300 Subject: [PATCH 63/83] MAGETWO-44530: Impossible save value for attribute with default entity table --- app/code/Magento/Eav/Model/Entity/AbstractEntity.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Eav/Model/Entity/AbstractEntity.php b/app/code/Magento/Eav/Model/Entity/AbstractEntity.php index c52d87b51b419..f26e634b865aa 100644 --- a/app/code/Magento/Eav/Model/Entity/AbstractEntity.php +++ b/app/code/Magento/Eav/Model/Entity/AbstractEntity.php @@ -1513,7 +1513,7 @@ protected function _saveAttribute($object, $attribute, $value) 'value' => $this->_prepareValueForSave($value, $attribute), ]; - if (!$this->getEntityTable()) { + if (!$this->getEntityTable() || $this->getEntityTable() == \Magento\Eav\Model\Entity::DEFAULT_ENTITY_TABLE) { $data['entity_type_id'] = $object->getEntityTypeId(); } From 755cbd7c24fbf0ca8b59243a9c9fa7c266f0fb56 Mon Sep 17 00:00:00 2001 From: Ievgen Shakhsuvarov Date: Sat, 24 Oct 2015 11:23:24 +0300 Subject: [PATCH 64/83] MAGETWO-40150: Empty space is displayed in Mini Shopping Cart where the Product was deleted --- .../Checkout/view/frontend/web/js/sidebar.js | 20 ++++++++++++------- .../view/frontend/web/js/view/minicart.js | 6 ------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js b/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js index 2600ada8b3cc3..790d8f721f5a9 100644 --- a/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js +++ b/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js @@ -10,9 +10,10 @@ define([ 'Magento_Customer/js/customer-data', 'Magento_Ui/js/modal/alert', 'Magento_Ui/js/modal/confirm', + 'Magento_Customer/js/customer-data', "jquery/ui", "mage/decorate" -], function($, authenticationPopup, customerData, alert, confirm){ +], function($, authenticationPopup, customerData, alert, confirm, customerData){ $.widget('mage.sidebar', { options: { @@ -21,8 +22,18 @@ define([ }, scrollHeight: 0, - _create: function() { + /** + * Create sidebar. + * @private + */ + _create: function () { + var self = this; + this._initContent(); + customerData.get('cart').subscribe(function () { + $(self.options.targetElement).trigger('contentUpdated'); + self._calcHeight(); + }); }, _initContent: function() { @@ -163,11 +174,6 @@ define([ * @private */ _removeItemAfter: function(elem, response) { - /** TODO: Extra options support. Should be refactored after MAGETWO-43159. */ - var self = this; - setTimeout(function(){ - self._calcHeight(); - }, 500); }, /** * @param url - ajax url diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/minicart.js b/app/code/Magento/Checkout/view/frontend/web/js/view/minicart.js index 933b5725638d6..68f02b5d57224 100644 --- a/app/code/Magento/Checkout/view/frontend/web/js/view/minicart.js +++ b/app/code/Magento/Checkout/view/frontend/web/js/view/minicart.js @@ -72,12 +72,6 @@ define([ this.isLoading(addToCartCalls > 0); sidebarInitialized = false; initSidebar(); - - /**TODO: Extra options support. Should be refactored after MAGETWO-43159. */ - setTimeout(function(){ - minicart.trigger('contentUpdated'); - }, 500); - }, this); $('[data-block="minicart"]').on('contentLoading', function(event) { addToCartCalls++; From 0734ec98ef7f6b4277633072c16ebbce60327815 Mon Sep 17 00:00:00 2001 From: Ievgen Shakhsuvarov Date: Sat, 24 Oct 2015 15:39:08 +0300 Subject: [PATCH 65/83] MAGETWO-40150: Empty space is displayed in Mini Shopping Cart where the Product was deleted --- app/code/Magento/Checkout/view/frontend/web/js/sidebar.js | 1 + 1 file changed, 1 insertion(+) diff --git a/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js b/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js index 790d8f721f5a9..b1ec6a75dcb38 100644 --- a/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js +++ b/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js @@ -33,6 +33,7 @@ define([ customerData.get('cart').subscribe(function () { $(self.options.targetElement).trigger('contentUpdated'); self._calcHeight(); + self._isOverflowed(); }); }, From a9f25d6051e0f6db3592bcc3edcb06f8760582b4 Mon Sep 17 00:00:00 2001 From: Stanislav Idolov Date: Mon, 26 Oct 2015 10:44:56 +0200 Subject: [PATCH 66/83] MAGETWO-39588: store_id value is not honored when creating simple product through API in multi-websites / multi-stores setup --- .../etc/{adminhtml => }/events.xml | 0 .../Store/_files/core_fixturestore.php | 21 ++++++++++--------- 2 files changed, 11 insertions(+), 10 deletions(-) rename app/code/Magento/CatalogSearch/etc/{adminhtml => }/events.xml (100%) diff --git a/app/code/Magento/CatalogSearch/etc/adminhtml/events.xml b/app/code/Magento/CatalogSearch/etc/events.xml similarity index 100% rename from app/code/Magento/CatalogSearch/etc/adminhtml/events.xml rename to app/code/Magento/CatalogSearch/etc/events.xml diff --git a/dev/tests/integration/testsuite/Magento/Store/_files/core_fixturestore.php b/dev/tests/integration/testsuite/Magento/Store/_files/core_fixturestore.php index 730eca1e7404b..88c3f333e12ec 100644 --- a/dev/tests/integration/testsuite/Magento/Store/_files/core_fixturestore.php +++ b/dev/tests/integration/testsuite/Magento/Store/_files/core_fixturestore.php @@ -6,25 +6,26 @@ use Magento\TestFramework\Helper\Bootstrap; +/** @var \Magento\Store\Model\StoreManagerInterface $storeManager */ +$storeManager = Bootstrap::getObjectManager()->get('Magento\Store\Model\StoreManagerInterface'); + +/** @var \Magento\Store\Model\Store $store */ $store = Bootstrap::getObjectManager()->create('Magento\Store\Model\Store'); $storeCode = 'fixturestore'; -if (!$store->load($storeCode)->getId()) { - $websiteId = Bootstrap::getObjectManager()->get('Magento\Store\Model\StoreManagerInterface') - ->getWebsite() - ->getId(); - - $groupId = Bootstrap::getObjectManager()->get('Magento\Store\Model\StoreManagerInterface') - ->getWebsite() - ->getDefaultGroupId(); +if (!$store->load($storeCode)->getId()) { $store->setCode($storeCode) - ->setWebsiteId($websiteId) - ->setGroupId($groupId) + ->setWebsiteId($storeManager->getWebsite()->getId()) + ->setGroupId($storeManager->getWebsite()->getDefaultGroupId()) ->setName('Fixture Store') ->setSortOrder(10) ->setIsActive(1); $store->save(); + Bootstrap::getObjectManager() + ->get('Magento\Framework\Event\ManagerInterface') + ->dispatch('store_add', ['store' => $store]); + /* Refresh stores memory cache */ Bootstrap::getObjectManager()->get('Magento\Store\Model\StoreManagerInterface')->reinitStores(); } From a8a2724a643e1fe93081347833e39a4bd8730d49 Mon Sep 17 00:00:00 2001 From: Olga Matviienko Date: Mon, 26 Oct 2015 14:10:44 +0200 Subject: [PATCH 67/83] MAGETWO-42900: [GitHub] UI improvement. User account on hover cursor state --- .../Magento/luma/Magento_Theme/web/css/source/_module.less | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less index 6327a89678098..a1f0aac552bc6 100644 --- a/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less +++ b/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less @@ -465,6 +465,9 @@ padding: 8px; } } + .customer-name { + cursor: pointer; + } .customer-menu { display: none; } From e4f9381f6b47d2513eb281575079e2b12c4c4ba3 Mon Sep 17 00:00:00 2001 From: Olga Matviienko Date: Mon, 26 Oct 2015 14:25:20 +0200 Subject: [PATCH 68/83] MAGETWO-44317: [MF] "Grid/List" view selector is invalidly colored --- .../web/css/source/module/_toolbar.less | 155 ++++++------ .../web/css/source/module/_toolbar.less | 223 ++++++++++-------- 2 files changed, 204 insertions(+), 174 deletions(-) diff --git a/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/module/_toolbar.less b/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/module/_toolbar.less index 95ae194085ad2..c6e638f56f450 100644 --- a/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/module/_toolbar.less +++ b/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/module/_toolbar.less @@ -4,105 +4,109 @@ // */ // -// Common -//-------------------------------------- +// Common +// _____________________________________________ @toolbar-mode-icon-font-size: 24px; @toolbar-element-background: @panel__background-color; & when (@media-common = true) { -.page-products .columns { - position: relative; - z-index: 1; -} - -.toolbar { - &:extend(.abs-add-clearfix all); - &-amount { - display: block; - line-height: @toolbar-mode-icon-font-size+2; - padding: 8px 0 0; - margin: 0; - vertical-align: middle; - .products.wrapper ~ .toolbar & { - display: none; + .page-products { + .columns { + position: relative; + z-index: 1; } } - &-products { - margin-bottom: @indent__xl; - text-align: center; - padding: 0 @indent__s; + + .toolbar { &:extend(.abs-add-clearfix all); - .pages { - display: none; - .products.wrapper ~ & { - display: block; + &-amount { + display: block; + line-height: @toolbar-mode-icon-font-size+2; + margin: 0; + padding: 8px 0 0; + vertical-align: middle; + .products.wrapper ~ .toolbar & { + display: none; } } - .limiter { - display: none; - .control { - display: inline-block; + &-products { + margin-bottom: @indent__xl; + padding: 0 @indent__s; + text-align: center; + &:extend(.abs-add-clearfix all); + .pages { + display: none; + .products.wrapper ~ & { + display: block; + } + } + .limiter { + display: none; + .control { + display: inline-block; + } } } } -} -.sorter { - padding: 4px 0 0; - .products.wrapper ~ .toolbar & { - display: none; - } - &-options { - margin: 0 0 0 7px; - width: auto; - } - &-action { - vertical-align: top; - .lib-icon-font( + .sorter { + padding: 4px 0 0; + .products.wrapper ~ .toolbar & { + display: none; + } + &-options { + margin: 0 0 0 7px; + width: auto; + } + &-action { + vertical-align: top; + .lib-icon-font( @icon-arrow-up, @_icon-font-size: 28px, @_icon-font-line-height: 32px, @_icon-font-color: @header-icons-color, @_icon-font-color-hover: @header-icons-color-hover, @_icon-font-text-hide: true - ); - &.sort-desc:before { - content: @icon-arrow-down; + ); + &.sort-desc:before { + content: @icon-arrow-down; + } } } -} -.modes { - display: none; -} - -.limiter { - &-options { - width: auto; - margin: 0 5px 0 7px; - } - &-label { - font-weight: 400; - } - .page-products .toolbar & { + .modes { display: none; } -} + .limiter { + &-options { + width: auto; + margin: 0 5px 0 7px; + } + &-label { + font-weight: 400; + } + .page-products .toolbar & { + display: none; + } + } } // -// Mobile -// --------------------------------------------- +// Desctop +// _____________________________________________ .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__s) { - .page-products .columns { - position: relative; - z-index: 1; - padding-top: 0; + .page-products { + .columns { + padding-top: 0; + position: relative; + z-index: 1; + } } + .toolbar { .products.wrapper ~ & .pages { float: left; @@ -111,19 +115,24 @@ float: left; } } + .sorter { float: right; } + .modes { - float: left; display: inline-block; + float: left; margin-right: @indent__base; + .products.wrapper ~ .toolbar & { display: none; } + &-label { &:extend(.abs-visually-hidden-desktop-s all); } + &-mode { .lib-css(color, @text__color__muted); border: 1px solid @border-color__base; @@ -134,8 +143,8 @@ padding: 7px 10px; text-align: center; &:not(.active):hover { - background: darken(@toolbar-element-background, 7%); .lib-css(color, @text__color__muted); + background: darken(@toolbar-element-background, 7%); } &:last-child { border-right: 1px solid @border-color__base; @@ -144,15 +153,19 @@ .lib-css(color, @primary__color__light); } .lib-icon-font( - @icon-grid, - @_icon-font-size: @toolbar-mode-icon-font-size, - @_icon-font-text-hide: true + @icon-grid, + @_icon-font-size: @toolbar-mode-icon-font-size, + @_icon-font-text-hide: true, + @_icon-font-color: @text__color__muted, + @_icon-font-color-hover: @text__color__muted ); } } + .mode-list { .lib-icon-font-symbol(@icon-list); } + .limiter { float: right; .products.wrapper ~ .toolbar & { diff --git a/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module/_toolbar.less b/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module/_toolbar.less index 3eefdcaa2b74c..bb25b47c668da 100644 --- a/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module/_toolbar.less +++ b/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module/_toolbar.less @@ -11,114 +11,117 @@ @pager__font-weight: @font-weight__bold; // -// Common -//-------------------------------------- +// Common +// _____________________________________________ & when (@media-common = true) { - -.page-products .columns { - position: relative; - z-index: 1; - padding-top: 60px; -} - -.toolbar { - select { - .lib-css(background-color, @toolbar-element-background); - border-radius: 3px; - .lib-css(box-shadow, @button__shadow); + .page-products { + .columns { + padding-top: 60px; + position: relative; + z-index: 1; + } } - text-align: center; - &:extend(.abs-add-clearfix all); - &-amount { - position: absolute; - left: 0; - top: 0; - line-height: @toolbar-mode-icon-font-size+2; - padding: 7px 0; - margin: 0; - vertical-align: middle; - text-align: left; - .products.wrapper ~ .toolbar & { - display: none; + .toolbar { + &:extend(.abs-add-clearfix all); + margin-bottom: @indent__l; + text-align: center; + + select { + .lib-css(background-color, @toolbar-element-background); + .lib-css(box-shadow, @button__shadow); + border-radius: 3px; } - } - .page-with-filter & { + &-amount { - position: static; + left: 0; + line-height: @toolbar-mode-icon-font-size+2; + margin: 0; + padding: 7px 0; + position: absolute; + text-align: left; + top: 0; + vertical-align: middle; + .products.wrapper ~ .toolbar & { + display: none; + } } - } - margin-bottom: @indent__l; - &-products { - .lib-css(background-color, @toolbar-background); - .pages { - display: none; - .products.wrapper ~ & { - display: block; + + .page-with-filter & { + &-amount { + position: static; } } - } - .pages { - margin-bottom: @indent__m; - } -} -.sorter { - float: right; - .page-products & { - position: absolute; - z-index: 1; - top: 0; - right: @indent__s; - } - .products.wrapper ~ .toolbar & { - display: none; - } - &-options { - margin: 0 @indent__xs 0 7px; - width: auto; + &-products { + .lib-css(background-color, @toolbar-background); + .pages { + display: none; + .products.wrapper ~ & { + display: block; + } + } + } + .pages { + margin-bottom: @indent__m; + } } - &-action { - .lib-icon-font( + + .sorter { + float: right; + .page-products & { + position: absolute; + right: @indent__s; + top: 0; + z-index: 1; + } + .products.wrapper ~ .toolbar & { + display: none; + } + &-options { + margin: 0 @indent__xs 0 7px; + width: auto; + } + &-action { + .lib-icon-font( @icon-arrow-up, @_icon-font-size: 16px, @_icon-font-color: @header-icons-color, @_icon-font-color-hover: @header-icons-color-hover - ); - .lib-icon-text-hide(); - &.sort-desc:before { - content: @icon-arrow-down; + ); + .lib-icon-text-hide(); + &.sort-desc:before { + content: @icon-arrow-down; + } } } -} -.modes { - display: none; -} - -.limiter { - display: none; - &-options { - width: auto; - margin: 0 5px 0 7px; - } - &-label { - font-weight: 400; - } - .page-products .toolbar & { + .modes { display: none; } - .control { - display: inline-block; - } -} + .limiter { + display: none; + &-options { + margin: 0 5px 0 7px; + width: auto; + } + &-label { + font-weight: 400; + } + .page-products .toolbar & { + display: none; + } + .control { + display: inline-block; + } + } } // -// Mobile -//-------------------------------------- +// Desctop +// _____________________________________________ .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__s) { .toolbar-products { @@ -127,26 +130,31 @@ } .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__s) { - .page-products .columns { - position: relative; - z-index: 1; - padding-top: 0; + .page-products { + .columns { + padding-top: 0; + position: relative; + z-index: 1; + } } + .toolbar { &-amount { - position: static; display: block; float: left; + position: static; } .products.wrapper ~ & .pages { float: left; margin-bottom: 0; } } + .modes { - float: left; display: inline-block; + float: left; margin-right: @indent__base; + .products.wrapper ~ .toolbar & { display: none; } @@ -156,22 +164,23 @@ } &-mode { - float: left; + .lib-css(background-color, @toolbar-element-background); + .lib-css(box-shadow, @button__shadow); + .lib-css(color, @text__color__muted); border: 1px solid @border-color__base; + border-right: 0; + float: left; font-weight: @font-weight__regular; - .lib-css(color, @text__color__muted); - text-align: center; - padding: 7px 10px; line-height: 1; - border-right: 0; - .lib-css(background-color, @toolbar-element-background); - .lib-css(box-shadow, @button__shadow); + padding: 7px 10px; + text-align: center; + .modes-label + & { border-radius: 3px 0 0 3px; } &:hover { - background: darken(@toolbar-element-background, 2%); .lib-css(color, @text__color__muted); + background: darken(@toolbar-element-background, 2%); } &:last-child { border-radius: 0 3px 3px 0; @@ -182,21 +191,29 @@ background: darken(@toolbar-element-background, 7%); color: @color-gray62; } + .lib-icon-font( - @icon-grid, - @_icon-font-size: @toolbar-mode-icon-font-size, - @_icon-font-text-hide: true + @icon-grid, + @_icon-font-size: @toolbar-mode-icon-font-size, + @_icon-font-text-hide: true, + @_icon-font-color: @text__color__muted, + @_icon-font-color-hover: @text__color__muted ); } } + .sorter { .page-products & { position: static; } } - .mode-list:before { - content: @icon-list; + + .mode-list { + &:before { + content: @icon-list; + } } + .limiter { float: right; .products.wrapper ~ .toolbar & { From d4981dbe8ac791f950f364895bf5b3b7cc026bc7 Mon Sep 17 00:00:00 2001 From: Stanislav Idolov Date: Tue, 27 Oct 2015 11:34:11 +0200 Subject: [PATCH 69/83] MAGETWO-39588: store_id value is not honored when creating simple product through API in multi-websites / multi-stores setup --- .../Api/ProductRepositoryInterfaceTest.php | 4 +-- .../Store/_files/core_fixturestore.php | 4 --- ...fixture_store_with_catalogsearch_index.php | 31 +++++++++++++++++++ ...tore_with_catalogsearch_index_rollback.php | 22 +++++++++++++ 4 files changed, 55 insertions(+), 6 deletions(-) create mode 100644 dev/tests/integration/testsuite/Magento/Store/_files/fixture_store_with_catalogsearch_index.php create mode 100644 dev/tests/integration/testsuite/Magento/Store/_files/fixture_store_with_catalogsearch_index_rollback.php diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductRepositoryInterfaceTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductRepositoryInterfaceTest.php index a4e575526562a..8535762ad4f08 100644 --- a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductRepositoryInterfaceTest.php +++ b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductRepositoryInterfaceTest.php @@ -140,7 +140,7 @@ public function testCreate($product) * @param array $fixtureProduct * * @dataProvider productCreationProvider - * @magentoApiDataFixture Magento/Store/_files/core_fixturestore.php + * @magentoApiDataFixture Magento/Store/_files/fixture_store_with_catalogsearch_index.php */ public function testCreateAllStoreCode($fixtureProduct) { @@ -169,7 +169,7 @@ public function testCreateAllStoreCode($fixtureProduct) * @param array $fixtureProduct * * @dataProvider productCreationProvider - * @magentoApiDataFixture Magento/Store/_files/core_fixturestore.php + * @magentoApiDataFixture Magento/Store/_files/fixture_store_with_catalogsearch_index.php */ public function testDeleteAllStoreCode($fixtureProduct) { diff --git a/dev/tests/integration/testsuite/Magento/Store/_files/core_fixturestore.php b/dev/tests/integration/testsuite/Magento/Store/_files/core_fixturestore.php index 88c3f333e12ec..8c432d03e7948 100644 --- a/dev/tests/integration/testsuite/Magento/Store/_files/core_fixturestore.php +++ b/dev/tests/integration/testsuite/Magento/Store/_files/core_fixturestore.php @@ -22,10 +22,6 @@ ->setIsActive(1); $store->save(); - Bootstrap::getObjectManager() - ->get('Magento\Framework\Event\ManagerInterface') - ->dispatch('store_add', ['store' => $store]); - /* Refresh stores memory cache */ Bootstrap::getObjectManager()->get('Magento\Store\Model\StoreManagerInterface')->reinitStores(); } diff --git a/dev/tests/integration/testsuite/Magento/Store/_files/fixture_store_with_catalogsearch_index.php b/dev/tests/integration/testsuite/Magento/Store/_files/fixture_store_with_catalogsearch_index.php new file mode 100644 index 0000000000000..88c3f333e12ec --- /dev/null +++ b/dev/tests/integration/testsuite/Magento/Store/_files/fixture_store_with_catalogsearch_index.php @@ -0,0 +1,31 @@ +get('Magento\Store\Model\StoreManagerInterface'); + +/** @var \Magento\Store\Model\Store $store */ +$store = Bootstrap::getObjectManager()->create('Magento\Store\Model\Store'); +$storeCode = 'fixturestore'; + +if (!$store->load($storeCode)->getId()) { + $store->setCode($storeCode) + ->setWebsiteId($storeManager->getWebsite()->getId()) + ->setGroupId($storeManager->getWebsite()->getDefaultGroupId()) + ->setName('Fixture Store') + ->setSortOrder(10) + ->setIsActive(1); + $store->save(); + + Bootstrap::getObjectManager() + ->get('Magento\Framework\Event\ManagerInterface') + ->dispatch('store_add', ['store' => $store]); + + /* Refresh stores memory cache */ + Bootstrap::getObjectManager()->get('Magento\Store\Model\StoreManagerInterface')->reinitStores(); +} diff --git a/dev/tests/integration/testsuite/Magento/Store/_files/fixture_store_with_catalogsearch_index_rollback.php b/dev/tests/integration/testsuite/Magento/Store/_files/fixture_store_with_catalogsearch_index_rollback.php new file mode 100644 index 0000000000000..08a8af6a68e62 --- /dev/null +++ b/dev/tests/integration/testsuite/Magento/Store/_files/fixture_store_with_catalogsearch_index_rollback.php @@ -0,0 +1,22 @@ +get('Magento\Framework\Registry'); + +$registry->unregister('isSecureArea'); +$registry->register('isSecureArea', true); + +/** @var \Magento\Store\Model\Store $store */ +$store = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create('Magento\Store\Model\Store'); +$storeCode = 'fixturestore'; +$store->load($storeCode); +if ($store->getId()) { + $store->delete(); +} + +$registry->unregister('isSecureArea'); +$registry->register('isSecureArea', false); From ae174e7e38a0ab262946d3bc863cb91faad5684a Mon Sep 17 00:00:00 2001 From: Michail Slabko Date: Mon, 26 Oct 2015 13:48:38 +0200 Subject: [PATCH 70/83] MAGETWO-36162: Unable to change some product information corresponding to all store view (storeId = 0) in multiwebsite structure through API service --- .../Api/Data/ProductWebsiteLinkInterface.php | 39 ++++++++++ .../ProductWebsiteLinkRepositoryInterface.php | 32 ++++++++ .../Catalog/Model/ProductRepository.php | 2 +- .../Catalog/Model/ProductWebsiteLink.php | 51 +++++++++++++ .../Model/ProductWebsiteLinkRepository.php | 76 +++++++++++++++++++ app/code/Magento/Catalog/etc/di.xml | 2 + app/code/Magento/Catalog/etc/webapi.xml | 18 +++++ 7 files changed, 219 insertions(+), 1 deletion(-) create mode 100644 app/code/Magento/Catalog/Api/Data/ProductWebsiteLinkInterface.php create mode 100644 app/code/Magento/Catalog/Api/ProductWebsiteLinkRepositoryInterface.php create mode 100644 app/code/Magento/Catalog/Model/ProductWebsiteLink.php create mode 100644 app/code/Magento/Catalog/Model/ProductWebsiteLinkRepository.php diff --git a/app/code/Magento/Catalog/Api/Data/ProductWebsiteLinkInterface.php b/app/code/Magento/Catalog/Api/Data/ProductWebsiteLinkInterface.php new file mode 100644 index 0000000000000..a50edeedcfa67 --- /dev/null +++ b/app/code/Magento/Catalog/Api/Data/ProductWebsiteLinkInterface.php @@ -0,0 +1,39 @@ +setData('tier_price', $tierPrices); } - $this->resourceModel->save($product); + $product->save(); } catch (\Magento\Eav\Model\Entity\Attribute\Exception $exception) { throw \Magento\Framework\Exception\InputException::invalidFieldValue( $exception->getAttributeCode(), diff --git a/app/code/Magento/Catalog/Model/ProductWebsiteLink.php b/app/code/Magento/Catalog/Model/ProductWebsiteLink.php new file mode 100644 index 0000000000000..614cd579281f1 --- /dev/null +++ b/app/code/Magento/Catalog/Model/ProductWebsiteLink.php @@ -0,0 +1,51 @@ +_get(self::KEY_SKU); + } + + /** + * {@inheritdoc} + */ + public function getWebsiteId() + { + return $this->_get(self::WEBSITE_ID); + } + + /** + * @param string $sku + * @return $this + */ + public function setSku($sku) + { + return $this->setData(self::KEY_SKU, $sku); + } + + /** + * {@inheritdoc} + */ + public function setWebsiteId($websiteId) + { + return $this->setData(self::WEBSITE_ID, $websiteId); + } +} diff --git a/app/code/Magento/Catalog/Model/ProductWebsiteLinkRepository.php b/app/code/Magento/Catalog/Model/ProductWebsiteLinkRepository.php new file mode 100644 index 0000000000000..991086d62ef34 --- /dev/null +++ b/app/code/Magento/Catalog/Model/ProductWebsiteLinkRepository.php @@ -0,0 +1,76 @@ +productRepository = $productRepository; + } + + /** + * {@inheritdoc} + */ + public function save(ProductWebsiteLinkInterface $productWebsiteLink) + { + if (!$productWebsiteLink->getWebsiteId()) { + throw new InputException(__('There are not websites for assign to product')); + } + $product = $this->productRepository->get($productWebsiteLink->getSku()); + $product->setWebsiteIds(array_merge($product->getWebsiteIds(), [$productWebsiteLink->getWebsiteId()])); + try { + $product->save(); + } catch (\Exception $e) { + throw new CouldNotSaveException( + __( + 'Could not assign product "%1" to websites "%2"', + $product->getId(), + $productWebsiteLink->getWebsiteId() + ), + $e + ); + } + return true; + } + + /** + * {@inheritdoc} + */ + public function deleteById($sku, $websiteId) + { + $product = $this->productRepository->get($sku); + $product->setWebsiteIds(array_diff($product->getWebsiteIds(), [$websiteId])); + + try { + $product->save(); + } catch (\Exception $e) { + throw new CouldNotSaveException( + __( + 'Could not save product "%1" with websites %2', + $product->getId(), + implode(', ', $product->getWebsiteIds()) + ), + $e + ); + } + return true; + } +} diff --git a/app/code/Magento/Catalog/etc/di.xml b/app/code/Magento/Catalog/etc/di.xml index 7bd251153314e..3ffee93604698 100644 --- a/app/code/Magento/Catalog/etc/di.xml +++ b/app/code/Magento/Catalog/etc/di.xml @@ -459,6 +459,8 @@ + + diff --git a/app/code/Magento/Catalog/etc/webapi.xml b/app/code/Magento/Catalog/etc/webapi.xml index 24492cbc019b9..6e6ee08b761e9 100644 --- a/app/code/Magento/Catalog/etc/webapi.xml +++ b/app/code/Magento/Catalog/etc/webapi.xml @@ -385,4 +385,22 @@ + + + + + + + + + + + + + + + + + + From 8eee426ab3d352d18d967eca3d00f91a8ce998a0 Mon Sep 17 00:00:00 2001 From: Michail Slabko Date: Mon, 26 Oct 2015 14:48:24 +0200 Subject: [PATCH 71/83] MAGETWO-44556: Js error on product page "Cannot read property 'getCurrencySymbol' of undefined" --- .../view/adminhtml/web/js/variations/steps/bulk.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/steps/bulk.js b/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/steps/bulk.js index 499962f8e59f8..788d4eed83235 100644 --- a/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/steps/bulk.js +++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/steps/bulk.js @@ -55,7 +55,7 @@ define([ type: ko.observable('none'), value: ko.observable(), attribute: ko.observable(), - currencySymbol: this.variationsComponent().getCurrencySymbol() + currencySymbol: '' }, quantity: { label: 'quantity', @@ -64,6 +64,11 @@ define([ attribute: ko.observable() } }); + + this.variationsComponent(function (variationsComponent) { + this.sections().price.currencySymbol = variationsComponent.getCurrencySymbol() + }.bind(this)); + this.makeOptionSections = function () { this.images = new self.makeImages(null); this.price = self.price; From 1cf0a7254452dc6ecdb31dd58fe3a48b8c340e17 Mon Sep 17 00:00:00 2001 From: Vitalii Zabaznov Date: Mon, 26 Oct 2015 17:06:24 +0200 Subject: [PATCH 72/83] MAGETWO-43505: Check-boxes are avoided on "create Downloadable Product" Admin page - fix test --- .../Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.xml b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.xml index bd1e9e70f43f1..6d6f3231f3e8e 100644 --- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.xml +++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.xml @@ -14,7 +14,7 @@ [name="product[links_purchased_separately]"] css selector - select + checkbox From 6c0ac05be596a0259ffbf39f2e23346be8a7e849 Mon Sep 17 00:00:00 2001 From: Valeriy Nayda Date: Mon, 26 Oct 2015 17:12:44 +0200 Subject: [PATCH 73/83] MAGETWO-43822: Incorrect Request Path generated for child category if Edit URL Rewrites from Category Page --- .../Model/CategoryUrlPathGenerator.php | 4 +- .../CategoryUrlPathAutogeneratorObserver.php | 56 +++++++++++++++++-- .../Service/V1/StoreViewService.php | 36 ++++++++++-- 3 files changed, 86 insertions(+), 10 deletions(-) diff --git a/app/code/Magento/CatalogUrlRewrite/Model/CategoryUrlPathGenerator.php b/app/code/Magento/CatalogUrlRewrite/Model/CategoryUrlPathGenerator.php index d978d726a58c7..24d5eb552c3d6 100644 --- a/app/code/Magento/CatalogUrlRewrite/Model/CategoryUrlPathGenerator.php +++ b/app/code/Magento/CatalogUrlRewrite/Model/CategoryUrlPathGenerator.php @@ -73,7 +73,9 @@ public function getUrlPath($category) return $category->getUrlPath(); } if ($this->isNeedToGenerateUrlPathForParent($category)) { - $parentPath = $this->getUrlPath($this->categoryRepository->get($category->getParentId())); + $parentPath = $this->getUrlPath( + $this->categoryRepository->get($category->getParentId(),$category->getStoreId()) + ); $path = $parentPath === '' ? $path : $parentPath . '/' . $path; } return $path; diff --git a/app/code/Magento/CatalogUrlRewrite/Observer/CategoryUrlPathAutogeneratorObserver.php b/app/code/Magento/CatalogUrlRewrite/Observer/CategoryUrlPathAutogeneratorObserver.php index e72b5df170485..a832b1104e92b 100644 --- a/app/code/Magento/CatalogUrlRewrite/Observer/CategoryUrlPathAutogeneratorObserver.php +++ b/app/code/Magento/CatalogUrlRewrite/Observer/CategoryUrlPathAutogeneratorObserver.php @@ -7,9 +7,11 @@ use Magento\Catalog\Model\Category; use Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator; +use Magento\CatalogUrlRewrite\Service\V1\StoreViewService; use Magento\Framework\Event\Observer; use Magento\CatalogUrlRewrite\Model\Category\ChildrenCategoriesProvider; use Magento\Framework\Event\ObserverInterface; +use Magento\Store\Model\Store; class CategoryUrlPathAutogeneratorObserver implements ObserverInterface { @@ -19,16 +21,22 @@ class CategoryUrlPathAutogeneratorObserver implements ObserverInterface /** @var \Magento\CatalogUrlRewrite\Model\Category\ChildrenCategoriesProvider */ protected $childrenCategoriesProvider; + /** @var StoreViewService */ + protected $storeViewService; + /** * @param CategoryUrlPathGenerator $categoryUrlPathGenerator * @param ChildrenCategoriesProvider $childrenCategoriesProvider + * @param \Magento\CatalogUrlRewrite\Service\V1\StoreViewService $storeViewService */ public function __construct( CategoryUrlPathGenerator $categoryUrlPathGenerator, - ChildrenCategoriesProvider $childrenCategoriesProvider + ChildrenCategoriesProvider $childrenCategoriesProvider, + StoreViewService $storeViewService ) { $this->categoryUrlPathGenerator = $categoryUrlPathGenerator; $this->childrenCategoriesProvider = $childrenCategoriesProvider; + $this->storeViewService = $storeViewService; } /** @@ -57,10 +65,48 @@ public function execute(\Magento\Framework\Event\Observer $observer) */ protected function updateUrlPathForChildren(Category $category) { - foreach ($this->childrenCategoriesProvider->getChildren($category, true) as $childCategory) { - $childCategory->unsUrlPath(); - $childCategory->setUrlPath($this->categoryUrlPathGenerator->getUrlPath($childCategory)); - $childCategory->getResource()->saveAttribute($childCategory, 'url_path'); + $children = $this->childrenCategoriesProvider->getChildren($category, true); + + if ($this->isGlobalScope($category->getStoreId())) { + foreach ($children as $child) { + foreach ($category->getStoreIds() as $storeId) { + if ($this->storeViewService->doesEntityHaveOverriddenUrlPathForStore( + $storeId, + $child->getId(), + Category::ENTITY + )) { + $child->setStoreId($storeId); + $this->updateUrlPathForCategory($child); + } + } + } + } else { + foreach ($children as $child) { + $child->setStoreId($category->getStoreId()); + $this->updateUrlPathForCategory($child); + } } } + + /** + * Check is global scope + * + * @param int|null $storeId + * @return bool + */ + protected function isGlobalScope($storeId) + { + return null === $storeId || $storeId == Store::DEFAULT_STORE_ID; + } + + /** + * @param Category $category + * @return void + */ + protected function updateUrlPathForCategory(Category $category) + { + $category->unsUrlPath(); + $category->setUrlPath($this->categoryUrlPathGenerator->getUrlPath($category)); + $category->getResource()->saveAttribute($category, 'url_path'); + } } diff --git a/app/code/Magento/CatalogUrlRewrite/Service/V1/StoreViewService.php b/app/code/Magento/CatalogUrlRewrite/Service/V1/StoreViewService.php index 958e882c46013..86cd085a796e2 100644 --- a/app/code/Magento/CatalogUrlRewrite/Service/V1/StoreViewService.php +++ b/app/code/Magento/CatalogUrlRewrite/Service/V1/StoreViewService.php @@ -46,14 +46,42 @@ public function __construct( */ public function doesEntityHaveOverriddenUrlKeyForStore($storeId, $entityId, $entityType) { - $attribute = $this->eavConfig->getAttribute($entityType, 'url_key'); + return $this->doesEntityHaveOverriddenUrlAttributeForStore($storeId, $entityId, $entityType, 'url_key'); + } + + /** + * Check that entity has overridden url path for specific store + * + * @param int $storeId + * @param int $entityId + * @param string $entityType + * @throws \InvalidArgumentException + * @return bool + */ + public function doesEntityHaveOverriddenUrlPathForStore($storeId, $entityId, $entityType) + { + return $this->doesEntityHaveOverriddenUrlAttributeForStore($storeId, $entityId, $entityType, 'url_path'); + } + + /** + * Check that entity has overridden url attribute for specific store + * + * @param int $storeId + * @param int $entityId + * @param string $entityType + * @throws \InvalidArgumentException + * @return bool + */ + protected function doesEntityHaveOverriddenUrlAttributeForStore($storeId, $entityId, $entityType, $attributeName) + { + $attribute = $this->eavConfig->getAttribute($entityType, $attributeName); if (!$attribute) { throw new \InvalidArgumentException(sprintf('Cannot retrieve attribute for entity type "%s"', $entityType)); } $select = $this->connection->select() - ->from($attribute->getBackendTable(), 'store_id') - ->where('attribute_id = ?', $attribute->getId()) - ->where('entity_id = ?', $entityId); + ->from($attribute->getBackendTable(), 'store_id') + ->where('attribute_id = ?', $attribute->getId()) + ->where('entity_id = ?', $entityId); return in_array($storeId, $this->connection->fetchCol($select)); } From 6d3a6a760feb91700a7aa392f80b8204c0d03142 Mon Sep 17 00:00:00 2001 From: Andrii Lugovyi Date: Wed, 30 Sep 2015 13:54:57 +0300 Subject: [PATCH 74/83] MAGETWO-43464: Loaded files display twice if edit downloadable product - remove extra div --- .../templates/product/edit/downloadable.phtml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable.phtml b/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable.phtml index dac2edad7be49..dd2cf918d704e 100644 --- a/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable.phtml +++ b/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable.phtml @@ -25,17 +25,6 @@ require([ // var uploaderTemplate = '
' + - '
' + - '' + - '<%= data.name %>' + - ' ' + - '(<%- data.size %>)' + - '' + - '
' + - '
' + - '
' + - '
' + - '
' + '
' + '
' + '<%- data.percent %>% <%- data.uploaded %> / <%- data.total %>' + From a4056d44c9092e3842caea42f868f987cd75cd04 Mon Sep 17 00:00:00 2001 From: Michail Slabko Date: Tue, 27 Oct 2015 13:38:39 +0200 Subject: [PATCH 75/83] MAGETWO-36162: Unable to change some product information corresponding to all store view (storeId = 0) in multiwebsite structure through API service --- .../Api/Data/ProductWebsiteLinkInterface.php | 2 +- .../ProductWebsiteLinkRepositoryInterface.php | 20 ++++++++++++++----- .../Model/ProductWebsiteLinkRepository.php | 8 ++++++++ app/code/Magento/Catalog/etc/webapi.xml | 2 ++ 4 files changed, 26 insertions(+), 6 deletions(-) diff --git a/app/code/Magento/Catalog/Api/Data/ProductWebsiteLinkInterface.php b/app/code/Magento/Catalog/Api/Data/ProductWebsiteLinkInterface.php index a50edeedcfa67..08c8f6b970583 100644 --- a/app/code/Magento/Catalog/Api/Data/ProductWebsiteLinkInterface.php +++ b/app/code/Magento/Catalog/Api/Data/ProductWebsiteLinkInterface.php @@ -12,7 +12,7 @@ interface ProductWebsiteLinkInterface { /** - * @return string|null + * @return string */ public function getSku(); diff --git a/app/code/Magento/Catalog/Api/ProductWebsiteLinkRepositoryInterface.php b/app/code/Magento/Catalog/Api/ProductWebsiteLinkRepositoryInterface.php index d557bc583cc5b..67f73d354a589 100644 --- a/app/code/Magento/Catalog/Api/ProductWebsiteLinkRepositoryInterface.php +++ b/app/code/Magento/Catalog/Api/ProductWebsiteLinkRepositoryInterface.php @@ -9,10 +9,10 @@ interface ProductWebsiteLinkRepositoryInterface { /** - * Assign a product to the websites + * Assign a product to the website * * @param \Magento\Catalog\Api\Data\ProductWebsiteLinkInterface $productWebsiteLink - * @return bool will returned True if assigned + * @return bool will returned True if website successfully assigned to product * * @throws \Magento\Framework\Exception\CouldNotSaveException * @throws \Magento\Framework\Exception\InputException @@ -20,13 +20,23 @@ interface ProductWebsiteLinkRepositoryInterface public function save(Data\ProductWebsiteLinkInterface $productWebsiteLink); /** - * Remove the websites assignment from the product by product sku + * Remove the website assignment from the product + * + * @param \Magento\Catalog\Api\Data\ProductWebsiteLinkInterface $productWebsiteLink + * @return bool will returned True if website successfully unassigned from product + * + * @throws \Magento\Framework\Exception\CouldNotSaveException + */ + public function delete(Data\ProductWebsiteLinkInterface $productWebsiteLink); + + /** + * Remove the website assignment from the product by product sku * * @param string $sku * @param int $websiteId - * @return bool will returned True if websites successfully unassigned from product + * @return bool will returned True if website successfully unassigned from product * - * @throws \Magento\Framework\Exception\StateException + * @throws \Magento\Framework\Exception\CouldNotSaveException */ public function deleteById($sku, $websiteId); } \ No newline at end of file diff --git a/app/code/Magento/Catalog/Model/ProductWebsiteLinkRepository.php b/app/code/Magento/Catalog/Model/ProductWebsiteLinkRepository.php index 991086d62ef34..4e24fc5ef9c9b 100644 --- a/app/code/Magento/Catalog/Model/ProductWebsiteLinkRepository.php +++ b/app/code/Magento/Catalog/Model/ProductWebsiteLinkRepository.php @@ -51,6 +51,14 @@ public function save(ProductWebsiteLinkInterface $productWebsiteLink) return true; } + /** + * {@inheritdoc} + */ + public function delete(ProductWebsiteLinkInterface $productLink) + { + return $this->deleteById($productLink->getSku(), $productLink->getSku()); + } + /** * {@inheritdoc} */ diff --git a/app/code/Magento/Catalog/etc/webapi.xml b/app/code/Magento/Catalog/etc/webapi.xml index 6e6ee08b761e9..d447b748a9ef4 100644 --- a/app/code/Magento/Catalog/etc/webapi.xml +++ b/app/code/Magento/Catalog/etc/webapi.xml @@ -385,6 +385,8 @@ + + From 546cde3ea319d4dffc86477ae2304ee01c0da8ec Mon Sep 17 00:00:00 2001 From: Valeriy Nayda Date: Tue, 27 Oct 2015 15:25:23 +0200 Subject: [PATCH 76/83] MAGETWO-43822: Incorrect Request Path generated for child category if Edit URL Rewrites from Category Page - fix builds --- .../Model/CategoryUrlPathGenerator.php | 4 +- .../Model/ProductUrlPathGenerator.php | 2 +- .../CategoryUrlPathAutogeneratorObserver.php | 3 +- .../ProductUrlKeyAutogeneratorObserver.php | 2 +- .../Model/CategoryUrlPathGeneratorTest.php | 12 +- .../Model/ProductUrlPathGeneratorTest.php | 41 +++--- ...tegoryUrlPathAutogeneratorObserverTest.php | 129 +++++++++++++++--- .../Price/ConfigurablePriceResolver.php | 2 +- 8 files changed, 140 insertions(+), 55 deletions(-) diff --git a/app/code/Magento/CatalogUrlRewrite/Model/CategoryUrlPathGenerator.php b/app/code/Magento/CatalogUrlRewrite/Model/CategoryUrlPathGenerator.php index 24d5eb552c3d6..69b955cf78a39 100644 --- a/app/code/Magento/CatalogUrlRewrite/Model/CategoryUrlPathGenerator.php +++ b/app/code/Magento/CatalogUrlRewrite/Model/CategoryUrlPathGenerator.php @@ -74,7 +74,7 @@ public function getUrlPath($category) } if ($this->isNeedToGenerateUrlPathForParent($category)) { $parentPath = $this->getUrlPath( - $this->categoryRepository->get($category->getParentId(),$category->getStoreId()) + $this->categoryRepository->get($category->getParentId(), $category->getStoreId()) ); $path = $parentPath === '' ? $path : $parentPath . '/' . $path; } @@ -143,7 +143,7 @@ public function getCanonicalUrlPath($category) * @param \Magento\Catalog\Model\Category $category * @return string */ - public function generateUrlKey($category) + public function getUrlKey($category) { $urlKey = $category->getUrlKey(); return $category->formatUrlKey($urlKey === '' || $urlKey === null ? $category->getName() : $urlKey); diff --git a/app/code/Magento/CatalogUrlRewrite/Model/ProductUrlPathGenerator.php b/app/code/Magento/CatalogUrlRewrite/Model/ProductUrlPathGenerator.php index 90e65b9094f5e..7656610422d4a 100644 --- a/app/code/Magento/CatalogUrlRewrite/Model/ProductUrlPathGenerator.php +++ b/app/code/Magento/CatalogUrlRewrite/Model/ProductUrlPathGenerator.php @@ -114,7 +114,7 @@ public function getCanonicalUrlPath($product, $category = null) * @param \Magento\Catalog\Model\Product $product * @return string */ - public function generateUrlKey($product) + public function getUrlKey($product) { return $product->getUrlKey() === false ? false : $this->prepareProductUrlKey($product); } diff --git a/app/code/Magento/CatalogUrlRewrite/Observer/CategoryUrlPathAutogeneratorObserver.php b/app/code/Magento/CatalogUrlRewrite/Observer/CategoryUrlPathAutogeneratorObserver.php index a832b1104e92b..74d9754b1d2e5 100644 --- a/app/code/Magento/CatalogUrlRewrite/Observer/CategoryUrlPathAutogeneratorObserver.php +++ b/app/code/Magento/CatalogUrlRewrite/Observer/CategoryUrlPathAutogeneratorObserver.php @@ -48,7 +48,7 @@ public function execute(\Magento\Framework\Event\Observer $observer) /** @var Category $category */ $category = $observer->getEvent()->getCategory(); if ($category->getUrlKey() !== false) { - $category->setUrlKey($this->categoryUrlPathGenerator->generateUrlKey($category)) + $category->setUrlKey($this->categoryUrlPathGenerator->getUrlKey($category)) ->setUrlPath($this->categoryUrlPathGenerator->getUrlPath($category)); if (!$category->isObjectNew()) { $category->getResource()->saveAttribute($category, 'url_path'); @@ -105,7 +105,6 @@ protected function isGlobalScope($storeId) */ protected function updateUrlPathForCategory(Category $category) { - $category->unsUrlPath(); $category->setUrlPath($this->categoryUrlPathGenerator->getUrlPath($category)); $category->getResource()->saveAttribute($category, 'url_path'); } diff --git a/app/code/Magento/CatalogUrlRewrite/Observer/ProductUrlKeyAutogeneratorObserver.php b/app/code/Magento/CatalogUrlRewrite/Observer/ProductUrlKeyAutogeneratorObserver.php index 5a3cd8bb47a0a..525cc1568a77c 100644 --- a/app/code/Magento/CatalogUrlRewrite/Observer/ProductUrlKeyAutogeneratorObserver.php +++ b/app/code/Magento/CatalogUrlRewrite/Observer/ProductUrlKeyAutogeneratorObserver.php @@ -31,6 +31,6 @@ public function execute(\Magento\Framework\Event\Observer $observer) { /** @var Product $product */ $product = $observer->getEvent()->getProduct(); - $product->setUrlKey($this->productUrlPathGenerator->generateUrlKey($product)); + $product->setUrlKey($this->productUrlPathGenerator->getUrlKey($product)); } } diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/CategoryUrlPathGeneratorTest.php b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/CategoryUrlPathGeneratorTest.php index 94dc7f9c33ae2..41300634caaa4 100644 --- a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/CategoryUrlPathGeneratorTest.php +++ b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/CategoryUrlPathGeneratorTest.php @@ -235,7 +235,7 @@ public function testGetCanonicalUrlPath() /** * @return array */ - public function generateUrlKeyDataProvider() + public function getUrlKeyDataProvider() { return [ ['url-key', null, 'url-key'], @@ -244,17 +244,17 @@ public function generateUrlKeyDataProvider() } /** - * @dataProvider generateUrlKeyDataProvider - * @param string $urlKey - * @param string $name + * @dataProvider getUrlKeyDataProvider + * @param string|null|bool $urlKey + * @param string|null|bool $name * @param string $result */ - public function testGenerateUrlKey($urlKey, $name, $result) + public function testGetUrlKey($urlKey, $name, $result) { $this->category->expects($this->once())->method('getUrlKey')->will($this->returnValue($urlKey)); $this->category->expects($this->any())->method('getName')->will($this->returnValue($name)); $this->category->expects($this->once())->method('formatUrlKey')->will($this->returnArgument(0)); - $this->assertEquals($result, $this->categoryUrlPathGenerator->generateUrlKey($this->category)); + $this->assertEquals($result, $this->categoryUrlPathGenerator->getUrlKey($this->category)); } } diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/ProductUrlPathGeneratorTest.php b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/ProductUrlPathGeneratorTest.php index 7b733303bf4d4..fe4895c721bb2 100644 --- a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/ProductUrlPathGeneratorTest.php +++ b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/ProductUrlPathGeneratorTest.php @@ -85,11 +85,11 @@ public function getUrlPathDataProvider() /** * @dataProvider getUrlPathDataProvider - * @param $urlKey - * @param $productName - * @param $result + * @param string|null|bool $urlKey + * @param string|null|bool $productName + * @param string $result */ - public function testGenerateUrlPath($urlKey, $productName, $result) + public function testGetUrlPath($urlKey, $productName, $result) { $this->product->expects($this->once())->method('getData')->with('url_path') ->will($this->returnValue(null)); @@ -101,19 +101,21 @@ public function testGenerateUrlPath($urlKey, $productName, $result) } /** - * @param $productUrlKey - * @param $expectedUrlKey - * - * @dataProvider generateUrlKeyDataProvider + * @param string|bool $productUrlKey + * @param string|bool $expectedUrlKey + * @dataProvider getUrlKeyDataProvider */ - public function testGenerateUrlKey($productUrlKey, $expectedUrlKey) + public function testGetUrlKey($productUrlKey, $expectedUrlKey) { $this->product->expects($this->any())->method('getUrlKey')->will($this->returnValue($productUrlKey)); $this->product->expects($this->any())->method('formatUrlKey')->will($this->returnValue($productUrlKey)); - $this->assertEquals($expectedUrlKey, $this->productUrlPathGenerator->generateUrlKey($this->product)); + $this->assertEquals($expectedUrlKey, $this->productUrlPathGenerator->getUrlKey($this->product)); } - public function generateUrlKeyDataProvider() + /** + * @return array + */ + public function getUrlKeyDataProvider() { return [ 'URL Key use default' => [false, false], @@ -121,17 +123,10 @@ public function generateUrlKeyDataProvider() ]; } - public function testGetUrlPath() - { - $this->product->expects($this->once())->method('getData')->with('url_path') - ->will($this->returnValue('url-path')); - $this->product->expects($this->never())->method('getUrlKey'); - - $this->assertEquals('url-path', $this->productUrlPathGenerator->getUrlPath($this->product, null)); - } - /** - * + * @param string|null|bool $storedUrlKey + * @param string|null|bool $productName + * @param string $expectedUrlKey * @dataProvider getUrlPathDefaultUrlKeyDataProvider */ public function testGetUrlPathDefaultUrlKey($storedUrlKey, $productName, $expectedUrlKey) @@ -144,13 +139,15 @@ public function testGetUrlPathDefaultUrlKey($storedUrlKey, $productName, $expect $this->assertEquals($expectedUrlKey, $this->productUrlPathGenerator->getUrlPath($this->product, null)); } + /** + * @return array + */ public function getUrlPathDefaultUrlKeyDataProvider() { return [ ['default-store-view-url-key', null, 'default-store-view-url-key'], [false, 'default-store-view-product-name', 'default-store-view-product-name'] ]; - } public function testGetUrlPathWithCategory() diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/CategoryUrlPathAutogeneratorObserverTest.php b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/CategoryUrlPathAutogeneratorObserverTest.php index 8088fcf653a18..de1f7fe6c02d8 100644 --- a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/CategoryUrlPathAutogeneratorObserverTest.php +++ b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/CategoryUrlPathAutogeneratorObserverTest.php @@ -24,6 +24,16 @@ class CategoryUrlPathAutogeneratorObserverTest extends \PHPUnit_Framework_TestCa /** @var \PHPUnit_Framework_MockObject_MockObject */ protected $category; + /** + * @var \Magento\CatalogUrlRewrite\Service\V1\StoreViewService|\PHPUnit_Framework_MockObject_MockObject + */ + protected $storeViewService; + + /** + * @var \Magento\Catalog\Model\ResourceModel\Category|\PHPUnit_Framework_MockObject_MockObject + */ + protected $categoryResource; + protected function setUp() { $this->observer = $this->getMock( @@ -33,13 +43,15 @@ protected function setUp() '', false ); + $this->categoryResource = $this->getMock('Magento\Catalog\Model\ResourceModel\Category', [], [], '', false); $this->category = $this->getMock( 'Magento\Catalog\Model\Category', - ['setUrlKey', 'setUrlPath', 'dataHasChangedFor', 'isObjectNew', 'getResource', 'getUrlKey'], + ['setUrlKey', 'setUrlPath', 'dataHasChangedFor', 'isObjectNew', 'getResource', 'getUrlKey', 'getStoreId'], [], '', false ); + $this->category->expects($this->any())->method('getResource')->willReturn($this->categoryResource); $this->observer->expects($this->any())->method('getEvent')->willReturnSelf(); $this->observer->expects($this->any())->method('getCategory')->willReturn($this->category); $this->categoryUrlPathGenerator = $this->getMock( @@ -53,11 +65,15 @@ protected function setUp() 'Magento\CatalogUrlRewrite\Model\Category\ChildrenCategoriesProvider' ); + $this->storeViewService = $this->getMock('Magento\CatalogUrlRewrite\Service\V1\StoreViewService', [], [], '', + false); + $this->categoryUrlPathAutogeneratorObserver = (new ObjectManagerHelper($this))->getObject( 'Magento\CatalogUrlRewrite\Observer\CategoryUrlPathAutogeneratorObserver', [ 'categoryUrlPathGenerator' => $this->categoryUrlPathGenerator, - 'childrenCategoriesProvider' => $this->childrenCategoriesProvider + 'childrenCategoriesProvider' => $this->childrenCategoriesProvider, + 'storeViewService' => $this->storeViewService, ] ); } @@ -65,7 +81,7 @@ protected function setUp() public function testSetCategoryUrlAndCategoryPath() { $this->category->expects($this->once())->method('getUrlKey')->willReturn('category'); - $this->categoryUrlPathGenerator->expects($this->once())->method('generateUrlKey')->willReturn('urk_key'); + $this->categoryUrlPathGenerator->expects($this->once())->method('getUrlKey')->willReturn('urk_key'); $this->category->expects($this->once())->method('setUrlKey')->with('urk_key')->willReturnSelf(); $this->categoryUrlPathGenerator->expects($this->once())->method('getUrlPath')->willReturn('url_path'); $this->category->expects($this->once())->method('setUrlPath')->with('url_path')->willReturnSelf(); @@ -74,7 +90,7 @@ public function testSetCategoryUrlAndCategoryPath() $this->categoryUrlPathAutogeneratorObserver->execute($this->observer); } - public function testExecuteWithoutGeneration() + public function testExecuteWithoutUrlKeyAndUrlPathUpdating() { $this->category->expects($this->once())->method('getUrlKey')->willReturn(false); $this->category->expects($this->never())->method('setUrlKey'); @@ -82,30 +98,103 @@ public function testExecuteWithoutGeneration() $this->categoryUrlPathAutogeneratorObserver->execute($this->observer); } - public function testUpdateUrlPathForChildren() + public function testUrlKeyAndUrlPathUpdating() { - $this->category->expects($this->once())->method('getUrlKey')->willReturn('category'); - $this->category->expects($this->once())->method('setUrlKey')->willReturnSelf(); - $this->category->expects($this->once())->method('setUrlPath')->willReturnSelf(); + $this->categoryUrlPathGenerator->expects($this->once())->method('getUrlKey')->with($this->category) + ->willReturn('url_key'); + $this->categoryUrlPathGenerator->expects($this->once())->method('getUrlPath')->with($this->category) + ->willReturn('url_path'); + + $this->category->expects($this->once())->method('getUrlKey')->willReturn('not_formatted_url_key'); + $this->category->expects($this->once())->method('setUrlKey')->with('url_key')->willReturnSelf(); + $this->category->expects($this->once())->method('setUrlPath')->with('url_path')->willReturnSelf(); + // break code execution + $this->category->expects($this->once())->method('isObjectNew')->willReturn(true); + + $this->categoryUrlPathAutogeneratorObserver->execute($this->observer); + } + + public function testUrlPathAttributeNoUpdatingIfCategoryIsNew() + { + $this->categoryUrlPathGenerator->expects($this->any())->method('getUrlKey')->willReturn('url_key'); + $this->categoryUrlPathGenerator->expects($this->any())->method('getUrlPath')->willReturn('url_path'); + + $this->category->expects($this->any())->method('getUrlKey')->willReturn('not_formatted_url_key'); + $this->category->expects($this->any())->method('setUrlKey')->willReturnSelf(); + $this->category->expects($this->any())->method('setUrlPath')->willReturnSelf(); + + $this->category->expects($this->once())->method('isObjectNew')->willReturn(true); + $this->categoryResource->expects($this->never())->method('saveAttribute'); + + $this->categoryUrlPathAutogeneratorObserver->execute($this->observer); + } + + public function testUrlPathAttributeUpdating() + { + $this->categoryUrlPathGenerator->expects($this->any())->method('getUrlKey')->willReturn('url_key'); + $this->categoryUrlPathGenerator->expects($this->any())->method('getUrlPath')->willReturn('url_path'); + + $this->category->expects($this->any())->method('getUrlKey')->willReturn('not_formatted_url_key'); + $this->category->expects($this->any())->method('setUrlKey')->willReturnSelf(); + $this->category->expects($this->any())->method('setUrlPath')->willReturnSelf(); $this->category->expects($this->once())->method('isObjectNew')->willReturn(false); - $this->category->expects($this->once())->method('dataHasChangedFor')->with('url_path')->willReturn(true); - $categoryResource = $this->getMockBuilder('Magento\Catalog\Model\ResourceModel\Category') - ->disableOriginalConstructor()->getMock(); - $this->category->expects($this->once())->method('getResource')->willReturn($categoryResource); - $categoryResource->expects($this->once())->method('saveAttribute')->with($this->category, 'url_path'); + $this->categoryResource->expects($this->once())->method('saveAttribute')->with($this->category, 'url_path'); + + // break code execution + $this->category->expects($this->once())->method('dataHasChangedFor')->with('url_path')->willReturn(false); + + $this->categoryUrlPathAutogeneratorObserver->execute($this->observer); + } + + public function testChildrenUrlPathAttributeNoUpdatingIfParentUrlPathIsNotChanged() + { + $this->categoryUrlPathGenerator->expects($this->any())->method('getUrlKey')->willReturn('url_key'); + $this->categoryUrlPathGenerator->expects($this->any())->method('getUrlPath')->willReturn('url_path'); + + $this->categoryResource->expects($this->once())->method('saveAttribute')->with($this->category, 'url_path'); + + $this->category->expects($this->any())->method('getUrlKey')->willReturn('not_formatted_url_key'); + $this->category->expects($this->any())->method('setUrlKey')->willReturnSelf(); + $this->category->expects($this->any())->method('setUrlPath')->willReturnSelf(); + $this->category->expects($this->once())->method('isObjectNew')->willReturn(false); + // break code execution + $this->category->expects($this->once())->method('dataHasChangedFor')->with('url_path')->willReturn(false); + + $this->categoryUrlPathAutogeneratorObserver->execute($this->observer); + } + + public function testChildrenUrlPathAttributeUpdatingForSpecificStore() + { + $this->categoryUrlPathGenerator->expects($this->any())->method('getUrlKey')->willReturn('generated_url_key'); + $this->categoryUrlPathGenerator->expects($this->any())->method('getUrlPath')->willReturn('generated_url_path'); + + $this->category->expects($this->any())->method('getUrlKey')->willReturn('not_formatted_url_key'); + $this->category->expects($this->any())->method('setUrlKey')->willReturnSelf(); + $this->category->expects($this->any())->method('setUrlPath')->willReturnSelf(); + $this->category->expects($this->any())->method('isObjectNew')->willReturn(false); + $this->category->expects($this->any())->method('dataHasChangedFor')->willReturn(true); + // only for specific store + $this->category->expects($this->atLeastOnce())->method('getStoreId')->willReturn(1); + + $childCategoryResource = $this->getMockBuilder('Magento\Catalog\Model\ResourceModel\Category') + ->disableOriginalConstructor()->getMock(); $childCategory = $this->getMockBuilder('Magento\Catalog\Model\Category') - ->setMethods(['getUrlPath', 'setUrlPath', 'getResource', 'unsUrlPath']) + ->setMethods([ + 'getUrlPath', + 'setUrlPath', + 'getResource', + 'getStore', + 'getStoreId', + 'setStoreId' + ]) ->disableOriginalConstructor()->getMock(); + $childCategory->expects($this->any())->method('getResource')->willReturn($childCategoryResource); + $childCategory->expects($this->once())->method('setStoreId')->with(1); $this->childrenCategoriesProvider->expects($this->once())->method('getChildren')->willReturn([$childCategory]); - $childCategoryResource = $this->getMockBuilder('Magento\Catalog\Model\ResourceModel\Category') - ->disableOriginalConstructor()->getMock(); - $childCategory->expects($this->once())->method('unsUrlPath')->willReturnSelf(); - $childCategory->expects($this->once())->method('getResource')->willReturn($childCategoryResource); + $childCategory->expects($this->once())->method('setUrlPath')->with('generated_url_path')->willReturnSelf(); $childCategoryResource->expects($this->once())->method('saveAttribute')->with($childCategory, 'url_path'); - $childCategory->expects($this->once())->method('setUrlPath')->with('category-url_path')->willReturnSelf(); - $this->categoryUrlPathGenerator->expects($this->any())->method('getUrlPath')->willReturn('category-url_path'); $this->categoryUrlPathAutogeneratorObserver->execute($this->observer); } diff --git a/app/code/Magento/ConfigurableProduct/Pricing/Price/ConfigurablePriceResolver.php b/app/code/Magento/ConfigurableProduct/Pricing/Price/ConfigurablePriceResolver.php index d04e4fb79f261..a4fe3d76da22b 100644 --- a/app/code/Magento/ConfigurableProduct/Pricing/Price/ConfigurablePriceResolver.php +++ b/app/code/Magento/ConfigurableProduct/Pricing/Price/ConfigurablePriceResolver.php @@ -50,7 +50,7 @@ public function resolvePrice(\Magento\Framework\Pricing\SaleableInterface $produ } if (!$price) { throw new \Magento\Framework\Exception\LocalizedException( - __('Configurable product "%s" do not have sub-products', $product->getName()) + __('Configurable product "%1" do not have sub-products', $product->getName()) ); } return (float)$price; From 23d0eb58f64651fb3b0b34e0a6691940e8f8dc54 Mon Sep 17 00:00:00 2001 From: Oleh Posyniak Date: Tue, 27 Oct 2015 17:45:14 +0200 Subject: [PATCH 77/83] MAGETWO-42984: Remove Section from Customer Data --- setup/performance-toolkit/benchmark.jmx | 114 ++++++++++++------------ 1 file changed, 57 insertions(+), 57 deletions(-) diff --git a/setup/performance-toolkit/benchmark.jmx b/setup/performance-toolkit/benchmark.jmx index af73293f01a30..c5060028b3454 100644 --- a/setup/performance-toolkit/benchmark.jmx +++ b/setup/performance-toolkit/benchmark.jmx @@ -1890,7 +1890,7 @@ vars.put("testLabel", "CatProdBrows"); true - banner + customer = true sections @@ -1929,7 +1929,7 @@ vars.put("testLabel", "CatProdBrows"); - \"banner\": + \"customer\": Assertion.response_data false @@ -1981,7 +1981,7 @@ vars.put("testLabel", "CatProdBrows"); true - banner + customer = true sections @@ -2020,7 +2020,7 @@ vars.put("testLabel", "CatProdBrows"); - \"banner\": + \"customer\": Assertion.response_data false @@ -2103,7 +2103,7 @@ vars.put("testLabel", "CatProdBrows"); true - banner + customer = true sections @@ -2142,7 +2142,7 @@ vars.put("testLabel", "CatProdBrows"); - \"banner\": + \"customer\": Assertion.response_data false @@ -2225,7 +2225,7 @@ vars.put("testLabel", "CatProdBrows"); true - banner + customer = true sections @@ -2264,7 +2264,7 @@ vars.put("testLabel", "CatProdBrows"); - \"banner\": + \"customer\": Assertion.response_data false @@ -2621,7 +2621,7 @@ vars.put("loadType", "Guest"); true - banner + customer = true sections @@ -2660,7 +2660,7 @@ vars.put("loadType", "Guest"); - \"banner\": + \"customer\": Assertion.response_data false @@ -2712,7 +2712,7 @@ vars.put("loadType", "Guest"); true - banner + customer = true sections @@ -2751,7 +2751,7 @@ vars.put("loadType", "Guest"); - \"banner\": + \"customer\": Assertion.response_data false @@ -2863,7 +2863,7 @@ vars.put("loadType", "Guest"); true - cart,banner,messages + cart,messages = true sections @@ -2982,7 +2982,7 @@ vars.put("loadType", "Guest"); true - banner + customer = true sections @@ -3021,7 +3021,7 @@ vars.put("loadType", "Guest"); - \"banner\": + \"customer\": Assertion.response_data false @@ -3132,7 +3132,7 @@ vars.put("loadType", "Guest"); true - cart,banner,messages + cart,messages = true sections @@ -3254,7 +3254,7 @@ vars.put("loadType", "Guest"); true - banner + customer = true sections @@ -3293,7 +3293,7 @@ vars.put("loadType", "Guest"); - \"banner\": + \"customer\": Assertion.response_data false @@ -3411,7 +3411,7 @@ vars.put("loadType", "Guest"); true - cart,banner,messages + cart,messages = true sections @@ -3807,7 +3807,7 @@ vars.put("loadType", "Guest"); true - banner + customer = true sections @@ -3846,7 +3846,7 @@ vars.put("loadType", "Guest"); - \"banner\": + \"customer\": Assertion.response_data false @@ -3898,7 +3898,7 @@ vars.put("loadType", "Guest"); true - banner + customer = true sections @@ -3937,7 +3937,7 @@ vars.put("loadType", "Guest"); - \"banner\": + \"customer\": Assertion.response_data false @@ -4049,7 +4049,7 @@ vars.put("loadType", "Guest"); true - cart,banner,messages + cart,messages = true sections @@ -4168,7 +4168,7 @@ vars.put("loadType", "Guest"); true - banner + customer = true sections @@ -4207,7 +4207,7 @@ vars.put("loadType", "Guest"); - \"banner\": + \"customer\": Assertion.response_data false @@ -4318,7 +4318,7 @@ vars.put("loadType", "Guest"); true - cart,banner,messages + cart,messages = true sections @@ -4440,7 +4440,7 @@ vars.put("loadType", "Guest"); true - banner + customer = true sections @@ -4479,7 +4479,7 @@ vars.put("loadType", "Guest"); - \"banner\": + \"customer\": Assertion.response_data false @@ -4597,7 +4597,7 @@ vars.put("loadType", "Guest"); true - cart,banner,messages + cart,messages = true sections @@ -4767,7 +4767,7 @@ vars.put("loadType", "Guest"); true - banner + customer = true sections @@ -4806,7 +4806,7 @@ vars.put("loadType", "Guest"); - \"banner\": + \"customer\": Assertion.response_data false @@ -5074,7 +5074,7 @@ vars.put("loadType", "Guest"); true - banner + customer = true sections @@ -5113,7 +5113,7 @@ vars.put("loadType", "Guest"); - \"banner\": + \"customer\": Assertion.response_data false @@ -5243,7 +5243,7 @@ vars.put("loadType", "Guest"); true - banner + customer = true sections @@ -5282,7 +5282,7 @@ vars.put("loadType", "Guest"); - \"banner\": + \"customer\": Assertion.response_data false @@ -5520,7 +5520,7 @@ vars.put("loadType", "Customer"); true - banner + customer = true sections @@ -5559,7 +5559,7 @@ vars.put("loadType", "Customer"); - \"banner\": + \"customer\": Assertion.response_data false @@ -5728,7 +5728,7 @@ vars.put("loadType", "Customer"); true - banner + customer = true sections @@ -5767,7 +5767,7 @@ vars.put("loadType", "Customer"); - \"banner\": + \"customer\": Assertion.response_data false @@ -5839,7 +5839,7 @@ vars.put("loadType", "Customer"); true - banner + customer = true sections @@ -5878,7 +5878,7 @@ vars.put("loadType", "Customer"); - \"banner\": + \"customer\": Assertion.response_data false @@ -5930,7 +5930,7 @@ vars.put("loadType", "Customer"); true - banner + customer = true sections @@ -5969,7 +5969,7 @@ vars.put("loadType", "Customer"); - \"banner\": + \"customer\": Assertion.response_data false @@ -6081,7 +6081,7 @@ vars.put("loadType", "Customer"); true - cart,banner,messages + cart,messages = true sections @@ -6200,7 +6200,7 @@ vars.put("loadType", "Customer"); true - banner + customer = true sections @@ -6239,7 +6239,7 @@ vars.put("loadType", "Customer"); - \"banner\": + \"customer\": Assertion.response_data false @@ -6350,7 +6350,7 @@ vars.put("loadType", "Customer"); true - cart,banner,messages + cart,messages = true sections @@ -6472,7 +6472,7 @@ vars.put("loadType", "Customer"); true - banner + customer = true sections @@ -6511,7 +6511,7 @@ vars.put("loadType", "Customer"); - \"banner\": + \"customer\": Assertion.response_data false @@ -6629,7 +6629,7 @@ vars.put("loadType", "Customer"); true - cart,banner,messages + cart,messages = true sections @@ -6839,7 +6839,7 @@ vars.put("loadType", "Customer"); true - banner + customer = true sections @@ -6878,7 +6878,7 @@ vars.put("loadType", "Customer"); - \"banner\": + \"customer\": Assertion.response_data false @@ -6957,7 +6957,7 @@ vars.put("loadType", "Customer"); true - banner + customer = true sections @@ -6996,7 +6996,7 @@ vars.put("loadType", "Customer"); - \"banner\": + \"customer\": Assertion.response_data false @@ -7113,7 +7113,7 @@ vars.put("loadType", "Customer"); true - banner + customer = true sections @@ -7152,7 +7152,7 @@ vars.put("loadType", "Customer"); - \"banner\": + \"customer\": Assertion.response_data false From 7e034113fcb9f5867dac6505c390ed46ccbeb69c Mon Sep 17 00:00:00 2001 From: Michail Slabko Date: Tue, 27 Oct 2015 17:57:59 +0200 Subject: [PATCH 78/83] MAGETWO-36162: Unable to change some product information corresponding to all store view (storeId = 0) in multiwebsite structure through API service - rollback to save with resourceModel --- app/code/Magento/Catalog/Model/ProductRepository.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Catalog/Model/ProductRepository.php b/app/code/Magento/Catalog/Model/ProductRepository.php index c5fd198ebc90d..ccd62fb3d3361 100644 --- a/app/code/Magento/Catalog/Model/ProductRepository.php +++ b/app/code/Magento/Catalog/Model/ProductRepository.php @@ -586,7 +586,7 @@ public function save(\Magento\Catalog\Api\Data\ProductInterface $product, $saveO if ($tierPrices !== null) { $product->setData('tier_price', $tierPrices); } - $product->save(); + $this->resourceModel->save($product); } catch (\Magento\Eav\Model\Entity\Attribute\Exception $exception) { throw \Magento\Framework\Exception\InputException::invalidFieldValue( $exception->getAttributeCode(), From f9f7c02ad06f6c9e1729bcd1548e564e591acdfb Mon Sep 17 00:00:00 2001 From: Michail Slabko Date: Tue, 27 Oct 2015 18:39:26 +0200 Subject: [PATCH 79/83] MAGETWO-36162: Unable to change some product information corresponding to all store view (storeId = 0) in multiwebsite structure through API service - price is not needed for configurable product --- .../Magento/ConfigurableProduct/Api/ProductRepositoryTest.php | 1 - 1 file changed, 1 deletion(-) diff --git a/dev/tests/api-functional/testsuite/Magento/ConfigurableProduct/Api/ProductRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/ConfigurableProduct/Api/ProductRepositoryTest.php index e8719f6f4e276..21f313bcf0c35 100644 --- a/dev/tests/api-functional/testsuite/Magento/ConfigurableProduct/Api/ProductRepositoryTest.php +++ b/dev/tests/api-functional/testsuite/Magento/ConfigurableProduct/Api/ProductRepositoryTest.php @@ -126,7 +126,6 @@ public function testCreateConfigurableProduct() $response = $this->createConfigurableProduct(); $this->assertEquals(self::CONFIGURABLE_PRODUCT_SKU, $response[ProductInterface::SKU]); - $this->assertEquals(50, $response['price']); $this->assertTrue( isset($response[ExtensibleDataInterface::EXTENSION_ATTRIBUTES_KEY]["configurable_product_options"]) ); From b17b105108031af9cea43aa95a3b5a3eb000b4b8 Mon Sep 17 00:00:00 2001 From: Andrii Lugovyi Date: Tue, 27 Oct 2015 18:48:26 +0200 Subject: [PATCH 80/83] MAGETWO-43464: Loaded files display twice if edit downloadable product - fix static test --- .../Api/ProductWebsiteLinkRepositoryInterface.php | 2 +- .../CatalogUrlRewrite/Service/V1/StoreViewService.php | 1 + .../CategoryUrlPathAutogeneratorObserverTest.php | 9 +++++++-- .../Catalog/Product/Edit/Tab/Downloadable/Links.php | 2 +- .../templates/product/edit/downloadable/links.phtml | 4 ++-- 5 files changed, 12 insertions(+), 6 deletions(-) diff --git a/app/code/Magento/Catalog/Api/ProductWebsiteLinkRepositoryInterface.php b/app/code/Magento/Catalog/Api/ProductWebsiteLinkRepositoryInterface.php index 67f73d354a589..55e875c2cfd37 100644 --- a/app/code/Magento/Catalog/Api/ProductWebsiteLinkRepositoryInterface.php +++ b/app/code/Magento/Catalog/Api/ProductWebsiteLinkRepositoryInterface.php @@ -39,4 +39,4 @@ public function delete(Data\ProductWebsiteLinkInterface $productWebsiteLink); * @throws \Magento\Framework\Exception\CouldNotSaveException */ public function deleteById($sku, $websiteId); -} \ No newline at end of file +} diff --git a/app/code/Magento/CatalogUrlRewrite/Service/V1/StoreViewService.php b/app/code/Magento/CatalogUrlRewrite/Service/V1/StoreViewService.php index 86cd085a796e2..71e33a7411101 100644 --- a/app/code/Magento/CatalogUrlRewrite/Service/V1/StoreViewService.php +++ b/app/code/Magento/CatalogUrlRewrite/Service/V1/StoreViewService.php @@ -69,6 +69,7 @@ public function doesEntityHaveOverriddenUrlPathForStore($storeId, $entityId, $en * @param int $storeId * @param int $entityId * @param string $entityType + * @param mixed $attributeName * @throws \InvalidArgumentException * @return bool */ diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/CategoryUrlPathAutogeneratorObserverTest.php b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/CategoryUrlPathAutogeneratorObserverTest.php index de1f7fe6c02d8..e400fe924c686 100644 --- a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/CategoryUrlPathAutogeneratorObserverTest.php +++ b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/CategoryUrlPathAutogeneratorObserverTest.php @@ -65,8 +65,13 @@ protected function setUp() 'Magento\CatalogUrlRewrite\Model\Category\ChildrenCategoriesProvider' ); - $this->storeViewService = $this->getMock('Magento\CatalogUrlRewrite\Service\V1\StoreViewService', [], [], '', - false); + $this->storeViewService = $this->getMock( + 'Magento\CatalogUrlRewrite\Service\V1\StoreViewService', + [], + [], + '', + false + ); $this->categoryUrlPathAutogeneratorObserver = (new ObjectManagerHelper($this))->getObject( 'Magento\CatalogUrlRewrite\Observer\CategoryUrlPathAutogeneratorObserver', diff --git a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php index dd31516d03a24..ee184dff0e6d5 100644 --- a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php +++ b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php @@ -161,7 +161,7 @@ public function getPurchasedSeparatelyAttribute() * * @return bool */ - public function getProductLinksCanBePurchasedSeparately() + public function isProductLinksCanBePurchasedSeparately() { return (bool) $this->getProduct()->getData('links_purchased_separately'); } diff --git a/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/links.phtml b/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/links.phtml index 70c90cf84161a..909ab56b20049 100644 --- a/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/links.phtml +++ b/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/links.phtml @@ -40,7 +40,7 @@ getProductLinksCanBePurchasedSeparately()): ?> + isProductLinksCanBePurchasedSeparately()): ?> checked="checked" > @@ -52,7 +52,7 @@ getProductLinksCanBePurchasedSeparately()): ?> + isProductLinksCanBePurchasedSeparately()): ?> checked="checked" > From af352ebfd42c82b27c130e86ebab7e51572d05dd Mon Sep 17 00:00:00 2001 From: Michail Slabko Date: Tue, 27 Oct 2015 20:11:56 +0200 Subject: [PATCH 81/83] MAGETWO-43822: Incorrect Request Path generated for child category if Edit URL Rewrites from Category Page --- .../Observer/CategoryUrlPathAutogeneratorObserver.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/code/Magento/CatalogUrlRewrite/Observer/CategoryUrlPathAutogeneratorObserver.php b/app/code/Magento/CatalogUrlRewrite/Observer/CategoryUrlPathAutogeneratorObserver.php index 74d9754b1d2e5..1a903432cc1ee 100644 --- a/app/code/Magento/CatalogUrlRewrite/Observer/CategoryUrlPathAutogeneratorObserver.php +++ b/app/code/Magento/CatalogUrlRewrite/Observer/CategoryUrlPathAutogeneratorObserver.php @@ -105,6 +105,7 @@ protected function isGlobalScope($storeId) */ protected function updateUrlPathForCategory(Category $category) { + $category->unsUrlPath(); $category->setUrlPath($this->categoryUrlPathGenerator->getUrlPath($category)); $category->getResource()->saveAttribute($category, 'url_path'); } From d9b7daa1f193d88dfb93255bd11373890f9cb980 Mon Sep 17 00:00:00 2001 From: Volodymyr Klymenko Date: Wed, 28 Oct 2015 13:43:34 +0200 Subject: [PATCH 82/83] MAGETWO-44707: Remove @api sign from CatalogInventory module --- .../CatalogInventory/Api/Data/StockCollectionInterface.php | 1 - app/code/Magento/CatalogInventory/Api/Data/StockInterface.php | 1 - .../CatalogInventory/Api/Data/StockItemCollectionInterface.php | 1 - .../Magento/CatalogInventory/Api/Data/StockItemInterface.php | 1 - .../CatalogInventory/Api/Data/StockStatusCollectionInterface.php | 1 - .../Magento/CatalogInventory/Api/Data/StockStatusInterface.php | 1 - .../Magento/CatalogInventory/Api/StockConfigurationInterface.php | 1 - app/code/Magento/CatalogInventory/Api/StockCriteriaInterface.php | 1 - app/code/Magento/CatalogInventory/Api/StockIndexInterface.php | 1 - .../Magento/CatalogInventory/Api/StockItemCriteriaInterface.php | 1 - .../CatalogInventory/Api/StockItemRepositoryInterface.php | 1 - .../Magento/CatalogInventory/Api/StockManagementInterface.php | 1 - app/code/Magento/CatalogInventory/Api/StockRegistryInterface.php | 1 - .../Magento/CatalogInventory/Api/StockRepositoryInterface.php | 1 - app/code/Magento/CatalogInventory/Api/StockStateInterface.php | 1 - .../CatalogInventory/Api/StockStatusCriteriaInterface.php | 1 - .../CatalogInventory/Api/StockStatusRepositoryInterface.php | 1 - .../Model/ResourceModel/Indexer/Stock/StockInterface.php | 1 - 18 files changed, 18 deletions(-) diff --git a/app/code/Magento/CatalogInventory/Api/Data/StockCollectionInterface.php b/app/code/Magento/CatalogInventory/Api/Data/StockCollectionInterface.php index a656b049c93a8..90e5081733ee8 100644 --- a/app/code/Magento/CatalogInventory/Api/Data/StockCollectionInterface.php +++ b/app/code/Magento/CatalogInventory/Api/Data/StockCollectionInterface.php @@ -13,7 +13,6 @@ /** * Interface StockCollectionInterface - * @api */ interface StockCollectionInterface extends SearchResultsInterface { diff --git a/app/code/Magento/CatalogInventory/Api/Data/StockInterface.php b/app/code/Magento/CatalogInventory/Api/Data/StockInterface.php index 8908ea0ee96af..47bd9b85cc321 100644 --- a/app/code/Magento/CatalogInventory/Api/Data/StockInterface.php +++ b/app/code/Magento/CatalogInventory/Api/Data/StockInterface.php @@ -9,7 +9,6 @@ /** * Interface Stock - * @api */ interface StockInterface extends ExtensibleDataInterface { diff --git a/app/code/Magento/CatalogInventory/Api/Data/StockItemCollectionInterface.php b/app/code/Magento/CatalogInventory/Api/Data/StockItemCollectionInterface.php index ee670c352f18a..80436c5427b8d 100644 --- a/app/code/Magento/CatalogInventory/Api/Data/StockItemCollectionInterface.php +++ b/app/code/Magento/CatalogInventory/Api/Data/StockItemCollectionInterface.php @@ -13,7 +13,6 @@ /** * Interface StockItemCollectionInterface - * @api */ interface StockItemCollectionInterface extends SearchResultsInterface { diff --git a/app/code/Magento/CatalogInventory/Api/Data/StockItemInterface.php b/app/code/Magento/CatalogInventory/Api/Data/StockItemInterface.php index 0c4216fd46a99..0a620ce1562d5 100644 --- a/app/code/Magento/CatalogInventory/Api/Data/StockItemInterface.php +++ b/app/code/Magento/CatalogInventory/Api/Data/StockItemInterface.php @@ -9,7 +9,6 @@ /** * Interface StockItem - * @api */ interface StockItemInterface extends ExtensibleDataInterface { diff --git a/app/code/Magento/CatalogInventory/Api/Data/StockStatusCollectionInterface.php b/app/code/Magento/CatalogInventory/Api/Data/StockStatusCollectionInterface.php index a06aa1ebd0a4a..b46ccbf5c94e2 100644 --- a/app/code/Magento/CatalogInventory/Api/Data/StockStatusCollectionInterface.php +++ b/app/code/Magento/CatalogInventory/Api/Data/StockStatusCollectionInterface.php @@ -9,7 +9,6 @@ /** * Stock Status collection interface - * @api */ interface StockStatusCollectionInterface extends SearchResultsInterface { diff --git a/app/code/Magento/CatalogInventory/Api/Data/StockStatusInterface.php b/app/code/Magento/CatalogInventory/Api/Data/StockStatusInterface.php index f4996ac62ec6b..3c90ea451776a 100644 --- a/app/code/Magento/CatalogInventory/Api/Data/StockStatusInterface.php +++ b/app/code/Magento/CatalogInventory/Api/Data/StockStatusInterface.php @@ -9,7 +9,6 @@ /** * Interface StockStatusInterface - * @api */ interface StockStatusInterface extends ExtensibleDataInterface { diff --git a/app/code/Magento/CatalogInventory/Api/StockConfigurationInterface.php b/app/code/Magento/CatalogInventory/Api/StockConfigurationInterface.php index 7b4179c7a7188..5052ea004b256 100644 --- a/app/code/Magento/CatalogInventory/Api/StockConfigurationInterface.php +++ b/app/code/Magento/CatalogInventory/Api/StockConfigurationInterface.php @@ -7,7 +7,6 @@ /** * Interface StockConfigurationInterface - * @api */ interface StockConfigurationInterface { diff --git a/app/code/Magento/CatalogInventory/Api/StockCriteriaInterface.php b/app/code/Magento/CatalogInventory/Api/StockCriteriaInterface.php index 15e299f8591c7..537db0ce5aff1 100644 --- a/app/code/Magento/CatalogInventory/Api/StockCriteriaInterface.php +++ b/app/code/Magento/CatalogInventory/Api/StockCriteriaInterface.php @@ -7,7 +7,6 @@ /** * Interface StockCriteriaInterface - * @api */ interface StockCriteriaInterface extends \Magento\Framework\Api\CriteriaInterface { diff --git a/app/code/Magento/CatalogInventory/Api/StockIndexInterface.php b/app/code/Magento/CatalogInventory/Api/StockIndexInterface.php index f57936402f0c9..6edba0a23b537 100644 --- a/app/code/Magento/CatalogInventory/Api/StockIndexInterface.php +++ b/app/code/Magento/CatalogInventory/Api/StockIndexInterface.php @@ -7,7 +7,6 @@ /** * Interface StockIndexInterface - * @api */ interface StockIndexInterface { diff --git a/app/code/Magento/CatalogInventory/Api/StockItemCriteriaInterface.php b/app/code/Magento/CatalogInventory/Api/StockItemCriteriaInterface.php index df76cc37f3153..878aa26d3c2f7 100644 --- a/app/code/Magento/CatalogInventory/Api/StockItemCriteriaInterface.php +++ b/app/code/Magento/CatalogInventory/Api/StockItemCriteriaInterface.php @@ -7,7 +7,6 @@ /** * Interface StockItemCriteriaInterface - * @api */ interface StockItemCriteriaInterface extends \Magento\Framework\Api\CriteriaInterface { diff --git a/app/code/Magento/CatalogInventory/Api/StockItemRepositoryInterface.php b/app/code/Magento/CatalogInventory/Api/StockItemRepositoryInterface.php index 97804d7043750..17a2287692281 100644 --- a/app/code/Magento/CatalogInventory/Api/StockItemRepositoryInterface.php +++ b/app/code/Magento/CatalogInventory/Api/StockItemRepositoryInterface.php @@ -7,7 +7,6 @@ /** * Interface StockItemRepository - * @api */ interface StockItemRepositoryInterface { diff --git a/app/code/Magento/CatalogInventory/Api/StockManagementInterface.php b/app/code/Magento/CatalogInventory/Api/StockManagementInterface.php index b4cd1008bf5ce..748ed9b39cfc7 100644 --- a/app/code/Magento/CatalogInventory/Api/StockManagementInterface.php +++ b/app/code/Magento/CatalogInventory/Api/StockManagementInterface.php @@ -7,7 +7,6 @@ /** * Interface StockManagementInterface - * @api */ interface StockManagementInterface { diff --git a/app/code/Magento/CatalogInventory/Api/StockRegistryInterface.php b/app/code/Magento/CatalogInventory/Api/StockRegistryInterface.php index 95c848f1865b7..27f90e740f961 100644 --- a/app/code/Magento/CatalogInventory/Api/StockRegistryInterface.php +++ b/app/code/Magento/CatalogInventory/Api/StockRegistryInterface.php @@ -7,7 +7,6 @@ /** * Interface StockRegistryInterface - * @api */ interface StockRegistryInterface { diff --git a/app/code/Magento/CatalogInventory/Api/StockRepositoryInterface.php b/app/code/Magento/CatalogInventory/Api/StockRepositoryInterface.php index 28b839c6fedb6..06f5d2f4e9cf7 100644 --- a/app/code/Magento/CatalogInventory/Api/StockRepositoryInterface.php +++ b/app/code/Magento/CatalogInventory/Api/StockRepositoryInterface.php @@ -7,7 +7,6 @@ /** * Interface StockRepositoryInterface - * @api */ interface StockRepositoryInterface { diff --git a/app/code/Magento/CatalogInventory/Api/StockStateInterface.php b/app/code/Magento/CatalogInventory/Api/StockStateInterface.php index 140ccee031bfa..490f92644df78 100644 --- a/app/code/Magento/CatalogInventory/Api/StockStateInterface.php +++ b/app/code/Magento/CatalogInventory/Api/StockStateInterface.php @@ -7,7 +7,6 @@ /** * Interface StockStateInterface - * @api */ interface StockStateInterface { diff --git a/app/code/Magento/CatalogInventory/Api/StockStatusCriteriaInterface.php b/app/code/Magento/CatalogInventory/Api/StockStatusCriteriaInterface.php index 7b5dfafa3116a..af80ddd5c5caf 100644 --- a/app/code/Magento/CatalogInventory/Api/StockStatusCriteriaInterface.php +++ b/app/code/Magento/CatalogInventory/Api/StockStatusCriteriaInterface.php @@ -7,7 +7,6 @@ /** * Interface StockStatusCriteriaInterface - * @api */ interface StockStatusCriteriaInterface extends \Magento\Framework\Api\CriteriaInterface { diff --git a/app/code/Magento/CatalogInventory/Api/StockStatusRepositoryInterface.php b/app/code/Magento/CatalogInventory/Api/StockStatusRepositoryInterface.php index 7a8ac82565413..b531c815ceb55 100644 --- a/app/code/Magento/CatalogInventory/Api/StockStatusRepositoryInterface.php +++ b/app/code/Magento/CatalogInventory/Api/StockStatusRepositoryInterface.php @@ -7,7 +7,6 @@ /** * Interface StockStatusRepositoryInterface - * @api */ interface StockStatusRepositoryInterface { diff --git a/app/code/Magento/CatalogInventory/Model/ResourceModel/Indexer/Stock/StockInterface.php b/app/code/Magento/CatalogInventory/Model/ResourceModel/Indexer/Stock/StockInterface.php index 8612b0ba52593..32b75680fbcd5 100644 --- a/app/code/Magento/CatalogInventory/Model/ResourceModel/Indexer/Stock/StockInterface.php +++ b/app/code/Magento/CatalogInventory/Model/ResourceModel/Indexer/Stock/StockInterface.php @@ -7,7 +7,6 @@ /** * CatalogInventory Stock Indexer Interface - * @api */ interface StockInterface { From 2640503c89d5bbdcf2d55cc7960b9e64a7112e42 Mon Sep 17 00:00:00 2001 From: "Korshenko, Olexii(okorshenko)" Date: Wed, 28 Oct 2015 17:17:25 +0200 Subject: [PATCH 83/83] Revert "MAGETWO-44707: Remove @api sign from CatalogInventory module" --- .../CatalogInventory/Api/Data/StockCollectionInterface.php | 1 + app/code/Magento/CatalogInventory/Api/Data/StockInterface.php | 1 + .../CatalogInventory/Api/Data/StockItemCollectionInterface.php | 1 + .../Magento/CatalogInventory/Api/Data/StockItemInterface.php | 1 + .../CatalogInventory/Api/Data/StockStatusCollectionInterface.php | 1 + .../Magento/CatalogInventory/Api/Data/StockStatusInterface.php | 1 + .../Magento/CatalogInventory/Api/StockConfigurationInterface.php | 1 + app/code/Magento/CatalogInventory/Api/StockCriteriaInterface.php | 1 + app/code/Magento/CatalogInventory/Api/StockIndexInterface.php | 1 + .../Magento/CatalogInventory/Api/StockItemCriteriaInterface.php | 1 + .../CatalogInventory/Api/StockItemRepositoryInterface.php | 1 + .../Magento/CatalogInventory/Api/StockManagementInterface.php | 1 + app/code/Magento/CatalogInventory/Api/StockRegistryInterface.php | 1 + .../Magento/CatalogInventory/Api/StockRepositoryInterface.php | 1 + app/code/Magento/CatalogInventory/Api/StockStateInterface.php | 1 + .../CatalogInventory/Api/StockStatusCriteriaInterface.php | 1 + .../CatalogInventory/Api/StockStatusRepositoryInterface.php | 1 + .../Model/ResourceModel/Indexer/Stock/StockInterface.php | 1 + 18 files changed, 18 insertions(+) diff --git a/app/code/Magento/CatalogInventory/Api/Data/StockCollectionInterface.php b/app/code/Magento/CatalogInventory/Api/Data/StockCollectionInterface.php index 90e5081733ee8..a656b049c93a8 100644 --- a/app/code/Magento/CatalogInventory/Api/Data/StockCollectionInterface.php +++ b/app/code/Magento/CatalogInventory/Api/Data/StockCollectionInterface.php @@ -13,6 +13,7 @@ /** * Interface StockCollectionInterface + * @api */ interface StockCollectionInterface extends SearchResultsInterface { diff --git a/app/code/Magento/CatalogInventory/Api/Data/StockInterface.php b/app/code/Magento/CatalogInventory/Api/Data/StockInterface.php index 47bd9b85cc321..8908ea0ee96af 100644 --- a/app/code/Magento/CatalogInventory/Api/Data/StockInterface.php +++ b/app/code/Magento/CatalogInventory/Api/Data/StockInterface.php @@ -9,6 +9,7 @@ /** * Interface Stock + * @api */ interface StockInterface extends ExtensibleDataInterface { diff --git a/app/code/Magento/CatalogInventory/Api/Data/StockItemCollectionInterface.php b/app/code/Magento/CatalogInventory/Api/Data/StockItemCollectionInterface.php index 80436c5427b8d..ee670c352f18a 100644 --- a/app/code/Magento/CatalogInventory/Api/Data/StockItemCollectionInterface.php +++ b/app/code/Magento/CatalogInventory/Api/Data/StockItemCollectionInterface.php @@ -13,6 +13,7 @@ /** * Interface StockItemCollectionInterface + * @api */ interface StockItemCollectionInterface extends SearchResultsInterface { diff --git a/app/code/Magento/CatalogInventory/Api/Data/StockItemInterface.php b/app/code/Magento/CatalogInventory/Api/Data/StockItemInterface.php index 0a620ce1562d5..0c4216fd46a99 100644 --- a/app/code/Magento/CatalogInventory/Api/Data/StockItemInterface.php +++ b/app/code/Magento/CatalogInventory/Api/Data/StockItemInterface.php @@ -9,6 +9,7 @@ /** * Interface StockItem + * @api */ interface StockItemInterface extends ExtensibleDataInterface { diff --git a/app/code/Magento/CatalogInventory/Api/Data/StockStatusCollectionInterface.php b/app/code/Magento/CatalogInventory/Api/Data/StockStatusCollectionInterface.php index b46ccbf5c94e2..a06aa1ebd0a4a 100644 --- a/app/code/Magento/CatalogInventory/Api/Data/StockStatusCollectionInterface.php +++ b/app/code/Magento/CatalogInventory/Api/Data/StockStatusCollectionInterface.php @@ -9,6 +9,7 @@ /** * Stock Status collection interface + * @api */ interface StockStatusCollectionInterface extends SearchResultsInterface { diff --git a/app/code/Magento/CatalogInventory/Api/Data/StockStatusInterface.php b/app/code/Magento/CatalogInventory/Api/Data/StockStatusInterface.php index 3c90ea451776a..f4996ac62ec6b 100644 --- a/app/code/Magento/CatalogInventory/Api/Data/StockStatusInterface.php +++ b/app/code/Magento/CatalogInventory/Api/Data/StockStatusInterface.php @@ -9,6 +9,7 @@ /** * Interface StockStatusInterface + * @api */ interface StockStatusInterface extends ExtensibleDataInterface { diff --git a/app/code/Magento/CatalogInventory/Api/StockConfigurationInterface.php b/app/code/Magento/CatalogInventory/Api/StockConfigurationInterface.php index 5052ea004b256..7b4179c7a7188 100644 --- a/app/code/Magento/CatalogInventory/Api/StockConfigurationInterface.php +++ b/app/code/Magento/CatalogInventory/Api/StockConfigurationInterface.php @@ -7,6 +7,7 @@ /** * Interface StockConfigurationInterface + * @api */ interface StockConfigurationInterface { diff --git a/app/code/Magento/CatalogInventory/Api/StockCriteriaInterface.php b/app/code/Magento/CatalogInventory/Api/StockCriteriaInterface.php index 537db0ce5aff1..15e299f8591c7 100644 --- a/app/code/Magento/CatalogInventory/Api/StockCriteriaInterface.php +++ b/app/code/Magento/CatalogInventory/Api/StockCriteriaInterface.php @@ -7,6 +7,7 @@ /** * Interface StockCriteriaInterface + * @api */ interface StockCriteriaInterface extends \Magento\Framework\Api\CriteriaInterface { diff --git a/app/code/Magento/CatalogInventory/Api/StockIndexInterface.php b/app/code/Magento/CatalogInventory/Api/StockIndexInterface.php index 6edba0a23b537..f57936402f0c9 100644 --- a/app/code/Magento/CatalogInventory/Api/StockIndexInterface.php +++ b/app/code/Magento/CatalogInventory/Api/StockIndexInterface.php @@ -7,6 +7,7 @@ /** * Interface StockIndexInterface + * @api */ interface StockIndexInterface { diff --git a/app/code/Magento/CatalogInventory/Api/StockItemCriteriaInterface.php b/app/code/Magento/CatalogInventory/Api/StockItemCriteriaInterface.php index 878aa26d3c2f7..df76cc37f3153 100644 --- a/app/code/Magento/CatalogInventory/Api/StockItemCriteriaInterface.php +++ b/app/code/Magento/CatalogInventory/Api/StockItemCriteriaInterface.php @@ -7,6 +7,7 @@ /** * Interface StockItemCriteriaInterface + * @api */ interface StockItemCriteriaInterface extends \Magento\Framework\Api\CriteriaInterface { diff --git a/app/code/Magento/CatalogInventory/Api/StockItemRepositoryInterface.php b/app/code/Magento/CatalogInventory/Api/StockItemRepositoryInterface.php index 17a2287692281..97804d7043750 100644 --- a/app/code/Magento/CatalogInventory/Api/StockItemRepositoryInterface.php +++ b/app/code/Magento/CatalogInventory/Api/StockItemRepositoryInterface.php @@ -7,6 +7,7 @@ /** * Interface StockItemRepository + * @api */ interface StockItemRepositoryInterface { diff --git a/app/code/Magento/CatalogInventory/Api/StockManagementInterface.php b/app/code/Magento/CatalogInventory/Api/StockManagementInterface.php index 748ed9b39cfc7..b4cd1008bf5ce 100644 --- a/app/code/Magento/CatalogInventory/Api/StockManagementInterface.php +++ b/app/code/Magento/CatalogInventory/Api/StockManagementInterface.php @@ -7,6 +7,7 @@ /** * Interface StockManagementInterface + * @api */ interface StockManagementInterface { diff --git a/app/code/Magento/CatalogInventory/Api/StockRegistryInterface.php b/app/code/Magento/CatalogInventory/Api/StockRegistryInterface.php index 27f90e740f961..95c848f1865b7 100644 --- a/app/code/Magento/CatalogInventory/Api/StockRegistryInterface.php +++ b/app/code/Magento/CatalogInventory/Api/StockRegistryInterface.php @@ -7,6 +7,7 @@ /** * Interface StockRegistryInterface + * @api */ interface StockRegistryInterface { diff --git a/app/code/Magento/CatalogInventory/Api/StockRepositoryInterface.php b/app/code/Magento/CatalogInventory/Api/StockRepositoryInterface.php index 06f5d2f4e9cf7..28b839c6fedb6 100644 --- a/app/code/Magento/CatalogInventory/Api/StockRepositoryInterface.php +++ b/app/code/Magento/CatalogInventory/Api/StockRepositoryInterface.php @@ -7,6 +7,7 @@ /** * Interface StockRepositoryInterface + * @api */ interface StockRepositoryInterface { diff --git a/app/code/Magento/CatalogInventory/Api/StockStateInterface.php b/app/code/Magento/CatalogInventory/Api/StockStateInterface.php index 490f92644df78..140ccee031bfa 100644 --- a/app/code/Magento/CatalogInventory/Api/StockStateInterface.php +++ b/app/code/Magento/CatalogInventory/Api/StockStateInterface.php @@ -7,6 +7,7 @@ /** * Interface StockStateInterface + * @api */ interface StockStateInterface { diff --git a/app/code/Magento/CatalogInventory/Api/StockStatusCriteriaInterface.php b/app/code/Magento/CatalogInventory/Api/StockStatusCriteriaInterface.php index af80ddd5c5caf..7b5dfafa3116a 100644 --- a/app/code/Magento/CatalogInventory/Api/StockStatusCriteriaInterface.php +++ b/app/code/Magento/CatalogInventory/Api/StockStatusCriteriaInterface.php @@ -7,6 +7,7 @@ /** * Interface StockStatusCriteriaInterface + * @api */ interface StockStatusCriteriaInterface extends \Magento\Framework\Api\CriteriaInterface { diff --git a/app/code/Magento/CatalogInventory/Api/StockStatusRepositoryInterface.php b/app/code/Magento/CatalogInventory/Api/StockStatusRepositoryInterface.php index b531c815ceb55..7a8ac82565413 100644 --- a/app/code/Magento/CatalogInventory/Api/StockStatusRepositoryInterface.php +++ b/app/code/Magento/CatalogInventory/Api/StockStatusRepositoryInterface.php @@ -7,6 +7,7 @@ /** * Interface StockStatusRepositoryInterface + * @api */ interface StockStatusRepositoryInterface { diff --git a/app/code/Magento/CatalogInventory/Model/ResourceModel/Indexer/Stock/StockInterface.php b/app/code/Magento/CatalogInventory/Model/ResourceModel/Indexer/Stock/StockInterface.php index 32b75680fbcd5..8612b0ba52593 100644 --- a/app/code/Magento/CatalogInventory/Model/ResourceModel/Indexer/Stock/StockInterface.php +++ b/app/code/Magento/CatalogInventory/Model/ResourceModel/Indexer/Stock/StockInterface.php @@ -7,6 +7,7 @@ /** * CatalogInventory Stock Indexer Interface + * @api */ interface StockInterface {