[OFBiz] SVN: r5926 - in trunk/applications: ecommerce/data ecommerce/script/org/ofbiz/ecommerce/customer product/servicedef

jonesde at svn.ofbiz.org jonesde at svn.ofbiz.org
Fri Oct 7 03:14:00 EDT 2005 

Author: jonesde
Date: 2005-10-07 02:13:52 -0500 (Fri, 07 Oct 2005)
New Revision: 5926

Modified:
   trunk/applications/ecommerce/data/DemoRentalProduct.xml
   trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml
   trunk/applications/product/servicedef/services_store.xml
Log:
Removed/updated various references to templatePath, including some reported by Si in Jira OFBIZ-513

Modified: trunk/applications/ecommerce/data/DemoRentalProduct.xml
===================================================================
--- trunk/applications/ecommerce/data/DemoRentalProduct.xml	2005-10-07 07:12:07 UTC (rev 5925)
+++ trunk/applications/ecommerce/data/DemoRentalProduct.xml	2005-10-07 07:13:52 UTC (rev 5926)
@@ -20,18 +20,24 @@
     <ProductStorePaymentSetting productStoreId="RentalStore" paymentMethodTypeId="GIFT_CARD" paymentServiceTypeEnumId="PRDS_PAY_RELEASE" paymentService="testGCRelease"/>
     <ProductStorePaymentSetting productStoreId="RentalStore" paymentMethodTypeId="EXT_PAYPAL" paymentServiceTypeEnumId="PRDS_PAY_EXTERNAL" paymentService=""/>
     <ProductStorePaymentSetting productStoreId="RentalStore" paymentMethodTypeId="EXT_WORLDPAY" paymentServiceTypeEnumId="PRDS_PAY_EXTERNAL" paymentService=""/>
-    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_ODR_CONFIRM" templatePath="/applications/ecommerce/templates/email/emailconfirmation.ftl" subject="OFBiz Demo - Order Confirmation #${orderId}" bccAddress="ofbiztest at yahoo.com" fromAddress="ofbiztest at yahoo.com"/>
-    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_ODR_COMPLETE" templatePath="/applications/ecommerce/templates/email/emailcomplete.ftl" subject="OFBiz Demo - Your Order Is Complete #${orderId}" fromAddress="ofbiztest at yahoo.com"/>
-    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_ODR_BACKORDER" templatePath="/applications/ecommerce/templates/email/emailbackorder.ftl" subject="OFBiz Demo - Backorder Notification #${orderId}" fromAddress="ofbiztest at yahoo.com"/>
-    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_ODR_CHANGE" templatePath="/applications/ecommerce/templates/email/emailorderchange.ftl" subject="OFBiz Demo - Order Change Notification #${orderId}" fromAddress="ofbiztest at yahoo.com"/>
-    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_ODR_PAYRETRY" templatePath="/applications/ecommerce/templates/email/emailpayretry.ftl" subject="OFBiz Demo - Order Payment Notification #${orderId}" fromAddress="ofbiztest at yahoo.com"/>
-    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_RTN_ACCEPT" templatePath="/applications/ecommerce/templates/email/returnaccept.ftl" subject="OFBiz Demo - Return Accepted #${returnHeader.returnId}" fromAddress="ofbiztest at yahoo.com"/>
-    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_RTN_COMPLETE" templatePath="/applications/ecommerce/templates/email/returncomplete.ftl" subject="OFBiz Demo - Return Completed #${returnHeader.returnId}" fromAddress="ofbiztest at yahoo.com"/>
-    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_RTN_CANCEL" templatePath="/applications/ecommerce/templates/email/returncancel.ftl" subject="OFBiz Demo - Return Cancelled #${returnHeader.returnId}" fromAddress="ofbiztest at yahoo.com"/>
-    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_PWD_RETRIEVE" templatePath="/applications/securityext/email/default/passwordemail.ftl" subject="OFBiz Demo - Password Reminder (${userLoginId})" fromAddress="ofbiztest at yahoo.com"/>
-    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_TELL_FRIEND" templatePath="/applications/ecommerce/templates/email/tellafriend.ftl" subject="${sendFrom} has sent you a link!" fromAddress="ofbiztest at yahoo.com"/>
-    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_GC_PURCHASE" templatePath="/applications/ecommerce/templates/email/giftcardpurchase.ftl" fromAddress="ofbiztest at yahoo.com" subject="A Gift From ${senderName}!"/>
-    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_GC_RELOAD" templatePath="/applications/ecommerce/templates/email/giftcardreload.ftl" fromAddress="ofbiztest at yahoo.com" subject="Gift Card Reload Results"/>
+
+    <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 at yahoo.com" fromAddress="ofbiztest at yahoo.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 at yahoo.com"/>
+    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_ODR_BACKORDER" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#BackorderNotice" subject="OFBiz Demo - Backorder Notification #${orderId}" fromAddress="ofbiztest at yahoo.com"/>
+    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_ODR_CHANGE" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderChangeNotice" subject="OFBiz Demo - Order Change Notification #${orderId}" fromAddress="ofbiztest at yahoo.com"/>
+    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_ODR_PAYRETRY" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#PaymentRetryNotice" subject="OFBiz Demo - Order Payment Notification #${orderId}" fromAddress="ofbiztest at yahoo.com"/>
+    
+    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_RTN_ACCEPT" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnAccept" subject="OFBiz Demo - Return Accepted #${returnHeader.returnId}" fromAddress="ofbiztest at yahoo.com"/>
+    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_RTN_COMPLETE" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnComplete" subject="OFBiz Demo - Return Completed #${returnHeader.returnId}" fromAddress="ofbiztest at yahoo.com"/>
+    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_RTN_CANCEL" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnCancel" subject="OFBiz Demo - Return Cancelled #${returnHeader.returnId}" fromAddress="ofbiztest at yahoo.com"/>
+    
+    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_GC_PURCHASE" bodyScreenLocation="component://ecommerce/widget/EmailGiftCardScreens.xml#GiftCardPurchase" fromAddress="ofbiztest at yahoo.com" subject="A Gift From ${senderName}!"/>
+    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_GC_RELOAD" bodyScreenLocation="component://ecommerce/widget/EmailGiftCardScreens.xml#GiftCardReload" fromAddress="ofbiztest at yahoo.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 at yahoo.com"/>
+    
+    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_PWD_RETRIEVE" bodyScreenLocation="component://securityext/widget/EmailSecurityScreens.xml#PasswordEmail" subject="OFBiz Demo - Password Reminder (${userLoginId})" fromAddress="ofbiztest at yahoo.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"/>
     <ProductStoreKeywordOvrd productStoreId="RentalStore" keyword="gizmo" fromDate="2001-05-13 12:00:00.0" target="100" targetTypeEnumId="KOTT_PRODCAT"/>

Modified: trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml
===================================================================
--- trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml	2005-10-07 07:12:07 UTC (rev 5925)
+++ trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml	2005-10-07 07:13:52 UTC (rev 5926)
@@ -411,7 +411,7 @@
             <env-to-env env-name="parameters.emailProductStoreId" to-env-name="storeEmailLookup.productStoreId"/>
             <string-to-field string="PRDS_CUST_REGISTER" field-name="emailType" map-name="storeEmailLookup"/>
             <find-by-primary-key map-name="storeEmailLookup" entity-name="ProductStoreEmailSetting"  value-name="storeEmail"/>
-            <if-not-empty field-name="templatePath" map-name="storeEmail">
+            <if-not-empty field-name="bodyScreenLocation" map-name="storeEmail">
                 <!-- prepare the email context -->
                 <get-related-one value-name="createdUserLogin" relation-name="Person" to-value-name="personObj"/>
                 <env-to-field env-name="createdUserLogin" field-name="userLogin" map-name="emailCtx"/>
@@ -423,7 +423,7 @@
                 <field-to-field field-name="ccAddress" map-name="storeEmail" to-field-name="sendCc" to-map-name="notifyCtx"/>
                 <field-to-field field-name="bccAddress" map-name="storeEmail" to-field-name="sendBcc" to-map-name="notifyCtx"/>
                 <field-to-field field-name="contentType" map-name="storeEmail" to-field-name="contentType" to-map-name="notifyCtx"/>
-                <field-to-field field-name="templatePath" map-name="storeEmail" to-field-name="templateName" to-map-name="notifyCtx"/>
+                <field-to-field field-name="bodyScreenLocation" map-name="storeEmail" to-field-name="templateName" to-map-name="notifyCtx"/>
                 <env-to-field env-name="emailCtx" field-name="templateData" map-name="notifyCtx"/>
                 <!-- call the service async -->
                 <call-service-asynch service-name="sendGenericNotificationEmail" in-map-name="notifyCtx" include-user-login="true"/>

Modified: trunk/applications/product/servicedef/services_store.xml
===================================================================
--- trunk/applications/product/servicedef/services_store.xml	2005-10-07 07:12:07 UTC (rev 5925)
+++ trunk/applications/product/servicedef/services_store.xml	2005-10-07 07:13:52 UTC (rev 5926)
@@ -145,7 +145,7 @@
             location="org/ofbiz/product/store/ProductStoreServices.xml" invoke="createProductStoreEmail" auth="true">
         <description>Create a Product Store Email Setting</description>
         <auto-attributes entity-name="ProductStoreEmailSetting" include="all" mode="IN" optional="false"/>
-        <override name="templatePath" optional="true"/>
+        <override name="xslfoAttachScreenLocation" optional="true"/>
         <override name="ccAddress" optional="true"/>
         <override name="bccAddress" optional="true"/>
         <override name="contentType" optional="true"/>
@@ -154,7 +154,7 @@
             location="org/ofbiz/product/store/ProductStoreServices.xml" invoke="updateProductStoreEmail" auth="true">
         <description>Update a Product Store Email Setting</description>
         <auto-attributes entity-name="ProductStoreEmailSetting" include="all" mode="IN" optional="false"/>
-        <override name="templatePath" optional="true"/>
+        <override name="xslfoAttachScreenLocation" optional="true"/>
         <override name="ccAddress" optional="true"/>
         <override name="bccAddress" optional="true"/>
         <override name="contentType" optional="true"/>

More information about the Svn mailing list