Author: mridulpathak
Date: Sat Nov 21 14:23:05 2015
New Revision: 1715531
URL: http://svn.apache.org/viewvc?rev=1715531&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.
Modified:
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/AnonymousTrail.groovy
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml
Modified:
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/AnonymousTrail.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/AnonymousTrail.groovy?rev=1715531&r1=1715530&r2=1715531&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/AnonymousTrail.groovy
(original)
+++
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/AnonymousTrail.groovy
Sat Nov 21 14:23:05 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/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml?rev=1715531&r1=1715530&r2=1715531&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml
(original)
+++
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml
Sat Nov 21 14:23:05 2015
@@ -437,7 +437,7 @@ under the License.
<request-map uri="processPaymentSettings">
<security https="true" auth="false"/>
- <event type="groovy"
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="groovy"
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="groovy"
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="groovy"
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="groovy"
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>
