Author: deepak
Date: Tue Aug 22 10:28:47 2017
New Revision: 1805750
URL: http://svn.apache.org/viewvc?rev=1805750&view=rev
Log:
Move config data related to PaymentGateway configuration from seed-initial to
demo (OFBIZ-9595)
Modified:
ofbiz/ofbiz-framework/trunk/applications/accounting/data/AccountingTypeData.xml
ofbiz/ofbiz-framework/trunk/applications/accounting/data/PaymentGatewayConfData.xml
ofbiz/ofbiz-framework/trunk/applications/accounting/ofbiz-component.xml
ofbiz/ofbiz-framework/trunk/applications/commonext/data/ProductStoreData.xml
Modified:
ofbiz/ofbiz-framework/trunk/applications/accounting/data/AccountingTypeData.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/data/AccountingTypeData.xml?rev=1805750&r1=1805749&r2=1805750&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/accounting/data/AccountingTypeData.xml
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/accounting/data/AccountingTypeData.xml
Tue Aug 22 10:28:47 2017
@@ -1115,4 +1115,16 @@ under the License.
<BudgetReviewResultType description="Accepted"
budgetReviewResultTypeId="BGR_ACCEPTED"/>
<BudgetReviewResultType description="Rejected"
budgetReviewResultTypeId="BGR_REJECTED"/>
+
+ <PaymentGatewayConfigType paymentGatewayConfigTypeId="SAGEPAY"
hasTable="N" description="SagePay Payment Gateway"/>
+ <PaymentGatewayConfigType paymentGatewayConfigTypeId="AUTHORIZE_NET"
hasTable="N" description="Authorize Dot Net Payment Gateway"/>
+ <PaymentGatewayConfigType paymentGatewayConfigTypeId="CYBERSOURCE"
hasTable="N" description="CyberSource Payment Gateway"/>
+ <PaymentGatewayConfigType paymentGatewayConfigTypeId="EWAY" hasTable="N"
description="eWay Payment Gateway"/>
+ <PaymentGatewayConfigType paymentGatewayConfigTypeId="PAYFLOWPRO"
hasTable="N" description="Payflow Pro Payment Gateway"/>
+ <PaymentGatewayConfigType paymentGatewayConfigTypeId="PAYPAL" hasTable="N"
description="PayPal Payment Gateway"/>
+ <PaymentGatewayConfigType paymentGatewayConfigTypeId="CLEARCOMMERCE"
hasTable="N" description="Clear Commerce Payment Gateway"/>
+ <PaymentGatewayConfigType paymentGatewayConfigTypeId="WORLDPAY"
hasTable="N" description="RBS WorldPay Payment Gateway"/>
+ <PaymentGatewayConfigType paymentGatewayConfigTypeId="ORBITAL"
hasTable="N" description="Orbital Payment Gateway"/>
+ <PaymentGatewayConfigType paymentGatewayConfigTypeId="SECUREPAY"
hasTable="N" description="SecurePay Payment Gateway"/>
+ <PaymentGatewayConfigType paymentGatewayConfigTypeId="IDEAL" hasTable="N"
description="iDEAL Payment Gateway"/>
</entity-engine-xml>
Modified:
ofbiz/ofbiz-framework/trunk/applications/accounting/data/PaymentGatewayConfData.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/data/PaymentGatewayConfData.xml?rev=1805750&r1=1805749&r2=1805750&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/accounting/data/PaymentGatewayConfData.xml
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/accounting/data/PaymentGatewayConfData.xml
Tue Aug 22 10:28:47 2017
@@ -20,48 +20,37 @@ under the License.
<entity-engine-xml>
<!-- Payment Gateway Config -->
- <PaymentGatewayConfigType paymentGatewayConfigTypeId="SAGEPAY"
hasTable="N" description="SagePay Payment Gateway"/>
<PaymentGatewayConfig paymentGatewayConfigId="SAGEPAY_CONFIG"
paymentGatewayConfigTypeId="SAGEPAY" description="SagePay Config"/>
<PaymentGatewaySagePay paymentGatewayConfigId="SAGEPAY_CONFIG"
vendor="YOUR_VENDOR_NAME" productionHost="https://live.sagepay.com:443";
testingHost="https://test.sagepay.com:443"; sagePayMode="TEST"
protocolVersion="2.22" authenticationTransType="DEFERRED"
authenticationUrl="/gateway/service/vspdirect-register.vsp"
authoriseTransType="RELEASE" authoriseUrl="/gateway/service/release.vsp"
releaseTransType="ABORT" releaseUrl="/gateway/service/abort.vsp"
voidUrl="/gateway/service/void.vsp" refundUrl="/gateway/service/refund.vsp"/>
- <PaymentGatewayConfigType paymentGatewayConfigTypeId="AUTHORIZE_NET"
hasTable="N" description="Authorize Dot Net Payment Gateway"/>
<PaymentGatewayConfig paymentGatewayConfigId="AUTHORIZE_NET_CONFIG"
paymentGatewayConfigTypeId="AUTHORIZE_NET" description="Authorize Dot Net
Config"/>
<PaymentGatewayAuthorizeNet paymentGatewayConfigId="AUTHORIZE_NET_CONFIG"
transactionUrl="https://test.authorize.net/gateway/transact.dll";
certificateAlias="test.authorize.net" apiVersion="3.1" delimitedData="TRUE"
delimiterChar="|" method="CC" emailCustomer="FALSE" emailMerchant="FALSE"
testMode="TRUE" relayResponse="FALSE" tranKey="" userId="" pwd=""
transDescription="OFBizAuthNet"/>
- <PaymentGatewayConfigType paymentGatewayConfigTypeId="CYBERSOURCE"
hasTable="N" description="CyberSource Payment Gateway"/>
<PaymentGatewayConfig paymentGatewayConfigId="CYBERSOURCE_CONFIG"
paymentGatewayConfigTypeId="CYBERSOURCE" description="CyberSource Config"/>
<PaymentGatewayCyberSource paymentGatewayConfigId="CYBERSOURCE_CONFIG"
merchantId="[MerchantID]" apiVersion="1.43" production="false"
keysDir="${sys:getProperty('ofbiz.home')}/applications/accounting/icskeys"
keysFile="merchantID.p12" logEnabled="true"
logDir="${sys:getProperty('ofbiz.home')}/runtime/logs"
logFile="cybersource.log" logSize="10" merchantDescr="Some Nice Web Store"
merchantContact="" autoBill="false" enableDav="N" fraudScore="N"
ignoreAvs="false" disableBillAvs="Y" avsDeclineCodes=""/>
- <PaymentGatewayConfigType paymentGatewayConfigTypeId="EWAY" hasTable="N"
description="eWay Payment Gateway"/>
<PaymentGatewayConfig paymentGatewayConfigId="EWAY_CONFIG"
paymentGatewayConfigTypeId="EWAY" description="eWay Config"/>
<PaymentGatewayEway paymentGatewayConfigId="EWAY_CONFIG"
customerId="87654321" refundPwd="" testMode="Y" enableBeagle="N" enableCvn="N"/>
-
- <PaymentGatewayConfigType paymentGatewayConfigTypeId="PAYFLOWPRO"
hasTable="N" description="Payflow Pro Payment Gateway"/>
+
<PaymentGatewayConfig paymentGatewayConfigId="PAYFLOWPRO_CONFIG"
paymentGatewayConfigTypeId="PAYFLOWPRO" description="Payflow Pro Config"/>
<PaymentGatewayPayflowPro paymentGatewayConfigId="PAYFLOWPRO_CONFIG"
certsPath="${sys:getProperty('ofbiz.home')}/applications/accounting/pfcerts"
hostAddress="pilot-payflowpro.paypal.com" hostPort="443" timeout="80"
proxyAddress="" proxyPort="80" proxyLogon="" proxyPassword=""
vendor="[Vendor]" userId="[PayFlow UserID]" pwd="[PayFlow Password]"
partner="[PayFlow Partner]" checkAvs="Y" checkCvv2="Y" preAuth="Y"
enableTransmit="true"
logFileName="${sys:getProperty('ofbiz.home')}/runtime/logs/payflow_java.log"
loggingLevel="6" maxLogFileSize="1000000" stackTraceOn="N" returnUrl="[Express
Checkout Return URL]" cancelReturnUrl="[Express Checkout Cancel Return URL]"
redirectUrl="[Express Checkout Customer Redirect URL]"/>
- <PaymentGatewayConfigType paymentGatewayConfigTypeId="PAYPAL" hasTable="N"
description="PayPal Payment Gateway"/>
<PaymentGatewayConfig paymentGatewayConfigId="PAYPAL_CONFIG"
paymentGatewayConfigTypeId="PAYPAL" description="PayPal Config"/>
<PaymentGatewayPayPal paymentGatewayConfigId="PAYPAL_CONFIG"
businessEmail="" apiUserName="" apiPassword="" apiSignature=""
apiEnvironment="" notifyUrl="" returnUrl="" cancelReturnUrl="" imageUrl=""
confirmTemplate="/order/emailconfirmation.ftl"
redirectUrl="https://www.sandbox.paypal.com/webscr";
confirmUrl="https://www.sandbox.paypal.com/us/cgi-bin/webscr";
shippingCallbackUrl="" requireConfirmedShipping="N"/>
- <PaymentGatewayConfigType paymentGatewayConfigTypeId="CLEARCOMMERCE"
hasTable="N" description="Clear Commerce Payment Gateway"/>
<PaymentGatewayConfig paymentGatewayConfigId="CLEARCOMMERCE_CONFIG"
paymentGatewayConfigTypeId="CLEARCOMMERCE" description="Clear Commerce Config"/>
<PaymentGatewayClearCommerce paymentGatewayConfigId="CLEARCOMMERCE_CONFIG"
sourceId="mySource" groupId="myGroup" clientId="[ClearCommerce clientId]"
username="[ClearCommerce username]" pwd="[ClearCommerce password]"
userAlias="[ClearCommerce alias]" effectiveAlias="" processMode="P"
serverURL="https://test5x.clearcommerce.com:11500"; enableCVM="N"/>
- <PaymentGatewayConfigType paymentGatewayConfigTypeId="WORLDPAY"
hasTable="N" description="RBS WorldPay Payment Gateway"/>
<PaymentGatewayConfig paymentGatewayConfigId="WORLDPAY_CONFIG"
paymentGatewayConfigTypeId="WORLDPAY" description="RBS WorldPay Config"/>
<PaymentGatewayWorldPay paymentGatewayConfigId="WORLDPAY_CONFIG"
redirectUrl="https://select-test.worldpay.com/wcc/purchase"; instId=""
authMode="A" fixContact="N" hideContact="N" hideCurrency="N" langId=""
noLanguageMenu="N" withDelivery="N" testMode="100"/>
- <PaymentGatewayConfigType paymentGatewayConfigTypeId="ORBITAL"
hasTable="N" description="Orbital Payment Gateway"/>
<PaymentGatewayConfig paymentGatewayConfigId="ORBITAL_CONFIG"
paymentGatewayConfigTypeId="ORBITAL" description="Orbital Config"/>
<PaymentGatewayOrbital paymentGatewayConfigId="ORBITAL_CONFIG"
username="ofbizuser" connectionPassword="ofbizpwd" merchantId="785240009879"
engineClass="com.paymentech.orbital.sdk.engine.https.HttpsEngine"
hostName="orbitalvar1.paymentech.net" port="443"
hostNameFailover="orbitalvar2.paymentech.net" portFailover="443"
connectionTimeoutSeconds="90" readTimeoutSeconds="90"
authorizationURI="/authorize" sdkVersion="PaymentechSDK_6.3.0"
sslSocketFactory="default" responseType="gateway"/>
- <PaymentGatewayConfigType paymentGatewayConfigTypeId="SECUREPAY"
hasTable="N" description="SecurePay Payment Gateway"/>
<PaymentGatewayConfig paymentGatewayConfigId="SECUREPAY_CONFIG"
paymentGatewayConfigTypeId="SECUREPAY" description="SecurePay Config"/>
<PaymentGatewaySecurePay paymentGatewayConfigId="SECUREPAY_CONFIG"
merchantId="[SecurePay MerchantID]" pwd="[SecurePay Password]"
serverURL="[SecurePay serverURL]" processTimeout="80" enableAmountRound="N"/>
- <PaymentGatewayConfigType paymentGatewayConfigTypeId="IDEAL" hasTable="N"
description="iDEAL Payment Gateway"/>
<PaymentGatewayConfig paymentGatewayConfigId="IDEAL_CONFIG"
paymentGatewayConfigTypeId="IDEAL" description="iDEAL Config"/>
<PaymentGatewayiDEAL paymentGatewayConfigId="IDEAL_CONFIG"
merchantId="[iDEAL MerchantID]" merchantSubId="[iDEAL MerchantSubID]"
merchantReturnURL="[iDEAL MerchantReturnURL]" acquirerURL="[iDEAL AcquirerURL]"
acquirerTimeout="10" privateCert="[iDEAL PrivateCert]"
acquirerKeyStoreFilename="[iDEAL AcquirerKeyStoreFilename]"
acquirerKeyStorePassword="[iDEAL AcquirerKeyStorePassword]"
merchantKeyStoreFilename="[iDEAL MerchantKeyStoreFilename]"
merchantKeyStorePassword="[iDEAL MerchantKeyStorePassword]"
expirationPeriod="[iDEAL ExpirationPeriod]"/>
</entity-engine-xml>
Modified:
ofbiz/ofbiz-framework/trunk/applications/accounting/ofbiz-component.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/ofbiz-component.xml?rev=1805750&r1=1805749&r2=1805750&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/accounting/ofbiz-component.xml
(original)
+++ ofbiz/ofbiz-framework/trunk/applications/accounting/ofbiz-component.xml Tue
Aug 22 10:28:47 2017
@@ -32,7 +32,7 @@ under the License.
<entity-resource type="data" reader-name="seed" loader="main"
location="data/AccountingSecurityPermissionSeedData.xml"/>
<entity-resource type="data" reader-name="demo" loader="main"
location="data/AccountingSecurityGroupDemoData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main"
location="data/AccountingPortletData.xml"/>
- <entity-resource type="data" reader-name="seed-initial" loader="main"
location="data/PaymentGatewayConfData.xml"/>
+ <entity-resource type="data" reader-name="demo" loader="main"
location="data/PaymentGatewayConfData.xml"/>
<entity-resource type="data" reader-name="seed-initial" loader="main"
location="data/AccountingScheduledServiceData.xml"/>
<entity-resource type="data" reader-name="demo" loader="main"
location="data/GeneralChartOfAccountsDemoData.xml"/>
<entity-resource type="data" reader-name="demo" loader="main"
location="data/OrganizationDemoData.xml"/>
Modified:
ofbiz/ofbiz-framework/trunk/applications/commonext/data/ProductStoreData.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/commonext/data/ProductStoreData.xml?rev=1805750&r1=1805749&r2=1805750&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/commonext/data/ProductStoreData.xml
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/commonext/data/ProductStoreData.xml
Tue Aug 22 10:28:47 2017
@@ -20,11 +20,9 @@
<entity-engine-xml>
<!-- Payment Gateway Config -->
- <PaymentGatewayConfigType paymentGatewayConfigTypeId="PAYPAL" hasTable="N"
description="PayPal Payment Gateway"/>
<PaymentGatewayConfig paymentGatewayConfigId="PAYPAL_CONFIG"
paymentGatewayConfigTypeId="PAYPAL" description="PayPal Config"/>
<PaymentGatewayPayPal paymentGatewayConfigId="PAYPAL_CONFIG"
businessEmail="" apiUserName="" apiPassword="" apiSignature=""
apiEnvironment="" notifyUrl="" returnUrl="" cancelReturnUrl="" imageUrl=""
confirmTemplate="/order/emailconfirmation.ftl"
redirectUrl="https://www.sandbox.paypal.com/webscr";
confirmUrl="https://www.sandbox.paypal.com/us/cgi-bin/webscr";
shippingCallbackUrl="" requireConfirmedShipping="N"/>
-
- <PaymentGatewayConfigType paymentGatewayConfigTypeId="WORLDPAY"
hasTable="N" description="RBS WorldPay Payment Gateway"/>
+
<PaymentGatewayConfig paymentGatewayConfigId="WORLDPAY_CONFIG"
paymentGatewayConfigTypeId="WORLDPAY" description="RBS WorldPay Config"/>
<PaymentGatewayWorldPay paymentGatewayConfigId="WORLDPAY_CONFIG"
redirectUrl="https://select-test.worldpay.com/wcc/purchase"; instId=""
authMode="A" fixContact="N" hideContact="N" hideCurrency="N" langId=""
noLanguageMenu="N" withDelivery="N" testMode="100"/>
