Version Notes
The ChannelUnity connector kit for Magento.
This version imports the shipping service level into an order, and also resolves an issue when copying product data where catalog flat product is enabled.
Download this release
Release Info
Developer | Magento Core Team |
Extension | Camiloo_Channelunity |
Version | 1.0.0.4 |
Comparing to | |
See all releases |
Code changes from version 1.0.0.3 to 1.0.0.4
- app/code/community/Camiloo/Channelunity/Helper/Data.php +8 -1
- app/code/community/Camiloo/Channelunity/Model/Abstract.php +8 -1
- app/code/community/Camiloo/Channelunity/Model/Attributes.php +8 -1
- app/code/community/Camiloo/Channelunity/Model/Categories.php +8 -2
- app/code/community/Camiloo/Channelunity/Model/Checkforupdates.php +8 -1
- app/code/community/Camiloo/Channelunity/Model/Collection.php +2 -2
- app/code/community/Camiloo/Channelunity/Model/Customrate.php +8 -1
- app/code/community/Camiloo/Channelunity/Model/Entity.php +10 -3
- app/code/community/Camiloo/Channelunity/Model/Observer.php +8 -1
- app/code/community/Camiloo/Channelunity/Model/Orders.php +8 -1
- app/code/community/Camiloo/Channelunity/Model/Products.php +20 -4
- app/code/community/Camiloo/Channelunity/controllers/ApiController.php +8 -1
- app/design/adminhtml/default/default/template/channelunity/configheader.phtml +1 -1
- package.xml +4 -4
app/code/community/Camiloo/Channelunity/Helper/Data.php
CHANGED
@@ -1,5 +1,12 @@
|
|
1 |
<?php
|
2 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
3 |
class Camiloo_Channelunity_Helper_Data extends Mage_Core_Helper_Data
|
4 |
{
|
5 |
|
1 |
<?php
|
2 |
+
/**
|
3 |
+
* ChannelUnity connector for Magento Commerce
|
4 |
+
*
|
5 |
+
* @category Camiloo
|
6 |
+
* @package Camiloo_Channelunity
|
7 |
+
* @copyright Copyright (c) 2012 Camiloo Limited (http://www.camiloo.co.uk)
|
8 |
+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
9 |
+
*/
|
10 |
class Camiloo_Channelunity_Helper_Data extends Mage_Core_Helper_Data
|
11 |
{
|
12 |
|
app/code/community/Camiloo/Channelunity/Model/Abstract.php
CHANGED
@@ -1,5 +1,12 @@
|
|
1 |
<?php
|
2 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
3 |
class Camiloo_Channelunity_Model_Abstract
|
4 |
{
|
5 |
|
1 |
<?php
|
2 |
+
/**
|
3 |
+
* ChannelUnity connector for Magento Commerce
|
4 |
+
*
|
5 |
+
* @category Camiloo
|
6 |
+
* @package Camiloo_Channelunity
|
7 |
+
* @copyright Copyright (c) 2012 Camiloo Limited (http://www.camiloo.co.uk)
|
8 |
+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
9 |
+
*/
|
10 |
class Camiloo_Channelunity_Model_Abstract
|
11 |
{
|
12 |
|
app/code/community/Camiloo/Channelunity/Model/Attributes.php
CHANGED
@@ -1,5 +1,12 @@
|
|
1 |
<?php
|
2 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
3 |
class Camiloo_Channelunity_Model_Attributes extends Camiloo_Channelunity_Model_Abstract
|
4 |
{
|
5 |
|
1 |
<?php
|
2 |
+
/**
|
3 |
+
* ChannelUnity connector for Magento Commerce
|
4 |
+
*
|
5 |
+
* @category Camiloo
|
6 |
+
* @package Camiloo_Channelunity
|
7 |
+
* @copyright Copyright (c) 2012 Camiloo Limited (http://www.camiloo.co.uk)
|
8 |
+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
9 |
+
*/
|
10 |
class Camiloo_Channelunity_Model_Attributes extends Camiloo_Channelunity_Model_Abstract
|
11 |
{
|
12 |
|
app/code/community/Camiloo/Channelunity/Model/Categories.php
CHANGED
@@ -1,5 +1,12 @@
|
|
1 |
<?php
|
2 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
3 |
class Camiloo_Channelunity_Model_Categories extends Camiloo_Channelunity_Model_Abstract
|
4 |
{
|
5 |
|
@@ -74,7 +81,6 @@ class Camiloo_Channelunity_Model_Categories extends Camiloo_Channelunity_Model_A
|
|
74 |
}
|
75 |
|
76 |
$messageToSend .= "</CategoryList>";
|
77 |
-
// $messageToSend .= var_export($storeView, TRUE);
|
78 |
|
79 |
return $messageToSend;
|
80 |
}
|
1 |
<?php
|
2 |
+
/**
|
3 |
+
* ChannelUnity connector for Magento Commerce
|
4 |
+
*
|
5 |
+
* @category Camiloo
|
6 |
+
* @package Camiloo_Channelunity
|
7 |
+
* @copyright Copyright (c) 2012 Camiloo Limited (http://www.camiloo.co.uk)
|
8 |
+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
9 |
+
*/
|
10 |
class Camiloo_Channelunity_Model_Categories extends Camiloo_Channelunity_Model_Abstract
|
11 |
{
|
12 |
|
81 |
}
|
82 |
|
83 |
$messageToSend .= "</CategoryList>";
|
|
|
84 |
|
85 |
return $messageToSend;
|
86 |
}
|
app/code/community/Camiloo/Channelunity/Model/Checkforupdates.php
CHANGED
@@ -1,5 +1,12 @@
|
|
1 |
<?php
|
2 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
3 |
class Camiloo_Channelunity_Model_Checkforupdates extends Varien_Object
|
4 |
{
|
5 |
public function getRemoteXMLFileData($urltograb){
|
1 |
<?php
|
2 |
+
/**
|
3 |
+
* ChannelUnity connector for Magento Commerce
|
4 |
+
*
|
5 |
+
* @category Camiloo
|
6 |
+
* @package Camiloo_Channelunity
|
7 |
+
* @copyright Copyright (c) 2012 Camiloo Limited (http://www.camiloo.co.uk)
|
8 |
+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
9 |
+
*/
|
10 |
class Camiloo_Channelunity_Model_Checkforupdates extends Varien_Object
|
11 |
{
|
12 |
public function getRemoteXMLFileData($urltograb){
|
app/code/community/Camiloo/Channelunity/Model/Collection.php
CHANGED
@@ -1,5 +1,5 @@
|
|
1 |
<?php
|
2 |
-
|
3 |
|
4 |
class Camiloo_Channelunity_Model_Collection extends Mage_Catalog_Model_Resource_Product_Collection {
|
5 |
public function isEnabledFlat()
|
@@ -8,4 +8,4 @@
|
|
8 |
}
|
9 |
}
|
10 |
|
11 |
-
|
1 |
<?php
|
2 |
+
if (version_compare(Mage::getVersion(), "1.5.0.0", ">=")) {
|
3 |
|
4 |
class Camiloo_Channelunity_Model_Collection extends Mage_Catalog_Model_Resource_Product_Collection {
|
5 |
public function isEnabledFlat()
|
8 |
}
|
9 |
}
|
10 |
|
11 |
+
}
|
app/code/community/Camiloo/Channelunity/Model/Customrate.php
CHANGED
@@ -1,5 +1,12 @@
|
|
1 |
<?php
|
2 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
3 |
class Camiloo_Channelunity_Model_Customrate
|
4 |
extends Mage_Shipping_Model_Carrier_Abstract
|
5 |
implements Mage_Shipping_Model_Carrier_Interface
|
1 |
<?php
|
2 |
+
/**
|
3 |
+
* ChannelUnity connector for Magento Commerce
|
4 |
+
*
|
5 |
+
* @category Camiloo
|
6 |
+
* @package Camiloo_Channelunity
|
7 |
+
* @copyright Copyright (c) 2012 Camiloo Limited (http://www.camiloo.co.uk)
|
8 |
+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
9 |
+
*/
|
10 |
class Camiloo_Channelunity_Model_Customrate
|
11 |
extends Mage_Shipping_Model_Carrier_Abstract
|
12 |
implements Mage_Shipping_Model_Carrier_Interface
|
app/code/community/Camiloo/Channelunity/Model/Entity.php
CHANGED
@@ -1,9 +1,16 @@
|
|
1 |
<?php
|
2 |
-
|
3 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
4 |
|
5 |
|
6 |
-
|
7 |
|
8 |
|
9 |
|
1 |
<?php
|
2 |
+
/**
|
3 |
+
* ChannelUnity connector for Magento Commerce
|
4 |
+
*
|
5 |
+
* @category Camiloo
|
6 |
+
* @package Camiloo_Channelunity
|
7 |
+
* @copyright Copyright (c) 2012 Camiloo Limited (http://www.camiloo.co.uk)
|
8 |
+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
9 |
+
*/
|
10 |
+
class Camiloo_Channelunity_Model_Entity extends Mage_Eav_Model_Entity_Setup {
|
11 |
|
12 |
|
13 |
+
}
|
14 |
|
15 |
|
16 |
|
app/code/community/Camiloo/Channelunity/Model/Observer.php
CHANGED
@@ -1,5 +1,12 @@
|
|
1 |
<?php
|
2 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
3 |
/**
|
4 |
* ChannelUnity observers.
|
5 |
* Posts events to the CU cloud when various Magento events occur.
|
1 |
<?php
|
2 |
+
/**
|
3 |
+
* ChannelUnity connector for Magento Commerce
|
4 |
+
*
|
5 |
+
* @category Camiloo
|
6 |
+
* @package Camiloo_Channelunity
|
7 |
+
* @copyright Copyright (c) 2012 Camiloo Limited (http://www.camiloo.co.uk)
|
8 |
+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
9 |
+
*/
|
10 |
/**
|
11 |
* ChannelUnity observers.
|
12 |
* Posts events to the CU cloud when various Magento events occur.
|
app/code/community/Camiloo/Channelunity/Model/Orders.php
CHANGED
@@ -1,5 +1,12 @@
|
|
1 |
<?php
|
2 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
3 |
class Camiloo_Channelunity_Model_Orders extends Camiloo_Channelunity_Model_Abstract
|
4 |
{
|
5 |
|
1 |
<?php
|
2 |
+
/**
|
3 |
+
* ChannelUnity connector for Magento Commerce
|
4 |
+
*
|
5 |
+
* @category Camiloo
|
6 |
+
* @package Camiloo_Channelunity
|
7 |
+
* @copyright Copyright (c) 2012 Camiloo Limited (http://www.camiloo.co.uk)
|
8 |
+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
9 |
+
*/
|
10 |
class Camiloo_Channelunity_Model_Orders extends Camiloo_Channelunity_Model_Abstract
|
11 |
{
|
12 |
|
app/code/community/Camiloo/Channelunity/Model/Products.php
CHANGED
@@ -1,5 +1,12 @@
|
|
1 |
<?php
|
2 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
3 |
class Camiloo_Channelunity_Model_Products extends Camiloo_Channelunity_Model_Abstract
|
4 |
{
|
5 |
protected $_collection = 'catalog/product';
|
@@ -419,15 +426,24 @@
|
|
419 |
try {
|
420 |
|
421 |
// get the highest product ID
|
422 |
-
|
|
|
|
|
|
|
|
|
|
|
423 |
$collectionOfProduct->setOrder('entity_id', 'DESC');
|
424 |
$collectionOfProduct->setPageSize(1);
|
425 |
$collectionOfProduct->setCurPage(1);
|
426 |
$totp = $collectionOfProduct->getFirstItem();
|
427 |
$totp = $totp->getEntityId();
|
428 |
|
429 |
-
|
430 |
-
|
|
|
|
|
|
|
|
|
431 |
$totalNumProducts = $this->executeQueryScalar(str_replace("SELECT", "SELECT count(*) as count_cu, ", $collectionOfProduct->getSelect()), 'count_cu');
|
432 |
|
433 |
$collectionOfProduct->addAttributeToFilter("entity_id", array('gteq' => $rangeFrom))
|
1 |
<?php
|
2 |
+
/**
|
3 |
+
* ChannelUnity connector for Magento Commerce
|
4 |
+
*
|
5 |
+
* @category Camiloo
|
6 |
+
* @package Camiloo_Channelunity
|
7 |
+
* @copyright Copyright (c) 2012 Camiloo Limited (http://www.camiloo.co.uk)
|
8 |
+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
9 |
+
*/
|
10 |
class Camiloo_Channelunity_Model_Products extends Camiloo_Channelunity_Model_Abstract
|
11 |
{
|
12 |
protected $_collection = 'catalog/product';
|
426 |
try {
|
427 |
|
428 |
// get the highest product ID
|
429 |
+
if (version_compare(Mage::getVersion(), "1.5.0.0", ">=")) {
|
430 |
+
$collectionOfProduct = Mage::getModel('channelunity/collection')->addStoreFilter($storeId);
|
431 |
+
}
|
432 |
+
else {
|
433 |
+
$collectionOfProduct = Mage::getModel('catalog/product')->getCollection()->addStoreFilter($storeId);
|
434 |
+
}
|
435 |
$collectionOfProduct->setOrder('entity_id', 'DESC');
|
436 |
$collectionOfProduct->setPageSize(1);
|
437 |
$collectionOfProduct->setCurPage(1);
|
438 |
$totp = $collectionOfProduct->getFirstItem();
|
439 |
$totp = $totp->getEntityId();
|
440 |
|
441 |
+
if (version_compare(Mage::getVersion(), "1.5.0.0", ">=")) {
|
442 |
+
$collectionOfProduct = Mage::getModel('channelunity/collection')->addStoreFilter($storeId);
|
443 |
+
}
|
444 |
+
else {
|
445 |
+
$collectionOfProduct = Mage::getModel('catalog/product')->getCollection()->addStoreFilter($storeId);
|
446 |
+
}
|
447 |
$totalNumProducts = $this->executeQueryScalar(str_replace("SELECT", "SELECT count(*) as count_cu, ", $collectionOfProduct->getSelect()), 'count_cu');
|
448 |
|
449 |
$collectionOfProduct->addAttributeToFilter("entity_id", array('gteq' => $rangeFrom))
|
app/code/community/Camiloo/Channelunity/controllers/ApiController.php
CHANGED
@@ -1,5 +1,12 @@
|
|
1 |
<?php
|
2 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
3 |
class Camiloo_Channelunity_ApiController extends Mage_Core_Controller_Front_Action
|
4 |
{
|
5 |
private function terminate($message) {
|
1 |
<?php
|
2 |
+
/**
|
3 |
+
* ChannelUnity connector for Magento Commerce
|
4 |
+
*
|
5 |
+
* @category Camiloo
|
6 |
+
* @package Camiloo_Channelunity
|
7 |
+
* @copyright Copyright (c) 2012 Camiloo Limited (http://www.camiloo.co.uk)
|
8 |
+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
9 |
+
*/
|
10 |
class Camiloo_Channelunity_ApiController extends Mage_Core_Controller_Front_Action
|
11 |
{
|
12 |
private function terminate($message) {
|
app/design/adminhtml/default/default/template/channelunity/configheader.phtml
CHANGED
@@ -16,7 +16,7 @@
|
|
16 |
<h3>ChannelUnity Integration for Magento</h3>
|
17 |
Devised and Developed in Manchester, UK by <a href="http://www.camiloo.co.uk/?ref=cu" target="_blank">Camiloo Limited</a><br />
|
18 |
<?php
|
19 |
-
$xml = Mage::getModel('channelunity/checkforupdates')->getRemoteXMLFileData("http://my.channelunity.com/versioncheck.php?Version=1.0.0.
|
20 |
$html = $xml->DisplayMessage[0];
|
21 |
echo $html;
|
22 |
?>
|
16 |
<h3>ChannelUnity Integration for Magento</h3>
|
17 |
Devised and Developed in Manchester, UK by <a href="http://www.camiloo.co.uk/?ref=cu" target="_blank">Camiloo Limited</a><br />
|
18 |
<?php
|
19 |
+
$xml = Mage::getModel('channelunity/checkforupdates')->getRemoteXMLFileData("http://my.channelunity.com/versioncheck.php?Version=1.0.0.4");
|
20 |
$html = $xml->DisplayMessage[0];
|
21 |
echo $html;
|
22 |
?>
|
package.xml
CHANGED
@@ -1,7 +1,7 @@
|
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>Camiloo_Channelunity</name>
|
4 |
-
<version>1.0.0.
|
5 |
<stability>stable</stability>
|
6 |
<license uri="http://www.camiloo.co.uk/license.txt">Camiloo EULA</license>
|
7 |
<channel>community</channel>
|
@@ -13,9 +13,9 @@ Should you need any help getting started, please email support@camiloo.co.uk</de
|
|
13 |
<notes>The ChannelUnity connector kit for Magento.
|
14 |
This version imports the shipping service level into an order, and also resolves an issue when copying product data where catalog flat product is enabled.</notes>
|
15 |
<authors><author><name>Camiloo Limited</name><user>auto-converted</user><email>hello@camiloo.co.uk</email></author></authors>
|
16 |
-
<date>2012-05-
|
17 |
-
<time>
|
18 |
-
<contents><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="template"><dir name="channelunity"><file name="configheader.phtml" hash="
|
19 |
<compatible/>
|
20 |
<dependencies/>
|
21 |
</package>
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>Camiloo_Channelunity</name>
|
4 |
+
<version>1.0.0.4</version>
|
5 |
<stability>stable</stability>
|
6 |
<license uri="http://www.camiloo.co.uk/license.txt">Camiloo EULA</license>
|
7 |
<channel>community</channel>
|
13 |
<notes>The ChannelUnity connector kit for Magento.
|
14 |
This version imports the shipping service level into an order, and also resolves an issue when copying product data where catalog flat product is enabled.</notes>
|
15 |
<authors><author><name>Camiloo Limited</name><user>auto-converted</user><email>hello@camiloo.co.uk</email></author></authors>
|
16 |
+
<date>2012-05-17</date>
|
17 |
+
<time>13:21:47</time>
|
18 |
+
<contents><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="template"><dir name="channelunity"><file name="configheader.phtml" hash="4b5db6e0e20940f8295167b3518b22cf"/><file name="paymentinfo.phtml" hash="60967f7ab38fe17c879b272eed25f986"/></dir></dir></dir></dir></dir></target><target name="magecommunity"><dir name="Camiloo"><dir name="Channelunity"><dir name="Block"><file name="Configheader.php" hash="6d7de078f04901e94b8b9675bcd9e4ac"/><file name="Paymentform.php" hash="1f3e79556f15a57b9761c3665a103103"/><file name="Paymentinfo.php" hash="6c3c36d92592dd802fb8045dc065d231"/></dir><dir name="controllers"><file name="ApiController.php" hash="6cc9052f6dd80e9460bc40d208fb5779"/><file name="ApiController.php.old.php" hash="01ff34c2cf5798a82cfc11b19ab6decd"/></dir><dir name="etc"><file name="config.xml" hash="4d813910e0807b964b3e68484eb38f41"/><file name="system.xml" hash="b43f861f8ab3dadca3c122be10790609"/></dir><dir name="Helper"><file name="Data.php" hash="857d7d23882394c33f96e14dece757c2"/></dir><dir name="Model"><file name="Abstract.php" hash="de4075b91bbb176c807ad12061789774"/><file name="Attributes.php" hash="054b33cadc22acda31056e5b4cb8ff56"/><file name="Categories.php" hash="fd3806b220fd579b00bc5ab5fd464170"/><file name="Checkforupdates.php" hash="e2675f59cc61e54ad1a20f76865ce653"/><file name="Collection.php" hash="ee472aa7cc4300c444e40ad5e770d3f6"/><file name="Customrate.php" hash="f388bd243823436828c1bb214b3f81be"/><file name="Entity.php" hash="0032a6c24cb75beb2ae073a56c2a1564"/><file name="Observer.php" hash="f734886fbecb301e766eeeeb8e95f2f3"/><file name="Ordercreatebackport.php" hash="3b696fb97ce6550a967d76436a3d131c"/><file name="Orders.php" hash="883998c27e6a066f1dfc4eb2757d8e08"/><file name="Payment.php" hash="7fe570cf0aaf7c2bcdf1982b6e69caa6"/><file name="Paymentinfo.php" hash="e11658c9fa02420557441f5c8a41f8a0"/><file name="Paymentmethoduk.php" hash="a99409ed4ee5f7e426df4eaf793482d6"/><file name="Products.php" hash="490c089a0cc71b8c5b049d767fd670a8"/><file name="Stores.php" hash="7f299877f0b62ca9d30a46b333124680"/></dir><dir name="sql"><dir name="channelunity_setup"><file name="install-1.0.0.php" hash="7127fff7219108813aa35dd7596b09d3"/><file name="mysql4-install-0.0.1.php" hash="7ebc892c87b9401bf402a7e1976133e3"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Camiloo_Channelunity.xml" hash="cccfbce64ee176372c5afecb8676fab0"/></dir></target></contents>
|
19 |
<compatible/>
|
20 |
<dependencies/>
|
21 |
</package>
|