Author: lektran
Date: Mon Jul  2 22:52:06 2007
New Revision: 552675

URL: http://svn.apache.org/viewvc?view=rev&rev=552675
Log:
A small tidy up of my original manual merge of trunk rev. 543713, this will 
make subsequent merges less likely to conflict

Modified:
    
ofbiz/branches/release4.0/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java

Modified: 
ofbiz/branches/release4.0/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java
URL: 
http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java?view=diff&rev=552675&r1=552674&r2=552675
==============================================================================
--- 
ofbiz/branches/release4.0/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java
 (original)
+++ 
ofbiz/branches/release4.0/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java
 Mon Jul  2 22:52:06 2007
@@ -1119,7 +1119,7 @@
                     Debug.logInfo("Nothing to capture; authAmount = 0", 
module);
                     continue;
                 }
- 
+
                 // if the authAmount is more then the remaining total; just 
use remaining total
                 if (authAmount.compareTo(remainingTotalBd) == 1) {
                     authAmount = new 
BigDecimal(remainingTotalBd.doubleValue());
@@ -1152,7 +1152,7 @@
                     Debug.logError("The amount to capture was more then what 
was authorized; we only captured the authorized amount : " + paymentPref, 
module);
                     amountThisCapture = authAmount;
                 }
-           
+
                 Debug.logInfo("Payment preference = [" + paymentPref + "] 
amount to capture = [" + amountToCapture +"] amount of this capture = [" + 
amountThisCapture +"] actual auth amount =[" + authAmount + "] 
amountToBillAccount = [" + amountToBillAccount + "]", module); 
                 Map captureResult = capturePayment(dctx, userLogin, orh, 
paymentPref, amountThisCapture.doubleValue());
                 if (captureResult != null) {
@@ -1191,6 +1191,7 @@
                         } catch (GenericServiceException e) {
                             Debug.logWarning(e, "Problem processing the 
capture split payment", module);
                         }
+                        Debug.logInfo("Captured: " + amountThisCapture + " 
Remaining (re-auth): " + splitAmount, module);
                     }
                 } else {
                     Debug.logError("Payment not captured", module);


Reply via email to