svn commit: r572284 - in /ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce: WEB-INF/controller.xml customer/editcontactmech.ftl order/billsettings.ftl order/paymentinformation.ftl

Author: jleroux
Date: Mon Sep  3 04:04:12 2007
New Revision: 572284

URL: http://svn.apache.org/viewvc?rev=572284&view=rev
Log:
A patch from Bilgin Ibryam "Small bugs in ecommerce application" (https://issues.apache.org/jira/browse/OFBIZ-1156)
Add to do it by hand because of a conflict in paymentinformation.ftl


Modified:
    ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/WEB-INF/controller.xml
    ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl
    ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/order/billsettings.ftl
    ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/order/paymentinformation.ftl

Modified: ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/WEB-INF/controller.xml?rev=572284&r1=572283&r2=572284&view=diff
==============================================================================
--- ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/WEB-INF/controller.xml (original)
+++ ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/WEB-INF/controller.xml Mon Sep  3 04:04:12 2007
@@ -1475,7 +1475,7 @@
         <response name="customer" type="view" value="custsetting"/>
         <response name="shipping" type="view" value="shipsetting"/>
         <response name="options" type="view" value="optionsetting"/>
-        <response name="payment" type="view" value="billsetting"/>
+        <response name="payment" type="view" value="paymentoptions"/>
         <response name="addparty" type="request" value="calcShipping"/> <!-- this actually wants to go to a page to set another party, but for ecommerce we'll skip it and go to the beginning of the chain for review and checkout -->
         <response name="paysplit" type="view" value="checkoutpayment"/>
         <response name="sales" type="request" value="calcShipping"/>
@@ -1487,12 +1487,15 @@
         <response name="customer" type="view" value="custsetting"/>
         <response name="shipping" type="view" value="shipsetting"/>
         <response name="options" type="view" value="optionsetting"/>
-        <response name="payment" type="view" value="billsetting"/>
+        <response name="payment" type="view" value="paymentoptions"/>
         <response name="paysplit" type="view" value="checkoutpayment"/>
         <response name="sales" type="request" value="calcShipping"/>
         <response name="error" type="view" value="showcart"/>
     </request-map>
-    
+    <request-map uri="setBilling">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="billsetting"/>
+    </request-map>    
     <request-map uri="ListRequests">
         <security https="true" auth="true"/>
         <response name="success" type="view" value="ListRequests"/>

Modified: ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl?rev=572284&r1=572283&r2=572284&view=diff
==============================================================================
--- ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl (original)
+++ ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl Mon Sep  3 04:04:12 2007
@@ -160,7 +160,7 @@
       <td width="5">&nbsp;</td>
       <td width="74%">
         <input type="text" class='inputBox' size="12" maxlength="10" name="postalCode" value="${postalAddressData.postalCode?if_exists}">
-      </td>
+      *</td>
     </tr>
     <tr>
       <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.PartyCountry}</div></td>
@@ -229,6 +229,7 @@
     &nbsp;<a href="<@ofbizUrl>authview/${donePage}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonGoBack}</a>
   </#if>
 </#if>
+
 
 
 

Modified: ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/order/billsettings.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/order/billsettings.ftl?rev=572284&r1=572283&r2=572284&view=diff
==============================================================================
--- ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/order/billsettings.ftl (original)
+++ ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/order/billsettings.ftl Mon Sep  3 04:04:12 2007
@@ -379,7 +379,7 @@
         <#else>
           <#-- initial screen show a list of options -->
           <form method="post" action="<@ofbizUrl>finalizeOrder</@ofbizUrl>" name="billsetupform">
-            <input type="hidden" name="finalizeMode" value="payoption">
+            <input type="hidden" name="finalizeMode" value="payment">
             <input type="hidden" name="createNew" value="Y">
             <table width="100%" border="0" cellpadding="1" cellspacing="0">
               <#if productStorePaymentMethodTypeIdMap.GIFT_CARD?exists>

Modified: ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/order/paymentinformation.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/order/paymentinformation.ftl?rev=572284&r1=572283&r2=572284&view=diff
==============================================================================
--- ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/order/paymentinformation.ftl (original)
+++ ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/order/paymentinformation.ftl Mon Sep  3 04:04:12 2007
@@ -64,6 +64,10 @@
           </#if>
           <#if paymentMethodTypeId?if_exists == "GIFT_CARD"> <#--Don't know much how this is handled -->
             <form method="post" action="<@ofbizUrl>enterGiftCard</@ofbizUrl>" name="${parameters.formNameValue}">
+          <#elseif paymentMethodTypeId?if_exists == "EXT_OFFLINE">
+            <form method="post" action="<@ofbizUrl>processPaymentSettings</@ofbizUrl>" name="${parameters.formNameValue}">
+          <#else>
+            <div class="tabletext">${uiLabelMap.AccountingPaymentMethodTypeNotHandled} ${paymentMethodTypeId?if_exists}</div>
           </#if>
 
           <#if requestParameters.singleUsePayment?default("N") == "Y">