svn commit: r1856918 - in /ofbiz/ofbiz-plugins/branches/release18.12: ./ ecommerce/template/cart/ShowCart.ftl ecommerce/webapp/ecommerce/WEB-INF/controller.xml

Author: jleroux
Date: Thu Apr  4 12:19:18 2019
New Revision: 1856918

URL: http://svn.apache.org/viewvc?rev=1856918&view=rev
Log:
"Applied fix from plugins for revision: 1856917  "
------------------------------------------------------------------------
r1856917 | jleroux | 2019-04-04 14:17:35 +0200 (jeu. 04 avr. 2019) | 12 lignes

Fixed: Unable to create new quote from cart at eCommerce store
(OFBIZ-10886)

Actually we decided that an external user should not be able to create quotes
but only requests for quote.

This disables creating quotes from the ecommerce. An authorised user can still
do the same from the backedn (order manager)

Thanks: Sanjay Yadav for initial report, Sasikant Biswal for trying, Pierre for
mentioning that this should not be open to external users and Pawan Verma for
the fix
------------------------------------------------------------------------

Modified:
    ofbiz/ofbiz-plugins/branches/release18.12/   (props changed)
    ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/template/cart/ShowCart.ftl
    ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/webapp/ecommerce/WEB-INF/controller.xml

Propchange: ofbiz/ofbiz-plugins/branches/release18.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Apr  4 12:19:18 2019
@@ -10,4 +10,4 @@
 /ofbiz/branches/json-integration-refactoring/plugins:1634077-1635900
 /ofbiz/branches/multitenant20100310/plugins:921280-927264
 /ofbiz/branches/release13.07/plugins:1547657
-/ofbiz/ofbiz-plugins/trunk:1851002,1851009,1851068,1851135,1851139-1851140,1851185,1851316,1851885,1852988,1853904,1854684,1855082,1855084,1856212,1856802
+/ofbiz/ofbiz-plugins/trunk:1851002,1851009,1851068,1851135,1851139-1851140,1851185,1851316,1851885,1852988,1853904,1854684,1855082,1855084,1856212,1856802,1856917

Modified: ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/template/cart/ShowCart.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/template/cart/ShowCart.ftl?rev=1856918&r1=1856917&r2=1856918&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/template/cart/ShowCart.ftl (original)
+++ ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/template/cart/ShowCart.ftl Thu Apr  4 12:19:18 2019
@@ -555,9 +555,7 @@ under the License.
                 <#if sessionAttributes.userLogin?has_content && sessionAttributes.userLogin.userLoginId != "anonymous">
                   <a href="<@ofbizUrl>createCustRequestFromCart</@ofbizUrl>" class="btn btn-outline-secondary btn-sm">
                     ${uiLabelMap.OrderCreateCustRequestFromCart}
-                  </a>&nbsp;&nbsp;&nbsp;&nbsp;
-                  <a href="<@ofbizUrl>createQuoteFromCart</@ofbizUrl>" class="btn btn-outline-secondary btn-sm">
-                    ${uiLabelMap.OrderCreateQuoteFromCart}</a>&nbsp;&nbsp;
+                  </a>
                 <#else>
                   ${uiLabelMap.OrderYouMust}
                   <a href="<@ofbizUrl>checkLogin/showcart</@ofbizUrl>" class="btn btn-outline-secondary btn-sm">

Modified: ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/webapp/ecommerce/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/webapp/ecommerce/WEB-INF/controller.xml?rev=1856918&r1=1856917&r2=1856918&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/webapp/ecommerce/WEB-INF/controller.xml (original)
+++ ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/webapp/ecommerce/WEB-INF/controller.xml Thu Apr  4 12:19:18 2019
@@ -1553,12 +1553,6 @@ under the License.
         <response name="success" type="request" value="showcart"/>
         <response name="error" type="request" value="showcart"/>
     </request-map>
-    <request-map uri="createQuoteFromCart">
-        <security https="true" auth="true"/>
-        <event type="java" path="org.apache.ofbiz.order.shoppingcart.ShoppingCartEvents" invoke="createQuoteFromCart"/>
-        <response name="success" type="request" value="showcart"/>
-        <response name="error" type="request" value="showcart"/>
-    </request-map>
     <request-map uri="createCustRequestFromShoppingList">
         <security https="true" auth="true"/>
         <event type="service" invoke="createCustRequestFromShoppingList"/>