svn commit: r1030521 - in /ofbiz/trunk/specialpurpose/ecommerce: config/EcommerceUiLabels.xml webapp/ecommerce/order/checkoutpayment.ftl

[erwan]

Author: erwan
Date: Wed Nov  3 16:34:18 2010
New Revision: 1030521

URL: http://svn.apache.org/viewvc?rev=1030521&view=rev
Log:
Adding new uiLabels for billingAccount information in eCommerce (limit and 
available amount)

Modified:
    ofbiz/trunk/specialpurpose/ecommerce/config/EcommerceUiLabels.xml
    
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutpayment.ftl

Modified: ofbiz/trunk/specialpurpose/ecommerce/config/EcommerceUiLabels.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/config/EcommerceUiLabels.xml?rev=1030521&r1=1030520&r2=1030521&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/config/EcommerceUiLabels.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/config/EcommerceUiLabels.xml Wed Nov  
3 16:34:18 2010
@@ -266,6 +266,10 @@
         <value xml:lang="en">Article Name</value>
         <value xml:lang="th">ชื่อบทความ</value>
     </property>
+    <property key="EcommerceAvailable">
+        <value xml:lang="en">Available:</value>
+        <value xml:lang="fr">Disponible :</value>
+    </property>
     <property key="EcommerceAssignItems">
         <value xml:lang="da">Tildel emne</value>
         <value xml:lang="en">Assign Items</value>
@@ -1552,6 +1556,10 @@
         <value xml:lang="th">ยาว</value>
         <value xml:lang="zh">长度</value>
     </property>
+    <property key="EcommerceLimit">
+        <value xml:lang="en">Limit:</value>
+        <value xml:lang="fr">Limite :</value>
+    </property>
     <property key="EcommerceLinkCards">
         <value xml:lang="da">Sammenkæd kort</value>
         <value xml:lang="de">Karten verknüpfen</value>

Modified: 
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutpayment.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutpayment.ftl?rev=1030521&r1=1030520&r2=1030521&view=diff
==============================================================================
--- 
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutpayment.ftl 
(original)
+++ 
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutpayment.ftl 
Wed Nov  3 16:34:18 2010
@@ -172,7 +172,7 @@ function submitForm(form, mode, value) {
                         <#list billingAccountList as billingAccount>
                           <#assign availableAmount = 
billingAccount.accountBalance>
                           <#assign accountLimit = billingAccount.accountLimit>
-                          <option value="${billingAccount.billingAccountId}" 
<#if billingAccount.billingAccountId == 
selectedBillingAccountId?default("")>selected="selected"</#if>>${billingAccount.description?default("")}
 [${billingAccount.billingAccountId}] Available: <@ofbizCurrency 
amount=availableAmount isoCode=billingAccount.accountCurrencyUomId/> Limit: 
<@ofbizCurrency amount=accountLimit 
isoCode=billingAccount.accountCurrencyUomId/></option>
+                          <option value="${billingAccount.billingAccountId}" 
<#if billingAccount.billingAccountId == 
selectedBillingAccountId?default("")>selected="selected"</#if>>${billingAccount.description?default("")}
 [${billingAccount.billingAccountId}] ${uiLabelMap.EcommerceAvailable} 
<@ofbizCurrency amount=availableAmount 
isoCode=billingAccount.accountCurrencyUomId/> ${uiLabelMap.EcommerceLimit} 
<@ofbizCurrency amount=accountLimit 
isoCode=billingAccount.accountCurrencyUomId/></option>
                         </#list>
                     </select>
                     <label 
for="billingAccountId">${uiLabelMap.FormFieldTitle_billingAccountId}</label>