Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promoUseDetailsInline.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promoUseDetailsInline.ftl?rev=657466&r1=657465&r2=657466&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promoUseDetailsInline.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promoUseDetailsInline.ftl Sat May 17 14:32:40 2008 @@ -19,7 +19,7 @@ <div class="screenlet"> <div class="screenlet-header"> - <div class="boxhead"> ${uiLabelMap.EcommercePromotionInformation}:</div> + <div class="boxhead"> ${uiLabelMap.OrderPromotionInformation}:</div> </div> <div class="screenlet-body"> <div style="float: left; width: 40%;"> @@ -48,21 +48,21 @@ <#assign productPromoActualPK = quantityUsedPerPromoActualEntry.getKey()> <#assign actualQuantityUsed = quantityUsedPerPromoActualEntry.getValue()> <#assign isQualifier = "ProductPromoCond" == productPromoActualPK.getEntityName()> - <div class="tabletext"> - ${actualQuantityUsed} ${uiLabelMap.CommonUsedAs} <#if isQualifier>${uiLabelMap.CommonQualifier}<#else>${uiLabelMap.CommonBenefit}</#if> ${uiLabelMap.EcommerceOfPromotion} <a href="<@ofbizUrl>showPromotionDetails?productPromoId=${productPromoActualPK.productPromoId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDetails}</a></div> + <div class="tabletext"> - ${actualQuantityUsed} ${uiLabelMap.CommonUsedAs} <#if isQualifier>${uiLabelMap.CommonQualifier}<#else>${uiLabelMap.CommonBenefit}</#if> ${uiLabelMap.OrderOfPromotion} <a href="<@ofbizUrl>showPromotionDetails?productPromoId=${productPromoActualPK.productPromoId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDetails}</a></div> <!-- productPromoActualPK ${productPromoActualPK.toString()} --> </#list> <#list cartLine.getQuantityUsedPerPromoFailedIter() as quantityUsedPerPromoFailedEntry> <#assign productPromoFailedPK = quantityUsedPerPromoFailedEntry.getKey()> <#assign failedQuantityUsed = quantityUsedPerPromoFailedEntry.getValue()> <#assign isQualifier = "ProductPromoCond" == productPromoFailedPK.getEntityName()> - <div class="tabletext"> - ${uiLabelMap.CommonCouldBeUsedAs} <#if isQualifier>${uiLabelMap.CommonQualifier}<#else>${uiLabelMap.CommonBenefit}</#if> ${uiLabelMap.EcommerceOfPromotion} <a href="<@ofbizUrl>showPromotionDetails?productPromoId=${productPromoFailedPK.productPromoId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDetails}</a></div> + <div class="tabletext"> - ${uiLabelMap.CommonCouldBeUsedAs} <#if isQualifier>${uiLabelMap.CommonQualifier}<#else>${uiLabelMap.CommonBenefit}</#if> ${uiLabelMap.OrderOfPromotion} <a href="<@ofbizUrl>showPromotionDetails?productPromoId=${productPromoFailedPK.productPromoId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDetails}</a></div> <!-- Total times checked but failed: ${failedQuantityUsed}, productPromoFailedPK ${productPromoFailedPK.toString()} --> </#list> <#list cartLine.getQuantityUsedPerPromoCandidateIter() as quantityUsedPerPromoCandidateEntry> <#assign productPromoCandidatePK = quantityUsedPerPromoCandidateEntry.getKey()> <#assign candidateQuantityUsed = quantityUsedPerPromoCandidateEntry.getValue()> <#assign isQualifier = "ProductPromoCond" == productPromoCandidatePK.getEntityName()> - <!-- Left over not reset or confirmed, shouldn't happen: ${candidateQuantityUsed} Might be Used (Candidate) as <#if isQualifier>${uiLabelMap.CommonQualifier}<#else>${uiLabelMap.CommonBenefit}</#if> ${uiLabelMap.EcommerceOfPromotion} [${productPromoCandidatePK.productPromoId}] --> + <!-- Left over not reset or confirmed, shouldn't happen: ${candidateQuantityUsed} Might be Used (Candidate) as <#if isQualifier>${uiLabelMap.CommonQualifier}<#else>${uiLabelMap.CommonBenefit}</#if> ${uiLabelMap.OrderOfPromotion} [${productPromoCandidatePK.productPromoId}] --> <!-- productPromoCandidatePK ${productPromoCandidatePK.toString()} --> </#list> </#if>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promotioncategories.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promotioncategories.ftl?rev=657466&r1=657465&r2=657466&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promotioncategories.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promotioncategories.ftl Sat May 17 14:32:40 2008 @@ -19,11 +19,11 @@ <#if productPromoCategoryIncludeList?has_content || productPromoCategoryExcludeList?has_content || productPromoCategoryAlwaysList?has_content> <div class="screenlet"> <div class="screenlet-header"> - <div class="boxhead"> ${uiLabelMap.EcommercePromotionCategories}:</div> + <div class="boxhead"> ${uiLabelMap.OrderPromotionCategories}:</div> </div> <div class="screenlet-body"> <#if productPromoCategoryIncludeList?has_content> - <div class="tabletext">${uiLabelMap.EcommercePromotionProductsInCategories}:</div> + <div class="tabletext">${uiLabelMap.OrderPromotionProductsInCategories}:</div> <#list productPromoCategoryIncludeList as productPromoCategory> <#assign productCategory = productPromoCategory.getRelatedOneCache("ProductCategory")> <div class="tabletext"> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promotiondetails.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promotiondetails.ftl?rev=657466&r1=657465&r2=657466&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promotiondetails.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promotiondetails.ftl Sat May 17 14:32:40 2008 @@ -19,7 +19,7 @@ <div class="screenlet"> <div class="screenlet-header"> - <div class="boxhead"> ${uiLabelMap.EcommercePromotionDetails}:</div> + <div class="boxhead"> ${uiLabelMap.OrderPromotionDetails}:</div> </div> <div class="screenlet-body"> <div class="tabletext">${productPromo.promoText?if_exists}</div> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promotionproducts.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promotionproducts.ftl?rev=657466&r1=657465&r2=657466&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promotionproducts.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promotionproducts.ftl Sat May 17 14:32:40 2008 @@ -20,7 +20,7 @@ <#if productIds?has_content> <div class="screenlet"> <div class="screenlet-header"> - <div class="boxhead"> ${uiLabelMap.EcommerceProductsForPromotion}:</div> + <div class="boxhead"> ${uiLabelMap.OrderProductsForPromotion}:</div> </div> <div class="screenlet-body"> <#if (listSize > 0)> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/advancedsearch.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/advancedsearch.ftl?rev=657466&r1=657465&r2=657466&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/advancedsearch.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/advancedsearch.ftl Sat May 17 14:32:40 2008 @@ -137,7 +137,7 @@ <#if searchOptionsHistoryList?has_content> <hr/> - <h2>${uiLabelMap.EcommerceLastSearches}...</h2> + <h2>${uiLabelMap.OrderLastSearches}...</h2> <div class="tabletext"> <a href="<@ofbizUrl>clearSearchOptionsHistoryList</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderClearSearchHistory}</a> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl?rev=657466&r1=657465&r2=657466&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl Sat May 17 14:32:40 2008 @@ -245,7 +245,7 @@ <div class="tabletext"> <b> <#if price.isSale?exists && price.isSale> - <span class='salePrice'>${uiLabelMap.EcommerceOnSale}!</span> + <span class='salePrice'>${uiLabelMap.OrderOnSale}!</span> <#assign priceStyle = "salePrice"> <#else> <#assign priceStyle = "regularPrice"> @@ -268,7 +268,7 @@ </div> </#if> <#if product.piecesIncluded?exists && product.piecesIncluded?long != 0> - <div class="tabletext">${uiLabelMap.EcommercePieces}: + <div class="tabletext">${uiLabelMap.OrderPieces}: ${product.piecesIncluded} </div> </#if> @@ -376,7 +376,7 @@ </#list> </#if> <option value="">---</option> - <option value="">${uiLabelMap.EcommerceNewShoppingList}</option> + <option value="">${uiLabelMap.OrderNewShoppingList}</option> </select> <input type="text" size="5" class="inputBox" name="quantity" value="1"> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl?rev=657466&r1=657465&r2=657466&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl Sat May 17 14:32:40 2008 @@ -325,7 +325,7 @@ <div class="tabletext"> <b> <#if price.isSale?exists && price.isSale> - <span class="salePrice">${uiLabelMap.EcommerceOnSale}!</span> + <span class="salePrice">${uiLabelMap.OrderOnSale}!</span> <#assign priceStyle = "salePrice"> <#else> <#assign priceStyle = "regularPrice"> @@ -355,7 +355,7 @@ <#-- Included quantities/pieces --> <#if product.piecesIncluded?exists && product.piecesIncluded?long != 0> <div class="tabletext"> - ${uiLabelMap.EcommercePieces}: ${product.piecesIncluded} + ${uiLabelMap.OrderPieces}: ${product.piecesIncluded} </div> </#if> <#if (product.quantityIncluded?exists && product.quantityIncluded?double != 0) || product.quantityUomId?has_content> @@ -536,7 +536,7 @@ </#list> </#if> <option value="">---</option> - <option value="">${uiLabelMap.EcommerceNewShoppingList}</option> + <option value="">${uiLabelMap.OrderNewShoppingList}</option> </select> <#if product.productTypeId?if_exists == "ASSET_USAGE"> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productsummary.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productsummary.ftl?rev=657466&r1=657465&r2=657466&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productsummary.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productsummary.ftl Sat May 17 14:32:40 2008 @@ -44,7 +44,7 @@ <div class="tabletext" style="color: red;">${uiLabelMap.ProductNoLongerAvailable}</div> <#-- check to see if it is a rental item; will enter parameters on the detail screen--> <#elseif product.productTypeId?if_exists == "ASSET_USAGE"> - <a href="<@ofbizUrl>product/<#if categoryId?exists>~category_id=${categoryId}/</#if>~product_id=${product.productId}</@ofbizUrl>" class="buttontext">${uiLabelMap.EcommerceMakeBooking}...</a> + <a href="<@ofbizUrl>product/<#if categoryId?exists>~category_id=${categoryId}/</#if>~product_id=${product.productId}</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderMakeBooking}...</a> <#-- check to see if it is an aggregated or configurable product; will enter parameters on the detail screen--> <#elseif product.productTypeId?if_exists == "AGGREGATED"> <a href="<@ofbizUrl>product/<#if categoryId?exists>~category_id=${categoryId}/</#if>~product_id=${product.productId}</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderConfigure}...</a> @@ -119,7 +119,7 @@ </#if> <b> <#if price.isSale?exists && price.isSale> - <span class="salePrice">${uiLabelMap.EcommerceOnSale}!</span> + <span class="salePrice">${uiLabelMap.OrderOnSale}!</span> <#assign priceStyle = "salePrice"> <#else> <#assign priceStyle = "regularPrice"> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderitems.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderitems.ftl?rev=657466&r1=657465&r2=657466&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderitems.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderitems.ftl Sat May 17 14:32:40 2008 @@ -80,7 +80,7 @@ <#if WorkOrderItemFulfillments?has_content> <#list WorkOrderItemFulfillments as WorkOrderItemFulfillment> <#assign workEffort = WorkOrderItemFulfillment.getRelatedOneCache("WorkEffort")?if_exists> - <tr><td> </td><td> </td><td colspan="8"><div class="tabletext">${uiLabelMap.CommonFrom}: ${workEffort.estimatedStartDate?string("yyyy-MM-dd")} ${uiLabelMap.CommonTo}: ${workEffort.estimatedCompletionDate?string("yyyy-MM-dd")} ${uiLabelMap.EcommerceNbrPersons}: ${workEffort.reservPersons}</div></td></tr> + <tr><td> </td><td> </td><td colspan="8"><div class="tabletext">${uiLabelMap.CommonFrom}: ${workEffort.estimatedStartDate?string("yyyy-MM-dd")} ${uiLabelMap.CommonTo}: ${workEffort.estimatedCompletionDate?string("yyyy-MM-dd")} ${uiLabelMap.OrderNbrPersons}: ${workEffort.reservPersons}</div></td></tr> <#break><#-- need only the first one --> </#list> </#if> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/survey.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/survey.ftl?rev=657466&r1=657465&r2=657466&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/survey.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/survey.ftl Sat May 17 14:32:40 2008 @@ -23,5 +23,5 @@ ${requestAttributes.surveyWrapper.renderSurvey().toString()} </form> <#else> - <h1>${uiLabelMap.EcommerceNothingToDoHere}</h1> + <h1>${uiLabelMap.OrderNothingToDoHere}</h1> </#if> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/request/ViewRequestItemInfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/request/ViewRequestItemInfo.ftl?rev=657466&r1=657465&r2=657466&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/request/ViewRequestItemInfo.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/request/ViewRequestItemInfo.ftl Sat May 17 14:32:40 2008 @@ -25,7 +25,7 @@ <table cellspacing="0" class="basic-table"> <tr align="left" valign="bottom" class="header-row"> <td width="10%" align="left">${uiLabelMap.ProductItem}</td> - <td width="35%" align="left">${uiLabelMap.EcommerceProduct}</td> + <td width="35%" align="left">${uiLabelMap.OrderProduct}</td> <td width="10%" align="right">${uiLabelMap.ProductQuantity}</td> <td width="10%" align="right">${uiLabelMap.OrderAmount}</td> <td width="10%" align="right">${uiLabelMap.OrderRequestMaximumAmount}</td> Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryForms.xml?rev=657466&r1=657465&r2=657466&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryForms.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryForms.xml Sat May 17 14:32:40 2008 @@ -103,7 +103,7 @@ <form name="ViewShoppingLists" type="list" list-name="customershoppinglists" target="" default-title-style="tableheadtext" default-widget-style="tabletext"> <field name="listName" title="${uiLabelMap.PageTitleShoppingList}"><display/></field> - <field name="shoppingListTypeId" title="${uiLabelMap.EcommerceListType}"> + <field name="shoppingListTypeId" title="${uiLabelMap.OrderListType}"> <display-entity entity-name="ShoppingListType"/> </field> <field name="description" title="${uiLabelMap.CommonDescription}"><display/></field>
