From e2e28c38c5299164e974bc4ff45c20ef3ad41fa3 Mon Sep 17 00:00:00 2001 From: Miguel Molina Date: Fri, 27 Feb 2015 15:48:10 -0800 Subject: [PATCH 1/3] Create data upgrade file --- .../data-upgrade-1.4.0-2.0.0.php | 55 +++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 src/app/code/community/Zendesk/Zendesk/data/zendesk_setup/data-upgrade-1.4.0-2.0.0.php diff --git a/src/app/code/community/Zendesk/Zendesk/data/zendesk_setup/data-upgrade-1.4.0-2.0.0.php b/src/app/code/community/Zendesk/Zendesk/data/zendesk_setup/data-upgrade-1.4.0-2.0.0.php new file mode 100644 index 00000000..63ed7e01 --- /dev/null +++ b/src/app/code/community/Zendesk/Zendesk/data/zendesk_setup/data-upgrade-1.4.0-2.0.0.php @@ -0,0 +1,55 @@ +deleteConfig('zendesk/features/feedback_tab_code'); + +// We won't check in our code whether to show or not the Feedback Tab +$config->deleteConfig('zendesk/features/feedback_tab_code_active'); + +// Retrieve the domain from the config settings +$domain = Mage::getStoreConfig('zendesk/general/domain'); + +if($domain) { + // We are activating the Web Widget by default + $config->saveConfig('zendesk/features/web_widget_code_active', 1); + + // The Web Widget code snippet, using the account zendesk domain from settings + $webWidgetSnippet=<< + + +EOJS; + + $config->saveConfig('zendesk/features/web_widget_code_snippet', $webWidgetSnippet); +} else { + // There is no domain on the settings, we can't activate the Web Widget + // The user should probably re-run the Setup from the Zendesk extension settings page + $config->saveConfig('zendesk/features/web_widget_code_active', 0); + $config->saveConfig('zendesk/features/web_widget_code_snippet', ''); +} From 0aa53aa63dee55dd74dd8913f5634b0a1ceeca6b Mon Sep 17 00:00:00 2001 From: Miguel Molina Date: Fri, 27 Feb 2015 16:13:27 -0800 Subject: [PATCH 2/3] Apply new 1.4.0 settings naming conventions --- .../data/zendesk_setup/data-upgrade-1.4.0-2.0.0.php | 12 ++++++------ .../code/community/Zendesk/Zendesk/etc/config.xml | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/app/code/community/Zendesk/Zendesk/data/zendesk_setup/data-upgrade-1.4.0-2.0.0.php b/src/app/code/community/Zendesk/Zendesk/data/zendesk_setup/data-upgrade-1.4.0-2.0.0.php index 63ed7e01..cdd75d25 100644 --- a/src/app/code/community/Zendesk/Zendesk/data/zendesk_setup/data-upgrade-1.4.0-2.0.0.php +++ b/src/app/code/community/Zendesk/Zendesk/data/zendesk_setup/data-upgrade-1.4.0-2.0.0.php @@ -27,17 +27,17 @@ $config = new Mage_Core_Model_Config(); // We won't need the Feedback Tab code snippet anymore -$config->deleteConfig('zendesk/features/feedback_tab_code'); +$config->deleteConfig('zendesk/frontend_features/feedback_tab_code'); // We won't check in our code whether to show or not the Feedback Tab -$config->deleteConfig('zendesk/features/feedback_tab_code_active'); +$config->deleteConfig('zendesk/frontend_features/feedback_tab_code_active'); // Retrieve the domain from the config settings $domain = Mage::getStoreConfig('zendesk/general/domain'); if($domain) { // We are activating the Web Widget by default - $config->saveConfig('zendesk/features/web_widget_code_active', 1); + $config->saveConfig('zendesk/frontend_features/web_widget_code_active', 1); // The Web Widget code snippet, using the account zendesk domain from settings $webWidgetSnippet=<< EOJS; - $config->saveConfig('zendesk/features/web_widget_code_snippet', $webWidgetSnippet); + $config->saveConfig('zendesk/frontend_features/web_widget_code_snippet', $webWidgetSnippet); } else { // There is no domain on the settings, we can't activate the Web Widget // The user should probably re-run the Setup from the Zendesk extension settings page - $config->saveConfig('zendesk/features/web_widget_code_active', 0); - $config->saveConfig('zendesk/features/web_widget_code_snippet', ''); + $config->saveConfig('zendesk/frontend_features/web_widget_code_active', 0); + $config->saveConfig('zendesk/frontend_features/web_widget_code_snippet', ''); } diff --git a/src/app/code/community/Zendesk/Zendesk/etc/config.xml b/src/app/code/community/Zendesk/Zendesk/etc/config.xml index 6501fb91..0d73b06a 100644 --- a/src/app/code/community/Zendesk/Zendesk/etc/config.xml +++ b/src/app/code/community/Zendesk/Zendesk/etc/config.xml @@ -250,7 +250,7 @@ 0 - 0 + 0 0 From 512c5de42b0ef408d7f0cff5c99bcca563ed93bd Mon Sep 17 00:00:00 2001 From: Miguel Molina Date: Fri, 27 Feb 2015 16:25:52 -0800 Subject: [PATCH 3/3] Remove duplicated "zendesk" string on JS snippet --- .../Zendesk/data/zendesk_setup/data-upgrade-1.4.0-2.0.0.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/code/community/Zendesk/Zendesk/data/zendesk_setup/data-upgrade-1.4.0-2.0.0.php b/src/app/code/community/Zendesk/Zendesk/data/zendesk_setup/data-upgrade-1.4.0-2.0.0.php index cdd75d25..1e7267dd 100644 --- a/src/app/code/community/Zendesk/Zendesk/data/zendesk_setup/data-upgrade-1.4.0-2.0.0.php +++ b/src/app/code/community/Zendesk/Zendesk/data/zendesk_setup/data-upgrade-1.4.0-2.0.0.php @@ -41,9 +41,9 @@ // The Web Widget code snippet, using the account zendesk domain from settings $webWidgetSnippet=<< + - + EOJS; $config->saveConfig('zendesk/frontend_features/web_widget_code_snippet', $webWidgetSnippet);