Skip to content

Commit

Permalink
Merge pull request #5191 in SW/shopware from sw-19194/5.3/fix-article…
Browse files Browse the repository at this point in the history
…-comparison to 5.3

* commit 'b5f9b1c327d9f23af93aa4a41ca869eac9476af8':
  SW-19194 - Fix article links for note list
  SW-19194 - Fix article links for comparison function
  • Loading branch information
janbuecker committed Jul 5, 2017
2 parents dbed0f2 + b5f9b1c commit e7a1adc
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 3 deletions.
3 changes: 3 additions & 0 deletions engine/Shopware/Controllers/Frontend/Compare.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@
*/
class Shopware_Controllers_Frontend_Compare extends Enlight_Controller_Action
{
/**
* @var sArticles
*/
protected $articles;

public function preDispatch()
Expand Down
4 changes: 3 additions & 1 deletion engine/Shopware/Core/sArticlesComparisons.php
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,9 @@ public function sGetComparisonList()

foreach ($checkForArticle as $article) {
if ($article['articleID']) {
$articles[] = $this->articleModule->sGetPromotionById('fix', 0, (int) $article['articleID']);
$promotion = $this->articleModule->sGetPromotionById('fix', 0, (int) $article['articleID']);
$promotion['linkDetails'] = $promotion['linkVariant'];
$articles[] = $promotion;
}
}

Expand Down
5 changes: 3 additions & 2 deletions engine/Shopware/Core/sBasket.php
Original file line number Diff line number Diff line change
Expand Up @@ -1263,8 +1263,9 @@ public function sGetNotes()
/** @var $product ListProduct */
foreach ($products as $product) {
$note = $notes[$product->getNumber()];

$promotions[] = $this->convertListProductToNote($product, $note);
$promotion = $this->convertListProductToNote($product, $note);
$promotion['linkDetails'] = $promotion['linkVariant'];
$promotions[] = $promotion;
}

return $this->eventManager->filter(
Expand Down

0 comments on commit e7a1adc

Please sign in to comment.