You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ja...@apache.org on 2007/08/05 19:48:08 UTC
svn commit: r562917 -
/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/ImportOrdersFromEbay.java
Author: jacopoc
Date: Sun Aug 5 10:48:06 2007
New Revision: 562917
URL: http://svn.apache.org/viewvc?view=rev&rev=562917
Log:
Misc fixes for the eBay import interface.
Modified:
ofbiz/trunk/applications/order/src/org/ofbiz/order/order/ImportOrdersFromEbay.java
Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/order/ImportOrdersFromEbay.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/ImportOrdersFromEbay.java?view=diff&rev=562917&r1=562916&r2=562917
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/order/ImportOrdersFromEbay.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/order/ImportOrdersFromEbay.java Sun Aug 5 10:48:06 2007
@@ -761,9 +761,6 @@
}
cart.setOrderDate(orderDate);
- // create the shipment group item
- cart.addItemGroup("00001", null);
-
// check if the producId exists and it is valid
String productId = (String) parameters.get("productId");
if (UtilValidate.isEmpty(productId)) {
@@ -796,7 +793,7 @@
if (UtilValidate.isNotEmpty(shippingCost)) {
double shippingAmount = new Double(shippingCost).doubleValue();
if (shippingAmount > 0) {
- GenericValue shippingAdjustment = madeOrderAdjustment(delegator, "SHIPPING_CHARGES", cart.getOrderId(), null, null, shippingAmount);
+ GenericValue shippingAdjustment = makeOrderAdjustment(delegator, "SHIPPING_CHARGES", cart.getOrderId(), null, null, shippingAmount);
if (shippingAdjustment != null) {
cart.addAdjustment(shippingAdjustment);
}
@@ -808,7 +805,7 @@
if (UtilValidate.isNotEmpty(shippingTotalAdditionalCost)) {
double shippingAdditionalCost = new Double(shippingTotalAdditionalCost).doubleValue();
if (shippingAdditionalCost > 0) {
- GenericValue shippingAdjustment = madeOrderAdjustment(delegator, "MISCELLANEOUS_CHARGE", cart.getOrderId(), null, null, shippingAdditionalCost);
+ GenericValue shippingAdjustment = makeOrderAdjustment(delegator, "MISCELLANEOUS_CHARGE", cart.getOrderId(), null, null, shippingAdditionalCost);
if (shippingAdjustment != null) {
cart.addAdjustment(shippingAdjustment);
}
@@ -953,7 +950,7 @@
}
}
- private static GenericValue madeOrderAdjustment(GenericDelegator delegator, String orderAdjustmentTypeId, String orderId, String orderItemSeqId, String shipGroupSeqId, double amount) {
+ private static GenericValue makeOrderAdjustment(GenericDelegator delegator, String orderAdjustmentTypeId, String orderId, String orderItemSeqId, String shipGroupSeqId, double amount) {
GenericValue orderAdjustment = null;
try {