Shiptheory_Interlinkst - Version 0.0.4

Version Notes

PHP compatibility and link bug fixes

Download this release

Release Info

Developer Shiptheory
Extension Shiptheory_Interlinkst
Version 0.0.4
Comparing to
See all releases


Code changes from version 0.0.1 to 0.0.4

Files changed (4) hide show
  1. app/code/local/Shiptheory/Shippinglabels/Block/Button/New.php +2 -2
  2. app/code/local/Shiptheory/Shippinglabels/Model/Order/Observer.php +2 -2
  3. app/code/local/Shiptheory/Shippinglabels/etc/config.xml +1 -1
  4. package.xml +1 -1
app/code/local/Shiptheory/Shippinglabels/Block/Button/New.php CHANGED
@@ -15,10 +15,10 @@ class Shiptheory_Shippinglabels_Block_Button_New extends Mage_Adminhtml_Block_Sy
15
  ->setType('button')
16
  ->setClass('scalable')
17
  ->setLabel('Register Free')
18
- ->setOnClick("setLocation('https://shiptheory.com/integrate/magento/interlink')")
19
  ->toHtml();
20
 
21
  return $html;
22
 
23
  }
24
- }
15
  ->setType('button')
16
  ->setClass('scalable')
17
  ->setLabel('Register Free')
18
+ ->setOnClick("window.open('https://shiptheory.com/integrate/magento/interlink','_blank')")
19
  ->toHtml();
20
 
21
  return $html;
22
 
23
  }
24
+ }
app/code/local/Shiptheory/Shippinglabels/Model/Order/Observer.php CHANGED
@@ -55,11 +55,11 @@ class Shiptheory_Shippinglabels_Model_Order_Observer
55
  protected function queue($order, $data)
56
  {
57
 
58
- if(Mage::registry('sales_order_save_commit_after_executed')){
59
  return;
60
  }
61
 
62
- Mage::register('sales_order_save_commit_after_executed', true);
63
  $order_id = $order->getId();
64
  $this->_orderId = Mage::getModel('shippinglabels/history')->loadArchive($order_id);
65
 
55
  protected function queue($order, $data)
56
  {
57
 
58
+ /*if(Mage::registry('sales_order_save_commit_after_executed')){
59
  return;
60
  }
61
 
62
+ Mage::register('sales_order_save_commit_after_executed', true);*/
63
  $order_id = $order->getId();
64
  $this->_orderId = Mage::getModel('shippinglabels/history')->loadArchive($order_id);
65
 
app/code/local/Shiptheory/Shippinglabels/etc/config.xml CHANGED
@@ -2,7 +2,7 @@
2
  <config>
3
  <modules>
4
  <Shiptheory_Shippinglabels>
5
- <version>0.0.1</version>
6
  </Shiptheory_Shippinglabels>
7
  </modules>
8
  <global>
2
  <config>
3
  <modules>
4
  <Shiptheory_Shippinglabels>
5
+ <version>0.0.4</version>
6
  </Shiptheory_Shippinglabels>
7
  </modules>
8
  <global>
package.xml CHANGED
@@ -1,2 +1,2 @@
1
  <?xml version="1.0"?>
2
- <package><name>Shiptheory_Interlinkst</name><version>0.0.1</version><stability>stable</stability><license>Commercial</license><channel>community</channel><extends></extends><summary>Inlerlink Shipping API Integration from Shiptheory</summary><description>Automatically print Interlink labels over the API via Shiptheory</description><notes>First public release</notes><authors><author><name>Shiptheory</name><user>Shiptheory</user><email>jm@shiptheory.com</email></author></authors><date>2015-06-17</date><time>3:55:33</time><compatible></compatible><dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies><contents><target name="mage"><dir name="app"><dir name="etc"><dir name="modules"><file name="Shiptheory_Interlinkst.xml" hash="939d744292f138cd38cad0ca89ad281c"/><file name="Shiptheory_Shippinglabels.xml" hash="0b912d0fab3b1c2b87a687fa5ba064e2"/></dir></dir><dir name="design"><dir name="adminhtml"><dir name="base"><dir name="default"><dir name="template"><dir name="shiptheory"><dir name="system"><dir name="config"><dir name="fieldset"><file name="hint.phtml" hash="398365cf3943f32446dbda1fbd150c3d"/><file name="interlink.phtml" hash="e48381b08085e8e63b908174d871c3e4"/></dir></dir></dir></dir></dir><dir name="layout"><file name="shiptheory.xml" hash="f9c980e4c2b9f95dbee962831b9dd52e"/></dir></dir></dir></dir></dir><dir name="code"><dir name="local"><dir name="Shiptheory"><dir name="Shippinglabels"><file name="Triggers.php" hash="7f4d01e26f881bfaa8953a412a44271c"/><dir name="sql"><dir name="shippinglabels_setup"><file name="mysql4-install-0.0.1.php" hash="1c8c491e7fb45b51d2251f109102dfaf"/></dir></dir><dir name="Model"><file name="Config.php" hash="58b24c47648ece1ddf1acc1af317295b"/><file name="History.php" hash="62959bc10994b928255649bc4635abf9"/><file name="Observer.php" hash="8b6733b5b435c4b6a52c96df7893ce22"/><file name="Order.php" hash="ca8bc351613977f43ad456070b2d8e10"/><file name="Version.php" hash="49415c1410ee2b5092e9c40f03b2e376"/><file name="Webservice.php" hash="ce6de35d30c4c95ba35d0e39f499e963"/><dir name="Order"><file name="Observer.php" hash="089950ac0f9eb7ffc7e0b023ebb91093"/></dir><dir name="Mysql4"><file name="History.php" hash="bc875bf7269a0cee5ecddd1624c26346"/><dir name="History"><file name="Collection.php" hash="8a747d6252f8931306471e33437b4f54"/></dir></dir><dir name="History"><file name="Observer.php" hash="592bd633a817b761d1bbcfee9b7968bb"/></dir><dir name="Config"><file name="Api.php" hash="c7de3c569a76254325a6b05573bd83f3"/><file name="Observer.php" hash="141afba8743c87683801c7a6af03d45d"/></dir></dir><dir name="Helper"><file name="Data.php" hash="f4d82e348cc5e3b7e91982adc7a0b8f8"/></dir><dir name="etc"><file name="api.xml" hash="2fb258d64df452f4f4a6426c4bec6e97"/><file name="config.xml" hash="73f06f6146bc9cdf5db3a175635b8c76"/><file name="system.xml" hash="ec9996a06e69215bb6b8f1ba0c5d4029"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="ShippinglabelsController.php" hash="bbabef05a15187bcdc2ff6c9d3f346ce"/></dir></dir><dir name="Block"><dir name="Button"><file name="New.php" hash="0bed4d724a326340745ab5788b866b00"/></dir><dir name="Adminhtml"><file name="Shippinglabels.php" hash="05b1c45a36c12d3187fef98ae2d9c3b2"/><file name="Version.php" hash="618012aaf852cd46916d4fdd84693565"/><dir name="System"><dir name="Config"><dir name="Fieldset"><file name="Hint.php" hash="024b80c408fd77ab1812d704c10d0d4d"/></dir></dir></dir><dir name="Shippinglabels"><file name="Grid.php" hash="1099b2faa55eda067bb15ecfb80413a7"/></dir></dir></dir></dir><dir name="Interlinkst"><dir name="Helper"><file name="Data.php" hash="f8e37b49c9d7e4b8e106141608471184"/></dir><dir name="etc"><file name="config.xml" hash="eafdd67e82d797f96d8d06491b276962"/><file name="system.xml" hash="5192219ebf22ed75849f517cfedf660c"/></dir><dir name="Block"><dir name="Adminhtml"><dir name="System"><dir name="Config"><dir name="Fieldset"><file name="Hint.php" hash="bc4ca911b67415cbfc4cb4e91cd6db4d"/></dir></dir></dir></dir></dir></dir></dir></dir></dir></dir><dir name="skin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="shiptheory"><dir name="images"><file name="shiptheory-section.png" hash="42f15b05c3667db74104f4dc73af2392"/><file name="shiptheory.png" hash="42f15b05c3667db74104f4dc73af2392"/></dir><dir name="css"><file name="shiptheory.css" hash="7bd374d2212a6ab7eaf400705999378f"/></dir></dir></dir></dir></dir></dir></target></contents></package>
1
  <?xml version="1.0"?>
2
+ <package><name>Shiptheory_Interlinkst</name><version>0.0.4</version><stability>stable</stability><license>Commercial</license><channel>community</channel><extends></extends><summary>Inlerlink Shipping API Integration from Shiptheory</summary><description>Automatically print Interlink labels over the API via Shiptheory</description><notes>PHP compatibility and link bug fixes</notes><authors><author><name>Shiptheory</name><user>Shiptheory</user><email>jm@shiptheory.com</email></author></authors><date>2015-06-26</date><time>8:28:43</time><compatible></compatible><dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies><contents><target name="mage"><dir name="skin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="shiptheory"><dir name="images"><file name="shiptheory-section.png" hash="42f15b05c3667db74104f4dc73af2392"/><file name="shiptheory.png" hash="42f15b05c3667db74104f4dc73af2392"/></dir><dir name="css"><file name="shiptheory.css" hash="7bd374d2212a6ab7eaf400705999378f"/></dir></dir></dir></dir></dir></dir><dir name="app"><dir name="etc"><dir name="modules"><file name="Shiptheory_Interlinkst.xml" hash="939d744292f138cd38cad0ca89ad281c"/><file name="Shiptheory_Shippinglabels.xml" hash="0b912d0fab3b1c2b87a687fa5ba064e2"/></dir></dir><dir name="design"><dir name="adminhtml"><dir name="base"><dir name="default"><dir name="template"><dir name="shiptheory"><dir name="system"><dir name="config"><dir name="fieldset"><file name="hint.phtml" hash="398365cf3943f32446dbda1fbd150c3d"/><file name="interlink.phtml" hash="e48381b08085e8e63b908174d871c3e4"/></dir></dir></dir></dir></dir><dir name="layout"><file name="shiptheory.xml" hash="f9c980e4c2b9f95dbee962831b9dd52e"/></dir></dir></dir></dir></dir><dir name="code"><dir name="local"><dir name="Shiptheory"><dir name="Interlinkst"><dir name="Helper"><file name="Data.php" hash="f8e37b49c9d7e4b8e106141608471184"/></dir><dir name="etc"><file name="config.xml" hash="eafdd67e82d797f96d8d06491b276962"/><file name="system.xml" hash="5192219ebf22ed75849f517cfedf660c"/></dir><dir name="Block"><dir name="Adminhtml"><dir name="System"><dir name="Config"><dir name="Fieldset"><file name="Hint.php" hash="bc4ca911b67415cbfc4cb4e91cd6db4d"/></dir></dir></dir></dir></dir></dir><dir name="Shippinglabels"><file name="Triggers.php" hash="7f4d01e26f881bfaa8953a412a44271c"/><dir name="controllers"><dir name="Adminhtml"><file name="ShippinglabelsController.php" hash="bbabef05a15187bcdc2ff6c9d3f346ce"/></dir></dir><dir name="Helper"><file name="Data.php" hash="f4d82e348cc5e3b7e91982adc7a0b8f8"/></dir><dir name="sql"><dir name="shippinglabels_setup"><file name="mysql4-install-0.0.1.php" hash="1c8c491e7fb45b51d2251f109102dfaf"/></dir></dir><dir name="Model"><file name="Config.php" hash="58b24c47648ece1ddf1acc1af317295b"/><file name="History.php" hash="62959bc10994b928255649bc4635abf9"/><file name="Observer.php" hash="8b6733b5b435c4b6a52c96df7893ce22"/><file name="Order.php" hash="ca8bc351613977f43ad456070b2d8e10"/><file name="Version.php" hash="49415c1410ee2b5092e9c40f03b2e376"/><file name="Webservice.php" hash="ce6de35d30c4c95ba35d0e39f499e963"/><dir name="Order"><file name="Observer.php" hash="fa764f2a6f74260a11bd413c704eadf0"/></dir><dir name="Mysql4"><file name="History.php" hash="bc875bf7269a0cee5ecddd1624c26346"/><dir name="History"><file name="Collection.php" hash="8a747d6252f8931306471e33437b4f54"/></dir></dir><dir name="History"><file name="Observer.php" hash="592bd633a817b761d1bbcfee9b7968bb"/></dir><dir name="Config"><file name="Api.php" hash="c7de3c569a76254325a6b05573bd83f3"/><file name="Observer.php" hash="141afba8743c87683801c7a6af03d45d"/></dir></dir><dir name="etc"><file name="api.xml" hash="2fb258d64df452f4f4a6426c4bec6e97"/><file name="config.xml" hash="1f4a2b04ee015e6ac3ae995dd945bca3"/><file name="system.xml" hash="ec9996a06e69215bb6b8f1ba0c5d4029"/></dir><dir name="Block"><dir name="Button"><file name="New.php" hash="448d4825755fe78f4230a94391438398"/></dir><dir name="Adminhtml"><file name="Shippinglabels.php" hash="05b1c45a36c12d3187fef98ae2d9c3b2"/><file name="Version.php" hash="618012aaf852cd46916d4fdd84693565"/><dir name="Shippinglabels"><file name="Grid.php" hash="1099b2faa55eda067bb15ecfb80413a7"/></dir><dir name="System"><dir name="Config"><dir name="Fieldset"><file name="Hint.php" hash="024b80c408fd77ab1812d704c10d0d4d"/></dir></dir></dir></dir></dir></dir></dir></dir></dir></dir></target></contents></package>