Skip to content
Snippets Groups Projects
Commit 4e1fc608 authored by Chris Hallberg's avatar Chris Hallberg
Browse files

Extend per column cart support to stack-left and stack-right.

Conflicts:
	themes/bootstrap3/templates/combined/stack-left.phtml
	themes/bootstrap3/templates/combined/stack-right.phtml
parent 5f948985
No related merge requests found
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
$this->escapeHtml($lookfor) . '</li>'; $this->escapeHtml($lookfor) . '</li>';
} }
// Disable cart if appropriate: // Enable cart if appropriate:
$this->showCartControls = $this->supportsCart && $this->cart()->isActive(); $this->showCartControls = $this->supportsCart && $this->cart()->isActive();
// Load Javascript dependencies into header: // Load Javascript dependencies into header:
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<? if ((!isset($currentSearch['ajax']) || !$currentSearch['ajax']) && isset($currentSearch['hide_if_empty']) && $currentSearch['hide_if_empty'] && $currentSearch['view']->results->getResultTotal() == 0) { $columnIndex += $columns; continue; } ?> <? if ((!isset($currentSearch['ajax']) || !$currentSearch['ajax']) && isset($currentSearch['hide_if_empty']) && $currentSearch['hide_if_empty'] && $currentSearch['view']->results->getResultTotal() == 0) { $columnIndex += $columns; continue; } ?>
<? <?
$viewParams = array('searchClassId' => $searchClassId, 'currentSearch' => $currentSearch); $viewParams = array('searchClassId' => $searchClassId, 'currentSearch' => $currentSearch);
// Disable cart if appropriate: // Enable cart if appropriate:
$viewParams['showCartControls'] = $this->supportsCartOptions[$columnIndex] && $this->showCartControls; $viewParams['showCartControls'] = $this->supportsCartOptions[$columnIndex] && $this->showCartControls;
?> ?>
<div id="combined_<?=$this->escapeHtmlAttr($searchClassId)?>"> <div id="combined_<?=$this->escapeHtmlAttr($searchClassId)?>">
......
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
<? endif; ?> <? endif; ?>
<? <?
$viewParams = array('searchClassId' => $searchClassId, 'currentSearch' => $currentSearch); $viewParams = array('searchClassId' => $searchClassId, 'currentSearch' => $currentSearch);
// Disable cart if appropriate: // Enable cart if appropriate:
$viewParams['showCartControls'] = $this->showCartControls; $viewParams['showCartControls'] = $this->supportsCartOptions[$columnIndex] && $this->showCartControls;
?> ?>
<div id="combined_<?=$this->escapeHtmlAttr($searchClassId)?>"> <div id="combined_<?=$this->escapeHtmlAttr($searchClassId)?>">
<? $templateSuffix = (isset($currentSearch['ajax']) && $currentSearch['ajax']) ? 'ajax' : 'list'; ?> <? $templateSuffix = (isset($currentSearch['ajax']) && $currentSearch['ajax']) ? 'ajax' : 'list'; ?>
......
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
<? endif; ?> <? endif; ?>
<? <?
$viewParams = array('searchClassId' => $searchClassId, 'currentSearch' => $currentSearch); $viewParams = array('searchClassId' => $searchClassId, 'currentSearch' => $currentSearch);
// Disable cart if appropriate: // Enable cart if appropriate:
$viewParams['showCartControls'] = $this->showCartControls; $viewParams['showCartControls'] = $this->supportsCartOptions[$columnIndex] && $this->showCartControls;
?> ?>
<div id="combined_<?=$this->escapeHtmlAttr($searchClassId)?>"> <div id="combined_<?=$this->escapeHtmlAttr($searchClassId)?>">
<? $templateSuffix = (isset($currentSearch['ajax']) && $currentSearch['ajax']) ? 'ajax' : 'list'; ?> <? $templateSuffix = (isset($currentSearch['ajax']) && $currentSearch['ajax']) ? 'ajax' : 'list'; ?>
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
$this->layout()->breadcrumbs .= '<li class="active">' . $this->transEsc('Search') . ': ' . $this->escapeHtml($lookfor) . '</li>'; $this->layout()->breadcrumbs .= '<li class="active">' . $this->transEsc('Search') . ': ' . $this->escapeHtml($lookfor) . '</li>';
} }
// Disable cart if appropriate: // Enable cart if appropriate:
$this->showCartControls = $this->params->getOptions()->supportsCart() && $this->cart()->isActive(); $this->showCartControls = $this->params->getOptions()->supportsCart() && $this->cart()->isActive();
// Load Javascript dependencies into header: // Load Javascript dependencies into header:
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment