ShipHero - Version 1.0.3.5

Version Notes

- Changed oAuth callback url

Download this release

Release Info

Developer Fareed Hosein
Extension ShipHero
Version 1.0.3.5
Comparing to
See all releases


Code changes from version 1.0.3.3 to 1.0.3.5

Files changed (5) hide show
  1. app/code/community/ShipHero/ShipmentExtApi/Model/Api2/Shipment/Rest/.DS_Store +0 -0
  2. app/code/community/ShipHero/ShipmentExtApi/Model/Api2/Shipment/Rest/Admin/V1.php +7 -2
  3. app/code/community/ShipHero/WebHooks/Model/OrderObserver.php +3 -1
  4. app/code/community/ShipHero/WebHooks/sql/shiphero_setup/install-0.1.0.php +2 -2
  5. package.xml +5 -5
app/code/community/ShipHero/ShipmentExtApi/Model/Api2/Shipment/Rest/.DS_Store ADDED
Binary file
app/code/community/ShipHero/ShipmentExtApi/Model/Api2/Shipment/Rest/Admin/V1.php CHANGED
@@ -73,8 +73,13 @@ class ShipHero_ShipmentExtApi_Model_Api2_Shipment_Rest_Admin_V1 extends ShipHero
73
  * These variables can be provided custom-value, but it is always
74
  * suggested to use Order values
75
  */
76
- $originalCarrierCode = strtolower($order->getShippingCarrier()->getCarrierCode());
77
- $originalCarrierTitle = $order->getShippingCarrier()->getConfigData('title');
 
 
 
 
 
78
  $shipmentCarrierCode = $data['shipping_carrier'];
79
  $shipmentCarrierTitle = $data['shipping_method'];
80
 
73
  * These variables can be provided custom-value, but it is always
74
  * suggested to use Order values
75
  */
76
+ $originalCarrierCode = 'custom';
77
+ $originalCarrierTitle = 'Custom';
78
+ $carrier = $order->getShippingCarrier();
79
+ if(!empty($carrier)) {
80
+ $originalCarrierCode = strtolower($carrier->getCarrierCode());
81
+ $originalCarrierTitle = $carrier->getConfigData('title');
82
+ }
83
  $shipmentCarrierCode = $data['shipping_carrier'];
84
  $shipmentCarrierTitle = $data['shipping_method'];
85
 
app/code/community/ShipHero/WebHooks/Model/OrderObserver.php CHANGED
@@ -169,6 +169,8 @@ class ShipHero_WebHooks_Model_OrderObserver
169
  // Get Creds
170
  $creds = $this->_getCredentials();
171
  $currency = $order->getOrderCurrencyCode();
 
 
172
  $fields = array(
173
  'order_id' => $order['entity_id'],
174
  'increment_id' => $order['increment_id'],
@@ -182,7 +184,7 @@ class ShipHero_WebHooks_Model_OrderObserver
182
  'addresses' => array($billingAddress, $shippingAddress),
183
  'payment_method' => $payment,
184
  'shipping_description' => $order['shipping_description'],
185
- 'comment' => $order['customer_note'],
186
  'gift_message' => $giftMessageArr,
187
  'order_items' => $orderItems,
188
  'remote_ip' => $remoteIp,
169
  // Get Creds
170
  $creds = $this->_getCredentials();
171
  $currency = $order->getOrderCurrencyCode();
172
+ $commentHistory = $order->getStatusHistoryCollection(TRUE);
173
+ $comments = $commentHistory->getData();
174
  $fields = array(
175
  'order_id' => $order['entity_id'],
176
  'increment_id' => $order['increment_id'],
184
  'addresses' => array($billingAddress, $shippingAddress),
185
  'payment_method' => $payment,
186
  'shipping_description' => $order['shipping_description'],
187
+ 'order_comments' => $comments,
188
  'gift_message' => $giftMessageArr,
189
  'order_items' => $orderItems,
190
  'remote_ip' => $remoteIp,
app/code/community/ShipHero/WebHooks/sql/shiphero_setup/install-0.1.0.php CHANGED
@@ -8,7 +8,7 @@ $errors = array();
8
 
9
  // Check for duplicate Consumer
10
  $consumerName = 'ShipHero';
11
- $callbackUrl = 'http://app.shiphero.com/magento/callback';
12
 
13
  // Database Read Adapter
14
  $coreResource = Mage::getSingleton('core/resource');
@@ -37,7 +37,7 @@ if(empty($result)){
37
  'name' => $consumerName,
38
  'key' => $helper->generateConsumerKey(),
39
  'secret' => $helper->generateConsumerSecret(),
40
- 'callback_url' => 'http://app.shiphero.com/magento/callback'
41
  );
42
 
43
  $consumer->addData($data);
8
 
9
  // Check for duplicate Consumer
10
  $consumerName = 'ShipHero';
11
+ $callbackUrl = 'https://auth.shiphero.com/auth/callback';
12
 
13
  // Database Read Adapter
14
  $coreResource = Mage::getSingleton('core/resource');
37
  'name' => $consumerName,
38
  'key' => $helper->generateConsumerKey(),
39
  'secret' => $helper->generateConsumerSecret(),
40
+ 'callback_url' => 'https://auth.shiphero.com/auth/callback'
41
  );
42
 
43
  $consumer->addData($data);
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>ShipHero</name>
4
- <version>1.0.3.3</version>
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
  &lt;p&gt;Please do! Contact us at 1-(877) 671-6011 or &lt;a href="mailto:hello@shiphero.com"&gt;hello@shiphero.com&lt;/a&gt;&lt;/p&gt;&#xD;
41
  &#xD;
42
  &lt;p /&gt;Want to know more about ShipHero? &lt;a href="http://www.ShipHero.com"&gt;Watch video of ShipHero in action, and learn about the full set of features.&lt;/a&gt;</description>
43
- <notes>- Pointed Webhook Calls to our API Gateway</notes>
44
  <authors><author><name>Fareed Hosein</name><user>shipherollc</user><email>roger@shiphero.com</email></author></authors>
45
- <date>2016-08-08</date>
46
- <time>21:01: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="60796b5c39ed840a50cc140fc583c64f"/></dir><file name=".DS_Store" hash="82133767cb30f899e06a57a6c0215a3d"/></dir></dir></dir></dir><dir name="etc"><file name="api2.xml" hash="42edee62fe92654f8efa77c62ba6b4a1"/><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="6c19fbeb1dac8d2a7ef586689d09b860"/></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="d323d2a89541af731a32c0e143342703"/><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="adfe5848f0172f2c19b56b78530e4eec"/><file name="ProductObserver.php" hash="961e1a6f2ec4d53f2718c98a38143cd0"/><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>8.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.3.5</version>
5
  <stability>stable</stability>
6
  <license>GNU General Public License (GPL)</license>
7
  <channel>community</channel>
40
  &lt;p&gt;Please do! Contact us at 1-(877) 671-6011 or &lt;a href="mailto:hello@shiphero.com"&gt;hello@shiphero.com&lt;/a&gt;&lt;/p&gt;&#xD;
41
  &#xD;
42
  &lt;p /&gt;Want to know more about ShipHero? &lt;a href="http://www.ShipHero.com"&gt;Watch video of ShipHero in action, and learn about the full set of features.&lt;/a&gt;</description>
43
+ <notes>- Changed oAuth callback url</notes>
44
  <authors><author><name>Fareed Hosein</name><user>shipherollc</user><email>roger@shiphero.com</email></author></authors>
45
+ <date>2017-04-11</date>
46
+ <time>15:08:48</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="60796b5c39ed840a50cc140fc583c64f"/></dir><file name=".DS_Store" hash="82133767cb30f899e06a57a6c0215a3d"/></dir></dir></dir></dir><dir name="etc"><file name="api2.xml" hash="42edee62fe92654f8efa77c62ba6b4a1"/><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="6c19fbeb1dac8d2a7ef586689d09b860"/></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="697551cb334e4bc635b630d2d95afb85"/><file name=".DS_Store" hash="194577a7e20bdcc7afbb718f502c134c"/></dir><file name=".DS_Store" hash="165b0abc0ce5f3d24fb7d8e74545b310"/></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="9ce54070d3beb407eb8f79123a7ffd3e"/><file name="ProductObserver.php" hash="961e1a6f2ec4d53f2718c98a38143cd0"/><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="9f105422d1a9f3e8d03267dfe447b915"/></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>8.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>