Skip to content

[CE-707] Replace Feedback Tab with Web Widget #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 4, 2015
Merged

[CE-707] Replace Feedback Tab with Web Widget #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ...nity/Zendesk/Zendesk/Block/Supporttab.php → ...unity/Zendesk/Zendesk/Block/webWidget.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* Copyright 2012 Zendesk.
* Copyright 2015 Zendesk.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -15,14 +15,14 @@
* limitations under the License.
*/

class Zendesk_Zendesk_Block_Supporttab extends Mage_Core_Block_Template
class Zendesk_Zendesk_Block_WebWidget extends Mage_Core_Block_Template
{
protected function _toHtml()
{
if(!Mage::getStoreConfig('zendesk/frontend_features/feedback_tab_code_active')) {
if(!Mage::getStoreConfig('zendesk/frontend_features/web_widget_code_active')) {
return '';
}

return Mage::getStoreConfig('zendesk/frontend_features/feedback_tab_code');
return Mage::getStoreConfig('zendesk/frontend_features/web_widget_code_snippet');
}
}
8 changes: 4 additions & 4 deletions src/app/code/community/Zendesk/Zendesk/controllers/ApiController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,12 +367,12 @@ public function finaliseAction()
}
}

if(isset($data['feedback_tab'])) {
$configUpdates['zendesk/frontend_features/feedback_tab_code_active'] = ($data['feedback_tab'] === 'true');
if(isset($data['web_widget_code_active'])) {
$configUpdates['zendesk/frontend_features/web_widget_code_active'] = ($data['web_widget_code_active'] === 'true');
}

if(isset($data['feedback_tab_html'])) {
$configUpdates['zendesk/frontend_features/feedback_tab_code'] = $data['feedback_tab_html'];
if(isset($data['web_widget_code_snippet'])) {
$configUpdates['zendesk/frontend_features/web_widget_code_snippet'] = $data['web_widget_code_snippet'];
}


Expand Down
43 changes: 15 additions & 28 deletions src/app/code/community/Zendesk/Zendesk/etc/system.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@
<show_in_default>1</show_in_default>
<show_in_website>1</show_in_website>
<show_in_store>1</show_in_store>
<fields>
<fields>
<contact_us translate="label">
<label>Create tickets from Contact Us form</label>
<frontend_type>select</frontend_type>
Expand All @@ -189,38 +189,25 @@
<show_in_website>1</show_in_website>
<show_in_store>1</show_in_store>
</contact_us>
<feedback_tab_code_active translate="label">
<label>Code to display Feedback Tab</label>
<web_widget_code_active translate="label">
<label>Include Web Widget</label>
<frontend_type>select</frontend_type>
<source_model>adminhtml/system_config_source_yesno</source_model>
<sort_order>6</sort_order>
<show_in_default>1</show_in_default>
<show_in_website>1</show_in_website>
<show_in_store>1</show_in_store>
</feedback_tab_code_active>
<feedback_tab_code>
<frontend_type>textarea</frontend_type>
<sort_order>7</sort_order>
<show_in_default>1</show_in_default>
<show_in_website>1</show_in_website>
<show_in_store>1</show_in_store>
<depends>
<feedback_tab_code_active>1</feedback_tab_code_active>
</depends>
</feedback_tab_code>
<feedback_tab_customise translate="label value">
</web_widget_code_active>
<web_widget_customise translate="label value">
<label></label>
<frontend_model>zendesk/adminhtml_config_link</frontend_model>
<destination><![CDATA[account/dropboxes/new]]></destination>
<value>Customize Feedback Tab</value>
<sort_order>8</sort_order>
<destination><![CDATA[agent/admin/widget]]></destination>
<value>Customize Web Widget</value>
<sort_order>7</sort_order>
<show_in_default>1</show_in_default>
<show_in_website>1</show_in_website>
<show_in_store>1</show_in_store>
<depends>
<feedback_tab_code_active>1</feedback_tab_code_active>
</depends>
</feedback_tab_customise>
</web_widget_customise>
<footer_link_enabled translate="label">
<label>Display link to Zendesk in Magento footer</label>
<frontend_type>select</frontend_type>
Expand Down Expand Up @@ -269,7 +256,7 @@
<show_in_default>1</show_in_default>
<show_in_website>1</show_in_website>
<show_in_store>0</show_in_store>
</show_on_order>
</show_on_order>
<show_on_dashboard translate="label">
<label>Show support tickets on admin dashboard</label>
<frontend_type>select</frontend_type>
Expand All @@ -287,7 +274,7 @@
<show_in_default>1</show_in_default>
<show_in_website>1</show_in_website>
<show_in_store>0</show_in_store>
</show_all>
</show_all>
<default_sort translate="label">
<label>Default Sort Order</label>
<frontend_type>select</frontend_type>
Expand Down Expand Up @@ -442,16 +429,16 @@
<show_in_website>1</show_in_website>
<show_in_store>1</show_in_store>
</voice>
<feedback_tab translate="label value">
<label>Feedback Tab</label>
<web_widget translate="label value">
<label>Web Widget</label>
<frontend_model>zendesk/adminhtml_config_link</frontend_model>
<destination><![CDATA[account/dropboxes/new]]></destination>
<destination><![CDATA[agent/admin/widget]]></destination>
<value>Configure</value>
<sort_order>1</sort_order>
<show_in_default>1</show_in_default>
<show_in_website>1</show_in_website>
<show_in_store>1</show_in_store>
</feedback_tab>
</web_widget>
<api translate="label value">
<label>API</label>
<frontend_model>zendesk/adminhtml_config_link</frontend_model>
Expand Down
2 changes: 1 addition & 1 deletion src/app/design/frontend/base/default/layout/zendesk.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
</action>
</reference>
<reference name="before_body_end">
<block type="zendesk/supporttab" name="zendesk_support_tab"/>
<block type="zendesk/webWidget" name="zendesk_web_widget"/>
</reference>
</default>

Expand Down