dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[-] FO : fixed bug #PSCFV-4092

Browse Source
This commit is contained in:
vAugagneur
2012-09-26 09:20:39 +00:00
parent 2e8ac55f01
commit a0bb25fcd9
10 changed files with 36 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/front/BestSalesController.php
+5 -1
View File
@@ -41,7 +41,8 @@ class BestSalesControllerCore extends FrontController
'products' => ProductSale::getBestSales($this->context->language->id, $this->p - 1, $this->n, $this->orderBy, $this->orderWay),
'add_prod_display' => Configuration::get('PS_ATTRIBUTE_CATEGORY_DISPLAY'),
'nbProducts' => $nbProducts,
'homeSize' => Image::getSize('home_default')
'homeSize' => Image::getSize('home_default'),
'comparator_max_item' => Configuration::get('PS_COMPARATOR_MAX_ITEM')
));
$this->setTemplate(_PS_THEME_DIR_.'best-sales.tpl');
@@ -51,6 +52,9 @@ class BestSalesControllerCore extends FrontController
{
parent::setMedia();
$this->addCSS(_THEME_CSS_DIR_.'product_list.css');
if (Configuration::get('PS_COMPARATOR_MAX_ITEM'))
$this->addJS(_THEME_JS_DIR_.'products-comparison.js');
}
}
controllers/front/ManufacturerController.php
+6 -1
View File
@@ -34,6 +34,9 @@ class ManufacturerControllerCore extends FrontController
{
parent::setMedia();
$this->addCSS(_THEME_CSS_DIR_.'product_list.css');
if (Configuration::get('PS_COMPARATOR_MAX_ITEM'))
$this->addJS(_THEME_JS_DIR_.'products-comparison.js');
}
public function canonicalRedirection($canonicalURL = '')
@@ -96,7 +99,9 @@ class ManufacturerControllerCore extends FrontController
'nb_products' => $nbProducts,
'products' => $this->manufacturer->getProducts($this->manufacturer->id, $this->context->language->id, (int)$this->p, (int)$this->n, $this->orderBy, $this->orderWay),
'path' => ($this->manufacturer->active ? Tools::safeOutput($this->manufacturer->name) : ''),
'manufacturer' => $this->manufacturer));
'manufacturer' => $this->manufacturer,
'comparator_max_item' => Configuration::get('PS_COMPARATOR_MAX_ITEM'))
);
}
/**
controllers/front/NewProductsController.php
+5 -1
View File
@@ -33,6 +33,9 @@ class NewProductsControllerCore extends FrontController
{
parent::setMedia();
$this->addCSS(_THEME_CSS_DIR_.'product_list.css');
if (Configuration::get('PS_COMPARATOR_MAX_ITEM'))
$this->addJS(_THEME_JS_DIR_.'products-comparison.js');
}
/**
@@ -58,7 +61,8 @@ class NewProductsControllerCore extends FrontController
'products' => Product::getNewProducts($this->context->language->id, (int)($this->p) - 1, (int)($this->n), false, $this->orderBy, $this->orderWay),
'add_prod_display' => Configuration::get('PS_ATTRIBUTE_CATEGORY_DISPLAY'),
'nbProducts' => (int)($nbProducts),
'homeSize' => Image::getSize('home_default')
'homeSize' => Image::getSize('home_default'),
'comparator_max_item' => Configuration::get('PS_COMPARATOR_MAX_ITEM')
));
$this->setTemplate(_PS_THEME_DIR_.'new-products.tpl');
controllers/front/PricesDropController.php
+5 -1
View File
@@ -33,6 +33,9 @@ class PricesDropControllerCore extends FrontController
{
parent::setMedia();
$this->addCSS(_THEME_CSS_DIR_.'product_list.css');
if (Configuration::get('PS_COMPARATOR_MAX_ITEM'))
$this->addJS(_THEME_JS_DIR_.'products-comparison.js');
}
/**
@@ -51,7 +54,8 @@ class PricesDropControllerCore extends FrontController
'products' => Product::getPricesDrop($this->context->language->id, (int)$this->p - 1, (int)$this->n, false, $this->orderBy, $this->orderWay),
'add_prod_display' => Configuration::get('PS_ATTRIBUTE_CATEGORY_DISPLAY'),
'nbProducts' => $nbProducts,
'homeSize' => Image::getSize('home_default')
'homeSize' => Image::getSize('home_default'),
'comparator_max_item' => Configuration::get('PS_COMPARATOR_MAX_ITEM')
));
$this->setTemplate(_PS_THEME_DIR_.'prices-drop.tpl');
controllers/front/SupplierController.php
+4
View File
@@ -35,6 +35,9 @@ class SupplierControllerCore extends FrontController
{
parent::setMedia();
$this->addCSS(_THEME_CSS_DIR_.'product_list.css');
if (Configuration::get('PS_COMPARATOR_MAX_ITEM'))
$this->addJS(_THEME_JS_DIR_.'products-comparison.js');
}
public function canonicalRedirection($canonicalURL = '')
@@ -99,6 +102,7 @@ class SupplierControllerCore extends FrontController
'products' => $this->supplier->getProducts($this->supplier->id, $this->context->cookie->id_lang, (int)$this->p, (int)$this->n, $this->orderBy, $this->orderWay),
'path' => ($this->supplier->active ? Tools::safeOutput($this->supplier->name) : ''),
'supplier' => $this->supplier,
'comparator_max_item' => Configuration::get('PS_COMPARATOR_MAX_ITEM')
));
}
themes/default/best-sales.tpl
+2
View File
@@ -33,8 +33,10 @@
<div class="sortPagiBar clearfix">
{include file="$tpl_dir./product-sort.tpl"}
</div>
{include file="./product-compare.tpl"}
{include file="$tpl_dir./product-list.tpl" products=$products}
{include file="$tpl_dir./pagination.tpl"}
{include file="./product-compare.tpl"}
{else}
<p class="warning">{l s='No top sellers.'}</p>
{/if}
themes/default/manufacturer.tpl
+2
View File
@@ -46,8 +46,10 @@
<div class="sortPagiBar clearfix">
{include file="./product-sort.tpl"}
</div>
{include file="./product-compare.tpl"}
{include file="./product-list.tpl" products=$products}
{include file="./pagination.tpl"}
{include file="./product-compare.tpl"}
{else}
<p class="warning">{l s='No products for this manufacturer.'}</p>
{/if}
themes/default/new-products.tpl
+2
View File
@@ -33,8 +33,10 @@
<div class="sortPagiBar clearfix">
{include file="./product-sort.tpl"}
</div>
{include file="./product-compare.tpl"}
{include file="./product-list.tpl" products=$products}
{include file="./pagination.tpl"}
{include file="./product-compare.tpl"}
{else}
<p class="warning">{l s='No new products.'}</p>
{/if}
themes/default/prices-drop.tpl
+2
View File
@@ -33,8 +33,10 @@
<div class="sortPagiBar clearfix">
{include file="./product-sort.tpl"}
</div>
{include file="./product-compare.tpl"}
{include file="./product-list.tpl" products=$products}
{include file="./pagination.tpl"}
{include file="./product-compare.tpl"}
{else}
<p class="warning">{l s='No price drop.'}</p>
{/if}
themes/default/supplier.tpl
+3 -1
View File
@@ -40,9 +40,11 @@
<div class="sortPagiBar clearfix">
{include file="$tpl_dir./product-sort.tpl"}
</div>
{include file="./product-compare.tpl"}
{include file="$tpl_dir./product-list.tpl" products=$products}
{include file="$tpl_dir./pagination.tpl"}
{include file="./product-compare.tpl"}
{else}
<p class="warning">{l s='No products for this supplier.'}</p>
{/if}
{/if}
{/if}