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

[+] Project : default theme added

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10862 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
mMarinetti
2011-12-02 15:24:40 +00:00
parent 43654ffba1
commit 9cc30dc3fe
431 changed files with 21629 additions and 1679 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/paypal/about.php
+2 -4
View File
@@ -1,6 +1,6 @@
<?php
/*
* 2007-2011 PrestaShop
* 2007-2011 PrestaShop
*
* NOTICE OF LICENSE
*
@@ -32,8 +32,6 @@ include(dirname(__FILE__).'/../../header.php');
$smarty->assign('iso_code', Tools::strtolower(Context::getContext()->language->iso_code));
require_once _PS_MODULE_DIR_.'paypal/paypal.php';
$paypal = new PayPal();
echo $paypal->display(dirname(__FILE__).'/paypal', 'about.tpl');
echo Module::display(dirname(__FILE__).'/paypal', 'about.tpl');
include(dirname(__FILE__).'/../../footer.php');
modules/paypal/paypal.php
+2 -2
View File
@@ -916,7 +916,7 @@ class PayPal extends PaymentModule
$method = 'Paypal Integrale';
else
$method = '';
$this->_html = $this->displayConfirmation($this->l('Settings updated').'<img src="http://api.prestashop.com/modules/paypal.png?email='.urlencode(Tools::getValue('email_paypal')).'&mode='.(Tools::getValue('sandbox_mode') ? 0 : 1).'&method='.urlencode($method).'" style="float:right" />');
$this->_html = $this->displayConfirmation($this->l('Settings updated').'<img src="http://www.prestashop.com/modules/paypal.png?email='.urlencode(Tools::getValue('email_paypal')).'&mode='.(Tools::getValue('sandbox_mode') ? 0 : 1).'&method='.urlencode($method).'" style="float:right" />');
}
else
{
@@ -1315,7 +1315,7 @@ class PayPal extends PaymentModule
return $domain;
}
public function display($file, $template, $cacheId = NULL, $compileId = NULL)
public static function display($file, $template, $cacheId = NULL, $compileId = NULL)
{
if (substr(_PS_VERSION_, 0, 3) != '1.3')
return parent::display($file, $template);