Author: rishi
Date: Sat Apr 13 13:21:51 2019
New Revision: 1857478
URL: http://svn.apache.org/viewvc?rev=1857478&view=rev
Log:
[Fixed] Incorrect decorator being used over view all promotions and view
promotion details screen causing back navigation. Change the decorator name on
the showAllPromotions and showPromotionDetails screens. Now user can go back
after navigating to both screens.
Merge from trunk revision 1856627.
(OFBIZ-10859)
Thanks to Ratnesh Upadhyay for your contribution.
Modified:
ofbiz/ofbiz-framework/branches/release18.12/applications/order/widget/ordermgr/OrderEntryCartScreens.xml
Modified:
ofbiz/ofbiz-framework/branches/release18.12/applications/order/widget/ordermgr/OrderEntryCartScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/applications/order/widget/ordermgr/OrderEntryCartScreens.xml?rev=1857478&r1=1857477&r2=1857478&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/branches/release18.12/applications/order/widget/ordermgr/OrderEntryCartScreens.xml
(original)
+++
ofbiz/ofbiz-framework/branches/release18.12/applications/order/widget/ordermgr/OrderEntryCartScreens.xml
Sat Apr 13 13:21:51 2019
@@ -121,7 +121,7 @@ under the License.
<script
location="component://order/groovyScripts/entry/ShowPromoText.groovy"/>
</actions>
<widgets>
- <decorator-screen name="CommonOrderEntryDecorator"
location="component://order/widget/ordermgr/OrderEntryCommonScreens.xml">
+ <decorator-screen name="CommonOrderCatalogDecorator"
location="component://order/widget/ordermgr/OrderEntryCommonScreens.xml">
<decorator-section name="body">
<platform-specific><html><html-template
location="component://order/template/entry/cart/ShowAllPromotions.ftl"/></html></platform-specific>
</decorator-section>
@@ -137,7 +137,7 @@ under the License.
<script
location="component://order/groovyScripts/entry/cart/ShowPromotionDetails.groovy"/>
</actions>
<widgets>
- <decorator-screen name="CommonOrderEntryDecorator"
location="component://order/widget/ordermgr/OrderEntryCommonScreens.xml">
+ <decorator-screen name="CommonOrderCatalogDecorator"
location="component://order/widget/ordermgr/OrderEntryCommonScreens.xml">
<decorator-section name="body">
<include-screen name="promotion"/>
</decorator-section>
