svn commit: r940814 - in /ofbiz/trunk: applications/accounting/data/ applications/content/data/ applications/marketing/data/ applications/order/servicedef/ applications/party/data/ applications/party/script/org/
Locked
svn commit: r940814 - in /ofbiz/trunk: applications/accounting/data/ applications/content/data/ applications/marketing/data/ applications/order/servicedef/ applications/party/data/ applications/party/script/org/
 
|
Author: ashish
Date: Tue May 4 11:57:35 2010 New Revision: 940814 URL: http://svn.apache.org/viewvc?rev=940814&view=rev Log: Reverting my commit r938446 based on the comments received on mailing list. For now I am keeping old email address in place (i.e [hidden email]) keeping in mind that email will not go in spam folder. If others think [hidden email] will also behave same then please go ahead commit the changes. Very soon I will revert my changes on release10.04 branch. Thanks to everybody who has provided their comments! Modified: ofbiz/trunk/applications/accounting/data/DemoOrganizationData.xml ofbiz/trunk/applications/content/data/UsersDemoData.xml ofbiz/trunk/applications/marketing/data/sfaDemoData.xml ofbiz/trunk/applications/order/servicedef/orderProcessXPDL.xml ofbiz/trunk/applications/party/data/PartyDemoData.xml ofbiz/trunk/applications/party/script/org/ofbiz/party/test/PartyContactMechTests.xml ofbiz/trunk/debian/TODO ofbiz/trunk/debian/override-data.xslt ofbiz/trunk/framework/common/config/general.properties ofbiz/trunk/framework/common/script/org/ofbiz/common/email/EmailServices.xml ofbiz/trunk/specialpurpose/ebaystore/data/DemoEbayStoreData.xml ofbiz/trunk/specialpurpose/ecommerce/data/DemoMarketing.xml ofbiz/trunk/specialpurpose/ecommerce/data/DemoOrderPeopleData.xml ofbiz/trunk/specialpurpose/ecommerce/data/DemoProduct.xml ofbiz/trunk/specialpurpose/ecommerce/data/DemoRentalProduct.xml ofbiz/trunk/specialpurpose/googlebase/data/DemoGoogleBaseData.xml ofbiz/trunk/specialpurpose/workflow/data/OrderProcessWorkflow.xml Modified: ofbiz/trunk/applications/accounting/data/DemoOrganizationData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/DemoOrganizationData.xml?rev=940814&r1=940813&r2=940814&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/data/DemoOrganizationData.xml (original) +++ ofbiz/trunk/applications/accounting/data/DemoOrganizationData.xml Tue May 4 11:57:35 2010 @@ -28,7 +28,7 @@ under the License. <ContactMech contactMechId="9000" contactMechTypeId="POSTAL_ADDRESS"/> <PartyContactMech partyId="Company" contactMechId="9000" fromDate="2000-01-01 00:00:00.000" allowSolicitation="Y"/> <PostalAddress contactMechId="9000" toName="Company XYZ" address1="2003 Open Blvd" city="Open City" postalCode="999999" countryGeoId="USA" stateProvinceGeoId="CA" geoPointId="9000"/> - <ContactMech contactMechId="Company" contactMechTypeId="EMAIL_ADDRESS" infoString="[hidden email]"/> + <ContactMech contactMechId="Company" contactMechTypeId="EMAIL_ADDRESS" infoString="[hidden email]"/> <PartyContactMech partyId="Company" contactMechId="Company" fromDate="2000-01-01 00:00:00.000" allowSolicitation="Y"/> <PartyContactMechPurpose contactMechPurposeTypeId="PRIMARY_EMAIL" partyId="Company" contactMechId="Company" fromDate="2003-01-01 00:00:00.000"/> <PartyContactMechPurpose partyId="Company" contactMechId="9000" contactMechPurposeTypeId="BILLING_LOCATION" fromDate="2000-01-01 00:00:00.000"/> Modified: ofbiz/trunk/applications/content/data/UsersDemoData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/data/UsersDemoData.xml?rev=940814&r1=940813&r2=940814&view=diff ============================================================================== --- ofbiz/trunk/applications/content/data/UsersDemoData.xml (original) +++ ofbiz/trunk/applications/content/data/UsersDemoData.xml Tue May 4 11:57:35 2010 @@ -47,19 +47,19 @@ under the License. <PartyRole partyId="BLOG_EDITOR" roleTypeId="CONTENT_PUBLISHER"/> <PartyRole partyId="BLOG_EDITOR" roleTypeId="_NA_"/> - <ContactMech contactMechId="ADMIN_CONTACT" contactMechTypeId="EMAIL_ADDRESS" infoString="[hidden email]"/> + <ContactMech contactMechId="ADMIN_CONTACT" contactMechTypeId="EMAIL_ADDRESS" infoString="[hidden email]"/> <PartyContactMech partyId="BLOG_ADMIN" contactMechId="ADMIN_CONTACT" fromDate="2001-05-13 12:00:00.0"/> <PartyContactMechPurpose partyId="BLOG_ADMIN" contactMechId="ADMIN_CONTACT" contactMechPurposeTypeId="PRIMARY_EMAIL" fromDate="2001-05-13 12:00:00.0"/> - <ContactMech contactMechId="AUTHOR_CONTACT" contactMechTypeId="EMAIL_ADDRESS" infoString="[hidden email]"/> + <ContactMech contactMechId="AUTHOR_CONTACT" contactMechTypeId="EMAIL_ADDRESS" infoString="[hidden email]"/> <PartyContactMech partyId="BLOG_AUTHOR" contactMechId="AUTHOR_CONTACT" fromDate="2001-05-13 12:00:00.0"/> <PartyContactMechPurpose partyId="BLOG_AUTHOR" contactMechId="AUTHOR_CONTACT" contactMechPurposeTypeId="PRIMARY_EMAIL" fromDate="2001-05-13 12:00:00.0"/> - <ContactMech contactMechId="EDITOR_CONTACT" contactMechTypeId="EMAIL_ADDRESS" infoString="[hidden email]"/> + <ContactMech contactMechId="EDITOR_CONTACT" contactMechTypeId="EMAIL_ADDRESS" infoString="[hidden email]"/> <PartyContactMech partyId="BLOG_EDITOR" contactMechId="EDITOR_CONTACT" fromDate="2001-05-13 12:00:00.0"/> <PartyContactMechPurpose partyId="BLOG_EDITOR" contactMechId="EDITOR_CONTACT" contactMechPurposeTypeId="PRIMARY_EMAIL" fromDate="2001-05-13 12:00:00.0"/> - <ContactMech contactMechId="GUEST_CONTACT" contactMechTypeId="EMAIL_ADDRESS" infoString="[hidden email]"/> + <ContactMech contactMechId="GUEST_CONTACT" contactMechTypeId="EMAIL_ADDRESS" infoString="[hidden email]"/> <PartyContactMech partyId="BLOG_GUEST" contactMechId="GUEST_CONTACT" fromDate="2001-05-13 12:00:00.0"/> <PartyContactMechPurpose partyId="BLOG_GUEST" contactMechId="GUEST_CONTACT" contactMechPurposeTypeId="PRIMARY_EMAIL" fromDate="2001-05-13 12:00:00.0"/> </entity-engine-xml> Modified: ofbiz/trunk/applications/marketing/data/sfaDemoData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/data/sfaDemoData.xml?rev=940814&r1=940813&r2=940814&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/data/sfaDemoData.xml (original) +++ ofbiz/trunk/applications/marketing/data/sfaDemoData.xml Tue May 4 11:57:35 2010 @@ -26,7 +26,7 @@ <PartyRole partyId="sfa100" roleTypeId="ACCOUNT"/> <ContactMech contactMechId="sfa100" contactMechTypeId="POSTAL_ADDRESS"/> <ContactMech contactMechId="sfa101" contactMechTypeId="TELECOM_NUMBER"/> - <ContactMech contactMechId="sfa102" contactMechTypeId="EMAIL_ADDRESS" infoString="[hidden email]"/> + <ContactMech contactMechId="sfa102" contactMechTypeId="EMAIL_ADDRESS" infoString="[hidden email]"/> <PostalAddress contactMechId="sfa100" address1="151 Madison street." city="Edison" postalCode="32451" lastUpdatedStamp="2008-05-23 11:57:40.936" lastUpdatedTxStamp="2008-05-23 11:57:39.476" createdStamp="2008-05-23 11:57:40.936" createdTxStamp="2008-05-23 11:57:39.476"/> <TelecomNumber contactMechId="sfa101" countryCode="1" areaCode="33" contactNumber="12456" lastUpdatedStamp="2008-05-23 11:57:41.179" lastUpdatedTxStamp="2008-05-23 11:57:39.476" createdStamp="2008-05-23 11:57:41.179" createdTxStamp="2008-05-23 11:57:39.476"/> <PartyContactMech partyId="sfa100" contactMechId="sfa100" fromDate="2000-01-01 00:00:00.000"/> Modified: ofbiz/trunk/applications/order/servicedef/orderProcessXPDL.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/servicedef/orderProcessXPDL.xml?rev=940814&r1=940813&r2=940814&view=diff ============================================================================== --- ofbiz/trunk/applications/order/servicedef/orderProcessXPDL.xml (original) +++ ofbiz/trunk/applications/order/servicedef/orderProcessXPDL.xml Tue May 4 11:57:35 2010 @@ -90,7 +90,7 @@ under the License. <DataType> <BasicType Type="STRING"/> </DataType> - <InitialValue>[hidden email]</InitialValue> + <InitialValue>[hidden email]</InitialValue> </DataField> </DataFields> Modified: ofbiz/trunk/applications/party/data/PartyDemoData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/data/PartyDemoData.xml?rev=940814&r1=940813&r2=940814&view=diff ============================================================================== --- ofbiz/trunk/applications/party/data/PartyDemoData.xml (original) +++ ofbiz/trunk/applications/party/data/PartyDemoData.xml Tue May 4 11:57:35 2010 @@ -29,7 +29,7 @@ <PartyRole partyId="DemoEmployee" roleTypeId="EMAIL_ADMIN"/> <PartyRelationship partyIdFrom="DemoEmployee" roleTypeIdFrom="EMAIL_ADMIN" partyIdTo="Company" roleTypeIdTo="_NA_" fromDate="2000-01-01 00:00:00"/> - <ContactMech contactMechId="admin" contactMechTypeId="EMAIL_ADDRESS" infoString="[hidden email]"/> + <ContactMech contactMechId="admin" contactMechTypeId="EMAIL_ADDRESS" infoString="[hidden email]"/> <PartyContactMech partyId="admin" contactMechId="admin" fromDate="2003-01-01 00:00:00.0" allowSolicitation="Y"/> <PartyContactMechPurpose contactMechPurposeTypeId="PRIMARY_EMAIL" partyId="admin" contactMechId="admin" fromDate="2003-01-01 00:00:00.0"/> @@ -40,10 +40,10 @@ <PartyIdentification partyId="DemoSupplier" partyIdentificationTypeId="SIRET" idValue="1234 5678 90123"/> <!-- email from an unknown party --> - <CommunicationEvent communicationEventId="9000" communicationEventTypeId="EMAIL_COMMUNICATION" statusId="COM_UNKNOWN_PARTY" contactMechTypeId="EMAIL_ADDRESS" contactMechIdTo="admin" roleTypeIdFrom="_NA_" roleTypeIdTo="_NA_" partyIdTo="admin" entryDate="2008-07-28 13:55:55.827" datetimeStarted="2008-07-28 13:55:19.0" subject="Why i would use the OFBiz system" contentMimeTypeId="text/plain" content="Every time i think of you, only you...you are always on my mind......." note="Sent from: [hidden email]; Sent Name from: Jo Easy User; Sent to: [hidden email]; Delivered-To: [hidden email]; " fromString="[hidden email]" toString="[hidden email]"/> + <CommunicationEvent communicationEventId="9000" communicationEventTypeId="EMAIL_COMMUNICATION" statusId="COM_UNKNOWN_PARTY" contactMechTypeId="EMAIL_ADDRESS" contactMechIdTo="admin" roleTypeIdFrom="_NA_" roleTypeIdTo="_NA_" partyIdTo="admin" entryDate="2008-07-28 13:55:55.827" datetimeStarted="2008-07-28 13:55:19.0" subject="Why i would use the OFBiz system" contentMimeTypeId="text/plain" content="Every time i think of you, only you...you are always on my mind......." note="Sent from: [hidden email]; Sent Name from: Jo Easy User; Sent to: [hidden email]; Delivered-To: [hidden email]; " fromString="[hidden email]" toString="[hidden email]"/> <PartyRole partyId="admin" roleTypeId="ADDRESSEE"/> <CommunicationEventRole communicationEventId="9000" partyId="admin" roleTypeId="ADDRESSEE" contactMechId="admin" statusId="COM_ROLE_CREATED"/> <!-- new registration notification --> - <EmailTemplateSetting emailTemplateSettingId="PARTY_REGISTER" bodyScreenLocation="component://party/widget/partymgr/PartyScreens.xml#CreateUserNotification" subject="New Account Created" bccAddress="[hidden email]" fromAddress="[hidden email]"/> + <EmailTemplateSetting emailTemplateSettingId="PARTY_REGISTER" bodyScreenLocation="component://party/widget/partymgr/PartyScreens.xml#CreateUserNotification" subject="New Account Created" bccAddress="[hidden email]" fromAddress="[hidden email]"/> </entity-engine-xml> Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/test/PartyContactMechTests.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/test/PartyContactMechTests.xml?rev=940814&r1=940813&r2=940814&view=diff ============================================================================== --- ofbiz/trunk/applications/party/script/org/ofbiz/party/test/PartyContactMechTests.xml (original) +++ ofbiz/trunk/applications/party/script/org/ofbiz/party/test/PartyContactMechTests.xml Tue May 4 11:57:35 2010 @@ -26,7 +26,7 @@ under the License. <set field="contactMechTypeId" value="EMAIL_ADDRESS"/> <!-- first try with just updating without changing the email address --> <set field="serviceCtx.partyId" from-field="partyId"/> - <set field="serviceCtx.emailAddress" value="[hidden email]"/> + <set field="serviceCtx.emailAddress" value="[hidden email]"/> <set field="serviceCtx.contactMechId" value="9026"/> <entity-one entity-name="UserLogin" value-field="userLogin"> <field-map field-name="userLoginId" value="system"/> Modified: ofbiz/trunk/debian/TODO URL: http://svn.apache.org/viewvc/ofbiz/trunk/debian/TODO?rev=940814&r1=940813&r2=940814&view=diff ============================================================================== --- ofbiz/trunk/debian/TODO (original) +++ ofbiz/trunk/debian/TODO Tue May 4 11:57:35 2010 @@ -19,7 +19,7 @@ * debian/copyright - Prompt for: - ofbiz admin password(s) - - default email([hidden email]) + - default email([hidden email]) - install of demo or just seed data * Auto-generate admin key/port * Move demo data into separate package? Modified: ofbiz/trunk/debian/override-data.xslt URL: http://svn.apache.org/viewvc/ofbiz/trunk/debian/override-data.xslt?rev=940814&r1=940813&r2=940814&view=diff ============================================================================== --- ofbiz/trunk/debian/override-data.xslt (original) +++ ofbiz/trunk/debian/override-data.xslt Tue May 4 11:57:35 2010 @@ -108,13 +108,13 @@ under the License. <xsl:template mode="data" match=" ProductStoreEmailSetting[ - @bccAddress='[hidden email]' or - @fromAddress='[hidden email]']|ContactList[ - @verifyEmailFrom='[hidden email]' + @bccAddress='[hidden email]' or + @fromAddress='[hidden email]']|ContactList[ + @verifyEmailFrom='[hidden email]' ]|ContactMech[ - @infoString='[hidden email]' + @infoString='[hidden email]' ]|WorkflowDataField[ - @initialValue='[hidden email]' + @initialValue='[hidden email]' ]|UserLogin[ @currentPassword='47ca69ebb4bdc9ae0adec130880165d2cc05db1a' ]"> @@ -126,7 +126,7 @@ under the License. <xsl:template mode="match" match="ProductStoreEmailSetting/@bccAddress|ProductStoreEmailSetting/@fromAddress|ProductStoreEmailSetting/@verifyEmailFrom|ContactMech/@infoString|ContactList/@verifyEmailFrom|WorkflowDataField/@initialValue"> <xsl:attribute name="{name()}"> <xsl:choose> - <xsl:when test=". = '[hidden email]'"><xsl:value-of select="$fromemail"/></xsl:when> + <xsl:when test=". = '[hidden email]'"><xsl:value-of select="$fromemail"/></xsl:when> <xsl:otherwise><xsl:value-of select="."/></xsl:otherwise> </xsl:choose> </xsl:attribute> Modified: ofbiz/trunk/framework/common/config/general.properties URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/general.properties?rev=940814&r1=940813&r2=940814&view=diff ============================================================================== --- ofbiz/trunk/framework/common/config/general.properties (original) +++ ofbiz/trunk/framework/common/config/general.properties Tue May 4 11:57:35 2010 @@ -65,7 +65,7 @@ partner.trackingCodeId.default= usps.address.match=(^.*?p[\\. ]*o[\\. ]*box.*$)|(^.*?post.*?office.*?box.*$)|((^|(^.*? ))r[\\. ]*r[\\. ]*(( +)|([0-9#]+)).*$)|(^.*?rural.*?route.*$) # -- general default 'fromEmailAddress' can be overridden in: EmailTemplateSetting -defaultFromEmailAddress=[hidden email] +defaultFromEmailAddress=[hidden email] # -- The default domainname used in the notification emails links # as 'baseUrl' and 'baseSecureUrl' are set in the url.properties file. Modified: ofbiz/trunk/framework/common/script/org/ofbiz/common/email/EmailServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/script/org/ofbiz/common/email/EmailServices.xml?rev=940814&r1=940813&r2=940814&view=diff ============================================================================== --- ofbiz/trunk/framework/common/script/org/ofbiz/common/email/EmailServices.xml (original) +++ ofbiz/trunk/framework/common/script/org/ofbiz/common/email/EmailServices.xml Tue May 4 11:57:35 2010 @@ -50,7 +50,7 @@ under the License. <if-not-empty field="emailTemplateSetting.fromAddress"> <set field="emailParams.sendFrom" from-field="emailTemplateSetting.fromAddress"/> <else> - <property-to-field resource="general" property="defaultFromEmailAddress" field="emailParams.sendFrom" default="[hidden email]"/> + <property-to-field resource="general" property="defaultFromEmailAddress" field="emailParams.sendFrom" default="[hidden email]"/> </else> </if-not-empty> <set field="emailParams.sendCc" from-field="emailTemplateSetting.ccAddress"/> Modified: ofbiz/trunk/specialpurpose/ebaystore/data/DemoEbayStoreData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/data/DemoEbayStoreData.xml?rev=940814&r1=940813&r2=940814&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebaystore/data/DemoEbayStoreData.xml (original) +++ ofbiz/trunk/specialpurpose/ebaystore/data/DemoEbayStoreData.xml Tue May 4 11:57:35 2010 @@ -92,9 +92,9 @@ <Content contentId="EBAY_ITEM_DISPATCH" contentTypeId="DOCUMENT" dataResourceId="EBAY_ITEM_DISPATCH" ownerContentId="EBAY_ITEM_DISPATCH" statusId="CTNT_IN_PROGRESS"/> <ContentRole contentId="EBAY_ITEM_DISPATCH" partyId="DemoEbayAccount" roleTypeId="OWNER" fromDate="2010-01-01 00:00:00.000"/> - <ProductStoreEmailSetting productStoreId="90100" emailType="EBAY_WIN_BUYER_NOTI" bccAddress="[hidden email]" bodyScreenLocation="component://ebaystore/widget/EbayEmailScreens.xml#WinnigBuyerNotification" fromAddress="[hidden email]" subject="OFBiz Demo - Winnig Buyer Notification #${buyerUserId}" xslfoAttachScreenLocation=""/> - <ProductStoreEmailSetting productStoreId="90100" emailType="EBAY_PAY_RECIEVED" bccAddress="[hidden email]" bodyScreenLocation="component://ebaystore/widget/EbayEmailScreens.xml#PaymentRecieved" fromAddress="[hidden email]" subject="OFBiz Demo - PaymentRecieved #${buyerUserId}" xslfoAttachScreenLocation=""/> - <ProductStoreEmailSetting productStoreId="90100" emailType="EBAY_FEEBACK_REMIN" bccAddress="[hidden email]" bodyScreenLocation="component://ebaystore/widget/EbayEmailScreens.xml#FeedbackReminder" fromAddress="[hidden email]" subject="OFBiz Demo - Feedback Reminder #${buyerUserId}" xslfoAttachScreenLocation=""/> - <ProductStoreEmailSetting productStoreId="90100" emailType="EBAY_ITEM_DISPATCH" bccAddress="[hidden email]" bodyScreenLocation="component://ebaystore/widget/EbayEmailScreens.xml#EbayEmailTemplate" fromAddress="[hidden email]" subject="OFBiz Demo - Item Dispatched Notification #${buyerUserId}" xslfoAttachScreenLocation=""/> + <ProductStoreEmailSetting productStoreId="90100" emailType="EBAY_WIN_BUYER_NOTI" bccAddress="[hidden email]" bodyScreenLocation="component://ebaystore/widget/EbayEmailScreens.xml#WinnigBuyerNotification" fromAddress="[hidden email]" subject="OFBiz Demo - Winnig Buyer Notification #${buyerUserId}" xslfoAttachScreenLocation=""/> + <ProductStoreEmailSetting productStoreId="90100" emailType="EBAY_PAY_RECIEVED" bccAddress="[hidden email]" bodyScreenLocation="component://ebaystore/widget/EbayEmailScreens.xml#PaymentRecieved" fromAddress="[hidden email]" subject="OFBiz Demo - PaymentRecieved #${buyerUserId}" xslfoAttachScreenLocation=""/> + <ProductStoreEmailSetting productStoreId="90100" emailType="EBAY_FEEBACK_REMIN" bccAddress="[hidden email]" bodyScreenLocation="component://ebaystore/widget/EbayEmailScreens.xml#FeedbackReminder" fromAddress="[hidden email]" subject="OFBiz Demo - Feedback Reminder #${buyerUserId}" xslfoAttachScreenLocation=""/> + <ProductStoreEmailSetting productStoreId="90100" emailType="EBAY_ITEM_DISPATCH" bccAddress="[hidden email]" bodyScreenLocation="component://ebaystore/widget/EbayEmailScreens.xml#EbayEmailTemplate" fromAddress="[hidden email]" subject="OFBiz Demo - Item Dispatched Notification #${buyerUserId}" xslfoAttachScreenLocation=""/> </entity-engine-xml> Modified: ofbiz/trunk/specialpurpose/ecommerce/data/DemoMarketing.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/data/DemoMarketing.xml?rev=940814&r1=940813&r2=940814&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/data/DemoMarketing.xml (original) +++ ofbiz/trunk/specialpurpose/ecommerce/data/DemoMarketing.xml Tue May 4 11:57:35 2010 @@ -23,11 +23,11 @@ under the License. <ContactList contactListId="9000" contactListTypeId="ANNOUNCEMENT" contactMechTypeId="EMAIL_ADDRESS" marketingCampaignId="9000" contactListName="New Product Announcements" description="New Product Announcements Mailing List (email)" comments="" isPublic="Y" ownerPartyId="Company" - verifyEmailFrom="[hidden email]" verifyEmailScreen="component://ecommerce/widget/EmailContactListScreens.xml#ContactListVerifyEmail" + verifyEmailFrom="[hidden email]" verifyEmailScreen="component://ecommerce/widget/EmailContactListScreens.xml#ContactListVerifyEmail" verifyEmailSubject="Subscription Verify Email" verifyEmailWebSiteId="WebStore"/> <ContactList contactListId="9010" contactListTypeId="NEWSLETTER" contactMechTypeId="EMAIL_ADDRESS" marketingCampaignId="9000" contactListName="Product Tips Newsletter" description="Product Tips Newsletter Mailing List (email)" comments="" isPublic="Y" ownerPartyId="Company" - verifyEmailFrom="[hidden email]" verifyEmailScreen="component://ecommerce/widget/EmailContactListScreens.xml#ContactListVerifyEmail" + verifyEmailFrom="[hidden email]" verifyEmailScreen="component://ecommerce/widget/EmailContactListScreens.xml#ContactListVerifyEmail" verifyEmailSubject="Subscription Verify Email" verifyEmailWebSiteId="WebStore"/> <ContactListParty contactListId="9000" partyId="DemoCustCompany" preferredContactMechId="9021" statusId="CLPT_ACCEPTED" fromDate="2001-05-13 00:00:00"/> Modified: ofbiz/trunk/specialpurpose/ecommerce/data/DemoOrderPeopleData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/data/DemoOrderPeopleData.xml?rev=940814&r1=940813&r2=940814&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/data/DemoOrderPeopleData.xml (original) +++ ofbiz/trunk/specialpurpose/ecommerce/data/DemoOrderPeopleData.xml Tue May 4 11:57:35 2010 @@ -78,7 +78,7 @@ under the License. <TelecomNumber contactMechId="9020" areaCode="801" contactNumber="555-5555"/> <PartyContactMech partyId="DemoCustCompany" contactMechId="9020" fromDate="2001-05-13 00:00:00.000" allowSolicitation="Y"/> <PartyContactMechPurpose partyId="DemoCustCompany" contactMechId="9020" contactMechPurposeTypeId="PHONE_WORK" fromDate="2001-05-13 00:00:00.000"/> - <ContactMech contactMechId="9021" contactMechTypeId="EMAIL_ADDRESS" infoString="[hidden email]"/> + <ContactMech contactMechId="9021" contactMechTypeId="EMAIL_ADDRESS" infoString="[hidden email]"/> <PartyContactMech partyId="DemoCustCompany" contactMechId="9021" fromDate="2001-05-13 00:00:00.000" allowSolicitation="Y"/> <PartyContactMechPurpose partyId="DemoCustCompany" contactMechId="9021" contactMechPurposeTypeId="PRIMARY_EMAIL" fromDate="2001-05-13 00:00:00.000"/> @@ -104,7 +104,7 @@ under the License. <TelecomNumber contactMechId="9022" areaCode="801" contactNumber="555-5555"/> <PartyContactMech partyId="DemoCustAgent" contactMechId="9022" fromDate="2001-05-13 00:00:00.000" allowSolicitation="Y"/> <PartyContactMechPurpose partyId="DemoCustAgent" contactMechId="9022" contactMechPurposeTypeId="PHONE_WORK" fromDate="2001-05-13 00:00:00.000"/> - <ContactMech contactMechId="9023" contactMechTypeId="EMAIL_ADDRESS" infoString="[hidden email]"/> + <ContactMech contactMechId="9023" contactMechTypeId="EMAIL_ADDRESS" infoString="[hidden email]"/> <PartyContactMech partyId="DemoCustAgent" contactMechId="9023" fromDate="2001-05-13 00:00:00.000" allowSolicitation="Y"/> <PartyContactMechPurpose partyId="DemoCustAgent" contactMechId="9023" contactMechPurposeTypeId="PRIMARY_EMAIL" fromDate="2001-05-13 00:00:00.000"/> @@ -139,7 +139,7 @@ under the License. <PartyContactMechPurpose partyId="DemoCustomer" contactMechId="9025" contactMechPurposeTypeId="PHONE_HOME" fromDate="2001-05-13 00:00:00.000"/> <PartyContactMechPurpose partyId="DemoCustomer" contactMechId="9025" contactMechPurposeTypeId="PHONE_SHIPPING" fromDate="2001-05-13 00:00:00.000"/> <PartyContactMechPurpose partyId="DemoCustomer" contactMechId="9027" contactMechPurposeTypeId="PHONE_BILLING" fromDate="2001-05-13 00:00:00.000"/> - <ContactMech contactMechId="9026" contactMechTypeId="EMAIL_ADDRESS" infoString="[hidden email]"/> + <ContactMech contactMechId="9026" contactMechTypeId="EMAIL_ADDRESS" infoString="[hidden email]"/> <PartyContactMech partyId="DemoCustomer" contactMechId="9026" fromDate="2001-05-13 00:00:00.000" allowSolicitation="Y"/> <PartyContactMechPurpose partyId="DemoCustomer" contactMechId="9026" contactMechPurposeTypeId="PRIMARY_EMAIL" fromDate="2001-05-13 00:00:00.000"/> @@ -165,7 +165,7 @@ under the License. <PartyContactMechPurpose partyId="EuroCustomer" contactMechId="EUROCUSTOMER" contactMechPurposeTypeId="BILLING_LOCATION" fromDate="2001-05-13 00:00:00.000"/> <PartyContactMechPurpose partyId="EuroCustomer" contactMechId="EUROCUSTOMER" contactMechPurposeTypeId="SHIPPING_LOCATION" fromDate="2001-05-13 00:00:00.000"/> <PartyContactMechPurpose partyId="EuroCustomer" contactMechId="EUROCUSTOMER" contactMechPurposeTypeId="GENERAL_LOCATION" fromDate="2001-05-13 00:00:00.000"/> - <ContactMech contactMechId="EURO01" contactMechTypeId="EMAIL_ADDRESS" infoString="[hidden email]"/> + <ContactMech contactMechId="EURO01" contactMechTypeId="EMAIL_ADDRESS" infoString="[hidden email]"/> <PartyContactMech partyId="EuroCustomer" contactMechId="EURO01" fromDate="2001-05-13 00:00:00.000" allowSolicitation="Y"/> <PartyContactMechPurpose partyId="EuroCustomer" contactMechId="EURO01" contactMechPurposeTypeId="PRIMARY_EMAIL" fromDate="2001-05-13 00:00:00.000"/> @@ -191,7 +191,7 @@ under the License. <PartyContactMechPurpose partyId="FrenchCustomer" contactMechId="FRENCHCUSTOMER" contactMechPurposeTypeId="BILLING_LOCATION" fromDate="2009-01-09 00:00:00.000"/> <PartyContactMechPurpose partyId="FrenchCustomer" contactMechId="FRENCHCUSTOMER" contactMechPurposeTypeId="SHIPPING_LOCATION" fromDate="2009-01-09 00:00:00.000"/> <PartyContactMechPurpose partyId="FrenchCustomer" contactMechId="FRENCHCUSTOMER" contactMechPurposeTypeId="GENERAL_LOCATION" fromDate="2009-01-09 00:00:00.000"/> - <ContactMech contactMechId="FRA01" contactMechTypeId="EMAIL_ADDRESS" infoString="[hidden email]"/> + <ContactMech contactMechId="FRA01" contactMechTypeId="EMAIL_ADDRESS" infoString="[hidden email]"/> <PartyContactMech partyId="FrenchCustomer" contactMechId="FRA01" fromDate="2009-01-09 00:00:00.000" allowSolicitation="Y"/> <PartyContactMechPurpose partyId="FrenchCustomer" contactMechId="FRA01" contactMechPurposeTypeId="PRIMARY_EMAIL" fromDate="2009-01-09 00:00:00.000"/> Modified: ofbiz/trunk/specialpurpose/ecommerce/data/DemoProduct.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/data/DemoProduct.xml?rev=940814&r1=940813&r2=940814&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/data/DemoProduct.xml (original) +++ ofbiz/trunk/specialpurpose/ecommerce/data/DemoProduct.xml Tue May 4 11:57:35 2010 @@ -23,7 +23,7 @@ under the License. <ContactMech contactMechId="9200" contactMechTypeId="POSTAL_ADDRESS"/> <ContactMech contactMechId="9201" contactMechTypeId="TELECOM_NUMBER"/> - <ContactMech contactMechId="9202" contactMechTypeId="EMAIL_ADDRESS" infoString="[hidden email]"/> + <ContactMech contactMechId="9202" contactMechTypeId="EMAIL_ADDRESS" infoString="[hidden email]"/> <PostalAddress contactMechId="9200" toName="Company XYZ" attnName="ZJAA" address1="2003 Open Blvd" city="Orem" postalCode="84058" countryGeoId="USA" stateProvinceGeoId="UT" geoPointId="9000"/> <TelecomNumber contactMechId="9201" areaCode="801" contactNumber="555-5555"/> <FacilityContactMech facilityId="WebStoreWarehouse" contactMechId="9200" fromDate="2001-05-13 12:00:00.0"/> @@ -97,34 +97,34 @@ under the License. <ProductStorePaymentSetting productStoreId="9000" paymentMethodTypeId="EXT_COD" paymentServiceTypeEnumId="PRDS_PAY_EXTERNAL" paymentService="" paymentCustomMethodId=""/> <ProductStorePaymentSetting productStoreId="9000" paymentMethodTypeId="EXT_BILLACT" paymentServiceTypeEnumId="PRDS_PAY_EXTERNAL" paymentService="" paymentCustomMethodId=""/> - <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_ODR_CONFIRM" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderConfirmNotice" xslfoAttachScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderConfirmNoticePdf" subject="OFBiz Demo - Order Confirmation #${orderId}" bccAddress="[hidden email]" fromAddress="[hidden email]"/> - <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_ODR_COMPLETE" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderCompleteNotice" subject="OFBiz Demo - Your Order Is Complete #${orderId}" fromAddress="[hidden email]"/> - <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_ODR_BACKORDER" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#BackorderNotice" subject="OFBiz Demo - Backorder Notification #${orderId}" fromAddress="[hidden email]"/> - <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_ODR_CHANGE" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderChangeNotice" subject="OFBiz Demo - Order Change Notification #${orderId}" fromAddress="[hidden email]"/> - <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_ODR_PAYRETRY" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#PaymentRetryNotice" subject="OFBiz Demo - Order Payment Notification #${orderId}" fromAddress="[hidden email]"/> - <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_ODR_SHIP_COMPLT" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#ShipmentCompleteNotice" subject="OFBiz Demo - Shipment Complete Notification #${orderId}" fromAddress="[hidden email]"/> + <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_ODR_CONFIRM" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderConfirmNotice" xslfoAttachScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderConfirmNoticePdf" subject="OFBiz Demo - Order Confirmation #${orderId}" bccAddress="[hidden email]" fromAddress="[hidden email]"/> + <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_ODR_COMPLETE" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderCompleteNotice" subject="OFBiz Demo - Your Order Is Complete #${orderId}" fromAddress="[hidden email]"/> + <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_ODR_BACKORDER" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#BackorderNotice" subject="OFBiz Demo - Backorder Notification #${orderId}" fromAddress="[hidden email]"/> + <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_ODR_CHANGE" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderChangeNotice" subject="OFBiz Demo - Order Change Notification #${orderId}" fromAddress="[hidden email]"/> + <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_ODR_PAYRETRY" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#PaymentRetryNotice" subject="OFBiz Demo - Order Payment Notification #${orderId}" fromAddress="[hidden email]"/> + <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_ODR_SHIP_COMPLT" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#ShipmentCompleteNotice" subject="OFBiz Demo - Shipment Complete Notification #${orderId}" fromAddress="[hidden email]"/> - <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_RTN_ACCEPT" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnAccept" subject="OFBiz Demo - Return Accepted #${returnHeader.returnId}" fromAddress="[hidden email]"/> - <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_RTN_COMPLETE" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnComplete" subject="OFBiz Demo - Return Completed #${returnHeader.returnId}" fromAddress="[hidden email]"/> - <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_RTN_CANCEL" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnCancel" subject="OFBiz Demo - Return Cancelled #${returnHeader.returnId}" fromAddress="[hidden email]"/> + <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_RTN_ACCEPT" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnAccept" subject="OFBiz Demo - Return Accepted #${returnHeader.returnId}" fromAddress="[hidden email]"/> + <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_RTN_COMPLETE" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnComplete" subject="OFBiz Demo - Return Completed #${returnHeader.returnId}" fromAddress="[hidden email]"/> + <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_RTN_CANCEL" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnCancel" subject="OFBiz Demo - Return Cancelled #${returnHeader.returnId}" fromAddress="[hidden email]"/> - <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_GC_PURCHASE" bodyScreenLocation="component://ecommerce/widget/EmailGiftCardScreens.xml#GiftCardPurchase" fromAddress="[hidden email]" subject="A Gift From ${senderName}!"/> - <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_GC_RELOAD" bodyScreenLocation="component://ecommerce/widget/EmailGiftCardScreens.xml#GiftCardReload" fromAddress="[hidden email]" subject="Gift Card Reload Results"/> + <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_GC_PURCHASE" bodyScreenLocation="component://ecommerce/widget/EmailGiftCardScreens.xml#GiftCardPurchase" fromAddress="[hidden email]" subject="A Gift From ${senderName}!"/> + <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_GC_RELOAD" bodyScreenLocation="component://ecommerce/widget/EmailGiftCardScreens.xml#GiftCardReload" fromAddress="[hidden email]" subject="Gift Card Reload Results"/> - <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_TELL_FRIEND" bodyScreenLocation="component://ecommerce/widget/EmailProductScreens.xml#TellFriend" subject="${sendFrom} has sent you a link!" fromAddress="[hidden email]"/> + <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_TELL_FRIEND" bodyScreenLocation="component://ecommerce/widget/EmailProductScreens.xml#TellFriend" subject="${sendFrom} has sent you a link!" fromAddress="[hidden email]"/> - <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_PWD_RETRIEVE" bodyScreenLocation="component://securityext/widget/EmailSecurityScreens.xml#PasswordEmail" subject="OFBiz Demo - Password Reminder (${userLogin.userLoginId})" fromAddress="[hidden email]"/> + <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_PWD_RETRIEVE" bodyScreenLocation="component://securityext/widget/EmailSecurityScreens.xml#PasswordEmail" subject="OFBiz Demo - Password Reminder (${userLogin.userLoginId})" fromAddress="[hidden email]"/> - <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_QUO_CONFIRM" bodyScreenLocation="component://order/widget/ordermgr/QuoteScreens.xml#ViewQuoteSimple" xslfoAttachScreenLocation="component://order/widget/ordermgr/QuoteScreens.xml#QuoteReport" subject="OFBiz Demo - Quote Confirmation #${quoteId}" bccAddress="[hidden email]" fromAddress="[hidden email]"/> + <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_QUO_CONFIRM" bodyScreenLocation="component://order/widget/ordermgr/QuoteScreens.xml#ViewQuoteSimple" xslfoAttachScreenLocation="component://order/widget/ordermgr/QuoteScreens.xml#QuoteReport" subject="OFBiz Demo - Quote Confirmation #${quoteId}" bccAddress="[hidden email]" fromAddress="[hidden email]"/> - <ProductStoreEmailSetting productStoreId="9000" emailType="PARTY_REGIS_CONFIRM" bodyScreenLocation="component://party/widget/partymgr/EmailPartyScreens.xml#CreatePartyNotification" subject="New Account Created" bccAddress="[hidden email]" fromAddress="[hidden email]"/> - <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_CUST_REGISTER" bodyScreenLocation="component://party/widget/partymgr/EmailPartyScreens.xml#CreatePartyNotification" subject="New Account Created" bccAddress="[hidden email]" fromAddress="[hidden email]"/> - <ProductStoreEmailSetting productStoreId="9000" emailType="UPD_PRSNL_INF_CNFRM" bodyScreenLocation="component://party/widget/partymgr/EmailPartyScreens.xml#ChangePersonalInfoNotification" subject="Personal Information Updated" bccAddress="[hidden email]" fromAddress="[hidden email]"/> - <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_EMAIL_VERIFY" bodyScreenLocation="component://party/widget/partymgr/EmailPartyScreens.xml#VerifyEmailAddressNotification" subject="Email Address Verification" bccAddress="[hidden email]" fromAddress="[hidden email]"/> + <ProductStoreEmailSetting productStoreId="9000" emailType="PARTY_REGIS_CONFIRM" bodyScreenLocation="component://party/widget/partymgr/EmailPartyScreens.xml#CreatePartyNotification" subject="New Account Created" bccAddress="[hidden email]" fromAddress="[hidden email]"/> + <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_CUST_REGISTER" bodyScreenLocation="component://party/widget/partymgr/EmailPartyScreens.xml#CreatePartyNotification" subject="New Account Created" bccAddress="[hidden email]" fromAddress="[hidden email]"/> + <ProductStoreEmailSetting productStoreId="9000" emailType="UPD_PRSNL_INF_CNFRM" bodyScreenLocation="component://party/widget/partymgr/EmailPartyScreens.xml#ChangePersonalInfoNotification" subject="Personal Information Updated" bccAddress="[hidden email]" fromAddress="[hidden email]"/> + <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_EMAIL_VERIFY" bodyScreenLocation="component://party/widget/partymgr/EmailPartyScreens.xml#VerifyEmailAddressNotification" subject="Email Address Verification" bccAddress="[hidden email]" fromAddress="[hidden email]"/> - <ProductStoreEmailSetting productStoreId="9000" emailType="CONT_NOTI_EMAIL" bodyScreenLocation="component://ecommerce/widget/EmailContactListScreens.xml#ContactUsEmailNotification" subject="Contact-us Information Notification" fromAddress="[hidden email]" /> + <ProductStoreEmailSetting productStoreId="9000" emailType="CONT_NOTI_EMAIL" bodyScreenLocation="component://ecommerce/widget/EmailContactListScreens.xml#ContactUsEmailNotification" subject="Contact-us Information Notification" fromAddress="[hidden email]" /> - <ProductStoreEmailSetting productStoreId="9000" emailType="UNSUB_CONT_LIST_NOTI" bodyScreenLocation="component://ecommerce/widget/EmailContactListScreens.xml#ContactListUnsubscribeEmail" subject="Unsubscribe Contact List" fromAddress="[hidden email]"/> + <ProductStoreEmailSetting productStoreId="9000" emailType="UNSUB_CONT_LIST_NOTI" bodyScreenLocation="component://ecommerce/widget/EmailContactListScreens.xml#ContactListUnsubscribeEmail" subject="Unsubscribe Contact List" fromAddress="[hidden email]"/> <WebAnalyticsConfig productStoreId="9000" webAnalyticsTypeId="GOOGLE_ANALYTICS" webAnalyticsCode="123456" isEnabled="Y" description="This is code provided from google analytics" contentId="GOOGLE_ANA_CNT"/> <WebAnalyticsConfig productStoreId="9000" webAnalyticsTypeId="BING_ANALYTICS" webAnalyticsCode="123456" isEnabled="Y" description="This is code provided from bing analytics" contentId="BING_ANA_CNT"/> Modified: ofbiz/trunk/specialpurpose/ecommerce/data/DemoRentalProduct.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/data/DemoRentalProduct.xml?rev=940814&r1=940813&r2=940814&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/data/DemoRentalProduct.xml (original) +++ ofbiz/trunk/specialpurpose/ecommerce/data/DemoRentalProduct.xml Tue May 4 11:57:35 2010 @@ -45,22 +45,22 @@ headerLogo="/images/opentravelsystem_log <ProductStorePaymentSetting productStoreId="RentalStore" paymentMethodTypeId="EXT_PAYPAL" paymentServiceTypeEnumId="PRDS_PAY_EXTERNAL" paymentService="" paymentCustomMethodId="" paymentGatewayConfigId="PAYPAL_CONFIG"/> <ProductStorePaymentSetting productStoreId="RentalStore" paymentMethodTypeId="EXT_WORLDPAY" paymentServiceTypeEnumId="PRDS_PAY_EXTERNAL" paymentService="" paymentCustomMethodId="" paymentGatewayConfigId="WORLDPAY_CONFIG"/> - <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_ODR_CONFIRM" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderConfirmNotice" xslfoAttachScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderConfirmNoticePdf" subject="OFBiz Demo - Order Confirmation #${orderId}" bccAddress="[hidden email]" fromAddress="[hidden email]"/> - <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_ODR_COMPLETE" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderCompleteNotice" subject="OFBiz Demo - Your Order Is Complete #${orderId}" fromAddress="[hidden email]"/> - <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_ODR_BACKORDER" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#BackorderNotice" subject="OFBiz Demo - Backorder Notification #${orderId}" fromAddress="[hidden email]"/> - <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_ODR_CHANGE" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderChangeNotice" subject="OFBiz Demo - Order Change Notification #${orderId}" fromAddress="[hidden email]"/> - <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_ODR_PAYRETRY" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#PaymentRetryNotice" subject="OFBiz Demo - Order Payment Notification #${orderId}" fromAddress="[hidden email]"/> - - <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_RTN_ACCEPT" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnAccept" subject="OFBiz Demo - Return Accepted #${returnHeader.returnId}" fromAddress="[hidden email]"/> - <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_RTN_COMPLETE" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnComplete" subject="OFBiz Demo - Return Completed #${returnHeader.returnId}" fromAddress="[hidden email]"/> - <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_RTN_CANCEL" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnCancel" subject="OFBiz Demo - Return Cancelled #${returnHeader.returnId}" fromAddress="[hidden email]"/> + <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_ODR_CONFIRM" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderConfirmNotice" xslfoAttachScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderConfirmNoticePdf" subject="OFBiz Demo - Order Confirmation #${orderId}" bccAddress="[hidden email]" fromAddress="[hidden email]"/> + <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_ODR_COMPLETE" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderCompleteNotice" subject="OFBiz Demo - Your Order Is Complete #${orderId}" fromAddress="[hidden email]"/> + <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_ODR_BACKORDER" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#BackorderNotice" subject="OFBiz Demo - Backorder Notification #${orderId}" fromAddress="[hidden email]"/> + <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_ODR_CHANGE" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderChangeNotice" subject="OFBiz Demo - Order Change Notification #${orderId}" fromAddress="[hidden email]"/> + <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_ODR_PAYRETRY" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#PaymentRetryNotice" subject="OFBiz Demo - Order Payment Notification #${orderId}" fromAddress="[hidden email]"/> + + <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_RTN_ACCEPT" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnAccept" subject="OFBiz Demo - Return Accepted #${returnHeader.returnId}" fromAddress="[hidden email]"/> + <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_RTN_COMPLETE" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnComplete" subject="OFBiz Demo - Return Completed #${returnHeader.returnId}" fromAddress="[hidden email]"/> + <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_RTN_CANCEL" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnCancel" subject="OFBiz Demo - Return Cancelled #${returnHeader.returnId}" fromAddress="[hidden email]"/> - <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_GC_PURCHASE" bodyScreenLocation="component://ecommerce/widget/EmailGiftCardScreens.xml#GiftCardPurchase" fromAddress="[hidden email]" subject="A Gift From ${senderName}!"/> - <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_GC_RELOAD" bodyScreenLocation="component://ecommerce/widget/EmailGiftCardScreens.xml#GiftCardReload" fromAddress="[hidden email]" subject="Gift Card Reload Results"/> + <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_GC_PURCHASE" bodyScreenLocation="component://ecommerce/widget/EmailGiftCardScreens.xml#GiftCardPurchase" fromAddress="[hidden email]" subject="A Gift From ${senderName}!"/> + <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_GC_RELOAD" bodyScreenLocation="component://ecommerce/widget/EmailGiftCardScreens.xml#GiftCardReload" fromAddress="[hidden email]" subject="Gift Card Reload Results"/> - <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_TELL_FRIEND" bodyScreenLocation="component://ecommerce/widget/EmailProductScreens.xml#TellFriend" subject="${sendFrom} has sent you a link!" fromAddress="[hidden email]"/> + <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_TELL_FRIEND" bodyScreenLocation="component://ecommerce/widget/EmailProductScreens.xml#TellFriend" subject="${sendFrom} has sent you a link!" fromAddress="[hidden email]"/> - <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_PWD_RETRIEVE" bodyScreenLocation="component://securityext/widget/EmailSecurityScreens.xml#PasswordEmail" subject="OFBiz Demo - Password Reminder (${userLoginId})" fromAddress="[hidden email]"/> + <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_PWD_RETRIEVE" bodyScreenLocation="component://securityext/widget/EmailSecurityScreens.xml#PasswordEmail" subject="OFBiz Demo - Password Reminder (${userLoginId})" fromAddress="[hidden email]"/> <ProductStoreFacility productStoreId="RentalStore" facilityId="WebStoreWarehouse" fromDate="2001-05-13 12:00:00.0"/> <ProductStoreRole partyId="admin" roleTypeId="SALES_REP" productStoreId="RentalStore" fromDate="2001-05-13 12:00:00.0"/> Modified: ofbiz/trunk/specialpurpose/googlebase/data/DemoGoogleBaseData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlebase/data/DemoGoogleBaseData.xml?rev=940814&r1=940813&r2=940814&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/googlebase/data/DemoGoogleBaseData.xml (original) +++ ofbiz/trunk/specialpurpose/googlebase/data/DemoGoogleBaseData.xml Tue May 4 11:57:35 2010 @@ -20,5 +20,5 @@ under the License. <entity-engine-xml> <WebSite webSiteId="GOOGLEBASE" standardContentPrefix="http://demo.ofbiz.org" productStoreId="9000" /> - <GoogleBaseConfig productStoreId="9000" developerKey="HKLh9khgVieditoO0b4JR2fnBT2yXp_ZAY8_yft3CFXhHIE1NvwkxQ1pZ4qyVEGh_FtRe5KtJPTKDorNP" authenticationUrl="https://www.google.com/accounts/ClientLogin" accountEmail="[hidden email]" accountPassword="47ca69ebb4bdc9ae0adec130880165d2cc05db1a" postItemsUrl="http://www.google.com/base/feeds/items/batch" webSiteId="GOOGLEBASE"/> + <GoogleBaseConfig productStoreId="9000" developerKey="HKLh9khgVieditoO0b4JR2fnBT2yXp_ZAY8_yft3CFXhHIE1NvwkxQ1pZ4qyVEGh_FtRe5KtJPTKDorNP" authenticationUrl="https://www.google.com/accounts/ClientLogin" accountEmail="[hidden email]" accountPassword="47ca69ebb4bdc9ae0adec130880165d2cc05db1a" postItemsUrl="http://www.google.com/base/feeds/items/batch" webSiteId="GOOGLEBASE"/> </entity-engine-xml> \ No newline at end of file Modified: ofbiz/trunk/specialpurpose/workflow/data/OrderProcessWorkflow.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/data/OrderProcessWorkflow.xml?rev=940814&r1=940813&r2=940814&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/workflow/data/OrderProcessWorkflow.xml (original) +++ ofbiz/trunk/specialpurpose/workflow/data/OrderProcessWorkflow.xml Tue May 4 11:57:35 2010 @@ -23,7 +23,7 @@ under the License. <WorkflowPackage packageId="org.ofbiz.order" packageVersion="20030730144901" packageName="" description="Demo Order Processing Workflow" specificationVersion="0.03" specificationId="XPDL" sourceVendorInfo="OFBiz.org" creationDateTime="2002-12-03 00:00:00.0" author="Andy Zeneski" publicationStatusId="WPS_UNDER_REVISION" graphConformanceEnumId="WGC_FULL_BLOCKED" priorityUomId="P" costUomId="USD" responsibleListId="10002" documentationUrl="None"/> <WorkflowProcess packageId="org.ofbiz.order" packageVersion="20030730144901" processId="ProcessOrder" processVersion="20030730144901" objectName="Processes incoming orders" objectPriority="5" description="Order Processing Workflow" creationDateTime="2002-12-01 12:00:00.0" author="OFBiz" publicationStatusId="WPS_UNDER_REVISION" timeLimit="12.0" validFromDate="2002-12-01 12:00:00.0" validToDate="2012-12-01 12:00:00.0" responsibleListId="10003" durationUomId="h" duration="3.0" waitingTime="2.0" defaultStartActivityId="receiveOrder" sourceReferenceField="orderId"/> - <WorkflowDataField packageId="org.ofbiz.order" packageVersion="20030730144901" processId="ProcessOrder" processVersion="20030730144901" dataFieldId="adminEmailList" dataFieldName="adminEmailList" initialValue="[hidden email]" dataTypeEnumId="WDT_STRING" isArray="N"/> + <WorkflowDataField packageId="org.ofbiz.order" packageVersion="20030730144901" processId="ProcessOrder" processVersion="20030730144901" dataFieldId="adminEmailList" dataFieldName="adminEmailList" initialValue="[hidden email]" dataTypeEnumId="WDT_STRING" isArray="N"/> <WorkflowFormalParam packageId="org.ofbiz.order" packageVersion="20030730144901" processId="ProcessOrder" processVersion="20030730144901" applicationId="_NA_" formalParamId="orderId" indexNumber="1" modeEnumId="WPM_IN" description="The order number" dataTypeEnumId="WDT_STRING"/> <WorkflowParticipant packageId="org.ofbiz.order" packageVersion="20030730144901" processId="_NA_" processVersion="_NA_" participantId="BUYER" participantName="Purchase Order Approval Role" description="Reviews and approves/rejects orders" participantTypeId="ROLE"/> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |