svn commit: r1739461 - /ofbiz/branches/release12.04/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl

[mr...@apache.org]

Author: mridulpathak
Date: Sat Apr 16 13:34:42 2016
New Revision: 1739461

URL: http://svn.apache.org/viewvc?rev=1739461&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/release12.04/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl

Modified: ofbiz/branches/release12.04/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl?rev=1739461&r1=1739460&r2=1739461&view=diff
==============================================================================
--- ofbiz/branches/release12.04/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl (original)
+++ ofbiz/branches/release12.04/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl Sat Apr 16 13:34:42 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>