svn commit: r479879 [2/2] - in /incubator/ofbiz/trunk/applications/ecommerce: script/org/ofbiz/ecommerce/customer/ script/org/ofbiz/ecommerce/order/ webapp/ecommerce/ webapp/ecommerce/WEB-INF/ webapp/ecommerce/WEB-INF/actions/order/ webapp/ecommerce/cu...

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r479879 [2/2] - in /incubator/ofbiz/trunk/applications/ecommerce: script/org/ofbiz/ecommerce/customer/ script/org/ofbiz/ecommerce/order/ webapp/ecommerce/ webapp/ecommerce/WEB-INF/ webapp/ecommerce/WEB-INF/actions/order/ webapp/ecommerce/cu...

jonesde
Modified: incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/custsettings.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/custsettings.ftl?view=diff&rev=479879&r1=479878&r2=479879
==============================================================================
--- incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/custsettings.ftl (original)
+++ incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/custsettings.ftl Mon Nov 27 19:36:25 2006
@@ -1,5 +1,4 @@
 <#--
-
 Copyright 2001-2006 The Apache Software Foundation
 
 Licensed under the Apache License, Version 2.0 (the "License"); you may not
@@ -17,64 +16,59 @@
 
 <div class="screenlet">
     <div class="screenlet-header">
-        <div class="boxlink">
-            <div class="tabletext">
-              ${screens.render(anonymoustrailScreen)}
-            </div>
-        </div>
         <div class="boxhead">&nbsp;${uiLabelMap.PartyBasicInformation}</div>
     </div>
     <div class="screenlet-body">
-        <form name="custsetupform" method="post" action="<@ofbizUrl>setBasicInfo</@ofbizUrl>">
-        <input type="hidden" name="finalizeMode" value="cust"/>
-            <table width="100%" border="0" cellpadding="1" cellspacing="0">
+        <form name="custsetupform" method="post" action="<@ofbizUrl>processCustomerSettings</@ofbizUrl>">
+           <input type="hidden" name="partyId" value="${parameters.partyId?if_exists}"/>
+           <table width="100%" border="0" cellpadding="1" cellspacing="0">
               <tr>
                 <td width="26%" align="right"><div class="tabletext">${uiLabelMap.CommonTitle}</div></td>
                 <td width="5">&nbsp;</td>
                 <td width="74%">
-                  <input type="text" class="inputBox" name="personalTitle" value="${requestParameters.personalTitle?if_exists}" size="10" maxlength="30"/>
+                  <input type="text" class="inputBox" name="personalTitle" value="${parameters.personalTitle?if_exists}" size="10" maxlength="30"/>
                 </td>
               </tr>
               <tr>
                 <td width="26%" align="right"><div class="tabletext">${uiLabelMap.PartyFirstName}</div></td>
                 <td width="5">&nbsp;</td>
                 <td width="74%">
-                  <input type="text" class="inputBox" name="firstName" value="${requestParameters.firstName?if_exists}" size="30" maxlength="30"/>
+                  <input type="text" class="inputBox" name="firstName" value="${parameters.firstName?if_exists}" size="30" maxlength="30"/>
                 *</td>
               </tr>
               <tr>
                 <td width="26%" align="right"><div class="tabletext">${uiLabelMap.PartyMiddleInitial}</div></td>
                 <td width="5">&nbsp;</td>
                 <td width="74%">
-                  <input type="text" class="inputBox" name="middleName" value="${requestParameters.middleName?if_exists}" size="4" maxlength="4"/>
+                  <input type="text" class="inputBox" name="middleName" value="${parameters.middleName?if_exists}" size="4" maxlength="4"/>
                 </td>
               </tr>
               <tr>
                 <td width="26%" align="right"><div class="tabletext">${uiLabelMap.PartyLastName} </div></td>
                 <td width="5">&nbsp;</td>
                 <td width="74%">
-                  <input type="text" class="inputBox" name="lastName" value="${requestParameters.lastName?if_exists}" size="30" maxlength="30"/>
+                  <input type="text" class="inputBox" name="lastName" value="${parameters.lastName?if_exists}" size="30" maxlength="30"/>
                 *</td>
               </tr>
               <tr>
                 <td width="26%" align="right"><div class="tabletext">${uiLabelMap.PartySuffix}</div></td>
                 <td width="5">&nbsp;</td>
                 <td width="74%">
-                  <input type="text" class="inputBox" name="suffix" value="${requestParameters.suffix?if_exists}" size="10" maxlength="30"/>
+                  <input type="text" class="inputBox" name="suffix" value="${parameters.suffix?if_exists}" size="10" maxlength="30"/>
                 </td>
               </tr>
               <tr>
                 <td colspan="3">&nbsp;</td>
               </tr>
               <tr>
-
                 <td width="26%" align="right"><div class="tabletext">${uiLabelMap.PartyHomePhone}</div></td>
                 <td width="5">&nbsp;</td>
                 <td width="74%">
-                  <input type="text" class="inputBox" name="homeCountryCode" value="${requestParameters.homeCountryCode?if_exists}" size="4" maxlength="10"/>
-                  -&nbsp;<input type="text" class="inputBox" name="homeAreaCode" value="${requestParameters.homeAreaCode?if_exists}" size="4" maxlength="10"/>
-                  -&nbsp;<input type="text" class="inputBox" name="homeContactNumber" value="${requestParameters.homeContactNumber?if_exists}" size="15" maxlength="15"/>
-                  -&nbsp;<input type="text" class='inputBox' name="homeExt" value="${requestParameters.homeExt?if_exists}" size="6" maxlength="10"/> *
+                  <input type="hidden" name="homePhoneContactMechId" value="${parameters.homePhoneContactMechId?if_exists}"/>
+                  <input type="text" class="inputBox" name="homeCountryCode" value="${parameters.homeCountryCode?if_exists}" size="4" maxlength="10"/>
+                  -&nbsp;<input type="text" class="inputBox" name="homeAreaCode" value="${parameters.homeAreaCode?if_exists}" size="4" maxlength="10"/>
+                  -&nbsp;<input type="text" class="inputBox" name="homeContactNumber" value="${parameters.homeContactNumber?if_exists}" size="15" maxlength="15"/>
+                  -&nbsp;<input type="text" class='inputBox' name="homeExt" value="${parameters.homeExt?if_exists}" size="6" maxlength="10"/> *
                 </td>
               </tr>
               <tr>
@@ -87,7 +81,7 @@
                 <td width="5">&nbsp;</td>
                 <td width="74%">
                 <select name="homeSol" class="selectBox">
-                    <option>${requestParameters.homeSol?default("Y")}</option>
+                    <option>${parameters.homeSol?default("Y")}</option>
                     <option></option><option>${uiLabelMap.CommonY}</option><option>${uiLabelMap.CommonN}</option>
                   </select>
                 </td>
@@ -99,11 +93,11 @@
                 <td width="26%" align="right"><div class="tabletext">${uiLabelMap.PartyBusinessPhone}</div></td>
                 <td width="5">&nbsp;</td>
                 <td width="74%">
-                  <input type="text" class="inputBox" name="workCountryCode" value="${requestParameters.CUSTOMER_WORK_COUNTRY?if_exists}" size="4" maxlength="10"/>
-                  -&nbsp;<input type="text" class="inputBox" name="workAreaCode" value="${requestParameters.CUSTOMER_WORK_AREA?if_exists}" size="4" maxlength="10"/>
-                  -&nbsp;<input type="text" class="inputBox" name="workContactNumber" value="${requestParameters.CUSTOMER_WORK_CONTACT?if_exists}" size="15" maxlength="15"/>
-
-                  -&nbsp;<input type="text" class='inputBox' name="workExt" value="${requestParameters.CUSTOMER_WORK_EXT?if_exists}" size="6" maxlength="10"/>
+                  <input type="hidden" name="workPhoneContactMechId" value="${parameters.workPhoneContactMechId?if_exists}"/>
+                  <input type="text" class="inputBox" name="workCountryCode" value="${parameters.workCountryCode?if_exists}" size="4" maxlength="10"/>
+                  -&nbsp;<input type="text" class="inputBox" name="workAreaCode" value="${parameters.workAreaCode?if_exists}" size="4" maxlength="10"/>
+                  -&nbsp;<input type="text" class="inputBox" name="workContactNumber" value="${parameters.workContactNumber?if_exists}" size="15" maxlength="15"/>
+                  -&nbsp;<input type="text" class='inputBox' name="workExt" value="${parameters.workExt?if_exists}" size="6" maxlength="10"/>
                 </td>
               </tr>
               <tr>
@@ -115,16 +109,16 @@
                 <td width="26%" align="right"><div class="tabletext">${uiLabelMap.PartyEmailAddress}</div></td>
                 <td width="5">&nbsp;</td>
                 <td width="74%">
-                  <input type="text" class="inputBox" name="emailAddress" value="" size="60" maxlength="255"/> *
+                  <input type="hidden" name="emailContactMechId" value="${parameters.emailContactMechId?if_exists}"/>
+                  <input type="text" class="inputBox" name="emailAddress" value="${parameters.emailAddress?if_exists}" size="60" maxlength="255"/> *
                 </td>
               </tr>
               <tr>
                 <td width="26%" align="right"><div class="tabletext">(${uiLabelMap.PartyAllowSolicitation}?)</div></td>
                 <td width="5">&nbsp;</td>
                 <td width="74%">
-
                   <select name="emailSol" class="selectBox">
-                    <option>${requestParameters.emailSol?default("Y")}</option>
+                    <option>${parameters.emailSol?default("Y")}</option>
                     <option></option><option value="Y">${uiLabelMap.CommonY}</option><option value="N">${uiLabelMap.CommonN}</option>
                   </select>
                 </td>

Modified: incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/genericaddress.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/genericaddress.ftl?view=diff&rev=479879&r1=479878&r2=479879
==============================================================================
--- incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/genericaddress.ftl (original)
+++ incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/genericaddress.ftl Mon Nov 27 19:36:25 2006
@@ -1,5 +1,4 @@
 <#--
-
 Copyright 2001-2006 The Apache Software Foundation
 
 Licensed under the Apache License, Version 2.0 (the "License"); you may not
@@ -16,7 +15,7 @@
 -->
 
 <#-- generic address information -->
-<#assign toName = (postalFields.toName)?if_exists>
+<#assign toName = (parameters.toName)?if_exists>
 <#if !toName?has_content && person?exists && person?has_content>
   <#assign toName = "">
   <#if person.personalTitle?has_content><#assign toName = person.personalTitle + " "></#if>
@@ -37,28 +36,28 @@
   <td width="26%" align="right" valign=middle><div class="tabletext">${uiLabelMap.PartyAttentionName}</div></td>
   <td width="5">&nbsp;</td>
   <td width="74%">
-    <input type="text" class="inputBox" size="30" maxlength="60" name="attnName" value="${(postalFields.attnName)?if_exists}" <#if requestParameters.useShipAddr?exists>disabled</#if>>
+    <input type="text" class="inputBox" size="30" maxlength="60" name="attnName" value="${(parameters.attnName)?if_exists}" <#if requestParameters.useShipAddr?exists>disabled</#if>>
   </td>
 </tr>
 <tr>
   <td width="26%" align="right" valign=middle><div class="tabletext">${uiLabelMap.PartyAddressLine1}</div></td>
   <td width="5">&nbsp;</td>
   <td width="74%">
-    <input type="text" class="inputBox" size="30" maxlength="30" name="address1" value="${(postalFields.address1)?if_exists}" <#if requestParameters.useShipAddr?exists>disabled</#if>>
+    <input type="text" class="inputBox" size="30" maxlength="30" name="address1" value="${(parameters.address1)?if_exists}" <#if requestParameters.useShipAddr?exists>disabled</#if>>
   *</td>
 </tr>
 <tr>
   <td width="26%" align="right" valign=middle><div class="tabletext">${uiLabelMap.PartyAddressLine2}</div></td>
   <td width="5">&nbsp;</td>
   <td width="74%">
-    <input type="text" class="inputBox" size="30" maxlength="30" name="address2" value="${(postalFields.address2)?if_exists}" <#if requestParameters.useShipAddr?exists>disabled</#if>>
+    <input type="text" class="inputBox" size="30" maxlength="30" name="address2" value="${(parameters.address2)?if_exists}" <#if requestParameters.useShipAddr?exists>disabled</#if>>
   </td>
 </tr>
 <tr>
   <td width="26%" align="right" valign=middle><div class="tabletext">${uiLabelMap.PartyCity}</div></td>
   <td width="5">&nbsp;</td>
   <td width="74%">
-    <input type="text" class="inputBox" size="30" maxlength="30" name="city" value="${(postalFields.city)?if_exists}" <#if requestParameters.useShipAddr?exists>disabled</#if>>
+    <input type="text" class="inputBox" size="30" maxlength="30" name="city" value="${(parameters.city)?if_exists}" <#if requestParameters.useShipAddr?exists>disabled</#if>>
   *</td>
 </tr>
 <tr>
@@ -66,21 +65,22 @@
   <td width="5">&nbsp;</td>
   <td width="74%">
     <select name="stateProvinceGeoId" class="selectBox" <#if requestParameters.useShipAddr?exists>disabled</#if>>
-      <#if (postalFields.stateProvinceGeoId)?exists>
-        <option>${postalFields.stateProvinceGeoId}</option>
-        <option value="${postalFields.stateProvinceGeoId}">---</option>
+      <#if (parameters.stateProvinceGeoId)?exists>
+        <#assign findGeoMap = Static["org.ofbiz.base.util.UtilMisc"].toMap("geoId", parameters.stateProvinceGeoId)>
+        <#assign stateGeo = delegator.findByPrimaryKeyCache("Geo", findGeoMap)>        <option>${parameters.stateProvinceGeoId}</option>
+        <option value="${parameters.stateProvinceGeoId}">---</option>
       <#else>
         <option value="">${uiLabelMap.PartyNoState}</option>
       </#if>
       ${screens.render("component://common/widget/CommonScreens.xml#states")}
     </select>
-  </td>
+  *</td>
 </tr>
 <tr>
   <td width="26%" align="right" valign=middle><div class="tabletext">${uiLabelMap.PartyZipCode}</div></td>
   <td width="5">&nbsp;</td>
   <td width="74%">
-    <input type="text" class="inputBox" size="12" maxlength="10" name="postalCode" value="${(postalFields.postalCode)?if_exists}" <#if requestParameters.useShipAddr?exists>disabled</#if>>
+    <input type="text" class="inputBox" size="12" maxlength="10" name="postalCode" value="${(parameters.postalCode)?if_exists}" <#if requestParameters.useShipAddr?exists>disabled</#if>>
   *</td>
 </tr>
 <tr>
@@ -88,9 +88,9 @@
   <td width="5">&nbsp;</td>
   <td width="74%">
     <select name="countryGeoId" class="selectBox" <#if requestParameters.useShipAddr?exists>disabled</#if>>
-      <#if (postalFields.countryGeoId)?exists>
-        <option>${postalFields.countryGeoId}</option>
-        <option value="${postalFields.countryGeoId}">---</option>
+      <#if (parameters.countryGeoId)?exists>
+        <option>${parameters.countryGeoId}</option>
+        <option value="${parameters.countryGeoId}">---</option>
       </#if>
       ${screens.render("component://common/widget/CommonScreens.xml#countries")}
     </select>
@@ -101,9 +101,9 @@
   <td width="5">&nbsp;</td>
   <td width="74%">
     <select name="allowSolicitation" class='selectBox' <#if requestParameters.useShipAddr?exists>disabled</#if>>
-      <#if (partyContactMech.allowSolicitation)?exists>
-        <option>${partyContactMech.allowSolicitation}</option>
-        <option value="${partyContactMech.allowSolicitation}">---</option>
+      <#if (parameters.allowSolicitation)?exists>
+        <option>${parameters.allowSolicitation}</option>
+        <option value="${parameters.allowSolicitation}">---</option>
       </#if>
       <option>${uiLabelMap.CommonY}</option><option>${uiLabelMap.CommonN}</option>
     </select>

Modified: incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/optionsettings.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/optionsettings.ftl?view=diff&rev=479879&r1=479878&r2=479879
==============================================================================
--- incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/optionsettings.ftl (original)
+++ incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/optionsettings.ftl Mon Nov 27 19:36:25 2006
@@ -17,30 +17,25 @@
 
 <div class="screenlet">
     <div class="screenlet-header">
-        <div class="boxlink">
-            <div class="tabletext">
-              ${screens.render(anonymoustrailScreen)}
-            </div>
-        </div>
         <div class='boxhead'>&nbsp;${uiLabelMap.OrderShippingInformation}</div>
     </div>
     <div class="screenlet-body">
-        <form method="post" action="<@ofbizUrl>finalizeOrder</@ofbizUrl>" name="optsetupform">
+        <form method="post" action="<@ofbizUrl>processShipOptions</@ofbizUrl>" name="optsetupform">
           <input type="hidden" name="finalizeMode" value="options"/>
           <table width="100%" cellpadding="1" border="0" cellpadding="0" cellspacing="0">
             <#list carrierShipmentMethodList as carrierShipmentMethod>
             <tr>
               <td width='1%' valign="top" >
                 <#assign shippingMethod = carrierShipmentMethod.shipmentMethodTypeId + "@" + carrierShipmentMethod.partyId>
-                <input type='radio' name='shipping_method' value='${shippingMethod}' <#if shippingMethod == chosenShippingMethod?default("N@A")>checked</#if>>
+                <input type='radio' name='shipping_method' value='${shippingMethod}' <#if shippingMethod == chosenShippingMethod?default("N@A")>checked</#if>/>
               </td>
               <td valign="top">
                 <div class='tabletext'>
-                          <#if shoppingCart.getShippingContactMechId()?exists>
-                            <#assign shippingEst = shippingEstWpr.getShippingEstimate(carrierShipmentMethod)?default(-1)>
-                          </#if>
-                          <#if carrierShipmentMethod.partyId != "_NA_">${carrierShipmentMethod.partyId?if_exists}&nbsp;</#if>${carrierShipmentMethod.description?if_exists}
-                          <#if shippingEst?has_content> - <#if (shippingEst > -1)?exists><@ofbizCurrency amount=shippingEst isoCode=shoppingCart.getCurrency()/><#else>${uiLabelMap.OrderCalculatedOffline}</#if></#if>
+                    <#if shoppingCart.getShippingContactMechId()?exists>
+                        <#assign shippingEst = shippingEstWpr.getShippingEstimate(carrierShipmentMethod)?default(-1)>
+                    </#if>
+                    <#if carrierShipmentMethod.partyId != "_NA_">${carrierShipmentMethod.partyId?if_exists}&nbsp;</#if>${carrierShipmentMethod.description?if_exists}
+                    <#if shippingEst?has_content> - <#if (shippingEst > -1)?exists><@ofbizCurrency amount=shippingEst isoCode=shoppingCart.getCurrency()/><#else>${uiLabelMap.OrderCalculatedOffline}</#if></#if>
                 </div>
               </td>
             </tr>
@@ -63,7 +58,7 @@
             </tr>
             <tr>
               <td valign="top">
-                 <input type='radio' <#if shoppingCart.getMaySplit()?default("N") == "N">checked</#if> name='may_split' value='false'>
+                 <input type='radio' <#if shoppingCart.getMaySplit()?default("N") == "N">checked</#if> name='may_split' value='false'/>
               </td>
               <td valign="top">
                 <div class="tabletext">${uiLabelMap.OrderPleaseWaitUntilBeforeShipping}.</div>
@@ -71,7 +66,7 @@
             </tr>
             <tr>
               <td valign="top">
-                 <input <#if shoppingCart.getMaySplit()?default("N") == "Y">checked</#if> type='radio' name='may_split' value='true'>
+                 <input <#if shoppingCart.getMaySplit()?default("N") == "Y">checked</#if> type='radio' name='may_split' value='true'/>
               </td>
               <td valign="top">
                 <div class="tabletext">${uiLabelMap.OrderPleaseShipItemsBecomeAvailable}.</div>

Added: incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/paymentinformation.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/paymentinformation.ftl?view=auto&rev=479879
==============================================================================
--- incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/paymentinformation.ftl (added)
+++ incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/paymentinformation.ftl Mon Nov 27 19:36:25 2006
@@ -0,0 +1,369 @@
+<#--
+Copyright 2001-2006 The Apache Software Foundation
+
+Licensed under the Apache License, Version 2.0 (the "License"); you may not
+use this file except in compliance with the License. You may obtain a copy of
+the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+License for the specific language governing permissions and limitations
+under the License.
+-->
+<#if requestParameters.paymentMethodTypeId?has_content>
+   <#assign paymentMethodTypeId = "${requestParameters.paymentMethodTypeId?if_exists}">
+</#if>
+<script language="JavaScript" type="text/javascript">
+function shipBillAddr() {
+    <#if requestParameters.singleUsePayment?default("N") == "Y">
+      <#assign singleUse = "&singleUsePayment=Y">
+    <#else>
+      <#assign singleUse = "">
+    </#if>
+    if (document.billsetupform.useShipAddr.checked) {
+        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&addGiftCard=${requestParameters.addGiftCard?if_exists}&paymentMethodTypeId=${paymentMethodTypeId?if_exists}${singleUse}");
+    }
+}
+</script>
+
+<div class="screenlet">
+    <div class="screenlet-header">
+        <div class='boxhead'>&nbsp;${uiLabelMap.AccountingPaymentInformation}</div>
+    </div>
+    <div class="screenlet-body">
+          <#-- after initial screen; show detailed screens for selected type -->
+          <#if paymentMethodTypeId?if_exists == "CREDIT_CARD">
+            <#if creditCard?has_content && postalAddress?has_content && !requestParameters.useShipAddr?exists>
+              <form method="post" action="<@ofbizUrl>changeCreditCardAndBillingAddress</@ofbizUrl>" name="billsetupform">
+                <input type="hidden" name="paymentMethodId" value="${creditCard.paymentMethodId?if_exists}"/>
+                <input type="hidden" name="contactMechId" value="${postalAddress.contactMechId?if_exists}"/>
+            <#elseif requestParameters.useShipAddr?exists>
+              <form method="post" action="<@ofbizUrl>enterCreditCard</@ofbizUrl>" name="billsetupform">
+            <#else>
+              <form method="post" action="<@ofbizUrl>enterCreditCardAndBillingAddress</@ofbizUrl>" name="billsetupform">
+            </#if>
+          </#if>
+          <#if paymentMethodTypeId?if_exists == "EFT_ACCOUNT">
+            <#if eftAccount?has_content && postalAddress?has_content>
+              <form method="post" action="<@ofbizUrl>changeEftAccountAndBillingAddress</@ofbizUrl>" name="billsetupform">
+                <input type="hidden" name="paymentMethodId" value="${eftAccount.paymentMethodId?if_exists}"/>
+                <input type="hidden" name="contactMechId" value="${postalAddress.contactMechId?if_exists}"/>
+            <#elseif requestParameters.useShipAddr?exists>
+              <form method="post" action="<@ofbizUrl>enterEftAccount</@ofbizUrl>" name="billsetupform">
+            <#else>
+              <form method="post" action="<@ofbizUrl>enterEftAccountAndBillingAddress</@ofbizUrl>" name="billsetupform">
+            </#if>
+          </#if>
+          <#if paymentMethodTypeId?if_exists == "GIFT_CARD"> <#--Don't know much how this is handled -->
+            <form method="post" action="<@ofbizUrl>enterGiftCard</@ofbizUrl>" name="billsetupform">
+          </#if>
+
+          <#if requestParameters.singleUsePayment?default("N") == "Y">
+            <input type="hidden" name="singleUsePayment" value="Y"/>
+            <input type="hidden" name="appendPayment" value="Y"/>
+          </#if>
+          <input type="hidden" name="contactMechTypeId" value="POSTAL_ADDRESS"/>
+          <input type="hidden" name="partyId" value="${partyId}"/>
+          <input type="hidden" name="paymentMethodTypeId" value="${paymentMethodTypeId?if_exists}"/>
+          <input type="hidden" name="createNew" value="Y"/>
+          <#if requestParameters.useShipAddr?exists>
+            <input type="hidden" name="contactMechId" value="${parameters.contactMechId?if_exists}"/>
+          </#if>
+
+          <table width="100%" border="0" cellpadding="1" cellspacing="0">
+            <#if cart.getShippingContactMechId()?exists && paymentMethodTypeId?if_exists != "GIFT_CARD">
+              <tr>
+                <td width="26%" align="right"= valign="top">
+                  <input type="checkbox" name="useShipAddr" value="Y" onClick="javascript:shipBillAddr();" <#if useShipAddr?exists>checked</#if>/>
+                </td>
+                <td colspan="2" align="left" valign="center">
+                  <div class="tabletext">${uiLabelMap.FacilityBillingAddressSameShipping}</div>
+                </td>
+              </tr>
+              <tr>
+                <td colspan="3"><hr class="sepbar"/></td>
+              </tr>
+            </#if>
+
+            <#if (paymentMethodTypeId?if_exists == "CREDIT_CARD" || paymentMethodTypeId?if_exists == "EFT_ACCOUNT")>
+              <tr>
+                <td width="26%" align="right" valign="top"><div class="tableheadtext">${uiLabelMap.PartyBillingAddress}</div></td>
+                <td width="5">&nbsp;</td>
+                <td width="74%">&nbsp;</td>
+              </tr>
+              ${screens.render("component://ecommerce/widget/OrderScreens.xml#genericaddress")}
+            </#if>
+
+            <#-- credit card fields -->
+            <#if paymentMethodTypeId?if_exists == "CREDIT_CARD">
+              <#if !creditCard?has_content>
+                <#assign creditCard = requestParameters>
+              </#if>
+              <tr>
+                <td colspan="3"><hr class="sepbar"/></td>
+              </tr>
+              <tr>
+                <td width="26%" align="right" valign="top"><div class="tableheadtext">${uiLabelMap.AccountingCreditCardInformation}</div></td>
+                <td width="5">&nbsp;</td>
+                <td width="74%">&nbsp;</td>
+              </tr>
+
+              <tr>
+                <td width="26%" align="right" valign=middle><div class="tabletext">${uiLabelMap.AccountingCompanyNameOnCard}</div></td>
+                <td width="5">&nbsp;</td>
+                <td width="74%">
+                  <input type="text" class='inputBox' size="30" maxlength="60" name="companyNameOnCard" value="${creditCard.companyNameOnCard?if_exists}"/>
+                </td>
+              </tr>
+              <tr>
+                <td width="26%" align="right" valign=middle><div class="tabletext">${uiLabelMap.AccountingPrefixCard}</div></td>
+                <td width="5">&nbsp;</td>
+                <td width="74%">
+                  <select name="titleOnCard" class="selectBox">
+                    <option value="">Select One</option>
+                    <option<#if ((creditCard.titleOnCard)?default("") == "Mr.")> selected</#if>>${uiLabelMap.CommonTitleMr}</option>
+                    <option<#if ((creditCard.titleOnCard)?default("") == "Mrs.")> selected</#if>>${uiLabelMap.CommonTitleMrs}</option>
+                    <option<#if ((creditCard.titleOnCard)?default("") == "Ms.")> selected</#if>>${uiLabelMap.CommonTitleMs}</option>
+                    <option<#if ((creditCard.titleOnCard)?default("") == "Dr.")> selected</#if>>${uiLabelMap.CommonTitleDr}</option>
+                  </select>
+                </td>
+              </tr>
+              <tr>
+                <td width="26%" align="right" valign=middle><div class="tabletext">${uiLabelMap.AccountingFirstNameCard}</div></td>
+                <td width="5">&nbsp;</td>
+                <td width="74%">
+                  <input type="text" class="inputBox" size="20" maxlength="60" name="firstNameOnCard" value="${(creditCard.firstNameOnCard)?if_exists}"/>
+                *</td>
+              </tr>
+              <tr>
+                <td width="26%" align="right" valign=middle><div class="tabletext">${uiLabelMap.AccountingMiddleNameCard}</div></td>
+                <td width="5">&nbsp;</td>
+                <td width="74%">
+                  <input type="text" class="inputBox" size="15" maxlength="60" name="middleNameOnCard" value="${(creditCard.middleNameOnCard)?if_exists}"/>
+                </td>
+              </tr>
+              <tr>
+                <td width="26%" align="right" valign=middle><div class="tabletext">${uiLabelMap.AccountingLastNameCard}</div></td>
+                <td width="5">&nbsp;</td>
+                <td width="74%">
+                  <input type="text" class="inputBox" size="20" maxlength="60" name="lastNameOnCard" value="${(creditCard.lastNameOnCard)?if_exists}"/>
+                *</td>
+              </tr>
+              <tr>
+                <td width="26%" align="right" valign=middle><div class="tabletext">${uiLabelMap.AccountingSuffixCard}</div></td>
+                <td width="5">&nbsp;</td>
+                <td width="74%">
+                  <select name="suffixOnCard" class="selectBox">
+                    <option value="">Select One</option>
+                    <option<#if ((creditCard.suffixOnCard)?default("") == "Jr.")> selected</#if>>Jr.</option>
+                    <option<#if ((creditCard.suffixOnCard)?default("") == "Sr.")> selected</#if>>Sr.</option>
+                    <option<#if ((creditCard.suffixOnCard)?default("") == "I")> selected</#if>>I</option>
+                    <option<#if ((creditCard.suffixOnCard)?default("") == "II")> selected</#if>>II</option>
+                    <option<#if ((creditCard.suffixOnCard)?default("") == "III")> selected</#if>>III</option>
+                    <option<#if ((creditCard.suffixOnCard)?default("") == "IV")> selected</#if>>IV</option>
+                    <option<#if ((creditCard.suffixOnCard)?default("") == "V")> selected</#if>>V</option>
+                  </select>
+                </td>
+              </tr>
+
+              <tr>
+                <td width="26%" align="right" valign=middle><div class="tabletext">${uiLabelMap.AccountingCardType}</div></td>
+                <td width="5">&nbsp;</td>
+                <td width="74%">
+                  <select name="cardType" class="selectBox">
+                    <#if creditCard.cardType?exists>
+                      <option>${creditCard.cardType}</option>
+                      <option value="${creditCard.cardType}">---</option>
+                    </#if>
+                    ${screens.render("component://common/widget/CommonScreens.xml#cctypes")}
+                  </select>
+                *</td>
+              </tr>
+              <tr>
+                <td width="26%" align="right" valign=middle><div class="tabletext">${uiLabelMap.AccountingCardNumber}</div></td>
+                <td width="5">&nbsp;</td>
+                <td width="74%">
+                  <input type="text" class="inputBox" size="20" maxlength="30" name="cardNumber" value="${creditCard.cardNumber?if_exists}"/>
+                *</td>
+              </tr>
+              <#--<tr>
+                <td width="26%" align="right" valign=middle><div class="tabletext">${uiLabelMap.AccountingCardSecurityCode}</div></td>
+                <td width="5">&nbsp;</td>
+                <td width="74%">
+                  <input type="text" size="5" maxlength="10" name="cardSecurityCode" value="">
+                </td>
+              </tr>-->
+              <tr>
+                <td width="26%" align="right" valign=middle><div class="tabletext">${uiLabelMap.AccountingExpirationDate}</div></td>
+                <td width="5">&nbsp;</td>
+                <td width="74%">
+                  <#assign expMonth = "">
+                  <#assign expYear = "">
+                  <#if creditCard?exists && creditCard.expireDate?exists>
+                    <#assign expDate = creditCard.expireDate>
+                    <#if (expDate?exists && expDate.indexOf("/") > 0)>
+                      <#assign expMonth = expDate.substring(0,expDate.indexOf("/"))>
+                      <#assign expYear = expDate.substring(expDate.indexOf("/")+1)>
+                    </#if>
+                  </#if>
+                  <select name="expMonth" class='selectBox'>
+                    <#if creditCard?has_content && expMonth?has_content>
+                      <#assign ccExprMonth = expMonth>
+                    <#else>
+                      <#assign ccExprMonth = requestParameters.expMonth?if_exists>
+                    </#if>
+                    <#if ccExprMonth?has_content>
+                      <option value="${ccExprMonth?if_exists}">${ccExprMonth?if_exists}</option>
+                    </#if>
+                    ${screens.render("component://common/widget/CommonScreens.xml#ccmonths")}
+                  </select>
+                  <select name="expYear" class='selectBox'>
+                    <#if creditCard?has_content && expYear?has_content>
+                      <#assign ccExprYear = expYear>
+                    <#else>
+                      <#assign ccExprYear = requestParameters.expYear?if_exists>
+                    </#if>
+                    <#if ccExprYear?has_content>
+                      <option value="${ccExprYear?if_exists}">${ccExprYear?if_exists}</option>
+                    </#if>
+                    ${screens.render("component://common/widget/CommonScreens.xml#ccyears")}
+                  </select>
+                *</td>
+              </tr>
+              <tr>
+                <td width="26%" align="right" valign=middle><div class="tabletext">${uiLabelMap.CommonDescription}</div></td>
+                <td width="5">&nbsp;</td>
+                <td width="74%">
+                  <input type="text" class="inputBox" size="20" maxlength="30" name="description" value="${creditCard.description?if_exists}"/>
+                </td>
+              </tr>
+            </#if>
+
+            <#-- eft fields -->
+            <#if paymentMethodTypeId?if_exists =="EFT_ACCOUNT">
+              <#if !eftAccount?has_content>
+                <#assign eftAccount = requestParameters>
+              </#if>
+              <tr>
+                <td colspan="3"><hr class="sepbar"/></td>
+              </tr>
+              <tr>
+                <td width="26%" align="right" valign="top"><div class="tableheadtext">${uiLabelMap.AccountingEFTAccountInformation}</div></td>
+                <td width="5">&nbsp;</td>
+                <td width="74%">&nbsp;</td>
+              </tr>
+              <tr>
+                <td width="26%" align="right" valign=middle><div class="tabletext">${uiLabelMap.AccountingNameOnAccount}</div></td>
+                <td width="5">&nbsp;</td>
+                <td width="74%">
+                  <input type="text" class="inputBox" size="30" maxlength="60" name="nameOnAccount" value="${eftAccount.nameOnAccount?if_exists}"/>
+                *</td>
+              </tr>
+              <tr>
+                <td width="26%" align="right" valign=middle><div class="tabletext">${uiLabelMap.AccountingCompanyNameOnAccount}</div></td>
+                <td width="5">&nbsp;</td>
+                <td width="74%">
+                  <input type="text" class="inputBox" size="30" maxlength="60" name="companyNameOnAccount" value="${eftAccount.companyNameOnAccount?if_exists}"/>
+                </td>
+              </tr>
+              <tr>
+                <td width="26%" align="right" valign=middle><div class="tabletext">${uiLabelMap.AccountingBankName}</div></td>
+                <td width="5">&nbsp;</td>
+                <td width="74%">
+                  <input type="text" class="inputBox" size="30" maxlength="60" name="bankName" value="${eftAccount.bankName?if_exists}"/>
+                *</td>
+              </tr>
+              <tr>
+                <td width="26%" align="right" valign=middle><div class="tabletext">${uiLabelMap.AccountingRoutingNumber}</div></td>
+                <td width="5">&nbsp;</td>
+                <td width="74%">
+                  <input type="text" class="inputBox" size="10" maxlength="30" name="routingNumber" value="${eftAccount.routingNumber?if_exists}"/>
+                *</td>
+              </tr>
+              <tr>
+                <td width="26%" align="right" valign=middle><div class="tabletext">${uiLabelMap.AccountingAccountType}</div></td>
+                <td width="5">&nbsp;</td>
+                <td width="74%">
+                  <select name="accountType" class='selectBox'>
+                    <option>${eftAccount.accountType?if_exists}</option>
+                    <option></option>
+                    <option>Checking</option>
+                    <option>Savings</option>
+                  </select>
+                *</td>
+              </tr>
+              <tr>
+                <td width="26%" align="right" valign=middle><div class="tabletext">${uiLabelMap.AccountingAccountNumber}</div></td>
+                <td width="5">&nbsp;</td>
+                <td width="74%">
+                  <input type="text" class="inputBox" size="20" maxlength="40" name="accountNumber" value="${eftAccount.accountNumber?if_exists}"/>
+                *</td>
+              </tr>
+              <tr>
+                <td width="26%" align="right" valign=middle><div class="tabletext">${uiLabelMap.CommonDescription}</div></td>
+                <td width="5">&nbsp;</td>
+                <td width="74%">
+                  <input type="text" class="inputBox" size="30" maxlength="60" name="description" value="${eftAccount.description?if_exists}"/>
+                </td>
+              </tr>
+            </#if>
+
+            <#-- gift card fields -->
+            <#if requestParameters.addGiftCard?default("") == "Y" || paymentMethodTypeId?if_exists == "GIFT_CARD">
+              <input type="hidden" name="addGiftCard" value="Y"/>
+              <#assign giftCard = giftCard?if_exists>
+              <#if paymentMethodTypeId?if_exists != "GIFT_CARD">
+                <tr>
+                  <td colspan="3"><hr class="sepbar"/></td>
+                </tr>
+              </#if>
+              <tr>
+                <td width="26%" align="right" valign="top"><div class="tableheadtext">${uiLabelMap.AccountingGiftCardInformation}</div></td>
+                <td width="5">&nbsp;</td>
+                <td width="74%">&nbsp;</td>
+              </tr>
+              <tr>
+                <td width="26%" align="right" valign=middle><div class="tabletext">${uiLabelMap.AccountingGiftCardNumber}</div></td>
+                <td width="5">&nbsp;</td>
+                <td width="74%">
+                  <input type="text" class="inputBox" size="20" maxlength="60" name="giftCardNumber" value="${giftCard.cardNumber?if_exists}"/>
+                *</td>
+              </tr>
+              <tr>
+                <td width="26%" align="right" valign=middle><div class="tabletext">${uiLabelMap.AccountingPINNumber}</div></td>
+                <td width="5">&nbsp;</td>
+                <td width="74%">
+                  <input type="text" class="inputBox" size="10" maxlength="60" name="giftCardPin" value="${giftCard.pinNumber?if_exists}"/>
+                *</td>
+              </tr>
+              <tr>
+                <td width="26%" align="right" valign=middle><div class="tabletext">${uiLabelMap.CommonDescription}</div></td>
+                <td width="5">&nbsp;</td>
+                <td width="74%">
+                  <input type="text" class="inputBox" size="30" maxlength="60" name="description" value="${giftCard.description?if_exists}"/>
+                </td>
+              </tr>
+              <#if paymentMethodTypeId?if_exists != "GIFT_CARD">
+                <tr>
+                  <td width="26%" align="right" valign=middle><div class="tabletext">${uiLabelMap.AccountingAmountToUse}</div></td>
+                  <td width="5">&nbsp;</td>
+                  <td width="74%">
+                    <input type="text" class="inputBox" size="5" maxlength="10" name="giftCardAmount" value="${giftCard.pinNumber?if_exists}"/>
+                  *</td>
+                </tr>
+              </#if>
+            </#if>
+
+            <tr>
+              <td align="center" colspan="3">
+                <input type="submit" class="smallsubmit" value="Continue"/>
+              </td>
+            </tr>
+          </table>
+    </div>
+</div>

Propchange: incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/paymentinformation.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/paymentinformation.ftl
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/paymentinformation.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/paymentoptions.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/paymentoptions.ftl?view=auto&rev=479879
==============================================================================
--- incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/paymentoptions.ftl (added)
+++ incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/paymentoptions.ftl Mon Nov 27 19:36:25 2006
@@ -0,0 +1,62 @@
+<#--
+Copyright 2001-2006 The Apache Software Foundation
+
+Licensed under the Apache License, Version 2.0 (the "License"); you may not
+use this file except in compliance with the License. You may obtain a copy of
+the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+License for the specific language governing permissions and limitations
+under the License.
+-->
+
+
+<div class="screenlet">
+    <div class="screenlet-header">
+        <div class='boxhead'>&nbsp;${uiLabelMap.AccountingPaymentInformation}</div>
+    </div>
+    <div class="screenlet-body">
+        
+          <#-- initial screen show a list of options -->
+          <form method="post" action="<@ofbizUrl>setPaymentInformation</@ofbizUrl>" name="billsetupform">
+            <table width="100%" border="0" cellpadding="1" cellspacing="0">
+              <#if productStorePaymentMethodTypeIdMap.GIFT_CARD?exists>
+              <tr>
+                <td width='5%' nowrap><input type="checkbox" name="addGiftCard" value="Y" <#if addGiftCard?exists && addGiftCard == "Y">checked</#if>/></td>
+                <td width='95%' nowrap><div class="tabletext">${uiLabelMap.AccountingCheckGiftCard}</div></td>
+              </tr>
+              <tr><td colspan="2"><hr class="sepbar"/></td></tr>
+              </#if>
+              <#if productStorePaymentMethodTypeIdMap.EXT_OFFLINE?exists>
+              <tr>
+                <td width='5%' nowrap><input type="radio" name="paymentMethodTypeId" value="EXT_OFFLINE" <#if paymentMethodTypeId?exists && paymentMethodTypeId == "EXT_OFFLINE">checked</#if>/></td>
+                <td width='95%'nowrap><div class="tabletext">${uiLabelMap.OrderPaymentOfflineCheckMoney}</div></td>
+              </tr>
+              <tr><td colspan="2"><hr class="sepbar"/></td></tr>
+              </#if>
+              <#if productStorePaymentMethodTypeIdMap.CREDIT_CARD?exists>
+              <tr>
+                <td width='5%' nowrap><input type="radio" name="paymentMethodTypeId" value="CREDIT_CARD" <#if paymentMethodTypeId?exists && paymentMethodTypeId == "CREDIT_CARD">checked</#if>/></td>
+                <td width='95%' nowrap><div class="tabletext">${uiLabelMap.AccountingVisaMastercardAmexDiscover}</div></td>
+              </tr>
+              <tr><td colspan="2"><hr class="sepbar"/></td></tr>
+              </#if>
+              <#if productStorePaymentMethodTypeIdMap.EFT_ACCOUNT?exists>
+              <tr>
+                <td width='5%' nowrap><input type="radio" name="paymentMethodTypeId" value="EFT_ACCOUNT" <#if paymentMethodTypeId?exists && paymentMethodTypeId == "EFT_ACCOUNT">checked</#if>/></td>
+                <td width='95%' nowrap><div class="tabletext">${uiLabelMap.AccountingAHCElectronicCheck}</div></td>
+              </tr>
+              </#if>
+              <tr>
+                <td align="center" colspan="2">
+                  <input type="submit" class="smallsubmit" value="${uiLabelMap.CommonContinue}">
+                </td>
+              </tr>
+            </table>
+          </form>
+    </div>
+</div>

Propchange: incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/paymentoptions.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/paymentoptions.ftl
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/paymentoptions.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/shipsettings.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/shipsettings.ftl?view=diff&rev=479879&r1=479878&r2=479879
==============================================================================
--- incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/shipsettings.ftl (original)
+++ incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/shipsettings.ftl Mon Nov 27 19:36:25 2006
@@ -1,5 +1,4 @@
 <#--
-
 Copyright 2001-2006 The Apache Software Foundation
 
 Licensed under the Apache License, Version 2.0 (the "License"); you may not
@@ -17,24 +16,12 @@
 
 <div class="screenlet">
     <div class="screenlet-header">
-        <div class="boxlink">
-            <div class="tabletext">
-              ${screens.render(anonymoustrailScreen)}
-            </div>
-        </div>
         <div class='boxhead'>&nbsp;${uiLabelMap.OrderShippingInformation}</div>
     </div>
     <div class="screenlet-body">
-        <#if useEntityFields?default("N") == "Y">
-          <form method="post" action="<@ofbizUrl>changeShippingAddress</@ofbizUrl>" name="shipsetupform">
-            <input type="hidden" name="contactMechId" value="${(postalFields.contactMechId)?if_exists}"/>
-        <#else>
-          <form method="post" action="<@ofbizUrl>enterShippingAddress</@ofbizUrl>" name="shipsetupform">
-            <input type="hidden" name="contactMechTypeId" value="POSTAL_ADDRESS"/>
-            <input type="hidden" name="contactMechPurposeTypeId" value="SHIPPING_LOCATION"/>
-        </#if>
+      <form method="post" action="<@ofbizUrl>processShipSettings</@ofbizUrl>" name="shipsetupform">
+        <input type="hidden" name="contactMechId" value="${parameters.shippingContactMechId?if_exists}"/>
         <input type="hidden" name="partyId" value="${cart.getPartyId()?default("_NA_")}"/>
-        <input type="hidden" name="finalizeMode" value="ship"/>
 
         <table width="100%" border="0" cellpadding="1" cellspacing="0">
           <tr>
@@ -42,7 +29,7 @@
             <td width="5">&nbsp;</td>
             <td width="74%">&nbsp;</td>
           </tr>
-          ${screens.render("component://ecommerce/widget/OrderScreens.xml#genericaddress")}
+            ${screens.render("component://ecommerce/widget/OrderScreens.xml#genericaddress")}
           <tr>
             <td colspan="3" align="center"><input type="submit" class="smallsubmit" value="${uiLabelMap.CommonContinue}"/></td>
           </tr>

Modified: incubator/ofbiz/trunk/applications/ecommerce/widget/OrderScreens.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/ecommerce/widget/OrderScreens.xml?view=diff&rev=479879&r1=479878&r2=479879
==============================================================================
--- incubator/ofbiz/trunk/applications/ecommerce/widget/OrderScreens.xml (original)
+++ incubator/ofbiz/trunk/applications/ecommerce/widget/OrderScreens.xml Mon Nov 27 19:36:25 2006
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-
 Copyright 2001-2006 The Apache Software Foundation
 
 Licensed under the Apache License, Version 2.0 (the "License"); you may not
@@ -30,7 +29,8 @@
             </widgets>
         </section>
     </screen>
-    <screen name="genericaddress">
+    
+ <screen name="genericaddress">
         <section>
             <widgets>
                 <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/order/genericaddress.ftl"/></html></platform-specific>
@@ -45,7 +45,8 @@
             </widgets>
         </section>
     </screen>
-    <screen name="orderitems">
+    
+ <screen name="orderitems">
         <section>
             <widgets>
                 <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/order/orderitems.ftl"/></html></platform-specific>
@@ -55,76 +56,85 @@
 
     <!-- =========== Top-Level and Stand-Alone Screens =========== -->
 
-    <screen name="billsettings">
+    <screen name="anonymousCheckoutLinks">
         <section>
             <actions>
-                <set field="rightbarScreenName" value="rightbar"/>
-                <set field="MainColumnStyle" value="rightonly"/>
-
-                <set field="titleProperty" value="PageTitleBillingInformation"/>
-                <set field="anonymoustrailScreen" value="component://ecommerce/widget/OrderScreens.xml#anonymoustrail"/>
-                <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/billsettings.bsh"/>
-                <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/storepaymentoptions.bsh"/>
+                <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/anonymousCheckoutLinks.bsh"/>
+            </actions>
+            <widgets>
+                <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/order/anonymousCheckoutLinks.ftl"/></html></platform-specific>
+            </widgets>
+        </section>
+    </screen>
+    <screen name="anonymousCheckoutDecorator">
+        <section>
+            <actions>
+                <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/anonymousCheckoutLinks.bsh"/>
             </actions>
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/order/billsettings.ftl"/></html></platform-specific>
+                        <section>
+                            <widgets>  
+                                <include-screen name="anonymousCheckoutLinks"/>
+                                <decorator-section-include name="body"/>                                
+                            </widgets>
+                        </section>                    
                     </decorator-section>
                 </decorator-screen>
             </widgets>
         </section>
     </screen>
-    <screen name="shipsettings">
+
+    <screen name="custsettings">
         <section>
             <actions>
                 <set field="rightbarScreenName" value="rightbar"/>
                 <set field="MainColumnStyle" value="rightonly"/>
-
+                
                 <set field="titleProperty" value="PageTitleShippingInformation"/>
-                <set field="anonymoustrailScreen" value="component://ecommerce/widget/OrderScreens.xml#anonymoustrail"/>
-                <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/shipsettings.bsh"/>
+                <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/custsettings.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+                <decorator-screen name="anonymousCheckoutDecorator">
                     <decorator-section name="body">
-                        <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/order/shipsettings.ftl"/></html></platform-specific>
+                        <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/order/custsettings.ftl"/></html></platform-specific>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
         </section>
     </screen>
-    <screen name="custsettings">
+
+    <screen name="shipsettings">
         <section>
             <actions>
                 <set field="rightbarScreenName" value="rightbar"/>
                 <set field="MainColumnStyle" value="rightonly"/>
 
                 <set field="titleProperty" value="PageTitleShippingInformation"/>
-                <set field="anonymoustrailScreen" value="component://ecommerce/widget/OrderScreens.xml#anonymoustrail"/>
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/shipsettings.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+                <decorator-screen name="anonymousCheckoutDecorator">
                     <decorator-section name="body">
-                        <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/order/custsettings.ftl"/></html></platform-specific>
+                        <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/order/shipsettings.ftl"/></html></platform-specific>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
         </section>
     </screen>
+
     <screen name="optionsettings">
         <section>
             <actions>
                 <set field="rightbarScreenName" value="rightbar"/>
                 <set field="MainColumnStyle" value="rightonly"/>
-
+                
                 <set field="titleProperty" value="PageTitleShippingOptions"/>
-                <set field="anonymoustrailScreen" value="component://ecommerce/widget/OrderScreens.xml#anonymoustrail"/>
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/optionsettings.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+                <decorator-screen name="anonymousCheckoutDecorator">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/order/optionsettings.ftl"/></html></platform-specific>
                     </decorator-section>
@@ -132,7 +142,84 @@
             </widgets>
         </section>
     </screen>
+    
+    <screen name="paymentoptions">
+        <section>
+            <actions>
+                <set field="rightbarScreenName" value="rightbar"/>
+                <set field="MainColumnStyle" value="rightonly"/>
 
+                <set field="titleProperty" value="PageTitleBillingInformation"/>
+                <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/paymentoptions.bsh"/>
+                <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/storepaymentoptions.bsh"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="anonymousCheckoutDecorator">
+                    <decorator-section name="body">
+                        <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/order/paymentoptions.ftl"/></html></platform-specific>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+
+ <screen name="paymentinformation">
+        <section>
+            <actions>
+                <set field="rightbarScreenName" value="rightbar"/>
+                <set field="MainColumnStyle" value="rightonly"/>
+
+                <set field="titleProperty" value="PageTitleBillingInformation"/>
+                <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/paymentinformation.bsh"/>
+                <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/storepaymentoptions.bsh"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="anonymousCheckoutDecorator">
+                    <decorator-section name="body">
+                        <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/order/paymentinformation.ftl"/></html></platform-specific>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+
+    <screen name="orderreview">
+        <section>
+            <actions>
+                <set field="titleProperty" value="PageTitleCheckoutReview"/>
+                <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/checkoutreview.bsh"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="anonymousCheckoutDecorator">
+                    <decorator-section name="body">
+                        <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/order/checkoutreview.ftl"/></html></platform-specific>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+
+    <screen name="billsettings">
+        <section>
+            <actions>
+                <set field="rightbarScreenName" value="rightbar"/>
+                <set field="MainColumnStyle" value="rightonly"/>
+
+                <set field="titleProperty" value="PageTitleBillingInformation"/>
+                <set field="anonymoustrailScreen" value="component://ecommerce/widget/OrderScreens.xml#anonymoustrail"/>
+                <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/billsettings.bsh"/>
+                <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/storepaymentoptions.bsh"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/order/billsettings.ftl"/></html></platform-specific>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+    
     <screen name="checkoutoptions">
         <section>
             <actions>
@@ -151,7 +238,8 @@
             </widgets>
         </section>
     </screen>
-    <screen name="checkoutshippingaddress">
+
+ <screen name="checkoutshippingaddress">
         <section>
             <actions>
                 <set field="rightbarScreenName" value="rightbar"/>
@@ -169,7 +257,8 @@
             </widgets>
         </section>
     </screen>
-    <screen name="checkoutshippingoptions">
+    
+ <screen name="checkoutshippingoptions">
         <section>
             <actions>
                 <set field="rightbarScreenName" value="rightbar"/>
@@ -187,7 +276,8 @@
             </widgets>
         </section>
     </screen>
-    <screen name="checkoutpayment">
+    
+ <screen name="checkoutpayment">
         <section>
             <actions>
                 <set field="rightbarScreenName" value="rightbar"/>
@@ -206,7 +296,8 @@
             </widgets>
         </section>
     </screen>
-    <screen name="splitship">
+    
+ <screen name="splitship">
         <section>
             <actions>
                 <set field="titleProperty" value="PageTitleSplitItemsForShipping"/>
@@ -237,7 +328,8 @@
             </widgets>
         </section>
     </screen>
-    <screen name="ordercomplete">
+    
+ <screen name="ordercomplete">
         <section>
             <actions>
                 <set field="titleProperty" value="PageTitleOrderSummary"/>
@@ -271,7 +363,8 @@
             </widgets>
         </section>
     </screen>
-    <screen name="orderstatus">
+    
+ <screen name="orderstatus">
         <section>
             <actions>
                 <set field="rightbarScreenName" value="rightbar"/>
@@ -290,7 +383,8 @@
             </widgets>
         </section>
     </screen>
-    <screen name="requestreturn">
+    
+ <screen name="requestreturn">
         <section>
             <actions>
                 <set field="rightbarScreenName" value="rightbar"/>
@@ -308,4 +402,5 @@
             </widgets>
         </section>
     </screen>
+    
 </screens>