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 2016/04/16 15:32:27 UTC
svn commit: r1739458 -
/ofbiz/branches/release13.07/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl
Author: mridulpathak
Date: Sat Apr 16 13:32:27 2016
New Revision: 1739458
URL: http://svn.apache.org/viewvc?rev=1739458&view=rev
Log:
[OFBIZ-7010] Shipping method is shown on all Promo Conditions even when only a single condition includes Shipping Method. Thanks Swapnil M Mane for reporting the issue and providing the patch. Applying fix from trunk r1739447.
Modified:
ofbiz/branches/release13.07/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl
Modified: ofbiz/branches/release13.07/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl?rev=1739458&r1=1739457&r2=1739458&view=diff
==============================================================================
--- ofbiz/branches/release13.07/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl (original)
+++ ofbiz/branches/release13.07/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl Sat Apr 16 13:32:27 2016
@@ -107,6 +107,9 @@ under the License.
<input type="text" size="25" name="condValue" value="${(productPromoCond.condValue)?if_exists}" />
<#assign otherValue = productPromoCond.otherValue?if_exists>
<label>${uiLabelMap.CommonOther}:</label><input type="text" size="10" name="otherValue" <#if otherValue?has_content && !otherValue.contains("@")> value="${(productPromoCond.otherValue)?if_exists}"</#if> />
+ <#-- Reseting the values of carrierParty and carrierShippingMethod assigned by previous iteration of productPromoConds -->
+ <#assign carrierShippingMethod = ""/>
+ <#assign carrierParty = ""/>
<#if otherValue?has_content && otherValue.contains("@")>
<#assign carrierShippingMethod = productPromoCond.otherValue?if_exists>
</#if>