Thanks David for the suggestion. I have reverted this commit in rev. 680926
I will take a pass through the name used on contactMechId for shipping. I think it is used as shippingContactMechId and it can also be changed to shipToContactMechId. Doing this will have all the names prefixed with shipTo for shipping and billTo for billing. - Vikas On Wed, Jul 30, 2008 at 12:22 PM, David E Jones <[EMAIL PROTECTED]> wrote: > > Please revert this change. The term "bill to" is used in various places and > has clear meaning in the business world. Unfortunately plain "billing" > instead of "bill to" is less clear because you don't know if your talking > about a bill from or a bill to. > > -David > > > > On Jul 29, 2008, at 12:30 AM, [EMAIL PROTECTED] wrote: > > Author: mor >> Date: Mon Jul 28 23:30:22 2008 >> New Revision: 680630 >> >> URL: http://svn.apache.org/viewvc?rev=680630&view=rev >> Log: >> Changed contactMechId name for billing to be used as similar to shipping. >> Reported by Jyotsna Rathore, patch from Rishi Solanki >> >> Modified: >> >> ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CheckoutMapProcs.xml >> >> ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml >> >> ofbiz/trunk/applications/ecommerce/webapp/ecommerce/images/checkoutProcess.js >> >> ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl >> >> Modified: >> ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CheckoutMapProcs.xml >> URL: >> http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CheckoutMapProcs.xml?rev=680630&r1=680629&r2=680630&view=diff >> >> ============================================================================== >> --- >> ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CheckoutMapProcs.xml >> (original) >> +++ >> ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CheckoutMapProcs.xml >> Mon Jul 28 23:30:22 2008 >> @@ -124,7 +124,7 @@ >> </simple-map-processor> >> >> <simple-map-processor name="billToAddress"> >> - <process field="billToContactMechId"> >> + <process field="billingContactMechId"> >> <copy to-field="contactMechId" set-if-null="false"/> >> </process> >> <process field="billToName"> >> >> Modified: >> ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml >> URL: >> http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml?rev=680630&r1=680629&r2=680630&view=diff >> >> ============================================================================== >> --- >> ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml >> (original) >> +++ >> ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml >> Mon Jul 28 23:30:22 2008 >> @@ -1154,7 +1154,7 @@ >> <set field="billToAddressAndCreditCardCtx.partyId" >> from-field="partyId"/> >> <set field="creditCardContext.partyId" from-field="partyId"/> >> <set field="creditCardContext.userLogin" >> from-field="userLogin"/> >> - <if-empty field="parameters.billToContactMechId"> >> + <if-empty field="parameters.billingContactMechId"> >> <entity-and entity-name="PartyContactMechPurpose" >> list-name="pcmpList" filter-by-date="true"> >> <field-map field-name="partyId" >> env-name="userLogin.partyId"/> >> <field-map field-name="contactMechPurposeTypeId" >> value="BILLING_LOCATION"/> >> @@ -1172,15 +1172,15 @@ >> <set field="billToAddressAndCreditCardCtx.paymentMethodId" >> from-field="paymentMethod.paymentMethodId"/> >> <!-- Create Credit Card and Address --> >> <call-service service-name="createCreditCardAndAddress" >> in-map-name="billToAddressAndCreditCardCtx"> >> - <result-to-field result-name="contactMechId" >> field-name="parameters.billToContactMechId"/> >> + <result-to-field result-name="contactMechId" >> field-name="parameters.billingContactMechId"/> >> <result-to-field result-name="paymentMethodId" >> field-name="parameters.paymentMethodId"/> >> </call-service> >> <else> >> <!-- Update Credit Card and Address --> >> - <set field="billToAddressAndCreditCardCtx.contactMechId" >> from-field="parameters.billToContactMechId"/> >> + <set field="billToAddressAndCreditCardCtx.contactMechId" >> from-field="parameters.billingContactMechId"/> >> <set field="billToAddressAndCreditCardCtx.paymentMethodId" >> from-field="parameters.paymentMethodId"/> >> <call-service service-name="updateCreditCardAndAddress" >> in-map-name="billToAddressAndCreditCardCtx"> >> - <result-to-field result-name="contactMechId" >> field-name="parameters.billToContactMechId"/> >> + <result-to-field result-name="contactMechId" >> field-name="parameters.billingContactMechId"/> >> <result-to-field result-name="paymentMethodId" >> field-name="parameters.paymentMethodId"/> >> </call-service> >> <entity-and entity-name="PartyContactMechPurpose" >> list-name="pcmpList" filter-by-date="true"> >> @@ -1188,7 +1188,7 @@ >> <field-map field-name="contactMechPurposeTypeId" >> value="BILLING_LOCATION"/> >> </entity-and> >> <first-from-list list-name="pcmpList" entry-name="pcmp"/> >> - <if-compare-field field="parameters.billToContactMechId" >> operator="not-equals" to-field="pcmp.contactMechId"> >> + <if-compare-field field="parameters.billingContactMechId" >> operator="not-equals" to-field="pcmp.contactMechId"> >> <if-not-empty field="pcmp"> >> <set-service-fields >> service-name="deletePartyContactMechPurposeIfExists" map-name="pcmp" >> to-map-name="deletePartyContactMechPurposeCtx"/> >> <call-service >> service-name="deletePartyContactMechPurposeIfExists" >> in-map-name="deletePartyContactMechPurposeCtx"/> >> @@ -1199,7 +1199,7 @@ >> </else> >> </if-empty> >> <field-to-request field-name="parameters.paymentMethodId" >> request-name="paymentMethodId"/> >> - <field-to-request field-name="parameters.billToContactMechId" >> request-name="billToContactMechId"/> >> + <field-to-request >> field-name="parameters.billingContactMechId" >> request-name="billingContactMechId"/> >> </if-compare> >> >> <if-compare field="parameters.useShippingAddressForBilling" >> operator="equals" value="Y"> >> @@ -1220,7 +1220,7 @@ >> <set >> field="createPartyContactMechPurposeCtx.contactMechPurposeTypeId" >> value="BILLING_LOCATION"/> >> <call-service service-name="createPartyContactMechPurpose" >> in-map-name="createPartyContactMechPurposeCtx"/> >> </if-compare-field> >> - <field-to-request >> field-name="parameters.shippingContactMechId" >> request-name="billToContactMechId"/> >> + <field-to-request >> field-name="parameters.shippingContactMechId" >> request-name="billingContactMechId"/> >> >> <set field="creditCardContext.contactMechId" >> from-field="parameters.shippingContactMechId"/> >> <if-empty field="parameters.paymentMethodId"> >> >> Modified: >> ofbiz/trunk/applications/ecommerce/webapp/ecommerce/images/checkoutProcess.js >> URL: >> http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/images/checkoutProcess.js?rev=680630&r1=680629&r2=680630&view=diff >> >> ============================================================================== >> --- >> ofbiz/trunk/applications/ecommerce/webapp/ecommerce/images/checkoutProcess.js >> (original) >> +++ >> ofbiz/trunk/applications/ecommerce/webapp/ecommerce/images/checkoutProcess.js >> Mon Jul 28 23:30:22 2008 >> @@ -369,7 +369,7 @@ >> } else { >> Effect.Fade('billingFormServerError'); >> isBillStepValidate = true; >> - $('billToContactMechId').value = >> data.billToContactMechId; >> + $('billingContactMechId').value = >> data.billingContactMechId; >> $('paymentMethodId').value = data.paymentMethodId; >> } >> }, parameters: $('billingForm').serialize(), requestHeaders: >> {Accept: 'application/json'} >> >> Modified: >> ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl >> URL: >> http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl?rev=680630&r1=680629&r2=680630&view=diff >> >> ============================================================================== >> --- >> ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl >> (original) >> +++ >> ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl >> Mon Jul 28 23:30:22 2008 >> @@ -479,7 +479,7 @@ >> </div> >> <div id="editBillingPanel" class="screenlet-body" >> style="display: none;"> >> <form name="billingForm" id="billingForm" class="theform" >> action="<@ofbizUrl></@ofbizUrl>" method="post"> >> - <input type="hidden" id ="billToContactMechId" >> name="billToContactMechId" >> value="${parameters.billToContactMechId?if_exists}"/> >> + <input type="hidden" id ="billingContactMechId" >> name="billingContactMechId" >> value="${parameters.billingContactMechId?if_exists}"/> >> <input type="hidden" >> id="shippingContactMechIdInBillingForm" name="shippingContactMechId" >> value="${parameters.shippingContactMechId?if_exists}"/> >> <input type="hidden" id="paymentMethodId" >> name="paymentMethodId" value="${parameters.paymentMethodId?if_exists}"/> >> <input type="hidden" id="paymentMethodTypeId" >> name="paymentMethodTypeId" value="CREDIT_CARD"/> >> >> >> >
