You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2007/04/20 09:42:09 UTC
svn commit: r530677 -
/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java
Author: jleroux
Date: Fri Apr 20 00:42:04 2007
New Revision: 530677
URL: http://svn.apache.org/viewvc?view=rev&rev=530677
Log:
[#OFBIZ-828] problem in the pos module related to item discount and sales discount
>From a suggestion of Si cf. https://issues.apache.org/jira/browse/OFBIZ-828#action_12483045
I Finally revert for now the change Si suggested (in https://issues.apache.org/jira/browse/OFBIZ-828#action_12483045)
I prefer to see an amount in payment, even negative
Modified:
ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java
Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java?view=diff&rev=530677&r1=530676&r2=530677
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java Fri Apr 20 00:42:04 2007
@@ -3523,7 +3523,7 @@
// create the payment
Map paymentParams = new HashMap();
double maxAmount = orderPaymentPreference.getDouble("maxAmount").doubleValue();
- if (maxAmount > 0.0) {
+ //if (maxAmount > 0.0) {
paymentParams.put("paymentTypeId", "CUSTOMER_PAYMENT");
paymentParams.put("paymentMethodTypeId", orderPaymentPreference.getString("paymentMethodTypeId"));
paymentParams.put("paymentPreferenceId", orderPaymentPreference.getString("orderPaymentPreferenceId"));
@@ -3533,10 +3533,10 @@
paymentParams.put("partyIdFrom", billToParty.getString("partyId"));
paymentParams.put("currencyUomId", productStore.getString("defaultCurrencyUomId"));
paymentParams.put("partyIdTo", payToPartyId);
- }
+ /*}
else {
paymentParams.put("paymentTypeId", "CUSTOMER_REFUND"); // JLR 17/7/4 from a suggestion of Si cf. https://issues.apache.org/jira/browse/OFBIZ-828#action_12483045
- paymentParams.put("paymentMethodTypeId", orderPaymentPreference.getString("paymentMethodTypeId"));
+ paymentParams.put("paymentMethodTypeId", orderPaymentPreference.getString("paymentMethodTypeId")); // JLR 20/7/4 Finally reverted for now, I prefer to see an amount in payment, even negative
paymentParams.put("paymentPreferenceId", orderPaymentPreference.getString("orderPaymentPreferenceId"));
paymentParams.put("amount", new Double(Math.abs(maxAmount)));
paymentParams.put("statusId", "PMNT_RECEIVED");
@@ -3544,7 +3544,7 @@
paymentParams.put("partyIdFrom", payToPartyId);
paymentParams.put("currencyUomId", productStore.getString("defaultCurrencyUomId"));
paymentParams.put("partyIdTo", billToParty.getString("partyId"));
- }
+ }*/
if (paymentRefNum != null) {
paymentParams.put("paymentRefNum", paymentRefNum);
}