ofbiz-commits mailing list archives

Site index · List index

Message view	« Date » · « Thread »
Top	« Date » · « Thread »
From	er...@apache.org
Subject	svn commit: r1210493 [2/2] - in /ofbiz/branches/20111205EmailHandling: applications/accounting/src/org/ofbiz/accounting/payment/ applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ applications/content/config/ applications/content/en...
Date	Mon, 05 Dec 2011 15:19:35 GMT
Modified: ofbiz/branches/20111205EmailHandling/applications/product/webapp/catalog/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/product/webapp/catalog/WEB-INF/controller.xml?rev=1210493&r1=1210492&r2=1210493&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/applications/product/webapp/catalog/WEB-INF/controller.xml (original) +++ ofbiz/branches/20111205EmailHandling/applications/product/webapp/catalog/WEB-INF/controller.xml Mon Dec 5 15:19:33 2011 @@ -2222,22 +2222,44 @@ under the License. </request-map> <request-map uri="createProductStoreEmail"> <security https="true" auth="true"/> - <event type="service" path="" invoke="createProductStoreEmailSetting"/> + <event type="service" path="" invoke="createProdStoreEmailTplSetting"/> <response name="success" type="view" value="EditProductStoreEmails"/> <response name="error" type="view" value="EditProductStoreEmails"/> </request-map> <request-map uri="updateProductStoreEmail"> <security https="true" auth="true"/> - <event type="service" path="" invoke="updateProductStoreEmailSetting"/> + <event type="service" path="" invoke="updateProdStoreEmailTplSetting"/> <response name="success" type="view" value="EditProductStoreEmails"/> <response name="error" type="view" value="EditProductStoreEmails"/> </request-map> <request-map uri="removeProductStoreEmail"> <security https="true" auth="true"/> - <event type="service" path="" invoke="removeProductStoreEmailSetting"/> + <event type="service" path="" invoke="removeProdStoreEmailTplSetting"/> <response name="success" type="view" value="EditProductStoreEmails"/> <response name="error" type="view" value="EditProductStoreEmails"/> </request-map> + <request-map uri="EditOldProductStoreEmails"> + <security https="true" auth="true"/> + <response name="success" type="view" value="EditOldProductStoreEmails"/> + </request-map> + <request-map uri="createOldProductStoreEmail"> + <security https="true" auth="true"/> + <event type="service" path="" invoke="createOldProdStoreEmailSetting"/> + <response name="success" type="view" value="EditOldProductStoreEmails"/> + <response name="error" type="view" value="EditOldProductStoreEmails"/> + </request-map> + <request-map uri="updateOldProductStoreEmail"> + <security https="true" auth="true"/> + <event type="service" path="" invoke="updateOldProdStoreEmailSetting"/> + <response name="success" type="view" value="EditOldProductStoreEmails"/> + <response name="error" type="view" value="EditOldProductStoreEmails"/> + </request-map> + <request-map uri="removeOldProductStoreEmail"> + <security https="true" auth="true"/> + <event type="service" path="" invoke="removeOldProdStoreEmailSetting"/> + <response name="success" type="view" value="EditOldProductStoreEmails"/> + <response name="error" type="view" value="EditOldProductStoreEmails"/> + </request-map> <!-- ================ Product Store Keyword Override ============= --> <request-map uri="editProductStoreKeywordOvrd"> @@ -3142,6 +3164,7 @@ under the License. <view-map name="EditProductStore" type="screen" page="component://product/widget/catalog/StoreScreens.xml#EditProductStore"/> <view-map name="FindProductStoreRoles" type="screen" page="component://product/widget/catalog/StoreScreens.xml#FindProductStoreRoles"/> <view-map name="EditProductStoreEmails" type="screen" page="component://product/widget/catalog/StoreScreens.xml#EditProductStoreEmails"/> + <view-map name="EditOldProductStoreEmails" type="screen" page="component://product/widget/catalog/StoreScreens.xml#EditOldProductStoreEmails"/> <view-map name="EditProductStorePromos" type="screen" page="component://product/widget/catalog/StoreScreens.xml#EditProductStorePromos"/> <view-map name="EditProductStoreCatalogs" type="screen" page="component://product/widget/catalog/StoreScreens.xml#EditProductStoreCatalogs"/> <view-map name="EditProductStoreShipSetup" type="screen" page="component://product/widget/catalog/StoreScreens.xml#EditProductStoreShipSetup"/> Modified: ofbiz/branches/20111205EmailHandling/applications/product/widget/catalog/CatalogMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/product/widget/catalog/CatalogMenus.xml?rev=1210493&r1=1210492&r2=1210493&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/applications/product/widget/catalog/CatalogMenus.xml (original) +++ ofbiz/branches/20111205EmailHandling/applications/product/widget/catalog/CatalogMenus.xml Mon Dec 5 15:19:33 2011 @@ -239,6 +239,11 @@ under the License. <parameter param-name="productStoreId"/> </link> </menu-item> + <menu-item name="EditOldProductStoreEmails" title="${uiLabelMap.ProductOldProductStoreEmails}"> + <link target="EditOldProductStoreEmails"> + <parameter param-name="productStoreId"/> + </link> + </menu-item> <menu-item name="EditProductStoreSurveys" title="${uiLabelMap.CommonSurveys}"> <link target="EditProductStoreSurveys"> <parameter param-name="productStoreId"/> Modified: ofbiz/branches/20111205EmailHandling/applications/product/widget/catalog/ProductStoreForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/product/widget/catalog/ProductStoreForms.xml?rev=1210493&r1=1210492&r2=1210493&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/applications/product/widget/catalog/ProductStoreForms.xml (original) +++ ofbiz/branches/20111205EmailHandling/applications/product/widget/catalog/ProductStoreForms.xml Mon Dec 5 15:19:33 2011 @@ -507,7 +507,48 @@ <form name="createProductStoreEmail" type="single" target="createProductStoreEmail" title="" header-row-style="header-row" default-table-style="basic-table"> - <auto-fields-service service-name="createProductStoreEmailSetting"/> + <auto-fields-service service-name="createProdStoreEmailTplSetting"/> + <field name="productStoreId" map-name="productStore"><hidden/></field> + <field name="emailTypeEnumId" title="${uiLabelMap.CommonEmailType}"> + <drop-down> + <entity-options entity-name="Enumeration" key-field-name="enumId" description="${description}"> + <entity-constraint name="enumTypeId" operator="in" value="PRDS_EMAIL,PARTY_EMAIL"/> + <entity-order-by field-name="sequenceId"/> + </entity-options> + </drop-down> + </field> + <field name="emailTemplateSettingId"><lookup target-form-name="LookupEmailTemplateSetting"/></field> + <field name="fromDate"><date-time default-value="${nowTimestamp}"/></field> + <field name="thruDate"><date-time/></field> + <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> + </form> + <form name="updateProductStoreEmail" type="list" target="updateProductStoreEmail" title="" list-name="productStoreEmailSettings" + odd-row-style="alternate-row" default-table-style="basic-table"> + <auto-fields-service service-name="updateProdStoreEmailTplSetting"/> + <auto-fields-entity entity-name="EmailTemplateSetting" default-field-type="display"/> + <field name="productStoreId"><hidden/></field> + <field name="emailTemplateSettingId"> + <display-entity entity-name="EmailTemplateSetting" description=" "> + <sub-hyperlink target="/content/control/EditEmailTemplateSetting" target-type="inter-app" description="[${emailTemplateSettingId}] ${description}"/> + </display-entity> + </field> + <field name="fromDate"><display type="date"/></field> + <field name="emailTypeEnumId" title="${uiLabelMap.CommonEmailType}"> + <display-entity entity-name="Enumeration" key-field-name="enumId" description="${description}"/> + </field> + <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext"> + <hyperlink target="removeProductStoreEmail" description="${uiLabelMap.CommonDelete}" also-hidden="false"> + <parameter param-name="productStoreId"/> + <parameter param-name="emailTemplateSettingId"/> + <parameter param-name="emailTypeEnumId"/> + <parameter param-name="fromDate"/> + </hyperlink> + </field> + </form> + <form name="createOldProductStoreEmail" type="single" target="createOldProductStoreEmail" title="" + header-row-style="header-row" default-table-style="basic-table"> + <auto-fields-service service-name="createOldProdStoreEmailSetting"/> <field name="productStoreId" map-name="productStore"><hidden/></field> <field name="emailType" title="${uiLabelMap.CommonEmailType}"> <drop-down> @@ -517,22 +558,16 @@ </entity-options> </drop-down> </field> - <field name="bodyScreenLocation" title="${uiLabelMap.ProductBodyScreenLocation}"></field> - <field name="xslfoAttachScreenLocation" title="${uiLabelMap.ProductAttachmentScreenLocation}"></field> - <field name="subject" title="${uiLabelMap.ProductSubject}"></field> <field name="fromAddress" title="${uiLabelMap.CommonFromAddress}"></field> <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <form name="updateProductStoreEmail" type="list" target="updateProductStoreEmail" title="" list-name="productStoreEmailSettings" + <form name="updateOldProductStoreEmail" type="list" target="updateOldProductStoreEmail" title="" list-name="productStoreEmailSettings" odd-row-style="alternate-row" default-table-style="basic-table"> - <auto-fields-service service-name="updateProductStoreEmailSetting"/> + <auto-fields-service service-name="updateOldProdStoreEmailSetting"/> <field name="productStoreId"><hidden/></field> <field name="emailType" title="${uiLabelMap.CommonEmailType}"> <display-entity entity-name="Enumeration" key-field-name="enumId" description="${description}" cache="true" also-hidden="true"/> </field> - <field name="bodyScreenLocation" title="${uiLabelMap.ProductBodyScreenLocation}"></field> - <field name="xslfoAttachScreenLocation" title="${uiLabelMap.ProductAttachmentScreenLocation}"></field> - <field name="subject" title="${uiLabelMap.ProductSubject}"></field> <field name="fromAddress" title="${uiLabelMap.CommonFromAddress}"></field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> <field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext"> Modified: ofbiz/branches/20111205EmailHandling/applications/product/widget/catalog/StoreScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/product/widget/catalog/StoreScreens.xml?rev=1210493&r1=1210492&r2=1210493&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/applications/product/widget/catalog/StoreScreens.xml (original) +++ ofbiz/branches/20111205EmailHandling/applications/product/widget/catalog/StoreScreens.xml Mon Dec 5 15:19:33 2011 @@ -325,7 +325,7 @@ under the License. <set field="paymentMethodTypeId" from-field="parameters.paymentMethodTypeId"/> <set field="paymentServiceTypeEnumId" from-field="parameters.paymentServiceTypeEnumId"/> <entity-one entity-name="ProductStorePaymentSetting" value-field="productStorePaymentSetting" auto-field-map="true"/> - + <script location="component://product/webapp/catalog/WEB-INF/actions/store/EditProductStorePaySetup.groovy"/> </actions> <widgets> @@ -349,20 +349,52 @@ under the License. </widgets> </section> </screen> + <!-- TODO Remove this screen when all send email system will be converted --> + <screen name="EditOldProductStoreEmails"> + <section> + <actions> + <set field="titleProperty" value="PageTitleEditProductStoreEmailSetup"/> + <set field="headerItem" value="store"/> + <set field="tabButtonItem" value="EditOldProductStoreEmails"/> + <set field="labelTitleProperty" value="ProductOldProdStoreEmailSettings"/> + + <set field="productStoreId" from-field="parameters.productStoreId"/> + <entity-one entity-name="ProductStore" value-field="productStore" auto-field-map="true"/> + + <entity-condition entity-name="OldProdStoreEmailSetting" list="productStoreEmailSettings"> + <condition-expr field-name="productStoreId" from-field="productStoreId"/> + <order-by field-name="emailType"/> + </entity-condition> + </actions> + <widgets> + <decorator-screen name="CommonProductStoreDecorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <label style="h3">${uiLabelMap.ProductDeprecatedProductStoreEmailScreen}</label> + <screenlet title="${uiLabelMap.PageTitleEditProductStoreEmailSetup}"> + <include-form name="updateOldProductStoreEmail" location="component://product/widget/catalog/ProductStoreForms.xml"/> + </screenlet> + <screenlet title="${uiLabelMap.PageTitleAddProductStoreEmailSetup}"> + <include-form name="createOldProductStoreEmail" location="component://product/widget/catalog/ProductStoreForms.xml"/> + </screenlet> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> <screen name="EditProductStoreEmails"> <section> <actions> <set field="titleProperty" value="PageTitleEditProductStoreEmailSetup"/> <set field="headerItem" value="store"/> <set field="tabButtonItem" value="EditProductStoreEmails"/> - <set field="labelTitleProperty" value="ProductProductStoreEmailSettings"/> + <set field="labelTitleProperty" value="ProductProdStoreEmailSettings"/> <set field="productStoreId" from-field="parameters.productStoreId"/> <entity-one entity-name="ProductStore" value-field="productStore" auto-field-map="true"/> - <entity-condition entity-name="ProductStoreEmailSetting" list="productStoreEmailSettings"> + <entity-condition entity-name="ProdStoreEmailAndTemplateSettingView" list="productStoreEmailSettings" filter-by-date="true"> <condition-expr field-name="productStoreId" from-field="productStoreId"/> - <order-by field-name="emailType"/> + <order-by field-name="emailTypeEnumId"/> </entity-condition> </actions> <widgets> Modified: ofbiz/branches/20111205EmailHandling/applications/securityext/src/org/ofbiz/securityext/login/LoginEvents.java URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/securityext/src/org/ofbiz/securityext/login/LoginEvents.java?rev=1210493&r1=1210492&r2=1210493&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/applications/securityext/src/org/ofbiz/securityext/login/LoginEvents.java (original) +++ ofbiz/branches/20111205EmailHandling/applications/securityext/src/org/ofbiz/securityext/login/LoginEvents.java Mon Dec 5 15:19:33 2011 @@ -264,9 +264,9 @@ public class LoginEvents { // get the ProductStore email settings GenericValue productStoreEmail = null; try { - productStoreEmail = delegator.findOne("ProductStoreEmailSetting", false, "productStoreId", productStoreId, "emailType", "PRDS_PWD_RETRIEVE"); + productStoreEmail = delegator.findOne("OldProdStoreEmailSetting", false, "productStoreId", productStoreId, "emailType", "PRDS_PWD_RETRIEVE"); } catch (GenericEntityException e) { - Debug.logError(e, "Problem getting ProductStoreEmailSetting", module); + Debug.logError(e, "Problem getting OldProdStoreEmailSetting", module); } if (productStoreEmail == null) { Modified: ofbiz/branches/20111205EmailHandling/debian/override-data.xslt URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/debian/override-data.xslt?rev=1210493&r1=1210492&r2=1210493&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/debian/override-data.xslt (original) +++ ofbiz/branches/20111205EmailHandling/debian/override-data.xslt Mon Dec 5 15:19:33 2011 @@ -107,7 +107,7 @@ under the License. </xsl:template> <xsl:template mode="data" match=" - ProductStoreEmailSetting[ + OldProdStoreEmailSetting[ @bccAddress='ofbiztest@example.com' or @fromAddress='ofbiztest@example.com']\|ContactList[ @verifyEmailFrom='ofbiztest@example.com' @@ -123,7 +123,7 @@ under the License. </xsl:element> </xsl:template> - <xsl:template mode="match" match="ProductStoreEmailSetting/@bccAddress\|ProductStoreEmailSetting/@fromAddress\|ProductStoreEmailSetting/@verifyEmailFrom\|ContactMech/@infoString\|ContactList/@verifyEmailFrom\|WorkflowDataField/@initialValue"> + <xsl:template mode="match" match="OldProdStoreEmailSetting/@bccAddress\|OldProdStoreEmailSetting/@fromAddress\|OldProdStoreEmailSetting/@verifyEmailFrom\|ContactMech/@infoString\|ContactList/@verifyEmailFrom\|WorkflowDataField/@initialValue"> <xsl:attribute name="{name()}"> <xsl:choose> <xsl:when test=". = 'ofbiztest@example.com'"><xsl:value-of select="$fromemail"/></xsl:when> Modified: ofbiz/branches/20111205EmailHandling/framework/common/config/CommonUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/framework/common/config/CommonUiLabels.xml?rev=1210493&r1=1210492&r2=1210493&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/framework/common/config/CommonUiLabels.xml (original) +++ ofbiz/branches/20111205EmailHandling/framework/common/config/CommonUiLabels.xml Mon Dec 5 15:19:33 2011 @@ -10258,6 +10258,18 @@ <value xml:lang="es">Comando a llamar</value> <value xml:lang="fr">Cmd d'appel</value> </property> + <property key="FormFieldTitle_bodyScreenLocation"> + <value xml:lang="de">Body Screen Pfad</value> + <value xml:lang="en">Body Screen Location</value> + <value xml:lang="es">UbicaciÃ³n de la Pantalla Principal</value> + <value xml:lang="fr">Emplacement de l'Ã©cran</value> + <value xml:lang="it">Posizione Corpo Videata</value> + <value xml:lang="ro">Pozitie Corp Videata</value> + <value xml:lang="ru">ÐÑÑÑ Ðº ÑÐºÑÐ°Ð½Ñ ÑÐ¾Ð´ÐµÑÐ¶Ð°Ð½Ð¸Ñ</value> + <value xml:lang="th">Body Screen Location</value> + <value xml:lang="zh">ä¸»ä½å±å¹ä½ç½®</value> + <value xml:lang="zh_TW">ä¸»é«è¢å¹ä½ç½®</value> + </property> <property key="FormFieldTitle_comments"> <value xml:lang="ar">ØªØ¹Ø§ÙÙÙ</value> <value xml:lang="de">Anmerkungen</value> @@ -10508,6 +10520,14 @@ <value xml:lang="es">CÃ³digo acciÃ³n dispositivo externo</value> <value xml:lang="fr">Obj. de l'action</value> </property> + <property key="FormFieldTitle_emailTemplateSettingId"> + <value xml:lang="en">ID email template</value> + <value xml:lang="fr">RÃ©f. ModÃ¨le mÃ©l</value> + </property> + <property key="FormFieldTitle_fromAddress"> + <value xml:lang="en">From Address</value> + <value xml:lang="fr">Addresse d'envoi</value> + </property> <property key="FormFieldTitle_fromDate"> <value xml:lang="ar">ØªØ§Ø±ÙØ® Ø§ÙØ¨Ø¯Ø¡</value> <value xml:lang="de">Von Datum</value> @@ -10914,6 +10934,18 @@ <value xml:lang="zh">æ´æ°</value> <value xml:lang="zh_TW">æ´æ°</value> </property> + <property key="FormFieldTitle_xslfoAttachScreenLocation"> + <value xml:lang="de">Anhang Screen Pfad (XSL-FO)</value> + <value xml:lang="en">Attachment Screen Location (XSL-FO)</value> + <value xml:lang="es">UbicaciÃ³n de la pantalla de Adjuntos (XSL-FO)</value> + <value xml:lang="fr">Emplacement de l'Ã©cran rattachÃ© (XSL-FO)</value> + <value xml:lang="it">Allegato Locazione Videata (XSL-FO)</value> + <value xml:lang="ro">Anexa Locatie Videata (XSL-FO)</value> + <value xml:lang="ru">ÐÑÑÑ Ðº ÑÐºÑÐ°Ð½Ñ Ð¿ÑÐ¸ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð½Ð¾Ð³Ð¾ ÑÐ°Ð¹Ð»Ð° (XSL-FO)</value> + <value xml:lang="th">à¸à¸µà¹à¸à¸±à¹à¸à¸à¸²à¸£à¹à¸à¸·à¹à¸à¸¡à¸à¹à¸à¸«à¸à¹à¸²à¸à¸ (XSL-FO)</value> + <value xml:lang="zh">éä»¶å±å¹ä½ç½® (XSL-FO)</value> + <value xml:lang="zh_TW">éä»¶è¢å¹ä½ç½® (XSL-FO)</value> + </property> <property key="Google Base"> <value xml:lang="de">Google Base</value> <value xml:lang="en">Google Base</value> @@ -11222,6 +11254,10 @@ <value xml:lang="zh">ç»å½</value> <value xml:lang="zh_TW">ç»å¥</value> </property> + <property key="PageTitleLookupEmailTemplateSetting"> + <value xml:lang="en">Lookup Email Template Setting</value> + <value xml:lang="fr">Recherche d'un modÃ¨le de mÃ©l</value> + </property> <property key="PageTitleLookupGeo"> <value xml:lang="en">Lookup Geo</value> <value xml:lang="es">Buscar zonas geogrÃ¡ficas</value> Modified: ofbiz/branches/20111205EmailHandling/framework/common/config/general.properties URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/framework/common/config/general.properties?rev=1210493&r1=1210492&r2=1210493&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/framework/common/config/general.properties (original) +++ ofbiz/branches/20111205EmailHandling/framework/common/config/general.properties Mon Dec 5 15:19:33 2011 @@ -71,7 +71,7 @@ defaultFromEmailAddress=ofbiztest@exampl # as 'baseUrl' and 'baseSecureUrl' are set in the url.properties file. # -- mail notifications enabled (Y\|N) -mail.notifications.enabled=N +mail.notifications.enabled=Y # -- redirect all mail notifications to this address for testing #mail.notifications.redirectTo= @@ -101,7 +101,7 @@ mail.smtp.relay.host=localhost mail.address.caseInsensitive=N # -- debug SMTP mail option enabled (Y\|N) -mail.debug.on=N +mail.debug.on=Y # -- if some addresses fail the SMTP check using the RCPT TO: command then setting this property to false will abort sending the message # to any recipients valid or not Modified: ofbiz/branches/20111205EmailHandling/framework/common/script/org/ofbiz/common/email/EmailServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/framework/common/script/org/ofbiz/common/email/EmailServices.xml?rev=1210493&r1=1210492&r2=1210493&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/framework/common/script/org/ofbiz/common/email/EmailServices.xml (original) +++ ofbiz/branches/20111205EmailHandling/framework/common/script/org/ofbiz/common/email/EmailServices.xml Mon Dec 5 15:19:33 2011 @@ -24,28 +24,26 @@ under the License. <!-- if partyIdTo provided but no emailAddress, get it from the partyContactMech --> <if-empty field="parameters.sendTo"> <if-empty field="parameters.partyIdTo"> - <log level="error" message="PartyId or SendTo should be specified!"></log> + <log level="error" message="PartyId or SendTo should be specified!"/> <add-error> <fail-property resource="CommonUiLabels" property="CommonEmailShouldBeSpecified"/> </add-error> <check-errors/> </if-empty> </if-empty> - <if-not-empty field="parameters.partyIdTo"> + <if-empty field="parameters.sendTo"> + <set field="getEmail.partyId" from-field="parameters.partyIdTo"/> + <call-service service-name="getPartyEmail" in-map-name="getEmail"> + <result-to-field result-name="emailAddress" field="parameters.sendTo"/> + </call-service> <if-empty field="parameters.sendTo"> - <set field="getEmail.partyId" from-field="parameters.partyIdTo"/> - <call-service service-name="getPartyEmail" in-map-name="getEmail"> - <result-to-field result-name="emailAddress" field="parameters.sendTo"/> - </call-service> - <if-empty field="parameters.sendTo"> - <log level="error" message="PartyId: ${parameters.partyIdTo} has no valid email address!"></log> - <add-error> - <fail-property resource="CommonUiLabels" property="CommonEmailNotValid"/> - </add-error> - <check-errors/> - </if-empty> + <log level="error" message="PartyId: ${parameters.partyIdTo} has no valid email address!"></log> + <add-error> + <fail-property resource="CommonUiLabels" property="CommonEmailNotValid"/> + </add-error> + <check-errors/> </if-empty> - </if-not-empty> + </if-empty> <entity-one entity-name="EmailTemplateSetting" value-field="emailTemplateSetting"/> <if-not-empty field="emailTemplateSetting"> <set field="emailParams.bodyScreenUri" from-field="emailTemplateSetting.bodyScreenLocation"/> @@ -54,7 +52,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="ofbiztest@example.com"/> + <property-to-field resource="general" property="defaultFromEmailAddress" field="emailParams.sendFrom" default="ofbiztest@example.com"/> </else> </if-not-empty> <set field="emailParams.sendCc" from-field="emailTemplateSetting.ccAddress"/> @@ -72,7 +70,7 @@ under the License. <result-to-result result-name="communicationEventId"/> </call-service> <else> - <log level="error" message="sendMailFromTemplateSetting service could not find the emailTemplateSettingId: ${parameters.emailTemplateSettingId}"></log> + <log level="error" message="sendMailFromTemplateSetting service could not find the emailTemplateSettingId: ${parameters.emailTemplateSettingId}"/> </else> </if-not-empty> </simple-method> Modified: ofbiz/branches/20111205EmailHandling/framework/common/servicedef/services_email.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/framework/common/servicedef/services_email.xml?rev=1210493&r1=1210492&r2=1210493&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/framework/common/servicedef/services_email.xml (original) +++ ofbiz/branches/20111205EmailHandling/framework/common/servicedef/services_email.xml Mon Dec 5 15:19:33 2011 @@ -23,6 +23,21 @@ under the License. <description>Content Component Services</description> <vendor>OFBiz</vendor> + <!-- Email Template Setting Management Service --> + <service name="createEmailTemplateSetting" engine="entity-auto" invoke="create" + auth ="true" default-entity-name="EmailTemplateSetting"> + <auto-attributes mode="IN" include="nonpk" optional="true"/> + <auto-attributes mode="OUT" include="pk"/> + </service> + <service name="updateEmailTemplateSetting" engine="entity-auto" invoke="update" + auth ="true" default-entity-name="EmailTemplateSetting"> + <auto-attributes mode="IN" include="pk"/> + <auto-attributes mode="IN" include="nonpk" optional="true"/> + </service> + <service name="removeEmailTemplateSetting" engine="entity-auto" invoke="delete" + auth ="true" default-entity-name="EmailTemplateSetting"> + <auto-attributes mode="IN" include="pk"/> + </service> <!-- Email Related Services --> <service name="sendMailInterface" engine="interface" location="" invoke=""> <description>Interface service for mail services. contentType defaults to "text/html", sendType defaults to @@ -35,10 +50,10 @@ under the License. <attribute name="authPass" type="String" mode="IN" optional="true"/> <attribute name="port" type="String" mode="IN" optional="true"/> <attribute name="sendVia" type="String" mode="IN" optional="true"/> - <attribute name="sendType" type="String" mode="IN" optional="true"/> + <attribute name="sendType" type="String" mode="IN" optional="true"/> <attribute name="socketFactoryClass" type="String" mode="IN" optional="true"/> <attribute name="socketFactoryPort" type="String" mode="IN" optional="true"/> - <attribute name="socketFactoryFallback" type="String" mode="IN" optional="true"/> + <attribute name="socketFactoryFallback" type="String" mode="IN" optional="true"/> <attribute name="sendFailureNotification" mode="IN" type="Boolean" optional="true"/> <attribute name="sendPartial" mode="IN" type="Boolean" optional="true"/> <attribute name="subject" type="String" mode="INOUT" optional="true" allow-html="safe"/> @@ -50,14 +65,14 @@ under the License. <attribute name="custRequestId" type="String" mode="INOUT" optional="true"/> <attribute name="messageWrapper" type="org.ofbiz.service.mail.MimeMessageWrapper" mode="OUT" optional="true"/><!-- mail can be disabled in general.properties so no output --> <!-- used for parsing and ECAs --> - <attribute name="communicationEventId" type="String" mode="INOUT" optional="true"/> + <attribute name="communicationEventId" type="String" mode="INOUT" optional="true"/> </service> <service name="sendMail" engine="java" location="org.ofbiz.common.email.EmailServices" invoke="sendMail"> <description>Send E-Mail Service. partyId and communicationEventId aren't used by sendMail but are passed down to storeEmailAsCommunication during the SECA chain. See sendMailInterface for more comments.</description> <implements service="sendMailInterface"/> - <attribute name="body" type="String" mode="INOUT" optional="false" allow-html="safe"/> + <attribute name="body" type="String" mode="INOUT" optional="false" allow-html="safe"/> <override name="contentType" mode="INOUT"/> <override name="subject" mode="INOUT" optional="false"/> <override name="emailType" type="String" mode="INOUT" optional="true"/> @@ -94,16 +109,13 @@ under the License. <attribute name="subject" type="String" mode="OUT" optional="true"/> <attribute name="body" type="String" mode="OUT" optional="false"/> </service> - <service name="sendMailFromTemplateSetting" engine="simple" + <service name="sendMailFromTemplateSetting" engine="simple" max-retry="3" location="component://common/script/org/ofbiz/common/email/EmailServices.xml" invoke="sendMailFromTemplateSetting"> <description>Send Email From Email Template Setting Service</description> - <implements service="sendMailInterface"/> + <implements service="sendMailFromScreen"/> <attribute name="emailTemplateSettingId" type="String" mode="IN" optional="false"/> <attribute name="partyIdTo" type="String" mode="IN" optional="true"/> - <attribute name="bodyText" type="String" mode="IN" optional="true" allow-html="safe"/> <attribute name="attachmentName" type="String" mode="IN" optional="true"/> - <attribute name="bodyParameters" type="Map" mode="IN" optional="true"/> - <attribute name="webSiteId" type="String" mode="IN" optional="true"/> <attribute name="body" type="String" mode="OUT" optional="true"/> </service> Modified: ofbiz/branches/20111205EmailHandling/framework/common/webcommon/WEB-INF/common-controller.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/framework/common/webcommon/WEB-INF/common-controller.xml?rev=1210493&r1=1210492&r2=1210493&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/framework/common/webcommon/WEB-INF/common-controller.xml (original) +++ ofbiz/branches/20111205EmailHandling/framework/common/webcommon/WEB-INF/common-controller.xml Mon Dec 5 15:19:33 2011 @@ -210,8 +210,9 @@ under the License. <!-- Lookup requests --> <request-map uri="LookupGeo"><security https="true" auth="true"/><response name="success" type="view" value="LookupGeo"/></request-map> <request-map uri="LookupGeoName"><security https="true" auth="true"/><response name="success" type="view" value="LookupGeoName"/></request-map> + <request-map uri="LookupEmailTemplateSetting"><security https="true" auth="true"/><response name="success" type="view" value="LookupEmailTemplateSetting"/></request-map> <request-map uri="LookupLocale"><security https="true" auth="true"/><response name="success" type="view" value="LookupLocale"/></request-map> - + <!--========================== AJAX events =====================--> <!-- Get states related to a country --> <request-map uri="getAssociatedStateList"> @@ -283,5 +284,6 @@ under the License. <view-map name="LookupGeo" type="screen" page="component://common/widget/LookupScreens.xml#LookupGeo"/> <view-map name="LookupGeoName" type="screen" page="component://common/widget/LookupScreens.xml#LookupGeoName"/> + <view-map name="LookupEmailTemplateSetting" type="screen" page="component://common/widget/LookupScreens.xml#LookupEmailTemplateSetting"/> <view-map name="LookupLocale" type="screen" page="component://common/widget/LookupScreens.xml#LookupLocale"/> </site-conf> Modified: ofbiz/branches/20111205EmailHandling/framework/common/widget/LookupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/framework/common/widget/LookupForms.xml?rev=1210493&r1=1210492&r2=1210493&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/framework/common/widget/LookupForms.xml (original) +++ ofbiz/branches/20111205EmailHandling/framework/common/widget/LookupForms.xml Mon Dec 5 15:19:33 2011 @@ -115,6 +115,27 @@ under the License. </field> </form> + <form name="LookupEmailTemplateSetting" type="single" target="LookupEmailTemplateSetting"> + <auto-fields-entity entity-name="EmailTemplateSetting" default-field-type="find"/> + <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> + <field name="submitButton" title="${uiLabelMap.CommonFind}"><submit button-type="button"/></field> + </form> + + <form name="ListEmailTemplateSettings" type="list" list-name="listIt" paginate-target="LookupEmailTemplateSetting" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> + <actions> + <service service-name="performFind" result-map="result" result-map-list="listIt"> + <field-map field-name="inputFields" from-field="parameters"/> + <field-map field-name="orderBy" value="emailTemplateSettingId"/> + <field-map field-name="entityName" value="EmailTemplateSetting"/> + </service> + </actions> + <auto-fields-entity entity-name="EmailTemplateSetting" default-field-type="display"/> + <field name="emailTemplateSettingId" widget-style="smallSubmit"> + <hyperlink also-hidden="false" target-type="plain" description="${description} [${emailTemplateSettingId}]" target="javascript:set_value('${emailTemplateSettingId}')"/> + </field> + </form> + <form name="LookupLocale" type="single" target="LookupLocale"> <field name="localeString"><text-find/></field> <field name="localeName" title="${uiLabelMap.CommonLanguageTitle}"><text-find/></field> Modified: ofbiz/branches/20111205EmailHandling/framework/common/widget/LookupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/framework/common/widget/LookupScreens.xml?rev=1210493&r1=1210492&r2=1210493&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/framework/common/widget/LookupScreens.xml (original) +++ ofbiz/branches/20111205EmailHandling/framework/common/widget/LookupScreens.xml Mon Dec 5 15:19:33 2011 @@ -73,7 +73,7 @@ under the License. <!-- required: fields to search a match --> <!-- the first element from searchFields is returned after user selection --> <!-- it might be hidden based on widget.autocompleter.displayReturnField property in widget.properties --> - <set field="searchFields" value="[geoName, geoId, geoCode]"/> + <set field="searchFields" value="[geoName, geoId, geoCode]"/> <!-- optional: fields to display in the given order, default is searchFields --> <set field="displayFields" value="[geoId, geoName, geoCode]"/> @@ -226,6 +226,24 @@ under the License. </section> </screen> + <screen name="LookupEmailTemplateSetting"> + <section> + <actions> + <set field="title" value="${uiLabelMap.PageTitleLookupEmailTemplateSetting}"/> + </actions> + <widgets> + <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> + <decorator-section name="search-options"> + <include-form name="LookupEmailTemplateSetting" location="component://common/widget/LookupForms.xml"/> + </decorator-section> + <decorator-section name="search-results"> + <include-form name="ListEmailTemplateSettings" location="component://common/widget/LookupForms.xml"/> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + <screen name="LookupLocale"> <section> <actions> Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/ebaystore/data/DemoEbayStoreData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/ebaystore/data/DemoEbayStoreData.xml?rev=1210493&r1=1210492&r2=1210493&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/ebaystore/data/DemoEbayStoreData.xml (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/ebaystore/data/DemoEbayStoreData.xml Mon Dec 5 15:19:33 2011 @@ -94,10 +94,10 @@ <Content contentId="EBAY_ITEM_DISPATCH1" contentTypeId="DOCUMENT" dataResourceId="EBAY_ITEM_DISPATCH1" statusId="CTNT_IN_PROGRESS"/> <ContentRole contentId="EBAY_ITEM_DISPATCH1" partyId="DemoEbayAccount1" roleTypeId="OWNER" fromDate="2010-01-01 00:00:00.000"/> - <ProductStoreEmailSetting productStoreId="90101" emailType="EBAY_WIN_BUYER_NOTI" bccAddress="ofbiztest@example.com" bodyScreenLocation="component://ebaystore/widget/EbayEmailScreens.xml#WinnigBuyerNotification" fromAddress="ofbiztest@example.com" subject="OFBiz Demo - Winnig Buyer Notification #${buyerUserId}" xslfoAttachScreenLocation=""/> - <ProductStoreEmailSetting productStoreId="90101" emailType="EBAY_PAY_RECIEVED" bccAddress="ofbiztest@example.com" bodyScreenLocation="component://ebaystore/widget/EbayEmailScreens.xml#PaymentRecieved" fromAddress="ofbiztest@example.com" subject="OFBiz Demo - PaymentRecieved #${buyerUserId}" xslfoAttachScreenLocation=""/> - <ProductStoreEmailSetting productStoreId="90101" emailType="EBAY_FEEBACK_REMIN" bccAddress="ofbiztest@example.com" bodyScreenLocation="component://ebaystore/widget/EbayEmailScreens.xml#FeedbackReminder" fromAddress="ofbiztest@example.com" subject="OFBiz Demo - Feedback Reminder #${buyerUserId}" xslfoAttachScreenLocation=""/> - <ProductStoreEmailSetting productStoreId="90101" emailType="EBAY_ITEM_DISPATCH" bccAddress="ofbiztest@example.com" bodyScreenLocation="component://ebaystore/widget/EbayEmailScreens.xml#EbayEmailTemplate" fromAddress="ofbiztest@example.com" subject="OFBiz Demo - Item Dispatched Notification #${buyerUserId}" xslfoAttachScreenLocation=""/> + <OldProdStoreEmailSetting productStoreId="90101" emailType="EBAY_WIN_BUYER_NOTI" bccAddress="ofbiztest@example.com" bodyScreenLocation="component://ebaystore/widget/EbayEmailScreens.xml#WinnigBuyerNotification" fromAddress="ofbiztest@example.com" subject="OFBiz Demo - Winnig Buyer Notification #${buyerUserId}" xslfoAttachScreenLocation=""/> + <OldProdStoreEmailSetting productStoreId="90101" emailType="EBAY_PAY_RECIEVED" bccAddress="ofbiztest@example.com" bodyScreenLocation="component://ebaystore/widget/EbayEmailScreens.xml#PaymentRecieved" fromAddress="ofbiztest@example.com" subject="OFBiz Demo - PaymentRecieved #${buyerUserId}" xslfoAttachScreenLocation=""/> + <OldProdStoreEmailSetting productStoreId="90101" emailType="EBAY_FEEBACK_REMIN" bccAddress="ofbiztest@example.com" bodyScreenLocation="component://ebaystore/widget/EbayEmailScreens.xml#FeedbackReminder" fromAddress="ofbiztest@example.com" subject="OFBiz Demo - Feedback Reminder #${buyerUserId}" xslfoAttachScreenLocation=""/> + <OldProdStoreEmailSetting productStoreId="90101" emailType="EBAY_ITEM_DISPATCH" bccAddress="ofbiztest@example.com" bodyScreenLocation="component://ebaystore/widget/EbayEmailScreens.xml#EbayEmailTemplate" fromAddress="ofbiztest@example.com" subject="OFBiz Demo - Item Dispatched Notification #${buyerUserId}" xslfoAttachScreenLocation=""/> <!-- ===================== --> <!-- Ebay Store Demo2 Data --> @@ -174,8 +174,8 @@ <Content contentId="EBAY_ITEM_DISPATCH2" contentTypeId="DOCUMENT" dataResourceId="EBAY_ITEM_DISPATCH2" statusId="CTNT_IN_PROGRESS"/> <ContentRole contentId="EBAY_ITEM_DISPATCH2" partyId="DemoEbayAccount2" roleTypeId="OWNER" fromDate="2010-01-01 00:00:00.000"/> - <ProductStoreEmailSetting productStoreId="90102" emailType="EBAY_WIN_BUYER_NOTI" bccAddress="ofbiztest@example.com" bodyScreenLocation="component://ebaystore/widget/EbayEmailScreens.xml#WinnigBuyerNotification" fromAddress="ofbiztest@example.com" subject="OFBiz Demo - Winnig Buyer Notification #${buyerUserId}" xslfoAttachScreenLocation=""/> - <ProductStoreEmailSetting productStoreId="90102" emailType="EBAY_PAY_RECIEVED" bccAddress="ofbiztest@example.com" bodyScreenLocation="component://ebaystore/widget/EbayEmailScreens.xml#PaymentRecieved" fromAddress="ofbiztest@example.com" subject="OFBiz Demo - PaymentRecieved #${buyerUserId}" xslfoAttachScreenLocation=""/> - <ProductStoreEmailSetting productStoreId="90102" emailType="EBAY_FEEBACK_REMIN" bccAddress="ofbiztest@example.com" bodyScreenLocation="component://ebaystore/widget/EbayEmailScreens.xml#FeedbackReminder" fromAddress="ofbiztest@example.com" subject="OFBiz Demo - Feedback Reminder #${buyerUserId}" xslfoAttachScreenLocation=""/> - <ProductStoreEmailSetting productStoreId="90102" emailType="EBAY_ITEM_DISPATCH" bccAddress="ofbiztest@example.com" bodyScreenLocation="component://ebaystore/widget/EbayEmailScreens.xml#EbayEmailTemplate" fromAddress="ofbiztest@example.com" subject="OFBiz Demo - Item Dispatched Notification #${buyerUserId}" xslfoAttachScreenLocation=""/> + <OldProdStoreEmailSetting productStoreId="90102" emailType="EBAY_WIN_BUYER_NOTI" bccAddress="ofbiztest@example.com" bodyScreenLocation="component://ebaystore/widget/EbayEmailScreens.xml#WinnigBuyerNotification" fromAddress="ofbiztest@example.com" subject="OFBiz Demo - Winnig Buyer Notification #${buyerUserId}" xslfoAttachScreenLocation=""/> + <OldProdStoreEmailSetting productStoreId="90102" emailType="EBAY_PAY_RECIEVED" bccAddress="ofbiztest@example.com" bodyScreenLocation="component://ebaystore/widget/EbayEmailScreens.xml#PaymentRecieved" fromAddress="ofbiztest@example.com" subject="OFBiz Demo - PaymentRecieved #${buyerUserId}" xslfoAttachScreenLocation=""/> + <OldProdStoreEmailSetting productStoreId="90102" emailType="EBAY_FEEBACK_REMIN" bccAddress="ofbiztest@example.com" bodyScreenLocation="component://ebaystore/widget/EbayEmailScreens.xml#FeedbackReminder" fromAddress="ofbiztest@example.com" subject="OFBiz Demo - Feedback Reminder #${buyerUserId}" xslfoAttachScreenLocation=""/> + <OldProdStoreEmailSetting productStoreId="90102" emailType="EBAY_ITEM_DISPATCH" bccAddress="ofbiztest@example.com" bodyScreenLocation="component://ebaystore/widget/EbayEmailScreens.xml#EbayEmailTemplate" fromAddress="ofbiztest@example.com" subject="OFBiz Demo - Item Dispatched Notification #${buyerUserId}" xslfoAttachScreenLocation=""/> </entity-engine-xml> Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/ebaystore/script/org/ofbiz/ebaystore/EbayStoreEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/ebaystore/script/org/ofbiz/ebaystore/EbayStoreEvents.xml?rev=1210493&r1=1210492&r2=1210493&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/ebaystore/script/org/ofbiz/ebaystore/EbayStoreEvents.xml (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/ebaystore/script/org/ofbiz/ebaystore/EbayStoreEvents.xml Mon Dec 5 15:19:33 2011 @@ -264,15 +264,15 @@ <result-to-field result-name="contentId"/> </call-service> - <!-- create ProductStoreEmailSetting --> + <!-- create OldProdStoreEmailSetting --> <if-not-empty field="parameters.includePayment"> <set field="parameters.subject" value="${parameters.subject} INCLUDE_PAYMENT"/> </if-not-empty> <if-not-empty field="parameters.includeCrossPromotions"> <set field="parameters.subject" value="${parameters.includeCrossPromotions} INCLUDE_CROSS_PROMOTIONS"/> </if-not-empty> - <set-service-fields service-name="createProductStoreEmailSetting" to-map="newEmailSetting" map="parameters"/> - <call-service service-name="createProductStoreEmailSetting" in-map-name="newEmailSetting" > + <set-service-fields service-name="createOldProdStoreEmailSetting" to-map="newEmailSetting" map="parameters"/> + <call-service service-name="createOldProdStoreEmailSetting" in-map-name="newEmailSetting" > <result-to-field result-name="contentId"/> </call-service> </simple-method> @@ -284,15 +284,15 @@ <result-to-field result-name="dataResourceId" field="parameters.dataResourceId"/> </call-service> - <!-- update ProductStoreEmailSetting --> + <!-- update OldProdStoreEmailSetting --> <!--if-not-empty field="parameters.includePayment"> <set field="parameters.subject" value="${parameters.subject} INCLUDE_PAYMENT"/> </if-not-empty> <if-not-empty field="parameters.includeCrossPromotions"> <set field="parameters.subject" value="${parameters.subject} INCLUDE_CROSS_PROMOTIONS"/> </if-not-empty--> - <set-service-fields service-name="updateProductStoreEmailSetting" to-map="updateEmailSetting" map="parameters"/> - <call-service service-name="updateProductStoreEmailSetting" in-map-name="updateEmailSetting" > + <set-service-fields service-name="updateOldProdStoreEmailSetting" to-map="updateEmailSetting" map="parameters"/> + <call-service service-name="updateOldProdStoreEmailSetting" in-map-name="updateEmailSetting" > <result-to-field result-name="contentId"/> </call-service> </simple-method> Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreAutoPreferences.java URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreAutoPreferences.java?rev=1210493&r1=1210492&r2=1210493&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreAutoPreferences.java (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreAutoPreferences.java Mon Dec 5 15:19:33 2011 @@ -353,7 +353,7 @@ public class EbayStoreAutoPreferences { for (SellingManagerSoldOrderType item : items) { // call send Map<String, Object> sendMap = FastMap.newInstance(); - GenericValue productStoreEmail = delegator.findByPrimaryKey("ProductStoreEmailSetting", UtilMisc.toMap("productStoreId", productStoreId, "emailType", "EBAY_FEEBACK_REMIN")); + GenericValue productStoreEmail = delegator.findByPrimaryKey("OldProdStoreEmailSetting", UtilMisc.toMap("productStoreId", productStoreId, "emailType", "EBAY_FEEBACK_REMIN")); String bodyScreenLocation = productStoreEmail.getString("bodyScreenLocation"); sendMap.put("bodyScreenUri", bodyScreenLocation); String subjectString = productStoreEmail.getString("subject"); @@ -687,7 +687,7 @@ public class EbayStoreAutoPreferences { for (SellingManagerSoldOrderType item : items) { // call send Map<String, Object> sendMap = FastMap.newInstance(); - GenericValue productStoreEmail = delegator.findByPrimaryKey("ProductStoreEmailSetting", UtilMisc.toMap("productStoreId", productStoreId, "emailType", "EBAY_PAY_RECIEVED")); + GenericValue productStoreEmail = delegator.findByPrimaryKey("OldProdStoreEmailSetting", UtilMisc.toMap("productStoreId", productStoreId, "emailType", "EBAY_PAY_RECIEVED")); String bodyScreenLocation = productStoreEmail.getString("bodyScreenLocation"); sendMap.put("bodyScreenUri", bodyScreenLocation); String subjectString = productStoreEmail.getString("subject"); @@ -941,7 +941,7 @@ public class EbayStoreAutoPreferences { String buyerUserId = bidder.get("userId").toString(); Map<String, Object> sendMap = FastMap.newInstance(); - GenericValue productStoreEmail = delegator.findByPrimaryKey("ProductStoreEmailSetting", UtilMisc.toMap("productStoreId", productStoreId, "emailType", "EBAY_WIN_BUYER_NOTI")); + GenericValue productStoreEmail = delegator.findByPrimaryKey("OldProdStoreEmailSetting", UtilMisc.toMap("productStoreId", productStoreId, "emailType", "EBAY_WIN_BUYER_NOTI")); String bodyScreenLocation = productStoreEmail.getString("bodyScreenLocation"); sendMap.put("bodyScreenUri", bodyScreenLocation); String subjectString = productStoreEmail.getString("subject"); @@ -1001,7 +1001,7 @@ public class EbayStoreAutoPreferences { String buyerEmail = item.get("buyerEmail").toString(); Map<String, Object> sendMap = FastMap.newInstance(); - GenericValue productStoreEmail = delegator.findByPrimaryKey("ProductStoreEmailSetting", UtilMisc.toMap("productStoreId", productStoreId, "emailType", "EBAY_ITEM_DISPATCH")); + GenericValue productStoreEmail = delegator.findByPrimaryKey("OldProdStoreEmailSetting", UtilMisc.toMap("productStoreId", productStoreId, "emailType", "EBAY_ITEM_DISPATCH")); String bodyScreenLocation = productStoreEmail.getString("bodyScreenLocation"); sendMap.put("bodyScreenUri", bodyScreenLocation); String subjectString = productStoreEmail.getString("subject"); Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/ebaystore/widget/EbayEmailScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/ebaystore/widget/EbayEmailScreens.xml?rev=1210493&r1=1210492&r2=1210493&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/ebaystore/widget/EbayEmailScreens.xml (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/ebaystore/widget/EbayEmailScreens.xml Mon Dec 5 15:19:33 2011 @@ -30,7 +30,7 @@ </service> <set field="userLoginId" from-field="result.userLoginId"/> <set field="emailType" from-field="parameters.emailType"/> - <entity-one value-field="emailSetting" entity-name="ProductStoreEmailSetting"> + <entity-one value-field="emailSetting" entity-name="OldProdStoreEmailSetting"> <field-map field-name="productStoreId" from-field="parameters.productStoreId"/> <field-map field-name="emailType" from-field="emailType"/> </entity-one> Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/ebaystore/widget/EbaySellingManagerScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/ebaystore/widget/EbaySellingManagerScreens.xml?rev=1210493&r1=1210492&r2=1210493&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/ebaystore/widget/EbaySellingManagerScreens.xml (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/ebaystore/widget/EbaySellingManagerScreens.xml Mon Dec 5 15:19:33 2011 @@ -407,7 +407,7 @@ </service> <set field="userLoginId" from-field="result.userLoginId"/> <set field="emailType" from-field="parameters.emailType"/> - <entity-one value-field="emailSetting" entity-name="ProductStoreEmailSetting"> + <entity-one value-field="emailSetting" entity-name="OldProdStoreEmailSetting"> <field-map field-name="productStoreId" from-field="parameters.productStoreId"/> <field-map field-name="emailType" from-field="emailType"/> </entity-one> Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/data/DemoProduct.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/data/DemoProduct.xml?rev=1210493&r1=1210492&r2=1210493&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/data/DemoProduct.xml (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/data/DemoProduct.xml Mon Dec 5 15:19:33 2011 @@ -97,37 +97,37 @@ 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="ofbiztest@example.com" fromAddress="ofbiztest@example.com"/> - <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_ODR_COMPLETE" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderCompleteNotice" subject="OFBiz Demo - Your Order Is Complete #${orderId}" fromAddress="ofbiztest@example.com"/> - <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_ODR_BACKORDER" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#BackorderNotice" subject="OFBiz Demo - Backorder Notification #${orderId}" fromAddress="ofbiztest@example.com"/> - <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_ODR_CHANGE" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderChangeNotice" subject="OFBiz Demo - Order Change Notification #${orderId}" fromAddress="ofbiztest@example.com"/> - <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_ODR_PAYRETRY" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#PaymentRetryNotice" subject="OFBiz Demo - Order Payment Notification #${orderId}" fromAddress="ofbiztest@example.com"/> - <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_ODR_SHIP_COMPLT" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#ShipmentCompleteNotice" subject="OFBiz Demo - Shipment Complete Notification #${orderId}" fromAddress="ofbiztest@example.com"/> + <OldProdStoreEmailSetting 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="ofbiztest@example.com" fromAddress="ofbiztest@example.com"/> + <OldProdStoreEmailSetting productStoreId="9000" emailType="PRDS_ODR_COMPLETE" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderCompleteNotice" subject="OFBiz Demo - Your Order Is Complete #${orderId}" fromAddress="ofbiztest@example.com"/> + <OldProdStoreEmailSetting productStoreId="9000" emailType="PRDS_ODR_BACKORDER" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#BackorderNotice" subject="OFBiz Demo - Backorder Notification #${orderId}" fromAddress="ofbiztest@example.com"/> + <OldProdStoreEmailSetting productStoreId="9000" emailType="PRDS_ODR_CHANGE" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderChangeNotice" subject="OFBiz Demo - Order Change Notification #${orderId}" fromAddress="ofbiztest@example.com"/> + <OldProdStoreEmailSetting productStoreId="9000" emailType="PRDS_ODR_PAYRETRY" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#PaymentRetryNotice" subject="OFBiz Demo - Order Payment Notification #${orderId}" fromAddress="ofbiztest@example.com"/> + <OldProdStoreEmailSetting productStoreId="9000" emailType="PRDS_ODR_SHIP_COMPLT" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#ShipmentCompleteNotice" subject="OFBiz Demo - Shipment Complete Notification #${orderId}" fromAddress="ofbiztest@example.com"/> - <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_RTN_ACCEPT" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnAccept" subject="OFBiz Demo - Return Accepted #${returnHeader.returnId}" xslfoAttachScreenLocation="component://order/widget/ordermgr/OrderPrintScreens.xml#ReturnPDF" fromAddress="ofbiztest@example.com"/> - <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_RTN_COMPLETE" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnComplete" subject="OFBiz Demo - Return Completed #${returnHeader.returnId}" xslfoAttachScreenLocation="component://order/widget/ordermgr/OrderPrintScreens.xml#ReturnPDF" fromAddress="ofbiztest@example.com"/> - <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_RTN_CANCEL" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnCancel" subject="OFBiz Demo - Return Cancelled #${returnHeader.returnId}" xslfoAttachScreenLocation="component://order/widget/ordermgr/OrderPrintScreens.xml#ReturnPDF" fromAddress="ofbiztest@example.com"/> + <OldProdStoreEmailSetting productStoreId="9000" emailType="PRDS_RTN_ACCEPT" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnAccept" subject="OFBiz Demo - Return Accepted #${returnHeader.returnId}" xslfoAttachScreenLocation="component://order/widget/ordermgr/OrderPrintScreens.xml#ReturnPDF" fromAddress="ofbiztest@example.com"/> + <OldProdStoreEmailSetting productStoreId="9000" emailType="PRDS_RTN_COMPLETE" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnComplete" subject="OFBiz Demo - Return Completed #${returnHeader.returnId}" xslfoAttachScreenLocation="component://order/widget/ordermgr/OrderPrintScreens.xml#ReturnPDF" fromAddress="ofbiztest@example.com"/> + <OldProdStoreEmailSetting productStoreId="9000" emailType="PRDS_RTN_CANCEL" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnCancel" subject="OFBiz Demo - Return Cancelled #${returnHeader.returnId}" xslfoAttachScreenLocation="component://order/widget/ordermgr/OrderPrintScreens.xml#ReturnPDF" fromAddress="ofbiztest@example.com"/> - <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_GC_PURCHASE" bodyScreenLocation="component://ecommerce/widget/EmailGiftCardScreens.xml#GiftCardPurchase" fromAddress="ofbiztest@example.com" subject="A Gift From ${senderName}!"/> - <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_GC_RELOAD" bodyScreenLocation="component://ecommerce/widget/EmailGiftCardScreens.xml#GiftCardReload" fromAddress="ofbiztest@example.com" subject="Gift Card Reload Results"/> + <OldProdStoreEmailSetting productStoreId="9000" emailType="PRDS_GC_PURCHASE" bodyScreenLocation="component://ecommerce/widget/EmailGiftCardScreens.xml#GiftCardPurchase" fromAddress="ofbiztest@example.com" subject="A Gift From ${senderName}!"/> + <OldProdStoreEmailSetting productStoreId="9000" emailType="PRDS_GC_RELOAD" bodyScreenLocation="component://ecommerce/widget/EmailGiftCardScreens.xml#GiftCardReload" fromAddress="ofbiztest@example.com" 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="ofbiztest@example.com"/> + <OldProdStoreEmailSetting productStoreId="9000" emailType="PRDS_TELL_FRIEND" bodyScreenLocation="component://ecommerce/widget/EmailProductScreens.xml#TellFriend" subject="${sendFrom} has sent you a link!" fromAddress="ofbiztest@example.com"/> - <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_PWD_RETRIEVE" bodyScreenLocation="component://securityext/widget/EmailSecurityScreens.xml#PasswordEmail" subject="OFBiz Demo - Password Reminder (${userLogin.userLoginId})" fromAddress="ofbiztest@example.com"/> + <OldProdStoreEmailSetting productStoreId="9000" emailType="PRDS_PWD_RETRIEVE" bodyScreenLocation="component://securityext/widget/EmailSecurityScreens.xml#PasswordEmail" subject="OFBiz Demo - Password Reminder (${userLogin.userLoginId})" fromAddress="ofbiztest@example.com"/> - <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="ofbiztest@example.com" fromAddress="ofbiztest@example.com"/> + <OldProdStoreEmailSetting 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="ofbiztest@example.com" fromAddress="ofbiztest@example.com"/> - <ProductStoreEmailSetting productStoreId="9000" emailType="PARTY_REGIS_CONFIRM" bodyScreenLocation="component://party/widget/partymgr/EmailPartyScreens.xml#CreatePartyNotification" subject="New Account Created" bccAddress="ofbiztest@example.com" fromAddress="ofbiztest@example.com"/> - <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_CUST_REGISTER" bodyScreenLocation="component://party/widget/partymgr/EmailPartyScreens.xml#CreatePartyNotification" subject="New Account Created" bccAddress="ofbiztest@example.com" fromAddress="ofbiztest@example.com"/> - <ProductStoreEmailSetting productStoreId="9000" emailType="UPD_PRSNL_INF_CNFRM" bodyScreenLocation="component://party/widget/partymgr/EmailPartyScreens.xml#ChangePersonalInfoNotification" subject="Personal Information Updated" bccAddress="ofbiztest@example.com" fromAddress="ofbiztest@example.com"/> - <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_EMAIL_VERIFY" bodyScreenLocation="component://party/widget/partymgr/EmailPartyScreens.xml#VerifyEmailAddressNotification" subject="Email Address Verification" bccAddress="ofbiztest@example.com" fromAddress="ofbiztest@example.com"/> + <OldProdStoreEmailSetting productStoreId="9000" emailType="PARTY_REGIS_CONFIRM" bodyScreenLocation="component://party/widget/partymgr/EmailPartyScreens.xml#CreatePartyNotification" subject="New Account Created" bccAddress="ofbiztest@example.com" fromAddress="ofbiztest@example.com"/> + <OldProdStoreEmailSetting productStoreId="9000" emailType="PRDS_CUST_REGISTER" bodyScreenLocation="component://party/widget/partymgr/EmailPartyScreens.xml#CreatePartyNotification" subject="New Account Created" bccAddress="ofbiztest@example.com" fromAddress="ofbiztest@example.com"/> + <OldProdStoreEmailSetting productStoreId="9000" emailType="UPD_PRSNL_INF_CNFRM" bodyScreenLocation="component://party/widget/partymgr/EmailPartyScreens.xml#ChangePersonalInfoNotification" subject="Personal Information Updated" bccAddress="ofbiztest@example.com" fromAddress="ofbiztest@example.com"/> + <OldProdStoreEmailSetting productStoreId="9000" emailType="PRDS_EMAIL_VERIFY" bodyScreenLocation="component://party/widget/partymgr/EmailPartyScreens.xml#VerifyEmailAddressNotification" subject="Email Address Verification" bccAddress="ofbiztest@example.com" fromAddress="ofbiztest@example.com"/> - <ProductStoreEmailSetting productStoreId="9000" emailType="CONT_NOTI_EMAIL" bodyScreenLocation="component://ecommerce/widget/EmailContactListScreens.xml#ContactUsEmailNotification" subject="Contact-us Information Notification" fromAddress="ofbiztest@example.com" /> + <OldProdStoreEmailSetting productStoreId="9000" emailType="CONT_NOTI_EMAIL" bodyScreenLocation="component://ecommerce/widget/EmailContactListScreens.xml#ContactUsEmailNotification" subject="Contact-us Information Notification" fromAddress="ofbiztest@example.com" /> - <ProductStoreEmailSetting productStoreId="9000" emailType="SUB_CONT_LIST_NOTI" bodyScreenLocation="component://ecommerce/widget/EmailContactListScreens.xml#ContactListSubscribeEmail" subject="Subscribe Contact List" fromAddress="ofbiztest@example.com"/> - <ProductStoreEmailSetting productStoreId="9000" emailType="UNSUB_CONT_LIST_VERI" bodyScreenLocation="component://ecommerce/widget/EmailContactListScreens.xml#ContactListUnsubscribeVerifyEmail" subject="Verify Unsubscribe Contact List" fromAddress="ofbiztest@example.com"/> - <ProductStoreEmailSetting productStoreId="9000" emailType="UNSUB_CONT_LIST_NOTI" bodyScreenLocation="component://ecommerce/widget/EmailContactListScreens.xml#ContactListUnsubscribeEmail" subject="Unsubscribe Contact List" fromAddress="ofbiztest@example.com"/> - <ProductStoreEmailSetting productStoreId="9000" emailType="CONT_EMAIL_TEMPLATE" bodyScreenLocation="component://ecommerce/widget/EmailContactListScreens.xml#ContactListEmailTemplate"/> + <OldProdStoreEmailSetting productStoreId="9000" emailType="SUB_CONT_LIST_NOTI" bodyScreenLocation="component://ecommerce/widget/EmailContactListScreens.xml#ContactListSubscribeEmail" subject="Subscribe Contact List" fromAddress="ofbiztest@example.com"/> + <OldProdStoreEmailSetting productStoreId="9000" emailType="UNSUB_CONT_LIST_VERI" bodyScreenLocation="component://ecommerce/widget/EmailContactListScreens.xml#ContactListUnsubscribeVerifyEmail" subject="Verify Unsubscribe Contact List" fromAddress="ofbiztest@example.com"/> + <OldProdStoreEmailSetting productStoreId="9000" emailType="UNSUB_CONT_LIST_NOTI" bodyScreenLocation="component://ecommerce/widget/EmailContactListScreens.xml#ContactListUnsubscribeEmail" subject="Unsubscribe Contact List" fromAddress="ofbiztest@example.com"/> + <OldProdStoreEmailSetting productStoreId="9000" emailType="CONT_EMAIL_TEMPLATE" bodyScreenLocation="component://ecommerce/widget/EmailContactListScreens.xml#ContactListEmailTemplate"/> <WebAnalyticsConfig webSiteId="WebStore" webAnalyticsTypeId="GOOGLE_ANALYTICS" webAnalyticsCode="-- enter here your analytic script code --"/> <WebAnalyticsConfig webSiteId="WebStore" webAnalyticsTypeId="BING_ANALYTICS" webAnalyticsCode="-- enter here your analytic script code --"/> Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/data/DemoRentalProduct.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/data/DemoRentalProduct.xml?rev=1210493&r1=1210492&r2=1210493&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/data/DemoRentalProduct.xml (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/data/DemoRentalProduct.xml Mon Dec 5 15:19:33 2011 @@ -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="ofbiztest@example.com" fromAddress="ofbiztest@example.com"/> - <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_ODR_COMPLETE" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderCompleteNotice" subject="OFBiz Demo - Your Order Is Complete #${orderId}" fromAddress="ofbiztest@example.com"/> - <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_ODR_BACKORDER" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#BackorderNotice" subject="OFBiz Demo - Backorder Notification #${orderId}" fromAddress="ofbiztest@example.com"/> - <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_ODR_CHANGE" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderChangeNotice" subject="OFBiz Demo - Order Change Notification #${orderId}" fromAddress="ofbiztest@example.com"/> - <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_ODR_PAYRETRY" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#PaymentRetryNotice" subject="OFBiz Demo - Order Payment Notification #${orderId}" fromAddress="ofbiztest@example.com"/> - - <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_RTN_ACCEPT" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnAccept" subject="OFBiz Demo - Return Accepted #${returnHeader.returnId}" fromAddress="ofbiztest@example.com"/> - <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_RTN_COMPLETE" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnComplete" subject="OFBiz Demo - Return Completed #${returnHeader.returnId}" fromAddress="ofbiztest@example.com"/> - <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_RTN_CANCEL" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnCancel" subject="OFBiz Demo - Return Cancelled #${returnHeader.returnId}" fromAddress="ofbiztest@example.com"/> + <OldProdStoreEmailSetting 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="ofbiztest@example.com" fromAddress="ofbiztest@example.com"/> + <OldProdStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_ODR_COMPLETE" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderCompleteNotice" subject="OFBiz Demo - Your Order Is Complete #${orderId}" fromAddress="ofbiztest@example.com"/> + <OldProdStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_ODR_BACKORDER" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#BackorderNotice" subject="OFBiz Demo - Backorder Notification #${orderId}" fromAddress="ofbiztest@example.com"/> + <OldProdStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_ODR_CHANGE" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderChangeNotice" subject="OFBiz Demo - Order Change Notification #${orderId}" fromAddress="ofbiztest@example.com"/> + <OldProdStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_ODR_PAYRETRY" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#PaymentRetryNotice" subject="OFBiz Demo - Order Payment Notification #${orderId}" fromAddress="ofbiztest@example.com"/> + + <OldProdStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_RTN_ACCEPT" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnAccept" subject="OFBiz Demo - Return Accepted #${returnHeader.returnId}" fromAddress="ofbiztest@example.com"/> + <OldProdStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_RTN_COMPLETE" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnComplete" subject="OFBiz Demo - Return Completed #${returnHeader.returnId}" fromAddress="ofbiztest@example.com"/> + <OldProdStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_RTN_CANCEL" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnCancel" subject="OFBiz Demo - Return Cancelled #${returnHeader.returnId}" fromAddress="ofbiztest@example.com"/> - <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_GC_PURCHASE" bodyScreenLocation="component://ecommerce/widget/EmailGiftCardScreens.xml#GiftCardPurchase" fromAddress="ofbiztest@example.com" subject="A Gift From ${senderName}!"/> - <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_GC_RELOAD" bodyScreenLocation="component://ecommerce/widget/EmailGiftCardScreens.xml#GiftCardReload" fromAddress="ofbiztest@example.com" subject="Gift Card Reload Results"/> + <OldProdStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_GC_PURCHASE" bodyScreenLocation="component://ecommerce/widget/EmailGiftCardScreens.xml#GiftCardPurchase" fromAddress="ofbiztest@example.com" subject="A Gift From ${senderName}!"/> + <OldProdStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_GC_RELOAD" bodyScreenLocation="component://ecommerce/widget/EmailGiftCardScreens.xml#GiftCardReload" fromAddress="ofbiztest@example.com" 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="ofbiztest@example.com"/> + <OldProdStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_TELL_FRIEND" bodyScreenLocation="component://ecommerce/widget/EmailProductScreens.xml#TellFriend" subject="${sendFrom} has sent you a link!" fromAddress="ofbiztest@example.com"/> - <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_PWD_RETRIEVE" bodyScreenLocation="component://securityext/widget/EmailSecurityScreens.xml#PasswordEmail" subject="OFBiz Demo - Password Reminder (${userLoginId})" fromAddress="ofbiztest@example.com"/> + <OldProdStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_PWD_RETRIEVE" bodyScreenLocation="component://securityext/widget/EmailSecurityScreens.xml#PasswordEmail" subject="OFBiz Demo - Password Reminder (${userLoginId})" fromAddress="ofbiztest@example.com"/> <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/branches/20111205EmailHandling/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml?rev=1210493&r1=1210492&r2=1210493&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml Mon Dec 5 15:19:33 2011 @@ -419,7 +419,7 @@ under the License. <if-not-empty field="emailContext.emailAddress"> <set from-field="parameters.emailProductStoreId" field="storeEmailLookup.productStoreId"/> <set value="PRDS_CUST_REGISTER" field="storeEmailLookup.emailType"/> - <find-by-primary-key map="storeEmailLookup" entity-name="ProductStoreEmailSetting" value-field="storeEmail"/> + <find-by-primary-key map="storeEmailLookup" entity-name="OldProdStoreEmailSetting" value-field="storeEmail"/> <if-not-empty field="storeEmail.bodyScreenLocation"> <get-related-one value-field="createdUserLogin" relation-name="Person" to-value-field="person"/> <set field="bodyParameters.person" from-field="person"/> Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/OrderStatus.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/OrderStatus.groovy?rev=1210493&r1=1210492&r2=1210493&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/OrderStatus.groovy (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/OrderStatus.groovy Mon Dec 5 15:19:33 2011 @@ -147,7 +147,7 @@ if (orderHeader) { } } - webSiteId = orderHeader.webSiteId ?: CatalogWorker.getWebSiteId(request); + webSiteId = orderHeader.webSiteId ?: CatalogWorker.getStoreCatalogs(delegator, orderHeader.productStoreId); payToPartyId = productStore.payToPartyId; paymentAddress = PaymentWorker.getPaymentAddress(delegator, payToPartyId); Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/oagis/src/org/ofbiz/oagis/OagisInventoryServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/oagis/src/org/ofbiz/oagis/OagisInventoryServices.java?rev=1210493&r1=1210492&r2=1210493&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/oagis/src/org/ofbiz/oagis/OagisInventoryServices.java (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/oagis/src/org/ofbiz/oagis/OagisInventoryServices.java Mon Dec 5 15:19:33 2011 @@ -253,7 +253,7 @@ public class OagisInventoryServices { if (UtilValidate.isNotEmpty(sendToEmail)) { String productStoreId = UtilProperties.getPropertyValue("oagis.properties", "Oagis.Warehouse.SyncInventoryProductStoreId"); - GenericValue productStoreEmail = delegator.findByPrimaryKey("ProductStoreEmailSetting", UtilMisc.toMap("productStoreId", productStoreId, "emailType", "PRDS_OAGIS_CONFIRM")); + GenericValue productStoreEmail = delegator.findByPrimaryKey("OldProdStoreEmailSetting", UtilMisc.toMap("productStoreId", productStoreId, "emailType", "PRDS_OAGIS_CONFIRM")); if (productStoreEmail != null) { String bodyScreenLocation = productStoreEmail.getString("bodyScreenLocation"); sendMap.put("bodyScreenUri", bodyScreenLocation);
Mime	Unnamed text/plain (inline, 8-Bit, 83983 bytes)
	View raw message