From 823764f5433035c5102436262cf6978a995ec712 Mon Sep 17 00:00:00 2001 From: nutan shinde Date: Wed, 4 Dec 2024 10:36:49 +0530 Subject: [PATCH 01/15] Added the service to generate the feed file --- .../co/hotwax/netsuite/CreateOrderService.xml | 109 ++++++++++++++++++ 1 file changed, 109 insertions(+) create mode 100644 service/co/hotwax/netsuite/CreateOrderService.xml diff --git a/service/co/hotwax/netsuite/CreateOrderService.xml b/service/co/hotwax/netsuite/CreateOrderService.xml new file mode 100644 index 0000000..b2fd440 --- /dev/null +++ b/service/co/hotwax/netsuite/CreateOrderService.xml @@ -0,0 +1,109 @@ + + + + + + Parameter to fetch Order details for a specific orderId. + + + The System Message Type ID for generating the Brokered Order Items Feed. + + + The System Message Remote Id for generating the Brokered Order Items Feed. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 1bbd388fc0530dfd96e44f5325a1ac3c9f02531a Mon Sep 17 00:00:00 2001 From: nutan shinde Date: Wed, 4 Dec 2024 19:25:39 +0530 Subject: [PATCH 02/15] UPdated the service logic to preapre the HC gift card total and duplicate item map for discount --- .../co/hotwax/netsuite/CreateOrderService.xml | 78 ++++++++++++++++--- 1 file changed, 68 insertions(+), 10 deletions(-) diff --git a/service/co/hotwax/netsuite/CreateOrderService.xml b/service/co/hotwax/netsuite/CreateOrderService.xml index b2fd440..e33525d 100644 --- a/service/co/hotwax/netsuite/CreateOrderService.xml +++ b/service/co/hotwax/netsuite/CreateOrderService.xml @@ -6,10 +6,10 @@ Parameter to fetch Order details for a specific orderId. - The System Message Type ID for generating the Brokered Order Items Feed. + The System Message Type ID for generating the Orders Feed for Netsuite. - The System Message Remote Id for generating the Brokered Order Items Feed. + The System Message Remote Id for generating the Orders Feed for Netsuite. @@ -29,7 +29,6 @@ try (ordersItr = netsuiteOrders_find.iterator()) { - @@ -63,23 +62,82 @@ + + + + + + + + + + + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + Parameter to fetch Order details for a specific orderId. @@ -36,132 +75,27 @@ - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - + + \ No newline at end of file From 7239301db2dbf9ae6eb4b6686b0cbae665c9b2aa Mon Sep 17 00:00:00 2001 From: nutan shinde Date: Thu, 5 Dec 2024 15:21:53 +0530 Subject: [PATCH 04/15] updated the service: 1. service to prepare the OrderDataMap 2. service to fetch the eligible order ids from the view and itr for each order and prepare OrderDataMap And added system message type and system message type parameter --- data/DbResourceData.xml | 12 ++ data/SystemMessageData.xml | 13 ++ .../co/hotwax/netsuite/CreateOrderService.xml | 180 ++++++------------ 3 files changed, 82 insertions(+), 123 deletions(-) create mode 100644 data/DbResourceData.xml create mode 100644 data/SystemMessageData.xml diff --git a/data/DbResourceData.xml b/data/DbResourceData.xml new file mode 100644 index 0000000..1604d65 --- /dev/null +++ b/data/DbResourceData.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/data/SystemMessageData.xml b/data/SystemMessageData.xml new file mode 100644 index 0000000..cbc9efd --- /dev/null +++ b/data/SystemMessageData.xml @@ -0,0 +1,13 @@ + + + + + + + \ No newline at end of file diff --git a/service/co/hotwax/netsuite/CreateOrderService.xml b/service/co/hotwax/netsuite/CreateOrderService.xml index e33525d..b708458 100644 --- a/service/co/hotwax/netsuite/CreateOrderService.xml +++ b/service/co/hotwax/netsuite/CreateOrderService.xml @@ -1,6 +1,45 @@ - + + + + Parameter to fetch Order details for a specific orderId. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Parameter to fetch Order details for a specific orderId. @@ -36,132 +75,27 @@ - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - + + \ No newline at end of file From 1212edf186003623a5709fb8bc0c105876ec0ba6 Mon Sep 17 00:00:00 2001 From: Nutan Shinde <112821431+Shinde-nutan@users.noreply.github.com> Date: Wed, 11 Dec 2024 20:27:46 +0530 Subject: [PATCH 05/15] Added the groovy script and logic to convert the json into csv and send file on sftp location. --- data/DbResourceData.xml | 152 +++++++++- data/ServiceJobData.xml | 13 + .../co/hotwax/netsuite/CreateOrderService.xml | 284 ++++++++++++++++-- 3 files changed, 430 insertions(+), 19 deletions(-) create mode 100644 data/ServiceJobData.xml diff --git a/data/DbResourceData.xml b/data/DbResourceData.xml index 1604d65..327d0bc 100644 --- a/data/DbResourceData.xml +++ b/data/DbResourceData.xml @@ -1,10 +1,160 @@ - + + + if (attribute.attrName == "Gift Wrap Option") { + giftWrapOption = attribute.attrValue + isGiftWrap = "true" + } + if(attribute.attrName == "isShipBooklet") + isShipBooklet + } + } + orderMapDetail.put("giftWrapOption", giftWrapOption) + orderMapDetail.put("isGiftWrap", isGiftWrap) + + // Order Note + String orderNote = orderCommunicationEvent ? orderCommunicationEvent.getString("content") : "" + // Remove the \n character from the orderNote + orderNote = orderNote.replace("\n", " ") + orderMapDetail.put("orderNote", orderNote) + + String gorjanaSalesChannel = orderMapDetail.salesChannel + orderMapDetail.put("gorjanaSalesChannel", gorjanaSalesChannel) + + BigDecimal hcOrderTotal = BigDecimal.ZERO + + EntityList orderLevelAdjustment = ec.entity.find("co.hotwax.order.OrderItemAdjustmentAndAttribute") + .condition("orderId", orderMapDetail.orderId) + .condition("orderItemSeqId", "_NA_").list() + + if (orderLevelAdjustment) { + System.out.println("orderLevelAdjustment:" + orderLevelAdjustment) + BigDecimal orderLevelAdjustmentTotal = orderLevelAdjustment.collect { adj -> adj.getBigDecimal("amount") ?: BigDecimal.ZERO }.sum() + hcOrderTotal = hcOrderTotal.add(orderLevelAdjustmentTotal) + } + // Loop through each order item + orderMapDetail.orderItems.each { orderItem -> + + EntityValue ProductDetail = ec.entity.find("org.apache.ofbiz.product.product.Product") + .condition("productId", orderItem.productId ).one() + String packingCategory = "" + if("MARKETING_PKG_PICK" == ProductDetail.productTypeId){ + packingCategory = "4" + } + orderItem.put("packingCategory", packingCategory) + + + if ("POS Channel" != orderMapDetail.salesChannel){ + EntityValue defaultFacility = ec.entity.find("org.apache.ofbiz.product.facility.Facility") + .condition("facilityTypeId", "WAREHOUSE") + .condition("facilityId", "WH").one() + String location = defaultFacility ? defaultFacility.getString("externalId") : "" + orderItem.put("location", location) + orderItem.put("department", "2") + } + + // Calculate item total: unitPrice * quantity + BigDecimal unitPrice = (orderItem?.get("price") as BigDecimal) + BigDecimal quantity = (orderItem?.get("quantity") as BigDecimal) + BigDecimal itemTotal = unitPrice * quantity + hcOrderTotal = hcOrderTotal.add(itemTotal) + + EntityList orderItemLevelAdjustment = ec.entity.find("co.hotwax.order.OrderItemAdjustmentAndAttribute") + .condition("orderId", orderMapDetail.orderId) + .condition("orderItemSeqId", orderItem.orderItemSeqId).list() + + if(orderItemLevelAdjustment) { + BigDecimal itemAdjustmentTotal = orderItemLevelAdjustment.collect { adj -> adj.get("amount") ?: BigDecimal.ZERO }.sum() + hcOrderTotal = hcOrderTotal.add(itemAdjustmentTotal) + } + + String orderLineTypeId = "" + + if(orderItem.isDiscountRow){ + orderLineTypeId = "HC_DISCOUNT_${orderItem.orderItemSeqId}" + } + + orderItem.put("orderLineTypeId", orderLineTypeId) + // Query the OrderItemAttribute entity for Option Font and Option Text at the item level + EntityList orderItemAttributes = ec.entity.find("org.apache.ofbiz.order.order.OrderItemAttribute") + .condition("orderId", orderItem.orderId) + .condition("orderItemSeqId", orderItem.orderItemSeqId) + .useCache(true) + .list() + + // Initialize variables to hold the Option Font and Option Text values + String optionFont = "" + String optionText = "" + String giftWrapText = "" + String finalSale = "" + + if (orderItemAttributes) { + // Loop through the attributes and check for Option Font and Option Text + orderItemAttributes.each { attribute -> + if (attribute.attrName == "Font") { + optionFont = attribute.attrValue + } + if (attribute.attrName == "Text") { + optionText = attribute.attrValue + } + if (attribute.attrName == "Direction") { + direction = attribute.attrValue + } + if (attribute.attrName == "Gift Wrap") { + giftWrapText = attribute.attrValue + } + if(attribute.attrName == "Final Sale"){ + finalSale = attribute.attrValue + } + } + // If direction is available, append it to the Option Text + if (direction) { + optionText = "${optionText} Direction: ${direction}" + } + } + // Add Option Font and Option Text to the order item + orderItem.put("optionFont", optionFont) + orderItem.put("OptionText", optionText) + orderItem.put("GiftWraperText", giftWrapText) + orderItem.put("finalSale", finalSale) + } + + orderMapDetail.put("hcOrderTotal", hcOrderTotal) + // Return the updated orderMapDetail + orderData = orderMapDetail + return orderData + ]]> diff --git a/data/ServiceJobData.xml b/data/ServiceJobData.xml new file mode 100644 index 0000000..e02aa38 --- /dev/null +++ b/data/ServiceJobData.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/service/co/hotwax/netsuite/CreateOrderService.xml b/service/co/hotwax/netsuite/CreateOrderService.xml index b708458..9dcabd0 100644 --- a/service/co/hotwax/netsuite/CreateOrderService.xml +++ b/service/co/hotwax/netsuite/CreateOrderService.xml @@ -23,8 +23,8 @@ - - + + @@ -38,6 +38,173 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -50,19 +217,46 @@ The System Message Remote Id for generating the Orders Feed for Netsuite. + + Parameter to fetch Order details after specific order date + + + Parameter to fetch Order details after specific order date + + + Parameter to fetch Order details for specific sales channel + - + + + + + + + + + + + - - + + + + + \ No newline at end of file From edea2031a496cb3ef182bd9d2528a79d23b3b240 Mon Sep 17 00:00:00 2001 From: Nutan Shinde <112821431+Shinde-nutan@users.noreply.github.com> Date: Fri, 13 Dec 2024 18:58:15 +0530 Subject: [PATCH 06/15] Added the comments and TODO in the service. --- .../co/hotwax/netsuite/CreateOrderService.xml | 170 +++++++++++++++--- 1 file changed, 148 insertions(+), 22 deletions(-) diff --git a/service/co/hotwax/netsuite/CreateOrderService.xml b/service/co/hotwax/netsuite/CreateOrderService.xml index 9dcabd0..7d1e75f 100644 --- a/service/co/hotwax/netsuite/CreateOrderService.xml +++ b/service/co/hotwax/netsuite/CreateOrderService.xml @@ -1,6 +1,21 @@ + Parameter to fetch Order details for a specific orderId. @@ -71,7 +86,13 @@ processedOrderMap.remove("shippingAreaCode") processedOrderMap.remove("shippingContactNumber") - // Logic to use shipping address as billing address if billing details are missing + /* + Logic to use shipping address as billing address if billing details are missing + The purpose of this logic is to handle scenarios where the billing address is missing from the order data. + In such cases, we use the shipping address as a fallback to ensure that we still have a valid billing address + available to create the order in NetSuite. A country is a required field for NetSuite order creation, + */ + if (!orderMap.billingContactMechId && orderMap.shippingContactMachId) { log.info("Billing address is missing. Using shipping address as billing address."); processedOrderMap.put("billingAddress1", orderMap.shippingAddress1); @@ -83,6 +104,23 @@ } ]]> + + @@ -97,32 +135,42 @@ def manualRefSet = new HashSet() def refundedSet = new HashSet() + // Identify refunded gift card payments by checking the parent reference number for (giftCardPayment in GiftCardPaymentList) { if (giftCardPayment.parentRefNumber) { - refundedSet.add(giftCardPayment.parentRefNumber) + refundedSet.add(giftCardPayment.parentRefNumber) // Mark as refunded if a parentRefNumber exists } } + // Sum amounts of non-refunded gift cards, ensuring we don't double-count gift cards for (giftCardPayment in GiftCardPaymentList) { if (!refundedSet.contains(giftCardPayment.manualRefNumber) && !manualRefSet.contains(giftCardPayment.manualRefNumber)) { totalNonRefundedGiftCardAmount += giftCardPayment.amount - manualRefSet.add(giftCardPayment.manualRefNumber) + manualRefSet.add(giftCardPayment.manualRefNumber) // Avoid double-counting gift cards } } - ]]> - - - + + @@ -135,8 +183,23 @@ processedOrderItem.remove("itemStatus"); processedOrderItem.put("orderLineId", processedOrderItem.orderItemSeqId) processedOrderItem.put("priceLevel", "custom") - ]]> + @@ -149,14 +212,45 @@ processedOrderItem.remove("shipmentMethodTypeId") ]]> - + + + + - + @@ -184,8 +278,16 @@ - - + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -169,6 +322,7 @@ - For Digital Goods, the tax code is sent as "-Not Taxable-" to NetSuite.(in some cases vary based on the ) The current hardcoded "AVATAX" may not be suitable for all product types. - We can create the record in integration type mapping based on the product types. + - Or we can modify this in custom groovy file. --> @@ -182,24 +336,7 @@ processedOrderItem.put("closed", isClosed); processedOrderItem.remove("itemStatus"); processedOrderItem.put("orderLineId", processedOrderItem.orderItemSeqId) - processedOrderItem.put("priceLevel", "custom") ]]> - @@ -258,9 +395,30 @@ - + + + + + + + + + + + + + + + + + + + @@ -308,168 +466,4 @@ - - - - Parameter to fetch Order details for a specific orderId. - - - The System Message Type ID for generating the Orders Feed for Netsuite. - - - The System Message Remote Id for generating the Orders Feed for Netsuite. - - - Parameter to fetch Order details after specific order date - - - Parameter to fetch Order details after specific order date - - - - Parameter to fetch Order details for specific sales channel - - - Parameter to exclude the Orders from the specific sales channel - - - Parameter to fetch Order details for specific shipment method - - - Parameter to exclude the Orders from the specific shipment method - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file From 108e326e82590b79705939622ff119bc3299dd7a Mon Sep 17 00:00:00 2001 From: Nutan Shinde <112821431+Shinde-nutan@users.noreply.github.com> Date: Mon, 16 Dec 2024 11:05:38 +0530 Subject: [PATCH 08/15] Added upgrade data. --- data/ServiceJobData.xml | 4 ++-- data/UpgradeData_Upcoming.xml | 24 ++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 data/UpgradeData_Upcoming.xml diff --git a/data/ServiceJobData.xml b/data/ServiceJobData.xml index aa59351..4a03ff8 100644 --- a/data/ServiceJobData.xml +++ b/data/ServiceJobData.xml @@ -6,8 +6,8 @@ - - + + diff --git a/data/UpgradeData_Upcoming.xml b/data/UpgradeData_Upcoming.xml new file mode 100644 index 0000000..0101cf7 --- /dev/null +++ b/data/UpgradeData_Upcoming.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file From b8c3c6dc8f72d190b185a90d72a33da1b9d24aee Mon Sep 17 00:00:00 2001 From: Nutan Shinde <112821431+Shinde-nutan@users.noreply.github.com> Date: Tue, 17 Dec 2024 10:32:14 +0530 Subject: [PATCH 09/15] Added the support to include and exclude the order based on the shipping method in the generate#CreateOrderFeed. --- data/ServiceJobData.xml | 2 +- data/UpgradeData_Upcoming.xml | 2 +- .../co/hotwax/netsuite/CreateOrderService.xml | 23 ++++++++++++++----- 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/data/ServiceJobData.xml b/data/ServiceJobData.xml index 4a03ff8..198dfd1 100644 --- a/data/ServiceJobData.xml +++ b/data/ServiceJobData.xml @@ -1,7 +1,7 @@ - diff --git a/data/UpgradeData_Upcoming.xml b/data/UpgradeData_Upcoming.xml index 0101cf7..5cb3a82 100644 --- a/data/UpgradeData_Upcoming.xml +++ b/data/UpgradeData_Upcoming.xml @@ -11,7 +11,7 @@ parameterName="resourcePath" parameterValue="" systemMessageRemoteId=""/> - diff --git a/service/co/hotwax/netsuite/CreateOrderService.xml b/service/co/hotwax/netsuite/CreateOrderService.xml index 1222b36..a7b6c8e 100644 --- a/service/co/hotwax/netsuite/CreateOrderService.xml +++ b/service/co/hotwax/netsuite/CreateOrderService.xml @@ -18,11 +18,16 @@ Parameter to fetch Order details after specific order date - - Parameter to fetch Order details for specific shipment method + + + Parameter to fetch Order details for specific shipment method or a list of shipping method + like: POS_COMPLETED,STORE_PICKUP + - - Parameter to exclude the Orders from the specific shipment method + + Parameter to exclude the Orders from the specific shipment method or a list of shipping method + like: POS_COMPLETED,STORE_PICKUP + @@ -37,7 +42,6 @@ need to figure out how we can put the checks for include and exclude shipment method. --> @@ -435,10 +436,11 @@ - + + From 0aaeade022ed47774f943ed0bc2c7c32567de82a Mon Sep 17 00:00:00 2001 From: Nutan Shinde <112821431+Shinde-nutan@users.noreply.github.com> Date: Tue, 17 Dec 2024 17:05:13 +0530 Subject: [PATCH 11/15] Added the upgrade steps --- data/ServiceJobData.xml | 2 +- data/UpgradeData_Upcoming.xml | 2 +- service/co/hotwax/netsuite/CreateOrderService.xml | 4 ++-- upgrade/upgrade_upcomming/upgradeSteps.md | 15 +++++++++++++++ 4 files changed, 19 insertions(+), 4 deletions(-) create mode 100644 upgrade/upgrade_upcomming/upgradeSteps.md diff --git a/data/ServiceJobData.xml b/data/ServiceJobData.xml index 198dfd1..6994364 100644 --- a/data/ServiceJobData.xml +++ b/data/ServiceJobData.xml @@ -2,7 +2,7 @@ + serviceName="co.hotwax.netsuite.CreateOrderService.generate#CreateOrderFeed" cronExpression="0 0/15 * * * ?" paused="Y"> diff --git a/data/UpgradeData_Upcoming.xml b/data/UpgradeData_Upcoming.xml index 5cb3a82..f0b919d 100644 --- a/data/UpgradeData_Upcoming.xml +++ b/data/UpgradeData_Upcoming.xml @@ -12,7 +12,7 @@ + serviceName="co.hotwax.netsuite.CreateOrderService.generate#CreateOrderFeed" cronExpression="0 0/15 * * * ?" paused="Y"> diff --git a/service/co/hotwax/netsuite/CreateOrderService.xml b/service/co/hotwax/netsuite/CreateOrderService.xml index b7333fa..38996f6 100644 --- a/service/co/hotwax/netsuite/CreateOrderService.xml +++ b/service/co/hotwax/netsuite/CreateOrderService.xml @@ -83,11 +83,11 @@ - - + + + + receivePath="${contentRoot}/CreateOrderFeed/createOrderFeed-${dateTime}.csv"/> + + + diff --git a/data/UpgradeData_Upcoming.xml b/data/UpgradeData_Upcoming.xml index f0b919d..6726a48 100644 --- a/data/UpgradeData_Upcoming.xml +++ b/data/UpgradeData_Upcoming.xml @@ -1,12 +1,24 @@ + + + + receivePath="${contentRoot}/CreateOrderFeed/createOrderFeed-${dateTime}.csv"/> + + + diff --git a/service/co/hotwax/netsuite/CreateOrderService.xml b/service/co/hotwax/netsuite/CreateOrderService.xml index 38996f6..5d1b530 100644 --- a/service/co/hotwax/netsuite/CreateOrderService.xml +++ b/service/co/hotwax/netsuite/CreateOrderService.xml @@ -33,9 +33,16 @@ + + + + + + - - + - - - - - diff --git a/upgrade/upgrade_upcomming/upgradeSteps.md b/upgrade/upgrade_upcomming/upgradeSteps.md index 1d2cdb4..ef85f8f 100644 --- a/upgrade/upgrade_upcomming/upgradeSteps.md +++ b/upgrade/upgrade_upcomming/upgradeSteps.md @@ -12,4 +12,5 @@ ### System message type 1. New system message type and system message type parameter is added. - NetSuiteOrderItemsFeed +- NetSuitePOSOrderItemsFeed 2. configure the send path in the system message type as per the required directory path. From f71111e24f775f91d32e6908133bcc4c1ff11e2e Mon Sep 17 00:00:00 2001 From: Nutan Shinde <112821431+Shinde-nutan@users.noreply.github.com> Date: Fri, 20 Dec 2024 15:53:24 +0530 Subject: [PATCH 13/15] remove the sales channel enum code after processing. --- service/co/hotwax/netsuite/CreateOrderService.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/service/co/hotwax/netsuite/CreateOrderService.xml b/service/co/hotwax/netsuite/CreateOrderService.xml index 5d1b530..21cb82a 100644 --- a/service/co/hotwax/netsuite/CreateOrderService.xml +++ b/service/co/hotwax/netsuite/CreateOrderService.xml @@ -115,6 +115,7 @@ def order = context.get("result") def orderItems = order.remove("orderItems") def orderId = order.remove("orderName") + order.remove("salesChannelEnumCode") def flattenedOrders = [] orderItems.each { item -> item.put("orderId", orderId) From d17398ca786236ee1bacdc895f976f9ed782b21b Mon Sep 17 00:00:00 2001 From: Nutan Shinde <112821431+Shinde-nutan@users.noreply.github.com> Date: Thu, 9 Jan 2025 04:55:20 +0000 Subject: [PATCH 14/15] Updated the file name and job name --- data/ServiceJobData.xml | 4 +- data/SystemMessageData.xml | 15 ++++---- data/UpgradeData_Upcoming.xml | 37 +++++++++---------- ...eateOrderService.xml => OrderServices.xml} | 17 +++------ upgrade/upgrade_upcomming/upgradeSteps.md | 16 ++++---- 5 files changed, 41 insertions(+), 48 deletions(-) rename service/co/hotwax/netsuite/{CreateOrderService.xml => OrderServices.xml} (97%) diff --git a/data/ServiceJobData.xml b/data/ServiceJobData.xml index 6994364..856837e 100644 --- a/data/ServiceJobData.xml +++ b/data/ServiceJobData.xml @@ -1,8 +1,8 @@ - + diff --git a/data/SystemMessageData.xml b/data/SystemMessageData.xml index d8908e0..20e81cd 100644 --- a/data/SystemMessageData.xml +++ b/data/SystemMessageData.xml @@ -1,24 +1,23 @@ - + receivePath="${contentRoot}/CreateOrderFeed/cashsale/createOrderFeed-${dateTime}.csv"/> + receivePath="${contentRoot}/CreateOrderFeed/salesorder/createOrderFeed-${dateTime}.csv"/> - - - \ No newline at end of file + diff --git a/data/UpgradeData_Upcoming.xml b/data/UpgradeData_Upcoming.xml index 6726a48..1f6b320 100644 --- a/data/UpgradeData_Upcoming.xml +++ b/data/UpgradeData_Upcoming.xml @@ -1,36 +1,35 @@ + + + + + + + + + + - + receivePath="${contentRoot}/CreateOrderFeed/cashsale/createOrderFeed-${dateTime}.csv"/> + receivePath="${contentRoot}/CreateOrderFeed/salesorder/createOrderFeed-${dateTime}.csv"/> - - - - - - - - - - - - \ No newline at end of file diff --git a/service/co/hotwax/netsuite/CreateOrderService.xml b/service/co/hotwax/netsuite/OrderServices.xml similarity index 97% rename from service/co/hotwax/netsuite/CreateOrderService.xml rename to service/co/hotwax/netsuite/OrderServices.xml index 21cb82a..02009db 100644 --- a/service/co/hotwax/netsuite/CreateOrderService.xml +++ b/service/co/hotwax/netsuite/OrderServices.xml @@ -1,6 +1,5 @@ - @@ -45,9 +44,6 @@ productStoreId:productStoreId], false)"/> - - + remote ${systemMessageRemoteId} saved response in messages ${FeedSysMsgOut.systemMessageId}"/> -