yuzu - Version 1.0.1

Version Notes

Official Yuzu plugin for Magento

Download this release

Release Info

Developer Jonathan Martin
Extension yuzu
Version 1.0.1
Comparing to
See all releases


Code changes from version 1.0.0 to 1.0.1

Files changed (14) hide show
  1. app/code/community/Yuzu/Tags/Block/Abstract.php +0 -1
  2. app/code/community/Yuzu/Tags/Block/Checkout.php +0 -1
  3. app/code/community/Yuzu/Tags/Block/Email.php +0 -1
  4. app/code/community/Yuzu/Tags/Block/Tags.php +0 -1
  5. app/code/community/Yuzu/Tags/Helper/Data.php +0 -1
  6. app/code/community/Yuzu/Tags/Model/Data.php +0 -1
  7. app/code/community/Yuzu/Tags/Model/Event.php +0 -1
  8. app/code/community/Yuzu/Tags/Model/Feed.php +0 -1
  9. app/code/community/Yuzu/Tags/Model/Notifier.php +0 -1
  10. app/code/community/Yuzu/Tags/Model/Observer.php +0 -1
  11. app/code/community/Yuzu/Tags/Model/System/Config/Source/Nb.php +0 -1
  12. app/code/community/Yuzu/Tags/controllers/CheckController.php +13 -2
  13. app/code/community/Yuzu/Tags/etc/config.xml +1 -1
  14. package.xml +4 -4
app/code/community/Yuzu/Tags/Block/Abstract.php CHANGED
@@ -5,7 +5,6 @@
5
  *
6
  * @category Yuzu
7
  * @package Yuzu_Tags
8
- * @version 1.0.0
9
  * @copyright Copyright (c) 2015 Yuzu (http://www.yuzu.co)
10
  * @author Jonathan Martin <jonathan@yuzu.co>
11
  */
5
  *
6
  * @category Yuzu
7
  * @package Yuzu_Tags
 
8
  * @copyright Copyright (c) 2015 Yuzu (http://www.yuzu.co)
9
  * @author Jonathan Martin <jonathan@yuzu.co>
10
  */
app/code/community/Yuzu/Tags/Block/Checkout.php CHANGED
@@ -5,7 +5,6 @@
5
  *
6
  * @category Yuzu
7
  * @package Yuzu_Tags
8
- * @version 1.0.0
9
  * @copyright Copyright (c) 2015 Yuzu (http://www.yuzu.co)
10
  * @author Jonathan Martin <jonathan@yuzu.co>
11
  */
5
  *
6
  * @category Yuzu
7
  * @package Yuzu_Tags
 
8
  * @copyright Copyright (c) 2015 Yuzu (http://www.yuzu.co)
9
  * @author Jonathan Martin <jonathan@yuzu.co>
10
  */
app/code/community/Yuzu/Tags/Block/Email.php CHANGED
@@ -5,7 +5,6 @@
5
  *
6
  * @category Yuzu
7
  * @package Yuzu_Tags
8
- * @version 1.0.0
9
  * @copyright Copyright (c) 2015 Yuzu (http://www.yuzu.co)
10
  * @author Jonathan Martin <jonathan@yuzu.co>
11
  */
5
  *
6
  * @category Yuzu
7
  * @package Yuzu_Tags
 
8
  * @copyright Copyright (c) 2015 Yuzu (http://www.yuzu.co)
9
  * @author Jonathan Martin <jonathan@yuzu.co>
10
  */
app/code/community/Yuzu/Tags/Block/Tags.php CHANGED
@@ -5,7 +5,6 @@
5
  *
6
  * @category Yuzu
7
  * @package Yuzu_Tags
8
- * @version 1.0.0
9
  * @copyright Copyright (c) 2015 Yuzu (http://www.yuzu.co)
10
  * @author Jonathan Martin <jonathan@yuzu.co>
11
  */
5
  *
6
  * @category Yuzu
7
  * @package Yuzu_Tags
 
8
  * @copyright Copyright (c) 2015 Yuzu (http://www.yuzu.co)
9
  * @author Jonathan Martin <jonathan@yuzu.co>
10
  */
app/code/community/Yuzu/Tags/Helper/Data.php CHANGED
@@ -5,7 +5,6 @@
5
  *
6
  * @category Yuzu
7
  * @package Yuzu_Tags
8
- * @version 1.0.0
9
  * @copyright Copyright (c) 2015 Yuzu (http://www.yuzu.co)
10
  * @author Jonathan Martin <jonathan@yuzu.co>
11
  */
5
  *
6
  * @category Yuzu
7
  * @package Yuzu_Tags
 
8
  * @copyright Copyright (c) 2015 Yuzu (http://www.yuzu.co)
9
  * @author Jonathan Martin <jonathan@yuzu.co>
10
  */
app/code/community/Yuzu/Tags/Model/Data.php CHANGED
@@ -5,7 +5,6 @@
5
  *
6
  * @category Yuzu
7
  * @package Yuzu_Tags
8
- * @version 1.0.0
9
  * @copyright Copyright (c) 2015 Yuzu (http://www.yuzu.co)
10
  * @author Jonathan Martin <jonathan@yuzu.co>
11
  */
5
  *
6
  * @category Yuzu
7
  * @package Yuzu_Tags
 
8
  * @copyright Copyright (c) 2015 Yuzu (http://www.yuzu.co)
9
  * @author Jonathan Martin <jonathan@yuzu.co>
10
  */
app/code/community/Yuzu/Tags/Model/Event.php CHANGED
@@ -5,7 +5,6 @@
5
  *
6
  * @category Yuzu
7
  * @package Yuzu_Tags
8
- * @version 1.0.0
9
  * @copyright Copyright (c) 2015 Yuzu (http://www.yuzu.co)
10
  * @author Jonathan Martin <jonathan@yuzu.co>
11
  */
5
  *
6
  * @category Yuzu
7
  * @package Yuzu_Tags
 
8
  * @copyright Copyright (c) 2015 Yuzu (http://www.yuzu.co)
9
  * @author Jonathan Martin <jonathan@yuzu.co>
10
  */
app/code/community/Yuzu/Tags/Model/Feed.php CHANGED
@@ -5,7 +5,6 @@
5
  *
6
  * @category Yuzu
7
  * @package Yuzu_Tags
8
- * @version 1.0.0
9
  * @copyright Copyright (c) 2015 Yuzu (http://www.yuzu.co)
10
  * @author Jonathan Martin <jonathan@yuzu.co>
11
  */
5
  *
6
  * @category Yuzu
7
  * @package Yuzu_Tags
 
8
  * @copyright Copyright (c) 2015 Yuzu (http://www.yuzu.co)
9
  * @author Jonathan Martin <jonathan@yuzu.co>
10
  */
app/code/community/Yuzu/Tags/Model/Notifier.php CHANGED
@@ -5,7 +5,6 @@
5
  *
6
  * @category Yuzu
7
  * @package Yuzu_Tags
8
- * @version 1.0.0
9
  * @copyright Copyright (c) 2015 Yuzu (http://www.yuzu.co)
10
  * @author Jonathan Martin <jonathan@yuzu.co>
11
  */
5
  *
6
  * @category Yuzu
7
  * @package Yuzu_Tags
 
8
  * @copyright Copyright (c) 2015 Yuzu (http://www.yuzu.co)
9
  * @author Jonathan Martin <jonathan@yuzu.co>
10
  */
app/code/community/Yuzu/Tags/Model/Observer.php CHANGED
@@ -5,7 +5,6 @@
5
  *
6
  * @category Yuzu
7
  * @package Yuzu_Tags
8
- * @version 1.0.0
9
  * @copyright Copyright (c) 2015 Yuzu (http://www.yuzu.co)
10
  * @author Jonathan Martin <jonathan@yuzu.co>
11
  */
5
  *
6
  * @category Yuzu
7
  * @package Yuzu_Tags
 
8
  * @copyright Copyright (c) 2015 Yuzu (http://www.yuzu.co)
9
  * @author Jonathan Martin <jonathan@yuzu.co>
10
  */
app/code/community/Yuzu/Tags/Model/System/Config/Source/Nb.php CHANGED
@@ -5,7 +5,6 @@
5
  *
6
  * @category Yuzu
7
  * @package Yuzu_Tags
8
- * @version 1.0.0
9
  * @copyright Copyright (c) 2015 Yuzu (http://www.yuzu.co)
10
  * @author Jonathan Martin <jonathan@yuzu.co>
11
  */
5
  *
6
  * @category Yuzu
7
  * @package Yuzu_Tags
 
8
  * @copyright Copyright (c) 2015 Yuzu (http://www.yuzu.co)
9
  * @author Jonathan Martin <jonathan@yuzu.co>
10
  */
app/code/community/Yuzu/Tags/controllers/CheckController.php CHANGED
@@ -5,7 +5,6 @@
5
  *
6
  * @category Yuzu
7
  * @package Yuzu_Tags
8
- * @version 1.0.0
9
  * @copyright Copyright (c) 2015 Yuzu (http://www.yuzu.co)
10
  * @author Jonathan Martin <jonathan@yuzu.co>
11
  */
@@ -13,16 +12,28 @@ class Yuzu_Tags_CheckController extends Mage_Core_Controller_Front_Action
13
  {
14
  public function statusAction()
15
  {
 
16
  $merchantKey = Mage::helper('yuzu_tags')->getConfig('yuzu_tags/general/merchant_key');
17
  $secretKey = Mage::helper('yuzu_tags')->getConfig('yuzu_tags/general/secret_key');
18
  $enabled = Mage::helper('yuzu_tags')->getConfig('yuzu_tags/general/enable');
 
 
 
 
 
19
 
20
  $response = array(
 
21
  'mage_version' => Mage::getVersion(),
22
  'php_version' => phpversion(),
23
  'merchant_key' => ($merchantKey) ? true : false,
24
  'secret_key' => ($secretKey) ? true : false,
25
- 'enabled' => ($enabled) ? true : false
 
 
 
 
 
26
  );
27
 
28
  $this->getResponse()->setHeader('Content-type', 'application/json');
5
  *
6
  * @category Yuzu
7
  * @package Yuzu_Tags
 
8
  * @copyright Copyright (c) 2015 Yuzu (http://www.yuzu.co)
9
  * @author Jonathan Martin <jonathan@yuzu.co>
10
  */
12
  {
13
  public function statusAction()
14
  {
15
+ $config = (array) Mage::getConfig()->getModuleConfig("Yuzu_Tags");
16
  $merchantKey = Mage::helper('yuzu_tags')->getConfig('yuzu_tags/general/merchant_key');
17
  $secretKey = Mage::helper('yuzu_tags')->getConfig('yuzu_tags/general/secret_key');
18
  $enabled = Mage::helper('yuzu_tags')->getConfig('yuzu_tags/general/enable');
19
+ $inCheckout = Mage::helper('yuzu_tags')->getConfig('yuzu_tags/offers/in_checkout');
20
+ $inOrderDetail = Mage::helper('yuzu_tags')->getConfig('yuzu_tags/offers/in_order_detail');
21
+ $emailOrder = Mage::helper('yuzu_tags')->getConfig('yuzu_tags/offers/in_email_confirmation_order');
22
+ $emailInvoice = Mage::helper('yuzu_tags')->getConfig('yuzu_tags/offers/in_email_invoice');
23
+ $emailShipment = Mage::helper('yuzu_tags')->getConfig('yuzu_tags/offers/in_email_shipment');
24
 
25
  $response = array(
26
+ 'version' => $config['version'],
27
  'mage_version' => Mage::getVersion(),
28
  'php_version' => phpversion(),
29
  'merchant_key' => ($merchantKey) ? true : false,
30
  'secret_key' => ($secretKey) ? true : false,
31
+ 'enabled' => ($enabled) ? true : false,
32
+ 'in_checkout' => ($inCheckout) ? true : false,
33
+ 'in_order_detail' => ($inOrderDetail) ? true : false,
34
+ 'email_order' => ($emailOrder) ? true : false,
35
+ 'email_invoice' => ($emailInvoice) ? true : false,
36
+ 'email_shipment' => ($emailShipment) ? true : false,
37
  );
38
 
39
  $this->getResponse()->setHeader('Content-type', 'application/json');
app/code/community/Yuzu/Tags/etc/config.xml CHANGED
@@ -2,7 +2,7 @@
2
  <config>
3
  <modules>
4
  <Yuzu_Tags>
5
- <version>1.0.0</version>
6
  </Yuzu_Tags>
7
  </modules>
8
 
2
  <config>
3
  <modules>
4
  <Yuzu_Tags>
5
+ <version>1.0.1</version>
6
  </Yuzu_Tags>
7
  </modules>
8
 
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>yuzu</name>
4
- <version>1.0.0</version>
5
  <stability>stable</stability>
6
  <license uri="http://www.yuzu.co">Custom licence</license>
7
  <channel>community</channel>
@@ -10,9 +10,9 @@
10
  <description>Yuzu</description>
11
  <notes>Official Yuzu plugin for Magento</notes>
12
  <authors><author><name>Jonathan Martin</name><user>jmartin</user><email>jonathan@yuzu.co</email></author></authors>
13
- <date>2015-02-09</date>
14
- <time>17:25:53</time>
15
- <contents><target name="magecommunity"><dir name="Yuzu"><dir name="Tags"><dir name="Block"><file name="Abstract.php" hash="1f88a40352e1b0192a4e8a9835ca79ad"/><file name="Checkout.php" hash="a52c4c134ea9d0c3818c79f34f5c013e"/><file name="Email.php" hash="472fb0038d3d8171b8209ca76018b4ef"/><file name="Tags.php" hash="9803f9d837bed1e3da7c4b42b3996f89"/></dir><dir name="Helper"><file name="Data.php" hash="77f09db03a5aae09be0e9cc801ebd412"/></dir><dir name="Model"><file name="Data.php" hash="38a8a695ca9a61a2160dd2ea48cc6b6d"/><file name="Event.php" hash="192c6918f478d676d3260de461501d82"/><file name="Feed.php" hash="40278b4837036fcd88641af6d2888fee"/><file name="Notifier.php" hash="beaa0f9aa9bcccb7e6402740c460d4ae"/><file name="Observer.php" hash="a9038e22f48354c5b1a6f706f7e993db"/><dir name="System"><dir name="Config"><dir name="Source"><file name="Nb.php" hash="1e1bf27b4749a2f3caa9bed5c45c7bf7"/></dir></dir></dir></dir><dir name="controllers"><file name="CheckController.php" hash="aeb20ad798dfa91cb5168e56a8a98cd4"/></dir><dir name="etc"><file name="adminhtml.xml" hash="1402ebcefa884063791db10144f314a3"/><file name="config.xml" hash="a75571aec0220df574846236e102ce84"/><file name="system.xml" hash="71eedce33809fcb50ff760c5a59ef43a"/></dir></dir></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="yuzu_tags.xml" hash="41a0c1814174885fd3d21eaf0612fe9e"/></dir><dir name="template"><dir name="yuzu_tags"><file name="async_tag.phtml" hash="6d64dc98d0886411a7833de6e9a76ccf"/><dir><dir name="email"><dir name="invoice"><file name="items.phtml" hash="a69e17038115272fc4b1f2f7318f7c35"/></dir><file name="offers.phtml" hash="83ad1604a5d6029af17083f0ff3ddaa0"/><dir name="order"><file name="items.phtml" hash="7e604a8b4b29183499f2673d28daba55"/></dir><dir name="shipment"><file name="items.phtml" hash="997065e2d6a6fec7704c99a743521731"/></dir></dir></dir><file name="event.phtml" hash="04de9167cd5165aff94d86e1df0c33af"/><file name="iframewrap.phtml" hash="8d0c1cf0ef68b8262cb3ac96d2359776"/><file name="init.phtml" hash="c13aad83caeec260587c16a8ff0c71de"/><file name="post_purchase.phtml" hash="6e95f079b990cde565931a02cfe5e98b"/></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Yuzu_Tags.xml" hash="966c25c3c7f93c697b07295201bb460c"/></dir></target></contents>
16
  <compatible/>
17
  <dependencies><required><php><min>5.2.0</min><max>5.6.0</max></php></required></dependencies>
18
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>yuzu</name>
4
+ <version>1.0.1</version>
5
  <stability>stable</stability>
6
  <license uri="http://www.yuzu.co">Custom licence</license>
7
  <channel>community</channel>
10
  <description>Yuzu</description>
11
  <notes>Official Yuzu plugin for Magento</notes>
12
  <authors><author><name>Jonathan Martin</name><user>jmartin</user><email>jonathan@yuzu.co</email></author></authors>
13
+ <date>2015-02-12</date>
14
+ <time>17:32:14</time>
15
+ <contents><target name="magecommunity"><dir name="Yuzu"><dir name="Tags"><dir name="Block"><file name="Abstract.php" hash="91c9266905c53ac9bf3d39fa311774ac"/><file name="Checkout.php" hash="7027a87b8282f517cf2cfe4939e6aad0"/><file name="Email.php" hash="2972f781ff145ac1a9419a58f84d023e"/><file name="Tags.php" hash="2cdaa0836f4c0a834e7d2fef9904f4c4"/></dir><dir name="Helper"><file name="Data.php" hash="76a99c5f494b66c8cfde97687e987def"/></dir><dir name="Model"><file name="Data.php" hash="e3985f42b22422a0d75ee56f68272d44"/><file name="Event.php" hash="87423a3e8a3d696cbf758c01e9501a3a"/><file name="Feed.php" hash="704c1b798925ed46d7e754170fcd172c"/><file name="Notifier.php" hash="e8fd5f3b758f5f761d849e808f9ecc0d"/><file name="Observer.php" hash="52248f11e7a978839e3a262499dc7f06"/><dir name="System"><dir name="Config"><dir name="Source"><file name="Nb.php" hash="fc539e10886ba8a5c9af56c991cd63d0"/></dir></dir></dir></dir><dir name="controllers"><file name="CheckController.php" hash="8ec828451efdcdfd31bb1344a76e3fe1"/></dir><dir name="etc"><file name="adminhtml.xml" hash="1402ebcefa884063791db10144f314a3"/><file name="config.xml" hash="bc5e97cbf41b6a4aaaeafd0fac215592"/><file name="system.xml" hash="71eedce33809fcb50ff760c5a59ef43a"/></dir></dir></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="yuzu_tags.xml" hash="41a0c1814174885fd3d21eaf0612fe9e"/></dir><dir name="template"><dir name="yuzu_tags"><file name="async_tag.phtml" hash="6d64dc98d0886411a7833de6e9a76ccf"/><dir><dir name="email"><dir name="invoice"><file name="items.phtml" hash="a69e17038115272fc4b1f2f7318f7c35"/></dir><file name="offers.phtml" hash="83ad1604a5d6029af17083f0ff3ddaa0"/><dir name="order"><file name="items.phtml" hash="7e604a8b4b29183499f2673d28daba55"/></dir><dir name="shipment"><file name="items.phtml" hash="997065e2d6a6fec7704c99a743521731"/></dir></dir></dir><file name="event.phtml" hash="04de9167cd5165aff94d86e1df0c33af"/><file name="iframewrap.phtml" hash="8d0c1cf0ef68b8262cb3ac96d2359776"/><file name="init.phtml" hash="c13aad83caeec260587c16a8ff0c71de"/><file name="post_purchase.phtml" hash="6e95f079b990cde565931a02cfe5e98b"/></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Yuzu_Tags.xml" hash="966c25c3c7f93c697b07295201bb460c"/></dir></target></contents>
16
  <compatible/>
17
  <dependencies><required><php><min>5.2.0</min><max>5.6.0</max></php></required></dependencies>
18
  </package>