Version Notes
- Added stock id to order polling endpoint
Download this release
Release Info
| Developer | Fareed Hosein |
| Extension | ShipHero |
| Version | 1.0.2.0 |
| Comparing to | |
| See all releases | |
Code changes from version 1.0.1.9 to 1.0.2.0
app/code/community/ShipHero/SalesExtApi/Model/Api2/Order/Rest/Admin/V1.php
CHANGED
|
@@ -77,6 +77,14 @@ class ShipHero_SalesExtApi_Model_Api2_Order_Rest_Admin_V1 extends Mage_Sales_Mod
|
|
| 77 |
}
|
| 78 |
|
| 79 |
if ($ordersData) {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 80 |
foreach ($this->_getAddresses(array_keys($ordersData)) as $orderId => $addresses) {
|
| 81 |
$ordersData[$orderId]['addresses'] = $addresses;
|
| 82 |
}
|
|
@@ -109,6 +117,13 @@ class ShipHero_SalesExtApi_Model_Api2_Order_Rest_Admin_V1 extends Mage_Sales_Mod
|
|
| 109 |
$items[$key]['custom_options'] = $ordersData[$orderId]['temp_item_array'][$item['item_id']]['options'];
|
| 110 |
$items[$key]['attributes'] = $attribute_output;
|
| 111 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 112 |
}
|
| 113 |
$ordersData[$orderId]['order_items'] = $items;
|
| 114 |
unset($ordersData[$orderId]['temp_item_array']);
|
| 77 |
}
|
| 78 |
|
| 79 |
if ($ordersData) {
|
| 80 |
+
$modules = Mage::getConfig()->getNode('modules')->children();
|
| 81 |
+
$modulesArray = (array)$modules;
|
| 82 |
+
/**
|
| 83 |
+
* Retrieve the read connection
|
| 84 |
+
*/
|
| 85 |
+
$resource = Mage::getSingleton('core/resource');
|
| 86 |
+
$readConnection = $resource->getConnection('core_read');
|
| 87 |
+
|
| 88 |
foreach ($this->_getAddresses(array_keys($ordersData)) as $orderId => $addresses) {
|
| 89 |
$ordersData[$orderId]['addresses'] = $addresses;
|
| 90 |
}
|
| 117 |
$items[$key]['custom_options'] = $ordersData[$orderId]['temp_item_array'][$item['item_id']]['options'];
|
| 118 |
$items[$key]['attributes'] = $attribute_output;
|
| 119 |
|
| 120 |
+
$stock_id = 1;
|
| 121 |
+
if(isset($modulesArray['Innoexts_Warehouse'])) {
|
| 122 |
+
$query = 'SELECT stock_id FROM warehouse_flat_order_grid_warehouse WHERE entity_id = ' . (int)$orderId . ' LIMIT 1';
|
| 123 |
+
$stock_id = $readConnection->fetchOne($query);
|
| 124 |
+
}
|
| 125 |
+
$items[$key]['stock_id'] = (int)$stock_id;
|
| 126 |
+
|
| 127 |
}
|
| 128 |
$ordersData[$orderId]['order_items'] = $items;
|
| 129 |
unset($ordersData[$orderId]['temp_item_array']);
|
app/code/community/ShipHero/WebHooks/Model/OrderObserver.php
CHANGED
|
@@ -51,6 +51,14 @@ class ShipHero_WebHooks_Model_OrderObserver
|
|
| 51 |
|
| 52 |
private function _orderCreatedUpdated($sale)
|
| 53 |
{
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 54 |
// error_log('in order created');
|
| 55 |
$origData = $sale->getOrigData();
|
| 56 |
$origDataUpdated = (!empty($origData)) ? $origData['updated_at'] : $sale['updated_at'];
|
| 51 |
|
| 52 |
private function _orderCreatedUpdated($sale)
|
| 53 |
{
|
| 54 |
+
// Get modules
|
| 55 |
+
$modules = Mage::getConfig()->getNode('modules')->children();
|
| 56 |
+
$modulesArray = (array)$modules;
|
| 57 |
+
if(isset($modulesArray['Innoexts_Warehouse'])) {
|
| 58 |
+
// Don't Push, we'll poll these orders instead
|
| 59 |
+
return TRUE;
|
| 60 |
+
}
|
| 61 |
+
|
| 62 |
// error_log('in order created');
|
| 63 |
$origData = $sale->getOrigData();
|
| 64 |
$origDataUpdated = (!empty($origData)) ? $origData['updated_at'] : $sale['updated_at'];
|
package.xml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>ShipHero</name>
|
| 4 |
-
<version>1.0.
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license>GNU General Public License (GPL)</license>
|
| 7 |
<channel>community</channel>
|
|
@@ -40,11 +40,11 @@ You can see the status of the order in real time and the history of the order in
|
|
| 40 |
<p>Please do! Contact us at 1-(877) 671-6011 or <a href="mailto:hello@shiphero.com">hello@shiphero.com</a></p>
|
| 41 |

|
| 42 |
<p />Want to know more about ShipHero? <a href="http://www.ShipHero.com">Watch video of ShipHero in action, and learn about the full set of features.</a></description>
|
| 43 |
-
<notes>- Added
|
| 44 |
<authors><author><name>Fareed Hosein</name><user>shipherollc</user><email>roger@shiphero.com</email></author></authors>
|
| 45 |
<date>2015-07-05</date>
|
| 46 |
-
<time>
|
| 47 |
-
<contents><target name="magecommunity"><dir name="ShipHero"><dir name="CatalogExtApi"><dir name="Model"><dir name="Api2"><dir name="Product"><dir name="Rest"><dir name="Admin"><file name="V1.php" hash="aea540bb3df759fa5abf4cb2f26e3410"/></dir><file name=".DS_Store" hash="82133767cb30f899e06a57a6c0215a3d"/></dir></dir></dir></dir><dir name="etc"><file name="api2.xml" hash="a84153a82d1ca4b37909cb836fb0df78"/><file name="config.xml" hash="75fca57d73d1909bfb92a0b4116c3b24"/></dir></dir><dir name="CategoriesExtApi"><dir name="Model"><dir name="Api2"><dir name="Categories"><dir name="Rest"><dir name="Admin"><file name="V1.php" hash="1b2132443dacf2e8b7bab5e7aef17765"/></dir></dir></dir><file name="Categories.php" hash="a3e20a32e745bf4360019bd18a77cb3d"/></dir></dir><dir name="etc"><file name="api2.xml" hash="3ecd699dcd137862f6b92bc963b3556f"/><file name="config.xml" hash="286f5304b1db4bffe69238ea661af011"/></dir></dir><dir name="PaymentExtApi"><dir name="Model"><dir name="Api2"><dir name="Payment"><dir name="Rest"><dir name="Admin"><file name="V1.php" hash="d172248ff949effa3990191c6a037ef3"/></dir></dir></dir><file name="Payment.php" hash="dd379bf5c286b0924111db0a8fadd658"/></dir></dir><dir name="etc"><file name="api2.xml" hash="792e6b7c9f17b551cb327267427ac128"/><file name="config.xml" hash="3a0e38693d058eb48521a4325b761b2e"/></dir></dir><dir name="SalesExtApi"><dir name="Model"><dir name="Api2"><dir name="Order"><dir name="Rest"><dir name="Admin"><file name="V1.php" hash="
|
| 48 |
<compatible/>
|
| 49 |
<dependencies><required><php><min>5.3.0</min><max>6.0.0</max></php><package><name>Mage_Core_Modules</name><channel>community</channel><min>1.7.0</min><max>2.0.0</max></package></required></dependencies>
|
| 50 |
</package>
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>ShipHero</name>
|
| 4 |
+
<version>1.0.2.0</version>
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license>GNU General Public License (GPL)</license>
|
| 7 |
<channel>community</channel>
|
| 40 |
<p>Please do! Contact us at 1-(877) 671-6011 or <a href="mailto:hello@shiphero.com">hello@shiphero.com</a></p>
|
| 41 |

|
| 42 |
<p />Want to know more about ShipHero? <a href="http://www.ShipHero.com">Watch video of ShipHero in action, and learn about the full set of features.</a></description>
|
| 43 |
+
<notes>- Added stock id to order polling endpoint</notes>
|
| 44 |
<authors><author><name>Fareed Hosein</name><user>shipherollc</user><email>roger@shiphero.com</email></author></authors>
|
| 45 |
<date>2015-07-05</date>
|
| 46 |
+
<time>22:50:17</time>
|
| 47 |
+
<contents><target name="magecommunity"><dir name="ShipHero"><dir name="CatalogExtApi"><dir name="Model"><dir name="Api2"><dir name="Product"><dir name="Rest"><dir name="Admin"><file name="V1.php" hash="aea540bb3df759fa5abf4cb2f26e3410"/></dir><file name=".DS_Store" hash="82133767cb30f899e06a57a6c0215a3d"/></dir></dir></dir></dir><dir name="etc"><file name="api2.xml" hash="a84153a82d1ca4b37909cb836fb0df78"/><file name="config.xml" hash="75fca57d73d1909bfb92a0b4116c3b24"/></dir></dir><dir name="CategoriesExtApi"><dir name="Model"><dir name="Api2"><dir name="Categories"><dir name="Rest"><dir name="Admin"><file name="V1.php" hash="1b2132443dacf2e8b7bab5e7aef17765"/></dir></dir></dir><file name="Categories.php" hash="a3e20a32e745bf4360019bd18a77cb3d"/></dir></dir><dir name="etc"><file name="api2.xml" hash="3ecd699dcd137862f6b92bc963b3556f"/><file name="config.xml" hash="286f5304b1db4bffe69238ea661af011"/></dir></dir><dir name="PaymentExtApi"><dir name="Model"><dir name="Api2"><dir name="Payment"><dir name="Rest"><dir name="Admin"><file name="V1.php" hash="d172248ff949effa3990191c6a037ef3"/></dir></dir></dir><file name="Payment.php" hash="dd379bf5c286b0924111db0a8fadd658"/></dir></dir><dir name="etc"><file name="api2.xml" hash="792e6b7c9f17b551cb327267427ac128"/><file name="config.xml" hash="3a0e38693d058eb48521a4325b761b2e"/></dir></dir><dir name="SalesExtApi"><dir name="Model"><dir name="Api2"><dir name="Order"><dir name="Rest"><dir name="Admin"><file name="V1.php" hash="47fef23fc8176831f9798040368e7c52"/></dir></dir></dir></dir></dir><dir name="etc"><file name="api2.xml" hash="7fd3830df03511ab3fd8923e9bf490dc"/><file name="config.xml" hash="a0817be74340d9f9e12861993e5ee2c9"/></dir></dir><dir name="ShipmentExtApi"><dir name="Model"><dir name="Api2"><dir name="Shipment"><dir name="Rest"><dir name="Admin"><file name="V1.php" hash="abdb59626a9bd4af1466159ee2383883"/><file name=".DS_Store" hash="194577a7e20bdcc7afbb718f502c134c"/></dir></dir></dir><file name="Shipment.php" hash="8a804aecde89f00f4d013253e8526cfb"/></dir></dir><dir name="etc"><file name="api2.xml" hash="84d7bb1a150b5b94f0797403ef656f45"/><file name="config.xml" hash="6bcba4e8b893bb78eadfb6038fa01927"/></dir></dir><dir name="WebHooks"><dir name="Model"><file name="OrderObserver.php" hash="8bdf3c619a18a5e138f6b005a6a792c2"/><file name="ProductObserver.php" hash="f6f547beefff73a438ab85c11b200d58"/><dir name="Resource"><file name="Setup.php" hash="428887c1ea6151a293d3d4b633963bce"/></dir></dir><dir name="etc"><file name="config.xml" hash="e5e8d6595e85311f3617f63b813e8e35"/><dir name="webapi"><file name="acl.xml" hash="444730c8892d9a14c169b6cd96da1cdd"/></dir></dir><dir name="sql"><dir name="shiphero_setup"><file name="install-0.1.0.php" hash="b793368264d3637cb831dd1ec2dbbeae"/></dir></dir><file name=".DS_Store" hash="5877fb6bf8ef0d0b1ae94df92d07d4cb"/></dir><file name=".DS_Store" hash="194577a7e20bdcc7afbb718f502c134c"/></dir></target><target name="mageetc"><dir name="modules"><file name="ShipHero.xml" hash="f6f6ffa93e8158fa631eb960d8872d46"/></dir></target></contents>
|
| 48 |
<compatible/>
|
| 49 |
<dependencies><required><php><min>5.3.0</min><max>6.0.0</max></php><package><name>Mage_Core_Modules</name><channel>community</channel><min>1.7.0</min><max>2.0.0</max></package></required></dependencies>
|
| 50 |
</package>
|
