From 9daba8c0431076b9b61fba9b2bcb5daed18d4b34 Mon Sep 17 00:00:00 2001 From: Stanislav Lopukhov Date: Sat, 16 Apr 2016 12:12:22 +0300 Subject: [PATCH 01/16] MAGETWO-51942: Does not work error message in category moving --- .../Magento/Catalog/Controller/Adminhtml/Category/Move.php | 6 +++--- .../view/adminhtml/templates/catalog/category/tree.phtml | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php index 6cfb6e3ba277c..ead95c544814a 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php @@ -67,12 +67,12 @@ public function execute() throw new \Exception(__('Category is not available for requested store.')); } $category->move($parentNodeId, $prevNodeId); - } catch (\Magento\Framework\Exception\LocalizedException $e) { - $error = true; - $this->messageManager->addError(__('There was a category move error.')); } catch (\Magento\Framework\Exception\AlreadyExistsException $e) { $error = true; $this->messageManager->addError(__('There was a category move error. %1', $e->getMessage())); + } catch (\Magento\Framework\Exception\LocalizedException $e) { + $error = true; + $this->messageManager->addError($e->getMessage()); } catch (\Exception $e) { $error = true; $this->messageManager->addError(__('There was a category move error.')); diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/tree.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/tree.phtml index 980ab6ac45805..135864e957a26 100644 --- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/tree.phtml +++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/tree.phtml @@ -493,6 +493,9 @@ } else { $(obj.tree.container.dom).trigger('categoryMove.tree'); } + $('.page-main-actions').next('.messages').remove(); + $('.page-main-actions').next('#messages').remove(); + $('.page-main-actions').after(data.messages); }).fail(function (jqXHR, textStatus) { if (window.console) { console.log(textStatus); From 41a37aa63cc9a5680038a035be8dd76f1acaff5d Mon Sep 17 00:00:00 2001 From: Roman Ganin Date: Wed, 20 Apr 2016 11:04:08 +0300 Subject: [PATCH 02/16] MAGETWO-52023: Cannot create store view after product duplicate --- app/code/Magento/Catalog/Model/ResourceModel/Product.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product.php b/app/code/Magento/Catalog/Model/ResourceModel/Product.php index 9c402ea6ec5cc..e0752d0f510a3 100644 --- a/app/code/Magento/Catalog/Model/ResourceModel/Product.php +++ b/app/code/Magento/Catalog/Model/ResourceModel/Product.php @@ -532,7 +532,7 @@ public function duplicate($oldId, $newId) $select, $tableName, ['attribute_id', 'store_id', $this->getLinkField(), 'value'], - \Magento\Framework\DB\Adapter\AdapterInterface::INSERT_ON_DUPLICATE + \Magento\Framework\DB\Adapter\AdapterInterface::INSERT_IGNORE ) ); } From 5e83d6137608fe58747abe367f91e492561e4c60 Mon Sep 17 00:00:00 2001 From: Roman Ganin Date: Wed, 20 Apr 2016 11:21:58 +0300 Subject: [PATCH 03/16] MAGETWO-52023: Cannot create store view after product duplicate --- app/code/Magento/Catalog/Model/ResourceModel/Product.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product.php b/app/code/Magento/Catalog/Model/ResourceModel/Product.php index e0752d0f510a3..c0d81c53e623f 100644 --- a/app/code/Magento/Catalog/Model/ResourceModel/Product.php +++ b/app/code/Magento/Catalog/Model/ResourceModel/Product.php @@ -522,9 +522,6 @@ public function duplicate($oldId, $newId) )->where( $this->getLinkField() . ' = ?', $oldId - )->where( - 'store_id >= ?', - 0 ); $connection->query( @@ -541,7 +538,6 @@ public function duplicate($oldId, $newId) $statusAttribute = $this->getAttribute('status'); $statusAttributeId = $statusAttribute->getAttributeId(); $statusAttributeTable = $statusAttribute->getBackend()->getTable(); - $updateCond[] = 'store_id >= 0'; $updateCond[] = $connection->quoteInto($this->getLinkField() . ' = ?', $newId); $updateCond[] = $connection->quoteInto('attribute_id = ?', $statusAttributeId); $connection->update( From 1700f7c58d6464349ca1a236823e30d4ef0ef01e Mon Sep 17 00:00:00 2001 From: Roman Ganin Date: Thu, 21 Apr 2016 13:50:59 +0300 Subject: [PATCH 04/16] MAGETWO-48511: [GitHub] HTML tags inside the Meta Description on Edit Product Admin page brake the Storefront PDP layout #1514 #2613 #3090 #3244 #3255 #3813 #4031 #4073 --- lib/internal/Magento/Framework/View/Page/Config.php | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/lib/internal/Magento/Framework/View/Page/Config.php b/lib/internal/Magento/Framework/View/Page/Config.php index 1ff41f5becfff..93467aa8469fe 100644 --- a/lib/internal/Magento/Framework/View/Page/Config.php +++ b/lib/internal/Magento/Framework/View/Page/Config.php @@ -216,7 +216,7 @@ public function getTitle() public function setMetadata($name, $content) { $this->build(); - $this->metadata[$name] = $content; + $this->metadata[$name] = $this->prepareMetaTagContent($content); } /** @@ -338,6 +338,17 @@ public function setKeywords($keywords) $this->setMetadata('keywords', $keywords); } + /** + * Prepare content for meta tag attribute + * + * @param $content + * @return string + */ + protected function prepareMetaTagContent($content) + { + return htmlentities($content); + } + /** * Retrieve content for keywords tag * From 0041c43b27db0e027dc02423a0d513c9ded2a40b Mon Sep 17 00:00:00 2001 From: Roman Ganin Date: Thu, 21 Apr 2016 19:21:52 +0300 Subject: [PATCH 05/16] MAGETWO-48511: [GitHub] HTML tags inside the Meta Description on Edit Product Admin page brake the Storefront PDP layout #1514 #2613 #3090 #3244 #3255 #3813 #4031 #4073 - CR changes --- lib/internal/Magento/Framework/View/Page/Config.php | 13 +------------ .../Framework/View/Test/Unit/Page/ConfigTest.php | 2 ++ 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/lib/internal/Magento/Framework/View/Page/Config.php b/lib/internal/Magento/Framework/View/Page/Config.php index 93467aa8469fe..e862c764d74c4 100644 --- a/lib/internal/Magento/Framework/View/Page/Config.php +++ b/lib/internal/Magento/Framework/View/Page/Config.php @@ -216,7 +216,7 @@ public function getTitle() public function setMetadata($name, $content) { $this->build(); - $this->metadata[$name] = $this->prepareMetaTagContent($content); + $this->metadata[$name] = htmlentities($content); } /** @@ -338,17 +338,6 @@ public function setKeywords($keywords) $this->setMetadata('keywords', $keywords); } - /** - * Prepare content for meta tag attribute - * - * @param $content - * @return string - */ - protected function prepareMetaTagContent($content) - { - return htmlentities($content); - } - /** * Retrieve content for keywords tag * diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Page/ConfigTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Page/ConfigTest.php index 90079974edd0d..2e73629c03888 100644 --- a/lib/internal/Magento/Framework/View/Test/Unit/Page/ConfigTest.php +++ b/lib/internal/Magento/Framework/View/Test/Unit/Page/ConfigTest.php @@ -133,8 +133,10 @@ public function testMetadata() 'keywords' => null, 'robots' => null, 'name' => 'test_value', + 'html_encoded' => '<title><span class="test">Test</span></title>', ]; $this->model->setMetadata('name', 'test_value'); + $this->model->setMetadata('html_encoded', '<span class="test">Test</span>'); $this->assertEquals($expectedMetadata, $this->model->getMetadata()); } From a39526b7478018c2b1d9ff7a1e5feffd682cf71d Mon Sep 17 00:00:00 2001 From: Stanislav Lopukhov Date: Fri, 22 Apr 2016 11:30:37 +0300 Subject: [PATCH 06/16] MAGETWO-51982: [CE] Products not displayed in category products if assigned to 2nd website only --- .../Magento/Catalog/Block/Adminhtml/Category/Tab/Product.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Tab/Product.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Tab/Product.php index 41aad9086869a..8ed0ad9e11cc2 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Category/Tab/Product.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Tab/Product.php @@ -104,8 +104,6 @@ protected function _prepareCollection() 'sku' )->addAttributeToSelect( 'price' - )->addStoreFilter( - $this->getRequest()->getParam('store') )->joinField( 'position', 'catalog_category_product', @@ -114,6 +112,9 @@ protected function _prepareCollection() 'category_id=' . (int)$this->getRequest()->getParam('id', 0), 'left' ); + if ($this->getRequest()->getParam('store', 0) > 0) { + $collection->addStoreFilter($this->getRequest()->getParam('store')); + } $this->setCollection($collection); if ($this->getCategory()->getProductsReadonly()) { From 79e2a31522b2543b48c3e821db54baa4482c2ae3 Mon Sep 17 00:00:00 2001 From: Stanislav Lopukhov Date: Fri, 22 Apr 2016 11:55:13 +0300 Subject: [PATCH 07/16] MAGETWO-51982: [CE] Products not displayed in category products if assigned to 2nd website only --- .../Magento/Catalog/Block/Adminhtml/Category/Tab/Product.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Tab/Product.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Tab/Product.php index 8ed0ad9e11cc2..976dd4c922263 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Category/Tab/Product.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Tab/Product.php @@ -112,8 +112,9 @@ protected function _prepareCollection() 'category_id=' . (int)$this->getRequest()->getParam('id', 0), 'left' ); - if ($this->getRequest()->getParam('store', 0) > 0) { - $collection->addStoreFilter($this->getRequest()->getParam('store')); + $storeId = (int)$this->getRequest()->getParam('store', 0); + if ($storeId > 0) { + $collection->addStoreFilter($storeId); } $this->setCollection($collection); From 562971a2155c6c26f04cca2e4e4819848e6e5e17 Mon Sep 17 00:00:00 2001 From: Kateryna Muntianu Date: Fri, 22 Apr 2016 19:22:46 +0300 Subject: [PATCH 08/16] MAGETWO-52176: New Accounts Report incorrectly calculates accounts for multiple websites --- .../Reports/view/adminhtml/layout/reports_report_grid.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_grid.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_grid.xml index 6f04004a39951..b190ce77e22ad 100644 --- a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_grid.xml +++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_grid.xml @@ -11,9 +11,6 @@ 0 - - null - 1 1 1 From 13a961f181ff7740a12b0a994ae585fa74a6a05e Mon Sep 17 00:00:00 2001 From: Roman Ganin Date: Sat, 23 Apr 2016 11:46:59 +0300 Subject: [PATCH 09/16] MAGETWO-48511: [GitHub] HTML tags inside the Meta Description on Edit Product Admin page brake the Storefront PDP layout #1514 #2613 #3090 #3244 #3255 #3813 #4031 #4073 - fixed opengraph tags template --- .../templates/product/view/opengraph/general.phtml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/opengraph/general.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/opengraph/general.phtml index 238649265821f..2310323452518 100644 --- a/app/code/Magento/Catalog/view/frontend/templates/product/view/opengraph/general.phtml +++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/opengraph/general.phtml @@ -10,10 +10,10 @@ ?> - - - - + + + + getProduct()->getFinalPrice()):?> getChildHtml('meta.currency'); ?> From fe1eb2f2b2ee7a4f8b937f5cf8b850e9c0ef0b2a Mon Sep 17 00:00:00 2001 From: Roman Ganin Date: Sat, 23 Apr 2016 12:47:47 +0300 Subject: [PATCH 10/16] MAGETWO-48511: [GitHub] HTML tags inside the Meta Description on Edit Product Admin page brake the Storefront PDP layout #1514 #2613 #3090 #3244 #3255 #3813 #4031 #4073 - fixed opengraph tags template --- .../templates/product/view/opengraph/general.phtml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/opengraph/general.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/opengraph/general.phtml index 2310323452518..fd66871b28ab8 100644 --- a/app/code/Magento/Catalog/view/frontend/templates/product/view/opengraph/general.phtml +++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/opengraph/general.phtml @@ -10,10 +10,10 @@ ?> - - - - + + + + getProduct()->getFinalPrice()):?> getChildHtml('meta.currency'); ?> From 2ff73d2564631ac0ad6993c7768a7a7374830441 Mon Sep 17 00:00:00 2001 From: vzabaznov Date: Sat, 23 Apr 2016 16:02:00 +0300 Subject: [PATCH 11/16] MAGETWO-52250: Remove double semicolon --- .../Test/Unit/Model/Product/Gallery/GalleryManagementTest.php | 2 +- app/code/Magento/Quote/Test/Unit/Model/QuoteTest.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/Gallery/GalleryManagementTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/Gallery/GalleryManagementTest.php index bb1041824ab7c..0e4d357164481 100644 --- a/app/code/Magento/Catalog/Test/Unit/Model/Product/Gallery/GalleryManagementTest.php +++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/Gallery/GalleryManagementTest.php @@ -97,7 +97,7 @@ public function testCreateWithCannotSaveException() $productSku = 'mediaProduct'; $entryContentMock = $this->getMockBuilder('\Magento\Framework\Api\Data\ImageContentInterface') ->disableOriginalConstructor() - ->getMock();; + ->getMock(); $this->mediaGalleryEntryMock->expects($this->any())->method('getContent')->willReturn($entryContentMock); $this->productRepositoryMock->expects($this->once()) ->method('get') diff --git a/app/code/Magento/Quote/Test/Unit/Model/QuoteTest.php b/app/code/Magento/Quote/Test/Unit/Model/QuoteTest.php index 9254ea0ea6362..7da2feffe464e 100644 --- a/app/code/Magento/Quote/Test/Unit/Model/QuoteTest.php +++ b/app/code/Magento/Quote/Test/Unit/Model/QuoteTest.php @@ -1105,7 +1105,7 @@ public function testBeforeSaveIsVirtualQuote(array $productTypes, $expected) ); $items = []; foreach ($productTypes as $type) { - $productMock = $this->getMock('\Magento\Catalog\Model\Product', [], [], '', false);; + $productMock = $this->getMock('\Magento\Catalog\Model\Product', [], [], '', false); $productMock->expects($this->any())->method('getIsVirtual')->willReturn($type); $itemMock = $this->getMock( From de942b806f749c772a9d9a5413937571db898adf Mon Sep 17 00:00:00 2001 From: Roman Ganin Date: Sat, 23 Apr 2016 17:39:51 +0300 Subject: [PATCH 12/16] MAGETWO-48527: [GITHUB] Wrong customer id in Abandoned Carts grid #3162 --- .../Reports/Model/ResourceModel/Quote/Collection.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/app/code/Magento/Reports/Model/ResourceModel/Quote/Collection.php b/app/code/Magento/Reports/Model/ResourceModel/Quote/Collection.php index fbba8ce47e537..151f8478c0bb4 100644 --- a/app/code/Magento/Reports/Model/ResourceModel/Quote/Collection.php +++ b/app/code/Magento/Reports/Model/ResourceModel/Quote/Collection.php @@ -156,7 +156,7 @@ public function resolveCustomerNames() $select->from( ['customer' => $this->customerResource->getTable('customer_entity')], - ['email'] + ['entity_id', 'email'] ); $select->columns( ['customer_name' => $customerName] @@ -171,8 +171,11 @@ public function resolveCustomerNames() $customersData = $this->customerResource->getConnection()->fetchAll($select); foreach ($this->getItems() as $item) { - $item->setData(array_merge($item->getData(), current($customersData))); - next($customersData); + foreach ($customersData as $customerItemData) { + if ($item['customer_id'] == $customerItemData['entity_id']) { + $item->setData(array_merge($item->getData(), $customerItemData)); + } + } } } } From 423ff9eb3bbbcc9aeaedf355f466d1caa4cd4072 Mon Sep 17 00:00:00 2001 From: Roman Ganin Date: Mon, 25 Apr 2016 13:59:58 +0300 Subject: [PATCH 13/16] MAGETWO-48527: [GITHUB] Wrong customer id in Abandoned Carts grid #3162 --- .../Test/Unit/Model/ResourceModel/Quote/CollectionTest.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/app/code/Magento/Reports/Test/Unit/Model/ResourceModel/Quote/CollectionTest.php b/app/code/Magento/Reports/Test/Unit/Model/ResourceModel/Quote/CollectionTest.php index 0a03a05bbb346..3b0cbd5c8a6c0 100644 --- a/app/code/Magento/Reports/Test/Unit/Model/ResourceModel/Quote/CollectionTest.php +++ b/app/code/Magento/Reports/Test/Unit/Model/ResourceModel/Quote/CollectionTest.php @@ -110,7 +110,7 @@ public function testResolveCustomerNames() $customerName = "CONCAT_WS('firstname', 'lastname')"; $customerTableName = 'customer_entity'; $customerId = ['customer_id' => ['test_id']]; - $customersData = [['item_1']]; + $customersData = [['entity_id' => 'test_id', 'name' => 'item_1']]; $itemData = ['test']; $this->selectMock->expects($this->any()) @@ -118,7 +118,7 @@ public function testResolveCustomerNames() ->willReturn($this->connectionMock); $this->selectMock->expects($this->once()) ->method('from') - ->with(['customer' => $customerTableName], ['email']) + ->with(['customer' => $customerTableName], ['entity_id', 'email']) ->willReturnSelf(); $this->selectMock->expects($this->once()) ->method('columns') @@ -158,9 +158,6 @@ public function testResolveCustomerNames() $itemMock = $this->getMockBuilder('Magento\Framework\Model\AbstractModel') ->disableOriginalConstructor() ->getMock(); - $itemMock->expects($this->once()) - ->method('getData') - ->willReturn($itemData); $this->entityFactoryMock->expects($this->any()) ->method('create') From 54b1b73cf7ab3542aba4d10c27772519f5273d26 Mon Sep 17 00:00:00 2001 From: Kateryna Muntianu Date: Mon, 25 Apr 2016 14:13:13 +0300 Subject: [PATCH 14/16] MAGETWO-51458: [FT] Autotests cannot set category on product page when run on env with sample data --- .../Mtf/Client/Element/SuggestElement.php | 20 ++++++------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/dev/tests/functional/lib/Magento/Mtf/Client/Element/SuggestElement.php b/dev/tests/functional/lib/Magento/Mtf/Client/Element/SuggestElement.php index d912a689cb31e..71d4a84b11612 100644 --- a/dev/tests/functional/lib/Magento/Mtf/Client/Element/SuggestElement.php +++ b/dev/tests/functional/lib/Magento/Mtf/Client/Element/SuggestElement.php @@ -75,19 +75,9 @@ public function setValue($value) if ($value == '') { return; } - foreach (str_split($value) as $symbol) { - $this->keys([$symbol]); - $searchedItem = $this->find(sprintf($this->resultItem, $value), Locator::SELECTOR_XPATH); - if ($searchedItem->isVisible()) { - try { - $searchedItem->click(); - break; - } catch (\Exception $e) { - // In parallel run on windows change the focus is lost on element - // that causes disappearing of category suggest list. - } - } - } + $this->keys([$value]); + $searchedItem = $this->find(sprintf($this->resultItem, $value), Locator::SELECTOR_XPATH); + $searchedItem->click(); $closeButton = $this->find($this->closeButton); if ($closeButton->isVisible()) { $closeButton->click(); @@ -102,7 +92,9 @@ public function setValue($value) */ public function keys(array $keys) { - $this->find($this->advancedSelect)->click(); + if (!$this->find($this->selectInput)->isVisible()) { + $this->find($this->advancedSelect)->click(); + } $input = $this->find($this->selectInput); $input->click(); $input->keys($keys); From faf84f1cee5af11b6a86cb787bb52616e096a4a1 Mon Sep 17 00:00:00 2001 From: Roman Ganin Date: Mon, 25 Apr 2016 14:47:37 +0300 Subject: [PATCH 15/16] MAGETWO-48527: [GITHUB] Wrong customer id in Abandoned Carts grid #3162 --- .../Test/Unit/Model/ResourceModel/Quote/CollectionTest.php | 1 - 1 file changed, 1 deletion(-) diff --git a/app/code/Magento/Reports/Test/Unit/Model/ResourceModel/Quote/CollectionTest.php b/app/code/Magento/Reports/Test/Unit/Model/ResourceModel/Quote/CollectionTest.php index 3b0cbd5c8a6c0..fa4f67f09f2d5 100644 --- a/app/code/Magento/Reports/Test/Unit/Model/ResourceModel/Quote/CollectionTest.php +++ b/app/code/Magento/Reports/Test/Unit/Model/ResourceModel/Quote/CollectionTest.php @@ -111,7 +111,6 @@ public function testResolveCustomerNames() $customerTableName = 'customer_entity'; $customerId = ['customer_id' => ['test_id']]; $customersData = [['entity_id' => 'test_id', 'name' => 'item_1']]; - $itemData = ['test']; $this->selectMock->expects($this->any()) ->method('getConnection') From 518acaf67e8e2dd1adb7f1c643fcf8f548762078 Mon Sep 17 00:00:00 2001 From: Roman Ganin Date: Mon, 25 Apr 2016 19:36:24 +0300 Subject: [PATCH 16/16] MAGETWO-48511: [GitHub] HTML tags inside the Meta Description on Edit Product Admin page brake the Storefront PDP layout #1514 #2613 #3090 #3244 #3255 #3813 #4031 #4073 --- .../frontend/templates/product/view/opengraph/general.phtml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/opengraph/general.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/opengraph/general.phtml index fd66871b28ab8..39170817ec78e 100644 --- a/app/code/Magento/Catalog/view/frontend/templates/product/view/opengraph/general.phtml +++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/opengraph/general.phtml @@ -11,9 +11,9 @@ - + - + getProduct()->getFinalPrice()):?> getChildHtml('meta.currency'); ?>