TriggMineCartRecovery - Version 3.0.10.2

Version Notes

- Added support for multiple websites
- Added notification of configuration errors
- Bug fixes and performance improvements

Download this release

Release Info

Developer TriggMine
Extension TriggMineCartRecovery
Version 3.0.10.2
Comparing to
See all releases


Code changes from version 3.0.10.1 to 3.0.10.2

Files changed (6) hide show
  1. app/code/community/Triggmine/IntegrationModule/Helper/Data.php +9 -9
  2. app/code/community/Triggmine/IntegrationModule/Model/Observer.php +1 -1
  3. app/code/community/Triggmine/IntegrationModule/etc/config.xml +1 -1
  4. app/design/frontend/base/default/layout/triggmine_integrationmodule.xml +1 -1
  5. app/etc/modules/Triggmine_IntegrationModule.xml +1 -1
  6. package.xml +6 -5
app/code/community/Triggmine/IntegrationModule/Helper/Data.php CHANGED
@@ -10,7 +10,7 @@ class Triggmine_IntegrationModule_Helper_Data extends Mage_Core_Helper_Abstract
10
  const XML_PATH_EXPORT = 'triggmine/triggmine_export/export';
11
  const XML_PATH_DATE_FROM = 'triggmine/triggmine_export/my_date_from';
12
  const XML_PATH_DATE_TO = 'triggmine/triggmine_export/my_date_to';
13
- const VERSION_PLUGIN = '3.0.10.1';
14
 
15
  protected $_cartItemRepository;
16
  protected $_customerRepository;
@@ -23,7 +23,8 @@ class Triggmine_IntegrationModule_Helper_Data extends Mage_Core_Helper_Abstract
23
  protected $_token;
24
  protected $_pluginOn;
25
  protected $_enableExport;
26
-
 
27
 
28
  public function __construct()
29
  {
@@ -39,6 +40,8 @@ class Triggmine_IntegrationModule_Helper_Data extends Mage_Core_Helper_Abstract
39
  $this->_token = Mage::app()->getWebsite($this->_websiteId)->getConfig(self::XML_PATH_TOKEN);
40
  $this->_pluginOn = Mage::app()->getWebsite($this->_websiteId)->getConfig(self::XML_PATH_ENABLED);
41
  $this->_enableExport = Mage::app()->getWebsite($this->_websiteId)->getConfig(self::XML_PATH_EXPORT);
 
 
42
  }
43
 
44
  public function apiClient($data, $method)
@@ -110,7 +113,7 @@ class Triggmine_IntegrationModule_Helper_Data extends Mage_Core_Helper_Abstract
110
 
111
  public function getProdImg($product)
112
  {
113
- $url = false;
114
  if ($image = $product->getImage())
115
  {
116
  $http = (isset($_SERVER['HTTPS']) || isset($_SERVER['HTTPS']) && isset($_SERVER['HTTPS']) == "on" || $_SERVER['SERVER_PORT'] == 443) ? "https://" : "http://";
@@ -121,7 +124,7 @@ class Triggmine_IntegrationModule_Helper_Data extends Mage_Core_Helper_Abstract
121
 
122
  public function getProdUrl($product)
123
  {
124
- $url = false;
125
  if ($path = $product->getUrlPath())
126
  {
127
  $http = (isset($_SERVER['HTTPS']) || isset($_SERVER['HTTPS']) && isset($_SERVER['HTTPS']) == "on" || $_SERVER['SERVER_PORT'] == 443) ? "https://" : "http://";
@@ -479,13 +482,10 @@ class Triggmine_IntegrationModule_Helper_Data extends Mage_Core_Helper_Abstract
479
  public function getOrderHistory($observer)
480
  {
481
  $dataExport = false;
482
-
483
- $fromDate = Mage::getStoreConfig(self::XML_PATH_DATE_FROM);
484
- $toDate = Mage::getStoreConfig(self::XML_PATH_DATE_TO);
485
 
486
  /* Format our dates */
487
- $fromDate = date('Y-m-d H:i:s', strtotime($fromDate));
488
- $toDate = date('Y-m-d H:i:s', strtotime($toDate));
489
 
490
  $dataExport = array();
491
 
10
  const XML_PATH_EXPORT = 'triggmine/triggmine_export/export';
11
  const XML_PATH_DATE_FROM = 'triggmine/triggmine_export/my_date_from';
12
  const XML_PATH_DATE_TO = 'triggmine/triggmine_export/my_date_to';
13
+ const VERSION_PLUGIN = '3.0.10.2';
14
 
15
  protected $_cartItemRepository;
16
  protected $_customerRepository;
23
  protected $_token;
24
  protected $_pluginOn;
25
  protected $_enableExport;
26
+ protected $_exportFromDate;
27
+ protected $_exportToDate;
28
 
29
  public function __construct()
30
  {
40
  $this->_token = Mage::app()->getWebsite($this->_websiteId)->getConfig(self::XML_PATH_TOKEN);
41
  $this->_pluginOn = Mage::app()->getWebsite($this->_websiteId)->getConfig(self::XML_PATH_ENABLED);
42
  $this->_enableExport = Mage::app()->getWebsite($this->_websiteId)->getConfig(self::XML_PATH_EXPORT);
43
+ $this->_exportFromDate = Mage::app()->getWebsite($this->_websiteId)->getConfig(self::XML_PATH_DATE_FROM);
44
+ $this->_exportToDate = Mage::app()->getWebsite($this->_websiteId)->getConfig(self::XML_PATH_DATE_TO);
45
  }
46
 
47
  public function apiClient($data, $method)
113
 
114
  public function getProdImg($product)
115
  {
116
+ $url = "";
117
  if ($image = $product->getImage())
118
  {
119
  $http = (isset($_SERVER['HTTPS']) || isset($_SERVER['HTTPS']) && isset($_SERVER['HTTPS']) == "on" || $_SERVER['SERVER_PORT'] == 443) ? "https://" : "http://";
124
 
125
  public function getProdUrl($product)
126
  {
127
+ $url = "";
128
  if ($path = $product->getUrlPath())
129
  {
130
  $http = (isset($_SERVER['HTTPS']) || isset($_SERVER['HTTPS']) && isset($_SERVER['HTTPS']) == "on" || $_SERVER['SERVER_PORT'] == 443) ? "https://" : "http://";
482
  public function getOrderHistory($observer)
483
  {
484
  $dataExport = false;
 
 
 
485
 
486
  /* Format our dates */
487
+ $fromDate = date('Y-m-d H:i:s', strtotime($this->_exportFromDate));
488
+ $toDate = date('Y-m-d H:i:s', strtotime($this->_exportToDate));
489
 
490
  $dataExport = array();
491
 
app/code/community/Triggmine/IntegrationModule/Model/Observer.php CHANGED
@@ -23,7 +23,7 @@ class Triggmine_IntegrationModule_Model_Observer
23
  else if ($res["status"] === 401)
24
  {
25
  Mage::throwException(Mage::helper('adminhtml')->__('Invalid API KEY'));
26
- }
27
  }
28
 
29
  public function export_order_history(Varien_Event_Observer $observer)
23
  else if ($res["status"] === 401)
24
  {
25
  Mage::throwException(Mage::helper('adminhtml')->__('Invalid API KEY'));
26
+ }
27
  }
28
 
29
  public function export_order_history(Varien_Event_Observer $observer)
app/code/community/Triggmine/IntegrationModule/etc/config.xml CHANGED
@@ -2,7 +2,7 @@
2
  <config>
3
  <modules>
4
  <Triggmine_IntegrationModule>
5
- <version>3.0.10.1</version>
6
  </Triggmine_IntegrationModule>
7
  </modules>
8
  <global>
2
  <config>
3
  <modules>
4
  <Triggmine_IntegrationModule>
5
+ <version>3.0.10.2</version>
6
  </Triggmine_IntegrationModule>
7
  </modules>
8
  <global>
app/design/frontend/base/default/layout/triggmine_integrationmodule.xml CHANGED
@@ -1,5 +1,5 @@
1
  <?xml version="1.0"?>
2
- <layout version="3.0.10.1">
3
  <default>
4
  <reference name="before_body_end">
5
  <block type="core/template" name="triggmine_init" after="-" template="triggmine/integrationmodule/init.phtml"/>
1
  <?xml version="1.0"?>
2
+ <layout version="3.0.10.2">
3
  <default>
4
  <reference name="before_body_end">
5
  <block type="core/template" name="triggmine_init" after="-" template="triggmine/integrationmodule/init.phtml"/>
app/etc/modules/Triggmine_IntegrationModule.xml CHANGED
@@ -4,7 +4,7 @@
4
  <Triggmine_IntegrationModule>
5
  <active>true</active>
6
  <codePool>community</codePool>
7
- <version>3.0.10.1</version>
8
  </Triggmine_IntegrationModule>
9
  </modules>
10
  </config>
4
  <Triggmine_IntegrationModule>
5
  <active>true</active>
6
  <codePool>community</codePool>
7
+ <version>3.0.10.2</version>
8
  </Triggmine_IntegrationModule>
9
  </modules>
10
  </config>
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>TriggMineCartRecovery</name>
4
- <version>3.0.10.1</version>
5
  <stability>stable</stability>
6
  <license uri="https://opensource.org/licenses/gpl-license.php">GPL</license>
7
  <channel>community</channel>
@@ -9,11 +9,12 @@
9
  <summary>ECOMMERCE EMAIL MARKETING AUTOMATION FOR YOUR IDEAL CUSTOMER EXPERIENCE</summary>
10
  <description>TriggMine&#x2019;s automated email campaigns are only limited by your imagination. Whoever you want to reach out to, and whatever you want to say to them, now you can, without complex coding or time consuming email management. </description>
11
  <notes>- Added support for multiple websites&#xD;
12
- - Added notification of configuration errors</notes>
 
13
  <authors><author><name>TriggMine</name><user>TriggMine</user><email>admin@triggmine.com</email></author></authors>
14
- <date>2017-02-21</date>
15
- <time>23:08:30</time>
16
- <contents><target name="magecommunity"><dir name="Triggmine"><dir name="IntegrationModule"><dir name="Block"><dir name="Adminhtml"><dir name="System"><dir name="Config"><file name="Date.php" hash="d6b04acde97c3ec4eb52179740e420cb"/><file name="Footer.php" hash="1ccaf261bc98c90c931b82cb81dda396"/><file name="Info.php" hash="755eedc85ce32a1088ab2a9649faadf0"/></dir></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="ed2f34161967bd171bd0afc8c0e376f9"/></dir><dir name="Model"><file name="Observer.php" hash="f69aabfd5a2b0f710f736e5e435f376c"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="IntmodulebackendController.php" hash="65549f09bc7c7a8f729e39ee18ed8439"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="fdf3bf3b8b0b0b2804d05cf5fe3c0ae3"/><file name="config.xml" hash="b74f900c6e5b663b5630183d72ed9541"/><file name="system.xml" hash="bdc8bd6245fc68f222d1256635a5c9d2"/></dir></dir></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="triggmine_integrationmodule.xml" hash="6f3be5c5f63d3e0df79a3f8b4a46c101"/></dir><dir name="template"><dir name="triggmine"><dir name="integrationmodule"><file name="init.phtml" hash="088f4b1efdbb774a020ebcb2d6405c86"/></dir></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Triggmine_IntegrationModule.xml" hash="917d5c1f038ff48142c415d4318afaff"/></dir></target><target name="mageweb"><dir name="js"><dir name="triggmine"><dir name="integationmodule"><dir name="scripts"><file name="client.min.js" hash="068c5c31adf266449d9de64f31772f55"/><file name="fingerprint2.min.js" hash="36b594aba875677b7ede86aa823b2493"/><file name="jscookie.min.js" hash="390302a82ecd74b0e39e2ff66eb23c13"/></dir></dir></dir></dir></target></contents>
17
  <compatible/>
18
  <dependencies><required><php><min>5.4.0</min><max>5.6.0</max></php></required></dependencies>
19
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>TriggMineCartRecovery</name>
4
+ <version>3.0.10.2</version>
5
  <stability>stable</stability>
6
  <license uri="https://opensource.org/licenses/gpl-license.php">GPL</license>
7
  <channel>community</channel>
9
  <summary>ECOMMERCE EMAIL MARKETING AUTOMATION FOR YOUR IDEAL CUSTOMER EXPERIENCE</summary>
10
  <description>TriggMine&#x2019;s automated email campaigns are only limited by your imagination. Whoever you want to reach out to, and whatever you want to say to them, now you can, without complex coding or time consuming email management. </description>
11
  <notes>- Added support for multiple websites&#xD;
12
+ - Added notification of configuration errors&#xD;
13
+ - Bug fixes and performance improvements</notes>
14
  <authors><author><name>TriggMine</name><user>TriggMine</user><email>admin@triggmine.com</email></author></authors>
15
+ <date>2017-02-23</date>
16
+ <time>09:01:41</time>
17
+ <contents><target name="magecommunity"><dir name="Triggmine"><dir name="IntegrationModule"><dir name="Block"><dir name="Adminhtml"><dir name="System"><dir name="Config"><file name="Date.php" hash="d6b04acde97c3ec4eb52179740e420cb"/><file name="Footer.php" hash="1ccaf261bc98c90c931b82cb81dda396"/><file name="Info.php" hash="755eedc85ce32a1088ab2a9649faadf0"/></dir></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="6a47d2a2273e56b320084d4835bdb569"/></dir><dir name="Model"><file name="Observer.php" hash="bdcb7662d4df3086c1746abd3b14cf59"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="IntmodulebackendController.php" hash="65549f09bc7c7a8f729e39ee18ed8439"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="fdf3bf3b8b0b0b2804d05cf5fe3c0ae3"/><file name="config.xml" hash="ddfeb57706026beea62c88a9989edf37"/><file name="system.xml" hash="bdc8bd6245fc68f222d1256635a5c9d2"/></dir></dir></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="triggmine_integrationmodule.xml" hash="7f6696bb9970dfc0d851364b2aef7379"/></dir><dir name="template"><dir name="triggmine"><dir name="integrationmodule"><file name="init.phtml" hash="088f4b1efdbb774a020ebcb2d6405c86"/></dir></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Triggmine_IntegrationModule.xml" hash="9cbc41ae87d9b9973c67221a7ff96f62"/></dir></target><target name="mageweb"><dir name="js"><dir name="triggmine"><dir name="integationmodule"><dir name="scripts"><file name="client.min.js" hash="068c5c31adf266449d9de64f31772f55"/><file name="fingerprint2.min.js" hash="36b594aba875677b7ede86aa823b2493"/><file name="jscookie.min.js" hash="390302a82ecd74b0e39e2ff66eb23c13"/></dir></dir></dir></dir></target></contents>
18
  <compatible/>
19
  <dependencies><required><php><min>5.4.0</min><max>5.6.0</max></php></required></dependencies>
20
  </package>