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.39 |
Comparing to | |
See all releases |
Code changes from version 1.3.37 to 1.3.39
app/code/community/Auctane/Api/Model/Action/Export.php
CHANGED
@@ -250,8 +250,8 @@ class Auctane_Api_Model_Action_Export
|
|
250 |
$xml->startElement('Item');
|
251 |
|
252 |
$helper = Mage::helper('auctaneapi');
|
253 |
-
$
|
254 |
-
if ($
|
255 |
$helper->fieldsetToXml('base_sales_order_item', $item, $xml, $isBundle);
|
256 |
} else {
|
257 |
$helper->fieldsetToXml('sales_order_item', $item, $xml, $isBundle);
|
250 |
$xml->startElement('Item');
|
251 |
|
252 |
$helper = Mage::helper('auctaneapi');
|
253 |
+
$priceType = Mage::helper('auctaneapi')->getExportPriceType($item->getOrder()->getStoreId());
|
254 |
+
if ($priceType == Auctane_Api_Model_System_Source_Config_Prices::BASE_PRICE) {
|
255 |
$helper->fieldsetToXml('base_sales_order_item', $item, $xml, $isBundle);
|
256 |
} else {
|
257 |
$helper->fieldsetToXml('sales_order_item', $item, $xml, $isBundle);
|
app/code/community/Auctane/Api/Model/Server/Adapter.php
CHANGED
@@ -138,8 +138,12 @@ class Auctane_Api_Model_Server_Adapter
|
|
138 |
}
|
139 |
$errMessage = 'Authorize.Net CIM Gateway: The original transaction was not issued
|
140 |
for this shipping address. (E00051)';
|
|
|
|
|
|
|
141 |
|
142 |
-
|
|
|
143 |
header('Web Exception', true, 400);
|
144 |
}
|
145 |
|
@@ -152,4 +156,4 @@ class Auctane_Api_Model_Server_Adapter
|
|
152 |
');
|
153 |
}
|
154 |
|
155 |
-
}
|
138 |
}
|
139 |
$errMessage = 'Authorize.Net CIM Gateway: The original transaction was not issued
|
140 |
for this shipping address. (E00051)';
|
141 |
+
|
142 |
+
$faultString = "Integrity constraint violation";
|
143 |
+
$position = strpos($message, $faultString);
|
144 |
|
145 |
+
//return fault status when web exception genrated.
|
146 |
+
if (($message == $errMessage) || ($position !== false)) {
|
147 |
header('Web Exception', true, 400);
|
148 |
}
|
149 |
|
156 |
');
|
157 |
}
|
158 |
|
159 |
+
}
|
app/code/community/Auctane/Api/etc/config.xml
CHANGED
@@ -19,7 +19,7 @@
|
|
19 |
<config>
|
20 |
<modules>
|
21 |
<Auctane_Api>
|
22 |
-
<version>1.3.
|
23 |
</Auctane_Api>
|
24 |
</modules>
|
25 |
<global>
|
19 |
<config>
|
20 |
<modules>
|
21 |
<Auctane_Api>
|
22 |
+
<version>1.3.39</version>
|
23 |
</Auctane_Api>
|
24 |
</modules>
|
25 |
<global>
|
package.xml
CHANGED
@@ -1,7 +1,7 @@
|
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>Auctane_ShipStation</name>
|
4 |
-
<version>1.3.
|
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;#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>2015-
|
16 |
-
<time>
|
17 |
-
<contents><target name="mageetc"><dir name="modules"><file name="Auctane_Api.xml" hash="a95e2ff4d2c0c0e9dbd33fa50d1fdff8"/></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="cf9c04c83f3bacb3c2a78aad2a53a81c"/></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="
|
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.39</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;#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>2015-12-29</date>
|
16 |
+
<time>09:52:43</time>
|
17 |
+
<contents><target name="mageetc"><dir name="modules"><file name="Auctane_Api.xml" hash="a95e2ff4d2c0c0e9dbd33fa50d1fdff8"/></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="cf9c04c83f3bacb3c2a78aad2a53a81c"/></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="02aea787b4243c5d95bf3dfee54bba2e"/><file name="Shipnotify.php" hash="06fe0518595c3f9dc616ea4073a4587e"/></dir><file name="Observer.php" hash="60445facb51142a030ea9944872fa98a"/><dir name="Server"><file name="Adapter.php" hash="3394bbbfa77df8351bf42c9da9a3e704"/></dir><dir name="System"><dir name="Source"><dir name="Config"><file name="Customattributes.php" hash="b8b4ea3c5c349e872de93c1dbfcc4171"/><file name="Import.php" hash="bed3f5935efde27705589afc448d5dd4"/><file name="Prices.php" hash="203d324934d8cfe0776a0ce764dc118d"/></dir></dir></dir></dir><dir name="controllers"><file name="AuctaneController.php" hash="ae73284a10d84540591b4ff9ad0814dd"/></dir><dir name="etc"><file name="api.xml" hash="41c92fc762da05e68b19f0eaf3100260"/><file name="config.xml" hash="20440c9647e77c2ad167db2fe763ba71"/><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>
|