Version Notes
Changelog:
- the group list in the filter mask is now alphabetically ordered
- the "categories" drop down in the filter mask now shows subcategories
- a bug with installation files was solved
- a bug with date selection (subscription date) in filters mask was solved
- dates selection in filters mask are now rendered in the same consistant way
Download this release
Release Info
Developer | Sevenlike |
Extension | MailUp |
Version | 2.1.2 |
Comparing to | |
See all releases |
Code changes from version 2.1.1 to 2.1.2
- app/code/local/SevenLike/MailUp/Model/Ws.php +8 -2
- app/code/local/SevenLike/MailUp/etc/config.xml +1 -1
- app/code/local/SevenLike/MailUp/sql/mailup_setup/mysql4-install-0.1.0.php +3 -1
- app/code/local/SevenLike/MailUp/sql/mailup_setup/mysql4-upgrade-0.1.0-1.0.0.php +3 -1
- app/design/adminhtml/default/default/template/sevenlike/mailup/confirm.phtml +6 -1
- app/design/adminhtml/default/default/template/sevenlike/mailup/filter.phtml +41 -4
- package.xml +9 -9
app/code/local/SevenLike/MailUp/Model/Ws.php
CHANGED
@@ -461,10 +461,16 @@ class MailUpWsImport
|
|
461 |
$filterEnd = '';
|
462 |
|
463 |
if ($request->getRequest()->getParam('mailupOrderStartDate')) {
|
464 |
-
|
|
|
|
|
|
|
465 |
}
|
466 |
if ($request->getRequest()->getParam('mailupOrderEndDate')) {
|
467 |
-
|
|
|
|
|
|
|
468 |
}
|
469 |
if ($filterStart && $filterEnd) {
|
470 |
//compreso tra start e end date
|
461 |
$filterEnd = '';
|
462 |
|
463 |
if ($request->getRequest()->getParam('mailupOrderStartDate')) {
|
464 |
+
$date = Zend_Locale_Format::getDate($request->getRequest()->getParam('mailupOrderStartDate'), array('locale'=>Mage::app()->getLocale()->getLocale(), 'date_format'=>Mage::app()->getLocale()->getDateFormat(Mage_Core_Model_Locale::FORMAT_TYPE_SHORT), 'fix_date'=>true));
|
465 |
+
$date['month'] = str_pad($date['month'], 2, 0, STR_PAD_LEFT);
|
466 |
+
$date['day'] = str_pad($date['day'], 2, 0, STR_PAD_LEFT);
|
467 |
+
$filterStart = "{$date['year']}{$date['month']}{$date['day']}";
|
468 |
}
|
469 |
if ($request->getRequest()->getParam('mailupOrderEndDate')) {
|
470 |
+
$date = Zend_Locale_Format::getDate($request->getRequest()->getParam('mailupOrderEndDate'), array('locale'=>Mage::app()->getLocale()->getLocale(), 'date_format'=>Mage::app()->getLocale()->getDateFormat(Mage_Core_Model_Locale::FORMAT_TYPE_SHORT), 'fix_date'=>true));
|
471 |
+
$date['month'] = str_pad($date['month'], 2, 0, STR_PAD_LEFT);
|
472 |
+
$date['day'] = str_pad($date['day'], 2, 0, STR_PAD_LEFT);
|
473 |
+
$filterEnd = "{$date['year']}{$date['month']}{$date['day']}";
|
474 |
}
|
475 |
if ($filterStart && $filterEnd) {
|
476 |
//compreso tra start e end date
|
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 |
|
3 |
<config>
|
4 |
<modules>
|
5 |
<SevenLike_MailUp>
|
6 |
+
<version>2.1.2</version>
|
7 |
</SevenLike_MailUp>
|
8 |
</modules>
|
9 |
|
app/code/local/SevenLike/MailUp/sql/mailup_setup/mysql4-install-0.1.0.php
CHANGED
@@ -1 +1,3 @@
|
|
1 |
-
<?php
|
|
|
|
1 |
+
<?php
|
2 |
+
|
3 |
+
//do not remove this line
|
app/code/local/SevenLike/MailUp/sql/mailup_setup/mysql4-upgrade-0.1.0-1.0.0.php
CHANGED
@@ -1 +1,3 @@
|
|
1 |
-
<?php
|
|
|
|
1 |
+
<?php
|
2 |
+
|
3 |
+
//do not remove this line
|
app/design/adminhtml/default/default/template/sevenlike/mailup/confirm.phtml
CHANGED
@@ -135,13 +135,18 @@ $xml = simplexml_load_string($xmlLists);
|
|
135 |
<p class="istrz1"><?=$this->__('Select an existing group')?>:</p>
|
136 |
<select class="required-entry slctpg1" name="mailupGroupId">
|
137 |
<?php
|
|
|
138 |
foreach($xml->List as $list) {
|
139 |
if ($list['idList'] == Mage::getStoreConfig('newsletter/mailup/list')){
|
140 |
foreach($list->Groups->Group as $group) {
|
141 |
-
|
142 |
}
|
143 |
}
|
144 |
}
|
|
|
|
|
|
|
|
|
145 |
?>
|
146 |
</select>
|
147 |
<br /><br />
|
135 |
<p class="istrz1"><?=$this->__('Select an existing group')?>:</p>
|
136 |
<select class="required-entry slctpg1" name="mailupGroupId">
|
137 |
<?php
|
138 |
+
$groups = array();
|
139 |
foreach($xml->List as $list) {
|
140 |
if ($list['idList'] == Mage::getStoreConfig('newsletter/mailup/list')){
|
141 |
foreach($list->Groups->Group as $group) {
|
142 |
+
$groups[(string)$group['idGroup']] = (string)$group['groupName'];
|
143 |
}
|
144 |
}
|
145 |
}
|
146 |
+
@asort($groups);
|
147 |
+
foreach ($groups as $tmpid=>$tmpname) {
|
148 |
+
echo '<option value="'.$tmpid.'">'.htmlspecialchars($tmpname).'</option>';
|
149 |
+
}
|
150 |
?>
|
151 |
</select>
|
152 |
<br /><br />
|
app/design/adminhtml/default/default/template/sevenlike/mailup/filter.phtml
CHANGED
@@ -53,6 +53,23 @@ if ($accessKey === false || strlen(Mage::getStoreConfig('newsletter/mailup/list'
|
|
53 |
$mailupOrderEndDate = $this->getRequest()->getParam('mailupOrderEndDate');
|
54 |
$mailupOrderYesNo = $this->getRequest()->getParam('mailupOrderYesNo');
|
55 |
$mailupSubscribed = $this->getRequest()->getParam('mailupSubscribed');
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
56 |
?>
|
57 |
|
58 |
<div class="content-header">
|
@@ -229,7 +246,7 @@ if ($accessKey === false || strlen(Mage::getStoreConfig('newsletter/mailup/list'
|
|
229 |
<?php
|
230 |
foreach ($categoriesCollection as $category) {
|
231 |
if ($category->getLevel() == 2) {
|
232 |
-
|
233 |
}
|
234 |
}
|
235 |
?>
|
@@ -261,7 +278,7 @@ if ($accessKey === false || strlen(Mage::getStoreConfig('newsletter/mailup/list'
|
|
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",
|
@@ -326,13 +343,33 @@ if ($accessKey === false || strlen(Mage::getStoreConfig('newsletter/mailup/list'
|
|
326 |
<tr>
|
327 |
<td class="labelpg1"><?=$this->__('From')?></td>
|
328 |
<td class="input-ele">
|
329 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
330 |
</td>
|
331 |
</tr>
|
332 |
<tr>
|
333 |
<td class="labelpg1"><?=$this->__('To')?></td>
|
334 |
<td class="input-ele">
|
335 |
-
<input type="text" class="inptptx1 customerDependent" name="mailupOrderEndDate" size="20" value="<?php echo $mailupOrderEndDate; ?>"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
336 |
</td>
|
337 |
</tr>
|
338 |
</table>
|
53 |
$mailupOrderEndDate = $this->getRequest()->getParam('mailupOrderEndDate');
|
54 |
$mailupOrderYesNo = $this->getRequest()->getParam('mailupOrderYesNo');
|
55 |
$mailupSubscribed = $this->getRequest()->getParam('mailupSubscribed');
|
56 |
+
|
57 |
+
|
58 |
+
function print_category($category)
|
59 |
+
{
|
60 |
+
if (is_numeric($category)) {
|
61 |
+
$category = Mage::getModel("catalog/category")->load($category);
|
62 |
+
}
|
63 |
+
|
64 |
+
echo '<option value="'.$category->getData('entity_id').'">'.str_repeat("-", $category->getData("level")-2) . htmlspecialchars($category->getData('name')).'</option>';
|
65 |
+
$children = $category->getChildren();
|
66 |
+
if (!$children) return;
|
67 |
+
|
68 |
+
$children = explode(",", $children);
|
69 |
+
foreach($children as $child) {
|
70 |
+
print_category($child);
|
71 |
+
}
|
72 |
+
}
|
73 |
?>
|
74 |
|
75 |
<div class="content-header">
|
246 |
<?php
|
247 |
foreach ($categoriesCollection as $category) {
|
248 |
if ($category->getLevel() == 2) {
|
249 |
+
print_category($category);
|
250 |
}
|
251 |
}
|
252 |
?>
|
278 |
<tr>
|
279 |
<td class="labelpg1"><?=$this->__('To')?></td>
|
280 |
<td class="input-ele">
|
281 |
+
<input type="text" class="inptptx1 customerDependent" name="mailupCustomerEndDate" id="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>
|
282 |
<script type="text/javascript">
|
283 |
Calendar.setup({
|
284 |
inputField: "mailupCustomerEndDate",
|
343 |
<tr>
|
344 |
<td class="labelpg1"><?=$this->__('From')?></td>
|
345 |
<td class="input-ele">
|
346 |
+
<input type="text" class="inptptx1 customerDependent" name="mailupOrderStartDate" id="mailupOrderStartDate" size="20" value="<?php echo $mailupOrderStartDate; ?>" /><img id="mailupOrderStartDateTrig" 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>
|
347 |
+
<script type="text/javascript">
|
348 |
+
Calendar.setup({
|
349 |
+
inputField: "mailupOrderStartDate",
|
350 |
+
ifFormat: "<?php echo Mage::app()->getLocale()->getDateStrFormat(Mage_Core_Model_Locale::FORMAT_TYPE_SHORT) ?>",
|
351 |
+
showsTime: false,
|
352 |
+
button: "mailupOrderStartDateTrig",
|
353 |
+
align: "Bl",
|
354 |
+
singleClick : true
|
355 |
+
});
|
356 |
+
</script>
|
357 |
</td>
|
358 |
</tr>
|
359 |
<tr>
|
360 |
<td class="labelpg1"><?=$this->__('To')?></td>
|
361 |
<td class="input-ele">
|
362 |
+
<input type="text" class="inptptx1 customerDependent" name="mailupOrderEndDate" id="mailupOrderEndDate" size="20" value="<?php echo $mailupOrderEndDate; ?>" /><img id="mailupOrderEndDateTrig" 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>
|
363 |
+
<script type="text/javascript">
|
364 |
+
Calendar.setup({
|
365 |
+
inputField: "mailupOrderEndDate",
|
366 |
+
ifFormat: "<?php echo Mage::app()->getLocale()->getDateStrFormat(Mage_Core_Model_Locale::FORMAT_TYPE_SHORT) ?>",
|
367 |
+
showsTime: false,
|
368 |
+
button: "mailupOrderEndDateTrig",
|
369 |
+
align: "Bl",
|
370 |
+
singleClick : true
|
371 |
+
});
|
372 |
+
</script>
|
373 |
</td>
|
374 |
</tr>
|
375 |
</table>
|
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,16 +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 |
-
<li>a bug with
|
54 |
-
<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-
|
58 |
-
<time>2012-08-
|
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="
|
60 |
<compatible/>
|
61 |
<dependencies><required><php><min>5.1.0</min><max>6.0.0</max></php></required></dependencies>
|
62 |
</package>
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>MailUp</name>
|
4 |
+
<version>2.1.2</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>the group list in the filter mask is now alphabetically ordered</li>
|
51 |
+
<li>the "categories" drop down in the filter mask now shows subcategories</li>
|
52 |
+
<li>a bug with installation files was solved</li>
|
53 |
+
<li>a bug with date selection (subscription date) in filters mask was solved</li>
|
54 |
+
<li>dates selection in filters mask are now rendered in the same consistant way</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-21</date>
|
58 |
+
<time>2012-08-21</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="0af7ec6cfab85c2cea793dd711480584"/><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="96fb455a3c30ac8307ed80cdb35c1fcc"/><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="43f2d3f43e10d493e748a6732bb4f5c5"/><file name="mysql4-upgrade-0.1.0-1.0.0.php" hash="43f2d3f43e10d493e748a6732bb4f5c5"/><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="755cfa597e6f68de72c0f87eca746367"/><file name="fieldsmapping.phtml" hash="9e71b7dfad8ddc1f10c5d3b5252ef7c7"/><file name="filter.phtml" hash="08a1343a152a97e778a59023a6c5adf1"/></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>
|