talkable - Version 0.1.3

Version Notes

Extension provides:
- Post-Checkout Integration
- Standalone Integration

Download this release

Release Info

Developer Talkable
Extension talkable
Version 0.1.3
Comparing to
See all releases


Code changes from version 0.1.2 to 0.1.3

Files changed (6) hide show
  1. app/code/community/Talkable/SocialReferrals/Helper/Data.php +10 -5
  2. app/code/community/Talkable/SocialReferrals/controllers/IndexController.php +1 -4
  3. app/code/community/Talkable/SocialReferrals/etc/config.xml +1 -1
  4. app/code/community/Talkable/SocialReferrals/etc/system.xml +6 -6
  5. app/design/frontend/base/default/template/talkable/socialreferrals/register_affiliate.phtml +1 -2
  6. package.xml +4 -4
app/code/community/Talkable/SocialReferrals/Helper/Data.php CHANGED
@@ -100,16 +100,21 @@ class Talkable_SocialReferrals_Helper_Data extends Mage_Core_Helper_Abstract
100
  );
101
  }
102
 
103
- public function getAffiliateData($customer)
104
  {
105
- return array(
106
- "affiliate_member" => array(
 
 
 
107
  "email" => $customer->getEmail(),
108
  "first_name" => $customer->getFirstname(),
109
  "last_name" => $customer->getLastname(),
110
  "customer_id" => $customer->getId(),
111
- ),
112
- );
 
 
113
  }
114
 
115
  //---------+
100
  );
101
  }
102
 
103
+ public function getAffiliateData()
104
  {
105
+ $helper = Mage::helper("customer");
106
+
107
+ if ($helper->isLoggedIn()) {
108
+ $customer = $helper->getCustomer();
109
+ return array("affiliate_member" => array(
110
  "email" => $customer->getEmail(),
111
  "first_name" => $customer->getFirstname(),
112
  "last_name" => $customer->getLastname(),
113
  "customer_id" => $customer->getId(),
114
+ ));
115
+ } else {
116
+ return array("affiliate_member" => array());
117
+ }
118
  }
119
 
120
  //---------+
app/code/community/Talkable/SocialReferrals/controllers/IndexController.php CHANGED
@@ -13,10 +13,7 @@ class Talkable_SocialReferrals_IndexController extends Mage_Core_Controller_Fron
13
 
14
  public function indexAction()
15
  {
16
- if (
17
- Mage::getSingleton("customer/session")->isLoggedIn() &&
18
- Mage::helper("socialreferrals")->isAffiliateEnabled()
19
- ) {
20
  $this->loadLayout();
21
  $this->renderLayout();
22
  } else {
13
 
14
  public function indexAction()
15
  {
16
+ if (Mage::helper("socialreferrals")->isAffiliateEnabled()) {
 
 
 
17
  $this->loadLayout();
18
  $this->renderLayout();
19
  } else {
app/code/community/Talkable/SocialReferrals/etc/config.xml CHANGED
@@ -12,7 +12,7 @@
12
  <config>
13
  <modules>
14
  <Talkable_SocialReferrals>
15
- <version>0.1.1</version>
16
  </Talkable_SocialReferrals>
17
  </modules>
18
 
12
  <config>
13
  <modules>
14
  <Talkable_SocialReferrals>
15
+ <version>0.1.3</version>
16
  </Talkable_SocialReferrals>
17
  </modules>
18
 
app/code/community/Talkable/SocialReferrals/etc/system.xml CHANGED
@@ -32,8 +32,8 @@
32
  <frontend_type>text</frontend_type>
33
  <sort_order>1</sort_order>
34
  <show_in_default>1</show_in_default>
35
- <show_in_website>0</show_in_website>
36
- <show_in_store>0</show_in_store>
37
 
38
  <fields>
39
  <site_id translate="label">
@@ -53,8 +53,8 @@
53
  <frontend_type>text</frontend_type>
54
  <sort_order>2</sort_order>
55
  <show_in_default>1</show_in_default>
56
- <show_in_website>0</show_in_website>
57
- <show_in_store>0</show_in_store>
58
 
59
  <fields>
60
  <enabled translate="label">
@@ -85,8 +85,8 @@
85
  <frontend_type>text</frontend_type>
86
  <sort_order>3</sort_order>
87
  <show_in_default>1</show_in_default>
88
- <show_in_website>0</show_in_website>
89
- <show_in_store>0</show_in_store>
90
 
91
  <fields>
92
  <enabled translate="label">
32
  <frontend_type>text</frontend_type>
33
  <sort_order>1</sort_order>
34
  <show_in_default>1</show_in_default>
35
+ <show_in_website>1</show_in_website>
36
+ <show_in_store>1</show_in_store>
37
 
38
  <fields>
39
  <site_id translate="label">
53
  <frontend_type>text</frontend_type>
54
  <sort_order>2</sort_order>
55
  <show_in_default>1</show_in_default>
56
+ <show_in_website>1</show_in_website>
57
+ <show_in_store>1</show_in_store>
58
 
59
  <fields>
60
  <enabled translate="label">
85
  <frontend_type>text</frontend_type>
86
  <sort_order>3</sort_order>
87
  <show_in_default>1</show_in_default>
88
+ <show_in_website>1</show_in_website>
89
+ <show_in_store>1</show_in_store>
90
 
91
  <fields>
92
  <enabled translate="label">
app/design/frontend/base/default/template/talkable/socialreferrals/register_affiliate.phtml CHANGED
@@ -17,7 +17,6 @@
17
  <?php if (empty($_helper->getSiteId())): ?>
18
  <!-- Talkable Site ID is blank, check your Talkable extension settings -->
19
  <?php else: ?>
20
- <?php $_customer = $this->helper("customer")->getCustomer() ?>
21
  <div id="talkable-container"></div>
22
  <script type="text/javascript">
23
  //<![CDATA[
@@ -27,7 +26,7 @@
27
  server: "https://www.talkable.com"
28
  }]);
29
 
30
- <?php $_event_data = array_merge($_helper->getAffiliateData($_customer), $_helper->getAffiliateIframeOptions()) ?>
31
  <?php $_event_data["campaign_tags"] = $_helper->getAffiliateCampaignTags() ?>
32
 
33
  _curebitq.push(["register_affiliate", <?php echo Mage::helper("core")->jsonEncode($_event_data) ?>]);
17
  <?php if (empty($_helper->getSiteId())): ?>
18
  <!-- Talkable Site ID is blank, check your Talkable extension settings -->
19
  <?php else: ?>
 
20
  <div id="talkable-container"></div>
21
  <script type="text/javascript">
22
  //<![CDATA[
26
  server: "https://www.talkable.com"
27
  }]);
28
 
29
+ <?php $_event_data = array_merge($_helper->getAffiliateData(), $_helper->getAffiliateIframeOptions()) ?>
30
  <?php $_event_data["campaign_tags"] = $_helper->getAffiliateCampaignTags() ?>
31
 
32
  _curebitq.push(["register_affiliate", <?php echo Mage::helper("core")->jsonEncode($_event_data) ?>]);
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>talkable</name>
4
- <version>0.1.2</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/mit-license.php">MIT License</license>
7
  <channel>community</channel>
@@ -18,9 +18,9 @@ See more at Talkable.com</description>
18
  - Post-Checkout Integration&#xD;
19
  - Standalone Integration</notes>
20
  <authors><author><name>Talkable</name><user>talkable</user><email>sub@talkable.com</email></author></authors>
21
- <date>2015-02-21</date>
22
- <time>21:06:25</time>
23
- <contents><target name="magecommunity"><dir name="Talkable"><dir name="SocialReferrals"><dir name="Block"><file name="Affiliate.php" hash="e5cf1648f2aab8c8894fd1311ae865b8"/><dir name="Multishipping"><file name="Purchase.php" hash="6eaab3557bdf97f40a77c7b6e040e483"/></dir><file name="Purchase.php" hash="5cd37269372b88cec4657bf85077c1a4"/></dir><dir name="Helper"><file name="Data.php" hash="5edcb929ebae8c45151cbceb69d75544"/></dir><dir name="controllers"><file name="IndexController.php" hash="3af0ec76d8edc7b7bccbb1375e7a8045"/></dir><dir name="etc"><file name="adminhtml.xml" hash="3f86a3e4bf980fa36aba8c0e33737e59"/><file name="config.xml" hash="05f9e39822aa44b75c972d422419d6ee"/><file name="system.xml" hash="7ecf7e23f655ac932af4e56cd3446d4f"/></dir></dir></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><dir name="talkable"><file name="socialreferrals.xml" hash="229ed61d0a4f0ea343248f85fc4f1d83"/></dir></dir><dir name="template"><dir name="talkable"><dir name="socialreferrals"><file name="register_affiliate.phtml" hash="7df514f68944239ed13e0d6d924c82c3"/><file name="register_purchase.phtml" hash="5d0e67f9a983bbaf57c6f6e84cdcd1d6"/></dir></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Talkable_SocialReferrals.xml" hash="ed1152e3c169ac8e9d33219e5ec9fb47"/></dir></target></contents>
24
  <compatible/>
25
  <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
26
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>talkable</name>
4
+ <version>0.1.3</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/mit-license.php">MIT License</license>
7
  <channel>community</channel>
18
  - Post-Checkout Integration&#xD;
19
  - Standalone Integration</notes>
20
  <authors><author><name>Talkable</name><user>talkable</user><email>sub@talkable.com</email></author></authors>
21
+ <date>2015-02-24</date>
22
+ <time>11:54:58</time>
23
+ <contents><target name="magecommunity"><dir name="Talkable"><dir name="SocialReferrals"><dir name="Block"><file name="Affiliate.php" hash="e5cf1648f2aab8c8894fd1311ae865b8"/><dir name="Multishipping"><file name="Purchase.php" hash="6eaab3557bdf97f40a77c7b6e040e483"/></dir><file name="Purchase.php" hash="5cd37269372b88cec4657bf85077c1a4"/></dir><dir name="Helper"><file name="Data.php" hash="7b1d141c15df2a27781f8bd22a675eef"/></dir><dir name="controllers"><file name="IndexController.php" hash="41a785b074c529b65a3f82ca3573662e"/></dir><dir name="etc"><file name="adminhtml.xml" hash="3f86a3e4bf980fa36aba8c0e33737e59"/><file name="config.xml" hash="487004e1d34aac31a5431fcc837adaeb"/><file name="system.xml" hash="a27a6ea05ee141e845df959e2d452f56"/></dir></dir></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><dir name="talkable"><file name="socialreferrals.xml" hash="229ed61d0a4f0ea343248f85fc4f1d83"/></dir></dir><dir name="template"><dir name="talkable"><dir name="socialreferrals"><file name="register_affiliate.phtml" hash="26bd0b36fb59be303302eba575b884f3"/><file name="register_purchase.phtml" hash="5d0e67f9a983bbaf57c6f6e84cdcd1d6"/></dir></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Talkable_SocialReferrals.xml" hash="ed1152e3c169ac8e9d33219e5ec9fb47"/></dir></target></contents>
24
  <compatible/>
25
  <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
26
  </package>