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

// Remove deprecated calls to Tools::addJS/CSS in modules

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10388 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
tDidierjean
2011-11-22 09:24:56 +00:00
parent 5b4d337cd6
commit e0415ec7e2
3 changed files with 284 additions and 284 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/authorizeaim/authorizeaim.php
+1 -1
View File
@@ -201,7 +201,7 @@ class authorizeAIM extends PaymentModule
public function hookHeader() public function hookHeader()
{ {
Tools::addJS(_PS_JS_DIR_.'jquery/jquery.validate.creditcard2-1.0.1.js'); $this->context->controller->addJS(_PS_JS_DIR_.'jquery/jquery.validate.creditcard2-1.0.1.js');
} }
/** /**
modules/blocklayered/blocklayered.php
+259 -259
View File
File diff suppressed because it is too large Load Diff
modules/producttooltip/producttooltip.php
+24 -24
View File
@@ -1,6 +1,6 @@
<?php <?php
/* /*
* 2007-2011 PrestaShop * 2007-2011 PrestaShop
* *
* NOTICE OF LICENSE * NOTICE OF LICENSE
* *
@@ -41,14 +41,14 @@ class ProductToolTip extends Module
parent::__construct(); parent::__construct();
$this->displayName = $this->l('Product tooltips'); $this->displayName = $this->l('Product tooltips');
$this->description = $this->l('Show how many people are watching a product page, last sale and last cart added.'); $this->description = $this->l('Show how many people are watching a product page, last sale and last cart added.');
} }
public function install() public function install()
{ {
if (!parent::install()) if (!parent::install())
return false; return false;
/* Default configuration values */ /* Default configuration values */
Configuration::updateValue('PS_PTOOLTIP_PEOPLE', 1); Configuration::updateValue('PS_PTOOLTIP_PEOPLE', 1);
Configuration::updateValue('PS_PTOOLTIP_DATE_CART', 1); Configuration::updateValue('PS_PTOOLTIP_DATE_CART', 1);
@@ -58,7 +58,7 @@ class ProductToolTip extends Module
return $this->registerHook('header') AND $this->registerHook('productfooter'); return $this->registerHook('header') AND $this->registerHook('productfooter');
} }
public function uninstall() public function uninstall()
{ {
if (!Configuration::deleteByName('PS_PTOOLTIP_PEOPLE') if (!Configuration::deleteByName('PS_PTOOLTIP_PEOPLE')
@@ -70,7 +70,7 @@ class ProductToolTip extends Module
return false; return false;
return true; return true;
} }
public function getContent() public function getContent()
{ {
/* Update values in DB */ /* Update values in DB */
@@ -81,7 +81,7 @@ class ProductToolTip extends Module
Configuration::updateValue('PS_PTOOLTIP_DATE_ORDER', (int)(Tools::getValue('ps_ptooltip_date_order'))); Configuration::updateValue('PS_PTOOLTIP_DATE_ORDER', (int)(Tools::getValue('ps_ptooltip_date_order')));
Configuration::updateValue('PS_PTOOLTIP_DAYS', ((int)(Tools::getValue('ps_ptooltip_days') < 0 ? 0 : (int)Tools::getValue('ps_ptooltip_days')))); Configuration::updateValue('PS_PTOOLTIP_DAYS', ((int)(Tools::getValue('ps_ptooltip_days') < 0 ? 0 : (int)Tools::getValue('ps_ptooltip_days'))));
Configuration::updateValue('PS_PTOOLTIP_LIFETIME', ((int)(Tools::getValue('ps_ptooltip_lifetime') < 0 ? 0 : (int)Tools::getValue('ps_ptooltip_lifetime')))); Configuration::updateValue('PS_PTOOLTIP_LIFETIME', ((int)(Tools::getValue('ps_ptooltip_lifetime') < 0 ? 0 : (int)Tools::getValue('ps_ptooltip_lifetime'))));
echo $this->displayConfirmation($this->l('Settings updated')); echo $this->displayConfirmation($this->l('Settings updated'));
} }
@@ -92,7 +92,7 @@ class ProductToolTip extends Module
<legend><img src="'.__PS_BASE_URI__.'modules/producttooltip/logo.gif" alt="" />'.$this->l('Product tooltips').'</legend> <legend><img src="'.__PS_BASE_URI__.'modules/producttooltip/logo.gif" alt="" />'.$this->l('Product tooltips').'</legend>
<p> <p>
'.$this->l('Display the number of people who are currently watching this product?').'<br /><br /> '.$this->l('Display the number of people who are currently watching this product?').'<br /><br />
<img src="'._PS_ADMIN_IMG_.'enabled.gif" alt="" /><input type="radio" name="ps_ptooltip_people" value="1"'.(Configuration::get('PS_PTOOLTIP_PEOPLE') ? ' checked="checked"' : '').' style="vertical-align: middle;" /> '.$this->l('Yes').' <img src="'._PS_ADMIN_IMG_.'enabled.gif" alt="" /><input type="radio" name="ps_ptooltip_people" value="1"'.(Configuration::get('PS_PTOOLTIP_PEOPLE') ? ' checked="checked"' : '').' style="vertical-align: middle;" /> '.$this->l('Yes').'
&nbsp;<img src="'._PS_ADMIN_IMG_.'disabled.gif" alt="" /><input type="radio" name="ps_ptooltip_people" value="0"'.(!Configuration::get('PS_PTOOLTIP_PEOPLE') ? ' checked="checked"' : '').' style="vertical-align: middle;" /> '.$this->l('No').'<br /> &nbsp;<img src="'._PS_ADMIN_IMG_.'disabled.gif" alt="" /><input type="radio" name="ps_ptooltip_people" value="0"'.(!Configuration::get('PS_PTOOLTIP_PEOPLE') ? ' checked="checked"' : '').' style="vertical-align: middle;" /> '.$this->l('No').'<br />
</p> </p>
<p> <p>
@@ -102,17 +102,17 @@ class ProductToolTip extends Module
<p> <p>
'.$this->l('If you activate the option above, you must activate the first option of StatData module').' '.$this->l('If you activate the option above, you must activate the first option of StatData module').'
</p> </p>
<hr size="1" noshade /> <hr size="1" noshade />
<p> <p>
'.$this->l('Display the last time the product has been ordered?').'<br /><br /> '.$this->l('Display the last time the product has been ordered?').'<br /><br />
<img src="'._PS_ADMIN_IMG_.'enabled.gif" alt="" /><input type="radio" name="ps_ptooltip_date_order" value="1"'.(Configuration::get('PS_PTOOLTIP_DATE_ORDER') ? ' checked="checked"' : '').' style="vertical-align: middle;" /> '.$this->l('Yes').' <img src="'._PS_ADMIN_IMG_.'enabled.gif" alt="" /><input type="radio" name="ps_ptooltip_date_order" value="1"'.(Configuration::get('PS_PTOOLTIP_DATE_ORDER') ? ' checked="checked"' : '').' style="vertical-align: middle;" /> '.$this->l('Yes').'
&nbsp;<img src="'._PS_ADMIN_IMG_.'disabled.gif" alt="" /><input type="radio" name="ps_ptooltip_date_order" value="0"'.(!Configuration::get('PS_PTOOLTIP_DATE_ORDER') ? ' checked="checked"' : '').' style="vertical-align: middle;" /> '.$this->l('No').'<br /><br /> &nbsp;<img src="'._PS_ADMIN_IMG_.'disabled.gif" alt="" /><input type="radio" name="ps_ptooltip_date_order" value="0"'.(!Configuration::get('PS_PTOOLTIP_DATE_ORDER') ? ' checked="checked"' : '').' style="vertical-align: middle;" /> '.$this->l('No').'<br /><br />
</p> </p>
<p> <p>
'.$this->l('If not ordered yet, display the last time the product has been added to a cart?').'<br /><br /> '.$this->l('If not ordered yet, display the last time the product has been added to a cart?').'<br /><br />
<img src="'._PS_ADMIN_IMG_.'enabled.gif" alt="" /><input type="radio" name="ps_ptooltip_date_cart" value="1"'.(Configuration::get('PS_PTOOLTIP_DATE_CART') ? ' checked="checked"' : '').' style="vertical-align: middle;" /> '.$this->l('Yes').' <img src="'._PS_ADMIN_IMG_.'enabled.gif" alt="" /><input type="radio" name="ps_ptooltip_date_cart" value="1"'.(Configuration::get('PS_PTOOLTIP_DATE_CART') ? ' checked="checked"' : '').' style="vertical-align: middle;" /> '.$this->l('Yes').'
&nbsp;<img src="'._PS_ADMIN_IMG_.'disabled.gif" alt="" /><input type="radio" name="ps_ptooltip_date_cart" value="0"'.(!Configuration::get('PS_PTOOLTIP_DATE_CART') ? ' checked="checked"' : '').' style="vertical-align: middle;" /> '.$this->l('No').'<br /><br /> &nbsp;<img src="'._PS_ADMIN_IMG_.'disabled.gif" alt="" /><input type="radio" name="ps_ptooltip_date_cart" value="0"'.(!Configuration::get('PS_PTOOLTIP_DATE_CART') ? ' checked="checked"' : '').' style="vertical-align: middle;" /> '.$this->l('No').'<br /><br />
</p> </p>
<p> <p>
'.$this->l('Do not display events older than:').' '.$this->l('Do not display events older than:').'
@@ -127,25 +127,25 @@ class ProductToolTip extends Module
</p> </p>
<div style="clear: both; font-size: 0;"></div> <div style="clear: both; font-size: 0;"></div>
</form>'; </form>';
return $output; return $output;
} }
public function hookHeader($params) public function hookHeader($params)
{ {
Tools::addCSS(__PS_BASE_URI__.'css/jquery.jgrowl.css', 'all'); $this->context->controller->addCSS(__PS_BASE_URI__.'css/jquery.jgrowl.css', 'all');
Tools::addJS(__PS_BASE_URI__.'js/jquery/jquery.jgrowl-1.2.1.min.js'); $this->context->controller->addJS(__PS_BASE_URI__.'js/jquery/jquery.jgrowl-1.2.1.min.js');
} }
public function hookProductFooter($params) public function hookProductFooter($params)
{ {
$id_product = (int)($params['product']->id); $id_product = (int)($params['product']->id);
/* First we try to display the number of people who are currently watching this product page */ /* First we try to display the number of people who are currently watching this product page */
if (Configuration::get('PS_PTOOLTIP_PEOPLE')) if (Configuration::get('PS_PTOOLTIP_PEOPLE'))
{ {
$date = strftime('%Y-%m-%d %H:%M:%S' , time() - (int)(Configuration::get('PS_PTOOLTIP_LIFETIME') * 60)); $date = strftime('%Y-%m-%d %H:%M:%S' , time() - (int)(Configuration::get('PS_PTOOLTIP_LIFETIME') * 60));
$nbPeople = Db::getInstance(_PS_USE_SQL_SLAVE_)->getRow(' $nbPeople = Db::getInstance(_PS_USE_SQL_SLAVE_)->getRow('
SELECT COUNT(DISTINCT(id_connections)) nb SELECT COUNT(DISTINCT(id_connections)) nb
FROM '._DB_PREFIX_.'page p FROM '._DB_PREFIX_.'page p
@@ -155,20 +155,20 @@ class ProductToolTip extends Module
if (isset($nbPeople['nb']) AND $nbPeople['nb'] > 0) if (isset($nbPeople['nb']) AND $nbPeople['nb'] > 0)
$this->context->smarty->assign('nb_people', (int)($nbPeople['nb'])); $this->context->smarty->assign('nb_people', (int)($nbPeople['nb']));
} }
/* Then, we try to display last sale */ /* Then, we try to display last sale */
if (Configuration::get('PS_PTOOLTIP_DATE_ORDER')) if (Configuration::get('PS_PTOOLTIP_DATE_ORDER'))
{ {
$days = (int)(Configuration::get('PS_PTOOLTIP_DAYS')); $days = (int)(Configuration::get('PS_PTOOLTIP_DAYS'));
$date = strftime('%Y-%m-%d' , strtotime('-'.(int)($days).' day')); $date = strftime('%Y-%m-%d' , strtotime('-'.(int)($days).' day'));
$order = Db::getInstance(_PS_USE_SQL_SLAVE_)->getRow(' $order = Db::getInstance(_PS_USE_SQL_SLAVE_)->getRow('
SELECT o.date_add SELECT o.date_add
FROM '._DB_PREFIX_.'order_detail od FROM '._DB_PREFIX_.'order_detail od
LEFT JOIN '._DB_PREFIX_.'orders o ON (od.id_order = o.id_order) LEFT JOIN '._DB_PREFIX_.'orders o ON (od.id_order = o.id_order)
WHERE od.product_id = '.(int)($id_product).' AND o.date_add >= \''.pSQL($date).'\' WHERE od.product_id = '.(int)($id_product).' AND o.date_add >= \''.pSQL($date).'\'
ORDER BY o.date_add DESC'); ORDER BY o.date_add DESC');
if (isset($order['date_add']) && Validate::isDateFormat($order['date_add']) && $order['date_add'] != '0000-00-00 00:00:00') if (isset($order['date_add']) && Validate::isDateFormat($order['date_add']) && $order['date_add'] != '0000-00-00 00:00:00')
$this->context->smarty->assign('date_last_order', $order['date_add']); $this->context->smarty->assign('date_last_order', $order['date_add']);
else else
@@ -180,12 +180,12 @@ class ProductToolTip extends Module
SELECT cp.date_add SELECT cp.date_add
FROM '._DB_PREFIX_.'cart_product cp FROM '._DB_PREFIX_.'cart_product cp
WHERE cp.id_product = '.(int)($id_product)); WHERE cp.id_product = '.(int)($id_product));
if (isset($cart['date_add']) && Validate::isDateFormat($cart['date_add']) && $cart['date_add'] != '0000-00-00 00:00:00') if (isset($cart['date_add']) && Validate::isDateFormat($cart['date_add']) && $cart['date_add'] != '0000-00-00 00:00:00')
$this->context->smarty->assign('date_last_cart', $cart['date_add']); $this->context->smarty->assign('date_last_cart', $cart['date_add']);
} }
} }
} }
if ((isset($nbPeople['nb']) AND $nbPeople['nb'] > 0) OR isset($order['date_add']) OR isset($cart['date_add'])) if ((isset($nbPeople['nb']) AND $nbPeople['nb'] > 0) OR isset($order['date_add']) OR isset($cart['date_add']))
return $this->display(__FILE__, 'producttooltip.tpl'); return $this->display(__FILE__, 'producttooltip.tpl');