svn commit: r684499 - in /ofbiz/trunk/applications/ecommerce: script/org/ofbiz/ecommerce/customer/CustomerEvents.xml webapp/ecommerce/order/OnePageCheckoutProcess.ftl

[as...@apache.org]

Author: ashish
Date: Sun Aug 10 06:43:32 2008
New Revision: 684499

URL: http://svn.apache.org/viewvc?rev=684499&view=rev
Log:
Removed unnecessary code with minor improvements.  Actually this code was breaking one page checkout for anonymous user in a condition when you run anonymous checkout just after registered checkout.

Thanks Mridul Pathak for this fix.

Modified:
    ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml
    ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl

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=684499&r1=684498&r2=684499&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 Sun Aug 10 06:43:32 2008
@@ -850,27 +850,16 @@
             short-description="Create/Update Customer, Shipping Address and other contact details." login-required="false">
         <set field="shoppingCart" from-field="parameters.shoppingCart"/>
         <set field="partyId" from-field="parameters.partyId"/>
-        <set field="userLogin" from-field="parameters.userLogin"/>
-        <set field="parameters.shipToCountryGeoId" from-field="parameters.countryGeoId"/>
-
-        <if-empty field="userLogin">
-            <session-to-field field-name="userLogin" session-name="userLogin"/>
-        </if-empty>
-        <if-empty field="shoppingCart">
-            <session-to-field field-name="shoppingCart"/>
-        </if-empty>
-        <if-not-empty field="shoppingCart">
+        <if-not-empty field="userLogin">
             <if-empty field="partyId">
-                <call-object-method obj-field-name="shoppingCart" method-name="getPartyId" ret-field-name="partyId"/>
+                <set field="partyId" from-field="userLogin.partyId"/>
             </if-empty>
-            <if-empty field="userLogin">
-                <call-object-method obj-field-name="shoppingCart" method-name="getUserLogin" ret-field-name="userLogin"/>
-            </if-empty>
-            <call-object-method obj-field-name="shoppingCart" method-name="getShippingContactMechId" ret-field-name="shipToContactMechId"/>
         </if-not-empty>
+        <set field="parameters.shipToCountryGeoId" from-field="parameters.countryGeoId"/>
+        <set field="shipToContactMechId" from-field="parameters.shipToContactMechId"/>
 
-        <if-empty field="shipToContactMechId">
-           <set field="shipToContactMechId" from-field="parameters.shipToContactMechId"/>
+        <if-empty field="shoppingCart">
+            <session-to-field field-name="shoppingCart"/>
         </if-empty>
 
         <call-simple-method method-name="createUpdatePerson"/>
@@ -993,6 +982,7 @@
         </else>
         </if-empty>
         <field-to-request field-name="userLogin" request-name="userLogin"/>
+        <field-to-session field-name="userLogin" session-name="userLogin"/>
         <log level="info" message="userLogin is ${userLogin}"/>
     </simple-method>
 

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=684499&r1=684498&r2=684499&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl Sun Aug 10 06:43:32 2008
@@ -245,7 +245,6 @@
               <input type="hidden" id="shipToContactMechId" name="shipToContactMechId" value="${parameters.shipToContactMechId?if_exists}"/>
               <input type="hidden" name="billToContactMechId" value="${parameters.billToContactMechId?if_exists}"/>
               <input type="hidden" id="shippingPartyId" name="partyId" value="${parameters.partyId?if_exists}"/>
-              <input type="hidden" name="userLogin" value="${parameters.userLogin?if_exists}"/>
               <input type="hidden" id="phoneContactMechId" name="phoneContactMechId" value="${parameters.phoneContactMechId?if_exists}"/>
               <input type="hidden" id="emailContactMechId" name="emailContactMechId" value="${parameters.emailContactMechId?if_exists}"/>
               <input type="hidden" name="roleTypeId" value="CUSTOMER"/>