Oro_Api - Version 1.2.2.0

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.2.2.0
Comparing to
See all releases


Code changes from version 1.2.1.0 to 1.2.2.0

Files changed (3) hide show
  1. app/code/community/Oro/Api/Model/Sales/Order/Api.php +2 -1
  2. app/code/community/Oro/Api/Model/Sales/Quote/Api.php +2 -2
  3. package.xml +4 -4
app/code/community/Oro/Api/Model/Sales/Order/Api.php CHANGED
@@ -20,7 +20,8 @@ class Oro_Api_Model_Sales_Order_Api extends Mage_Sales_Model_Api_Resource
20
  /** @var array */
21
  protected $_attributesMap = array(
22
  'order' => array('order_id' => 'entity_id'),
23
- 'order_address' => array('address_id' => 'entity_id')
 
24
  );
25
 
26
  /**
20
  /** @var array */
21
  protected $_attributesMap = array(
22
  'order' => array('order_id' => 'entity_id'),
23
+ 'order_address' => array('address_id' => 'entity_id'),
24
+ 'global' => array()
25
  );
26
 
27
  /**
app/code/community/Oro/Api/Model/Sales/Quote/Api.php CHANGED
@@ -133,9 +133,9 @@ class Oro_Api_Model_Sales_Quote_Api
133
  $mediaAttributes = $productModel->getMediaAttributes();
134
  if (is_array($mediaAttributes) && array_key_exists('image', $mediaAttributes)) {
135
  /** @var Mage_Catalog_Model_Product $product */
136
- $product = $productModel
137
  ->setStoreId($item->getQuote()->getStoreId())
138
- ->load($item->getProductId(), $mediaAttributes['image']->getAttributeCode());
139
 
140
  if ($product) {
141
  /** @var Mage_Catalog_Model_Product_Media_Config $productMediaConfig */
133
  $mediaAttributes = $productModel->getMediaAttributes();
134
  if (is_array($mediaAttributes) && array_key_exists('image', $mediaAttributes)) {
135
  /** @var Mage_Catalog_Model_Product $product */
136
+ $product = Mage::getModel('catalog/product')
137
  ->setStoreId($item->getQuote()->getStoreId())
138
+ ->load($item->getProductId(), array($mediaAttributes['image']->getAttributeCode()));
139
 
140
  if ($product) {
141
  /** @var Mage_Catalog_Model_Product_Media_Config $productMediaConfig */
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Oro_Api</name>
4
- <version>1.2.1.0</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>2015-06-26</date>
14
- <time>08:45:24</time>
15
- <contents><target name="magecommunity"><dir name="Oro"><dir name="Api"><dir name="Helper"><file name="Data.php" hash="ab7e20ec5a9d0893fe0ea6caf3f8872d"/></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="Address"><dir name="Api"><file name="V2.php" hash="d78fb25439d4c4f172f8ff49dc24439d"/></dir><file name="Api.php" hash="bc68a17a8b3f4ef84d4887c9bbe148f0"/></dir><dir name="Api"><file name="V2.php" hash="89fc6f16e7f452438d4927669ea0f0de"/></dir><file name="Api.php" hash="36e09efd92d3ecb1d4dc833f3c259ad3"/></dir><dir name="Newsletter"><dir name="Subscriber"><dir name="Api"><file name="V2.php" hash="7b18db294f86ccf841a95aa7b7e656af"/></dir><file name="Api.php" hash="ac35ba0bb921258495149509fdb1b66e"/></dir></dir><dir name="Observer"><dir name="Crm"><file name="Controller.php" hash="7b3ec12f8934af2cb97ee21d7cd1c903"/></dir><dir name="Sales"><file name="Order.php" hash="81e2f8992f57a406130c893072365782"/></dir></dir><file name="Observer.php" hash="cf5202298ae9319e731ef8b5845a36a1"/><dir name="Ping"><file name="V2.php" hash="0fa10110ecb67d32079c5530a979c55a"/></dir><file name="Ping.php" hash="5a12b76b0e1f99b3fa096b1436f6a42f"/><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="8f7a31f36d75184c7d05d646a5a6180d"/></dir><dir name="Quote"><dir name="Api"><file name="V2.php" hash="4e8ba0ed7757110c4eae1d239b2adf76"/></dir><file name="Api.php" hash="b559260a935a9d8c03dc2694885a5b4a"/></dir></dir><dir name="Website"><dir name="Api"><file name="V2.php" hash="aa9ab487ab696216d287be68dac262a6"/></dir><file name="Api.php" hash="a7cc7c6b06873e6d63b5d393cd50fd9b"/></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="3cd40b74eafe18fc6885ce871e305c5c"/></dir></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="b3298b50c6f9556d36055f01cdfeb180"/><file name="api.xml" hash="be5cbe077e7485a503202da5f4457a14"/><file name="config.xml" hash="979297bce6a9c40f72f6d9097107c000"/><file name="system.xml" hash="602816f300ad544e9bf4f82d752a092c"/><file name="workflow.xml" hash="40e7f46d53156e77b1d5498769e8f6cc"/><file name="wsdl.xml" hash="a02b318b87b39b821101a8d541165f2c"/><file name="wsi.xml" hash="b419b26f3523c0366ed80528bdbc7de6"/></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="check.phtml" hash="142e380fa9eae5c0b7f233d519d13dc7"/><file name="login_styles.phtml" hash="a89d5d690702cf8296d76923b85e4ced"/><file name="page.phtml" hash="e9359e49019bbaa6e8b77e2a0ec458dd"/><file name="script.phtml" hash="89c3810165995c0ef6a0f5ad3b39f41f"/></dir></dir></dir></dir></dir></dir></dir></target><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="images"><dir name="oro"><file name="add_button_icon_dark.png" hash="01929b4351b537427035ba0f4df61689"/><file name="apply_button_icon.png" hash="4fc6fffbf943e82ea2b1a0022ec329e1"/><file name="error.png" hash="0caf3533e40e7f425d206803ef6e1876"/><file name="grid_sort_asc.gif" hash="8a86df764d4219dc0cf04f8529165cef"/><file name="grid_sort_desc.gif" hash="4f493deb94cb0eb0c6401e7f6bf6e0af"/><file name="loader.gif" hash="edf214475c8e79574dac3687926fc62b"/></dir></dir><file name="oro_style.css" hash="fd0609bb04a1f6748c06dd17a2946a54"/></dir></dir></dir></target></contents>
16
  <compatible/>
17
  <dependencies><required><php><min>5.2.13</min><max>5.6.0</max></php></required></dependencies>
18
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Oro_Api</name>
4
+ <version>1.2.2.0</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>2015-09-17</date>
14
+ <time>16:22:10</time>
15
+ <contents><target name="magecommunity"><dir name="Oro"><dir name="Api"><dir name="Helper"><file name="Data.php" hash="ab7e20ec5a9d0893fe0ea6caf3f8872d"/></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="Address"><dir name="Api"><file name="V2.php" hash="d78fb25439d4c4f172f8ff49dc24439d"/></dir><file name="Api.php" hash="bc68a17a8b3f4ef84d4887c9bbe148f0"/></dir><dir name="Api"><file name="V2.php" hash="89fc6f16e7f452438d4927669ea0f0de"/></dir><file name="Api.php" hash="36e09efd92d3ecb1d4dc833f3c259ad3"/></dir><dir name="Newsletter"><dir name="Subscriber"><dir name="Api"><file name="V2.php" hash="7b18db294f86ccf841a95aa7b7e656af"/></dir><file name="Api.php" hash="ac35ba0bb921258495149509fdb1b66e"/></dir></dir><dir name="Observer"><dir name="Crm"><file name="Controller.php" hash="7b3ec12f8934af2cb97ee21d7cd1c903"/></dir><dir name="Sales"><file name="Order.php" hash="81e2f8992f57a406130c893072365782"/></dir></dir><file name="Observer.php" hash="cf5202298ae9319e731ef8b5845a36a1"/><dir name="Ping"><file name="V2.php" hash="0fa10110ecb67d32079c5530a979c55a"/></dir><file name="Ping.php" hash="5a12b76b0e1f99b3fa096b1436f6a42f"/><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="2f56b71f65af75ec4353471fc6ea13e7"/></dir><dir name="Quote"><dir name="Api"><file name="V2.php" hash="4e8ba0ed7757110c4eae1d239b2adf76"/></dir><file name="Api.php" hash="93de572d94cf36b39082cdfcde98c96c"/></dir></dir><dir name="Website"><dir name="Api"><file name="V2.php" hash="aa9ab487ab696216d287be68dac262a6"/></dir><file name="Api.php" hash="a7cc7c6b06873e6d63b5d393cd50fd9b"/></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="3cd40b74eafe18fc6885ce871e305c5c"/></dir></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="b3298b50c6f9556d36055f01cdfeb180"/><file name="api.xml" hash="be5cbe077e7485a503202da5f4457a14"/><file name="config.xml" hash="979297bce6a9c40f72f6d9097107c000"/><file name="system.xml" hash="602816f300ad544e9bf4f82d752a092c"/><file name="workflow.xml" hash="40e7f46d53156e77b1d5498769e8f6cc"/><file name="wsdl.xml" hash="a02b318b87b39b821101a8d541165f2c"/><file name="wsi.xml" hash="b419b26f3523c0366ed80528bdbc7de6"/></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="check.phtml" hash="142e380fa9eae5c0b7f233d519d13dc7"/><file name="login_styles.phtml" hash="a89d5d690702cf8296d76923b85e4ced"/><file name="page.phtml" hash="e9359e49019bbaa6e8b77e2a0ec458dd"/><file name="script.phtml" hash="89c3810165995c0ef6a0f5ad3b39f41f"/></dir></dir></dir></dir></dir></dir></dir></target><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="images"><dir name="oro"><file name="add_button_icon_dark.png" hash="01929b4351b537427035ba0f4df61689"/><file name="apply_button_icon.png" hash="4fc6fffbf943e82ea2b1a0022ec329e1"/><file name="error.png" hash="0caf3533e40e7f425d206803ef6e1876"/><file name="grid_sort_asc.gif" hash="8a86df764d4219dc0cf04f8529165cef"/><file name="grid_sort_desc.gif" hash="4f493deb94cb0eb0c6401e7f6bf6e0af"/><file name="loader.gif" hash="edf214475c8e79574dac3687926fc62b"/></dir></dir><file name="oro_style.css" hash="fd0609bb04a1f6748c06dd17a2946a54"/></dir></dir></dir></target></contents>
16
  <compatible/>
17
  <dependencies><required><php><min>5.2.13</min><max>5.6.0</max></php></required></dependencies>
18
  </package>