Index: grails-app/services/com/lemans/orders/SalesOrderCheckoutService.groovy =================================================================== diff -u -r8ba99fc4d61cb54a2c4ba976d42119bd2e3c55a9 -r2f10297a5269c4f4e9574817721d38e2daeaa4fa --- grails-app/services/com/lemans/orders/SalesOrderCheckoutService.groovy (.../SalesOrderCheckoutService.groovy) (revision 8ba99fc4d61cb54a2c4ba976d42119bd2e3c55a9) +++ grails-app/services/com/lemans/orders/SalesOrderCheckoutService.groovy (.../SalesOrderCheckoutService.groovy) (revision 2f10297a5269c4f4e9574817721d38e2daeaa4fa) @@ -1,6 +1,7 @@ package com.lemans.orders import com.lemans.order.MainFrameOrderTransformer +import com.lemans.order.SalesOrderHeader import com.lemans.order.SalesOrderLine import com.lemans.pricing.PricingResponseService import com.lemans.services.LemansService @@ -78,6 +79,7 @@ Map processD365Checkout(Map criteria) { criteria.lines = sql().rows(LINE_ITEM_SQL, [criteria.orderId]) + criteria.paymentProfileId = SalesOrderHeader.findByIdAndDateDeletedIsNull(criteria.orderId)?.payTraceCustomerId criteria.applicationOrderId = criteria.orderId criteria.applicationID = 'Rider Support' Map data = submitOrderToE4(criteria) @@ -89,7 +91,6 @@ try { String token = e4TokenService.getE4Token()//getE4LoginToken(criteria) if (token) { - String d365url = "https://webhook-lemans-uat.evenica.com/LeMansSalesOrder" String d365payload = buildD365payload(criteria) println 'payload' + d365payload HttpPost httpMethod = new HttpPost(e4SalesOrderUrl) @@ -115,6 +116,10 @@ if (input.dealerCode) { customer input.dealerCode } + if (input.paymentProfileId) { + billingId input.paymentProfileId + paymentTerms 'CC' //CC allowed for all orders.Change this to dynamic if user is allowed to change setting. + } if (input.estimationOrder) { estimationOrder input.estimationOrder } @@ -133,15 +138,13 @@ if (input.orderedby) { orderedby input.orderedby } - if (input.cancellationPolicy) { - cancellationPolicy input.cancellationPolicy - } if (input.applicationID) { applicationID input.applicationID } if (input.applicationOrderId) { applicationOrderId input.applicationOrderId } + cancellationPolicy 'BO' //BO allowed for all orders.Change this to dynamic if user is allowed to change setting. if (input.lines) { lines input.lines.collect { [itemId: it.partNumber, totalQuantity: it.quantity, appLineId: it.lineNumber, note: it.note]