Author: jleroux
Date: Mon May 30 16:28:23 2016 New Revision: 1746155 URL: http://svn.apache.org/viewvc?rev=1746155&view=rev Log: Backport 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/branches/release13.07/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl ofbiz/branches/release14.12/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl ofbiz/branches/release15.12/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl Modified: ofbiz/branches/release13.07/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl?rev=1746155&r1=1746154&r2=1746155&view=diff ============================================================================== --- ofbiz/branches/release13.07/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl (original) +++ ofbiz/branches/release13.07/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl Mon May 30 16:28:23 2016 @@ -156,10 +156,11 @@ under the License. <span style="color: red; font-size: 15px;">[${backOrdered?if_exists} ${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()} ${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?if_exists} ${uiLabelMap.OrderBackOrdered}]</span> </#if> Modified: ofbiz/branches/release14.12/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl?rev=1746155&r1=1746154&r2=1746155&view=diff ============================================================================== --- ofbiz/branches/release14.12/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl (original) +++ ofbiz/branches/release14.12/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl Mon May 30 16:28:23 2016 @@ -156,10 +156,11 @@ under the License. <span style="color: red; font-size: 15px;">[${backOrdered!} ${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()} ${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!} ${uiLabelMap.OrderBackOrdered}]</span> </#if> Modified: ofbiz/branches/release15.12/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl?rev=1746155&r1=1746154&r2=1746155&view=diff ============================================================================== --- ofbiz/branches/release15.12/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl (original) +++ ofbiz/branches/release15.12/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl Mon May 30 16:28:23 2016 @@ -156,10 +156,11 @@ under the License. <span style="color: red; font-size: 15px;">[${backOrdered!} ${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()} ${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!} ${uiLabelMap.OrderBackOrdered}]</span> </#if> |
Free forum by Nabble | Edit this page |