svn commit: r1632764 - in /ofbiz/trunk/specialpurpose/ec
Locked
 
|
Author: apatel
Date: Sat Oct 18 11:35:58 2014 New Revision: 1632764 URL: http://svn.apache.org/r1632764 Log: [OFBIZ-2618] Applying patch contributed by Arun Patidar. Thanks Arun for updated fix. Thanks BJ for reporting the issue and providing first patch. Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/EmailContactListScreens.xml ofbiz/trunk/specialpurpose/ecommerce/widget/EmailGiftCardScreens.xml ofbiz/trunk/specialpurpose/ecommerce/widget/EmailOrderScreens.xml ofbiz/trunk/specialpurpose/ecommerce/widget/EmailProductScreens.xml ofbiz/trunk/specialpurpose/ecommerce/widget/EmailReturnScreens.xml Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/EmailContactListScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/widget/EmailContactListScreens.xml?rev=1632764&r1=1632763&r2=1632764&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/widget/EmailContactListScreens.xml (original) +++ ofbiz/trunk/specialpurpose/ecommerce/widget/EmailContactListScreens.xml Sat Oct 18 11:35:58 2014 @@ -26,7 +26,7 @@ under the License. <actions> <set field="titleProperty" value="EcommerceSubscriptionVerifyEmail"/> <!--<set field="baseEcommerceSecureUrl" value="${baseSecureUrl}/ecommerce/control/"/>--> - <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}${baseLocation}/control/"/> + <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}${baseLocation}/control"/> <entity-one entity-name="PartyNameView" value-field="partyName" auto-field-map="false"> <field-map field-name="partyId" from-field="contactListParty.partyId"/> </entity-one> @@ -68,7 +68,7 @@ under the License. <entity-one entity-name="ContactList" value-field="contactList"/> <entity-one entity-name="PartyNameView" value-field="partyName"/> <!--<set field="baseEcommerceSecureUrl" value="${baseSecureUrl}/ecommerce/control/"/>--> - <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}${baseLocation}/control/"/> + <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}${baseLocation}/control"/> </actions> <widgets> <platform-specific><html><html-template location="component://ecommerce/templates/email/ContactListSubscribeEmail.ftl"/></html></platform-specific> @@ -82,7 +82,7 @@ under the License. <entity-one entity-name="ContactList" value-field="contactList"/> <entity-one entity-name="PartyNameView" value-field="partyName"/> <!--<set field="baseEcommerceSecureUrl" value="${baseSecureUrl}/ecommerce/control/"/>--> - <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}${baseLocation}/control/"/> + <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}${baseLocation}/control"/> </actions> <widgets> <platform-specific><html><html-template location="component://ecommerce/templates/email/ContactListUnsubscribeVerifyEmail.ftl"/></html></platform-specific> @@ -96,7 +96,7 @@ under the License. <entity-one entity-name="ContactList" value-field="contactList"/> <entity-one entity-name="PartyNameView" value-field="partyName"/> <!--<set field="baseEcommerceSecureUrl" value="${baseSecureUrl}/ecommerce/control/"/>--> - <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}${baseLocation}/control/"/> + <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}${baseLocation}/control"/> </actions> <widgets> <platform-specific><html><html-template location="component://ecommerce/templates/email/ContactListUnsubscribeEmail.ftl"/></html></platform-specific> @@ -110,7 +110,7 @@ under the License. <entity-one entity-name="ContactList" value-field="contactList"/> <entity-one entity-name="PartyNameView" value-field="partyName"/> <!--<set field="baseEcommerceSecureUrl" value="${baseSecureUrl}/ecommerce/control/"/>--> - <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}${baseLocation}/control/"/> + <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}${baseLocation}/control"/> </actions> <widgets> <platform-specific><html><html-template location="component://ecommerce/templates/email/ContactListEmailTemplate.ftl"/></html></platform-specific> Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/EmailGiftCardScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/widget/EmailGiftCardScreens.xml?rev=1632764&r1=1632763&r2=1632764&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/widget/EmailGiftCardScreens.xml (original) +++ ofbiz/trunk/specialpurpose/ecommerce/widget/EmailGiftCardScreens.xml Sat Oct 18 11:35:58 2014 @@ -36,7 +36,7 @@ under the License. <screen name="GiftCardReload"> <section> <actions> - <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}/ecommerce/control/"/> + <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}/ecommerce/control"/> <property-map resource="EcommerceUiLabels" map-name="uiLabelMap" global="true"/> </actions> <widgets> Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/EmailOrderScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/widget/EmailOrderScreens.xml?rev=1632764&r1=1632763&r2=1632764&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/widget/EmailOrderScreens.xml (original) +++ ofbiz/trunk/specialpurpose/ecommerce/widget/EmailOrderScreens.xml Sat Oct 18 11:35:58 2014 @@ -105,7 +105,7 @@ under the License. <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> <set field="title" value="${uiLabelMap.PageTitleOrderCompleteNotice}"/> - <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}/ecommerce/control/"/> + <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}/ecommerce/control"/> <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/OrderStatus.groovy"/> </actions> <widgets> @@ -119,7 +119,7 @@ under the License. <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="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 --> <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/OrderStatus.groovy"/> </actions> @@ -134,7 +134,7 @@ under the License. <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="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 --> <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/OrderStatus.groovy"/> </actions> @@ -150,7 +150,7 @@ under the License. <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/"/> + <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}/ecommerce/control"/> <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/OrderStatus.groovy"/> </actions> <widgets> @@ -165,7 +165,7 @@ under the License. <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/"/> + <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}/ecommerce/control"/> <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/ShipmentStatus.groovy"/> </actions> <widgets> Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/EmailProductScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/widget/EmailProductScreens.xml?rev=1632764&r1=1632763&r2=1632764&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/widget/EmailProductScreens.xml (original) +++ ofbiz/trunk/specialpurpose/ecommerce/widget/EmailProductScreens.xml Sat Oct 18 11:35:58 2014 @@ -23,7 +23,7 @@ under the License. <screen name="TellFriend"> <section> <actions> - <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}/ecommerce/control/"/> + <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}/ecommerce/control"/> <property-map resource="EcommerceUiLabels" map-name="uiLabelMap" global="true"/> </actions> <widgets> Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/EmailReturnScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/widget/EmailReturnScreens.xml?rev=1632764&r1=1632763&r2=1632764&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/widget/EmailReturnScreens.xml (original) +++ ofbiz/trunk/specialpurpose/ecommerce/widget/EmailReturnScreens.xml Sat Oct 18 11:35:58 2014 @@ -25,7 +25,7 @@ under the License. <section> <actions> <!-- <set field="title" value="Order Confirmation Notice"/> --> - <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}/ecommerce/control/"/> + <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}/ecommerce/control"/> <property-map resource="EcommerceUiLabels" map-name="uiLabelMap" global="true"/> <!-- <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/OrderStatus.groovy"/> --> </actions> @@ -37,7 +37,7 @@ under the License. <screen name="ReturnCancel"> <section> <actions> - <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}/ecommerce/control/"/> + <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}/ecommerce/control"/> <property-map resource="EcommerceUiLabels" map-name="uiLabelMap" global="true"/> </actions> <widgets> @@ -48,7 +48,7 @@ under the License. <screen name="ReturnComplete"> <section> <actions> - <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}/ecommerce/control/"/> + <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}/ecommerce/control"/> <property-map resource="EcommerceUiLabels" map-name="uiLabelMap" global="true"/> </actions> <widgets> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |