diff --git a/config/xml/themes/default.xml b/config/xml/themes/default.xml index 2a9cea57b..ab04ad89e 100644 --- a/config/xml/themes/default.xml +++ b/config/xml/themes/default.xml @@ -78,7 +78,6 @@ - diff --git a/controllers/admin/AdminThemesController.php b/controllers/admin/AdminThemesController.php index 919d60876..232f4a396 100644 --- a/controllers/admin/AdminThemesController.php +++ b/controllers/admin/AdminThemesController.php @@ -2129,7 +2129,6 @@ class AdminThemesControllerCore extends AdminController 'newsletter', 'pagesnotfound', 'productcomments', - 'productpaymentlogos', 'pscleaner', 'referralprogram', 'sekeywords', diff --git a/install/data/theme.sql b/install/data/theme.sql index 52f02f71a..905818e9e 100644 --- a/install/data/theme.sql +++ b/install/data/theme.sql @@ -157,9 +157,6 @@ SET @id_hook = (SELECT id_hook FROM `PREFIX_hook` WHERE name = 'displayProductBu UPDATE `PREFIX_hook_module` SET position = 1 WHERE id_module = (SELECT id_module FROM `PREFIX_module` WHERE name = 'blockwishlist') AND id_hook = @id_hook; -UPDATE `PREFIX_hook_module` SET position = 2 -WHERE id_module = (SELECT id_module FROM `PREFIX_module` WHERE name = 'productpaymentlogos') -AND id_hook = @id_hook; INSERT INTO `PREFIX_hook_module_exceptions` (`id_shop`, `id_module`, `id_hook`, `file_name`) ( diff --git a/modules/productpaymentlogos/CHANGELOG.txt b/modules/productpaymentlogos/CHANGELOG.txt deleted file mode 100644 index 73aac1ce3..000000000 --- a/modules/productpaymentlogos/CHANGELOG.txt +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------- -# V1.4.1 to V1.4.2 ------------------------------- - -## Improved/Changed Features: - -* [CO] :Images link are now generated dynamically - ------------------------------- -# V1.3.7 to V1.4.1 ------------------------------- - -## Improved/Changed Features: - -* [CO] : Updated with latest PS version - 1.6.1.23. - - -2014-04-17 11:53:57 +0200 // Version compliancy -2014-03-31 12:08:03 +0200 [-] MO : productpaymentlogos : if there is not a link specified in the configuration, no link will be displayed -2014-03-24 15:22:19 +0100 / MO productpaymentlogos : ps_versions_compliancy added -2014-03-20 14:35:30 +0100 Initial commit diff --git a/modules/productpaymentlogos/img/index.php b/modules/productpaymentlogos/img/index.php deleted file mode 100644 index 8761a003e..000000000 --- a/modules/productpaymentlogos/img/index.php +++ /dev/null @@ -1,35 +0,0 @@ - -* @copyright 2007-2016 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); -header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT'); - -header('Cache-Control: no-store, no-cache, must-revalidate'); -header('Cache-Control: post-check=0, pre-check=0', false); -header('Pragma: no-cache'); - -header('Location: ../'); -exit; \ No newline at end of file diff --git a/modules/productpaymentlogos/img/payment-logo.png b/modules/productpaymentlogos/img/payment-logo.png deleted file mode 100644 index c11e33de8..000000000 Binary files a/modules/productpaymentlogos/img/payment-logo.png and /dev/null differ diff --git a/modules/productpaymentlogos/index.php b/modules/productpaymentlogos/index.php deleted file mode 100644 index 8761a003e..000000000 --- a/modules/productpaymentlogos/index.php +++ /dev/null @@ -1,35 +0,0 @@ - -* @copyright 2007-2016 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); -header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT'); - -header('Cache-Control: no-store, no-cache, must-revalidate'); -header('Cache-Control: post-check=0, pre-check=0', false); -header('Pragma: no-cache'); - -header('Location: ../'); -exit; \ No newline at end of file diff --git a/modules/productpaymentlogos/logo.gif b/modules/productpaymentlogos/logo.gif deleted file mode 100644 index 659aace81..000000000 Binary files a/modules/productpaymentlogos/logo.gif and /dev/null differ diff --git a/modules/productpaymentlogos/logo.png b/modules/productpaymentlogos/logo.png deleted file mode 100644 index e1256c349..000000000 Binary files a/modules/productpaymentlogos/logo.png and /dev/null differ diff --git a/modules/productpaymentlogos/productpaymentlogos.php b/modules/productpaymentlogos/productpaymentlogos.php deleted file mode 100644 index a3ae323d7..000000000 --- a/modules/productpaymentlogos/productpaymentlogos.php +++ /dev/null @@ -1,197 +0,0 @@ - -* @copyright 2007-2016 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -if (!defined('_PS_VERSION_')) { - exit; -} - -class ProductPaymentLogos extends Module -{ - public function __construct() - { - $this->name = 'productpaymentlogos'; - $this->tab = 'front_office_features'; - $this->version = '1.4.2'; - $this->author = 'PrestaShop'; - $this->need_instance = 0; - - $this->bootstrap = true; - parent::__construct(); - - $this->displayName = $this->l('Product payment logos block'); - $this->description = $this->l('Displays the logos of the available payment systems on the product page.'); - - $this->ps_versions_compliancy = array('min' => '1.6', 'max' => '1.6.99.99'); - } - - public function install() - { - Configuration::updateValue('PRODUCTPAYMENTLOGOS_IMG', 'payment-logo.png'); - Configuration::updateValue('PRODUCTPAYMENTLOGOS_LINK', ''); - Configuration::updateValue('PRODUCTPAYMENTLOGOS_TITLE', ''); - - $this->_clearCache('productpaymentlogos.tpl'); - - return parent::install() && $this->registerHook('displayProductButtons') && $this->registerHook('header'); - } - - public function uninstall() - { - Configuration::deleteByName('PRODUCTPAYMENTLOGOS_IMG'); - Configuration::deleteByName('PRODUCTPAYMENTLOGOS_LINK'); - Configuration::deleteByName('PRODUCTPAYMENTLOGOS_TITLE'); - - return parent::uninstall(); - } - - public function hookDisplayProductButtons($params) - { - if (Configuration::get('PS_CATALOG_MODE')) { - return; - } - if (!$this->isCached('productpaymentlogos.tpl', $this->getCacheId())) { - $this->smarty->assign(array( - 'banner_img' => 'img/'.Configuration::get('PRODUCTPAYMENTLOGOS_IMG'), - 'banner_link' => Configuration::get('PRODUCTPAYMENTLOGOS_LINK'), - 'banner_title' => Configuration::get('PRODUCTPAYMENTLOGOS_TITLE') - )); - } - - return $this->display(__FILE__, 'productpaymentlogos.tpl', $this->getCacheId()); - } - - public function hookHeader($params) - { - if (Configuration::get('PS_CATALOG_MODE')) { - return; - } - $this->context->controller->addCSS($this->_path.'productpaymentlogos.css', 'all'); - } - - public function postProcess() - { - if (Tools::isSubmit('submitStoreConf')) { - Configuration::updateValue('PRODUCTPAYMENTLOGOS_LINK', Tools::getValue('PRODUCTPAYMENTLOGOS_LINK')); - Configuration::updateValue('PRODUCTPAYMENTLOGOS_TITLE', Tools::getValue('PRODUCTPAYMENTLOGOS_TITLE')); - if (isset($_FILES['PRODUCTPAYMENTLOGOS_IMG']) && isset($_FILES['PRODUCTPAYMENTLOGOS_IMG']['tmp_name']) && !empty($_FILES['PRODUCTPAYMENTLOGOS_IMG']['tmp_name'])) { - if (ImageManager::validateUpload($_FILES['PRODUCTPAYMENTLOGOS_IMG'], 4000000)) { - return $this->displayError($this->l('Invalid image')); - } else { - $ext = Tools::substr($_FILES['PRODUCTPAYMENTLOGOS_IMG']['name'], Tools::strrpos($_FILES['PRODUCTPAYMENTLOGOS_IMG']['name'], '.') + 1); - $file_name = md5($_FILES['PRODUCTPAYMENTLOGOS_IMG']['name']).'.'.$ext; - if (!ImageManager::resize($_FILES['PRODUCTPAYMENTLOGOS_IMG']['tmp_name'], dirname(__FILE__).'/img/'.$file_name)) { // by webkul use ImageManager for image upload - return $this->displayError($this->l('An error occurred while attempting to upload the file.')); - } else { - $file_path = dirname(__FILE__).'/img/'.Configuration::get('PRODUCTPAYMENTLOGOS_IMG'); - if (Configuration::hasContext('PRODUCTPAYMENTLOGOS_IMG', null, Shop::getContext()) && - Configuration::get('PRODUCTPAYMENTLOGOS_IMG') != $file_name && - Tools::deleteImage($file_path) //by webkul use deleteImage insted of unlink - ) { - Tools::deleteImage($file_path); //by webkul use deleteImage insted of unlink - } - - Configuration::updateValue('PRODUCTPAYMENTLOGOS_IMG', $file_name); - $this->_clearCache('productpaymentlogos.tpl'); - - Tools::redirectAdmin('index.php?tab=AdminModules&conf=6&configure='.$this->name.'&token='.Tools::getAdminTokenLite('AdminModules')); - } - } - } - $this->_clearCache('productpaymentlogos.tpl'); - } - - return ''; - } - - public function getContent() - { - return $this->postProcess().$this->renderForm(); - } - - public function renderForm() - { - $img_url = $this->context->link->getMediaLink(_MODULE_DIR_.$this->name.'/img/'.Configuration::get('PRODUCTPAYMENTLOGOS_IMG')); // by webkul get image using Media link - - $fields_form = array( - 'form' => array( - 'legend' => array( - 'title' => $this->l('Settings'), - 'icon' => 'icon-cogs' - ), - 'input' => array( - array( - 'type' => 'text', - 'label' => $this->l('Block heading'), - 'name' => 'PRODUCTPAYMENTLOGOS_TITLE', - 'desc' => $this->l('You can choose to add a heading above the logos.') - ), - array( - 'type' => 'file', - 'label' => $this->l('Block image'), - 'name' => 'PRODUCTPAYMENTLOGOS_IMG', - 'thumb' => $img_url, // by webkul - ), - array( - 'type' => 'text', - 'label' => $this->l('Image link'), - 'name' => 'PRODUCTPAYMENTLOGOS_LINK', - 'desc' => $this->l('You can either upload your own image using the form above, or link to it from the "Image link" option.') - ) - ), - 'submit' => array( - 'title' => $this->l('Save'), - ) - ), - ); - - $helper = new HelperForm(); - $helper->show_toolbar = false; - $helper->table = $this->table; - $lang = new Language((int)Configuration::get('PS_LANG_DEFAULT')); - $helper->default_form_language = $lang->id; - $helper->allow_employee_form_lang = Configuration::get('PS_BO_ALLOW_EMPLOYEE_FORM_LANG') ? Configuration::get('PS_BO_ALLOW_EMPLOYEE_FORM_LANG') : 0; - $helper->identifier = $this->identifier; - $helper->submit_action = 'submitStoreConf'; - $helper->currentIndex = $this->context->link->getAdminLink('AdminModules', false).'&configure='.$this->name.'&tab_module='.$this->tab.'&module_name='.$this->name; - $helper->token = Tools::getAdminTokenLite('AdminModules'); - $helper->tpl_vars = array( - 'fields_value' => $this->getConfigFieldsValues(), - 'languages' => $this->context->controller->getLanguages(), - 'id_language' => $this->context->language->id - ); - - return $helper->generateForm(array($fields_form)); - } - - public function getConfigFieldsValues() - { - return array( - 'PRODUCTPAYMENTLOGOS_IMG' => Tools::getValue('PRODUCTPAYMENTLOGOS_IMG', Configuration::get('PRODUCTPAYMENTLOGOS_IMG')), - 'PRODUCTPAYMENTLOGOS_LINK' => Tools::getValue('PRODUCTPAYMENTLOGOS_LINK', Configuration::get('PRODUCTPAYMENTLOGOS_LINK')), - 'PRODUCTPAYMENTLOGOS_TITLE' => Tools::getValue('PRODUCTPAYMENTLOGOS_TITLE', Configuration::get('PRODUCTPAYMENTLOGOS_TITLE')), - ); - } -} diff --git a/modules/productpaymentlogos/translations/index.php b/modules/productpaymentlogos/translations/index.php deleted file mode 100644 index e5064df41..000000000 --- a/modules/productpaymentlogos/translations/index.php +++ /dev/null @@ -1,35 +0,0 @@ - -* @copyright 2007-2016 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); -header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); - -header("Cache-Control: no-store, no-cache, must-revalidate"); -header("Cache-Control: post-check=0, pre-check=0", false); -header("Pragma: no-cache"); - -header("Location: ../"); -exit; \ No newline at end of file diff --git a/modules/productpaymentlogos/views/index.php b/modules/productpaymentlogos/views/index.php deleted file mode 100644 index 8761a003e..000000000 --- a/modules/productpaymentlogos/views/index.php +++ /dev/null @@ -1,35 +0,0 @@ - -* @copyright 2007-2016 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); -header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT'); - -header('Cache-Control: no-store, no-cache, must-revalidate'); -header('Cache-Control: post-check=0, pre-check=0', false); -header('Pragma: no-cache'); - -header('Location: ../'); -exit; \ No newline at end of file diff --git a/modules/productpaymentlogos/views/templates/hook/index.php b/modules/productpaymentlogos/views/templates/hook/index.php deleted file mode 100644 index 8761a003e..000000000 --- a/modules/productpaymentlogos/views/templates/hook/index.php +++ /dev/null @@ -1,35 +0,0 @@ - -* @copyright 2007-2016 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); -header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT'); - -header('Cache-Control: no-store, no-cache, must-revalidate'); -header('Cache-Control: post-check=0, pre-check=0', false); -header('Pragma: no-cache'); - -header('Location: ../'); -exit; \ No newline at end of file diff --git a/modules/productpaymentlogos/views/templates/hook/productpaymentlogos.tpl b/modules/productpaymentlogos/views/templates/hook/productpaymentlogos.tpl deleted file mode 100644 index 457844fdd..000000000 --- a/modules/productpaymentlogos/views/templates/hook/productpaymentlogos.tpl +++ /dev/null @@ -1,34 +0,0 @@ -{* -* 2007-2016 PrestaShop -* -* NOTICE OF LICENSE -* -* This source file is subject to the Academic Free License (AFL 3.0) -* that is bundled with this package in the file LICENSE.txt. -* It is also available through the world-wide-web at this URL: -* http://opensource.org/licenses/afl-3.0.php -* If you did not receive a copy of the license and are unable to -* obtain it through the world-wide-web, please send an email -* to license@prestashop.com so we can send you a copy immediately. -* -* DISCLAIMER -* -* Do not edit or add to this file if you wish to upgrade PrestaShop to newer -* versions in the future. If you wish to customize PrestaShop for your -* needs please refer to http://www.prestashop.com for more information. -* -* @author PrestaShop SA -* @copyright 2007-2016 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*} - -
-
-
{$banner_title|escape:'htmlall':'UTF-8'}
- {if $banner_link != ''}{/if} - {$banner_title|escape:'htmlall':'UTF-8'} - {if $banner_link != ''}{/if} -
-
- diff --git a/modules/productpaymentlogos/views/templates/index.php b/modules/productpaymentlogos/views/templates/index.php deleted file mode 100644 index 8761a003e..000000000 --- a/modules/productpaymentlogos/views/templates/index.php +++ /dev/null @@ -1,35 +0,0 @@ - -* @copyright 2007-2016 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); -header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT'); - -header('Cache-Control: no-store, no-cache, must-revalidate'); -header('Cache-Control: post-check=0, pre-check=0', false); -header('Pragma: no-cache'); - -header('Location: ../'); -exit; \ No newline at end of file