Index: src/main/groovy/com/lemans/services/email/EmailService.groovy =================================================================== diff -u -re8feb119871bd0a623752393d157121e266ca7f2 -r48d4a0f3c8610dce6f80b3d0e287401c364ff19a --- src/main/groovy/com/lemans/services/email/EmailService.groovy (.../EmailService.groovy) (revision e8feb119871bd0a623752393d157121e266ca7f2) +++ src/main/groovy/com/lemans/services/email/EmailService.groovy (.../EmailService.groovy) (revision 48d4a0f3c8610dce6f80b3d0e287401c364ff19a) @@ -51,7 +51,7 @@ carton << "Carton ${i+1} of ${totalNoOfCartons} ${data.grossWeight}# or ${weightInKilos.setScale(2, BigDecimal.ROUND_UP)} Kilos Dimensions: ${data?.length ?: ''}*${data?.width ?: ''}*${data?.height} Tracking Number: ${data?.trackingNumber ?: ''} \n" } StringBuilder cartonBody = new StringBuilder().append(carton.join('\n')) - StringBuilder foot = new StringBuilder("""\nTotal: ${totalNoOfCartons} Carton(s) @ ${cartonData*.grossWeight.sum()}# or ${totalCartonWeightInKilos.setScale(2, BigDecimal.ROUND_UP)}Kilos\nShipping ${shippedDate} via ${header?.shipViaCode ?: ''} \n \nThank You for your order(s). PARTS UNLIMITED Appreciates your business.""") + StringBuilder foot = new StringBuilder("""\nTotal: ${totalNoOfCartons} Carton(s) @ ${cartonData*.grossWeight.sum()}# or ${totalCartonWeightInKilos.setScale(2, BigDecimal.ROUND_UP)}Kilos\nShipping ${shippedDate} via ${header?.serviceLevelDescr ?: ''} \n \nThank You for your order(s). PARTS UNLIMITED Appreciates your business.""") cartonBody.append(foot) } @@ -72,7 +72,7 @@ } Map shippingDetails(Map criteria) { - sql().rows("SELECT orderShippedDate, shipViaCode FROM Export.vwInvoiceShipment WITH(NOLOCK) WHERE entityId = ${criteria.entityId} AND entityClass = ${criteria.entityClass}")[0] + sql().rows("SELECT orderShippedDate, shipViaCode, serviceLevelDescr FROM Export.vwInvoiceShipment WITH(NOLOCK) WHERE entityId = ${criteria.entityId} AND entityClass = ${criteria.entityClass}")[0] } List cartonDetails(Map criteria) {