Oro_Api - Version 1.1.4.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.4.3
Comparing to
See all releases


Code changes from version 1.1.4.1 to 1.1.4.3

Files changed (5) hide show
  1. app/code/community/Oro/Api/Model/Observer/Crm/Controller.php +7 -0
  2. app/code/community/Oro/Api/controllers/Adminhtml/Oro/SalesController.php +28 -0
  3. app/code/community/Oro/Api/etc/workflow.xml +3 -0
  4. package.xml +5 -5
  5. skin/adminhtml/default/default/oro_style.css +5 -0
app/code/community/Oro/Api/Model/Observer/Crm/Controller.php CHANGED
@@ -87,6 +87,13 @@ class Oro_Api_Model_Observer_Crm_Controller
87
  $this->_insertBlock('oro_check_script', $layout);
88
 
89
  if (Mage::helper('oro_api')->isOroRequest()) {
 
 
 
 
 
 
 
90
  if (($contentBlock = $layout->getBlock('content')) instanceof Mage_Adminhtml_Block_Sales_Order_Create) {
91
  $contentBlock->removeButton('reset');
92
 
87
  $this->_insertBlock('oro_check_script', $layout);
88
 
89
  if (Mage::helper('oro_api')->isOroRequest()) {
90
+ // Remove back button on Manage Shopping Cart of Customer if it's rendered in Oro Request.
91
+ if (class_exists('Enterprise_Checkout_Block_Adminhtml_Manage') &&
92
+ ($manageBlock = $layout->getBlock('ID')) instanceof Enterprise_Checkout_Block_Adminhtml_Manage
93
+ ) {
94
+ $manageBlock->removeButton('back');
95
+ }
96
+
97
  if (($contentBlock = $layout->getBlock('content')) instanceof Mage_Adminhtml_Block_Sales_Order_Create) {
98
  $contentBlock->removeButton('reset');
99
 
app/code/community/Oro/Api/controllers/Adminhtml/Oro/SalesController.php CHANGED
@@ -18,6 +18,34 @@
18
  class Oro_Api_Adminhtml_Oro_SalesController
19
  extends Mage_Adminhtml_Controller_Action
20
  {
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
21
  public function newOrderAction()
22
  {
23
  $quote = false;
18
  class Oro_Api_Adminhtml_Oro_SalesController
19
  extends Mage_Adminhtml_Controller_Action
20
  {
21
+ public function checkoutAction()
22
+ {
23
+ $quote = false;
24
+ $session = Mage::getSingleton('adminhtml/session_quote');
25
+ $session->clear();
26
+
27
+ $quoteId = $this->getRequest()->getParam('quote');
28
+ if (null !== $quoteId) {
29
+ $quote = $this->_getQuoteById($quoteId);
30
+ }
31
+
32
+ $customerId = $this->getRequest()->getParam('customer');
33
+ if (null !== $customerId && $this->_checkCustomer($customerId)) {
34
+ $session->setQuoteId(null);
35
+ $session->setCustomerId((int)$customerId);
36
+ } elseif (false !== $quote) {
37
+ $customerId = (int)$quote->getCustomerId();
38
+
39
+ $session->setStoreId($quote->getStoreId());
40
+ $session->setQuoteId($quote->getId());
41
+ $session->setCustomerId($customerId);
42
+ } else {
43
+ return $this->_redirect('*/oro_gateway/error');
44
+ }
45
+
46
+ return $this->_redirect('*/checkout/index', array('customer' => $customerId));
47
+ }
48
+
49
  public function newOrderAction()
50
  {
51
  $quote = false;
app/code/community/Oro/Api/etc/workflow.xml CHANGED
@@ -3,4 +3,7 @@
3
  <oro_sales_new_order>
4
  <end_point_action>adminhtml_sales_order_create_save</end_point_action>
5
  </oro_sales_new_order>
 
 
 
6
  </config>
3
  <oro_sales_new_order>
4
  <end_point_action>adminhtml_sales_order_create_save</end_point_action>
5
  </oro_sales_new_order>
6
+ <oro_sales_checkout>
7
+ <end_point_action>adminhtml_sales_order_create_save</end_point_action>
8
+ </oro_sales_checkout>
9
  </config>
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Oro_Api</name>
4
- <version>1.1.4.1</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-06-11</date>
14
- <time>12:55:56</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="ae6c98e07ba8c175a9ef22c40bde502b"/></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="263438faf4af9fd4fff6e81ac9f006ff"/></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="88705771d0f78063c695e39e4c5f1af9"/><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="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="f6b8ef21733eb76e70deb5eb4cf33a30"/></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.4.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-11-14</date>
14
+ <time>13:25:30</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="4b3119af0f93297cb3b3fcb527ffc113"/></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="263438faf4af9fd4fff6e81ac9f006ff"/></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="3cd40b74eafe18fc6885ce871e305c5c"/></dir></dir></dir><dir name="etc"><file name="api.xml" hash="2ee90b80f4d29ab73b3517a3d19e7aa3"/><file name="config.xml" hash="88705771d0f78063c695e39e4c5f1af9"/><file name="workflow.xml" hash="40e7f46d53156e77b1d5498769e8f6cc"/><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="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>
skin/adminhtml/default/default/oro_style.css CHANGED
@@ -198,6 +198,11 @@ dl.accordion dt, .entry-edit .entry-edit-head, .create-order-sidebar-block .head
198
  height: 16px;
199
  }
200
 
 
 
 
 
 
201
  .login-container .legal {
202
  display: none;
203
  }
198
  height: 16px;
199
  }
200
 
201
+ .login-form .form-buttons a.left {
202
+ /* forgot password link */
203
+ display: none;
204
+ }
205
+
206
  .login-container .legal {
207
  display: none;
208
  }