Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum
', 'Excepteur sint prestashop cupidatat non proident'), -(1, 2, 'Lorem ipsum dolor sit amet', 'Excepteur sint occaecat cupidatat non proident', 'Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum
', 'Lorem ipsum presta shop amet'), -(1, 3, 'Lorem ipsum dolor sit amet', 'Consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua', 'Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum
', 'Excepteur sint prestashop cupidatat non proident'), -(1, 4, 'Lorem ipsum dolor sit amet', 'Consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua', 'Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum
', 'Excepteur sint prestashop cupidatat non proident'), -(1, 5, 'Lorem ipsum dolor sit amet', 'Consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua', 'Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum
', 'Excepteur sint prestashop cupidatat non proident'); - INSERT INTO `PREFIX_range_price` (`id_range_price`, `id_carrier`, `delimiter1`, `delimiter2`) VALUES (1, 2, 0, 10000); INSERT INTO `PREFIX_range_weight` (`id_range_weight`, `id_carrier`, `delimiter1`, `delimiter2`) VALUES (1, 2, 0, 10000); INSERT INTO `PREFIX_delivery` (`id_delivery`, `id_range_price`, `id_range_weight`, `id_carrier`, `id_zone`, `price`) VALUES @@ -1650,3 +1625,66 @@ CREATE TABLE IF NOT EXISTS `PREFIX_newsletter` ( PRIMARY KEY(`id`) ) ENGINE=ENGINE_TYPE default CHARSET=utf8; + CREATE TABLE IF NOT EXISTS `PREFIX_homeslider` ( + `id_slide` int(10) unsigned NOT NULL AUTO_INCREMENT, + `id_shop` int(10) unsigned NOT NULL, + PRIMARY KEY (`id_slide`, `id_shop`) + ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=UTF8; + + CREATE TABLE IF NOT EXISTS `PREFIX_homeslider_slides` ( + `id_slide` int(10) unsigned NOT NULL AUTO_INCREMENT, + `position` int(10) unsigned NOT NULL DEFAULT '0', + `active` tinyint(1) unsigned NOT NULL DEFAULT '0', + PRIMARY KEY (`id_slide`) + ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=UTF8; + + CREATE TABLE IF NOT EXISTS `PREFIX_homeslider_slides_lang` ( + `id_slide` int(10) unsigned NOT NULL, + `id_lang` int(10) unsigned NOT NULL, + `title` varchar(255) NOT NULL, + `description` text NOT NULL, + `legend` varchar(255) NOT NULL, + `url` varchar(255) NOT NULL, + `image` varchar(255) NOT NULL, + PRIMARY KEY (`id_slide`,`id_lang`) + ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=UTF8; + +INSERT INTO `PREFIX_configuration` (name, value) +VALUES +("HOMESLIDER_WIDTH", "535"), +("HOMESLIDER_HEIGHT", "300"), +("HOMESLIDER_SPEED", "1300"), +("HOMESLIDER_PAUSE", "7700"); + +INSERT INTO `PREFIX_homeslider` (id_slide, id_shop) VALUES (1, 1),(2, 1), (3, 1), (4, 1), (5, 1); + +INSERT INTO `PREFIX_homeslider_slides` (id_slide, position, active) +VALUES (1, 1, 1), (2, 2, 1), (3, 3, 1), (4, 4, 1), (5, 5, 1); + +INSERT INTO `PREFIX_homeslider_slides_lang` (id_slide, id_lang, title, description, legend, url, image) VALUES +(1, 1, "Add Ons", "improve your e-commerce site by adding new features", "addons", "http://addons.prestashop.com", "sample-1.jpg"), +(2, 1, "PrestaBox", "Your e-shop ready to use open in 10 minutes", "prestabox", "http://www.prestabox.com", "sample-2.jpg"), +(3, 1, "Support", "contact PrestaShop Support team to help you in installing or configuring your software", "support", "http://support.prestashop.com", "sample-3.jpg"), +(4, 1, "PHP.net", "", "PrestaShop use PHP, the open-source technology", "http://www.php.net", "sample-4.jpg"), +(5, 1, "Smarty.net", "PrestaShop use the template engine Smarty (V3)", "Smarty", "http://www.smarty.net", "sample-5.jpg"), +(1, 2, "Add Ons", "improve your e-commerce site by adding new features", "addons", "http://addons.prestashop.com", "sample-1.jpg"), +(2, 2, "PrestaBox", "Your e-shop ready to use open in 10 minutes", "prestabox", "http://www.prestabox.com", "sample-2.jpg"), +(3, 2, "Support", "contact PrestaShop Support team to help you in installing or configuring your software", "support", "http://support.prestashop.com", "sample-3.jpg"), +(4, 2, "PHP.net", "", "PrestaShop use PHP, the open-source technology", "http://www.php.net", "sample-4.jpg"), +(5, 2, "Smarty.net", "PrestaShop use the template engine Smarty (V3)", "Smarty", "http://www.smarty.net", "sample-5.jpg"), +(1, 3, "Add Ons", "improve your e-commerce site by adding new features", "addons", "http://addons.prestashop.com", "sample-1.jpg"), +(2, 3, "PrestaBox", "Your e-shop ready to use open in 10 minutes", "prestabox", "http://www.prestabox.com", "sample-2.jpg"), +(3, 3, "Support", "contact PrestaShop Support team to help you in installing or configuring your software", "support", "http://support.prestashop.com", "sample-3.jpg"), +(4, 3, "PHP.net", "", "PrestaShop use PHP, the open-source technology", "http://www.php.net", "sample-4.jpg"), +(5, 3, "Smarty.net", "PrestaShop use the template engine Smarty (V3)", "Smarty", "http://www.smarty.net", "sample-5.jpg"), +(1, 4, "Add Ons", "improve your e-commerce site by adding new features", "addons", "http://addons.prestashop.com", "sample-1.jpg"), +(2, 4, "PrestaBox", "Your e-shop ready to use open in 10 minutes", "prestabox", "http://www.prestabox.com", "sample-2.jpg"), +(3, 4, "Support", "contact PrestaShop Support team to help you in installing or configuring your software", "support", "http://support.prestashop.com", "sample-3.jpg"), +(4, 4, "PHP.net", "", "PrestaShop use PHP, the open-source technology", "http://www.php.net", "sample-4.jpg"), +(5, 4, "Smarty.net", "PrestaShop use the template engine Smarty (V3)", "Smarty", "http://www.smarty.net", "sample-5.jpg"), +(1, 5, "Add Ons", "improve your e-commerce site by adding new features", "addons", "http://addons.prestashop.com", "sample-1.jpg"), +(2, 5, "PrestaBox", "Your e-shop ready to use open in 10 minutes", "prestabox", "http://www.prestabox.com", "sample-2.jpg"), +(3, 5, "Support", "contact PrestaShop Support team to help you in installing or configuring your software", "support", "http://support.prestashop.com", "sample-3.jpg"), +(4, 5, "PHP.net", "", "PrestaShop use PHP, the open-source technology", "http://www.php.net", "sample-4.jpg"), +(5, 5, "Smarty.net", "PrestaShop use the template engine Smarty (V3)", "Smarty", "http://www.smarty.net", "sample-5.jpg"); + diff --git a/modules/blocksupplier/blocksupplier.php b/modules/blocksupplier/blocksupplier.php index 668b3d98f..80c6b77ec 100644 --- a/modules/blocksupplier/blocksupplier.php +++ b/modules/blocksupplier/blocksupplier.php @@ -48,9 +48,9 @@ class BlockSupplier extends Module { if (!parent::install()) return false; - if (!$this->registerHook('leftColumn')) + if (!$this->registerHook('displayLeftColumn')) return false; - if (!$this->registerHook('header')) + if (!$this->registerHook('displayHeader')) return false; Configuration::updateValue('SUPPLIER_DISPLAY_TEXT', true); Configuration::updateValue('SUPPLIER_DISPLAY_TEXT_NB', 5); diff --git a/modules/homeslider/homeslider.php b/modules/homeslider/homeslider.php index 36ae4b757..1a4d8fec5 100644 --- a/modules/homeslider/homeslider.php +++ b/modules/homeslider/homeslider.php @@ -57,10 +57,10 @@ class HomeSlider extends Module public function install() { /* Adds Module */ - if (parent::install() && $this->registerHook('home') && $this->registerHook('backOfficeTop') && $this->registerHook('header')) + if (parent::install() && $this->registerHook('displayHome') && $this->registerHook('backOfficeTop') && $this->registerHook('displayHeader')) { /* Sets up configuration */ - $res = Configuration::updateValue('HOMESLIDER_WIDTH', '550'); + $res = Configuration::updateValue('HOMESLIDER_WIDTH', '535'); $res &= Configuration::updateValue('HOMESLIDER_HEIGHT', '300'); $res &= Configuration::updateValue('HOMESLIDER_SPEED', '1300'); $res &= Configuration::updateValue('HOMESLIDER_PAUSE', '7700'); @@ -90,7 +90,7 @@ class HomeSlider extends Module protected function createTables() { /* Slides */ - $res = Db::getInstance()->execute(' + $res = (bool)Db::getInstance()->execute(' CREATE TABLE IF NOT EXISTS `'._DB_PREFIX_.'homeslider` ( `id_slide` int(10) unsigned NOT NULL AUTO_INCREMENT, `id_shop` int(10) unsigned NOT NULL, @@ -650,14 +650,14 @@ class HomeSlider extends Module hss.`active`, hssl.`title`, hssl.`url`, - hssl.`legend` + hssl.`legend`, + hssl.`description` FROM '._DB_PREFIX_.'homeslider hs LEFT JOIN '._DB_PREFIX_.'homeslider_slides hss ON (hs.id_slide = hss.id_slide) LEFT JOIN '._DB_PREFIX_.'homeslider_slides_lang hssl ON (hssl.id_slide = hs.id_slide) - WHERE id_shop = '.(int)$id_shop.' OR id_shop = 0 + WHERE (id_shop = '.(int)$id_shop.' OR id_shop = 1) AND hssl.id_lang = '.(int)$id_lang. ($active ? ' AND hss.`active` = 1' : ' ').' - GROUP BY hs.id_slide ORDER BY hss.position'); } diff --git a/modules/homeslider/homeslider.tpl b/modules/homeslider/homeslider.tpl index bf36d6265..0f0bef762 100644 --- a/modules/homeslider/homeslider.tpl +++ b/modules/homeslider/homeslider.tpl @@ -10,9 +10,9 @@