Version Notes
Official Yuzu plugin for Magento
Download this release
Release Info
Developer | Jonathan Martin |
Extension | yuzu |
Version | 1.0.4 |
Comparing to | |
See all releases |
Code changes from version 1.0.3 to 1.0.4
- app/code/community/Yuzu/Tags/Helper/Data.php +5 -0
- app/code/community/Yuzu/Tags/Model/Observer.php +34 -0
- app/code/community/Yuzu/Tags/controllers/CheckController.php +4 -10
- app/code/community/Yuzu/Tags/etc/config.xml +7 -10
- app/code/community/Yuzu/Tags/etc/system.xml +24 -112
- app/design/frontend/base/default/layout/yuzu_tags.xml +9 -9
- app/design/frontend/base/default/template/yuzu_tags/init.phtml +1 -1
- package.xml +4 -4
app/code/community/Yuzu/Tags/Helper/Data.php
CHANGED
@@ -17,4 +17,9 @@ class Yuzu_Tags_Helper_Data extends Mage_Core_Helper_Abstract
|
|
17 |
}
|
18 |
return Mage::getStoreConfig($key, $store);
|
19 |
}
|
|
|
|
|
|
|
|
|
|
|
20 |
}
|
17 |
}
|
18 |
return Mage::getStoreConfig($key, $store);
|
19 |
}
|
20 |
+
|
21 |
+
public function setConfig($key, $value)
|
22 |
+
{
|
23 |
+
Mage::getModel('core/config')->saveConfig($key, $value);
|
24 |
+
}
|
25 |
}
|
app/code/community/Yuzu/Tags/Model/Observer.php
CHANGED
@@ -21,6 +21,40 @@ class Yuzu_Tags_Model_Observer
|
|
21 |
$roleId = $this->getOrCreateRole();
|
22 |
$this->getOrCreateUser($roleId, $secretKey);
|
23 |
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
24 |
}
|
25 |
|
26 |
/**
|
21 |
$roleId = $this->getOrCreateRole();
|
22 |
$this->getOrCreateUser($roleId, $secretKey);
|
23 |
}
|
24 |
+
|
25 |
+
$enable = Mage::helper('yuzu_tags')->getConfig('yuzu_tags/general/enable');
|
26 |
+
$apiKey = Mage::helper('yuzu_tags')->getConfig('yuzu_tags/general/merchant_key');
|
27 |
+
$monetize = Mage::helper('yuzu_tags')->getConfig('yuzu_tags/general/monetize');
|
28 |
+
$inEmail = Mage::helper('yuzu_tags')->getConfig('yuzu_tags/advanced/in_email');
|
29 |
+
|
30 |
+
if ($enable && $apiKey && $monetize && $inEmail) {
|
31 |
+
Mage::helper('yuzu_tags')->setConfig('yuzu_tags/advanced/ready_in_email', true);
|
32 |
+
} else {
|
33 |
+
Mage::helper('yuzu_tags')->setConfig('yuzu_tags/advanced/ready_in_email', false);
|
34 |
+
}
|
35 |
+
|
36 |
+
$this->sendPing();
|
37 |
+
}
|
38 |
+
|
39 |
+
private function sendPing()
|
40 |
+
{
|
41 |
+
try {
|
42 |
+
|
43 |
+
$iClient = new Varien_Http_Client();
|
44 |
+
$iClient->setUri('https://my.yuzu.co/embed/magento/ping')
|
45 |
+
->setMethod('POST')
|
46 |
+
->setConfig(array(
|
47 |
+
'maxredirects'=>0,
|
48 |
+
'timeout'=>30,
|
49 |
+
));
|
50 |
+
$iClient->setRawData(json_encode(array(
|
51 |
+
"url" => Mage::getBaseUrl(),
|
52 |
+
"email" => Mage::getStoreConfig('trans_email/ident_general/email')
|
53 |
+
)), "application/json;charset=UTF-8");
|
54 |
+
$response = $iClient->request();
|
55 |
+
} catch(\Exception $e) {
|
56 |
+
|
57 |
+
}
|
58 |
}
|
59 |
|
60 |
/**
|
app/code/community/Yuzu/Tags/controllers/CheckController.php
CHANGED
@@ -16,11 +16,8 @@ class Yuzu_Tags_CheckController extends Mage_Core_Controller_Front_Action
|
|
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 |
-
$
|
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'],
|
@@ -31,11 +28,8 @@ class Yuzu_Tags_CheckController extends Mage_Core_Controller_Front_Action
|
|
31 |
'merchant_key' => ($merchantKey) ? true : false,
|
32 |
'secret_key' => ($secretKey) ? true : false,
|
33 |
'enabled' => ($enabled) ? true : false,
|
34 |
-
'
|
35 |
-
|
36 |
-
'email_order' => ($emailOrder) ? true : false,
|
37 |
-
'email_invoice' => ($emailInvoice) ? true : false,
|
38 |
-
'email_shipment' => ($emailShipment) ? true : false,
|
39 |
);
|
40 |
|
41 |
$this->getResponse()->setHeader('Content-type', 'application/json');
|
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 |
+
$monetize = Mage::helper('yuzu_tags')->getConfig('yuzu_tags/general/monetize');
|
20 |
+
$inEmail = Mage::helper('yuzu_tags')->getConfig('yuzu_tags/advanced/in_email');
|
|
|
|
|
|
|
21 |
|
22 |
$response = array(
|
23 |
'version' => $config['version'],
|
28 |
'merchant_key' => ($merchantKey) ? true : false,
|
29 |
'secret_key' => ($secretKey) ? true : false,
|
30 |
'enabled' => ($enabled) ? true : false,
|
31 |
+
'monetize' => ($monetize) ? true : false,
|
32 |
+
'in_email' => ($inEmail) ? true : false,
|
|
|
|
|
|
|
33 |
);
|
34 |
|
35 |
$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.
|
6 |
</Yuzu_Tags>
|
7 |
</modules>
|
8 |
|
@@ -71,18 +71,15 @@
|
|
71 |
<yuzu_tags>
|
72 |
<feed_url>my.yuzu.co/mage-notifications.rss</feed_url>
|
73 |
<general>
|
74 |
-
<tag_url_js>//cs.yuzu.co/js/collect/yuzu-
|
75 |
<tag_url_collect>//cs.yuzu.co</tag_url_collect>
|
76 |
<enable>0</enable>
|
|
|
77 |
</general>
|
78 |
-
<
|
79 |
-
<
|
80 |
-
<
|
81 |
-
|
82 |
-
<in_email_confirmation_order>1</in_email_confirmation_order>
|
83 |
-
<in_email_invoice>1</in_email_invoice>
|
84 |
-
<in_email_shipment>1</in_email_shipment>
|
85 |
-
</offers>
|
86 |
<events>
|
87 |
<product_addcart_form_selector>#product_addtocart_form</product_addcart_form_selector>
|
88 |
<product_addcart_button_selector>#product_addtocart_form .add-to-cart-buttons button</product_addcart_button_selector>
|
2 |
<config>
|
3 |
<modules>
|
4 |
<Yuzu_Tags>
|
5 |
+
<version>1.0.4</version>
|
6 |
</Yuzu_Tags>
|
7 |
</modules>
|
8 |
|
71 |
<yuzu_tags>
|
72 |
<feed_url>my.yuzu.co/mage-notifications.rss</feed_url>
|
73 |
<general>
|
74 |
+
<tag_url_js>//cs.yuzu.co/js/collect/yuzu-latest.js</tag_url_js>
|
75 |
<tag_url_collect>//cs.yuzu.co</tag_url_collect>
|
76 |
<enable>0</enable>
|
77 |
+
<monetize>1</monetize>
|
78 |
</general>
|
79 |
+
<advanced>
|
80 |
+
<in_email>1</in_email>
|
81 |
+
<ready_in_email>0</ready_in_email>
|
82 |
+
</advanced>
|
|
|
|
|
|
|
|
|
83 |
<events>
|
84 |
<product_addcart_form_selector>#product_addtocart_form</product_addcart_form_selector>
|
85 |
<product_addcart_button_selector>#product_addtocart_form .add-to-cart-buttons button</product_addcart_button_selector>
|
app/code/community/Yuzu/Tags/etc/system.xml
CHANGED
@@ -20,7 +20,7 @@
|
|
20 |
<show_in_store>1</show_in_store>
|
21 |
<groups>
|
22 |
<general translate="label">
|
23 |
-
<comment><
|
24 |
<label>General</label>
|
25 |
<frontend_type>text</frontend_type>
|
26 |
<sort_order>0</sort_order>
|
@@ -29,10 +29,7 @@
|
|
29 |
<show_in_store>1</show_in_store>
|
30 |
<fields>
|
31 |
<enable translate="label">
|
32 |
-
<label>
|
33 |
-
<comment>
|
34 |
-
<![CDATA[<span class="notice">Enable/Disable this plugin</span>]]>
|
35 |
-
</comment>
|
36 |
<frontend_type>select</frontend_type>
|
37 |
<source_model>adminhtml/system_config_source_yesno</source_model>
|
38 |
<sort_order>1</sort_order>
|
@@ -61,127 +58,42 @@
|
|
61 |
<show_in_website>1</show_in_website>
|
62 |
<show_in_store>1</show_in_store>
|
63 |
</secret_key>
|
64 |
-
|
65 |
-
|
66 |
-
|
67 |
-
|
68 |
-
|
69 |
-
<frontend_type>text</frontend_type>
|
70 |
-
<sort_order>1</sort_order>
|
71 |
-
<show_in_default>1</show_in_default>
|
72 |
-
<show_in_website>1</show_in_website>
|
73 |
-
<show_in_store>1</show_in_store>
|
74 |
-
<fields>
|
75 |
-
<in_checkout translate="label">
|
76 |
-
<label>Display in checkout success</label>
|
77 |
-
<frontend_type>select</frontend_type>
|
78 |
-
<source_model>adminhtml/system_config_source_yesno</source_model>
|
79 |
-
<sort_order>2</sort_order>
|
80 |
-
<show_in_default>1</show_in_default>
|
81 |
-
<show_in_website>1</show_in_website>
|
82 |
-
<show_in_store>1</show_in_store>
|
83 |
-
</in_checkout>
|
84 |
-
<in_order_detail translate="label">
|
85 |
-
<label>Display in order show</label>
|
86 |
-
<frontend_type>select</frontend_type>
|
87 |
-
<source_model>adminhtml/system_config_source_yesno</source_model>
|
88 |
-
<sort_order>3</sort_order>
|
89 |
-
<show_in_default>1</show_in_default>
|
90 |
-
<show_in_website>1</show_in_website>
|
91 |
-
<show_in_store>1</show_in_store>
|
92 |
-
</in_order_detail>
|
93 |
-
<in_email_confirmation_order translate="label">
|
94 |
-
<label>Display in order confirmation email</label>
|
95 |
<frontend_type>select</frontend_type>
|
96 |
<source_model>adminhtml/system_config_source_yesno</source_model>
|
97 |
<sort_order>4</sort_order>
|
98 |
<show_in_default>1</show_in_default>
|
99 |
<show_in_website>1</show_in_website>
|
100 |
<show_in_store>1</show_in_store>
|
101 |
-
</
|
102 |
-
<in_email_invoice translate="label">
|
103 |
-
<label>Display in invoice email</label>
|
104 |
-
<frontend_type>select</frontend_type>
|
105 |
-
<source_model>adminhtml/system_config_source_yesno</source_model>
|
106 |
-
<sort_order>5</sort_order>
|
107 |
-
<show_in_default>1</show_in_default>
|
108 |
-
<show_in_website>1</show_in_website>
|
109 |
-
<show_in_store>1</show_in_store>
|
110 |
-
</in_email_invoice>
|
111 |
-
<in_email_shipment translate="label">
|
112 |
-
<label>Display in shipment email</label>
|
113 |
-
<frontend_type>select</frontend_type>
|
114 |
-
<source_model>adminhtml/system_config_source_yesno</source_model>
|
115 |
-
<sort_order>6</sort_order>
|
116 |
-
<show_in_default>1</show_in_default>
|
117 |
-
<show_in_website>1</show_in_website>
|
118 |
-
<show_in_store>1</show_in_store>
|
119 |
-
</in_email_shipment>
|
120 |
-
<nb translate="label">
|
121 |
-
<label>Nb offers to display in emails</label>
|
122 |
-
<frontend_type>select</frontend_type>
|
123 |
-
<source_model>yuzu_tags/system_config_source_nb</source_model>
|
124 |
-
<sort_order>7</sort_order>
|
125 |
-
<show_in_default>1</show_in_default>
|
126 |
-
<show_in_website>1</show_in_website>
|
127 |
-
<show_in_store>1</show_in_store>
|
128 |
-
</nb>
|
129 |
</fields>
|
130 |
-
</
|
131 |
-
<
|
132 |
-
<label>
|
133 |
<frontend_type>text</frontend_type>
|
134 |
-
<sort_order>
|
135 |
<show_in_default>1</show_in_default>
|
136 |
<show_in_website>1</show_in_website>
|
137 |
<show_in_store>1</show_in_store>
|
138 |
<fields>
|
139 |
-
<
|
140 |
-
<label>
|
141 |
-
|
142 |
-
|
143 |
-
|
144 |
-
<frontend_type>text</frontend_type>
|
145 |
-
<sort_order>10</sort_order>
|
146 |
-
<show_in_default>1</show_in_default>
|
147 |
-
<show_in_website>1</show_in_website>
|
148 |
-
<show_in_store>1</show_in_store>
|
149 |
-
</product_addcart_form_selector>
|
150 |
-
<product_addcart_button_selector translate="label">
|
151 |
-
<label>Product - "Add To cart" button css selector</label>
|
152 |
-
<comment>
|
153 |
-
<![CDATA[<span class="notice">Product Page - "Add to cart" button css selector</span>]]>
|
154 |
</comment>
|
155 |
-
|
156 |
-
|
157 |
-
|
158 |
-
|
159 |
-
|
160 |
-
</
|
161 |
-
<product_addwishlist_button_selector translate="label">
|
162 |
-
<label>Product - "Add To wishlist" button css selector</label>
|
163 |
-
<comment>
|
164 |
-
<![CDATA[<span class="notice">Product Page - "Add to wishlist" button css selector</span>]]>
|
165 |
-
</comment>
|
166 |
-
<frontend_type>text</frontend_type>
|
167 |
-
<sort_order>20</sort_order>
|
168 |
-
<show_in_default>1</show_in_default>
|
169 |
-
<show_in_website>1</show_in_website>
|
170 |
-
<show_in_store>1</show_in_store>
|
171 |
-
</product_addwishlist_button_selector>
|
172 |
-
<product_addcompare_button_selector translate="label">
|
173 |
-
<label>Product - "Add To compare" button css selector</label>
|
174 |
-
<comment>
|
175 |
-
<![CDATA[<span class="notice">Product Page - "Add to compare" button css selector</span>]]>
|
176 |
-
</comment>
|
177 |
-
<frontend_type>text</frontend_type>
|
178 |
-
<sort_order>25</sort_order>
|
179 |
-
<show_in_default>1</show_in_default>
|
180 |
-
<show_in_website>1</show_in_website>
|
181 |
-
<show_in_store>1</show_in_store>
|
182 |
-
</product_addcompare_button_selector>
|
183 |
</fields>
|
184 |
-
</
|
185 |
</groups>
|
186 |
</yuzu_tags>
|
187 |
</sections>
|
20 |
<show_in_store>1</show_in_store>
|
21 |
<groups>
|
22 |
<general translate="label">
|
23 |
+
<comment><iframe src="//my.yuzu.co/embed/magento" width="100%" height="340" frameborder="0" style="border: 0px;"></iframe ></comment>
|
24 |
<label>General</label>
|
25 |
<frontend_type>text</frontend_type>
|
26 |
<sort_order>0</sort_order>
|
29 |
<show_in_store>1</show_in_store>
|
30 |
<fields>
|
31 |
<enable translate="label">
|
32 |
+
<label>Enabled</label>
|
|
|
|
|
|
|
33 |
<frontend_type>select</frontend_type>
|
34 |
<source_model>adminhtml/system_config_source_yesno</source_model>
|
35 |
<sort_order>1</sort_order>
|
58 |
<show_in_website>1</show_in_website>
|
59 |
<show_in_store>1</show_in_store>
|
60 |
</secret_key>
|
61 |
+
<monetize translate="label">
|
62 |
+
<label>Monetize your receipts</label>
|
63 |
+
<comment>
|
64 |
+
<![CDATA[<span class="notice">If "Yes", you will reward your customers on order confirmation page & email after their purchase with awesome offers from Yuzu network</strong></span>]]>
|
65 |
+
</comment>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
66 |
<frontend_type>select</frontend_type>
|
67 |
<source_model>adminhtml/system_config_source_yesno</source_model>
|
68 |
<sort_order>4</sort_order>
|
69 |
<show_in_default>1</show_in_default>
|
70 |
<show_in_website>1</show_in_website>
|
71 |
<show_in_store>1</show_in_store>
|
72 |
+
</monetize>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
73 |
</fields>
|
74 |
+
</general>
|
75 |
+
<advanced>
|
76 |
+
<label>Advanced settings</label>
|
77 |
<frontend_type>text</frontend_type>
|
78 |
+
<sort_order>1</sort_order>
|
79 |
<show_in_default>1</show_in_default>
|
80 |
<show_in_website>1</show_in_website>
|
81 |
<show_in_store>1</show_in_store>
|
82 |
<fields>
|
83 |
+
<in_email translate="label">
|
84 |
+
<label>Send offers in emails</label>
|
85 |
+
<frontend_type>select</frontend_type>
|
86 |
+
<comment>
|
87 |
+
<![CDATA[<span class="notice">If "Yes", you will reward your customers with awesome offers from Yuzu network in transactionals emails (order confirmation/invoice/shipment)</strong></span>]]>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
88 |
</comment>
|
89 |
+
<source_model>adminhtml/system_config_source_yesno</source_model>
|
90 |
+
<sort_order>4</sort_order>
|
91 |
+
<show_in_default>1</show_in_default>
|
92 |
+
<show_in_website>1</show_in_website>
|
93 |
+
<show_in_store>1</show_in_store>
|
94 |
+
</in_email>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
95 |
</fields>
|
96 |
+
</advanced>
|
97 |
</groups>
|
98 |
</yuzu_tags>
|
99 |
</sections>
|
app/design/frontend/base/default/layout/yuzu_tags.xml
CHANGED
@@ -1,7 +1,7 @@
|
|
1 |
<layout version="0.1.0">
|
2 |
|
3 |
<default>
|
4 |
-
<reference name="head">
|
5 |
<block type="yuzu_tags/tags" template="yuzu_tags/async_tag.phtml"/>
|
6 |
</reference>
|
7 |
<reference name="after_body_start">
|
@@ -13,38 +13,38 @@
|
|
13 |
<sales_order_view>
|
14 |
<block type="yuzu_tags/checkout" name="yuzu_post_purchase" template="yuzu_tags/post_purchase.phtml"/>
|
15 |
<reference name="my.account.wrapper">
|
16 |
-
<action method="append" ifconfig="yuzu_tags/
|
17 |
</reference>
|
18 |
</sales_order_view>
|
19 |
|
20 |
<checkout_onepage_success>
|
21 |
<block type="yuzu_tags/checkout" name="yuzu_wrap" template="yuzu_tags/iframewrap.phtml"/>
|
22 |
<reference name="content">
|
23 |
-
<action method="append" ifconfig="yuzu_tags/
|
24 |
</reference>
|
25 |
</checkout_onepage_success>
|
26 |
|
27 |
<sales_email_order_items>
|
28 |
<block type="yuzu_tags/email" name="yuzu_offers" template="yuzu_tags/email/offers.phtml"/>
|
29 |
<reference name="items">
|
30 |
-
<action method="setTemplate" ifconfig="yuzu_tags/
|
31 |
-
<action method="append" ifconfig="yuzu_tags/
|
32 |
</reference>
|
33 |
</sales_email_order_items>
|
34 |
|
35 |
<sales_email_order_invoice_items>
|
36 |
<block type="yuzu_tags/email" name="yuzu_offers" template="yuzu_tags/email/offers.phtml"/>
|
37 |
<reference name="items">
|
38 |
-
<action method="setTemplate" ifconfig="yuzu_tags/
|
39 |
-
<action method="append" ifconfig="yuzu_tags/
|
40 |
</reference>
|
41 |
</sales_email_order_invoice_items>
|
42 |
|
43 |
<sales_email_order_shipment_items>
|
44 |
<block type="yuzu_tags/email" name="yuzu_offers" template="yuzu_tags/email/offers.phtml"/>
|
45 |
<reference name="items">
|
46 |
-
<action method="setTemplate" ifconfig="yuzu_tags/
|
47 |
-
<action method="append" ifconfig="yuzu_tags/
|
48 |
</reference>
|
49 |
</sales_email_order_shipment_items>
|
50 |
|
1 |
<layout version="0.1.0">
|
2 |
|
3 |
<default>
|
4 |
+
<reference name="head">
|
5 |
<block type="yuzu_tags/tags" template="yuzu_tags/async_tag.phtml"/>
|
6 |
</reference>
|
7 |
<reference name="after_body_start">
|
13 |
<sales_order_view>
|
14 |
<block type="yuzu_tags/checkout" name="yuzu_post_purchase" template="yuzu_tags/post_purchase.phtml"/>
|
15 |
<reference name="my.account.wrapper">
|
16 |
+
<action method="append" ifconfig="yuzu_tags/general/monetize"><block>yuzu_post_purchase</block></action>
|
17 |
</reference>
|
18 |
</sales_order_view>
|
19 |
|
20 |
<checkout_onepage_success>
|
21 |
<block type="yuzu_tags/checkout" name="yuzu_wrap" template="yuzu_tags/iframewrap.phtml"/>
|
22 |
<reference name="content">
|
23 |
+
<action method="append" ifconfig="yuzu_tags/general/monetize"><block>yuzu_wrap</block></action>
|
24 |
</reference>
|
25 |
</checkout_onepage_success>
|
26 |
|
27 |
<sales_email_order_items>
|
28 |
<block type="yuzu_tags/email" name="yuzu_offers" template="yuzu_tags/email/offers.phtml"/>
|
29 |
<reference name="items">
|
30 |
+
<action method="setTemplate" ifconfig="yuzu_tags/advanced/ready_in_email"><template>yuzu_tags/email/order/items.phtml</template></action>
|
31 |
+
<action method="append" ifconfig="yuzu_tags/advanced/ready_in_email"><block>yuzu_offers</block></action>
|
32 |
</reference>
|
33 |
</sales_email_order_items>
|
34 |
|
35 |
<sales_email_order_invoice_items>
|
36 |
<block type="yuzu_tags/email" name="yuzu_offers" template="yuzu_tags/email/offers.phtml"/>
|
37 |
<reference name="items">
|
38 |
+
<action method="setTemplate" ifconfig="yuzu_tags/advanced/ready_in_email"><template>yuzu_tags/email/invoice/items.phtml</template></action>
|
39 |
+
<action method="append" ifconfig="yuzu_tags/advanced/ready_in_email"><block>yuzu_offers</block></action>
|
40 |
</reference>
|
41 |
</sales_email_order_invoice_items>
|
42 |
|
43 |
<sales_email_order_shipment_items>
|
44 |
<block type="yuzu_tags/email" name="yuzu_offers" template="yuzu_tags/email/offers.phtml"/>
|
45 |
<reference name="items">
|
46 |
+
<action method="setTemplate" ifconfig="yuzu_tags/advanced/ready_in_email"><template>yuzu_tags/email/shipment/items.phtml</template></action>
|
47 |
+
<action method="append" ifconfig="yuzu_tags/advanced/ready_in_email"><block>yuzu_offers</block></action>
|
48 |
</reference>
|
49 |
</sales_email_order_shipment_items>
|
50 |
|
app/design/frontend/base/default/template/yuzu_tags/init.phtml
CHANGED
@@ -1,4 +1,4 @@
|
|
1 |
-
<?php if ($this->isEnabled()): ?>
|
2 |
<script type="text/javascript">
|
3 |
(function(){
|
4 |
Yuzu.configure({
|
1 |
+
<?php if ($this->isEnabled() && $this->getMerchantKey()): ?>
|
2 |
<script type="text/javascript">
|
3 |
(function(){
|
4 |
Yuzu.configure({
|
package.xml
CHANGED
@@ -1,7 +1,7 @@
|
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>yuzu</name>
|
4 |
-
<version>1.0.
|
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-
|
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="
|
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.4</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-07-01</date>
|
14 |
+
<time>14:10:29</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="2e4f4453c348f04862c80efd45c6881b"/></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="5caf983c0c77663a672ed4660eb7540f"/><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="f3a6d2a65e29079096cc1ebca50efaac"/></dir><dir name="etc"><file name="adminhtml.xml" hash="1402ebcefa884063791db10144f314a3"/><file name="config.xml" hash="a46852e1f4df4197af38960915513012"/><file name="system.xml" hash="c2fbd8fb0967cb9d873a91a1987ea617"/></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="346393c11f1c5856cb1753049790dbcb"/></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="12362eeb227843b6af0d9837decc87ff"/><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>
|