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

oroinc · Oct 30, 2017 · 8135184 · 8135184
2 parents 9492a97 + d29c773
commit 8135184
Show file tree

Hide file tree

Showing 11 changed files with 37 additions and 10 deletions.
diff --git a/CHANGELOG.md b/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
 

diff --git a/app/code/community/Oro/Api/Model/Observer/Crm/Controller.php b/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;
                 }
             }
 

diff --git a/app/code/community/Oro/Api/Model/Sales/Order/Api.php b/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;
     }
 

diff --git a/app/code/community/Oro/Api/controllers/Adminhtml/Oro/GatewayController.php b/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;
+    }
 }
diff --git a/app/code/community/Oro/Api/controllers/Adminhtml/Oro/SalesController.php b/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;
+    }
 }
diff --git a/app/code/community/Oro/Api/etc/config.xml b/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>

diff --git a/var/connect/Oro_Api-1.2.16.0.tgz b/var/connect/Oro_Api-1.2.16.0.tgz
diff --git a/var/connect/Oro_Api-1.2.17.0.tgz b/var/connect/Oro_Api-1.2.17.0.tgz
diff --git a/var/connect/Oro_Api-1.2.18.0.tgz b/var/connect/Oro_Api-1.2.18.0.tgz
diff --git a/var/connect/Oro_Api.xml b/var/connect/Oro_Api.xml
@@ -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>

diff --git a/var/connect/package.xml b/var/connect/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package>
     <name>Oro_Api</name>
-    <version>1.2.16.0</version>
+    <version>1.2.18.0</version>
     <stability>stable</stability>
     <license uri="http://opensource.org/licenses/osl-3.0.php">Open Software License (OSL 3.0)</license>
     <channel>community</channel>
@@ -10,9 +10,9 @@
     <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>
     <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><author><name>Oro, Inc</name><user>orocrm</user><email>info@orocrm.com</email></author></authors>
-    <date>2017-09-08</date>
-    <time>12:13:11</time>
-    <contents><target name="magecommunity"><dir name="Oro"><dir name="Api"><dir name="Helper"><file name="Data.php" hash="3f60d322fbdeea0f751addadc3d0b10e"/></dir><dir name="Model"><dir name="Admin"><file name="Redirectpolicy.php" hash="6d266848220d82ee2a8ef037755be953"/></dir><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="Directory"><dir name="Region"><dir name="Api"><file name="V2.php" hash="58db6ac2958e08cc1d5d35b7d6aed492"/></dir><file name="Api.php" hash="627b8ec0cf600bc3d1527728fff9e747"/></dir></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="223e546950e0f7c23dfcc567e44893a3"/><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><file name="Setup.php" hash="4186114dd1317db2c98d54089d7edf89"/><dir name="Wishlist"><dir name="Status"><file name="Collection.php" hash="c700fba4fcdf3c229cac1636c09e6d63"/></dir><file name="Status.php" hash="2af51c733fd1a967d0c540b7d8db9f76"/></dir></dir><dir name="Sales"><dir name="Order"><dir name="Api"><file name="V2.php" hash="0621bd68c420feb8000dae6861c49369"/></dir><file name="Api.php" hash="373f0e839ca16709b0bc7899db92b9db"/></dir><dir name="Quote"><dir name="Api"><file name="V2.php" hash="4e8ba0ed7757110c4eae1d239b2adf76"/></dir><file name="Api.php" hash="bc8a696845efa612d52f06f7e7c27c08"/><file name="Item.php" hash="991c52036036b348b7385f618ee16b67"/></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="db30a7c3c9fbd7ff5fa6dcf7ba4c594f"/><dir name="Item"><dir name="Api"><file name="V2.php" hash="43a919dae8dd432e211878a39ba3f4a2"/></dir><file name="Api.php" hash="8d5d856ea533b9b122c96d0bef32861b"/></dir><file name="Observer.php" hash="475495be5a367730dfdf1ffbc20b54fa"/><dir name="Status"><dir name="Api"><file name="V2.php" hash="37a227a428a277ace34cbb25d30e92c2"/></dir><file name="Api.php" hash="25789253dbd23561aabaf62aba3a982c"/></dir><file name="Status.php" hash="0fe5e02ae58a405adbc7b69a282acdab"/></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="1afe878afc0f501d5d65487a354f31e1"/><file name="config.xml" hash="d835046cf7bd9ea5ccc074977a6c4487"/><file name="system.xml" hash="d42daecd30f4b9a1de9952fa1041bfbe"/><file name="workflow.xml" hash="40e7f46d53156e77b1d5498769e8f6cc"/><file name="wsdl.xml" hash="a04173786fa06dcba5ea6f4658ba5b50"/><file name="wsi.xml" hash="4522ce764cde2c134e0e7350fc8ebbd7"/></dir><dir name="sql"><dir name="oro_api_setup"><file name="install-1.2.5.php" hash="d7c5d2ef1ebfd4f6084aa48d318fe307"/><file name="upgrade-1.2.5.0-1.2.5.1.php" hash="7946d51070254f4230c90da2e97801e8"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Oro_Api.xml" hash="9e6e71fac0eecdb2eb3d5589a19aa60e"/></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="90e9457b48af47efd91ee80114ca636e"/></dir></dir></dir></target></contents>
+    <date>2017-10-19</date>
+    <time>17:15:10</time>
+    <contents><target name="magecommunity"><dir name="Oro"><dir name="Api"><dir name="Helper"><file name="Data.php" hash="3f60d322fbdeea0f751addadc3d0b10e"/></dir><dir name="Model"><dir name="Admin"><file name="Redirectpolicy.php" hash="620f29cae6d37275ebd92fe661a2d0ad"/></dir><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="Directory"><dir name="Region"><dir name="Api"><file name="V2.php" hash="58db6ac2958e08cc1d5d35b7d6aed492"/></dir><file name="Api.php" hash="627b8ec0cf600bc3d1527728fff9e747"/></dir></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="cbe4a5fb694656032e2adfd6a02c774b"/></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="223e546950e0f7c23dfcc567e44893a3"/><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><file name="Setup.php" hash="4186114dd1317db2c98d54089d7edf89"/><dir name="Wishlist"><dir name="Status"><file name="Collection.php" hash="c700fba4fcdf3c229cac1636c09e6d63"/></dir><file name="Status.php" hash="2af51c733fd1a967d0c540b7d8db9f76"/></dir></dir><dir name="Sales"><dir name="Order"><dir name="Api"><file name="V2.php" hash="0621bd68c420feb8000dae6861c49369"/></dir><file name="Api.php" hash="5024f1e8d9ffc1f7d39ad0f14a5b0a4d"/></dir><dir name="Quote"><dir name="Api"><file name="V2.php" hash="4e8ba0ed7757110c4eae1d239b2adf76"/></dir><file name="Api.php" hash="bc8a696845efa612d52f06f7e7c27c08"/><file name="Item.php" hash="991c52036036b348b7385f618ee16b67"/></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="db30a7c3c9fbd7ff5fa6dcf7ba4c594f"/><dir name="Item"><dir name="Api"><file name="V2.php" hash="43a919dae8dd432e211878a39ba3f4a2"/></dir><file name="Api.php" hash="8d5d856ea533b9b122c96d0bef32861b"/></dir><file name="Observer.php" hash="475495be5a367730dfdf1ffbc20b54fa"/><dir name="Status"><dir name="Api"><file name="V2.php" hash="37a227a428a277ace34cbb25d30e92c2"/></dir><file name="Api.php" hash="25789253dbd23561aabaf62aba3a982c"/></dir><file name="Status.php" hash="0fe5e02ae58a405adbc7b69a282acdab"/></dir></dir><dir name="controllers"><dir name="Adminhtml"><dir name="Oro"><file name="GatewayController.php" hash="051e824eb93536c452f11703a4f55314"/><file name="SalesController.php" hash="cd67b5bc4fc3d64e1a466dac8607263b"/></dir></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="b3298b50c6f9556d36055f01cdfeb180"/><file name="api.xml" hash="1afe878afc0f501d5d65487a354f31e1"/><file name="config.xml" hash="532d6a1ce754690945af53c9bf422b3f"/><file name="system.xml" hash="d42daecd30f4b9a1de9952fa1041bfbe"/><file name="workflow.xml" hash="40e7f46d53156e77b1d5498769e8f6cc"/><file name="wsdl.xml" hash="a04173786fa06dcba5ea6f4658ba5b50"/><file name="wsi.xml" hash="4522ce764cde2c134e0e7350fc8ebbd7"/></dir><dir name="sql"><dir name="oro_api_setup"><file name="install-1.2.5.php" hash="d7c5d2ef1ebfd4f6084aa48d318fe307"/><file name="upgrade-1.2.5.0-1.2.5.1.php" hash="7946d51070254f4230c90da2e97801e8"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Oro_Api.xml" hash="9e6e71fac0eecdb2eb3d5589a19aa60e"/></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="90e9457b48af47efd91ee80114ca636e"/></dir></dir></dir></target></contents>
     <compatible/>
     <dependencies><required><php><min>5.2.13</min><max>5.6.99</max></php></required></dependencies>
 </package>