Author: ashish
Date: Mon Mar 16 08:11:47 2009
New Revision: 754837
URL: http://svn.apache.org/viewvc?rev=754837&view=rev
Log:
Applying patch from OFBIZ-2212 (If subject of verification mail does not exists
then also functionality should not be broken.)
Thanks Ashish Nagar for your contribution.
Modified:
ofbiz/trunk/specialpurpose/ecommerce/templates/email/ContactListVerifyEmail.ftl
ofbiz/trunk/specialpurpose/ecommerce/templates/email/OrderNoticeEmail.ftl
ofbiz/trunk/specialpurpose/ecommerce/widget/EmailOrderScreens.xml
Modified:
ofbiz/trunk/specialpurpose/ecommerce/templates/email/ContactListVerifyEmail.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/templates/email/ContactListVerifyEmail.ftl?rev=754837&r1=754836&r2=754837&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/ecommerce/templates/email/ContactListVerifyEmail.ftl
(original)
+++
ofbiz/trunk/specialpurpose/ecommerce/templates/email/ContactListVerifyEmail.ftl
Mon Mar 16 08:11:47 2009
@@ -20,14 +20,14 @@
<html xmlns="http://www.w3.org/1999/xhtml";>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
- <title>${title}</title>
+ <title>${title!}</title>
<#-- this needs to be fully qualified to appear in email; the server must
also be available -->
<link rel="stylesheet" href="${baseUrl}/images/maincss.css"
type="text/css"/>
</head>
<body>
<#-- custom logo or text can be inserted here -->
-<h1>${title}</h1>
+<h1>${title!}</h1>
<#if note?exists><p class="tabletext">${note}</p></#if>
<p class="tabletext">Hello ${partyName.firstName?if_exists}
${partyName.lastName?if_exists} ${partyName.groupName?if_exists}!</p>
Modified:
ofbiz/trunk/specialpurpose/ecommerce/templates/email/OrderNoticeEmail.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/templates/email/OrderNoticeEmail.ftl?rev=754837&r1=754836&r2=754837&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/templates/email/OrderNoticeEmail.ftl
(original)
+++ ofbiz/trunk/specialpurpose/ecommerce/templates/email/OrderNoticeEmail.ftl
Mon Mar 16 08:11:47 2009
@@ -21,7 +21,7 @@
<html xmlns="http://www.w3.org/1999/xhtml";>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
- <title>${title}</title>
+ <title>${title!}</title>
<#-- this needs to be fully qualified to appear in email; the server must
also be available -->
<link rel="stylesheet" href="${baseUrl}/images/maincss.css"
type="text/css"/>
</head>
@@ -30,7 +30,7 @@
<#-- custom logo or text can be inserted here -->
-<h1>${title}</h1>
+<h1>${title!}</h1>
<#if !isDemoStore?exists ||
isDemoStore><p>${uiLabelMap.OrderDemoFrontNote}.</p></#if>
<#if note?exists><p class="tabletext">${note}</p></#if>
<#if orderHeader?exists>
Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/EmailOrderScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/widget/EmailOrderScreens.xml?rev=754837&r1=754836&r2=754837&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/widget/EmailOrderScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/widget/EmailOrderScreens.xml Mon Mar
16 08:11:47 2009
@@ -24,13 +24,14 @@
<screen name="OrderConfirmNoticePdf">
<section>
<actions>
- <set field="title"
value="${uiLabelMap.PageTitleOrderConfirmationNotice}"/>
- <set field="baseEcommerceSecureUrl"
value="${baseSecureUrl}/ecommerce/control/"/>
- <set field="title" value="Order"/>
+ <property-map resource="EcommerceUiLabels"
map-name="uiLabelMap" global="true"/>
<property-map resource="OrderUiLabels" map-name="uiLabelMap"
global="true"/>
<property-map resource="AccountingUiLabels"
map-name="uiLabelMap" global="true"/>
<property-map resource="ProductUiLabels" map-name="uiLabelMap"
global="true"/>
<property-map resource="CommonUiLabels" map-name="uiLabelMap"
global="true"/>
+ <set field="title"
value="${uiLabelMap.PageTitleOrderConfirmationNotice}"/>
+ <set field="baseEcommerceSecureUrl"
value="${baseSecureUrl}/ecommerce/control/"/>
+ <set field="title" value="Order"/>
<script
location="component://order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy"/>
</actions>
<widgets>
@@ -79,6 +80,7 @@
<section>
<actions>
<property-map resource="EcommerceUiLabels"
map-name="uiLabelMap" global="true"/>
+ <property-map resource="OrderUiLabels" map-name="uiLabelMap"
global="true"/>
<set field="title"
value="${uiLabelMap.PageTitleOrderConfirmationNotice}"/>
<set field="baseEcommerceSecureUrl"
value="${baseSecureUrl}/ecommerce/control/"/>
<set field="allowAnonymousView" value="Y"/> <!-- this field
will instruction OrderStatus.groovy to allow an anonymous order to be viewed by
anybody, so the email confirmation screen will work -->
@@ -111,6 +113,8 @@
<screen name="BackorderNotice">
<section>
<actions>
+ <property-map resource="EcommerceUiLabels"
map-name="uiLabelMap" global="true"/>
+ <property-map resource="OrderUiLabels" map-name="uiLabelMap"
global="true"/>
<set field="title"
value="${uiLabelMap.PageTitleOrderBackorderNotice}"/>
<set field="baseEcommerceSecureUrl"
value="${baseSecureUrl}/ecommerce/control/"/>
<set field="allowAnonymousView" value="Y"/> <!-- this field
will instruction OrderStatus.groovy to allow an anonymous order to be viewed by
anybody, so the email confirmation screen will work -->
@@ -124,6 +128,8 @@
<screen name="OrderChangeNotice">
<section>
<actions>
+ <property-map resource="EcommerceUiLabels"
map-name="uiLabelMap" global="true"/>
+ <property-map resource="OrderUiLabels" map-name="uiLabelMap"
global="true"/>
<set field="title"
value="${uiLabelMap.PageTitleOrderChangeNotice}"/>
<set field="baseEcommerceSecureUrl"
value="${baseSecureUrl}/ecommerce/control/"/>
<set field="allowAnonymousView" value="Y"/> <!-- this field
will instruction OrderStatus.groovy to allow an anonymous order to be viewed by
anybody, so the email confirmation screen will work -->
@@ -138,6 +144,8 @@
<screen name="PaymentRetryNotice">
<section>
<actions>
+ <property-map resource="EcommerceUiLabels"
map-name="uiLabelMap" global="true"/>
+ <property-map resource="OrderUiLabels" map-name="uiLabelMap"
global="true"/>
<set field="title"
value="${uiLabelMap.PageTitleOrderPaymentRetryNotice}"/>
<set field="baseEcommerceSecureUrl"
value="${baseSecureUrl}/ecommerce/control/"/>
<script
location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/OrderStatus.groovy"/>
@@ -152,6 +160,7 @@
<actions>
<property-map resource="EcommerceUiLabels"
map-name="uiLabelMap" global="true"/>
<property-map resource="ProductUiLabels" map-name="uiLabelMap"
global="true"/>
+ <property-map resource="OrderUiLabels" map-name="uiLabelMap"
global="true"/>
<set field="title"
value="${uiLabelMap.PageTitleShipmentCompleteNotice}"/>
<set field="baseEcommerceSecureUrl"
value="${baseSecureUrl}/ecommerce/control/"/>
<script
location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/ShipmentStatus.groovy"/>
