You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ap...@apache.org on 2008/04/30 00:21:05 UTC
svn commit: r652167 - in /ofbiz/trunk/applications/marketing: config/
script/org/ofbiz/sfa/contact/ script/org/ofbiz/sfa/lead/ servicedef/
webapp/party/ webapp/sfa/WEB-INF/ widget/sfa/ widget/sfa/forms/
Author: apatel
Date: Tue Apr 29 15:21:05 2008
New Revision: 652167
URL: http://svn.apache.org/viewvc?rev=652167&view=rev
Log:
Forms/screens and services for create/find Contact. Thanks Jyotsna Rathore
Added:
ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/contact/
ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/contact/ContactServices.xml (with props)
ofbiz/trunk/applications/marketing/webapp/party/
ofbiz/trunk/applications/marketing/webapp/party/findSfaParty.ftl (contents, props changed)
- copied, changed from r652163, ofbiz/trunk/applications/marketing/webapp/sfa/findSfaParty.ftl
ofbiz/trunk/applications/marketing/widget/sfa/ContactScreens.xml (with props)
ofbiz/trunk/applications/marketing/widget/sfa/forms/ContactForms.xml (with props)
Modified:
ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml
ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml
ofbiz/trunk/applications/marketing/servicedef/services.xml
ofbiz/trunk/applications/marketing/webapp/sfa/WEB-INF/controller.xml
ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml
ofbiz/trunk/applications/marketing/widget/sfa/LeadScreens.xml
ofbiz/trunk/applications/marketing/widget/sfa/SfaMenus.xml
ofbiz/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml
Modified: ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml?rev=652167&r1=652166&r2=652167&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml (original)
+++ ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml Tue Apr 29 15:21:05 2008
@@ -537,6 +537,12 @@
<property key="PageTitleCreateAccount">
<value xml:lang="en">Create New Account</value>
</property>
+ <property key="PageTitleCreateLead">
+ <value xml:lang="en">Create New Account</value>
+ </property>
+ <property key="PageTitleCreateContact">
+ <value xml:lang="en">Create New Account</value>
+ </property>
<property key="PageTitleEditAccount">
<value xml:lang="en">Edit Account</value>
</property>
@@ -1125,6 +1131,12 @@
<property key="SfaCompetitors">
<value xml:lang="en">Competitors & Partners </value>
</property>
+ <property key="SfaContacts">
+ <value xml:lang="en">Contacts</value>
+ </property>
+ <property key="SfaContact">
+ <value xml:lang="en">Contact</value>
+ </property>
<property key="SfaLeadGroup">
<value xml:lang="en">Lead Group</value>
</property>
@@ -1140,6 +1152,9 @@
<property key="SfaEvents">
<value xml:lang="en">Events</value>
</property>
+ <property key="SfaFindContacts">
+ <value xml:lang="en">Find Contacts</value>
+ </property>
<property key="SfaFindLeads">
<value xml:lang="en">Find Leads</value>
</property>
Added: 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=652167&view=auto
==============================================================================
--- ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/contact/ContactServices.xml (added)
+++ ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/contact/ContactServices.xml Tue Apr 29 15:21:05 2008
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd">
+ <simple-method short-description="Create Contact" method-name="createContact">
+ <set field="parameters.roleTypeId" value="CONTACT"/>
+ <call-simple-method method-name="createPersonRoleAndContactMechs" xml-resource="org/ofbiz/party/party/PartySimpleMethods.xml"/>
+ <set field="partyId" from-field="parameters.partyId"></set>
+ <set field="partyRelationContext.partyIdFrom" from-field="userLogin.partyId"/>
+ <set field="partyRelationContext.partyIdTo" from-field="partyId" />
+ <set field="partyRelationContext.roleTypeIdTo" from-field="parameters.roleTypeId"/>
+ <set field="partyRelationContext.roleTypeIdFrom" value="_NA_"/>
+ <set field="partyRelationContext.partyRelationshipTypeId" value="CONTACT_REL"></set>
+ <call-service service-name="createPartyRelationship" in-map-name="partyRelationContext"/>
+ </simple-method>
+</simple-methods>
Propchange: ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/contact/ContactServices.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/contact/ContactServices.xml
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/contact/ContactServices.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
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=652167&r1=652166&r2=652167&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 Tue Apr 29 15:21:05 2008
@@ -63,5 +63,6 @@
<set field="partyDataSource.isCreate" value="Y"/>
<create-value value-name="partyDataSource"/>
</if-not-empty>
+ <field-to-result field-name="partyId"/>
</simple-method>
</simple-methods>
Modified: ofbiz/trunk/applications/marketing/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/servicedef/services.xml?rev=652167&r1=652166&r2=652167&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/servicedef/services.xml (original)
+++ ofbiz/trunk/applications/marketing/servicedef/services.xml Tue Apr 29 15:21:05 2008
@@ -401,9 +401,25 @@
<auto-attributes entity-name="TelecomNumber" mode="IN" optional="true">
<exclude field-name="contactMechId"/>
</auto-attributes>
+ <attribute name="partyId" type="String" mode="OUT" />
<attribute name="emailAddress" type="String" mode="IN" optional="true"/>
<attribute name="partyIdFrom" type="String" mode="IN" optional="true"/>
<attribute name="leadType" type="String" mode="IN" optional="false"/><!-- can be PERSON OR GROUP -->
<attribute name="leadSource" type="String" mode="IN" optional="true"/>
</service>
+ <service name="createContact" engine="simple"
+ location="org/ofbiz/sfa/contact/ContactServices.xml" invoke="createContact">
+ <description>Create a Contact Person</description>
+ <auto-attributes entity-name="Person" mode="IN" optional="true">
+ <exclude field-name="partyId"/>
+ </auto-attributes>
+ <auto-attributes entity-name="PostalAddress" mode="IN" optional="true">
+ <exclude field-name="contactMechId"/>
+ </auto-attributes>
+ <auto-attributes entity-name="TelecomNumber" mode="IN" optional="true">
+ <exclude field-name="contactMechId"/>
+ </auto-attributes>
+ <attribute name="emailAddress" type="String" mode="IN" optional="true"/>
+ <attribute name="partyIdFrom" type="String" mode="IN" optional="true"/>
+ </service>
</services>
Copied: ofbiz/trunk/applications/marketing/webapp/party/findSfaParty.ftl (from r652163, ofbiz/trunk/applications/marketing/webapp/sfa/findSfaParty.ftl)
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/party/findSfaParty.ftl?p2=ofbiz/trunk/applications/marketing/webapp/party/findSfaParty.ftl&p1=ofbiz/trunk/applications/marketing/webapp/sfa/findSfaParty.ftl&r1=652163&r2=652167&rev=652167&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/webapp/sfa/findSfaParty.ftl (original)
+++ ofbiz/trunk/applications/marketing/webapp/party/findSfaParty.ftl Tue Apr 29 15:21:05 2008
@@ -21,6 +21,11 @@
<#if roleTypeId=="LEAD">
<#assign currentUrl="FindLead"/>
<#assign title="${uiLabelMap.SfaFindLeads}">
+ <#assign currentUrl="FindLeads"/>
+ <#assign title="${uiLabelMap.SfaFindLeads}"/>
+<#elseif roleTypeId=="CONTACT">
+ <#assign currentUrl="FindContacts"/>
+ <#assign title="${uiLabelMap.SfaFindContacts}"/>
</#if>
<div id="findPartyParameters" class="screenlet">
<div class="screenlet-title-bar">
@@ -68,10 +73,12 @@
<td class="label">${uiLabelMap.PartyFirstName}</td>
<td><input type="text" name="firstName" value="${parameters.firstName?if_exists}"/></td>
</tr>
- <tr>
- <td class="label">${uiLabelMap.PartyPartyGroupName}</td>
- <td><input type="text" name="groupName" value="${parameters.groupName?if_exists}"/></td>
- </tr>
+ <#if roleTypeId != "CONTACT">
+ <tr>
+ <td class="label">${uiLabelMap.PartyPartyGroupName}</td>
+ <td><input type="text" name="groupName" value="${parameters.groupName?if_exists}"/></td>
+ </tr>
+ </#if>
<#if extInfo == "P">
<tr><td colspan="3"><hr/></td></tr>
<tr>
@@ -84,7 +91,7 @@
</tr>
<tr>
<td class="label">${uiLabelMap.CommonCity}</td>
- <td><inputmsg type="text" name="city" value="${parameters.city?if_exists}"/></td>
+ <td><input type="text" name="city" value="${parameters.city?if_exists}"/></td>
</tr>
<tr>
<td class="label">${uiLabelMap.CommonStateProvince}</td>
Propchange: ofbiz/trunk/applications/marketing/webapp/party/findSfaParty.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/marketing/webapp/party/findSfaParty.ftl
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/applications/marketing/webapp/party/findSfaParty.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: ofbiz/trunk/applications/marketing/webapp/sfa/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/sfa/WEB-INF/controller.xml?rev=652167&r1=652166&r2=652167&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/webapp/sfa/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/marketing/webapp/sfa/WEB-INF/controller.xml Tue Apr 29 15:21:05 2008
@@ -84,9 +84,9 @@
</request-map>
<!-- Lead Requests -->
- <request-map uri="FindLead">
+ <request-map uri="FindLeads">
<security https="true" auth="true"/>
- <response name="success" type="view" value="FindLead"/>
+ <response name="success" type="view" value="FindLeads"/>
</request-map>
<request-map uri="CreateLead">
<security https="true" auth="true"/>
@@ -95,9 +95,28 @@
<request-map uri="createLead">
<security https="true" auth="true"/>
<event type="service" invoke="createLead"/>
- <response name="success" type="view" value="FindLead"/>
+ <response name="success" type="view" value="viewprofile"/>
<response name="error" type="view" value="CreateLead"/>
</request-map>
+ <request-map uri="viewLead">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="viewLead"/>
+ <response name="error" type="view" value="FindLeads"/>
+ </request-map>
+ <request-map uri="FindContacts">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="FindContacts"/>
+ </request-map>
+ <request-map uri="CreateContact">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="CreateContact"/>
+ </request-map>
+ <request-map uri="createContact">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="createContact"/>
+ <response name="success" type="view" value="FindContacts"/>
+ <response name="error" type="view" value="CreateContact"/>
+ </request-map>
<!-- end of request mappings -->
<!-- View Mappings -->
@@ -109,7 +128,9 @@
<view-map name="FindAccounts" type="screen" page="component://marketing/widget/sfa/AccountScreens.xml#FindAccounts"/>
<view-map name="NewAccounts" type="screen" page="component://marketing/widget/sfa/AccountScreens.xml#NewAccounts"/>
<view-map name="ViewAccount" type="screen" page="component://marketing/widget/sfa/AccountScreens.xml#ViewAccount"/>
- <view-map name="FindLead" type="screen" page="component://marketing/widget/sfa/LeadScreens.xml#FindLead"/>
+ <view-map name="FindLeads" type="screen" page="component://marketing/widget/sfa/LeadScreens.xml#FindLeads"/>
<view-map name="CreateLead" type="screen" page="component://marketing/widget/sfa/LeadScreens.xml#CreateLead"/>
+ <view-map name="FindContacts" type="screen" page="component://marketing/widget/sfa/ContactScreens.xml#FindContacts"/>
+ <view-map name="CreateContact" type="screen" page="component://marketing/widget/sfa/ContactScreens.xml#CreateContact"/>
<!-- end of view mappings -->
</site-conf>
\ No newline at end of file
Modified: ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml?rev=652167&r1=652166&r2=652167&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml Tue Apr 29 15:21:05 2008
@@ -146,4 +146,216 @@
</widgets>
</section>
</screen>
+
+ <screen name="CommonPartyDecorator">
+ <section>
+ <actions>
+ <set field="partyId" from-field="parameters.partyId"/>
+ <entity-one entity-name="Party" value-name="party"/>
+ <entity-one entity-name="Person" value-name="lookupPerson"/>
+ <entity-one entity-name="PartyGroup" value-name="lookupGroup"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <section>
+ <!-- do check for PARTYMGR, _VIEW permission -->
+ <condition>
+ <if-has-permission permission="PARTYMGR" action="_VIEW"/>
+ </condition>
+ <widgets>
+ <section>
+ <condition><not><if-empty field-name="partyId"/></not></condition>
+ <widgets>
+ <include-menu location="component://party/widget/partymgr/PartyMenus.xml" name="ProfileTabBar"/>
+ <container style="button-bar button-style-2">
+ <link target="FindBillingAccount?partyId=${partyId}" url-mode="inter-app"
+ text="${uiLabelMap.AccountingBillingAccount}"/>
+ <section>
+ <condition><if-has-permission permission="ORDERMGR" action="_VIEW"/></condition>
+ <widgets>
+ <link target="searchorders?lookupFlag=Y&hideFields=Y&partyId=${partyId}&externalLoginKey=${externalLoginKey}&viewIndex=1&viewSize=20" url-mode="inter-app"
+ text="${uiLabelMap.OrderOrders}"/>
+ <link target="FindQuote?partyId=${partyId}&externalLoginKey=${externalLoginKey}" url-mode="inter-app"
+ text="${uiLabelMap.OrderOrderQuotes}"/>
+ <link target="FindRequest?lookupFlag=Y&fromPartyId=${partyId}&externaLoginKey=${externalLoginKey}" url-mode="inter-app"
+ text="${uiLabelMap.PartyPartyRequests}"/>
+ </widgets>
+ </section>
+ <section>
+ <condition><if-has-permission permission="ORDERMGR" action="_CREATE"/></condition>
+ <widgets>
+ <link target="checkinits?partyId=${partyId}&externaLoginKey=${externalLoginKey}" url-mode="inter-app"
+ text="${uiLabelMap.OrderNewOrder}"/>
+ <link target="EditQuote?partyId=${partyId}&externaLoginKey=${externalLoginKey}" url-mode="inter-app"
+ text="${uiLabelMap.OrderNewQuote}"/>
+ </widgets>
+ </section>
+ <section>
+ <condition><if-has-permission permission="ACCOUNTING" action="_VIEW"/></condition>
+ <widgets>
+ <link target="findPayments?lookupFlag=Y&hideFields=Y&partyIdTo=${partyId}&externaLoginKey=${externalLoginKey}" url-mode="inter-app"
+ text="${uiLabelMap.AccountingPaymentsSent}"/>
+ <link target="findPayments?lookupFlag=Y&hideFields=Y&partyIdFrom=${partyId}&externaLoginKey=${externalLoginKey}" url-mode="inter-app"
+ text="${uiLabelMap.AccountingPaymentsReceived}"/>
+ <link target="FindFinAccount?ownerPartyId=${partyId}" url-mode="inter-app"
+ text="${uiLabelMap.AccountingFinAccounts}"/>
+ </widgets>
+ </section>
+ </container>
+ <container>
+ <section>
+ <condition>
+ <or>
+ <not><if-empty field-name="lookupPerson"/></not>
+ <not><if-empty field-name="lookupGroup"/></not>
+ </or>
+ </condition>
+ <widgets>
+ <label text="&nbsp;<br/>"/>
+ <label style="h1" text="${uiLabelMap.PartyTheProfileOf} ${lookupPerson.personalTitle} ${lookupPerson.firstName} ${lookupPerson.middleName} ${lookupPerson.lastName} ${lookupPerson.suffix} ${lookupGroup.groupName}"/>
+ </widgets>
+ <fail-widgets>
+ <label style="h1" text="${uiLabelMap.PartyNewUser}"/>
+ </fail-widgets>
+ </section>
+ <label style="h1" text="[${partyId}]"/>
+ </container>
+ </widgets>
+ </section>
+ <decorator-section-include name="body"/>
+ </widgets>
+ <fail-widgets>
+ <label style="h3">${uiLabelMap.PartyMgrViewPermissionError}</label>
+ </fail-widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
+ <screen name="CommonCommunicationEventDecorator">
+ <section>
+ <actions>
+ <set field="headerItem" value="comm"/>
+ <set field="communicationEventId" from-field="parameters.communicationEventId"/>
+ <entity-one entity-name="CommunicationEvent" value-name="communicationEvent"/>
+ <set field="okayToUpdate" value="true" type="Boolean" global="true"/>
+ </actions>
+ <widgets>
+ <section>
+ <condition>
+ <and>
+ <not><if-empty field-name="communicationEvent.statusId"/></not>
+ <or>
+ <if-compare field-name="communicationEvent.statusId" operator="equals" type="String" value="COM_COMPLETE"/>
+ <if-compare field-name="communicationEvent.statusId" operator="equals" type="String" value="COM_RESOLVED"/>
+ <if-compare field-name="communicationEvent.statusId" operator="equals" type="String" value="COM_REFERRED"/>
+ <if-compare field-name="communicationEvent.statusId" operator="equals" type="String" value="COM_CANCELLED"/>
+ </or>
+ </and>
+ </condition>
+ <actions>
+ <set field="okayToUpdate" value="false" type="Boolean" global="true"/>
+ </actions>
+ <widgets/>
+ </section>
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <section>
+ <condition>
+ <if-has-permission action="_VIEW" permission="PARTYMGR"/>
+ </condition>
+ <widgets>
+ <section>
+ <condition>
+ <not><if-empty field-name="partyId"/></not>
+ </condition>
+ <widgets>
+ <include-menu location="component://party/widget/partymgr/PartyMenus.xml" name="ProfileTabBar"/>
+ <container style="button-bar button-style-2">
+ <link target="/accounting/control/FindBillingAccount?partyId=${partyId}" url-mode="inter-app"
+ text="${uiLabelMap.AccountingBillingAccount}"/>
+ <section>
+ <condition><if-has-permission permission="ORDERMGR" action="_VIEW"/></condition>
+ <widgets>
+ <link target="/ordermgr/control/searchorders?lookupFlag=Y&hideFields=Y&partyId=${partyId}&viewIndex=1&viewSize=20" url-mode="inter-app"
+ text="${uiLabelMap.OrderOrders}"/>
+ </widgets>
+ </section>
+ <section>
+ <condition><if-has-permission permission="ORDERMGR" action="_CREATE"/></condition>
+ <widgets>
+ <link target="/ordermgr/control/checkinits?partyId=${partyId}" url-mode="inter-app"
+ text="${uiLabelMap.OrderNewOrder}"/>
+ </widgets>
+ </section>
+ <section>
+ <condition><if-has-permission permission="ACCOUNTING" action="_VIEW"/></condition>
+ <widgets>
+ <link target="/accounting/control/findPayments?lookupFlag=Y&hideFields=Y&partyIdTo=${partyId}" url-mode="inter-app"
+ text="${uiLabelMap.AccountingPaymentsSent}"/>
+ <link target="/accounting/control/findPayments?lookupFlag=Y&hideFields=Y&partyIdFrom=${partyId}" url-mode="inter-app"
+ text="${uiLabelMap.AccountingPaymentsReceived}"/>
+ </widgets>
+ </section>
+ </container>
+ </widgets>
+ </section>
+ <section>
+ <condition>
+ <not><if-empty field-name="communicationEvent"/></not>
+ </condition>
+ <widgets>
+ <include-menu location="component://party/webapp/partymgr/communication/CommMenus.xml" name="CommEventTabBar"/>
+ </widgets>
+ </section>
+ <section>
+ <widgets>
+ <decorator-section-include name="body"/>
+ </widgets>
+ </section>
+ </widgets>
+ <fail-widgets>
+ <label style="h3">${uiLabelMap.PartyMgrViewPermissionError}</label>
+ </fail-widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
+ <screen name="CommonQuoteDecorator">
+ <section>
+ <actions>
+ <set field="headerItem" value="quote"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <section>
+ <!-- do check for ORDERMGR, _VIEW permission -->
+ <condition>
+ <if-has-permission permission="ORDERMGR" action="_VIEW"/>
+ </condition>
+ <widgets>
+ <platform-specific>
+ <html><html-template location="component://order/webapp/ordermgr/quote/QuoteTabBar.ftl"/></html>
+ </platform-specific>
+ <container>
+ <label style="h1">[${uiLabelMap.CommonId}:${quote.quoteId}] ${quote.description}</label>
+ </container>
+ <decorator-section-include name="body"/>
+ </widgets>
+ <fail-widgets>
+ <label style="h3">${uiLabelMap.OrderViewPermissionError}</label>
+ </fail-widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
</screens>
Added: ofbiz/trunk/applications/marketing/widget/sfa/ContactScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/ContactScreens.xml?rev=652167&view=auto
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/ContactScreens.xml (added)
+++ ofbiz/trunk/applications/marketing/widget/sfa/ContactScreens.xml Tue Apr 29 15:21:05 2008
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd">
+ <screen name="FindContacts">
+ <section>
+ <actions>
+ <set field="roleTypeId" value="CONTACT"/>
+ <set field="partyTypeId" value="PERSON"/>
+ <set field="tabButtonItem" value="Contacts"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <section>
+ <actions>
+ <service service-name="findParty" auto-field-map="true"/>
+ </actions>
+ <widgets>
+ <container><link target="CreateContact" text="${uiLabelMap.CommonCreateNew}" style="buttontext"/></container>
+ <section>
+ <widgets>
+ <platform-specific>
+ <html><html-template location="component://marketing/webapp/party/findSfaParty.ftl"/></html>
+ </platform-specific>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="h3">
+ <label text="${uiLabelMap.SfaFindResults}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <condition>
+ <not>
+ <if-empty field-name="partyList"/>
+ </not>
+ </condition>
+ <widgets>
+ <include-form name="ListConatcts" location="component://marketing/widget/sfa/forms/ContactForms.xml"/>
+ </widgets>
+ <fail-widgets>
+ <container style="h3">
+ <label text="${uiLabelMap.PartyNoPartiesFound}"/>
+ </container>
+ </fail-widgets>
+ </section>
+ </container>
+ </container>
+ </widgets>
+ </section>
+ </widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+ <screen name="CreateContact">
+ <section>
+ <actions>
+ <set field="titleProperty" value="PageTitleCreateContact"/>
+ <set field="tabButtonItem" value="Contacts"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="h3">
+ <section>
+ <widgets>
+ <label text="${uiLabelMap.CommonCreate} ${uiLabelMap.SfaContact}"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="CreateContact" location="component://marketing/widget/sfa/forms/ContactForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+</screens>
Propchange: ofbiz/trunk/applications/marketing/widget/sfa/ContactScreens.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/marketing/widget/sfa/ContactScreens.xml
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/applications/marketing/widget/sfa/ContactScreens.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: ofbiz/trunk/applications/marketing/widget/sfa/LeadScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/LeadScreens.xml?rev=652167&r1=652166&r2=652167&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/LeadScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/LeadScreens.xml Tue Apr 29 15:21:05 2008
@@ -20,11 +20,11 @@
<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd">
-
- <screen name="FindLead">
+ <screen name="FindLeads">
<section>
<actions>
<set field="roleTypeId" value="LEAD"/>
+ <set field="tabButtonItem" value="Leads"/>
</actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
@@ -32,37 +32,38 @@
<section>
<actions>
<service service-name="findParty" auto-field-map="true"/>
+ <set field="tabButtonItem" value=""/>
</actions>
<widgets>
- <container><link target="CreateLead?leadType=PERSON" text="${uiLabelMap.CommonCreate} ${uiLabelMap.SfaLeadPerson}" style="buttontext"/><link target="CreateLead?leadType=GROUP" text="${uiLabelMap.CommonCreate} ${uiLabelMap.SfaLeadGroup}" style="buttontext"/></container>
- <section>
+ <container><link target="CreateLead?leadType=PERSON" text="${uiLabelMap.CommonCreate} ${uiLabelMap.SfaLeadPerson}" style="buttontext"/><link target="CreateLead?leadType=GROUP" text="${uiLabelMap.CommonCreate} ${uiLabelMap.SfaLeadGroup}" style="buttontext"/></container>
+ <section>
<widgets>
<platform-specific>
- <html><html-template location="component://marketing/webapp/sfa/findSfaParty.ftl"/></html>
+ <html><html-template location="component://marketing/webapp/party/findSfaParty.ftl"/></html>
</platform-specific>
<container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.SfaFindResults}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <condition>
- <not>
- <if-empty field-name="partyList"/>
- </not>
- </condition>
- <widgets>
- <include-form name="ListLeads" location="component://marketing/widget/sfa/forms/LeadForms.xml"/>
- </widgets>
- <fail-widgets>
- <container style="h3">
- <label text="${uiLabelMap.PartyNoPartiesFound}"/>
- </container>
- </fail-widgets>
- </section>
- </container>
+ <container style="screenlet-title-bar">
+ <container style="h3">
+ <label text="${uiLabelMap.SfaFindResults}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <condition>
+ <not>
+ <if-empty field-name="partyList"/>
+ </not>
+ </condition>
+ <widgets>
+ <include-form name="ListLeads" location="component://marketing/widget/sfa/forms/LeadForms.xml"/>
+ </widgets>
+ <fail-widgets>
+ <container style="h3">
+ <label text="${uiLabelMap.PartyNoPartiesFound}"/>
+ </container>
+ </fail-widgets>
+ </section>
+ </container>
</container>
</widgets>
</section>
@@ -78,34 +79,35 @@
<actions>
<set field="titleProperty" value="PageTitleCreateLead"/>
<set field="leadType" from-field="parameters.leadType"/>
+ <set field="tabButtonItem" value="Leads"/>
</actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <section>
- <condition>
- <if-compare value="PERSON" field-name="leadType" operator="equals"/>
- </condition>
- <widgets>
- <label text="${uiLabelMap.CommonCreate} ${uiLabelMap.SfaLeadPerson}"/>
- </widgets>
- <fail-widgets>
- <label text="${uiLabelMap.CommonCreate} ${uiLabelMap.SfaLeadGroup}"/>
- </fail-widgets>
- </section>
- </container>
- </container>
- <container style="screenlet-body">
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="h3">
<section>
+ <condition>
+ <if-compare value="PERSON" field-name="leadType" operator="equals"/>
+ </condition>
<widgets>
- <include-form name="createLead" location="component://marketing/widget/sfa/forms/LeadForms.xml"/>
+ <label text="${uiLabelMap.CommonCreate} ${uiLabelMap.SfaLeadPerson}"/>
</widgets>
+ <fail-widgets>
+ <label text="${uiLabelMap.CommonCreate} ${uiLabelMap.SfaLeadGroup}"/>
+ </fail-widgets>
</section>
- </container>
+ </container>
</container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="createLead" location="component://marketing/widget/sfa/forms/LeadForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
Modified: ofbiz/trunk/applications/marketing/widget/sfa/SfaMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/SfaMenus.xml?rev=652167&r1=652166&r2=652167&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/SfaMenus.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/SfaMenus.xml Tue Apr 29 15:21:05 2008
@@ -22,8 +22,8 @@
default-selected-style="selected" menu-container-style="button-bar tab-bar">
<menu-item name="Main" title="${uiLabelMap.MarketingMainPage}"><link target="main"/></menu-item>
<menu-item name="Accounts" title="${uiLabelMap.SfaAcccounts}"><link target="FindAccounts"/></menu-item>
- <menu-item name="Contacts" title="${uiLabelMap.SfaContacts}"><link target=""/></menu-item>
- <menu-item name="Leads" title="${uiLabelMap.SfaLeads}"><link target="FindLead"/></menu-item>
+ <menu-item name="Contacts" title="${uiLabelMap.SfaContacts}"><link target="FindContacts"/></menu-item>
+ <menu-item name="Leads" title="${uiLabelMap.SfaLeads}"><link target="FindLeads"/></menu-item>
<menu-item name="Competitors" title="${uiLabelMap.SfaCompetitors}"><link target=""/></menu-item>
<menu-item name="Events" title="${uiLabelMap.SfaEvents}"><link target=""/></menu-item>
<menu-item name="Documents" title="${uiLabelMap.SfaDocuments}"><link target=""/></menu-item>
Added: 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=652167&view=auto
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/forms/ContactForms.xml (added)
+++ ofbiz/trunk/applications/marketing/widget/sfa/forms/ContactForms.xml Tue Apr 29 15:21:05 2008
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
+
+ <form name="ListConatcts" type="list" list-name="partyList" list-entry-name="partyRow" paginate-target="FindContact">
+ <row-actions>
+ <entity-one entity-name="PartyGroup" value-name="partyGroup">
+ <field-map field-name="partyId" env-name="partyRow.partyId"/>
+ </entity-one>
+ <entity-one entity-name="Person" value-name="person">
+ <field-map field-name="partyId" env-name="partyRow.partyId"/>
+ </entity-one>
+ <entity-one entity-name="PartyType" value-name="partyType">
+ <field-map field-name="partyTypeId" env-name="partyRow.partyTypeId"/>
+ </entity-one>
+ </row-actions>
+ <field name="partyId" title="${uiLabelMap.PartyPartyId}">
+ <hyperlink target="viewprofile?partyId=${partyRow.partyId}" description="${partyRow.partyId}"/>
+ </field>
+ <field name="partyName" title="${uiLabelMap.PartyName}"><display description="${person.lastName}, ${person.firstName}"/></field>
+ </form>
+ <form name="CreateContact" type="single" target="createContact" header-row-style="header-row" default-table-style="basic-table">
+ <field name="firstName" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text/></field>
+ <field name="lastName" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text/></field>
+ <field name="suffix"><text/></field>
+ <field name="postalAddressTitle" title="${uiLabelMap.PartyGeneralCorrespondenceAddress}" title-area-style="group-label"><display description=" " also-hidden="false"/></field>
+ <field name="address1" title="${uiLabelMap.CommonAddress1}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text size="50" maxlength="60"/></field>
+ <field name="address2" title="${uiLabelMap.CommonAddress2}"><text size="50" maxlength="60"/></field>
+ <field name="city" title="${uiLabelMap.CommonCity}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text size="30" maxlength="60"/></field>
+ <field name="state" title="${uiLabelMap.CommonState}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required">
+ <drop-down allow-empty="true">
+ <entity-options entity-name="Geo" key-field-name="geoId" description="${geoId} - ${geoName}">
+ <entity-constraint name="geoTypeId" operator="in" value="STATE,PROVINCE"/>
+ <entity-order-by field-name="geoId"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="postalCode" title="${uiLabelMap.CommonZipPostalCode}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text size="10" maxlength="30"/></field>
+ <field name="country" title="${uiLabelMap.CommonCountry}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required">
+ <drop-down allow-empty="false" no-current-selected-key="${defaultCountryGeoId}">
+ <entity-options entity-name="Geo" key-field-name="geoId" description="${geoId}: ${geoName}">
+ <entity-constraint name="geoTypeId" value="COUNTRY"/>
+ <entity-order-by field-name="geoId"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="phoneTitle" title="${uiLabelMap.PartyPrimaryPhone}" title-area-style="group-label"><display/></field>
+ <field name="countryCode" title="${uiLabelMap.PartyCountryCode}"><text size="4" maxlength="10"/></field>
+ <field name="areaCode" title="${uiLabelMap.PartyAreaCode}"><text size="4" maxlength="10"/></field>
+ <field name="contactNumber" title="${uiLabelMap.PartyPhoneNumber}"><text size="15" maxlength="15"/></field>
+ <field name="extensionCode" 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="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="button"/></field>
+ </form>
+</forms>
Propchange: ofbiz/trunk/applications/marketing/widget/sfa/forms/ContactForms.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/marketing/widget/sfa/forms/ContactForms.xml
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/applications/marketing/widget/sfa/forms/ContactForms.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
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=652167&r1=652166&r2=652167&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml Tue Apr 29 15:21:05 2008
@@ -20,7 +20,6 @@
<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
-
<form name="ListLeads" type="list" list-name="partyList" list-entry-name="partyRow" paginate-target="FindLead">
<row-actions>
<entity-one entity-name="PartyGroup" value-name="partyGroup">
@@ -34,12 +33,13 @@
</entity-one>
</row-actions>
<field name="partyId" title="${uiLabelMap.PartyPartyId}">
- <hyperlink target="/partymgr/control/viewprofile?partyId=${partyRow.partyId}" description="${partyRow.partyId}" target-type="inter-app"/>
+ <hyperlink target="viewprofile?partyId=${partyRow.partyId}" description="${partyRow.partyId}" target-type="inter-app"/>
</field>
<field name="partyName" title="${uiLabelMap.PartyName}" use-when="partyGroup != null"><display description="${partyGroup.groupName}"/></field>
<field name="partyName" title="${uiLabelMap.PartyName}" use-when="person != null"><display description="${person.lastName}, ${person.firstName}"/></field>
<field name="partyTypeId" title="${uiLabelMap.PartyType}"><display description="${partyType.description}"/> </field>
</form>
+
<form name="createLead" type="single" target="createLead" header-row-style="header-row" default-table-style="basic-table">
<field name="leadType"><hidden value="${leadType}"/></field>
<field name="firstName" use-when="leadType.equals("PERSON")" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text/></field>