svn commit: r1061728 - in /ofbiz/trunk: applications/accounting/widget/PaymentGatewayConfigForms.xml framework/common/config/CommonUiLabels.xml

Author: jleroux
Date: Fri Jan 21 10:50:43 2011
New Revision: 1061728

URL: http://svn.apache.org/viewvc?rev=1061728&view=rev
Log:
A patch from Abdullah Shaikh "Added drop down options replacing text box to configure sagepay." (https://issues.apache.org/jira/browse/OFBIZ-3260) - OFBIZ-3260

To configure SagePay payment gateway transaction types settings.

JLR: this patch contains a bit of labels redundancy, but I prefer to keep them as is. At least it's verbs in Common and can be reused... (why have a Payment label in each app...)

Modified:
    ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigForms.xml
    ofbiz/trunk/framework/common/config/CommonUiLabels.xml

Modified: ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigForms.xml?rev=1061728&r1=1061727&r2=1061728&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigForms.xml Fri Jan 21 10:50:43 2011
@@ -90,19 +90,29 @@ under the License.
             <text size="10" maxlength="10"/>
         </field>
         <field name="authenticationTransType" title="${uiLabelMap.AccountingSagePayAuthenticationTransType}">
-            <text size="100" maxlength="100"/>
+            <drop-down>
+                <option key="PAYMENT" description="${uiLabelMap.CommonPayment}"/>
+                <option key="AUTHENTICATE" description="${uiLabelMap.CommonAuthenticate}"/>
+                <option key="DEFERRED" description="${uiLabelMap.CommonDeferred}"/>
+            </drop-down>
         </field>
         <field name="authenticationUrl" title="${uiLabelMap.AccountingSagePayAuthenticationUrl}">
             <text size="100" maxlength="100"/>
         </field>        
         <field name="authoriseTransType" title="${uiLabelMap.AccountingSagePayAuthorisationTransType}">
-            <text size="100" maxlength="100"/>
+            <drop-down>
+                <option key="AUTHORISE" description="${uiLabelMap.CommonAuthorise}"/>
+                <option key="RELEASE" description="${uiLabelMap.CommonRelease}"/>
+            </drop-down>
         </field>
         <field name="authoriseUrl" title="${uiLabelMap.AccountingSagePayAuthorisationUrl}">
             <text size="100" maxlength="100"/>
         </field>
         <field name="releaseTransType" title="${uiLabelMap.AccountingSagePayReleaseTransType}">
-            <text size="100" maxlength="100"/>
+            <drop-down>
+                <option key="CANCEL" description="${uiLabelMap.CommonCancel}"/>
+                <option key="ABORT" description="${uiLabelMap.CommonAbort}"/>
+            </drop-down>
         </field>
         <field name="releaseUrl" title="${uiLabelMap.AccountingSagePayReleaseUrl}">
             <text size="100" maxlength="100"/>

Modified: ofbiz/trunk/framework/common/config/CommonUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/CommonUiLabels.xml?rev=1061728&r1=1061727&r2=1061728&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/config/CommonUiLabels.xml (original)
+++ ofbiz/trunk/framework/common/config/CommonUiLabels.xml Fri Jan 21 10:50:43 2011
@@ -9641,6 +9641,24 @@
         <value xml:lang="zh_CN">数据源类型</value>
         <value xml:lang="zh_TW">資料源類型</value>
     </property>
+    <property key="CommonPayment">
+        <value xml:lang="en">Payment</value>
+    </property>
+    <property key="CommonAuthenticate">
+        <value xml:lang="en">Authenticate</value>
+    </property>
+    <property key="CommonDeferred">
+        <value xml:lang="en">Deferred</value>
+    </property>
+    <property key="CommonAuthorise">
+        <value xml:lang="en">Authorise</value>
+    </property>
+    <property key="CommonRelease">
+        <value xml:lang="en">Release</value>
+    </property>
+    <property key="CommonAbort">
+        <value xml:lang="en">Abort</value>
+    </property>
     <property key="DataSourceTypeCreate">
         <value xml:lang="ar">استحداث نوع مصدر معلومات</value>
         <value xml:lang="de">Datenquelle Typ erstellen</value>