Merge remote-tracking branch 'remotes/dev/master'

Author: rgrebenchuk

CHANGELOG.md

@@ -1,4 +1,8 @@
-Current version 1.2.16 is compatible with OroCRM version 1.*
+Current version 1.2.17 is compatible with OroCRM version 1.*
+
+- fixed: https://github.com/oroinc/magento-orocrm-bridge/issues/13
+
+## Changelog for 1.2.16
 
 - fixed version on application config file
 

app/code/community/Oro/Api/Model/Observer/Crm/Controller.php

@@ -67,7 +67,7 @@ public function handleResponse(Varien_Event_Observer $observer)
                         . $session->getData('oro_success_url')
                         . '"}, 1000)</script>'
                     )->sendResponse();
-                    exit;
+                    return;
                 }
             }
 

app/code/community/Oro/Api/Model/Sales/Order/Api.php

@@ -209,6 +209,13 @@ protected function getOrderCollection()
                 array('shipping_firstname' => $shippingFirstnameField, 'shipping_lastname' => $shippingLastnameField)
             );
 
+        $orderCollection->join(
+            array('store' => 'core/store'),
+            'main_table.store_id = store.store_id',
+            array('website_id' => 'website_id')
+        );
+        $orderCollection->addFilterToMap('store_id', 'main_table.store_id');
+
         return $orderCollection;
     }
 

app/code/community/Oro/Api/controllers/Adminhtml/Oro/GatewayController.php

@@ -70,4 +70,12 @@ public function errorAction()
         $response->setBody($this->__('Gateway error.'));
         $response->setHttpResponseCode(400);
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function _isAllowed()
+    {
+        return true;
+    }
 }

app/code/community/Oro/Api/controllers/Adminhtml/Oro/SalesController.php

@@ -103,4 +103,12 @@ private function _checkCustomer($customerId)
 
         return (bool)$customer->getId();
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function _isAllowed()
+    {
+        return true;
+    }
 }

app/code/community/Oro/Api/etc/config.xml

@@ -20,7 +20,7 @@
 <config>
     <modules>
         <Oro_Api>
-            <version>1.2.16</version>
+            <version>1.2.18</version>
         </Oro_Api>
     </modules>
     <global>

var/connect/Oro_Api-1.2.16.0.tgz

@@ -1,5 +1,5 @@
 <_>
-   <form_key>59ONeBzjxaYkohs2</form_key>
+   <form_key>JJydtutwfipSlO40</form_key>
    <name>Oro_Api</name>
    <channel>community</channel>
    <version_ids>
@@ -9,7 +9,7 @@
    <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>
    <license>Open Software License (OSL 3.0)</license>
    <license_uri>http://opensource.org/licenses/osl-3.0.php</license_uri>
-   <version>1.2.16.0</version>
+   <version>1.2.18.0</version>
    <stability>stable</stability>
    <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>
    <authors>
@@ -40,7 +40,7 @@
             <max/>
          </max>
          <files>
-            <files>                                        </files>
+            <files>                                             </files>
          </files>
       </package>
       <extension>