Author: hansbak
Date: Wed Mar 14 10:24:05 2012
New Revision: 1300496
URL: http://svn.apache.org/viewvc?rev=1300496&view=rev
Log:
fix the setup component, move some paypal gateway code back to seed again
Modified:
ofbiz/trunk/applications/commonext/data/ProductStoreData.xml
ofbiz/trunk/applications/commonext/data/helpdata/HELP_SETUP.xml
ofbiz/trunk/applications/commonext/widget/ofbizsetup/SetupForms.xml
Modified: ofbiz/trunk/applications/commonext/data/ProductStoreData.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/data/ProductStoreData.xml?rev=1300496&r1=1300495&r2=1300496&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/data/ProductStoreData.xml (original)
+++ ofbiz/trunk/applications/commonext/data/ProductStoreData.xml Wed Mar 14
10:24:05 2012
@@ -19,6 +19,15 @@
-->
<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"/>
+
<ProductStorePaymentSetting productStoreId="PRODUCTSTOREID"
paymentMethodTypeId="CREDIT_CARD" paymentServiceTypeEnumId="PRDS_PAY_AUTH"
paymentService="alwaysApproveCCProcessor"
paymentCustomMethodId="CC_AUTH_ALWAYSAPPROV"/>
<ProductStorePaymentSetting productStoreId="PRODUCTSTOREID"
paymentMethodTypeId="CREDIT_CARD" paymentServiceTypeEnumId="PRDS_PAY_RELEASE"
paymentService="testCCRelease" paymentCustomMethodId="CC_RELEASE_TEST"/>
<ProductStorePaymentSetting productStoreId="PRODUCTSTOREID"
paymentMethodTypeId="CREDIT_CARD" paymentServiceTypeEnumId="PRDS_PAY_CAPTURE"
paymentService="testCCCapture" paymentCustomMethodId="CC_CAPTURE_TEST"/>
Modified: ofbiz/trunk/applications/commonext/data/helpdata/HELP_SETUP.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/data/helpdata/HELP_SETUP.xml?rev=1300496&r1=1300495&r2=1300496&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/data/helpdata/HELP_SETUP.xml (original)
+++ ofbiz/trunk/applications/commonext/data/helpdata/HELP_SETUP.xml Wed Mar 14
10:24:05 2012
@@ -44,7 +44,7 @@
<para>1. Open a new terminal.</para>
<para>2. Go to your ofbiz directory.</para>
<para>3. Clean out all built classes with : ./ant clean-all </para>
- <para>4. Load the seed data with : ant run-install-extseed</para>
+ <para>4. Load the seed data with : ./ant run-install-seed </para>
<para>5. Create the admin user with : ./ant create-admin-user-login ,
then enter a user login id that will be created for you (the initial temporary
password is "ofbiz")</para>
<para>6. Start ofbiz with : ./startofbiz.sh </para>
<para>7. Connect to the OFBiz Setup application with your browser at
https://localhost:8443/ofbizsetup.</para>
Modified: ofbiz/trunk/applications/commonext/widget/ofbizsetup/SetupForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/widget/ofbizsetup/SetupForms.xml?rev=1300496&r1=1300495&r2=1300496&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/widget/ofbizsetup/SetupForms.xml
(original)
+++ ofbiz/trunk/applications/commonext/widget/ofbizsetup/SetupForms.xml Wed Mar
14 10:24:05 2012
@@ -207,7 +207,7 @@
<form name="EditProdCatalog" extends="EditProdCatalog"
extends-resource="component://product/widget/catalog/ProdCatalogForms.xml">
<field use-when="prodCatalog==null&&prodCatalogId==null"
name="prodCatalogId" tooltip="${uiLabelMap.CommonRequired}"
widget-style="required"><text default-value="${partyId}"/></field>
- <field name="catalogName" title="${uiLabelMap.ProductCatalogName}"
tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text size="30"
maxlength="60"/></field>
+ <field name="catalogName"
title="${uiLabelMap.FormFieldTitle_prodCatalogName}"
tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text size="30"
maxlength="60"/></field>
<field name="partyId"><hidden value="${partyId}"/></field>
<field name="productStoreId"><hidden
value="${productStoreId}"/></field>
<field name="useQuickAdd"><hidden value="Y"/></field>
@@ -230,7 +230,7 @@
<field name="prodCatalogId"><hidden value="${prodCatalogId}"/></field>
<field name="productCategoryTypeId"><hidden
value="CATALOG_CATEGORY"/></field>
<field name="categoryName" tooltip="${uiLabelMap.CommonRequired}"
widget-style="required"><text size="30" maxlength="60"/></field>
- <field name="description"
title="${uiLabelMap.ProductProductDescription}"><textarea cols="60"
rows="2"/></field>
+ <field name="description"
title="${uiLabelMap.ProductCategoryDescription}"><textarea cols="60"
rows="2"/></field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}"
widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
