svn commit: r433418 - in /incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order: checkoutoptions.ftl checkoutpayment.ftl

[sichen]

Author: sichen
Date: Mon Aug 21 16:09:35 2006
New Revision: 433418

URL: http://svn.apache.org/viewvc?rev=433418&view=rev
Log:
Fix some bugs with the ecommerce billing account page

Modified:
    incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/checkoutoptions.ftl
    incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/checkoutpayment.ftl

Modified: incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/checkoutoptions.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/checkoutoptions.ftl?rev=433418&r1=433417&r2=433418&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/checkoutoptions.ftl (original)
+++ incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/checkoutoptions.ftl Mon Aug 21 16:09:35 2006
@@ -449,19 +449,19 @@
                       <#assign availableAmount = billingAccount.accountLimit?double - billingAccount.accountBalance?double>
                       <tr>
                         <td align="left" valign="top" width="1%">
-                          <input type="radio" onClick="javascript:toggleBillingAccount(this);" name="billingAccountId" value="${billingAccount.billingAccountId}" <#if (billingAccount.billingAccountId == selectedBillingAccount?default(""))>checked="checked"</#if>/>
+                          <input type="radio" onClick="javascript:toggleBillingAccount(this);" name="billingAccountId" value="${billingAccount.billingAccountId}" <#if (billingAccount.billingAccountId == selectedBillingAccountId?default(""))>checked="checked"</#if>/>
                         </td>
                         <td align="left" valign="top" width="99%">
                           <div class="tabletext">
                            ${billingAccount.description?default("Bill Account")} [${uiLabelMap.OrderNbr}<b>${billingAccount.billingAccountId}</b>]&nbsp;(<@ofbizCurrency amount=availableAmount isoCode=billingAccount.accountCurrencyUomId?default(shoppingCart.getCurrency())/>)<br/>
-                           <b>${uiLabelMap.OrderBillUpTo}:</b> <input type="text" size="8" class="inputBox" name="amount_${billingAccount.billingAccountId}" value="${availableAmount?double?string("##0.00")}" <#if !(billingAccount.billingAccountId == selectedBillingAccount?default(""))>disabled</#if>>
+                           <b>${uiLabelMap.OrderBillUpTo}:</b> <input type="text" size="8" class="inputBox" name="amount_${billingAccount.billingAccountId}" value="${availableAmount?double?string("##0.00")}" <#if !(billingAccount.billingAccountId == selectedBillingAccountId?default(""))>disabled</#if>>
                           </div>
                         </td>
                       </tr>
                     </#list>
                     <tr>
                       <td align="left" valign="top" width="1%">
-                        <input type="radio" onClick="javascript:toggleBillingAccount(this);" name="billingAccountId" value="_NA" <#if (selectedBillingAccount?default("") == "N")>checked="checked"</#if>/>
+                        <input type="radio" onClick="javascript:toggleBillingAccount(this);" name="billingAccountId" value="_NA_" <#if (selectedBillingAccountId?default("") == "N")>checked="checked"</#if>/>
                         <input type="hidden" name="_NA_amount" value="0.00"/>
                       </td>
                       <td align="left" valign="top" width="99%">

Modified: incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/checkoutpayment.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/checkoutpayment.ftl?rev=433418&r1=433417&r2=433418&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/checkoutpayment.ftl (original)
+++ incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/checkoutpayment.ftl Mon Aug 21 16:09:35 2006
@@ -244,12 +244,12 @@
                   <#assign availableAmount = billingAccount.accountLimit?double - billingAccount.accountBalance?double>
                   <tr>
                     <td align="left" valign="top" width="1%" nowrap>
-                      <input type="radio" onClick="javascript:toggleBillingAccount(this);" name="billingAccountId" value="${billingAccount.billingAccountId}" <#if (billingAccount.billingAccountId == selectedBillingAccount?default(""))>checked</#if>>
+                      <input type="radio" onClick="javascript:toggleBillingAccount(this);" name="billingAccountId" value="${billingAccount.billingAccountId}" <#if (billingAccount.billingAccountId == selectedBillingAccountId?default(""))>checked</#if>>
                     </td>
                     <td align="left" valign="top" width="99%" nowrap>
                       <div class="tabletext">
                        ${billingAccount.description?default("Bill Account")} [${uiLabelMap.OrderNbr}<b>${billingAccount.billingAccountId}</b>]&nbsp;(<@ofbizCurrency amount=availableAmount isoCode=billingAccount.accountCurrencyUomId?default(cart.getCurrency())/>)<br/>
-                       <b>${uiLabelMap.OrderBillUpTo}:</b> <input type="text" size="8" class="inputBox" name="amount_${billingAccount.billingAccountId}" value="${availableAmount?double?string("##0.00")}" <#if !(billingAccount.billingAccountId == selectedBillingAccount?default(""))>disabled</#if>>
+                       <b>${uiLabelMap.OrderBillUpTo}:</b> <input type="text" size="8" class="inputBox" name="amount_${billingAccount.billingAccountId}" value="${availableAmount?double?string("##0.00")}" <#if !(billingAccount.billingAccountId == selectedBillingAccountId?default(""))>disabled</#if>>
                       </div>
                     </td>
                     <td>&nbsp;</td>
@@ -257,7 +257,7 @@
                 </#list>
                 <tr>
                   <td align="left" valign="top" width="1%" nowrap>
-                    <input type="radio" onClick="javascript:toggleBillingAccount(this);" name="billingAccountId" value="_NA" <#if (selectedBillingAccount?default("") == "N")>checked</#if>>
+                    <input type="radio" onClick="javascript:toggleBillingAccount(this);" name="billingAccountId" value="_NA_" <#if (selectedBillingAccountId?default("") == "N")>checked</#if>>
                     <input type="hidden" name="_NA_amount" value="0.00">
                   </td>
                   <td align="left" valign="top" width="99%" nowrap>