svn commit: r1665193 - /ofbiz/branches/release14.12/applications/product/webapp/catalog/WEB-INF/actions/store/EditProductStorePaySetup.groovy

[as...@apache.org]

Author: ashish
Date: Mon Mar  9 11:33:36 2015
New Revision: 1665193

URL: http://svn.apache.org/r1665193
Log:
Providing fix for the issue reported by Sebastian on jira issue OFBIZ-5893. 
===========================================================
Sebastian Wachinger commented on OFBIZ-5893:

Now we have the issue that it is no longer possible to set up, edit or delete *Payment Settings for PayPal* on _catalog/control/EditProductStorePaySetup?productStoreId=9000_
These actions render a lengthy error message referring to _applications/product/webapp/catalog/WEB-INF/actions/store/EditProductStorePaySetup.groovy_ ending with
bq. Cannot resolve which method to invoke for [null] due to overlapping prototypes between: [interface java.util.List] [interface java.util.Map])
As a quick fix we had to revert from revision 1647937 to be able to set up payment settings for PayPal.
===========================================================
Thanks Arun for providing the fix. 

Modified:
    ofbiz/branches/release14.12/applications/product/webapp/catalog/WEB-INF/actions/store/EditProductStorePaySetup.groovy

Modified: ofbiz/branches/release14.12/applications/product/webapp/catalog/WEB-INF/actions/store/EditProductStorePaySetup.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/product/webapp/catalog/WEB-INF/actions/store/EditProductStorePaySetup.groovy?rev=1665193&r1=1665192&r2=1665193&view=diff
==============================================================================
--- ofbiz/branches/release14.12/applications/product/webapp/catalog/WEB-INF/actions/store/EditProductStorePaySetup.groovy (original)
+++ ofbiz/branches/release14.12/applications/product/webapp/catalog/WEB-INF/actions/store/EditProductStorePaySetup.groovy Mon Mar  9 11:33:36 2015
@@ -82,6 +82,8 @@ if (!paymentMethodTypeId || !paymentServ
 }
 if (paymentServiceTypeEnumId == "PRDS_PAY_EXTERNAL") {
     context.paymentCustomMethods = null;
-} else {
+} else if (customMethodsCond) { 
     context.paymentCustomMethods = from("CustomMethod").where(customMethodsCond).orderBy("description").queryList();
+} else {
+    context.paymentCustomMethods = from("CustomMethod").orderBy("description").queryList();
 }