Auctane_ShipStation - Version 1.3.4

Version Notes

Official release.
Wrap exported text fields in CDATA as a precaution.

Download this release

Release Info

Developer Clockworkgeek
Extension Auctane_ShipStation
Version 1.3.4
Comparing to
See all releases


Code changes from version 1.3.3 to 1.3.4

Files changed (5) hide show
  1. app/code/community/Auctane/Api/Helper/Data.php +8 -1
  2. app/code/community/Auctane/Api/Model/Server/Adapter.php +15 -4
  3. app/code/community/Auctane/Api/etc/config.xml +1 -1
  4. app/code/community/Auctane/ShipStation/etc/config.xml +1 -1
  5. package.xml +5 -5
app/code/community/Auctane/Api/Helper/Data.php CHANGED
@@ -38,7 +38,14 @@ class Auctane_Api_Helper_Data extends Mage_Core_Helper_Data
38
  $value = $source instanceof Varien_Object
39
  ? $source->getDataUsingMethod($field)
40
  : @$source[$field];
41
- $xml->writeElement((string) $name, (string) $value);
 
 
 
 
 
 
 
42
  }
43
  }
44
 
38
  $value = $source instanceof Varien_Object
39
  ? $source->getDataUsingMethod($field)
40
  : @$source[$field];
41
+ $xml->startElement((string) $name);
42
+ if (is_numeric($value)) {
43
+ $xml->text((string) $value);
44
+ }
45
+ elseif ($value) {
46
+ $xml->writeCdata((string) $value);
47
+ }
48
+ $xml->endElement();
49
  }
50
  }
51
 
app/code/community/Auctane/Api/Model/Server/Adapter.php CHANGED
@@ -205,9 +205,18 @@ class Auctane_Api_Model_Server_Adapter
205
  foreach ($orders as $order) {
206
  $this->_writeOrder($order, $xml, $storeId);
207
  }
208
- $xml->writeElement('Query', $orders->getSelectSql());
209
- $xml->writeElement('Version', 'Magento ' . Mage::getVersion());
210
- $xml->writeElement('Extensions', $this->_getModuleList());
 
 
 
 
 
 
 
 
 
211
  $xml->endElement(); // Orders
212
  }
213
 
@@ -240,7 +249,9 @@ class Auctane_Api_Model_Server_Adapter
240
  $helper->fieldsetToXml('sales_order', $order, $xml);
241
 
242
  $xml->startElement('Customer');
243
- $xml->writeElement('CustomerCode', $order->getCustomerEmail());
 
 
244
 
245
  $xml->startElement('BillTo');
246
  $helper->fieldsetToXml('sales_order_billing_address',
205
  foreach ($orders as $order) {
206
  $this->_writeOrder($order, $xml, $storeId);
207
  }
208
+ $xml->startElement('Query');
209
+ $xml->writeCdata($orders->getSelectSql());
210
+ $xml->endElement(); // Query
211
+
212
+ $xml->startElement('Version');
213
+ $xml->writeCdata('Magento ' . Mage::getVersion());
214
+ $xml->endElement(); // Version
215
+
216
+ $xml->startElement('Extensions');
217
+ $xml->writeCdata($this->_getModuleList());
218
+ $xml->endElement(); // Extensions
219
+
220
  $xml->endElement(); // Orders
221
  }
222
 
249
  $helper->fieldsetToXml('sales_order', $order, $xml);
250
 
251
  $xml->startElement('Customer');
252
+ $xml->startElement('CustomerCode');
253
+ $xml->writeCdata($order->getCustomerEmail());
254
+ $xml->endElement(); // CustomerCode
255
 
256
  $xml->startElement('BillTo');
257
  $helper->fieldsetToXml('sales_order_billing_address',
app/code/community/Auctane/Api/etc/config.xml CHANGED
@@ -19,7 +19,7 @@
19
  <config>
20
  <modules>
21
  <Auctane_Api>
22
- <version>0.3.0</version>
23
  </Auctane_Api>
24
  </modules>
25
 
19
  <config>
20
  <modules>
21
  <Auctane_Api>
22
+ <version>0.3.1</version>
23
  </Auctane_Api>
24
  </modules>
25
 
app/code/community/Auctane/ShipStation/etc/config.xml CHANGED
@@ -19,7 +19,7 @@
19
  <config>
20
  <modules>
21
  <Auctane_ShipStation>
22
- <version>1.3.3</version>
23
  </Auctane_ShipStation>
24
  </modules>
25
 
19
  <config>
20
  <modules>
21
  <Auctane_ShipStation>
22
+ <version>1.3.4</version>
23
  </Auctane_ShipStation>
24
  </modules>
25
 
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Auctane_ShipStation</name>
4
- <version>1.3.3</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
7
  <channel>community</channel>
@@ -9,11 +9,11 @@
9
  <summary>ShipStation is a web-based shipping solution that is integrated with the Magento API for retrieving order information and updating shipping details.</summary>
10
  <description>ShipStation is a web-based shipping solution that is integrated with the Magento API for retrieving order information and updating shipping details.</description>
11
  <notes>Official release.&#xD;
12
- Include debugging information and limit page size to 100 orders when exporting.</notes>
13
  <authors><author><name>clockworkgeek</name><user>nonproffessional</user><email>nonproffessional@clockworkgeek.com</email></author></authors>
14
- <date>2013-04-09</date>
15
- <time>12:54:55</time>
16
- <contents><target name="magecommunity"><dir name="Auctane"><dir name="ShipStation"><dir name="Block"><dir name="Adminhtml"><dir name="Linkup"><file name="Form.php" hash="68b7c7bc627e89c304cf630c24aa5164"/></dir><file name="Linkup.php" hash="f280d1f6a26e74244898ea16cdf29c9b"/><file name="Pending.php" hash="6bc7a07b5d0b5192db32fefc55b94b08"/></dir></dir><dir name="Helper"><file name="Data.php" hash="cf2bd6a04dd7b88cae8096c2dd548214"/></dir><file name="LICENSE.html" hash="caf0a79ffb5e4719f9f4de286f253a61"/><file name="LICENSE.txt" hash="59563e7be45096d0833dade102989042"/><file name="LICENSE_AFL.txt" hash="45a399f2095030865fb962263ccd7506"/><dir name="Model"><dir name="Mysql4"><dir name="User"><file name="Collection.php" hash="eee6af3b0c7ecf4f4a42eb0b50605d29"/></dir><file name="User.php" hash="296427f3d22c7cc18c0ece7c1afbc278"/></dir><file name="Observer.php" hash="ffb797d5cfc2f0724d20a44140661bed"/><file name="User.php" hash="9e3fad822b8adcd79dd5438d995fc61a"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="ShipstationController.php" hash="c7cd0029ed2a0a46d7b16821b1e6a683"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="3021b17f108f3f50230194ff63975481"/><file name="api.xml" hash="3021b17f108f3f50230194ff63975481"/><file name="config.xml" hash="9e892b501d6d2489bb07b1be4fbd5063"/></dir><dir name="sql"><dir name="auctaneshipstation_setup"><file name="mysql4-install-1.0.0.php" hash="ab307db58a6d8ec97b5efc8d4eedb349"/></dir></dir></dir><dir name="Api"><dir name="Helper"><file name="Data.php" hash="58f95c074ed97db15d564c973dae5d43"/></dir><file name="LICENSE.html" hash="caf0a79ffb5e4719f9f4de286f253a61"/><file name="LICENSE.txt" hash="59563e7be45096d0833dade102989042"/><file name="LICENSE_AFL.txt" hash="45a399f2095030865fb962263ccd7506"/><dir name="Model"><dir name="Server"><file name="Adapter.php" hash="d5d85e8a36f6c5145f016995ac191e5e"/></dir><dir name="System"><dir name="Source"><dir name="Config"><file name="Customattributes.php" hash="a10dff7d323044151803ce2e30313615"/></dir></dir></dir></dir><dir name="controllers"><file name="AuctaneController.php" hash="b7100ac35e0b3a5d737cde7ef96e19c0"/></dir><dir name="etc"><file name="api.xml" hash="3b6279da3c6a4e5fc71c72f1caf94ae1"/><file name="config.xml" hash="c119f36d7b910805059e3670f0bc8a77"/><file name="system.xml" hash="37d6921d13f1410dbb98f53925fba200"/></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="auctaneshipstation.xml" hash="d89f79f6de41bb4b23866356f16f48a1"/></dir><dir name="template"><dir name="auctane"><dir name="shipstation"><file name="container.phtml" hash="fb3df40a0baa33a21f6a51d52a90066c"/><file name="launch.phtml" hash="c3fbbc817cbf307fbd500defb2ab9f8e"/><file name="launchform.phtml" hash="b77583e98de80857b185d19a8ce03987"/><file name="linkup.phtml" hash="282a2114ca36efb68f1e681a29739a87"/><file name="pending.phtml" hash="100ec728f3b5ce479e09361bb22960bb"/></dir></dir></dir></dir></dir></dir></target><target name="magelocale"><dir name="en_US"><file name="Auctane_ShipStation.csv" hash="0f9582a3124a762cd6d9531f714d2f82"/></dir></target><target name="mageetc"><dir name="modules"><file name="Auctane_ShipStation.xml" hash="bacef7ff4049dece52644ec7be714ee6"/><file name="Auctane_Api.xml" hash="a27b534a3ad08732488959f8bdb72a03"/></dir></target><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="images"><file name="shipstation.png" hash="e19a42099ef020edaf7c10d9a068c1c0"/></dir></dir></dir></dir></target></contents>
17
  <compatible/>
18
  <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
19
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Auctane_ShipStation</name>
4
+ <version>1.3.4</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
7
  <channel>community</channel>
9
  <summary>ShipStation is a web-based shipping solution that is integrated with the Magento API for retrieving order information and updating shipping details.</summary>
10
  <description>ShipStation is a web-based shipping solution that is integrated with the Magento API for retrieving order information and updating shipping details.</description>
11
  <notes>Official release.&#xD;
12
+ Wrap exported text fields in CDATA as a precaution.</notes>
13
  <authors><author><name>clockworkgeek</name><user>nonproffessional</user><email>nonproffessional@clockworkgeek.com</email></author></authors>
14
+ <date>2013-04-17</date>
15
+ <time>21:15:55</time>
16
+ <contents><target name="magecommunity"><dir name="Auctane"><dir name="ShipStation"><dir name="Block"><dir name="Adminhtml"><dir name="Linkup"><file name="Form.php" hash="68b7c7bc627e89c304cf630c24aa5164"/></dir><file name="Linkup.php" hash="f280d1f6a26e74244898ea16cdf29c9b"/><file name="Pending.php" hash="6bc7a07b5d0b5192db32fefc55b94b08"/></dir></dir><dir name="Helper"><file name="Data.php" hash="cf2bd6a04dd7b88cae8096c2dd548214"/></dir><file name="LICENSE.html" hash="caf0a79ffb5e4719f9f4de286f253a61"/><file name="LICENSE.txt" hash="59563e7be45096d0833dade102989042"/><file name="LICENSE_AFL.txt" hash="45a399f2095030865fb962263ccd7506"/><dir name="Model"><dir name="Mysql4"><dir name="User"><file name="Collection.php" hash="eee6af3b0c7ecf4f4a42eb0b50605d29"/></dir><file name="User.php" hash="296427f3d22c7cc18c0ece7c1afbc278"/></dir><file name="Observer.php" hash="ffb797d5cfc2f0724d20a44140661bed"/><file name="User.php" hash="9e3fad822b8adcd79dd5438d995fc61a"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="ShipstationController.php" hash="c7cd0029ed2a0a46d7b16821b1e6a683"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="3021b17f108f3f50230194ff63975481"/><file name="api.xml" hash="3021b17f108f3f50230194ff63975481"/><file name="config.xml" hash="e0deae29ad3c4f83eefc6f23a7ea3953"/></dir><dir name="sql"><dir name="auctaneshipstation_setup"><file name="mysql4-install-1.0.0.php" hash="ab307db58a6d8ec97b5efc8d4eedb349"/></dir></dir></dir><dir name="Api"><dir name="Helper"><file name="Data.php" hash="e26b391ac0b9f0be29e1f127b2c7033e"/></dir><file name="LICENSE.html" hash="caf0a79ffb5e4719f9f4de286f253a61"/><file name="LICENSE.txt" hash="59563e7be45096d0833dade102989042"/><file name="LICENSE_AFL.txt" hash="45a399f2095030865fb962263ccd7506"/><dir name="Model"><dir name="Server"><file name="Adapter.php" hash="66a6914ed20bd925b630833d4f585638"/></dir><dir name="System"><dir name="Source"><dir name="Config"><file name="Customattributes.php" hash="a10dff7d323044151803ce2e30313615"/></dir></dir></dir></dir><dir name="controllers"><file name="AuctaneController.php" hash="b7100ac35e0b3a5d737cde7ef96e19c0"/></dir><dir name="etc"><file name="api.xml" hash="3b6279da3c6a4e5fc71c72f1caf94ae1"/><file name="config.xml" hash="921afbb817db09130827ac9d2f1fe033"/><file name="system.xml" hash="37d6921d13f1410dbb98f53925fba200"/></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="auctaneshipstation.xml" hash="d89f79f6de41bb4b23866356f16f48a1"/></dir><dir name="template"><dir name="auctane"><dir name="shipstation"><file name="container.phtml" hash="fb3df40a0baa33a21f6a51d52a90066c"/><file name="launch.phtml" hash="c3fbbc817cbf307fbd500defb2ab9f8e"/><file name="launchform.phtml" hash="b77583e98de80857b185d19a8ce03987"/><file name="linkup.phtml" hash="282a2114ca36efb68f1e681a29739a87"/><file name="pending.phtml" hash="100ec728f3b5ce479e09361bb22960bb"/></dir></dir></dir></dir></dir></dir></target><target name="magelocale"><dir name="en_US"><file name="Auctane_ShipStation.csv" hash="0f9582a3124a762cd6d9531f714d2f82"/></dir></target><target name="mageetc"><dir name="modules"><file name="Auctane_ShipStation.xml" hash="bacef7ff4049dece52644ec7be714ee6"/><file name="Auctane_Api.xml" hash="a27b534a3ad08732488959f8bdb72a03"/></dir></target><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="images"><file name="shipstation.png" hash="e19a42099ef020edaf7c10d9a068c1c0"/></dir></dir></dir></dir></target></contents>
17
  <compatible/>
18
  <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
19
  </package>