You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by mr...@apache.org on 2015/11/21 15:37:26 UTC
svn commit: r1715533 - in
/ofbiz/branches/release14.12/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF:
actions/order/AnonymousTrail.groovy controller.xml
Author: mridulpathak
Date: Sat Nov 21 14:37:25 2015
New Revision: 1715533
URL: http://svn.apache.org/viewvc?rev=1715533&view=rev
Log:
[OFBIZ-6534] Same Billing Address generates an error. Continue button was generating error as well. Applying patch from OFBIZ-6534. Thanks Pierre Smits for reporting the issue. Applying fix from trunk r1715531. Also applying the relevant fix from trunk r1704227.
Modified:
ofbiz/branches/release14.12/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/AnonymousTrail.groovy
ofbiz/branches/release14.12/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml
Modified: ofbiz/branches/release14.12/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/AnonymousTrail.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/AnonymousTrail.groovy?rev=1715533&r1=1715532&r2=1715533&view=diff
==============================================================================
--- ofbiz/branches/release14.12/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/AnonymousTrail.groovy (original)
+++ ofbiz/branches/release14.12/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/AnonymousTrail.groovy Sat Nov 21 14:37:25 2015
@@ -34,7 +34,7 @@ if (cart.getShipmentMethodTypeId()) {
trailClassMap.shipOptions = "submenutextright";
}
-if (parameter.paymentMethodType || cart.getPaymentMethodIds() || cart.getPaymentMethodTypeIds()) {
+if (parameters.paymentMethodType || cart.getPaymentMethodIds() || cart.getPaymentMethodTypeIds()) {
context.billing = "Y";
trailClassMap.shipOptions = "submenutext";
trailClassMap.paymentType = "submenutextright";
Modified: ofbiz/branches/release14.12/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml?rev=1715533&r1=1715532&r2=1715533&view=diff
==============================================================================
--- ofbiz/branches/release14.12/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml (original)
+++ ofbiz/branches/release14.12/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml Sat Nov 21 14:37:25 2015
@@ -24,7 +24,7 @@ under the License.
<errorpage>/error/error.jsp</errorpage>
<handler name="java" type="request" class="org.ofbiz.webapp.event.JavaEventHandler"/>
- <handler name="bsf" type="request" class="org.ofbiz.webapp.event.BsfEventHandler"/>
+ <handler name="groovy" type="request" class="org.ofbiz.webapp.event.GroovyEventHandler"/>
<handler name="soap" type="request" class="org.ofbiz.webapp.event.SOAPEventHandler"/>
<handler name="service" type="request" class="org.ofbiz.webapp.event.ServiceEventHandler"/>
<handler name="service-multi" type="request" class="org.ofbiz.webapp.event.ServiceMultiEventHandler"/>
@@ -437,7 +437,7 @@ under the License.
<request-map uri="processPaymentSettings">
<security https="true" auth="false"/>
- <event type="bsf" invoke="component://ecommerce/script/org/ofbiz/ecommerce/order/ProcessPaymentSettings.groovy"/>
+ <event type="groovy" path="component://ecommerce/script/org/ofbiz/ecommerce/order/ProcessPaymentSettings.groovy"/>
<response name="success" type="request" value="reviewOrder"/>
<response name="error" type="view" value="paymentinformation"/>
</request-map>
@@ -523,7 +523,7 @@ under the License.
<request-map uri="quickAnonAddCreditCardToCart">
<security https="true" auth="false"/>
- <event type="bsf" invoke="component://ecommerce/script/org/ofbiz/ecommerce/order/ProcessPaymentSettings.groovy"/>
+ <event type="groovy" path="component://ecommerce/script/org/ofbiz/ecommerce/order/ProcessPaymentSettings.groovy"/>
<response name="success" type="view" value="quickAnonCcInfo"/>
<response name="error" type="view" value="quickAnonCcInfo"/>
</request-map>
@@ -537,21 +537,21 @@ under the License.
<request-map uri="quickAnonAddEftAccountToCart">
<security https="true" auth="false"/>
- <event type="bsf" invoke="component://ecommerce/script/org/ofbiz/ecommerce/order/ProcessPaymentSettings.groovy"/>
+ <event type="groovy" path="component://ecommerce/script/org/ofbiz/ecommerce/order/ProcessPaymentSettings.groovy"/>
<response name="success" type="view" value="quickAnonEftInfo"/>
<response name="error" type="view" value="quickAnonEftInfo"/>
</request-map>
<request-map uri="quickAnonEnterExtOffline">
<security https="true" auth="false"/>
- <event type="bsf" invoke="component://ecommerce/script/org/ofbiz/ecommerce/order/ProcessPaymentSettings.groovy"/>
+ <event type="groovy" path="component://ecommerce/script/org/ofbiz/ecommerce/order/ProcessPaymentSettings.groovy"/>
<response name="success" type="view" value="quickAnonOrderReview"/>
<response name="error" type="view" value="quickAnonOrderReview"/>
</request-map>
<request-map uri="quickAnonAddGiftCardToCart">
<security https="true" auth="false"/>
- <event type="bsf" invoke="component://ecommerce/script/org/ofbiz/ecommerce/order/ProcessPaymentSettings.groovy"/>
+ <event type="groovy" path="component://ecommerce/script/org/ofbiz/ecommerce/order/ProcessPaymentSettings.groovy"/>
<response name="success" type="request" value="quickAnonGcInfo"/>
<response name="error" type="view" value="quickAnonGcInfo"/>
</request-map>