Oro_Api - Version 1.1.3

Version Notes

OroCRM Bridge extension adds a couple of improvements to Magento SOAP API v2 in order to expose more shopping cart and customer data.

Download this release

Release Info

Developer Oro, Inc
Extension Oro_Api
Version 1.1.3
Comparing to
See all releases


Code changes from version 1.1.2 to 1.1.3

Files changed (6) hide show
  1. app/code/community/Oro/Api/Model/Customer/Api.php +3 -2
  2. app/code/community/Oro/Api/Model/Sales/Order/Api.php +1 -1
  3. app/code/community/Oro/Api/Model/Sales/Quote/Api.php +1 -1
  4. app/code/community/Oro/Api/etc/wsdl.xml +12 -0
  5. app/code/community/Oro/Api/etc/wsi.xml +12 -0
  6. package.xml +4 -4
app/code/community/Oro/Api/Model/Customer/Api.php CHANGED
@@ -58,7 +58,7 @@ class Oro_Api_Model_Customer_Api extends Mage_Customer_Model_Api_Resource
58
  $this->_fault('filters_invalid', $e->getMessage());
59
  }
60
 
61
- $collection->setOrder('entity_id');
62
  if (!$apiHelper->applyPager($collection, $pager)) {
63
  // there's no such page, so no results for it
64
  return array();
@@ -76,7 +76,8 @@ class Oro_Api_Model_Customer_Api extends Mage_Customer_Model_Api_Resource
76
  /** @var $attribute Mage_Customer_Model_Attribute */
77
  $row[$attributeCode] = $customer->getData($attributeCode);
78
  if (in_array($attributeCode, $this->_sourcedAttributes)) {
79
- $row[$attributeCode] = $attribute->getSource()->getOptionText($customer->getData($attributeCode));
 
80
  }
81
  }
82
 
58
  $this->_fault('filters_invalid', $e->getMessage());
59
  }
60
 
61
+ $collection->setOrder('entity_id', Varien_Data_Collection_Db::SORT_ORDER_ASC);
62
  if (!$apiHelper->applyPager($collection, $pager)) {
63
  // there's no such page, so no results for it
64
  return array();
76
  /** @var $attribute Mage_Customer_Model_Attribute */
77
  $row[$attributeCode] = $customer->getData($attributeCode);
78
  if (in_array($attributeCode, $this->_sourcedAttributes)) {
79
+ $attributeValue = $attribute->getSource()->getOptionText($customer->getData($attributeCode));
80
+ $row[$attributeCode] = !empty($attributeValue) ? $attributeValue : null;
81
  }
82
  }
83
 
app/code/community/Oro/Api/Model/Sales/Order/Api.php CHANGED
@@ -46,7 +46,7 @@ class Oro_Api_Model_Sales_Order_Api extends Mage_Sales_Model_Api_Resource
46
  $this->_fault('filters_invalid', $e->getMessage());
47
  }
48
 
49
- $orderCollection->setOrder('entity_id');
50
  if (!$apiHelper->applyPager($orderCollection, $pager)) {
51
  // there's no such page, so no results for it
52
  return array();
46
  $this->_fault('filters_invalid', $e->getMessage());
47
  }
48
 
49
+ $orderCollection->setOrder('entity_id', Varien_Data_Collection_Db::SORT_ORDER_ASC);
50
  if (!$apiHelper->applyPager($orderCollection, $pager)) {
51
  // there's no such page, so no results for it
52
  return array();
app/code/community/Oro/Api/Model/Sales/Quote/Api.php CHANGED
@@ -41,7 +41,7 @@ class Oro_Api_Model_Sales_Quote_Api
41
  $this->_fault('filters_invalid', $e->getMessage());
42
  }
43
 
44
- $quoteCollection->setOrder('entity_id');
45
  if (!$apiHelper->applyPager($quoteCollection, $pager)) {
46
  // there's no such page, so no results for it
47
  return array();
41
  $this->_fault('filters_invalid', $e->getMessage());
42
  }
43
 
44
+ $quoteCollection->setOrder('entity_id', Varien_Data_Collection_Db::SORT_ORDER_ASC);
45
  if (!$apiHelper->applyPager($quoteCollection, $pager)) {
46
  // there's no such page, so no results for it
47
  return array();
app/code/community/Oro/Api/etc/wsdl.xml CHANGED
@@ -237,6 +237,18 @@
237
  </restriction>
238
  </complexContent>
239
  </complexType>
 
 
 
 
 
 
 
 
 
 
 
 
240
  </schema>
241
  </types>
242
 
237
  </restriction>
238
  </complexContent>
239
  </complexType>
240
+
241
+ <complexType name="customerCustomerEntityToCreate">
242
+ <all>
243
+ <element name="middlename" type="xsd:string" minOccurs="0" />
244
+ <element name="prefix" type="xsd:string" minOccurs="0" />
245
+ <element name="suffix" type="xsd:string" minOccurs="0" />
246
+ <element name="dob" type="xsd:string" minOccurs="0" />
247
+ <element name="taxvat" type="xsd:string" minOccurs="0" />
248
+ <element name="gender" type="xsd:string" minOccurs="0" />
249
+ <element name="group_id" type="xsd:int" minOccurs="0" />
250
+ </all>
251
+ </complexType>
252
  </schema>
253
  </types>
254
 
app/code/community/Oro/Api/etc/wsi.xml CHANGED
@@ -216,6 +216,18 @@
216
  </xsd:sequence>
217
  </xsd:complexType>
218
 
 
 
 
 
 
 
 
 
 
 
 
 
219
  <!-- Customer -->
220
  <xsd:element name="oroCustomerListRequestParam">
221
  <xsd:complexType>
216
  </xsd:sequence>
217
  </xsd:complexType>
218
 
219
+ <xsd:complexType name="customerCustomerEntityToCreate">
220
+ <xsd:sequence>
221
+ <xsd:element name="middlename" type="xsd:string" minOccurs="0" />
222
+ <xsd:element name="group_id" type="xsd:int" minOccurs="0" />
223
+ <xsd:element name="prefix" type="xsd:string" minOccurs="0" />
224
+ <xsd:element name="suffix" type="xsd:string" minOccurs="0" />
225
+ <xsd:element name="dob" type="xsd:string" minOccurs="0" />
226
+ <xsd:element name="taxvat" type="xsd:string" minOccurs="0" />
227
+ <xsd:element name="gender" type="xsd:string" minOccurs="0" />
228
+ </xsd:sequence>
229
+ </xsd:complexType>
230
+
231
  <!-- Customer -->
232
  <xsd:element name="oroCustomerListRequestParam">
233
  <xsd:complexType>
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Oro_Api</name>
4
- <version>1.1.2</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/osl-3.0.php">Open Software License (OSL 3.0)</license>
7
  <channel>community</channel>
@@ -10,9 +10,9 @@
10
  <description>OroCRM Bridge extension adds a couple of improvements to Magento SOAP API v2 in order to expose more shopping cart and customer data.</description>
11
  <notes>OroCRM Bridge extension adds a couple of improvements to Magento SOAP API v2 in order to expose more shopping cart and customer data.</notes>
12
  <authors><author><name>Oro, Inc</name><user>orocrm</user><email>info@orocrm.com</email></author></authors>
13
- <date>2014-05-12</date>
14
- <time>10:32:21</time>
15
- <contents><target name="magecommunity"><dir name="Oro"><dir name="Api"><dir name="Helper"><file name="Data.php" hash="94d7cebbd20dca0e0176e300a4165434"/></dir><dir name="Model"><dir name="Catalog"><dir name="Product"><dir name="Api"><file name="V2.php" hash="9fe5e65e1b189ba6a9fed25fe8d858d6"/></dir></dir></dir><dir name="Customer"><dir name="Api"><file name="V2.php" hash="89fc6f16e7f452438d4927669ea0f0de"/></dir><file name="Api.php" hash="4cbc2a224da7d80ca7253f297efeaaed"/></dir><dir name="Newsletter"><dir name="Subscriber"><dir name="Api"><file name="V2.php" hash="7b18db294f86ccf841a95aa7b7e656af"/></dir><file name="Api.php" hash="a49473afaca6c5bbbb82f58f41ff1650"/></dir></dir><dir name="Observer"><dir name="Crm"><file name="Controller.php" hash="10e07e0b8086c9475c6128cd2ac43878"/></dir><dir name="Sales"><file name="Order.php" hash="81e2f8992f57a406130c893072365782"/></dir></dir><dir name="Ping"><file name="V2.php" hash="0fa10110ecb67d32079c5530a979c55a"/></dir><file name="Ping.php" hash="e5f8c2feb8ece7f27ff4f13277da68fd"/><dir name="Report"><dir name="Product"><dir name="Viewed"><dir name="Api"><file name="V2.php" hash="c8481504cefd028a17cc4a6555182ad0"/></dir><file name="Api.php" hash="fe175f2aab97cafa47574f1da2e169a3"/></dir></dir></dir><dir name="Resource"><dir name="Reports"><dir name="Product"><dir name="Index"><dir name="Viewed"><file name="Collection.php" hash="199749c5c972ab305abff0c9b10e9954"/></dir></dir></dir></dir></dir><dir name="Sales"><dir name="Order"><dir name="Api"><file name="V2.php" hash="0621bd68c420feb8000dae6861c49369"/></dir><file name="Api.php" hash="62c6b56d1fbe74b44d0ec087b605334d"/></dir><dir name="Quote"><dir name="Api"><file name="V2.php" hash="4e8ba0ed7757110c4eae1d239b2adf76"/></dir><file name="Api.php" hash="193c05456f86b5072f0ee5c20cb22eac"/></dir></dir><dir name="Wishlist"><dir name="Api"><file name="V2.php" hash="f0ac63e1cf9440ed0e4ca72eb93834f2"/></dir><file name="Api.php" hash="3ebfc3b7841c265921ea05d63f8ba5a9"/><dir name="Item"><dir name="Api"><file name="V2.php" hash="43a919dae8dd432e211878a39ba3f4a2"/></dir><file name="Api.php" hash="8d5d856ea533b9b122c96d0bef32861b"/></dir></dir></dir><dir name="controllers"><dir name="Adminhtml"><dir name="Oro"><file name="GatewayController.php" hash="aca4efd099a889a77fb119356d9fab23"/><file name="SalesController.php" hash="4ba37d2b0d86c0eeaf9e6fa2b7bac843"/></dir></dir></dir><dir name="etc"><file name="api.xml" hash="2ee90b80f4d29ab73b3517a3d19e7aa3"/><file name="config.xml" hash="bbaa0acc4714204e0dd4bad2bbdf8263"/><file name="workflow.xml" hash="12ad592e533d8a53187af25c46fb017e"/><file name="wsdl.xml" hash="d0266ccf9a6811d3e7e2340cd7af8081"/><file name="wsi.xml" hash="dd9047840a8cc69deee4df21cf08d553"/></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Oro_Api.xml" hash="e4836dedcf0ace31dd01b117a1fd962e"/></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="template"><dir name="oro"><dir><dir name="api"><file name="page.phtml" hash="be4a29775b24569d60802616072b2628"/><file name="script.phtml" hash="e9002ec0c9b90fc92c926542e84045bf"/></dir></dir></dir></dir></dir></dir></dir></target></contents>
16
  <compatible/>
17
  <dependencies><required><php><min>5.2.13</min><max>5.5.0</max></php></required></dependencies>
18
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Oro_Api</name>
4
+ <version>1.1.3</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/osl-3.0.php">Open Software License (OSL 3.0)</license>
7
  <channel>community</channel>
10
  <description>OroCRM Bridge extension adds a couple of improvements to Magento SOAP API v2 in order to expose more shopping cart and customer data.</description>
11
  <notes>OroCRM Bridge extension adds a couple of improvements to Magento SOAP API v2 in order to expose more shopping cart and customer data.</notes>
12
  <authors><author><name>Oro, Inc</name><user>orocrm</user><email>info@orocrm.com</email></author></authors>
13
+ <date>2014-05-22</date>
14
+ <time>22:54:05</time>
15
+ <contents><target name="magecommunity"><dir name="Oro"><dir name="Api"><dir name="Helper"><file name="Data.php" hash="94d7cebbd20dca0e0176e300a4165434"/></dir><dir name="Model"><dir name="Catalog"><dir name="Product"><dir name="Api"><file name="V2.php" hash="9fe5e65e1b189ba6a9fed25fe8d858d6"/></dir></dir></dir><dir name="Customer"><dir name="Api"><file name="V2.php" hash="89fc6f16e7f452438d4927669ea0f0de"/></dir><file name="Api.php" hash="d8a56eba2d835451c9021c2e94a7347b"/></dir><dir name="Newsletter"><dir name="Subscriber"><dir name="Api"><file name="V2.php" hash="7b18db294f86ccf841a95aa7b7e656af"/></dir><file name="Api.php" hash="a49473afaca6c5bbbb82f58f41ff1650"/></dir></dir><dir name="Observer"><dir name="Crm"><file name="Controller.php" hash="10e07e0b8086c9475c6128cd2ac43878"/></dir><dir name="Sales"><file name="Order.php" hash="81e2f8992f57a406130c893072365782"/></dir></dir><dir name="Ping"><file name="V2.php" hash="0fa10110ecb67d32079c5530a979c55a"/></dir><file name="Ping.php" hash="e5f8c2feb8ece7f27ff4f13277da68fd"/><dir name="Report"><dir name="Product"><dir name="Viewed"><dir name="Api"><file name="V2.php" hash="c8481504cefd028a17cc4a6555182ad0"/></dir><file name="Api.php" hash="fe175f2aab97cafa47574f1da2e169a3"/></dir></dir></dir><dir name="Resource"><dir name="Reports"><dir name="Product"><dir name="Index"><dir name="Viewed"><file name="Collection.php" hash="199749c5c972ab305abff0c9b10e9954"/></dir></dir></dir></dir></dir><dir name="Sales"><dir name="Order"><dir name="Api"><file name="V2.php" hash="0621bd68c420feb8000dae6861c49369"/></dir><file name="Api.php" hash="abbcb2a561b1030a4c1cc465e6cc0a1e"/></dir><dir name="Quote"><dir name="Api"><file name="V2.php" hash="4e8ba0ed7757110c4eae1d239b2adf76"/></dir><file name="Api.php" hash="b1a92196c0edca15bf2cd8d031cadcbc"/></dir></dir><dir name="Wishlist"><dir name="Api"><file name="V2.php" hash="f0ac63e1cf9440ed0e4ca72eb93834f2"/></dir><file name="Api.php" hash="3ebfc3b7841c265921ea05d63f8ba5a9"/><dir name="Item"><dir name="Api"><file name="V2.php" hash="43a919dae8dd432e211878a39ba3f4a2"/></dir><file name="Api.php" hash="8d5d856ea533b9b122c96d0bef32861b"/></dir></dir></dir><dir name="controllers"><dir name="Adminhtml"><dir name="Oro"><file name="GatewayController.php" hash="aca4efd099a889a77fb119356d9fab23"/><file name="SalesController.php" hash="4ba37d2b0d86c0eeaf9e6fa2b7bac843"/></dir></dir></dir><dir name="etc"><file name="api.xml" hash="2ee90b80f4d29ab73b3517a3d19e7aa3"/><file name="config.xml" hash="bbaa0acc4714204e0dd4bad2bbdf8263"/><file name="workflow.xml" hash="12ad592e533d8a53187af25c46fb017e"/><file name="wsdl.xml" hash="da7d4715356d7cb88052f720bf739c15"/><file name="wsi.xml" hash="1343db7b48eef10979246ca616651781"/></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Oro_Api.xml" hash="e4836dedcf0ace31dd01b117a1fd962e"/></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="template"><dir name="oro"><dir><dir name="api"><file name="page.phtml" hash="be4a29775b24569d60802616072b2628"/><file name="script.phtml" hash="e9002ec0c9b90fc92c926542e84045bf"/></dir></dir></dir></dir></dir></dir></dir></target></contents>
16
  <compatible/>
17
  <dependencies><required><php><min>5.2.13</min><max>5.5.0</max></php></required></dependencies>
18
  </package>