Skip to content

Commit c5db4ca

Browse files
mmolinammolina
committed
Merge pull request #47 from zendesk/mmolina/replace_feedback_tab
[CE-707] Replace Feedback Tab with Web Widget
2 parents 934994d + de0c91f commit c5db4ca

File tree

4 files changed

+24
-37
lines changed

4 files changed

+24
-37
lines changed

‎src/app/code/community/Zendesk/Zendesk/Block/Supporttab.php‎ renamed to ‎src/app/code/community/Zendesk/Zendesk/Block/webWidget.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
/**
3-
* Copyright 2012 Zendesk.
3+
* Copyright 2015 Zendesk.
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License");
66
* you may not use this file except in compliance with the License.
@@ -15,14 +15,14 @@
1515
* limitations under the License.
1616
*/
1717

18-
class Zendesk_Zendesk_Block_Supporttab extends Mage_Core_Block_Template
18+
class Zendesk_Zendesk_Block_WebWidget extends Mage_Core_Block_Template
1919
{
2020
protected function _toHtml()
2121
{
22-
if(!Mage::getStoreConfig('zendesk/frontend_features/feedback_tab_code_active')) {
22+
if(!Mage::getStoreConfig('zendesk/frontend_features/web_widget_code_active')) {
2323
return '';
2424
}
2525

26-
return Mage::getStoreConfig('zendesk/frontend_features/feedback_tab_code');
26+
return Mage::getStoreConfig('zendesk/frontend_features/web_widget_code_snippet');
2727
}
2828
}

‎src/app/code/community/Zendesk/Zendesk/controllers/ApiController.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -367,12 +367,12 @@ public function finaliseAction()
367367
}
368368
}
369369

370-
if(isset($data['feedback_tab'])) {
371-
$configUpdates['zendesk/frontend_features/feedback_tab_code_active'] = ($data['feedback_tab'] === 'true');
370+
if(isset($data['web_widget_code_active'])) {
371+
$configUpdates['zendesk/frontend_features/web_widget_code_active'] = ($data['web_widget_code_active'] === 'true');
372372
}
373373

374-
if(isset($data['feedback_tab_html'])) {
375-
$configUpdates['zendesk/frontend_features/feedback_tab_code'] = $data['feedback_tab_html'];
374+
if(isset($data['web_widget_code_snippet'])) {
375+
$configUpdates['zendesk/frontend_features/web_widget_code_snippet'] = $data['web_widget_code_snippet'];
376376
}
377377

378378

‎src/app/code/community/Zendesk/Zendesk/etc/system.xml‎

Lines changed: 15 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@
179179
<show_in_default>1</show_in_default>
180180
<show_in_website>1</show_in_website>
181181
<show_in_store>1</show_in_store>
182-
<fields>
182+
<fields>
183183
<contact_us translate="label">
184184
<label>Create tickets from Contact Us form</label>
185185
<frontend_type>select</frontend_type>
@@ -189,38 +189,25 @@
189189
<show_in_website>1</show_in_website>
190190
<show_in_store>1</show_in_store>
191191
</contact_us>
192-
<feedback_tab_code_active translate="label">
193-
<label>Code to display Feedback Tab</label>
192+
<web_widget_code_active translate="label">
193+
<label>Include Web Widget</label>
194194
<frontend_type>select</frontend_type>
195195
<source_model>adminhtml/system_config_source_yesno</source_model>
196196
<sort_order>6</sort_order>
197197
<show_in_default>1</show_in_default>
198198
<show_in_website>1</show_in_website>
199199
<show_in_store>1</show_in_store>
200-
</feedback_tab_code_active>
201-
<feedback_tab_code>
202-
<frontend_type>textarea</frontend_type>
203-
<sort_order>7</sort_order>
204-
<show_in_default>1</show_in_default>
205-
<show_in_website>1</show_in_website>
206-
<show_in_store>1</show_in_store>
207-
<depends>
208-
<feedback_tab_code_active>1</feedback_tab_code_active>
209-
</depends>
210-
</feedback_tab_code>
211-
<feedback_tab_customise translate="label value">
200+
</web_widget_code_active>
201+
<web_widget_customise translate="label value">
212202
<label></label>
213203
<frontend_model>zendesk/adminhtml_config_link</frontend_model>
214-
<destination><![CDATA[account/dropboxes/new]]></destination>
215-
<value>Customize Feedback Tab</value>
216-
<sort_order>8</sort_order>
204+
<destination><![CDATA[agent/admin/widget]]></destination>
205+
<value>Customize Web Widget</value>
206+
<sort_order>7</sort_order>
217207
<show_in_default>1</show_in_default>
218208
<show_in_website>1</show_in_website>
219209
<show_in_store>1</show_in_store>
220-
<depends>
221-
<feedback_tab_code_active>1</feedback_tab_code_active>
222-
</depends>
223-
</feedback_tab_customise>
210+
</web_widget_customise>
224211
<footer_link_enabled translate="label">
225212
<label>Display link to Zendesk in Magento footer</label>
226213
<frontend_type>select</frontend_type>
@@ -269,7 +256,7 @@
269256
<show_in_default>1</show_in_default>
270257
<show_in_website>1</show_in_website>
271258
<show_in_store>0</show_in_store>
272-
</show_on_order>
259+
</show_on_order>
273260
<show_on_dashboard translate="label">
274261
<label>Show support tickets on admin dashboard</label>
275262
<frontend_type>select</frontend_type>
@@ -287,7 +274,7 @@
287274
<show_in_default>1</show_in_default>
288275
<show_in_website>1</show_in_website>
289276
<show_in_store>0</show_in_store>
290-
</show_all>
277+
</show_all>
291278
<default_sort translate="label">
292279
<label>Default Sort Order</label>
293280
<frontend_type>select</frontend_type>
@@ -442,16 +429,16 @@
442429
<show_in_website>1</show_in_website>
443430
<show_in_store>1</show_in_store>
444431
</voice>
445-
<feedback_tab translate="label value">
446-
<label>Feedback Tab</label>
432+
<web_widget translate="label value">
433+
<label>Web Widget</label>
447434
<frontend_model>zendesk/adminhtml_config_link</frontend_model>
448-
<destination><![CDATA[account/dropboxes/new]]></destination>
435+
<destination><![CDATA[agent/admin/widget]]></destination>
449436
<value>Configure</value>
450437
<sort_order>1</sort_order>
451438
<show_in_default>1</show_in_default>
452439
<show_in_website>1</show_in_website>
453440
<show_in_store>1</show_in_store>
454-
</feedback_tab>
441+
</web_widget>
455442
<api translate="label value">
456443
<label>API</label>
457444
<frontend_model>zendesk/adminhtml_config_link</frontend_model>

‎src/app/design/frontend/base/default/layout/zendesk.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
</action>
2828
</reference>
2929
<reference name="before_body_end">
30-
<block type="zendesk/supporttab" name="zendesk_support_tab"/>
30+
<block type="zendesk/webWidget" name="zendesk_web_widget"/>
3131
</reference>
3232
</default>
3333

0 commit comments

Comments
 (0)