Author: jleroux Date: Wed Jan 21 08:07:27 2015 New Revision: 1653457 URL: http://svn.apache.org/r1653457 Log: "Applied fix from trunk for revision: 1653456 " ------------------------------------------------------------------------ r1653456 | jleroux | 2015-01-21 09:04:10 +0100 (mer. 21 janv. 2015) | 3 lignes
Fixes "Gift card reload service not working OOTB" https://issues.apache.org/jira/browse/OFBIZ-5914 jleroux: this issue was only in ecommerce, order manager worked once you followed the FAQ about fin account and GC. It simply missed a test on product.requireAmount ------------------------------------------------------------------------ Modified: ofbiz/branches/release14.12/ (props changed) ofbiz/branches/release14.12/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl Propchange: ofbiz/branches/release14.12/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Jan 21 08:07:27 2015 @@ -8,4 +8,4 @@ /ofbiz/branches/json-integration-refactoring:1634077-1635900 /ofbiz/branches/multitenant20100310:921280-927264 /ofbiz/branches/release13.07:1547657 -/ofbiz/trunk:1649393,1649742,1650240,1650583,1650642,1650678,1650882,1650887,1650938,1651593,1652361,1652706,1652725,1652731,1652739 +/ofbiz/trunk:1649393,1649742,1650240,1650583,1650642,1650678,1650882,1650887,1650938,1651593,1652361,1652706,1652725,1652731,1652739,1653456 Modified: ofbiz/branches/release14.12/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl?rev=1653457&r1=1653456&r2=1653457&view=diff ============================================================================== --- ofbiz/branches/release14.12/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl (original) +++ ofbiz/branches/release14.12/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl Wed Jan 21 08:07:27 2015 @@ -621,7 +621,7 @@ $(function(){ <strong><div id="variant_price_display"> </div></strong> </div> </#if> - <#if (availableInventory??) && (availableInventory <= 0)> + <#if (availableInventory??) && (availableInventory <= 0) && product.requireAmount?default("N") == "N"> <#assign inStock = false /> </#if> </#if>
