svn commit: r1752940 - in /ofbiz/trunk/applications/acco
Locked
svn commit: r1752940 - in /ofbiz/trunk/applications/acco
 
|
Author: ashish
Date: Sat Jul 16 12:27:38 2016 New Revision: 1752940 URL: http://svn.apache.org/viewvc?rev=1752940&view=rev Log: Applied patch from jira issue - OFBIZ-7826 - Clean up commented out code in Java source for Accounting. Thanks Harsh for the contribution. Modified: ofbiz/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/InvoiceServices.java ofbiz/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/GiftCertificateServices.java ofbiz/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/PaymentGatewayServices.java ofbiz/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/PaymentMethodServices.java ofbiz/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/tax/TaxAuthorityServices.java ofbiz/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/authorizedotnet/AIMPaymentServices.java ofbiz/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/clearcommerce/CCPaymentServices.java ofbiz/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/cybersource/IcsPaymentServices.java ofbiz/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/gosoftware/RitaApi.java ofbiz/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/paypal/PayPalEvents.java ofbiz/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/sagepay/SagePayUtil.java ofbiz/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/valuelink/ValueLinkApi.java Modified: ofbiz/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/InvoiceServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/InvoiceServices.java?rev=1752940&r1=1752939&r2=1752940&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/InvoiceServices.java (original) +++ ofbiz/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/InvoiceServices.java Sat Jul 16 12:27:38 2016 @@ -436,7 +436,6 @@ public class InvoiceServices { createInvoiceItemContext.put("productId", orderItem.get("productId")); createInvoiceItemContext.put("productFeatureId", orderItem.get("productFeatureId")); createInvoiceItemContext.put("overrideGlAccountId", orderItem.get("overrideGlAccountId")); - //createInvoiceItemContext.put("uomId", ""); createInvoiceItemContext.put("userLogin", userLogin); String itemIssuanceId = null; @@ -577,7 +576,6 @@ public class InvoiceServices { createInvoiceItemAdjContext.put("overrideGlAccountId", adj.get("overrideGlAccountId")); createInvoiceItemAdjContext.put("parentInvoiceId", invoiceId); createInvoiceItemAdjContext.put("parentInvoiceItemSeqId", parentInvoiceItemSeqId); - //createInvoiceItemAdjContext.put("uomId", ""); createInvoiceItemAdjContext.put("userLogin", userLogin); createInvoiceItemAdjContext.put("taxAuthPartyId", adj.get("taxAuthPartyId")); createInvoiceItemAdjContext.put("taxAuthGeoId", adj.get("taxAuthGeoId")); @@ -2307,10 +2305,6 @@ public class InvoiceServices { createInvoiceItemContext.put("quantity", BigDecimal.ONE); createInvoiceItemContext.put("amount", amount); createInvoiceItemContext.put("overrideGlAccountId", adj.get("overrideGlAccountId")); - //createInvoiceItemContext.put("productId", orderItem.get("productId")); - //createInvoiceItemContext.put("productFeatureId", orderItem.get("productFeatureId")); - //createInvoiceItemContext.put("uomId", ""); - //createInvoiceItemContext.put("taxableFlag", product.get("taxable")); createInvoiceItemContext.put("taxAuthPartyId", adj.get("taxAuthPartyId")); createInvoiceItemContext.put("taxAuthGeoId", adj.get("taxAuthGeoId")); createInvoiceItemContext.put("taxAuthorityRateSeqId", adj.get("taxAuthorityRateSeqId")); @@ -2363,10 +2357,6 @@ public class InvoiceServices { createInvoiceItemContext.put("quantity", BigDecimal.ONE); createInvoiceItemContext.put("amount", amount); createInvoiceItemContext.put("overrideGlAccountId", adj.get("overrideGlAccountId")); - //createInvoiceItemContext.put("productId", orderItem.get("productId")); - //createInvoiceItemContext.put("productFeatureId", orderItem.get("productFeatureId")); - //createInvoiceItemContext.put("uomId", ""); - //createInvoiceItemContext.put("taxableFlag", product.get("taxable")); createInvoiceItemContext.put("taxAuthPartyId", adj.get("taxAuthPartyId")); createInvoiceItemContext.put("taxAuthGeoId", adj.get("taxAuthGeoId")); createInvoiceItemContext.put("taxAuthorityRateSeqId", adj.get("taxAuthorityRateSeqId")); @@ -2811,7 +2801,6 @@ public class InvoiceServices { } invoiceItemApplyAvailable = invoiceItem.getBigDecimal("amount").multiply(quantity).setScale(DECIMALS,ROUNDING).subtract(InvoiceWorker.getInvoiceItemApplied(invoiceItem)); // check here for too much application if a new record is added - // (paymentApplicationId == null) if (paymentApplicationId == null && amountApplied.compareTo(invoiceItemApplyAvailable) > 0) { // new record errorMessageList.add("Invoice(" + invoiceId + ") item(" + invoiceItemSeqId + ") has " + invoiceItemApplyAvailable + " to apply but " + amountApplied + " is requested\n"); @@ -3197,27 +3186,6 @@ public class InvoiceServices { storePaymentApplication(delegator, paymentApplication,locale); } - // check if either the invoice or the payment is fully - // applied, when yes change the status to paid - // which triggers the ledger routines.... - /* - * if - * (InvoiceWorker.getInvoiceTotal(invoice).equals(InvoiceWorker.getInvoiceApplied(invoice))) { - * try { dispatcher.runSync("setInvoiceStatus", - * UtilMisc.toMap("invoiceId",invoiceId,"statusId","INVOICE_PAID")); } - * catch (GenericServiceException e1) { - * Debug.logError(e1, "Error updating invoice status", - * module); } } - * - * if - * (payment.getBigDecimal("amount").equals(PaymentWorker.getPaymentApplied(payment))) { - * GenericValue appliedPayment = (GenericValue) - * delegator.makeValue("Payment", - * UtilMisc.toMap("paymentId",paymentId,"statusId","INVOICE_PAID")); - * try { appliedPayment.store(); } catch - * (GenericEntityException e) { - * ServiceUtil.returnError(e.getMessage()); } } - */ } if (errorMessageList.size() > 0) { Modified: ofbiz/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/GiftCertificateServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/GiftCertificateServices.java?rev=1752940&r1=1752939&r2=1752940&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/GiftCertificateServices.java (original) +++ ofbiz/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/GiftCertificateServices.java Sat Jul 16 12:27:38 2016 @@ -355,7 +355,6 @@ public class GiftCertificateServices { } // TODO: get the real currency from context - //String currencyUom = EntityUtilProperties.getPropertyValue("general", "currency.uom.id.default", "USD", delegator); // get the balance BigDecimal balance = finAccount.get("availableBalance") == null ? BigDecimal.ZERO : finAccount.getBigDecimal("availableBalance"); @@ -661,7 +660,6 @@ public class GiftCertificateServices { refundCtx.put("productStoreId", productStoreId); refundCtx.put("currency", currency); refundCtx.put("partyId", partyId); - //reloadCtx.put("orderId", orderId); refundCtx.put("cardNumber", giftCard.get("cardNumber")); refundCtx.put("pinNumber", giftCard.get("pinNumber")); refundCtx.put("amount", amount); @@ -837,11 +835,9 @@ public class GiftCertificateServices { for (int i = 0; i < qtyLoop; i++) { // create a gift certificate Map<String, Object> createGcCtx = new HashMap<String, Object>(); - //createGcCtx.put("paymentConfig", paymentConfig); createGcCtx.put("productStoreId", productStoreId); createGcCtx.put("currency", currency); createGcCtx.put("partyId", partyId); - //createGcCtx.put("orderId", orderId); createGcCtx.put("initialAmount", amount); createGcCtx.put("userLogin", userLogin); @@ -1060,7 +1056,6 @@ public class GiftCertificateServices { reloadCtx.put("productStoreId", productStoreId); reloadCtx.put("currency", currency); reloadCtx.put("partyId", partyId); - //reloadCtx.put("orderId", orderId); reloadCtx.put("cardNumber", cardNumber); reloadCtx.put("pinNumber", pinNumber); reloadCtx.put("amount", amount); @@ -1385,12 +1380,9 @@ public class GiftCertificateServices { // create the payment for the transaction Map<String, Object> paymentCtx = UtilMisc.<String, Object>toMap("paymentTypeId", paymentType); paymentCtx.put("paymentMethodTypeId", paymentMethodType); - //paymentCtx.put("paymentMethodId", ""); - //paymentCtx.put("paymentGatewayResponseId", ""); paymentCtx.put("partyIdTo", partyIdTo); paymentCtx.put("partyIdFrom", partyIdFrom); paymentCtx.put("statusId", "PMNT_RECEIVED"); - //paymentCtx.put("paymentPreferenceId", ""); paymentCtx.put("currencyUomId", currencyUom); paymentCtx.put("amount", amount); paymentCtx.put("userLogin", userLogin); Modified: ofbiz/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/PaymentGatewayServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/PaymentGatewayServices.java?rev=1752940&r1=1752939&r2=1752940&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/PaymentGatewayServices.java (original) +++ ofbiz/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/PaymentGatewayServices.java Sat Jul 16 12:27:38 2016 @@ -478,8 +478,6 @@ public class PaymentGatewayServices { // get the visit record to obtain the client's IP address GenericValue orderHeader = orh.getOrderHeader(); - //if (orderHeader == null) {} - String visitId = orderHeader.getString("visitId"); GenericValue visit = null; if (visitId != null) { @@ -2603,7 +2601,6 @@ public class PaymentGatewayServices { return ServiceUtil.returnError(UtilProperties.getMessage(resource, "AccountingPaymentCreationError", locale)); } - //Debug.logInfo("Payment created : " + paymentId, module); if (paymentId == null) { return ServiceUtil.returnError(UtilProperties.getMessage(resource, @@ -2905,8 +2902,6 @@ public class PaymentGatewayServices { return true; } - // 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. Modified: ofbiz/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/PaymentMethodServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/PaymentMethodServices.java?rev=1752940&r1=1752939&r2=1752940&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/PaymentMethodServices.java (original) +++ ofbiz/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/PaymentMethodServices.java Sat Jul 16 12:27:38 2016 @@ -407,7 +407,6 @@ public class PaymentMethodServices { } if (isModified) { - // Debug.logInfo("yes, is modified", module); if (newPartyContactMechPurpose != null) toBeStored.add(newPartyContactMechPurpose); // set thru date on old paymentMethod Modified: ofbiz/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/tax/TaxAuthorityServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/tax/TaxAuthorityServices.java?rev=1752940&r1=1752939&r2=1752940&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/tax/TaxAuthorityServices.java (original) +++ ofbiz/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/tax/TaxAuthorityServices.java Sat Jul 16 12:27:38 2016 @@ -252,15 +252,12 @@ public class TaxAuthorityServices { Debug.logWarning("shippingAddress was null, adding nothing to taxAuthoritySet", module); } - //Debug.logInfo("Tax calc geoIdByTypeMap before expand:" + geoIdByTypeMap + "; this is for shippingAddress=" + shippingAddress, module); // get the most granular, or all available, geoIds and then find parents by GeoAssoc with geoAssocTypeId="REGIONS" and geoIdTo=<granular geoId> and find the GeoAssoc.geoId geoIdByTypeMap = GeoWorker.expandGeoRegionDeep(geoIdByTypeMap, delegator); - //Debug.logInfo("Tax calc geoIdByTypeMap after expand:" + geoIdByTypeMap, module); List<GenericValue> taxAuthorityRawList = EntityQuery.use(delegator) .from("TaxAuthority").where(EntityCondition.makeCondition("taxAuthGeoId", EntityOperator.IN, geoIdByTypeMap.values())).cache().queryList(); taxAuthoritySet.addAll(taxAuthorityRawList); - //Debug.logInfo("Tax calc taxAuthoritySet after expand:" + taxAuthoritySet, module); } private static List<GenericValue> getTaxAdjustments(Delegator delegator, GenericValue product, GenericValue productStore, @@ -442,8 +439,6 @@ public class TaxAuthorityServices { .orderBy("-fromDate").filterByDate().queryFirst(); } } - //Debug.logInfo("=================== productId=" + product.getString("productId"), module); - //Debug.logInfo("=================== productPrice=" + productPrice, module); } GenericValue taxAdjValue = delegator.makeValue("OrderAdjustment"); @@ -497,9 +492,6 @@ public class TaxAuthorityServices { BigDecimal price = productPrice.getBigDecimal("price"); BigDecimal baseSubtotal = price.multiply(itemQuantity); BigDecimal baseTaxAmount = (baseSubtotal.multiply(taxRate)).divide(PERCENT_SCALE, salestaxCalcDecimals, salestaxRounding); - //Debug.logInfo("=================== priceWithTax=" + priceWithTax, module); - //Debug.logInfo("=================== enteredTotalPriceWithTax=" + enteredTotalPriceWithTax, module); - //Debug.logInfo("=================== calcedTotalPriceWithTax=" + calcedTotalPriceWithTax, module); // tax is not already in price so we want to add it in, but this is a VAT situation so adjust to make it as accurate as possible @@ -519,7 +511,6 @@ public class TaxAuthorityServices { // to get it down to match the entered amount // so, subtract the calculated amount from the entered amount (ie: correction = entered - calculated) BigDecimal correctionAmount = enteredTotalPriceWithTax.subtract(calcedTotalPriceWithTax); - //Debug.logInfo("=================== correctionAmount=" + correctionAmount, module); GenericValue correctionAdjValue = delegator.makeValue("OrderAdjustment"); correctionAdjValue.set("taxAuthorityRateSeqId", taxAuthorityRateProduct.getString("taxAuthorityRateSeqId")); @@ -572,7 +563,6 @@ public class TaxAuthorityServices { GenericValue taxAuthorityAssoc = EntityQuery.use(delegator).from("TaxAuthorityAssoc") .where("toTaxAuthGeoId", taxAuthGeoId, "toTaxAuthPartyId", taxAuthPartyId, "taxAuthorityAssocTypeId", "EXEMPT_INHER") .orderBy("-fromDate").filterByDate().queryFirst(); - // Debug.logInfo("Parent assoc to " + taxAuthGeoId + " : " + taxAuthorityAssoc, module); if (taxAuthorityAssoc != null) { handlePartyTaxExempt(adjValue, billToPartyIdSet, taxAuthorityAssoc.getString("taxAuthGeoId"), taxAuthorityAssoc.getString("taxAuthPartyId"), taxAmount, nowTimestamp, delegator); } Modified: ofbiz/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/authorizedotnet/AIMPaymentServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/authorizedotnet/AIMPaymentServices.java?rev=1752940&r1=1752939&r2=1752940&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/authorizedotnet/AIMPaymentServices.java (original) +++ ofbiz/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/authorizedotnet/AIMPaymentServices.java Sat Jul 16 12:27:38 2016 @@ -132,7 +132,6 @@ public class AIMPaymentServices { // PRIOR_AUTH_CAPTURE is the right one to use, since we already have an authorization from the authTransaction. // CAPTURE_ONLY is a "force" transaction to be used if there is no prior authorization props.put("transType", "PRIOR_AUTH_CAPTURE"); - //props.put("transType","CAPTURE_ONLY"); props.put("cardtype", creditCard.get("cardType")); buildCaptureTransaction(context,props,request); Map<String, Object> validateResults = validateRequest(context, props, request); Modified: ofbiz/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/clearcommerce/CCPaymentServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/clearcommerce/CCPaymentServices.java?rev=1752940&r1=1752939&r2=1752940&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/clearcommerce/CCPaymentServices.java (original) +++ ofbiz/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/clearcommerce/CCPaymentServices.java Sat Jul 16 12:27:38 2016 @@ -366,7 +366,6 @@ public class CCPaymentServices { Debug.set(Debug.VERBOSE, true); //Document reportResponseDoc = null; try { - //reportResponseDoc = sendRequest(requestDocument, (String) context.get("paymentConfig"), delegator); } catch (ClearCommerceException cce) { return ServiceUtil.returnError(cce.getMessage()); @@ -917,11 +916,6 @@ public class CCPaymentServices { throw new ClearCommerceException("ClearCommerce connection problem", hce); } - // Note: if Debug.verboseOn(), HttpClient will log this...set on with: Debug.set(Debug.VERBOSE, true); - // if (Debug.verboseOn()) { - // Debug.logVerbose("ClearCommerce response: " + response, module); - // } - Document responseDocument = null; try { responseDocument = UtilXml.readXmlDocument(response, false); Modified: ofbiz/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/cybersource/IcsPaymentServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/cybersource/IcsPaymentServices.java?rev=1752940&r1=1752939&r2=1752940&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/cybersource/IcsPaymentServices.java (original) +++ ofbiz/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/cybersource/IcsPaymentServices.java Sat Jul 16 12:27:38 2016 @@ -332,8 +332,6 @@ public class IcsPaymentServices { 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 if (merchantDesc != null) { request.put("invoiceHeader_merchantDescriptor", merchantDesc); // merchant description } Modified: ofbiz/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/gosoftware/RitaApi.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/gosoftware/RitaApi.java?rev=1752940&r1=1752939&r2=1752940&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/gosoftware/RitaApi.java (original) +++ ofbiz/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/gosoftware/RitaApi.java Sat Jul 16 12:27:38 2016 @@ -179,52 +179,6 @@ public class RitaApi { HttpClient http = new HttpClient(urlString); http.setDebug(true); - /* - SocketFactory sf = null; - if (ssl) { - sf = SSLSocketFactory.getDefault(); - } else { - sf = SocketFactory.getDefault(); - } - Socket sock = sf.createSocket(host, port); - - // get the streams - BufferedReader br = new BufferedReader(new InputStreamReader(sock.getInputStream())); - PrintStream ps = new PrintStream(sock.getOutputStream()); - - // send the request - ps.print(this.toString()); - ps.flush(); - - // the output map - LinkedHashMap docMap = new LinkedHashMap(); - String line; - - // read the response - while ((line = br.readLine()) != null) { - Debug.logInfo(line, module); - if (!line.trim().equals(".")) { - String[] lineSplit = line.trim().split(" "); - if (lineSplit != null && lineSplit.length == 2) { - docMap.put(lineSplit[0], lineSplit[1]); - } else { - Debug.logWarning("Line split error - " + line, module); - } - } else { - break; - } - } - Debug.logInfo("Reading finished.", module); - - // send session finished signal - ps.print("..\r\n"); - ps.flush(); - - // close the streams - ps.close(); - br.close(); - */ - Map<String, String> docMap = new HashMap<String, String>(); String resp = null; try { Modified: ofbiz/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/paypal/PayPalEvents.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/paypal/PayPalEvents.java?rev=1752940&r1=1752939&r2=1752940&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/paypal/PayPalEvents.java (original) +++ ofbiz/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/paypal/PayPalEvents.java Sat Jul 16 12:27:38 2016 @@ -294,13 +294,6 @@ public class PayPalEvents { return "error"; } - /* get payment data - String paymentCurrency = request.getParameter("mc_currency"); - String paymentAmount = request.getParameter("mc_gross"); - String paymentFee = request.getParameter("mc_fee"); - String transactionId = request.getParameter("txn_id"); - */ - // get the transaction status String paymentStatus = request.getParameter("payment_status"); Modified: ofbiz/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/sagepay/SagePayUtil.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/sagepay/SagePayUtil.java?rev=1752940&r1=1752939&r2=1752940&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/sagepay/SagePayUtil.java (original) +++ ofbiz/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/sagepay/SagePayUtil.java Sat Jul 16 12:27:38 2016 @@ -158,8 +158,6 @@ public final class SagePayUtil { HttpPost httpPost = new HttpPost(uri); httpPost.addHeader("User-Agent", "HTTP Client"); httpPost.addHeader("Content-type", "application/x-www-form-urlencoded"); - //postMethod.addHeader("Content-Length", "0"); - List<NameValuePair> postParameters = new ArrayList<NameValuePair>(); Set<String> keys = parameters.keySet(); for (String key : keys) { Modified: ofbiz/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/valuelink/ValueLinkApi.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/valuelink/ValueLinkApi.java?rev=1752940&r1=1752939&r2=1752940&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/valuelink/ValueLinkApi.java (original) +++ ofbiz/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/valuelink/ValueLinkApi.java Sat Jul 16 12:27:38 2016 @@ -406,8 +406,6 @@ public class ValueLinkApi { // initialize the parameter spec DHPublicKey publicKey = (DHPublicKey) this.getValueLinkPublicKey(); DHParameterSpec dhParamSpec = publicKey.getParams(); - //Debug.logInfo(dhParamSpec.getP().toString() + " / " + dhParamSpec.getG().toString(), module); - // create the public/private key pair using parameters defined by valuelink KeyPairGenerator keyGen = KeyPairGenerator.getInstance("DH"); keyGen.initialize(dhParamSpec); |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |