Author: deepak
Date: Mon Jul 10 13:07:27 2017
New Revision: 1801464
URL: http://svn.apache.org/viewvc?rev=1801464&view=rev
Log:
Improved: Moved some ftl file to correct location, found while code review.
Added:
ofbiz/ofbiz-framework/trunk/applications/order/template/email/
- copied from r1801463,
ofbiz/ofbiz-framework/trunk/applications/order/email/default/
ofbiz/ofbiz-framework/trunk/applications/product/template/shipment/ShipmentScheduledNotice.ftl
- copied unchanged from r1801463,
ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/shipment/ShipmentScheduledNotice.ftl
Removed:
ofbiz/ofbiz-framework/trunk/applications/order/email/default/
ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/shipment/ShipmentScheduledNotice.ftl
Modified:
ofbiz/ofbiz-framework/trunk/applications/order/minilang/order/OrderDeliveryServices.xml
ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderServices.java
ofbiz/ofbiz-framework/trunk/applications/product/minilang/shipment/shipment/ShipmentServices.xml
Modified:
ofbiz/ofbiz-framework/trunk/applications/order/minilang/order/OrderDeliveryServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/minilang/order/OrderDeliveryServices.xml?rev=1801464&r1=1801463&r2=1801464&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/order/minilang/order/OrderDeliveryServices.xml
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/order/minilang/order/OrderDeliveryServices.xml
Mon Jul 10 13:07:27 2017
@@ -113,7 +113,7 @@ under the License.
<string-append string=" Item
#${orderDeliverySchedule.orderItemSeqId}" field="sendEmailMap.subject"/>
</if-compare>
<set field="sendEmailMap.contentType" value="text/html"/>
- <set field="sendEmailMap.templateName"
value="default/OrderDeliveryUpdatedNotice.ftl"/>
+ <set field="sendEmailMap.templateName"
value="component://order/template/email/OrderDeliveryUpdatedNotice.ftl"/>
<set field="sendEmailMap.templateData.orderDeliverySchedule"
from-field="orderDeliverySchedule"/>
<!-- call sendGenericNotificationEmail service, if enough information
was found -->
Modified:
ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderServices.java?rev=1801464&r1=1801463&r2=1801464&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderServices.java
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderServices.java
Mon Jul 10 13:07:27 2017
@@ -2764,8 +2764,7 @@ public class OrderServices {
}
// prepare the mail info
- String ofbizHome = System.getProperty("ofbiz.home");
- String templateName = ofbizHome +
"/applications/order/email/default/EmailProcessNotify.ftl";
+ String templateName =
"component://order/template/email/EmailProcessNotify.ftl";
Map<String, Object> sendMailContext = new HashMap<String, Object>();
sendMailContext.put("sendTo", emailList.toString());
Modified:
ofbiz/ofbiz-framework/trunk/applications/product/minilang/shipment/shipment/ShipmentServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/minilang/shipment/shipment/ShipmentServices.xml?rev=1801464&r1=1801463&r2=1801464&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/product/minilang/shipment/shipment/ShipmentServices.xml
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/product/minilang/shipment/shipment/ShipmentServices.xml
Mon Jul 10 13:07:27 2017
@@ -773,7 +773,7 @@ under the License.
<string-append string=" for Primary Order
${shipment.primaryOrderId}" field="sendEmailMap.subject"/>
</if-not-empty>
<set value="text/html" field="sendEmailMap.contentType"/>
- <set
value="org/apache/ofbiz/shipment/shipment/ShipmentScheduledNotice.ftl"
field="sendEmailMap.templateName"/>
+ <set
value="component://product/template/shipment/ShipmentScheduledNotice.ftl"
field="sendEmailMap.templateName"/>
<set from-field="shipment" field="sendEmailMap.templateData.shipment"/>
<!-- call sendGenericNotificationEmail service, if enough information
was found -->
