Version Notes
* Prevent extension conflicts in the order grid
Download this release
Release Info
Developer | Christiaan de Ridder |
Extension | Tritac_ChannelEngine |
Version | 2.1.2 |
Comparing to | |
See all releases |
Code changes from version 2.1.1 to 2.1.2
app/code/community/Tritac/ChannelEngine/Model/Observer.php
CHANGED
@@ -728,4 +728,50 @@ class Tritac_ChannelEngine_Model_Observer
|
|
728 |
|
729 |
return $xml;
|
730 |
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
731 |
}
|
728 |
|
729 |
return $xml;
|
730 |
}
|
731 |
+
|
732 |
+
/**
|
733 |
+
* Join channelengine order fields to adminhtml order grid
|
734 |
+
*
|
735 |
+
* @param $observer
|
736 |
+
*/
|
737 |
+
public function prepareOrderGridCollection($observer)
|
738 |
+
{
|
739 |
+
$collection = $observer->getOrderGridCollection();
|
740 |
+
$joinTableName = Mage::getSingleton('core/resource')->getTableName('channelengine/order');
|
741 |
+
$collection->getSelect()->joinLeft(
|
742 |
+
array('channel_order_table' => $joinTableName),
|
743 |
+
'channel_order_table.order_id=main_table.entity_id',
|
744 |
+
array('channel_name', 'channel_order_id')
|
745 |
+
);
|
746 |
+
}
|
747 |
+
|
748 |
+
/**
|
749 |
+
* Add channelengine order fields to adminhtml order grid
|
750 |
+
*
|
751 |
+
* @param $observer
|
752 |
+
* @return $this
|
753 |
+
*/
|
754 |
+
public function appendCustomColumnToOrderGrid($observer)
|
755 |
+
{
|
756 |
+
$block = $observer->getBlock();
|
757 |
+
if (!isset($block)) {
|
758 |
+
return $this;
|
759 |
+
}
|
760 |
+
|
761 |
+
if ($block->getType() == 'adminhtml/sales_order_grid') {
|
762 |
+
$block->addColumnAfter('channel_order_id', array(
|
763 |
+
'header'=> Mage::helper('sales')->__('ChannelEngine Order ID'),
|
764 |
+
'width' => '80px',
|
765 |
+
'type' => 'text',
|
766 |
+
'index' => 'channel_order_id',
|
767 |
+
), 'real_order_id');
|
768 |
+
|
769 |
+
$block->addColumnAfter('channel_name', array(
|
770 |
+
'header'=> Mage::helper('sales')->__('Channel Name'),
|
771 |
+
'width' => '80px',
|
772 |
+
'type' => 'text',
|
773 |
+
'index' => 'channel_name',
|
774 |
+
), 'real_order_id');
|
775 |
+
}
|
776 |
+
}
|
777 |
}
|
app/code/community/Tritac/ChannelEngine/etc/config.xml
CHANGED
@@ -2,17 +2,12 @@
|
|
2 |
<config>
|
3 |
<modules>
|
4 |
<Tritac_ChannelEngine>
|
5 |
-
<version>2.1.
|
6 |
</Tritac_ChannelEngine>
|
7 |
</modules>
|
8 |
|
9 |
<global>
|
10 |
<blocks>
|
11 |
-
<adminhtml>
|
12 |
-
<rewrite>
|
13 |
-
<sales_order_grid>Tritac_ChannelEngine_Block_Sales_Order_Grid</sales_order_grid>
|
14 |
-
</rewrite>
|
15 |
-
</adminhtml>
|
16 |
<channelengine>
|
17 |
<class>Tritac_ChannelEngine_Block</class>
|
18 |
</channelengine>
|
@@ -124,6 +119,24 @@
|
|
124 |
</shipmentsave>
|
125 |
</observers>
|
126 |
</sales_order_shipment_save_after>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
127 |
</events>
|
128 |
</adminhtml>
|
129 |
|
2 |
<config>
|
3 |
<modules>
|
4 |
<Tritac_ChannelEngine>
|
5 |
+
<version>2.1.2</version>
|
6 |
</Tritac_ChannelEngine>
|
7 |
</modules>
|
8 |
|
9 |
<global>
|
10 |
<blocks>
|
|
|
|
|
|
|
|
|
|
|
11 |
<channelengine>
|
12 |
<class>Tritac_ChannelEngine_Block</class>
|
13 |
</channelengine>
|
119 |
</shipmentsave>
|
120 |
</observers>
|
121 |
</sales_order_shipment_save_after>
|
122 |
+
<core_block_abstract_prepare_layout_before>
|
123 |
+
<observers>
|
124 |
+
<ordergrid_column_append>
|
125 |
+
<type>singleton</type>
|
126 |
+
<class>channelengine/observer</class>
|
127 |
+
<method>appendCustomColumnToOrderGrid</method>
|
128 |
+
</ordergrid_column_append>
|
129 |
+
</observers>
|
130 |
+
</core_block_abstract_prepare_layout_before>
|
131 |
+
<sales_order_grid_collection_load_before>
|
132 |
+
<observers>
|
133 |
+
<prepare_order_grid_collection>
|
134 |
+
<type>singleton</type>
|
135 |
+
<class>channelengine/observer</class>
|
136 |
+
<method>prepareOrderGridCollection</method>
|
137 |
+
</prepare_order_grid_collection>
|
138 |
+
</observers>
|
139 |
+
</sales_order_grid_collection_load_before>
|
140 |
</events>
|
141 |
</adminhtml>
|
142 |
|
package.xml
CHANGED
@@ -1,18 +1,18 @@
|
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>Tritac_ChannelEngine</name>
|
4 |
-
<version>2.1.
|
5 |
<stability>stable</stability>
|
6 |
<license uri="http://opensource.org/licenses/osl-3.0.php">Open Software License (OSL)</license>
|
7 |
<channel>community</channel>
|
8 |
<extends/>
|
9 |
<summary>Connect your Magento shop to the ChannelEngine platform.</summary>
|
10 |
<description>Easily offer your products on comparison websites and marketplaces using the ChannelEngine platform.</description>
|
11 |
-
<notes>*
|
12 |
<authors><author><name>ChannelEngine</name><user>christiaander</user><email>christiaan@tritac.com</email></author></authors>
|
13 |
-
<date>2014-04-
|
14 |
-
<time>
|
15 |
-
<contents><target name="mageetc"><dir name="modules"><file name="Tritac_ChannelEngine.xml" hash="014b02d581d1039764cdc422e8f86643"/></dir></target><target name="magecommunity"><dir name="Tritac"><dir name="ChannelEngine"><dir name="Block"><dir name="Adminhtml"><dir name="System"><dir name="Config"><file name="Feed.php" hash="cbc5bf15ab9cd9bb5b2bc97375db3eb2"/></dir></dir></dir><file name="Head.php" hash="98a65067f1ae6074f2c276624164c183"/><dir name="Sales"><dir name="Order"><file name="Grid.php" hash="097e10d1e9e6dd8c5aee66124376cae4"/></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="bf1203d5f080b340404f02c51967f328"/></dir><dir name="Model"><dir name="Carrier"><file name="Channelengine.php" hash="d93ca824330b2e0eff034009c7e333c2"/></dir><file name="Observer.php" hash="
|
16 |
<compatible/>
|
17 |
<dependencies><required><php><min>5.2.13</min><max>6.0.0</max></php></required></dependencies>
|
18 |
</package>
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>Tritac_ChannelEngine</name>
|
4 |
+
<version>2.1.2</version>
|
5 |
<stability>stable</stability>
|
6 |
<license uri="http://opensource.org/licenses/osl-3.0.php">Open Software License (OSL)</license>
|
7 |
<channel>community</channel>
|
8 |
<extends/>
|
9 |
<summary>Connect your Magento shop to the ChannelEngine platform.</summary>
|
10 |
<description>Easily offer your products on comparison websites and marketplaces using the ChannelEngine platform.</description>
|
11 |
+
<notes>* Prevent extension conflicts in the order grid</notes>
|
12 |
<authors><author><name>ChannelEngine</name><user>christiaander</user><email>christiaan@tritac.com</email></author></authors>
|
13 |
+
<date>2014-04-25</date>
|
14 |
+
<time>10:55:16</time>
|
15 |
+
<contents><target name="mageetc"><dir name="modules"><file name="Tritac_ChannelEngine.xml" hash="014b02d581d1039764cdc422e8f86643"/></dir></target><target name="magecommunity"><dir name="Tritac"><dir name="ChannelEngine"><dir name="Block"><dir name="Adminhtml"><dir name="System"><dir name="Config"><file name="Feed.php" hash="cbc5bf15ab9cd9bb5b2bc97375db3eb2"/></dir></dir></dir><file name="Head.php" hash="98a65067f1ae6074f2c276624164c183"/><dir name="Sales"><dir name="Order"><file name="Grid.php" hash="097e10d1e9e6dd8c5aee66124376cae4"/></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="bf1203d5f080b340404f02c51967f328"/></dir><dir name="Model"><dir name="Carrier"><file name="Channelengine.php" hash="d93ca824330b2e0eff034009c7e333c2"/></dir><file name="Observer.php" hash="eac32b7e34172409e520c407cd7f1ebe"/><file name="Order.php" hash="66c8e7c0ac47f9dbabb156eaa8c97f1e"/><dir name="Payment"><dir name="Method"><file name="Channelengine.php" hash="49ef02953b486cfbf813d37e681172a3"/></dir></dir><dir name="Resource"><dir name="Order"><file name="Collection.php" hash="989bbd95481d2954d7813e19d8c27d18"/></dir><file name="Order.php" hash="3813fe3ad637daf069d79bca1feea540"/><file name="Setup.php" hash="24934fe022e3bb93331fcbfb7a116d37"/></dir><dir name="System"><dir name="Config"><dir name="Source"><file name="Gtin.php" hash="d182d37bc836ef718858c985c27b3c3c"/><file name="Shipping.php" hash="103486f575dcd6205fc9cfd40f2fa5ea"/></dir></dir></dir></dir><dir name="controllers"><dir name="Adminhtml"><file name="GenerateController.php" hash="edde582db1fbb091e14396b247cd0d45"/></dir><file name="TestController.php" hash="1f579ff8fd8ffeb9a8ce25dde0d0fc11"/></dir><dir name="etc"><file name="adminhtml.xml" hash="5a976b638c6ad66287ba3084fdbfc157"/><file name="config.xml" hash="0d127997b8b6dfa9b9922e5837629161"/><file name="system.xml" hash="de0e1158e239833891707739313ac8c6"/></dir><dir name="sql"><dir name="channelengine_setup"><file name="mysql4-install-0.1.0.0.php" hash="312e7c69f98c8d13d251b8ed1ca93448"/><file name="mysql4-install-1.0.0.php" hash="3664f3c5b6e01db69cbea8b4b0beb9ab"/></dir></dir></dir></dir></target><target name="magelib"><dir name="Tritac"><dir name="ChannelEngineApiClient"><file name="AddTrustExternalCARoot.crt" hash="f85d1ff17b0079709f131f3ce3f288d2"/><file name="Client.php" hash="cbfd5ff092ffb201426146d02e6316b4"/><dir name="Enums"><file name="CancellationLineStatus.php" hash="0fe455ad75e49b2796d4bcd1230a3c0d"/><file name="CancellationStatus.php" hash="e4a26c1a29afe02d92320187277f5d03"/><file name="Gender.php" hash="49645506c67b6ad530e1463da256d403"/><file name="MancoReason.php" hash="80388c0545fa091fd9e651fc1284b77d"/><file name="OrderStatus.php" hash="855341235149ff3c9d3a36a5a23f8db0"/><file name="ReturnAcceptStatus.php" hash="de4252a8f9d7b94493b470cccd9feaec"/><file name="ReturnReason.php" hash="05d5fd5b23af84508b8bec92137c421d"/><file name="ReturnStatus.php" hash="ba9350e9ba015ec9cac4b1ab7702333c"/><file name="ShipmentLineStatus.php" hash="8329dce7182fc7705bb8008da6a7e26f"/><file name="ShipmentStatus.php" hash="d73e4a5b58487c7b0c80b114601d3279"/></dir><dir name="Helpers"><file name="Collection.php" hash="2278a5e6d8d65ebca92ba1e968680315"/><file name="HttpMethod.php" hash="4949b2cfe4a309a54b1642fa09bda53b"/><file name="JsonMapper.php" hash="f8e30cab83a2f2ccfdb2a64636c2346b"/></dir><dir name="Models"><file name="Address.php" hash="543aff76425e3335cbba2a1cdd25564d"/><file name="BaseModel.php" hash="65f09d298baa6496807a2f71ea93a8f8"/><file name="Cancellation.php" hash="2fc15d3d2a8f7e21d6f6000bffb77722"/><file name="CancellationLine.php" hash="e8820be847e77d5f77a2de8cb551a8a0"/><file name="Message.php" hash="e0cea12494684d58abea051958082036"/><file name="Order.php" hash="e2a36b36a58607cc460c712979213e54"/><file name="OrderExtraDataItem.php" hash="eaf59ef83070360c4c7bb2c3f5c5633a"/><file name="OrderLine.php" hash="63451a19448eddb6eecf8eca959f9fcb"/><file name="ReturnLine.php" hash="c1cbf7c45a85280782955be400c478e6"/><file name="ReturnObject.php" hash="32d035ba6b448958bb43eac6bf286d6e"/><file name="Shipment.php" hash="8f027c770d98cdb5bc74005ec9310e1c"/><file name="ShipmentLine.php" hash="5c738023584cd6513940be54b8f8dc60"/></dir><file name="loader.php" hash="3daea8be627858c27383a79a29663c82"/></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="template"><dir name="channelengine"><dir name="system"><dir name="config"><dir name="feed"><file name="generate_button.phtml" hash="0ca6edb2f5738aa81dd7edd8944b47cf"/></dir></dir></dir></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="channelengine.xml" hash="d4019283d7ff05708cfac73363f598b8"/></dir><dir name="template"><dir name="channelengine"><dir name="checkout"><file name="success.phtml" hash="eea5605084a179e06c8ea922bfcdd55c"/></dir><file name="head.phtml" hash="638dd695feb9aeaf343183cc3c5d77e1"/></dir></dir></dir></dir></dir></target></contents>
|
16 |
<compatible/>
|
17 |
<dependencies><required><php><min>5.2.13</min><max>6.0.0</max></php></required></dependencies>
|
18 |
</package>
|