Version Notes
Email marketing
Download this release
Release Info
Developer | bento |
Extension | Licentia_Fidelitas |
Version | 2.5.0.4 |
Comparing to | |
See all releases |
Code changes from version 2.5.0.2 to 2.5.0.4
app/code/community/Licentia/Fidelitas/Model/Lists.php
CHANGED
@@ -122,6 +122,19 @@ class Licentia_Fidelitas_Model_Lists extends Mage_Core_Model_Abstract
|
|
122 |
|
123 |
if ($forceFields && $result->getData('listnum')) {
|
124 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
125 |
$extra = Mage::getModel('fidelitas/egoi')
|
126 |
->setData(array('listID' => $result->getData('listnum')))
|
127 |
->getLists();
|
122 |
|
123 |
if ($forceFields && $result->getData('listnum')) {
|
124 |
|
125 |
+
$egoi = Mage::getModel('fidelitas/egoi')->getLists();
|
126 |
+
|
127 |
+
$ok = false;
|
128 |
+
foreach ($egoi->getData() as $list) {
|
129 |
+
if ($list['listnum'] == $result->getData('listnum')) {
|
130 |
+
$ok = true;
|
131 |
+
break;
|
132 |
+
}
|
133 |
+
}
|
134 |
+
if (!$ok) {
|
135 |
+
return -1;
|
136 |
+
}
|
137 |
+
|
138 |
$extra = Mage::getModel('fidelitas/egoi')
|
139 |
->setData(array('listID' => $result->getData('listnum')))
|
140 |
->getLists();
|
app/code/community/Licentia/Fidelitas/controllers/Adminhtml/Fidelitas/AccountController.php
CHANGED
@@ -27,7 +27,11 @@ class Licentia_Fidelitas_Adminhtml_Fidelitas_AccountController extends Mage_Admi
|
|
27 |
return;
|
28 |
}
|
29 |
|
30 |
-
Mage::getModel('fidelitas/lists')->getList(true);
|
|
|
|
|
|
|
|
|
31 |
|
32 |
$this->_initAction();
|
33 |
$this->_addContent($this->getLayout()->createBlock('fidelitas/adminhtml_account'));
|
27 |
return;
|
28 |
}
|
29 |
|
30 |
+
$okList = Mage::getModel('fidelitas/lists')->getList(true);
|
31 |
+
|
32 |
+
if ($okList == -1) {
|
33 |
+
$this->_getSession()->addError($this->__('WARNING: We cannot find your E-Goi List Mapped to this Store. If this errors continues, please use the section on your right "Clear Data" to disconnet and start the mapping process again'));
|
34 |
+
}
|
35 |
|
36 |
$this->_initAction();
|
37 |
$this->_addContent($this->getLayout()->createBlock('fidelitas/adminhtml_account'));
|
app/code/community/Licentia/Fidelitas/etc/config.xml
CHANGED
@@ -3,12 +3,12 @@
|
|
3 |
<config>
|
4 |
<modules>
|
5 |
<Licentia_Fidelitas>
|
6 |
-
<version>2.5.0.
|
7 |
</Licentia_Fidelitas>
|
8 |
</modules>
|
9 |
<frontend>
|
10 |
<events>
|
11 |
-
<
|
12 |
<observers>
|
13 |
<update_subscriber_auto>
|
14 |
<class>fidelitas/observer</class>
|
@@ -19,7 +19,7 @@
|
|
19 |
<method>newOrder</method>
|
20 |
</fidelitas_update_autoresponders>
|
21 |
</observers>
|
22 |
-
</
|
23 |
<checkout_onepage_controller_success_action>
|
24 |
<observers>
|
25 |
<egoimmerce_order_success>
|
@@ -73,10 +73,6 @@
|
|
73 |
<class>fidelitas/autoresponders</class>
|
74 |
<method>changeStatus</method>
|
75 |
</fidelitas_autoresponders_status>
|
76 |
-
</observers>
|
77 |
-
</sales_order_save_commit_after>
|
78 |
-
<sales_order_save_commit_after>
|
79 |
-
<observers>
|
80 |
<fidelitas_autoresponders_new_order>
|
81 |
<class>fidelitas/autoresponders</class>
|
82 |
<method>newOrder</method>
|
3 |
<config>
|
4 |
<modules>
|
5 |
<Licentia_Fidelitas>
|
6 |
+
<version>2.5.0.4</version>
|
7 |
</Licentia_Fidelitas>
|
8 |
</modules>
|
9 |
<frontend>
|
10 |
<events>
|
11 |
+
<sales_order_save_commit_after>
|
12 |
<observers>
|
13 |
<update_subscriber_auto>
|
14 |
<class>fidelitas/observer</class>
|
19 |
<method>newOrder</method>
|
20 |
</fidelitas_update_autoresponders>
|
21 |
</observers>
|
22 |
+
</sales_order_save_commit_after>
|
23 |
<checkout_onepage_controller_success_action>
|
24 |
<observers>
|
25 |
<egoimmerce_order_success>
|
73 |
<class>fidelitas/autoresponders</class>
|
74 |
<method>changeStatus</method>
|
75 |
</fidelitas_autoresponders_status>
|
|
|
|
|
|
|
|
|
76 |
<fidelitas_autoresponders_new_order>
|
77 |
<class>fidelitas/autoresponders</class>
|
78 |
<method>newOrder</method>
|
package.xml
CHANGED
@@ -1,7 +1,7 @@
|
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>Licentia_Fidelitas</name>
|
4 |
-
<version>2.5.0.
|
5 |
<stability>stable</stability>
|
6 |
<license uri="http://creativecommons.org/licenses/by-nc/4.0/">Creative Commons - Attribution-NonCommercial 4.0 International </license>
|
7 |
<channel>community</channel>
|
@@ -10,9 +10,9 @@
|
|
10 |
<description>Email marketing</description>
|
11 |
<notes>Email marketing</notes>
|
12 |
<authors><author><name>bento</name><user>licentia</user><email>bento@licentia.pt</email></author></authors>
|
13 |
-
<date>2017-
|
14 |
-
<time>
|
15 |
-
<contents><target name="magecommunity"><dir name="Licentia"><dir name="Fidelitas"><dir name="Block"><dir name="Adminhtml"><dir name="Account"><dir name="New"><dir name="Edit"><file name="Form.php" hash="6802d636f325a1c1e91515d906c35352"/><dir name="Tab"><file name="Api.php" hash="320ffbcc93452ab7c2ffd0a83aa96020"/><file name="Form.php" hash="d58c80db9a08fb05ae059e18215cb378"/></dir><file name="Tabs.php" hash="8add5cc4a3edbd6ef92c6f0a00db0e2e"/></dir><file name="Edit.php" hash="b86f3f3b32c38ba80c5e74bd0c858e08"/></dir><file name="New.php" hash="d5fc7f250b2d2cd816e4b5cc91242272"/><dir name="Support"><dir name="Edit"><file name="Form.php" hash="0eacee9a220ba52968442575c9f9a406"/><dir name="Tab"><file name="Form.php" hash="5cecbf817777f9322a8a4066805c6dd4"/></dir><file name="Tabs.php" hash="3de3e6aa7541058be94a4cdad5f479ae"/></dir><file name="Edit.php" hash="9dbc6988f63239978405ca3703ed2ce6"/></dir><file name="Support.php" hash="8a8ca7ba9dd695f10fca5e6f2fe7b55a"/><dir name="Sync"><dir name="Edit"><file name="Form.php" hash="f0283c4d94ded6843b5d807cd8ef1a29"/><dir name="Tab"><file name="Form.php" hash="62aa790142e7c7d5f7c1efd403bc8caf"/></dir><file name="Tabs.php" hash="69846a0c99c896a88e9ab56766d7e53f"/></dir><file name="Edit.php" hash="564693d4f8dfb59b9ff0efd47a1119cd"/></dir><file name="Sync.php" hash="2c1d8b495043e8f07dcd9e360bb188d3"/></dir><file name="Account.php" hash="7852371d0a9d7be6df7a2d06e2ee631c"/><dir name="Autoresponders"><dir name="Edit"><file name="Form.php" hash="356ca946f042ef4707f4c2d87d449852"/><dir name="Tab"><file name="Data.php" hash="bbacf805657b8f029d6b91b36d28bb77"/><file name="Main.php" hash="37bdc3f0d2b704bc1fb208a7f5515a6a"/></dir><file name="Tabs.php" hash="ea583251e1c289ef5bcb883140966474"/></dir><file name="Edit.php" hash="814a0172d583f9678cf6fa67972e0198"/><file name="Grid.php" hash="44ce976d0426680e89d84fd0327e6ae2"/></dir><file name="Autoresponders.php" hash="7e2d11c1b3bb81a3bd2e1e347c1dcf0f"/><dir name="Events"><file name="Grid.php" hash="fb96492b69dec4628b42a25c8bbfd284"/></dir><file name="Events.php" hash="d5e7420ab36d092fb36f0c800dd55a1d"/><dir name="Lists"><dir name="Edit"><file name="Form.php" hash="1887d528edc782f9c918894238e3e5a4"/><dir name="Tab"><file name="Main.php" hash="fa2ee28e4baf3b562df58e35a287ac08"/></dir><file name="Tabs.php" hash="b0687d00f6c93ea0955ad5432c2dc1ab"/></dir><file name="Edit.php" hash="f9e149d2b0922c33ffb89a99e256c4b3"/><file name="Grid.php" hash="c2684f64f5dac5e6e83a74a6d9cd0664"/></dir><file name="Lists.php" hash="cc3df10e61a0a0cef65deb0e7bd029bb"/><dir name="Subscribers"><dir name="Edit"><file name="Form.php" hash="aadce50da358d664c99fc2c27d519b2e"/><dir name="Tab"><file name="Form.php" hash="56f4c6b69545e15b3e4bfad1228c2d57"/></dir><file name="Tabs.php" hash="62462849bc5bd297fb764a075abb6b69"/></dir><file name="Edit.php" hash="c86c116e9b7894b653713db6c1f5b405"/><file name="Grid.php" hash="b6307e585a5e6feb8af3801db5b5019f"/></dir><file name="Subscribers.php" hash="5880102fd07c90d645fee6c9f90f5662"/><dir name="System"><dir name="Config"><dir name="Form"><dir name="Field"><file name="Test.php" hash="55c625dced6d7e265c28377eed3fea21"/></dir></dir></dir></dir></dir><file name="Egoimmerce.php" hash="66ea73ddc94914d705ab22ee90da0c08"/><file name="Products.php" hash="fe93effd102dc4b569725e37f6c004dd"/></dir><dir name="Helper"><file name="Data.php" hash="d9c90d95319fab4b6431b2d30fbfae6f"/></dir><dir name="Model"><file name="Account.php" hash="ac6a858eebdf9335b22e7cced2145fa8"/><file name="Autoresponders.php" hash="3f6808a6b9c7e356002c31cc00597317"/><file name="Egoi.php" hash="bfa2b5fe6f863acaebf475ef8d835096"/><file name="Events.php" hash="190cf15070bd6f799f8b10c0921133f5"/><file name="Extra.php" hash="ba2e3e3797ebd6d62bbca22a05190cae"/><file name="Lists.php" hash="
|
16 |
<compatible/>
|
17 |
-
<dependencies><required><php><min>5.2.0</min><max>
|
18 |
</package>
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>Licentia_Fidelitas</name>
|
4 |
+
<version>2.5.0.4</version>
|
5 |
<stability>stable</stability>
|
6 |
<license uri="http://creativecommons.org/licenses/by-nc/4.0/">Creative Commons - Attribution-NonCommercial 4.0 International </license>
|
7 |
<channel>community</channel>
|
10 |
<description>Email marketing</description>
|
11 |
<notes>Email marketing</notes>
|
12 |
<authors><author><name>bento</name><user>licentia</user><email>bento@licentia.pt</email></author></authors>
|
13 |
+
<date>2017-04-05</date>
|
14 |
+
<time>15:36:34</time>
|
15 |
+
<contents><target name="magecommunity"><dir name="Licentia"><dir name="Fidelitas"><dir name="Block"><dir name="Adminhtml"><dir name="Account"><dir name="New"><dir name="Edit"><file name="Form.php" hash="6802d636f325a1c1e91515d906c35352"/><dir name="Tab"><file name="Api.php" hash="320ffbcc93452ab7c2ffd0a83aa96020"/><file name="Form.php" hash="d58c80db9a08fb05ae059e18215cb378"/></dir><file name="Tabs.php" hash="8add5cc4a3edbd6ef92c6f0a00db0e2e"/></dir><file name="Edit.php" hash="b86f3f3b32c38ba80c5e74bd0c858e08"/></dir><file name="New.php" hash="d5fc7f250b2d2cd816e4b5cc91242272"/><dir name="Support"><dir name="Edit"><file name="Form.php" hash="0eacee9a220ba52968442575c9f9a406"/><dir name="Tab"><file name="Form.php" hash="5cecbf817777f9322a8a4066805c6dd4"/></dir><file name="Tabs.php" hash="3de3e6aa7541058be94a4cdad5f479ae"/></dir><file name="Edit.php" hash="9dbc6988f63239978405ca3703ed2ce6"/></dir><file name="Support.php" hash="8a8ca7ba9dd695f10fca5e6f2fe7b55a"/><dir name="Sync"><dir name="Edit"><file name="Form.php" hash="f0283c4d94ded6843b5d807cd8ef1a29"/><dir name="Tab"><file name="Form.php" hash="62aa790142e7c7d5f7c1efd403bc8caf"/></dir><file name="Tabs.php" hash="69846a0c99c896a88e9ab56766d7e53f"/></dir><file name="Edit.php" hash="564693d4f8dfb59b9ff0efd47a1119cd"/></dir><file name="Sync.php" hash="2c1d8b495043e8f07dcd9e360bb188d3"/></dir><file name="Account.php" hash="7852371d0a9d7be6df7a2d06e2ee631c"/><dir name="Autoresponders"><dir name="Edit"><file name="Form.php" hash="356ca946f042ef4707f4c2d87d449852"/><dir name="Tab"><file name="Data.php" hash="bbacf805657b8f029d6b91b36d28bb77"/><file name="Main.php" hash="37bdc3f0d2b704bc1fb208a7f5515a6a"/></dir><file name="Tabs.php" hash="ea583251e1c289ef5bcb883140966474"/></dir><file name="Edit.php" hash="814a0172d583f9678cf6fa67972e0198"/><file name="Grid.php" hash="44ce976d0426680e89d84fd0327e6ae2"/></dir><file name="Autoresponders.php" hash="7e2d11c1b3bb81a3bd2e1e347c1dcf0f"/><dir name="Events"><file name="Grid.php" hash="fb96492b69dec4628b42a25c8bbfd284"/></dir><file name="Events.php" hash="d5e7420ab36d092fb36f0c800dd55a1d"/><dir name="Lists"><dir name="Edit"><file name="Form.php" hash="1887d528edc782f9c918894238e3e5a4"/><dir name="Tab"><file name="Main.php" hash="fa2ee28e4baf3b562df58e35a287ac08"/></dir><file name="Tabs.php" hash="b0687d00f6c93ea0955ad5432c2dc1ab"/></dir><file name="Edit.php" hash="f9e149d2b0922c33ffb89a99e256c4b3"/><file name="Grid.php" hash="c2684f64f5dac5e6e83a74a6d9cd0664"/></dir><file name="Lists.php" hash="cc3df10e61a0a0cef65deb0e7bd029bb"/><dir name="Subscribers"><dir name="Edit"><file name="Form.php" hash="aadce50da358d664c99fc2c27d519b2e"/><dir name="Tab"><file name="Form.php" hash="56f4c6b69545e15b3e4bfad1228c2d57"/></dir><file name="Tabs.php" hash="62462849bc5bd297fb764a075abb6b69"/></dir><file name="Edit.php" hash="c86c116e9b7894b653713db6c1f5b405"/><file name="Grid.php" hash="b6307e585a5e6feb8af3801db5b5019f"/></dir><file name="Subscribers.php" hash="5880102fd07c90d645fee6c9f90f5662"/><dir name="System"><dir name="Config"><dir name="Form"><dir name="Field"><file name="Test.php" hash="55c625dced6d7e265c28377eed3fea21"/></dir></dir></dir></dir></dir><file name="Egoimmerce.php" hash="66ea73ddc94914d705ab22ee90da0c08"/><file name="Products.php" hash="fe93effd102dc4b569725e37f6c004dd"/></dir><dir name="Helper"><file name="Data.php" hash="d9c90d95319fab4b6431b2d30fbfae6f"/></dir><dir name="Model"><file name="Account.php" hash="ac6a858eebdf9335b22e7cced2145fa8"/><file name="Autoresponders.php" hash="3f6808a6b9c7e356002c31cc00597317"/><file name="Egoi.php" hash="bfa2b5fe6f863acaebf475ef8d835096"/><file name="Events.php" hash="190cf15070bd6f799f8b10c0921133f5"/><file name="Extra.php" hash="ba2e3e3797ebd6d62bbca22a05190cae"/><file name="Lists.php" hash="ebc38f4a3efc614e84cdcb21cc1436ef"/><dir name="Mysql4"><dir name="Account"><file name="Collection.php" hash="2d668e62a13f4ef5e384aeec0e514c1a"/></dir><file name="Account.php" hash="7c9967d6a86f49378f1e513acfc07078"/><dir name="Autoresponders"><file name="Collection.php" hash="bb924ad5979b3b27b312f46d84fe44c6"/></dir><file name="Autoresponders.php" hash="84fe50177e1c3cf4b8773b6133017ab4"/><dir name="Events"><file name="Collection.php" hash="3eb76ae733c4d76f27dae40cda7f9f4c"/></dir><file name="Events.php" hash="c68be7cbd8bcb077729de120a4af2cb3"/><dir name="Extra"><file name="Collection.php" hash="3378a705bbc8fd647c87d50c729b6715"/></dir><file name="Extra.php" hash="2e7c8ae5c07f92a22b04b5080f0712b4"/><dir name="Lists"><file name="Collection.php" hash="bb48b44e845ee9c28a8ce8fdbc42674d"/></dir><file name="Lists.php" hash="eb23516e199ed10234c7df1a6922a313"/><dir name="Subscribers"><file name="Collection.php" hash="fc44d78d088c11aab5345aacd12b80b6"/></dir><file name="Subscribers.php" hash="4478e53edda9027e02fb62163164ce97"/></dir><file name="Observer.php" hash="2427a5b6790255e334f536fedc0b091a"/><file name="Products.php" hash="15563f5b53af8e176e48ce2a4633458a"/><dir name="Source"><file name="Addressattributes.php" hash="c8cf64629c92f54859c3335832b43ee6"/><file name="Method.php" hash="151497a995e79e0a6e226ec1aae3eaec"/><file name="Sender.php" hash="2c054ca6a46b43545a0cec4eef381b8a"/></dir><file name="Subscribers.php" hash="3f0b59c2faf8738f93e855eb86cab788"/></dir><dir name="controllers"><dir name="Adminhtml"><dir name="Fidelitas"><file name="AccountController.php" hash="8a4437336cffe5e015d06d25d7d06c52"/><file name="AutorespondersController.php" hash="000336c4a0bbe237404ea8de5a399e66"/><file name="EventsController.php" hash="37252a1a492bb4a90d2badae5c92e472"/><file name="ListsController.php" hash="7731b43d85442b802c1d71fcc2d7c6b3"/><file name="SubscribersController.php" hash="c3c0393809c664891b02f07a89ca3f7b"/></dir></dir><file name="CallbackController.php" hash="a5c1e7ef880f3faeaa32287791737669"/><file name="ProductsController.php" hash="368d75d6057c36710359fc0bfc945186"/></dir><dir name="etc"><file name="adminhtml.xml" hash="cbd50b5788580ddfd5b87449c8c07bff"/><file name="config.xml" hash="6a696134f7eb8b6fcfb9a0c1cb5c259b"/><file name="system.xml" hash="bfbfc6ba8827e6ba20f1cd88b2f25105"/></dir><dir name="sql"><dir name="fidelitas_setup"><file name="mysql4-install-2.0.0.0.php" hash="665ca2dfe422a474f4faad8ae1985e6c"/><file name="mysql4-upgrade-2.0.0.5-2.1.0.0.php" hash="628f9f7253d152847971708552849b90"/><file name="mysql4-upgrade-2.1.0.4-2.1.0.5.php" hash="5fe08f874391f6d174be2c33e2f81cfd"/><file name="mysql4-upgrade-2.2.0.4-2.2.0.5.php" hash="ed2e1a7d5e7cd959277823d7a03bff5a"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Licentia_Fidelitas.xml" hash="fb5bebd3e734d581867a362a1046df7c"/></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="fidelitas.xml" hash="78efe5b2c2cbf4650e4d3d5acea8df12"/></dir><dir name="template"><dir name="fidelitas"><file name="egoimmerce.phtml" hash="8402f2defee218269dad4989ce80651f"/><file name="products.phtml" hash="6b704c921c38bcc25a6d90764e01a879"/></dir></dir></dir></dir></dir><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="fidelitas.xml" hash="fbf163f93a515a6b834468bbbddd49da"/></dir><dir name="template"><dir name="fidelitas"><dir name="account"><file name="account.phtml" hash="502fd3aa14466f51b760e54d3754728a"/><file name="new.phtml" hash="b77874642f2fe60d966ba52ba808ff87"/></dir></dir></dir></dir></dir></dir></target></contents>
|
16 |
<compatible/>
|
17 |
+
<dependencies><required><php><min>5.2.0</min><max>7.0.0</max></php><extension><name>soap</name><min/><max/></extension><extension><name>intl</name><min/><max/></extension></required></dependencies>
|
18 |
</package>
|