svn commit: r452766 [1/2] - in /incubator/ofbiz/trunk/applica
Locked
svn commit: r452766 [1/2] - in /incubator/ofbiz/trunk/applica
 
|
Author: jacopoc
Date: Tue Oct 3 23:47:22 2006 New Revision: 452766 URL: http://svn.apache.org/viewvc?view=rev&rev=452766 Log: Break up of orderheader templates (for order confirm and order view screens) and the showPromotions template with multiple screenlets: this should improve the template readability and also make the customization much more simple. Really thanks to Chris Howe for this work (OFBIZ-68): I had to manually apply the patch (many templates were changed after the patch was submitted, and in the patch there were some issues) and so I did something different from Chris' patch, however his work is now finally committed. I've also removed some unused resources from the ecommerce component (a few entries in the controller, a screen definition and a template). Added: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promotioncategories.ftl (with props) incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promotiondetails.ftl (with props) incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promotionproducts.ftl (with props) incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderheaderinfo.ftl (with props) incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderpaymentinfo.ftl (with props) incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl (with props) incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl (with props) incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl (with props) incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl (with props) incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderterms.ftl (with props) Removed: incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/confirmorder.ftl incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showPromotionDetails.ftl incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderheader.ftl incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderheader.ftl Modified: incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/controller.xml incubator/ofbiz/trunk/applications/ecommerce/widget/CartScreens.xml incubator/ofbiz/trunk/applications/ecommerce/widget/OrderScreens.xml incubator/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml incubator/ofbiz/trunk/applications/order/webapp/ordermgr/requirement/RequirementForms.xml incubator/ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCartScreens.xml incubator/ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml incubator/ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml Modified: incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/controller.xml?view=diff&rev=452766&r1=452765&r2=452766 ============================================================================== --- incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/controller.xml (original) +++ incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/controller.xml Tue Oct 3 23:47:22 2006 @@ -571,11 +571,6 @@ <response name="success" type="view" value="ordercomplete"/> </request-map> - <request-map uri="confirmorder"> - <security https="false" auth="false"/> - <response name="success" type="view" value="confirmorder"/> - </request-map> - <request-map uri="catalog"> <security https="false" auth="false"/> <response name="success" type="view" value="catalog"/> @@ -1261,7 +1256,6 @@ <view-map name="shipsetting" type="screen" page="component://ecommerce/widget/OrderScreens.xml#shipsettings"/> <view-map name="billsetting" type="screen" page="component://ecommerce/widget/OrderScreens.xml#billsettings"/> <view-map name="optionsetting" type="screen" page="component://ecommerce/widget/OrderScreens.xml#optionsettings"/> - <view-map name="confirm" type="screen" page="component://ecommerce/widget/OrderScreens.xml#confirmorder"/> <view-map name="quickcheckout" type="screen" page="component://ecommerce/widget/OrderScreens.xml#checkoutoptions"/> <view-map name="checkoutshippingaddress" type="screen" page="component://ecommerce/widget/OrderScreens.xml#checkoutshippingaddress"/> @@ -1271,7 +1265,6 @@ <view-map name="checkoutreview" type="screen" page="component://ecommerce/widget/OrderScreens.xml#checkoutreview"/> <view-map name="ordercomplete" type="screen" page="component://ecommerce/widget/OrderScreens.xml#ordercomplete"/> - <view-map name="confirmorder" type="screen" page="component://ecommerce/widget/OrderScreens.xml#confirmorder"/> <!-- DEJ20050112 is this used? --> <view-map name="orderhistory" type="screen" page="component://ecommerce/widget/OrderScreens.xml#orderhistory"/> <view-map name="orderstatus" type="screen" page="component://ecommerce/widget/OrderScreens.xml#orderstatus"/> Modified: incubator/ofbiz/trunk/applications/ecommerce/widget/CartScreens.xml URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/ecommerce/widget/CartScreens.xml?view=diff&rev=452766&r1=452765&r2=452766 ============================================================================== --- incubator/ofbiz/trunk/applications/ecommerce/widget/CartScreens.xml (original) +++ incubator/ofbiz/trunk/applications/ecommerce/widget/CartScreens.xml Tue Oct 3 23:47:22 2006 @@ -102,16 +102,14 @@ <set field="leftbarScreenName" value="leftbar"/> <set field="rightbarScreenName" value="rightbar"/> <set field="MainColumnStyle" value="center"/> - <set field="productsummaryScreen" value="component://ecommerce/widget/CatalogScreens.xml#productsummary"/> - - <set field="titleProperty" value="PageTitleShowPromotionDetails"/> + <set field="titleProperty" value="PageTitleShowPromotionDetails"/> <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/cart/showPromotionDetails.bsh"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <platform-specific><html><html-template location="component://order/webapp/ordermgr/entry/cart/showPromotionDetails.ftl"/></html></platform-specific> + <include-screen name="promotion" location="component://order/widget/ordermgr/OrderEntryCartScreens.xml"/> </decorator-section> </decorator-screen> </widgets> Modified: incubator/ofbiz/trunk/applications/ecommerce/widget/OrderScreens.xml URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/ecommerce/widget/OrderScreens.xml?view=diff&rev=452766&r1=452765&r2=452766 ============================================================================== --- incubator/ofbiz/trunk/applications/ecommerce/widget/OrderScreens.xml (original) +++ incubator/ofbiz/trunk/applications/ecommerce/widget/OrderScreens.xml Tue Oct 3 23:47:22 2006 @@ -132,24 +132,6 @@ </widgets> </section> </screen> - <screen name="confirmorder"> - <section> - <actions> - <set field="rightbarScreenName" value="rightbar"/> - <set field="MainColumnStyle" value="rightonly"/> - - <set field="titleProperty" value="PageTitleOrderConfirmation"/> - <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/checkoutreview.bsh"/> - </actions> - <widgets> - <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/order/confirmorder.ftl"/></html></platform-specific> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </screen> <screen name="checkoutoptions"> <section> Modified: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml?view=diff&rev=452766&r1=452765&r2=452766 ============================================================================== --- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml (original) +++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml Tue Oct 3 23:47:22 2006 @@ -1020,6 +1020,10 @@ <security https="true" auth="true"/> <response name="success" type="view" value="ApprovedProductRequirements"/> </request-map> + <request-map uri="ApprovedProductRequirementsReport"> + <security https="true" auth="true"/> + <response name="success" type="view" value="ApprovedProductRequirementsReport"/> + </request-map> <request-map uri="quickPurchaseOrderEntry"> <security https="true" auth="true"/> <event type="java" path="org.ofbiz.order.shoppingcart.ShoppingCartEvents" invoke="quickInitPurchaseOrder"/> @@ -1468,6 +1472,7 @@ <view-map name="EditRequirementRole" type="screen" page="component://order/widget/ordermgr/RequirementScreens.xml#EditRequirementRole"/> <view-map name="ApproveRequirements" page="component://order/widget/ordermgr/RequirementScreens.xml#ApproveRequirements" type="screen"/> <view-map name="ApprovedProductRequirements" page="component://order/widget/ordermgr/RequirementScreens.xml#ApprovedProductRequirements" type="screen"/> + <view-map name="ApprovedProductRequirementsReport" type="screenfop" page="component://order/widget/ordermgr/RequirementScreens.xml#ApprovedProductRequirementsReport" content-type="application/pdf" encoding="none"/> <view-map name="RequirementsForSupplier" type="screen" page="component://order/widget/ordermgr/OrderEntryScreens.xml#RequirementsForSupplier"/> <view-map name="FindQuoteForCart" type="screen" page="component://order/widget/ordermgr/OrderEntryScreens.xml#FindQuoteForCart"/> Added: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promotioncategories.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promotioncategories.ftl?view=auto&rev=452766 ============================================================================== --- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promotioncategories.ftl (added) +++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promotioncategories.ftl Tue Oct 3 23:47:22 2006 @@ -0,0 +1,55 @@ +<#-- + +Copyright 2001-2006 The Apache Software Foundation + +Licensed under the Apache License, Version 2.0 (the "License"); you may not +use this file except in compliance with the License. You may obtain a copy of +the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +License for the specific language governing permissions and limitations +under the License. +--> +<#if productPromoCategoryIncludeList?has_content || productPromoCategoryExcludeList?has_content || productPromoCategoryAlwaysList?has_content> +<div class="screenlet"> + <div class="screenlet-header"> + <div class="boxhead"> ${uiLabelMap.EcommercePromotionCategories}:</div> + </div> + <div class="screenlet-body"> + <#if productPromoCategoryIncludeList?has_content> + <div class="tabletext">${uiLabelMap.EcommercePromotionProductsInCategories}:</div> + <#list productPromoCategoryIncludeList as productPromoCategory> + <#assign productCategory = productPromoCategory.getRelatedOneCache("ProductCategory")> + <div class="tabletext"> + - <a href="<@ofbizUrl>category/~category_id=${productPromoCategory.productCategoryId}</@ofbizUrl>" class="buttontext">${(productCategory.description)?default(productPromoCategory.productCategoryId)}</a> + <#if productPromoCategory.includeSubCategories?if_exists = "Y">(${uiLabelMap.EcommerceIncludeSubCategories})</#if> + </div> + </#list> + </#if> + <#if productPromoCategoryExcludeList?has_content> + <div class="tabletext">${uiLabelMap.EcommerceEcludeCategories}</div> + <#list productPromoCategoryExcludeList as productPromoCategory> + <#assign productCategory = productPromoCategory.getRelatedOneCache("ProductCategory")> + <div class="tabletext"> + - <a href="<@ofbizUrl>category/~category_id=${productPromoCategory.productCategoryId}</@ofbizUrl>" class="buttontext">${(productCategory.description)?default(productPromoCategory.productCategoryId)}</a> + <#if productPromoCategory.includeSubCategories?if_exists = "Y">(${uiLabelMap.EcommerceIncludeSubCategories})</#if> + </div> + </#list> + </#if> + <#if productPromoCategoryAlwaysList?has_content> + <div class="tabletext">${uiLabelMap.EcommerceAlwaysList}</div> + <#list productPromoCategoryAlwaysList as productPromoCategory> + <#assign productCategory = productPromoCategory.getRelatedOneCache("ProductCategory")> + <div class="tabletext"> + - <a href="<@ofbizUrl>category/~category_id=${productPromoCategory.productCategoryId}</@ofbizUrl>" class="buttontext">${(productCategory.description)?default(productPromoCategory.productCategoryId)}</a> + <#if productPromoCategory.includeSubCategories?if_exists = "Y">(${uiLabelMap.EcommerceIncludeSubCategories})</#if> + </div> + </#list> + </#if> + </div> +</div> +</#if> Propchange: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promotioncategories.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promotioncategories.ftl ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promotioncategories.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promotiondetails.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promotiondetails.ftl?view=auto&rev=452766 ============================================================================== --- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promotiondetails.ftl (added) +++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promotiondetails.ftl Tue Oct 3 23:47:22 2006 @@ -0,0 +1,26 @@ +<#-- + +Copyright 2001-2006 The Apache Software Foundation + +Licensed under the Apache License, Version 2.0 (the "License"); you may not +use this file except in compliance with the License. You may obtain a copy of +the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +License for the specific language governing permissions and limitations +under the License. +--> + +<div class="screenlet"> + <div class="screenlet-header"> + <div class="boxhead"> ${uiLabelMap.EcommercePromotionDetails}:</div> + </div> + <div class="screenlet-body"> + <div class="tabletext">${productPromo.promoText?if_exists}</div> + <div class="tabletext">Generated Description: ${promoAutoDescription?if_exists}</div> + </div> +</div> Propchange: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promotiondetails.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promotiondetails.ftl ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promotiondetails.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promotionproducts.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promotionproducts.ftl?view=auto&rev=452766 ============================================================================== --- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promotionproducts.ftl (added) +++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promotionproducts.ftl Tue Oct 3 23:47:22 2006 @@ -0,0 +1,66 @@ +<#-- + +Copyright 2001-2006 The Apache Software Foundation + +Licensed under the Apache License, Version 2.0 (the "License"); you may not +use this file except in compliance with the License. You may obtain a copy of +the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +License for the specific language governing permissions and limitations +under the License. +--> + +<#if productIds?has_content> +<div class="screenlet"> + <div class="screenlet-header"> + <div class="boxhead"> ${uiLabelMap.EcommerceProductsForPromotion}:</div> + </div> + <div class="screenlet-body"> + <#if (listSize > 0)> + <table border="0" width="100%" cellpadding="2"> + <tr> + <td align="right"> + <span class="tabletext"> + <b> + <#if (viewIndex > 0)> + <a href="<@ofbizUrl>showPromotionDetails?productPromoId=${productPromoId?if_exists}&VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex-1}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonPrevious}</a> | + </#if> + ${lowIndex+1} - ${highIndex} ${uiLabelMap.CommonOf} ${listSize} + <#if (listSize > highIndex)> + | <a href="<@ofbizUrl>showPromotionDetails?productPromoId=${productPromoId?if_exists}&VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex+1}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonNext}</a> + </#if> + </b> + </span> + </td> + </tr> + </table> + </#if> + + <table width="100%" border="0" cellspacing="0" cellpadding="0" class="boxbottom"> + <tr> + <td><div class="tableheadtext">${uiLabelMap.CommonQualifier}</div></td> + <td><div class="tableheadtext">${uiLabelMap.CommonBenefit}</div></td> + <td><div class="tableheadtext"> </div></td> + </tr> + <#if (listSize > 0)> + <#list productIds[lowIndex..highIndex-1] as productId> + <tr> + <td><div class="tabletext">[<#if productIdsCond.contains(productId)>x<#else> </#if>]</div></td> + <td><div class="tabletext">[<#if productIdsAction.contains(productId)>x<#else> </#if>]</div></td> + <td> + ${setRequestAttribute("optProductId", productId)} + ${setRequestAttribute("listIndex", productId_index)} + ${screens.render(productsummaryScreen)} + </td> + </tr> + </#list> + </#if> + </table> + </div> +</div> +</#if> Propchange: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promotionproducts.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promotionproducts.ftl ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promotionproducts.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderheaderinfo.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderheaderinfo.ftl?view=auto&rev=452766 ============================================================================== --- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderheaderinfo.ftl (added) +++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderheaderinfo.ftl Tue Oct 3 23:47:22 2006 @@ -0,0 +1,172 @@ +<#-- + +Copyright 2001-2006 The Apache Software Foundation + +Licensed under the Apache License, Version 2.0 (the "License"); you may not +use this file except in compliance with the License. You may obtain a copy of +the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +License for the specific language governing permissions and limitations +under the License. +--> + +<div class="screenlet"> + <div class="screenlet-body"> + <table width="100%" border="0" cellpadding="1"> + <#-- order name --> + <#if (orderName?exists)> + <tr> + <td align="right" valign="top" width="15%"> + <span class="tabletext"> <b>${uiLabelMap.OrderOrderName}</b> </span> + </td> + <td width="5"> </td> + <td align="left" valign="top" width="80%" class="tabletext"> + ${orderName} + </td> + </tr> + <tr><td colspan="7"><hr class="sepbar"/></td></tr> + </#if> + <#-- order for party --> + <#if (orderForParty?exists)> + <tr> + <td align="right" valign="top" width="15%"> + <span class="tabletext"> <b>${uiLabelMap.OrderOrderFor}</b> </span> + </td> + <td width="5"> </td> + <td align="left" valign="top" width="80%" class="tabletext"> + ${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(orderForParty, false)} [${orderForParty.partyId}] + </td> + </tr> + <tr><td colspan="7"><hr class="sepbar"/></td></tr> + </#if> + <#if orderTerms?has_content> + <tr> + <td align="right" valign="top" width="15%"> + <div class="tabletext"> <b>${uiLabelMap.OrderOrderTerms}</b></div> + </td> + <td width="5"> </td> + <td align="left" valign="top" width="80%"> + <table> + <tr> + <td width="33%"><div class="tabletext"><b>${uiLabelMap.OrderOrderTermType}</b></div></td> + <td width="33%"><div class="tabletext"><b>${uiLabelMap.OrderOrderTermValue}</b></div></td> + <td width="33%"><div class="tabletext"><b>${uiLabelMap.OrderOrderTermDays}</b></div></td> + </tr> + <tr><td colspan="3"><hr class="sepbar"/></td></tr> + <#assign index=0/> + <#list orderTerms as orderTerm> + <tr> + <td width="33%"><div class="tabletext">${orderTerm.getRelatedOne("TermType").get("description",locale)}</div></td> + <td width="33%"><div class="tabletext">${orderTerm.termValue?default("")}</div></td> + <td width="33%"><div class="tabletext">${orderTerm.termDays?default("")}</div></td> + </tr> + <#if orderTerms.size()<index> + <tr><td colspan="3"><hr class="sepbar"/></td></tr> + </#if> + <#assign index=index+1/> + </#list> + </table> + </td> + </tr> + <tr><td colspan="7"><hr class="sepbar"/></td></tr> + </#if> + <#-- tracking number --> + <#if trackingNumber?has_content> + <tr> + <td align="right" valign="top" width="15%"> + <div class="tabletext"> <b>${uiLabelMap.FacilityTrackingNumber}</b></div> + </td> + <td width="5"> </td> + <td align="left" valign="top" width="80%"> + <#-- TODO: add links to UPS/FEDEX/etc based on carrier partyId --> + <div class="tabletext">${trackingNumber}</div> + </td> + </tr> + <tr><td colspan="7"><hr class="sepbar"/></td></tr> + </#if> + + <#-- splitting preference --> + <tr> + <td align="right" valign="top" width="15%"> + <div class="tabletext"> <b>${uiLabelMap.OrderSplittingPreference}</b></div> + </td> + <td width="5"> </td> + <td align="left" valign="top" width="80%"> + <div class="tabletext"> + <#if maySplit?default("N") == "N">${uiLabelMap.FacilityWaitEntireOrderReady}</#if> + <#if maySplit?default("Y") == "Y">${uiLabelMap.FacilityShipAvailable}</#if> + </div> + </td> + </tr> + <#-- shipping instructions --> + <#if shippingInstructions?has_content> + <tr><td colspan="7"><hr class="sepbar"/></td></tr> + <tr> + <td align="right" valign="top" width="15%"> + <div class="tabletext"> <b>${uiLabelMap.CommonInstructions}</b></div> + </td> + <td width="5"> </td> + <td align="left" valign="top" width="80%"> + <div class="tabletext">${shippingInstructions}</div> + </td> + </tr> + </#if> + <tr><td colspan="7"><hr class="sepbar"/></td></tr> + <#if orderType != "PURCHASE_ORDER"> + <#-- gift settings --> + <tr> + <td align="right" valign="top" width="15%"> + <div class="tabletext"> <b>${uiLabelMap.OrderGift}?</b></div> + </td> + <td width="5"> </td> + <td align="left" valign="top" width="80%"> + <div class="tabletext"> + <#if isGift?default("N") == "N">${uiLabelMap.OrderThisOrderNotGift}</#if> + <#if isGift?default("N") == "Y">${uiLabelMap.OrderThisOrderGift}</#if> + </div> + </td> + </tr> + <tr><td colspan="7"><hr class="sepbar"/></td></tr> + <#if giftMessage?has_content> + <tr> + <td align="right" valign="top" width="15%"> + <div class="tabletext"> <b>${uiLabelMap.OrderGiftMessage}</b></div> + </td> + <td width="5"> </td> + <td align="left" valign="top" width="80%"> + <div class="tabletext">${giftMessage}</div> + </td> + </tr> + <tr><td colspan="7"><hr class="sepbar"/></td></tr> + </#if> + </#if> + <#if shipAfterDate?has_content> + <tr> + <td align="right" valign="top" width="15%"> + <div class="tabletext"> <b>${uiLabelMap.OrderShipAfterDate}</b></div> + </td> + <td width="5"> </td> + <td align="left" valign="top" width="80%"> + <div class="tabletext">${shipAfterDate}</div> + </td> + </tr> + </#if> + <#if shipBeforeDate?has_content> + <tr> + <td align="right" valign="top" width="15%"> + <div class="tabletext"> <b>${uiLabelMap.OrderShipBeforeDate}</b></div> + </td> + <td width="5"> </td> + <td align="left" valign="top" width="80%"> + <div class="tabletext">${shipBeforeDate}</div> + </td> + </tr> + </#if> + </table> + </div> +</div> Propchange: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderheaderinfo.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderheaderinfo.ftl ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderheaderinfo.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderpaymentinfo.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderpaymentinfo.ftl?view=auto&rev=452766 ============================================================================== --- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderpaymentinfo.ftl (added) +++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderpaymentinfo.ftl Tue Oct 3 23:47:22 2006 @@ -0,0 +1,124 @@ +<#-- + +Copyright 2001-2006 The Apache Software Foundation + +Licensed under the Apache License, Version 2.0 (the "License"); you may not +use this file except in compliance with the License. You may obtain a copy of +the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +License for the specific language governing permissions and limitations +under the License. +--> + +<#if paymentMethod?has_content || paymentMethodType?has_content || billingAccount?has_content> +<div class="screenlet"> + <div class="screenlet-header"> + <div class="boxhead"> ${uiLabelMap.AccountingPaymentInformation}</div> + </div> + <div class="screenlet-body"> + <#-- order payment info --> + <table width="100%" border="0" cellpadding="1"> + <#-- offline payment address infomation :: change this to use Company's address --> + <#if !paymentMethod?has_content && paymentMethodType?has_content> + <tr> + <#if paymentMethodType.paymentMethodTypeId == "EXT_OFFLINE"> + <td colspan="3" valign="top"> + <div class="tabletext" align="center"><b>${uiLabelMap.AccountingOfflinePayment}</b></div> + <#if orderHeader?has_content && paymentAddress?has_content> + <div class="tabletext" align="center"><hr class="sepbar"/></div> + <div class="tabletext" align="center"><b>${uiLabelMap.AccountingPleaseSendPaymentTo}:</b></div> + <#if paymentAddress.toName?has_content><div class="tabletext" align="center">${paymentAddress.toName}</div></#if> + <#if paymentAddress.attnName?has_content><div class="tabletext" align="center"><b>${uiLabelMap.CommonAttn}:</b> ${paymentAddress.attnName}</div></#if> + <div class="tabletext" align="center">${paymentAddress.address1}</div> + <#if paymentAddress.address2?has_content><div class="tabletext" align="center">${paymentAddress.address2}</div></#if> + <div class="tabletext" align="center">${paymentAddress.city}<#if paymentAddress.stateProvinceGeoId?has_content>, ${paymentAddress.stateProvinceGeoId}</#if> ${paymentAddress.postalCode} + <div class="tabletext" align="center">${paymentAddress.countryGeoId}</div> + <div class="tabletext" align="center"><hr class="sepbar"/></div> + <div class="tabletext" align="center"><b>${uiLabelMap.OrderBeSureIncludeOrder} #</b></div> + </#if> + </td> + <#else> + <#assign outputted = true> + <td colspan="3" valign="top"> + <div class="tabletext" align="center"><b>${uiLabelMap.AccountingPaymentVia} ${paymentMethodType.get("description",locale)}</b></div> + </td> + </#if> + </tr> + </#if> + <#if paymentMethod?has_content> + <#assign outputted = true> + <#-- credit card info --> + <#if creditCard?has_content> + <tr> + <td align="right" valign="top" width="15%"> + <div class="tabletext"> <b>${uiLabelMap.AccountingCreditCard}</b></div> + </td> + <td width="5"> </td> + <td align="left" valign="top" width="80%"> + <div class="tabletext"> + <#if creditCard.companyNameOnCard?has_content>${creditCard.companyNameOnCard}<br/></#if> + <#if creditCard.titleOnCard?has_content>${creditCard.titleOnCard} </#if> + ${creditCard.firstNameOnCard} + <#if creditCard.middleNameOnCard?has_content>${creditCard.middleNameOnCard} </#if> + ${creditCard.lastNameOnCard} + <#if creditCard.suffixOnCard?has_content> ${creditCard.suffixOnCard}</#if> + <br/> + ${formattedCardNumber} + </div> + </td> + </tr> + <#-- EFT account info --> + <#elseif eftAccount?has_content> + <tr> + <td align="right" valign="top" width="15%"> + <div class="tabletext"> <b>${uiLabelMap.AccountingEFTAccount}</b></div> + </td> + <td width="5"> </td> + <td align="left" valign="top" width="80%"> + <div class="tabletext"> + ${eftAccount.nameOnAccount}<br/> + <#if eftAccount.companyNameOnAccount?has_content>${eftAccount.companyNameOnAccount}<br/></#if> + Bank: ${eftAccount.bankName}, ${eftAccount.routingNumber}<br/> + Account #: ${eftAccount.accountNumber} + </div> + </td> + </tr> + </#if> + </#if> + <#-- billing account info --> + <#if billingAccount?has_content> + <#if outputted?default(false)> + <tr><td colspan="3"><hr class="sepbar"/></td></tr> + </#if> + <#assign outputted = true/> + <tr> + <td align="right" valign="top" width="15%"> + <div class="tabletext"> <b>${uiLabelMap.AccountingBillingAccount}</b></div> + </td> + <td width="5"> </td> + <td align="left" valign="top" width="80%"> + <div class="tabletext"> + #${billingAccount.billingAccountId?if_exists} - ${billingAccount.description?if_exists} + </div> + </td> + </tr> + <tr><td colspan="7"><hr class="sepbar"/></td></tr> + <tr> + <td align="right" valign="top" width="15%"> + <div class="tabletext"> <b>${uiLabelMap.OrderPurchaseOrderNumber}</b></div> + </td> + <td width="5"> </td> + <td align="left" valign="top" width="80%"> + <div class="tabletext">${customerPoNumber?if_exists}</div> + </td> + </tr> + </#if> + </table> + </div> +</div> +</#if> Propchange: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderpaymentinfo.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderpaymentinfo.ftl ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderpaymentinfo.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl?view=auto&rev=452766 ============================================================================== --- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl (added) +++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl Tue Oct 3 23:47:22 2006 @@ -0,0 +1,118 @@ +<#-- + +Copyright 2001-2006 The Apache Software Foundation + +Licensed under the Apache License, Version 2.0 (the "License"); you may not +use this file except in compliance with the License. You may obtain a copy of +the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +License for the specific language governing permissions and limitations +under the License. +--> + +<#if displayParty?has_content || orderContactMechValueMaps?has_content> +<div class="screenlet"> + <div class="screenlet-header"> + <div class="boxhead"> ${uiLabelMap.OrderContactInformation}</div> + </div> + <div class="screenlet-body"> + <table width="100%" border="0" cellpadding="1" cellspacing="0"> + <tr> + <td align="right" valign="top" width="15%"> + <div class="tabletext"> <b>${uiLabelMap.CommonName}</b></div> + </td> + <td width="5"> </td> + <td align="left" valign="top" width="80%"> + <div class="tabletext"> + <#if displayParty?has_content> + <#assign displayPartyNameResult = dispatcher.runSync("getPartyNameForDate", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", displayParty.partyId, "compareDate", orderHeader.orderDate, "userLogin", userLogin))/> + ${displayPartyNameResult.fullName?default("[${uiLabelMap.OrderPartyNameNotFound}]")} + </#if> + <#if partyId?exists> + <span> (<a href="${customerDetailLink}${partyId}" target="partymgr" class="buttontext">${partyId}</a>)</span> + <span align="right"> + <a href="<@ofbizUrl>/orderentry?partyId=${partyId}&orderTypeId=${orderHeader.orderTypeId}</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderNewOrder}</a> + <a href="<@ofbizUrl>/findorders?lookupFlag=Y&hideFields=Y&partyId=${partyId}</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderOtherOrders}</a> + </span> + </#if> + </div> + </td> + </tr> + <#list orderContactMechValueMaps as orderContactMechValueMap> + <#assign contactMech = orderContactMechValueMap.contactMech> + <#assign contactMechPurpose = orderContactMechValueMap.contactMechPurposeType> + <#--<#assign partyContactMech = orderContactMechValueMap.partyContactMech>--> + <tr><td colspan="7"><hr class="sepbar"></td></tr> + <tr> + <td align="right" valign="top" width="15%"> + <div class="tabletext"> <b>${contactMechPurpose.get("description",locale)}</b></div> + </td> + <td width="5"> </td> + <td align="left" valign="top" width="80%"> + <#if contactMech.contactMechTypeId == "POSTAL_ADDRESS"> + <#assign postalAddress = orderContactMechValueMap.postalAddress> + <#if postalAddress?has_content> + <div class="tabletext"> + <#if postalAddress.toName?has_content><b>${uiLabelMap.CommonTo}:</b> ${postalAddress.toName}<br/></#if> + <#if postalAddress.attnName?has_content><b>${uiLabelMap.CommonAttn}:</b> ${postalAddress.attnName}<br/></#if> + ${postalAddress.address1}<br/> + <#if postalAddress.address2?has_content>${postalAddress.address2}<br/></#if> + ${postalAddress.city}<#if postalAddress.stateProvinceGeoId?has_content>, ${postalAddress.stateProvinceGeoId} </#if> + ${postalAddress.postalCode?if_exists}<br/> + ${postalAddress.countryGeoId?if_exists}<br/> + <#if !postalAddress.countryGeoId?exists || postalAddress.countryGeoId == "USA"> + <#assign addr1 = postalAddress.address1?if_exists> + <#if (addr1.indexOf(" ") > 0)> + <#assign addressNum = addr1.substring(0, addr1.indexOf(" "))> + <#assign addressOther = addr1.substring(addr1.indexOf(" ")+1)> + <a target="_blank" href="http://www.whitepages.com/find_person_results.pl?fid=a&s_n=${addressNum}&s_a=${addressOther}&c=${postalAddress.city?if_exists}&s=${postalAddress.stateProvinceGeoId?if_exists}&x=29&y=18" class="buttontext">(lookup:whitepages.com)</a> + </#if> + </#if> + </div> + </#if> + <#elseif contactMech.contactMechTypeId == "TELECOM_NUMBER"> + <#assign telecomNumber = orderContactMechValueMap.telecomNumber> + <div class="tabletext"> + ${telecomNumber.countryCode?if_exists} + <#if telecomNumber.areaCode?exists>${telecomNumber.areaCode}-</#if>${telecomNumber.contactNumber} + <#--<#if partyContactMech.extension?exists>ext ${partyContactMech.extension}</#if>--> + <#if !telecomNumber.countryCode?exists || telecomNumber.countryCode == "011" || telecomNumber.countryCode == "1"> + <a target="_blank" href="http://www.anywho.com/qry/wp_rl?npa=${telecomNumber.areaCode?if_exists}&telephone=${telecomNumber.contactNumber?if_exists}&btnsubmit.x=20&btnsubmit.y=8" class="buttontext">(lookup:anywho.com)</a> + <a target="_blank" href="http://whitepages.com/find_person_results.pl?fid=p&ac=${telecomNumber.areaCode}&s=&p=${telecomNumber.contactNumber}&pt=b&x=40&y=9" class="buttontext">(lookup:whitepages.com)</a> + </#if> + </div> + <#elseif contactMech.contactMechTypeId == "EMAIL_ADDRESS"> + <div class="tabletext"> + ${contactMech.infoString} + <#if security.hasEntityPermission("ORDERMGR", "_SEND_CONFIRMATION", session)> + <br/>(<a href="<@ofbizUrl>confirmationmailedit?orderId=${orderId}&partyId=${partyId}&sendTo=${contactMech.infoString}</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderSendConfirmationEmail}</a>) + <#else> + <a href="mailto:${contactMech.infoString}" class="buttontext">(${uiLabelMap.OrderSendEmail})</a> + </#if> + </div> + <#elseif contactMech.contactMechTypeId == "WEB_ADDRESS"> + <div class="tabletext"> + ${contactMech.infoString} + <#assign openString = contactMech.infoString> + <#if !openString?starts_with("http") && !openString?starts_with("HTTP")> + <#assign openString = "http://" + openString> + </#if> + <a target="_blank" href="${openString}" class="buttontext">(open page in new window)</a> + </div> + <#else> + <div class="tabletext"> + ${contactMech.infoString?if_exists} + </div> + </#if> + </td> + </tr> + </#list> + </table> + </div> +</div> +</#if> Propchange: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl?view=auto&rev=452766 ============================================================================== --- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl (added) +++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl Tue Oct 3 23:47:22 2006 @@ -0,0 +1,218 @@ +<#-- + +Copyright 2001-2006 The Apache Software Foundation + +Licensed under the Apache License, Version 2.0 (the "License"); you may not +use this file except in compliance with the License. You may obtain a copy of +the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +License for the specific language governing permissions and limitations +under the License. +--> + +<div class="screenlet"> + <div class="screenlet-header"> + <div class="boxlink"> + <#if currentStatus.statusId == "ORDER_CREATED" || currentStatus.statusId == "ORDER_PROCESSING"> + <div class="tabletext"><a href="<@ofbizUrl>changeOrderItemStatus?statusId=ITEM_APPROVED&${paramString}</@ofbizUrl>" class="submenutextright">${uiLabelMap.OrderApproveOrder}</a></div> + </#if> + <#if setOrderCompleteOption> + <div class="tabletext"><a href="<@ofbizUrl>changeOrderStatus?orderId=${orderId}&statusId=ORDER_COMPLETED</@ofbizUrl>" class="submenutextright">${uiLabelMap.OrderCompleteOrder}</a></div> + </#if> + </div> + <#if orderHeader.externalId?has_content> + <#assign externalOrder = "(" + orderHeader.externalId + ")"/> + </#if> + <div class="boxhead"> ${uiLabelMap.OrderOrder} #${orderId} ${externalOrder?if_exists} ${uiLabelMap.CommonInformation} [<a href="<@ofbizUrl>order.pdf?orderId=${orderId}</@ofbizUrl>" class="submenutextright" target="_blank">PDF</a> ]</div> + </div> + <div class="screenlet-body"> + <table width="100%" border="0" cellpadding="1" cellspacing="0"> + <#-- order name --> + <#if orderHeader.orderName?has_content> + <tr> + <td align="right" valign="top" width="15%"> + <div class="tabletext"> <b>${uiLabelMap.OrderOrderName}</b></div> + </td> + <td width="5"> </td> + <td align="left" valign="top" width="80%"> + <div class="tabletext">${orderHeader.orderName}</div> + </td> + </tr> + <tr><td colspan="7"><hr class="sepbar"></td></tr> + </#if> + <#-- order status history --> + <tr> + <td align="right" valign="top" width="15%"> + <div class="tabletext"> <b>${uiLabelMap.OrderStatusHistory}</b></div> + </td> + <td width="5"> </td> + <td align="left" valign="top" width="80%"> + <div class="tabletext">${uiLabelMap.OrderCurrentStatus}: ${currentStatus.get("description",locale)}</div> + <#if orderHeaderStatuses?has_content> + <hr class="sepbar"> + <#list orderHeaderStatuses as orderHeaderStatus> + <#assign loopStatusItem = orderHeaderStatus.getRelatedOne("StatusItem")> + <div class="tabletext"> + ${loopStatusItem.get("description",locale)} - ${orderHeaderStatus.statusDatetime?default("0000-00-00 00:00:00")?string} + </div> + </#list> + </#if> + </td> + </tr> + <tr><td colspan="7"><hr class="sepbar"></td></tr> + <tr> + <td align="right" valign="top" width="15%"> + <div class="tabletext"> <b>${uiLabelMap.OrderDateOrdered}</b></div> + </td> + <td width="5"> </td> + <td align="left" valign="top" width="80%"> + <div class="tabletext"> + ${orderHeader.orderDate.toString()} + </div> + </td> + </tr> + <tr><td colspan="7"><hr class="sepbar"></td></tr> + <tr> + <td align="right" valign="top" width="15%"> + <div class="tabletext"> <b>${uiLabelMap.CommonCurrency}</b></div> + </td> + <td width="5"> </td> + <td align="left" valign="top" width="80%"> + <div class="tabletext"> + ${orderHeader.currencyUom?default("???")} + </div> + </td> + </tr> + <#if orderHeader.internalCode?has_content> + <tr><td colspan="7"><hr class="sepbar"></td></tr> + <tr> + <td align="right" valign="top" width="15%"> + <div class="tabletext"> <b>${uiLabelMap.OrderInternalCode}</b></div> + </td> + <td width="5"> </td> + <td align="left" valign="top" width="80%"> + <div class="tabletext"> + ${orderHeader.internalCode} + </div> + </td> + </tr> + </#if> + <tr><td colspan="7"><hr class="sepbar"></td></tr> + <tr> + <td align="right" valign="top" width="15%"> + <div class="tabletext"> <b>${uiLabelMap.OrderSalesChannel}</b></div> + </td> + <td width="5"> </td> + <td align="left" valign="top" width="80%"> + <div class="tabletext"> + <#if orderHeader.salesChannelEnumId?has_content> + <#assign channel = orderHeader.getRelatedOne("SalesChannelEnumeration")> + ${(channel.get("description",locale))?default("N/A")} + <#else> + ${uiLabelMap.CommonNA} + </#if> + </div> + </td> + </tr> + <tr><td colspan="7"><hr class="sepbar"></td></tr> + <tr> + <td align="right" valign="top" width="15%"> + <div class="tabletext"> <b>${uiLabelMap.OrderProductStore}</b></div> + </td> + <td width="5"> </td> + <td align="left" valign="top" width="80%"> + <div class="tabletext"> + <#if orderHeader.productStoreId?has_content> + <a href="/catalog/control/EditProductStore?productStoreId=${orderHeader.productStoreId}" target="catalogmgr" class="buttontext">${orderHeader.productStoreId}</a> + <#else> + ${uiLabelMap.CommonNA} + </#if> + </div> + </td> + </tr> + <tr><td colspan="7"><hr class="sepbar"></td></tr> + <tr> + <td align="right" valign="top" width="15%"> + <div class="tabletext"> <b>${uiLabelMap.OrderOriginFacility}</b></div> + </td> + <td width="5"> </td> + <td align="left" valign="top" width="80%"> + <div class="tabletext"> + <#if orderHeader.originFacilityId?has_content> + <a href="/facility/control/EditFacility?facilityId=${orderHeader.originFacilityId}${externalKeyParam}" target="facilitymgr" class="buttontext">${orderHeader.originFacilityId}</a> + <#else> + ${uiLabelMap.CommonNA} + </#if> + </div> + </td> + </tr> + <tr><td colspan="7"><hr class="sepbar"></td></tr> + <tr> + <td align="right" valign="top" width="15%"> + <div class="tabletext"> <b>${uiLabelMap.OrderCreatedBy}</b></div> + </td> + <td width="5"> </td> + <td align="left" valign="top" width="80%"> + <div class="tabletext"> + <#if orderHeader.createdBy?has_content> + <a href="/partymgr/control/viewprofile?userlogin_id=${orderHeader.createdBy}" target="partymgr" class="buttontext">${orderHeader.createdBy}</a> + <#else> + [${uiLabelMap.CommonNotSet}] + </#if> + </div> + </td> + </tr> + + <#if distributorId?exists> + <tr><td colspan="7"><hr class="sepbar"></td></tr> + <tr> + <td align="right" valign="top" width="15%"> + <div class="tabletext"> <b>${uiLabelMap.OrderDistributor}</b></div> + </td> + <td width="5"> </td> + <td align="left" valign="top" width="80%"> + <div class="tabletext"> + <#assign distPartyNameResult = dispatcher.runSync("getPartyNameForDate", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", distributorId, "compareDate", orderHeader.orderDate, "userLogin", userLogin))/> + ${distPartyNameResult.fullName?default("[${uiLabelMap.OrderPartyNameNotFound}]")} + </div> + </td> + </tr> + </#if> + <#if affiliateId?exists> + <tr><td colspan="7"><hr class="sepbar"></td></tr> + <tr> + <td align="right" valign="top" width="15%"> + <div class="tabletext"> <b>${uiLabelMap.OrderAffiliate}</b></div> + </td> + <td width="5"> </td> + <td align="left" valign="top" width="80%"> + <div class="tabletext"> + <#assign affPartyNameResult = dispatcher.runSync("getPartyNameForDate", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", affiliateId, "compareDate", orderHeader.orderDate, "userLogin", userLogin))/> + ${affPartyNameResult.fullName?default("[${uiLabelMap.OrderPartyNameNotFound}]")} + </div> + </td> + </tr> + </#if> + + <#if orderContentWrapper.get("IMAGE_URL")?has_content> + <tr><td colspan="7"><hr class="sepbar"></td></tr> + <tr> + <td align="right" valign="top" width="15%"> + <div class="tabletext"> <b>${uiLabelMap.OrderImage}</b></div> + </td> + <td width="5"> </td> + <td align="left" valign="top" width="80%"> + <div class="tabletext"> + <a href="<@ofbizUrl>viewimage?orderId=${orderId}&orderContentTypeId=IMAGE_URL</@ofbizUrl>" target="_orderImage" class="buttontext">${uiLabelMap.OrderViewImage}</a> + </div> + </td> + </tr> + </#if> + </table> + </div> +</div> Propchange: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl?view=auto&rev=452766 ============================================================================== --- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl (added) +++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl Tue Oct 3 23:47:22 2006 @@ -0,0 +1,362 @@ +<#-- + +Copyright 2001-2006 The Apache Software Foundation + +Licensed under the Apache License, Version 2.0 (the "License"); you may not +use this file except in compliance with the License. You may obtain a copy of +the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +License for the specific language governing permissions and limitations +under the License. +--> + +<div class="screenlet"> + <div class="screenlet-header"> + <div class="boxhead"> ${uiLabelMap.AccountingPaymentInformation}</div> + </div> + <div class="screenlet-body"> + <table width="100%" border="0" cellpadding="1" cellspacing="0"> + <#if orderPaymentPreferences?has_content || billingAccount?has_content || invoices?has_content> + <#list orderPaymentPreferences as orderPaymentPreference> + <#assign oppStatusItem = orderPaymentPreference.getRelatedOne("StatusItem")> + <#if outputted?default("false") == "true"> + <tr><td colspan="7"><hr class="sepbar"></td></tr> + </#if> + <#assign outputted = "true"> + <#-- try the paymentMethod first; if paymentMethodId is specified it overrides paymentMethodTypeId --> + <#assign paymentMethod = orderPaymentPreference.getRelatedOne("PaymentMethod")?if_exists> + <#if !paymentMethod?has_content> + <#assign paymentMethodType = orderPaymentPreference.getRelatedOne("PaymentMethodType")> + <#if paymentMethodType.paymentMethodTypeId == "EXT_BILLACT"> + <#assign outputted = "false"> + <#else> + <tr> + <td align="right" valign="top" width="15%"> + <div class="tabletext"> <b>${paymentMethodType.get("description",locale)?if_exists}</b> + <#if orderPaymentPreference.maxAmount?has_content> + <br/>${uiLabelMap.OrderPaymentMaximumAmount}: <@ofbizCurrency amount=orderPaymentPreference.maxAmount?default(0.00) isoCode=currencyUomId/> + </#if> + </div> + </td> + <td width="5"> </td> + <#if paymentMethodType.paymentMethodTypeId != "EXT_OFFLINE" && paymentMethodType.paymentMethodTypeId != "EXT_PAYPAL"> + <td align="left"> + <div class="tabletext"> + <#if orderPaymentPreference.maxAmount?has_content> + <br/>${uiLabelMap.OrderPaymentMaximumAmount}: <@ofbizCurrency amount=orderPaymentPreference.maxAmount?default(0.00) isoCode=currencyUomId/> + </#if> + <br/> [<#if oppStatusItem?exists>${oppStatusItem.get("description",locale)}<#else>${orderPaymentPreference.statusId}</#if>] + </div> + <#-- + <div class="tabletext"><@ofbizCurrency amount=orderPaymentPreference.maxAmount?default(0.00) isoCode=currencyUomId/> - ${(orderPaymentPreference.authDate.toString())?if_exists}</div> + <div class="tabletext |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |