svn commit: r1097428 - in /ofbiz/trunk/applications/prod
Locked
 
|
Author: ashish
Date: Thu Apr 28 12:03:11 2011 New Revision: 1097428 URL: http://svn.apache.org/viewvc?rev=1097428&view=rev Log: Applied patch from jira issue - OFBIZ-4265. Improve readability of Edit Promo Rules page. Added new uiLabel map entries, did logical grouping of screen. Thanks Akash for the contribution. Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.xml ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.xml?rev=1097428&r1=1097427&r2=1097428&view=diff ============================================================================== --- ofbiz/trunk/applications/product/config/ProductUiLabels.xml (original) +++ ofbiz/trunk/applications/product/config/ProductUiLabels.xml Thu Apr 28 12:03:11 2011 @@ -8292,6 +8292,18 @@ <value xml:lang="zh">è´¦æ·</value> <value xml:lang="zh_TW">帳æ¶</value> </property> + <property key="ProductAction"> + <value xml:lang="en">Action</value> + </property> + <property key="ProductActionsCategoriesForAction"> + <value xml:lang="en">Actions Categories For Action</value> + </property> + <property key="ProductActionForRule"> + <value xml:lang="en">Action For Rule</value> + </property> + <property key="ProductActionsProductsForAction"> + <value xml:lang="en">Actions Products For Action</value> + </property> <property key="ProductActionType"> <value xml:lang="de">Aktionstyp</value> <value xml:lang="en">Action Type</value> @@ -8446,6 +8458,12 @@ <value xml:lang="zh">å®é è¿è¾</value> <value xml:lang="zh_TW">實éé輸</value> </property> + <property key="ProductAddActionCategory"> + <value xml:lang="en">Add Action Category</value> + </property> + <property key="ProductAddActionProducts"> + <value xml:lang="en">Add Action Products</value> + </property> <property key="ProductAddAdditionalImages"> <value xml:lang="en">Add Additional Images</value> </property> @@ -8507,6 +8525,12 @@ <value xml:lang="en">Add Communication Event</value> <value xml:lang="it">Aggiungi evento comunicazione</value> </property> + <property key="ProductAddConditionCategory"> + <value xml:lang="en">Add Condition Category</value> + </property> + <property key="ProductAddConditionProducts"> + <value xml:lang="en">Add Condition Products</value> + </property> <property key="ProductAddContentCategory"> <value xml:lang="de">Inhalt zu Kategorie hinzufügen</value> <value xml:lang="en">Add Content to Category</value> @@ -10890,6 +10914,12 @@ <value xml:lang="zh">ç»ä»¶</value> <value xml:lang="zh_TW">å 件</value> </property> + <property key="ProductCondition"> + <value xml:lang="en">Condition</value> + </property> + <property key="ProductConditionValue"> + <value xml:lang="en">Condition Value</value> + </property> <property key="ProductConditions"> <value xml:lang="de">Bedingungen</value> <value xml:lang="en">Conditions</value> @@ -10907,11 +10937,23 @@ <value xml:lang="en">To remove a price rule, you must before remove all conditions and actions OR disable it by entering a Thru Date</value> <value xml:lang="fr">Pour supprimer une règle de prix, vous devez d'abord supprimer toutes les conditions et actions. Vous pouvez aussi la désactiver en entrant une date de fin appropriée</value> </property> + <property key="ProductConditionsCategoriesForCondition"> + <value xml:lang="en">Conditions Categories For Condition</value> + </property> + <property key="ProductConditionsForRule"> + <value xml:lang="en">Conditions For Rule</value> + </property> + <property key="ProductConditionsProductsForCondition"> + <value xml:lang="en">Conditions Products For Condition</value> + </property> <property key="ProductConditionsThenActions"> <value xml:lang="de">Wenn mehrere Bedingungen eingegeben wurde, sind sie logisch UND verknüpft. Daher müssen alle Bedingungen WAHR sein und die Preisregel auszuführen (gleiches für Aktionen)</value> <value xml:lang="en">If multiple conditions are entered they are tested logically as and AND statement. Therefore all Conditions must be TRUE for the price rule to execute (same for actions)</value> <value xml:lang="fr">Si toutes les conditions sont vérifiées, alors les actions sont exécutées (autrement dit ET logique entre conditions, de même pour les actions)</value> </property> + <property key="ProductConditionValue"> + <value xml:lang="en">Condition Value</value> + </property> <property key="ProductConfigItem"> <value xml:lang="de">Konfigurationsposition</value> <value xml:lang="en">Config Item</value> @@ -11306,6 +11348,9 @@ <value xml:lang="en">Country of Origin</value> <value xml:lang="it">Paese di origine</value> </property> + <property key="ProductCreateAction"> + <value xml:lang="en">Create Action</value> + </property> <property key="ProductCreateAProductFeatureCategory"> <value xml:lang="de">Produktmerkmal Kategorie erstellen</value> <value xml:lang="en">Create a Product Feature Category</value> @@ -11318,6 +11363,9 @@ <value xml:lang="zh">å建ä¸ä¸ªäº§åç¹å¾åç±»</value> <value xml:lang="zh_TW">åµå»ºä¸åç¢åç¹æ§åé¡</value> </property> + <property key="ProductCreateCondition"> + <value xml:lang="en">Create Condition</value> + </property> <property key="ProductCreateInformationNewSupplier"> <value xml:lang="de">Informationen zu neuem Lieferant erstellen</value> <value xml:lang="en">Create information for new supplier</value> @@ -16650,6 +16698,12 @@ <value xml:lang="zh">ä¸æ¬¡éè´§</value> <value xml:lang="zh_TW">ä¸æ¬¡é貨</value> </property> + <property key="ProductNoActionCategories"> + <value xml:lang="en">No Action Categories</value> + </property> + <property key="ProductNoActionProducts"> + <value xml:lang="en">No Action Products</value> + </property> <property key="ProductNoCategorySpecified"> <value xml:lang="de">Keine Kategorie ausgewählt</value> <value xml:lang="en">No category specified</value> @@ -16686,6 +16740,12 @@ <value xml:lang="zh">没ææ¾å°ä¸çº§ç»</value> <value xml:lang="zh_TW">æ²ææ¾å°ä¸ç´çµ</value> </property> + <property key="ProductNoConditionCategories"> + <value xml:lang="en">No Condition Categories</value> + </property> + <property key="ProductNoConditionProducts"> + <value xml:lang="en">No Condition Products</value> + </property> <property key="ProductNoDescription"> <value xml:lang="de">Keine Beschreibung</value> <value xml:lang="en">No description</value> @@ -21333,6 +21393,9 @@ <value xml:lang="zh">è§ååç§°ï¼ æè¿°ï¼ å¼å§æ¥æï¼ ç»ææ¥æ</value> <value xml:lang="zh_TW">è¦ååç¨±ï¼ æè¿°ï¼ éå§æ¥æï¼ çµææ¥æ</value> </property> + <property key="ProductRule"> + <value xml:lang="en">Rule</value> + </property> <property key="ProductRules"> <value xml:lang="de">Regeln</value> <value xml:lang="en">Rules</value> Modified: ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl?rev=1097428&r1=1097427&r2=1097428&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl Thu Apr 28 12:03:11 2011 @@ -33,8 +33,11 @@ under the License. <#list productPromoRules as productPromoRule> <#assign productPromoConds = productPromoRule.getRelated("ProductPromoCond")> <#assign productPromoActions = productPromoRule.getRelated("ProductPromoAction")> + <#if productPromoRule_index != 0> + <tr><td colspan="3"><hr /></td></tr> + </#if> <tr valign="middle" class="row-level-one<#if ruleClass == "1"> alternate-row</#if>"> - <td class="label"><b>${(productPromoRule.productPromoRuleId)?if_exists}</b></td> + <td class="label"><b> ${uiLabelMap.ProductRule} ${(productPromoRule.productPromoRuleId)?if_exists}</b></td> <td> <form method="post" action="<@ofbizUrl>updateProductPromoRule</@ofbizUrl>"> <input type="hidden" name="productPromoId" value="${(productPromoRule.productPromoId)?if_exists}" /> @@ -53,8 +56,9 @@ under the License. </#if> </td> </tr> + <tr><td><hr /></td><td colspan="2"></td></tr> <tr valign="top" class="row-level-one<#if ruleClass == "1"> alternate-row</#if>"> - <td align="right" class="label">${uiLabelMap.ProductConditions}</td> + <td align="right" class="label">${uiLabelMap.ProductConditionsForRule} ${(productPromoRule.productPromoRuleId)?if_exists} :</td> <td colspan="2"> <table cellspacing="0" class="basic-table"> <#assign maxCondSeqId = 1> @@ -68,8 +72,9 @@ under the License. <#assign maxCondSeqId = curCondSeqId + 1> </#if> </#if> - <td class="label"><b>${(productPromoCond.productPromoCondSeqId)?if_exists}</b></td> + <td></td> <td> + <b>${uiLabelMap.ProductCondition} ${(productPromoCond.productPromoCondSeqId)?if_exists}</b> <form method="post" action="<@ofbizUrl>updateProductPromoCond</@ofbizUrl>"> <input type="hidden" name="productPromoId" value="${(productPromoCond.productPromoId)?if_exists}"/> <input type="hidden" name="productPromoRuleId" value="${(productPromoCond.productPromoRuleId)?if_exists}"/> @@ -98,6 +103,7 @@ under the License. <option value="${(condOperEnum.enumId)?if_exists}">${(condOperEnum.get("description",locale))?if_exists}</option> </#list> </select> + <label>${uiLabelMap.ProductConditionValue}:</label> <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> /> @@ -122,9 +128,16 @@ under the License. </select> <input type="submit" value="${uiLabelMap.CommonUpdate}" /> </form> + <form name="deleteProductPromoCondition_${productPromoRule_index}_${productPromoCond_index}" method="post" action="<@ofbizUrl>deleteProductPromoCond</@ofbizUrl>"> + <input type="hidden" name="productPromoId" value="${(productPromoCond.productPromoId)?if_exists}" /> + <input type="hidden" name="productPromoRuleId" value="${(productPromoCond.productPromoRuleId)?if_exists}" /> + <input type="hidden" name="productPromoCondSeqId" value="${(productPromoCond.productPromoCondSeqId)?if_exists}" /> + <a href="javascript:document.deleteProductPromoCondition_${productPromoRule_index}_${productPromoCond_index}.submit()" class="buttontext">${uiLabelMap.CommonDelete}</a> + </form> <#-- ======================= Categories ======================== --> - <div class="label">${uiLabelMap.ProductConditions} ${uiLabelMap.ProductCategories}:</div> + <div class="label">${uiLabelMap.ProductConditionsCategoriesForCondition} ${(productPromoCond.productPromoCondSeqId)?if_exists}:</div> <#assign condProductPromoCategories = productPromoCond.getRelated("ProductPromoCategory")> + <#if condProductPromoCategories?has_content> <#list condProductPromoCategories as condProductPromoCategory> <#assign condProductCategory = condProductPromoCategory.getRelatedOneCache("ProductCategory")> <#assign condApplEnumeration = condProductPromoCategory.getRelatedOneCache("ApplEnumeration")> @@ -144,6 +157,9 @@ under the License. </form> </div> </#list> + <#else> + <div>${uiLabelMap.ProductNoConditionCategories}</div> + </#if> <div> <form method="post" action="<@ofbizUrl>createProductPromoCategory</@ofbizUrl>" name="createProductPromoCategoryConditions"> <input type="hidden" name="productPromoId" value="${productPromoId}" /> @@ -161,12 +177,13 @@ under the License. <option value="Y">${uiLabelMap.CommonY}</option> </select> ${uiLabelMap.CommonAnd} ${uiLabelMap.CommonGroup}: <input type="text" size="10" maxlength="20" name="andGroupId" value="_NA_"/>* - <input type="submit" value="${uiLabelMap.CommonAdd}" /> + <input type="submit" value="${uiLabelMap.ProductAddConditionCategory}" /> </form> </div> <#-- ======================= Products ======================== --> - <div class="label">${uiLabelMap.ProductConditions} ${uiLabelMap.ProductProducts}:</div> + <div class="label">${uiLabelMap.ProductConditionsProductsForCondition} ${(productPromoCond.productPromoCondSeqId)?if_exists}:</div> <#assign condProductPromoProducts = productPromoCond.getRelated("ProductPromoProduct")> + <#if condProductPromoProducts?has_content> <#list condProductPromoProducts as condProductPromoProduct> <#assign condProduct = condProductPromoProduct.getRelatedOneCache("Product")?if_exists> <#assign condApplEnumeration = condProductPromoProduct.getRelatedOneCache("ApplEnumeration")> @@ -183,6 +200,9 @@ under the License. </form> </div> </#list> + <#else> + <div>${uiLabelMap.ProductNoConditionProducts}</div> + </#if> <div> <form method="post" action="<@ofbizUrl>createProductPromoProduct</@ofbizUrl>"> <input type="hidden" name="productPromoId" value="${productPromoId}" /> @@ -195,18 +215,11 @@ under the License. <option value="${productPromoApplEnum.enumId}">${productPromoApplEnum.get("description",locale)}</option> </#list> </select> - <input type="submit" value="${uiLabelMap.CommonAdd}" /> + <input type="submit" value="${uiLabelMap.ProductAddConditionProducts}" /> </form> </div> </td> - <td align="center"> - <form name="deleteProductPromoCondition_${productPromoRule_index}_${productPromoCond_index}" method="post" action="<@ofbizUrl>deleteProductPromoCond</@ofbizUrl>"> - <input type="hidden" name="productPromoId" value="${(productPromoCond.productPromoId)?if_exists}" /> - <input type="hidden" name="productPromoRuleId" value="${(productPromoCond.productPromoRuleId)?if_exists}" /> - <input type="hidden" name="productPromoCondSeqId" value="${(productPromoCond.productPromoCondSeqId)?if_exists}" /> - <a href="javascript:document.deleteProductPromoCondition_${productPromoRule_index}_${productPromoCond_index}.submit()" class="buttontext">${uiLabelMap.CommonDelete}</a> - </form> - </td> + <td></td> </tr> <#-- toggle the row color --> <#if condClass == "2"> @@ -231,8 +244,9 @@ under the License. <option value="${(condOperEnum.enumId)?if_exists}">${(condOperEnum.get("description",locale))?if_exists}</option> </#list> </select> + <label>${uiLabelMap.ProductConditionValue}:</label> <input type="text" size="25" name="condValue" /> - ${uiLabelMap.CommonOther}:<input type="text" size="10" name="otherValue" /><br /> + ${uiLabelMap.CommonOther}:<input type="text" size="10" name="otherValue" /> <label>${uiLabelMap.OrderSelectShippingMethod}:</label> <select name = "carrierShipmentMethod"> <option value = "">--${uiLabelMap.OrderSelectShippingMethod}--</option> @@ -241,23 +255,25 @@ under the License. <option value = "${carrierShipmentMethod.partyId?if_exists}@${carrierShipmentMethod.shipmentMethodTypeId?if_exists}">${carrierShipmentMethod.partyId?if_exists} ${shipmentMethodType.get("description")?if_exists}</option> </#list> </select> - <input type="submit" value="${uiLabelMap.CommonCreate}" /> + <input type="submit" value="${uiLabelMap.ProductCreateCondition}" /> </form> </td> </tr> </table> </td> </tr> + <tr><td><hr /></td><td colspan="2"></td></tr> <tr valign="top" class="row-level-one<#if ruleClass == "1"> alternate-row</#if>"> - <td align="right" class="label">${uiLabelMap.ProductActions} :</td> + <td align="right" class="label">${uiLabelMap.ProductActionForRule} ${(productPromoRule.productPromoRuleId)?if_exists} :</td> <td colspan="2"> <table cellspacing="0" class="basic-table"> <#assign actionClass = "2"> <#list productPromoActions as productPromoAction> <tr class="row-level-two<#if actionClass == "1"> alternate-row</#if>"> - <td class="label"><b>${(productPromoAction.productPromoActionSeqId)?if_exists}</b></td> + <td></td> <td> <div> + <b> ${uiLabelMap.ProductAction} ${(productPromoAction.productPromoActionSeqId)?if_exists}</b> <form method="post" action="<@ofbizUrl>updateProductPromoAction</@ofbizUrl>"> <input type="hidden" name="productPromoId" value="${(productPromoAction.productPromoId)?if_exists}" /> <input type="hidden" name="productPromoRuleId" value="${(productPromoAction.productPromoRuleId)?if_exists}" /> @@ -294,10 +310,17 @@ under the License. </select> <input type="submit" value="${uiLabelMap.CommonUpdate}" /> </form> + <form name="deleteProductPromoAction_${productPromoRule_index}_${productPromoAction_index}" method="post" action="<@ofbizUrl>deleteProductPromoAction</@ofbizUrl>"> + <input type="hidden" name="productPromoId" value="${(productPromoAction.productPromoId)?if_exists}" /> + <input type="hidden" name="productPromoRuleId" value="${(productPromoAction.productPromoRuleId)?if_exists}" /> + <input type="hidden" name="productPromoActionSeqId" value="${(productPromoAction.productPromoActionSeqId)?if_exists}" /> + <a href="javascript:document.deleteProductPromoAction_${productPromoRule_index}_${productPromoAction_index}.submit()" class="buttontext">${uiLabelMap.CommonDelete}</a> + </form> </div> <#-- ======================= Categories ======================== --> - <div class="label">${uiLabelMap.ProductActions} ${uiLabelMap.ProductCategories}:</div> + <div class="label">${uiLabelMap.ProductActionsCategoriesForAction} ${(productPromoAction.productPromoActionSeqId)?if_exists}:</div> <#assign actionProductPromoCategories = productPromoAction.getRelated("ProductPromoCategory")> + <#if actionProductPromoCategories?has_content> <#list actionProductPromoCategories as actionProductPromoCategory> <#assign actionProductCategory = actionProductPromoCategory.getRelatedOneCache("ProductCategory")> <#assign actionApplEnumeration = actionProductPromoCategory.getRelatedOneCache("ApplEnumeration")> @@ -317,6 +340,10 @@ under the License. </form> </div> </#list> + <#else> + <div>${uiLabelMap.ProductNoActionCategories}</div> + </#if> + <br /> <div> <form method="post" action="<@ofbizUrl>createProductPromoCategory</@ofbizUrl>" name="createProductPromoCategoryActions"> <input type="hidden" name="productPromoId" value="${productPromoId}" /> @@ -334,12 +361,13 @@ under the License. <option value="Y">${uiLabelMap.CommonY}</option> </select> ${uiLabelMap.CommonAnd} ${uiLabelMap.CommonGroup}: <input type="text" size="10" maxlength="20" name="andGroupId" value="_NA_"/>* - <input type="submit" value="${uiLabelMap.CommonAdd}" /> + <input type="submit" value="${uiLabelMap.ProductAddActionCategory}" /> </form> </div> <#-- ======================= Products ======================== --> - <div class="label">${uiLabelMap.ProductActions} ${uiLabelMap.ProductProducts}:</div> + <div class="label">${uiLabelMap.ProductActionsProductsForAction} ${(productPromoAction.productPromoActionSeqId)?if_exists}:</div> <#assign actionProductPromoProducts = productPromoAction.getRelated("ProductPromoProduct")> + <#if actionProductPromoProducts?has_content> <#list actionProductPromoProducts as actionProductPromoProduct> <#assign actionProduct = actionProductPromoProduct.getRelatedOneCache("Product")?if_exists> <#assign actionApplEnumeration = actionProductPromoProduct.getRelatedOneCache("ApplEnumeration")> @@ -356,6 +384,9 @@ under the License. </form> </div> </#list> + <#else> + <div>${uiLabelMap.ProductNoActionProducts}</div> + </#if> <div> <form method="post" action="<@ofbizUrl>createProductPromoProduct</@ofbizUrl>"> <input type="hidden" name="productPromoId" value="${productPromoId}" /> @@ -368,18 +399,11 @@ under the License. <option value="${productPromoApplEnum.enumId}">${productPromoApplEnum.get("description",locale)}</option> </#list> </select> - <input type="submit" value="${uiLabelMap.CommonAdd}" /> + <input type="submit" value="${uiLabelMap.ProductAddActionProducts}" /> </form> </div> </td> - <td align="center"> - <form name="deleteProductPromoAction_${productPromoRule_index}_${productPromoAction_index}" method="post" action="<@ofbizUrl>deleteProductPromoAction</@ofbizUrl>"> - <input type="hidden" name="productPromoId" value="${(productPromoAction.productPromoId)?if_exists}" /> - <input type="hidden" name="productPromoRuleId" value="${(productPromoAction.productPromoRuleId)?if_exists}" /> - <input type="hidden" name="productPromoActionSeqId" value="${(productPromoAction.productPromoActionSeqId)?if_exists}" /> - <a href="javascript:document.deleteProductPromoAction_${productPromoRule_index}_${productPromoAction_index}.submit()" class="buttontext">${uiLabelMap.CommonDelete}</a> - </form> - </td> + <td></td> </tr> <#-- toggle the row color --> <#if actionClass == "2"> @@ -411,7 +435,7 @@ under the License. <option value="N">${uiLabelMap.CommonN}</option> <option value="Y">${uiLabelMap.CommonY}</option> </select> - <input type="submit" value="${uiLabelMap.CommonCreate}" /> + <input type="submit" value="${uiLabelMap.ProductCreateAction}" /> </form> </div> </td> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |