svn commit: r570599 - in /ofbiz/trunk/applications/product: config/ProductUiLabels.properties webapp/catalog/promo/PromoForms.xml

[jaz-3]

Author: jaz
Date: Tue Aug 28 18:10:47 2007
New Revision: 570599

URL: http://svn.apache.org/viewvc?rev=570599&view=rev
Log:
updated promo code form to allow manually setting the code, instead of forcing an auto-generated code

Modified:
    ofbiz/trunk/applications/product/config/ProductUiLabels.properties
    ofbiz/trunk/applications/product/webapp/catalog/promo/PromoForms.xml

Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.properties?rev=570599&r1=570598&r2=570599&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels.properties (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels.properties Tue Aug 28 18:10:47 2007
@@ -1052,6 +1052,7 @@
 ProductProductType=Product Type
 ProductProductWidth=Product Width
 ProductProducts=Products
+ProductPromoCodeBlank=Leave blank to auto-generate a unique promo code
 ProductPromoCodeEmails=Promo Code Emails
 ProductPromoCodeParties=Promo Code Parties
 ProductPromoNameId=Promo Name [ID]

Modified: ofbiz/trunk/applications/product/webapp/catalog/promo/PromoForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/promo/PromoForms.xml?rev=570599&r1=570598&r2=570599&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/promo/PromoForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/promo/PromoForms.xml Tue Aug 28 18:10:47 2007
@@ -52,9 +52,7 @@
             <display description="[${productPromo.createdByUserLogin}] ${uiLabelMap.CommonOn} ${productPromo.createdDate}" also-hidden="false"/>
         </field>
     </form>
-    <form name="EditProductPromoCode" type="single" target="updateProductPromoCode" title="" default-map-name="productPromoCode"
-        default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
-
+    <form name="EditProductPromoCode" type="single" target="updateProductPromoCode" title="" default-map-name="productPromoCode">        
         <alt-target use-when="productPromoCode==null" target="createProductPromoCode"/>
         <auto-fields-service service-name="updateProductPromoCode" map-name=""/>
 
@@ -68,7 +66,7 @@
         <field use-when="productPromoCode!=null" name="productPromoCodeId" tooltip=""><display/></field>
         <field use-when="productPromoCode==null&amp;&amp;productPromoCodeId!=null" name="productPromoCodeId" tooltip="${uiLabelMap.ProductCouldNotFindProductPromoCode} [${productPromoCodeId}]"><display/></field>
         <!-- this to be taken care of with auto-fields-service as soon as it uses entity field info too -->
-        <field use-when="productPromoCode==null&amp;&amp;productPromoCodeId==null" name="productPromoCodeId"><ignored/></field>
+        <field use-when="productPromoCode==null&amp;&amp;productPromoCodeId==null" name="productPromoCodeId" tooltip="${uiLabelMap.ProductPromoCodeBlank}"><text/></field>
 
         <field name="userEntered" widget-style="selectBox">
             <drop-down allow-empty="false" no-current-selected-key="Y"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down>