svn commit: r1745315 - /ofbiz/trunk/applications/order/template/entry/cart/ShowCartItems.ftl

Author: jleroux
Date: Tue May 24 07:42:38 2016
New Revision: 1745315

URL: http://svn.apache.org/viewvc?rev=1745315&view=rev
Log:
A patch from Akash Jain for "Backordered flag should not be shown for service product" https://issues.apache.org/jira/browse/OFBIZ-7092

These are the steps:
-- Initiate sales order.
-- Add service product (ex. sv-1000) in the cart

Backordered flag (attached screen-shot) should not be shown for service product.


Modified:
    ofbiz/trunk/applications/order/template/entry/cart/ShowCartItems.ftl

Modified: ofbiz/trunk/applications/order/template/entry/cart/ShowCartItems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/cart/ShowCartItems.ftl?rev=1745315&r1=1745314&r2=1745315&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/template/entry/cart/ShowCartItems.ftl (original)
+++ ofbiz/trunk/applications/order/template/entry/cart/ShowCartItems.ftl Tue May 24 07:42:38 2016
@@ -156,10 +156,11 @@ under the License.
                       <span style="color: red; font-size: 15px;">[${backOrdered!}&nbsp;${uiLabelMap.OrderBackOrdered}]</span>
                     </#if>
                     </#if>
-                    <#if (availableToPromiseMap.get(cartLine.getProductId()) <= 0) && (shoppingCart.getOrderType() == 'SALES_ORDER') && product.productTypeId! != "DIGITAL_GOOD" && product.productTypeId! != "MARKETING_PKG_AUTO" && product.productTypeId! != "MARKETING_PKG_PICK">
+                    <#assign isPhysical = Static["org.ofbiz.product.product.ProductWorker"].isPhysical(product)/>
+                    <#if (availableToPromiseMap.get(cartLine.getProductId()) <= 0) && (shoppingCart.getOrderType() == 'SALES_ORDER') && product.productTypeId! != "MARKETING_PKG_AUTO" && product.productTypeId! != "MARKETING_PKG_PICK" && isPhysical>
                       <span style="color: red;">[${cartLine.getQuantity()}&nbsp;${uiLabelMap.OrderBackOrdered}]</span>
                     <#else>
-                      <#if (availableToPromiseMap.get(cartLine.getProductId()) < cartLine.getQuantity()) && (shoppingCart.getOrderType() == 'SALES_ORDER') && product.productTypeId != "DIGITAL_GOOD" && product.productTypeId != "MARKETING_PKG_AUTO" && product.productTypeId != "MARKETING_PKG_PICK">
+                      <#if (availableToPromiseMap.get(cartLine.getProductId()) < cartLine.getQuantity()) && (shoppingCart.getOrderType() == 'SALES_ORDER') && product.productTypeId != "MARKETING_PKG_AUTO" && product.productTypeId != "MARKETING_PKG_PICK" && isPhysical>
                         <#assign backOrdered = cartLine.getQuantity() - availableToPromiseMap.get(cartLine.getProductId())/>
                         <span style="color: red;">[${backOrdered!}&nbsp;${uiLabelMap.OrderBackOrdered}]</span>
                       </#if>