Author: jleroux
Date: Mon Nov 26 02:10:59 2007
New Revision: 598199
URL:
http://svn.apache.org/viewvc?rev=598199&view=revLog:
Applied fix from trunk for revision: 597972
Modified:
ofbiz/branches/release4.0/specialpurpose/pos/src/org/ofbiz/pos/event/PaymentEvents.java
Modified: ofbiz/branches/release4.0/specialpurpose/pos/src/org/ofbiz/pos/event/PaymentEvents.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release4.0/specialpurpose/pos/src/org/ofbiz/pos/event/PaymentEvents.java?rev=598199&r1=598198&r2=598199&view=diff==============================================================================
--- ofbiz/branches/release4.0/specialpurpose/pos/src/org/ofbiz/pos/event/PaymentEvents.java (original)
+++ ofbiz/branches/release4.0/specialpurpose/pos/src/org/ofbiz/pos/event/PaymentEvents.java Mon Nov 26 02:10:59 2007
@@ -43,7 +43,7 @@
Debug.log("Processing [Cash] Amount : " + amount, module);
// add the payment
- trans.addPayment("CASH", amount, "N/A", null);
+ trans.addPayment("CASH", amount, null, null);
} catch (GeneralException e) {
// errors handled
}
@@ -59,6 +59,7 @@
// check for no/external payment processing
int paymentCheck = trans.checkPaymentMethodType("PERSONAL_CHECK");
if (paymentCheck == PosTransaction.NO_PAYMENT) {
+ trans.clearPayment("PERSONAL_CHECK");
processNoPayment(pos, "PERSONAL_CHECK");
return;
} else if (paymentCheck == PosTransaction.EXTERNAL_PAYMENT) {
@@ -148,6 +149,7 @@
msrInfoStr = input.value();
}
}
+ input.clearFunction("MSRINFO");
input.setFunction("MSRINFO", msrInfoStr);
String[] msrInfoArr = msrInfoStr.split("\\|");
int allInfo = msrInfoArr.length;
@@ -172,6 +174,8 @@
if (pmId != null) {
trans.addPayment(pmId, amount);
}
+ input.clearFunction("MSRINFO");
+ input.clearFunction("CREDIT");
pos.refresh();
break;
case 1: // card number only found
@@ -195,7 +199,7 @@
Debug.log("Processing [" + paymentMethodTypeId + "] Amount : " + amount, module);
// add the payment
- trans.addPayment(paymentMethodTypeId, amount, "N/A", null);
+ trans.addPayment(paymentMethodTypeId, amount, null, null);
} catch (GeneralException e) {
// errors handled
}