svn commit: r1739455 - /ofbiz/branches/release14.12/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl

[Mridul Pathak-5]

Author: mridulpathak
Date: Sat Apr 16 12:46:28 2016
New Revision: 1739455

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

Modified: ofbiz/branches/release14.12/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl?rev=1739455&r1=1739454&r2=1739455&view=diff
==============================================================================
--- ofbiz/branches/release14.12/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl (original)
+++ ofbiz/branches/release14.12/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl Sat Apr 16 12:46:28 2016
@@ -107,6 +107,10 @@ under the License.
                   <input type="text" size="25" name="condValue" value="${(productPromoCond.condValue)!}" />
       <#assign otherValue = productPromoCond.otherValue!>
                   <label>${uiLabelMap.CommonOther}:</label><input type="text" size="10" name="otherValue" <#if otherValue?has_content && !otherValue.contains("@")> value="${(productPromoCond.otherValue)!}"</#if> />
+
+      <#-- Reseting the values of carrierParty and carrierShippingMethod assigned in previous iteration of productPromoConds -->
+      <#assign carrierShippingMethod = ""/>
+      <#assign carrierParty = ""/>
       <#if otherValue?has_content && otherValue.contains("@")>
         <#assign carrierShippingMethod = productPromoCond.otherValue!>
       </#if>