diff --git a/install-new/classes/xmlLoader.php b/install-new/classes/xmlLoader.php index 9cc475d83..d829774ea 100644 --- a/install-new/classes/xmlLoader.php +++ b/install-new/classes/xmlLoader.php @@ -433,7 +433,7 @@ class InstallXmlLoader public function createEntityConfiguration(array $data, array $data_lang = array()) { if (!Configuration::get($data['name'])) - Configuration::updateValue($data['name'], ($data_lang) ? $data_lang['value'] : $data['value']); + Configuration::updateGlobalValue($data['name'], ($data_lang) ? $data_lang['value'] : $data['value']); return Configuration::getIdByName($data['name']); } diff --git a/install-new/controllers/http/process.php b/install-new/controllers/http/process.php index a71038e33..8fb134a58 100644 --- a/install-new/controllers/http/process.php +++ b/install-new/controllers/http/process.php @@ -65,6 +65,8 @@ class InstallControllerHttpProcess extends InstallControllerHttp $this->processInstallModules(); else if (Tools::getValue('installFixtures')) $this->processInstallFixtures(); + else if (Tools::getValue('installTheme')) + $this->processInstallTheme(); else if (Tools::getValue('preactivation')) $this->processPreactivation(); } @@ -98,6 +100,7 @@ class InstallControllerHttpProcess extends InstallControllerHttp { $this->initializeContext(); + // @todo remove true in populateDatabase for 1.5.0 RC version if (!$this->model_install->populateDatabase(true) || $this->model_install->getErrors()) $this->ajaxJsonAnswer(false, $this->model_install->getErrors()); $this->session->xml_loader_ids = $this->model_install->xml_loader_ids; @@ -176,6 +179,20 @@ class InstallControllerHttpProcess extends InstallControllerHttp $this->ajaxJsonAnswer(true); } + /** + * PROCESS : installTheme + * Install theme + */ + public function processInstallTheme() + { + $this->initializeContext(); + + $this->model_install->installTheme(); + if ($this->model_install->getErrors()) + $this->ajaxJsonAnswer(false, $this->model_install->getErrors()); + $this->ajaxJsonAnswer(true); + } + /** * PROCESS : preactivation * (currently not used) @@ -212,6 +229,7 @@ class InstallControllerHttpProcess extends InstallControllerHttp 'configureShop', 'installModules', 'installFixtures', + 'installTheme', //'preactivation', ); $this->displayTemplate('process'); diff --git a/install-new/data/theme.sql b/install-new/data/theme.sql new file mode 100644 index 000000000..7b3e1b3ec --- /dev/null +++ b/install-new/data/theme.sql @@ -0,0 +1,210 @@ +SET NAMES 'utf8'; + +INSERT INTO `ps_homeslider` (id_homeslider_slides, id_shop) VALUES (1, 1),(2, 1), (3, 1), (4, 1), (5, 1); + +INSERT INTO `ps_homeslider_slides` (id_homeslider_slides, position, active) +VALUES (1, 1, 1), (2, 2, 1), (3, 3, 1), (4, 4, 1), (5, 5, 1); + +INSERT INTO `ps_homeslider_slides_lang` (id_homeslider_slides, id_lang, title, description, legend, url, image) VALUES +(1, 1, "Sample 1", "This is a sample picture", "sample-1", "http://www.prestashop.com", "sample-1.jpg"), +(2, 1, "Sample 2", "This is a sample picture", "sample-2", "http://www.prestashop.com", "sample-2.jpg"), +(3, 1, "Sample 3", "This is a sample picture", "sample-3", "http://www.prestashop.com", "sample-3.jpg"), +(4, 1, "Sample 4", "This is a sample picture", "sample-4", "http://www.prestashop.com", "sample-4.jpg"), +(5, 1, "Sample 5", "This is a sample picture", "sample-5", "http://www.prestashop.com", "sample-5.jpg"), +(1, 2, "Sample 1", "This is a sample picture", "sample-1", "http://www.prestashop.com", "sample-1.jpg"), +(2, 2, "Sample 2", "This is a sample picture", "sample-2", "http://www.prestashop.com", "sample-2.jpg"), +(3, 2, "Sample 3", "This is a sample picture", "sample-3", "http://www.prestashop.com", "sample-3.jpg"), +(4, 2, "Sample 4", "This is a sample picture", "sample-4", "http://www.prestashop.com", "sample-4.jpg"), +(5, 2, "Sample 5", "This is a sample picture", "sample-5", "http://www.prestashop.com", "sample-5.jpg"), +(1, 3, "Sample 1", "This is a sample picture", "sample-1", "http://www.prestashop.com", "sample-1.jpg"), +(2, 3, "Sample 2", "This is a sample picture", "sample-2", "http://www.prestashop.com", "sample-2.jpg"), +(3, 3, "Sample 3", "This is a sample picture", "sample-3", "http://www.prestashop.com", "sample-3.jpg"), +(4, 3, "Sample 4", "This is a sample picture", "sample-4", "http://www.prestashop.com", "sample-4.jpg"), +(5, 3, "Sample 5", "This is a sample picture", "sample-5", "http://www.prestashop.com", "sample-5.jpg"), +(1, 4, "Sample 1", "This is a sample picture", "sample-1", "http://www.prestashop.com", "sample-1.jpg"), +(2, 4, "Sample 2", "This is a sample picture", "sample-2", "http://www.prestashop.com", "sample-2.jpg"), +(3, 4, "Sample 3", "This is a sample picture", "sample-3", "http://www.prestashop.com", "sample-3.jpg"), +(4, 4, "Sample 4", "This is a sample picture", "sample-4", "http://www.prestashop.com", "sample-4.jpg"), +(5, 4, "Sample 5", "This is a sample picture", "sample-5", "http://www.prestashop.com", "sample-5.jpg"), +(1, 5, "Sample 1", "This is a sample picture", "sample-1", "http://www.prestashop.com", "sample-1.jpg"), +(2, 5, "Sample 2", "This is a sample picture", "sample-2", "http://www.prestashop.com", "sample-2.jpg"), +(3, 5, "Sample 3", "This is a sample picture", "sample-3", "http://www.prestashop.com", "sample-3.jpg"), +(4, 5, "Sample 4", "This is a sample picture", "sample-4", "http://www.prestashop.com", "sample-4.jpg"), +(5, 5, "Sample 5", "This is a sample picture", "sample-5", "http://www.prestashop.com", "sample-5.jpg"); + + +UPDATE `PREFIX_configuration` SET value = '1' WHERE name = 'PS_CONDITIONS'; +UPDATE `PREFIX_configuration` SET value = '10' WHERE name = 'PS_PRODUCTS_PER_PAGE'; +UPDATE `PREFIX_configuration` SET value = '0' WHERE name = 'PS_PRODUCTS_ORDER_WAY'; +UPDATE `PREFIX_configuration` SET value = '4' WHERE name = 'PS_PRODUCTS_ORDER_BY'; +UPDATE `PREFIX_configuration` SET value = '1' WHERE name = 'PS_DISPLAY_QTIES'; +UPDATE `PREFIX_configuration` SET value = '20' WHERE name = 'PS_NB_DAYS_NEW_PRODUCT'; +UPDATE `PREFIX_configuration` SET value = '1' WHERE name = 'PS_BLOCK_CART_AJAX'; +UPDATE `PREFIX_configuration` SET value = '131072' WHERE name = 'PS_PRODUCT_PICTURE_MAX_SIZE'; +UPDATE `PREFIX_configuration` SET value = '64' WHERE name = 'PS_PRODUCT_PICTURE_WIDTH'; +UPDATE `PREFIX_configuration` SET value = '64' WHERE name = 'PS_PRODUCT_PICTURE_HEIGHT'; +UPDATE `PREFIX_configuration` SET value = '3' WHERE name = 'PS_SEARCH_MINWORDLEN'; +UPDATE `PREFIX_configuration` SET value = '6' WHERE name = 'PS_SEARCH_WEIGHT_PNAME'; +UPDATE `PREFIX_configuration` SET value = '10' WHERE name = 'PS_SEARCH_WEIGHT_REF'; +UPDATE `PREFIX_configuration` SET value = '1' WHERE name = 'PS_SEARCH_WEIGHT_SHORTDESC'; +UPDATE `PREFIX_configuration` SET value = '1' WHERE name = 'PS_SEARCH_WEIGHT_DESC'; +UPDATE `PREFIX_configuration` SET value = '3' WHERE name = 'PS_SEARCH_WEIGHT_CNAME'; +UPDATE `PREFIX_configuration` SET value = '3' WHERE name = 'PS_SEARCH_WEIGHT_MNAME'; +UPDATE `PREFIX_configuration` SET value = '4' WHERE name = 'PS_SEARCH_WEIGHT_TAG'; +UPDATE `PREFIX_configuration` SET value = '2' WHERE name = 'PS_SEARCH_WEIGHT_ATTRIBUTE'; +UPDATE `PREFIX_configuration` SET value = '2' WHERE name = 'PS_SEARCH_WEIGHT_FEATURE'; +UPDATE `PREFIX_configuration` SET value = '1' WHERE name = 'PS_SEARCH_AJAX'; +UPDATE `PREFIX_configuration` SET value = '0' WHERE name = 'PS_DISPLAY_JQZOOM'; +UPDATE `PREFIX_configuration` SET value = '0' WHERE name = 'PS_BLOCK_BESTSELLERS_DISPLAY'; +UPDATE `PREFIX_configuration` SET value = '0' WHERE name = 'PS_BLOCK_NEWPRODUCTS_DISPLAY'; +UPDATE `PREFIX_configuration` SET value = '0' WHERE name = 'PS_BLOCK_SPECIALS_DISPLAY'; +UPDATE `PREFIX_configuration` SET value = '0' WHERE name = 'PS_TAX_DISPLAY'; +UPDATE `PREFIX_configuration` SET value = '1' WHERE name = 'PS_STORES_DISPLAY_CMS'; +UPDATE `PREFIX_configuration` SET value = '1' WHERE name = 'PS_STORES_DISPLAY_FOOTER'; +UPDATE `PREFIX_configuration` SET value = '224' WHERE name = 'SHOP_LOGO_WIDTH'; +UPDATE `PREFIX_configuration` SET value = '73' WHERE name = 'SHOP_LOGO_HEIGHT'; +UPDATE `PREFIX_configuration` SET value = '1' WHERE name = 'PS_DISPLAY_SUPPLIERS'; +UPDATE `PREFIX_configuration` SET value = '1' WHERE name = 'PS_LEGACY_IMAGES'; +UPDATE `PREFIX_configuration` SET value = 'jpg' WHERE name = 'PS_IMAGE_QUALITY'; +UPDATE `PREFIX_configuration` SET value = '7' WHERE name = 'PS_PNG_QUALITY'; +UPDATE `PREFIX_configuration` SET value = '90' WHERE name = 'PS_JPEG_QUALITY'; +UPDATE `PREFIX_configuration` SET value = '2' WHERE name = 'PRODUCTS_VIEWED_NBR'; +UPDATE `PREFIX_configuration` SET value = '1' WHERE name = 'BLOCK_CATEG_DHTML'; +UPDATE `PREFIX_configuration` SET value = '3' WHERE name = 'BLOCK_CATEG_MAX_DEPTH'; +UPDATE `PREFIX_configuration` SET value = '1' WHERE name = 'MANUFACTURER_DISPLAY_FORM'; +UPDATE `PREFIX_configuration` SET value = '1' WHERE name = 'MANUFACTURER_DISPLAY_TEXT'; +UPDATE `PREFIX_configuration` SET value = '5' WHERE name = 'MANUFACTURER_DISPLAY_TEXT_NB'; +UPDATE `PREFIX_configuration` SET value = '5' WHERE name = 'NEW_PRODUCTS_NBR'; +UPDATE `PREFIX_configuration` SET value = '10' WHERE name = 'BLOCKTAGS_NBR'; +UPDATE `PREFIX_configuration` SET value = '0_3|0_4' WHERE name = 'FOOTER_CMS'; +UPDATE `PREFIX_configuration` SET value = '0_3|0_4' WHERE name = 'FOOTER_BLOCK_ACTIVATION'; +UPDATE `PREFIX_configuration` SET value = '1' WHERE name = 'FOOTER_POWEREDBY'; +UPDATE `PREFIX_configuration` SET value = '0' WHERE name = 'BLOCKADVERT_LINK'; +UPDATE `PREFIX_configuration` SET value = 'store.jpg' WHERE name = 'BLOCKSTORE_IMG'; +UPDATE `PREFIX_configuration` SET value = 'jpg' WHERE name = 'BLOCKADVERT_IMG_EXT'; +UPDATE `PREFIX_configuration` SET value = 'CAT2,CAT3,CAT4' WHERE name = 'MOD_BLOCKTOPMENU_ITEMS'; +UPDATE `PREFIX_configuration` SET value = '' WHERE name = 'MOD_BLOCKTOPMENU_SEARCH'; +UPDATE `PREFIX_configuration` SET value = 'http://www.facebook.com/prestashop' WHERE name = 'blocksocial_facebook'; +UPDATE `PREFIX_configuration` SET value = 'http://www.twitter.com/prestashop' WHERE name = 'blocksocial_twitter'; +UPDATE `PREFIX_configuration` SET value = 'RSS' WHERE name = 'blocksocial_rss'; +UPDATE `PREFIX_configuration` SET value = 'Prestashop' WHERE name = 'blockcontactinfos_company'; +UPDATE `PREFIX_configuration` SET value = '41, boulevard des capucines, 75002 Paris, France' WHERE name = 'blockcontactinfos_address'; +UPDATE `PREFIX_configuration` SET value = '+33 (0)1.40.18.30.04' WHERE name = 'blockcontactinfos_phone'; +UPDATE `PREFIX_configuration` SET value = 'pub@prestashop.com' WHERE name = 'blockcontactinfos_email'; +UPDATE `PREFIX_configuration` SET value = '+33 (0)1.40.18.30.04' WHERE name = 'blockcontact_telnumber'; +UPDATE `PREFIX_configuration` SET value = 'pub@prestashop.com' WHERE name = 'blockcontact_email'; +UPDATE `PREFIX_configuration` SET value = '1' WHERE name = 'SUPPLIER_DISPLAY_TEXT'; +UPDATE `PREFIX_configuration` SET value = '5' WHERE name = 'SUPPLIER_DISPLAY_TEXT_NB'; +UPDATE `PREFIX_configuration` SET value = '1' WHERE name = 'SUPPLIER_DISPLAY_FORM'; +UPDATE `PREFIX_configuration` SET value = '1' WHERE name = 'BLOCK_CATEG_NBR_COLUMN_FOOTER'; +UPDATE `PREFIX_configuration` SET value = '' WHERE name = 'UPGRADER_BACKUPDB_FILENAME'; +UPDATE `PREFIX_configuration` SET value = '' WHERE name = 'UPGRADER_BACKUPFILES_FILENAME'; +UPDATE `PREFIX_configuration` SET value = '5' WHERE name = 'blockreinsurance_nbblocks'; + + +TRUNCATE `ps_hook_module`; +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayPayment'), (SELECT id_module FROM `ps_module` WHERE name = 'cheque'), 1); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayPayment'), (SELECT id_module FROM `ps_module` WHERE name = 'bankwire'), 2); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayPayment'), (SELECT id_module FROM `ps_module` WHERE name = 'moneybookers'), 3); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayPaymentReturn'), (SELECT id_module FROM `ps_module` WHERE name = 'cheque'), 1); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayPaymentReturn'), (SELECT id_module FROM `ps_module` WHERE name = 'bankwire'), 2); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayPaymentReturn'), (SELECT id_module FROM `ps_module` WHERE name = 'moneybookers'), 3); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayRightColumn'), (SELECT id_module FROM `ps_module` WHERE name = 'blocknewproducts'), 2); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayRightColumn'), (SELECT id_module FROM `ps_module` WHERE name = 'blockspecials'), 4); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayRightColumn'), (SELECT id_module FROM `ps_module` WHERE name = 'blockcms'), 5); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayRightColumn'), (SELECT id_module FROM `ps_module` WHERE name = 'blockstore'), 6); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayRightColumn'), (SELECT id_module FROM `ps_module` WHERE name = 'blockcontact'), 7); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayRightColumn'), (SELECT id_module FROM `ps_module` WHERE name = 'blocknewsletter'), 8); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayLeftColumn'), (SELECT id_module FROM `ps_module` WHERE name = 'blocktags'), 2); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayLeftColumn'), (SELECT id_module FROM `ps_module` WHERE name = 'blockcategories'), 3); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayLeftColumn'), (SELECT id_module FROM `ps_module` WHERE name = 'blockviewed'), 4); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayLeftColumn'), (SELECT id_module FROM `ps_module` WHERE name = 'blocksupplier'), 5); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayLeftColumn'), (SELECT id_module FROM `ps_module` WHERE name = 'blockmanufacturer'), 5); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayLeftColumn'), (SELECT id_module FROM `ps_module` WHERE name = 'blockcms'), 6); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayLeftColumn'), (SELECT id_module FROM `ps_module` WHERE name = 'blockadvertising'), 7); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayLeftColumn'), (SELECT id_module FROM `ps_module` WHERE name = 'blockpaymentlogo'), 8); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayHome'), (SELECT id_module FROM `ps_module` WHERE name = 'homeslider'), 1); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayHome'), (SELECT id_module FROM `ps_module` WHERE name = 'homefeatured'), 2); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayHeader'), (SELECT id_module FROM `ps_module` WHERE name = 'blockpaymentlogo'), 2); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayHeader'), (SELECT id_module FROM `ps_module` WHERE name = 'blockpermanentlinks'), 3); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayHeader'), (SELECT id_module FROM `ps_module` WHERE name = 'blockviewed'), 4); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayHeader'), (SELECT id_module FROM `ps_module` WHERE name = 'blockcart'), 5); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayHeader'), (SELECT id_module FROM `ps_module` WHERE name = 'blocksocial'), 5); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayHeader'), (SELECT id_module FROM `ps_module` WHERE name = 'blockmyaccount'), 6); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayHeader'), (SELECT id_module FROM `ps_module` WHERE name = 'homeslider'), 7); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayHeader'), (SELECT id_module FROM `ps_module` WHERE name = 'blockcategories'), 9); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayHeader'), (SELECT id_module FROM `ps_module` WHERE name = 'blockspecials'), 10); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayHeader'), (SELECT id_module FROM `ps_module` WHERE name = 'blockcurrencies'), 11); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayHeader'), (SELECT id_module FROM `ps_module` WHERE name = 'blocknewproducts'), 12); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayHeader'), (SELECT id_module FROM `ps_module` WHERE name = 'blockuserinfo'), 13); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayHeader'), (SELECT id_module FROM `ps_module` WHERE name = 'blocklanguages'), 14); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayHeader'), (SELECT id_module FROM `ps_module` WHERE name = 'blockmanufacturer'), 15); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayHeader'), (SELECT id_module FROM `ps_module` WHERE name = 'blockcms'), 16); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayHeader'), (SELECT id_module FROM `ps_module` WHERE name = 'blockadvertising'), 17); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayHeader'), (SELECT id_module FROM `ps_module` WHERE name = 'blocktags'), 18); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayHeader'), (SELECT id_module FROM `ps_module` WHERE name = 'blockstore'), 19); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayHeader'), (SELECT id_module FROM `ps_module` WHERE name = 'blocksearch'), 20); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayHeader'), (SELECT id_module FROM `ps_module` WHERE name = 'blockcontactinfos'), 21); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayHeader'), (SELECT id_module FROM `ps_module` WHERE name = 'blocktopmenu'), 22); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayHeader'), (SELECT id_module FROM `ps_module` WHERE name = 'favoriteproducts'), 22); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayHeader'), (SELECT id_module FROM `ps_module` WHERE name = 'homefeatured'), 23); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayHeader'), (SELECT id_module FROM `ps_module` WHERE name = 'blocknewsletter'), 24); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayHeader'), (SELECT id_module FROM `ps_module` WHERE name = 'blockcontact'), 24); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayHeader'), (SELECT id_module FROM `ps_module` WHERE name = 'blocksupplier'), 25); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayHeader'), (SELECT id_module FROM `ps_module` WHERE name = 'feeder'), 26); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'actionAuthentication'), (SELECT id_module FROM `ps_module` WHERE name = 'statsdata'), 1); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayTop'), (SELECT id_module FROM `ps_module` WHERE name = 'blocklanguages'), 1); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayTop'), (SELECT id_module FROM `ps_module` WHERE name = 'blockcurrencies'), 2); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayTop'), (SELECT id_module FROM `ps_module` WHERE name = 'blockpermanentlinks'), 3); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayTop'), (SELECT id_module FROM `ps_module` WHERE name = 'blocksearch'), 4); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayTop'), (SELECT id_module FROM `ps_module` WHERE name = 'blockuserinfo'), 5); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayTop'), (SELECT id_module FROM `ps_module` WHERE name = 'blocktopmenu'), 6); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayTop'), (SELECT id_module FROM `ps_module` WHERE name = 'blockcart'), 7); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayTop'), (SELECT id_module FROM `ps_module` WHERE name = 'sekeywords'), 7); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayTop'), (SELECT id_module FROM `ps_module` WHERE name = 'pagesnotfound'), 8); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayAdminOrder'), (SELECT id_module FROM `ps_module` WHERE name = 'statsorigin'), 2); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayFooter'), (SELECT id_module FROM `ps_module` WHERE name = 'blockreinsurance'), 1); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayFooter'), (SELECT id_module FROM `ps_module` WHERE name = 'blockcategories'), 2); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayFooter'), (SELECT id_module FROM `ps_module` WHERE name = 'blockmyaccount'), 3); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayFooter'), (SELECT id_module FROM `ps_module` WHERE name = 'blockcms'), 4); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayFooter'), (SELECT id_module FROM `ps_module` WHERE name = 'blocksocial'), 5); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayFooter'), (SELECT id_module FROM `ps_module` WHERE name = 'blockcontactinfos'), 6); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayFooter'), (SELECT id_module FROM `ps_module` WHERE name = 'blocksharefb'), 7); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayFooter'), (SELECT id_module FROM `ps_module` WHERE name = 'statsdata'), 7); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'actionCustomerAccountAdd'), (SELECT id_module FROM `ps_module` WHERE name = 'statsdata'), 1); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayCustomerAccount'), (SELECT id_module FROM `ps_module` WHERE name = 'favoriteproducts'), 1); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayAdminStatsModules'), (SELECT id_module FROM `ps_module` WHERE name = 'statsvisits'), 1); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayAdminStatsModules'), (SELECT id_module FROM `ps_module` WHERE name = 'statssales'), 2); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayAdminStatsModules'), (SELECT id_module FROM `ps_module` WHERE name = 'statsregistrations'), 3); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayAdminStatsModules'), (SELECT id_module FROM `ps_module` WHERE name = 'statspersonalinfos'), 4); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayAdminStatsModules'), (SELECT id_module FROM `ps_module` WHERE name = 'statslive'), 5); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayAdminStatsModules'), (SELECT id_module FROM `ps_module` WHERE name = 'statsequipment'), 6); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayAdminStatsModules'), (SELECT id_module FROM `ps_module` WHERE name = 'statscatalog'), 7); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayAdminStatsModules'), (SELECT id_module FROM `ps_module` WHERE name = 'statsbestcustomers'), 8); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayAdminStatsModules'), (SELECT id_module FROM `ps_module` WHERE name = 'statsorigin'), 9); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayAdminStatsModules'), (SELECT id_module FROM `ps_module` WHERE name = 'pagesnotfound'), 10); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayAdminStatsModules'), (SELECT id_module FROM `ps_module` WHERE name = 'sekeywords'), 11); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayAdminStatsModules'), (SELECT id_module FROM `ps_module` WHERE name = 'statsproduct'), 12); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayAdminStatsModules'), (SELECT id_module FROM `ps_module` WHERE name = 'statsbestproducts'), 13); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayAdminStatsModules'), (SELECT id_module FROM `ps_module` WHERE name = 'statsbestvouchers'), 14); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayAdminStatsModules'), (SELECT id_module FROM `ps_module` WHERE name = 'statsbestcategories'), 15); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayAdminStatsModules'), (SELECT id_module FROM `ps_module` WHERE name = 'statsbestsuppliers'), 16); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayAdminStatsModules'), (SELECT id_module FROM `ps_module` WHERE name = 'statscarrier'), 17); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayAdminStatsModules'), (SELECT id_module FROM `ps_module` WHERE name = 'statsnewsletter'), 18); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayAdminStatsModules'), (SELECT id_module FROM `ps_module` WHERE name = 'statssearch'), 19); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayAdminStatsModules'), (SELECT id_module FROM `ps_module` WHERE name = 'statscheckup'), 20); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayAdminStatsModules'), (SELECT id_module FROM `ps_module` WHERE name = 'statsstock'), 21); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayAdminStatsModules'), (SELECT id_module FROM `ps_module` WHERE name = 'statsforecast'), 22); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayAdminStatsGraphEngine'), (SELECT id_module FROM `ps_module` WHERE name = 'graphvisifire'), 1); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayAdminStatsGraphEngine'), (SELECT id_module FROM `ps_module` WHERE name = 'graphxmlswfcharts'), 2); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayAdminStatsGraphEngine'), (SELECT id_module FROM `ps_module` WHERE name = 'graphgooglechart'), 3); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayAdminStatsGraphEngine'), (SELECT id_module FROM `ps_module` WHERE name = 'graphartichow'), 4); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayAdminStatsGridEngine'), (SELECT id_module FROM `ps_module` WHERE name = 'gridhtml'), 1); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayLeftColumnProduct'), (SELECT id_module FROM `ps_module` WHERE name = 'blocksharefb'), 1); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayLeftColumnProduct'), (SELECT id_module FROM `ps_module` WHERE name = 'favoriteproducts'), 2); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'actionSearch'), (SELECT id_module FROM `ps_module` WHERE name = 'statssearch'), 1); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'actionCategoryAdd'), (SELECT id_module FROM `ps_module` WHERE name = 'blockcategories'), 1); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'actionCategoryUpdate'), (SELECT id_module FROM `ps_module` WHERE name = 'blockcategories'), 1); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'actionCategoryDelete'), (SELECT id_module FROM `ps_module` WHERE name = 'blockcategories'), 1); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'actionAdminMetaSave'), (SELECT id_module FROM `ps_module` WHERE name = 'blockcategories'), 1); +INSERT IGNORE INTO `ps_hook_module` (`id_hook`, `id_module`, `position`) VALUES ((SELECT id_hook FROM `ps_hook` WHERE name = 'displayMyAccountBlock'), (SELECT id_module FROM `ps_module` WHERE name = 'favoriteproducts'), 1); diff --git a/install-new/langs/en/install.php b/install-new/langs/en/install.php index 788314d35..1fc45c91b 100644 --- a/install-new/langs/en/install.php +++ b/install-new/langs/en/install.php @@ -18,6 +18,7 @@ return array( 'process_step_configureShop' => 'Configure shop informations', 'process_step_installModules' => 'Install default modules', 'process_step_installFixtures' => 'Install demonstration data', + 'process_step_installTheme' => 'Install theme', 'process_step_preactivation' => 'Preactivate modules', ), ); \ No newline at end of file diff --git a/install-new/models/install.php b/install-new/models/install.php index 66897d6ed..a09cea8b4 100644 --- a/install-new/models/install.php +++ b/install-new/models/install.php @@ -147,7 +147,6 @@ class InstallModelInstall extends InstallAbstractModel { if ($clear_database) $this->clearDatabase(true); - $this->clearDatabase(true); // Install first shop if (!$this->createShop()) @@ -550,6 +549,7 @@ class InstallModelInstall extends InstallAbstractModel */ public function installFixtures() { + // @todo REMOVE THIS Db::getInstance()->delete('prefix_manufacturer'); Db::getInstance()->delete('prefix_manufacturer_lang'); Db::getInstance()->delete('prefix_supplier'); @@ -640,4 +640,25 @@ class InstallModelInstall extends InstallAbstractModel return true; } + + /** + * PROCESS : installTheme + * Install theme + */ + public function installTheme() + { + // @todo do a real install of the theme + $sql_loader = new InstallSqlLoader(); + $sql_loader->setMetaData(array( + 'PREFIX_' => _DB_PREFIX_, + 'ENGINE_TYPE' => _MYSQL_ENGINE_, + )); + + $sql_loader->parse_file(_PS_INSTALL_DATA_PATH_.'theme.sql', false); + if ($errors = $sql_loader->getErrors()) + { + $this->setError($errors); + return false; + } + } }