ShipHero - Version 1.0.0.15

Version Notes

- Fixed on hold status webhook bug

Download this release

Release Info

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


Code changes from version 1.0.0.14 to 1.0.0.15

Files changed (4) hide show
  1. app/code/community/ShipHero/PaymentExtApi/Model/Api2/Payment/Rest/Admin/V1.php +7 -0
  2. app/code/community/ShipHero/ShipmentExtApi/Model/Api2/Shipment/Rest/Admin/V1.php +0 -1
  3. app/code/community/ShipHero/WebHooks/Model/OrderObserver.php +4 -3
  4. package.xml +5 -5
app/code/community/ShipHero/PaymentExtApi/Model/Api2/Payment/Rest/Admin/V1.php CHANGED
@@ -46,18 +46,25 @@ class ShipHero_PaymentExtApi_Model_Api2_Payment_Rest_Admin_V1 extends ShipHero_P
46
  $orderId = $data['order_id'];
47
  $order = Mage::getModel('sales/order')->load($orderId);
48
 
 
49
  if($order['status'] == 'complete') $this->_error("The order is already complete.", Mage_Api2_Model_Server::HTTP_BAD_REQUEST);
50
 
51
  if($order->canInvoice()) {
 
 
52
  try {
53
  // Generate invoice for this shipment
54
  $invoice = Mage::getModel('sales/service_order', $order)->prepareInvoice($this->_getItemQtys($order));
55
  $this->_saveInvoice($invoice, $order);
 
56
 
57
  // Finally, Save the Order
58
  $this->_saveOrder($order, $customerEmailComments);
 
59
 
60
  } catch (Exception $e){
 
 
61
  $this->_error($e->getMessage(), Mage_Api2_Model_Server::HTTP_BAD_REQUEST);
62
  }
63
  }
46
  $orderId = $data['order_id'];
47
  $order = Mage::getModel('sales/order')->load($orderId);
48
 
49
+ error_log('In Create Invoice');
50
  if($order['status'] == 'complete') $this->_error("The order is already complete.", Mage_Api2_Model_Server::HTTP_BAD_REQUEST);
51
 
52
  if($order->canInvoice()) {
53
+ error_log('Can Invoice:');
54
+ error_log($order->canInvoice());
55
  try {
56
  // Generate invoice for this shipment
57
  $invoice = Mage::getModel('sales/service_order', $order)->prepareInvoice($this->_getItemQtys($order));
58
  $this->_saveInvoice($invoice, $order);
59
+ error_log('Saved Invoice');
60
 
61
  // Finally, Save the Order
62
  $this->_saveOrder($order, $customerEmailComments);
63
+ error_log('Saved Order');
64
 
65
  } catch (Exception $e){
66
+ error_log('Can Invoice Errors');
67
+ error_log($e->getMessage());
68
  $this->_error($e->getMessage(), Mage_Api2_Model_Server::HTTP_BAD_REQUEST);
69
  }
70
  }
app/code/community/ShipHero/ShipmentExtApi/Model/Api2/Shipment/Rest/Admin/V1.php CHANGED
@@ -93,7 +93,6 @@ class ShipHero_ShipmentExtApi_Model_Api2_Shipment_Rest_Admin_V1 extends ShipHero
93
  $this->_saveOrder($order, $customerEmailComments);
94
 
95
  } catch (Exception $e) {
96
- // throw $e;
97
  $this->_error($e->getMessage(), Mage_Api2_Model_Server::HTTP_BAD_REQUEST);
98
  }
99
  }
93
  $this->_saveOrder($order, $customerEmailComments);
94
 
95
  } catch (Exception $e) {
 
96
  $this->_error($e->getMessage(), Mage_Api2_Model_Server::HTTP_BAD_REQUEST);
97
  }
98
  }
app/code/community/ShipHero/WebHooks/Model/OrderObserver.php CHANGED
@@ -37,14 +37,15 @@ class ShipHero_WebHooks_Model_OrderObserver
37
  */
38
  public function orderSaveAfter(Varien_Event_Observer $observer)
39
  {
40
- error_log('in order save after');
41
  $sale = $observer->getEvent()->getOrder();
42
  $status = $sale['status'];
43
  $state = (isset($sale['state'])) ? $sale['state'] : NULL;
44
- error_log(print_r($sale,1));
45
  // Determine how to process the order event
 
46
  if(($status == 'canceled' && $state == 'canceled') || ($status == 'closed' && $state == 'closed')) $this->_orderCanceled($sale);
47
- if(($status == 'pending' && $state == 'new') || ($status == 'processing' && $state == 'processing') || ($status == 'complete' && $state == 'complete')) $this->_orderCreatedUpdated($sale);
48
  }
49
 
50
  private function _orderCreatedUpdated($sale)
37
  */
38
  public function orderSaveAfter(Varien_Event_Observer $observer)
39
  {
40
+ // error_log('in order save after');
41
  $sale = $observer->getEvent()->getOrder();
42
  $status = $sale['status'];
43
  $state = (isset($sale['state'])) ? $sale['state'] : NULL;
44
+ // error_log(print_r($sale,1));
45
  // Determine how to process the order event
46
+ // error_log($status . ', ' . $state);
47
  if(($status == 'canceled' && $state == 'canceled') || ($status == 'closed' && $state == 'closed')) $this->_orderCanceled($sale);
48
+ if(($status == 'pending' && $state == 'new') || ($status == 'processing' && $state == 'processing') || ($status == 'complete' && $state == 'complete') || ($status == 'holded' && $state == 'holded')) $this->_orderCreatedUpdated($sale);
49
  }
50
 
51
  private function _orderCreatedUpdated($sale)
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>ShipHero</name>
4
- <version>1.0.0.14</version>
5
  <stability>beta</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>- Fixed typo in customerEmailComment, that was filling up the log</notes>
44
  <authors><author><name>Fareed Hosein</name><user>shipherollc</user><email>roger@shiphero.com</email></author></authors>
45
- <date>2014-12-01</date>
46
- <time>22:46:44</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="fa124c3cf7655d6c9efc8172ecfdb8b4"/></dir><file name=".DS_Store" hash="82133767cb30f899e06a57a6c0215a3d"/></dir></dir></dir></dir><dir name="etc"><file name="api2.xml" hash="4bfa96037c915b8da87b87cd48f8c51b"/><file name="config.xml" hash="75fca57d73d1909bfb92a0b4116c3b24"/></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="76eab99916d836c5910b744b2d81fdd7"/></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="e153e3b2e377e83e86798d332e83b9b9"/></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="c87d1a796f1734cc6c65f68bcf3b7c55"/></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="03b9ca983e4605b5fca5bf08d9b7f192"/><file name="ProductObserver.php" hash="df1790c6df7b976d4973f05a2e8c0088"/><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="9bc5e69f5d1a726dc36c95d7e6dae982"/></dir></dir></dir><file name=".DS_Store" hash="194577a7e20bdcc7afbb718f502c134c"/></dir></target><target name="mageetc"><dir name="modules"><file name="ShipHero.xml" hash="9ab0798e75362629478abe9a1db7bb6f"/></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>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>ShipHero</name>
4
+ <version>1.0.0.15</version>
5
  <stability>beta</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>- Fixed on hold status webhook bug</notes>
44
  <authors><author><name>Fareed Hosein</name><user>shipherollc</user><email>roger@shiphero.com</email></author></authors>
45
+ <date>2015-01-29</date>
46
+ <time>04:48:10</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="fa124c3cf7655d6c9efc8172ecfdb8b4"/></dir><file name=".DS_Store" hash="82133767cb30f899e06a57a6c0215a3d"/></dir></dir></dir></dir><dir name="etc"><file name="api2.xml" hash="4bfa96037c915b8da87b87cd48f8c51b"/><file name="config.xml" hash="75fca57d73d1909bfb92a0b4116c3b24"/></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="24f5c3e72b225ad62b674a60213db7f9"/></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="e153e3b2e377e83e86798d332e83b9b9"/></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="3c0d3c01b64f83a2bbd0e443805e7506"/></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="59cdc43b3606252b9c6508ed0b713548"/><file name="ProductObserver.php" hash="df1790c6df7b976d4973f05a2e8c0088"/><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="9bc5e69f5d1a726dc36c95d7e6dae982"/></dir></dir></dir><file name=".DS_Store" hash="194577a7e20bdcc7afbb718f502c134c"/></dir></target><target name="mageetc"><dir name="modules"><file name="ShipHero.xml" hash="9ab0798e75362629478abe9a1db7bb6f"/></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>