svn commit: r1848916 - in /ofbiz/ofbiz-framework/trunk/applications/product: config/ProductUiLabels.xml template/promo/EditProductPromoRules.ftl

Author: jleroux
Date: Fri Dec 14 08:54:40 2018
New Revision: 1848916

URL: http://svn.apache.org/viewvc?rev=1848916&view=rev
Log:
Improved: Add a warning on UI about the "X quantity of Product" condition in
Promo Rules
(OFBIZ-6032)

Add a sentence on the UI to explain what the current implementation really does:
it always and only uses the "Is Greater Than" or "Is Greater Than or Equal to"
operators.

With this information in the UI people should not be confused.
You can easily do a "Is Greater Than or Equal to" operator by changing the
"condition value". For instance if you want a break at 10 put 9 in the condition
value, etc.

I believe it's usable as is because the other operators don't make much sense
(if any) with this rule condition.

IMO, Only the "Is Greater Than" and Is Greater Than or Equal to" operators make
sense with "X Quantities of Product".

For more details please see OFBIZ-1560

Modified:
    ofbiz/ofbiz-framework/trunk/applications/product/config/ProductUiLabels.xml
    ofbiz/ofbiz-framework/trunk/applications/product/template/promo/EditProductPromoRules.ftl

Modified: ofbiz/ofbiz-framework/trunk/applications/product/config/ProductUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/config/ProductUiLabels.xml?rev=1848916&r1=1848915&r2=1848916&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/product/config/ProductUiLabels.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/config/ProductUiLabels.xml Fri Dec 14 08:54:40 2018
@@ -15247,6 +15247,10 @@
         <value xml:lang="zh">条件</value>
         <value xml:lang="zh-TW">條件</value>
     </property>
+    <property key="ProductConditionXquantityOfProduct">
+        <value xml:lang="en">[Note: if you use "X quantity of Product" beware that only the "Is Greater Than" and ""Is Greater Than or Equal to" are used.]</value>
+        <value xml:lang="fr">[Note: si vous utilisez "X quantité de produit", veillez à n'utiliser que les termes "est plus grand que" et "est plus grand que ou égal à".]</value>
+    </property>
     <property key="ProductConditions">
         <value xml:lang="de">Bedingungen</value>
         <value xml:lang="en">Conditions</value>

Modified: ofbiz/ofbiz-framework/trunk/applications/product/template/promo/EditProductPromoRules.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/template/promo/EditProductPromoRules.ftl?rev=1848916&r1=1848915&r2=1848916&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/product/template/promo/EditProductPromoRules.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/template/promo/EditProductPromoRules.ftl Fri Dec 14 08:54:40 2018
@@ -74,7 +74,8 @@ under the License.
       </#if>
               <td></td>
               <td>
-                <b>${uiLabelMap.ProductCondition} ${(productPromoCond.productPromoCondSeqId)!}</b>
+                <b>${uiLabelMap.ProductCondition} ${(productPromoCond.productPromoCondSeqId)!}.</b>
+                &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;${uiLabelMap.ProductConditionXquantityOfProduct}
                 <form method="post" action="<@ofbizUrl>updateProductPromoCond</@ofbizUrl>">
                   <input type="hidden" name="productPromoId" value="${(productPromoCond.productPromoId)!}"/>
                   <input type="hidden" name="productPromoRuleId" value="${(productPromoCond.productPromoRuleId)!}"/>