svn commit: r429904 - in /incubator/ofbiz/trunk/applications/order: script/org/ofbiz/order/customer/CustomerEvents.xml webapp/ordermgr/entry/custsettings.ftl

[sichen]

Author: sichen
Date: Tue Aug  8 17:41:27 2006
New Revision: 429904

URL: http://svn.apache.org/viewvc?rev=429904&view=rev
Log:
Made email not required for order manager order entry customers

Modified:
    incubator/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CustomerEvents.xml
    incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/custsettings.ftl

Modified: incubator/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CustomerEvents.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CustomerEvents.xml?rev=429904&r1=429903&r2=429904&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CustomerEvents.xml (original)
+++ incubator/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CustomerEvents.xml Tue Aug  8 17:41:27 2006
@@ -48,7 +48,6 @@
             <simple-map-processor name="newEmail">
                 <process field="emailAddress">
                     <copy/>
-                    <not-empty><fail-property resource="EcommerceUiLabels" property="PartyEmailAddressMissingError"/></not-empty>
                     <validate-method method="isEmail"><fail-property resource="EcommerceUiLabels" property="PartyEmailAddressNotFormattedCorrectly"/></validate-method>
                 </process>
                 <process field="emailSol"><copy to-field="allowSolicitation"/></process>
@@ -140,10 +139,12 @@
             <call-service service-name="updatePartyEmailAddress" in-map-name="emailMap"/>
         <else>
             <!-- create the email address -->
-            <set from-field="partyId" field="emailMap.partyId"/>
-            <string-to-field field-name="contactMechPurposeTypeId" map-name="emailMap" string="PRIMARY_EMAIL"/>
-            <!-- call the create email service -->
-            <call-service service-name="createPartyEmailAddress" in-map-name="emailMap"/>
+            <if-not-empty field-name="parameters.emailAddress">
+                <set from-field="partyId" field="emailMap.partyId"/>
+                <string-to-field field-name="contactMechPurposeTypeId" map-name="emailMap" string="PRIMARY_EMAIL"/>
+                <!-- call the create email service -->
+                <call-service service-name="createPartyEmailAddress" in-map-name="emailMap"/>
+            </if-not-empty>
         </else>
         </if-not-empty>
         

Modified: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/custsettings.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/custsettings.ftl?rev=429904&r1=429903&r2=429904&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/custsettings.ftl (original)
+++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/custsettings.ftl Tue Aug  8 17:41:27 2006
@@ -119,7 +119,7 @@
                 <td width="26%" align="right"><div class="tabletext">${uiLabelMap.PartyEmailAddress}<BR>${uiLabelMap.CommonAllowSolicitation}</div></td>
                 <td width="5">&nbsp;</td>
                 <td width="74%">
-                  <input type="text" class="inputBox" name="emailAddress" value="" size="60" maxlength="255"> *
+                  <input type="text" class="inputBox" name="emailAddress" value="" size="60" maxlength="255">
                   <BR>
                   <select name="emailSol" class="selectBox">
                     <option>${requestParameters.emailSol?default("Y")}</option>