svn commit: r639239 - in /ofbiz/trunk/applications/product: webapp/catalog/store/ProductStoreForms.xml widget/catalog/StoreScreens.xml

[bibryam]

Author: bibryam
Date: Thu Mar 20 03:56:21 2008
New Revision: 639239

URL: http://svn.apache.org/viewvc?rev=639239&view=rev
Log:
Applied (a slightly different) patch from Rashko Rejmer, OFBIZ-1710: "Adding payment settings to store not possible".

Modified:
    ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml
    ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml

Modified: ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml?rev=639239&r1=639238&r2=639239&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml Thu Mar 20 03:56:21 2008
@@ -851,17 +851,23 @@
         </field>
     </form>
 
-    <form name="EditProductStorePaymentSetting" type="single" target="storeUpdatePaySetting" default-map-name="editSetting"
+    <form name="EditProductStorePaymentSetting" type="single" target="storeUpdatePaySetting" default-map-name="productStorePaymentSetting"
         header-row-style="header-row" default-table-style="basic-table">
-        <alt-target use-when="editSetting==null" target="storeCreatePaySetting"/>
+        <alt-target use-when="productStorePaymentSetting==null" target="storeCreatePaySetting"/>
         <field name="productStoreId"><hidden/></field>
-        <field name="paymentMethodTypeId" title="${uiLabelMap.AccountingPaymentMethodType}">
+        <field name="paymentMethodTypeId" title="${uiLabelMap.AccountingPaymentMethodType}" use-when="productStorePaymentSetting!=null">
+            <display-entity entity-name="PaymentMethodType" also-hidden="true" description="${description}" key-field-name="paymentMethodTypeId"/>
+        </field>        
+        <field name="paymentMethodTypeId" title="${uiLabelMap.AccountingPaymentMethodType}" use-when="productStorePaymentSetting==null">
             <drop-down allow-empty="false">
                 <entity-options entity-name="PaymentMethodType" description="${description}">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
         </field>
+        <field name="paymentServiceTypeEnumId" title="${uiLabelMap.ProductServiceType}" use-when="productStorePaymentSetting!=null">
+            <display-entity entity-name="Enumeration" also-hidden="true" description="${description}" key-field-name="enumId"/>
+        </field>        
         <field name="paymentServiceTypeEnumId" title="${uiLabelMap.ProductServiceType}">
             <drop-down allow-empty="false">
                 <entity-options entity-name="Enumeration" key-field-name="enumId" description="${description}">

Modified: ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml?rev=639239&r1=639238&r2=639239&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml Thu Mar 20 03:56:21 2008
@@ -456,6 +456,9 @@
 
                 <set field="productStoreId" from-field="parameters.productStoreId"/>
                 <entity-one entity-name="ProductStore" value-name="productStore" auto-field-map="true"/>
+                <set field="paymentMethodTypeId" from-field="parameters.paymentMethodTypeId"/>
+                <set field="paymentServiceTypeEnumId" from-field="parameters.paymentServiceTypeEnumId"/>                
+                <entity-one entity-name="ProductStorePaymentSetting" value-name="productStorePaymentSetting" auto-field-map="true"/>              
 
             </actions>
             <widgets>