You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by as...@apache.org on 2009/06/23 17:34:42 UTC
svn commit: r787715 -
/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java
Author: ashish
Date: Tue Jun 23 15:34:41 2009
New Revision: 787715
URL: http://svn.apache.org/viewvc?rev=787715&view=rev
Log:
Applied patch from jira issue OFBIZ-2653 (Payment authorization and capture is not possible for replacement orders)
Thanks Mridul for your contribution.
Modified:
ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java
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=787715&r1=787714&r2=787715&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 Tue Jun 23 15:34:41 2009
@@ -494,8 +494,11 @@
processAmount = paymentPreference.getBigDecimal("maxAmount");
}
+ // Check if the order is a replacement order
+ boolean replacementOrderFlag = isReplacementOrder(orderHeader);
+
// don't authorized more then what is required
- if (processAmount.compareTo(totalRemaining) > 0) {
+ if (!replacementOrderFlag && processAmount.compareTo(totalRemaining) > 0) {
processAmount = totalRemaining;
}
@@ -1269,7 +1272,10 @@
BigDecimal amountThisCapture;
// determine how much for *this* capture
- if (authAmount.compareTo(amountToCapture) >= 0) {
+ if (isReplacementOrder(orderHeader)) {
+ // if it is a replacement order then just capture the auth amount
+ amountThisCapture = authAmount;
+ } else if (authAmount.compareTo(amountToCapture) >= 0) {
// if the auth amount is more then expected capture just capture what is expected
amountThisCapture = amountToCapture;
} else if (payments.hasNext()) {
@@ -1297,8 +1303,10 @@
// decrease amount of next payment preference to capture
amountToCapture = amountToCapture.subtract(amountCaptured);
- // add the invoiceId to the result for processing
- captureResult.put("invoiceId", invoiceId);
+ // add the invoiceId to the result for processing, not for a replacement order
+ if (!isReplacementOrder(orderHeader)) {
+ captureResult.put("invoiceId", invoiceId);
+ }
// process the capture's results
try {
@@ -3480,4 +3488,21 @@
}
return serviceName;
}
+
+ public static boolean isReplacementOrder(GenericValue orderHeader) {
+ boolean replacementOrderFlag = false;
+
+ List<GenericValue> returnItemResponses = FastList.newInstance();
+ try {
+ returnItemResponses = orderHeader.getRelated("ReplacementReturnItemResponse");
+ } catch (GenericEntityException e) {
+ Debug.logError(e, module);
+ return replacementOrderFlag;
+ }
+ if (UtilValidate.isNotEmpty(returnItemResponses)) {
+ replacementOrderFlag = true;
+ }
+
+ return replacementOrderFlag;
+ }
}