[OFBiz] SVN: r4780 - in trunk/applications/order:
webapp/ordermgr/entry widget/ordermgr
jacopo at svn.ofbiz.org
jacopo at svn.ofbiz.org
Thu Apr 7 03:03:19 EDT 2005
Author: jacopo
Date: 2005-04-07 02:03:04 -0500 (Thu, 07 Apr 2005)
New Revision: 4780
Added:
trunk/applications/order/webapp/ordermgr/entry/associatedProducts.ftl
trunk/applications/order/webapp/ordermgr/entry/promoCodes.ftl
trunk/applications/order/webapp/ordermgr/entry/promoText.ftl
Modified:
trunk/applications/order/webapp/ordermgr/entry/showcart.ftl
trunk/applications/order/widget/ordermgr/OrderEntryCartScreens.xml
Log:
showcart.ftl template is now splitted up in smaller templates that are composed by the ShowCart screen definition.
Added: trunk/applications/order/webapp/ordermgr/entry/associatedProducts.ftl
===================================================================
--- trunk/applications/order/webapp/ordermgr/entry/associatedProducts.ftl 2005-04-07 06:03:15 UTC (rev 4779)
+++ trunk/applications/order/webapp/ordermgr/entry/associatedProducts.ftl 2005-04-07 07:03:04 UTC (rev 4780)
@@ -0,0 +1,79 @@
+<#--
+ * Copyright (c) 2003 The Open For Business Project - www.ofbiz.org
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
+ * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ *@author David E. Jones (jonesde at ofbiz.org)
+ *@author Andy Zeneski (jaz at ofbiz.org)
+ *@author Jean-Luc.Malet at nereide.biz (migration to uiLabelMap)
+ *@author Jacopo Cappellato (tiz at sastau.it)
+ *@version $Rev$
+ *@since 2.2
+-->
+
+<#if requestAttributes.uiLabelMap?exists>
+ <#assign uiLabelMap = requestAttributes.uiLabelMap>
+</#if>
+
+<#if (shoppingCart.getOrderType() == "SALES_ORDER")>
+ <#assign associatedProducts = Static["org.ofbiz.order.shoppingcart.product.ProductDisplayWorker"].getRandomCartProductAssoc(request, true)?if_exists>
+</#if>
+
+<#if associatedProducts?has_content>
+ <BR>
+ <TABLE border="0" cellspacing="0" cellpadding="0" class="boxoutside">
+ <TR>
+ <TD>
+ <table border="0" cellspacing="0" cellpadding="0" class="boxtop">
+ <tr>
+ <td valign="middle" align="left">
+ <div class="boxhead"> ${uiLabelMap.help_also_interested_in}</div>
+ </td>
+ <#--<td valign="middle" align="right"> </td>-->
+ </tr>
+ </table>
+ </TD>
+ </TR>
+ <TR>
+ <TD>
+ <table border="0" cellspacing="0" cellpadding="0" class="boxbottom">
+ <tr>
+ <td>
+ <table cellspacing="0" cellpadding="1" border="0">
+ <#-- random complementary products -->
+ <#list associatedProducts as assocProduct>
+ <tr>
+ <td>
+ ${setRequestAttribute("optProduct", assocProduct)}
+ ${setRequestAttribute("listIndex", assocProduct_index)}
+ ${screens.render(productsummaryScreen)}
+ </td>
+ </tr>
+ <#if assocProduct_has_next>
+ <tr><td><hr class="sepbar"></td></tr>
+ </#if>
+ </#list>
+ </table>
+ </td>
+ </tr>
+ </table>
+ </TD>
+ </TR>
+ </TABLE>
+</#if>
Property changes on: trunk/applications/order/webapp/ordermgr/entry/associatedProducts.ftl
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ "Id Rev Author"
Name: svn:eol-style
+ native
Added: trunk/applications/order/webapp/ordermgr/entry/promoCodes.ftl
===================================================================
--- trunk/applications/order/webapp/ordermgr/entry/promoCodes.ftl 2005-04-07 06:03:15 UTC (rev 4779)
+++ trunk/applications/order/webapp/ordermgr/entry/promoCodes.ftl 2005-04-07 07:03:04 UTC (rev 4780)
@@ -0,0 +1,73 @@
+<#--
+ * Copyright (c) 2003 The Open For Business Project - www.ofbiz.org
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
+ * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ *@author David E. Jones (jonesde at ofbiz.org)
+ *@author Andy Zeneski (jaz at ofbiz.org)
+ *@author Jean-Luc.Malet at nereide.biz (migration to uiLabelMap)
+ *@author Jacopo Cappellato (tiz at sastau.it)
+ *@version $Rev$
+ *@since 2.2
+-->
+
+<#if requestAttributes.uiLabelMap?exists>
+ <#assign uiLabelMap = requestAttributes.uiLabelMap>
+</#if>
+
+<#if shoppingCart.getOrderType() == "SALES_ORDER">
+ <br/>
+ <table border="0" cellspacing="0" cellpadding="0" class="boxoutside">
+ <tr>
+ <td>
+ <table border="0" width="100%" cellspacing="0" cellpadding="0" class="boxtop">
+ <tr>
+ <td valign="middle" align="left">
+ <div class="boxhead"> ${uiLabelMap.OrderPromotionCouponCodes}</div>
+ </td>
+ <#--<td valign="middle" align="right"> </td>-->
+ </tr>
+ </table>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <table border="0" cellspacing="0" cellpadding="0" class="boxbottom">
+ <tr>
+ <td>
+ <div class="tabletext">
+ <form method="POST" action="<@ofbizUrl>/addpromocode<#if requestAttributes._CURRENT_VIEW_?has_content>/${requestAttributes._CURRENT_VIEW_}</#if></@ofbizUrl>" name="addpromocodeform" style="margin: 0;">
+ <input type="text" class="inputBox" size="15" name="productPromoCodeId" value="">
+ <input type="submit" class="smallSubmit" value="${uiLabelMap.OrderAddCode}">
+ <#assign productPromoCodeIds = (shoppingCart.getProductPromoCodesEntered())?if_exists>
+ <#if productPromoCodeIds?has_content>
+ Entered Codes:
+ <#list productPromoCodeIds as productPromoCodeId>
+ ${productPromoCodeId}
+ </#list>
+ </#if>
+ </form>
+ </div>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+</#if>
Property changes on: trunk/applications/order/webapp/ordermgr/entry/promoCodes.ftl
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ "Id Rev Author"
Name: svn:eol-style
+ native
Added: trunk/applications/order/webapp/ordermgr/entry/promoText.ftl
===================================================================
--- trunk/applications/order/webapp/ordermgr/entry/promoText.ftl 2005-04-07 06:03:15 UTC (rev 4779)
+++ trunk/applications/order/webapp/ordermgr/entry/promoText.ftl 2005-04-07 07:03:04 UTC (rev 4780)
@@ -0,0 +1,79 @@
+<#--
+ * Copyright (c) 2003 The Open For Business Project - www.ofbiz.org
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
+ * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ *@author David E. Jones (jonesde at ofbiz.org)
+ *@author Andy Zeneski (jaz at ofbiz.org)
+ *@author Jean-Luc.Malet at nereide.biz (migration to uiLabelMap)
+ *@author Jacopo Cappellato (tiz at sastau.it)
+ *@version $Rev$
+ *@since 2.2
+-->
+
+<#if requestAttributes.uiLabelMap?exists>
+ <#assign uiLabelMap = requestAttributes.uiLabelMap>
+</#if>
+
+<#if showPromoText?exists && showPromoText>
+ <br/>
+ <table border="0" cellspacing="0" cellpadding="0" class="boxoutside">
+ <tr>
+ <td>
+ <table border="0" width="100%" cellspacing="0" cellpadding="0" class="boxtop">
+ <tr>
+ <td valign="middle" align="left">
+ <div class="boxhead"> ${uiLabelMap.EcommerceSpecialOffers}</div>
+ </td>
+ <#--<td valign="middle" align="right"> </td>-->
+ </tr>
+ </table>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <table border="0" cellspacing="0" cellpadding="0" class="boxbottom">
+ <tr>
+ <td>
+ <table cellspacing="0" cellpadding="1" border="0">
+ <#-- show promotions text -->
+ <#list productPromos as productPromo>
+ <tr>
+ <td>
+ <div class="tabletext"><a href="<@ofbizUrl>/showPromotionDetails?productPromoId=${productPromo.productPromoId}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonDetails}]</a> ${productPromo.promoText?if_exists}</div>
+ </td>
+ </tr>
+ <#if productPromo_has_next>
+ <tr><td><hr class="sepbar"></td></tr>
+ </#if>
+ </#list>
+ <tr><td><hr class="sepbar"></td></tr>
+ <tr>
+ <td>
+ <div class="tabletext"><a href="<@ofbizUrl>/showAllPromotions</@ofbizUrl>" class="buttontext">[${uiLabelMap.EcommerceViewAllPromotions}]</a></div>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+</#if>
Property changes on: trunk/applications/order/webapp/ordermgr/entry/promoText.ftl
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ "Id Rev Author"
Name: svn:eol-style
+ native
Modified: trunk/applications/order/webapp/ordermgr/entry/showcart.ftl
===================================================================
--- trunk/applications/order/webapp/ordermgr/entry/showcart.ftl 2005-04-07 06:03:15 UTC (rev 4779)
+++ trunk/applications/order/webapp/ordermgr/entry/showcart.ftl 2005-04-07 07:03:04 UTC (rev 4780)
@@ -414,140 +414,3 @@
</TD>
</TR>
</TABLE>
-
-<#if shoppingCart.getOrderType() == "SALES_ORDER">
- <br/>
- <table border="0" cellspacing="0" cellpadding="0" class="boxoutside">
- <tr>
- <td>
- <table border="0" width="100%" cellspacing="0" cellpadding="0" class="boxtop">
- <tr>
- <td valign="middle" align="left">
- <div class="boxhead"> ${uiLabelMap.OrderPromotionCouponCodes}</div>
- </td>
- <#--<td valign="middle" align="right"> </td>-->
- </tr>
- </table>
- </td>
- </tr>
- <tr>
- <td>
- <table border="0" cellspacing="0" cellpadding="0" class="boxbottom">
- <tr>
- <td>
- <div class="tabletext">
- <form method="POST" action="<@ofbizUrl>/addpromocode<#if requestAttributes._CURRENT_VIEW_?has_content>/${requestAttributes._CURRENT_VIEW_}</#if></@ofbizUrl>" name="addpromocodeform" style="margin: 0;">
- <input type="text" class="inputBox" size="15" name="productPromoCodeId" value="">
- <input type="submit" class="smallSubmit" value="${uiLabelMap.OrderAddCode}">
- <#assign productPromoCodeIds = (shoppingCart.getProductPromoCodesEntered())?if_exists>
- <#if productPromoCodeIds?has_content>
- Entered Codes:
- <#list productPromoCodeIds as productPromoCodeId>
- ${productPromoCodeId}
- </#list>
- </#if>
- </form>
- </div>
- </td>
- </tr>
- </table>
- </td>
- </tr>
- </table>
-</#if>
-
-<#if showPromoText?exists && showPromoText>
- <br/>
- <table border="0" cellspacing="0" cellpadding="0" class="boxoutside">
- <tr>
- <td>
- <table border="0" width="100%" cellspacing="0" cellpadding="0" class="boxtop">
- <tr>
- <td valign="middle" align="left">
- <div class="boxhead"> ${uiLabelMap.EcommerceSpecialOffers}</div>
- </td>
- <#--<td valign="middle" align="right"> </td>-->
- </tr>
- </table>
- </td>
- </tr>
- <tr>
- <td>
- <table border="0" cellspacing="0" cellpadding="0" class="boxbottom">
- <tr>
- <td>
- <table cellspacing="0" cellpadding="1" border="0">
- <#-- show promotions text -->
- <#list productPromos as productPromo>
- <tr>
- <td>
- <div class="tabletext"><a href="<@ofbizUrl>/showPromotionDetails?productPromoId=${productPromo.productPromoId}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonDetails}]</a> ${productPromo.promoText?if_exists}</div>
- </td>
- </tr>
- <#if productPromo_has_next>
- <tr><td><hr class="sepbar"></td></tr>
- </#if>
- </#list>
- <tr><td><hr class="sepbar"></td></tr>
- <tr>
- <td>
- <div class="tabletext"><a href="<@ofbizUrl>/showAllPromotions</@ofbizUrl>" class="buttontext">[${uiLabelMap.EcommerceViewAllPromotions}]</a></div>
- </td>
- </tr>
- </table>
- </td>
- </tr>
- </table>
- </td>
- </tr>
- </table>
-</#if>
-
-<#if associatedProducts?has_content>
- <BR>
- <TABLE border="0" cellspacing="0" cellpadding="0" class="boxoutside">
- <TR>
- <TD>
- <table border="0" cellspacing="0" cellpadding="0" class="boxtop">
- <tr>
- <td valign="middle" align="left">
- <div class="boxhead"> ${uiLabelMap.help_also_interested_in}</div>
- </td>
- <#--<td valign="middle" align="right"> </td>-->
- </tr>
- </table>
- </TD>
- </TR>
- <TR>
- <TD>
- <table border="0" cellspacing="0" cellpadding="0" class="boxbottom">
- <tr>
- <td>
- <table cellspacing="0" cellpadding="1" border="0">
- <#-- random complementary products -->
- <#list associatedProducts as assocProduct>
- <tr>
- <td>
- ${setRequestAttribute("optProduct", assocProduct)}
- ${setRequestAttribute("listIndex", assocProduct_index)}
- ${screens.render(productsummaryScreen)}
- </td>
- </tr>
- <#if assocProduct_has_next>
- <tr><td><hr class="sepbar"></td></tr>
- </#if>
- </#list>
- </table>
- </td>
- </tr>
- </table>
- </TD>
- </TR>
- </TABLE>
-</#if>
-
-
-<#if (shoppingCartSize?default(0) > 0)>
- <br/>
- ${screens.render(promoUseDetailsInlineScreen)}
-</#if>
Modified: trunk/applications/order/widget/ordermgr/OrderEntryCartScreens.xml
===================================================================
--- trunk/applications/order/widget/ordermgr/OrderEntryCartScreens.xml 2005-04-07 06:03:15 UTC (rev 4779)
+++ trunk/applications/order/widget/ordermgr/OrderEntryCartScreens.xml 2005-04-07 07:03:04 UTC (rev 4780)
@@ -76,6 +76,11 @@
<decorator-screen name="CommonOrderEntryDecorator" location="component://order/widget/ordermgr/OrderEntryCommonScreens.xml">
<decorator-section name="body">
<platform-specific><html><html-template location="component://order/webapp/ordermgr/entry/showcart.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://order/webapp/ordermgr/entry/promoCodes.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://order/webapp/ordermgr/entry/promoText.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://order/webapp/ordermgr/entry/associatedProducts.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://order/webapp/ordermgr/entry/associatedProducts.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://order/webapp/ordermgr/entry/promotionsApplied.ftl"/></html></platform-specific>
</decorator-section>
</decorator-screen>
</widgets>
More information about the Svn
mailing list