From commits-return-8714-apmail-ofbiz-commits-archive=ofbiz.apache.org@ofbiz.apache.org Mon Sep 08 06:36:05 2008 Return-Path: Delivered-To: apmail-ofbiz-commits-archive@www.apache.org Received: (qmail 61155 invoked from network); 8 Sep 2008 06:36:05 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 8 Sep 2008 06:36:05 -0000 Received: (qmail 12534 invoked by uid 500); 8 Sep 2008 06:36:03 -0000 Delivered-To: apmail-ofbiz-commits-archive@ofbiz.apache.org Received: (qmail 12383 invoked by uid 500); 8 Sep 2008 06:36:02 -0000 Mailing-List: contact commits-help@ofbiz.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ofbiz.apache.org Delivered-To: mailing list commits@ofbiz.apache.org Received: (qmail 12374 invoked by uid 99); 8 Sep 2008 06:36:02 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 07 Sep 2008 23:36:02 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 08 Sep 2008 06:35:12 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 42191238899E; Sun, 7 Sep 2008 23:35:44 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r692997 - /ofbiz/trunk/applications/ecommerce/webapp/ecommerce/images/checkoutProcess.js Date: Mon, 08 Sep 2008 06:35:44 -0000 To: commits@ofbiz.apache.org From: mor@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080908063544.42191238899E@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mor Date: Sun Sep 7 23:35:43 2008 New Revision: 692997 URL: http://svn.apache.org/viewvc?rev=692997&view=rev Log: Not entering extension number during one page checkout results in phone number on summary panels like 1-555-5555555-. Fix provided by Brajesh Patel. Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/images/checkoutProcess.js 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=692997&r1=692996&r2=692997&view=diff ============================================================================== --- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/images/checkoutProcess.js (original) +++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/images/checkoutProcess.js Sun Sep 7 23:35:43 2008 @@ -305,8 +305,12 @@ function setDataInShippingCompleted() { var fullName = $('firstName').value + " " +$('lastName').value; + var extension = ""; + if ($F('shipToExtension')) { + extension = "-" + $F('shipToExtension'); + } var shippingContactPhoneNumber = $F('shipToCountryCode')+ "-" + $F('shipToAreaCode') - + "-" + $F('shipToContactNumber')+ "-" + $F('shipToExtension'); + + "-" + $F('shipToContactNumber') + extension; $('completedShipToAttn').update("Attn: " + fullName); $('completedShippingContactNumber').update(shippingContactPhoneNumber); $('completedEmailAddress').update($('emailAddress').value); @@ -400,7 +404,11 @@ function setDataInBillingCompleted() { var fullName = $F('firstNameOnCard') + " " +$F('lastNameOnCard'); $('completedBillToAttn').update("Attn: " + fullName); - var billToPhoneNumber = $F('billToCountryCode') + "-" + $F('billToAreaCode') + "-" +$F('billToContactNumber') + "-" + $F('billToExtension'); + var extension = ""; + if ($F('billToExtension')) { + extension = "-" + $F('billToExtension'); + } + var billToPhoneNumber = $F('billToCountryCode') + "-" + $F('billToAreaCode') + "-" + $F('billToContactNumber') + extension; $('completedBillToPhoneNumber').update(billToPhoneNumber); var cardNumber = "CC#:XXXXXXXXXXXX"+$F('cardNumber').gsub('-','').slice(12,16); $('completedCCNumber').update(cardNumber);