Version Notes
Added support for product images
Download this release
Release Info
| Developer | Eduard G. Dumitrescu |
| Extension | Intelivemetrics_Unityreports |
| Version | 0.7.8 |
| Comparing to | |
| See all releases | |
Code changes from version 0.7.7 to 0.7.8
- app/code/community/Intelivemetrics/Unityreports/Model/Cron/Sync.php +10 -5
- app/code/community/Intelivemetrics/Unityreports/Model/Request/HandShake.php +2 -1
- app/code/community/Intelivemetrics/Unityreports/Model/Sync.php +0 -66
- app/code/community/Intelivemetrics/Unityreports/Model/Sync/Invoice.php +27 -9
- app/code/community/Intelivemetrics/Unityreports/controllers/IndexController.php +1 -2
- app/code/community/Intelivemetrics/Unityreports/controllers/PublicController.php +75 -0
- js/intelivemetrics/unityreports/utmz-alternative.js +53 -53
- package.xml +5 -5
app/code/community/Intelivemetrics/Unityreports/Model/Cron/Sync.php
CHANGED
|
@@ -39,14 +39,11 @@ extends Intelivemetrics_Unityreports_Model_Cron{
|
|
| 39 |
return true;
|
| 40 |
}
|
| 41 |
|
| 42 |
-
//sync customers
|
| 43 |
if (($res1 = Mage::getModel('unityreports/sync_customer')->runSync()) !== Intelivemetrics_Unityreports_Model_Sync::NOTHING_TO_SYNC) {
|
| 44 |
$helper->debug('OK syncing customers');
|
| 45 |
}
|
| 46 |
-
if (
|
| 47 |
-
$helper->debug('OK syncing customer actions');
|
| 48 |
-
}
|
| 49 |
-
if ($res1 !== Intelivemetrics_Unityreports_Model_Sync::NOTHING_TO_SYNC || $res2 !== Intelivemetrics_Unityreports_Model_Sync::NOTHING_TO_SYNC) {
|
| 50 |
return true;
|
| 51 |
}
|
| 52 |
|
|
@@ -71,6 +68,14 @@ extends Intelivemetrics_Unityreports_Model_Cron{
|
|
| 71 |
if ($res1 !== Intelivemetrics_Unityreports_Model_Sync::NOTHING_TO_SYNC || $res2 !== Intelivemetrics_Unityreports_Model_Sync::NOTHING_TO_SYNC) {
|
| 72 |
return true;
|
| 73 |
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 74 |
} catch (Exception $e) {
|
| 75 |
$helper->debug($e, Zend_Log::ERR);
|
| 76 |
return false;
|
| 39 |
return true;
|
| 40 |
}
|
| 41 |
|
| 42 |
+
//sync customers
|
| 43 |
if (($res1 = Mage::getModel('unityreports/sync_customer')->runSync()) !== Intelivemetrics_Unityreports_Model_Sync::NOTHING_TO_SYNC) {
|
| 44 |
$helper->debug('OK syncing customers');
|
| 45 |
}
|
| 46 |
+
if ($res1 !== Intelivemetrics_Unityreports_Model_Sync::NOTHING_TO_SYNC) {
|
|
|
|
|
|
|
|
|
|
| 47 |
return true;
|
| 48 |
}
|
| 49 |
|
| 68 |
if ($res1 !== Intelivemetrics_Unityreports_Model_Sync::NOTHING_TO_SYNC || $res2 !== Intelivemetrics_Unityreports_Model_Sync::NOTHING_TO_SYNC) {
|
| 69 |
return true;
|
| 70 |
}
|
| 71 |
+
|
| 72 |
+
//sync customer actions
|
| 73 |
+
if (($res2 = Mage::getModel('unityreports/sync_customerAction')->runSync()) !== Intelivemetrics_Unityreports_Model_Sync::NOTHING_TO_SYNC) {
|
| 74 |
+
$helper->debug('OK syncing customer actions');
|
| 75 |
+
}
|
| 76 |
+
if ($res2 !== Intelivemetrics_Unityreports_Model_Sync::NOTHING_TO_SYNC) {
|
| 77 |
+
return true;
|
| 78 |
+
}
|
| 79 |
} catch (Exception $e) {
|
| 80 |
$helper->debug($e, Zend_Log::ERR);
|
| 81 |
return false;
|
app/code/community/Intelivemetrics/Unityreports/Model/Request/HandShake.php
CHANGED
|
@@ -24,7 +24,8 @@ class Intelivemetrics_Unityreports_Model_Request_HandShake extends Intelivemetri
|
|
| 24 |
|
| 25 |
protected function _getMageInfo() {
|
| 26 |
$db =Mage::getSingleton('unityreports/utils')->getDb();
|
| 27 |
-
$
|
|
|
|
| 28 |
|
| 29 |
if (!$result) {
|
| 30 |
return FALSE;
|
| 24 |
|
| 25 |
protected function _getMageInfo() {
|
| 26 |
$db =Mage::getSingleton('unityreports/utils')->getDb();
|
| 27 |
+
$tbl = Intelivemetrics_Unityreports_Model_Utils::getTableName('core_resource');
|
| 28 |
+
$result = $db->query("SELECT * FROM {$tbl}");
|
| 29 |
|
| 30 |
if (!$result) {
|
| 31 |
return FALSE;
|
app/code/community/Intelivemetrics/Unityreports/Model/Sync.php
CHANGED
|
@@ -33,72 +33,6 @@ class Intelivemetrics_Unityreports_Model_Sync {
|
|
| 33 |
return self::MAX_SENTS;
|
| 34 |
}
|
| 35 |
|
| 36 |
-
/**
|
| 37 |
-
* Metodo invocato dal Cron di Magento (vedi xml di configurazione)
|
| 38 |
-
* @assert () == true
|
| 39 |
-
* @return null
|
| 40 |
-
*/
|
| 41 |
-
// public function sync() {
|
| 42 |
-
// $helper = Mage::helper('unityreports');
|
| 43 |
-
// try {
|
| 44 |
-
// $helper->debug('*******NEW SYNC JOB START*******');
|
| 45 |
-
// //Check app status before syncing
|
| 46 |
-
// if (!$this->_appIsOk()) {
|
| 47 |
-
// $helper->debug('App is not ok, cannot send data');
|
| 48 |
-
// return false;
|
| 49 |
-
// }
|
| 50 |
-
//
|
| 51 |
-
// //sync prods & variations
|
| 52 |
-
// if (($res1 = Mage::getModel('unityreports/sync_product')->runSync()) !== Intelivemetrics_Unityreports_Model_Sync::NOTHING_TO_SYNC) {
|
| 53 |
-
// $helper->debug('OK syncing products');
|
| 54 |
-
// }
|
| 55 |
-
// if (($res2 = Mage::getModel('unityreports/sync_productVariation')->runSync()) !== Intelivemetrics_Unityreports_Model_Sync::NOTHING_TO_SYNC) {
|
| 56 |
-
// $helper->debug('OK syncing product variations');
|
| 57 |
-
// }
|
| 58 |
-
// if ($res1 !== Intelivemetrics_Unityreports_Model_Sync::NOTHING_TO_SYNC || $res2 !== Intelivemetrics_Unityreports_Model_Sync::NOTHING_TO_SYNC) {
|
| 59 |
-
// return true;
|
| 60 |
-
// }
|
| 61 |
-
//
|
| 62 |
-
// //sync orders & abcarts
|
| 63 |
-
// if (($res1 = Mage::getModel('unityreports/sync_order')->runSync()) !== Intelivemetrics_Unityreports_Model_Sync::NOTHING_TO_SYNC) {
|
| 64 |
-
// $helper->debug('OK syncing orders');
|
| 65 |
-
// }
|
| 66 |
-
// if (($res2 = Mage::getModel('unityreports/sync_abcart')->runSync()) !== Intelivemetrics_Unityreports_Model_Sync::NOTHING_TO_SYNC) {
|
| 67 |
-
// $helper->debug('OK syncing abcarts');
|
| 68 |
-
// }
|
| 69 |
-
// if ($res1 !== Intelivemetrics_Unityreports_Model_Sync::NOTHING_TO_SYNC || $res2 !== Intelivemetrics_Unityreports_Model_Sync::NOTHING_TO_SYNC) {
|
| 70 |
-
// return true;
|
| 71 |
-
// }
|
| 72 |
-
//
|
| 73 |
-
// //sync invoices & creditmemos
|
| 74 |
-
// if (($res1 = Mage::getModel('unityreports/sync_invoice')->runSync()) !== Intelivemetrics_Unityreports_Model_Sync::NOTHING_TO_SYNC) {
|
| 75 |
-
// $helper->debug('OK syncing invoices');
|
| 76 |
-
// }
|
| 77 |
-
// if (($res2 = Mage::getModel('unityreports/sync_creditnote')->runSync()) !== Intelivemetrics_Unityreports_Model_Sync::NOTHING_TO_SYNC) {
|
| 78 |
-
// $helper->debug('OK syncing credit memos');
|
| 79 |
-
// }
|
| 80 |
-
// if ($res1 !== Intelivemetrics_Unityreports_Model_Sync::NOTHING_TO_SYNC || $res2 !== Intelivemetrics_Unityreports_Model_Sync::NOTHING_TO_SYNC) {
|
| 81 |
-
// return true;
|
| 82 |
-
// }
|
| 83 |
-
//
|
| 84 |
-
// //sync customers and customer actions
|
| 85 |
-
// if (($res1 = Mage::getModel('unityreports/sync_customer')->runSync()) !== Intelivemetrics_Unityreports_Model_Sync::NOTHING_TO_SYNC) {
|
| 86 |
-
// $helper->debug('OK syncing customers');
|
| 87 |
-
// }
|
| 88 |
-
// if (($res2 = Mage::getModel('unityreports/sync_customerAction')->runSync()) !== Intelivemetrics_Unityreports_Model_Sync::NOTHING_TO_SYNC) {
|
| 89 |
-
// $helper->debug('OK syncing customer actions');
|
| 90 |
-
// }
|
| 91 |
-
// if ($res1 !== Intelivemetrics_Unityreports_Model_Sync::NOTHING_TO_SYNC || $res2 !== Intelivemetrics_Unityreports_Model_Sync::NOTHING_TO_SYNC) {
|
| 92 |
-
// return true;
|
| 93 |
-
// }
|
| 94 |
-
// } catch (Exception $e) {
|
| 95 |
-
// $helper->debug($e, Zend_Log::ERR);
|
| 96 |
-
// return false;
|
| 97 |
-
// }
|
| 98 |
-
//
|
| 99 |
-
// return true;
|
| 100 |
-
// }
|
| 101 |
-
|
| 102 |
protected function _getEntityType() {
|
| 103 |
$class = get_called_class();
|
| 104 |
$caller = new $class;
|
| 33 |
return self::MAX_SENTS;
|
| 34 |
}
|
| 35 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 36 |
protected function _getEntityType() {
|
| 37 |
$class = get_called_class();
|
| 38 |
$caller = new $class;
|
app/code/community/Intelivemetrics/Unityreports/Model/Sync/Invoice.php
CHANGED
|
@@ -11,6 +11,7 @@
|
|
| 11 |
class Intelivemetrics_Unityreports_Model_Sync_Invoice extends Intelivemetrics_Unityreports_Model_Sync implements Intelivemetrics_Unityreports_Model_Sync_Interface {
|
| 12 |
|
| 13 |
const ENTITY_TYPE = 'sales_invoice';
|
|
|
|
| 14 |
|
| 15 |
/**
|
| 16 |
* Segna gli oggetti inviati
|
|
@@ -66,16 +67,27 @@ class Intelivemetrics_Unityreports_Model_Sync_Invoice extends Intelivemetrics_Un
|
|
| 66 |
$ordersTableMage = Intelivemetrics_Unityreports_Model_Utils::getTableName('sales_flat_order');
|
| 67 |
$now = date('Y-m-d H:i:s');
|
| 68 |
try {
|
| 69 |
-
|
| 70 |
-
|
| 71 |
-
|
| 72 |
-
|
| 73 |
-
|
| 74 |
-
|
| 75 |
-
|
| 76 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 77 |
|
| 78 |
-
// se non ci sono record, esce
|
| 79 |
if (count($collection) == 0) {
|
| 80 |
$helper->debug('No invoice data found to sync', Zend_Log::INFO);
|
| 81 |
return null;
|
|
@@ -114,6 +126,12 @@ class Intelivemetrics_Unityreports_Model_Sync_Invoice extends Intelivemetrics_Un
|
|
| 114 |
}
|
| 115 |
}
|
| 116 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 117 |
}
|
| 118 |
|
| 119 |
?>
|
| 11 |
class Intelivemetrics_Unityreports_Model_Sync_Invoice extends Intelivemetrics_Unityreports_Model_Sync implements Intelivemetrics_Unityreports_Model_Sync_Interface {
|
| 12 |
|
| 13 |
const ENTITY_TYPE = 'sales_invoice';
|
| 14 |
+
const USE_SHIPPING = false; //true extracts data from shipments instead of invoices. some customerms don't generate invoices for all sales
|
| 15 |
|
| 16 |
/**
|
| 17 |
* Segna gli oggetti inviati
|
| 67 |
$ordersTableMage = Intelivemetrics_Unityreports_Model_Utils::getTableName('sales_flat_order');
|
| 68 |
$now = date('Y-m-d H:i:s');
|
| 69 |
try {
|
| 70 |
+
if (self::USE_SHIPPING) {
|
| 71 |
+
$collection = Mage::getModel('sales/order_shipment')->getCollection()
|
| 72 |
+
->addAttributeToSelect('*');
|
| 73 |
+
$collection->getSelect()
|
| 74 |
+
->joinLeft(array('orders' => $ordersTableMage), "orders.entity_id=main_table.order_id", array('o_increment_id' => 'increment_id', 'grand_total', 'shipping_amount', 'shipping_tax_amount', 'subtotal', 'discount_amount', 'tax_amount', 'order_currency_code'))
|
| 75 |
+
->where("main_table.increment_id NOT IN (SELECT increment_id FROM $invoicesTable WHERE synced=1 OR sents>={$this->getMaxSents()} OR TIMESTAMPDIFF(MINUTE,last_sent_at,'{$now}')<60)")
|
| 76 |
+
->where("orders.increment_id IN (SELECT increment_id FROM $ordersTable WHERE synced=1)")
|
| 77 |
+
->limit($limit)
|
| 78 |
+
;
|
| 79 |
+
} else {
|
| 80 |
+
$collection = Mage::getModel('sales/order_invoice')->getCollection()
|
| 81 |
+
->addAttributeToSelect('*');
|
| 82 |
+
$collection->getSelect()
|
| 83 |
+
->joinLeft(array('orders' => $ordersTableMage), "orders.entity_id=main_table.order_id", array('o_increment_id' => 'increment_id'))
|
| 84 |
+
->where("main_table.increment_id NOT IN (SELECT increment_id FROM $invoicesTable WHERE synced=1 OR sents>={$this->getMaxSents()} OR TIMESTAMPDIFF(MINUTE,last_sent_at,'{$now}')<60)")
|
| 85 |
+
->where("orders.increment_id IN (SELECT increment_id FROM $ordersTable WHERE synced=1)")
|
| 86 |
+
->limit($limit)
|
| 87 |
+
;
|
| 88 |
+
}
|
| 89 |
+
// $helper->debug($collection->getSelectSql()->__toString());
|
| 90 |
|
|
|
|
| 91 |
if (count($collection) == 0) {
|
| 92 |
$helper->debug('No invoice data found to sync', Zend_Log::INFO);
|
| 93 |
return null;
|
| 126 |
}
|
| 127 |
}
|
| 128 |
|
| 129 |
+
|
| 130 |
+
public function testGetData() {
|
| 131 |
+
$data = $this->_getData(10);
|
| 132 |
+
return $data;
|
| 133 |
+
}
|
| 134 |
+
|
| 135 |
}
|
| 136 |
|
| 137 |
?>
|
app/code/community/Intelivemetrics/Unityreports/controllers/IndexController.php
CHANGED
|
@@ -69,6 +69,5 @@ class Intelivemetrics_Unityreports_IndexController extends Mage_Adminhtml_Contro
|
|
| 69 |
|
| 70 |
$this->_redirectReferer();
|
| 71 |
}
|
| 72 |
-
|
| 73 |
-
|
| 74 |
}
|
| 69 |
|
| 70 |
$this->_redirectReferer();
|
| 71 |
}
|
| 72 |
+
|
|
|
|
| 73 |
}
|
app/code/community/Intelivemetrics/Unityreports/controllers/PublicController.php
ADDED
|
@@ -0,0 +1,75 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?php
|
| 2 |
+
|
| 3 |
+
/**
|
| 4 |
+
* Controller publicly available actions
|
| 5 |
+
*
|
| 6 |
+
* @category Unityreports
|
| 7 |
+
* @package Intelivemetrics_Unityreports
|
| 8 |
+
* @copyright Copyright (c) 2014 Intelive Metrics Srl
|
| 9 |
+
* @author Eduard Gabriel Dumitrescu (balaur@gmail.com)
|
| 10 |
+
*/
|
| 11 |
+
class Intelivemetrics_Unityreports_PublicController extends Mage_Core_Controller_Front_Action {
|
| 12 |
+
|
| 13 |
+
const ERR = 'ERROR:';
|
| 14 |
+
const HEADER = 'UnityReports: OK';
|
| 15 |
+
|
| 16 |
+
public function imageAction() {
|
| 17 |
+
try {
|
| 18 |
+
$id = (int) $this->getRequest()->getParam('id');
|
| 19 |
+
if (!$id) {
|
| 20 |
+
die(self::ERR . 'Missing prod ID');
|
| 21 |
+
}
|
| 22 |
+
$w = (int) $this->getRequest()->getParam('w');
|
| 23 |
+
if (!$w) {
|
| 24 |
+
$w = 100;
|
| 25 |
+
}
|
| 26 |
+
|
| 27 |
+
$p = Mage::getModel('catalog/product')->load($id);
|
| 28 |
+
if (!$p->getSku()) {
|
| 29 |
+
die(self::ERR . 'Cannot load product');
|
| 30 |
+
}
|
| 31 |
+
|
| 32 |
+
//if this sku doesn't have an image and is type simple, we can check his parent for image
|
| 33 |
+
if ((!$p->getImage() || $p->getImage() == 'no_selection') && $p->getTypeId() == 'simple') {
|
| 34 |
+
list( $parentId ) = Mage::getModel('catalog/product_type_configurable')
|
| 35 |
+
->getParentIdsByChild($p->getId());
|
| 36 |
+
$p->load($parentId);
|
| 37 |
+
if (!$p->getSku()) {
|
| 38 |
+
die(self::ERR . 'Cannot load parent product');
|
| 39 |
+
}
|
| 40 |
+
}
|
| 41 |
+
|
| 42 |
+
//we always do square images
|
| 43 |
+
$path = Mage::helper('catalog/image')
|
| 44 |
+
->init($p, 'image')
|
| 45 |
+
->resize($w, $w);
|
| 46 |
+
|
| 47 |
+
//output image
|
| 48 |
+
$ext = strtolower(pathinfo($path, PATHINFO_EXTENSION));
|
| 49 |
+
switch ($ext) {
|
| 50 |
+
case 'gif':
|
| 51 |
+
$type = 'image/gif';
|
| 52 |
+
break;
|
| 53 |
+
case 'jpg':
|
| 54 |
+
case 'jpeg':
|
| 55 |
+
$type = 'image/jpeg';
|
| 56 |
+
break;
|
| 57 |
+
case 'png':
|
| 58 |
+
$type = 'image/png';
|
| 59 |
+
break;
|
| 60 |
+
default:
|
| 61 |
+
$type = 'unknown';
|
| 62 |
+
break;
|
| 63 |
+
}
|
| 64 |
+
if ($type != 'unknown') {
|
| 65 |
+
header('Content-Type:' . $type);
|
| 66 |
+
header(self::HEADER);
|
| 67 |
+
readfile($path);
|
| 68 |
+
}
|
| 69 |
+
} catch (Exception $ex) {
|
| 70 |
+
die(self::ERR . $ex->getMessage());
|
| 71 |
+
}
|
| 72 |
+
}
|
| 73 |
+
|
| 74 |
+
|
| 75 |
+
}
|
js/intelivemetrics/unityreports/utmz-alternative.js
CHANGED
|
@@ -1,53 +1,53 @@
|
|
| 1 |
-
/**
|
| 2 |
-
* This script provides an alternative method for creating an _utmz cookie
|
| 3 |
-
* when switching to universal analytics
|
| 4 |
-
*
|
| 5 |
-
* @category Unityreports
|
| 6 |
-
* @package Intelivemetrics_Unityreports
|
| 7 |
-
* @copyright Copyright (c) 2014 Intelive Metrics Srl
|
| 8 |
-
* @author Eduard Gabriel Dumitrescu (balaur@gmail.com)
|
| 9 |
-
*/
|
| 10 |
-
var Qs = function () {
|
| 11 |
-
// This function is anonymous, is executed immediately and
|
| 12 |
-
// the return value is assigned to QueryString!
|
| 13 |
-
var query_string = {};
|
| 14 |
-
var query = window.location.search.substring(1);
|
| 15 |
-
var vars = query.split("&");
|
| 16 |
-
for (var i = 0; i < vars.length; i++) {
|
| 17 |
-
var pair = vars[i].split("=");
|
| 18 |
-
// If first entry with this name
|
| 19 |
-
if (typeof query_string[pair[0]] === "undefined") {
|
| 20 |
-
query_string[pair[0]] = pair[1];
|
| 21 |
-
// If second entry with this name
|
| 22 |
-
} else if (typeof query_string[pair[0]] === "string") {
|
| 23 |
-
var arr = [query_string[pair[0]], pair[1]];
|
| 24 |
-
query_string[pair[0]] = arr;
|
| 25 |
-
// If third or later entry with this name
|
| 26 |
-
} else {
|
| 27 |
-
query_string[pair[0]].push(pair[1]);
|
| 28 |
-
}
|
| 29 |
-
}
|
| 30 |
-
return query_string;
|
| 31 |
-
}();
|
| 32 |
-
|
| 33 |
-
//utm_campaign=app_listing&utm_medium=referral&utm_source=ga_partner_gallery
|
| 34 |
-
var Utmza = function (domain) {
|
| 35 |
-
var c = Qs.utm_campaign || null,
|
| 36 |
-
s = Qs.utm_source || null,
|
| 37 |
-
m = Qs.utm_medium || null,
|
| 38 |
-
j = [],
|
| 39 |
-
expires = new Date(),
|
| 40 |
-
cookie = '__utmza'
|
| 41 |
-
;
|
| 42 |
-
domain = domain || window.location.hostname;
|
| 43 |
-
|
| 44 |
-
if (c) j.push('c=' + c);
|
| 45 |
-
if (s) j.push('s=' + s);
|
| 46 |
-
if (m) j.push('m=' + m);
|
| 47 |
-
|
| 48 |
-
if(j.length > 0){
|
| 49 |
-
//create top level cookie
|
| 50 |
-
expires.setTime(expires.getTime() + 1000*60*60*24*365); // (1 years)
|
| 51 |
-
document.cookie = cookie + "=" + j.join('|') + "; expires=" + expires.toGMTString() + "; domain=" + domain + "; path=/";
|
| 52 |
-
}
|
| 53 |
-
}();
|
| 1 |
+
/**
|
| 2 |
+
* This script provides an alternative method for creating an _utmz cookie
|
| 3 |
+
* when switching to universal analytics
|
| 4 |
+
*
|
| 5 |
+
* @category Unityreports
|
| 6 |
+
* @package Intelivemetrics_Unityreports
|
| 7 |
+
* @copyright Copyright (c) 2014 Intelive Metrics Srl
|
| 8 |
+
* @author Eduard Gabriel Dumitrescu (balaur@gmail.com)
|
| 9 |
+
*/
|
| 10 |
+
var Qs = function () {
|
| 11 |
+
// This function is anonymous, is executed immediately and
|
| 12 |
+
// the return value is assigned to QueryString!
|
| 13 |
+
var query_string = {};
|
| 14 |
+
var query = window.location.search.substring(1);
|
| 15 |
+
var vars = query.split("&");
|
| 16 |
+
for (var i = 0; i < vars.length; i++) {
|
| 17 |
+
var pair = vars[i].split("=");
|
| 18 |
+
// If first entry with this name
|
| 19 |
+
if (typeof query_string[pair[0]] === "undefined") {
|
| 20 |
+
query_string[pair[0]] = pair[1];
|
| 21 |
+
// If second entry with this name
|
| 22 |
+
} else if (typeof query_string[pair[0]] === "string") {
|
| 23 |
+
var arr = [query_string[pair[0]], pair[1]];
|
| 24 |
+
query_string[pair[0]] = arr;
|
| 25 |
+
// If third or later entry with this name
|
| 26 |
+
} else {
|
| 27 |
+
query_string[pair[0]].push(pair[1]);
|
| 28 |
+
}
|
| 29 |
+
}
|
| 30 |
+
return query_string;
|
| 31 |
+
}();
|
| 32 |
+
|
| 33 |
+
//utm_campaign=app_listing&utm_medium=referral&utm_source=ga_partner_gallery
|
| 34 |
+
var Utmza = function (domain) {
|
| 35 |
+
var c = Qs.utm_campaign || null,
|
| 36 |
+
s = Qs.utm_source || null,
|
| 37 |
+
m = Qs.utm_medium || null,
|
| 38 |
+
j = [],
|
| 39 |
+
expires = new Date(),
|
| 40 |
+
cookie = '__utmza'
|
| 41 |
+
;
|
| 42 |
+
domain = domain || window.location.hostname;
|
| 43 |
+
|
| 44 |
+
if (c) j.push('c=' + c);
|
| 45 |
+
if (s) j.push('s=' + s);
|
| 46 |
+
if (m) j.push('m=' + m);
|
| 47 |
+
|
| 48 |
+
if(j.length > 0){
|
| 49 |
+
//create top level cookie
|
| 50 |
+
expires.setTime(expires.getTime() + 1000*60*60*24*365); // (1 years)
|
| 51 |
+
document.cookie = cookie + "=" + j.join('|') + "; expires=" + expires.toGMTString() + "; domain=" + domain + "; path=/";
|
| 52 |
+
}
|
| 53 |
+
}();
|
package.xml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>Intelivemetrics_Unityreports</name>
|
| 4 |
-
<version>0.7.
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license uri="http://choosealicense.com/licenses/apache-2.0/">APACHE</license>
|
| 7 |
<channel>community</channel>
|
|
@@ -10,11 +10,11 @@
|
|
| 10 |
<description>Unityreports brings powerful e-commerce analytics by combining Magento, Google Analytics and Google Adwords data.
|
| 11 |
http://www.unityreports.com
|
| 12 |
</description>
|
| 13 |
-
<notes>
|
| 14 |
<authors><author><name>Eduard G. Dumitrescu</name><user>bregoiu</user><email>eddie.dumitrescu@gmail.com</email></author></authors>
|
| 15 |
-
<date>2015-
|
| 16 |
-
<time>
|
| 17 |
-
<contents><target name="magecommunity"><dir name="Intelivemetrics"><dir name="Unityreports"><dir name="Block"><dir name="Adminhtml"><dir name="Button"><file name="Test.php" hash="f23e261d8cf7ef8314f121978b3b03d3"/></dir><dir name="Label"><file name="Renderer.php" hash="89a6ec5dddca5fcf86fbe85b83d87650"/></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="28ec3fc4be05e608c27da2722b75d2d1"/></dir><dir name="Model"><dir name="Admin"><dir name="Status"><file name="Active.php" hash="28d46ddb38425dcdddf34a694fcbcd84"/><dir name="Cron"><file name="Count.php" hash="8f8de0b781e5889c63b508dcba24532b"/><file name="GlobalCounters.php" hash="7b89f230d9a4fbd65bbf1dd87fd2d196"/><file name="Mage.php" hash="922159223ba73f6ecb4cb019595009f4"/><file name="Stat.php" hash="64e4b605214a0a966adada181d413d79"/><file name="Sync.php" hash="ab2313a6949823565001b9787a1a255a"/></dir><file name="Cron.php" hash="2f5e7a78dcdf1f593d239851316787cf"/></dir></dir><file name="Config.php" hash="590dd9e3939f58560d9b004763d48c05"/><dir name="Cron"><file name="Count.php" hash="e9fb746dabb7a9e2c8433f43fa723df8"/><file name="GlobalCounters.php" hash="c55ce27f8ea8c9a22b22053ae3715bff"/><file name="Request.php" hash="d0d5c8e1b3ba294ef4a628148f4eff3f"/><file name="Sync.php" hash="
|
| 18 |
<compatible/>
|
| 19 |
<dependencies><required><php><min>5.1.0</min><max>7.0.0</max></php></required></dependencies>
|
| 20 |
</package>
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>Intelivemetrics_Unityreports</name>
|
| 4 |
+
<version>0.7.8</version>
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license uri="http://choosealicense.com/licenses/apache-2.0/">APACHE</license>
|
| 7 |
<channel>community</channel>
|
| 10 |
<description>Unityreports brings powerful e-commerce analytics by combining Magento, Google Analytics and Google Adwords data.
|
| 11 |
http://www.unityreports.com
|
| 12 |
</description>
|
| 13 |
+
<notes>Added support for product images</notes>
|
| 14 |
<authors><author><name>Eduard G. Dumitrescu</name><user>bregoiu</user><email>eddie.dumitrescu@gmail.com</email></author></authors>
|
| 15 |
+
<date>2015-08-12</date>
|
| 16 |
+
<time>07:51:48</time>
|
| 17 |
+
<contents><target name="magecommunity"><dir name="Intelivemetrics"><dir name="Unityreports"><dir name="Block"><dir name="Adminhtml"><dir name="Button"><file name="Test.php" hash="f23e261d8cf7ef8314f121978b3b03d3"/></dir><dir name="Label"><file name="Renderer.php" hash="89a6ec5dddca5fcf86fbe85b83d87650"/></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="28ec3fc4be05e608c27da2722b75d2d1"/></dir><dir name="Model"><dir name="Admin"><dir name="Status"><file name="Active.php" hash="28d46ddb38425dcdddf34a694fcbcd84"/><dir name="Cron"><file name="Count.php" hash="8f8de0b781e5889c63b508dcba24532b"/><file name="GlobalCounters.php" hash="7b89f230d9a4fbd65bbf1dd87fd2d196"/><file name="Mage.php" hash="922159223ba73f6ecb4cb019595009f4"/><file name="Stat.php" hash="64e4b605214a0a966adada181d413d79"/><file name="Sync.php" hash="ab2313a6949823565001b9787a1a255a"/></dir><file name="Cron.php" hash="2f5e7a78dcdf1f593d239851316787cf"/></dir></dir><file name="Config.php" hash="590dd9e3939f58560d9b004763d48c05"/><dir name="Cron"><file name="Count.php" hash="e9fb746dabb7a9e2c8433f43fa723df8"/><file name="GlobalCounters.php" hash="c55ce27f8ea8c9a22b22053ae3715bff"/><file name="Request.php" hash="d0d5c8e1b3ba294ef4a628148f4eff3f"/><file name="Sync.php" hash="b929a2328350c060bc1566bbe5140aca"/></dir><file name="Cron.php" hash="51f800a9c3c0ab0acdcda3aa9ba51104"/><file name="Customer.php" hash="c99b23d2ec6ffd8acdcc11cf7ed6421e"/><file name="Observer.php" hash="6d29e3b6e3b740f8fcdbaf8f78feabba"/><dir name="Request"><file name="Base.php" hash="2c3fea1af836bedb205786d67465b97d"/><file name="Diagnose.php" hash="5e8525e5392c705660e800faf9b3e057"/><file name="Dq.php" hash="813628e7a57c45f37f83024cce909bdb"/><file name="GetCounters.php" hash="58350a26c70f552349a1eac4a29bb729"/><file name="HandShake.php" hash="904a425860be3685d747503367cc2b11"/><file name="Interface.php" hash="680707fa0a26ecd7237d116bc0b0a3da"/><file name="ResetAbcarts.php" hash="facdc1c2486398a2a62db126c8518174"/><file name="ResetAll.php" hash="b2533da935c5c66f741490f7f082c8df"/><file name="ResetCreditmemos.php" hash="a199f6f07c67e219d85990a3a08454cc"/><file name="ResetCustomers.php" hash="570aff03d862608cea5e09ded7e7fd9b"/><file name="ResetInvoices.php" hash="7c62cfe07c089b6ca64e32c9f4667297"/><file name="ResetOrders.php" hash="b73a88a0b1bd908c9e9e1d386f23087f"/><file name="ResetProductCounters.php" hash="e84ea87e8c2dcf28189e870c84118317"/><file name="ResetProducts.php" hash="9cfbc9b3f2a1388ef61f0af516ea8e02"/><file name="SetSpeed.php" hash="48496a1971c80fdaa689e0d65d0acd16"/><file name="StartSync.php" hash="30d94be6608c4bce5cebb114ad241fdb"/><file name="StopSync.php" hash="61fb6758c1600eed20c40e4ec28fcef1"/><file name="SyncResult.php" hash="c2f9893e2a083f9c792bc43a212196e4"/></dir><dir name="Resource"><dir name="Config"><file name="Collection.php" hash="dc7cc10daf7e597be061d7bf841d0f66"/></dir><file name="Config.php" hash="e3f733d66219ffc946a1b3cd5eca980d"/><file name="Setup.php" hash="2f7cb85c64bd6103faf9208c7d5f451f"/></dir><dir name="Sync"><file name="Abcart.php" hash="9c4132a0d377a5b8ea5b20d2a3f3fb3b"/><file name="Creditnote.php" hash="6485779bff48de00a9ba0960c906cf9f"/><file name="Customer.php" hash="b49c41bf3a310a1b874f0498b4863af7"/><file name="CustomerAction.php" hash="160ace0a2e9fa8e28ce522f0d03db25d"/><file name="Interface.php" hash="d74a42d2d34c34ce8ec3379bb220127f"/><file name="Invoice.php" hash="bc7adc628e4bff44e7314438b40a0cd3"/><file name="Order.php" hash="62d3a2e30cbe00b38773a0a6279ee11e"/><file name="Product.php" hash="ac1a6cd15f3fc1858e11170accf5145c"/><file name="ProductVariation.php" hash="c3042550b9849335c1af13cc26d61504"/></dir><file name="Sync.php" hash="8aa9f12fbe6fde9304046ff332ecfda9"/><file name="Utils.php" hash="911a0d029646f3c6ed69c812b472afe4"/><file name="Utmz.php" hash="b3b1d805e042142f8d713e253836b1b1"/></dir><dir name="controllers"><file name="IndexController.php" hash="a8424f7e6841bc8f0c59867a41c8c2f1"/><file name="PublicController.php" hash="49b73f02a1ed29bba55490f82af75608"/><file name="TestController.php" hash="f9394956fe1befcc5ce2c4830eae0149"/></dir><dir name="etc"><file name="adminhtml.xml" hash="aab2ef0e4aedb050d8b60937a085537c"/><file name="config.xml" hash="fe50df73d2f0d0316f958795f9ef9d11"/><file name="system.xml" hash="dd6cee8070b16c894b64f1b7d84a4571"/></dir><dir name="sql"><dir name="unityreports_setup"><file name="mysql4-install-0.7.2.php" hash="54f2cbb15d70806b1756c6196d9b3ec1"/><file name="mysql4-install-0.7.3.php" hash="54f2cbb15d70806b1756c6196d9b3ec1"/><file name="mysql4-upgrade-0.6.2-0.7.2.php" hash="7c1abd7bed806f811ffedf9cdb2c0cc0"/><file name="mysql4-upgrade-0.7.2-0.7.3.php" hash="fcbc4f1c8b216548ee212855142857f8"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Intelivemetrics_Unityreports.xml" hash="ccb9d92196bbc626b5552746ac3ad08b"/></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="unityreports.xml" hash="1378f49dd55356156426785b3d1e3eab"/></dir></dir></dir></dir></target><target name="mageweb"><dir name="js"><dir name="intelivemetrics"><dir name="unityreports"><file name="utmz-alternative.js" hash="20f145b83473ec9c13b738b3f15ee969"/></dir></dir></dir></target></contents>
|
| 18 |
<compatible/>
|
| 19 |
<dependencies><required><php><min>5.1.0</min><max>7.0.0</max></php></required></dependencies>
|
| 20 |
</package>
|
