svn commit: r765412 - in /ofbiz/trunk/applications/marketing: script/org/ofbiz/sfa/contact/ script/org/ofbiz/sfa/lead/ servicedef/ widget/sfa/forms/

[jaz-3]

Author: jaz
Date: Wed Apr 15 23:03:14 2009
New Revision: 765412

URL: http://svn.apache.org/viewvc?rev=765412&view=rev
Log:
can now attach a new lead/contact to a ContactList when creating (both main create and quick create)

Modified:
    ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/contact/ContactServices.xml
    ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml
    ofbiz/trunk/applications/marketing/servicedef/secas.xml
    ofbiz/trunk/applications/marketing/servicedef/services.xml
    ofbiz/trunk/applications/marketing/widget/sfa/forms/ContactForms.xml
    ofbiz/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml

Modified: ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/contact/ContactServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/contact/ContactServices.xml?rev=765412&r1=765411&r2=765412&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/contact/ContactServices.xml (original)
+++ ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/contact/ContactServices.xml Wed Apr 15 23:03:14 2009
@@ -49,6 +49,7 @@
                 <set field="emailAddressCtx.contactMechPurposeTypeId" value="PRIMARY_EMAIL"/>
                 <call-service service-name="createPartyEmailAddress" in-map-name="emailAddressCtx">
                     <result-to-field result-name="contactMechId" field="emailContactMechId"/>
+                    <result-to-result result-name="contactMechId" service-result-name="contactMechId"/>
                 </call-service>
             </if-not-empty>
         </else>

Modified: ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml?rev=765412&r1=765411&r2=765412&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml (original)
+++ ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml Wed Apr 15 23:03:14 2009
@@ -50,6 +50,7 @@
                 <set field="emailAddressCtx.contactMechPurposeTypeId" value="PRIMARY_EMAIL"/>
                 <call-service service-name="createPartyEmailAddress" in-map-name="emailAddressCtx">
                     <result-to-field result-name="contactMechId" field="emailContactMechId"/>
+                    <result-to-result result-name="contactMechId" service-result-name="contactMechId"/>
                 </call-service>
             </if-not-empty>
         </else>

Modified: ofbiz/trunk/applications/marketing/servicedef/secas.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/servicedef/secas.xml?rev=765412&r1=765411&r2=765412&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/servicedef/secas.xml (original)
+++ ofbiz/trunk/applications/marketing/servicedef/secas.xml Wed Apr 15 23:03:14 2009
@@ -27,4 +27,18 @@
     <eca service="updatePartyEmailAddress" event="return">
         <action service="updatePartyEmailContactListParty" mode="sync"/>
     </eca>
+
+    <!-- quick add functions which pass a contactListId as well -->
+    <eca service="createLead" event="commit">
+        <condition field-name="contactListId" operator="is-not-empty"/>
+        <set field-name="statusId" value="CLPT_ACCEPTED"/>
+        <set field-name="preferredContactMechId" env-name="contactMechId"/>
+        <action service="createContactListParty" mode="sync"/>
+    </eca>
+    <eca service="createContact" event="commit">
+        <condition field-name="contactListId" operator="is-not-empty"/>
+        <set field-name="statusId" value="CLPT_ACCEPTED"/>
+        <set field-name="preferredContactMechId" env-name="contactMechId"/>
+        <action service="createContactListParty" mode="sync"/>
+    </eca>
 </service-eca>

Modified: ofbiz/trunk/applications/marketing/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/servicedef/services.xml?rev=765412&r1=765411&r2=765412&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/servicedef/services.xml (original)
+++ ofbiz/trunk/applications/marketing/servicedef/services.xml Wed Apr 15 23:03:14 2009
@@ -398,6 +398,7 @@
             <exclude field-name="contactMechId"/>
         </auto-attributes>
         <attribute name="partyId" type="String" mode="OUT"/>
+        <attribute name="contactMechId" type="String" mode="OUT" />
         <attribute name="emailAddress" type="String" mode="IN" optional="true"/>
         <attribute name="groupName" type="String" mode="IN" optional="true"/>
         <attribute name="title" type="String" mode="IN" optional="true"/>
@@ -408,6 +409,7 @@
         <attribute name="roleTypeId" type="String" mode="OUT"/>
         <attribute name="quickAdd" type="String" mode="IN" optional="true"/>
         <attribute name="extension" type="String" mode="IN" optional="true"/>
+        <attribute name="contactListId" type="String" mode="IN" optional="true"/>
     </service>
     <service name="createContact" engine="simple"
         location="component://marketing/script/org/ofbiz/sfa/contact/ContactServices.xml" invoke="createContact">
@@ -422,10 +424,12 @@
             <exclude field-name="contactMechId"/>
         </auto-attributes>
         <attribute name="partyId" type="String" mode="OUT"/>
+        <attribute name="contactMechId" type="String" mode="OUT" />
         <attribute name="emailAddress" type="String" mode="IN" optional="true"/>
         <attribute name="partyIdFrom" type="String" mode="IN" optional="true"/>
         <attribute name="quickAdd" type="String" mode="IN" optional="true"/>
         <attribute name="extension" type="String" mode="IN" optional="true"/>
+        <attribute name="contactListId" type="String" mode="IN" optional="true"/>
     </service>
     <service name="mergeContacts" engine="simple"
         location="component://marketing/script/org/ofbiz/sfa/contact/ContactServices.xml" invoke="mergeContacts">

Modified: ofbiz/trunk/applications/marketing/widget/sfa/forms/ContactForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/forms/ContactForms.xml?rev=765412&r1=765411&r2=765412&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/forms/ContactForms.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/forms/ContactForms.xml Wed Apr 15 23:03:14 2009
@@ -75,6 +75,12 @@
         <field name="extension" title="${uiLabelMap.PartyContactExt}"><text size="6" maxlength="10"/></field>
         <field name="emailAddressTitle" title="${uiLabelMap.PartyEmailAddress}" title-area-style="group-label"><display/></field>
         <field name="emailAddress" title="${uiLabelMap.CommonEmail}"><text size="50" maxlength="60"/></field>
+        <field name="contactListTitle" title="${uiLabelMap.MarketingContactList}" title-area-style="group-label"><display/></field>
+        <field name="contactListId" title="${uiLabelMap.MarketingContactList}">
+            <drop-down allow-empty="true">
+                <entity-options entity-name="ContactList" description="${description}" key-field-name="contactListId"/>
+            </drop-down>
+        </field>
         <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
     <form name="MergeContacts" type="single"  target="MergeContacts">
@@ -107,6 +113,11 @@
         <field name="firstName"  title="${uiLabelMap.CommonFirst} ${uiLabelMap.CommonName}*" widget-style="required"><text size="15"/></field>
         <field name="lastName" title="${uiLabelMap.CommonLast} ${uiLabelMap.CommonName}*" widget-style="required"><text size="15"/></field>
         <field name="emailAddress" title="${uiLabelMap.CommonEmail}"><text size="15"/></field>
+        <field name="contactListId" title="${uiLabelMap.MarketingContactList}">
+            <drop-down allow-empty="true">
+                <entity-options entity-name="ContactList" description="${groovy:description.substring(0,12)}..." key-field-name="contactListId"/>
+            </drop-down>
+        </field>
         <field name="quickAdd"><hidden value="Y"/></field>
         <field name="submitButton"><submit/></field>
     </form>

Modified: ofbiz/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml?rev=765412&r1=765411&r2=765412&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml Wed Apr 15 23:03:14 2009
@@ -79,6 +79,12 @@
         <field name="emailAddress" title="${uiLabelMap.CommonEmail}"><text size="50" maxlength="60"/></field>
         <field name="leadSourceTitle" title="${uiLabelMap.SfaLeadSource}" title-area-style="group-label"><display/></field>
         <field name="leadSource" title="${uiLabelMap.SfaLeadSource}"><text size="50" maxlength="60"/></field>
+        <field name="contactListTitle" title="${uiLabelMap.MarketingContactList}" title-area-style="group-label"><display/></field>
+        <field name="contactListId" title="${uiLabelMap.MarketingContactList}">
+            <drop-down allow-empty="true">
+                <entity-options entity-name="ContactList" description="${description}" key-field-name="contactListId"/>
+            </drop-down>
+        </field>
         <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
 
@@ -131,6 +137,11 @@
         <field name="lastName" title="${uiLabelMap.CommonLast} ${uiLabelMap.CommonName}*" widget-style="required"><text size="15"/></field>
         <field name="groupName" title="${uiLabelMap.CommonGroup}"><text size="15"/></field>
         <field name="emailAddress" title="${uiLabelMap.CommonEmail}"><text size="15"/></field>
+        <field name="contactListId" title="${uiLabelMap.MarketingContactList}">
+            <drop-down allow-empty="true">
+                <entity-options entity-name="ContactList" description="${groovy:description.substring(0,12)}..." key-field-name="contactListId"/>
+            </drop-down>
+        </field>
         <field name="quickAdd"><hidden value="Y"/></field>
         <field name="submitButton"><submit/></field>
     </form>