svn commit: r899812 [1/8] - in /ofbiz/trunk: applications/accounting/src/or
Locked
svn commit: r899812 [1/8] - in /ofbiz/trunk: applications/accounting/src/or
 
|
Author: doogie
Date: Fri Jan 15 21:00:23 2010 New Revision: 899812 URL: http://svn.apache.org/viewvc?rev=899812&view=rev Log: Fix trailing whitespace, and mixed tab/space at the beginning of lines. Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountProductServices.java ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceWorker.java ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentMethodServices.java ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/AIMPaymentServices.java ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/clearcommerce/CCPaymentServices.java ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/cybersource/IcsPaymentServices.java ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/orbital/OrbitalPaymentServices.java ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalEvents.java ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalServices.java ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/sagepay/SagePayPaymentServices.java ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/sagepay/SagePayServices.java ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/sagepay/SagePayUtil.java ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/verisign/PayflowPro.java ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/util/UtilAccounting.java ofbiz/trunk/applications/content/src/org/ofbiz/content/cms/CmsEvents.java ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentMapFacade.java ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentWorker.java ofbiz/trunk/applications/content/src/org/ofbiz/content/survey/SurveyEvents.java ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java ofbiz/trunk/applications/marketing/src/org/ofbiz/sfa/vcard/VCard.java ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderEvents.java ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderListState.java ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java ofbiz/trunk/applications/order/src/org/ofbiz/order/requirement/RequirementServices.java ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.java ofbiz/trunk/applications/order/src/org/ofbiz/order/thirdparty/paypal/ExpressCheckoutEvents.java ofbiz/trunk/applications/party/src/org/ofbiz/party/communication/CommunicationEventServices.java ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyRelationshipHelper.java ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyRelationshipServices.java ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyServices.java ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyTypeHelper.java ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyWorker.java ofbiz/trunk/applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductEvents.java ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductSearchSession.java ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductServices.java ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductWorker.java ofbiz/trunk/applications/product/src/org/ofbiz/product/promo/PromoServices.java ofbiz/trunk/applications/product/src/org/ofbiz/shipment/shipment/ShipmentWorker.java ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/ups/UpsServices.java ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServices.java ofbiz/trunk/applications/product/src/org/ofbiz/shipment/verify/VerifyPickSession.java ofbiz/trunk/applications/product/src/org/ofbiz/shipment/weightPackage/WeightPackageSession.java ofbiz/trunk/applications/securityext/src/org/ofbiz/securityext/da/ServiceDaHandler.java ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalConverter.java ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalHandlerFactory.java ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalWorker.java ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortWorker.java ofbiz/trunk/framework/appserver/src/org/ofbiz/appservers/GenerateContainer.java ofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/ConverterLoader.java ofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/Converters.java ofbiz/trunk/framework/base/src/org/ofbiz/base/util/ObjectType.java ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilFormatOut.java ofbiz/trunk/framework/base/src/org/ofbiz/base/util/template/XslTransform.java ofbiz/trunk/framework/birt/src/org/ofbiz/birt/BirtWorker.java ofbiz/trunk/framework/birt/src/org/ofbiz/birt/container/BirtContainer.java ofbiz/trunk/framework/birt/src/org/ofbiz/birt/email/BirtEmailServices.java ofbiz/trunk/framework/birt/src/org/ofbiz/birt/report/context/BirtViewerAttributeBean.java ofbiz/trunk/framework/birt/src/org/ofbiz/birt/report/context/OFBizBirtContext.java ofbiz/trunk/framework/birt/src/org/ofbiz/birt/report/service/OFBizBirtViewerReportService.java ofbiz/trunk/framework/birt/src/org/ofbiz/birt/report/servlet/BirtEngineServlet.java ofbiz/trunk/framework/birt/src/org/ofbiz/birt/report/servlet/BirtViewerServlet.java ofbiz/trunk/framework/birt/src/org/ofbiz/birt/webapp/view/BirtViewHandler.java ofbiz/trunk/framework/birt/src/org/ofbiz/birt/widget/BirtFactory.java ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonServices.java ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonWorkers.java ofbiz/trunk/framework/common/src/org/ofbiz/common/FindServices.java ofbiz/trunk/framework/common/src/org/ofbiz/common/authentication/AuthHelper.java ofbiz/trunk/framework/common/src/org/ofbiz/common/authentication/AuthenticationComparator.java ofbiz/trunk/framework/common/src/org/ofbiz/common/authentication/api/Authenticator.java ofbiz/trunk/framework/common/src/org/ofbiz/common/authentication/api/AuthenticatorException.java ofbiz/trunk/framework/common/src/org/ofbiz/common/email/EmailServices.java ofbiz/trunk/framework/common/src/org/ofbiz/common/image/ImageTransform.java ofbiz/trunk/framework/common/src/org/ofbiz/common/preferences/PreferenceServices.java ofbiz/trunk/framework/common/src/org/ofbiz/common/uom/UomWorker.java ofbiz/trunk/framework/datafile/src/org/ofbiz/datafile/Record.java ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityExpr.java ofbiz/trunk/framework/entity/src/org/ofbiz/entity/datasource/GenericDAO.java ofbiz/trunk/framework/entity/src/org/ofbiz/entity/serialize/XmlSerializer.java ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/data/EntityDataLoadContainer.java ofbiz/trunk/framework/guiapp/src/org/ofbiz/guiapp/xui/XuiContainer.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/MethodContext.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallService.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/HasPermissionCondition.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityCount.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/CheckPermission.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfHasPermission.java ofbiz/trunk/framework/security/src/org/ofbiz/security/OFBizSecurity.java ofbiz/trunk/framework/security/src/org/ofbiz/security/authz/AbstractAuthorization.java ofbiz/trunk/framework/security/src/org/ofbiz/security/authz/Authorization.java ofbiz/trunk/framework/security/src/org/ofbiz/security/authz/da/DynamicAccess.java ofbiz/trunk/framework/security/src/org/ofbiz/security/authz/da/DynamicAccessFactory.java ofbiz/trunk/framework/security/src/org/ofbiz/security/authz/da/DynamicAccessHandler.java ofbiz/trunk/framework/security/src/org/ofbiz/security/authz/da/GroovyDaHandler.java ofbiz/trunk/framework/security/src/org/ofbiz/security/authz/da/ObjectDaHandler.java ofbiz/trunk/framework/service/src/org/ofbiz/service/DispatchContext.java ofbiz/trunk/framework/service/src/org/ofbiz/service/GenericAbstractDispatcher.java ofbiz/trunk/framework/service/src/org/ofbiz/service/LocalDispatcher.java ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelParam.java ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelService.java ofbiz/trunk/framework/service/src/org/ofbiz/service/ServiceDispatcher.java ofbiz/trunk/framework/service/src/org/ofbiz/service/ServiceUtil.java ofbiz/trunk/framework/service/src/org/ofbiz/service/eca/ServiceEcaRule.java ofbiz/trunk/framework/service/src/org/ofbiz/service/eca/ServiceEcaSetField.java ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/SOAPClientEngine.java ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/StandardJavaEngine.java ofbiz/trunk/framework/service/src/org/ofbiz/service/job/AbstractJob.java ofbiz/trunk/framework/service/src/org/ofbiz/service/job/JobInvoker.java ofbiz/trunk/framework/service/src/org/ofbiz/service/job/JobManager.java ofbiz/trunk/framework/service/src/org/ofbiz/service/mail/JavaMailContainer.java ofbiz/trunk/framework/service/src/org/ofbiz/service/mail/MimeMessageWrapper.java ofbiz/trunk/framework/service/src/org/ofbiz/service/rmi/ExampleRemoteClient.java ofbiz/trunk/framework/service/src/org/ofbiz/service/test/ServiceSOAPTests.java ofbiz/trunk/framework/service/src/org/ofbiz/service/testtools/OFBizTestCase.java ofbiz/trunk/framework/sql/src/org/ofbiz/sql/Main.java ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/ModelTestSuite.java ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/TestRunContainer.java ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/VerifySeleniumSetups.java ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/seleniumxml/DataLoader.java ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/seleniumxml/DataLoop.java ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/seleniumxml/GroovyRunner.java ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/seleniumxml/InitJython.java ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/seleniumxml/JythonRunner.java ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/seleniumxml/RemoteRequest.java ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/seleniumxml/util/TestUtils.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ContextFilter.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/LoginWorker.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ProtectViewWorker.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/CoreEvents.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/SOAPEventHandler.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/ServiceMultiEventHandler.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/stats/ServerHitBin.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/webdav/PropFindHelper.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/webdav/RequestHandlerFactory.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/webdav/ResponseHelper.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/webdav/WebDavUtil.java ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelReferences.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/WidgetWorker.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/fo/FoFormRenderer.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/fo/FoScreenRenderer.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelForm.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlMenuRenderer.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/MenuFactory.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenuItem.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/IterateSectionWidget.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenRenderer.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/text/TextFormRenderer.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/ModelTree.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/xml/XmlFormRenderer.java ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/authentication/ApplicationAuthenticationContext.java ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/authentication/AuthenticatedToken.java ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/authentication/PasswordCredential.java ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/authentication/PrincipalAuthenticationContext.java ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/authentication/ValidationFactor.java ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/ApplicationAccessDeniedException.java ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/ApplicationPermissionException.java ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/InactiveAccountException.java ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/InvalidAuthenticationException.java ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/InvalidAuthorizationTokenException.java ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/InvalidCredentialException.java ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/InvalidGroupException.java ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/InvalidPrincipalException.java ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/InvalidRoleException.java ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/InvalidTokenException.java ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/ObjectNotFoundException.java ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/soap/SOAPAttribute.java ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/soap/SOAPCookieInfo.java ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/soap/SOAPGroup.java ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/soap/SOAPNestableGroup.java ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/soap/SOAPPrincipal.java ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/soap/SOAPRole.java ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/soap/SearchRestriction.java ofbiz/trunk/specialpurpose/crowd/src/org/ofbiz/crowd/CrowdAuthenticator.java ofbiz/trunk/specialpurpose/crowd/src/org/ofbiz/crowd/security/SecurityServerLocator.java ofbiz/trunk/specialpurpose/crowd/src/org/ofbiz/crowd/user/UserAttributeMapper.java ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayHelper.java ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayOrderServices.java ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/ImportOrdersFromEbay.java ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/ProductsExportToEbay.java ofbiz/trunk/specialpurpose/googlebase/src/org/ofbiz/googlebase/ProductsExportToGoogle.java ofbiz/trunk/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleCheckoutHelper.java ofbiz/trunk/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleCheckoutResponseEvents.java ofbiz/trunk/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleRequestServices.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/PromoStatusBar.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Receipt.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/PromoEvents.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/ConfigureItem.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/NumericKeypad.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/PosScreen.java Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountProductServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountProductServices.java?rev=899812&r1=899811&r2=899812&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountProductServices.java (original) +++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountProductServices.java Fri Jan 15 21:00:23 2010 @@ -207,7 +207,7 @@ Debug.logFatal(ServiceUtil.getErrorMessage(createResp), module); return createResp; } - + finAccountId = (String) createResp.get("finAccountId"); // create the owner role Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java?rev=899812&r1=899811&r2=899812&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java (original) +++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java Fri Jan 15 21:00:23 2010 @@ -819,7 +819,7 @@ List<String> salesInvoiceRolePartyIds = EntityUtil.getFieldListFromEntityList(delegator.findList("InvoiceRole", EntityCondition.makeCondition(invoiceRoleConds, EntityOperator.AND), null, null, null, false), "partyId", true); if (UtilValidate.isNotEmpty(salesInvoiceRolePartyIds)) { salesRepPartyIds = UtilGenerics.checkList(CollectionUtils.intersection(salesRepPartyIds, salesInvoiceRolePartyIds)); - } + } } invoice = delegator.findOne("Invoice", UtilMisc.toMap("invoiceId", salesInvoiceId), false); String invoiceTypeId = invoice.getString("invoiceTypeId"); @@ -1054,7 +1054,7 @@ String shipmentId = (String) context.get("shipmentId"); Locale locale = (Locale) context.get("locale"); GenericValue userLogin = (GenericValue) context.get("userLogin"); - + // 1. Find all the orders for this shipment // 2. For every order check the invoice // 2.a If the invoice is in In-Process status, then move its status to ready and capture the payment. @@ -1084,7 +1084,7 @@ return ServiceUtil.returnSuccess(); } // The orders can now be placed in separate groups, each for - // 1. The group of orders for which payment is already captured. No grouping and action required. + // 1. The group of orders for which payment is already captured. No grouping and action required. // 2. The group of orders for which invoice is IN-Process status. Map<String, Object> ordersWithInProcessInvoice = FastMap.newInstance(); @@ -1260,7 +1260,7 @@ billFields.add(EntityCondition.makeCondition("orderId", orderId)); billFields.add(EntityCondition.makeCondition("orderItemSeqId", orderItemSeqId)); billFields.add(EntityCondition.makeCondition("statusId", EntityOperator.NOT_EQUAL, "INVOICE_CANCELLED")); - + if (dropShipmentFound) { // Drop shipments have neither issuances nor receipts, so this check is meaningless Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceWorker.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceWorker.java?rev=899812&r1=899811&r2=899812&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceWorker.java (original) +++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceWorker.java Fri Jan 15 21:00:23 2010 @@ -164,7 +164,7 @@ } /** - * + * * Return the total amount of the invoice (including tax) using the the invoice GenericValue as input. * with the ability to specify if the actual currency is required. * @param invoice @@ -185,12 +185,12 @@ if ("SALES_INVOICE".equals(invoice.getString("invoiceTypeId"))) { invoiceItems = EntityUtil.filterByAnd( invoiceItems, UtilMisc.toList( - EntityCondition.makeCondition("invoiceItemTypeId", EntityOperator.NOT_EQUAL, "INV_SALES_TAX"), + EntityCondition.makeCondition("invoiceItemTypeId", EntityOperator.NOT_EQUAL, "INV_SALES_TAX"), EntityCondition.makeCondition("invoiceItemTypeId", EntityOperator.NOT_EQUAL, "ITM_SALES_TAX"))); } else if (("PURCHASE_INVOICE".equals(invoice.getString("invoiceTypeId")))) { invoiceItems = EntityUtil.filterByAnd( invoiceItems, UtilMisc.toList( - EntityCondition.makeCondition("invoiceItemTypeId", EntityOperator.NOT_EQUAL, "PINV_SALES_TAX"), + EntityCondition.makeCondition("invoiceItemTypeId", EntityOperator.NOT_EQUAL, "PINV_SALES_TAX"), EntityCondition.makeCondition("invoiceItemTypeId", EntityOperator.NOT_EQUAL, "PITM_SALES_TAX"))); } } catch (GenericEntityException e) { @@ -654,12 +654,12 @@ if ("SALES_INVOICE".equals(invoice.getString("invoiceTypeId"))) { invoiceItems = EntityUtil.filterByOr( invoiceItems, UtilMisc.toList( - EntityCondition.makeCondition("invoiceItemTypeId", EntityOperator.EQUALS, "INV_SALES_TAX"), + EntityCondition.makeCondition("invoiceItemTypeId", EntityOperator.EQUALS, "INV_SALES_TAX"), EntityCondition.makeCondition("invoiceItemTypeId", EntityOperator.EQUALS, "ITM_SALES_TAX"))); } else if (("PURCHASE_INVOICE".equals(invoice.getString("invoiceTypeId")))) { invoiceItems = EntityUtil.filterByOr( invoiceItems, UtilMisc.toList( - EntityCondition.makeCondition("invoiceItemTypeId", EntityOperator.EQUALS, "PINV_SALES_TAX"), + EntityCondition.makeCondition("invoiceItemTypeId", EntityOperator.EQUALS, "PINV_SALES_TAX"), EntityCondition.makeCondition("invoiceItemTypeId", EntityOperator.EQUALS, "PITM_SALES_TAX"))); } else { invoiceItems = null; Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java?rev=899812&r1=899811&r2=899812&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java (original) +++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java Fri Jan 15 21:00:23 2010 @@ -122,16 +122,16 @@ return ServiceUtil.returnError("Problems getting required information: orderPaymentPreference [" + orderPaymentPreferenceId + "]"); } OrderReadHelper orh = new OrderReadHelper(orderHeader); - + // get the total remaining BigDecimal totalRemaining = orh.getOrderGrandTotal(); - + // get the process attempts so far Long procAttempt = orderPaymentPreference.getLong("processAttempt"); if (procAttempt == null) { procAttempt = Long.valueOf(0); } - + // update the process attempt count orderPaymentPreference.set("processAttempt", Long.valueOf(procAttempt.longValue() + 1)); try { @@ -496,7 +496,7 @@ // Check if the order is a replacement order boolean replacementOrderFlag = isReplacementOrder(orderHeader); - + // don't authorized more then what is required if (!replacementOrderFlag && processAmount.compareTo(totalRemaining) > 0) { processAmount = totalRemaining; @@ -759,7 +759,7 @@ return result; } - + public static Map<String, Object> processCreditResult(DispatchContext dctx, Map<String, ? extends Object> context) { Delegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); @@ -837,7 +837,7 @@ } return ServiceUtil.returnSuccess(); } - + /** * * Releases authorization for a single OrderPaymentPreference through service calls to the defined processing service for the ProductStore/PaymentMethodType @@ -950,7 +950,7 @@ } return result; } - + public static Map<String, Object> processReleaseResult(DispatchContext dctx, Map<String, ? extends Object> context) { Delegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); @@ -993,7 +993,7 @@ savePgr(dctx, respMsg); } } - + if (releaseResponse != null && releaseResponse.booleanValue()) { paymentPref.set("statusId", "PAYMENT_CANCELLED"); try { @@ -1029,7 +1029,7 @@ } return ServiceUtil.returnSuccess(); } - + /** * Captures payments through service calls to the defined processing service for the ProductStore/PaymentMethodType * @return COMPLETE|FAILED|ERROR for complete processing of ALL payment methods. @@ -1398,7 +1398,7 @@ // create the new payment preference delegator.create(newPref); - // PayPal requires us to reuse the existing authorization, so we'll + // PayPal requires us to reuse the existing authorization, so we'll // fake it and copy the existing auth with the remaining amount if ("EXT_PAYPAL".equals(paymentPref.get("paymentMethodTypeId"))) { String newAuthId = delegator.getNextSeqId("PaymentGatewayResponse"); @@ -1601,7 +1601,7 @@ } paymentConfig = paymentSettings.getString("paymentPropertiesPath"); paymentGatewayConfigId = paymentSettings.getString("paymentGatewayConfigId"); - + if (serviceName == null) { Debug.logError("Service name is null for payment setting; cannot process", module); return null; @@ -2294,7 +2294,7 @@ } return ServiceUtil.returnSuccess(); } - + public static Map<String, Object> refundOrderPaymentPreference(DispatchContext dctx, Map<String, ? extends Object> context) { Delegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); @@ -2322,7 +2322,7 @@ } return refundResponse; } - + public static Map<String, Object> refundPayment(DispatchContext dctx, Map<String, ? extends Object> context) { LocalDispatcher dispatcher = dctx.getDispatcher(); GenericValue userLogin = (GenericValue) context.get("userLogin"); @@ -2344,10 +2344,10 @@ if (orderHeader != null) { paymentSettings = getPaymentSettings(orderHeader, paymentPref, REFUND_SERVICE_TYPE, false); } - + String serviceName = null; String paymentGatewayConfigId = null; - + if (paymentSettings != null) { String customMethodId = paymentSettings.getString("paymentCustomMethodId"); if (UtilValidate.isNotEmpty(customMethodId)) { @@ -2358,7 +2358,7 @@ } String paymentConfig = paymentSettings.getString("paymentPropertiesPath"); paymentGatewayConfigId = paymentSettings.getString("paymentGatewayConfigId"); - + if (serviceName != null) { Map<String, Object> serviceContext = FastMap.newInstance(); serviceContext.put("orderPaymentPreference", paymentPref); @@ -2688,7 +2688,7 @@ } return ServiceUtil.returnSuccess(); } - + public static GenericValue getCaptureTransaction(GenericValue orderPaymentPreference) { GenericValue capTrans = null; try { @@ -2702,7 +2702,7 @@ } return capTrans; } - + /** * Gets the chronologically latest PaymentGatewayResponse from an OrderPaymentPreference which is either a PRDS_PAY_AUTH * or PRDS_PAY_REAUTH. Used for capturing. @@ -2712,7 +2712,7 @@ public static GenericValue getAuthTransaction(GenericValue orderPaymentPreference) { return EntityUtil.getFirst(getAuthTransactions(orderPaymentPreference)); } - + /** * Gets a chronologically ordered list of PaymentGatewayResponses from an OrderPaymentPreference which is either a PRDS_PAY_AUTH * or PRDS_PAY_REAUTH. @@ -2749,7 +2749,7 @@ if (authTime == null) { return false; } - + String reauthDays = null; GenericValue paymentMethod = null; @@ -2810,7 +2810,7 @@ } // safe payment gateway response store - + /** * Saves either a PaymentGatewayResponse or PaymentGatewayRespMsg value and ensures that the value * is persisted even in the event of a rollback. @@ -2848,7 +2848,7 @@ return ServiceUtil.returnSuccess(); } - + // manual auth service public static Map<String, Object> processManualCcAuth(DispatchContext dctx, Map<String, ? extends Object> context) { GenericValue userLogin = (GenericValue) context.get("userLogin"); @@ -2973,7 +2973,7 @@ return ServiceUtil.returnError("Authorization failed"); } } - + // manual processing service public static Map<String, Object> processManualCcTx(DispatchContext dctx, Map<String, ? extends Object> context) { GenericValue userLogin = (GenericValue) context.get("userLogin"); @@ -3058,7 +3058,7 @@ if (paymentService == null || (paymentGatewayConfigId == null && paymentConfig == null)) { return ServiceUtil.returnError("Invalid product store payment settings"); } - + if (paymentMethodTypeId.equals("CREDIT_CARD")) { GenericValue creditCard = delegator.makeValue("CreditCard"); creditCard.setAllFields(context, true, null, null); @@ -3087,7 +3087,7 @@ requestContext.put("referenceCode", referenceCode); String currency = UtilProperties.getPropertyValue("general.properties", "currency.uom.id.default", "USD"); requestContext.put("currency", currency); - requestContext.put("creditAmount", context.get("amount")); + requestContext.put("creditAmount", context.get("amount")); } else { return ServiceUtil.returnError("Payment method type : " + paymentMethodTypeId + " is not yet implemented for manual transactions"); } @@ -3131,7 +3131,7 @@ returnResults.put("referenceNum", refNum); return returnResults; } - + // Verify Credit Card (Manually) Service public static Map<String, Object>verifyCreditCard(DispatchContext dctx, Map<String, ? extends Object> context) { LocalDispatcher dispatcher = dctx.getDispatcher(); @@ -3529,7 +3529,7 @@ result.put("refundMessage", "This is a test refund failure; no money was transferred"); return result; } - + public static String getPaymentCustomMethod(Delegator delegator, String customMethodId) { String serviceName = null; GenericValue customMethod = null; @@ -3543,10 +3543,10 @@ } return serviceName; } - + public static boolean isReplacementOrder(GenericValue orderHeader) { boolean replacementOrderFlag = false; - + List<GenericValue> returnItemResponses = FastList.newInstance(); try { returnItemResponses = orderHeader.getRelated("ReplacementReturnItemResponse"); @@ -3557,7 +3557,7 @@ if (UtilValidate.isNotEmpty(returnItemResponses)) { replacementOrderFlag = true; } - + return replacementOrderFlag; } } Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentMethodServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentMethodServices.java?rev=899812&r1=899811&r2=899812&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentMethodServices.java (original) +++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentMethodServices.java Fri Jan 15 21:00:23 2010 @@ -143,18 +143,18 @@ context.put("cardNumber", StringUtil.removeSpaces((String) context.get("cardNumber"))); if (!UtilValidate.isCardMatch((String) context.get("cardType"), (String) context.get("cardNumber"))) { messages.add( - UtilProperties.getMessage(resource, "AccountingCreditCardNumberInvalid", + UtilProperties.getMessage(resource, "AccountingCreditCardNumberInvalid", UtilMisc.toMap("cardNumber", (String) context.get("cardNumber"), "cardType", (String) context.get("cardType"), "validCardType", UtilValidate.getCardType((String) context.get("cardNumber"))), locale)); } - + if (!UtilValidate.isDateAfterToday((String) context.get("expireDate"))) { messages.add( - UtilProperties.getMessage(resource, "AccountingCreditCardExpireDateBeforeToday", + UtilProperties.getMessage(resource, "AccountingCreditCardExpireDateBeforeToday", UtilMisc.toMap("expireDate", (String) context.get("expireDate")), locale)); } - + if (messages.size() > 0) { return ServiceUtil.returnError(messages); } @@ -304,20 +304,20 @@ } context.put("cardNumber", updatedCardNumber); - if (!UtilValidate.isCardMatch((String) context.get("cardType"), (String) context.get("cardNumber"))) { + if (!UtilValidate.isCardMatch((String) context.get("cardType"), (String) context.get("cardNumber"))) { messages.add( - UtilProperties.getMessage(resource, "AccountingCreditCardNumberInvalid", + UtilProperties.getMessage(resource, "AccountingCreditCardNumberInvalid", UtilMisc.toMap("cardNumber", (String) context.get("cardNumber"), "cardType", (String) context.get("cardType"), "validCardType", UtilValidate.getCardType((String) context.get("cardNumber"))), locale)); } - - if (!UtilValidate.isDateAfterToday((String) context.get("expireDate"))) { + + if (!UtilValidate.isDateAfterToday((String) context.get("expireDate"))) { messages.add( - UtilProperties.getMessage(resource, "AccountingCreditCardExpireDateBeforeToday", + UtilProperties.getMessage(resource, "AccountingCreditCardExpireDateBeforeToday", UtilMisc.toMap("expireDate", (String) context.get("expireDate")), locale)); } - + if (messages.size() > 0) { return ServiceUtil.returnError(messages); } @@ -330,7 +330,7 @@ String newPmId = null; try { newPmId = delegator.getNextSeqId("PaymentMethod"); - } catch (IllegalArgumentException e) { + } catch (IllegalArgumentException e) { return ServiceUtil.returnError(UtilProperties.getMessage(resource, "AccountingCreditCardUpdateIdGenerationFailure", locale)); } Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java?rev=899812&r1=899811&r2=899812&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java (original) +++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java Fri Jan 15 21:00:23 2010 @@ -162,7 +162,7 @@ if (productStoreId != null) { productStore = delegator.findByPrimaryKey("ProductStore", UtilMisc.toMap("productStoreId", productStoreId)); } - + } catch (GenericEntityException e) { String errMsg = "Data error getting tax settings: " + e.toString(); Debug.logError(e, errMsg, module); @@ -176,14 +176,14 @@ else { try { - getTaxAuthorities(delegator, shippingAddress, taxAuthoritySet); + getTaxAuthorities(delegator, shippingAddress, taxAuthoritySet); } catch (GenericEntityException e) { String errMsg = "Data error getting tax settings: " + e.toString(); Debug.logError(e, errMsg, module); return ServiceUtil.returnError(errMsg); } } - + // Setup the return lists. List orderAdjustments = FastList.newInstance(); List itemAdjustments = FastList.newInstance(); @@ -286,7 +286,7 @@ taxAuthCondOrList.add(taxAuthCond); } EntityCondition taxAuthoritiesCond = EntityCondition.makeCondition(taxAuthCondOrList, EntityOperator.OR); - + try { EntityCondition productCategoryCond = null; if (product != null) { @@ -318,14 +318,14 @@ mainExprs.add(EntityCondition.makeCondition(EntityCondition.makeCondition("minItemPrice", EntityOperator.EQUALS, null), EntityOperator.OR, EntityCondition.makeCondition("minItemPrice", EntityOperator.LESS_THAN_EQUAL_TO, itemPrice))); mainExprs.add(EntityCondition.makeCondition(EntityCondition.makeCondition("minPurchase", EntityOperator.EQUALS, null), EntityOperator.OR, EntityCondition.makeCondition("minPurchase", EntityOperator.LESS_THAN_EQUAL_TO, itemAmount))); EntityCondition mainCondition = EntityCondition.makeCondition(mainExprs, EntityOperator.AND); - + // create the orderby clause List orderList = UtilMisc.toList("minItemPrice", "minPurchase", "fromDate"); // finally ready... do the rate query List lookupList = delegator.findList("TaxAuthorityRateProduct", mainCondition, null, orderList, null, false); List filteredList = EntityUtil.filterByDate(lookupList, true); - + if (filteredList.size() == 0) { Debug.logWarning("In TaxAuthority Product Rate no records were found for condition:" + mainCondition.toString(), module); return adjustments; Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/AIMPaymentServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/AIMPaymentServices.java?rev=899812&r1=899811&r2=899812&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/AIMPaymentServices.java (original) +++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/AIMPaymentServices.java Fri Jan 15 21:00:23 2010 @@ -45,26 +45,26 @@ import org.ofbiz.service.ServiceUtil; public class AIMPaymentServices { - + public static final String module = AIMPaymentServices.class.getName(); - + // The list of refund failure response codes that would cause the ccRefund service // to attempt to void the refund's associated authorization transaction. This list // contains the responses where the voiding does not need to be done within a certain // time limit private static final List<String> VOIDABLE_RESPONSES_NO_TIME_LIMIT = UtilMisc.toList("50"); - + // A list of refund failure response codes that would cause the ccRefund service // to first check whether the refund's associated authorization transaction has occurred // within a certain time limit, and if so, cause it to void the transaction private static final List<String> VOIDABLE_RESPONSES_TIME_LIMIT = UtilMisc.toList("54"); - + // The number of days in the time limit when one can safely consider an unsettled // transaction to be still valid private static final int TIME_LIMIT_VERIFICATION_DAYS = 120; - + private static Properties AIMProperties = null; - + // A routine to check whether a given refund failure response code will cause the // ccRefund service to attempt to void the refund's associated authorization transaction private static boolean isVoidableResponse(String responseCode) { @@ -72,7 +72,7 @@ VOIDABLE_RESPONSES_NO_TIME_LIMIT.contains(responseCode) || VOIDABLE_RESPONSES_TIME_LIMIT.contains(responseCode); } - + public static Map<String, Object> ccAuth(DispatchContext ctx, Map<String, Object> context) { Delegator delegator = ctx.getDelegator(); Map<String, Object> results = ServiceUtil.returnSuccess(); @@ -96,7 +96,7 @@ processAuthTransResult(reply, results); return results; } - + public static Map<String, Object> ccCapture(DispatchContext ctx, Map<String, Object> context) { Delegator delegator = ctx.getDelegator(); GenericValue orderPaymentPreference = (GenericValue) context.get("orderPaymentPreference"); @@ -141,7 +141,7 @@ } return results; } - + public static Map<String, Object> ccRefund(DispatchContext ctx, Map<String, Object> context) { Delegator delegator = ctx.getDelegator(); GenericValue orderPaymentPreference = (GenericValue) context.get("orderPaymentPreference"); @@ -222,7 +222,7 @@ } return results; } - + public static Map<String, Object> ccRelease(DispatchContext ctx, Map<String, Object> context) { Delegator delegator = ctx.getDelegator(); GenericValue orderPaymentPreference = (GenericValue) context.get("orderPaymentPreference"); @@ -238,7 +238,7 @@ results.putAll(processReleaseTransResult(reply)); return results; } - + private static Map<String, Object> voidTransaction(GenericValue authTransaction, Map<String, Object> context, Delegator delegator) { context.put("authTransaction", authTransaction); Map<String, Object> results = ServiceUtil.returnSuccess(); @@ -257,14 +257,14 @@ } return processCard(request, props); } - + public static Map<String, Object> ccCredit(DispatchContext ctx, Map<String, Object> context) { Map<String, Object> results = FastMap.newInstance(); results.put(ModelService.RESPONSE_MESSAGE, ModelService.RESPOND_ERROR); results.put(ModelService.ERROR_MESSAGE, "Authorize.net ccCredit unsupported with version 3.1"); return results; } - + public static Map<String, Object> ccAuthCapture(DispatchContext ctx, Map<String, Object> context) { Delegator delegator = ctx.getDelegator(); Map<String, Object> results = ServiceUtil.returnSuccess(); @@ -292,7 +292,7 @@ } return results; } - + private static Map<String, Object> processCard(Map<String, Object> request, Properties props) { Map<String, Object> result = FastMap.newInstance(); String url = props.getProperty("url"); @@ -328,11 +328,11 @@ result.put(ModelService.RESPONSE_MESSAGE, ModelService.RESPOND_SUCCESS); return result; } - + private static boolean isTestMode() { return "true".equalsIgnoreCase((String)AIMProperties.get("testReq")); } - + private static Properties buildAIMProperties(Map<String, Object> context, Delegator delegator) { String paymentGatewayConfigId = (String) context.get("paymentGatewayConfigId"); String configStr = (String) context.get("paymentConfig"); @@ -395,7 +395,7 @@ } return props; } - + private static void buildMerchantInfo(Map<String, Object> params, Properties props, Map<String, Object> AIMRequest) { AIMRequest.put("x_Login", props.getProperty("login")); String trankey = props.getProperty("trankey"); @@ -405,12 +405,12 @@ AIMRequest.put("x_Password",props.getProperty("password")); AIMRequest.put("x_Version", props.getProperty("ver")); } - + private static void buildGatewayResponeConfig(Map<String, Object> params, Properties props, Map<String, Object> AIMRequest) { AIMRequest.put("x_Delim_Data", props.getProperty("delimited")); AIMRequest.put("x_Delim_Char", props.getProperty("delimiter")); } - + private static void buildCustomerBillingInfo(Map<String, Object> params, Properties props, Map<String, Object> AIMRequest) { try { // this would be used in the case of a capture, where one of the parameters is an OrderPaymentPreference @@ -456,7 +456,7 @@ return; } } - + private static void buildEmailSettings(Map<String, Object> params, Properties props, Map<String, Object> AIMRequest) { GenericValue ea = (GenericValue)params.get("billToEmail"); AIMRequest.put("x_Email_Customer", props.getProperty("emailCustomer")); @@ -465,14 +465,14 @@ AIMRequest.put("x_Email", UtilFormatOut.checkNull(ea.getString("infoString"))); } } - + private static void buildInvoiceInfo(Map<String, Object> params, Properties props, Map<String, Object> AIMRequest) { String description = UtilFormatOut.checkNull(props.getProperty("transDescription")); String orderId = UtilFormatOut.checkNull((String)params.get("orderId")); AIMRequest.put("x_Invoice_Num", "Order " + orderId); AIMRequest.put("x_Description", description); } - + private static void buildAuthTransaction(Map<String, Object> params, Properties props, Map<String, Object> AIMRequest) { GenericValue cc = (GenericValue) params.get("creditCard"); String currency = (String) params.get("currency"); @@ -490,7 +490,7 @@ AIMRequest.put("x_card_code", cardSecurityCode); } } - + private static void buildCaptureTransaction(Map<String, Object> params, Properties props, Map<String, Object> AIMRequest) { GenericValue at = (GenericValue) params.get("authTransaction"); GenericValue cc = (GenericValue) params.get("creditCard"); @@ -507,7 +507,7 @@ AIMRequest.put("x_Trans_ID", at.get("referenceNum")); AIMRequest.put("x_Auth_Code", at.get("gatewayCode")); } - + private static void buildRefundTransaction(Map<String, Object> params, Properties props, Map<String, Object> AIMRequest) { GenericValue at = (GenericValue) params.get("authTransaction"); GenericValue cc = (GenericValue) params.get("creditCard"); @@ -525,7 +525,7 @@ AIMRequest.put("x_Auth_Code", at.get("gatewayCode")); Debug.logInfo("buildCaptureTransaction. " + at.toString(), module); } - + private static void buildVoidTransaction(Map<String, Object> params, Properties props, Map<String, Object> AIMRequest) { GenericValue at = (GenericValue) params.get("authTransaction"); String currency = (String) params.get("currency"); @@ -536,13 +536,13 @@ AIMRequest.put("x_Auth_Code", at.get("gatewayCode")); Debug.logInfo("buildVoidTransaction. " + at.toString(), module); } - + private static Map<String, Object> validateRequest(Map<String, Object> params, Properties props, Map<String, Object> AIMRequest) { Map<String, Object> result = FastMap.newInstance(); result.put(ModelService.RESPONSE_MESSAGE, ModelService.RESPOND_SUCCESS); return result; } - + private static void processAuthTransResult(Map<String, Object> reply, Map<String, Object> results) { AuthorizeResponse ar = (AuthorizeResponse) reply.get("authorizeResponse"); Boolean authResult = (Boolean) reply.get("authResult"); @@ -562,7 +562,7 @@ } Debug.logInfo("processAuthTransResult: " + results.toString(),module); } - + private static void processCaptureTransResult(Map<String, Object> reply, Map<String, Object> results) { AuthorizeResponse ar = (AuthorizeResponse) reply.get("authorizeResponse"); Boolean captureResult = (Boolean) reply.get("authResult"); @@ -578,7 +578,7 @@ } Debug.logInfo("processCaptureTransResult: " + results.toString(),module); } - + private static Map<String, Object> processRefundTransResult(Map<String, Object> reply) { Map<String, Object> results = FastMap.newInstance(); AuthorizeResponse ar = (AuthorizeResponse) reply.get("authorizeResponse"); @@ -596,7 +596,7 @@ Debug.logInfo("processRefundTransResult: " + results.toString(),module); return results; } - + private static Map<String, Object> processReleaseTransResult(Map<String, Object> reply) { Map<String, Object> results = FastMap.newInstance(); AuthorizeResponse ar = (AuthorizeResponse) reply.get("authorizeResponse"); @@ -614,7 +614,7 @@ Debug.logInfo("processReleaseTransResult: " + results.toString(),module); return results; } - + private static void processAuthCaptureTransResult(Map<String, Object> reply, Map<String, Object> results) { AuthorizeResponse ar = (AuthorizeResponse) reply.get("authorizeResponse"); Boolean authResult = (Boolean) reply.get("authResult"); @@ -638,7 +638,7 @@ } Debug.logInfo("processAuthTransResult: " + results.toString(),module); } - + private static String getPaymentGatewayConfigValue(Delegator delegator, String paymentGatewayConfigId, String paymentGatewayConfigParameterName, String resource, String parameterName) { String returnValue = ""; Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/clearcommerce/CCPaymentServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/clearcommerce/CCPaymentServices.java?rev=899812&r1=899811&r2=899812&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/clearcommerce/CCPaymentServices.java (original) +++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/clearcommerce/CCPaymentServices.java Fri Jan 15 21:00:23 2010 @@ -353,7 +353,7 @@ Debug.set(Debug.VERBOSE, true); //Document reportResponseDoc = null; try { - //reportResponseDoc = + //reportResponseDoc = sendRequest(requestDocument, (String) context.get("paymentConfig")); } catch (ClearCommerceException cce) { return ServiceUtil.returnError(cce.getMessage()); Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/cybersource/IcsPaymentServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/cybersource/IcsPaymentServices.java?rev=899812&r1=899811&r2=899812&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/cybersource/IcsPaymentServices.java (original) +++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/cybersource/IcsPaymentServices.java Fri Jan 15 21:00:23 2010 @@ -53,12 +53,12 @@ public static final String module = IcsPaymentServices.class.getName(); private static int decimals = UtilNumber.getBigDecimalScale("invoice.decimals"); private static int rounding = UtilNumber.getBigDecimalRoundingMode("invoice.rounding"); - + // load the JSSE properties static { SSLUtil.loadJsseProperties(); } - + public static Map<String, Object> ccAuth(DispatchContext dctx, Map<String, ? extends Object> context) { Delegator delegator = dctx.getDelegator(); // generate the request/properties @@ -66,10 +66,10 @@ if (props == null) { return ServiceUtil.returnError("ERROR: Getting Cybersource property configuration"); } - + Map<String, Object> request = buildAuthRequest(context, delegator); request.put("merchantID", props.get("merchantID")); - + // transmit the request Map<String, Object> reply; try { @@ -87,11 +87,11 @@ processAuthResult(reply, result); return result; } - + public static Map<String, Object> ccReAuth(DispatchContext dctx, Map<String, ? extends Object> context) { return ServiceUtil.returnSuccess(); } - + public static Map<String, Object> ccCapture(DispatchContext dctx, Map<String, ? extends Object> context) { Delegator delegator = dctx.getDelegator(); GenericValue orderPaymentPreference = (GenericValue) context.get("orderPaymentPreference"); @@ -108,10 +108,10 @@ if (props == null) { return ServiceUtil.returnError("ERROR: Getting Cybersource property configuration"); } - + Map<String, Object> request = buildCaptureRequest(context, authTransaction, delegator); request.put("merchantID", props.get("merchantID")); - + // transmit the request Map<String, Object> reply; try { @@ -128,7 +128,7 @@ processCaptureResult(reply, result); return result; } - + public static Map<String, Object> ccRelease(DispatchContext dctx, Map<String, ? extends Object> context) { Delegator delegator = dctx.getDelegator(); GenericValue orderPaymentPreference = (GenericValue) context.get("orderPaymentPreference"); @@ -136,16 +136,16 @@ if (authTransaction == null) { return ServiceUtil.returnError("No authorization transaction found for the OrderPaymentPreference; cannot release"); } - + // generate the request/properties Properties props = buildCsProperties(context, delegator); if (props == null) { return ServiceUtil.returnError("ERROR: Getting Cybersource property configuration"); } - + Map<String, Object> request = buildReleaseRequest(context, authTransaction); request.put("merchantID", props.get("merchantID")); - + // transmit the request Map<String, Object> reply; try { @@ -162,7 +162,7 @@ processReleaseResult(reply, result); return result; } - + public static Map<String, Object> ccRefund(DispatchContext dctx, Map<String, ? extends Object> context) { Delegator delegator = dctx.getDelegator(); GenericValue orderPaymentPreference = (GenericValue) context.get("orderPaymentPreference"); @@ -170,16 +170,16 @@ if (authTransaction == null) { return ServiceUtil.returnError("No authorization transaction found for the OrderPaymentPreference; cannot refund"); } - + // generate the request/properties Properties props = buildCsProperties(context, delegator); if (props == null) { return ServiceUtil.returnError("ERROR: Getting Cybersource property configuration"); } - + Map<String, Object> request = buildRefundRequest(context, authTransaction, delegator); request.put("merchantID", props.get("merchantID")); - + // transmit the request Map<String, Object> reply; try { @@ -191,13 +191,13 @@ Debug.logError(e, "ERROR: CyberSource Client exception : " + e.getMessage(), module); return ServiceUtil.returnError("Unable to communicate with CyberSource"); } - + // process the reply Map<String, Object> result = ServiceUtil.returnSuccess(); processRefundResult(reply, result); return result; } - + public static Map<String, Object> ccCredit(DispatchContext dctx, Map<String, ? extends Object> context) { Delegator delegator = dctx.getDelegator(); // generate the request/properties @@ -205,10 +205,10 @@ if (props == null) { return ServiceUtil.returnError("ERROR: Getting Cybersource property configuration"); } - + Map<String, Object> request = buildCreditRequest(context); request.put("merchantID", props.get("merchantID")); - + // transmit the request Map<String, Object> reply; try { @@ -220,13 +220,13 @@ Debug.logError(e, "ERROR: CyberSource Client exception : " + e.getMessage(), module); return ServiceUtil.returnError("Unable to communicate with CyberSource"); } - + // process the reply Map<String, Object> result = ServiceUtil.returnSuccess(); processCreditResult(reply, result); return result; } - + private static Properties buildCsProperties(Map<String, ? extends Object> context, Delegator delegator) { String paymentGatewayConfigId = (String) context.get("paymentGatewayConfigId"); String configString = (String) context.get("paymentConfig"); @@ -267,7 +267,7 @@ Debug.log("Created CyberSource Properties : " + props, module); return props; } - + private static Map<String, Object> buildAuthRequest(Map<String, ? extends Object> context, Delegator delegator) { String paymentGatewayConfigId = (String) context.get("paymentGatewayConfigId"); String configString = (String) context.get("paymentConfig"); @@ -288,7 +288,7 @@ appendAvsRules(request, context, delegator); // add in the AVS flags and decline codes return request; } - + private static Map<String, Object> buildCaptureRequest(Map<String, ? extends Object> context, GenericValue authTransaction, Delegator delegator) { GenericValue orderPaymentPreference = (GenericValue) context.get("orderPaymentPreference"); String paymentGatewayConfigId = (String) context.get("paymentGatewayConfigId"); @@ -305,7 +305,7 @@ request.put("item_0_unitPrice", getAmountString(context, "captureAmount")); request.put("merchantReferenceCode", orderPaymentPreference.getString("orderId")); request.put("purchaseTotals_currency", currency); - + // TODO: add support for verbal authorizations //request.put("ccCaptureService_authType", null); -- should be 'verbal' //request.put("ccCaptureService_verbalAuthCode", null); -- code from verbal auth @@ -317,7 +317,7 @@ } return request; } - + private static Map<String, Object> buildReleaseRequest(Map<String, ? extends Object> context, GenericValue authTransaction) { Map<String, Object> request = FastMap.newInstance(); GenericValue orderPaymentPreference = (GenericValue) context.get("orderPaymentPreference"); @@ -329,7 +329,7 @@ request.put("purchaseTotals_currency", currency); return request; } - + private static Map<String, Object> buildRefundRequest(Map<String, ? extends Object> context, GenericValue authTransaction, Delegator delegator) { GenericValue orderPaymentPreference = (GenericValue) context.get("orderPaymentPreference"); String paymentGatewayConfigId = (String) context.get("paymentGatewayConfigId"); @@ -354,7 +354,7 @@ } return request; } - + private static Map<String, Object> buildCreditRequest(Map<String, ? extends Object> context) { String refCode = (String) context.get("referenceCode"); Map<String, Object> request = FastMap.newInstance(); @@ -364,7 +364,7 @@ appendItemLineInfo(request, context, "creditAmount"); // add in the item info return request; } - + private static void appendAvsRules(Map<String, Object> request, Map<String, ? extends Object> context, Delegator delegator) { String paymentGatewayConfigId = (String) context.get("paymentGatewayConfigId"); String configString = (String) context.get("paymentConfig"); @@ -394,7 +394,7 @@ String avsIgnore = getPaymentGatewayConfigValue(delegator, paymentGatewayConfigId, "ignoreAvs", configString, "payment.cybersource.ignoreAvs", "false"); request.put("businessRules_ignoreAVS", avsIgnore); } - + private static void appendFullBillingInfo(Map<String, Object> request, Map<String, ? extends Object> context) { // contact info GenericValue email = (GenericValue) context.get("billToEmail"); @@ -404,7 +404,7 @@ Debug.logWarning("Email not defined; Cybersource will fail.", module); } // phone number seems to not be used; possibly only for reporting. - + // CC payment info GenericValue creditCard = (GenericValue) context.get("creditCard"); if (creditCard != null) { @@ -426,7 +426,7 @@ } // payment contact info GenericValue billingAddress = (GenericValue) context.get("billingAddress"); - + if (billingAddress != null) { request.put("billTo_street1", billingAddress.getString("address1")); if (billingAddress.get("address2") != null) { @@ -463,7 +463,7 @@ } } } - + private static void appendItemLineInfo(Map<String, Object> request, Map<String, ? extends Object> context, String amountField) { // send over a line item total offer w/ the total for billing; don't trust CyberSource for calc String currency = (String) context.get("currency"); @@ -503,12 +503,12 @@ } } } - + private static String getAmountString(Map<String, ? extends Object> context, String amountField) { BigDecimal processAmount = (BigDecimal) context.get(amountField); return processAmount.setScale(decimals, rounding).toPlainString(); } - + private static void processAuthResult(Map<String, Object> reply, Map<String, Object> result) { String decision = getDecision(reply); if ("ACCEPT".equalsIgnoreCase(decision)) { @@ -519,7 +519,7 @@ result.put("authResult", Boolean.FALSE); // TODO: based on reasonCode populate the following flags as applicable: resultDeclined, resultNsf, resultBadExpire, resultBadCardNumber } - + if (reply.get("ccAuthReply_amount") != null) { result.put("processAmount", new BigDecimal((String) reply.get("ccAuthReply_amount"))); } else { @@ -545,7 +545,7 @@ if (Debug.infoOn()) Debug.logInfo("CC [Cybersource] authorization result : " + result, module); } - + private static void processCaptureResult(Map<String, Object> reply, Map<String, Object> result) { String decision = getDecision(reply); if ("ACCEPT".equalsIgnoreCase(decision)) { @@ -565,7 +565,7 @@ if (Debug.infoOn()) Debug.logInfo("CC [Cybersource] capture result : " + result, module); } - + private static void processReleaseResult(Map<String, Object> reply, Map<String, Object> result) { String decision = getDecision(reply); if ("ACCEPT".equalsIgnoreCase(decision)) { @@ -585,7 +585,7 @@ if (Debug.infoOn()) Debug.logInfo("CC [Cybersource] release result : " + result, module); } - + private static void processRefundResult(Map<String, Object> reply, Map<String, Object> result) { String decision = getDecision(reply); if ("ACCEPT".equalsIgnoreCase(decision)) { @@ -605,7 +605,7 @@ if (Debug.infoOn()) Debug.logInfo("CC [Cybersource] refund result : " + result, module); } - + private static void processCreditResult(Map<String, Object> reply, Map<String, Object> result) { String decision = (String) reply.get("decision"); if ("ACCEPT".equalsIgnoreCase(decision)) { @@ -613,13 +613,13 @@ } else { result.put("creditResult", Boolean.FALSE); } - + if (reply.get("ccCreditReply_amount") != null) { result.put("creditAmount", new BigDecimal((String) reply.get("ccCreditReply_amount"))); } else { result.put("creditAmount", BigDecimal.ZERO); } - + result.put("creditRefNum", reply.get("requestID")); result.put("creditCode", reply.get("ccCreditReply_reconciliationID")); result.put("creditFlag", reply.get("ccCreditReply_reasonCode")); @@ -627,7 +627,7 @@ if (Debug.infoOn()) Debug.logInfo("CC [Cybersource] credit result : " + result, module); } - + private static String getDecision(Map<String, Object> reply) { String decision = (String) reply.get("decision"); String reasonCode = (String) reply.get("reasonCode"); @@ -637,7 +637,7 @@ } return decision; } - + private static String getPaymentGatewayConfigValue(Delegator delegator, String paymentGatewayConfigId, String paymentGatewayConfigParameterName, String resource, String parameterName) { String returnValue = ""; @@ -661,7 +661,7 @@ } return returnValue; } - + private static String getPaymentGatewayConfigValue(Delegator delegator, String paymentGatewayConfigId, String paymentGatewayConfigParameterName, String resource, String parameterName, String defaultValue) { String returnValue = getPaymentGatewayConfigValue(delegator, paymentGatewayConfigId, paymentGatewayConfigParameterName, resource, parameterName); Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/orbital/OrbitalPaymentServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/orbital/OrbitalPaymentServices.java?rev=899812&r1=899811&r2=899812&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/orbital/OrbitalPaymentServices.java (original) +++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/orbital/OrbitalPaymentServices.java Fri Jan 15 21:00:23 2010 @@ -56,12 +56,12 @@ public static String APPROVED = "Approved"; public static String DECLINED = "Declined"; public static String ERROR = "Error"; - + public static final String BIN_VALUE = "000002"; public static TransactionProcessorIF tp = null; public static ResponseIF response = null; public static RequestIF request = null; - + public static Map<String, Object> ccAuth(DispatchContext ctx, Map<String, Object> context) { Delegator delegator = ctx.getDelegator(); Map<String, Object> results = ServiceUtil.returnSuccess(); @@ -71,7 +71,7 @@ try { request = new Request(RequestIF.NEW_ORDER_TRANSACTION); } catch (InitializationException e) { - Debug.logError("Error in request initialization", module); + Debug.logError("Error in request initialization", module); e.printStackTrace(); } buildAuthOrAuthCaptureTransaction(context, delegator, props, request, results); @@ -88,7 +88,7 @@ processAuthTransResult(processCardResponseContext, results); return results; } - + public static Map<String, Object> ccAuthCapture(DispatchContext ctx, Map<String, Object> context) { Delegator delegator = ctx.getDelegator(); Map<String, Object> results = ServiceUtil.returnSuccess(); @@ -98,7 +98,7 @@ try { request = new Request(RequestIF.NEW_ORDER_TRANSACTION); } catch (InitializationException e) { - Debug.logError("Error in request initialization", module); + Debug.logError("Error in request initialization", module); e.printStackTrace(); } buildAuthOrAuthCaptureTransaction(context, delegator, props, request, results); @@ -120,7 +120,7 @@ Delegator delegator = ctx.getDelegator(); Map<String, Object> results = ServiceUtil.returnSuccess(); Map<String, Object> props = buildOrbitalProperties(context, delegator); - + GenericValue orderPaymentPreference = (GenericValue) context.get("orderPaymentPreference"); GenericValue creditCard = null; try { @@ -136,13 +136,13 @@ context.put("creditCard", creditCard); context.put("authTransaction", authTransaction); context.put("orderId", orderPaymentPreference.getString("orderId")); - + props.put("transType", "PRIOR_AUTH_CAPTURE"); //Tell the request object which template to use (see RequestIF.java) try { request = new Request(RequestIF.MARK_FOR_CAPTURE_TRANSACTION); } catch (InitializationException e) { - Debug.logError("Error in request initialization", module); + Debug.logError("Error in request initialization", module); e.printStackTrace(); } buildCaptureTransaction(context, delegator, props, request, results); @@ -179,12 +179,12 @@ context.put("creditCard", creditCard); context.put("authTransaction", authTransaction); context.put("orderId", orderPaymentPreference.getString("orderId")); - + //Tell the request object which template to use (see RequestIF.java) try { request = new Request(RequestIF.NEW_ORDER_TRANSACTION); } catch (InitializationException e) { - Debug.logError("Error in request initialization", module); + Debug.logError("Error in request initialization", module); e.printStackTrace(); } buildRefundTransaction(context, props, request, results); @@ -201,12 +201,12 @@ processRefundTransResult(processCardResponseContext, results); return results; } - + public static Map<String, Object> ccRelease(DispatchContext ctx, Map<String, Object> context) { Delegator delegator = ctx.getDelegator(); Map<String, Object> results = ServiceUtil.returnSuccess(); Map<String, Object> props = buildOrbitalProperties(context, delegator); - + GenericValue orderPaymentPreference = (GenericValue) context.get("orderPaymentPreference"); GenericValue creditCard = null; try { @@ -221,12 +221,12 @@ } context.put("authTransaction", authTransaction); context.put("orderId", orderPaymentPreference.getString("orderId")); - + //Tell the request object which template to use (see RequestIF.java) try { request = new Request(RequestIF.REVERSE_TRANSACTION); } catch (InitializationException e) { - Debug.logError("Error in request initialization", module); + Debug.logError("Error in request initialization", module); e.printStackTrace(); } buildReleaseTransaction(context, delegator, props, request, results); @@ -243,8 +243,8 @@ processReleaseTransResult(processCardResponseContext, results); return results; } - - + + private static Map<String, Object> buildOrbitalProperties(Map<String, Object> context, Delegator delegator) { //TODO: Will move this to property file and then will read it from there. String configFile = "/applications/accounting/config/linehandler.properties"; @@ -275,7 +275,7 @@ } return buildConfiguratorContext; } - + private static String getPaymentGatewayConfigValue(Delegator delegator, String paymentGatewayConfigId, String paymentGatewayConfigParameterName) { String returnValue = ""; @@ -291,7 +291,7 @@ } catch (GenericEntityException e) { Debug.logError(e, module); } - } + } return returnValue; } @@ -309,8 +309,8 @@ if ("AUTH_ONLY".equals(transType)) { messageType = "A"; } else if ("AUTH_CAPTURE".equals(transType)) { - messageType = "AC"; - } + messageType = "AC"; + } try { request.setFieldValue("IndustryType", "EC"); request.setFieldValue("MessageType", UtilFormatOut.checkNull(messageType)); @@ -318,7 +318,7 @@ request.setFieldValue("BIN", BIN_VALUE); request.setFieldValue("OrderID", UtilFormatOut.checkNull(orderId)); request.setFieldValue("AccountNum", UtilFormatOut.checkNull(number)); - + request.setFieldValue("Amount", UtilFormatOut.checkNull(amountValue)); request.setFieldValue("Exp", UtilFormatOut.checkNull(expDate)); // AVS Information @@ -332,7 +332,7 @@ creditCard = opp.getRelatedOne("CreditCard"); } } - + request.setFieldValue("AVSname", "Demo Customer"); if (UtilValidate.isNotEmpty(creditCard.getString("contactMechId"))) { GenericValue address = creditCard.getRelatedOne("PostalAddress"); @@ -375,7 +375,7 @@ e.printStackTrace(); } } - + private static void buildCaptureTransaction(Map<String, Object> params, Delegator delegator, Map<String, Object> props, RequestIF request, Map<String, Object> results) { GenericValue authTransaction = (GenericValue) params.get("authTransaction"); GenericValue creditCard = (GenericValue) params.get("creditCard"); @@ -390,7 +390,7 @@ request.setFieldValue("TxRefNum", UtilFormatOut.checkNull(authTransaction.get("referenceNum").toString())); request.setFieldValue("OrderID", UtilFormatOut.checkNull(orderId)); request.setFieldValue("Amount", UtilFormatOut.checkNull(amountValue)); - + request.setFieldValue("PCDestName", UtilFormatOut.checkNull(creditCard.getString("firstNameOnCard") + creditCard.getString("lastNameOnCard"))); if (UtilValidate.isNotEmpty(creditCard.getString("contactMechId"))) { GenericValue address = creditCard.getRelatedOne("PostalAddress"); @@ -402,7 +402,7 @@ request.setFieldValue("PCDestState", UtilFormatOut.checkNull(address.getString("stateProvinceGeoId"))); request.setFieldValue("PCDestZip", UtilFormatOut.checkNull(address.getString("postalCode"))); } - } + } //Display the request Debug.log("\nCapture Request:\n ======== " + request.getXML()); results.put("captureAmount", amount); @@ -435,7 +435,7 @@ request.setFieldValue("Amount", UtilFormatOut.checkNull(amountValue)); request.setFieldValue("Exp", UtilFormatOut.checkNull(expDate)); request.setFieldValue("Comments", "This is a credit card refund"); - + Debug.log("\nRefund Request:\n ======== " + request.getXML()); results.put("refundAmount", amount); } catch (InitializationException ie) { @@ -446,7 +446,7 @@ e.printStackTrace(); } } - + private static void buildReleaseTransaction(Map<String, Object> params, Delegator delegator, Map<String, Object> props, RequestIF request, Map<String, Object> results) { BigDecimal amount = (BigDecimal) params.get("releaseAmount"); GenericValue authTransaction = (GenericValue) params.get("authTransaction"); @@ -458,7 +458,7 @@ request.setFieldValue("BIN", BIN_VALUE); request.setFieldValue("TxRefNum", UtilFormatOut.checkNull(authTransaction.get("referenceNum").toString())); request.setFieldValue("OrderID", UtilFormatOut.checkNull(orderId)); - + //Display the request Debug.log("\nRelease Request:\n ======== " + request.getXML()); results.put("releaseAmount", amount); @@ -470,8 +470,8 @@ e.printStackTrace(); } } - - + + private static void initializeTransactionProcessor() { //Create a Transaction Processor //The Transaction Processor acquires and releases resources and executes transactions. @@ -483,7 +483,7 @@ iex.printStackTrace(); } } - + private static Map<String, Object> processCard(RequestIF request) { Map<String, Object> processCardResult = FastMap.newInstance(); try { @@ -492,7 +492,7 @@ processCardResult.put("authResult", Boolean.TRUE); } else { processCardResult.put("authResult", Boolean.FALSE); - } + } processCardResult.put("processCardResponse", response); } catch (TransactionException tex) { Debug.logError("TransactionProcessor failed to initialize" + tex.getMessage(), module); @@ -501,7 +501,7 @@ processCardResult.put(ModelService.RESPONSE_MESSAGE, ModelService.RESPOND_SUCCESS); return processCardResult; } - + private static void processAuthTransResult(Map<String, Object> processCardResponseContext, Map<String, Object> results) { ResponseIF response = (ResponseIF) processCardResponseContext.get("processCardResponse"); Boolean authResult = (Boolean) processCardResponseContext.get("authResult"); @@ -521,7 +521,7 @@ } Debug.logInfo("processAuthTransResult: " + results.toString(),module); } - + private static void processAuthCaptureTransResult(Map<String, Object> processCardResponseContext, Map<String, Object> results) { ResponseIF response = (ResponseIF) processCardResponseContext.get("processCardResponse"); Boolean authResult = (Boolean) processCardResponseContext.get("authResult"); @@ -545,7 +545,7 @@ } Debug.logInfo("processAuthCaptureTransResult: " + results.toString(),module); } - + private static void processCaptureTransResult(Map<String, Object> processCardResponseContext, Map<String, Object> results) { ResponseIF response = (ResponseIF) processCardResponseContext.get("processCardResponse"); Boolean captureResult = (Boolean) processCardResponseContext.get("authResult"); @@ -577,7 +577,7 @@ } Debug.logInfo("processRefundTransResult: " + results.toString(),module); } - + private static void processReleaseTransResult(Map<String, Object> processCardResponseContext, Map<String, Object> results) { ResponseIF response = (ResponseIF) processCardResponseContext.get("processCardResponse"); Boolean releaseResult = (Boolean) processCardResponseContext.get("authResult"); @@ -593,7 +593,7 @@ } Debug.logInfo("processReleaseTransResult: " + results.toString(),module); } - + private static void printTransResult(ResponseIF response) { Map<String, Object> generatedResponse = FastMap.newInstance(); generatedResponse.put("isGood", response.isGood()); @@ -608,15 +608,15 @@ generatedResponse.put("Message", response.getMessage()); generatedResponse.put("AVSCode", response.getAVSResponseCode()); generatedResponse.put("CVV2ResponseCode", response.getCVV2RespCode()); - + Debug.logInfo("printTransResult === " + generatedResponse.toString(),module); } - + private static String formatExpDateForOrbital(String expDate) { String formatedDate = expDate.substring(0, 2) + expDate.substring(5); return formatedDate; } - + private static String getShippingRefForOrder(String orderId, Delegator delegator) { String shippingRef = ""; try { @@ -625,7 +625,7 @@ GenericValue trackingCode = null; if (UtilValidate.isNotEmpty(trackingCodeOrder)) { trackingCode = trackingCodeOrder.getRelatedOne("TrackingCode"); - } + } if (UtilValidate.isNotEmpty(trackingCode) && UtilValidate.isNotEmpty(trackingCode.getString("description"))) { // get tracking code description and provide it into shipping reference. shippingRef = trackingCode.getString("trackingCodeId") + "====" + trackingCode.getString("description"); @@ -638,7 +638,7 @@ } return shippingRef; } - + private static Map<String, Object> validateRequest(Map<String, Object> params, Map props, RequestIF request) { Map<String, Object> result = FastMap.newInstance(); result.put(ModelService.RESPONSE_MESSAGE, ModelService.RESPOND_SUCCESS); Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalEvents.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalEvents.java?rev=899812&r1=899811&r2=899812&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalEvents.java (original) +++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalEvents.java Fri Jan 15 21:00:23 2010 @@ -115,25 +115,25 @@ String itemName = UtilProperties.getMessage(resource, "AccountingOrderNr", locale) + orderId + " " + (company != null ? UtilProperties.getMessage(commonResource, "CommonFrom", locale) + " "+ company : ""); String itemNumber = "0"; - + // get the redirect url String redirectUrl = getPaymentGatewayConfigValue(delegator, paymentGatewayConfigId, "redirectUrl", configString, "payment.paypal.redirect"); - + // get the notify url String notifyUrl = getPaymentGatewayConfigValue(delegator, paymentGatewayConfigId, "notifyUrl", configString, "payment.paypal.notify"); - + // get the return urls String returnUrl = getPaymentGatewayConfigValue(delegator, paymentGatewayConfigId, "returnUrl", configString, "payment.paypal.return"); - + // get the cancel return urls String cancelReturnUrl = getPaymentGatewayConfigValue(delegator, paymentGatewayConfigId, "cancelReturnUrl", configString, "payment.paypal.cancelReturn"); - + // get the image url String imageUrl = getPaymentGatewayConfigValue(delegator, paymentGatewayConfigId, "imageUrl", configString, "payment.paypal.image"); - + // get the paypal account String payPalAccount = getPaymentGatewayConfigValue(delegator, paymentGatewayConfigId, "businessEmail", configString, "payment.paypal.business"); - + if (UtilValidate.isEmpty(redirectUrl) || UtilValidate.isEmpty(notifyUrl) || UtilValidate.isEmpty(returnUrl) @@ -242,7 +242,7 @@ } catch (IOException e) { Debug.logError(e, "Problems sending verification message", module); } - + Debug.logInfo("Got verification from PayPal, processing..", module); boolean verified = false; Set <String> keySet = parametersMap.keySet(); @@ -259,7 +259,7 @@ if (!verified) { Debug.logError("###### PayPal did not verify this request, need investigation!", module); } - + // get the system user GenericValue userLogin = null; try { @@ -508,7 +508,7 @@ return true; } - + private static String getPaymentGatewayConfigValue(Delegator delegator, String paymentGatewayConfigId, String paymentGatewayConfigParameterName, String resource, String parameterName) { String returnValue = ""; |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |