ofbiz-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jone...@apache.org
Subject svn commit: r490651 [2/4] - in /ofbiz/trunk: ./ applications/ecommerce/config/ applications/ecommerce/script/org/ofbiz/ecommerce/customer/ applications/ecommerce/webapp/ecommerce/ applications/ecommerce/webapp/ecommerce/WEB-INF/ applications/ecommerce/...
Date Thu, 28 Dec 2006 05:08:57 GMT
Propchange: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/gcinfo.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

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

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

Added: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/quickAnonCheckoutLinks.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/quickAnonCheckoutLinks.ftl?view=auto&rev=490651
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/quickAnonCheckoutLinks.ftl (added)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/quickAnonCheckoutLinks.ftl Wed Dec 27 21:08:56 2006
@@ -0,0 +1,40 @@
+<#--
+
+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.
+-->
+<script language="javascript" type="text/javascript">
+function submitForm(form) {
+   form.submit();
+}
+</script>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<#-- <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html> -->
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+    <script language="javascript" src="<@ofbizContentUrl>/images/dojo.js</@ofbizContentUrl>" type="text/javascript"></script>    
+</head>
+<body>
+<div>
+    <a href="<@ofbizUrl>quickAnonSetCustomer</@ofbizUrl>" class="buttontext" <#if callSubmitForm?exists>onclick="javascript:submitForm(document.${parameters.formNameValue?if_exists});"</#if>>Personal Info</a>
+    <#if (enableShipmentMethod)?exists>
+        <a href="<@ofbizUrl>quickAnonOrderReview</@ofbizUrl>" class="buttontext" <#if callSubmitForm?exists>onclick="javascript:submitForm(document.${parameters.formNameValue?if_exists});"</#if>>Review Order</a>
+    <#else>
+        <span class="buttontextdisabled">Review Order</span>
+    </#if>
+</div>
+</body>
+</html>

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

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

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

Added: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/quickAnonCheckoutReview.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/quickAnonCheckoutReview.ftl?view=auto&rev=490651
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/quickAnonCheckoutReview.ftl (added)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/quickAnonCheckoutReview.ftl Wed Dec 27 21:08:56 2006
@@ -0,0 +1,71 @@
+<#--
+
+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.
+-->
+
+<script language="JavaScript" type="text/javascript">
+<!--
+    var clicked = 0;
+    function processOrder() {
+        if (clicked == 0) {
+            clicked++;
+            //window.location.replace("<@ofbizUrl>processorder</@ofbizUrl>");
+            document.${parameters.formNameValue}.processButton.value="${uiLabelMap.OrderSubmittingOrder}";
+            document.${parameters.formNameValue}.processButton.disabled=true;
+            document.${parameters.formNameValue}.submit();
+        } else {
+            alert("You order is being processed, this may take a moment.");
+        }
+    }
+    
+    function shippingMethodChanged(shippingMethod) {
+        var submitToUri = "<@ofbizUrl>quickAnonProcessShipOptionsUpdateOrderItems</@ofbizUrl>?shipping_method=" + shippingMethod;
+        dojo.io.bind({url: submitToUri,
+            load: function(type, data, evt){
+            if(type == "load"){
+                document.getElementById("orderItemsSection").innerHTML = data;
+            }        
+          },mimetype: "text/html"});    
+    }
+    
+// -->
+</script>
+
+<p class="head1">${uiLabelMap.OrderFinalCheckoutReview}</p>
+<#if !isDemoStore?exists || isDemoStore><p>${uiLabelMap.OrderDemoFrontNote}.</p></#if>
+
+<#if cart?exists && 0 < cart.size()>
+  ${screens.render("component://ecommerce/widget/OrderScreens.xml#quickAnonOrderHeader")}
+  <br/>
+  <div id="orderItemsSection">${screens.render("component://ecommerce/widget/OrderScreens.xml#orderitems")}</div>
+<form type="POST" action="<@ofbizUrl>processorder</@ofbizUrl>" name="${parameters.formNameValue}">
+  <table border="0" cellpadding="1" width="100%">
+   <tr>
+      <td colspan="4" align="left">
+        &nbsp;
+      </td>
+      <td align="right">
+          <#if (requestParameters.checkoutpage)?has_content>
+            <input type="hidden" name="checkoutpage" value="${requestParameters.checkoutpage}">
+          </#if>
+          <input type="button" id="submitOrderReview" name="processButton" value="${uiLabelMap.OrderSubmitOrder}" onClick="processOrder();" class="mediumSubmit">
+        <#-- doesn't work with Safari, seems to work with IE, Mozilla <a href="#" onclick="processOrder();" class="buttontextbig">[${uiLabelMap.OrderSubmitOrder}]&nbsp;</a> -->
+      </td>
+    </tr>
+  </table>
+</form>
+<#else>
+  <h3>${uiLabelMap.OrderErrorShoppingCartEmpty}.</h3>
+</#if>

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

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

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

Added: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/quickAnonCustSettings.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/quickAnonCustSettings.ftl?view=auto&rev=490651
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/quickAnonCustSettings.ftl (added)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/quickAnonCustSettings.ftl Wed Dec 27 21:08:56 2006
@@ -0,0 +1,360 @@
+<#--
+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.
+-->
+<script language="JavaScript" type="text/javascript">
+function shipBillAddr() {
+    if (document.${parameters.formNameValue}.usePostalAddress_0ForContactMechPurpose_1.checked) {
+       document.${parameters.formNameValue}.toName_1.value = document.${parameters.formNameValue}.toName_0.value ;
+       document.${parameters.formNameValue}.attnName_1.value = document.${parameters.formNameValue}.attnName_0.value ;
+       document.${parameters.formNameValue}.address1_1.value = document.${parameters.formNameValue}.address1_0.value ;
+       document.${parameters.formNameValue}.address2_1.value = document.${parameters.formNameValue}.address2_0.value ;
+       document.${parameters.formNameValue}.city_1.value = document.${parameters.formNameValue}.city_0.value ;
+       document.${parameters.formNameValue}.stateProvinceGeoId_1.value = document.${parameters.formNameValue}.stateProvinceGeoId_0.value ;
+       document.${parameters.formNameValue}.postalCode_1.value = document.${parameters.formNameValue}.postalCode_0.value ;
+       document.${parameters.formNameValue}.countryGeoId_1.value = document.${parameters.formNameValue}.countryGeoId_0.value ;
+       
+       document.${parameters.formNameValue}.toName_1.disabled = true;
+       document.${parameters.formNameValue}.attnName_1.disabled = true;
+       document.${parameters.formNameValue}.address1_1.disabled = true;
+       document.${parameters.formNameValue}.address2_1.disabled = true;
+       document.${parameters.formNameValue}.city_1.disabled = true;
+       document.${parameters.formNameValue}.stateProvinceGeoId_1.disabled = true;                                   
+       document.${parameters.formNameValue}.postalCode_1.disabled = true;
+       document.${parameters.formNameValue}.countryGeoId_1.disabled = true;                                   
+    } else {
+       document.${parameters.formNameValue}.toName_1.disabled = false;
+       document.${parameters.formNameValue}.attnName_1.disabled = false;
+       document.${parameters.formNameValue}.address1_1.disabled = false;
+       document.${parameters.formNameValue}.address2_1.disabled = false;
+       document.${parameters.formNameValue}.city_1.disabled = false;
+       document.${parameters.formNameValue}.stateProvinceGeoId_1.disabled = false;                                   
+       document.${parameters.formNameValue}.postalCode_1.disabled = false;
+       document.${parameters.formNameValue}.countryGeoId_1.disabled = false;                                   
+       document.${parameters.formNameValue}.postalAddressContactMechId_1.value = "";  
+    }
+}
+</script>
+
+<#macro fieldErrors fieldName>
+  <#if errorMessageList?has_content>
+    <#assign fieldMessages = Static["org.ofbiz.base.util.MessageString"].getMessagesForField(fieldName, true, errorMessageList)>
+    <ul>
+      <#list fieldMessages as errorMsg>
+        <li class="errorMessage">${errorMsg}</li>
+      </#list>
+    </ul>
+  </#if>
+</#macro>
+<#macro fieldErrorsMulti fieldName1 fieldName2 fieldName3 fieldName4>
+  <#if errorMessageList?has_content>
+    <#assign fieldMessages = Static["org.ofbiz.base.util.MessageString"].getMessagesForField(fieldName1, fieldName2, fieldName3, fieldName4, true, errorMessageList)>
+    <ul>
+      <#list fieldMessages as errorMsg>
+        <li class="errorMessage">${errorMsg}</li>
+      </#list>
+    </ul>
+  </#if>
+</#macro>
+
+<div class="screenlet">
+  <div class="screenlet-header">
+     <div class="boxhead">&nbsp;${uiLabelMap.PartyBasicInformation}</div>
+  </div>
+  <div class="screenlet-body">
+  <form name="${parameters.formNameValue}" method="post" action="<@ofbizUrl>quickAnonProcessCustomerSettings</@ofbizUrl>">
+  <input type="hidden" name="partyId" value="${parameters.partyId?if_exists}"/>
+  <input type="hidden" name="postalAddressContactMechId_0" value="${parameters.shippingContactMechId?if_exists}"/>
+  <input type="hidden" name="postalAddressContactMechId_1" value="${parameters.billingContactMechId?if_exists}"/>
+  <input type="hidden" name="contactMechPurposeTypeId_0" value="${parameters.contactMechPurposeTypeId_0?if_exists}"/>
+  <input type="hidden" name="contactMechPurposeTypeId_1" value="${parameters.contactMechPurposeTypeId_1?if_exists}"/>
+  
+  <table width="100%" border="0" cellpadding="1" cellspacing="0">
+     <tr>
+        <td width="50%">
+           <table width="100%" border="0" cellpadding="1" cellspacing="0">
+              <tr>
+                 <td width="26%" align="right" valign="top"></td>
+                 <td width="2%">&nbsp;</td>
+                 <td width="72%">&nbsp;</td>
+              </tr>
+              <tr>
+                 <td width="26%" align="right" valign="top"><div class="tableheadtext">${uiLabelMap.PartyNameAndConactInfo}</div></td>
+                 <td width="2%">&nbsp;</td>
+                 <td width="72%">&nbsp;</td>
+              </tr>
+              <tr>
+                <td width="26%" align="right"><div class="tabletext">${uiLabelMap.PartyFirstName}</div></td>
+                <td width="2%">&nbsp;</td>
+                <td width="72%">
+                  <@fieldErrors fieldName="firstName"/>
+                  <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="2%">&nbsp;</td>
+                <td width="72%">
+                  <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="2%">&nbsp;</td>
+                <td width="72%">
+                  <@fieldErrors fieldName="lastName"/>
+                  <input type="text" class="inputBox" name="lastName" value="${parameters.lastName?if_exists}" size="30" maxlength="30"/>
+                *</td>
+              </tr>
+              <tr>
+                <td width="26%" align="right" valign="top"><div class="tabletext"></div></td>
+                <td width="2%">&nbsp;</td>
+                <td width="72%"><div class="tabletext">[${uiLabelMap.PartyCountryCode}] [${uiLabelMap.PartyAreaCode}] [${uiLabelMap.PartyContactNumber}] [${uiLabelMap.PartyExtension}]</div></td>
+              </tr>
+              <tr>
+                <td width="26%" align="right"><div class="tabletext">${uiLabelMap.PartyHomePhone}</div></td>
+                <td width="2%">&nbsp;</td>
+                <td width="72%">
+                  <@fieldErrorsMulti fieldName1="homeCountryCode" fieldName2="homeAreaCode" fieldName3="homeContactNumber" fieldName4="homeExt"/>
+                  <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>
+                <td width="26%" align="right"><div class="tabletext">${uiLabelMap.PartyBusinessPhone}</div></td>
+                <td width="2%">&nbsp;</td>
+                <td width="72%">
+                  <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>
+                <td width="26%" align="right"><div class="tabletext">${uiLabelMap.PartyEmailAddress}</div></td>
+                <td width="2%">&nbsp;</td>
+                <td width="72%">
+                  <@fieldErrors fieldName="emailAddress"/>
+                  <input type="hidden" name="emailContactMechId" value="${parameters.emailContactMechId?if_exists}"/>
+                  <input type="text" class="inputBox" name="emailAddress" value="${parameters.emailAddress?if_exists}" size="40" maxlength="255"/> *
+                </td>
+              </tr>
+            </table>
+         </td>
+     </tr>
+     <tr>
+        <td colspan="3" align="center"><hr class="sepbar"/></td>
+     </tr>
+     <tr>
+        <td width="50%">
+           <table width="100%" border="0" cellpadding="1" cellspacing="0">
+              <tr>
+                 <td width="26%" align="right" valign="top"></td>
+                 <td width="2%">&nbsp;</td>
+                 <td width="72%">&nbsp;</td>
+              </tr>
+              <tr>
+                 <td width="26%" align="right" valign="top"><div class="tableheadtext">${uiLabelMap.OrderShippingAddress}</div></td>
+                 <td width="2%">&nbsp;</td>
+                 <td width="72%">&nbsp;</td>
+              </tr>
+              <tr>
+                <td width="26%" align="right"><div class="tabletext">${uiLabelMap.PartyToName}</div></td>
+                <td width="2%">&nbsp;</td>
+                <td width="72%">
+                  <@fieldErrors fieldName="toName_0"/>
+                  <input type="text" class="inputBox" name="toName_0" value="${parameters.toName_0?if_exists}" size="30" maxlength="30"/>
+                </td>
+              </tr>
+              <tr>
+                <td width="26%" align="right"><div class="tabletext">${uiLabelMap.PartyAttentionName}</div></td>
+                <td width="2%">&nbsp;</td>
+                <td width="72%">
+                  <@fieldErrors fieldName="attnName_0"/>
+                  <input type="text" class="inputBox" name="attnName_0" value="${parameters.attnName_0?if_exists}" size="30" maxlength="30"/>
+                </td>
+              </tr>
+              <tr>
+                 <td width="26%" align="right" valign=middle><div class="tabletext">${uiLabelMap.PartyAddressLine1}</div></td>
+                 <td width="2%">&nbsp;</td>
+                 <td width="72%">
+                    <@fieldErrors fieldName="address1_0"/>
+                    <input type="text" class="inputBox" size="30" maxlength="30" name="address1_0" value="${parameters.address1_0?if_exists}">
+                 *</td>
+              </tr>
+              <tr>
+                 <td width="26%" align="right" valign=middle><div class="tabletext">${uiLabelMap.PartyAddressLine2}</div></td>
+                 <td width="2%">&nbsp;</td>
+                 <td width="72%">
+                    <input type="text" class="inputBox" size="30" maxlength="30" name="address2_0" value="${parameters.address2_0?if_exists}">
+                 </td>
+              </tr>
+              <tr>
+                 <td width="26%" align="right" valign=middle><div class="tabletext">${uiLabelMap.PartyCity}</div></td>
+                 <td width="2%">&nbsp;</td>
+                 <td width="72%">
+                    <@fieldErrors fieldName="city_0"/>
+                    <input type="text" class="inputBox" size="30" maxlength="30" name="city_0" value="${parameters.city_0?if_exists}">
+                 *</td>
+              </tr>
+              <tr>
+                 <td width="26%" align="right" valign=middle><div class="tabletext">${uiLabelMap.PartyState}</div></td>
+                 <td width="2%">&nbsp;</td>
+                 <td width="72%">
+                    <@fieldErrors fieldName="stateProvinceGeoId_0"/>
+                    <select name="stateProvinceGeoId_0" class="selectBox">
+                    <#if (parameters.stateProvinceGeoId_0)?exists>
+                       <option>${parameters.stateProvinceGeoId_0}</option>
+                       <option value="${parameters.stateProvinceGeoId_0}">---</option>
+                    <#else>
+                       <option value="">${uiLabelMap.PartyNoState}</option>
+                    </#if>
+                       ${screens.render("component://common/widget/CommonScreens.xml#states")}
+                    </select>
+                 *</td>
+              </tr>
+              <tr>
+                 <td width="26%" align="right" valign=middle><div class="tabletext">${uiLabelMap.PartyZipCode}</div></td>
+                 <td width="2%">&nbsp;</td>
+                 <td width="72%">
+                    <@fieldErrors fieldName="postalCode_0"/>
+                    <input type="text" class="inputBox" size="12" maxlength="10" name="postalCode_0" value="${parameters.postalCode_0?if_exists}">
+                 *</td>
+              </tr>
+              <tr>
+                 <td width="26%" align="right" valign=middle><div class="tabletext">${uiLabelMap.PartyCountry}</div></td>
+                 <td width="2%">&nbsp;</td>
+                 <td width="72%">
+                    <@fieldErrors fieldName="countryGeoId_0"/>
+                    <select name="countryGeoId_0" class="selectBox">
+                    <#if (parameters.countryGeoId_0)?exists>
+                       <option>${parameters.countryGeoId_0}</option>
+                       <option value="${parameters.countryGeoId_0}">---</option>
+                    </#if>
+                       ${screens.render("component://common/widget/CommonScreens.xml#countries")}
+                    </select>
+                 *</td>
+              </tr>
+            </table>
+         </td>
+         
+        <td width="50%">
+           <table width="100%" border="0" cellpadding="1" cellspacing="0">
+              <tr>
+                <td align="center" valign="top" colspan="3">
+                  <div class="tabletext">
+                    <input type="checkbox" name="usePostalAddress_0ForContactMechPurpose_1" value="Y" <#if usePostalAddress_0ForContactMechPurpose_1?exists>checked</#if>  onClick="javascript:shipBillAddr()"/>
+                    ${uiLabelMap.FacilityBillingAddressSameShipping}
+                  </div>
+                </td>
+              </tr>
+              <tr>
+                 <td width="26%" align="right" valign="top"><div class="tableheadtext">${uiLabelMap.PartyBillingAddress}</div></td>
+                 <td width="2%">&nbsp;</td>
+                 <td width="72%">&nbsp;</td>
+              </tr>
+              <tr>
+                <td width="26%" align="right"><div class="tabletext">${uiLabelMap.PartyToName}</div></td>
+                <td width="2%">&nbsp;</td>
+                <td width="72%">
+                  <@fieldErrors fieldName="toName_1"/>
+                  <input type="text" class="inputBox" name="toName_1" value="${parameters.toName_1?if_exists}" size="30" maxlength="30"/>
+                </td>
+              </tr>
+              <tr>
+                <td width="26%" align="right"><div class="tabletext">${uiLabelMap.PartyAttentionName}</div></td>
+                <td width="2%">&nbsp;</td>
+                <td width="72%">
+                  <@fieldErrors fieldName="attnName_1"/>
+                  <input type="text" class="inputBox" name="attnName_1" value="${parameters.attnName_1?if_exists}" size="30" maxlength="30"/>
+                </td>
+              </tr>
+              <tr>
+                 <td width="26%" align="right" valign=middle><div class="tabletext">${uiLabelMap.PartyAddressLine1}</div></td>
+                 <td width="2%">&nbsp;</td>
+                 <td width="72%">
+                    <@fieldErrors fieldName="address1_1"/>
+                    <input type="text" class="inputBox" size="30" maxlength="30" name="address1_1" value="${parameters.address1_1?if_exists}">
+                 *</td>
+              </tr>
+              <tr>
+                 <td width="26%" align="right" valign=middle><div class="tabletext">${uiLabelMap.PartyAddressLine2}</div></td>
+                 <td width="2%">&nbsp;</td>
+                 <td width="72%">
+                    <input type="text" class="inputBox" size="30" maxlength="30" name="address2_1" value="${parameters.address2_1?if_exists}">
+                 </td>
+              </tr>
+              <tr>
+                 <td width="26%" align="right" valign=middle><div class="tabletext">${uiLabelMap.PartyCity}</div></td>
+                 <td width="2%">&nbsp;</td>
+                 <td width="72%">
+                    <@fieldErrors fieldName="city_1"/>
+                    <input type="text" class="inputBox" size="30" maxlength="30" name="city_1" value="${parameters.city_1?if_exists}">
+                 *</td>
+              </tr>
+              <tr>
+                 <td width="26%" align="right" valign=middle><div class="tabletext">${uiLabelMap.PartyState}</div></td>
+                 <td width="2%">&nbsp;</td>
+                 <td width="72%">
+                    <@fieldErrors fieldName="stateProvinceGeoId_1"/>
+                    <select name="stateProvinceGeoId_1" class="selectBox">
+                    <#if (parameters.stateProvinceGeoId_1)?exists>
+                       <option>${parameters.stateProvinceGeoId_1}</option>
+                       <option value="${parameters.stateProvinceGeoId_1}">---</option>
+                    <#else>
+                       <option value="">${uiLabelMap.PartyNoState}</option>
+                    </#if>
+                       ${screens.render("component://common/widget/CommonScreens.xml#states")}
+                    </select>
+                 *</td>
+              </tr>
+              <tr>
+                 <td width="26%" align="right" valign=middle><div class="tabletext">${uiLabelMap.PartyZipCode}</div></td>
+                 <td width="2%">&nbsp;</td>
+                 <td width="72%">
+                    <@fieldErrors fieldName="postalCode_1"/>
+                    <input type="text" class="inputBox" size="12" maxlength="10" name="postalCode_1" value="${parameters.postalCode_1?if_exists}">
+                 *</td>
+              </tr>
+              <tr>
+                 <td width="26%" align="right" valign=middle><div class="tabletext">${uiLabelMap.PartyCountry}</div></td>
+                 <td width="2%">&nbsp;</td>
+                 <td width="72%">
+                    <@fieldErrors fieldName="countryGeoId_1"/>
+                    <select name="countryGeoId_1" class="selectBox">
+                    <#if (parameters.countryGeoId_1)?exists>
+                       <option>${parameters.countryGeoId_1}</option>
+                       <option value="${parameters.countryGeoId_1}">---</option>
+                    </#if>
+                       ${screens.render("component://common/widget/CommonScreens.xml#countries")}
+                    </select>
+                 *</td>
+              </tr>
+            </table>
+         </td>
+      </tr>
+      <tr>
+         <td colspan="3" align="center">&nbsp;</td>
+      </tr>
+      <tr>
+         <td colspan="3" align="center"><input type="submit" class="smallsubmit" value="${uiLabelMap.CommonContinue}"/></td>
+      </tr>
+  </table>    
+  </form>
+  </div>
+</div>

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

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

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

Added: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/quickAnonOptionSettings.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/quickAnonOptionSettings.ftl?view=auto&rev=490651
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/quickAnonOptionSettings.ftl (added)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/quickAnonOptionSettings.ftl Wed Dec 27 21:08:56 2006
@@ -0,0 +1,168 @@
+<#--
+
+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.
+-->
+<script language="JavaScript" type="text/javascript">
+
+dojo.require("dojo.event.*");
+dojo.require("dojo.io.*");
+
+dojo.addOnLoad(init);
+
+function init() {
+    dojo.event.connect("around", "processOrder", "aroundOptSubmitOrder");
+    var optForm = document.quickAnonOptSetupForm;
+    document.getElementById("noShippingMethodSelectedError").innerHTML = "";
+}
+
+function aroundOptSubmitOrder(invocation) {
+    var formToSubmit = document.quickAnonOptSetupForm;
+    var shipMethodOption = "none";
+    for (var i=0; i < formToSubmit.shipping_method.length; i++) {
+        if (formToSubmit.shipping_method[i].checked){
+            shipMethodOption = formToSubmit.shipping_method[i].value;
+        }
+    }    
+    if (shipMethodOption != "none") {
+        dojo.io.bind({ url: formToSubmit.action, load: function(type, evaldObj){
+           document.getElementById("optInfoSection").innerHTML = evaldObj;
+       
+           var result = invocation.proceed();
+           return result;
+        },formNode: document.quickAnonOptSetupForm});
+    } else {
+        document.getElementById("noShippingMethodSelectedError").innerHTML = "${uiLabelMap.EcommerceMessagePleaseSelectShippingMethod}";
+    }
+}
+
+function eventTrigger (e) {
+    if (! e)
+        e = event;
+    return e.target || e.srcElement;
+}
+
+function onClickShippingMethod(e) {
+    var obj = eventTrigger (e);
+    shippingMethodChanged(obj.value);
+    return true;
+}
+
+</script>
+
+<form id="quickAnonOptSetupForm" method="post" action="<@ofbizUrl>quickAnonProcessShipOptions</@ofbizUrl>" name="quickAnonOptSetupForm">
+<div id="optInfoSection">
+<table  width="100%" >
+    <tr>
+    <td><div class="screenlet">
+        <table hight="100%" >
+              <tr><td><div class="errorMessage" id="noShippingMethodSelectedError"></div></td></tr>
+            <tr>
+                <td>
+                    <div class="head2"><b>${uiLabelMap.OrderMethod}</b></div>
+                </td>
+            </tr>
+            <#list carrierShipmentMethodList as carrierShipmentMethod>
+            <tr>
+                <td>
+                    <div class="tabletext"> 
+                         <#assign shippingMethod = carrierShipmentMethod.shipmentMethodTypeId + "@" + carrierShipmentMethod.partyId>
+                         <input type="radio" onclick="return onClickShippingMethod(event)" name="shipping_method" value="${shippingMethod}" <#if shippingMethod == chosenShippingMethod?default("N@A")>checked</#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>
+            </#list>
+            <#if !carrierShipmentMethodList?exists || carrierShipmentMethodList?size == 0>
+            <tr>
+              <td width="1%" valign="top">
+                <div class="tabletext"><input type="radio"  onclick="return onClickShippingMethod(event)" name="shipping_method" value="Default" checked="checked"/>${uiLabelMap.OrderUseDefault}.</div>
+              </td>
+            </tr>
+            </#if>
+        </table>
+        </div>
+    </td>
+    <td><div>
+        <table hight="100%" >
+            <tr>
+              <td colspan="2">
+                <div class="head2"><b>${uiLabelMap.OrderSpecialInstructions}</b></div>
+              </td>
+            </tr>
+            <tr>
+              <td colspan="2">
+                <textarea class='textAreaBox' cols="30" rows="3" name="shipping_instructions">${shoppingCart.getShippingInstructions()?if_exists}</textarea>
+              </td>
+            </tr>
+            <tr><td colspan="2"><hr class="sepbar"/></td></tr>
+            <tr>
+              <td colspan="2">
+                <span class="head2"><b>${uiLabelMap.OrderPoNumber}</b></span>&nbsp;
+                <input type="text" class='inputBox' name="corresponding_po_id" size="15" value='${shoppingCart.getPoNumber()?if_exists}'/>
+              </td>
+            </tr>
+            <#if productStore.showCheckoutGiftOptions?if_exists != "N">
+            <tr><td colspan="2"><hr class="sepbar"/></td></tr>
+            <tr>
+              <td colspan="2">
+                <div>
+                  <span class="head2"><b>${uiLabelMap.OrderIsThisGift}?</b></span>
+                  <input type='radio' <#if shoppingCart.getIsGift()?default("Y") == "Y">checked</#if> name='is_gift' value='true'/><span class='tabletext'>${uiLabelMap.CommonYes}</span>
+                  <input type='radio' <#if shoppingCart.getIsGift()?default("N") == "N">checked</#if> name='is_gift' value='false'/><span class='tabletext'>${uiLabelMap.CommonNo}</span>
+                </div>
+              </td>
+            </tr>
+            <tr><td colspan="2"><hr class="sepbar"/></td></tr>
+            <tr>
+              <td colspan="2">
+                <div class="head2"><b>${uiLabelMap.OrderGiftMessage}</b></div>
+              </td>
+            </tr>
+            <tr>
+              <td colspan="2">
+                <textarea class='textAreaBox' cols="30" rows="3" name="gift_message">${shoppingCart.getGiftMessage()?if_exists}</textarea>
+              </td>
+            </tr>
+            </#if>
+        </table></div>
+    </td>
+    </tr>
+    <tr><td colspan="2"><hr class="sepbar"/></td></tr>
+    <tr><td colspan="2"><div class="head2"><b>${uiLabelMap.OrderShipAllAtOnce}?</b></div></td></tr>
+    <tr>
+        <td valign="top" colspan="2">
+            <div>
+                <input type='radio' <#if shoppingCart.getMaySplit()?default("N") == "N">checked</#if> name='may_split' value='false'/>
+                <span class="tabletext">${uiLabelMap.OrderPleaseWaitUntilBeforeShipping}.</span>
+            </div>
+        </td>
+    </tr>
+    <tr>
+        <td valign="top"  colspan="2">
+            <div>
+                <input <#if shoppingCart.getMaySplit()?default("N") == "Y">checked</#if> type='radio' name='may_split' value='true'/>
+                <span class="tabletext">${uiLabelMap.OrderPleaseShipItemsBecomeAvailable}.</span>
+            </div>
+        </td>
+    </tr>
+    <tr>
+    </tr>
+</table>
+</div>
+</form>

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

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

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

Added: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/quickAnonOrderHeader.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/quickAnonOrderHeader.ftl?view=auto&rev=490651
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/quickAnonOrderHeader.ftl (added)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/quickAnonOrderHeader.ftl Wed Dec 27 21:08:56 2006
@@ -0,0 +1,158 @@
+<#--
+
+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.
+-->
+
+<#-- NOTE: this template is used for the orderstatus screen in ecommerce AND for order notification emails through the OrderNoticeEmail.ftl file -->
+<#-- the "urlPrefix" value will be prepended to URLs by the ofbizUrl transform if/when there is no "request" object in the context -->
+<#if baseEcommerceSecureUrl?exists><#assign urlPrefix = baseEcommerceSecureUrl/></#if>
+
+<table width="100%" border="0" cellpadding="0" cellspacing="0">
+  <tr>
+    <#-- left side -->
+    <td width="50%" valign="top" align="left">
+
+    <div class="screenlet">
+        <div class="screenlet-header">
+            <div class="boxlink">
+                <#if maySelectItems?default("N") == "Y" && returnLink?default("N") == "Y" && (orderHeader.statusId)?if_exists == "ORDER_COMPLETED">
+                    <a href="<@ofbizUrl>makeReturn?orderId=${orderHeader.orderId}</@ofbizUrl>" class="submenutextright">${uiLabelMap.OrderRequestReturn}</a>
+                </#if>
+            </div>
+            <div class="boxhead">&nbsp;${uiLabelMap.OrderOrder}&nbsp;<#if orderHeader?has_content>${uiLabelMap.OrderNbr}<a href="<@ofbizUrl>orderstatus?orderId=${orderHeader.orderId}</@ofbizUrl>" class="lightbuttontext">${orderHeader.orderId}</a>&nbsp;</#if>${uiLabelMap.CommonInformation}</div>
+        </div>
+        <div class="screenlet-body">
+            <table width="100%" border="0" cellpadding="1">
+                <#-- placing customer information -->
+                <#if localOrderReadHelper?exists && orderHeader?has_content>
+                  <#assign displayParty = localOrderReadHelper.getPlacingParty()?if_exists/>
+                  <#if displayParty?has_content>
+                      <#assign displayPartyNameResult = dispatcher.runSync("getPartyNameForDate", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", displayParty.partyId, "compareDate", orderHeader.orderDate, "userLogin", userLogin))/>
+                  </#if>
+                  <tr>
+                    <td align="right" valign="top" width="15%">
+                      <div class="tabletext">&nbsp;<b>${uiLabelMap.PartyName}</b></div>
+                    </td>
+                    <td width="5">&nbsp;</td>
+                    <td align="left" valign="top" width="80%">
+                      <div class="tabletext">
+                        ${(displayPartyNameResult.fullName)?default("[Name Not Found]")}
+                      </div>
+                    </td>
+                  </tr>
+                  <tr><td colspan="7"><hr class="sepbar"/></td></tr>
+                </#if>
+                <#-- order status information -->
+                <tr>
+                  <td align="right" valign="top" width="15%">
+                    <div class="tabletext">&nbsp;<b>${uiLabelMap.CommonStatus}</b></div>
+                  </td>
+                  <td width="5">&nbsp;</td>
+                  <td align="left" valign="top" width="80%">
+                    <#if orderHeader?has_content>                                                
+                      <div class="tabletext">${localOrderReadHelper.getStatusString()}</div>
+                    <#else>
+                      <div class="tabletext"><b>${uiLabelMap.OrderNotYetOrdered}</b></div>
+                    </#if>
+                  </td>
+                </tr>
+                <#-- ordered date -->
+                <#if orderHeader?has_content>
+                  <tr><td colspan="7"><hr class="sepbar"/></td></tr>
+                  <tr>
+                    <td align="right" valign="top" width="15%">
+                      <div class="tabletext">&nbsp;<b>${uiLabelMap.CommonDate}</b></div>
+                    </td>
+                    <td width="5">&nbsp;</td>
+                    <td align="left" valign="top" width="80%">
+                      <div class="tabletext">${orderHeader.orderDate.toString()}</div>
+                    </td>
+                  </tr>
+                </#if>
+                <#if distributorId?exists>
+                  <tr><td colspan="7"><hr class="sepbar"/></td></tr>
+                  <tr>
+                    <td align="right" valign="top" width="15%">
+                      <div class="tabletext">&nbsp;<b>${uiLabelMap.OrderDistributor}</b></div>
+                    </td>
+                    <td width="5">&nbsp;</td>
+                    <td align="left" valign="top" width="80%">
+                      <div class="tabletext">${distributorId}</div>
+                    </td>
+                  </tr>
+                </#if>
+            </table>
+        </div>
+    </div>
+        ${screens.render("component://ecommerce/widget/OrderScreens.xml#quickAnonPaymentInformation")}
+    </td>
+
+    <td width="1">&nbsp;&nbsp;</td>
+    <#-- right side -->
+
+    <td width="50%" valign="top" align="left">
+      <#if orderItemShipGroups?has_content>
+
+    <div class="screenlet">
+        <div class="screenlet-header">
+            <div class="boxhead">&nbsp;${uiLabelMap.OrderShippingInformation}</div>
+        </div>
+        <div class="screenlet-body">
+        <#-- shipping address -->
+            <#assign groupIdx = 0>
+            <#list orderItemShipGroups as shipGroup>
+                <#if orderHeader?has_content>
+                  <#assign shippingAddress = shipGroup.getRelatedOne("PostalAddress")?if_exists>
+                  <#assign groupNumber = shipGroup.shipGroupSeqId?if_exists>
+                <#else>
+                  <#assign shippingAddress = cart.getShippingAddress(groupIdx)?if_exists>
+                  <#assign groupNumber = groupIdx + 1>
+                </#if>
+
+              <table width="100%" border="0" cellpadding="1">
+                <#if shippingAddress?has_content>
+                  <tr>
+                    <td align="right" valign="top" width="15%">
+                      <div class="tabletext">&nbsp;<b>${uiLabelMap.OrderDestination}</b> [${groupNumber}]</div>
+                    </td>
+                    <td width="5">&nbsp;</td>
+                    <td align="left" valign="top" width="80%">
+                      <div class="tabletext">
+                        <#if shippingAddress.toName?has_content><b>${uiLabelMap.CommonTo}:</b> ${shippingAddress.toName}<br/></#if>
+                        <#if shippingAddress.attnName?has_content><b>${uiLabelMap.PartyAddrAttnName}:</b> ${shippingAddress.attnName}<br/></#if>
+                        ${shippingAddress.address1}<br/>
+                        <#if shippingAddress.address2?has_content>${shippingAddress.address2}<br/></#if>                            
+                        ${shippingAddress.city}<#if shippingAddress.stateProvinceGeoId?has_content>, ${shippingAddress.stateProvinceGeoId} </#if>
+                        ${shippingAddress.postalCode?if_exists}<br/>
+                        ${shippingAddress.countryGeoId?if_exists}
+                      </div>
+                    </td>
+                  </tr>
+                  <tr><td colspan="7"><hr class="sepbar"/></td></tr>
+                </#if>
+                  <tr><td colspan="7">
+                     ${screens.render("component://ecommerce/widget/OrderScreens.xml#quickAnonOptionSettings")}                     
+                  </td></tr>
+              </table>
+
+                <#assign groupIdx = groupIdx + 1>
+            </#list><#-- end list of orderItemShipGroups -->
+        </div>
+    </div>
+
+      </#if>
+    </td>
+  </tr>
+</table>

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

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

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

Added: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/quickAnonPaymentInformation.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/quickAnonPaymentInformation.ftl?view=auto&rev=490651
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/quickAnonPaymentInformation.ftl (added)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/quickAnonPaymentInformation.ftl Wed Dec 27 21:08:56 2006
@@ -0,0 +1,155 @@
+<#--
+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">
+
+dojo.require("dojo.event.*");
+dojo.require("dojo.io.*");
+
+dojo.addOnLoad(init);
+
+function init() {
+    getPaymentInformation();
+    dojo.event.connect("around", "processOrder", "aroundSubmitOrder");
+    var paymentForm = document.setPaymentInformation;
+}
+
+function aroundSubmitOrder(invocation) {
+    var formToSubmit = document.setPaymentInformation;
+    var paymentMethodTypeOption = document.setPaymentInformation.paymentMethodTypeOptionList.options[document.setPaymentInformation.paymentMethodTypeOptionList.selectedIndex].value;
+    if(paymentMethodTypeOption == "none"){
+        document.setPaymentInformation.action = "<@ofbizUrl>quickAnonAddGiftCardToCart</@ofbizUrl>";
+    }
+    
+    dojo.io.bind({ url: formToSubmit.action, load: function(type, evaldObj){
+       if(type == "load"){
+           if(paymentMethodTypeOption == "EXT_OFFLINE"){
+               var result = invocation.proceed();
+               return result;
+           }else {
+               if(paymentMethodTypeOption == "none"){
+                   document.getElementById("noPaymentMethodSelectedError").innerHTML = "${uiLabelMap.EcommerceMessagePleaseSelectPaymentMethod}";
+                   return result;
+               } else {
+                   document.getElementById("paymentInfoSection").innerHTML = evaldObj;
+               }
+               if(formToSubmit.paymentMethodId.value != "") {
+                   var result = invocation.proceed();
+                   return result;
+               }
+           }
+       }        
+    },formNode: document.setPaymentInformation});
+}
+
+function getGCInfo() {
+    if (document.setPaymentInformation.addGiftCard.checked) {
+      dojo.io.bind({url: "<@ofbizUrl>quickAnonGcInfo</@ofbizUrl>",
+        load: function(type, data, evt){
+          if(type == "load"){
+            document.getElementById("giftCardSection").innerHTML = data;
+          }        
+        },mimetype: "text/html"});    
+    } else {
+        document.getElementById("giftCardSection").innerHTML = "";
+    }
+}
+
+function getPaymentInformation() {
+  document.getElementById("noPaymentMethodSelectedError").innerHTML = "";
+  var paymentMethodTypeOption = document.setPaymentInformation.paymentMethodTypeOptionList.options[document.setPaymentInformation.paymentMethodTypeOptionList.selectedIndex].value;
+  var connectionObject;
+   if(paymentMethodTypeOption.length > 0){
+      if(paymentMethodTypeOption == "CREDIT_CARD"){
+        dojo.io.bind({url: "<@ofbizUrl>quickAnonCcInfo</@ofbizUrl>",
+          load: function(type, data, evt){
+            if(type == "load"){document.getElementById("paymentInfoSection").innerHTML = data;}        
+          },mimetype: "text/html"});
+        document.setPaymentInformation.paymentMethodTypeId.value = "CREDIT_CARD";
+        document.setPaymentInformation.action = "<@ofbizUrl>quickAnonEnterCreditCard</@ofbizUrl>";
+      } else if(paymentMethodTypeOption == "EFT_ACCOUNT"){
+        dojo.io.bind({url: "<@ofbizUrl>quickAnonEftInfo</@ofbizUrl>",
+          load: function(type, data, evt){
+            if(type == "load"){document.getElementById("paymentInfoSection").innerHTML = data;}        
+          },mimetype: "text/html"});
+         document.setPaymentInformation.paymentMethodTypeId.value = "EFT_ACCOUNT";
+        document.setPaymentInformation.action = "<@ofbizUrl>quickAnonEnterEftAccount</@ofbizUrl>";
+      } else if(paymentMethodTypeOption == "EXT_OFFLINE"){
+        document.setPaymentInformation.paymentMethodTypeId.value = "EXT_OFFLINE";
+        document.getElementById("paymentInfoSection").innerHTML = "";
+        document.setPaymentInformation.action = "<@ofbizUrl>quickAnonEnterExtOffline</@ofbizUrl>";
+      } else {
+        document.setPaymentInformation.paymentMethodTypeId.value = "none";
+        document.getElementById("paymentInfoSection").innerHTML = "";
+      }
+   }    
+}
+</script>
+<form id="setPaymentInformation" type="POST" action="<@ofbizUrl>quickAnonAddGiftCardToCart</@ofbizUrl>" name="setPaymentInformation">
+<div class="screenlet">
+    <div class="screenlet-header">
+        <div class='boxhead'>&nbsp;${uiLabelMap.AccountingPaymentInformation}</div>
+    </div>
+    <div class="screenlet-body">
+          <#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?if_exists}"/>
+          <input type="hidden" name="paymentMethodTypeId" value="${paymentMethodTypeId?if_exists}"/>
+          <input type="hidden" name="createNew" value="Y"/>
+          <#if session.getAttribute("billingContactMechId")?exists>
+            <input type="hidden" name="contactMechId" value="${session.getAttribute("billingContactMechId")?if_exists}"/>
+          </#if>
+
+          <table width="100%" border="0" cellpadding="1" cellspacing="0">
+              <tr><td colspan="3"><div class="errorMessage" id="noPaymentMethodSelectedError"></div></td></tr>
+              <tr>
+                 <td width="26%" align="right" valign="top"><div class="tableheadtext">${uiLabelMap.OrderSelectPaymentMethod}</div></td>
+                 <td colspan="2">
+                   <select name="paymentMethodTypeOptionList" class="selectBox"  onChange="javascript:getPaymentInformation();">
+                       <option value="none">Select One</option>
+                     <#if productStorePaymentMethodTypeIdMap.CREDIT_CARD?exists>
+                       <option value="CREDIT_CARD" <#if (parameters.paymentMethodTypeId?default("") == "CREDIT_CARD")> selected</#if>>${uiLabelMap.AccountingVisaMastercardAmexDiscover}</option>
+                     </#if> 
+                     <#if productStorePaymentMethodTypeIdMap.EFT_ACCOUNT?exists>
+                       <option value="EFT_ACCOUNT" <#if (parameters.paymentMethodTypeId?default("") == "EFT_ACCOUNT")> selected</#if>>${uiLabelMap.AccountingAHCElectronicCheck}</option>
+                     </#if>
+                     <#if productStorePaymentMethodTypeIdMap.EXT_OFFLINE?exists>
+                       <option value="EXT_OFFLINE" <#if (parameters.paymentMethodTypeId?default("") == "EXT_OFFLINE")> selected</#if>>${uiLabelMap.OrderPaymentOfflineCheckMoney}</option>
+                     </#if>
+                   </select>                 
+                 </td>
+              </tr>
+              <tr><td nowrap colspan="3"><div id="paymentInfoSection"></div></td></tr>
+              <tr><td colspan="3"><hr class="sepbar"/></td></tr>
+              <#-- gift card fields -->
+              <#if productStorePaymentMethodTypeIdMap.GIFT_CARD?exists>
+              <tr>
+                <td width='26%' nowrap align="right">
+                  <input type="checkbox" id="addGiftCard" name="addGiftCard" value="Y" onClick="javascript:getGCInfo();"/>
+                </td>
+                <td colspan="2" nowrap><div class="tabletext">${uiLabelMap.AccountingCheckGiftCard}</div></td>
+              </tr>
+              <tr><td colspan="3"><div id="giftCardSection"></div></td></tr>
+              </#if>
+          </table>
+    </div>
+</div>
+</form>

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

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

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

Modified: ofbiz/trunk/applications/ecommerce/widget/OrderScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/widget/OrderScreens.xml?view=diff&rev=490651&r1=490650&r2=490651
==============================================================================
--- ofbiz/trunk/applications/ecommerce/widget/OrderScreens.xml (original)
+++ ofbiz/trunk/applications/ecommerce/widget/OrderScreens.xml Wed Dec 27 21:08:56 2006
@@ -410,4 +410,196 @@
         </section>
     </screen>
     
+    <!-- Anonymous Checkout 3 steps entry -->    
+    
+    <screen name="quickAnonOrderHeader">
+        <section>
+            <widgets>
+                <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/order/quickAnonOrderHeader.ftl"/></html></platform-specific>
+            </widgets>
+        </section>
+    </screen>
+    
+    
+    <screen name="quickAnonCheckoutLinks">
+        <section>
+            <actions>
+                <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/quickAnonCheckoutLinks.bsh"/>
+            </actions>
+            <widgets>
+                <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/order/quickAnonCheckoutLinks.ftl"/></html></platform-specific>
+            </widgets>
+        </section>
+    </screen>
+    
+    <screen name="quickAnonCheckoutDecorator">
+        <section>
+            <actions>
+                <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/quickAnonCheckoutLinks.bsh"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <section>
+                            <widgets>  
+                                <include-screen name="quickAnonCheckoutLinks"/>
+                                <decorator-section-include name="body"/>                                
+                            </widgets>
+                        </section>                    
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+
+    <screen name="quickAnonCustSettings">
+        <section>
+            <actions>
+                <set field="rightbarScreenName" value="rightbar"/>
+                <set field="MainColumnStyle" value="rightonly"/>
+                <set field="parameters.formNameValue" value="quickAnonCustSetupForm" global="true"/>
+                
+                <set field="titleProperty" value="PageTitleShippingInformation"/>
+                <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/quickAnonCustSettings.bsh"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="quickAnonCheckoutDecorator">
+                    <decorator-section name="body">
+                        <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/order/quickAnonCustSettings.ftl"/></html></platform-specific>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+
+    <screen name="quickAnonOptionSettings">
+        <section>
+            <actions>
+                <property-map resource="EcommerceUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="ContentUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/>
+                <!--set field="parameters.formNameValue" value="quickAnonOptSetupForm" global="true"/-->
+                
+                <set field="titleProperty" value="PageTitleShippingOptions"/>
+                <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/quickAnonOptionSettings.bsh"/>
+            </actions>
+            <widgets>
+                <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/order/quickAnonOptionSettings.ftl"/></html></platform-specific>
+            </widgets>
+        </section>
+    </screen>
+    
+    <screen name="quickAnonPaymentInformation">
+        <section>
+            <actions>
+                <set field="titleProperty" value="PageTitleBillingInformation"/>
+                <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/quickAnonPaymentInformation.bsh"/>
+                <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/storepaymentoptions.bsh"/>
+            </actions>
+            <widgets>
+               <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/order/quickAnonPaymentInformation.ftl"/></html></platform-specific>
+            </widgets>
+        </section>
+    </screen>
+    
+    <screen name="quickAnonOrderReview">
+        <section>
+            <actions>
+                <set field="titleProperty" value="PageTitleCheckoutReview"/>
+                <set field="parameters.formNameValue" value="quickAnonOrderReview" global="true"/>
+                <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/checkoutreview.bsh"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="quickAnonCheckoutDecorator">
+                    <decorator-section name="body">
+                        <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/order/quickAnonCheckoutReview.ftl"/></html></platform-specific>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+    
+    <screen name="quickAnonCcInfo">
+        <section>
+            <actions>
+                <!-- base/top/specific map first, then more common map added for shared labels --> 
+                <property-map resource="EcommerceUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="ContentUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/>
+                <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/quickAnonPaymentInformation.bsh"/>
+            </actions>
+            <widgets>
+                <platform-specific><html><html-template location="component://common/webcommon/includes/messages.ftl"/></html></platform-specific>
+                <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/order/ccinfo.ftl"/></html></platform-specific>
+            </widgets>
+        </section>
+    </screen>
+    
+    <screen name="quickAnonEftInfo">
+        <section>
+            <actions>
+                <!-- base/top/specific map first, then more common map added for shared labels -->
+                <property-map resource="EcommerceUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="ContentUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/>
+                <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/quickAnonPaymentInformation.bsh"/>
+            </actions>
+            <widgets>
+                <platform-specific><html><html-template location="component://common/webcommon/includes/messages.ftl"/></html></platform-specific>
+                <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/order/eftinfo.ftl"/></html></platform-specific>
+            </widgets>
+        </section>
+    </screen>   
+    
+    <screen name="quickAnonGcInfo">
+        <section>
+            <actions>
+                <!-- base/top/specific map first, then more common map added for shared labels -->
+                <property-map resource="EcommerceUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="ContentUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/>
+                <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/quickAnonPaymentInformation.bsh"/>
+            </actions>
+            <widgets>
+              <platform-specific><html><html-template location="component://common/webcommon/includes/messages.ftl"/></html></platform-specific>
+              <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/order/gcinfo.ftl"/></html></platform-specific>
+            </widgets>
+        </section>
+    </screen>   
+    <screen name="quickAnonOrderItems">
+        <section>
+            <actions>
+                <!-- base/top/specific map first, then more common map added for shared labels -->
+                <property-map resource="EcommerceUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="ContentUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/>
+                <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/checkoutreview.bsh"/>
+                <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/quickAnonPaymentInformation.bsh"/>
+            </actions>
+            <widgets>
+                <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/order/orderitems.ftl"/></html></platform-specific>
+            </widgets>
+        </section>
+    </screen>
+    
 </screens>



Mime
View raw message