You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by mr...@apache.org on 2009/04/09 21:45:33 UTC
svn commit: r763782 [2/2] - in /ofbiz/trunk: applications/accounting/
applications/accounting/config/ applications/accounting/data/
applications/accounting/entitydef/
applications/accounting/script/org/ofbiz/accounting/payment/
applications/accounting/...
Added: ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigurationsForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigurationsForms.xml?rev=763782&view=auto
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigurationsForms.xml (added)
+++ ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigurationsForms.xml Thu Apr 9 19:45:31 2009
@@ -0,0 +1,187 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
+
+ <!-- form whose input filters the ListFindGatewayConfigurations -->
+ <form name="FindGatewayConfigurations" type="single" target="FindGatewayConfigurations" header-row-style="header-row" default-table-style="basic-table">
+ <field name="paymentGatewayConfigId" title="${uiLabelMap.AccountingPaymentGatewayConfigId}"><text-find default-option="contains" ignore-case="true"/></field>
+ <field name="description" title="${uiLabelMap.AccountingPaymentGatewayConfigDescription}"><text-find default-option="contains" ignore-case="true"/></field>
+ <field name="paymentGatewayConfigTypeId" title="${uiLabelMap.AccountingPaymentGatewayConfigTypeId}">
+ <drop-down allow-empty="true">
+ <entity-options entity-name="PaymentGatewayConfigType" description="${description}" key-field-name="paymentGatewayConfigTypeId">
+ <entity-order-by field-name="description"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="performSearch"><hidden value="Y"/></field>
+ <field name="noConditionFind"><hidden value="Y"/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit">
+ <submit button-type="button"/>
+ </field>
+ </form>
+
+ <form name="ListGatewayConfigurations" type="list" list-name="listIt" odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+ <actions>
+ <service service-name="performFind" result-map="result" result-map-list="listIt">
+ <field-map field-name="inputFields" from-field="parameters"/>
+ <field-map field-name="entityName" value="PaymentGatewayConfig"/>
+ <field-map field-name="orderBy" value="description DESC"/>
+ </service>
+ </actions>
+ <auto-fields-entity entity-name="PaymentGatewayConfig" default-field-type="display"/>
+ <field name="paymentGatewayConfigId" widget-style="buttontext" title="${uiLabelMap.AccountingPaymentGatewayConfigId}">
+ <hyperlink description="${paymentGatewayConfigId}" target="ViewGatewayConfiguration?paymentGatewayConfigId=${paymentGatewayConfigId}"/>
+ </field>
+ <field name="description" title="${uiLabelMap.AccountingPaymentGatewayConfigDescription}"/>
+ <field name="paymentGatewayConfigTypeId" title="${uiLabelMap.AccountingPaymentGatewayConfigTypeId}">
+ <display-entity entity-name="PaymentGatewayConfigType" key-field-name="paymentGatewayConfigTypeId" description="${description}"/>
+ </field>
+ </form>
+
+ <form name="ViewGatewayConfiguration" type="single" target="UpdateGatewayConfiguration" default-map-name="paymentGatewayConfig" header-row-style="header-row" default-table-style="basic-table">
+ <field name="paymentGatewayConfigId"><hidden/></field>
+ <field name="description" title="${uiLabelMap.AccountingPaymentGatewayConfigDescription}"><text size="60" maxlength="60"/></field>
+ <field name="paymentGatewayConfigTypeId" title="${uiLabelMap.AccountingPaymentGatewayConfigTypeId}">
+ <display-entity entity-name="PaymentGatewayConfigType" key-field-name="paymentGatewayConfigTypeId" description="${description}"/>
+ </field>
+ <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit">
+ <submit button-type="button"/>
+ </field>
+ </form>
+
+ <form name="ViewGatewayConfigurationPayflowPro" type="single" target="UpdateGatewayConfigurationPayflowPro" default-map-name="paymentGatewayPayflowPro" header-row-style="header-row" default-table-style="basic-table">
+ <auto-fields-entity entity-name="PaymentGatewayPayflowPro" default-field-type="edit"/>
+ <field name="certsPath"><text size="80" maxlength="80"/></field>
+ <field name="paymentGatewayConfigId"><hidden/></field>
+ <field name="checkAvs">
+ <drop-down>
+ <option key="Y" description="${uiLabelMap.CommonYes}"/>
+ <option key="N" description="${uiLabelMap.CommonNo}"/>
+ </drop-down>
+ </field>
+ <field name="checkCvv2">
+ <drop-down>
+ <option key="Y" description="${uiLabelMap.CommonYes}"/>
+ <option key="N" description="${uiLabelMap.CommonNo}"/>
+ </drop-down>
+ </field>
+ <field name="preAuth">
+ <drop-down>
+ <option key="Y" description="${uiLabelMap.CommonYes}"/>
+ <option key="N" description="${uiLabelMap.CommonNo}"/>
+ </drop-down>
+ </field>
+ <field name="enableTransmit">
+ <drop-down>
+ <option key="true" description="${uiLabelMap.CommonTrue}"/>
+ <option key="false" description="${uiLabelMap.CommonFalse}"/>
+ </drop-down>
+ </field>
+ <field name="loggingLevel">
+ <drop-down>
+ <option key="6" description="${uiLabelMap.AccountingPayflowProLoggingOff}"/>
+ <option key="5" description="${uiLabelMap.AccountingPayflowProLoggingSeverityFatal}"/>
+ <option key="4" description="${uiLabelMap.AccountingPayflowProLoggingSeverityError}"/>
+ <option key="3" description="${uiLabelMap.AccountingPayflowProLoggingSeverityWarn}"/>
+ <option key="2" description="${uiLabelMap.AccountingPayflowProLoggingSeverityInfo}"/>
+ <option key="1" description="${uiLabelMap.AccountingPayflowProLoggingSeverityDebug}"/>
+ </drop-down>
+ </field>
+ <field name="maxLogFileSize"><text size="20" maxlength="20"/></field>
+ <field name="stackTraceOn">
+ <drop-down>
+ <option key="Y" description="${uiLabelMap.CommonYes}"/>
+ <option key="N" description="${uiLabelMap.CommonNo}"/>
+ </drop-down>
+ </field>
+ <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit">
+ <submit button-type="button"/>
+ </field>
+ </form>
+
+ <form name="ViewGatewayConfigurationClearCommerce" type="single" target="UpdateGatewayConfigurationClearCommerce" default-map-name="paymentGatewayClearCommerce" header-row-style="header-row" default-table-style="basic-table">
+ <auto-fields-entity entity-name="PaymentGatewayClearCommerce" default-field-type="edit"/>
+ <field name="paymentGatewayConfigId"><hidden/></field>
+ <field name="enableCVM">
+ <drop-down>
+ <option key="Y" description="${uiLabelMap.CommonYes}"/>
+ <option key="N" description="${uiLabelMap.CommonNo}"/>
+ </drop-down>
+ </field>
+ <field name="processMode">
+ <drop-down>
+ <option key="Y" description="${uiLabelMap.AccountingPaymentGatewayApprove}"/>
+ <option key="N" description="${uiLabelMap.AccountingPaymentGatewayDecline}"/>
+ <option key="R" description="${uiLabelMap.AccountingPaymentGatewayRandom}"/>
+ <option key="P" description="${uiLabelMap.AccountingPaymentGatewayProduction}"/>
+ </drop-down>
+ </field>
+ <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit">
+ <submit button-type="button"/>
+ </field>
+ </form>
+
+ <form name="FindGatewayConfigurationTypes" type="single" target="FindGatewayConfigurationTypes" header-row-style="header-row" default-table-style="basic-table">
+ <field name="paymentGatewayConfigTypeId" title="${uiLabelMap.AccountingPaymentGatewayConfigTypeId}"><text-find default-option="contains" ignore-case="true"/></field>
+ <field name="description" title="${uiLabelMap.AccountingPaymentGatewayConfigDescription}"><text-find default-option="contains" ignore-case="true"/></field>
+ <field name="performSearch"><hidden value="Y"/></field>
+ <field name="noConditionFind"><hidden value="Y"/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit">
+ <submit button-type="button"/>
+ </field>
+ </form>
+
+ <form name="ListGatewayConfigurationTypes" type="list" list-name="listIt" odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+ <actions>
+ <service service-name="performFind" result-map="result" result-map-list="listIt">
+ <field-map field-name="inputFields" from-field="parameters"/>
+ <field-map field-name="entityName" value="PaymentGatewayConfigType"/>
+ <field-map field-name="orderBy" value="description DESC"/>
+ </service>
+ </actions>
+ <auto-fields-entity entity-name="PaymentGatewayConfigType" default-field-type="display"/>
+ <field name="paymentGatewayConfigTypeId" widget-style="buttontext" title="${uiLabelMap.AccountingPaymentGatewayConfigTypeId}">
+ <hyperlink description="${paymentGatewayConfigTypeId}" target="ViewGatewayConfigurationType?paymentGatewayConfigTypeId=${paymentGatewayConfigTypeId}"/>
+ </field>
+ <field name="description" title="${uiLabelMap.AccountingPaymentGatewayConfigTypeDescription}"/>
+ </form>
+
+ <form name="ViewGatewayConfigurationType" type="single" target="UpdateGatewayConfigurationType" default-map-name="paymentGatewayConfigType" header-row-style="header-row" default-table-style="basic-table">
+ <field name="paymentGatewayConfigTypeId"><hidden/></field>
+ <field name="description" title="${uiLabelMap.AccountingPaymentGatewayConfigTypeDescription}"><text size="60" maxlength="60"/></field>
+ <field name="parentTypeId">
+ <drop-down allow-empty="true">
+ <entity-options entity-name="PaymentGatewayConfigType" description="${description}" key-field-name="paymentGatewayConfigTypeId">
+ <entity-constraint name="paymentGatewayConfigTypeId" operator="not-equals" env-name="paymentGatewayConfigTypeId"/>
+ <entity-order-by field-name="description"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="hasTable">
+ <drop-down>
+ <option key="Y" description="${uiLabelMap.CommonYes}"/>
+ <option key="N" description="${uiLabelMap.CommonNo}"/>
+ </drop-down>
+ </field>
+ <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit">
+ <submit button-type="button"/>
+ </field>
+ </form>
+</forms>
\ No newline at end of file
Propchange: ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigurationsForms.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigurationsForms.xml
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigurationsForms.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigurationsScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigurationsScreens.xml?rev=763782&view=auto
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigurationsScreens.xml (added)
+++ ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigurationsScreens.xml Thu Apr 9 19:45:31 2009
@@ -0,0 +1,220 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd">
+
+ <screen name="GenericPaymentGatewayDecorator">
+ <section>
+ <actions>
+ <set field="headerItem" value="paymentGatewayConfigurations"/>
+ </actions>
+ <widgets>
+ <!-- main defines the regions of the HTML page -->
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+ <!-- body is the primary display for this page and is called recursively -->
+ <decorator-section name="body">
+ <section>
+ <widgets>
+ <include-menu name="PaymentGatewayTabBar" location="component://accounting/widget/Menus.xml"/>
+ <container>
+ <label style="h1">${uiLabelMap[labelTitleProperty]}</label>
+ </container>
+
+ <!-- Now call the SimpleScreen form -->
+ <decorator-section-include name="body"/>
+ </widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
+ <screen name="FindGatewayConfigurations">
+ <section>
+ <actions>
+ <set field="titleProperty" value="PageTitleFindPaymentGatewayConfigurations"/>
+ <set field="tabButtonItem" value="paymentGatewayConfigurationsTab"/>
+ <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/>
+ <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="50"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="GenericPaymentGatewayDecorator">
+ <decorator-section name="body">
+ <section>
+ <widgets>
+ <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml">
+ <decorator-section name="search-options">
+ <include-form name="FindGatewayConfigurations" location="component://accounting/widget/PaymentGatewayConfigurationsForms.xml"/>
+ </decorator-section>
+ <decorator-section name="search-results">
+ <include-form name="ListGatewayConfigurations" location="component://accounting/widget/PaymentGatewayConfigurationsForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
+ <screen name="ViewGatewayConfiguration">
+ <section>
+ <actions>
+ <set field="titleProperty" value="PageTitleUpdatePaymentGatewayConfiguration"/>
+ <set field="tabButtonItem" value="paymentGatewayConfigurationsTab"/>
+
+ <set field="paymentGatewayConfigId" from-field="parameters.paymentGatewayConfigId"/>
+ <entity-one entity-name="PaymentGatewayConfig" value-field="paymentGatewayConfig"/>
+ <entity-one entity-name="PaymentGatewayPayflowPro" value-field="paymentGatewayPayflowPro">
+ <field-map field-name="paymentGatewayConfigId" from-field="parameters.paymentGatewayConfigId"/>
+ </entity-one>
+ <entity-one entity-name="PaymentGatewayClearCommerce" value-field="paymentGatewayClearCommerce">
+ <field-map field-name="paymentGatewayConfigId" from-field="parameters.paymentGatewayConfigId"/>
+ </entity-one>
+ </actions>
+ <widgets>
+ <decorator-screen name="GenericPaymentGatewayDecorator">
+ <decorator-section name="body">
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="h3">
+ <label text="${uiLabelMap.PageTitleUpdatePaymentGatewayConfiguration}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="ViewGatewayConfiguration" location="component://accounting/widget/PaymentGatewayConfigurationsForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
+ <section>
+ <condition>
+ <not><if-empty field="paymentGatewayPayflowPro"/></not>
+ </condition>
+ <widgets>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="h3">
+ <label text="${uiLabelMap.PageTitleUpdatePaymentGatewayConfigurationPayflowPro}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="ViewGatewayConfigurationPayflowPro" location="component://accounting/widget/PaymentGatewayConfigurationsForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
+ </widgets>
+ </section>
+ <section>
+ <condition>
+ <not><if-empty field="paymentGatewayClearCommerce"/></not>
+ </condition>
+ <widgets>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="h3">
+ <label text="${uiLabelMap.PageTitleUpdatePaymentGatewayConfigurationClearCommerce}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="ViewGatewayConfigurationClearCommerce" location="component://accounting/widget/PaymentGatewayConfigurationsForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
+ </widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
+ <screen name="FindGatewayConfigurationTypes">
+ <section>
+ <actions>
+ <set field="titleProperty" value="PageTitleFindPaymentGatewayConfigurationTypes"/>
+ <set field="tabButtonItem" value="paymentGatewayConfigurationTypesTab"/>
+ <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/>
+ <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="50"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="GenericPaymentGatewayDecorator">
+ <decorator-section name="body">
+ <section>
+ <widgets>
+ <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml">
+ <decorator-section name="search-options">
+ <include-form name="FindGatewayConfigurationTypes" location="component://accounting/widget/PaymentGatewayConfigurationsForms.xml"/>
+ </decorator-section>
+ <decorator-section name="search-results">
+ <include-form name="ListGatewayConfigurationTypes" location="component://accounting/widget/PaymentGatewayConfigurationsForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
+ <screen name="ViewGatewayConfigurationType">
+ <section>
+ <actions>
+ <set field="titleProperty" value="PageTitleUpdatePaymentGatewayConfigurationType"/>
+ <set field="tabButtonItem" value="paymentGatewayConfigurationTypesTab"/>
+
+ <set field="paymentGatewayConfigTypeId" from-field="parameters.paymentGatewayConfigTypeId"/>
+ <entity-one entity-name="PaymentGatewayConfigType" value-field="paymentGatewayConfigType"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="GenericPaymentGatewayDecorator">
+ <decorator-section name="body">
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="h3">
+ <label text="${uiLabelMap.PageTitleUpdatePaymentGatewayConfigurationType}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="ViewGatewayConfigurationType" location="component://accounting/widget/PaymentGatewayConfigurationsForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+</screens>
\ No newline at end of file
Propchange: ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigurationsScreens.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigurationsScreens.xml
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigurationsScreens.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.xml?rev=763782&r1=763781&r2=763782&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels.xml (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels.xml Thu Apr 9 19:45:31 2009
@@ -8785,6 +8785,10 @@
<value xml:lang="th">ลุà¸à¸à¹à¸²</value>
<value xml:lang="zh">客æ·</value>
</property>
+ <property key="ProductCustomMethod">
+ <value xml:lang="en">Custom Method</value>
+ <value xml:lang="it">Metodo personalizzato pagamento</value>
+ </property>
<property key="ProductCustomerRating">
<value xml:lang="de">Kundenbewertung</value>
<value xml:lang="en">Customer Rating</value>
Modified: ofbiz/trunk/applications/product/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/entitydef/entitymodel.xml?rev=763782&r1=763781&r2=763782&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/product/entitydef/entitymodel.xml Thu Apr 9 19:45:31 2009
@@ -3903,6 +3903,8 @@
<field name="paymentMethodTypeId" type="id-ne"></field>
<field name="paymentServiceTypeEnumId" type="id-ne"></field>
<field name="paymentService" type="value"></field>
+ <field name="paymentCustomMethodId" type="id"></field>
+ <field name="paymentGatewayConfigId" type="id"></field>
<field name="paymentPropertiesPath" type="value"></field>
<field name="applyToAllProducts" type="indicator"></field>
<prim-key field="productStoreId"/>
@@ -3917,6 +3919,12 @@
<relation type="one" fk-name="PRDS_PS_ENUM" rel-entity-name="Enumeration">
<key-map field-name="paymentServiceTypeEnumId" rel-field-name="enumId"/>
</relation>
+ <relation type="one" fk-name="PRDS_PS_PGC" rel-entity-name="PaymentGatewayConfig">
+ <key-map field-name="paymentGatewayConfigId"/>
+ </relation>
+ <relation type="one" fk-name="PRDS_PS_CUS_MET" rel-entity-name="CustomMethod">
+ <key-map field-name="paymentCustomMethodId" rel-field-name="customMethodId"/>
+ </relation>
</entity>
<view-entity entity-name="ProductStorePromoAndAppl"
package-name="org.ofbiz.product.store"
Modified: ofbiz/trunk/applications/product/servicedef/services_store.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/servicedef/services_store.xml?rev=763782&r1=763781&r2=763782&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/servicedef/services_store.xml (original)
+++ ofbiz/trunk/applications/product/servicedef/services_store.xml Thu Apr 9 19:45:31 2009
@@ -122,6 +122,8 @@
location="component://product/script/org/ofbiz/product/store/ProductStoreServices.xml" invoke="createProductStorePaymentSetting" auth="true">
<description>Create ProductStorePaymentSetting</description>
<auto-attributes include="all" mode="IN" optional="false"/>
+ <override name="paymentCustomMethodId" optional="true"/>
+ <override name="paymentGatewayConfigId" optional="true"/>
<override name="paymentPropertiesPath" optional="true"/>
<override name="paymentService" optional="true"/>
</service>
@@ -129,6 +131,8 @@
location="component://product/script/org/ofbiz/product/store/ProductStoreServices.xml" invoke="updateProductStorePaymentSetting" auth="true">
<description>Update ProductStorePaymentSetting</description>
<auto-attributes include="all" mode="IN" optional="false"/>
+ <override name="paymentCustomMethodId" optional="true"/>
+ <override name="paymentGatewayConfigId" optional="true"/>
<override name="paymentPropertiesPath" optional="true"/>
<override name="paymentService" optional="true"/>
</service>
Added: ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/store/EditProductStorePaySetup.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/store/EditProductStorePaySetup.groovy?rev=763782&view=auto
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/store/EditProductStorePaySetup.groovy (added)
+++ ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/store/EditProductStorePaySetup.groovy Thu Apr 9 19:45:31 2009
@@ -0,0 +1,87 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.ofbiz.entity.condition.*;
+import org.ofbiz.entity.util.*;
+import javolution.util.FastList;
+
+paymentMethodTypeId = request.getParameter("paymentMethodTypeId");
+paymentServiceTypeEnumId = request.getParameter("paymentServiceTypeEnumId");
+customMethodsCond = null;
+
+if (paymentMethodTypeId && paymentServiceTypeEnumId) {
+
+ if (paymentMethodTypeId == "CREDIT_CARD" && paymentServiceTypeEnumId == "PRDS_PAY_AUTH" ) {
+ customMethodsCond = EntityCondition.makeCondition("customMethodTypeId", EntityOperator.EQUALS, "CC_AUTH");
+ } else if (paymentMethodTypeId == "CREDIT_CARD" && paymentServiceTypeEnumId == "PRDS_PAY_CAPTURE" ) {
+ customMethodsCond = EntityCondition.makeCondition("customMethodTypeId", EntityOperator.EQUALS, "CC_CAPTURE");
+ } else if (paymentMethodTypeId == "CREDIT_CARD" && paymentServiceTypeEnumId == "PRDS_PAY_REAUTH" ) {
+ customMethodsCond = EntityCondition.makeCondition("customMethodTypeId", EntityOperator.EQUALS, "CC_AUTH");
+ } else if (paymentMethodTypeId == "CREDIT_CARD" && paymentServiceTypeEnumId == "PRDS_PAY_REFUND" ) {
+ customMethodsCond = EntityCondition.makeCondition("customMethodTypeId", EntityOperator.EQUALS, "CC_REFUND");
+ } else if (paymentMethodTypeId == "CREDIT_CARD" && paymentServiceTypeEnumId == "PRDS_PAY_RELEASE" ) {
+ customMethodsCond = EntityCondition.makeCondition("customMethodTypeId", EntityOperator.EQUALS, "CC_RELEASE");
+ } else if (paymentMethodTypeId == "EFT_ACCOUNT" && paymentServiceTypeEnumId == "PRDS_PAY_AUTH" ) {
+ customMethodsCond = EntityCondition.makeCondition("customMethodTypeId", EntityOperator.EQUALS, "EFT_AUTH");
+ } else if (paymentMethodTypeId == "EFT_ACCOUNT" && paymentServiceTypeEnumId == "PRDS_PAY_RELEASE" ) {
+ customMethodsCond = EntityCondition.makeCondition("customMethodTypeId", EntityOperator.EQUALS, "EFT_RELEASE");
+ } else if (paymentMethodTypeId == "FIN_ACCOUNT" && paymentServiceTypeEnumId == "PRDS_PAY_AUTH" ) {
+ customMethodsCond = EntityCondition.makeCondition("customMethodTypeId", EntityOperator.EQUALS, "FIN_AUTH");
+ } else if (paymentMethodTypeId == "FIN_ACCOUNT" && paymentServiceTypeEnumId == "PRDS_PAY_CAPTURE" ) {
+ customMethodsCond = EntityCondition.makeCondition("customMethodTypeId", EntityOperator.EQUALS, "FIN_CAPTURE");
+ } else if (paymentMethodTypeId == "FIN_ACCOUNT" && paymentServiceTypeEnumId == "PRDS_PAY_REFUND" ) {
+ customMethodsCond = EntityCondition.makeCondition("customMethodTypeId", EntityOperator.EQUALS, "FIN_REFUND");
+ } else if (paymentMethodTypeId == "FIN_ACCOUNT" && paymentServiceTypeEnumId == "PRDS_PAY_RELEASE" ) {
+ customMethodsCond = EntityCondition.makeCondition("customMethodTypeId", EntityOperator.EQUALS, "FIN_RELEASE");
+ } else if (paymentMethodTypeId == "GIFT_CARD" && paymentServiceTypeEnumId == "PRDS_PAY_AUTH" ) {
+ customMethodsCond = EntityCondition.makeCondition("customMethodTypeId", EntityOperator.EQUALS, "GIFT_AUTH");
+ } else if (paymentMethodTypeId == "GIFT_CARD" && paymentServiceTypeEnumId == "PRDS_PAY_CAPTURE" ) {
+ customMethodsCond = EntityCondition.makeCondition("customMethodTypeId", EntityOperator.EQUALS, "GIFT_CAPTURE");
+ } else if (paymentMethodTypeId == "GIFT_CARD" && paymentServiceTypeEnumId == "PRDS_PAY_REFUND" ) {
+ customMethodsCond = EntityCondition.makeCondition("customMethodTypeId", EntityOperator.EQUALS, "GIFT_REFUND");
+ } else if (paymentMethodTypeId == "GIFT_CARD" && paymentServiceTypeEnumId == "PRDS_PAY_RELEASE" ) {
+ customMethodsCond = EntityCondition.makeCondition("customMethodTypeId", EntityOperator.EQUALS, "GIFT_RELEASE");
+ }
+}
+
+if (!paymentMethodTypeId || !paymentServiceTypeEnumId) {
+ customMethods = FastList.newInstance();
+ customMethods.add(EntityCondition.makeCondition("customMethodTypeId", EntityOperator.EQUALS, "CC_AUTH"));
+ customMethods.add(EntityCondition.makeCondition("customMethodTypeId", EntityOperator.EQUALS, "CC_CAPTURE"));
+ customMethods.add(EntityCondition.makeCondition("customMethodTypeId", EntityOperator.EQUALS, "CC_REAUTH"));
+ customMethods.add(EntityCondition.makeCondition("customMethodTypeId", EntityOperator.EQUALS, "CC_REFUND"));
+ customMethods.add(EntityCondition.makeCondition("customMethodTypeId", EntityOperator.EQUALS, "CC_RELEASE"));
+ customMethods.add(EntityCondition.makeCondition("customMethodTypeId", EntityOperator.EQUALS, "CC_CREDIT"));
+ customMethods.add(EntityCondition.makeCondition("customMethodTypeId", EntityOperator.EQUALS, "EFT_AUTH"));
+ customMethods.add(EntityCondition.makeCondition("customMethodTypeId", EntityOperator.EQUALS, "EFT_RELEASE"));
+ customMethods.add(EntityCondition.makeCondition("customMethodTypeId", EntityOperator.EQUALS, "FIN_AUTH"));
+ customMethods.add(EntityCondition.makeCondition("customMethodTypeId", EntityOperator.EQUALS, "FIN_CAPTURE"));
+ customMethods.add(EntityCondition.makeCondition("customMethodTypeId", EntityOperator.EQUALS, "FIN_REFUND"));
+ customMethods.add(EntityCondition.makeCondition("customMethodTypeId", EntityOperator.EQUALS, "FIN_RELEASE"));
+ customMethods.add(EntityCondition.makeCondition("customMethodTypeId", EntityOperator.EQUALS, "GIFT_AUTH"));
+ customMethods.add(EntityCondition.makeCondition("customMethodTypeId", EntityOperator.EQUALS, "GIFT_CAPTURE"));
+ customMethods.add(EntityCondition.makeCondition("customMethodTypeId", EntityOperator.EQUALS, "GIFT_REFUND"));
+ customMethods.add(EntityCondition.makeCondition("customMethodTypeId", EntityOperator.EQUALS, "GIFT_RELEASE"));
+ customMethodsCond = EntityCondition.makeCondition(customMethods, EntityOperator.OR);
+}
+if (paymentServiceTypeEnumId == "PRDS_PAY_EXTERNAL") {
+ context.paymentCustomMethods = null;
+} else {
+ context.paymentCustomMethods = delegator.findList("CustomMethod", customMethodsCond, null, ["description"], null, false);
+}
\ No newline at end of file
Propchange: ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/store/EditProductStorePaySetup.groovy
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/store/EditProductStorePaySetup.groovy
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/store/EditProductStorePaySetup.groovy
------------------------------------------------------------------------------
svn:mime-type = text/plain
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=763782&r1=763781&r2=763782&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml Thu Apr 9 19:45:31 2009
@@ -1034,6 +1034,12 @@
<display-entity entity-name="Enumeration" key-field-name="enumId" description="${description}"/>
</field>
<field name="paymentService" title="${uiLabelMap.ProductServiceName}"><display/></field>
+ <field name="paymentCustomMethodId" title="${uiLabelMap.ProductCustomMethod}">
+ <display-entity entity-name="CustomMethod" key-field-name="customMethodId" description="${description} (${customMethodName})"/>
+ </field>
+ <field name="paymentGatewayConfigId" title="${uiLabelMap.AccountingPaymentGatewayConfigId}">
+ <display-entity entity-name="PaymentGatewayConfig" key-field-name="paymentGatewayConfigId" description="${description}"/>
+ </field>
<field name="paymentPropertiesPath" title="${uiLabelMap.ProductPaymentProps}"><display/></field>
<field name="applyToAllProducts" title="${uiLabelMap.ProductApplyToAll}"><display/></field>
<field name="editLink" title="${uiLabelMap.CommonEmptyHeader}" use-when="${bsh:security.hasEntityPermission("CATALOG", "_UPDATE", session);}" widget-style="buttontext">
@@ -1084,6 +1090,18 @@
</drop-down>
</field>
<field name="paymentService" title="${uiLabelMap.ProductServiceName}"><text/></field>
+ <field name="paymentCustomMethodId" title="${uiLabelMap.ProductCustomMethod}">
+ <drop-down allow-empty="true">
+ <list-options key-name="customMethodId" description="${description} (${customMethodName})" list-name="paymentCustomMethods"/>
+ </drop-down>
+ </field>
+ <field name="paymentGatewayConfigId" title="${uiLabelMap.AccountingPaymentGatewayConfigId}">
+ <drop-down allow-empty="true">
+ <entity-options entity-name="PaymentGatewayConfig" key-field-name="paymentGatewayConfigId" description="${description}">
+ <entity-order-by field-name="description"/>
+ </entity-options>
+ </drop-down>
+ </field>
<field name="paymentPropertiesPath" title="${uiLabelMap.ProductPaymentProps}"><text/></field>
<field name="applyToAllProducts" title="${uiLabelMap.ProductApplyToAll} ${uiLabelMap.ProductProducts}">
<drop-down>
Modified: ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml?rev=763782&r1=763781&r2=763782&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml Thu Apr 9 19:45:31 2009
@@ -449,7 +449,8 @@
<set field="paymentMethodTypeId" from-field="parameters.paymentMethodTypeId"/>
<set field="paymentServiceTypeEnumId" from-field="parameters.paymentServiceTypeEnumId"/>
<entity-one entity-name="ProductStorePaymentSetting" value-field="productStorePaymentSetting" auto-field-map="true"/>
-
+
+ <script location="component://product/webapp/catalog/WEB-INF/actions/store/EditProductStorePaySetup.groovy"/>
</actions>
<widgets>
<decorator-screen name="CommonProductStoreDecorator" location="${parameters.mainDecoratorLocation}">
Modified: ofbiz/trunk/specialpurpose/ecommerce/data/DemoFinAccount.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/data/DemoFinAccount.xml?rev=763782&r1=763781&r2=763782&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/data/DemoFinAccount.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/data/DemoFinAccount.xml Thu Apr 9 19:45:31 2009
@@ -31,11 +31,11 @@
<ProductStoreFinActSetting productStoreId="9000" finAccountTypeId="REPLENISH_ACCOUNT" requirePinCode="N" validateGCFinAcct="Y" allowAuthToNegative="Y" replenishThreshold="0.0"
purchaseSurveyId="1100" purchSurveySendTo="recipientEmail" purchSurveyCopyMe="copyMe" accountCodeLength="12" pinCodeLength="4" accountValidDays="365" authValidDays="5"/>
- <ProductStorePaymentSetting productStoreId="9000" paymentMethodTypeId="FIN_ACCOUNT" paymentServiceTypeEnumId="PRDS_PAY_AUTH" paymentService="ofbFaAuthorize"/>
- <ProductStorePaymentSetting productStoreId="9000" paymentMethodTypeId="FIN_ACCOUNT" paymentServiceTypeEnumId="PRDS_PAY_RELEASE" paymentService="ofbFaRelease"/>
- <ProductStorePaymentSetting productStoreId="9000" paymentMethodTypeId="FIN_ACCOUNT" paymentServiceTypeEnumId="PRDS_PAY_CAPTURE" paymentService="ofbFaCapture"/>
- <ProductStorePaymentSetting productStoreId="9000" paymentMethodTypeId="FIN_ACCOUNT" paymentServiceTypeEnumId="PRDS_PAY_REAUTH" paymentService="ofbFaAuthorize"/>
- <ProductStorePaymentSetting productStoreId="9000" paymentMethodTypeId="FIN_ACCOUNT" paymentServiceTypeEnumId="PRDS_PAY_REFUND" paymentService="ofbFaRefund"/>
+ <ProductStorePaymentSetting productStoreId="9000" paymentMethodTypeId="FIN_ACCOUNT" paymentServiceTypeEnumId="PRDS_PAY_AUTH" paymentService="ofbFaAuthorize" paymentCustomMethodId="FIN_AUTH_OFBIZ"/>
+ <ProductStorePaymentSetting productStoreId="9000" paymentMethodTypeId="FIN_ACCOUNT" paymentServiceTypeEnumId="PRDS_PAY_RELEASE" paymentService="ofbFaRelease" paymentCustomMethodId="FIN_RELEASE_OFBIZ"/>
+ <ProductStorePaymentSetting productStoreId="9000" paymentMethodTypeId="FIN_ACCOUNT" paymentServiceTypeEnumId="PRDS_PAY_CAPTURE" paymentService="ofbFaCapture" paymentCustomMethodId="FIN_CAPTURE_OFBIZ"/>
+ <ProductStorePaymentSetting productStoreId="9000" paymentMethodTypeId="FIN_ACCOUNT" paymentServiceTypeEnumId="PRDS_PAY_REAUTH" paymentService="ofbFaAuthorize" paymentCustomMethodId="FIN_AUTH_OFBIZ"/>
+ <ProductStorePaymentSetting productStoreId="9000" paymentMethodTypeId="FIN_ACCOUNT" paymentServiceTypeEnumId="PRDS_PAY_REFUND" paymentService="ofbFaRefund" paymentCustomMethodId="FIN_REFUND_OFBIZ"/>
<!-- product / category -->
<ProductCategory productCategoryId="FA-100" description="Account Activation" productCategoryTypeId="CATALOG_CATEGORY"/>
Modified: ofbiz/trunk/specialpurpose/ecommerce/data/DemoProduct.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/data/DemoProduct.xml?rev=763782&r1=763781&r2=763782&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/data/DemoProduct.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/data/DemoProduct.xml Thu Apr 9 19:45:31 2009
@@ -60,20 +60,20 @@
visualThemeId="EC_DEFAULT" autoApproveInvoice="Y" shipIfCaptureFails="Y" autoApproveOrder="Y"/>
<!-- <ProductStorePaymentSetting productStoreId="9000" paymentMethodTypeId="CREDIT_CARD" paymentServiceTypeEnumId="PRDS_PAY_AUTH" paymentService="testRandomAuthorize"/> -->
- <ProductStorePaymentSetting productStoreId="9000" paymentMethodTypeId="CREDIT_CARD" paymentServiceTypeEnumId="PRDS_PAY_AUTH" paymentService="alwaysApproveCCProcessor"/>
- <ProductStorePaymentSetting productStoreId="9000" paymentMethodTypeId="CREDIT_CARD" paymentServiceTypeEnumId="PRDS_PAY_RELEASE" paymentService="testCCRelease"/>
- <ProductStorePaymentSetting productStoreId="9000" paymentMethodTypeId="CREDIT_CARD" paymentServiceTypeEnumId="PRDS_PAY_CAPTURE" paymentService="testCCCapture"/>
- <ProductStorePaymentSetting productStoreId="9000" paymentMethodTypeId="CREDIT_CARD" paymentServiceTypeEnumId="PRDS_PAY_REAUTH" paymentService="alwaysApproveCCProcessor"/>
- <ProductStorePaymentSetting productStoreId="9000" paymentMethodTypeId="CREDIT_CARD" paymentServiceTypeEnumId="PRDS_PAY_REFUND" paymentService="testCCRefund"/>
- <ProductStorePaymentSetting productStoreId="9000" paymentMethodTypeId="EFT_ACCOUNT" paymentServiceTypeEnumId="PRDS_PAY_AUTH" paymentService="alwaysApproveEFTProcessor"/>
- <ProductStorePaymentSetting productStoreId="9000" paymentMethodTypeId="GIFT_CARD" paymentServiceTypeEnumId="PRDS_PAY_AUTH" paymentService="alwaysApproveGCProcessor"/>
- <ProductStorePaymentSetting productStoreId="9000" paymentMethodTypeId="GIFT_CARD" paymentServiceTypeEnumId="PRDS_PAY_RELEASE" paymentService="testGCRelease"/>
-
- <ProductStorePaymentSetting productStoreId="9000" paymentMethodTypeId="EXT_PAYPAL" paymentServiceTypeEnumId="PRDS_PAY_EXTERNAL" paymentService=""/>
- <ProductStorePaymentSetting productStoreId="9000" paymentMethodTypeId="EXT_WORLDPAY" paymentServiceTypeEnumId="PRDS_PAY_EXTERNAL" paymentService=""/>
- <ProductStorePaymentSetting productStoreId="9000" paymentMethodTypeId="EXT_OFFLINE" paymentServiceTypeEnumId="PRDS_PAY_EXTERNAL" paymentService=""/>
- <ProductStorePaymentSetting productStoreId="9000" paymentMethodTypeId="EXT_COD" paymentServiceTypeEnumId="PRDS_PAY_EXTERNAL" paymentService=""/>
- <ProductStorePaymentSetting productStoreId="9000" paymentMethodTypeId="EXT_BILLACT" paymentServiceTypeEnumId="PRDS_PAY_EXTERNAL" paymentService=""/>
+ <ProductStorePaymentSetting productStoreId="9000" paymentMethodTypeId="CREDIT_CARD" paymentServiceTypeEnumId="PRDS_PAY_AUTH" paymentService="alwaysApproveCCProcessor" paymentCustomMethodId="CC_AUTH_ALWAYSAPPROV"/>
+ <ProductStorePaymentSetting productStoreId="9000" paymentMethodTypeId="CREDIT_CARD" paymentServiceTypeEnumId="PRDS_PAY_RELEASE" paymentService="testCCRelease" paymentCustomMethodId="CC_RELEASE_TEST"/>
+ <ProductStorePaymentSetting productStoreId="9000" paymentMethodTypeId="CREDIT_CARD" paymentServiceTypeEnumId="PRDS_PAY_CAPTURE" paymentService="testCCCapture" paymentCustomMethodId="CC_CAPTURE_TEST"/>
+ <ProductStorePaymentSetting productStoreId="9000" paymentMethodTypeId="CREDIT_CARD" paymentServiceTypeEnumId="PRDS_PAY_REAUTH" paymentService="alwaysApproveCCProcessor" paymentCustomMethodId="CC_AUTH_ALWAYSAPPROV"/>
+ <ProductStorePaymentSetting productStoreId="9000" paymentMethodTypeId="CREDIT_CARD" paymentServiceTypeEnumId="PRDS_PAY_REFUND" paymentService="testCCRefund" paymentCustomMethodId="CC_REFUND_TEST"/>
+ <ProductStorePaymentSetting productStoreId="9000" paymentMethodTypeId="EFT_ACCOUNT" paymentServiceTypeEnumId="PRDS_PAY_AUTH" paymentService="alwaysApproveEFTProcessor" paymentCustomMethodId="EFT_AUTH_ALWAYSAPPRO"/>
+ <ProductStorePaymentSetting productStoreId="9000" paymentMethodTypeId="GIFT_CARD" paymentServiceTypeEnumId="PRDS_PAY_AUTH" paymentService="alwaysApproveGCProcessor" paymentCustomMethodId="GIFT_AUTH_ALWAYSAPPR"/>
+ <ProductStorePaymentSetting productStoreId="9000" paymentMethodTypeId="GIFT_CARD" paymentServiceTypeEnumId="PRDS_PAY_RELEASE" paymentService="testGCRelease" paymentCustomMethodId="GIFT_RELEASE_TEST"/>
+
+ <ProductStorePaymentSetting productStoreId="9000" paymentMethodTypeId="EXT_PAYPAL" paymentServiceTypeEnumId="PRDS_PAY_EXTERNAL" paymentService="" paymentCustomMethodId=""/>
+ <ProductStorePaymentSetting productStoreId="9000" paymentMethodTypeId="EXT_WORLDPAY" paymentServiceTypeEnumId="PRDS_PAY_EXTERNAL" paymentService="" paymentCustomMethodId=""/>
+ <ProductStorePaymentSetting productStoreId="9000" paymentMethodTypeId="EXT_OFFLINE" paymentServiceTypeEnumId="PRDS_PAY_EXTERNAL" paymentService="" paymentCustomMethodId=""/>
+ <ProductStorePaymentSetting productStoreId="9000" paymentMethodTypeId="EXT_COD" paymentServiceTypeEnumId="PRDS_PAY_EXTERNAL" paymentService="" paymentCustomMethodId=""/>
+ <ProductStorePaymentSetting productStoreId="9000" paymentMethodTypeId="EXT_BILLACT" paymentServiceTypeEnumId="PRDS_PAY_EXTERNAL" paymentService="" paymentCustomMethodId=""/>
<ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_ODR_CONFIRM" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderConfirmNotice" xslfoAttachScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderConfirmNoticePdf" subject="OFBiz Demo - Order Confirmation #${orderId}" bccAddress="ofbiztest@yahoo.com" fromAddress="ofbiztest@yahoo.com"/>
<ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_ODR_COMPLETE" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderCompleteNotice" subject="OFBiz Demo - Your Order Is Complete #${orderId}" fromAddress="ofbiztest@yahoo.com"/>
Modified: ofbiz/trunk/specialpurpose/ecommerce/data/DemoRentalProduct.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/data/DemoRentalProduct.xml?rev=763782&r1=763781&r2=763782&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/data/DemoRentalProduct.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/data/DemoRentalProduct.xml Thu Apr 9 19:45:31 2009
@@ -34,16 +34,16 @@
headerLogo="/images/opentravelsystem_logo.jpg"
-->
- <ProductStorePaymentSetting productStoreId="RentalStore" paymentMethodTypeId="CREDIT_CARD" paymentServiceTypeEnumId="PRDS_PAY_AUTH" paymentService="alwaysApproveCCProcessor"/>
- <ProductStorePaymentSetting productStoreId="RentalStore" paymentMethodTypeId="CREDIT_CARD" paymentServiceTypeEnumId="PRDS_PAY_RELEASE" paymentService="testCCRelease"/>
- <ProductStorePaymentSetting productStoreId="RentalStore" paymentMethodTypeId="CREDIT_CARD" paymentServiceTypeEnumId="PRDS_PAY_CAPTURE" paymentService="testCCCapture"/>
- <ProductStorePaymentSetting productStoreId="RentalStore" paymentMethodTypeId="CREDIT_CARD" paymentServiceTypeEnumId="PRDS_PAY_REAUTH" paymentService="alwaysApproveCCProcessor"/>
- <ProductStorePaymentSetting productStoreId="RentalStore" paymentMethodTypeId="CREDIT_CARD" paymentServiceTypeEnumId="PRDS_PAY_REFUND" paymentService="testCCRefund"/>
- <ProductStorePaymentSetting productStoreId="RentalStore" paymentMethodTypeId="EFT_ACCOUNT" paymentServiceTypeEnumId="PRDS_PAY_AUTH" paymentService="alwaysApproveEFTProcessor"/>
- <ProductStorePaymentSetting productStoreId="RentalStore" paymentMethodTypeId="GIFT_CARD" paymentServiceTypeEnumId="PRDS_PAY_AUTH" paymentService="alwaysApproveGCProcessor"/>
- <ProductStorePaymentSetting productStoreId="RentalStore" paymentMethodTypeId="GIFT_CARD" paymentServiceTypeEnumId="PRDS_PAY_RELEASE" paymentService="testGCRelease"/>
- <ProductStorePaymentSetting productStoreId="RentalStore" paymentMethodTypeId="EXT_PAYPAL" paymentServiceTypeEnumId="PRDS_PAY_EXTERNAL" paymentService=""/>
- <ProductStorePaymentSetting productStoreId="RentalStore" paymentMethodTypeId="EXT_WORLDPAY" paymentServiceTypeEnumId="PRDS_PAY_EXTERNAL" paymentService=""/>
+ <ProductStorePaymentSetting productStoreId="RentalStore" paymentMethodTypeId="CREDIT_CARD" paymentServiceTypeEnumId="PRDS_PAY_AUTH" paymentService="alwaysApproveCCProcessor" paymentCustomMethodId="CC_AUTH_ALWAYSAPPROV"/>
+ <ProductStorePaymentSetting productStoreId="RentalStore" paymentMethodTypeId="CREDIT_CARD" paymentServiceTypeEnumId="PRDS_PAY_RELEASE" paymentService="testCCRelease" paymentCustomMethodId="CC_RELEASE_TEST"/>
+ <ProductStorePaymentSetting productStoreId="RentalStore" paymentMethodTypeId="CREDIT_CARD" paymentServiceTypeEnumId="PRDS_PAY_CAPTURE" paymentService="testCCCapture" paymentCustomMethodId="CC_CAPTURE_TEST"/>
+ <ProductStorePaymentSetting productStoreId="RentalStore" paymentMethodTypeId="CREDIT_CARD" paymentServiceTypeEnumId="PRDS_PAY_REAUTH" paymentService="alwaysApproveCCProcessor" paymentCustomMethodId="CC_AUTH_ALWAYSAPPROV"/>
+ <ProductStorePaymentSetting productStoreId="RentalStore" paymentMethodTypeId="CREDIT_CARD" paymentServiceTypeEnumId="PRDS_PAY_REFUND" paymentService="testCCRefund" paymentCustomMethodId="CC_REFUND_TEST"/>
+ <ProductStorePaymentSetting productStoreId="RentalStore" paymentMethodTypeId="EFT_ACCOUNT" paymentServiceTypeEnumId="PRDS_PAY_AUTH" paymentService="alwaysApproveEFTProcessor" paymentCustomMethodId="EFT_AUTH_ALWAYSAPPRO"/>
+ <ProductStorePaymentSetting productStoreId="RentalStore" paymentMethodTypeId="GIFT_CARD" paymentServiceTypeEnumId="PRDS_PAY_AUTH" paymentService="alwaysApproveGCProcessor" paymentCustomMethodId="GIFT_AUTH_ALWAYSAPPR"/>
+ <ProductStorePaymentSetting productStoreId="RentalStore" paymentMethodTypeId="GIFT_CARD" paymentServiceTypeEnumId="PRDS_PAY_RELEASE" paymentService="testGCRelease" paymentCustomMethodId="GIFT_RELEASE_TEST"/>
+ <ProductStorePaymentSetting productStoreId="RentalStore" paymentMethodTypeId="EXT_PAYPAL" paymentServiceTypeEnumId="PRDS_PAY_EXTERNAL" paymentService="" paymentCustomMethodId=""/>
+ <ProductStorePaymentSetting productStoreId="RentalStore" paymentMethodTypeId="EXT_WORLDPAY" paymentServiceTypeEnumId="PRDS_PAY_EXTERNAL" paymentService="" paymentCustomMethodId=""/>
<ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_ODR_CONFIRM" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderConfirmNotice" xslfoAttachScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderConfirmNoticePdf" subject="OFBiz Demo - Order Confirmation #${orderId}" bccAddress="ofbiztest@yahoo.com" fromAddress="ofbiztest@yahoo.com"/>
<ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_ODR_COMPLETE" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderCompleteNotice" subject="OFBiz Demo - Your Order Is Complete #${orderId}" fromAddress="ofbiztest@yahoo.com"/>
Modified: ofbiz/trunk/specialpurpose/ecommerce/data/DemoStoreGiftCertificateSettings.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/data/DemoStoreGiftCertificateSettings.xml?rev=763782&r1=763781&r2=763782&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/data/DemoStoreGiftCertificateSettings.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/data/DemoStoreGiftCertificateSettings.xml Thu Apr 9 19:45:31 2009
@@ -33,11 +33,11 @@
<!-- payment settings for gift certificates. the idea is that you re-configure this store's GIFT_CARD settings to use the gift certificate services,
rather than the gift card services. -->
- <ProductStorePaymentSetting productStoreId="9000" paymentMethodTypeId="GIFT_CARD" paymentServiceTypeEnumId="PRDS_PAY_AUTH" paymentService="ofbGcAuthorize"/>
- <ProductStorePaymentSetting productStoreId="9000" paymentMethodTypeId="GIFT_CARD" paymentServiceTypeEnumId="PRDS_PAY_RELEASE" paymentService="ofbGcRelease"/>
- <ProductStorePaymentSetting productStoreId="9000" paymentMethodTypeId="GIFT_CARD" paymentServiceTypeEnumId="PRDS_PAY_CAPTURE" paymentService="ofbGcProcessor"/>
- <ProductStorePaymentSetting productStoreId="9000" paymentMethodTypeId="GIFT_CARD" paymentServiceTypeEnumId="PRDS_PAY_REAUTH" paymentService="ofbGcAuthorize"/>
- <ProductStorePaymentSetting productStoreId="9000" paymentMethodTypeId="GIFT_CARD" paymentServiceTypeEnumId="PRDS_PAY_REFUND" paymentService="ofbGcRefund"/>
+ <ProductStorePaymentSetting productStoreId="9000" paymentMethodTypeId="GIFT_CARD" paymentServiceTypeEnumId="PRDS_PAY_AUTH" paymentService="ofbGcAuthorize" paymentCustomMethodId="GIFT_AUTH_OFBIZ"/>
+ <ProductStorePaymentSetting productStoreId="9000" paymentMethodTypeId="GIFT_CARD" paymentServiceTypeEnumId="PRDS_PAY_RELEASE" paymentService="ofbGcRelease" paymentCustomMethodId="GIFT_RELEASE_OFBIZ"/>
+ <ProductStorePaymentSetting productStoreId="9000" paymentMethodTypeId="GIFT_CARD" paymentServiceTypeEnumId="PRDS_PAY_CAPTURE" paymentService="ofbGcProcessor" paymentCustomMethodId="GIFT_CAPTURE_OFBIZ"/>
+ <ProductStorePaymentSetting productStoreId="9000" paymentMethodTypeId="GIFT_CARD" paymentServiceTypeEnumId="PRDS_PAY_REAUTH" paymentService="ofbGcAuthorize" paymentCustomMethodId="GIFT_AUTH_OFBIZ"/>
+ <ProductStorePaymentSetting productStoreId="9000" paymentMethodTypeId="GIFT_CARD" paymentServiceTypeEnumId="PRDS_PAY_REFUND" paymentService="ofbGcRefund" paymentCustomMethodId="GIFT_REFUND_OFBIZ"/>
</entity-engine-xml>
Modified: ofbiz/trunk/specialpurpose/pos/data/DemoRetail.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/data/DemoRetail.xml?rev=763782&r1=763781&r2=763782&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/data/DemoRetail.xml (original)
+++ ofbiz/trunk/specialpurpose/pos/data/DemoRetail.xml Thu Apr 9 19:45:31 2009
@@ -59,13 +59,13 @@
styleSheet=""
-->
- <ProductStorePaymentSetting productStoreId="9100" paymentMethodTypeId="CREDIT_CARD" paymentServiceTypeEnumId="PRDS_PAY_AUTH" paymentService="alwaysApproveWithCaptureCCProcessor"/>
- <ProductStorePaymentSetting productStoreId="9100" paymentMethodTypeId="CREDIT_CARD" paymentServiceTypeEnumId="PRDS_PAY_RELEASE" paymentService="testCCRelease"/>
- <ProductStorePaymentSetting productStoreId="9100" paymentMethodTypeId="CREDIT_CARD" paymentServiceTypeEnumId="PRDS_PAY_CAPTURE" paymentService="testCCCapture"/>
- <ProductStorePaymentSetting productStoreId="9100" paymentMethodTypeId="CREDIT_CARD" paymentServiceTypeEnumId="PRDS_PAY_REAUTH" paymentService="alwaysApproveCCProcessor"/>
- <ProductStorePaymentSetting productStoreId="9100" paymentMethodTypeId="CREDIT_CARD" paymentServiceTypeEnumId="PRDS_PAY_REFUND" paymentService="testCCRefund"/>
- <ProductStorePaymentSetting productStoreId="9100" paymentMethodTypeId="EFT_ACCOUNT" paymentServiceTypeEnumId="PRDS_PAY_AUTH" paymentService="alwaysApproveEFTProcessor"/>
- <ProductStorePaymentSetting productStoreId="9100" paymentMethodTypeId="GIFT_CARD" paymentServiceTypeEnumId="PRDS_PAY_EXTERNAL" paymentService=""/>
+ <ProductStorePaymentSetting productStoreId="9100" paymentMethodTypeId="CREDIT_CARD" paymentServiceTypeEnumId="PRDS_PAY_AUTH" paymentService="alwaysApproveWithCaptureCCProcessor" paymentCustomMethodId="CC_AUTH_CAPTURE_ALWA"/>
+ <ProductStorePaymentSetting productStoreId="9100" paymentMethodTypeId="CREDIT_CARD" paymentServiceTypeEnumId="PRDS_PAY_RELEASE" paymentService="testCCRelease" paymentCustomMethodId="CC_RELEASE_TEST"/>
+ <ProductStorePaymentSetting productStoreId="9100" paymentMethodTypeId="CREDIT_CARD" paymentServiceTypeEnumId="PRDS_PAY_CAPTURE" paymentService="testCCCapture" paymentCustomMethodId="CC_CAPTURE_TEST"/>
+ <ProductStorePaymentSetting productStoreId="9100" paymentMethodTypeId="CREDIT_CARD" paymentServiceTypeEnumId="PRDS_PAY_REAUTH" paymentService="alwaysApproveCCProcessor" paymentCustomMethodId="CC_AUTH_ALWAYSAPPROV"/>
+ <ProductStorePaymentSetting productStoreId="9100" paymentMethodTypeId="CREDIT_CARD" paymentServiceTypeEnumId="PRDS_PAY_REFUND" paymentService="testCCRefund" paymentCustomMethodId="CC_REFUND_TEST"/>
+ <ProductStorePaymentSetting productStoreId="9100" paymentMethodTypeId="EFT_ACCOUNT" paymentServiceTypeEnumId="PRDS_PAY_AUTH" paymentService="alwaysApproveEFTProcessor" paymentCustomMethodId="EFT_AUTH_ALWAYSAPPRO"/>
+ <ProductStorePaymentSetting productStoreId="9100" paymentMethodTypeId="GIFT_CARD" paymentServiceTypeEnumId="PRDS_PAY_EXTERNAL" paymentService="" paymentCustomMethodId=""/>
<ProductStoreFacility productStoreId="9100" facilityId="MyRetailStore" fromDate="2001-05-13 12:00:00.0"/>
<ProductStoreRole partyId="admin" roleTypeId="SALES_REP" productStoreId="9100" fromDate="2001-05-13 12:00:00.0"/>
Modified: ofbiz/trunk/specialpurpose/webpos/data/DemoPosData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/data/DemoPosData.xml?rev=763782&r1=763781&r2=763782&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/data/DemoPosData.xml (original)
+++ ofbiz/trunk/specialpurpose/webpos/data/DemoPosData.xml Thu Apr 9 19:45:31 2009
@@ -21,5 +21,5 @@
<entity-engine-xml>
<WebSite webSiteId="WebStorePos" siteName="Web POS Site" productStoreId="9100"/>
- <ProductStorePaymentSetting productStoreId="9100" paymentMethodTypeId="PERSONAL_CHECK" paymentServiceTypeEnumId="PRDS_PAY_EXTERNAL" paymentService=""/>
+ <ProductStorePaymentSetting productStoreId="9100" paymentMethodTypeId="PERSONAL_CHECK" paymentServiceTypeEnumId="PRDS_PAY_EXTERNAL" paymentService="" paymentCustomMethodId=""/>
</entity-engine-xml>
\ No newline at end of file