svn commit: r502669 - in /ofbiz/trunk/applications/order/webapp/ordermgr: WEB-INF/controller.xml entry/editShipAddress.ftl

[sichen]

Author: sichen
Date: Fri Feb  2 09:38:20 2007
New Revision: 502669

URL: http://svn.apache.org/viewvc?view=rev&rev=502669
Log:
In ordermgr checkout, directing errors from createPostalAddress back to EditShipAddress instead of shipsetting, so that the error message makes sense and refers to what's on the screen. Also repopulating address fields with parameters in case of error.

Modified:
    ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml
    ofbiz/trunk/applications/order/webapp/ordermgr/entry/editShipAddress.ftl

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml?view=diff&rev=502669&r1=502668&r2=502669
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml Fri Feb  2 09:38:20 2007
@@ -736,7 +736,7 @@
         <security https="true" auth="true"/>
         <event type="service" invoke="createPartyPostalAddress"/>
         <response name="success" type="request" value="finalizeOrder"/>
-        <response name="error" type="view" value="shipsetting"/>
+        <response name="error" type="view" value="EditShipAddress"/>
     </request-map>
     <request-map uri="updatePostalAddressOrderEntry">
         <security https="true" auth="true"/>

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/editShipAddress.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/editShipAddress.ftl?view=diff&rev=502669&r1=502668&r2=502669
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/editShipAddress.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/editShipAddress.ftl Fri Feb  2 09:38:20 2007
@@ -55,6 +55,8 @@
                   <#if orderPerson.middleName?has_content><#assign toName = toName + orderPerson.middleName + " "></#if>
                   <#assign toName = toName + orderPerson.lastName>
                   <#if orderPerson.suffix?has_content><#assign toName = toName + " " + orderPerson.suffix></#if>
+                <#elseif parameters.toName?exists>
+                  <#assign toName = parameters.toName>
                 <#else>
                   <#assign toName = "">
                 </#if>
@@ -70,28 +72,28 @@
                     <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.CommonAttentionName}</div></td>
                     <td width="5">&nbsp;</td>
                     <td width="74%">
-                      <input type="text" class="inputBox" size="30" maxlength="60" name="attnName" value=""/>
+                      <input type="text" class="inputBox" size="30" maxlength="60" name="attnName" value="${parameters.attnName?if_exists}"/>
                     </td>
                   </tr>
                   <tr>
                     <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.CommonAddressLine} 1</div></td>
                     <td width="5">&nbsp;</td>
                     <td width="74%">
-                      <input type="text" class="inputBox" size="30" maxlength="30" name="address1" value=""/>
+                      <input type="text" class="inputBox" size="30" maxlength="30" name="address1" value="${parameters.address1?if_exists}"/>
                     *</td>
                   </tr>
                   <tr>
                     <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.CommonAddressLine} 2</div></td>
                     <td width="5">&nbsp;</td>
                     <td width="74%">
-                      <input type="text" class="inputBox" size="30" maxlength="30" name="address2" value=""/>
+                      <input type="text" class="inputBox" size="30" maxlength="30" name="address2" value="${parameters.address2?if_exists}"/>
                     </td>
                   </tr>
                   <tr>
                     <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.CommonCity}</div></td>
                     <td width="5">&nbsp;</td>
                     <td width="74%">
-                      <input type="text" class="inputBox" size="30" maxlength="30" name="city" value=""/>
+                      <input type="text" class="inputBox" size="30" maxlength="30" name="city" value="${parameters.city?if_exists}"/>
                     *</td>
                   </tr>
                   <tr>
@@ -108,7 +110,7 @@
                     <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.CommonZipPostalCode}</div></td>
                     <td width="5">&nbsp;</td>
                     <td width="74%">
-                      <input type="text" class="inputBox" size="12" maxlength="10" name="postalCode" value=""/>
+                      <input type="text" class="inputBox" size="12" maxlength="10" name="postalCode" value="${parameters.postalCode?if_exists}"/>
                     *</td>
                   </tr>
                   <tr>
@@ -124,8 +126,9 @@
                     <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.CommonAllowSolicitation}</div></td>
                     <td width="5">&nbsp;</td>
                     <td width="74%">
-                      <select name="allowSolicitation" class='selectBox'>                      
-                        <option></option><option>Y</option><option>N</option>
+                      <select name="allowSolicitation" class='selectBox'>
+                        <#assign selectedValue = parameters.allowSolicitation?default("")/>
+                        <option></option><option ${(selectedValue=="Y")?string("selected=\"selected\"","")}>Y</option><option ${(selectedValue=="N")?string("selected=\"selected\"","")}>N</option>
                       </select>
                     </td>
                   </tr>