OctopusDeploy release: 14.2.13

Author: securesubmit-buildmaster

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
-## Latest Version - V14.2.12 (02/27/2025)
+
+## Latest Version - V14.2.13 (03/27/2025)
+### Bug Fixes
+- [Vaps] - Added a fix to set the original batchNumber into a datacollect transaction through TransactionReference object.
+- [Vaps] - Updated DE 12 dateTime function for non-original transaction.
+- [Vaps] - Updated the datetime retrieval method from datetime.now() to localdatetime.now() for internal data collect DE 12 tag (10349).
+
+## V14.2.12 (02/27/2025)
 - [NTS] -Fix issue 10348 : Updated the default value space to 0 for Voyager EMV  non-fuel product types.
 
 ## V14.2.11 (02/18/2025)

pom.xml

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.heartlandpaymentsystems</groupId>
   <artifactId>globalpayments-sdk</artifactId>
-  <version>14.2.12</version>
+  <version>14.2.13</version>
   <packaging>jar</packaging>
   <name>Heartland &amp; Global Payments SDK</name>
   <description>API for processing payments through Global Payments</description>

src/main/java/com/global/api/gateways/VapsConnector.java

@@ -27,6 +27,8 @@
 
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.LinkedList;
@@ -798,7 +800,7 @@ else if (originalPaymentMethod instanceof GiftCard) {
         // DE 12: Date and Time, Transaction - n12 (YYMMDDhhmmss)
         String timestamp = builder.getTimestamp();
         if(StringUtils.isNullOrEmpty(timestamp)) {
-            timestamp = DateTime.now(DateTimeZone.UTC).toString("yyMMddhhmmss");
+            timestamp = DateTime.now().toString("yyMMddhhmmss");
         }
         request.set(DataElementId.DE_012, timestamp);
 
@@ -1517,7 +1519,7 @@ private <T extends TransactionBuilder<Transaction>> Transaction sendRequest(Netw
                         } else {
                         NetworkMessage impliedCapture = decodeRequest(response.getTransactionToken());
                         impliedCapture.set(DataElementId.DE_011, StringUtils.padLeft(followOnStan, 6, '0'));
-                        impliedCapture.set(DataElementId.DE_012, DateTime.now().toString("yyMMddhhmmss"));
+                        impliedCapture.set(DataElementId.DE_012, LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyMMddhhmmss")));
                         impliedCapture.set(DataElementId.DE_025, DE25_MessageReasonCode.PinDebit_EBT_Acknowledgement);
 
 
@@ -1555,7 +1557,7 @@ else if(transactionType.equals(TransactionType.Capture) && messageReasonCode !=
                             return response;
                         } else if (messageReasonCode.equals(DE25_MessageReasonCode.AuthCapture.getValue())) {
                             request.set(DataElementId.DE_011, StringUtils.padLeft(followOnStan, 6, '0'));
-                            request.set(DataElementId.DE_012, DateTime.now().toString("yyMMddhhmmss"));
+                            request.set(DataElementId.DE_012, LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyMMddhhmmss")));
                             request.set(DataElementId.DE_025, DE25_MessageReasonCode.PinDebit_EBT_Acknowledgement);
 
                             Transaction dataCollectResponse = sendRequest(request, builder, orgCorr1, orgCorr2);
@@ -2331,21 +2333,38 @@ private <T extends TransactionBuilder<Transaction>> DE48_MessageControl mapMessa
         // DE48-4 (Sequence Number & Batch Number)
         if(!builder.getTransactionType().equals(TransactionType.Auth) && !isTimeRequest) {
             int sequenceNumber = 0;
+
             if(!builder.getTransactionType().equals(TransactionType.BatchClose)) {
                 sequenceNumber = builder.getSequenceNumber();
+                if (builder.getPaymentMethod() != null) {
+                    IPaymentMethod paymentMethod = builder.getPaymentMethod();
+                    if (paymentMethod instanceof TransactionReference) {
+                        TransactionReference reference = (TransactionReference) builder.getPaymentMethod();
+                        if(reference.getSequenceNumber()!=null) {
+                            sequenceNumber = reference.getSequenceNumber();
+                        }
+                    }
+                }
                 if (sequenceNumber == 0 && batchProvider != null) {
                     sequenceNumber = batchProvider.getSequenceNumber();
                 }
             }
             messageControl.setSequenceNumber(sequenceNumber);
 
             int batchNumber = builder.getBatchNumber();
-            if (batchNumber == 0 && batchProvider != null) {
-                batchNumber = batchProvider.getBatchNumber();
+            if (builder.getPaymentMethod() != null) {
+                IPaymentMethod paymentMethod = builder.getPaymentMethod();
+                if (paymentMethod instanceof TransactionReference) {
+                    TransactionReference reference = (TransactionReference) builder.getPaymentMethod();
+                    if(reference.getBatchNumber()!=null)
+                        batchNumber = reference.getBatchNumber();
+                }
             }
+            if (batchNumber == 0 && batchProvider != null) {
+                    batchNumber = batchProvider.getBatchNumber();
+                }
             messageControl.setBatchNumber(batchNumber);
         }
-
         // DE48-5
         if(builder instanceof AuthorizationBuilder) {
             AuthorizationBuilder authBuilder = (AuthorizationBuilder)builder;