You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by de...@apache.org on 2019/01/12 19:18:11 UTC
svn commit: r1851187 - in /ofbiz/ofbiz-plugins/branches/release17.12: ./
ecommerce/template/cart/ ecommerce/widget/
Author: deepak
Date: Sat Jan 12 19:18:11 2019
New Revision: 1851187
URL: http://svn.apache.org/viewvc?rev=1851187&view=rev
Log:
Applied fix from trunk for revision: 1851185
===
Improved: Convert Promotion Screen of e-commerce as per Bootstrap Styling
(OFBIZ-10793)
Thanks Nitish Mishra for your contribution
Added:
ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/cart/PromotionCategories.ftl
- copied unchanged from r1851185, ofbiz/ofbiz-plugins/trunk/ecommerce/template/cart/PromotionCategories.ftl
ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/cart/PromotionDetails.ftl
- copied unchanged from r1851185, ofbiz/ofbiz-plugins/trunk/ecommerce/template/cart/PromotionDetails.ftl
ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/cart/PromotionProducts.ftl
- copied unchanged from r1851185, ofbiz/ofbiz-plugins/trunk/ecommerce/template/cart/PromotionProducts.ftl
ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/cart/ShowAllPromotions.ftl
- copied unchanged from r1851185, ofbiz/ofbiz-plugins/trunk/ecommerce/template/cart/ShowAllPromotions.ftl
Modified:
ofbiz/ofbiz-plugins/branches/release17.12/ (props changed)
ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/widget/CartScreens.xml
Propchange: ofbiz/ofbiz-plugins/branches/release17.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jan 12 19:18:11 2019
@@ -11,4 +11,4 @@
/ofbiz/branches/multitenant20100310/plugins:921280-927264
/ofbiz/branches/release13.07/plugins:1547657
/ofbiz/ofbiz-framework/trunk:1836107
-/ofbiz/ofbiz-plugins/trunk:1819576,1819580,1819582,1819589,1820962,1820973,1821045,1821049,1821051,1822129,1822133,1822139,1822143,1822145,1822389,1822391,1822395,1824646,1824648,1824650,1824654,1828569,1830856,1831084,1832727,1832800,1837796,1837845,1837857,1838249,1838381,1838816,1841650,1845558,1847272,1847346,1847398,1847528,1847530,1848009,1848396,1848398,1848921,1849119,1851002,1851068,1851135
+/ofbiz/ofbiz-plugins/trunk:1819576,1819580,1819582,1819589,1820962,1820973,1821045,1821049,1821051,1822129,1822133,1822139,1822143,1822145,1822389,1822391,1822395,1824646,1824648,1824650,1824654,1828569,1830856,1831084,1832727,1832800,1837796,1837845,1837857,1838249,1838381,1838816,1841650,1845558,1847272,1847346,1847398,1847528,1847530,1848009,1848396,1848398,1848921,1849119,1851002,1851068,1851135,1851185
Modified: ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/widget/CartScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/widget/CartScreens.xml?rev=1851187&r1=1851186&r2=1851187&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/widget/CartScreens.xml (original)
+++ ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/widget/CartScreens.xml Sat Jan 12 19:18:11 2019
@@ -105,7 +105,7 @@ under the License.
<include-screen name="leftbar" location="component://ecommerce/widget/CommonScreens.xml"/>
</decorator-section>
<decorator-section name="body">
- <platform-specific><html><html-template location="component://order/template/entry/cart/ShowAllPromotions.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://ecommerce/template/cart/ShowAllPromotions.ftl"/></html></platform-specific>
</decorator-section>
</decorator-screen>
</widgets>
@@ -125,7 +125,7 @@ under the License.
<include-screen name="leftbar" location="component://ecommerce/widget/CommonScreens.xml"/>
</decorator-section>
<decorator-section name="body">
- <include-screen name="promotion" location="component://order/widget/ordermgr/OrderEntryCartScreens.xml"/>
+ <include-screen name="promotion"></include-screen>
</decorator-section>
<decorator-section name="right-column">
<include-screen name="rightbar" location="component://ecommerce/widget/CommonScreens.xml"/>
@@ -135,6 +135,22 @@ under the License.
</section>
</screen>
+ <screen name="promotion">
+ <section>
+ <condition>
+ <not><if-empty field="productPromo"/></not>
+ </condition>
+ <widgets>
+ <platform-specific><html><html-template location="component://ecommerce/template/cart/PromotionDetails.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://ecommerce/template/cart/PromotionCategories.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://ecommerce/template/cart/PromotionProducts.ftl"/></html></platform-specific>
+ </widgets>
+ <fail-widgets>
+ <label text="${uiLabelMap.OrderErrorNoPromotionFoundWithID} [${productPromoId?if_exists}]" style="h2"/>
+ </fail-widgets>
+ </section>
+ </screen>
+
<screen name="UpdateCart">
<section>
<actions>