Version Notes
* Minor fixes
Download this release
Release Info
| Developer | Christiaan de Ridder |
| Extension | Tritac_ChannelEngine |
| Version | 2.3.6 |
| Comparing to | |
| See all releases | |
Code changes from version 2.3.5 to 2.3.6
app/code/community/Tritac/ChannelEngine/Model/Carrier/Channelengine.php
CHANGED
|
@@ -21,6 +21,12 @@ class Tritac_ChannelEngine_Model_Carrier_Channelengine
|
|
| 21 |
return false;
|
| 22 |
}
|
| 23 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 24 |
$result = Mage::getModel('shipping/rate_result');
|
| 25 |
|
| 26 |
$shippingPrice = 0;
|
|
@@ -48,6 +54,11 @@ class Tritac_ChannelEngine_Model_Carrier_Channelengine
|
|
| 48 |
return $result;
|
| 49 |
}
|
| 50 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 51 |
public function getAllowedMethods()
|
| 52 |
{
|
| 53 |
return array('channelengine'=>'ChannelEngine');
|
| 21 |
return false;
|
| 22 |
}
|
| 23 |
|
| 24 |
+
// Check if the rates were requested by ChannelEngine and not by the frontend
|
| 25 |
+
if(!Mage::registry('channelengine_shipping')){
|
| 26 |
+
return false;
|
| 27 |
+
}
|
| 28 |
+
Mage::unregister('channelengine_shipping');
|
| 29 |
+
|
| 30 |
$result = Mage::getModel('shipping/rate_result');
|
| 31 |
|
| 32 |
$shippingPrice = 0;
|
| 54 |
return $result;
|
| 55 |
}
|
| 56 |
|
| 57 |
+
public function isActive()
|
| 58 |
+
{
|
| 59 |
+
|
| 60 |
+
}
|
| 61 |
+
|
| 62 |
public function getAllowedMethods()
|
| 63 |
{
|
| 64 |
return array('channelengine'=>'ChannelEngine');
|
app/code/community/Tritac/ChannelEngine/Model/Observer.php
CHANGED
|
@@ -162,6 +162,9 @@ class Tritac_ChannelEngine_Model_Observer
|
|
| 162 |
|
| 163 |
// Register shipping cost. See Tritac_ChannelEngine_Model_Carrier_Channelengine::collectrates();
|
| 164 |
Mage::register('channelengine_shipping_amount', floatval($order->getShippingCostsInclVat()));
|
|
|
|
|
|
|
|
|
|
| 165 |
|
| 166 |
$quote->getBillingAddress()
|
| 167 |
->addData($billingData);
|
| 162 |
|
| 163 |
// Register shipping cost. See Tritac_ChannelEngine_Model_Carrier_Channelengine::collectrates();
|
| 164 |
Mage::register('channelengine_shipping_amount', floatval($order->getShippingCostsInclVat()));
|
| 165 |
+
// Set this value to make sure ChannelEngine requested the rates and not the frontend
|
| 166 |
+
// because the shipping method has a fallback on 0,- and this will make it show up on the frontend
|
| 167 |
+
Mage::register('channelengine_shipping', true);
|
| 168 |
|
| 169 |
$quote->getBillingAddress()
|
| 170 |
->addData($billingData);
|
app/code/community/Tritac/ChannelEngine/etc/config.xml
CHANGED
|
@@ -2,7 +2,7 @@
|
|
| 2 |
<config>
|
| 3 |
<modules>
|
| 4 |
<Tritac_ChannelEngine>
|
| 5 |
-
<version>2.3.
|
| 6 |
</Tritac_ChannelEngine>
|
| 7 |
</modules>
|
| 8 |
|
| 2 |
<config>
|
| 3 |
<modules>
|
| 4 |
<Tritac_ChannelEngine>
|
| 5 |
+
<version>2.3.6</version>
|
| 6 |
</Tritac_ChannelEngine>
|
| 7 |
</modules>
|
| 8 |
|
package.xml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>Tritac_ChannelEngine</name>
|
| 4 |
-
<version>2.3.
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license uri="http://opensource.org/licenses/osl-3.0.php">Open Software License (OSL)</license>
|
| 7 |
<channel>community</channel>
|
|
@@ -10,9 +10,9 @@
|
|
| 10 |
<description>Easily offer your products on comparison websites and marketplaces using the ChannelEngine platform.</description>
|
| 11 |
<notes>* Minor fixes</notes>
|
| 12 |
<authors><author><name>ChannelEngine</name><user>christiaander</user><email>christiaan@tritac.com</email></author></authors>
|
| 13 |
-
<date>2014-07-
|
| 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="
|
| 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.3.6</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>
|
| 10 |
<description>Easily offer your products on comparison websites and marketplaces using the ChannelEngine platform.</description>
|
| 11 |
<notes>* Minor fixes</notes>
|
| 12 |
<authors><author><name>ChannelEngine</name><user>christiaander</user><email>christiaan@tritac.com</email></author></authors>
|
| 13 |
+
<date>2014-07-14</date>
|
| 14 |
+
<time>09:40:48</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="a9f4a062739d3ae4c542093888a0f5fc"/></dir><file name="Observer.php" hash="7a8d1d66ea5f353c78137ac2ec1f50be"/><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="f66078a0a91c1f0ae6f6792ac9632444"/><file name="system.xml" hash="dec9123b13aac4340dea2307e7855525"/></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="6b17bfb6a9c9f8af6086cd46fda24106"/><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="4e845b4bd2076a5426f13e6763b41271"/><file name="CancellationLine.php" hash="e8820be847e77d5f77a2de8cb551a8a0"/><file name="Message.php" hash="e0cea12494684d58abea051958082036"/><file name="Order.php" hash="db5ecd35bf5e2158ac27565bd1c95a8a"/><file name="OrderExtraDataItem.php" hash="eaf59ef83070360c4c7bb2c3f5c5633a"/><file name="OrderLine.php" hash="11372030afba1ed751e5a99ccf14d7c9"/><file name="ReturnLine.php" hash="c1cbf7c45a85280782955be400c478e6"/><file name="ReturnObject.php" hash="6cf979eb91ce737464620575ada1c8e9"/><file name="Shipment.php" hash="246d699692e4fd9bad5db370648f717f"/><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="11f261e8aee3ddfe2cd611bb8eae573e"/></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>
|
