eBay_Enterprise_Affiliate_Extension - Version 1.1.2

Version Notes

Add Back Necessary Change Log
Remove Unecessary Change Log
DE4938 Reset Config Cache After Save

Download this release

Release Info

Developer Michael A. Smith
Extension eBay_Enterprise_Affiliate_Extension
Version 1.1.2
Comparing to
See all releases


Code changes from version 1.1.1 to 1.1.2

Files changed (3) hide show
  1. app/code/community/EbayEnterprise/Affiliate/Helper/Config.php +24 -25
  2. app/design/frontend/base/default/template/eems_affiliate/tracking.phtml +1 -1
  3. package.xml +3 -1
app/code/community/EbayEnterprise/Affiliate/Helper/Config.php CHANGED
@@ -171,19 +171,18 @@ class EbayEnterprise_Affiliate_Helper_Config
171
  * Update the last run time of the order create feed to the specified time,
172
  * or the current time it no time is given. Always set globally so no need to
173
  * ever be given a store context.
174
- * @param mixed $store
175
  * @param string $time
176
  * @return self
177
  */
178
  public function updateOrderLastRunTime($time=null)
179
  {
180
  Mage::getConfig()->saveConfig(self::ORDER_LAST_RUN_PATH, $time ?: time());
 
181
  return $this;
182
  }
183
  /**
184
  * Get the last time the order corrections feed was run. Returns the string
185
  * value saved in config. Always set globally so no need for a store context.
186
- * @param mixed $store
187
  * @return string
188
  */
189
  public function getOrderLastRunTime()
@@ -191,28 +190,28 @@ class EbayEnterprise_Affiliate_Helper_Config
191
  return Mage::getStoreConfig(self::ORDER_LAST_RUN_PATH);
192
  }
193
 
194
- /**
195
- * Enable/disable conditional pixel logic
196
- *
197
- * @param null $store
198
- * @return bool
199
- */
200
- public function isConditionalPixelEnabled($store=null)
201
- {
202
- return Mage::getStoreConfig(self::CONDITIONAL_PIXEL_ENABLED, $store);
203
- }
204
 
205
- /**
206
- * Name of the affiliate source
207
- *
208
- * If conditional pixel logic is enabled then only display the pixel
209
- * if the query string contains a key with this name
210
- *
211
- * @param null $store
212
- * @return string
213
- */
214
- public function getSourceKeyName($store=null)
215
- {
216
- return Mage::getStoreConfig(self::SOURCE_KEY_NAME, $store);
217
- }
218
  }
171
  * Update the last run time of the order create feed to the specified time,
172
  * or the current time it no time is given. Always set globally so no need to
173
  * ever be given a store context.
 
174
  * @param string $time
175
  * @return self
176
  */
177
  public function updateOrderLastRunTime($time=null)
178
  {
179
  Mage::getConfig()->saveConfig(self::ORDER_LAST_RUN_PATH, $time ?: time());
180
+ Mage::app()->getStore()->resetConfig();
181
  return $this;
182
  }
183
  /**
184
  * Get the last time the order corrections feed was run. Returns the string
185
  * value saved in config. Always set globally so no need for a store context.
 
186
  * @return string
187
  */
188
  public function getOrderLastRunTime()
190
  return Mage::getStoreConfig(self::ORDER_LAST_RUN_PATH);
191
  }
192
 
193
+ /**
194
+ * Enable/disable conditional pixel logic
195
+ *
196
+ * @param null $store
197
+ * @return bool
198
+ */
199
+ public function isConditionalPixelEnabled($store=null)
200
+ {
201
+ return Mage::getStoreConfig(self::CONDITIONAL_PIXEL_ENABLED, $store);
202
+ }
203
 
204
+ /**
205
+ * Name of the affiliate source
206
+ *
207
+ * If conditional pixel logic is enabled then only display the pixel
208
+ * if the query string contains a key with this name
209
+ *
210
+ * @param null $store
211
+ * @return string
212
+ */
213
+ public function getSourceKeyName($store=null)
214
+ {
215
+ return Mage::getStoreConfig(self::SOURCE_KEY_NAME, $store);
216
+ }
217
  }
app/design/frontend/base/default/template/eems_affiliate/tracking.phtml CHANGED
@@ -92,4 +92,4 @@
92
  }(window, document, 45, "<?php echo $keyName ?>", "<?php echo $cookieName ?>"));
93
  //]]>
94
  </script>
95
- <?endif;
92
  }(window, document, 45, "<?php echo $keyName ?>", "<?php echo $cookieName ?>"));
93
  //]]>
94
  </script>
95
+ <?php endif;
package.xml CHANGED
@@ -1,2 +1,4 @@
1
  <?xml version="1.0"?>
2
- <package><name>eBay_Enterprise_Affiliate_Extension</name><version>1.1.1</version><stability>stable</stability><license>EULA</license><channel>community</channel><extends></extends><summary>eBay Enterprise Affiliate Extension.</summary><description>eBay Enterprise Affiliate Extension.</description><notes>DE4743 Fix Product Feed Crontab Configuration</notes><authors><author><name>Michael A. Smith</name><user>msmith3</user><email>msmith3@ebay.com</email></author><author><name>Michael Phang</name><user>mphang</user><email>mphang@ebay.com</email></author><author><name>Mike West</name><user>micwest</user><email>micwest@ebay.com</email></author><author><name>Reginald Gabriel</name><user>rgabriel</user><email>rgabriel@ebay.com</email></author><author><name>Scott van Brug</name><user>svanbrug</user><email>svanbrug@ebay.com</email></author></authors><date>2015-02-12</date><time>9:30:48</time><compatible></compatible><dependencies><required><php><min>5.3.0</min><max>5.6.99</max></php></required></dependencies><contents><target name="mage"><dir name="app"><dir name="code"><dir name="community"><dir name="EbayEnterprise"><dir name="Affiliate"><dir name="Exception"><file name="Configuration.php" hash="329e9296f4662b6cbf60fe1daef1acd7"/></dir><dir name="Model"><file name="Observer.php" hash="ee3dba8505e43f175ee54dea3c7813cb"/><dir name="System"><dir name="Config"><dir name="Source"><file name="Attributes.php" hash="3930134c53203f03ad872a6c647679b0"/><file name="Categories.php" hash="4166f8b40f0e0451cd3fce5fd3f7b23f"/><file name="Stockquantity.php" hash="cfa82a3115cf37bb4d8e76b5a627835a"/><file name="Stockyesno.php" hash="236c4532b0935e4e9f25cf99468071a5"/><file name="Transactiontype.php" hash="f929f51e0ec30364607e823cd34d0469"/><file name="Visibilityyesno.php" hash="0262dfcfd0741d217753d39db37d565e"/></dir></dir></dir><dir name="Feed"><file name="Abstract.php" hash="c34c8b875a7d6da6ab056fa12110d706"/><file name="Product.php" hash="c99bb4b79bb2483270dc2a9615ce8a0e"/><dir name="Order"><file name="Abstract.php" hash="053a2f0f719566a41903f89366f997ea"/><file name="Basic.php" hash="c9e8ce48928c68af62907b62ac692a52"/><file name="Itemized.php" hash="cf8f2f3f51e0d1f912d8e81e0338f6f7"/></dir></dir></dir><dir name="Helper"><file name="Config.php" hash="bdd2ebf40e46cb06b04ce4c2f388493c"/><file name="Data.php" hash="7f6c4c7bece8fc8e95cb52da78800621"/><file name="Map.php" hash="baa4d775c2328e0e45d2e8bc00dd8083"/><dir name="Map"><file name="Order.php" hash="27fee01d500d662be4796aa01c1270ef"/><file name="Product.php" hash="f037e9df9f5c9ef87df01a022d7706e0"/></dir></dir><dir name="sql"><dir name="eems_affiliate_setup"><file name="install-1.0.0.1.php" hash="f98e9282dcb282d9c29731c513344770"/><file name="mysql4-install-1.0.0.1.php" hash="f98e9282dcb282d9c29731c513344770"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="c68a5314867507e9215b2cf3b4b87562"/><file name="config.xml" hash="7ddcedb646a3622670a26dc7f72862ef"/><file name="system.xml" hash="8f1d3775d926300d32c4a610f4f6417f"/></dir><dir name="Block"><file name="Beacon.php" hash="07790d8d8e1a0919f3ec1d4297cd64e1"/><file name="Tracking.php" hash="e9d6eaf93beb55e8fe94330ea8dd32f5"/></dir></dir></dir></dir></dir><dir name="etc"><dir name="modules"><file name="EbayEnterprise_Affiliate.xml" hash="2c8823653d3f9c19634df8630c70628b"/></dir></dir><dir name="design"><dir name="frontend"><dir name="base"><dir name="default"><dir name="template"><dir name="eems_affiliate"><file name="beacon.phtml" hash="05341e8074f0d575eb796cc46d537a51"/><file name="tracking.phtml" hash="6a5f4895bc2656f81a7b86a04caa3f98"/></dir></dir><dir name="layout"><file name="eems_affiliate.xml" hash="333920eb2a0bdf92505b1031affb577e"/></dir></dir></dir></dir></dir></dir></target></contents></package>
 
 
1
  <?xml version="1.0"?>
2
+ <package><name>eBay_Enterprise_Affiliate_Extension</name><version>1.1.2</version><stability>stable</stability><license>EULA</license><channel>community</channel><extends></extends><summary>eBay Enterprise Affiliate Extension.</summary><description>eBay Enterprise Affiliate Extension.</description><notes>Add Back Necessary Change Log
3
+ Remove Unecessary Change Log
4
+ DE4938 Reset Config Cache After Save</notes><authors><author><name>Michael A. Smith</name><user>msmith3</user><email>msmith3@ebay.com</email></author></authors><date>2015-03-17</date><time>8:44:32</time><compatible></compatible><dependencies><required><php><min>5.3.0</min><max>5.6.99</max></php></required></dependencies><contents><target name="mage"><dir name="app"><dir name="code"><dir name="community"><dir name="EbayEnterprise"><dir name="Affiliate"><dir name="sql"><dir name="eems_affiliate_setup"><file name="install-1.0.0.1.php" hash="f98e9282dcb282d9c29731c513344770"/><file name="mysql4-install-1.0.0.1.php" hash="f98e9282dcb282d9c29731c513344770"/></dir></dir><dir name="Helper"><file name="Config.php" hash="5f08ef84f23a7798013bcea56288b8e4"/><file name="Data.php" hash="7f6c4c7bece8fc8e95cb52da78800621"/><file name="Map.php" hash="baa4d775c2328e0e45d2e8bc00dd8083"/><dir name="Map"><file name="Order.php" hash="27fee01d500d662be4796aa01c1270ef"/><file name="Product.php" hash="f037e9df9f5c9ef87df01a022d7706e0"/></dir></dir><dir name="Block"><file name="Beacon.php" hash="07790d8d8e1a0919f3ec1d4297cd64e1"/><file name="Tracking.php" hash="e9d6eaf93beb55e8fe94330ea8dd32f5"/></dir><dir name="Exception"><file name="Configuration.php" hash="329e9296f4662b6cbf60fe1daef1acd7"/></dir><dir name="etc"><file name="adminhtml.xml" hash="c68a5314867507e9215b2cf3b4b87562"/><file name="config.xml" hash="7ddcedb646a3622670a26dc7f72862ef"/><file name="system.xml" hash="8f1d3775d926300d32c4a610f4f6417f"/></dir><dir name="Model"><file name="Observer.php" hash="ee3dba8505e43f175ee54dea3c7813cb"/><dir name="Feed"><file name="Abstract.php" hash="c34c8b875a7d6da6ab056fa12110d706"/><file name="Product.php" hash="c99bb4b79bb2483270dc2a9615ce8a0e"/><dir name="Order"><file name="Abstract.php" hash="053a2f0f719566a41903f89366f997ea"/><file name="Basic.php" hash="c9e8ce48928c68af62907b62ac692a52"/><file name="Itemized.php" hash="cf8f2f3f51e0d1f912d8e81e0338f6f7"/></dir></dir><dir name="System"><dir name="Config"><dir name="Source"><file name="Attributes.php" hash="3930134c53203f03ad872a6c647679b0"/><file name="Categories.php" hash="4166f8b40f0e0451cd3fce5fd3f7b23f"/><file name="Stockquantity.php" hash="cfa82a3115cf37bb4d8e76b5a627835a"/><file name="Stockyesno.php" hash="236c4532b0935e4e9f25cf99468071a5"/><file name="Transactiontype.php" hash="f929f51e0ec30364607e823cd34d0469"/><file name="Visibilityyesno.php" hash="0262dfcfd0741d217753d39db37d565e"/></dir></dir></dir></dir></dir></dir></dir></dir><dir name="design"><dir name="frontend"><dir name="base"><dir name="default"><dir name="template"><dir name="eems_affiliate"><file name="beacon.phtml" hash="05341e8074f0d575eb796cc46d537a51"/><file name="tracking.phtml" hash="edd58299b79215d7dd11afa589048623"/></dir></dir><dir name="layout"><file name="eems_affiliate.xml" hash="333920eb2a0bdf92505b1031affb577e"/></dir></dir></dir></dir></dir><dir name="etc"><dir name="modules"><file name="EbayEnterprise_Affiliate.xml" hash="2c8823653d3f9c19634df8630c70628b"/></dir></dir></dir></target></contents></package>