Version Notes
Added Functionality: Order Exports for the past 12 months.
Download this release
Release Info
| Developer | Magento Core Team |
| Extension | EmailDirect_Integration |
| Version | 1.5.3 |
| Comparing to | |
| See all releases | |
Code changes from version 1.5.2 to 1.5.3
- app/code/local/EmailDirect/Integration/Block/Adminhtml/Abandoned.php +1 -1
- app/code/local/EmailDirect/Integration/Block/Adminhtml/Abandoned/Grid.php +1 -1
- app/code/local/EmailDirect/Integration/Block/Adminhtml/System/Config/Form/Field/{Button.php → Export/Orders.php} +2 -2
- app/code/local/EmailDirect/Integration/Block/Adminhtml/System/Config/Form/Field/Export/Products.php +28 -0
- app/code/local/EmailDirect/Integration/Block/Adminhtml/System/Config/Form/Field/Export/Range.php +47 -0
- app/code/local/EmailDirect/Integration/Block/Adminhtml/System/Convert/Profile/Export.php +16 -14
- app/code/local/EmailDirect/Integration/Block/Adminhtml/System/Convert/Profile/Export/Orders.php +25 -0
- app/code/local/EmailDirect/Integration/Block/Adminhtml/System/Convert/Profile/Export/Products.php +25 -0
- app/code/local/EmailDirect/Integration/Block/Customer/Account/Lists.php +1 -1
- app/code/local/EmailDirect/Integration/Helper/Data.php +16 -3
- app/code/local/EmailDirect/Integration/Model/Observer.php +2 -1
- app/code/local/EmailDirect/Integration/Model/System/Config/Source/Export/Orders/From.php +0 -0
- app/code/local/EmailDirect/Integration/Model/Wrapper/Execute.php +13 -3
- app/code/local/EmailDirect/Integration/controllers/Admin/AbandonedController.php +1 -1
- app/code/local/EmailDirect/Integration/controllers/Admin/ExportController.php +137 -17
- app/code/local/EmailDirect/Integration/controllers/Admin/OrderExportController.php +0 -0
- app/code/local/EmailDirect/Integration/controllers/Admin/TroubleshootingController.php +1 -1
- app/code/local/EmailDirect/Integration/controllers/ExportController.php +16 -1
- app/code/local/EmailDirect/Integration/etc/config.xml +1 -2
- app/code/local/EmailDirect/Integration/etc/system.xml +38 -11
- app/design/adminhtml/default/default/layout/emaildirect.xml +29 -13
- app/design/adminhtml/default/default/template/emaildirect/system/config/form/field/button.phtml +0 -15
- app/design/adminhtml/default/default/template/emaildirect/system/config/form/field/export/date_range.phtml +120 -0
- app/design/adminhtml/default/default/template/emaildirect/system/config/form/field/export/orders.phtml +14 -0
- app/design/adminhtml/default/default/template/emaildirect/system/config/form/field/export/products.phtml +13 -0
- app/design/adminhtml/default/default/template/emaildirect/system/config/form/field/trouble.phtml +0 -2
- app/design/adminhtml/default/default/template/emaildirect/system/convert/profile/export.phtml +4 -4
- app/design/adminhtml/default/default/template/emaildirect/system/convert/profile/export_orders.phtml +0 -0
- package.xml +5 -5
- skin/adminhtml/default/default/emaildirect/emaildirect.css +3 -1
app/code/local/EmailDirect/Integration/Block/Adminhtml/Abandoned.php
CHANGED
|
@@ -1,6 +1,6 @@
|
|
| 1 |
<?php
|
| 2 |
|
| 3 |
-
class
|
| 4 |
{
|
| 5 |
|
| 6 |
public function __construct()
|
| 1 |
<?php
|
| 2 |
|
| 3 |
+
class EmailDirect_Integration_Block_Adminhtml_Abandoned extends Mage_Adminhtml_Block_Widget_Grid_Container
|
| 4 |
{
|
| 5 |
|
| 6 |
public function __construct()
|
app/code/local/EmailDirect/Integration/Block/Adminhtml/Abandoned/Grid.php
CHANGED
|
@@ -1,6 +1,6 @@
|
|
| 1 |
<?php
|
| 2 |
|
| 3 |
-
class
|
| 4 |
{
|
| 5 |
|
| 6 |
/**
|
| 1 |
<?php
|
| 2 |
|
| 3 |
+
class EmailDirect_Integration_Block_Adminhtml_Abandoned_Grid extends Mage_Adminhtml_Block_Widget_Grid
|
| 4 |
{
|
| 5 |
|
| 6 |
/**
|
app/code/local/EmailDirect/Integration/Block/Adminhtml/System/Config/Form/Field/{Button.php → Export/Orders.php}
RENAMED
|
@@ -1,6 +1,6 @@
|
|
| 1 |
<?php
|
| 2 |
|
| 3 |
-
class
|
| 4 |
{
|
| 5 |
/**
|
| 6 |
* Check if columns are defined, set template
|
|
@@ -9,7 +9,7 @@ class EmailDirect_Integration_Block_Adminhtml_System_Config_Form_Field_Button ex
|
|
| 9 |
public function __construct()
|
| 10 |
{
|
| 11 |
parent::__construct();
|
| 12 |
-
$this->setTemplate('emaildirect/system/config/form/field/
|
| 13 |
}
|
| 14 |
|
| 15 |
/**
|
| 1 |
<?php
|
| 2 |
|
| 3 |
+
class EmailDirect_Integration_Block_Adminhtml_System_Config_Form_Field_Export_Orders extends Mage_Adminhtml_Block_System_Config_Form_Field
|
| 4 |
{
|
| 5 |
/**
|
| 6 |
* Check if columns are defined, set template
|
| 9 |
public function __construct()
|
| 10 |
{
|
| 11 |
parent::__construct();
|
| 12 |
+
$this->setTemplate('emaildirect/system/config/form/field/export/orders.phtml');
|
| 13 |
}
|
| 14 |
|
| 15 |
/**
|
app/code/local/EmailDirect/Integration/Block/Adminhtml/System/Config/Form/Field/Export/Products.php
ADDED
|
@@ -0,0 +1,28 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?php
|
| 2 |
+
|
| 3 |
+
class EmailDirect_Integration_Block_Adminhtml_System_Config_Form_Field_Export_Products extends Mage_Adminhtml_Block_System_Config_Form_Field
|
| 4 |
+
{
|
| 5 |
+
/**
|
| 6 |
+
* Check if columns are defined, set template
|
| 7 |
+
*
|
| 8 |
+
*/
|
| 9 |
+
public function __construct()
|
| 10 |
+
{
|
| 11 |
+
parent::__construct();
|
| 12 |
+
$this->setTemplate('emaildirect/system/config/form/field/export/products.phtml');
|
| 13 |
+
}
|
| 14 |
+
|
| 15 |
+
/**
|
| 16 |
+
* Get the grid and scripts contents
|
| 17 |
+
*
|
| 18 |
+
* @param Varien_Data_Form_Element_Abstract $element
|
| 19 |
+
* @return string
|
| 20 |
+
*/
|
| 21 |
+
protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element)
|
| 22 |
+
{
|
| 23 |
+
$this->setElement($element);
|
| 24 |
+
$html = $this->_toHtml();
|
| 25 |
+
//$this->_arrayRowsCache = null; // doh, the object is used as singleton!
|
| 26 |
+
return $html;
|
| 27 |
+
}
|
| 28 |
+
}
|
app/code/local/EmailDirect/Integration/Block/Adminhtml/System/Config/Form/Field/Export/Range.php
ADDED
|
@@ -0,0 +1,47 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?php
|
| 2 |
+
|
| 3 |
+
class EmailDirect_Integration_Block_Adminhtml_System_Config_Form_Field_Export_Range extends Mage_Adminhtml_Block_System_Config_Form_Field
|
| 4 |
+
{
|
| 5 |
+
/**
|
| 6 |
+
* Check if columns are defined, set template
|
| 7 |
+
*
|
| 8 |
+
*/
|
| 9 |
+
public function __construct()
|
| 10 |
+
{
|
| 11 |
+
parent::__construct();
|
| 12 |
+
$this->setTemplate('emaildirect/system/config/form/field/export/date_range.phtml');
|
| 13 |
+
}
|
| 14 |
+
|
| 15 |
+
public function getFromDate()
|
| 16 |
+
{
|
| 17 |
+
$time = strtotime("-1 year", Mage::getModel('core/date')->timestamp(time()));
|
| 18 |
+
return date("Y-m-d", $time);
|
| 19 |
+
}
|
| 20 |
+
|
| 21 |
+
public function getToDate()
|
| 22 |
+
{
|
| 23 |
+
return date("Y-m-d", Mage::getModel('core/date')->timestamp(time()));
|
| 24 |
+
}
|
| 25 |
+
|
| 26 |
+
public function getOrdersCount()
|
| 27 |
+
{
|
| 28 |
+
$orders = Mage::helper('emaildirect')->getOrderExportCollection($this->getFromDate(),$this->getToDate());
|
| 29 |
+
|
| 30 |
+
return $orders->getSize();
|
| 31 |
+
}
|
| 32 |
+
|
| 33 |
+
|
| 34 |
+
/**
|
| 35 |
+
* Get the grid and scripts contents
|
| 36 |
+
*
|
| 37 |
+
* @param Varien_Data_Form_Element_Abstract $element
|
| 38 |
+
* @return string
|
| 39 |
+
*/
|
| 40 |
+
protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element)
|
| 41 |
+
{
|
| 42 |
+
$this->setElement($element);
|
| 43 |
+
$html = $this->_toHtml();
|
| 44 |
+
//$this->_arrayRowsCache = null; // doh, the object is used as singleton!
|
| 45 |
+
return $html;
|
| 46 |
+
}
|
| 47 |
+
}
|
app/code/local/EmailDirect/Integration/Block/Adminhtml/System/Convert/Profile/Export.php
CHANGED
|
@@ -1,21 +1,25 @@
|
|
| 1 |
<?php
|
| 2 |
|
| 3 |
-
class
|
| 4 |
{
|
|
|
|
|
|
|
|
|
|
| 5 |
public function __construct()
|
| 6 |
{
|
| 7 |
parent::__construct();
|
| 8 |
$this->_init();
|
| 9 |
}
|
| 10 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 11 |
protected function _init()
|
| 12 |
{
|
| 13 |
-
$
|
| 14 |
-
|
| 15 |
-
if (Mage::helper('emaildirect')->exportConfig('include_disabled') == false)
|
| 16 |
-
$products->addFieldToFilter('status', Mage_Catalog_Model_Product_Status::STATUS_ENABLED);
|
| 17 |
-
|
| 18 |
-
$importData = array_map('intval',$products->getAllIds());
|
| 19 |
$this->setBatchItemsCount(count($importData));
|
| 20 |
|
| 21 |
$this->setBatchConfig(
|
|
@@ -35,18 +39,16 @@ class Emaildirect_Integration_Block_Adminhtml_System_Convert_Profile_Export exte
|
|
| 35 |
. '<img id="#{id}_img" src="#{image}" class="v-middle" style="margin-right:5px"/>'
|
| 36 |
. '<span id="#{id}_status" class="text">#{text}</span>'
|
| 37 |
. '</li>',
|
| 38 |
-
'text' => $this->__('Processed <strong>%s%% %s/%d</strong>
|
| 39 |
-
'uploadText' => $this->__('Sending file to
|
| 40 |
-
'successText' => $this->__('Exported <strong>%s</strong>
|
| 41 |
)
|
| 42 |
);
|
| 43 |
|
| 44 |
$this->setImportData($importData);
|
| 45 |
|
| 46 |
-
|
| 47 |
-
|
| 48 |
-
else
|
| 49 |
-
$this->setUploadStatus('false');
|
| 50 |
$this->setBatchSize(Mage::helper('emaildirect')->exportConfig('batch'));
|
| 51 |
}
|
| 52 |
|
| 1 |
<?php
|
| 2 |
|
| 3 |
+
class EmailDirect_Integration_Block_Adminhtml_System_Convert_Profile_Export extends Mage_Adminhtml_Block_Abstract
|
| 4 |
{
|
| 5 |
+
|
| 6 |
+
protected $_record_name = "record";
|
| 7 |
+
|
| 8 |
public function __construct()
|
| 9 |
{
|
| 10 |
parent::__construct();
|
| 11 |
$this->_init();
|
| 12 |
}
|
| 13 |
|
| 14 |
+
protected function getCollection()
|
| 15 |
+
{
|
| 16 |
+
|
| 17 |
+
}
|
| 18 |
+
|
| 19 |
protected function _init()
|
| 20 |
{
|
| 21 |
+
$collection = $this->getCollection();
|
| 22 |
+
$importData = array_map('intval',$collection->getAllIds());
|
|
|
|
|
|
|
|
|
|
|
|
|
| 23 |
$this->setBatchItemsCount(count($importData));
|
| 24 |
|
| 25 |
$this->setBatchConfig(
|
| 39 |
. '<img id="#{id}_img" src="#{image}" class="v-middle" style="margin-right:5px"/>'
|
| 40 |
. '<span id="#{id}_status" class="text">#{text}</span>'
|
| 41 |
. '</li>',
|
| 42 |
+
'text' => $this->__('Processed <strong>%s%% %s/%d</strong> ' . $this->_record_name . 's', '#{percent}', '#{updated}', $this->getBatchItemsCount()),
|
| 43 |
+
'uploadText' => $this->__('Sending file to EmailDirect...'),
|
| 44 |
+
'successText' => $this->__('Exported <strong>%s</strong> ' . $this->_record_name . 's', '#{updated}')
|
| 45 |
)
|
| 46 |
);
|
| 47 |
|
| 48 |
$this->setImportData($importData);
|
| 49 |
|
| 50 |
+
$this->setUploadStatus('true');
|
| 51 |
+
|
|
|
|
|
|
|
| 52 |
$this->setBatchSize(Mage::helper('emaildirect')->exportConfig('batch'));
|
| 53 |
}
|
| 54 |
|
app/code/local/EmailDirect/Integration/Block/Adminhtml/System/Convert/Profile/Export/Orders.php
ADDED
|
@@ -0,0 +1,25 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?php
|
| 2 |
+
|
| 3 |
+
class EmailDirect_Integration_Block_Adminhtml_System_Convert_Profile_Export_Orders extends EmailDirect_Integration_Block_Adminhtml_System_Convert_Profile_Export
|
| 4 |
+
{
|
| 5 |
+
public function __construct()
|
| 6 |
+
{
|
| 7 |
+
$this->_record_name = "order";
|
| 8 |
+
parent::__construct();
|
| 9 |
+
}
|
| 10 |
+
|
| 11 |
+
public function getExportType()
|
| 12 |
+
{
|
| 13 |
+
return "order";
|
| 14 |
+
}
|
| 15 |
+
|
| 16 |
+
public function getCollection()
|
| 17 |
+
{
|
| 18 |
+
$from = Mage::app()->getRequest()->getParam('export_from');
|
| 19 |
+
$to = Mage::app()->getRequest()->getParam('export_to');
|
| 20 |
+
|
| 21 |
+
$orders = Mage::helper('emaildirect')->getOrderExportCollection($from, $to);
|
| 22 |
+
|
| 23 |
+
return $orders;
|
| 24 |
+
}
|
| 25 |
+
}
|
app/code/local/EmailDirect/Integration/Block/Adminhtml/System/Convert/Profile/Export/Products.php
ADDED
|
@@ -0,0 +1,25 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?php
|
| 2 |
+
|
| 3 |
+
class EmailDirect_Integration_Block_Adminhtml_System_Convert_Profile_Export_Products extends EmailDirect_Integration_Block_Adminhtml_System_Convert_Profile_Export
|
| 4 |
+
{
|
| 5 |
+
public function __construct()
|
| 6 |
+
{
|
| 7 |
+
$this->_record_name = "product";
|
| 8 |
+
parent::__construct();
|
| 9 |
+
}
|
| 10 |
+
|
| 11 |
+
public function getExportType()
|
| 12 |
+
{
|
| 13 |
+
return "product";
|
| 14 |
+
}
|
| 15 |
+
|
| 16 |
+
public function getCollection()
|
| 17 |
+
{
|
| 18 |
+
$products = Mage::getModel('catalog/product')->getCollection();
|
| 19 |
+
|
| 20 |
+
if (Mage::helper('emaildirect')->exportConfig('include_disabled') == false)
|
| 21 |
+
$products->addFieldToFilter('status', Mage_Catalog_Model_Product_Status::STATUS_ENABLED);
|
| 22 |
+
|
| 23 |
+
return $products;
|
| 24 |
+
}
|
| 25 |
+
}
|
app/code/local/EmailDirect/Integration/Block/Customer/Account/Lists.php
CHANGED
|
@@ -1,6 +1,6 @@
|
|
| 1 |
<?php
|
| 2 |
|
| 3 |
-
class
|
| 4 |
{
|
| 5 |
protected $_form;
|
| 6 |
|
| 1 |
<?php
|
| 2 |
|
| 3 |
+
class EmailDirect_Integration_Block_Customer_Account_Lists extends Mage_Core_Block_Template
|
| 4 |
{
|
| 5 |
protected $_form;
|
| 6 |
|
app/code/local/EmailDirect/Integration/Helper/Data.php
CHANGED
|
@@ -15,6 +15,21 @@ class EmailDirect_Integration_Helper_Data extends Mage_Core_Helper_Abstract
|
|
| 15 |
|
| 16 |
private $_log_area = "";
|
| 17 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 18 |
public function formatSize($size)
|
| 19 |
{
|
| 20 |
try
|
|
@@ -346,9 +361,8 @@ class EmailDirect_Integration_Helper_Data extends Mage_Core_Helper_Abstract
|
|
| 346 |
|
| 347 |
public function registerGuestCustomer($order)
|
| 348 |
{
|
| 349 |
-
if(
|
| 350 |
return;
|
| 351 |
-
}
|
| 352 |
|
| 353 |
$customer = new Varien_Object;
|
| 354 |
|
|
@@ -360,7 +374,6 @@ class EmailDirect_Integration_Helper_Data extends Mage_Core_Helper_Abstract
|
|
| 360 |
$customer->setPrimaryBillingAddress($order->getBillingAddress());
|
| 361 |
$customer->setPrimaryShippingAddress($order->getShippingAddress());
|
| 362 |
Mage::register('ed_guest_customer', $customer, TRUE);
|
| 363 |
-
|
| 364 |
}
|
| 365 |
|
| 366 |
public function getAbandonedLastRunHtml()
|
| 15 |
|
| 16 |
private $_log_area = "";
|
| 17 |
|
| 18 |
+
public function getOrderExportCollection($from, $to)
|
| 19 |
+
{
|
| 20 |
+
$from_date = Mage::getModel('core/date')->gmtDate(null,strtotime($from)); // 2010-05-11 15:00:00
|
| 21 |
+
|
| 22 |
+
$to_date = Mage::getModel('core/date')->gmtDate(null,strtotime($to)); // 2010-05-11 15:00:00
|
| 23 |
+
|
| 24 |
+
$orders = Mage::getModel('sales/order')->getCollection()
|
| 25 |
+
->addAttributeToFilter('created_at', array('from' => $from_date, 'to' => $to_date))
|
| 26 |
+
->addAttributeToFilter('status', array('eq' => Mage_Sales_Model_Order::STATE_COMPLETE));
|
| 27 |
+
|
| 28 |
+
return $orders;
|
| 29 |
+
}
|
| 30 |
+
|
| 31 |
+
|
| 32 |
+
|
| 33 |
public function formatSize($size)
|
| 34 |
{
|
| 35 |
try
|
| 361 |
|
| 362 |
public function registerGuestCustomer($order)
|
| 363 |
{
|
| 364 |
+
if (Mage::registry('ed_guest_customer'))
|
| 365 |
return;
|
|
|
|
| 366 |
|
| 367 |
$customer = new Varien_Object;
|
| 368 |
|
| 374 |
$customer->setPrimaryBillingAddress($order->getBillingAddress());
|
| 375 |
$customer->setPrimaryShippingAddress($order->getShippingAddress());
|
| 376 |
Mage::register('ed_guest_customer', $customer, TRUE);
|
|
|
|
| 377 |
}
|
| 378 |
|
| 379 |
public function getAbandonedLastRunHtml()
|
app/code/local/EmailDirect/Integration/Model/Observer.php
CHANGED
|
@@ -3,6 +3,7 @@
|
|
| 3 |
class EmailDirect_Integration_Model_Observer
|
| 4 |
{
|
| 5 |
const ABANDONED_LAST_RUN = 'emaildirect/general/abandoned_last_run';
|
|
|
|
| 6 |
|
| 7 |
private $_helper = null;
|
| 8 |
|
|
@@ -628,7 +629,7 @@ class EmailDirect_Integration_Model_Observer
|
|
| 628 |
$order = $observer->getEvent()->getOrder();
|
| 629 |
|
| 630 |
$this->_helper->log("Order Save After: " . $order->getIncrementId());
|
| 631 |
-
if($order->getState() !==
|
| 632 |
{
|
| 633 |
$this->_helper->logReason("Order is not complete.");
|
| 634 |
return $observer;
|
| 3 |
class EmailDirect_Integration_Model_Observer
|
| 4 |
{
|
| 5 |
const ABANDONED_LAST_RUN = 'emaildirect/general/abandoned_last_run';
|
| 6 |
+
const STATE_COMPLETE = Mage_Sales_Model_Order::STATE_COMPLETE;
|
| 7 |
|
| 8 |
private $_helper = null;
|
| 9 |
|
| 629 |
$order = $observer->getEvent()->getOrder();
|
| 630 |
|
| 631 |
$this->_helper->log("Order Save After: " . $order->getIncrementId());
|
| 632 |
+
if($order->getState() !== self::STATE_COMPLETE)
|
| 633 |
{
|
| 634 |
$this->_helper->logReason("Order is not complete.");
|
| 635 |
return $observer;
|
app/code/local/EmailDirect/Integration/Model/System/Config/Source/Export/Orders/From.php
ADDED
|
File without changes
|
app/code/local/EmailDirect/Integration/Model/Wrapper/Execute.php
CHANGED
|
@@ -4,11 +4,21 @@ class EmailDirect_Integration_Model_Wrapper_Execute
|
|
| 4 |
{
|
| 5 |
private function parseHttpResponse($str)
|
| 6 |
{
|
| 7 |
-
|
|
|
|
|
|
|
| 8 |
|
| 9 |
-
|
| 10 |
|
| 11 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 12 |
}
|
| 13 |
|
| 14 |
public function sendCommand($command, $subcommand = null, $id= null, $xmldata=null, $method = "POST")
|
| 4 |
{
|
| 5 |
private function parseHttpResponse($str)
|
| 6 |
{
|
| 7 |
+
try
|
| 8 |
+
{
|
| 9 |
+
$parts = explode(PHP_EOL,$str,2);
|
| 10 |
|
| 11 |
+
$http_parts = explode(' ',$parts[0],3);
|
| 12 |
|
| 13 |
+
return array("code" => $http_parts[1], "msg" => $http_parts[2]);
|
| 14 |
+
}
|
| 15 |
+
catch (Exception $e)
|
| 16 |
+
{
|
| 17 |
+
Mage::helper('emaildirect')->log($e->getMessage(),"Failed to parse HTTP Response");
|
| 18 |
+
Mage::helper('emaildirect')->log($str,"HTTP Response");
|
| 19 |
+
|
| 20 |
+
return array("code" => "0", "msg" => "Failed to parse HTTP Response");
|
| 21 |
+
}
|
| 22 |
}
|
| 23 |
|
| 24 |
public function sendCommand($command, $subcommand = null, $id= null, $xmldata=null, $method = "POST")
|
app/code/local/EmailDirect/Integration/controllers/Admin/AbandonedController.php
CHANGED
|
@@ -1,6 +1,6 @@
|
|
| 1 |
<?php
|
| 2 |
|
| 3 |
-
class
|
| 4 |
{
|
| 5 |
public function indexAction()
|
| 6 |
{
|
| 1 |
<?php
|
| 2 |
|
| 3 |
+
class EmailDirect_Integration_Admin_AbandonedController extends Mage_Adminhtml_Controller_Action
|
| 4 |
{
|
| 5 |
public function indexAction()
|
| 6 |
{
|
app/code/local/EmailDirect/Integration/controllers/Admin/ExportController.php
CHANGED
|
@@ -1,9 +1,20 @@
|
|
| 1 |
<?php
|
| 2 |
|
| 3 |
-
class
|
| 4 |
{
|
| 5 |
protected $_min_category_level = 2;
|
|
|
|
|
|
|
| 6 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 7 |
|
| 8 |
private function setConfigValue($name)
|
| 9 |
{
|
|
@@ -22,7 +33,7 @@ class Emaildirect_Integration_Admin_ExportController extends Mage_Adminhtml_Cont
|
|
| 22 |
|
| 23 |
private function setConfiguration()
|
| 24 |
{
|
| 25 |
-
$config_options = array('
|
| 26 |
|
| 27 |
$changed = false;
|
| 28 |
|
|
@@ -40,7 +51,16 @@ class Emaildirect_Integration_Admin_ExportController extends Mage_Adminhtml_Cont
|
|
| 40 |
}
|
| 41 |
}
|
| 42 |
|
| 43 |
-
public function
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 44 |
{
|
| 45 |
// Update export configuration options if changed before button click
|
| 46 |
$this->setConfiguration();
|
|
@@ -91,6 +111,48 @@ class Emaildirect_Integration_Admin_ExportController extends Mage_Adminhtml_Cont
|
|
| 91 |
return $product_data;
|
| 92 |
}
|
| 93 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 94 |
private function saveRow($fields,$name)
|
| 95 |
{
|
| 96 |
$file = Mage::helper('emaildirect')->getExportFileName($name);
|
|
@@ -100,8 +162,11 @@ class Emaildirect_Integration_Admin_ExportController extends Mage_Adminhtml_Cont
|
|
| 100 |
$fp = fopen($file, 'a');
|
| 101 |
}
|
| 102 |
else
|
| 103 |
-
{
|
| 104 |
-
$
|
|
|
|
|
|
|
|
|
|
| 105 |
|
| 106 |
$fp = fopen($file, 'w');
|
| 107 |
fputcsv($fp, $header_fields, ',','"');
|
|
@@ -120,8 +185,66 @@ class Emaildirect_Integration_Admin_ExportController extends Mage_Adminhtml_Cont
|
|
| 120 |
return 2;
|
| 121 |
return 1;
|
| 122 |
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 123 |
|
| 124 |
public function batchRunAction()
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 125 |
{
|
| 126 |
$this->_min_category_level = $this->getMinCategoryLevel();
|
| 127 |
|
|
@@ -150,7 +273,6 @@ class Emaildirect_Integration_Admin_ExportController extends Mage_Adminhtml_Cont
|
|
| 150 |
|
| 151 |
$this->saveRow($csv_data,"emaildirect_products_{$file_name}");
|
| 152 |
|
| 153 |
-
|
| 154 |
$result = array(
|
| 155 |
'savedRows' => 1,
|
| 156 |
'errors' => array()
|
|
@@ -162,7 +284,8 @@ class Emaildirect_Integration_Admin_ExportController extends Mage_Adminhtml_Cont
|
|
| 162 |
|
| 163 |
public function downloadAction()
|
| 164 |
{
|
| 165 |
-
$file_name = "
|
|
|
|
| 166 |
$file = Mage::helper('emaildirect')->getExportFileName($file_name);
|
| 167 |
|
| 168 |
$this->_prepareDownloadResponse(Mage::helper('emaildirect')->getExportFileName($file_name,false), file_get_contents($file));
|
|
@@ -174,22 +297,19 @@ class Emaildirect_Integration_Admin_ExportController extends Mage_Adminhtml_Cont
|
|
| 174 |
{
|
| 175 |
$file_name = $this->getRequest()->getPost('filename', 0);
|
| 176 |
|
| 177 |
-
$url = $this->getUrl('*/*/download') . "filename/{$file_name}";
|
| 178 |
|
| 179 |
$result = array(
|
| 180 |
'download_link' => $url,
|
| 181 |
);
|
|
|
|
|
|
|
|
|
|
|
|
|
| 182 |
|
| 183 |
-
if (
|
| 184 |
{
|
| 185 |
-
$
|
| 186 |
-
$api = Mage::getSingleton('emaildirect/wrapper_ftp');
|
| 187 |
-
$rc = $api->upload($ed_url,"magento_products_{$file_name}.csv");
|
| 188 |
-
|
| 189 |
-
if (isset($rc->ErrorCode))
|
| 190 |
-
{
|
| 191 |
-
$result['error'] = "EmailDirect Error: (" . (string) $rc->ErrorCode . "): " . (string)$rc->Message;
|
| 192 |
-
}
|
| 193 |
}
|
| 194 |
|
| 195 |
$this->getResponse()->setBody(Mage::helper('core')->jsonEncode($result));
|
| 1 |
<?php
|
| 2 |
|
| 3 |
+
class EmailDirect_Integration_Admin_ExportController extends Mage_Adminhtml_Controller_Action
|
| 4 |
{
|
| 5 |
protected $_min_category_level = 2;
|
| 6 |
+
|
| 7 |
+
protected $_export_type = null;
|
| 8 |
|
| 9 |
+
public function countAction()
|
| 10 |
+
{
|
| 11 |
+
$from = $this->getRequest()->getParam('from');
|
| 12 |
+
$to = $this->getRequest()->getParam('to');
|
| 13 |
+
|
| 14 |
+
$orders = Mage::helper('emaildirect')->getOrderExportCollection($from,$to);
|
| 15 |
+
|
| 16 |
+
echo $orders->getSize();
|
| 17 |
+
}
|
| 18 |
|
| 19 |
private function setConfigValue($name)
|
| 20 |
{
|
| 33 |
|
| 34 |
private function setConfiguration()
|
| 35 |
{
|
| 36 |
+
$config_options = array('include_disabled');
|
| 37 |
|
| 38 |
$changed = false;
|
| 39 |
|
| 51 |
}
|
| 52 |
}
|
| 53 |
|
| 54 |
+
public function productsAction()
|
| 55 |
+
{
|
| 56 |
+
// Update export configuration options if changed before button click
|
| 57 |
+
$this->setConfiguration();
|
| 58 |
+
|
| 59 |
+
$this->loadLayout();
|
| 60 |
+
$this->renderLayout();
|
| 61 |
+
}
|
| 62 |
+
|
| 63 |
+
public function ordersAction()
|
| 64 |
{
|
| 65 |
// Update export configuration options if changed before button click
|
| 66 |
$this->setConfiguration();
|
| 111 |
return $product_data;
|
| 112 |
}
|
| 113 |
|
| 114 |
+
private function getOrderData($id)
|
| 115 |
+
{
|
| 116 |
+
$order = Mage::getModel('sales/order')->load($id);
|
| 117 |
+
|
| 118 |
+
//EmailAddress, OrderNumber, ProductName, SKU, Quantity, PurchaseDate, UnitPrice
|
| 119 |
+
|
| 120 |
+
$date = $order->getCreatedAt();
|
| 121 |
+
$orderNum = $order->getIncrementId();
|
| 122 |
+
$email = $order->getCustomerEmail();
|
| 123 |
+
|
| 124 |
+
$items = $order->getAllItems();
|
| 125 |
+
|
| 126 |
+
$order_data = array();
|
| 127 |
+
|
| 128 |
+
if (is_array($items))
|
| 129 |
+
{
|
| 130 |
+
foreach($items as $item)
|
| 131 |
+
{
|
| 132 |
+
|
| 133 |
+
if ($item->getParentItemId() != null)
|
| 134 |
+
continue;
|
| 135 |
+
|
| 136 |
+
$row = array($email,$orderNum);
|
| 137 |
+
|
| 138 |
+
$qty = (int)$item->getQtyOrdered();
|
| 139 |
+
$name = $item->getName();
|
| 140 |
+
$sku = $item->getSku();
|
| 141 |
+
$price = $item->getPrice();
|
| 142 |
+
|
| 143 |
+
$row[] = $name;
|
| 144 |
+
$row[] = $sku;
|
| 145 |
+
$row[] = $qty;
|
| 146 |
+
$row[] = $date;
|
| 147 |
+
$row[] = $price;
|
| 148 |
+
|
| 149 |
+
$order_data[] = $row;
|
| 150 |
+
}
|
| 151 |
+
|
| 152 |
+
}
|
| 153 |
+
return $order_data;
|
| 154 |
+
}
|
| 155 |
+
|
| 156 |
private function saveRow($fields,$name)
|
| 157 |
{
|
| 158 |
$file = Mage::helper('emaildirect')->getExportFileName($name);
|
| 162 |
$fp = fopen($file, 'a');
|
| 163 |
}
|
| 164 |
else
|
| 165 |
+
{
|
| 166 |
+
if ($this->getExportType() == 'product')
|
| 167 |
+
$header_fields = array('Product Name','SKU','Root Category');
|
| 168 |
+
else
|
| 169 |
+
$header_fields = array('EmailAddress', 'OrderNumber', 'ProductName', 'SKU', 'Quantity', 'PurchaseDate', 'UnitPrice');
|
| 170 |
|
| 171 |
$fp = fopen($file, 'w');
|
| 172 |
fputcsv($fp, $header_fields, ',','"');
|
| 185 |
return 2;
|
| 186 |
return 1;
|
| 187 |
}
|
| 188 |
+
|
| 189 |
+
private function getExportType()
|
| 190 |
+
{
|
| 191 |
+
if ($this->_export_type == null)
|
| 192 |
+
$this->_export_type = $this->getRequest()->getParam('export_type', 'product');
|
| 193 |
+
|
| 194 |
+
return $this->_export_type;
|
| 195 |
+
}
|
| 196 |
|
| 197 |
public function batchRunAction()
|
| 198 |
+
{
|
| 199 |
+
if ($this->getExportType() == 'product')
|
| 200 |
+
return $this->batchRunProducts();
|
| 201 |
+
|
| 202 |
+
return $this->batchRunOrders();
|
| 203 |
+
}
|
| 204 |
+
|
| 205 |
+
private function batchRunOrders()
|
| 206 |
+
{
|
| 207 |
+
if ($this->getRequest()->isPost())
|
| 208 |
+
{
|
| 209 |
+
$order_id = $this->getRequest()->getPost('id', 0);
|
| 210 |
+
$file_name = $this->getRequest()->getPost('filename', 0);
|
| 211 |
+
|
| 212 |
+
if (is_array($order_id))
|
| 213 |
+
{
|
| 214 |
+
foreach ($order_id as $id)
|
| 215 |
+
{
|
| 216 |
+
$csv_data = $this->getOrderData($id);
|
| 217 |
+
|
| 218 |
+
foreach ($csv_data as $data_row)
|
| 219 |
+
{
|
| 220 |
+
$this->saveRow($data_row,"emaildirect_orders_{$file_name}");
|
| 221 |
+
}
|
| 222 |
+
}
|
| 223 |
+
|
| 224 |
+
$result = array(
|
| 225 |
+
'savedRows' => count($order_id),
|
| 226 |
+
'errors' => array()
|
| 227 |
+
);
|
| 228 |
+
}
|
| 229 |
+
else
|
| 230 |
+
{
|
| 231 |
+
$csv_data = $this->getOrderData($order_id);
|
| 232 |
+
|
| 233 |
+
foreach ($csv_data as $data_row)
|
| 234 |
+
{
|
| 235 |
+
$this->saveRow($data_row,"emaildirect_orders_{$file_name}");
|
| 236 |
+
}
|
| 237 |
+
|
| 238 |
+
$result = array(
|
| 239 |
+
'savedRows' => 1,
|
| 240 |
+
'errors' => array()
|
| 241 |
+
);
|
| 242 |
+
}
|
| 243 |
+
$this->getResponse()->setBody(Mage::helper('core')->jsonEncode($result));
|
| 244 |
+
}
|
| 245 |
+
}
|
| 246 |
+
|
| 247 |
+
private function batchRunProducts()
|
| 248 |
{
|
| 249 |
$this->_min_category_level = $this->getMinCategoryLevel();
|
| 250 |
|
| 273 |
|
| 274 |
$this->saveRow($csv_data,"emaildirect_products_{$file_name}");
|
| 275 |
|
|
|
|
| 276 |
$result = array(
|
| 277 |
'savedRows' => 1,
|
| 278 |
'errors' => array()
|
| 284 |
|
| 285 |
public function downloadAction()
|
| 286 |
{
|
| 287 |
+
$file_name = "emaildirect_" . $this->getExportType() . "s_" . $this->getRequest()->getParam('filename');
|
| 288 |
+
|
| 289 |
$file = Mage::helper('emaildirect')->getExportFileName($file_name);
|
| 290 |
|
| 291 |
$this->_prepareDownloadResponse(Mage::helper('emaildirect')->getExportFileName($file_name,false), file_get_contents($file));
|
| 297 |
{
|
| 298 |
$file_name = $this->getRequest()->getPost('filename', 0);
|
| 299 |
|
| 300 |
+
$url = $this->getUrl('*/*/download') . "filename/{$file_name}/export_type/" . $this->getExportType();
|
| 301 |
|
| 302 |
$result = array(
|
| 303 |
'download_link' => $url,
|
| 304 |
);
|
| 305 |
+
|
| 306 |
+
$ed_url = $this->getUrl('emaildirect/export/download') . "filename/{$file_name}/export_type/" . $this->getExportType();
|
| 307 |
+
$api = Mage::getSingleton('emaildirect/wrapper_ftp');
|
| 308 |
+
$rc = $api->upload($ed_url,"magento_" . $this->getExportType() . "s_{$file_name}.csv");
|
| 309 |
|
| 310 |
+
if (isset($rc->ErrorCode))
|
| 311 |
{
|
| 312 |
+
$result['error'] = "EmailDirect Error: (" . (string) $rc->ErrorCode . "): " . (string)$rc->Message;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 313 |
}
|
| 314 |
|
| 315 |
$this->getResponse()->setBody(Mage::helper('core')->jsonEncode($result));
|
app/code/local/EmailDirect/Integration/controllers/Admin/OrderExportController.php
ADDED
|
File without changes
|
app/code/local/EmailDirect/Integration/controllers/Admin/TroubleshootingController.php
CHANGED
|
@@ -1,6 +1,6 @@
|
|
| 1 |
<?php
|
| 2 |
|
| 3 |
-
class
|
| 4 |
{
|
| 5 |
public function indexAction()
|
| 6 |
{
|
| 1 |
<?php
|
| 2 |
|
| 3 |
+
class EmailDirect_Integration_Admin_TroubleshootingController extends Mage_Adminhtml_Controller_Action
|
| 4 |
{
|
| 5 |
public function indexAction()
|
| 6 |
{
|
app/code/local/EmailDirect/Integration/controllers/ExportController.php
CHANGED
|
@@ -1,11 +1,26 @@
|
|
| 1 |
<?php
|
| 2 |
class EmailDirect_Integration_ExportController extends Mage_Core_Controller_Front_Action
|
| 3 |
{
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 4 |
public function downloadAction()
|
| 5 |
{
|
| 6 |
-
$file_name = "
|
| 7 |
$file = Mage::helper('emaildirect')->getExportFileName($file_name);
|
| 8 |
|
| 9 |
$this->_prepareDownloadResponse(Mage::helper('emaildirect')->getExportFileName($file_name,false), file_get_contents($file));
|
| 10 |
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 11 |
}
|
| 1 |
<?php
|
| 2 |
class EmailDirect_Integration_ExportController extends Mage_Core_Controller_Front_Action
|
| 3 |
{
|
| 4 |
+
protected $_export_type = null;
|
| 5 |
+
|
| 6 |
+
private function getExportType()
|
| 7 |
+
{
|
| 8 |
+
if ($this->_export_type == null)
|
| 9 |
+
$this->_export_type = $this->getRequest()->getParam('export_type', 'product');
|
| 10 |
+
|
| 11 |
+
return $this->_export_type;
|
| 12 |
+
}
|
| 13 |
+
|
| 14 |
public function downloadAction()
|
| 15 |
{
|
| 16 |
+
$file_name = "emaildirect_" . $this->getExportType() . "s_" . $this->getRequest()->getParam('filename');
|
| 17 |
$file = Mage::helper('emaildirect')->getExportFileName($file_name);
|
| 18 |
|
| 19 |
$this->_prepareDownloadResponse(Mage::helper('emaildirect')->getExportFileName($file_name,false), file_get_contents($file));
|
| 20 |
}
|
| 21 |
+
|
| 22 |
+
public function testAction()
|
| 23 |
+
{
|
| 24 |
+
echo "TEST";
|
| 25 |
+
}
|
| 26 |
}
|
app/code/local/EmailDirect/Integration/etc/config.xml
CHANGED
|
@@ -2,7 +2,7 @@
|
|
| 2 |
<config>
|
| 3 |
<modules>
|
| 4 |
<EmailDirect_Integration>
|
| 5 |
-
<version>1.5.
|
| 6 |
</EmailDirect_Integration>
|
| 7 |
</modules>
|
| 8 |
<global>
|
|
@@ -262,7 +262,6 @@
|
|
| 262 |
<related_fields>2</related_fields>
|
| 263 |
</general>
|
| 264 |
<export>
|
| 265 |
-
<send_to_emaildirect>1</send_to_emaildirect>
|
| 266 |
<include_disabled>1</include_disabled>
|
| 267 |
<batch>100</batch>
|
| 268 |
</export>
|
| 2 |
<config>
|
| 3 |
<modules>
|
| 4 |
<EmailDirect_Integration>
|
| 5 |
+
<version>1.5.3</version>
|
| 6 |
</EmailDirect_Integration>
|
| 7 |
</modules>
|
| 8 |
<global>
|
| 262 |
<related_fields>2</related_fields>
|
| 263 |
</general>
|
| 264 |
<export>
|
|
|
|
| 265 |
<include_disabled>1</include_disabled>
|
| 266 |
<batch>100</batch>
|
| 267 |
</export>
|
app/code/local/EmailDirect/Integration/etc/system.xml
CHANGED
|
@@ -186,21 +186,48 @@
|
|
| 186 |
<show_in_store>1</show_in_store>
|
| 187 |
<expanded>1</expanded>
|
| 188 |
<fields>
|
| 189 |
-
<
|
| 190 |
-
|
| 191 |
-
|
| 192 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 193 |
<sort_order>10</sort_order>
|
| 194 |
<show_in_default>1</show_in_default>
|
| 195 |
<show_in_website>1</show_in_website>
|
| 196 |
<show_in_store>1</show_in_store>
|
| 197 |
-
<
|
| 198 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 199 |
<include_disabled translate="label">
|
| 200 |
<label>Include disabled Products?</label>
|
| 201 |
<frontend_type>select</frontend_type>
|
| 202 |
<source_model>adminhtml/system_config_source_yesno</source_model>
|
| 203 |
-
<sort_order>
|
| 204 |
<show_in_default>1</show_in_default>
|
| 205 |
<show_in_website>1</show_in_website>
|
| 206 |
<show_in_store>1</show_in_store>
|
|
@@ -209,7 +236,7 @@
|
|
| 209 |
<label>Batch Size</label>
|
| 210 |
<frontend_type>select</frontend_type>
|
| 211 |
<source_model>emaildirect/system_config_source_export_batch</source_model>
|
| 212 |
-
<sort_order>
|
| 213 |
<show_in_default>0</show_in_default>
|
| 214 |
<show_in_website>0</show_in_website>
|
| 215 |
<show_in_store>0</show_in_store>
|
|
@@ -217,13 +244,13 @@
|
|
| 217 |
</batch>
|
| 218 |
<export_button>
|
| 219 |
<label>Export Products</label>
|
| 220 |
-
<frontend_model>emaildirect/
|
| 221 |
-
<sort_order>
|
| 222 |
<show_in_default>1</show_in_default>
|
| 223 |
<show_in_website>1</show_in_website>
|
| 224 |
<show_in_store>1</show_in_store>
|
| 225 |
<can_be_empty>1</can_be_empty>
|
| 226 |
-
<comment>Export
|
| 227 |
</export_button>
|
| 228 |
</fields>
|
| 229 |
</export>
|
| 186 |
<show_in_store>1</show_in_store>
|
| 187 |
<expanded>1</expanded>
|
| 188 |
<fields>
|
| 189 |
+
<heading_orders translate="label">
|
| 190 |
+
<label>Order Exports</label>
|
| 191 |
+
<frontend_model>adminhtml/system_config_form_field_heading</frontend_model>
|
| 192 |
+
<sort_order>5</sort_order>
|
| 193 |
+
<show_in_default>1</show_in_default>
|
| 194 |
+
<show_in_website>1</show_in_website>
|
| 195 |
+
<show_in_store>1</show_in_store>
|
| 196 |
+
</heading_orders>
|
| 197 |
+
<export_orders_range>
|
| 198 |
+
<label>Order Date Range</label>
|
| 199 |
+
<frontend_model>emaildirect/adminhtml_system_config_form_field_export_range</frontend_model>
|
| 200 |
<sort_order>10</sort_order>
|
| 201 |
<show_in_default>1</show_in_default>
|
| 202 |
<show_in_website>1</show_in_website>
|
| 203 |
<show_in_store>1</show_in_store>
|
| 204 |
+
<can_be_empty>1</can_be_empty>
|
| 205 |
+
<comment>Only orders within the past year can be exported</comment>
|
| 206 |
+
</export_orders_range>
|
| 207 |
+
<export_orders_button>
|
| 208 |
+
<label>Export Orders</label>
|
| 209 |
+
<frontend_model>emaildirect/adminhtml_system_config_form_field_export_orders</frontend_model>
|
| 210 |
+
<sort_order>20</sort_order>
|
| 211 |
+
<show_in_default>1</show_in_default>
|
| 212 |
+
<show_in_website>1</show_in_website>
|
| 213 |
+
<show_in_store>1</show_in_store>
|
| 214 |
+
<can_be_empty>1</can_be_empty>
|
| 215 |
+
<comment>Export Orders to CSV and send the CSV file to Emaildirect (opens in new window)</comment>
|
| 216 |
+
</export_orders_button>
|
| 217 |
+
|
| 218 |
+
<heading_products translate="label">
|
| 219 |
+
<label>Category Exports</label>
|
| 220 |
+
<frontend_model>adminhtml/system_config_form_field_heading</frontend_model>
|
| 221 |
+
<sort_order>30</sort_order>
|
| 222 |
+
<show_in_default>1</show_in_default>
|
| 223 |
+
<show_in_website>1</show_in_website>
|
| 224 |
+
<show_in_store>1</show_in_store>
|
| 225 |
+
</heading_products>
|
| 226 |
<include_disabled translate="label">
|
| 227 |
<label>Include disabled Products?</label>
|
| 228 |
<frontend_type>select</frontend_type>
|
| 229 |
<source_model>adminhtml/system_config_source_yesno</source_model>
|
| 230 |
+
<sort_order>40</sort_order>
|
| 231 |
<show_in_default>1</show_in_default>
|
| 232 |
<show_in_website>1</show_in_website>
|
| 233 |
<show_in_store>1</show_in_store>
|
| 236 |
<label>Batch Size</label>
|
| 237 |
<frontend_type>select</frontend_type>
|
| 238 |
<source_model>emaildirect/system_config_source_export_batch</source_model>
|
| 239 |
+
<sort_order>50</sort_order>
|
| 240 |
<show_in_default>0</show_in_default>
|
| 241 |
<show_in_website>0</show_in_website>
|
| 242 |
<show_in_store>0</show_in_store>
|
| 244 |
</batch>
|
| 245 |
<export_button>
|
| 246 |
<label>Export Products</label>
|
| 247 |
+
<frontend_model>emaildirect/adminhtml_system_config_form_field_export_products</frontend_model>
|
| 248 |
+
<sort_order>60</sort_order>
|
| 249 |
<show_in_default>1</show_in_default>
|
| 250 |
<show_in_website>1</show_in_website>
|
| 251 |
<show_in_store>1</show_in_store>
|
| 252 |
<can_be_empty>1</can_be_empty>
|
| 253 |
+
<comment>Export Products to CSV and send the CSV file to Emaildirect (opens in new window)</comment>
|
| 254 |
</export_button>
|
| 255 |
</fields>
|
| 256 |
</export>
|
app/design/adminhtml/default/default/layout/emaildirect.xml
CHANGED
|
@@ -6,19 +6,35 @@
|
|
| 6 |
</reference>
|
| 7 |
</adminhtml_system_config_edit>
|
| 8 |
|
| 9 |
-
|
| 10 |
-
|
| 11 |
-
|
| 12 |
-
|
| 13 |
-
|
| 14 |
-
|
| 15 |
-
|
| 16 |
-
|
| 17 |
-
|
| 18 |
-
|
| 19 |
-
|
| 20 |
-
|
| 21 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 22 |
|
| 23 |
<emaildirect_admin_troubleshooting_index>
|
| 24 |
<reference name="head">
|
| 6 |
</reference>
|
| 7 |
</adminhtml_system_config_edit>
|
| 8 |
|
| 9 |
+
<emaildirect_admin_export_products>
|
| 10 |
+
<remove name="root"/>
|
| 11 |
+
<block type="adminhtml/page" name="convert_root" output="toHtml" template="page.phtml">
|
| 12 |
+
<block type="adminhtml/page_head" name="convert_root_head" as="head" template="page/head.phtml">
|
| 13 |
+
<action method="addJs"><script>prototype/prototype.js</script></action>
|
| 14 |
+
<action method="addJs"><script>prototype/validation.js</script></action>
|
| 15 |
+
<action method="addJs"><script>varien/js.js</script></action>
|
| 16 |
+
<action method="addJs"><script>mage/translate.js</script></action>
|
| 17 |
+
<action method="addJs"><script>mage/adminhtml/tools.js</script></action>
|
| 18 |
+
<action method="setTitle" translate="title"><title>EmailDirect - Export Products</title></action>
|
| 19 |
+
</block>
|
| 20 |
+
<block type="emaildirect/adminhtml_system_convert_profile_export_products" name="system_convert_profile_run" template="emaildirect/system/convert/profile/export.phtml" output="toHtml"/>
|
| 21 |
+
</block>
|
| 22 |
+
</emaildirect_admin_export_products>
|
| 23 |
+
|
| 24 |
+
<emaildirect_admin_export_orders>
|
| 25 |
+
<remove name="root"/>
|
| 26 |
+
<block type="adminhtml/page" name="convert_root" output="toHtml" template="page.phtml">
|
| 27 |
+
<block type="adminhtml/page_head" name="convert_root_head" as="head" template="page/head.phtml">
|
| 28 |
+
<action method="addJs"><script>prototype/prototype.js</script></action>
|
| 29 |
+
<action method="addJs"><script>prototype/validation.js</script></action>
|
| 30 |
+
<action method="addJs"><script>varien/js.js</script></action>
|
| 31 |
+
<action method="addJs"><script>mage/translate.js</script></action>
|
| 32 |
+
<action method="addJs"><script>mage/adminhtml/tools.js</script></action>
|
| 33 |
+
<action method="setTitle" translate="title"><title>EmailDirect - Export Orders</title></action>
|
| 34 |
+
</block>
|
| 35 |
+
<block type="emaildirect/adminhtml_system_convert_profile_export_orders" name="system_convert_profile_run" template="emaildirect/system/convert/profile/export.phtml" output="toHtml"/>
|
| 36 |
+
</block>
|
| 37 |
+
</emaildirect_admin_export_orders>
|
| 38 |
|
| 39 |
<emaildirect_admin_troubleshooting_index>
|
| 40 |
<reference name="head">
|
app/design/adminhtml/default/default/template/emaildirect/system/config/form/field/button.phtml
DELETED
|
@@ -1,15 +0,0 @@
|
|
| 1 |
-
<!--<button id='emaildirect_export' onClick="window.open('<?php echo $this->getUrl("emaildirect/admin_export/run/"); ?>'); return false;">Export</button>-->
|
| 2 |
-
<button id='emaildirect_export' onClick="perform_export(); return false;">Export</button>
|
| 3 |
-
<script type='text/javascript'>
|
| 4 |
-
function perform_export()
|
| 5 |
-
{
|
| 6 |
-
var form = $('config_edit_form');
|
| 7 |
-
var send_to_ed = form['groups[export][fields][send_to_emaildirect][value]'];
|
| 8 |
-
var include_disabled = form['groups[export][fields][include_disabled][value]'];
|
| 9 |
-
var url = '<?php echo $this->getUrl("emaildirect/admin_export/run/"); ?>';
|
| 10 |
-
|
| 11 |
-
url += 'send_to_emaildirect/' + $(send_to_ed).getValue() + '/include_disabled/' + $(include_disabled).getValue() + '/';
|
| 12 |
-
|
| 13 |
-
window.open(url);
|
| 14 |
-
}
|
| 15 |
-
</script>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
app/design/adminhtml/default/default/template/emaildirect/system/config/form/field/export/date_range.phtml
ADDED
|
@@ -0,0 +1,120 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<span>From: </span><input style="width: 75px;" type="text" name="order_export_from" id="order_export_from" value="<?php echo $this->getFromDate() ?>" class="input-text">
|
| 2 |
+
<img src="<?php echo $this->getSkinUrl('images/grid-cal.gif'); ?>" alt="Select From Date" class="v-middle" title="Select From Date" id="from_trig">
|
| 3 |
+
<span> to: </span>
|
| 4 |
+
<input style="width: 75px;" type="text" name="order_export_to" id="order_export_to" value="<?php echo $this->getToDate() ?>" class="input-text">
|
| 5 |
+
<img src="<?php echo $this->getSkinUrl('images/grid-cal.gif'); ?>" alt="Select To Date" class="v-middle" title="Select To Date" id="to_trig">
|
| 6 |
+
<div class='ed_orders_found'>
|
| 7 |
+
<strong>Orders Found: </strong><span id='orders_found'><?php echo $this->getOrdersCount() ?></span>
|
| 8 |
+
</div>
|
| 9 |
+
<script type='text/javascript'>
|
| 10 |
+
|
| 11 |
+
var start_from = '<?php echo $this->getFromDate() ?>';
|
| 12 |
+
var start_to = '<?php echo $this->getFromDate() ?>';
|
| 13 |
+
|
| 14 |
+
var check_from = parseDate(start_from);
|
| 15 |
+
|
| 16 |
+
function parseDate(date_string)
|
| 17 |
+
{
|
| 18 |
+
var date_parts = date_string.split('-');
|
| 19 |
+
return new Date(date_parts[0],date_parts[1] - 1,date_parts[2]);
|
| 20 |
+
}
|
| 21 |
+
|
| 22 |
+
var calendarSetupObject = {
|
| 23 |
+
inputField : "order_export_from",
|
| 24 |
+
ifFormat : "%Y-%m-%d",
|
| 25 |
+
showTime : "false",
|
| 26 |
+
button : "from_trig",
|
| 27 |
+
align : "Bl",
|
| 28 |
+
singleClick : true,
|
| 29 |
+
disableFunc: function(date)
|
| 30 |
+
{
|
| 31 |
+
if (date < check_from)
|
| 32 |
+
return true;
|
| 33 |
+
}
|
| 34 |
+
}
|
| 35 |
+
Calendar.setup(calendarSetupObject);
|
| 36 |
+
|
| 37 |
+
var calendarSetupObject2 = {
|
| 38 |
+
inputField : "order_export_to",
|
| 39 |
+
ifFormat : "%Y-%m-%d",
|
| 40 |
+
showTime : "false",
|
| 41 |
+
button : "to_trig",
|
| 42 |
+
align : "Bl",
|
| 43 |
+
singleClick : true,
|
| 44 |
+
disableFunc: function(date)
|
| 45 |
+
{
|
| 46 |
+
if (date < check_from)
|
| 47 |
+
return true;
|
| 48 |
+
}
|
| 49 |
+
}
|
| 50 |
+
Calendar.setup(calendarSetupObject2);
|
| 51 |
+
|
| 52 |
+
var url = '<?php echo $this->getUrl("emaildirect/admin_export/count/"); ?>';
|
| 53 |
+
|
| 54 |
+
$('order_export_from').observe('change', function(event)
|
| 55 |
+
{
|
| 56 |
+
if (!validateDates())
|
| 57 |
+
return;
|
| 58 |
+
|
| 59 |
+
dateRangeChange();
|
| 60 |
+
});
|
| 61 |
+
|
| 62 |
+
$('order_export_to').observe('change', function(event)
|
| 63 |
+
{
|
| 64 |
+
if (!validateDates())
|
| 65 |
+
return;
|
| 66 |
+
|
| 67 |
+
// Check if the date is < to date
|
| 68 |
+
dateRangeChange();
|
| 69 |
+
});
|
| 70 |
+
|
| 71 |
+
function validateDates()
|
| 72 |
+
{
|
| 73 |
+
// Check if the date is < starting date or > to date
|
| 74 |
+
var from = parseDate($('order_export_from').value);
|
| 75 |
+
var to = parseDate($('order_export_to').value);
|
| 76 |
+
|
| 77 |
+
if (from < check_from)
|
| 78 |
+
{
|
| 79 |
+
$('order_export_from').value = start_from;
|
| 80 |
+
return false;
|
| 81 |
+
}
|
| 82 |
+
|
| 83 |
+
if (to < check_from)
|
| 84 |
+
{
|
| 85 |
+
$('order_export_to').value = start_from;
|
| 86 |
+
return false;
|
| 87 |
+
}
|
| 88 |
+
|
| 89 |
+
if (from > to)
|
| 90 |
+
{
|
| 91 |
+
var temp = $('order_export_from').value;
|
| 92 |
+
|
| 93 |
+
$('order_export_from').value = $('order_export_to').value;
|
| 94 |
+
$('order_export_to').value = temp;
|
| 95 |
+
}
|
| 96 |
+
|
| 97 |
+
return true;
|
| 98 |
+
}
|
| 99 |
+
|
| 100 |
+
function dateRangeChange()
|
| 101 |
+
{
|
| 102 |
+
var from = $('order_export_from').value;
|
| 103 |
+
var to = $('order_export_to').value;
|
| 104 |
+
|
| 105 |
+
$('orders_found').update("???");
|
| 106 |
+
|
| 107 |
+
new Ajax.Request(url + (url.match(new RegExp('\\?')) ? '&isAjax=true' : '?isAjax=true' ), {
|
| 108 |
+
parameters : {from: from, to: to},
|
| 109 |
+
method : 'post',
|
| 110 |
+
loaderArea : false,
|
| 111 |
+
onSuccess : function(transport)
|
| 112 |
+
{
|
| 113 |
+
var response = eval('(' + transport.responseText + ')');
|
| 114 |
+
|
| 115 |
+
$('orders_found').update(response);
|
| 116 |
+
}
|
| 117 |
+
});
|
| 118 |
+
}
|
| 119 |
+
|
| 120 |
+
</script>
|
app/design/adminhtml/default/default/template/emaildirect/system/config/form/field/export/orders.phtml
ADDED
|
@@ -0,0 +1,14 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<button id='emaildirect_export_orders' onClick="perform_order_export(); return false;">Export Orders</button>
|
| 2 |
+
<script type='text/javascript'>
|
| 3 |
+
function perform_order_export()
|
| 4 |
+
{
|
| 5 |
+
var form = $('config_edit_form');
|
| 6 |
+
var from = form['order_export_from'];
|
| 7 |
+
var to = form['order_export_to'];
|
| 8 |
+
var url = '<?php echo $this->getUrl("emaildirect/admin_export/orders/"); ?>';
|
| 9 |
+
|
| 10 |
+
url += 'export_from/' + $(from).getValue() + '/export_to/' + $(to).getValue() + '/';
|
| 11 |
+
|
| 12 |
+
window.open(url);
|
| 13 |
+
}
|
| 14 |
+
</script>
|
app/design/adminhtml/default/default/template/emaildirect/system/config/form/field/export/products.phtml
ADDED
|
@@ -0,0 +1,13 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<button id='emaildirect_export_products' onClick="perform_product_export(); return false;">Export Products</button>
|
| 2 |
+
<script type='text/javascript'>
|
| 3 |
+
function perform_product_export()
|
| 4 |
+
{
|
| 5 |
+
var form = $('config_edit_form');
|
| 6 |
+
var include_disabled = form['groups[export][fields][include_disabled][value]'];
|
| 7 |
+
var url = '<?php echo $this->getUrl("emaildirect/admin_export/products/"); ?>';
|
| 8 |
+
|
| 9 |
+
url += 'include_disabled/' + $(include_disabled).getValue() + '/';
|
| 10 |
+
|
| 11 |
+
window.open(url);
|
| 12 |
+
}
|
| 13 |
+
</script>
|
app/design/adminhtml/default/default/template/emaildirect/system/config/form/field/trouble.phtml
CHANGED
|
@@ -74,8 +74,6 @@ function view_details()
|
|
| 74 |
var form = $('config_edit_form');
|
| 75 |
var url = '<?php echo $this->getUrl("emaildirect/admin_troubleshooting/"); ?>';
|
| 76 |
|
| 77 |
-
//url += 'send_to_emaildirect/' + $(send_to_ed).getValue() + '/include_disabled/' + $(include_disabled).getValue() + '/';
|
| 78 |
-
|
| 79 |
window.location = url;
|
| 80 |
}
|
| 81 |
</script>
|
| 74 |
var form = $('config_edit_form');
|
| 75 |
var url = '<?php echo $this->getUrl("emaildirect/admin_troubleshooting/"); ?>';
|
| 76 |
|
|
|
|
|
|
|
| 77 |
window.location = url;
|
| 78 |
}
|
| 79 |
</script>
|
app/design/adminhtml/default/default/template/emaildirect/system/convert/profile/export.phtml
CHANGED
|
@@ -1,7 +1,4 @@
|
|
| 1 |
-
<?php
|
| 2 |
|
| 3 |
-
//echo $this->getUrl("*/*/download",array('filename' => 'test123'));
|
| 4 |
-
?>
|
| 5 |
<style type="text/css" >
|
| 6 |
ul { list-style-type:none; padding:0; margin:0; }
|
| 7 |
li { margin-left:0; border:1px solid #ccc; margin:2px; padding:2px 2px 2px 2px; font:normal 13px sans-serif; }
|
|
@@ -9,6 +6,7 @@
|
|
| 9 |
</style>
|
| 10 |
<script type="text/javascript">
|
| 11 |
var FORM_KEY = "<?php echo $this->getFormKey();?>";
|
|
|
|
| 12 |
</script>
|
| 13 |
<ul>
|
| 14 |
<li>
|
|
@@ -78,7 +76,7 @@ function execImportData()
|
|
| 78 |
|
| 79 |
new Ajax.Request("<?php echo $this->getUrl('*/*/batchFinish');?>", {
|
| 80 |
method: "post",
|
| 81 |
-
parameters: {filename: filename, form_key: FORM_KEY},
|
| 82 |
onComplete: function(transport)
|
| 83 |
{
|
| 84 |
if (transport.responseText.isJSON())
|
|
@@ -158,6 +156,8 @@ function sendImportData(id,id_name)
|
|
| 158 |
if (!data.form_key)
|
| 159 |
data.form_key = FORM_KEY;
|
| 160 |
|
|
|
|
|
|
|
| 161 |
data.filename = filename;
|
| 162 |
|
| 163 |
new Ajax.Request("<?php echo $this->getUrl("*/*/batchRun/");?>", {
|
|
|
|
| 1 |
|
|
|
|
|
|
|
| 2 |
<style type="text/css" >
|
| 3 |
ul { list-style-type:none; padding:0; margin:0; }
|
| 4 |
li { margin-left:0; border:1px solid #ccc; margin:2px; padding:2px 2px 2px 2px; font:normal 13px sans-serif; }
|
| 6 |
</style>
|
| 7 |
<script type="text/javascript">
|
| 8 |
var FORM_KEY = "<?php echo $this->getFormKey();?>";
|
| 9 |
+
var export_type = "<?php echo $this->getExportType(); ?>";
|
| 10 |
</script>
|
| 11 |
<ul>
|
| 12 |
<li>
|
| 76 |
|
| 77 |
new Ajax.Request("<?php echo $this->getUrl('*/*/batchFinish');?>", {
|
| 78 |
method: "post",
|
| 79 |
+
parameters: {filename: filename, form_key: FORM_KEY, export_type: export_type},
|
| 80 |
onComplete: function(transport)
|
| 81 |
{
|
| 82 |
if (transport.responseText.isJSON())
|
| 156 |
if (!data.form_key)
|
| 157 |
data.form_key = FORM_KEY;
|
| 158 |
|
| 159 |
+
data.export_type = export_type;
|
| 160 |
+
|
| 161 |
data.filename = filename;
|
| 162 |
|
| 163 |
new Ajax.Request("<?php echo $this->getUrl("*/*/batchRun/");?>", {
|
app/design/adminhtml/default/default/template/emaildirect/system/convert/profile/export_orders.phtml
ADDED
|
File without changes
|
package.xml
CHANGED
|
@@ -1,18 +1,18 @@
|
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>EmailDirect_Integration</name>
|
| 4 |
-
<version>1.5.
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license>GNU</license>
|
| 7 |
<channel>community</channel>
|
| 8 |
<extends/>
|
| 9 |
<summary>EmailDirect integration for magento</summary>
|
| 10 |
<description>EmailDirect integration for magento</description>
|
| 11 |
-
<notes>
|
| 12 |
<authors><author><name>Kevin Linden</name><user>auto-converted</user><email>Kevin@EmailDirect.com</email></author></authors>
|
| 13 |
-
<date>2013-
|
| 14 |
-
<time>
|
| 15 |
-
<contents><target name="magelocal"><dir name="EmailDirect"><dir name="Integration"><dir name="Block"><dir name="Adminhtml"><dir name="Abandoned"><file name="Grid.php" hash="
|
| 16 |
<compatible/>
|
| 17 |
<dependencies/>
|
| 18 |
</package>
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>EmailDirect_Integration</name>
|
| 4 |
+
<version>1.5.3</version>
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license>GNU</license>
|
| 7 |
<channel>community</channel>
|
| 8 |
<extends/>
|
| 9 |
<summary>EmailDirect integration for magento</summary>
|
| 10 |
<description>EmailDirect integration for magento</description>
|
| 11 |
+
<notes>Added Functionality: Order Exports for the past 12 months.</notes>
|
| 12 |
<authors><author><name>Kevin Linden</name><user>auto-converted</user><email>Kevin@EmailDirect.com</email></author></authors>
|
| 13 |
+
<date>2013-08-05</date>
|
| 14 |
+
<time>18:24:14</time>
|
| 15 |
+
<contents><target name="magelocal"><dir name="EmailDirect"><dir name="Integration"><dir name="Block"><dir name="Adminhtml"><dir name="Abandoned"><file name="Grid.php" hash="6c89297aecebd7d25c1178bdd3fd5529"/></dir><dir name="System"><dir name="Config"><dir name="Fieldset"><file name="Hint.php" hash="7649b64cf2319484207c5179df7b4e9f"/></dir><dir name="Form"><dir name="Field"><dir name="Export"><file name="Orders.php" hash="ddcfc1c3c579421bc5c8af9173d1cbf2"/><file name="Products.php" hash="0c6a9936ccc806b9e3ddf573d1df1e53"/><file name="Range.php" hash="1a65f810199b9ca793ed2e8effeaed5b"/></dir><file name="Addressmapfields.php" hash="97b75c8340d561e863a3985ad73ce228"/><file name="Common.php" hash="e597ff375c4b46b92d6aa35646e3d8c9"/><file name="Mapfields.php" hash="677ebfd526fba11a1c177c00ae085526"/><file name="Shippingmapfields.php" hash="589a74260f394a5eae1b57ca89a74a8b"/><file name="Troubleshooting.php" hash="3699df84e4856983e679bd6c8fc9513e"/></dir></dir><file name="Account.php" hash="60fa8e43a87e1f2ff71c319c979556b2"/></dir><dir name="Convert"><dir name="Profile"><dir name="Export"><file name="Orders.php" hash="b04562daa66840c1e60b0cc930037de7"/><file name="Products.php" hash="a58d1d192ef82fd6ce032db7455b11b8"/></dir><file name="Export.php" hash="8ab53088f2dd35ca001e9a063a5c6e64"/></dir></dir></dir><dir name="Troubleshooting"><dir name="View"><dir name="Tab"><file name="Download.php" hash="9315a364a46f9e39972bbd0a47152e90"/><file name="Info.php" hash="6714b756a3fa7a5812356e544fe48f1b"/><file name="Log.php" hash="7c3661722d1197cd8a564f76275353c7"/><file name="Submit.php" hash="8831d886858fde08a4323eea66ec76d2"/></dir><file name="Form.php" hash="e527a3a2335b109c48a69f06c1b0d01f"/></dir><file name="Tabs.php" hash="ab1fdbe561e8572c2c50cdbec9573f82"/><file name="View.php" hash="7cd8350545f6b6119b2c91b3fc6ae562"/></dir><file name="Abandoned.php" hash="c8b14b123f121b528b9a9d3b6c90c328"/></dir><dir name="Checkout"><file name="Subscribe.php" hash="ae325e815a54bde93507562cf0d86b8a"/></dir><dir name="Customer"><dir name="Account"><dir name="Dashboard"><file name="Info.php" hash="20e74d9c2b2c02611c8f69b254d81ef5"/></dir><file name="Lists.php" hash="3c3bdb9482ecf4a71740a80395bd5465"/></dir></dir><dir name="Widget"><dir name="Grid"><dir name="Column"><dir name="Renderer"><file name="AbandonedMinutes.php" hash="22e33be85dc8348fce9b49637ead919d"/><file name="Action.php" hash="b85ef0454ab5c65ef0c43c7ef057ecc2"/></dir></dir></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="8f88fd5ed3c1d2260c135b47679bc818"/><file name="Fields.php" hash="1275a766d979e1ac3efabbf168ac92f5"/></dir><dir name="Model"><dir name="System"><dir name="Config"><dir name="Source"><dir name="Export"><dir name="Orders"><file name="From.php" hash="d41d8cd98f00b204e9800998ecf8427e"/></dir><file name="Batch.php" hash="fd2fcedc80472895b2081e21af8fa7f5"/></dir><file name="Abandoned.php" hash="d4985049dbd47d79a9d8f3361528bc87"/><file name="Abandonedlist.php" hash="a5d3b987ea2a2d8672c9c2c3473c24e2"/><file name="Additionallist.php" hash="1fcede7a1efe84ce13104194f3dc9962"/><file name="Checkoutsubscribe.php" hash="fd90252a1f19649a420dae136ad2a2ba"/><file name="List.php" hash="00611b9215b54e86171a8e4a9a5e54db"/><file name="Maxtimes.php" hash="465ffb2acf45adf594b6e8c720dd23dc"/><file name="Publication.php" hash="903657f0b2a911af97f8bccb6d9cffab"/><file name="Source.php" hash="fb706f2418208b2a8f7a29a6050e815d"/><file name="Time.php" hash="0e26839880e25ec0eedce1ce8a663c0f"/></dir></dir></dir><dir name="Wrapper"><file name="Abandoned.php" hash="f33d3ef289c147ce572bcafdce47665c"/><file name="Abstract.php" hash="90935a39addc872b82639ae97855c894"/><file name="Database.php" hash="3cceb467358d13584baff58c043762ec"/><file name="Execute.php" hash="e186a88a5dd2814b96801e1083ab9353"/><file name="Ftp.php" hash="d5335cfb68f99761d6902dd390a3d7a8"/><file name="Lists.php" hash="dff74c445f6a9582b35bb24560582c2b"/><file name="Orders.php" hash="81dbf1045688e932fa6175784c2bf0cb"/><file name="Publications.php" hash="815715549df345ccb5b69ed65589aa53"/><file name="Sources.php" hash="c6caf0274f7d0c50114324bc47a490c4"/><file name="Subscribers.php" hash="c3093bd2f86fdc3a7e4b2a2d4beadd2b"/></dir><file name="Observer.php" hash="51c5936090ef54a4718eb7f54b12b062"/></dir><dir name="controllers"><dir name="Admin"><file name="AbandonedController.php" hash="a662c919ac3fae1503616a1795c96cf9"/><file name="ExportController.php" hash="35d4e0da60732256ed3d6c4d07c5225c"/><file name="OrderExportController.php" hash="d41d8cd98f00b204e9800998ecf8427e"/><file name="TroubleshootingController.php" hash="c3dbc4bd72620dcd0b5844c3ee735f4e"/></dir><dir name="Customer"><file name="AccountController.php" hash="16bfdb6de4804a5d71cb972afbff4537"/></dir><file name="AbandonedController.php" hash="12d8655ed118d280320e5457f4933881"/><file name="ExportController.php" hash="18efc4651839152794bf06c3bf4a6bb1"/></dir><dir name="etc"><file name="adminhtml.xml" hash="896c10d8a3f932346e7d301052b1b6a6"/><file name="config.xml" hash="ca0f208186857a877092daecd0fd909e"/><file name="system.xml" hash="fbeee326e5a9385f8c273797130d26f9"/></dir><dir name="sql"><dir name="emaildirect_setup"><file name="mysql4-install-1.0.0.php" hash="9dc51edb346e9676735e15d3e78fa3eb"/><file name="mysql4-upgrade-1.0.13-1.0.14.php" hash="c42e2677b3960a049d7137b622552084"/><file name="mysql4-upgrade-1.0.19-1.2.0.php" hash="742be042b7f56e7ff2002b0606270ca6"/></dir></dir></dir></dir></target><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="emaildirect"><file name="emaildirect-connected-ebizmarts-title.png" hash="faf3858f23eafe3a89cce144fef6bd2a"/><file name="emaildirect-section-background.png" hash="c205ce454fe63280d7d7dd74428b7ea4"/><file name="emaildirect-tab.png" hash="9ddb077b74a7078ac509d79b024631a1"/><file name="emaildirect.css" hash="a1bd456df3c616fb0ec93d0ba60deb10"/><file name="emaildirect.js" hash="ce03dd6f51ea529fc4acdc5116f4e030"/></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="emaildirect"><dir name="images"><file name="bkg_block-title.gif" hash="f8c1f130ad69464fe7aff2f589b2ec75"/><file name="dotted_divider.gif" hash="260ebae91ffb1b7c663906b29a069925"/><file name="emaildirect-tile.png" hash="86a0ed36169ab9691480fc995ab674a8"/><file name="i_block-subscribe.gif" hash="9e5fee06a543742045118a95f2debcb8"/></dir><file name="integration.js" hash="d8c8d5bf0ddb4f6ead23bec8a2814475"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="emaildirect.xml" hash="60db91d36cf7929e5999239fcd4df256"/></dir><dir name="template"><dir name="emaildirect"><dir name="abandoned"><file name="grid.phtml" hash="d41d8cd98f00b204e9800998ecf8427e"/></dir><dir name="system"><dir name="config"><dir name="fieldset"><file name="hint.phtml" hash="4d7607ecb15d13cfe8bb0cc889cb724f"/></dir><dir name="form"><dir name="field"><dir name="export"><file name="date_range.phtml" hash="9f0970202cbe62961418ca9e07af6bca"/><file name="orders.phtml" hash="4e3e9e7bce9d95ed4414c680f81d0eb0"/><file name="products.phtml" hash="c18ce1ac91420dbb92d73cecd422b692"/></dir><file name="array.phtml" hash="d6af9f840f4dda9c73d106e167ec1bc6"/><file name="trouble.phtml" hash="6a4da26c815410af8030f1eda5f1022d"/></dir></dir></dir><dir name="convert"><dir name="profile"><file name="export.phtml" hash="ae27366ebd59f082f1a2dd000b41081b"/><file name="export_orders.phtml" hash="d41d8cd98f00b204e9800998ecf8427e"/></dir></dir></dir><dir name="troubleshooting"><dir name="view"><dir name="tab"><file name="download.phtml" hash="78ec34fd9c3c8b660b19f9e799d8e76e"/><file name="info.phtml" hash="547b1e906ed142983d1034e05f6251bd"/><file name="log.phtml" hash="c9e2c9493a2dad579bba4ed53795cf5e"/><file name="submit.phtml" hash="c2269f4a6a52d66bff5eac660d0831bd"/></dir><file name="form.phtml" hash="d2338bfe3598e9315ca8f5ac8d9b5516"/></dir><file name="view.phtml" hash="ee6af3fe79d916af764f41e7e8c5cc37"/></dir></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="emaildirect.xml" hash="9803fe9024b7eb6415713d81fe27c629"/></dir><dir name="template"><dir name="emaildirect"><dir name="checkout"><file name="subscribe.phtml" hash="351ea790305f0a3ec99c34180bbee235"/></dir><dir name="customer"><dir name="account"><dir name="dashboard"><file name="info.phtml" hash="4256a03d67ec2a6f97867a87564cff92"/></dir><file name="lists.phtml" hash="4c697dcfa63ece1db7885cadb02982d1"/></dir></dir><dir name="email"><dir name="order"><dir name="items"><dir name="order"><file name="default.phtml" hash="2d65f3d02b9baa08969d68f2a2cca348"/></dir></dir><file name="items.phtml" hash="e6b15e6460010c5acae66017d177bfb9"/></dir></dir></dir></dir></dir></dir></dir></target><target name="magelocale"><dir name="en_US"><dir name="template"><dir name="email"><file name="newsletter_subscr_success_emaildirect.html" hash="f6afb69d207bbc3f8920e7a72ac9dd07"/><file name="newsletter_unsub_success_emaildirect.html" hash="bd9f97e8f5485180d4420097b5200ef4"/></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="EmailDirect_Integration.xml" hash="2d2666e6d9cd8d40a4974d5e242721d6"/></dir></target></contents>
|
| 16 |
<compatible/>
|
| 17 |
<dependencies/>
|
| 18 |
</package>
|
skin/adminhtml/default/default/emaildirect/emaildirect.css
CHANGED
|
@@ -53,4 +53,6 @@ div.emaildirect-notice h4 div.abandoned
|
|
| 53 |
}
|
| 54 |
|
| 55 |
.log_note { color: red; padding: 5px 0;}
|
| 56 |
-
.log_size_warning { color: red;}
|
|
|
|
|
|
| 53 |
}
|
| 54 |
|
| 55 |
.log_note { color: red; padding: 5px 0;}
|
| 56 |
+
.log_size_warning { color: red;}
|
| 57 |
+
|
| 58 |
+
.ed_orders_found { margin-top: 10px; }
|
