svn commit: r814560 [1/2] - in /ofbiz/trunk/specialpurpose/eb
Locked
 
|
Author: ashish
Date: Mon Sep 14 10:18:43 2009 New Revision: 814560 URL: http://svn.apache.org/viewvc?rev=814560&view=rev Log: Another pass on eBay Order Imports using GetOrders request. Following things are done in this patch: -- Moved commonly used methods to EbayHelper.java file. -- Created two main methods "readGetOrdersResponse" & "createShoppingCart" to read xml data coming from Ebay and then create order in OFBiz respectively. -- Also provided sample response XML data that is being generated from Ebay. -- Changed the UI in which first it was searching orders and then from the orders list we were importing orders. Now we have only one screen available in which search criteria for order is provided & on the basis of that search criteria order gets imported in OFBiz. -- Previous work for importing Orders(Not exactly order - it was transaction) is working fine OOTB. Here are few things that I am thinking to do in this area soon: -- Improve error handling code - code cleanup. -- Provide scheduled service UI(or prepare demo data for scheduling job) in which the orders will be imported automatically in the system instead of searching and then importing done by end user. - Thinking the best way to handle it. Thanks Rishi & Sumit for discussing few things/ issues in b/w the development of this pass. Modified: ofbiz/trunk/specialpurpose/ebay/config/EbayUiLabels.xml ofbiz/trunk/specialpurpose/ebay/servicedef/services.xml ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayHelper.java ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayOrderServices.java ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/ImportOrdersFromEbay.java ofbiz/trunk/specialpurpose/ebay/webapp/ebay/WEB-INF/controller.xml ofbiz/trunk/specialpurpose/ebay/widget/EbayForms.xml ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml Modified: ofbiz/trunk/specialpurpose/ebay/config/EbayUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/config/EbayUiLabels.xml?rev=814560&r1=814559&r2=814560&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebay/config/EbayUiLabels.xml (original) +++ ofbiz/trunk/specialpurpose/ebay/config/EbayUiLabels.xml Mon Sep 14 10:18:43 2009 @@ -33,7 +33,7 @@ <value xml:lang="th">OFBiz</value> </property> <property key="EbayEBayOrders"> - <value xml:lang="en">eBay Orders</value> + <value xml:lang="en">eBay Orders Import</value> </property> <property key="EbayExportToEbay"> <value xml:lang="de">zu eBay exportieren</value> Modified: ofbiz/trunk/specialpurpose/ebay/servicedef/services.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/servicedef/services.xml?rev=814560&r1=814559&r2=814560&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebay/servicedef/services.xml (original) +++ ofbiz/trunk/specialpurpose/ebay/servicedef/services.xml Mon Sep 14 10:18:43 2009 @@ -113,10 +113,29 @@ <service name="getEbayOrders" engine="java" transaction-timeout="300" location="org.ofbiz.ebay.EbayOrderServices" invoke="getEbayOrders" auth="true"> <description>Get Orders from eBay</description> - <attribute type="String" mode="IN" name="productStoreId" optional="false"/> - <attribute type="String" mode="IN" name="fromDate" optional="false"/> - <attribute type="String" mode="IN" name="thruDate" optional="false"/> - <attribute type="List" mode="OUT" name="orderList" optional="true"/> + <attribute name="productStoreId" type="String" mode="IN" optional="false"/> + <attribute name="fromDate" type="String" mode="IN" optional="false"/> + <attribute name="thruDate" type="String" mode="IN" optional="false"/> + <attribute name="orderList" type="List" mode="OUT" optional="true"/> + </service> + + <service name="importEbayOrders" engine="java" transaction-timeout="7200" + location="org.ofbiz.ebay.EbayOrderServices" invoke="importEbayOrders" auth="true"> + <description>Import Order from eBay</description> + <attribute name="productStoreId" type="String" mode="IN" optional="false"/> + <attribute name="externalId" type="String" mode="IN" optional="false"/> + <attribute name="emailBuyer" type="String" mode="IN" optional="true"/> + <attribute name="amountPaid" type="String" mode="IN" optional="true"/> + <attribute name="createdDate" type="String" mode="IN" optional="false"/> + <attribute name="paidTime" type="String" mode="IN" optional="true"/> + <attribute name="shippedTime" type="String" mode="IN" optional="true"/> + <attribute name="ebayUserIdBuyer" type="String" mode="IN" optional="true"/> + <attribute name="shippingAddressCtx" type="Map" mode="IN" optional="true"/> + <attribute name="shippingServiceSelectedCtx" type="Map" mode="IN" optional="true"/> + <attribute name="shippingDetailsCtx" type="Map" mode="IN" optional="true"/> + <attribute name="checkoutStatusCtx" type="Map" mode="IN" optional="true"/> + <attribute name="externalTransactionCtx" type="Map" mode="IN" optional="true"/> + <attribute name="orderItemList" type="List" mode="IN" optional="true"/> </service> </services> \ No newline at end of file Modified: ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayHelper.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayHelper.java?rev=814560&r1=814559&r2=814560&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayHelper.java (original) +++ ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayHelper.java Mon Sep 14 10:18:43 2009 @@ -24,11 +24,16 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.io.OutputStream; +import java.math.BigDecimal; import java.net.HttpURLConnection; import java.net.URL; +import java.sql.Timestamp; import java.text.ParsePosition; import java.text.SimpleDateFormat; +import java.util.Collection; import java.util.Date; +import java.util.Iterator; +import java.util.List; import java.util.Locale; import java.util.Map; @@ -42,6 +47,12 @@ import org.ofbiz.entity.GenericDelegator; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericValue; +import org.ofbiz.entity.util.EntityUtil; +import org.ofbiz.order.shoppingcart.ShoppingCart; +import org.ofbiz.party.contact.ContactHelper; +import org.ofbiz.service.GenericServiceException; +import org.ofbiz.service.LocalDispatcher; +import org.ofbiz.service.ModelService; import org.ofbiz.service.ServiceUtil; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -88,31 +99,6 @@ Element requesterCredentialsElem = UtilXml.addChildElement(elem, "RequesterCredentials", doc); UtilXml.addChildElementValue(requesterCredentialsElem, "eBayAuthToken", token, doc); } - - public static String convertDate(String dateIn, String fromDateFormat, String toDateFormat) { - String dateOut; - try { - SimpleDateFormat formatIn = new SimpleDateFormat(fromDateFormat); - SimpleDateFormat formatOut= new SimpleDateFormat(toDateFormat); - Date data = formatIn.parse(dateIn, new ParsePosition(0)); - dateOut = formatOut.format(data); - } catch (Exception e) { - dateOut = null; - } - return dateOut; - } - - public static String toString(InputStream inputStream) throws IOException { - String string; - StringBuilder outputBuilder = new StringBuilder(); - if (inputStream != null) { - BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream)); - while (null != (string = reader.readLine())) { - outputBuilder.append(string).append('\n'); - } - } - return outputBuilder.toString(); - } public static Map<String, Object> postItem(String postItemsUrl, StringBuffer generatedXmlData, String devID, String appID, String certID, String callName, String compatibilityLevel, String siteID) throws IOException { @@ -153,4 +139,465 @@ } return result; } + + public static String convertDate(String dateIn, String fromDateFormat, String toDateFormat) { + String dateOut; + try { + SimpleDateFormat formatIn = new SimpleDateFormat(fromDateFormat); + SimpleDateFormat formatOut= new SimpleDateFormat(toDateFormat); + Date data = formatIn.parse(dateIn, new ParsePosition(0)); + dateOut = formatOut.format(data); + } catch (Exception e) { + dateOut = null; + } + return dateOut; + } + + public static String toString(InputStream inputStream) throws IOException { + String string; + StringBuilder outputBuilder = new StringBuilder(); + if (inputStream != null) { + BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream)); + while (null != (string = reader.readLine())) { + outputBuilder.append(string).append('\n'); + } + } + return outputBuilder.toString(); + } + + public static void setShipmentMethodType(ShoppingCart cart, String shippingService) { + String partyId = "_NA_"; + String shipmentMethodTypeId = "NO_SHIPPING"; + + if (shippingService != null) { + if ("USPSPriority".equals(shippingService)) { + partyId = "USPS"; + shipmentMethodTypeId = "STANDARD"; + } else if ("UPSGround".equals(shippingService)) { + partyId = "UPS"; + shipmentMethodTypeId = "GROUND"; + } else if ("UPS3rdDay".equals(shippingService)) { + partyId = "UPS"; + shipmentMethodTypeId = "THIRD_DAY"; + } else if ("UPS2ndDay".equals(shippingService)) { + partyId = "UPS"; + shipmentMethodTypeId = "SECOND_DAY"; + } else if ("USPSExpressMailInternational".equals(shippingService)) { + partyId = "USPS"; + shipmentMethodTypeId = "INT_EXPRESS"; + } else if ("UPSNextDay".equals(shippingService)) { + partyId = "UPS"; + shipmentMethodTypeId = "NEXT_DAY"; + } else if ("UPSNextDayAir".equals(shippingService)) { + partyId = "UPS"; + shipmentMethodTypeId = "AIR"; + } else if ("ShippingMethodStandard".equals(shippingService)) { + partyId = "UPS"; + shipmentMethodTypeId = "GROUND"; + } else if ("StandardInternational".equals(shippingService)) { + partyId = "USPS"; + shipmentMethodTypeId = "INT_EXPRESS"; + } else if ("LocalDelivery".equals(shippingService)) { + partyId = "_NA_"; + shipmentMethodTypeId = "STANDARD"; + } + } + cart.setCarrierPartyId(partyId); + cart.setShipmentMethodTypeId(shipmentMethodTypeId); + } + + public static boolean createPaymentFromPaymentPreferences(GenericDelegator delegator, LocalDispatcher dispatcher, GenericValue userLogin, + String orderId, String externalId, Timestamp orderDate, String partyIdFrom) { + List paymentPreferences = null; + try { + Map paymentFields = UtilMisc.toMap("orderId", orderId, "statusId", "PAYMENT_RECEIVED", + "paymentMethodTypeId", "EXT_EBAY"); + paymentPreferences = delegator.findByAnd("OrderPaymentPreference", paymentFields); + + if (UtilValidate.isNotEmpty(paymentPreferences)) { + Iterator i = paymentPreferences.iterator(); + while (i.hasNext()) { + GenericValue pref = (GenericValue) i.next(); + boolean okay = createPayment(dispatcher, userLogin, pref, orderId, externalId, orderDate, partyIdFrom); + if (!okay) + return false; + } + } + } catch (Exception e) { + Debug.logError(e, "Cannot get payment preferences for order #" + orderId, module); + return false; + } + return true; + } + + public static boolean createPayment(LocalDispatcher dispatcher, GenericValue userLogin, + GenericValue paymentPreference, String orderId, String externalId, Timestamp orderDate, String partyIdFrom) { + try { + GenericDelegator delegator = paymentPreference.getDelegator(); + + // create the PaymentGatewayResponse + String responseId = delegator.getNextSeqId("PaymentGatewayResponse"); + GenericValue response = delegator.makeValue("PaymentGatewayResponse"); + response.set("paymentGatewayResponseId", responseId); + response.set("paymentServiceTypeEnumId", "PRDS_PAY_EXTERNAL"); + response.set("orderPaymentPreferenceId", paymentPreference.get("orderPaymentPreferenceId")); + response.set("paymentMethodTypeId", paymentPreference.get("paymentMethodTypeId")); + response.set("paymentMethodId", paymentPreference.get("paymentMethodId")); + response.set("amount", paymentPreference.get("maxAmount")); + response.set("referenceNum", externalId); + response.set("transactionDate", orderDate); + delegator.createOrStore(response); + + // create the payment + Map results = dispatcher.runSync("createPaymentFromPreference", UtilMisc.toMap("userLogin", userLogin, + "orderPaymentPreferenceId", paymentPreference.get("orderPaymentPreferenceId"), "paymentFromId", + partyIdFrom, "paymentRefNum", externalId, "comments", "Payment receive via eBay")); + + if ((results == null) || (results.get(ModelService.RESPONSE_MESSAGE).equals(ModelService.RESPOND_ERROR))) { + Debug.logError((String) results.get(ModelService.ERROR_MESSAGE), module); + return false; + } + return true; + } catch (Exception e) { + Debug.logError(e, "Failed to create the payment for order " + orderId, module); + return false; + } + } + + public static GenericValue makeOrderAdjustment(GenericDelegator delegator, String orderAdjustmentTypeId, + String orderId, String orderItemSeqId, String shipGroupSeqId, double amount, double sourcePercentage) { + GenericValue orderAdjustment = null; + + try { + if (UtilValidate.isNotEmpty(orderItemSeqId)) { + orderItemSeqId = "_NA_"; + } + if (UtilValidate.isNotEmpty(shipGroupSeqId)) { + shipGroupSeqId = "_NA_"; + } + + Map inputMap = UtilMisc.toMap("orderAdjustmentTypeId", orderAdjustmentTypeId, "orderId", orderId, + "orderItemSeqId", orderItemSeqId, "shipGroupSeqId", shipGroupSeqId, "amount", + new BigDecimal(amount)); + if (sourcePercentage != 0) { + inputMap.put("sourcePercentage", new Double(sourcePercentage)); + } + orderAdjustment = delegator.makeValue("OrderAdjustment", inputMap); + } catch (Exception e) { + Debug.logError(e, "Failed to made order adjustment for order " + orderId, module); + } + return orderAdjustment; + } + + public static String createCustomerParty(LocalDispatcher dispatcher, String name, GenericValue userLogin) { + String partyId = null; + + try { + if (UtilValidate.isNotEmpty(name) && UtilValidate.isNotEmpty(userLogin)) { + Debug.logVerbose("Creating Customer Party: " + name, module); + + // Try to split the lastname from the firstname + String firstName = ""; + String lastName = ""; + int pos = name.indexOf(" "); + + if (pos >= 0) { + firstName = name.substring(0, pos); + lastName = name.substring(pos + 1); + } else { + lastName = name; + } + + Map summaryResult = dispatcher.runSync("createPerson", UtilMisc.<String, Object> toMap("description", + name, "firstName", firstName, "lastName", lastName, "userLogin", userLogin, "comments", + "Created via eBay")); + partyId = (String) summaryResult.get("partyId"); + Debug.logVerbose("Created Customer Party: " + partyId, module); + } + } catch (Exception e) { + Debug.logError(e, "Failed to createPerson", module); + } + return partyId; + } + + public static String createAddress(LocalDispatcher dispatcher, String partyId, GenericValue userLogin, + String contactMechPurposeTypeId, Map address) { + Debug.logInfo("Creating postal address with input map: " + address, module); + String contactMechId = null; + try { + Map context = FastMap.newInstance(); + context.put("partyId", partyId); + context.put("toName", (String) address.get("buyerName")); + context.put("address1", (String) address.get("shippingAddressStreet1")); + context.put("address2", (String) address.get("shippingAddressStreet2")); + context.put("postalCode", (String) address.get("shippingAddressPostalCode")); + context.put("userLogin", userLogin); + context.put("contactMechPurposeTypeId", contactMechPurposeTypeId); + + String country = (String) address.get("shippingAddressCountry"); + String state = (String) address.get("shippingAddressStateOrProvince"); + String city = (String) address.get("shippingAddressCityName"); + correctCityStateCountry(dispatcher, context, city, state, country); + + Map summaryResult = dispatcher.runSync("createPartyPostalAddress", context); + contactMechId = (String) summaryResult.get("contactMechId"); + // Set also as a billing address + context = FastMap.newInstance(); + context.put("partyId", partyId); + context.put("contactMechId", contactMechId); + context.put("contactMechPurposeTypeId", "BILLING_LOCATION"); + context.put("userLogin", userLogin); + dispatcher.runSync("createPartyContactMechPurpose", context); + } catch (GenericServiceException e) { + Debug.logError(e, "Failed to createAddress", module); + } + return contactMechId; + } + + public static void correctCityStateCountry(LocalDispatcher dispatcher, Map map, String city, String state, + String country) { + try { + Debug.logInfo("correctCityStateCountry params: " + city + ", " + state + ", " + country, module); + if (UtilValidate.isEmpty(country)) { + country = "US"; + } + country = country.toUpperCase(); + if (country.indexOf("UNITED STATES") > -1 || country.indexOf("USA") > -1) { + country = "US"; + } + Debug.logInfo("GeoCode: " + country, module); + Map outMap = getCountryGeoId(dispatcher.getDelegator(), country); + String geoId = (String) outMap.get("geoId"); + if (UtilValidate.isEmpty(geoId)) { + geoId = "USA"; + } + map.put("countryGeoId", geoId); + Debug.logInfo("Country geoid: " + geoId, module); + if (geoId.equals("USA") || geoId.equals("CAN")) { + if (UtilValidate.isNotEmpty(state)) { + map.put("stateProvinceGeoId", state.toUpperCase()); + } + map.put("city", city); + } else { + map.put("city", city + ", " + state); + } + Debug.logInfo("State geoid: " + state, module); + } catch (Exception e) { + Debug.logError(e, "Failed to correctCityStateCountry", module); + } + } + + public static String createPartyPhone(LocalDispatcher dispatcher, String partyId, String phoneNumber, + GenericValue userLogin) { + Map summaryResult = FastMap.newInstance(); + Map context = FastMap.newInstance(); + String phoneContactMechId = null; + + try { + context.put("contactNumber", phoneNumber); + context.put("partyId", partyId); + context.put("userLogin", userLogin); + context.put("contactMechPurposeTypeId", "PHONE_SHIPPING"); + summaryResult = dispatcher.runSync("createPartyTelecomNumber", context); + phoneContactMechId = (String) summaryResult.get("contactMechId"); + } catch (Exception e) { + Debug.logError(e, "Failed to createPartyPhone", module); + } + return phoneContactMechId; + } + + public static String createPartyEmail(LocalDispatcher dispatcher, String partyId, String email, GenericValue userLogin) { + Map context = FastMap.newInstance(); + Map summaryResult = FastMap.newInstance(); + String emailContactMechId = null; + + try { + if (UtilValidate.isNotEmpty(email)) { + context.clear(); + context.put("emailAddress", email); + context.put("userLogin", userLogin); + context.put("contactMechTypeId", "EMAIL_ADDRESS"); + summaryResult = dispatcher.runSync("createEmailAddress", context); + emailContactMechId = (String) summaryResult.get("contactMechId"); + + context.clear(); + context.put("partyId", partyId); + context.put("contactMechId", emailContactMechId); + context.put("contactMechPurposeTypeId", "OTHER_EMAIL"); + context.put("userLogin", userLogin); + summaryResult = dispatcher.runSync("createPartyContactMech", context); + } + } catch (Exception e) { + Debug.logError(e, "Failed to createPartyEmail", module); + } + return emailContactMechId; + } + + public static void createEbayCustomer(LocalDispatcher dispatcher, String partyId, String ebayUserIdBuyer, String eias, + GenericValue userLogin) { + Map context = FastMap.newInstance(); + Map summaryResult = FastMap.newInstance(); + if (UtilValidate.isNotEmpty(eias)) { + try { + context.put("partyId", partyId); + context.put("attrName", "EBAY_BUYER_EIAS"); + context.put("attrValue", eias); + context.put("userLogin", userLogin); + summaryResult = dispatcher.runSync("createPartyAttribute", context); + } catch (Exception e) { + Debug.logError(e, "Failed to create eBay EIAS party attribute"); + } + context.clear(); + summaryResult.clear(); + } + if (UtilValidate.isNotEmpty(ebayUserIdBuyer)) { + try { + context.put("partyId", partyId); + context.put("attrName", "EBAY_BUYER_USER_ID"); + context.put("attrValue", ebayUserIdBuyer); + context.put("userLogin", userLogin); + summaryResult = dispatcher.runSync("createPartyAttribute", context); + } catch (Exception e) { + Debug.logError(e, "Failed to create eBay userId party attribute"); + } + } + } + + public static Map getCountryGeoId(GenericDelegator delegator, String geoCode) { + GenericValue geo = null; + try { + Debug.logInfo("geocode: " + geoCode, module); + + geo = EntityUtil.getFirst(delegator.findByAnd("Geo", UtilMisc.toMap("geoCode", geoCode.toUpperCase(), + "geoTypeId", "COUNTRY"))); + Debug.logInfo("Found a geo entity " + geo, module); + if (UtilValidate.isEmpty(geo)) { + geo = delegator.makeValue("Geo"); + geo.set("geoId", geoCode + "_IMPORTED"); + geo.set("geoTypeId", "COUNTRY"); + geo.set("geoName", geoCode + "_IMPORTED"); + geo.set("geoCode", geoCode + "_IMPORTED"); + geo.set("abbreviation", geoCode + "_IMPORTED"); + delegator.create(geo); + Debug.logInfo("Creating new geo entity: " + geo, module); + } + } catch (Exception e) { + String errMsg = "Failed to find/setup geo id"; + Debug.logError(e, errMsg, module); + return ServiceUtil.returnError(errMsg); + } + + Map result = ServiceUtil.returnSuccess(); + result.put("geoId", (String) geo.get("geoId")); + return result; + } + + public static String setShippingAddressContactMech(LocalDispatcher dispatcher, GenericDelegator delegator, + GenericValue party, GenericValue userLogin, Map context) { + String contactMechId = null; + String partyId = (String) party.get("partyId"); + + // find all contact mechs for this party with a shipping location + // purpose. + Collection shippingLocations = ContactHelper.getContactMechByPurpose(party, "SHIPPING_LOCATION", false); + + // check them to see if one matches + Iterator shippingLocationsIterator = shippingLocations.iterator(); + while (shippingLocationsIterator.hasNext()) { + GenericValue shippingLocation = (GenericValue) shippingLocationsIterator.next(); + contactMechId = shippingLocation.getString("contactMechId"); + GenericValue postalAddress; + try { + // get the postal address for this contact mech + postalAddress = delegator.findByPrimaryKey("PostalAddress", UtilMisc.toMap("contactMechId", contactMechId)); + + // match values to compare by modifying them the same way they + // were when they were created + String country = ((String) context.get("shippingAddressCountry")).toUpperCase(); + String state = ((String) context.get("shippingAddressStateOrProvince")).toUpperCase(); + String city = (String) context.get("shippingAddressCityName"); + correctCityStateCountry(dispatcher, context, city, state, country); + + // TODO: The following comparison does not consider the To Name + // or Attn: lines of the address. + // + // now compare values. If all fields match, that's our shipping + // address. Return the related contact mech id. + if (context.get("shippingAddressStreet1").toString().equals((postalAddress.get("address1").toString())) + && context.get("shippingAddressStreet2").toString().equals((postalAddress.get("address2").toString())) + && context.get("city").toString().equals((postalAddress.get("city").toString())) + && context.get("stateProvinceGeoId").toString().equals((postalAddress.get("stateProvinceGeoId").toString())) + && context.get("countryGeoId").toString().equals((postalAddress.get("countryGeoId").toString())) + && context.get("shippingAddressPostalCode").toString().equals((postalAddress.get("postalCode").toString()))) { + return contactMechId; + } + } catch (Exception e) { + Debug.logError(e, "Problem with verifying postal addresses for contactMechId " + contactMechId + ".", module); + } + } + // none of the existing contact mechs/postal addresses match (or none + // were found). Create a new one and return the related contact mech id. + Debug.logInfo("Unable to find matching postal address for partyId " + partyId + ". Creating a new one.", module); + return createAddress(dispatcher, partyId, userLogin, "SHIPPING_LOCATION", context); + } + + public static String setEmailContactMech(LocalDispatcher dispatcher, GenericDelegator delegator, + GenericValue party, GenericValue userLogin, Map context) { + String contactMechId = null; + String partyId = (String) party.get("partyId"); + + // find all contact mechs for this party with a email address purpose. + Collection emailAddressContactMechs = ContactHelper.getContactMechByPurpose(party, "OTHER_EMAIL", false); + + // check them to see if one matches + Iterator emailAddressesContactMechsIterator = emailAddressContactMechs.iterator(); + while (emailAddressesContactMechsIterator.hasNext()) { + GenericValue emailAddressContactMech = (GenericValue) emailAddressesContactMechsIterator.next(); + contactMechId = emailAddressContactMech.getString("contactMechId"); + // now compare values. If one matches, that's our email address. + // Return the related contact mech id. + if (context.get("emailBuyer").toString().equals((emailAddressContactMech.get("infoString").toString()))) { + return contactMechId; + } + } + // none of the existing contact mechs/email addresses match (or none + // were found). Create a new one and return the related contact mech id. + Debug.logInfo("Unable to find matching postal address for partyId " + partyId + ". Creating a new one.", module); + return createPartyEmail(dispatcher, partyId, (String) context.get("emailBuyer"), userLogin); + } + + public static String setPhoneContactMech(LocalDispatcher dispatcher, GenericDelegator delegator, + GenericValue party, GenericValue userLogin, Map context) { + String contactMechId = null; + String partyId = (String) party.get("partyId"); + + // find all contact mechs for this party with a telecom number purpose. + Collection phoneNumbers = ContactHelper.getContactMechByPurpose(party, "PHONE_SHIPPING", false); + + // check them to see if one matches + Iterator phoneNumbersIterator = phoneNumbers.iterator(); + while (phoneNumbersIterator.hasNext()) { + GenericValue phoneNumberContactMech = (GenericValue) phoneNumbersIterator.next(); + contactMechId = phoneNumberContactMech.getString("contactMechId"); + GenericValue phoneNumber; + try { + // get the phone number for this contact mech + phoneNumber = delegator.findByPrimaryKey("TelecomNumber", UtilMisc + .toMap("contactMechId", contactMechId)); + + // now compare values. If one matches, that's our phone number. + // Return the related contact mech id. + if (context.get("shippingAddressPhone").toString() + .equals((phoneNumber.get("contactNumber").toString()))) { + return contactMechId; + } + } catch (Exception e) { + Debug.logError("Problem with verifying phone number for contactMechId " + contactMechId + ".", module); + } + } + // none of the existing contact mechs/email addresses match (or none + // were found). Create a new one and return the related contact mech id. + Debug.logInfo("Unable to find matching postal address for partyId " + partyId + ". Creating a new one.", module); + return createPartyPhone(dispatcher, partyId, (String) context.get("shippingAddressPhone"), userLogin); + } } \ No newline at end of file Modified: ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayOrderServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayOrderServices.java?rev=814560&r1=814559&r2=814560&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayOrderServices.java (original) +++ ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayOrderServices.java Mon Sep 14 10:18:43 2009 @@ -19,15 +19,35 @@ package org.ofbiz.ebay; +import java.math.BigDecimal; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; import java.util.Locale; import java.util.Map; import javolution.util.FastMap; import org.ofbiz.base.util.Debug; +import org.ofbiz.base.util.GeneralException; +import org.ofbiz.base.util.UtilDateTime; +import org.ofbiz.base.util.UtilMisc; import org.ofbiz.base.util.UtilProperties; +import org.ofbiz.base.util.UtilValidate; import org.ofbiz.base.util.UtilXml; import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.GenericEntityException; +import org.ofbiz.entity.GenericValue; +import org.ofbiz.entity.util.EntityUtil; +import org.ofbiz.order.order.OrderChangeHelper; +import org.ofbiz.order.shoppingcart.CheckOutHelper; +import org.ofbiz.order.shoppingcart.ShoppingCart; +import org.ofbiz.order.shoppingcart.ShoppingCartItem; +import org.ofbiz.party.party.PartyWorker; import org.ofbiz.service.DispatchContext; import org.ofbiz.service.LocalDispatcher; import org.ofbiz.service.ModelService; @@ -51,9 +71,9 @@ if (!ServiceUtil.isFailure(buildGetOrdersRequest(context, getOrdersXml, eBayConfigResult.get("token").toString()))) { result = EbayHelper.postItem(eBayConfigResult.get("xmlGatewayUri").toString(), getOrdersXml, eBayConfigResult.get("devID").toString(), eBayConfigResult.get("appID").toString(), eBayConfigResult.get("certID").toString(), "GetOrders", eBayConfigResult.get("compatibilityLevel").toString(), eBayConfigResult.get("siteID").toString()); - String success = (String) result.get(ModelService.SUCCESS_MESSAGE); - if (success != null) { - result = checkOrders(delegator, dispatcher, locale, context, success); + String responseMsg = (String) result.get(ModelService.SUCCESS_MESSAGE); + if (responseMsg != null) { + result = checkOrders(delegator, dispatcher, locale, context, responseMsg); } } } catch (Exception e) { @@ -63,6 +83,21 @@ return result; } + public static Map<String, Object> importEbayOrders(DispatchContext dctx, Map<String, Object> context) { + Debug.logInfo("The value of context map is " + context, module); + GenericDelegator delegator = dctx.getDelegator(); + LocalDispatcher dispatcher = dctx.getDispatcher(); + Locale locale = (Locale) context.get("locale"); + Map<String, Object> result = FastMap.newInstance(); + try { + result = createShoppingCart(delegator, dispatcher, locale, context, true); + } catch (Exception e) { + Debug.logError("Exception in importOrderFromEbay " + e, module); + return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "ordersImportFromEbay.exceptionInImportOrderFromEbay", locale)); + } + return result; + } + private static Map<String, Object> buildGetOrdersRequest(Map<String, Object> context, StringBuffer dataItemsXml, String token) { Locale locale = (Locale) context.get("locale"); String fromDate = (String) context.get("fromDate"); @@ -100,14 +135,593 @@ return ServiceUtil.returnSuccess(); } - private static Map<String, Object> checkOrders(GenericDelegator delegator, LocalDispatcher dispatcher, Locale locale, Map<String, Object> context, String response) { - Document docResponse; + private static Map<String, Object> checkOrders(GenericDelegator delegator, LocalDispatcher dispatcher, Locale locale, Map<String, Object> context, String responseMsg) { + StringBuffer errorMessage = new StringBuffer(); + GenericValue userLogin = (GenericValue) context.get("userLogin"); + List<GenericValue> orders = readGetOrdersResponse(responseMsg, locale, (String) context.get("productStoreId"), delegator, dispatcher, errorMessage, userLogin); + if (orders == null || orders.size() == 0) { + Debug.logError("No orders found", module); + return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "ordersImportFromEbay.noOrdersFound", locale)); + } + return ServiceUtil.returnSuccess(); + } + +// Sample xml data that is being generated from GetOrders request +// +// <?xml version="1.0" encoding="UTF-8"?><GetOrdersResponse xmlns="urn:ebay:apis:eBLBaseComponents"> +// <Timestamp>2009-09-10T11:17:53.529Z</Timestamp> +// <Ack>Success</Ack> +// <Version>631</Version> +// <Build>E631_CORE_BUNDLED_9942930_R1</Build> +// <OrderArray> +// <Order> +// <OrderID>116583010</OrderID> +// <OrderStatus>Completed</OrderStatus> +// <AdjustmentAmount currencyID="USD">0.0</AdjustmentAmount> +// <AmountSaved currencyID="USD">0.0</AmountSaved> +// <CheckoutStatus> +// <eBayPaymentStatus>NoPaymentFailure</eBayPaymentStatus> +// <LastModifiedTime>2009-09-08T14:07:10.000Z</LastModifiedTime> +// <PaymentMethod>CCAccepted</PaymentMethod> +// <Status>Complete</Status> +// <IntegratedMerchantCreditCardEnabled>false</IntegratedMerchantCreditCardEnabled> +// </CheckoutStatus> +// <ShippingDetails> +// <InsuranceFee currencyID="USD">0.0</InsuranceFee> +// <InsuranceOption>NotOffered</InsuranceOption> +// <InsuranceWanted>false</InsuranceWanted> +// <SalesTax> +// <SalesTaxPercent>0.0</SalesTaxPercent> +// <SalesTaxState/> +// <ShippingIncludedInTax>false</ShippingIncludedInTax> +// <SalesTaxAmount currencyID="USD">0.0</SalesTaxAmount> +// </SalesTax> +// <ShippingServiceOptions> +// <ShippingService>UPS2ndDay</ShippingService> +// <ShippingServiceCost currencyID="USD">10.0</ShippingServiceCost> +// <ShippingServicePriority>1</ShippingServicePriority> +// <ExpeditedService>false</ExpeditedService> +// <ShippingTimeMin>1</ShippingTimeMin> +// <ShippingTimeMax>2</ShippingTimeMax> +// </ShippingServiceOptions> +// <SellingManagerSalesRecordNumber>103</SellingManagerSalesRecordNumber> +// <GetItFast>false</GetItFast> +// </ShippingDetails> +// <CreatingUserRole>Buyer</CreatingUserRole> +// <CreatedTime>2009-09-08T08:53:23.000Z</CreatedTime> +// <PaymentMethods>AmEx</PaymentMethods> +// <PaymentMethods>Discover</PaymentMethods> +// <PaymentMethods>VisaMC</PaymentMethods> +// <ShippingAddress> +// <Name>Apache OFBiz</Name> +// <Street1>Apache Software Foundation</Street1> +// <Street2/> +// <CityName>Salt Lake City</CityName> +// <StateOrProvince>UT</StateOrProvince> +// <Country>US</Country> +// <CountryName>United States</CountryName> +// <Phone>888 887 9876</Phone> +// <PostalCode>84101</PostalCode> +// <AddressID>5149770</AddressID> +// <AddressOwner>eBay</AddressOwner> +// <ExternalAddressID/> +// </ShippingAddress> +// <ShippingServiceSelected> +// <ShippingInsuranceCost currencyID="USD">0.0</ShippingInsuranceCost> +// <ShippingService>UPS2ndDay</ShippingService> +// <ShippingServiceCost currencyID="USD">10.0</ShippingServiceCost> +// </ShippingServiceSelected> +// <Subtotal currencyID="USD">132.0</Subtotal> +// <Total currencyID="USD">142.0</Total> +// <ExternalTransaction> +// <ExternalTransactionID>SIS</ExternalTransactionID> +// <ExternalTransactionTime>2009-09-08T08:53:32.000Z</ExternalTransactionTime> +// <FeeOrCreditAmount currencyID="USD">0.0</FeeOrCreditAmount> +// <PaymentOrRefundAmount currencyID="USD">142.0</PaymentOrRefundAmount> +// </ExternalTransaction> +// <TransactionArray> +// <Transaction> +// <Buyer> +// <Email>[hidden email]</Email> +// </Buyer> +// <ShippingDetails> +// <SellingManagerSalesRecordNumber>101</SellingManagerSalesRecordNumber> +// </ShippingDetails> +// <Item> +// <ItemID>110040779968</ItemID> +// <SKU>GZ-9290</SKU> +// </Item> +// <QuantityPurchased>1</QuantityPurchased> +// <Status> +// <PaymentHoldStatus>None</PaymentHoldStatus> +// </Status> +// <TransactionID>0</TransactionID> +// <TransactionPrice currencyID="USD">102.0</TransactionPrice> +// </Transaction> +// <Transaction> +// <Buyer> +// <Email>[hidden email]</Email> +// </Buyer> +// <ShippingDetails> +// <SellingManagerSalesRecordNumber>102</SellingManagerSalesRecordNumber> +// </ShippingDetails> +// <Item> +// <ItemID>110040780249</ItemID> +// <SKU>GZ-1001</SKU> +// </Item> +// <QuantityPurchased>1</QuantityPurchased> +// <Status> +// <PaymentHoldStatus>None</PaymentHoldStatus> +// </Status> +// <TransactionID>0</TransactionID> +// <TransactionPrice currencyID="USD">30.0</TransactionPrice> +// </Transaction> +// </TransactionArray> +// <BuyerUserID>apacheofbiz</BuyerUserID> +// <PaidTime>2009-09-08T14:04:17.000Z</PaidTime> +// <ShippedTime>2009-09-08T14:07:09.000Z</ShippedTime> +// <IntegratedMerchantCreditCardEnabled>false</IntegratedMerchantCreditCardEnabled> +// </Order> +// </OrderArray> +//</GetOrdersResponse> + + + private static List readGetOrdersResponse(String responseMsg, Locale locale, String productStoreId, GenericDelegator delegator, LocalDispatcher dispatcher, StringBuffer errorMessage, GenericValue userLogin) { + List fetchedOrders = new ArrayList(); try { - docResponse = UtilXml.readXmlDocument(response, true); - //Debug.logInfo("The generated string is ======= " + UtilXml.writeXmlDocument(docResponse), module); + Document docResponse = UtilXml.readXmlDocument(responseMsg, true); + //Debug.logInfo("The generated string is ======= " + UtilXml.writeXmlDocument(docResponse), module); + Element elemResponse = docResponse.getDocumentElement(); + String ack = UtilXml.childElementValue(elemResponse, "Ack", "Failure"); + + int totalOrders = 0; + + if (ack != null && "Success".equals(ack)) { + List orderArrays = UtilXml.childElementList(elemResponse, "OrderArray"); + if (orderArrays != null && orderArrays.size() > 0) { + totalOrders = orderArrays.size(); + } + if (totalOrders > 0) { + // retrieve transaction array + Iterator orderArraysElemIter = orderArrays.iterator(); + while (orderArraysElemIter.hasNext()) { + Element orderArraysElement = (Element) orderArraysElemIter.next(); + + // retrieve transaction + List orders = UtilXml.childElementList(orderArraysElement, "Order"); + Iterator ordersElemIter = orders.iterator(); + + while (ordersElemIter.hasNext()) { + Map<String, Object> orderCtx = FastMap.newInstance(); + Element ordersElement = (Element) ordersElemIter.next(); + String externalOrderId = UtilXml.childElementValue(ordersElement, "OrderID"); + orderCtx.put("externalId", externalOrderId); + orderCtx.put("amountPaid", UtilXml.childElementValue(ordersElement, "Total", "0")); + orderCtx.put("createdDate", UtilXml.childElementValue(ordersElement, "CreatedTime")); + orderCtx.put("paidTime", UtilXml.childElementValue(ordersElement, "PaidTime")); + orderCtx.put("shippedTime", UtilXml.childElementValue(ordersElement, "ShippedTime")); + orderCtx.put("ebayUserIdBuyer", UtilXml.childElementValue(ordersElement, "BuyerUserID")); + orderCtx.put("productStoreId", productStoreId); + + // Retrieve shipping address + Map<String, Object> shippingAddressCtx = FastMap.newInstance(); + List shippingAddressList = UtilXml.childElementList(ordersElement, "ShippingAddress"); + Iterator shippingAddressElemIter = shippingAddressList.iterator(); + while (shippingAddressElemIter.hasNext()) { + Element shippingAddressElement = (Element)shippingAddressElemIter.next(); + shippingAddressCtx.put("buyerName", UtilXml.childElementValue(shippingAddressElement, "Name")); + shippingAddressCtx.put("shippingAddressStreet1", UtilXml.childElementValue(shippingAddressElement, "Street1")); + shippingAddressCtx.put("shippingAddressStreet2", UtilXml.childElementValue(shippingAddressElement, "Street2")); + shippingAddressCtx.put("shippingAddressCityName", UtilXml.childElementValue(shippingAddressElement, "CityName")); + shippingAddressCtx.put("shippingAddressStateOrProvince", UtilXml.childElementValue(shippingAddressElement, "StateOrProvince")); + shippingAddressCtx.put("shippingAddressCountry", UtilXml.childElementValue(shippingAddressElement, "Country")); + shippingAddressCtx.put("shippingAddressCountryName", UtilXml.childElementValue(shippingAddressElement, "CountryName")); + shippingAddressCtx.put("shippingAddressPhone", UtilXml.childElementValue(shippingAddressElement, "Phone")); + shippingAddressCtx.put("shippingAddressPostalCode", UtilXml.childElementValue(shippingAddressElement, "PostalCode")); + } + orderCtx.put("shippingAddressCtx", shippingAddressCtx); + + // Retrieve shipping service selected + Map<String, Object> shippingServiceSelectedCtx = FastMap.newInstance(); + List shippingServiceSelectedList = UtilXml.childElementList(ordersElement, "ShippingServiceSelected"); + Iterator shippingServiceSelectedElemIter = shippingServiceSelectedList.iterator(); + while (shippingServiceSelectedElemIter.hasNext()) { + Element shippingServiceSelectedElement = (Element)shippingServiceSelectedElemIter.next(); + shippingServiceSelectedCtx.put("shippingService", UtilXml.childElementValue(shippingServiceSelectedElement, "ShippingService")); + shippingServiceSelectedCtx.put("shippingServiceCost", UtilXml.childElementValue(shippingServiceSelectedElement, "ShippingServiceCost", "0")); + String insuranceCost = UtilXml.childElementValue(shippingServiceSelectedElement, "ShippingInsuranceCost", "0"); + if (UtilValidate.isNotEmpty(insuranceCost)) { + shippingServiceSelectedCtx.put("shippingTotalAdditionalCost", insuranceCost); + } + } + orderCtx.put("shippingServiceSelectedCtx", shippingServiceSelectedCtx); + + // Retrieve shipping details + Map<String, Object> shippingDetailsCtx = FastMap.newInstance(); + List shippingDetailsList = UtilXml.childElementList(ordersElement, "ShippingDetails"); + Iterator shippingDetailsElemIter = shippingDetailsList.iterator(); + while (shippingDetailsElemIter.hasNext()) { + Element shippingDetailsElement = (Element) shippingDetailsElemIter.next(); + shippingDetailsCtx.put("insuranceFee", UtilXml.childElementValue(shippingDetailsElement, "InsuranceFee", "0")); + shippingDetailsCtx.put("insuranceOption", UtilXml.childElementValue(shippingDetailsElement, "InsuranceOption")); + shippingDetailsCtx.put("insuranceWanted", UtilXml.childElementValue(shippingDetailsElement, "InsuranceWanted", "false")); + + // Retrieve sales Tax + List salesTaxList = UtilXml.childElementList(shippingDetailsElement, "SalesTax"); + Iterator salesTaxElemIter = salesTaxList.iterator(); + while (salesTaxElemIter.hasNext()) { + Element salesTaxElement = (Element) salesTaxElemIter.next(); + shippingDetailsCtx.put("salesTaxAmount", UtilXml.childElementValue(salesTaxElement, "SalesTaxAmount", "0")); + shippingDetailsCtx.put("salesTaxPercent", UtilXml.childElementValue(salesTaxElement, "SalesTaxPercent", "0")); + shippingDetailsCtx.put("salesTaxState", UtilXml.childElementValue(salesTaxElement, "SalesTaxState", "0")); + shippingDetailsCtx.put("shippingIncludedInTax", UtilXml.childElementValue(salesTaxElement, "ShippingIncludedInTax", "false")); + } + } + orderCtx.put("shippingDetailsCtx", shippingDetailsCtx); + + // Retrieve checkout status + Map<String, Object> checkoutStatusCtx = FastMap.newInstance(); + List checkoutStatusList = UtilXml.childElementList(ordersElement, "CheckoutStatus"); + Iterator checkoutStatusElemIter = checkoutStatusList.iterator(); + while (checkoutStatusElemIter.hasNext()) { + Element statusElement = (Element) checkoutStatusElemIter.next(); + checkoutStatusCtx.put("eBayPaymentStatus", UtilXml.childElementValue(statusElement, "eBayPaymentStatus")); + checkoutStatusCtx.put("paymentMethodUsed", UtilXml.childElementValue(statusElement, "PaymentMethod")); + checkoutStatusCtx.put("completeStatus", UtilXml.childElementValue(statusElement, "Status")); + } + orderCtx.put("checkoutStatusCtx", checkoutStatusCtx); + + // Retrieve external transaction + Map<String, Object> externalTransactionCtx = FastMap.newInstance(); + List externalTransactionList = UtilXml.childElementList(ordersElement, "ExternalTransaction"); + Iterator externalTransactionElemIter = externalTransactionList.iterator(); + while (externalTransactionElemIter.hasNext()) { + Element externalTransactionElement = (Element) externalTransactionElemIter.next(); + externalTransactionCtx.put("externalTransactionID", UtilXml.childElementValue(externalTransactionElement, "ExternalTransactionID")); + externalTransactionCtx.put("externalTransactionTime", UtilXml.childElementValue(externalTransactionElement, "ExternalTransactionTime")); + externalTransactionCtx.put("feeOrCreditAmount", UtilXml.childElementValue(externalTransactionElement, "FeeOrCreditAmount", "0")); + externalTransactionCtx.put("paymentOrRefundAmount", UtilXml.childElementValue(externalTransactionElement, "PaymentOrRefundAmount", "0")); + } + orderCtx.put("externalTransactionCtx", externalTransactionCtx); + + // Retrieve Transactions Array --> Transactions | Order Items + List orderItemList = new ArrayList(); + String buyersEmailId = null; + List transactionArrayList = UtilXml.childElementList(ordersElement, "TransactionArray"); + Iterator transactionArrayElemIter = transactionArrayList.iterator(); + while (transactionArrayElemIter.hasNext()) { + Element transactionArrayElement = (Element) transactionArrayElemIter.next(); + + boolean buyerEmailExists = false; + List transactionList = UtilXml.childElementList(transactionArrayElement, "Transaction"); + Iterator transactionElemIter = transactionList.iterator(); + while (transactionElemIter.hasNext()) { + Map<String, Object> transactionCtx = FastMap.newInstance(); + Element transactionElement = (Element) transactionElemIter.next(); + + // Retrieve Buyer email + if (!buyerEmailExists) { + List buyerList = UtilXml.childElementList(transactionElement, "Buyer"); + Iterator buyerElemIter = buyerList.iterator(); + while (buyerElemIter.hasNext()) { + Element buyerElement = (Element) buyerElemIter.next(); + buyersEmailId = UtilXml.childElementValue(buyerElement, "Email"); + buyerEmailExists = true; + } + } + + // Retrieve Order Item info + List itemList = UtilXml.childElementList(transactionElement, "Item"); + Iterator itemElemIter = itemList.iterator(); + while (itemElemIter.hasNext()) { + Element itemElement = (Element) itemElemIter.next(); + transactionCtx.put("goodIdentificationIdValue", UtilXml.childElementValue(itemElement, "ItemID")); + transactionCtx.put("productId", UtilXml.childElementValue(itemElement, "SKU")); + } + transactionCtx.put("quantity", UtilXml.childElementValue(transactionElement, "QuantityPurchased")); + transactionCtx.put("transactionId", UtilXml.childElementValue(transactionElement, "TransactionID")); + transactionCtx.put("transactionPrice", UtilXml.childElementValue(transactionElement, "TransactionPrice")); + orderItemList.add(transactionCtx); + } + } + orderCtx.put("orderItemList", orderItemList); + if (UtilValidate.isNotEmpty(buyersEmailId)) { + orderCtx.put("emailBuyer", buyersEmailId); + } + orderCtx.put("userLogin", userLogin); + Map<String, Object> result = dispatcher.runSync("importEbayOrders", orderCtx); + fetchedOrders.add(orderCtx); + } + } + } + //Debug.logInfo("The generated string is ======= " + fetchedOrders.toString(), module); + } else { + List errorList = UtilXml.childElementList(elemResponse, "Errors"); + Iterator errorElemIter = errorList.iterator(); + while (errorElemIter.hasNext()) { + Element errorElement = (Element) errorElemIter.next(); + errorMessage.append(UtilXml.childElementValue(errorElement, "ShortMessage", "")); + } + } } catch (Exception e) { Debug.logError("Exception during read response from Ebay", module); } + return fetchedOrders; + } + + private static Map createShoppingCart(GenericDelegator delegator, LocalDispatcher dispatcher, Locale locale, Map context, boolean create) { + try { + String productStoreId = (String) context.get("productStoreId"); + GenericValue userLogin = (GenericValue) context.get("userLogin"); + String defaultCurrencyUomId = null; + String payToPartyId = null; + String facilityId = null; + + // Product Store is mandatory + if (productStoreId == null) { + return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "ordersImportFromEbay.productStoreIdIsMandatory", locale)); + } else { + GenericValue productStore = delegator.findByPrimaryKey("ProductStore", UtilMisc.toMap("productStoreId", productStoreId)); + if (productStore != null) { + defaultCurrencyUomId = productStore.getString("defaultCurrencyUomId"); + payToPartyId = productStore.getString("payToPartyId"); + facilityId = productStore.getString("inventoryFacilityId"); + } else { + return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "ordersImportFromEbay.productStoreIdIsMandatory", locale)); + } + } + + // create a new shopping cart + ShoppingCart cart = new ShoppingCart(delegator, productStoreId, locale, defaultCurrencyUomId); + + // set the external id with the eBay Item Id + String externalId = (String) context.get("externalId"); + + if (UtilValidate.isNotEmpty(externalId)) { + if (externalOrderExists(delegator, externalId) != null && create) { + return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "ordersImportFromEbay.externalIdAlreadyExist", locale)); + } + cart.setExternalId(externalId); + } else { + return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "ordersImportFromEbay.externalIdNotAvailable", locale)); + } + + cart.setOrderType("SALES_ORDER"); + cart.setChannelType("EBAY_SALES_CHANNEL"); + cart.setUserLogin(userLogin, dispatcher); + cart.setProductStoreId(productStoreId); + + if (UtilValidate.isNotEmpty(facilityId)) { + cart.setFacilityId(facilityId); + } + String amountStr = (String) context.get("amountPaid"); + BigDecimal amountPaid = BigDecimal.ZERO; + + if (UtilValidate.isNotEmpty(amountStr)) { + amountPaid = new BigDecimal(amountStr); + } + // add the payment EXT_BAY for the paid amount + cart.addPaymentAmount("EXT_EBAY", amountPaid, externalId, null, true, false, false); + + // set the order date with the eBay created date + Timestamp orderDate = UtilDateTime.nowTimestamp(); + if (UtilValidate.isNotEmpty((String) context.get("createdDate"))) { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'"); + Date createdDate = sdf.parse((String) context.get("createdDate")); + orderDate = new Timestamp(createdDate.getTime()); + } + cart.setOrderDate(orderDate); + // Before import the order from eBay to OFBiz is mandatory that the payment has be received + String paidTime = (String) context.get("paidTime"); + if (UtilValidate.isEmpty(paidTime)) { + return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "ordersImportFromEbay.paymentIsStillNotReceived", locale)); + } + + //List orderItemList = (List) context.get("orderItemList"); + List orderItemList = (List) context.get("orderItemList"); + Iterator orderItemIter = orderItemList.iterator(); + while (orderItemIter.hasNext()) { + Map orderItem = (Map) orderItemIter.next(); + addItem(cart, orderItem, dispatcher, 0); + } + + // set partyId from + if (UtilValidate.isNotEmpty(payToPartyId)) { + cart.setBillFromVendorPartyId(payToPartyId); + } + // Apply shipping costs as order adjustment + Map<String, Object> shippingServiceSelectedCtx = (Map) context.get("shippingServiceSelectedCtx"); + + String shippingCost = (String) shippingServiceSelectedCtx.get("shippingServiceCost"); + if (UtilValidate.isNotEmpty(shippingCost)) { + double shippingAmount = new Double(shippingCost).doubleValue(); + if (shippingAmount > 0) { + GenericValue shippingAdjustment = EbayHelper.makeOrderAdjustment(delegator, "SHIPPING_CHARGES", cart.getOrderId(), null, null, shippingAmount, 0.0); + if (shippingAdjustment != null) { + cart.addAdjustment(shippingAdjustment); + } + } + } + // Apply additional shipping costs as order adjustment + String shippingTotalAdditionalCost = (String) shippingServiceSelectedCtx.get("shippingTotalAdditionalCost"); + if (UtilValidate.isNotEmpty(shippingTotalAdditionalCost)) { + double shippingAdditionalCost = new Double(shippingTotalAdditionalCost).doubleValue(); + if (shippingAdditionalCost > 0) { + GenericValue shippingAdjustment = EbayHelper.makeOrderAdjustment(delegator, "MISCELLANEOUS_CHARGE", cart.getOrderId(), null, null, shippingAdditionalCost, 0.0); + if (shippingAdjustment != null) { + cart.addAdjustment(shippingAdjustment); + } + } + } + // Apply sales tax as order adjustment + Map<String, Object> shippingDetailsCtx = (Map) context.get("shippingDetailsCtx"); + String salesTaxAmount = (String) shippingDetailsCtx.get("salesTaxAmount"); + String salesTaxPercent = (String) shippingDetailsCtx.get("salesTaxPercent"); + if (UtilValidate.isNotEmpty(salesTaxAmount)) { + double salesTaxAmountTotal = new Double(salesTaxAmount).doubleValue(); + if (salesTaxAmountTotal > 0) { + double salesPercent = 0.0; + if (UtilValidate.isNotEmpty(salesTaxPercent)) { + salesPercent = new Double(salesTaxPercent).doubleValue(); + } + GenericValue salesTaxAdjustment = EbayHelper.makeOrderAdjustment(delegator, "SALES_TAX", cart.getOrderId(), null, null, salesTaxAmountTotal, salesPercent); + if (salesTaxAdjustment != null) { + cart.addAdjustment(salesTaxAdjustment); + } + } + } + + // order has to be created ? + if (create) { + Debug.logInfo("Importing new order from eBay", module); + // set partyId to + String partyId = null; + String contactMechId = null; + String emailContactMechId = null; + String phoneContactMechId = null; + GenericValue partyAttribute = null; + Map<String, Object> shippingAddressCtx = (Map) context.get("shippingAddressCtx"); + if (UtilValidate.isNotEmpty(shippingAddressCtx)) { + String buyerName = (String) shippingAddressCtx.get("buyerName"); + String firstName = (String) buyerName.substring(0, buyerName.indexOf(" ")); + String lastName = (String) buyerName.substring(buyerName.indexOf(" ")+1); + + String country = (String) shippingAddressCtx.get("shippingAddressCountry"); + String state = (String) shippingAddressCtx.get("shippingAddressStateOrProvince"); + String city = (String) shippingAddressCtx.get("shippingAddressCityName"); + EbayHelper.correctCityStateCountry(dispatcher, shippingAddressCtx, city, state, country); + + List<GenericValue> shipInfo = PartyWorker.findMatchingPartyAndPostalAddress(delegator, shippingAddressCtx.get("shippingAddressStreet1").toString(), + (UtilValidate.isEmpty(shippingAddressCtx.get("shippingAddressStreet2")) ? null : shippingAddressCtx.get("shippingAddressStreet2").toString()), city, state, + shippingAddressCtx.get("shippingAddressPostalCode").toString(), null, country, firstName, null, lastName); + if (shipInfo != null && shipInfo.size() > 0) { + GenericValue first = EntityUtil.getFirst(shipInfo); + partyId = first.getString("partyId"); + Debug.logInfo("Existing shipping address found for : (party: " + partyId + ")", module); + } + } + // if we get a party, check its contact information. + if (UtilValidate.isNotEmpty(partyId)) { + Debug.logInfo("Found existing party associated to the eBay buyer: " + partyId, module); + GenericValue party = delegator.findByPrimaryKey("Party", UtilMisc.toMap("partyId", partyId)); + + contactMechId = EbayHelper.setShippingAddressContactMech(dispatcher, delegator, party, userLogin, shippingAddressCtx); + String emailBuyer = (String) context.get("emailBuyer"); + if (!(emailBuyer.equals("") || emailBuyer.equalsIgnoreCase("Invalid Request"))) { + String emailContactMech = EbayHelper.setEmailContactMech(dispatcher, delegator, party, userLogin, context); + } + String phoneContactMech = EbayHelper.setPhoneContactMech(dispatcher, delegator, party, userLogin, shippingAddressCtx); + } + + // create party if none exists already + if (UtilValidate.isEmpty(partyId)) { + Debug.logInfo("Creating new party for the eBay buyer.", module); + partyId = EbayHelper.createCustomerParty(dispatcher, (String) shippingAddressCtx.get("buyerName"), userLogin); + if (UtilValidate.isEmpty(partyId)) { + Debug.logWarning("Using admin party for the eBay buyer.", module); + partyId = "admin"; + } + } + + // create new party's contact information + if (UtilValidate.isEmpty(contactMechId)) { + Debug.logInfo("Creating new postal address for party: " + partyId, module); + contactMechId = EbayHelper.createAddress(dispatcher, partyId, userLogin, "SHIPPING_LOCATION", shippingAddressCtx); + if (UtilValidate.isEmpty(contactMechId)) { + return ServiceUtil.returnFailure("Unable to create postalAddress with input map: " + shippingAddressCtx); + } + Debug.logInfo("Created postal address: " + contactMechId, module); + Debug.logInfo("Creating new phone number for party: " + partyId, module); + EbayHelper.createPartyPhone(dispatcher, partyId, (String) shippingAddressCtx.get("shippingAddressPhone"), userLogin); + Debug.logInfo("Creating association to eBay buyer for party: " + partyId, module); + EbayHelper.createEbayCustomer(dispatcher, partyId, (String) context.get("ebayUserIdBuyer"), (String) context.get("eiasTokenBuyer"), userLogin); + String emailBuyer = (String) context.get("emailBuyer"); + if (UtilValidate.isNotEmpty(emailBuyer) && !emailBuyer.equalsIgnoreCase("Invalid Request")) { + Debug.logInfo("Creating new email for party: " + partyId, module); + EbayHelper.createPartyEmail(dispatcher, partyId, emailBuyer, userLogin); + } + } + + Debug.logInfo("Setting cart roles for party: " + partyId, module); + cart.setBillToCustomerPartyId(partyId); + cart.setPlacingCustomerPartyId(partyId); + cart.setShipToCustomerPartyId(partyId); + cart.setEndUserCustomerPartyId(partyId); + + Debug.logInfo("Setting contact mech in cart: " + contactMechId, module); + cart.setShippingContactMechId(contactMechId); + cart.setMaySplit(Boolean.FALSE); + + Debug.logInfo("Setting shipment method: " + (String) shippingServiceSelectedCtx.get("shippingService"), module); + EbayHelper.setShipmentMethodType(cart, (String) shippingServiceSelectedCtx.get("shippingService")); + cart.makeAllShipGroupInfos(); + + // create the order + Debug.logInfo("Creating CheckOutHelper.", module); + CheckOutHelper checkout = new CheckOutHelper(dispatcher, delegator, cart); + Debug.logInfo("Creating order.", module); + Map orderCreate = checkout.createOrder(userLogin); + + String orderId = (String)orderCreate.get("orderId"); + Debug.logInfo("Created order with id: " + orderId, module); + + // approve the order + if (UtilValidate.isNotEmpty(orderId)) { + Debug.logInfo("Approving order with id: " + orderId, module); + boolean approved = OrderChangeHelper.approveOrder(dispatcher, userLogin, orderId); + Debug.logInfo("Order approved with result: " + approved, module); + + // create the payment from the preference + if (approved) { + Debug.logInfo("Creating payment for approved order.", module); + EbayHelper.createPaymentFromPaymentPreferences(delegator, dispatcher, userLogin, orderId, externalId, cart.getOrderDate(), partyId); + Debug.logInfo("Payment created.", module); + } + } + } + } catch (Exception e) { + Debug.logError("Exception in createShoppingCart: " + e.getMessage(), module); + return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "ordersImportFromEbay.exceptionInCreateShoppingCart", locale) + ": " + e.getMessage()); + } return ServiceUtil.returnSuccess(); } + + // Made some changes transactionId removed. + private static GenericValue externalOrderExists(GenericDelegator delegator, String externalId) throws GenericEntityException { + Debug.logInfo("Checking for existing externalId: " + externalId, module); + GenericValue orderHeader = null; + List orderHeaderList = delegator.findByAnd("OrderHeader", UtilMisc.toMap("externalId", externalId)); + if (orderHeaderList != null && orderHeaderList.size() > 0) { + orderHeader = EntityUtil.getFirst(orderHeaderList); + } + return orderHeader; + } + + private static void addItem(ShoppingCart cart, Map orderItem, LocalDispatcher dispatcher, int groupIdx) throws GeneralException { + String productId = (String) orderItem.get("productId"); + BigDecimal qty = new BigDecimal(orderItem.get("quantity").toString()); + BigDecimal price = new BigDecimal(orderItem.get("transactionPrice").toString()); + price = price.setScale(ShoppingCart.scale, ShoppingCart.rounding); + + HashMap<Object, Object> attrs = new HashMap<Object, Object>(); + attrs.put("shipGroup", groupIdx); + + int idx = cart.addItemToEnd(productId, null, qty, null, null, attrs, null, null, dispatcher, Boolean.FALSE, Boolean.TRUE, Boolean.TRUE, Boolean.TRUE); + ShoppingCartItem cartItem = cart.findCartItem(idx); + cartItem.setQuantity(qty, dispatcher, cart, true, false); + + // locate the price verify it matches the expected price + BigDecimal cartPrice = cartItem.getBasePrice(); + cartPrice = cartPrice.setScale(ShoppingCart.scale, ShoppingCart.rounding); + + if (price.doubleValue() != cartPrice.doubleValue()) { + // does not match; honor the price but hold the order for manual review + cartItem.setIsModifiedPrice(true); + cartItem.setBasePrice(price); + cart.setHoldOrder(true); + cart.addInternalOrderNote("Price received [" + price + "] (for item # " + productId + ") from eBay Checkout does not match the price in the database [" + cartPrice + "]. Order is held for manual review."); + } + // assign the item to its ship group + cart.setItemShipGroupQty(cartItem, qty, groupIdx); + } } |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |