From 0e91352520e6c47d310d19f1f59100fb4de4a937 Mon Sep 17 00:00:00 2001 From: Damien Metzger Date: Fri, 11 Oct 2013 16:10:08 +0200 Subject: [PATCH 1/4] // Dashboard update --- install-dev/upgrade/php/moduleReinstaller.php | 36 ------------------- install-dev/upgrade/sql/1.6.0.1.sql | 22 +++++++++++- 2 files changed, 21 insertions(+), 37 deletions(-) delete mode 100644 install-dev/upgrade/php/moduleReinstaller.php diff --git a/install-dev/upgrade/php/moduleReinstaller.php b/install-dev/upgrade/php/moduleReinstaller.php deleted file mode 100644 index bcffce8e5..000000000 --- a/install-dev/upgrade/php/moduleReinstaller.php +++ /dev/null @@ -1,36 +0,0 @@ - -* @copyright 2007-2013 PrestaShop SA -* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -function moduleReinstaller($moduleName, $force = false) -{ - $module = Module::getInstanceByName($moduleName); - if (!is_object($module)) - die(Tools::displayError()); - if ($module->uninstall() OR $force) - return $module->install(); - return false; -} - diff --git a/install-dev/upgrade/sql/1.6.0.1.sql b/install-dev/upgrade/sql/1.6.0.1.sql index 58c5e5411..614a5b92f 100644 --- a/install-dev/upgrade/sql/1.6.0.1.sql +++ b/install-dev/upgrade/sql/1.6.0.1.sql @@ -32,4 +32,24 @@ CREATE TABLE `PREFIX_configuration_kpi_lang` ( UPDATE `PREFIX_configuration` SET `value`='-' WHERE `name` = 'PS_ATTRIBUTE_ANCHOR_SEPARATOR'; -UPDATE `PREFIX_tab` SET class_name = 'AdminDashboard' WHERE class_name = 'AdminHome'; +UPDATE `PREFIX_tab` SET class_name = 'AdminDashboard', id_parent = 0, active = 1, module = "" WHERE class_name = 'AdminHome'; + +INSERT INTO `PREFIX_module` (`name`, `active`, `version`) +VALUES ('dashactivity', '1', '0.1'), ('dashtrends', '1', '0.1'), ('dashproducts', '1', '0.1'); + +INSERT INTO `PREFIX_module_access` (`id_profile`, `id_module`, `view`, `configure`) ( + SELECT p.id_profile, m.id_module, 1, 1 FROM `PREFIX_module` m, `PREFIX_profile` p WHERE m.name IN ('dashactivity', 'dashtrends', 'dashproducts') +); + +INSERT INTO `PREFIX_module_shop` (`id_module`, `id_shop`) ( + SELECT m.id_module, s.id_shop FROM `PREFIX_module` m, `PREFIX_shop` s WHERE m.name IN ('dashactivity', 'dashtrends', 'dashproducts') +); + +INSERT INTO `PREFIX_hook` (`name`, `title`, `position`, `live_edit`) VALUES +('dashboardZoneOne', 'dashboardZoneOne', 1, 0), +('dashboardZoneTwo', 'dashboardZoneTwo', 1, 0), +('dashboardData', 'dashboardData', 0, 0); + +INSERT INTO `PREFIX_hook_module` (`id_module`, `id_shop`, `id_hook`, `position`) VALUES ( + SELECT m.id_module, s.id_shop, h.id_hook, 1 FROM `PREFIX_module` m, `PREFIX_shop` s, `PREFIX_hook` h WHERE m.name IN ('dashactivity', 'dashtrends', 'dashproducts') AND h.name IN ('dashboardZoneOne', 'dashboardZoneTwo', 'dashboardData') +); From d2ecdfb93d1a224dc97afff8c0c0409c7ac5d83f Mon Sep 17 00:00:00 2001 From: Damien Metzger Date: Fri, 11 Oct 2013 16:18:37 +0200 Subject: [PATCH 2/4] // fix dashboard modules upgrade --- install-dev/upgrade/sql/1.6.0.1.sql | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/install-dev/upgrade/sql/1.6.0.1.sql b/install-dev/upgrade/sql/1.6.0.1.sql index 614a5b92f..03e72937c 100644 --- a/install-dev/upgrade/sql/1.6.0.1.sql +++ b/install-dev/upgrade/sql/1.6.0.1.sql @@ -50,6 +50,15 @@ INSERT INTO `PREFIX_hook` (`name`, `title`, `position`, `live_edit`) VALUES ('dashboardZoneTwo', 'dashboardZoneTwo', 1, 0), ('dashboardData', 'dashboardData', 0, 0); -INSERT INTO `PREFIX_hook_module` (`id_module`, `id_shop`, `id_hook`, `position`) VALUES ( - SELECT m.id_module, s.id_shop, h.id_hook, 1 FROM `PREFIX_module` m, `PREFIX_shop` s, `PREFIX_hook` h WHERE m.name IN ('dashactivity', 'dashtrends', 'dashproducts') AND h.name IN ('dashboardZoneOne', 'dashboardZoneTwo', 'dashboardData') +INSERT INTO `PREFIX_hook_module` (`id_module`, `id_shop`, `id_hook`, `position`) ( + SELECT m.id_module, s.id_shop, h.id_hook, 0 FROM `PREFIX_module` m, `PREFIX_shop` s, `PREFIX_hook` h WHERE m.name IN ('dashactivity', 'dashtrends', 'dashproducts') AND h.name IN ('dashboardData') +); +INSERT INTO `PREFIX_hook_module` (`id_module`, `id_shop`, `id_hook`, `position`) ( + SELECT m.id_module, s.id_shop, h.id_hook, 1 FROM `PREFIX_module` m, `PREFIX_shop` s, `PREFIX_hook` h WHERE m.name IN ('dashactivity') AND h.name IN ('dashboardZoneOne') +); +INSERT INTO `PREFIX_hook_module` (`id_module`, `id_shop`, `id_hook`, `position`) ( + SELECT m.id_module, s.id_shop, h.id_hook, 1 FROM `PREFIX_module` m, `PREFIX_shop` s, `PREFIX_hook` h WHERE m.name IN ('dashtrends') AND h.name IN ('dashboardZoneTwo') +); +INSERT INTO `PREFIX_hook_module` (`id_module`, `id_shop`, `id_hook`, `position`) ( + SELECT m.id_module, s.id_shop, h.id_hook, 2 FROM `PREFIX_module` m, `PREFIX_shop` s, `PREFIX_hook` h WHERE m.name IN ('dashproducts') AND h.name IN ('dashboardZoneTwo') ); From eff292731f2232ed1edeae5a5d92f4e6066f398c Mon Sep 17 00:00:00 2001 From: Damien Metzger Date: Fri, 11 Oct 2013 16:35:49 +0200 Subject: [PATCH 3/4] // Fixed typo --- cache/class_index.php | 2 ++ controllers/admin/AdminStatsController.php | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/cache/class_index.php b/cache/class_index.php index 3b3a1df86..767ee17c2 100644 --- a/cache/class_index.php +++ b/cache/class_index.php @@ -359,6 +359,8 @@ 'HelpAccess' => '', 'HelpAccessCore' => 'classes/HelpAccess.php', 'Helper' => '', + 'HelperCalendar' => '', + 'HelperCalendarCore' => 'classes/helper/HelperCalendar.php', 'HelperCore' => 'classes/helper/Helper.php', 'HelperForm' => '', 'HelperFormCore' => 'classes/helper/HelperForm.php', diff --git a/controllers/admin/AdminStatsController.php b/controllers/admin/AdminStatsController.php index 82391bdfa..e04821964 100644 --- a/controllers/admin/AdminStatsController.php +++ b/controllers/admin/AdminStatsController.php @@ -544,15 +544,15 @@ class AdminStatsControllerCore extends AdminStatsTabController $value = Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue(' SELECT COUNT(*) FROM `'._DB_PREFIX_.'customer` c - '.Shop::addSqlRestriction().' - WHERE active = 1'); + WHERE active = 1 + '.Shop::addSqlRestriction()); if ($value) { $orders = Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue(' SELECT COUNT(*) FROM `'._DB_PREFIX_.'orders` o - '.Shop::addSqlRestriction().' - WHERE valid = 1'); + WHERE valid = 1 + '.Shop::addSqlRestriction()); $value = round($orders / $value, 2); } From 18690e4b9a2fe6e586dca96c0f59f44f48b02fbc Mon Sep 17 00:00:00 2001 From: Jerome Nadaud Date: Fri, 11 Oct 2013 17:17:58 +0200 Subject: [PATCH 4/4] // Adding update for customer message --- install-dev/upgrade/sql/1.6.0.1.sql | 2 ++ 1 file changed, 2 insertions(+) diff --git a/install-dev/upgrade/sql/1.6.0.1.sql b/install-dev/upgrade/sql/1.6.0.1.sql index 03e72937c..dd96716d9 100644 --- a/install-dev/upgrade/sql/1.6.0.1.sql +++ b/install-dev/upgrade/sql/1.6.0.1.sql @@ -62,3 +62,5 @@ INSERT INTO `PREFIX_hook_module` (`id_module`, `id_shop`, `id_hook`, `position`) INSERT INTO `PREFIX_hook_module` (`id_module`, `id_shop`, `id_hook`, `position`) ( SELECT m.id_module, s.id_shop, h.id_hook, 2 FROM `PREFIX_module` m, `PREFIX_shop` s, `PREFIX_hook` h WHERE m.name IN ('dashproducts') AND h.name IN ('dashboardZoneTwo') ); + +/* PHP:update_order_messages(); */; \ No newline at end of file