Skip to content

[Forwardport] Add compare list link to success message after adding a product #16757

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Aug 10, 2018
Merged

[Forwardport] Add compare list link to success message after adding a product #16757

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
577e8dd
Add a link to the success message when adding a product to the compar…
avstudnitz Feb 27, 2018
de0e8d1
Renaming to avoid duplication
avstudnitz Feb 27, 2018
f225505
Merge branch '2.2-develop' into compare-success-message
gelanivishal Jul 12, 2018
b8440f0
Resolved conflict changes
gelanivishal Jul 13, 2018
7965492
Fixed conflict issue
gelanivishal Jul 16, 2018
e7463c1
Update CompareTest.php
gelanivishal Jul 24, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion app/code/Magento/Catalog/Controller/Product/Compare/Add.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,14 @@ public function execute()
$productName = $this->_objectManager->get(
\Magento\Framework\Escaper::class
)->escapeHtml($product->getName());
$this->messageManager->addSuccess(__('You added product %1 to the comparison list.', $productName));
$this->messageManager->addComplexSuccessMessage(
'addCompareSuccessMessage',
[
'product_name' => $productName,
'compare_list_url' => $this->_url->getUrl('catalog/product_compare')
]
);

$this->_eventManager->dispatch('catalog_product_compare_add_product', ['product' => $product]);
}

Expand Down
23 changes: 7 additions & 16 deletions app/code/Magento/Catalog/etc/frontend/di.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,23 +79,14 @@
<argument name="typeId" xsi:type="string">recently_compared_product</argument>
</arguments>
</virtualType>
<type name="Magento\Catalog\Block\Product\View\Gallery">
<type name="Magento\Framework\View\Element\Message\MessageConfigurationsPool">
<arguments>
<argument name="galleryImagesConfig" xsi:type="array">
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like you wrongly resolved conflicts while doing this Forwardport. Can you please check this part and resolve it correctly?

<item name="small_image" xsi:type="array">
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi
Looks like you accidentally removed working part of code, can you please review your changes? As reference you can use this commit from original PR
https://github.com/magento/magento2/pull/13862/files#diff-da4fdd9a985964091b2bbe0a3722ab77

<item name="image_id" xsi:type="string">product_page_image_small</item>
<item name="data_object_key" xsi:type="string">small_image_url</item>
<item name="json_object_key" xsi:type="string">thumb</item>
</item>
<item name="medium_image" xsi:type="array">
<item name="image_id" xsi:type="string">product_page_image_medium</item>
<item name="data_object_key" xsi:type="string">medium_image_url</item>
<item name="json_object_key" xsi:type="string">img</item>
</item>
<item name="large_image" xsi:type="array">
<item name="image_id" xsi:type="string">product_page_image_large</item>
<item name="data_object_key" xsi:type="string">large_image_url</item>
<item name="json_object_key" xsi:type="string">full</item>
<argument name="configurationsMap" xsi:type="array">
<item name="addCompareAddSuccessMessage" xsi:type="array">
<item name="renderer" xsi:type="const">\Magento\Framework\View\Element\Message\Renderer\BlockRenderer::CODE</item>
<item name="data" xsi:type="array">
<item name="template" xsi:type="string">Magento_Catalog::messages/addCompareAddSuccessMessage.phtml</item>
</item>
</item>
</argument>
</arguments>
Expand Down
14 changes: 14 additions & 0 deletions app/code/Magento/Catalog/view/frontend/templates/messages/addCompareSuccessMessage.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
// @codingStandardsIgnoreFile
/** @var \Magento\Framework\View\Element\Template $block */
?>
<?= $block->escapeHtml(__(
'You added product %1 to the <a href="%2">comparison list</a>.',
$block->getData('product_name'),
$block->getData('compare_list_url')),
['a']
);
2 changes: 1 addition & 1 deletion dev/tests/integration/testsuite/Magento/Catalog/Controller/Product/CompareTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public function testAddAction()
);

$this->assertSessionMessages(
$this->equalTo(['You added product Simple Product 1 Name to the comparison list.']),
$this->equalTo(['You added product Simple Product 1 Name to the <a href="http://localhost/index.php/catalog/product_compare/">comparison list</a>.']),
MessageInterface::TYPE_SUCCESS
);

Expand Down