You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ja...@apache.org on 2007/10/24 14:53:52 UTC
svn commit: r587883 - in /ofbiz/trunk/applications/product:
webapp/catalog/WEB-INF/actions/store/EditProductStorePaySetup.bsh
webapp/catalog/store/EditProductStorePaySetup.ftl
webapp/catalog/store/ProductStoreForms.xml widget/catalog/StoreScreens.xml
Author: jacopoc
Date: Wed Oct 24 05:53:51 2007
New Revision: 587883
URL: http://svn.apache.org/viewvc?rev=587883&view=rev
Log:
Migrated Store Payment Settings screen to widgets.
Removed:
ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/store/EditProductStorePaySetup.bsh
ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStorePaySetup.ftl
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=587883&r1=587882&r2=587883&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml Wed Oct 24 05:53:51 2007
@@ -807,4 +807,65 @@
</field>
<field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
+
+ <form name="ListProductStorePaymentSettings" type="list">
+ <actions>
+ <entity-and entity-name="ProductStorePaymentSetting">
+ <field-map field-name="productStoreId"/>
+ <order-by field-name="paymentMethodTypeId"/>
+ <order-by field-name="paymentServiceTypeEnumId"/>
+ </entity-and>
+ </actions>
+ <field name="productStoreId"><hidden/></field>
+ <field name="paymentMethodTypeId" title="${uiLabelMap.AccountingPaymentMethodType}">
+ <display-entity entity-name="PaymentMethodType" description="${description}"/>
+ </field>
+ <field name="paymentServiceTypeEnumId" title="${uiLabelMap.ProductServiceType}">
+ <display-entity entity-name="Enumeration" key-field-name="enumId" description="${description}"/>
+ </field>
+ <field name="paymentService" title="${uiLabelMap.ProductServiceName}"><display/></field>
+ <field name="paymentPropertiesPath" title="${uiLabelMap.AccountingPaymentProps}"><display/></field>
+ <field name="applyToAllProducts" title="${uiLabelMap.ApplyToAll}"><display/></field>
+ <field name="editLink" title="${uiLabelMap.CommonEmptyHeader}" use-when="${bsh:security.hasEntityPermission("CATALOG", "_UPDATE", session);}" widget-style="buttontext">
+ <hyperlink target="EditProductStorePaySetup?productStoreId=${productStoreId}&paymentMethodTypeId=${paymentMethodTypeId}&paymentServiceTypeEnumId=${paymentServiceTypeEnumId}" description="${uiLabelMap.CommonEdit}" also-hidden="false"/>
+ </field>
+ <field name="editLink" title="${uiLabelMap.CommonEmptyHeader}" use-when="${bsh:!security.hasEntityPermission("CATALOG", "_UPDATE", session);}">
+ <display/>
+ </field>
+ <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" use-when="${bsh:security.hasEntityPermission("CATALOG", "_DELETE", session);}" widget-style="buttontext">
+ <hyperlink target="storeRemovePaySetting?productStoreId=${productStoreId}&paymentMethodTypeId=${paymentMethodTypeId}&paymentServiceTypeEnumId=${paymentServiceTypeEnumId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
+ </field>
+ <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" use-when="${bsh:!security.hasEntityPermission("CATALOG", "_DELETE", session);}">
+ <display/>
+ </field>
+ </form>
+
+ <form name="EditProductStorePaymentSetting" type="single" target="storeUpdatePaySetting" default-map-name="editSetting">
+ <alt-target use-when="editSetting==null" target="storeCreatePaySetting"/>
+ <field name="productStoreId"><hidden/></field>
+ <field name="paymentMethodTypeId" title="${uiLabelMap.AccountingPaymentMethodType}">
+ <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}">
+ <drop-down allow-empty="false">
+ <entity-options entity-name="Enumeration" key-field-name="enumId" description="${description}">
+ <entity-constraint name="enumTypeId" value="PRDS_PAYSVC"/>
+ <entity-order-by field-name="description"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="paymentService" title="${uiLabelMap.ProductServiceName}"><text/></field>
+ <field name="paymentPropertiesPath" title="${uiLabelMap.AccountingPaymentProps}"><text/></field>
+ <field name="applyToAllProducts" title="${uiLabelMap.ApplyToAll} ${uiLabelMap.ProductProducts}">
+ <drop-down>
+ <option key="Y" description="${uiLabelMap.CommonY}"/>
+ <option key="N" description="${uiLabelMap.CommonN}"/>
+ </drop-down>
+ </field>
+ <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit button-type="button"/></field>
+ </form>
</forms>
Modified: ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml?rev=587883&r1=587882&r2=587883&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml Wed Oct 24 05:53:51 2007
@@ -317,14 +317,19 @@
<set field="productStoreId" from-field="parameters.productStoreId"/>
<entity-one entity-name="ProductStore" value-name="productStore" auto-field-map="true"/>
- <script location="component://product/webapp/catalog/WEB-INF/actions/store/EditProductStorePaySetup.bsh"/>
</actions>
<widgets>
<decorator-screen name="CommonProductStoreDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <platform-specific>
- <html><html-template location="component://product/webapp/catalog/store/EditProductStorePaySetup.ftl"/></html>
- </platform-specific>
+ <include-form name="ListProductStorePaymentSettings" location="component://product/webapp/catalog/store/ProductStoreForms.xml"/>
+ <section>
+ <condition>
+ <if-has-permission permission="CATALOG" action="CREATE"/>
+ </condition>
+ <widgets>
+ <include-form name="EditProductStorePaymentSetting" location="component://product/webapp/catalog/store/ProductStoreForms.xml"/>
+ </widgets>
+ </section>
</decorator-section>
</decorator-screen>
</widgets>