You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by mr...@apache.org on 2008/05/18 15:40:13 UTC
svn commit: r657557 [3/3] - in /ofbiz/trunk/applications: ecommerce/config/
ecommerce/webapp/ecommerce/cart/ ecommerce/webapp/ecommerce/catalog/
ecommerce/webapp/ecommerce/shoppinglist/ order/config/
order/webapp/ordermgr/entry/ order/webapp/ordermgr/e...
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/minicart.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/minicart.ftl?rev=657557&r1=657556&r2=657557&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/minicart.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/minicart.ftl Sun May 18 06:40:12 2008
@@ -31,7 +31,7 @@
<div class="screenlet-body">
<#if (shoppingCartSize > 0)>
<#if hidetoplinks?default("N") != "Y">
- <div><a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.EcommerceViewCart}</a> <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.OrderCheckout}</a></div>
+ <div><a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.OrderViewCart}</a> <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.OrderCheckout}</a></div>
</#if>
<table width="100%" cellpadding="0" cellspacing="2">
<tr>
@@ -61,16 +61,16 @@
</#list>
<tr>
<td colspan="3" align="right">
- <div class="tabletext"><b>${uiLabelMap.EcommerceTotal}: <@ofbizCurrency amount=shoppingCart.getGrandTotal() isoCode=shoppingCart.getCurrency()/></b></div>
+ <div class="tabletext"><b>${uiLabelMap.OrderTotal}: <@ofbizCurrency amount=shoppingCart.getGrandTotal() isoCode=shoppingCart.getCurrency()/></b></div>
</td>
</tr>
</table>
<#if hidebottomlinks?default("N") != "Y">
- <div><a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.EcommerceViewCart}</a> <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.OrderCheckout}</a></div>
+ <div><a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.OrderViewCart}</a> <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.OrderCheckout}</a></div>
<div style="margin-top: 4px;"><a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.OrderCheckoutQuick}</a></div>
</#if>
<#else>
- <div class="tabletext">${uiLabelMap.EcommerceShoppingCartEmpty}</div>
+ <div class="tabletext">${uiLabelMap.OrderShoppingCartEmpty}</div>
</#if>
</div>
</div>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promoText.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promoText.ftl?rev=657557&r1=657556&r2=657557&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promoText.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promoText.ftl Sun May 18 06:40:12 2008
@@ -19,7 +19,7 @@
<#if showPromoText?exists && showPromoText>
<div class="screenlet">
<div class="screenlet-header">
- <div class="boxhead"> ${uiLabelMap.EcommerceSpecialOffers}</div>
+ <div class="boxhead"> ${uiLabelMap.OrderSpecialOffers}</div>
</div>
<div class="screenlet-body">
<table cellspacing="0" cellpadding="1" border="0">
@@ -37,7 +37,7 @@
<tr><td><hr/></td></tr>
<tr>
<td>
- <div class="tabletext"><a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.EcommerceViewAllPromotions}</a></div>
+ <div class="tabletext"><a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.OrderViewAllPromotions}</a></div>
</td>
</tr>
</table>
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=657557&r1=657556&r2=657557&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promoUseDetailsInline.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promoUseDetailsInline.ftl Sun May 18 06:40:12 2008
@@ -23,7 +23,7 @@
</div>
<div class="screenlet-body">
<div style="float: left; width: 40%;">
- <div class="tableheadtext">${uiLabelMap.EcommercePromotionsApplied}:</div>
+ <div class="tableheadtext">${uiLabelMap.OrderPromotionsApplied}:</div>
<#list shoppingCart.getProductPromoUseInfoIter() as productPromoUseInfo>
<div class="tabletext">
<#-- TODO: when promo pretty print is done show promo short description here -->
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showAllPromotions.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showAllPromotions.ftl?rev=657557&r1=657556&r2=657557&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showAllPromotions.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showAllPromotions.ftl Sun May 18 06:40:12 2008
@@ -19,7 +19,7 @@
<div class="screenlet">
<div class="screenlet-header">
- <div class="boxhead"> ${uiLabelMap.EcommerceSpecialOffers}</div>
+ <div class="boxhead"> ${uiLabelMap.OrderSpecialOffers}</div>
</div>
<div class="screenlet-body">
<#-- show promotions text -->
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=657557&r1=657556&r2=657557&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl Sun May 18 06:40:12 2008
@@ -250,13 +250,13 @@
<#else>
<#assign priceStyle = "regularPrice">
</#if>
- ${uiLabelMap.EcommerceYourPrice}: <#if "Y" = product.isVirtual?if_exists> from </#if><span class='${priceStyle}'><@ofbizCurrency amount=price.price isoCode=price.currencyUsed/></span>
+ ${uiLabelMap.OrderYourPrice}: <#if "Y" = product.isVirtual?if_exists> from </#if><span class='${priceStyle}'><@ofbizCurrency amount=price.price isoCode=price.currencyUsed/></span>
</b>
</div>
<#if price.listPrice?exists && price.price?exists && price.price?double < price.listPrice?double>
<#assign priceSaved = price.listPrice?double - price.price?double>
<#assign percentSaved = (priceSaved?double / price.listPrice?double) * 100>
- <div class="tabletext">${uiLabelMap.EcommerceSave}: <span class="basePrice"><@ofbizCurrency amount=priceSaved isoCode=price.currencyUsed/> (${percentSaved?int}%)</span></div>
+ <div class="tabletext">${uiLabelMap.OrderSave}: <span class="basePrice"><@ofbizCurrency amount=priceSaved isoCode=price.currencyUsed/> (${percentSaved?int}%)</span></div>
</#if>
</#if>
@@ -383,8 +383,8 @@
<a href="javascript:document.addToShoppingList.submit();" class="buttontext">[${uiLabelMap.OrderAddToShoppingList}]</a>
</form>
<#else> <br/>
- ${uiLabelMap.EcommerceYouMust} <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonLogin}</a>
- ${uiLabelMap.EcommerceToAddSelectedItemsToShoppingList}.
+ ${uiLabelMap.OrderYouMust} <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonLogin}</a>
+ ${uiLabelMap.OrderToAddSelectedItemsToShoppingList}.
</#if>
</div>
<#-- Prefill first select box (virtual products only) -->
@@ -576,7 +576,7 @@
<td colspan="2">
<div class="tableheadtext">${uiLabelMap.OrderCustomerReviews}:</div>
<#if averageRating?exists && (averageRating?double > 0) && numRatings?exists && (numRatings?double > 1)>
- <div class="tabletext">${uiLabelMap.OrderAverageRating}: ${averageRating} <#if numRatings?exists>(${uiLabelMap.CommonFrom} ${numRatings} ${uiLabelMap.EcommerceRatings})</#if></div>
+ <div class="tabletext">${uiLabelMap.OrderAverageRating}: ${averageRating} <#if numRatings?exists>(${uiLabelMap.CommonFrom} ${numRatings} ${uiLabelMap.OrderRatings})</#if></div>
</#if>
</td>
</tr>
@@ -596,7 +596,7 @@
<div class="tabletext"><b>${uiLabelMap.CommonOn}: </b>${productReview.postedDateTime?if_exists}</div>
</td>
<td>
- <div class="tabletext"><b>${uiLabelMap.EcommerceRanking}: </b>${productReview.productRating?if_exists?string}</div>
+ <div class="tabletext"><b>${uiLabelMap.OrderRanking}: </b>${productReview.productRating?if_exists?string}</div>
</td>
</tr>
<tr>
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=657557&r1=657556&r2=657557&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl Sun May 18 06:40:12 2008
@@ -330,7 +330,7 @@
<#else>
<#assign priceStyle = "regularPrice">
</#if>
- ${uiLabelMap.EcommerceYourPrice}: <#if "Y" = product.isVirtual?if_exists> ${uiLabelMap.CommonFrom} </#if><span class="${priceStyle}"><@ofbizCurrency amount=price.price isoCode=price.currencyUsed/></span>
+ ${uiLabelMap.OrderYourPrice}: <#if "Y" = product.isVirtual?if_exists> ${uiLabelMap.CommonFrom} </#if><span class="${priceStyle}"><@ofbizCurrency amount=price.price isoCode=price.currencyUsed/></span>
<#if product.productTypeId?if_exists == "ASSET_USAGE">
<#if product.reserv2ndPPPerc?exists && product.reserv2ndPPPerc != 0><br/><span class="${priceStyle}">${uiLabelMap.ProductReserv2ndPPPerc}<#if !product.reservNthPPPerc?exists || product.reservNthPPPerc == 0>${uiLabelMap.CommonUntil} ${product.reservMaxPersons}</#if> <@ofbizCurrency amount=product.reserv2ndPPPerc*price.price/100 isoCode=price.currencyUsed/></span></#if>
<#if product.reservNthPPPerc?exists &&product.reservNthPPPerc != 0><br/><span class="${priceStyle}">${uiLabelMap.ProductReservNthPPPerc} <#if !product.reserv2ndPPPerc?exists || product.reserv2ndPPPerc == 0>${uiLabelMap.ProductReservSecond} <#else> ${uiLabelMap.ProductReservThird} </#if> ${uiLabelMap.CommonUntil} ${product.reservMaxPersons}, ${uiLabelMap.ProductEach}: <@ofbizCurrency amount=product.reservNthPPPerc*price.price/100 isoCode=price.currencyUsed/></span></#if>
@@ -341,7 +341,7 @@
<#if price.listPrice?exists && price.price?exists && price.price?double < price.listPrice?double>
<#assign priceSaved = price.listPrice?double - price.price?double>
<#assign percentSaved = (priceSaved?double / price.listPrice?double) * 100>
- <div class="tabletext">${uiLabelMap.EcommerceSave}: <span class="basePrice"><@ofbizCurrency amount=priceSaved isoCode=price.currencyUsed/> (${percentSaved?int}%)</span></div>
+ <div class="tabletext">${uiLabelMap.OrderSave}: <span class="basePrice"><@ofbizCurrency amount=priceSaved isoCode=price.currencyUsed/> (${percentSaved?int}%)</span></div>
</#if>
<#-- show price details ("showPriceDetails" field can be set in the screen definition) -->
<#if (showPriceDetails?exists && showPriceDetails?default("N") == "Y")>
@@ -548,8 +548,8 @@
<a href="javascript:addShoplistSubmit();" class="buttontext">${uiLabelMap.OrderAddToShoppingList}</a>
</form>
<#else> <br/>
- ${uiLabelMap.EcommerceYouMust} <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonLogin}</a>
- ${uiLabelMap.EcommerceToAddSelectedItemsToShoppingList}.
+ ${uiLabelMap.OrderYouMust} <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonLogin}</a>
+ ${uiLabelMap.OrderToAddSelectedItemsToShoppingList}.
</#if>
</div>
<#-- Prefill first select box (virtual products only) -->
@@ -617,7 +617,7 @@
<div id="reviews">
<div class="tableheadtext">${uiLabelMap.OrderCustomerReviews}:</div>
<#if averageRating?exists && (averageRating?double > 0) && numRatings?exists && (numRatings?double > 1)>
- <div class="tabletext">${uiLabelMap.OrderAverageRating}: ${averageRating} <#if numRatings?exists>(${uiLabelMap.CommonFrom} ${numRatings} ${uiLabelMap.EcommerceRatings})</#if></div>
+ <div class="tabletext">${uiLabelMap.OrderAverageRating}: ${averageRating} <#if numRatings?exists>(${uiLabelMap.CommonFrom} ${numRatings} ${uiLabelMap.OrderRatings})</#if></div>
</#if>
<tr><td colspan="2"><hr/></td></tr>
<#if productReviews?has_content>
@@ -633,7 +633,7 @@
<div class="tabletext"><b>${uiLabelMap.CommonAt}: </b>${productReview.postedDateTime?if_exists} </div>
</td>
<td>
- <div class="tabletext"><b>${uiLabelMap.EcommerceRanking}: </b>${productReview.productRating?if_exists?string}</div>
+ <div class="tabletext"><b>${uiLabelMap.OrderRanking}: </b>${productReview.productRating?if_exists?string}</div>
</td>
</tr>
<tr>
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=657557&r1=657556&r2=657557&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productsummary.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productsummary.ftl Sun May 18 06:40:12 2008
@@ -77,7 +77,7 @@
<#if requestParameters.VIEW_INDEX?has_content><input type="hidden" name="VIEW_INDEX" value="${requestParameters.VIEW_INDEX}"/></#if>
<#if requestParameters.VIEW_SIZE?has_content><input type="hidden" name="VIEW_SIZE" value="${requestParameters.VIEW_SIZE}"/></#if>
<input type="hidden" name="clearSearch" value="N"/>
- <a href="javascript:document.the${requestAttributes.formNamePrefix?if_exists}${requestAttributes.listIndex?if_exists}defaultform.submit()" class="buttontext">${uiLabelMap.CommonAddDefault}(${prodCatMem.quantity?string.number}) ${uiLabelMap.EcommerceToCart}</a>
+ <a href="javascript:document.the${requestAttributes.formNamePrefix?if_exists}${requestAttributes.listIndex?if_exists}defaultform.submit()" class="buttontext">${uiLabelMap.CommonAddDefault}(${prodCatMem.quantity?string.number}) ${uiLabelMap.OrderToCart}</a>
</form>
</#if>
</#if>
@@ -126,13 +126,13 @@
</#if>
<#if (price.price?default(0) > 0 && product.requireAmount?default("N") == "N")>
- ${uiLabelMap.EcommerceYourPrice}: <#if "Y" = product.isVirtual?if_exists> ${uiLabelMap.CommonFrom} </#if><span class="${priceStyle}"><@ofbizCurrency amount=price.price isoCode=price.currencyUsed/></span>
+ ${uiLabelMap.OrderYourPrice}: <#if "Y" = product.isVirtual?if_exists> ${uiLabelMap.CommonFrom} </#if><span class="${priceStyle}"><@ofbizCurrency amount=price.price isoCode=price.currencyUsed/></span>
</#if>
</b>
<#if price.listPrice?exists && price.price?exists && price.price?double < price.listPrice?double>
<#assign priceSaved = price.listPrice?double - price.price?double>
<#assign percentSaved = (priceSaved?double / price.listPrice?double) * 100>
- ${uiLabelMap.EcommerceSave}: <span class="basePrice"><@ofbizCurrency amount=priceSaved isoCode=price.currencyUsed/> (${percentSaved?int}%)</span>
+ ${uiLabelMap.OrderSave}: <span class="basePrice"><@ofbizCurrency amount=priceSaved isoCode=price.currencyUsed/> (${percentSaved?int}%)</span>
</#if>
</#if>
<#-- show price details ("showPriceDetails" field can be set in the screen definition) -->
@@ -145,7 +145,7 @@
</#if>
</div>
<#if averageRating?exists && (averageRating?double > 0) && numRatings?exists && (numRatings?long > 2)>
- <div class="tabletext">${uiLabelMap.OrderAverageRating}: ${averageRating} (${uiLabelMap.CommonFrom} ${numRatings} ${uiLabelMap.EcommerceRatings})</div>
+ <div class="tabletext">${uiLabelMap.OrderAverageRating}: ${averageRating} (${uiLabelMap.CommonFrom} ${numRatings} ${uiLabelMap.OrderRatings})</div>
</#if>
</div>
</div>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderShortcuts.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderShortcuts.ftl?rev=657557&r1=657556&r2=657557&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderShortcuts.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderShortcuts.ftl Sun May 18 06:40:12 2008
@@ -41,7 +41,7 @@
<#if security.hasEntityPermission("CATALOG", "_CREATE", session)>
<li><a href="/catalog/control/EditProduct?${externalKeyParam?if_exists}" target="catalog" class="buttontext">${uiLabelMap.ProductCreateNewProduct}</a></li>
</#if>
- <li><a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.EcommerceQuickAdd}</a></li>
+ <li><a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.OrderQuickAdd}</a></li>
<#if shoppingLists?exists>
<li><a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.PageTitleShoppingList}</a></li>
</#if>