svn commit: r1851186 - in /ofbiz/ofbiz-plugins/branches/
Locked
svn commit: r1851186 - in /ofbiz/ofbiz-plugins/branches/
 
|
Author: deepak
Date: Sat Jan 12 19:16:59 2019 New Revision: 1851186 URL: http://svn.apache.org/viewvc?rev=1851186&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/release18.12/ecommerce/template/cart/PromotionCategories.ftl - copied unchanged from r1851185, ofbiz/ofbiz-plugins/trunk/ecommerce/template/cart/PromotionCategories.ftl ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/template/cart/PromotionDetails.ftl - copied unchanged from r1851185, ofbiz/ofbiz-plugins/trunk/ecommerce/template/cart/PromotionDetails.ftl ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/template/cart/PromotionProducts.ftl - copied unchanged from r1851185, ofbiz/ofbiz-plugins/trunk/ecommerce/template/cart/PromotionProducts.ftl ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/template/cart/ShowAllPromotions.ftl - copied unchanged from r1851185, ofbiz/ofbiz-plugins/trunk/ecommerce/template/cart/ShowAllPromotions.ftl Modified: ofbiz/ofbiz-plugins/branches/release18.12/ (props changed) ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/widget/CartScreens.xml Propchange: ofbiz/ofbiz-plugins/branches/release18.12/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 12 19:16:59 2019 @@ -10,4 +10,4 @@ /ofbiz/branches/json-integration-refactoring/plugins:1634077-1635900 /ofbiz/branches/multitenant20100310/plugins:921280-927264 /ofbiz/branches/release13.07/plugins:1547657 -/ofbiz/ofbiz-plugins/trunk:1851002,1851009,1851068,1851135,1851139-1851140 +/ofbiz/ofbiz-plugins/trunk:1851002,1851009,1851068,1851135,1851139-1851140,1851185 Modified: ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/widget/CartScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/widget/CartScreens.xml?rev=1851186&r1=1851185&r2=1851186&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/widget/CartScreens.xml (original) +++ ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/widget/CartScreens.xml Sat Jan 12 19:16:59 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> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |