svn commit: r565839 - in /ofbiz/trunk/applications/ecommerce: config/EcommerceUiLabels.properties webapp/ecommerce/order/paymentinformation.ftl

[rayb-2]

Author: rayb
Date: Tue Aug 14 10:12:21 2007
New Revision: 565839

URL: http://svn.apache.org/viewvc?view=rev&rev=565839
Log:
Javascript fix and simple if/else tidy up. Thanks to Wickersheimer Jeremy for patch : OFBIZ-1201

Modified:
    ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.properties
    ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/paymentinformation.ftl

Modified: ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.properties?view=diff&rev=565839&r1=565838&r2=565839
==============================================================================
--- ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.properties (original)
+++ ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.properties Tue Aug 14 10:12:21 2007
@@ -69,6 +69,7 @@
 AccountingPayWithWorldPay=Pay With WorldPay
 AccountingPaymentInformation=Payment Information
 AccountingPaymentMethodInformation=Payment Method Information
+AccountingPaymentMethodTypeNotHandled=Payment method not handled paymentMethodTypeId :
 AccountingPaymentVia=Payment Via
 AccountingPhysicalCard=Physical Card
 AccountingRoutingNumber=Routing Number

Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/paymentinformation.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/paymentinformation.ftl?view=diff&rev=565839&r1=565838&r2=565839
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/paymentinformation.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/paymentinformation.ftl Tue Aug 14 10:12:21 2007
@@ -22,14 +22,14 @@
 <script language="JavaScript" type="text/javascript">
 function shipBillAddr() {
     <#if requestParameters.singleUsePayment?default("N") == "Y">
-      <#assign singleUse = "&amp;singleUsePayment=Y">
+      <#assign singleUse = "&singleUsePayment=Y">
     <#else>
       <#assign singleUse = "">
     </#if>
     if (document.billsetupform.useShipAddr.checked) {
-        window.location.replace("setPaymentInformation?createNew=Y&amp;addGiftCard=${requestParameters.addGiftCard?if_exists}&amp;paymentMethodTypeId=${paymentMethodTypeId?if_exists}&amp;useShipAddr=Y${singleUse}");
+        window.location.replace("setPaymentInformation?createNew=Y&addGiftCard=${requestParameters.addGiftCard?if_exists}&paymentMethodTypeId=${paymentMethodTypeId?if_exists}&useShipAddr=Y${singleUse}");
     } else {
-        window.location.replace("setPaymentInformation?createNew=Y&amp;addGiftCard=${requestParameters.addGiftCard?if_exists}&amp;paymentMethodTypeId=${paymentMethodTypeId?if_exists}${singleUse}");
+        window.location.replace("setPaymentInformation?createNew=Y&addGiftCard=${requestParameters.addGiftCard?if_exists}&paymentMethodTypeId=${paymentMethodTypeId?if_exists}${singleUse}");
     }
 }
 </script>
@@ -50,8 +50,7 @@
             <#else>
               <form method="post" action="<@ofbizUrl>enterCreditCardAndBillingAddress</@ofbizUrl>" name="${parameters.formNameValue}">
             </#if>
-          </#if>
-          <#if paymentMethodTypeId?if_exists == "EFT_ACCOUNT">
+          <#elseif paymentMethodTypeId?if_exists == "EFT_ACCOUNT">
             <#if eftAccount?has_content && postalAddress?has_content>
               <form method="post" action="<@ofbizUrl>changeEftAccountAndBillingAddress</@ofbizUrl>" name="${parameters.formNameValue}">
                 <input type="hidden" name="paymentMethodId" value="${eftAccount.paymentMethodId?if_exists}"/>
@@ -61,9 +60,10 @@
             <#else>
               <form method="post" action="<@ofbizUrl>enterEftAccountAndBillingAddress</@ofbizUrl>" name="${parameters.formNameValue}">
             </#if>
-          </#if>
-          <#if paymentMethodTypeId?if_exists == "GIFT_CARD"> <#--Don't know much how this is handled -->
+          <#elseif paymentMethodTypeId?if_exists == "GIFT_CARD"> <#--Don't know much how this is handled -->
             <form method="post" action="<@ofbizUrl>enterGiftCard</@ofbizUrl>" name="${parameters.formNameValue}">
+          <#else>
+            <div class="tabletext">${uiLabelMap.AccountingPaymentMethodTypeNotHandled} ${paymentMethodTypeId?if_exists}</div>
           </#if>
 
           <#if requestParameters.singleUsePayment?default("N") == "Y">