Version Notes
Changelog:
- a bug with manual modification of filtered emails was solved
- a bug with date format was fixed
- date format in "filter mask" was reworked according to magento's locale settings
- a bug with cron settings saving and executing was solved
- newsletter subscription observer was changed to newsletter_subscriber_save_after
Download this release
Release Info
| Developer | Sevenlike |
| Extension | MailUp |
| Version | 2.1.1 |
| Comparing to | |
| See all releases | |
Code changes from version 2.1.0 to 2.1.1
- app/code/local/SevenLike/MailUp/Helper/Data.php +4 -3
- app/code/local/SevenLike/MailUp/Model/Adminhtml/System/Source/Cron/Frequency.php +37 -40
- app/code/local/SevenLike/MailUp/Model/Adminhtml/System/Source/Cron/Hours.php +18 -19
- app/code/local/SevenLike/MailUp/Model/Cron.php +6 -4
- app/code/local/SevenLike/MailUp/Model/Lists.php +2 -8
- app/code/local/SevenLike/MailUp/Model/MailUp.php +1 -3
- app/code/local/SevenLike/MailUp/Model/Mysql14/MailUp.php +2 -2
- app/code/local/SevenLike/MailUp/Model/Mysql14/MailUp/Collection.php +2 -2
- app/code/local/SevenLike/MailUp/Model/Observer.php +19 -43
- app/code/local/SevenLike/MailUp/Model/System/Source/Cron/Frequency.php +0 -61
- app/code/local/SevenLike/MailUp/Model/System/Source/Cron/Hours.php +0 -48
- app/code/local/SevenLike/MailUp/Model/Ws.php +15 -10
- app/code/local/SevenLike/MailUp/Model/Wssend.php +2 -2
- app/code/local/SevenLike/MailUp/controllers/Adminhtml/FieldsmappingController.php +4 -6
- app/code/local/SevenLike/MailUp/controllers/Adminhtml/FilterController.php +1 -3
- app/code/local/SevenLike/MailUp/etc/config.xml +12 -6
- app/code/local/SevenLike/MailUp/sql/mailup_setup/mysql4-install-0.1.0.php +1 -4
- app/code/local/SevenLike/MailUp/sql/mailup_setup/mysql4-upgrade-0.1.0-1.0.0.php +1 -3
- app/code/local/SevenLike/MailUp/sql/mailup_setup/mysql4-upgrade-0.3.0-1.0.0.php +11 -11
- app/code/local/SevenLike/MailUp/sql/mailup_setup/mysql4-upgrade-1.0.0-1.5.2.php +2 -2
- app/design/adminhtml/default/default/template/sevenlike/mailup/fieldsmapping.phtml +5 -0
- app/design/adminhtml/default/default/template/sevenlike/mailup/filter.phtml +22 -2
- app/locale/en_US/SevenLike_MailUp.csv +2 -0
- app/locale/it_IT/SevenLike_MailUp.csv +3 -1
- package.xml +9 -7
app/code/local/SevenLike/MailUp/Helper/Data.php
CHANGED
|
@@ -1,6 +1,7 @@
|
|
| 1 |
<?php
|
| 2 |
-
class SevenLike_MailUp_Helper_Data extends Mage_Core_Helper_Abstract {
|
| 3 |
|
|
|
|
|
|
|
| 4 |
public static function getCustomersData() {
|
| 5 |
Mage::log('Getting customers data', 0);
|
| 6 |
$dateFormat = 'm/d/y h:i:s';
|
|
@@ -196,8 +197,7 @@ class SevenLike_MailUp_Helper_Data extends Mage_Core_Helper_Abstract {
|
|
| 196 |
|
| 197 |
private static function _retriveDateFromDatetime($datetime) {
|
| 198 |
if ($datetime && !empty($datetime)) {
|
| 199 |
-
|
| 200 |
-
return $exploded[0];
|
| 201 |
}
|
| 202 |
return '';
|
| 203 |
}
|
|
@@ -213,6 +213,7 @@ class SevenLike_MailUp_Helper_Data extends Mage_Core_Helper_Abstract {
|
|
| 213 |
if (empty($mailupCustomerIds)) return false;
|
| 214 |
if ($post === null) {
|
| 215 |
// chiamata da cron, popolo con i dati del gruppo "magento" di default
|
|
|
|
| 216 |
$post['mailupIdList'] = Mage::getStoreConfig('newsletter/mailup/list');
|
| 217 |
|
| 218 |
$tmp = new SevenLike_MailUp_Model_Lists;
|
| 1 |
<?php
|
|
|
|
| 2 |
|
| 3 |
+
class SevenLike_MailUp_Helper_Data extends Mage_Core_Helper_Abstract
|
| 4 |
+
{
|
| 5 |
public static function getCustomersData() {
|
| 6 |
Mage::log('Getting customers data', 0);
|
| 7 |
$dateFormat = 'm/d/y h:i:s';
|
| 197 |
|
| 198 |
private static function _retriveDateFromDatetime($datetime) {
|
| 199 |
if ($datetime && !empty($datetime)) {
|
| 200 |
+
return date("d/m/Y", strtotime($datetime));
|
|
|
|
| 201 |
}
|
| 202 |
return '';
|
| 203 |
}
|
| 213 |
if (empty($mailupCustomerIds)) return false;
|
| 214 |
if ($post === null) {
|
| 215 |
// chiamata da cron, popolo con i dati del gruppo "magento" di default
|
| 216 |
+
$post['mailupNewGroup'] = 0;
|
| 217 |
$post['mailupIdList'] = Mage::getStoreConfig('newsletter/mailup/list');
|
| 218 |
|
| 219 |
$tmp = new SevenLike_MailUp_Model_Lists;
|
app/code/local/SevenLike/MailUp/Model/Adminhtml/System/Source/Cron/Frequency.php
CHANGED
|
@@ -1,40 +1,37 @@
|
|
| 1 |
-
<?php
|
| 2 |
-
|
| 3 |
-
class SevenLike_MailUp_Model_Adminhtml_System_Source_Cron_Frequency
|
| 4 |
-
{
|
| 5 |
-
const HOURLY
|
| 6 |
-
const
|
| 7 |
-
const
|
| 8 |
-
const
|
| 9 |
-
|
| 10 |
-
|
| 11 |
-
|
| 12 |
-
|
| 13 |
-
|
| 14 |
-
|
| 15 |
-
|
| 16 |
-
|
| 17 |
-
|
| 18 |
-
|
| 19 |
-
|
| 20 |
-
|
| 21 |
-
|
| 22 |
-
array(
|
| 23 |
-
'label' => '
|
| 24 |
-
'value' => self::
|
| 25 |
-
array(
|
| 26 |
-
'label' => 'Every
|
| 27 |
-
'value' => self::
|
| 28 |
-
array(
|
| 29 |
-
'label' => 'Every
|
| 30 |
-
'value' => self::
|
| 31 |
-
array(
|
| 32 |
-
'label' => '
|
| 33 |
-
'value' => self::
|
| 34 |
-
|
| 35 |
-
|
| 36 |
-
|
| 37 |
-
|
| 38 |
-
);
|
| 39 |
-
}
|
| 40 |
-
}
|
| 1 |
+
<?php
|
| 2 |
+
|
| 3 |
+
class SevenLike_MailUp_Model_Adminhtml_System_Source_Cron_Frequency
|
| 4 |
+
{
|
| 5 |
+
const HOURLY = 0;
|
| 6 |
+
const EVERY_2_HOURS = 1;
|
| 7 |
+
const EVERY_6_HOURS = 2;
|
| 8 |
+
const EVERY_12_HOURS = 3;
|
| 9 |
+
const DAILY = 4;
|
| 10 |
+
|
| 11 |
+
/**
|
| 12 |
+
* Fetch options array
|
| 13 |
+
*
|
| 14 |
+
* @return array
|
| 15 |
+
*/
|
| 16 |
+
public function toOptionArray()
|
| 17 |
+
{
|
| 18 |
+
return array(
|
| 19 |
+
array(
|
| 20 |
+
'label' => 'Hourly',
|
| 21 |
+
'value' => self::HOURLY),
|
| 22 |
+
array(
|
| 23 |
+
'label' => 'Every 2 Hours',
|
| 24 |
+
'value' => self::EVERY_2_HOURS),
|
| 25 |
+
array(
|
| 26 |
+
'label' => 'Every 6 hours',
|
| 27 |
+
'value' => self::EVERY_6_HOURS),
|
| 28 |
+
array(
|
| 29 |
+
'label' => 'Every 12 hours',
|
| 30 |
+
'value' => self::EVERY_12_HOURS),
|
| 31 |
+
array(
|
| 32 |
+
'label' => 'Daily',
|
| 33 |
+
'value' => self::DAILY),
|
| 34 |
+
|
| 35 |
+
);
|
| 36 |
+
}
|
| 37 |
+
}
|
|
|
|
|
|
|
|
|
app/code/local/SevenLike/MailUp/Model/Adminhtml/System/Source/Cron/Hours.php
CHANGED
|
@@ -1,19 +1,18 @@
|
|
| 1 |
-
<?php
|
| 2 |
-
|
| 3 |
-
class SevenLike_MailUp_Model_Adminhtml_System_Source_Cron_Hours
|
| 4 |
-
{
|
| 5 |
-
|
| 6 |
-
|
| 7 |
-
*
|
| 8 |
-
*
|
| 9 |
-
|
| 10 |
-
|
| 11 |
-
|
| 12 |
-
|
| 13 |
-
$
|
| 14 |
-
|
| 15 |
-
|
| 16 |
-
|
| 17 |
-
|
| 18 |
-
|
| 19 |
-
}
|
| 1 |
+
<?php
|
| 2 |
+
|
| 3 |
+
class SevenLike_MailUp_Model_Adminhtml_System_Source_Cron_Hours
|
| 4 |
+
{
|
| 5 |
+
/**
|
| 6 |
+
* Fetch options array
|
| 7 |
+
*
|
| 8 |
+
* @return array
|
| 9 |
+
*/
|
| 10 |
+
public function toOptionArray()
|
| 11 |
+
{
|
| 12 |
+
$hours = array();
|
| 13 |
+
for ($i = 1; $i <= 24; $i++) {
|
| 14 |
+
$hours[] = array('label' => $i, 'value' => $i);
|
| 15 |
+
}
|
| 16 |
+
return $hours;
|
| 17 |
+
}
|
| 18 |
+
}
|
|
|
app/code/local/SevenLike/MailUp/Model/Cron.php
CHANGED
|
@@ -1,7 +1,7 @@
|
|
| 1 |
<?php
|
| 2 |
|
| 3 |
-
class SevenLike_MailUp_Model_Cron
|
| 4 |
-
|
| 5 |
public function run() {
|
| 6 |
Mage::log('Cron mailup', 0);
|
| 7 |
|
|
@@ -12,17 +12,19 @@ class SevenLike_MailUp_Model_Cron {
|
|
| 12 |
$mailupCustomerIds = array();
|
| 13 |
$customersData = SevenLike_MailUp_Helper_Data::getCustomersData();
|
| 14 |
foreach ($customersData as $tmp) {
|
|
|
|
|
|
|
| 15 |
$mailupCustomerIds[] = array(
|
| 16 |
"entity_id" => $tmp["IDCliente"],
|
| 17 |
"email" => $tmp["email"]
|
| 18 |
);
|
| 19 |
}
|
| 20 |
-
|
| 21 |
SevenLike_MailUp_Helper_Data::generateAndSendCustomers($mailupCustomerIds);
|
| 22 |
} else {
|
| 23 |
Mage::log('Cron export not enabled', 0);
|
| 24 |
}
|
| 25 |
|
| 26 |
-
Mage::log('Cron mailup
|
| 27 |
}
|
| 28 |
}
|
| 1 |
<?php
|
| 2 |
|
| 3 |
+
class SevenLike_MailUp_Model_Cron
|
| 4 |
+
{
|
| 5 |
public function run() {
|
| 6 |
Mage::log('Cron mailup', 0);
|
| 7 |
|
| 12 |
$mailupCustomerIds = array();
|
| 13 |
$customersData = SevenLike_MailUp_Helper_Data::getCustomersData();
|
| 14 |
foreach ($customersData as $tmp) {
|
| 15 |
+
$status = Mage::getModel('newsletter/subscriber')->loadByEmail($tmp["email"])->getStatus();
|
| 16 |
+
if ($status != Mage_Newsletter_Model_Subscriber::STATUS_SUBSCRIBED) continue;
|
| 17 |
$mailupCustomerIds[] = array(
|
| 18 |
"entity_id" => $tmp["IDCliente"],
|
| 19 |
"email" => $tmp["email"]
|
| 20 |
);
|
| 21 |
}
|
| 22 |
+
|
| 23 |
SevenLike_MailUp_Helper_Data::generateAndSendCustomers($mailupCustomerIds);
|
| 24 |
} else {
|
| 25 |
Mage::log('Cron export not enabled', 0);
|
| 26 |
}
|
| 27 |
|
| 28 |
+
Mage::log('Cron mailup finished', 0);
|
| 29 |
}
|
| 30 |
}
|
app/code/local/SevenLike/MailUp/Model/Lists.php
CHANGED
|
@@ -1,12 +1,7 @@
|
|
| 1 |
<?php
|
| 2 |
|
| 3 |
-
class SevenLike_MailUp_Model_Lists
|
| 4 |
-
|
| 5 |
-
/**
|
| 6 |
-
* Options getter
|
| 7 |
-
*
|
| 8 |
-
* @return array
|
| 9 |
-
*/
|
| 10 |
public function toOptionArray() {
|
| 11 |
//genero la select per Magento
|
| 12 |
$selectLists = array();
|
|
@@ -59,5 +54,4 @@ class SevenLike_MailUp_Model_Lists {
|
|
| 59 |
|
| 60 |
return $selectLists;
|
| 61 |
}
|
| 62 |
-
|
| 63 |
}
|
| 1 |
<?php
|
| 2 |
|
| 3 |
+
class SevenLike_MailUp_Model_Lists
|
| 4 |
+
{
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 5 |
public function toOptionArray() {
|
| 6 |
//genero la select per Magento
|
| 7 |
$selectLists = array();
|
| 54 |
|
| 55 |
return $selectLists;
|
| 56 |
}
|
|
|
|
| 57 |
}
|
app/code/local/SevenLike/MailUp/Model/MailUp.php
CHANGED
|
@@ -6,6 +6,4 @@ class SevenLike_MailUp_Model_MailUp extends Mage_Core_Model_Abstract
|
|
| 6 |
parent::_construct();
|
| 7 |
$this->_init('mailup/mailup');
|
| 8 |
}
|
| 9 |
-
|
| 10 |
-
}
|
| 11 |
-
?>
|
| 6 |
parent::_construct();
|
| 7 |
$this->_init('mailup/mailup');
|
| 8 |
}
|
| 9 |
+
}
|
|
|
|
|
|
app/code/local/SevenLike/MailUp/Model/Mysql14/MailUp.php
CHANGED
|
@@ -1,9 +1,9 @@
|
|
| 1 |
<?php
|
|
|
|
| 2 |
class SevenLike_MailUp_Model_Mysql4_MailUp extends Mage_Core_Model_Mysql4_Abstract
|
| 3 |
{
|
| 4 |
public function _construct()
|
| 5 |
{
|
| 6 |
$this->_init('mailup/mailup', 'mailup_id');
|
| 7 |
}
|
| 8 |
-
}
|
| 9 |
-
?>
|
| 1 |
<?php
|
| 2 |
+
|
| 3 |
class SevenLike_MailUp_Model_Mysql4_MailUp extends Mage_Core_Model_Mysql4_Abstract
|
| 4 |
{
|
| 5 |
public function _construct()
|
| 6 |
{
|
| 7 |
$this->_init('mailup/mailup', 'mailup_id');
|
| 8 |
}
|
| 9 |
+
}
|
|
|
app/code/local/SevenLike/MailUp/Model/Mysql14/MailUp/Collection.php
CHANGED
|
@@ -1,4 +1,5 @@
|
|
| 1 |
<?php
|
|
|
|
| 2 |
class SevenLike_MailUp_Model_Mysql4_MailUp_Collection extends Mage_Core_Model_Mysql4_Collection_Abstract
|
| 3 |
{
|
| 4 |
public function _construct()
|
|
@@ -6,5 +7,4 @@ class SevenLike_MailUp_Model_Mysql4_MailUp_Collection extends Mage_Core_Model_My
|
|
| 6 |
//parent::__construct();
|
| 7 |
$this->_init('mailup/mailup');
|
| 8 |
}
|
| 9 |
-
}
|
| 10 |
-
?>
|
| 1 |
<?php
|
| 2 |
+
|
| 3 |
class SevenLike_MailUp_Model_Mysql4_MailUp_Collection extends Mage_Core_Model_Mysql4_Collection_Abstract
|
| 4 |
{
|
| 5 |
public function _construct()
|
| 7 |
//parent::__construct();
|
| 8 |
$this->_init('mailup/mailup');
|
| 9 |
}
|
| 10 |
+
}
|
|
|
app/code/local/SevenLike/MailUp/Model/Observer.php
CHANGED
|
@@ -2,6 +2,8 @@
|
|
| 2 |
|
| 3 |
class SevenLike_MailUp_Model_Observer
|
| 4 |
{
|
|
|
|
|
|
|
| 5 |
/**
|
| 6 |
* Save system config event
|
| 7 |
*
|
|
@@ -11,14 +13,13 @@ class SevenLike_MailUp_Model_Observer
|
|
| 11 |
{
|
| 12 |
$store = $observer->getStore();
|
| 13 |
$website = $observer->getWebsite();
|
| 14 |
-
$groups['settings']['fields']['cron_schedule']['value'] = $this->_getSchedule();
|
| 15 |
|
| 16 |
-
|
| 17 |
-
|
| 18 |
-
|
| 19 |
-
|
| 20 |
-
|
| 21 |
-
|
| 22 |
}
|
| 23 |
|
| 24 |
/**
|
|
@@ -29,48 +30,23 @@ class SevenLike_MailUp_Model_Observer
|
|
| 29 |
protected function _getSchedule()
|
| 30 |
{
|
| 31 |
$data = Mage::app()->getRequest()->getPost('groups');
|
| 32 |
-
|
| 33 |
-
|
| 34 |
-
$data['settings']['fields']['mailup_cron_frequency']['value']:
|
| 35 |
-
0;
|
| 36 |
-
|
| 37 |
-
$hours = !empty($data['settings']['fields']['mailup_cron_hours']['value'])?
|
| 38 |
-
$data['settings']['fields']['mailup_cron_hours']['value']:
|
| 39 |
0;
|
| 40 |
|
| 41 |
-
$schedule = "0 $hours ";
|
| 42 |
-
|
| 43 |
switch ($frequency) {
|
| 44 |
case SevenLike_MailUp_Model_Adminhtml_System_Source_Cron_Frequency::DAILY:
|
| 45 |
-
|
| 46 |
-
break;
|
| 47 |
-
case SevenLike_MailUp_Model_Adminhtml_System_Source_Cron_Frequency::WEEKLY:
|
| 48 |
-
$schedule .= "* * 1";
|
| 49 |
-
break;
|
| 50 |
-
case SevenLike_MailUp_Model_Adminhtml_System_Source_Cron_Frequency::MONTHLY:
|
| 51 |
-
$schedule .= "1 * *";
|
| 52 |
-
break;
|
| 53 |
-
case SevenLike_MailUp_Model_Adminhtml_System_Source_Cron_Frequency::EVERY_MINUTE:
|
| 54 |
-
$schedule = "0-59 * * * *";
|
| 55 |
-
break;
|
| 56 |
-
case SevenLike_MailUp_Model_Adminhtml_System_Source_Cron_Frequency::HOURLY:
|
| 57 |
-
$schedule = "* 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23 * * *";
|
| 58 |
-
break;
|
| 59 |
case SevenLike_MailUp_Model_Adminhtml_System_Source_Cron_Frequency::EVERY_2_HOURS:
|
| 60 |
-
|
| 61 |
-
break;
|
| 62 |
case SevenLike_MailUp_Model_Adminhtml_System_Source_Cron_Frequency::EVERY_6_HOURS:
|
| 63 |
-
|
| 64 |
-
break;
|
| 65 |
case SevenLike_MailUp_Model_Adminhtml_System_Source_Cron_Frequency::EVERY_12_HOURS:
|
| 66 |
-
|
| 67 |
-
|
| 68 |
-
|
| 69 |
-
|
| 70 |
-
break;
|
| 71 |
}
|
| 72 |
-
|
| 73 |
-
return $schedule;
|
| 74 |
}
|
| 75 |
|
| 76 |
public function leggiUtente($observer)
|
|
@@ -144,7 +120,7 @@ class SevenLike_MailUp_Model_Observer
|
|
| 144 |
if (!$status) {
|
| 145 |
//leggo l'utente da mailup
|
| 146 |
$this->leggiUtente($observer);
|
| 147 |
-
//rileggo lo status perch� potrebbe essere stato modificato dalla precedente chiamata
|
| 148 |
$status = Mage::getModel('newsletter/subscriber')->loadByEmail($model->getEmail())->getStatus();
|
| 149 |
// se non sono iscritto nemmeno lato mailup allora posso evitare di andare oltre
|
| 150 |
if (!$status) return $this;
|
|
@@ -173,7 +149,7 @@ class SevenLike_MailUp_Model_Observer
|
|
| 173 |
break;
|
| 174 |
}
|
| 175 |
}
|
| 176 |
-
|
| 177 |
if ($status == 1) {
|
| 178 |
$ws = "http://{$console}/frontend/Xmlsubscribe.aspx";
|
| 179 |
} else {
|
| 2 |
|
| 3 |
class SevenLike_MailUp_Model_Observer
|
| 4 |
{
|
| 5 |
+
const CRON_STRING_PATH = 'crontab/jobs/sevenlike_mailup/schedule/cron_expr';
|
| 6 |
+
|
| 7 |
/**
|
| 8 |
* Save system config event
|
| 9 |
*
|
| 13 |
{
|
| 14 |
$store = $observer->getStore();
|
| 15 |
$website = $observer->getWebsite();
|
|
|
|
| 16 |
|
| 17 |
+
Mage::getModel('core/config_data')
|
| 18 |
+
->load(self::CRON_STRING_PATH, 'path')
|
| 19 |
+
->setValue($this->_getSchedule())
|
| 20 |
+
->setPath(self::CRON_STRING_PATH)
|
| 21 |
+
->save();
|
| 22 |
+
Mage::app()->cleanCache();
|
| 23 |
}
|
| 24 |
|
| 25 |
/**
|
| 30 |
protected function _getSchedule()
|
| 31 |
{
|
| 32 |
$data = Mage::app()->getRequest()->getPost('groups');
|
| 33 |
+
$frequency = !empty($data['mailup']['fields']['mailup_cron_frequency']['value'])?
|
| 34 |
+
$data['mailup']['fields']['mailup_cron_frequency']['value']:
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 35 |
0;
|
| 36 |
|
|
|
|
|
|
|
| 37 |
switch ($frequency) {
|
| 38 |
case SevenLike_MailUp_Model_Adminhtml_System_Source_Cron_Frequency::DAILY:
|
| 39 |
+
return "0 0 * * *";
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 40 |
case SevenLike_MailUp_Model_Adminhtml_System_Source_Cron_Frequency::EVERY_2_HOURS:
|
| 41 |
+
return "0 0,2,4,6,8,10,12,14,16,18,20,22 * * *";
|
|
|
|
| 42 |
case SevenLike_MailUp_Model_Adminhtml_System_Source_Cron_Frequency::EVERY_6_HOURS:
|
| 43 |
+
return "0 0,6,12,18 * * * *";
|
|
|
|
| 44 |
case SevenLike_MailUp_Model_Adminhtml_System_Source_Cron_Frequency::EVERY_12_HOURS:
|
| 45 |
+
return "0 0,12 * * *";
|
| 46 |
+
case SevenLike_MailUp_Model_Adminhtml_System_Source_Cron_Frequency::HOURLY:
|
| 47 |
+
default:
|
| 48 |
+
return "0 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23 * * *";
|
|
|
|
| 49 |
}
|
|
|
|
|
|
|
| 50 |
}
|
| 51 |
|
| 52 |
public function leggiUtente($observer)
|
| 120 |
if (!$status) {
|
| 121 |
//leggo l'utente da mailup
|
| 122 |
$this->leggiUtente($observer);
|
| 123 |
+
//rileggo lo status perch� potrebbe essere stato modificato dalla precedente chiamata
|
| 124 |
$status = Mage::getModel('newsletter/subscriber')->loadByEmail($model->getEmail())->getStatus();
|
| 125 |
// se non sono iscritto nemmeno lato mailup allora posso evitare di andare oltre
|
| 126 |
if (!$status) return $this;
|
| 149 |
break;
|
| 150 |
}
|
| 151 |
}
|
| 152 |
+
Mage::log("STATO ISCRIZIONE: $status");
|
| 153 |
if ($status == 1) {
|
| 154 |
$ws = "http://{$console}/frontend/Xmlsubscribe.aspx";
|
| 155 |
} else {
|
app/code/local/SevenLike/MailUp/Model/System/Source/Cron/Frequency.php
DELETED
|
@@ -1,61 +0,0 @@
|
|
| 1 |
-
<?php
|
| 2 |
-
/**
|
| 3 |
-
* Magento Commercial Edition
|
| 4 |
-
*
|
| 5 |
-
* NOTICE OF LICENSE
|
| 6 |
-
*
|
| 7 |
-
* This source file is subject to the Magento Commercial Edition License
|
| 8 |
-
* that is available at: http://www.magentocommerce.com/license/commercial-edition
|
| 9 |
-
* If you did not receive a copy of the license and are unable to
|
| 10 |
-
* obtain it through the world-wide-web, please send an email
|
| 11 |
-
* to license@magentocommerce.com so we can send you a copy immediately.
|
| 12 |
-
*
|
| 13 |
-
* DISCLAIMER
|
| 14 |
-
*
|
| 15 |
-
* Do not edit or add to this file if you wish to upgrade Magento to newer
|
| 16 |
-
* versions in the future. If you wish to customize Magento for your
|
| 17 |
-
* needs please refer to http://www.magentocommerce.com for more information.
|
| 18 |
-
*
|
| 19 |
-
* @category
|
| 20 |
-
* @package _storage
|
| 21 |
-
* @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
|
| 22 |
-
* @license http://www.magentocommerce.com/license/commercial-edition
|
| 23 |
-
*/
|
| 24 |
-
|
| 25 |
-
|
| 26 |
-
/**
|
| 27 |
-
* Source for cron frequency
|
| 28 |
-
*
|
| 29 |
-
* @category Find
|
| 30 |
-
* @package Find_Feed
|
| 31 |
-
*/
|
| 32 |
-
class SevenLike_MailUp_Model_Adminhtml_System_Source_Cron_Frequency
|
| 33 |
-
{
|
| 34 |
-
const DAILY = 1;
|
| 35 |
-
const WEEKLY = 2;
|
| 36 |
-
const MONTHLY = 3;
|
| 37 |
-
const EVERY_MINUTE = 4;
|
| 38 |
-
|
| 39 |
-
/**
|
| 40 |
-
* Fetch options array
|
| 41 |
-
*
|
| 42 |
-
* @return array
|
| 43 |
-
*/
|
| 44 |
-
public function toOptionArray()
|
| 45 |
-
{
|
| 46 |
-
return array(
|
| 47 |
-
array(
|
| 48 |
-
'label' => 'Daily',
|
| 49 |
-
'value' => self::DAILY),
|
| 50 |
-
array(
|
| 51 |
-
'label' => 'Weekly',
|
| 52 |
-
'value' => self::WEEKLY),
|
| 53 |
-
array(
|
| 54 |
-
'label' => 'Monthly',
|
| 55 |
-
'value' => self::MONTHLY),
|
| 56 |
-
array(
|
| 57 |
-
'label' => 'Every minute',
|
| 58 |
-
'value' => self::EVERY_MINUTE)
|
| 59 |
-
);
|
| 60 |
-
}
|
| 61 |
-
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
app/code/local/SevenLike/MailUp/Model/System/Source/Cron/Hours.php
DELETED
|
@@ -1,48 +0,0 @@
|
|
| 1 |
-
<?php
|
| 2 |
-
/**
|
| 3 |
-
* Magento Commercial Edition
|
| 4 |
-
*
|
| 5 |
-
* NOTICE OF LICENSE
|
| 6 |
-
*
|
| 7 |
-
* This source file is subject to the Magento Commercial Edition License
|
| 8 |
-
* that is available at: http://www.magentocommerce.com/license/commercial-edition
|
| 9 |
-
* If you did not receive a copy of the license and are unable to
|
| 10 |
-
* obtain it through the world-wide-web, please send an email
|
| 11 |
-
* to license@magentocommerce.com so we can send you a copy immediately.
|
| 12 |
-
*
|
| 13 |
-
* DISCLAIMER
|
| 14 |
-
*
|
| 15 |
-
* Do not edit or add to this file if you wish to upgrade Magento to newer
|
| 16 |
-
* versions in the future. If you wish to customize Magento for your
|
| 17 |
-
* needs please refer to http://www.magentocommerce.com for more information.
|
| 18 |
-
*
|
| 19 |
-
* @category
|
| 20 |
-
* @package _storage
|
| 21 |
-
* @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
|
| 22 |
-
* @license http://www.magentocommerce.com/license/commercial-edition
|
| 23 |
-
*/
|
| 24 |
-
|
| 25 |
-
|
| 26 |
-
/**
|
| 27 |
-
* Source for cron hours
|
| 28 |
-
*
|
| 29 |
-
* @category Find
|
| 30 |
-
* @package Find_Feed
|
| 31 |
-
*/
|
| 32 |
-
class SevenLike_MailUp_Model_Adminhtml_System_Source_Cron_Hours
|
| 33 |
-
{
|
| 34 |
-
|
| 35 |
-
/**
|
| 36 |
-
* Fetch options array
|
| 37 |
-
*
|
| 38 |
-
* @return array
|
| 39 |
-
*/
|
| 40 |
-
public function toOptionArray()
|
| 41 |
-
{
|
| 42 |
-
$hours = array();
|
| 43 |
-
for ($i = 1; $i <= 24; $i++) {
|
| 44 |
-
$hours[] = array('label' => $i, 'value' => $i);
|
| 45 |
-
}
|
| 46 |
-
return $hours;
|
| 47 |
-
}
|
| 48 |
-
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
app/code/local/SevenLike/MailUp/Model/Ws.php
CHANGED
|
@@ -1,8 +1,7 @@
|
|
| 1 |
<?php
|
| 2 |
-
//ini_set('soap.wsdl_cache_enabled', '0');
|
| 3 |
-
|
| 4 |
-
class MailUpWsImport {
|
| 5 |
|
|
|
|
|
|
|
| 6 |
protected $ns = "http://ws.mailupnet.it/";
|
| 7 |
|
| 8 |
//protected $WSDLUrl = "http://g4a0.s03.it/services/WSMailUpImport.asmx?WSDL";
|
|
@@ -130,7 +129,7 @@ class MailUpWsImport {
|
|
| 130 |
public function getCustomersFiltered($request) {
|
| 131 |
//inizializzo l'array dei clienti
|
| 132 |
$customersFiltered = array();
|
| 133 |
-
|
| 134 |
if (!$request->getRequest()->getParam('mailupCustomerFilteredMod')) {
|
| 135 |
//ottengo la collection con tutti i clienti
|
| 136 |
$customerCollection = Mage::getModel('customer/customer')
|
|
@@ -363,10 +362,16 @@ class MailUpWsImport {
|
|
| 363 |
$filterEnd = '';
|
| 364 |
|
| 365 |
if ($request->getRequest()->getParam('mailupCustomerStartDate')) {
|
| 366 |
-
|
|
|
|
|
|
|
|
|
|
| 367 |
}
|
| 368 |
if ($request->getRequest()->getParam('mailupCustomerEndDate')) {
|
| 369 |
-
|
|
|
|
|
|
|
|
|
|
| 370 |
}
|
| 371 |
if ($filterStart && $filterEnd) {
|
| 372 |
//compreso tra start e end date
|
|
@@ -505,13 +510,12 @@ class MailUpWsImport {
|
|
| 505 |
$result = array();
|
| 506 |
$tempMod = array();
|
| 507 |
|
| 508 |
-
$emails = explode('
|
| 509 |
-
', $request->getRequest()->getParam('mailupCustomerFilteredMod'));
|
| 510 |
|
| 511 |
foreach ($emails as $email) {
|
| 512 |
$email = trim($email);
|
| 513 |
|
| 514 |
-
if (strstr($email, '@')) {
|
| 515 |
$customerModCollection = Mage::getModel('customer/customer')
|
| 516 |
->getCollection()
|
| 517 |
->addAttributeToSelect('email')
|
|
@@ -530,7 +534,8 @@ class MailUpWsImport {
|
|
| 530 |
}
|
| 531 |
}
|
| 532 |
|
| 533 |
-
|
|
|
|
| 534 |
}
|
| 535 |
//FINE GESTISCO LE MODIFICHE MANUALI
|
| 536 |
|
| 1 |
<?php
|
|
|
|
|
|
|
|
|
|
| 2 |
|
| 3 |
+
class MailUpWsImport
|
| 4 |
+
{
|
| 5 |
protected $ns = "http://ws.mailupnet.it/";
|
| 6 |
|
| 7 |
//protected $WSDLUrl = "http://g4a0.s03.it/services/WSMailUpImport.asmx?WSDL";
|
| 129 |
public function getCustomersFiltered($request) {
|
| 130 |
//inizializzo l'array dei clienti
|
| 131 |
$customersFiltered = array();
|
| 132 |
+
|
| 133 |
if (!$request->getRequest()->getParam('mailupCustomerFilteredMod')) {
|
| 134 |
//ottengo la collection con tutti i clienti
|
| 135 |
$customerCollection = Mage::getModel('customer/customer')
|
| 362 |
$filterEnd = '';
|
| 363 |
|
| 364 |
if ($request->getRequest()->getParam('mailupCustomerStartDate')) {
|
| 365 |
+
$date = Zend_Locale_Format::getDate($request->getRequest()->getParam('mailupCustomerStartDate'), array('locale'=>Mage::app()->getLocale()->getLocale(), 'date_format'=>Mage::app()->getLocale()->getDateFormat(Mage_Core_Model_Locale::FORMAT_TYPE_SHORT), 'fix_date'=>true));
|
| 366 |
+
$date['month'] = str_pad($date['month'], 2, 0, STR_PAD_LEFT);
|
| 367 |
+
$date['day'] = str_pad($date['day'], 2, 0, STR_PAD_LEFT);
|
| 368 |
+
$filterStart = "{$date['year']}{$date['month']}{$date['day']}";
|
| 369 |
}
|
| 370 |
if ($request->getRequest()->getParam('mailupCustomerEndDate')) {
|
| 371 |
+
$date = Zend_Locale_Format::getDate($request->getRequest()->getParam('mailupCustomerEndDate'), array('locale'=>Mage::app()->getLocale()->getLocale(), 'date_format'=>Mage::app()->getLocale()->getDateFormat(Mage_Core_Model_Locale::FORMAT_TYPE_SHORT), 'fix_date'=>true));
|
| 372 |
+
$date['month'] = str_pad($date['month'], 2, 0, STR_PAD_LEFT);
|
| 373 |
+
$date['day'] = str_pad($date['day'], 2, 0, STR_PAD_LEFT);
|
| 374 |
+
$filterEnd = "{$date['year']}{$date['month']}{$date['day']}";
|
| 375 |
}
|
| 376 |
if ($filterStart && $filterEnd) {
|
| 377 |
//compreso tra start e end date
|
| 510 |
$result = array();
|
| 511 |
$tempMod = array();
|
| 512 |
|
| 513 |
+
$emails = explode("\n", $request->getRequest()->getParam('mailupCustomerFilteredMod'));
|
|
|
|
| 514 |
|
| 515 |
foreach ($emails as $email) {
|
| 516 |
$email = trim($email);
|
| 517 |
|
| 518 |
+
if (strstr($email, '@') !== false) {
|
| 519 |
$customerModCollection = Mage::getModel('customer/customer')
|
| 520 |
->getCollection()
|
| 521 |
->addAttributeToSelect('email')
|
| 534 |
}
|
| 535 |
}
|
| 536 |
|
| 537 |
+
//$customersFiltered = array_intersect($tempMod, $customersFiltered);
|
| 538 |
+
$customersFiltered = $tempMod;
|
| 539 |
}
|
| 540 |
//FINE GESTISCO LE MODIFICHE MANUALI
|
| 541 |
|
app/code/local/SevenLike/MailUp/Model/Wssend.php
CHANGED
|
@@ -1,6 +1,7 @@
|
|
| 1 |
<?php
|
| 2 |
-
class MailUpWsSend {
|
| 3 |
|
|
|
|
|
|
|
| 4 |
protected $WSDLUrl = 'http://services.mailupnet.it/MailupSend.asmx?WSDL';
|
| 5 |
private $soapClient;
|
| 6 |
private $xmlResponse;
|
|
@@ -304,5 +305,4 @@ class MailUpWsSend {
|
|
| 304 |
//print_r($client->__getFunctions());
|
| 305 |
return $client->Method1('x12qaq','c56tf3');
|
| 306 |
}
|
| 307 |
-
|
| 308 |
}
|
| 1 |
<?php
|
|
|
|
| 2 |
|
| 3 |
+
class MailUpWsSend
|
| 4 |
+
{
|
| 5 |
protected $WSDLUrl = 'http://services.mailupnet.it/MailupSend.asmx?WSDL';
|
| 6 |
private $soapClient;
|
| 7 |
private $xmlResponse;
|
| 305 |
//print_r($client->__getFunctions());
|
| 306 |
return $client->Method1('x12qaq','c56tf3');
|
| 307 |
}
|
|
|
|
| 308 |
}
|
app/code/local/SevenLike/MailUp/controllers/Adminhtml/FieldsmappingController.php
CHANGED
|
@@ -1,11 +1,11 @@
|
|
| 1 |
<?php
|
| 2 |
|
| 3 |
-
class SevenLike_MailUp_Adminhtml_FieldsMappingController extends Mage_Adminhtml_Controller_Action
|
| 4 |
-
|
| 5 |
public function indexAction() {
|
| 6 |
$this->loadLayout()->renderLayout();
|
| 7 |
}
|
| 8 |
-
|
| 9 |
public function saveAction() {
|
| 10 |
try {
|
| 11 |
$post = $this->getRequest()->getPost();
|
|
@@ -20,6 +20,4 @@ class SevenLike_MailUp_Adminhtml_FieldsMappingController extends Mage_Adminhtml_
|
|
| 20 |
|
| 21 |
$this->_redirect('*/*');
|
| 22 |
}
|
| 23 |
-
}
|
| 24 |
-
|
| 25 |
-
?>
|
| 1 |
<?php
|
| 2 |
|
| 3 |
+
class SevenLike_MailUp_Adminhtml_FieldsMappingController extends Mage_Adminhtml_Controller_Action
|
| 4 |
+
{
|
| 5 |
public function indexAction() {
|
| 6 |
$this->loadLayout()->renderLayout();
|
| 7 |
}
|
| 8 |
+
|
| 9 |
public function saveAction() {
|
| 10 |
try {
|
| 11 |
$post = $this->getRequest()->getPost();
|
| 20 |
|
| 21 |
$this->_redirect('*/*');
|
| 22 |
}
|
| 23 |
+
}
|
|
|
|
|
|
app/code/local/SevenLike/MailUp/controllers/Adminhtml/FilterController.php
CHANGED
|
@@ -154,6 +154,4 @@ class SevenLike_MailUp_Adminhtml_FilterController extends Mage_Adminhtml_Control
|
|
| 154 |
die('no access key returned');
|
| 155 |
}
|
| 156 |
}
|
| 157 |
-
}
|
| 158 |
-
|
| 159 |
-
?>
|
| 154 |
die('no access key returned');
|
| 155 |
}
|
| 156 |
}
|
| 157 |
+
}
|
|
|
|
|
|
app/code/local/SevenLike/MailUp/etc/config.xml
CHANGED
|
@@ -3,7 +3,7 @@
|
|
| 3 |
<config>
|
| 4 |
<modules>
|
| 5 |
<SevenLike_MailUp>
|
| 6 |
-
<version>2.1.
|
| 7 |
</SevenLike_MailUp>
|
| 8 |
</modules>
|
| 9 |
|
|
@@ -44,7 +44,7 @@
|
|
| 44 |
</mailup_read>
|
| 45 |
</resources>
|
| 46 |
<events>
|
| 47 |
-
<
|
| 48 |
<observers>
|
| 49 |
<mailupinviautente_observer>
|
| 50 |
<type>singleton</type>
|
|
@@ -52,7 +52,7 @@
|
|
| 52 |
<method>inviaUtente</method>
|
| 53 |
</mailupinviautente_observer>
|
| 54 |
</observers>
|
| 55 |
-
</
|
| 56 |
<customer_customer_authenticated>
|
| 57 |
<observers>
|
| 58 |
<mailupleggiutente_observer>
|
|
@@ -62,6 +62,15 @@
|
|
| 62 |
</mailupleggiutente_observer>
|
| 63 |
</observers>
|
| 64 |
</customer_customer_authenticated>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 65 |
</events>
|
| 66 |
</global>
|
| 67 |
|
|
@@ -154,9 +163,6 @@
|
|
| 154 |
<crontab>
|
| 155 |
<jobs>
|
| 156 |
<sevenlike_mailup>
|
| 157 |
-
<schedule>
|
| 158 |
-
<cron_expr>0 * * * *</cron_expr>
|
| 159 |
-
</schedule>
|
| 160 |
<run>
|
| 161 |
<model>mailup/Cron::run</model>
|
| 162 |
</run>
|
| 3 |
<config>
|
| 4 |
<modules>
|
| 5 |
<SevenLike_MailUp>
|
| 6 |
+
<version>2.1.1</version>
|
| 7 |
</SevenLike_MailUp>
|
| 8 |
</modules>
|
| 9 |
|
| 44 |
</mailup_read>
|
| 45 |
</resources>
|
| 46 |
<events>
|
| 47 |
+
<newsletter_subscriber_save_after>
|
| 48 |
<observers>
|
| 49 |
<mailupinviautente_observer>
|
| 50 |
<type>singleton</type>
|
| 52 |
<method>inviaUtente</method>
|
| 53 |
</mailupinviautente_observer>
|
| 54 |
</observers>
|
| 55 |
+
</newsletter_subscriber_save_after>
|
| 56 |
<customer_customer_authenticated>
|
| 57 |
<observers>
|
| 58 |
<mailupleggiutente_observer>
|
| 62 |
</mailupleggiutente_observer>
|
| 63 |
</observers>
|
| 64 |
</customer_customer_authenticated>
|
| 65 |
+
<controller_action_postdispatch_adminhtml_system_config_save>
|
| 66 |
+
<observers>
|
| 67 |
+
<mailupconfigsave_observer>
|
| 68 |
+
<type>singleton</type>
|
| 69 |
+
<class>SevenLike_MailUp_Model_Observer</class>
|
| 70 |
+
<method>saveSystemConfig</method>
|
| 71 |
+
</mailupconfigsave_observer>
|
| 72 |
+
</observers>
|
| 73 |
+
</controller_action_postdispatch_adminhtml_system_config_save>
|
| 74 |
</events>
|
| 75 |
</global>
|
| 76 |
|
| 163 |
<crontab>
|
| 164 |
<jobs>
|
| 165 |
<sevenlike_mailup>
|
|
|
|
|
|
|
|
|
|
| 166 |
<run>
|
| 167 |
<model>mailup/Cron::run</model>
|
| 168 |
</run>
|
app/code/local/SevenLike/MailUp/sql/mailup_setup/mysql4-install-0.1.0.php
CHANGED
|
@@ -1,4 +1 @@
|
|
| 1 |
-
<?php
|
| 2 |
-
// nothing to do
|
| 3 |
-
|
| 4 |
-
?>
|
| 1 |
+
<?php
|
|
|
|
|
|
|
|
|
app/code/local/SevenLike/MailUp/sql/mailup_setup/mysql4-upgrade-0.1.0-1.0.0.php
CHANGED
|
@@ -1,3 +1 @@
|
|
| 1 |
-
<?php
|
| 2 |
-
// nothing to do
|
| 3 |
-
?>
|
| 1 |
+
<?php
|
|
|
|
|
|
app/code/local/SevenLike/MailUp/sql/mailup_setup/mysql4-upgrade-0.3.0-1.0.0.php
CHANGED
|
@@ -1,11 +1,11 @@
|
|
| 1 |
-
<?php
|
| 2 |
-
|
| 3 |
-
|
| 4 |
-
|
| 5 |
-
|
| 6 |
-
`
|
| 7 |
-
|
| 8 |
-
|
| 9 |
-
|
| 10 |
-
|
| 11 |
-
|
| 1 |
+
<?php
|
| 2 |
+
|
| 3 |
+
$this->startSetup();
|
| 4 |
+
|
| 5 |
+
$this->run("CREATE TABLE IF NOT EXISTS `mailup_filter_hints` (
|
| 6 |
+
`filter_name` varchar(255) collate utf8_unicode_ci NOT NULL,
|
| 7 |
+
`hints` varchar(255) collate utf8_unicode_ci NOT NULL,
|
| 8 |
+
PRIMARY KEY (`filter_name`)
|
| 9 |
+
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;");
|
| 10 |
+
|
| 11 |
+
$this->endSetup();
|
app/code/local/SevenLike/MailUp/sql/mailup_setup/mysql4-upgrade-1.0.0-1.5.2.php
CHANGED
|
@@ -1,4 +1,5 @@
|
|
| 1 |
<?php
|
|
|
|
| 2 |
$this->startSetup();
|
| 3 |
|
| 4 |
$this->run("CREATE TABLE IF NOT EXISTS `mailup_fields_mapping` (
|
|
@@ -7,5 +8,4 @@ $this->run("CREATE TABLE IF NOT EXISTS `mailup_fields_mapping` (
|
|
| 7 |
PRIMARY KEY (`magento_field_name`, `mailup_field_id`)
|
| 8 |
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;");
|
| 9 |
|
| 10 |
-
$this->endSetup();
|
| 11 |
-
?>
|
| 1 |
<?php
|
| 2 |
+
|
| 3 |
$this->startSetup();
|
| 4 |
|
| 5 |
$this->run("CREATE TABLE IF NOT EXISTS `mailup_fields_mapping` (
|
| 8 |
PRIMARY KEY (`magento_field_name`, `mailup_field_id`)
|
| 9 |
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;");
|
| 10 |
|
| 11 |
+
$this->endSetup();
|
|
|
app/design/adminhtml/default/default/template/sevenlike/mailup/fieldsmapping.phtml
CHANGED
|
@@ -31,6 +31,11 @@ if ($accessKey === false) {
|
|
| 31 |
</table>
|
| 32 |
</div>
|
| 33 |
<p><?php echo $this->__('Associate all Magento fields with MailUp ones') ?></p>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 34 |
<form name="saveFieldsMappingForm" method="post" action="<?php echo $this->getUrl('*/*/save')?>">
|
| 35 |
<input name="form_key" type="hidden" value="<?php echo Mage::getSingleton('core/session')->getFormKey() ?>" />
|
| 36 |
<?php foreach ($allmagentofields as $magentofield): ?>
|
| 31 |
</table>
|
| 32 |
</div>
|
| 33 |
<p><?php echo $this->__('Associate all Magento fields with MailUp ones') ?></p>
|
| 34 |
+
<p> </p>
|
| 35 |
+
<div style="font-weight:bold">
|
| 36 |
+
<div style="display:block;float:left;width:180px"><?php echo $this->__("Magento fields") ?></div>
|
| 37 |
+
<div><?php echo $this->__("Mailup fields") ?></div>
|
| 38 |
+
</div>
|
| 39 |
<form name="saveFieldsMappingForm" method="post" action="<?php echo $this->getUrl('*/*/save')?>">
|
| 40 |
<input name="form_key" type="hidden" value="<?php echo Mage::getSingleton('core/session')->getFormKey() ?>" />
|
| 41 |
<?php foreach ($allmagentofields as $magentofield): ?>
|
app/design/adminhtml/default/default/template/sevenlike/mailup/filter.phtml
CHANGED
|
@@ -245,13 +245,33 @@ if ($accessKey === false || strlen(Mage::getStoreConfig('newsletter/mailup/list'
|
|
| 245 |
<tr>
|
| 246 |
<td class="labelpg1"><?=$this->__('From')?></td>
|
| 247 |
<td class="input-ele">
|
| 248 |
-
<input type="text" class="inptptx1 customerDependent" name="mailupCustomerStartDate" size="20" value="<?php echo $mailupCustomerStartDate; ?>"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 249 |
</td>
|
| 250 |
</tr>
|
| 251 |
<tr>
|
| 252 |
<td class="labelpg1"><?=$this->__('To')?></td>
|
| 253 |
<td class="input-ele">
|
| 254 |
-
<input type="text" class="inptptx1 customerDependent" name="mailupCustomerEndDate" size="20" value="<?php echo $mailupCustomerEndDate; ?>"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 255 |
</td>
|
| 256 |
</tr>
|
| 257 |
<tr>
|
| 245 |
<tr>
|
| 246 |
<td class="labelpg1"><?=$this->__('From')?></td>
|
| 247 |
<td class="input-ele">
|
| 248 |
+
<input type="text" class="inptptx1 customerDependent" name="mailupCustomerStartDate" id="mailupCustomerStartDate" size="20" value="<?php echo $mailupCustomerStartDate; ?>" /><img id="mailupCustomerStartDateTrig" class="v-middle" alt="" src="/skin/adminhtml/default/default/images/grid-cal.gif"> <span class="tip">(<?php echo Mage::app()->getLocale()->getDateFormat(Mage_Core_Model_Locale::FORMAT_TYPE_SHORT) ?>)</span>
|
| 249 |
+
<script type="text/javascript">
|
| 250 |
+
Calendar.setup({
|
| 251 |
+
inputField: "mailupCustomerStartDate",
|
| 252 |
+
ifFormat: "<?php echo Mage::app()->getLocale()->getDateStrFormat(Mage_Core_Model_Locale::FORMAT_TYPE_SHORT) ?>",
|
| 253 |
+
showsTime: false,
|
| 254 |
+
button: "mailupCustomerStartDateTrig",
|
| 255 |
+
align: "Bl",
|
| 256 |
+
singleClick : true
|
| 257 |
+
});
|
| 258 |
+
</script>
|
| 259 |
</td>
|
| 260 |
</tr>
|
| 261 |
<tr>
|
| 262 |
<td class="labelpg1"><?=$this->__('To')?></td>
|
| 263 |
<td class="input-ele">
|
| 264 |
+
<input type="text" class="inptptx1 customerDependent" name="mailupCustomerEndDate" size="20" value="<?php echo $mailupCustomerEndDate; ?>" /><img id="mailupCustomerEndDateTrig" class="v-middle" alt="" src="/skin/adminhtml/default/default/images/grid-cal.gif"> <span class="tip">(<?php echo Mage::app()->getLocale()->getDateFormat(Mage_Core_Model_Locale::FORMAT_TYPE_SHORT) ?>)</span>
|
| 265 |
+
<script type="text/javascript">
|
| 266 |
+
Calendar.setup({
|
| 267 |
+
inputField: "mailupCustomerEndDate",
|
| 268 |
+
ifFormat: "<?php echo Mage::app()->getLocale()->getDateStrFormat(Mage_Core_Model_Locale::FORMAT_TYPE_SHORT) ?>",
|
| 269 |
+
showsTime: false,
|
| 270 |
+
button: "mailupCustomerEndDateTrig",
|
| 271 |
+
align: "Bl",
|
| 272 |
+
singleClick : true
|
| 273 |
+
});
|
| 274 |
+
</script>
|
| 275 |
</td>
|
| 276 |
</tr>
|
| 277 |
<tr>
|
app/locale/en_US/SevenLike_MailUp.csv
CHANGED
|
@@ -71,3 +71,5 @@ Products and categories,Products and categories
|
|
| 71 |
dd/mm/yyyy,dd/mm/yyyy
|
| 72 |
e.g.,e.g.
|
| 73 |
Opt-in Status,Opt-in Status
|
|
|
|
|
|
| 71 |
dd/mm/yyyy,dd/mm/yyyy
|
| 72 |
e.g.,e.g.
|
| 73 |
Opt-in Status,Opt-in Status
|
| 74 |
+
"Magento fields","Magento fields"
|
| 75 |
+
"Mailup fields","Mailup fields"
|
app/locale/it_IT/SevenLike_MailUp.csv
CHANGED
|
@@ -83,4 +83,6 @@
|
|
| 83 |
"You can set it in your console (Manage->Web Services), then type it here","Puoi impostarla dalla tua console (Gestione->Web service)"
|
| 84 |
"Allow Guest Subscription","Permetti l'iscrizione di utenti ospiti"
|
| 85 |
"Error: unable to save current filter","Errore: impossibile salvare il filtro corrente"
|
| 86 |
-
"Error: unable to delete the filter","Errore: impossibile eliminare il filtro selezionato"
|
|
|
|
|
|
| 83 |
"You can set it in your console (Manage->Web Services), then type it here","Puoi impostarla dalla tua console (Gestione->Web service)"
|
| 84 |
"Allow Guest Subscription","Permetti l'iscrizione di utenti ospiti"
|
| 85 |
"Error: unable to save current filter","Errore: impossibile salvare il filtro corrente"
|
| 86 |
+
"Error: unable to delete the filter","Errore: impossibile eliminare il filtro selezionato"
|
| 87 |
+
"Magento fields","Campi Magento"
|
| 88 |
+
"Mailup fields","Campi Mailup"
|
package.xml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>MailUp</name>
|
| 4 |
-
<version>2.1.
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license uri="http://www.opensource.org/licenses/academic.php">Academic Free License (AFL)</license>
|
| 7 |
<channel>community</channel>
|
|
@@ -47,14 +47,16 @@
|
|
| 47 |
<p><br />Ad esempio un sito di ecommerce potrebbe alimentare il DB di MailUp con informazioni sugli acquisti e MailUp potr&agrave; quindi inviare, ad esempio dopo 7 giorni dall'acquisto, un messaggio di costumer satisfaction oppure l'invito ad acquistare un prodotto correlato.</p></description>
|
| 48 |
<notes>Changelog:<br />
|
| 49 |
<ul>
|
| 50 |
-
<li>
|
| 51 |
-
<li>
|
| 52 |
-
<li>
|
|
|
|
|
|
|
| 53 |
</ul></notes>
|
| 54 |
<authors><author><name>Sevenlike</name><user>sevenlike</user><email>moduli-magento@sevenlike.com</email></author></authors>
|
| 55 |
-
<date>2012-
|
| 56 |
-
<time>2012-
|
| 57 |
-
<contents><target name="magelocal"><dir name="SevenLike"><dir name="MailUp"><dir name="Block"><file name=".DS_Store" hash="194577a7e20bdcc7afbb718f502c134c"/></dir><dir name="Helper"><file name="Data.php" hash="
|
| 58 |
<compatible/>
|
| 59 |
<dependencies><required><php><min>5.1.0</min><max>6.0.0</max></php></required></dependencies>
|
| 60 |
</package>
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>MailUp</name>
|
| 4 |
+
<version>2.1.1</version>
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license uri="http://www.opensource.org/licenses/academic.php">Academic Free License (AFL)</license>
|
| 7 |
<channel>community</channel>
|
| 47 |
<p><br />Ad esempio un sito di ecommerce potrebbe alimentare il DB di MailUp con informazioni sugli acquisti e MailUp potr&agrave; quindi inviare, ad esempio dopo 7 giorni dall'acquisto, un messaggio di costumer satisfaction oppure l'invito ad acquistare un prodotto correlato.</p></description>
|
| 48 |
<notes>Changelog:<br />
|
| 49 |
<ul>
|
| 50 |
+
<li>a bug with manual modification of filtered emails was solved</li>
|
| 51 |
+
<li>a bug with date format was fixed</li>
|
| 52 |
+
<li>date format in "filter mask" was reworked according to magento's locale settings</li>
|
| 53 |
+
<li>a bug with cron settings saving and executing was solved</li>
|
| 54 |
+
<li>newsletter subscription observer was changed to newsletter_subscriber_save_after</li>
|
| 55 |
</ul></notes>
|
| 56 |
<authors><author><name>Sevenlike</name><user>sevenlike</user><email>moduli-magento@sevenlike.com</email></author></authors>
|
| 57 |
+
<date>2012-08-10</date>
|
| 58 |
+
<time>2012-08-10</time>
|
| 59 |
+
<contents><target name="magelocal"><dir name="SevenLike"><dir name="MailUp"><dir name="Block"><file name=".DS_Store" hash="194577a7e20bdcc7afbb718f502c134c"/></dir><dir name="Helper"><file name="Data.php" hash="ced5e72e373593454738a2fad1457e04"/><file name=".DS_Store" hash="194577a7e20bdcc7afbb718f502c134c"/></dir><dir name="Model"><dir name="Adminhtml"><dir name="System"><dir name="Source"><dir name="Cron"><file name="Frequency.php" hash="6883a8ed591fb256b13452a1c95571f9"/><file name="Hours.php" hash="a29b9482b58cd4d492535323e957e74e"/></dir></dir></dir></dir><file name="Cron.php" hash="f31ff2354048584e37abb89bde87aea2"/><file name="Lists.php" hash="d014f01fc68f5982fd8e0a7d6eb540ea"/><file name="MailUp.php" hash="fee7ff035654ad08c9c88a8fbf95089d"/><dir name="Mysql14"><dir name="MailUp"><file name="Collection.php" hash="0b655573c6ed02bb67d7ff9241a1fd73"/></dir><file name="MailUp.php" hash="5a261952db1cedf7cdc7888e2ced7e16"/></dir><file name="Observer.php" hash="e815c625c3849c8b53834788bd186dc7"/><file name="Ws.php" hash="985486563bab4055f4134f79bc865f55"/><file name="Wssend.php" hash="f48254e6909e5edbffc0cc4fb1145b6b"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="FieldsmappingController.php" hash="35966211b73234d929e0e33c760848c4"/><file name="FilterController.php" hash="079f76269091e357b601193c85ff9ccd"/><file name=".DS_Store" hash="194577a7e20bdcc7afbb718f502c134c"/></dir><file name=".DS_Store" hash="194577a7e20bdcc7afbb718f502c134c"/></dir><dir name="etc"><file name="config.xml" hash="99dcb9f7c69468d8b0ebe29cc9c5fb13"/><file name="system.xml" hash="c9e10400e27057dacf2e3f9d18f6ed21"/><file name=".DS_Store" hash="194577a7e20bdcc7afbb718f502c134c"/></dir><dir name="sql"><dir name="mailup_setup"><file name="mysql4-install-0.1.0.php" hash="feabe5cc691b088d6ade3e04d6b120fc"/><file name="mysql4-upgrade-0.1.0-1.0.0.php" hash="feabe5cc691b088d6ade3e04d6b120fc"/><file name="mysql4-upgrade-0.3.0-1.0.0.php" hash="0a6a28082e3d589cf32516b44bcd9408"/><file name="mysql4-upgrade-1.0.0-1.5.2.php" hash="4ab5fd71fbc9ba8e6cce8e974bfed2fc"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="template"><dir name="sevenlike"><dir name="mailup"><file name="confirm.phtml" hash="b6e4af2eb21000d218648abc3b2f7caf"/><file name="fieldsmapping.phtml" hash="9e71b7dfad8ddc1f10c5d3b5252ef7c7"/><file name="filter.phtml" hash="86113624b3fdaa4c9965c7132815657c"/></dir></dir></dir><dir name="layout"><file name="mailup.xml" hash="37a171055aedfb552cb261dede1e0037"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="SevenLike_MailUp.xml" hash="8377b55193e7524ca9572ed4dc2dca62"/></dir></target><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="sevenlike"><dir name="mailup"><dir name="images"><file name="titoli.png" hash="95a7996cd77d3413fd048018095aec6e"/></dir><file name="mailup.css" hash="37febcfd87a78148d5962da507c62ecc"/></dir></dir></dir></dir></dir></target><target name="magelocale"><dir name="en_US"><file name="SevenLike_MailUp.csv" hash="265f5c2f35d8088de783b5bec0d2e2e2"/></dir><dir name="it_IT"><file name="SevenLike_MailUp.csv" hash="7fcd58235be33c99e3d55f96d7c9d703"/></dir></target></contents>
|
| 60 |
<compatible/>
|
| 61 |
<dependencies><required><php><min>5.1.0</min><max>6.0.0</max></php></required></dependencies>
|
| 62 |
</package>
|
