Author: hansbak
Date: Mon Jan 24 07:51:55 2011
New Revision: 1062669
URL: http://svn.apache.org/viewvc?rev=1062669&view=rev
Log:
if ideal libs are missing make sure no error is shown in checkout
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckoutPayment.groovy
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckoutPayment.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckoutPayment.groovy?rev=1062669&r1=1062668&r2=1062669&view=diff
==============================================================================
---
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckoutPayment.groovy
(original)
+++
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckoutPayment.groovy
Mon Jan 24 07:51:55 2011
@@ -23,7 +23,6 @@ import org.ofbiz.entity.util.*;
import org.ofbiz.accounting.payment.*;
import org.ofbiz.party.contact.*;
import org.ofbiz.product.store.*;
-import org.ofbiz.accounting.thirdparty.ideal.IdealEvents;
cart = session.getAttribute("shoppingCart");
currencyUomId = cart.getCurrency();
@@ -58,7 +57,21 @@ if (billingAccountList) {
context.billingAccountList = billingAccountList;
}
-issuerList = IdealEvents.getIssuerList();
-if (issuerList) {
- context.issuerList = issuerList;
+checkIdealPayment = false;
+productStore = ProductStoreWorker.getProductStore(request);
+productStorePaymentSettingList =
productStore.getRelatedCache("ProductStorePaymentSetting");
+productStorePaymentSettingIter = productStorePaymentSettingList.iterator();
+while (productStorePaymentSettingIter.hasNext()) {
+ productStorePaymentSetting = productStorePaymentSettingIter.next();
+ if (productStorePaymentSetting.get("paymentMethodTypeId") == "EXT_IDEAL") {
+ checkIdealPayment = true;
+ }
+
}
+
+if (checkIdealPayment) {
+ issuerList =
org.ofbiz.accounting.thirdparty.ideal.IdealEvents.IdealEvents.getIssuerList();
+ if (issuerList) {
+ context.issuerList = issuerList;
+ }
+}
\ No newline at end of file
