You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jo...@apache.org on 2006/12/28 06:08:57 UTC
svn commit: r490651 [1/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/...
Author: jonesde
Date: Wed Dec 27 21:08:56 2006
New Revision: 490651
URL: http://svn.apache.org/viewvc?view=rev&rev=490651
Log:
Applied patch from Anil, others through Tim on Jira #OFBIZ-501; also added license notice for dojo, also updated Libraries Included in OFBiz page on docs.ofbiz.org; this has been tested by a few people, and in my own brief tests it seems to be working quite well
Added:
ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml (with props)
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/order/quickAnonCheckoutLinks.bsh (with props)
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/order/quickAnonCustSettings.bsh (with props)
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/order/quickAnonOptionSettings.bsh (with props)
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/order/quickAnonPaymentInformation.bsh (with props)
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/ccinfo.ftl (with props)
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/eftinfo.ftl (with props)
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/gcinfo.ftl (with props)
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/quickAnonCheckoutLinks.ftl (with props)
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/quickAnonCheckoutReview.ftl (with props)
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/quickAnonCustSettings.ftl (with props)
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/quickAnonOptionSettings.ftl (with props)
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/quickAnonOrderHeader.ftl (with props)
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/quickAnonPaymentInformation.ftl (with props)
ofbiz/trunk/framework/images/webapp/images/dojo.js (with props)
Modified:
ofbiz/trunk/LICENSE
ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.properties
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/controller.xml
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/login.ftl
ofbiz/trunk/applications/ecommerce/widget/OrderScreens.xml
Modified: ofbiz/trunk/LICENSE
URL: http://svn.apache.org/viewvc/ofbiz/trunk/LICENSE?view=diff&rev=490651&r1=490650&r2=490651
==============================================================================
--- ofbiz/trunk/LICENSE (original)
+++ ofbiz/trunk/LICENSE Wed Dec 27 21:08:56 2006
@@ -373,6 +373,7 @@
ofbiz/trunk/specialpurpose/pos/lib/looks-2.0.2.jar
ofbiz/trunk/framework/webapp/lib/MinML2.jar
ofbiz/trunk/framework/base/lib/javolution.jar
+ofbiz/trunk/framework/images/webapp/images/dojo.js
=========================================================================
The BSD License
Modified: ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.properties?view=diff&rev=490651&r1=490650&r2=490651
==============================================================================
--- ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.properties (original)
+++ ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.properties Wed Dec 27 21:08:56 2006
@@ -204,6 +204,8 @@
EcommerceMessage3=Select a New Billing Address:
EcommerceMessageListForForum=Message list for forum:
EcommerceMessages=Messages
+EcommerceMessagePleaseSelectPaymentMethod = Please Select Payment Method
+EcommerceMessagePleaseSelectShippingMethod = Please Select Shipping Method
EcommerceMonths=months
EcommerceNbr=#
EcommerceNbrOfDays=Nbr of days
@@ -576,6 +578,7 @@
PartyMobilePhone=Mobile phone
PartyName=Name
PartyNameAndShippingAddress=Name and Shipping Address
+PartyNameAndConactInfo =Name Phone and Email
PartyNewContactHavePurpose=Note: this new contact information will have the purpose
PartyNewPassword=New Password
PartyNewPasswordVerify=New Password Verify
Added: ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml?view=auto&rev=490651
==============================================================================
--- ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml (added)
+++ ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml Wed Dec 27 21:08:56 2006
@@ -0,0 +1,624 @@
+<?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
+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.
+-->
+
+<simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/simple-methods.xsd">
+
+ <!-- =========================================== -->
+ <!-- ======== Anonymous Checkout Events ======== -->
+ <!-- =========================================== -->
+
+ <simple-method method-name="validateUserInfo" short-description="Validate User Information" login-required="false">
+ <property-to-field resource="security" property="username.lowercase" default="false" field-name="username_lowercase"/>
+ <property-to-field resource="security" property="password.lowercase" default="false" field-name="password_lowercase"/>
+ <set field="default_user_password" value="ungssblepsswd" />
+ <now-timestamp-to-env env-name="nowStamp"/>
+
+ <if-compare field-name="create_allow_password" operator="not-equals" value="true">
+ <set field="parameters.password" from-field="default_user_password" />
+ <set field="parameters.confirmPassword" from-field="default_user_password" />
+ <set field="parameters.passwordHint" value="No hint set, accout not yet enabled" />
+ </if-compare>
+
+ <!-- if username and/or password should be lowercased, do that now -->
+ <if-compare field-name="username_lowercase" operator="equals" value="true">
+ <call-object-method obj-field-name="username" obj-map-name="parameters" method-name="toLowerCase" ret-field-name="username" ret-map-name="parameters"/>
+ </if-compare>
+ <if-compare field-name="password_lowercase" operator="equals" value="true">
+ <call-object-method obj-field-name="password" obj-map-name="parameters" method-name="toLowerCase" ret-field-name="password" ret-map-name="parameters"/>
+ <call-object-method obj-field-name="confirmPassword" obj-map-name="parameters" method-name="toLowerCase" ret-field-name="confirmPassword" ret-map-name="parameters"/>
+ </if-compare>
+
+ <!-- Create the UserLogin Record -->
+ <if-not-empty field-name="userLoginId" map-name="parameters">
+ <call-map-processor in-map-name="parameters" out-map-name="userLoginContext">
+ <simple-map-processor name="newUserLogin">
+ <process field="userLoginId"><copy to-field="userLoginId"/><not-empty><fail-property resource="PartyUiLabels" property="PartyUserNameMissing"/></not-empty></process>
+ <process field="password"><copy to-field="currentPassword"/><not-empty><fail-property resource="PartyUiLabels" property="PartyPasswordMissing"/></not-empty></process>
+ <process field="confirmPassword">
+ <compare-field operator="equals" field="password"><fail-property resource="PartyUiLabels" property="PartyPasswordMatchError"/></compare-field>
+ <!-- This is checked below in the checkNewPassword method in the bsh block: <not-empty><fail-property resource="PartyUiLabels" property="PartyEnterPasswordTwice"/></not-empty> -->
+ <copy to-field="currentPasswordVerify"/>
+ </process>
+ <process field="passwordHint"><copy to-field="passwordHint"/></process>
+ </simple-map-processor>
+ </call-map-processor>
+ <if-not-empty field-name="userLoginId" map-name="userLoginContext">
+ <set field=" userLoginExistsMap.userLoginId" from-field="userLoginContext.userLoginId" />
+ <find-by-primary-key entity-name="UserLogin" map-name="userLoginExistsMap" value-name="existingUserLogin"/>
+ <if-not-empty field-name="existingUserLogin">
+ <set field="tempErrorMessage" value="Username in use, please choose another." />
+ <field-to-list field-name="tempErrorMessage" list-name="error_list"/>
+ </if-not-empty>
+ </if-not-empty>
+
+ <make-value entity-name="UserLogin" value-name="newUserLogin"/>
+ <set field="newUserLogin.userLoginId" from-field="userLoginContext.userLoginId"/>
+ <set field="newUserLogin.currentPassword" from-field="userLoginContext.currentPassword" />
+ <set field="newUserLogin.passwordHint" from-field="userLoginContext.passwordHint" />
+
+ <!-- Check the password, etc for validity -->
+ <call-bsh><![CDATA[
+ String password = (String) userLoginContext.get("currentPassword");
+ String confirmPassword = (String) userLoginContext.get("currentPasswordVerify");
+ String passwordHint = (String) userLoginContext.get("passwordHint");
+ org.ofbiz.common.login.LoginServices.checkNewPassword(newUserLogin, null, password, confirmPassword, passwordHint, error_list, true, locale);
+ ]]></call-bsh>
+ <else>
+ <if-compare field-name="require_login" operator="equals" value="true">
+ <add-error><fail-property resource="PartyUiLabels" property="PartyUserNameMissing"/></add-error>
+ <check-errors/>
+ </if-compare>
+ </else>
+ </if-not-empty>
+
+ <!-- Create the Person -->
+ <call-map-processor in-map-name="parameters" out-map-name="personContext">
+ <simple-map-processor name="newPerson">
+ <process field="firstName"><copy to-field="firstName"/><not-empty><fail-property resource="PartyUiLabels" property="PartyFirstNameMissing"/></not-empty></process>
+ <process field="middleName"><copy to-field="middleName"/></process>
+ <process field="lastName"><copy to-field="lastName"/><not-empty><fail-property resource="PartyUiLabels" property="PartyLastNameMissingError"/></not-empty></process>
+ <process field="personalTitle"><copy to-field="personalTitle"/></process>
+ <process field="suffix"><copy to-field="suffix"/></process>
+ <process field="birthDate"><convert type="Date" to-field="birthDate"><fail-property resource="PartyUiLabels" property="PartyBirthDateMissingError"/></convert></process>
+ <process field="gender"><copy to-field="gender"/></process>
+ </simple-map-processor>
+ </call-map-processor>
+
+ <!-- Create the Home Phone -->
+ <if-not-empty field-name="homeContactNumber" map-name="parameters">
+ <call-map-processor in-map-name="parameters" out-map-name="homePhoneContext">
+ <simple-map-processor name="newTelecomNumber">
+ <process field="roleTypeId"><copy/></process>
+ <process field="homeCountryCode"><copy to-field="countryCode"/></process>
+ <process field="homeAreaCode"><copy to-field="areaCode"/></process>
+ <process field="homeContactNumber"><copy to-field="contactNumber"/></process>
+ <process field="homeExt"><copy to-field="extension"/></process>
+ <process field="homePhoneAllowSol"><copy to-field="allowSolicitation"/></process>
+ </simple-map-processor>
+ </call-map-processor>
+ </if-not-empty>
+
+ <!-- Create the Work Phone -->
+ <if-not-empty field-name="workContactNumber" map-name="parameters">
+ <call-map-processor in-map-name="parameters" out-map-name="workPhoneContext">
+ <simple-map-processor name="newTelecomNumber">
+ <process field="roleTypeId"><copy/></process>
+ <process field="workCountryCode"><copy to-field="countryCode"/></process>
+ <process field="workAreaCode"><copy to-field="areaCode"/></process>
+ <process field="workContactNumber"><copy to-field="contactNumber"/></process>
+ <process field="workExt"><copy to-field="extension"/></process>
+ <process field="workPhoneAllowSol"><copy to-field="allowSolicitation"/></process>
+ </simple-map-processor>
+ </call-map-processor>
+ </if-not-empty>
+
+ <!-- Create the Fax Phone -->
+ <if-not-empty field-name="faxContactNumber" map-name="parameters">
+ <call-map-processor in-map-name="parameters" out-map-name="faxPhoneContext">
+ <simple-map-processor name="newTelecomNumber">
+ <process field="roleTypeId"><copy/></process>
+ <process field="faxCountryCode"><copy to-field="countryCode"/></process>
+ <process field="faxAreaCode"><copy to-field="areaCode"/></process>
+ <process field="faxContactNumber"><copy to-field="contactNumber"/></process>
+ <process field="faxExt"><copy to-field="extension"/></process>
+ <process field="faxAllowSolicitation"><copy to-field="allowSolicitation"/></process>
+ </simple-map-processor>
+ </call-map-processor>
+ </if-not-empty>
+
+ <!-- Create the Mobile Phone -->
+ <if-not-empty field-name="mobileContactNumber" map-name="parameters">
+ <call-map-processor in-map-name="parameters" out-map-name="mobilePhoneContext">
+ <simple-map-processor name="newTelecomNumber">
+ <process field="roleTypeId"><copy/></process>
+ <process field="mobileAreaCode"><copy to-field="countryCode"/></process>
+ <process field="mobileAreaCode"><copy to-field="areaCode"/></process>
+ <process field="mobileContactNumber"><copy to-field="contactNumber"/></process>
+ <process field="mobileExt"><copy to-field="extension"/></process>
+ <process field="mobileAllowSolicitation"><copy to-field="allowSolicitation"/></process>
+ </simple-map-processor>
+ </call-map-processor>
+ </if-not-empty>
+
+ <!-- Check for required Phone -->
+ <if-compare field-name="require_phone" operator="equals" value="true">
+ <if-empty field-name="homeContactNumber" map-name="parameters">
+ <if-empty field-name="workContactNumber" map-name="parameters">
+ <if-empty field-name="mobileContactNumber" map-name="parameters">
+ <call-map-processor in-map-name="parameters" out-map-name="dummymap">
+ <simple-map-processor name="checkRequiredPhone">
+ <process field="requiredPhone">
+ <not-empty><fail-property resource="PartyUiLabels" property="PartyContactTelephoneMissing"/></not-empty>
+ </process>
+ </simple-map-processor>
+ </call-map-processor>
+ </if-empty>
+ </if-empty>
+ </if-empty>
+ </if-compare>
+
+ <!-- Create the email address -->
+ <call-map-processor in-map-name="parameters" out-map-name="emailContext">
+ <simple-map-processor name="newEmail">
+ <process field="roleTypeId"><copy/></process>
+ <process field="emailAddress"><copy to-field="emailAddress"/></process>
+ <process field="emailAllowSolicitation"><copy to-field="allowSolicitation"/></process>
+ </simple-map-processor>
+ </call-map-processor>
+
+ <!-- Check for required E-Mail -->
+ <if-compare field-name="require_email" operator="equals" value="true">
+ <if-empty field-name="emailAddress" map-name="emailContext">
+ <call-map-processor in-map-name="emailContext" out-map-name="dummymap">
+ <simple-map-processor name="checkRequiredEmail">
+ <process field="emailAddress">
+ <not-empty><fail-property resource="PartyUiLabels" property="PartyEmailAddressMissing"/></not-empty>
+ </process>
+ </simple-map-processor>
+ </call-map-processor>
+ </if-empty>
+ <if-not-empty field-name="emailAddress" map-name="emailContext">
+ <call-map-processor in-map-name="emailContext" out-map-name="dummymap">
+ <simple-map-processor name="checkRequiredEmailFormat">
+ <process field="emailAddress">
+ <validate-method method="isEmail">
+ <fail-property resource="PartyUiLabels" property="PartyEmailAddressNotFormattedCorrectly" />
+ </validate-method>
+ </process>
+ </simple-map-processor>
+ </call-map-processor>
+ </if-not-empty>
+ </if-compare>
+
+ <!-- Create the PartyRole -->
+ <set field="partyRoleContext.roleTypeId" from-field="parameters.roleTypeId" />
+
+ <!-- Create the Postal Address -->
+ <if-compare field-name="usePostalAddress_0" operator="equals" value="true">
+ <if-empty field-name="toName_0" map-name="parameters">
+ <set field="parameters.toName_0" value="${personContext.firstName} ${personContext.middleName} ${personContext.lastName}" />
+ </if-empty>
+ <call-map-processor in-map-name="parameters" out-map-name="postalAddressContext_0">
+ <simple-map-processor name="postalAddress">
+ <process field="roleTypeId"><copy/></process>
+ <process field="toName_0"><copy to-field="toName"/><not-empty><fail-property resource="PartyUiLabels" property="PartyToNameMissing"/></not-empty></process>
+ <process field="attnName_0"><copy to-field="attnName"/></process>
+ <process field="address1_0"><copy to-field="address1"/><not-empty><fail-property resource="PartyUiLabels" property="PartyAddressLine1Missing"/></not-empty></process>
+ <process field="address2_0"><copy to-field="address2"/></process>
+ <process field="city_0"><copy to-field="city"/><not-empty><fail-property resource="PartyUiLabels" property="PartyCityMissing"/></not-empty></process>
+ <process field="stateProvinceGeoId_0"><copy to-field="stateProvinceGeoId"/></process>
+ <process field="postalCode_0"><copy to-field="postalCode"/><not-empty><fail-property resource="PartyUiLabels" property="PartyPostalCodeMissing"/></not-empty></process>
+ <process field="countryGeoId_0"><copy to-field="countryGeoId"/><not-empty><fail-property resource="PartyUiLabels" property="PartyCountryMissing"/></not-empty></process>
+ <process field="postalAddressAllowSol_0"><copy to-field="allowSolicitation"/></process>
+ </simple-map-processor>
+ </call-map-processor>
+ <if-compare value="USA" operator="equals" field-name="countryGeoId_0" map-name="parameters">
+ <if-empty field-name="stateProvinceGeoId_0" map-name="parameters">
+ <set field="tempErrorMessage" value="State is missing, and is required for an address in the United States." />
+ <field-to-list field-name="tempErrorMessage" list-name="error_list"/>
+ </if-empty>
+ </if-compare>
+ <if-compare value="CAN" operator="equals" field-name="countryGeoId_0" map-name="parameters">
+ <if-empty field-name="stateProvinceGeoId_0" map-name="parameters">
+ <set field="tempErrorMessage" value="State is missing, and is required for an address in Canada." />
+ <field-to-list field-name="tempErrorMessage" list-name="error_list"/>
+ </if-empty>
+ </if-compare>
+ </if-compare>
+
+ <if-compare value="Y" field-name="parameters.usePostalAddress_0ForContactMechPurpose_1" operator="not-equals">
+ <!-- Check the flag if Second Postal address is not same as First So create Another Postal Address -->
+ <if-compare field-name="usePostalAddress_1" operator="equals" value="true">
+ <if-empty field-name="toName_1" map-name="parameters">
+ <set field="parameters.toName_1" value="${personContext.firstName} ${personContext.middleName} ${personContext.lastName}" />
+ </if-empty>
+ <call-map-processor in-map-name="parameters" out-map-name="postalAddressContext_1">
+ <simple-map-processor name="postalAddress">
+ <process field="roleTypeId"><copy/></process>
+ <process field="toName_1"><copy to-field="toName"/><not-empty><fail-property resource="PartyUiLabels" property="PartyToNameMissing"/></not-empty></process>
+ <process field="attnName_1"><copy to-field="attnName"/></process>
+ <process field="address1_1"><copy to-field="address1"/><not-empty><fail-property resource="PartyUiLabels" property="PartyAddressLine1Missing"/></not-empty></process>
+ <process field="address2_1"><copy to-field="address2"/></process>
+ <process field="city_1"><copy to-field="city"/><not-empty><fail-property resource="PartyUiLabels" property="PartyCityMissing"/></not-empty></process>
+ <process field="stateProvinceGeoId_1"><copy to-field="stateProvinceGeoId"/></process>
+ <process field="postalCode_1"><copy to-field="postalCode"/><not-empty><fail-property resource="PartyUiLabels" property="PartyPostalCodeMissing"/></not-empty></process>
+ <process field="countryGeoId_1"><copy to-field="countryGeoId"/><not-empty><fail-property resource="PartyUiLabels" property="PartyCountryMissing"/></not-empty></process>
+ <process field="postalAddressAllowSol_1"><copy to-field="allowSolicitation"/></process>
+ </simple-map-processor>
+ </call-map-processor>
+ <if-compare value="USA" operator="equals" field-name="countryGeoId_1" map-name="parameters">
+ <if-empty field-name="stateProvinceGeoId_1" map-name="parameters">
+ <set field="tempErrorMessage" value="State is missing, and is required for an address in the United States." />
+ <field-to-list field-name="tempErrorMessage" list-name="error_list"/>
+ </if-empty>
+ </if-compare>
+ <if-compare value="CAN" operator="equals" field-name="countryGeoId_1" map-name="parameters">
+ <if-empty field-name="stateProvinceGeoId_1" map-name="parameters">
+ <set field="tempErrorMessage" value="State is missing, and is required for an address in Canada." />
+ <field-to-list field-name="tempErrorMessage" list-name="error_list"/>
+ </if-empty>
+ </if-compare>
+ </if-compare>
+ </if-compare>
+
+ <!-- create the PartyDataSource entry to track where this info came from... -->
+ <make-value entity-name="PartyDataSource" value-name="partyDataSource"/>
+ <set field="partyDataSource.dataSourceId" value="ECOMMERCE_SITE" />
+ <set field="partyDataSource.fromDate" from-field="nowStamp" />
+ <set field="partyDataSource.isCreate" value="Y" />
+ <!-- get the visit from the session to get the visitId -->
+ <session-to-field field-name="visit"/>
+ <set from-field="visit.visitId" field="partyDataSource.visitId"/>
+ <log level="info" message="Setting up party ${error_list} "/>
+ <!-- now that everything is validated & setup, check to see if there are errors, then call the services -->
+ <check-errors/>
+ </simple-method>
+
+ <simple-method method-name="createUpdateUser" short-description="Create or Update User" login-required="false">
+
+ <call-simple-method method-name="validateUserInfo"/>
+ <!-- see if we should continue now... -->
+ <check-errors/>
+
+ <if-empty field-name="parameters.partyId">
+ <!-- call the create person service -->
+ <call-service service-name="createPerson" in-map-name="personContext">
+ <result-to-field result-name="partyId" field-name="partyId"/>
+ <result-to-request result-name="partyId"/>
+ </call-service>
+ <if-empty field-name="userLogin">
+ <if-empty field-name="newUserLogin">
+ <!-- the rest of the methods require a userLogin object; so if we are anonymous lets fake it -->
+ <set field="ulLookup.userLoginId" value="anonymous"/>
+ <find-by-primary-key entity-name="UserLogin" map-name="ulLookup" value-name="userLogin"/>
+ <set field="userLogin.partyId" from-field="partyId"/>
+ <set-current-user-login value-name="userLogin"/>
+ <else>
+ <set-current-user-login value-name="userLoginContext"/>
+ </else>
+ </if-empty>
+ <else><!-- of an anonymous vistor is coming back, update the party id in the userLogin object -->
+ <if-compare field-name="userLogin.userLoginId" value="anonymous" operator="equals">
+ <set field="userLogin.partyId" from-field="partyId"/>
+ </if-compare>
+ </else>
+ </if-empty>
+ <set field="partyRoleContext.partyId" from-field="partyId" />
+ <call-service service-name="createPartyRole" in-map-name="partyRoleContext"/>
+ <else>
+ <set from-field="parameters.partyId" field="personContext.partyId"/>
+ <call-service service-name="updatePerson" in-map-name="personContext"/>
+ <set field="partyId" from-field="parameters.partyId"/>
+ </else>
+ </if-empty>
+
+ <!-- now that we have the partyId, put it where it needs to go... -->
+ <set field="partyDataSource.partyId" from-field="partyId" />
+ <set field="userLoginContext.partyId" from-field="partyId" />
+ <set field="personContext.partyId" from-field="partyId" />
+ <set field="postalAddressContext_0.partyId" from-field="partyId" />
+ <set field="postalAddressContext_1.partyId" from-field="partyId" />
+ <set field="homePhoneContext.partyId" from-field="partyId" />
+ <set field="workPhoneContext.partyId" from-field="partyId" />
+ <set field="faxPhoneContext.partyId" from-field="partyId" />
+ <set field="mobilePhoneContext.partyId" from-field="partyId" />
+ <set field="emailContext.partyId" from-field="partyId" />
+
+ <if-not-empty field-name="newUserLogin">
+ <!-- If password encryption is enabled, encrpyt it now -->
+ <call-bsh><![CDATA[
+ boolean useEncryption = "true".equals(org.ofbiz.base.util.UtilProperties.getPropertyValue("security.properties", "password.encrypt"));
+ if (useEncryption) { newUserLogin.set("currentPassword", org.ofbiz.base.crypto.HashCrypt.getDigestHash((String) newUserLogin.get("currentPassword"))); }
+ ]]></call-bsh>
+ <!-- create the UserLogin manually to get around ordering and security constraints in the service -->
+ <set field="userLoginContext.partyId" from-field="partyId" />
+ <create-value value-name="newUserLogin"/>
+ </if-not-empty>
+
+ <create-value value-name="partyDataSource"/>
+
+ <!-- add contactMechPurposeTypeId for first Postal Address -->
+ <if-compare field-name="usePostalAddress_0" operator="equals" value="true">
+ <if-empty field-name="parameters.postalAddressContactMechId_0">
+ <set field="postalAddressContext_0.contactMechPurposeTypeId" from-field="parameters.contactMechPurposeTypeId_0" default-value="SHIPPING_LOCATION"/>
+ <call-service service-name="createPartyPostalAddress" in-map-name="postalAddressContext_0">
+ <result-to-field result-name="contactMechId" field-name="parameters.postalAddressContactMechId_0"/>
+ </call-service>
+ <if-compare value="Y" field-name="parameters.usePostalAddress_0ForContactMechPurpose_1" operator="equals">
+ <set field="addressPurposeContext.partyId" from-field="partyId"/>
+ <set field="addressPurposeContext.contactMechPurposeTypeId" from-field="parameters.contactMechPurposeTypeId_1" default-value="BILLING_LOCATION"/>
+ <set field="addressPurposeContext.contactMechId" from-field="parameters.postalAddressContactMechId_0"/>
+ <call-service service-name="createPartyContactMechPurpose" in-map-name="addressPurposeContext"/>
+ </if-compare>
+ <else>
+ <set field="postalAddressContext_0.contactMechId" from-field="parameters.postalAddressContactMechId_0"/>
+ <!-- call the update address service -->
+ <call-service service-name="updatePartyPostalAddress" in-map-name="postalAddressContext_0">
+ <result-to-field result-name="contactMechId" field-name="parameters.postalAddressContactMechId_0"/>
+ </call-service>
+ </else>
+ </if-empty>
+ </if-compare>
+
+ <if-compare value="Y" field-name="parameters.usePostalAddress_0ForContactMechPurpose_1" operator="not-equals">
+ <if-empty field-name="parameters.postalAddressContactMechId_1">
+ <!-- create the Billing location -->
+ <set field="postalAddressContext_1.contactMechPurposeTypeId" from-field="parameters.contactMechPurposeTypeId_1" default-value="BILLING_LOCATION"/>
+ <call-service service-name="createPartyPostalAddress" in-map-name="postalAddressContext_1">
+ <result-to-field result-name="contactMechId" field-name="parameters.postalAddressContactMechId_1"/>
+ </call-service>
+ <else>
+ <set field="postalAddressContext_1.contactMechId" from-field="parameters.postalAddressContactMechId_1"/>
+ <!-- call the update address service -->
+ <call-service service-name="updatePartyPostalAddress" in-map-name="postalAddressContext_1">
+ <result-to-field result-name="contactMechId" field-name="parameters.postalAddressContactMechId_1"/>
+ </call-service>
+ </else>
+ </if-empty>
+ </if-compare>
+
+ <!-- home phone -->
+ <if-not-empty field-name="homeContactNumber" map-name="parameters">
+ <if-empty field-name="parameters.homePhoneContactMechId">
+ <!-- create home phone -->
+ <set field="homePhoneContext.contactMechPurposeTypeId" value="PHONE_HOME"/>
+ <!-- call create telecom service -->
+ <call-service service-name="createPartyTelecomNumber" in-map-name="homePhoneContext">
+ <result-to-field result-name="contactMechId" field-name="parameters.homePhoneContactMechId"/>
+ </call-service>
+ <else>
+ <set field="homePhoneContext.contactMechId" from-field="parameters.homePhoneContactMechId"/>
+ <!-- call update telecom service -->
+ <call-service service-name="updatePartyTelecomNumber" in-map-name="homePhoneContext">
+ <result-to-field result-name="contactMechId" field-name="parameters.homePhoneContactMechId"/>
+ </call-service>
+ </else>
+ </if-empty>
+ </if-not-empty>
+
+ <!-- work phone -->
+ <if-not-empty field-name="workContactNumber" map-name="parameters">
+ <if-empty field-name="parameters.workPhoneContactMechId">
+ <!-- create work phone -->
+ <set field="workPhoneContext.contactMechPurposeTypeId" value="PHONE_WORK"/>
+ <!-- call create telecom service -->
+ <call-service service-name="createPartyTelecomNumber" in-map-name="workPhoneContext">
+ <result-to-field result-name="contactMechId" field-name="parameters.workPhoneContactMechId"/>
+ </call-service>
+ <else>
+ <set field="workPhoneContext.contactMechId" from-field="parameters.workPhoneContactMechId"/>
+ <!-- call update telecom service -->
+ <call-service service-name="updatePartyTelecomNumber" in-map-name="workPhoneContext">
+ <result-to-field result-name="contactMechId" field-name="parameters.workPhoneContactMechId"/>
+ </call-service>
+ </else>
+ </if-empty>
+ </if-not-empty>
+
+ <!-- fax phone -->
+ <if-not-empty field-name="faxContactNumber" map-name="parameters">
+ <if-empty field-name="parameters.faxPhoneContactMechId">
+ <!-- create fax phone -->
+ <set field="faxPhoneContext.contactMechPurposeTypeId" value="FAX_NUMBER"/>
+ <!-- call create telecom service -->
+ <call-service service-name="createPartyTelecomNumber" in-map-name="faxPhoneContext">
+ <result-to-field result-name="contactMechId" field-name="parameters.faxPhoneContactMechId"/>
+ </call-service>
+ <else>
+ <set field="faxPhoneContext.contactMechId" from-field="parameters.faxPhoneContactMechId"/>
+ <!-- call update telecom service -->
+ <call-service service-name="updatePartyTelecomNumber" in-map-name="faxPhoneContext">
+ <result-to-field result-name="contactMechId" field-name="parameters.faxPhoneContactMechId"/>
+ </call-service>
+ </else>
+ </if-empty>
+ </if-not-empty>
+
+ <!-- mobile phone -->
+ <if-not-empty field-name="mobileContactNumber" map-name="parameters">
+ <if-empty field-name="parameters.mobilePhoneContactMechId">
+ <set field="mobilePhoneContext.contactMechPurposeTypeId" value="PHONE_MOBILE"/>
+ <!-- call create telecom service -->
+ <call-service service-name="createPartyTelecomNumber" in-map-name="mobilePhoneContext">
+ <result-to-field result-name="contactMechId" field-name="parameters.mobilePhoneContactMechId"/>
+ </call-service>
+ <else>
+ <set field="mobilePhoneContext.contactMechId" from-field="parameters.mobilePhoneContactMechId"/>
+ <!-- call update telecom service -->
+ <call-service service-name="updatePartyTelecomNumber" in-map-name="mobilePhoneContext">
+ <result-to-field result-name="contactMechId" field-name="parameters.mobilePhoneContactMechId"/>
+ </call-service>
+ </else>
+ </if-empty>
+ </if-not-empty>
+
+ <!-- email address -->
+ <if-not-empty field-name="emailAddress" map-name="parameters">
+ <if-empty field-name="emailContactMechId" map-name="parameters">
+ <set field="emailContext.contactMechPurposeTypeId" value="PRIMARY_EMAIL" />
+ <call-service service-name="createPartyEmailAddress" in-map-name="emailContext">
+ <result-to-field result-name="contactMechId" field-name="parameters.emailContactMechId"/>
+ </call-service>
+ <else>
+ <set field="emailContext.contactMechId" from-field="parameters.emailContactMechId"/>
+ <!-- call update Email address -->
+ <call-service service-name="updatePartyEmailAddress" in-map-name="emailContext">
+ <result-to-field result-name="contactMechId" field-name="parameters.emailContactMechId"/>
+ </call-service>
+ </else>
+ </if-empty>
+ </if-not-empty>
+ </simple-method>
+
+ <simple-method method-name="processCustomerSettings" short-description="Process Customer Settings; to be called as a Request Event" login-required="false">
+ <set field="require_email" value="true" />
+ <set field="require_phone" value="true" />
+ <set field="require_login" value="false" />
+ <set field="usePostalAddress_0" value="true"/>
+ <set field="usePostalAddress_1" value="true"/>
+ <!-- this parameter must be set to true or the createUser method below will use a default password instead of the one entered by user -->
+ <set field="create_allow_password" value="true" />
+
+ <set field="parameters.roleTypeId" value="CUSTOMER" />
+
+ <call-simple-method method-name="createUpdateUser"/>
+ <!-- see if we should continue now... -->
+ <session-to-field field-name="cart" session-name="shoppingCart"/>
+ <session-to-field field-name="userLogin" session-name="userLogin"/>
+ <if-empty field-name="userLogin">
+ <call-object-method obj-field-name="session" method-name="removeAttribute">
+ <string value="autoUserLogin"/>
+ </call-object-method>
+ <check-errors/>
+ <call-object-method obj-field-name="session" method-name="removeAttribute">
+ <string value="autoName"/>
+ </call-object-method>
+ <check-errors/>
+ <if-not-empty field-name="cart">
+ <call-bsh><![CDATA[
+ // clear out the login fields from the cart
+ try {
+ if (cart!=null) cart.setAutoUserLogin(null, dispatcher);
+ } catch (CartItemModifyException e) {
+ Debug.logError(e, module);
+ }
+ ]]></call-bsh>
+ </if-not-empty>
+ <set from-field="partyId" field="partyId" />
+ <if-not-empty field-name="partyId">
+ <set field="lookupKeyValue.userLoginId" value="anonymous"/>
+ <find-by-primary-key map-name="lookupKeyValue" entity-name="UserLogin" value-name="userLogin"/>
+ <if-not-empty field-name="userLogin">
+ <set field="userLogin.partyId" from-field="partyId"/>
+ <field-to-session field-name="userLogin" session-name="userLogin" />
+ <if-not-empty field-name="cart">
+ <call-object-method obj-field-name="cart" method-name="setOrderPartyId">
+ <field field-name="partyId"/>
+ </call-object-method>
+ <call-bsh><![CDATA[
+ // clear out the login fields from the cart
+ try {
+ if (cart!=null) cart.setUserLogin(userLogin, dispatcher);
+ } catch (CartItemModifyException e) {
+ Debug.logError(e, module);
+ }
+ ]]></call-bsh>
+ </if-not-empty>
+ </if-not-empty>
+ </if-not-empty>
+ </if-empty>
+ <check-errors/>
+
+ <if-not-empty field-name="cart">
+ <call-object-method obj-field-name="cart" method-name="addContactMech">
+ <string value="SHIPPING_LOCATION"/>
+ <field field-name="parameters.postalAddressContactMechId_0"/>
+ </call-object-method>
+ <call-object-method obj-field-name="cart" method-name="setShippingContactMechId">
+ <field field-name="parameters.postalAddressContactMechId_0"/>
+ </call-object-method>
+ </if-not-empty>
+
+
+ <if-compare value="Y" field-name="parameters.usePostalAddress_0ForContactMechPurpose_1" operator="not-equals">
+ <field-to-session field-name="parameters.postalAddressContactMechId_1" session-name="billingContactMechId"></field-to-session>
+ <else>
+ <if-not-empty field-name="cart">
+ <call-object-method obj-field-name="cart" method-name="getShippingContactMechId" ret-field-name="shippingContactMechId"/>
+ </if-not-empty>
+ <field-to-session field-name="shippingContactMechId" session-name="billingContactMechId"></field-to-session>
+ </else>
+ </if-compare>
+ <!-- set the partyId in the request -->
+ <field-to-request field-name="partyId" request-name="partyId"/>
+ </simple-method>
+
+ <simple-method method-name="processShipOptions" short-description="Process Ship Options; to be called as a Request Event" login-required="false">
+ <call-bsh><![CDATA[
+ shipmentMethod = parameters.get("shipping_method");
+ if(shipmentMethod != null){
+ parameters.put("shipmentMethodTypeId", shipmentMethod.substring(0, shipmentMethod.indexOf("@")));
+ parameters.put("carrierPartyId", shipmentMethod.substring(shipmentMethod.indexOf("@")+1));
+ }
+ ]]></call-bsh>
+ <session-to-field field-name="cart" session-name="shoppingCart"/>
+ <if-not-empty field-name="cart">
+ <set field="shipmentMethodTypeId" from-field="parameters.shipmentMethodTypeId" />
+ <call-object-method obj-field-name="cart" method-name="setShipmentMethodTypeId">
+ <field field-name="shipmentMethodTypeId"/>
+ </call-object-method>
+
+ <set field="carrierPartyId" from-field="parameters.carrierPartyId" />
+ <call-object-method obj-field-name="cart" method-name="setCarrierPartyId">
+ <field field-name="carrierPartyId"/>
+ </call-object-method>
+
+ <set field="maySplit" from-field="parameters.may_split" type="Boolean" default-value="false"/>
+ <call-object-method obj-field-name="cart" method-name="setMaySplit">
+ <field field-name="maySplit" type="Boolean"/>
+ </call-object-method>
+
+ <set field="shippingInstruction" from-field="parameters.shipping_instructions" type="String"/>
+ <if-not-empty field-name="shippingInstruction">
+ <call-object-method obj-field-name="cart" method-name="setShippingInstructions">
+ <field field-name="shippingInstruction" type="String"/>
+ </call-object-method>
+ </if-not-empty>
+
+ <set field="correspondingPoId" from-field="parameters.corresponding_po_id" type="String"/>
+ <if-not-empty field-name="correspondingPoId">
+ <call-object-method obj-field-name="cart" method-name="setPoNumber">
+ <field field-name="correspondingPoId" type="String"/>
+ </call-object-method>
+ </if-not-empty>
+
+ <set field="isGift" from-field="parameters.is_gift" type="Boolean" default-value="false" />
+ <call-object-method obj-field-name="cart" method-name="setIsGift">
+ <field field-name="isGift" type="Boolean"/>
+ </call-object-method>
+
+ <set field="giftMessage" from-field="parameters.gift_message" type="String"/>
+ <if-not-empty field-name="giftMessage">
+ <call-object-method obj-field-name="cart" method-name="setGiftMessage">
+ <field field-name="giftMessage" type="String"/>
+ </call-object-method>
+ </if-not-empty>
+ </if-not-empty>
+ </simple-method>
+
+</simple-methods>
Propchange: ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/order/quickAnonCheckoutLinks.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/order/quickAnonCheckoutLinks.bsh?view=auto&rev=490651
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/order/quickAnonCheckoutLinks.bsh (added)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/order/quickAnonCheckoutLinks.bsh Wed Dec 27 21:08:56 2006
@@ -0,0 +1,29 @@
+/*
+ *
+ * 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.
+ */
+import org.ofbiz.order.shoppingcart.ShoppingCartEvents;
+
+shoppingCart = ShoppingCartEvents.getCartObject(request);
+
+userLogin = context.get("userLogin");
+if (userLogin != null) {
+ context.put("enableShippingAddress",true);
+}
+
+shippingContactMechId = shoppingCart.getShippingContactMechId();
+if (shippingContactMechId !=null && !shippingContactMechId.equals("")) {
+ context.put("enableShipmentMethod",true);
+}
Propchange: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/order/quickAnonCheckoutLinks.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/order/quickAnonCheckoutLinks.bsh
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/order/quickAnonCheckoutLinks.bsh
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/order/quickAnonCustSettings.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/order/quickAnonCustSettings.bsh?view=auto&rev=490651
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/order/quickAnonCustSettings.bsh (added)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/order/quickAnonCustSettings.bsh Wed Dec 27 21:08:56 2006
@@ -0,0 +1,141 @@
+/*
+ * 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.
+ */
+
+import org.ofbiz.base.util.*;
+import org.ofbiz.entity.util.EntityUtil;
+import org.ofbiz.entity.*;
+import org.ofbiz.entity.util.*;
+import org.ofbiz.order.shoppingcart.*;
+import org.ofbiz.party.contact.*;
+import org.ofbiz.product.catalog.*;
+
+
+partyId = null;
+
+userLogin = context.get("userLogin");
+if (userLogin != null) {
+ partyId = userLogin.get("partyId");
+}
+
+if (partyId == null && parameters.get("partyId") != null) {
+ partyId = parameters.get("partyId");
+}
+
+if (partyId != null) {
+ parameters.put("partyId", partyId);
+
+ // NOTE: if there was an error, then don't look up and fill in all of this data, just use the values from the previous request (which will be in the parameters Map automagically)
+ if (request.getAttribute("_ERROR_MESSAGE_") == null && request.getAttribute("_ERROR_MESSAGE_LIST_") == null) {
+ person = delegator.findByPrimaryKey("Person", UtilMisc.toMap("partyId", partyId));
+ if (person != null) {
+ context.put("callSubmitForm",true);
+ // should never be null for the anonymous checkout, but just in case
+ parameters.put("firstName", person.get("firstName"));
+ parameters.put("middleName", person.get("middleName"));
+ parameters.put("lastName", person.get("lastName"));
+ }
+
+ // get the Email Address
+ emailPartyContactDetail = EntityUtil.getFirst(EntityUtil.filterByDate(delegator.findByAnd("PartyContactDetailByPurpose",
+ UtilMisc.toMap("partyId", partyId, "contactMechPurposeTypeId", "PRIMARY_EMAIL")), true));
+ if (emailPartyContactDetail != null) {
+ parameters.put("emailContactMechId", emailPartyContactDetail.get("contactMechId"));
+ parameters.put("emailAddress", emailPartyContactDetail.get("infoString"));
+ parameters.put("emailSol", emailPartyContactDetail.get("allowSolicitation"));
+ }
+
+ // get the Phone Numbers
+ homePhonePartyContactDetail = EntityUtil.getFirst(EntityUtil.filterByDate(delegator.findByAnd("PartyContactDetailByPurpose",
+ UtilMisc.toMap("partyId", partyId, "contactMechPurposeTypeId", "PHONE_HOME")), true));
+ if (homePhonePartyContactDetail != null) {
+ parameters.put("homePhoneContactMechId", homePhonePartyContactDetail.get("contactMechId"));
+ parameters.put("homeCountryCode", homePhonePartyContactDetail.get("countryCode"));
+ parameters.put("homeAreaCode", homePhonePartyContactDetail.get("areaCode"));
+ parameters.put("homeContactNumber", homePhonePartyContactDetail.get("contactNumber"));
+ parameters.put("homeExt", homePhonePartyContactDetail.get("extension"));
+ parameters.put("homeSol", homePhonePartyContactDetail.get("allowSolicitation"));
+ }
+
+ workPhonePartyContactDetail = EntityUtil.getFirst(EntityUtil.filterByDate(delegator.findByAnd("PartyContactDetailByPurpose",
+ UtilMisc.toMap("partyId", partyId, "contactMechPurposeTypeId", "PHONE_WORK")), true));
+ if (workPhonePartyContactDetail != null) {
+ parameters.put("workPhoneContactMechId", workPhonePartyContactDetail.get("contactMechId"));
+ parameters.put("workCountryCode", workPhonePartyContactDetail.get("countryCode"));
+ parameters.put("workAreaCode", workPhonePartyContactDetail.get("areaCode"));
+ parameters.put("workContactNumber", workPhonePartyContactDetail.get("contactNumber"));
+ parameters.put("workExt", workPhonePartyContactDetail.get("extension"));
+ parameters.put("workSol", workPhonePartyContactDetail.get("allowSolicitation"));
+ }
+ }
+}
+
+cart = session.getAttribute("shoppingCart");
+cartPartyId = cart.getPartyId();
+context.put("cart", cart);
+
+// nuke the event messages
+request.removeAttribute("_EVENT_MESSAGE_");
+
+if (cartPartyId != null && !cartPartyId.equals("_NA_")) {
+ cartParty = delegator.findByPrimaryKey("Party", UtilMisc.toMap("partyId", cartPartyId));
+ if(cartParty != null){
+ cartPerson = cartParty.getRelatedOne("Person");
+ context.put("party", cartParty);
+ context.put("person", cartPerson);
+ }
+}
+
+if (cart != null && cart.getShippingContactMechId() != null) {
+ shippingContactMechId = cart.getShippingContactMechId();
+ shippingPartyContactDetail = EntityUtil.getFirst(EntityUtil.filterByDate(delegator.findByAnd("PartyContactDetailByPurpose",
+ UtilMisc.toMap("partyId", cartPartyId, "contactMechId", shippingContactMechId)), true));
+ parameters.put("shippingContactMechId", shippingPartyContactDetail.get("contactMechId"));
+ context.put("callSubmitForm",true);
+ parameters.put("toName_0", shippingPartyContactDetail.get("toName"));
+ parameters.put("attnName_0", shippingPartyContactDetail.get("attnName"));
+ parameters.put("address1_0", shippingPartyContactDetail.get("address1"));
+ parameters.put("address2_0", shippingPartyContactDetail.get("address2"));
+ parameters.put("city_0", shippingPartyContactDetail.get("city"));
+ parameters.put("postalCode_0", shippingPartyContactDetail.get("postalCode"));
+ parameters.put("stateProvinceGeoId_0", shippingPartyContactDetail.get("stateProvinceGeoId"));
+ parameters.put("countryGeoId_0", shippingPartyContactDetail.get("countryGeoId"));
+} else {
+ context.put("postalFields", UtilHttp.getParameterMap(request));
+}
+
+
+billingContactMechId = session.getAttribute("billingContactMechId");
+if(billingContactMechId != null){
+ billPostalAddress = delegator.findByPrimaryKey("PostalAddress",UtilMisc.toMap("contactMechId",billingContactMechId));
+ parameters.put("billingContactMechId", billPostalAddress.get("contactMechId"));
+ parameters.put("toName_1", billPostalAddress.get("toName"));
+ parameters.put("attnName_1", billPostalAddress.get("attnName"));
+ parameters.put("address1_1", billPostalAddress.get("address1"));
+ parameters.put("address2_1", billPostalAddress.get("address2"));
+ parameters.put("city_1", billPostalAddress.get("city"));
+ parameters.put("postalCode_1", billPostalAddress.get("postalCode"));
+ parameters.put("stateProvinceGeoId_1", billPostalAddress.get("stateProvinceGeoId"));
+ parameters.put("countryGeoId_1", billPostalAddress.get("countryGeoId"));
+}
+
+if(cart != null && cart.getShippingContactMechId() != null && shippingPartyContactDetail != null){
+ shippingContactMechId = shippingPartyContactDetail.get("contactMechId");
+ if(billingContactMechId != null && billingContactMechId.equals(shippingContactMechId)){
+ context.put("usePostalAddress_0ForContactMechPurpose_1","Y");
+ }
+}
+parameters.put("contactMechPurposeTypeId_0", "SHIPPING_LOCATION");
+parameters.put("contactMechPurposeTypeId_1", "BILLING_LOCATION");
Propchange: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/order/quickAnonCustSettings.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/order/quickAnonCustSettings.bsh
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/order/quickAnonCustSettings.bsh
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/order/quickAnonOptionSettings.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/order/quickAnonOptionSettings.bsh?view=auto&rev=490651
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/order/quickAnonOptionSettings.bsh (added)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/order/quickAnonOptionSettings.bsh Wed Dec 27 21:08:56 2006
@@ -0,0 +1,60 @@
+/*
+ *
+ * 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.
+ */
+
+import org.ofbiz.entity.*;
+import org.ofbiz.base.util.*;
+import org.ofbiz.order.shoppingcart.*;
+import org.ofbiz.order.shoppingcart.shipping.*;
+import org.ofbiz.party.contact.*;
+import org.ofbiz.product.store.*;
+
+shoppingCart = session.getAttribute("shoppingCart");
+context.put("shoppingCart", shoppingCart);
+productStore = ProductStoreWorker.getProductStore(request);
+
+itemSizes = new LinkedList();
+featureIdSet = new HashSet();
+shipAddress = null;
+shipWeight = 0.00;
+shipTotal = 0.00;
+
+if (shoppingCart != null) {
+ shippingEstWpr = new ShippingEstimateWrapper(dispatcher, shoppingCart, 0);
+ context.put("shippingEstWpr", shippingEstWpr);
+ context.put("carrierShipmentMethodList", shippingEstWpr.getShippingMethods());
+}
+
+// nuke the event messages
+request.removeAttribute("_EVENT_MESSAGE_");
+
+party = null;
+partyId = session.getAttribute("orderPartyId");
+if (partyId != null) {
+ party = delegator.findByPrimaryKey("Party", UtilMisc.toMap("partyId", partyId));
+ context.put("party", party);
+}
+
+
+context.put("emailList", ContactHelper.getContactMechByType(party, "EMAIL_ADDRESS", false));
+
+if (shoppingCart != null && shoppingCart.getShipmentMethodTypeId() != null && shoppingCart.getCarrierPartyId() != null) {
+ context.put("chosenShippingMethod", shoppingCart.getShipmentMethodTypeId() + '@' + shoppingCart.getCarrierPartyId());
+ context.put("callSubmitForm",true);
+}
+
+context.put("productStoreId", productStore.get("productStoreId"));
+context.put("productStore", productStore);
Propchange: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/order/quickAnonOptionSettings.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/order/quickAnonOptionSettings.bsh
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/order/quickAnonOptionSettings.bsh
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/order/quickAnonPaymentInformation.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/order/quickAnonPaymentInformation.bsh?view=auto&rev=490651
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/order/quickAnonPaymentInformation.bsh (added)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/order/quickAnonPaymentInformation.bsh Wed Dec 27 21:08:56 2006
@@ -0,0 +1,49 @@
+/*
+ *
+ * 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.
+ */
+
+import org.ofbiz.entity.*;
+import org.ofbiz.entity.util.*;
+import org.ofbiz.base.util.*;
+import org.ofbiz.accounting.payment.*;
+import org.ofbiz.order.shoppingcart.*;
+import org.ofbiz.party.contact.*;
+
+cart = ShoppingCartEvents.getCartObject(request);
+context.put("cart", cart);
+
+paymentMethodTypeId = parameters.get("paymentMethodTypeId");
+if(paymentMethodTypeId == null) {
+ parameters.put("paymentMethodTypeId","CREDIT_CARD");
+}
+
+// nuke the event messages
+request.removeAttribute("_EVENT_MESSAGE_");
+
+if (cart != null) {
+ if (cart.getPaymentMethodIds() != null && cart.getPaymentMethodIds().size() > 0) {
+ paymentMethods = cart.getPaymentMethods();
+ paymentMethodIter = paymentMethods.iterator();
+ while (paymentMethodIter.hasNext()) {
+ paymentMethod = (GenericValue)paymentMethodIter.next();
+ if (paymentMethod != null && paymentMethod.getString("paymentMethodTypeId").equals("CREDIT_CARD")) {
+ paymentMethodId = paymentMethod.get("paymentMethodId");
+ parameters.put("paymentMethodId",paymentMethodId);
+ }
+ }
+ }
+}
+
Propchange: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/order/quickAnonPaymentInformation.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/order/quickAnonPaymentInformation.bsh
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/order/quickAnonPaymentInformation.bsh
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/controller.xml?view=diff&rev=490651&r1=490650&r2=490651
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/controller.xml Wed Dec 27 21:08:56 2006
@@ -321,10 +321,24 @@
<request-map uri="processShipOptions">
<security https="true" auth="false"/>
<event type="simple" path="org/ofbiz/ecommerce/customer/CustomerEvents.xml" invoke="processShipOptions"/>
- <response name="success" type="request" value="setPaymentOption"/>
+ <response name="success" type="request" value="setShippingBeforePayment"/>
<response name="error" type="view" value="optionsetting"/>
</request-map>
+ <request-map uri="setShippingBeforePayment">
+ <security direct-request="false"/>
+ <event type="java" path="org.ofbiz.order.shoppingcart.shipping.ShippingEvents" invoke="getShipEstimate"/>
+ <response name="success" type="request" value="setTaxBeforePayment"/>
+ <response name="error" type="view" value="optionsetting"/>
+ </request-map>
+
+ <request-map uri="setTaxBeforePayment">
+ <security direct-request="false"/>
+ <event type="java" path="org.ofbiz.order.shoppingcart.CheckOutEvents" invoke="calcTax"/>
+ <response name="success" type="request" value="setPaymentOption"/>
+ <response name="error" type="view" value="optionsetting"/>
+ </request-map>
+
<request-map uri="setPaymentOption">
<security https="true" auth="false"/>
<response name="success" type="view" value="paymentoptions"/>
@@ -391,7 +405,128 @@
<response name="success" type="view" value="checkoutreview"/>
</request-map>
<!-- End Anonymous checkout requests -->
+
+ <!--Anonymous Checkout 3 steps entry -->
+ <request-map uri="quickAnonSetCustomer">
+ <security https="true" auth="false"/>
+ <response name="success" type="view" value="quickAnonCustSetting"/>
+ </request-map>
+
+ <request-map uri="quickAnonProcessCustomerSettings">
+ <security https="true" auth="false"/>
+ <event type="simple" path="org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml" invoke="processCustomerSettings"/>
+ <response name="success" type="request" value="quickAnonOrderReview"/>
+ <response name="error" type="view" value="quickAnonCustSetting"/>
+ </request-map>
+
+ <request-map uri="quickAnonSetShipOptions">
+ <security https="true" auth="false"/>
+ <response name="success" type="view" value="quickAnonOptionSetting"/>
+ </request-map>
+
+ <request-map uri="quickAnonProcessShipOptions">
+ <security https="true" auth="false"/>
+ <event type="simple" path="org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml" invoke="processShipOptions"/>
+ <response name="success" type="view" value="quickAnonOptionSetting"/>
+ <response name="error" type="view" value="quickAnonOptionSetting"/>
+ </request-map>
+ <request-map uri="quickAnonProcessShipOptionsUpdateOrderItems">
+ <security https="true" auth="false"/>
+ <event type="simple" path="org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml" invoke="processShipOptions"/>
+ <response name="success" type="request" value="quickAnonUpdateShippingChargeOrderItems"/>
+ <response name="error" type="view" value="quickAnonOrderItems"/>
+ </request-map>
+ <request-map uri="quickAnonUpdateShippingChargeOrderItems">
+ <security https="true" auth="false"/>
+ <event type="java" path="org.ofbiz.order.shoppingcart.shipping.ShippingEvents" invoke="getShipEstimate"/>
+ <response name="success" type="view" value="quickAnonOrderItems"/>
+ <response name="error" type="view" value="quickAnonOrderItems"/>
+ </request-map>
+
+ <request-map uri="quickAnonSetShippingBeforePayment">
+ <security direct-request="false"/>
+ <event type="java" path="org.ofbiz.order.shoppingcart.shipping.ShippingEvents" invoke="getShipEstimate"/>
+ <response name="success" type="request" value="quickAnonSetTaxBeforePayment"/>
+ <response name="error" type="view" value="quickAnonOptionSetting"/>
+ </request-map>
+
+ <request-map uri="quickAnonSetTaxBeforePayment">
+ <security direct-request="false"/>
+ <event type="java" path="org.ofbiz.order.shoppingcart.CheckOutEvents" invoke="calcTax"/>
+ <response name="success" type="view" value="quickAnonOrderReview"/>
+ <response name="error" type="view" value="quickAnonCustSetting"/>
+ </request-map>
+
+ <request-map uri="quickAnonEnterCreditCard">
+ <security https="true" auth="false"/>
+ <event type="service" path="" invoke="createCreditCard"/>
+ <response name="success" type="request" value="quickAnonAddCreditCardToCart"/>
+ <response name="error" type="view" value="quickAnonCcInfo"/>
+ </request-map>
+
+ <request-map uri="quickAnonAddCreditCardToCart">
+ <security https="true" auth="false"/>
+ <event type="bsf" path="" invoke="org/ofbiz/ecommerce/order/processPaymentSettings.bsh"/>
+ <response name="success" type="view" value="quickAnonCcInfo"/>
+ <response name="error" type="view" value="quickAnonCcInfo"/>
+ </request-map>
+
+ <request-map uri="quickAnonEnterEftAccount">
+ <security https="true" auth="false"/>
+ <event type="service" path="" invoke="createEftAccount"/>
+ <response name="success" type="request" value="quickAnonAddEftAccountToCart"/>
+ <response name="error" type="view" value="quickAnonEftInfo"/>
+ </request-map>
+
+ <request-map uri="quickAnonAddEftAccountToCart">
+ <security https="true" auth="false"/>
+ <event type="bsf" path="" invoke="org/ofbiz/ecommerce/order/processPaymentSettings.bsh"/>
+ <response name="success" type="view" value="quickAnonEftInfo"/>
+ <response name="error" type="view" value="quickAnonEftInfo"/>
+ </request-map>
+
+ <request-map uri="quickAnonenterExtOffline">
+ <security https="true" auth="false"/>
+ <event type="bsf" path="" invoke="org/ofbiz/ecommerce/order/processPaymentSettings.bsh"/>
+ <response name="success" type="view" value="quickAnonOrderReview"/>
+ <response name="error" type="view" value="quickAnonOrderReview"/>
+ </request-map>
+
+ <request-map uri="quickAnonAddGiftCardToCart">
+ <security https="true" auth="false"/>
+ <event type="bsf" path="" invoke="org/ofbiz/ecommerce/order/processPaymentSettings.bsh"/>
+ <response name="success" type="request" value="quickAnonGcInfo"/>
+ <response name="error" type="view" value="quickAnonGcInfo"/>
+ </request-map>
+
+ <request-map uri="quickAnonOrderReview">
+ <security https="true" auth="false"/>
+ <response name="success" type="request" value="quickAnonSetTaxBeforePayment"/>
+ </request-map>
+
+ <request-map uri="quickAnonCcInfo">
+ <security https="true" auth="false"/>
+ <response name="success" type="view" value="quickAnonCcInfo"/>
+ </request-map>
+
+ <request-map uri="quickAnonEftInfo">
+ <security https="true" auth="false"/>
+ <response name="success" type="view" value="quickAnonEftInfo"/>
+ </request-map>
+
+ <request-map uri="quickAnonGcInfo">
+ <security https="true" auth="false"/>
+ <response name="success" type="view" value="quickAnonGcInfo"/>
+ </request-map>
+
+ <request-map uri="quickAnonProcessOrder">
+ <security https="true" auth="false"/>
+ <response name="success" type="view" value="quickAnonGcInfo"/>
+ </request-map>
+
+ <!--End Anonymous Checkout 3 steps entry -->
+
<request-map uri="checkoutpayment">
<security https="true" auth="true"/>
<response name="success" type="view" value="checkoutpayment"/>
@@ -1324,6 +1459,15 @@
<view-map name="orderhistory" type="screen" page="component://ecommerce/widget/OrderScreens.xml#orderhistory"/>
<view-map name="orderstatus" type="screen" page="component://ecommerce/widget/OrderScreens.xml#orderstatus"/>
<view-map name="requestreturn" type="screen" page="component://ecommerce/widget/OrderScreens.xml#requestreturn"/>
+
+ <!-- Anonymous Checkout 3 steps entry-->
+ <view-map name="quickAnonCustSetting" type="screen" page="component://ecommerce/widget/OrderScreens.xml#quickAnonCustSettings"/>
+ <view-map name="quickAnonOptionSetting" type="screen" page="component://ecommerce/widget/OrderScreens.xml#quickAnonOptionSettings"/>
+ <view-map name="quickAnonOrderReview" type="screen" page="component://ecommerce/widget/OrderScreens.xml#quickAnonOrderReview"/>
+ <view-map name="quickAnonOrderItems" type="screen" page="component://ecommerce/widget/OrderScreens.xml#quickAnonOrderItems"/>
+ <view-map name="quickAnonCcInfo" type="screen" page="component://ecommerce/widget/OrderScreens.xml#quickAnonCcInfo"/>
+ <view-map name="quickAnonGcInfo" type="screen" page="component://ecommerce/widget/OrderScreens.xml#quickAnonGcInfo"/>
+ <view-map name="quickAnonEftInfo" type="screen" page="component://ecommerce/widget/OrderScreens.xml#quickAnonEftInfo"/>
<!-- Customer Info Views -->
<view-map name="survey" type="screen" page="component://ecommerce/widget/CustomerScreens.xml#survey"/>
Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/login.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/login.ftl?view=diff&rev=490651&r1=490650&r2=490651
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/login.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/login.ftl Wed Dec 27 21:08:56 2006
@@ -85,9 +85,12 @@
<div class="boxhead">${uiLabelMap.CommonCheckoutAnonymous}</div>
</div>
<div class="screenlet-body">
+ <div class="tabletext" align="center">${uiLabelMap.CommonCheckoutAnonymousMsg}:</div>
<form method="post" action="<@o...@ofbizUrl>" style="margin: 0;">
- <div class="tabletext" align="center">${uiLabelMap.CommonCheckoutAnonymousMsg}:</div>
<div align="center"><input type="submit" class="smallSubmit" value="Checkout"/></div>
+ </form>
+ <form method="post" action="<@o...@ofbizUrl>" style="margin: 0;">
+ <div align="center"><input type="submit" class="smallSubmit" value="Quick Checkout"/></div>
</form>
</div>
</div>
Added: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/ccinfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/ccinfo.ftl?view=auto&rev=490651
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/ccinfo.ftl (added)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/ccinfo.ftl Wed Dec 27 21:08:56 2006
@@ -0,0 +1,142 @@
+<#--
+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 !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"> </td>
+ <td width="74%"><input type="hidden" name="paymentMethodId" value="${parameters.paymentMethodId?if_exists}"/> </td>
+</tr>
+<tr>
+ <td width="26%" align="right" valign=middle><div class="tabletext">${uiLabelMap.AccountingCompanyNameOnCard}</div></td>
+ <td width="5"> </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"> </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"> </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"> </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"> </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"> </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"> </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"> </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.AccountingExpirationDate}</div></td>
+ <td width="5"> </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"> </td>
+ <td width="74%">
+ <input type="text" class="inputBox" size="20" maxlength="30" name="description" value="${creditCard.description?if_exists}"/>
+ </td>
+</tr>
Propchange: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/ccinfo.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/ccinfo.ftl
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/ccinfo.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/eftinfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/eftinfo.ftl?view=auto&rev=490651
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/eftinfo.ftl (added)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/eftinfo.ftl Wed Dec 27 21:08:56 2006
@@ -0,0 +1,57 @@
+<#--
+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.
+-->
+
+<#-- eft fields -->
+<#if !eftAccount?has_content><#assign eftAccount = requestParameters></#if>
+<tr><td colspan="3"><hr class="sepbar"/>
+<input type="hidden" name="paymentMethodId" value="${parameters.paymentMethodId?if_exists}"/></td></tr>
+<tr><td width="26%" align="right" valign="top"><div class="tableheadtext">${uiLabelMap.AccountingEFTAccountInformation}</div></td><td width="5"> </td><td width="74%"> </td></tr>
+<tr>
+ <td width="26%" align="right" valign=middle><div class="tabletext">${uiLabelMap.AccountingNameOnAccount}</div></td>
+ <td width="5"> </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"> </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"> </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"> </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"> </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"> </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"> </td><td width="74%"><input type="text" class="inputBox" size="30" maxlength="60" name="description" value="${eftAccount.description?if_exists}"/></td>
+</tr>
Propchange: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/eftinfo.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/eftinfo.ftl
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/eftinfo.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/gcinfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/gcinfo.ftl?view=auto&rev=490651
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/gcinfo.ftl (added)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/gcinfo.ftl Wed Dec 27 21:08:56 2006
@@ -0,0 +1,59 @@
+<#--
+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.
+-->
+
+<#-- gift card fields -->
+ <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"> </td>
+ <td width="74%"> </td>
+ </tr>
+ <tr>
+ <td width="26%" align="right" valign=middle><div class="tabletext">${uiLabelMap.AccountingGiftCardNumber}</div></td>
+ <td width="5"> </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"> </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"> </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"> </td>
+ <td width="74%">
+ <input type="text" class="inputBox" size="5" maxlength="10" name="giftCardAmount" value="${giftCard.pinNumber?if_exists}"/>
+ *</td>
+ </tr>
+ </#if>