Author: ashish
Date: Thu Nov 19 12:30:58 2009
New Revision: 882127
URL:
http://svn.apache.org/viewvc?rev=882127&view=revLog:
Conditional check for billingAccount amount. If no account limit is set with party's billing account then 0.00 will be shown on checkout page. Thanks Akash for the patch.
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/entry/billsettings.ftl
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/billsettings.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/billsettings.ftl?rev=882127&r1=882126&r2=882127&view=diff==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/billsettings.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/billsettings.ftl Thu Nov 19 12:30:58 2009
@@ -52,7 +52,11 @@
<option value=""></option>
<#list billingAccountList as billingAccount>
<#assign availableAmount = billingAccount.accountBalance?double>
- <#assign accountLimit = billingAccount.accountLimit?double>
+ <#if (billingAccount.accountLimit)?exists>
+ <#assign accountLimit = billingAccount.accountLimit?double />
+ <#else>
+ <#assign accountLimit = 0.00 />
+ </#if>
<option value="${billingAccount.billingAccountId}" <#if billingAccount.billingAccountId == selectedBillingAccountId?default("")>selected</#if>>${billingAccount.description?default("")} [${billingAccount.billingAccountId}] Available: <@ofbizCurrency amount=availableAmount isoCode=billingAccount.accountCurrencyUomId/> Limit: <@ofbizCurrency amount=accountLimit isoCode=billingAccount.accountCurrencyUomId/></option>
</#list>
</select>