svn commit: r983936 - in /ofbiz/branches/release10.04: ./ applications/order/script/org/ofbiz/order/order/CheckoutServices.xml mergefromtrunk.bat specialpurpose/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl

Author: jleroux
Date: Tue Aug 10 11:38:57 2010
New Revision: 983936

URL: http://svn.apache.org/viewvc?rev=983936&view=rev
Log:
"Applied fix from trunk for revision: 983930 "
------------------------------------------------------------------------
r983930 | jleroux | 2010-08-10 13:20:55 +0200 (mar. 10 ao–t 2010) | 10 lignes

A patch from Ren‚ Scheibe <<"createUpdateBillingAddressAndPaymentMethod" service called from one page checkout throws Exception due to incorrect field name>> (https://issues.apache.org/jira/browse/OFBIZ-3887) - OFBIZ-3887

Problem:
The method "createUpdateBillingAddressAndPaymentMethod" in CheckoutServices.xml refers to a "billToCardSecurityCode" parameter, which is not existing.
Instead OnePageCheckoutProcess.ftl defines this field with id="CVV2" and name="cardSecurityCode".

Solution:
1. Change the "id" and "name" in OnePageCheckoutProcess.ftl to meet the attribute name of "createUpdateBillingAddressAndPaymentMethod".
2. Extend the attribute mapping line in CheckoutServices.xml so that in case the CVV2 is not entered by the user, the field is defined anyway. (otherwise groovy.lang.MissingPropertyException is still thrown as the field is always accessed)

------------------------------------------------------------------------


Modified:
    ofbiz/branches/release10.04/   (props changed)
    ofbiz/branches/release10.04/applications/order/script/org/ofbiz/order/order/CheckoutServices.xml
    ofbiz/branches/release10.04/mergefromtrunk.bat
    ofbiz/branches/release10.04/specialpurpose/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl

Propchange: ofbiz/branches/release10.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 10 11:38:57 2010
@@ -1,3 +1,3 @@
 /ofbiz/branches/addbirt:831210-885099,885686-886087
 /ofbiz/branches/multitenant20100310:921280-927264
-/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,958343,958514,958521,958752,958758,958769,958953,959456,960491,960997,963610,964558,965470,965916,966525,966785,967098,978806,978893,978939,979104,980641-980642,980935,981051,981104,981123,981288,983920
+/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,958343,958514,958521,958752,958758,958769,958953,959456,960491,960997,963610,964558,965470,965916,966525,966785,967098,978806,978893,978939,979104,980641-980642,980935,981051,981104,981123,981288,983920,983930

Modified: ofbiz/branches/release10.04/applications/order/script/org/ofbiz/order/order/CheckoutServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/order/script/org/ofbiz/order/order/CheckoutServices.xml?rev=983936&r1=983935&r2=983936&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/order/script/org/ofbiz/order/order/CheckoutServices.xml (original)
+++ ofbiz/branches/release10.04/applications/order/script/org/ofbiz/order/order/CheckoutServices.xml Tue Aug 10 11:38:57 2010
@@ -180,7 +180,7 @@ under the License.
             <result-to-result result-name="paymentMethodId"/>
         </call-service>
         <!-- Set Payment Method-->
-        <set field="cardSecurityCode" from-field="parameters.billToCardSecurityCode"/>
+        <set field="cardSecurityCode" from-field="parameters.billToCardSecurityCode" set-if-null="true" set-if-empty="true"/>
         <create-object class-name="org.ofbiz.order.shoppingcart.CheckOutHelper" field="checkOutHelper">
             <field field="dispatcher" type="org.ofbiz.service.LocalDispatcher"/>
             <field field="delegator" type="org.ofbiz.entity.Delegator"/>

Modified: ofbiz/branches/release10.04/mergefromtrunk.bat
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/mergefromtrunk.bat?rev=983936&r1=983935&r2=983936&view=diff
==============================================================================
--- ofbiz/branches/release10.04/mergefromtrunk.bat (original)
+++ ofbiz/branches/release10.04/mergefromtrunk.bat Tue Aug 10 11:38:57 2010
@@ -37,21 +37,25 @@ rem keep the comment.tmp file svn ignore
 rem commit the backport to release with comment fom file
 echo on
 svn merge -r %prevRev%:%version% https://svn.apache.org/repos/asf/ofbiz/trunk
-svn commit -F comment.tmp
 
 
 :menu
 echo y) tests
 echo n) exit
 choice /c:yn Do you want to run tests ?
-if errorlevel = 2 goto exit
+if errorlevel = 2 goto noTests
 if errorlevel = 1 goto tests
 
+:noTests
+svn commit -F comment.tmp
+goto exit
+
 :tests
 ant clean-all
 ant run-install
 ant run-tests
 
+echo you can now do the commit by hand if all is OK
+
 :exit
-echo you can now do the commit by hand
 pause

Modified: ofbiz/branches/release10.04/specialpurpose/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/specialpurpose/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl?rev=983936&r1=983935&r2=983936&view=diff
==============================================================================
--- ofbiz/branches/release10.04/specialpurpose/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl (original)
+++ ofbiz/branches/release10.04/specialpurpose/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl Tue Aug 10 11:38:57 2010
@@ -543,8 +543,8 @@ under the License.
                                 <input id="cardNumber" name="cardNumber" class="required" type="text" value="${cardNumber?if_exists}" size="30" maxlength="16" />
                             </span>
                             <span>
-                                <label for="CVV2">CVV2</label>
-                                <input id="CVV2" name="cardSecurityCode" size="4" type="text" maxlength="4" value="" />
+                                <label for="billToCardSecurityCode">CVV2</label>
+                                <input id="billToCardSecurityCode" name="billToCardSecurityCode" size="4" type="text" maxlength="4" value="" />
                             </span>
                         </div>
                         <div>
@@ -656,4 +656,4 @@ under the License.
         <h3>${uiLabelMap.EcommerceStep} 4: ${uiLabelMap.AccountingBilling}</h3>
         <h3>${uiLabelMap.EcommerceStep} 5: ${uiLabelMap.OrderSubmitOrder}</h3>
     </div>
-</div>
\ No newline at end of file
+</div>