Eyemagine_HubSpot - Version 1.0.5

Version Notes

v.1.0.4: Aug 31, 2015:
- Fixed product image display related issue

Download this release

Release Info

Developer EYEMAGINE
Extension Eyemagine_HubSpot
Version 1.0.5
Comparing to
See all releases


Code changes from version 1.0.4 to 1.0.5

Files changed (5) hide show
  1. app/code/community/Eyemagine/HubSpot/Helper/Data.php +1 -1
  2. app/code/community/Eyemagine/HubSpot/controllers/Adminhtml/.DS_Store +0 -0
  3. app/code/community/Eyemagine/HubSpot/controllers/LinkController.php +1 -1
  4. app/code/community/Eyemagine/HubSpot/controllers/SyncController.php +7 -3
  5. package.xml +4 -4
app/code/community/Eyemagine/HubSpot/Helper/Data.php CHANGED
@@ -199,7 +199,7 @@ class Eyemagine_HubSpot_Helper_Data extends Mage_Core_Helper_Abstract
199
  ->setOrder('logged_at', Varien_Data_Collection::SORT_ORDER_DESC);
200
 
201
  if ($storeId) {
202
- $collection->addStoreFilter($storeId);
203
  }
204
 
205
  $productIds = array();
199
  ->setOrder('logged_at', Varien_Data_Collection::SORT_ORDER_DESC);
200
 
201
  if ($storeId) {
202
+ $collection->addStoreFilter(array($storeId));
203
  }
204
 
205
  $productIds = array();
app/code/community/Eyemagine/HubSpot/controllers/Adminhtml/.DS_Store ADDED
Binary file
app/code/community/Eyemagine/HubSpot/controllers/LinkController.php CHANGED
@@ -127,7 +127,7 @@ class Eyemagine_HubSpot_LinkController extends Mage_Core_Controller_Front_Action
127
  // add the size header, and output
128
  if ($file && file_exists($file)) {
129
  header('Content-Length: ' . filesize($file));
130
- ob_clean();
131
  flush();
132
  readfile($file);
133
  } else {
127
  // add the size header, and output
128
  if ($file && file_exists($file)) {
129
  header('Content-Length: ' . filesize($file));
130
+ if (ob_get_level()) ob_end_clean();
131
  flush();
132
  readfile($file);
133
  } else {
app/code/community/Eyemagine/HubSpot/controllers/SyncController.php CHANGED
@@ -247,7 +247,7 @@ class Eyemagine_HubSpot_SyncController extends Mage_Core_Controller_Front_Action
247
  $result['items'] = array();
248
 
249
  foreach ($cart->getAllItems() as $item) {
250
- $helper->loadCatalogData($item, $cartStoreId, $websiteId, $maxAssociated);
251
  $result['items'][] = $helper->convertAttributeData($item);
252
  }
253
 
@@ -320,8 +320,12 @@ class Eyemagine_HubSpot_SyncController extends Mage_Core_Controller_Front_Action
320
  'p.url_id = lv.last_url_id',
321
  array('last_url' => 'p.url', 'last_referer' => 'p.referer')
322
  )
323
- ->where('lc.customer_id > 0')
324
- ->where("lv.last_visit_at >= '$start'")
 
 
 
 
325
  ->where("lv.last_visit_at < '$end'")
326
  ->order('lv.last_visit_at')
327
  ->limit($maxperpage);
247
  $result['items'] = array();
248
 
249
  foreach ($cart->getAllItems() as $item) {
250
+ $helper->loadCatalogData($item, $storeId, $websiteId, $maxAssociated);
251
  $result['items'][] = $helper->convertAttributeData($item);
252
  }
253
 
320
  'p.url_id = lv.last_url_id',
321
  array('last_url' => 'p.url', 'last_referer' => 'p.referer')
322
  )
323
+ ->where('lc.customer_id > 0');
324
+ // only add the filter if website id > 0
325
+ if ($websiteId) {
326
+ $select->where("c.website_id = '$websiteId'");
327
+ }
328
+ $select->where("lv.last_visit_at >= '$start'")
329
  ->where("lv.last_visit_at < '$end'")
330
  ->order('lv.last_visit_at')
331
  ->limit($maxperpage);
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Eyemagine_HubSpot</name>
4
- <version>1.0.4</version>
5
  <stability>stable</stability>
6
  <license uri="http://www.eyemaginetech.com/license.txt">Custom</license>
7
  <channel>community</channel>
@@ -51,11 +51,11 @@ Attribute revenue generated to specific marketing channels and campaigns.&#xD;
51
  HubSpot's suite of analytics and reporting tools allows you to quickly and easily see which traffic sources or marketing actions turned into revenue for you during any given time period. Generate a report in seconds and email it to anyone in the company--you can even set up recurring reports so everyone can keep track of the company's progress.</description>
52
  <notes>v.1.0.4: Aug 31, 2015:&#xD;
53
  - Fixed product image display related issue &#xD;
54
- - Fixed PHP version</notes>
55
  <authors><author><name>EYEMAGINE</name><user>eyemagine</user><email>andy@eyemaginetech.com</email></author></authors>
56
  <date>2015-08-31</date>
57
- <time>17:28:13</time>
58
- <contents><target name="magecommunity"><dir name="Eyemagine"><dir name="HubSpot"><dir name="Block"><dir name="Adminhtml"><dir name="Frontend"><dir name="Button"><file name="Regen.php" hash="14197e4d6ea6282b1ae0619d655c6a27"/><file name="._Regen.php" hash="03ec92c7aa4a80b83dab35ae888c547b"/></dir><dir name="Eyemagine"><file name="Info.php" hash="1e203f16f38ee5eb951ee829b83afdc8"/><file name="Support.php" hash="0005ef97d2ea3c598b58c88057bc8624"/><file name="Version.php" hash="a96813f8f3d6480c16f61571f39cd4d2"/><file name="._Info.php" hash="ce0cf7ed20da8016624555bbb5968191"/><file name="._Support.php" hash="d7af6eacee8bbc688f3be8c5b681b7bb"/><file name="._Version.php" hash="aa0f9e438f113f370a375ec75e45dfdc"/></dir><file name="Utk.php" hash="76e92726aa413c814a3b62da62572ce2"/><file name="._Utk.php" hash="a4c1f2bab0767a83af323589a3181513"/></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="4a737dc3791dce5163b42803ce820b70"/><file name="._Data.php" hash="9c68a0caf545ef711c3e211076d31607"/></dir><dir name="Model"><file name="Observer.php" hash="bb1f11321b3fb4f9aa729c071aa472cc"/><file name="._Observer.php" hash="9f900637bde9683431d89da9174b57fb"/></dir><dir name="controllers"><dir name="Adminhtml"><dir name="Hubspot"><file name="IndexController.php" hash="d6959e2033c8748f8fd27b33073b2a66"/><file name="._IndexController.php" hash="14ef1a094333b6261a631537df4a98b8"/></dir></dir><file name="LinkController.php" hash="c34cc83c3466e37f7dbb4b798261b9e3"/><file name="SyncController.php" hash="fa88d180ebcda2ac88aefcf106d3e2c0"/><file name="._SyncController.php" hash="29711776eb99fdc6b890d04af2bc8a3a"/></dir><dir name="etc"><file name="adminhtml.xml" hash="9c3e3430dfddebf425ab78ece4c6cc49"/><file name="config.xml" hash="43d9fb699b9568bbfe31cc45bfe7fe3f"/><file name="system.xml" hash="05ac7296c26bcea77d4e29bf226c9eec"/><file name="._config.xml" hash="e10af298d19d562bc2d7bcbe4fa8ea24"/></dir><file name="readme.txt" hash="d1602564bca2e4a18c18efb8f33980f0"/><dir name="sql"><dir name="eyehubspot_setup"><file name="mysql4-install-1.0.0.php" hash="68ae87bd4cf97456dac5c8a91ddcebb2"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Eyemagine_HubSpot.xml" hash="236d83db51f70ac31376d95eb3ca73f4"/></dir></target></contents>
59
  <compatible/>
60
  <dependencies><required><php><min>5.3.0</min><max>7.0.0</max></php></required></dependencies>
61
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Eyemagine_HubSpot</name>
4
+ <version>1.0.5</version>
5
  <stability>stable</stability>
6
  <license uri="http://www.eyemaginetech.com/license.txt">Custom</license>
7
  <channel>community</channel>
51
  HubSpot's suite of analytics and reporting tools allows you to quickly and easily see which traffic sources or marketing actions turned into revenue for you during any given time period. Generate a report in seconds and email it to anyone in the company--you can even set up recurring reports so everyone can keep track of the company's progress.</description>
52
  <notes>v.1.0.4: Aug 31, 2015:&#xD;
53
  - Fixed product image display related issue &#xD;
54
+ </notes>
55
  <authors><author><name>EYEMAGINE</name><user>eyemagine</user><email>andy@eyemaginetech.com</email></author></authors>
56
  <date>2015-08-31</date>
57
+ <time>19:40:17</time>
58
+ <contents><target name="magecommunity"><dir name="Eyemagine"><dir name="HubSpot"><dir name="Block"><dir name="Adminhtml"><dir name="Frontend"><dir name="Button"><file name="Regen.php" hash="14197e4d6ea6282b1ae0619d655c6a27"/><file name="._Regen.php" hash="03ec92c7aa4a80b83dab35ae888c547b"/></dir><dir name="Eyemagine"><file name="Info.php" hash="1e203f16f38ee5eb951ee829b83afdc8"/><file name="Support.php" hash="0005ef97d2ea3c598b58c88057bc8624"/><file name="Version.php" hash="a96813f8f3d6480c16f61571f39cd4d2"/><file name="._Info.php" hash="ce0cf7ed20da8016624555bbb5968191"/><file name="._Support.php" hash="d7af6eacee8bbc688f3be8c5b681b7bb"/><file name="._Version.php" hash="aa0f9e438f113f370a375ec75e45dfdc"/></dir><file name="Utk.php" hash="76e92726aa413c814a3b62da62572ce2"/><file name="._Utk.php" hash="a4c1f2bab0767a83af323589a3181513"/></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="fd67190f4f397feff5729671fb0b0a59"/><file name="._Data.php" hash="9c68a0caf545ef711c3e211076d31607"/></dir><dir name="Model"><file name="Observer.php" hash="bb1f11321b3fb4f9aa729c071aa472cc"/><file name="._Observer.php" hash="9f900637bde9683431d89da9174b57fb"/></dir><dir name="controllers"><dir name="Adminhtml"><dir name="Hubspot"><file name="IndexController.php" hash="d6959e2033c8748f8fd27b33073b2a66"/><file name="._IndexController.php" hash="14ef1a094333b6261a631537df4a98b8"/></dir><file name=".DS_Store" hash="99afa5d6f042ec44f5661080a02ed4ab"/></dir><file name="LinkController.php" hash="b81263eeec88187d33c7797c1b910749"/><file name="SyncController.php" hash="d24da8a7bdab61e963efe96f04862c61"/><file name="._SyncController.php" hash="29711776eb99fdc6b890d04af2bc8a3a"/></dir><dir name="etc"><file name="adminhtml.xml" hash="9c3e3430dfddebf425ab78ece4c6cc49"/><file name="config.xml" hash="43d9fb699b9568bbfe31cc45bfe7fe3f"/><file name="system.xml" hash="05ac7296c26bcea77d4e29bf226c9eec"/><file name="._config.xml" hash="e10af298d19d562bc2d7bcbe4fa8ea24"/></dir><file name="readme.txt" hash="d1602564bca2e4a18c18efb8f33980f0"/><dir name="sql"><dir name="eyehubspot_setup"><file name="mysql4-install-1.0.0.php" hash="68ae87bd4cf97456dac5c8a91ddcebb2"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Eyemagine_HubSpot.xml" hash="236d83db51f70ac31376d95eb3ca73f4"/></dir></target></contents>
59
  <compatible/>
60
  <dependencies><required><php><min>5.3.0</min><max>7.0.0</max></php></required></dependencies>
61
  </package>