Auctane_ShipStation - Version 1.3.26

Version Notes

Official release.



Compatibility with php running as cgi, allows exporting base or store price.

Download this release

Release Info

Developer Classy Llama
Extension Auctane_ShipStation
Version 1.3.26
Comparing to
See all releases


Code changes from version 1.3.24 to 1.3.26

Files changed (4) hide show
  1. app/code/community/Auctane/Api/Helper/Data.php +1 -7
  2. app/code/community/Auctane/Api/Model/Action/Export.php +6 -6
  3. app/code/community/Auctane/Api/etc/config.xml +2 -11
  4. package.xml +4 -4
app/code/community/Auctane/Api/Helper/Data.php CHANGED
@@ -29,7 +29,7 @@ class Auctane_Api_Helper_Data extends Mage_Core_Helper_Data {
29
  * @param array|Varien_Object $source
30
  * @param XMLWriter $xml
31
  */
32
- public function fieldsetToXml($fieldset, $source, XMLWriter $xml, $isBundle = 0, $fltConfigItemPrice = 0) {
33
  $fields = (array) Mage::getConfig()->getFieldset($fieldset);
34
  //Check for the importing the child product settings
35
  $intImportChildProducts = Mage::getStoreConfig('auctaneapi/general/import_child_products');
@@ -41,14 +41,8 @@ class Auctane_Api_Helper_Data extends Mage_Core_Helper_Data {
41
  $value = $source instanceof Varien_Object ? $source->getDataUsingMethod($field) : @$source[$field];
42
  //Set the child item price of bundle products to 0
43
  if ($isBundle == 1 && $name == 'UnitPrice' && $intImportChildProducts == 1) {
44
- //continue;
45
  $value = 0;
46
  }
47
- //set the configurable product base price
48
- if ($name == 'UnitPrice' && $fltConfigItemPrice) {
49
- $value = $fltConfigItemPrice;
50
- }
51
-
52
  $xml->startElement((string) $name);
53
  if (is_numeric($value)) {
54
  $xml->text((string) $value);
29
  * @param array|Varien_Object $source
30
  * @param XMLWriter $xml
31
  */
32
+ public function fieldsetToXml($fieldset, $source, XMLWriter $xml, $isBundle = 0) {
33
  $fields = (array) Mage::getConfig()->getFieldset($fieldset);
34
  //Check for the importing the child product settings
35
  $intImportChildProducts = Mage::getStoreConfig('auctaneapi/general/import_child_products');
41
  $value = $source instanceof Varien_Object ? $source->getDataUsingMethod($field) : @$source[$field];
42
  //Set the child item price of bundle products to 0
43
  if ($isBundle == 1 && $name == 'UnitPrice' && $intImportChildProducts == 1) {
 
44
  $value = 0;
45
  }
 
 
 
 
 
46
  $xml->startElement((string) $name);
47
  if (is_numeric($value)) {
48
  $xml->text((string) $value);
app/code/community/Auctane/Api/Model/Action/Export.php CHANGED
@@ -17,8 +17,8 @@ class Auctane_Api_Model_Action_Export {
17
 
18
  $apiConfigCharset = Mage::getStoreConfig("api/config/charset", $store);
19
 
20
- $start_date = strtotime($request->getParam('start_date'));
21
- $end_date = strtotime($request->getParam('end_date'));
22
  if (!$start_date || !$end_date)
23
  throw new Exception('Start and end dates are required', 400);
24
 
@@ -200,12 +200,12 @@ class Auctane_Api_Model_Action_Export {
200
  if ($item->getParentItemId() && !$item->getParentItem()) {
201
  $item->setParentItem(Mage::getModel('sales/order_item')->load($item->getParentItemId()));
202
  }
203
- $fltConfigItemPrice = 0;
204
  // only inherit if parent has been hidden
205
  if ($item->getParentItem() && ($item->getPrice() == 0.000) && (Mage::helper('auctaneapi')->isExcludedProductType($item->getParentItem()->getProductType()))) {
 
206
  $item->setPrice($item->getParentItem()->getPrice());
207
- //set the base price of configurable product type
208
- $fltConfigItemPrice = $item->getParentItem()->getPrice();
209
  }
210
 
211
  /* @var $gift Mage_GiftMessage_Model_Message */
@@ -236,7 +236,7 @@ class Auctane_Api_Model_Action_Export {
236
  $helper = Mage::helper('auctaneapi');
237
  if (Mage::helper('auctaneapi')->getExportPriceType($item->getOrder()->getStoreId()) ==
238
  Auctane_Api_Model_System_Source_Config_Prices::BASE_PRICE) {
239
- $helper->fieldsetToXml('base_sales_order_item', $item, $xml, $isBundle, $fltConfigItemPrice);
240
  } else {
241
  $helper->fieldsetToXml('sales_order_item', $item, $xml, $isBundle);
242
  }
17
 
18
  $apiConfigCharset = Mage::getStoreConfig("api/config/charset", $store);
19
 
20
+ $start_date = strtotime(urldecode($request->getParam('start_date')));
21
+ $end_date = strtotime(urldecode($request->getParam('end_date')));
22
  if (!$start_date || !$end_date)
23
  throw new Exception('Start and end dates are required', 400);
24
 
200
  if ($item->getParentItemId() && !$item->getParentItem()) {
201
  $item->setParentItem(Mage::getModel('sales/order_item')->load($item->getParentItemId()));
202
  }
 
203
  // only inherit if parent has been hidden
204
  if ($item->getParentItem() && ($item->getPrice() == 0.000) && (Mage::helper('auctaneapi')->isExcludedProductType($item->getParentItem()->getProductType()))) {
205
+ //set the store price of item from parent item
206
  $item->setPrice($item->getParentItem()->getPrice());
207
+ //set the base price of item from parent item
208
+ $item->setBasePrice($item->getParentItem()->getBasePrice());
209
  }
210
 
211
  /* @var $gift Mage_GiftMessage_Model_Message */
236
  $helper = Mage::helper('auctaneapi');
237
  if (Mage::helper('auctaneapi')->getExportPriceType($item->getOrder()->getStoreId()) ==
238
  Auctane_Api_Model_System_Source_Config_Prices::BASE_PRICE) {
239
+ $helper->fieldsetToXml('base_sales_order_item', $item, $xml, $isBundle);
240
  } else {
241
  $helper->fieldsetToXml('sales_order_item', $item, $xml, $isBundle);
242
  }
app/code/community/Auctane/Api/etc/config.xml CHANGED
@@ -19,12 +19,10 @@
19
  <config>
20
  <modules>
21
  <Auctane_Api>
22
- <version>1.3.11</version>
23
  </Auctane_Api>
24
  </modules>
25
-
26
  <global>
27
-
28
  <events>
29
  <salesrule_validator_process>
30
  <observers>
@@ -42,9 +40,7 @@
42
  </auctaneapi_quote_to_order>
43
  </observers>
44
  </sales_convert_quote_to_order>
45
- </events>
46
-
47
-
48
  <helpers>
49
  <auctaneapi>
50
  <class>Auctane_Api_Helper</class>
@@ -78,7 +74,6 @@
78
  </setup>
79
  </auctaneapi_setup>
80
  </resources>
81
-
82
  <fieldsets>
83
  <sales_order>
84
  <increment_id><auctaneapi>OrderNumber</auctaneapi></increment_id>
@@ -162,7 +157,6 @@
162
  <value><auctaneapi>Value</auctaneapi></value>
163
  </sales_order_item_option>
164
  </fieldsets>
165
-
166
  <catalog>
167
  <product>
168
  <type>
@@ -173,7 +167,6 @@
173
  </type>
174
  </product>
175
  </catalog>
176
-
177
  <!-- The following node is only necessary for versions of Magento older than 1.3
178
  <rewrite>
179
  <auctaneapi>
@@ -211,7 +204,6 @@
211
  </resources>
212
  </acl>
213
  </adminhtml>
214
-
215
  <frontend>
216
  <routers>
217
  <!-- The following node is only necessary for versions of Magento older than 1.3
@@ -232,7 +224,6 @@
232
  </api>
233
  </routers>
234
  </frontend>
235
-
236
  <default>
237
  <auctaneapi>
238
  <config>
19
  <config>
20
  <modules>
21
  <Auctane_Api>
22
+ <version>1.3.26</version>
23
  </Auctane_Api>
24
  </modules>
 
25
  <global>
 
26
  <events>
27
  <salesrule_validator_process>
28
  <observers>
40
  </auctaneapi_quote_to_order>
41
  </observers>
42
  </sales_convert_quote_to_order>
43
+ </events>
 
 
44
  <helpers>
45
  <auctaneapi>
46
  <class>Auctane_Api_Helper</class>
74
  </setup>
75
  </auctaneapi_setup>
76
  </resources>
 
77
  <fieldsets>
78
  <sales_order>
79
  <increment_id><auctaneapi>OrderNumber</auctaneapi></increment_id>
157
  <value><auctaneapi>Value</auctaneapi></value>
158
  </sales_order_item_option>
159
  </fieldsets>
 
160
  <catalog>
161
  <product>
162
  <type>
167
  </type>
168
  </product>
169
  </catalog>
 
170
  <!-- The following node is only necessary for versions of Magento older than 1.3
171
  <rewrite>
172
  <auctaneapi>
204
  </resources>
205
  </acl>
206
  </adminhtml>
 
207
  <frontend>
208
  <routers>
209
  <!-- The following node is only necessary for versions of Magento older than 1.3
224
  </api>
225
  </routers>
226
  </frontend>
 
227
  <default>
228
  <auctaneapi>
229
  <config>
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Auctane_ShipStation</name>
4
- <version>1.3.24</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
7
  <channel>community</channel>
@@ -12,9 +12,9 @@
12
  &amp;amp;amp;amp;amp;amp;amp;#xD;&amp;amp;amp;amp;amp;amp;#xD;&amp;amp;amp;amp;amp;#xD;&amp;amp;amp;amp;#xD;&amp;amp;amp;#xD;&amp;amp;#xD;&amp;#xD;&#xD;
13
  Compatibility with php running as cgi, allows exporting base or store price.</notes>
14
  <authors><author><name>Classy Llama</name><user>classyllama</user><email>info@classyllama.com</email></author></authors>
15
- <date>2014-08-11</date>
16
- <time>11:50:06</time>
17
- <contents><target name="mageetc"><dir name="modules"><file name="Auctane_Api.xml" hash="a27b534a3ad08732488959f8bdb72a03"/></dir></target><target name="magecommunity"><dir name="Auctane"><dir name="Api"><file name="CHANGELOG.txt" hash="ac302cdb9f343e0ec036b7a846294235"/><dir name="Helper"><file name="Data.php" hash="09d59846badf0227c3f00b80426d4c88"/></dir><file name="LICENSE.html" hash="caf0a79ffb5e4719f9f4de286f253a61"/><file name="LICENSE.txt" hash="34410d4f566fdc33f094525a2d9865fa"/><file name="LICENSE_AFL.txt" hash="0e3cb8112c018920eee7a316a2a69103"/><dir name="Model"><dir name="Action"><file name="Export.php" hash="c1008c5dbac647e45d623935f84d3c02"/><file name="Shipnotify.php" hash="45733af4236d6b855d7db21f36d68cc1"/></dir><file name="Observer.php" hash="35039bba674a42171212e3a13b7800ca"/><dir name="Server"><file name="Adapter.php" hash="2439c54a7fe7bb44c93ee1e00b2e8dcf"/></dir><dir name="System"><dir name="Source"><dir name="Config"><file name="Customattributes.php" hash="a10dff7d323044151803ce2e30313615"/><file name="Import.php" hash="f7e86512477d957d2620084faab48327"/><file name="Prices.php" hash="0869f093096b4ff6d2ae24f14468d782"/></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="17552bc312cbd3cfb23e102b528438b6"/><file name="system.xml" hash="91b7c65f17f50a62029008e22dadc0ac"/></dir><dir name="sql"><dir name="auctaneapi_setup"><file name="mysql4-install-1.3.11.php" hash="17aa8f981f75f1e1d62e8dbdde2f950d"/></dir></dir></dir></dir></target><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="auctaneapi"><dir name="css"><file name="master.css" hash="0b35fa9797b3bd868b3725a85d4347af"/></dir><dir name="images"><file name="auctaneapi.png" hash="294d531f2f4f6dd85bdccd124a3057f6"/><file name="btn_bl.png" hash="093ac74aedfd1dd0addbfac3a19ced95"/><file name="header.png" hash="9228dfeb910aa6f3141d40966a6dba32"/><file name="tabs_span_bg.gif" hash="bcabd4fea0d67b181f21779564c2284b"/></dir></dir></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="auctaneapi.xml" hash="a6fe62d8258e423bee3a129165c0d313"/></dir></dir></dir></dir></target></contents>
18
  <compatible/>
19
  <dependencies><required><php><min>5.3.0</min><max>6.0.0</max></php></required></dependencies>
20
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Auctane_ShipStation</name>
4
+ <version>1.3.26</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
7
  <channel>community</channel>
12
  &amp;amp;amp;amp;amp;amp;amp;#xD;&amp;amp;amp;amp;amp;amp;#xD;&amp;amp;amp;amp;amp;#xD;&amp;amp;amp;amp;#xD;&amp;amp;amp;#xD;&amp;amp;#xD;&amp;#xD;&#xD;
13
  Compatibility with php running as cgi, allows exporting base or store price.</notes>
14
  <authors><author><name>Classy Llama</name><user>classyllama</user><email>info@classyllama.com</email></author></authors>
15
+ <date>2014-10-17</date>
16
+ <time>16:05:53</time>
17
+ <contents><target name="mageetc"><dir name="modules"><file name="Auctane_Api.xml" hash="a27b534a3ad08732488959f8bdb72a03"/></dir></target><target name="magecommunity"><dir name="Auctane"><dir name="Api"><file name="CHANGELOG.txt" hash="ac302cdb9f343e0ec036b7a846294235"/><dir name="Helper"><file name="Data.php" hash="33984bc5e9f69c4dc1326164dac9e115"/></dir><file name="LICENSE.html" hash="caf0a79ffb5e4719f9f4de286f253a61"/><file name="LICENSE.txt" hash="34410d4f566fdc33f094525a2d9865fa"/><file name="LICENSE_AFL.txt" hash="0e3cb8112c018920eee7a316a2a69103"/><dir name="Model"><dir name="Action"><file name="Export.php" hash="46b4c629256bd8e3f03c16755776ae49"/><file name="Shipnotify.php" hash="45733af4236d6b855d7db21f36d68cc1"/></dir><file name="Observer.php" hash="35039bba674a42171212e3a13b7800ca"/><dir name="Server"><file name="Adapter.php" hash="2439c54a7fe7bb44c93ee1e00b2e8dcf"/></dir><dir name="System"><dir name="Source"><dir name="Config"><file name="Customattributes.php" hash="a10dff7d323044151803ce2e30313615"/><file name="Import.php" hash="f7e86512477d957d2620084faab48327"/><file name="Prices.php" hash="0869f093096b4ff6d2ae24f14468d782"/></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="d1ac0a7ac817642d47ba2cb629b6a447"/><file name="system.xml" hash="91b7c65f17f50a62029008e22dadc0ac"/></dir><dir name="sql"><dir name="auctaneapi_setup"><file name="mysql4-install-1.3.11.php" hash="17aa8f981f75f1e1d62e8dbdde2f950d"/></dir></dir></dir></dir></target><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="auctaneapi"><dir name="css"><file name="master.css" hash="0b35fa9797b3bd868b3725a85d4347af"/></dir><dir name="images"><file name="auctaneapi.png" hash="294d531f2f4f6dd85bdccd124a3057f6"/><file name="btn_bl.png" hash="093ac74aedfd1dd0addbfac3a19ced95"/><file name="header.png" hash="9228dfeb910aa6f3141d40966a6dba32"/><file name="tabs_span_bg.gif" hash="bcabd4fea0d67b181f21779564c2284b"/></dir></dir></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="auctaneapi.xml" hash="a6fe62d8258e423bee3a129165c0d313"/></dir></dir></dir></dir></target></contents>
18
  <compatible/>
19
  <dependencies><required><php><min>5.3.0</min><max>6.0.0</max></php></required></dependencies>
20
  </package>