0036943: It is possible to void a layaway while it is being paid in a different terminal

# HG changeset patch
# User Ranjith S R <ranjith@qualiantech.com>
# Date 1506606149 -19800
#      Thu Sep 28 19:12:29 2017 +0530
# Node ID dbd98d4df71de08fb45f85cb7fe830b374728f28
# Parent  3e73374b406ed5efbf5bec928d72afd9bcafcc16
Related to issue 36943 : Validate Layaway loaded with last updated date

diff -r 3e73374b406e -r dbd98d4df71d src/org/openbravo/retail/posterminal/OrderLoader.java
--- a/src/org/openbravo/retail/posterminal/OrderLoader.java	Thu Sep 28 14:15:39 2017 +0200
+++ b/src/org/openbravo/retail/posterminal/OrderLoader.java	Thu Sep 28 19:12:29 2017 +0530
@@ -12,8 +12,6 @@
 import java.math.RoundingMode;
 import java.sql.CallableStatement;
 import java.sql.Timestamp;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Collections;
@@ -142,7 +140,6 @@
   private boolean isDeleted = false;
   private boolean doCancelAndReplace = false;
   private boolean paidReceipt = false;
-  private DateFormat dateFormatUTC = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
   private boolean doCancelLayaway = false;
 
   @Inject
@@ -258,7 +255,7 @@
         order = OBDal.getInstance().get(Order.class, jsonorder.getString("id"));
 
         if (order != null) {
-          final Date loaded = dateFormatUTC.parse(jsonorder.getString("loaded")), updated = OBMOBCUtils
+          final Date loaded = POSUtils.dateFormatUTC.parse(jsonorder.getString("loaded")), updated = OBMOBCUtils
               .convertToUTC(order.getUpdated());
           if (!(loaded.compareTo(updated) >= 0)) {
             throw new OutDatedDataChangeException(Utility.messageBD(
diff -r 3e73374b406e -r dbd98d4df71d src/org/openbravo/retail/posterminal/POSUtils.java
--- a/src/org/openbravo/retail/posterminal/POSUtils.java	Thu Sep 28 14:15:39 2017 +0200
+++ b/src/org/openbravo/retail/posterminal/POSUtils.java	Thu Sep 28 19:12:29 2017 +0530
@@ -18,6 +18,7 @@
 package org.openbravo.retail.posterminal;
 
 import java.math.BigDecimal;
+import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -66,6 +67,8 @@
   public static final String MODULE_JAVA_PACKAGE = "org.openbravo.retail.posterminal";
   public static final String APP_NAME = "WebPOS";
   public static final String WEB_POS_FORM_ID = "B7B7675269CD4D44B628A2C6CF01244F";
+  public static final DateFormat dateFormatUTC = new SimpleDateFormat(
+      "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
 
   public static boolean isModuleInDevelopment() {
     OBContext.setAdminMode(false);
diff -r 3e73374b406e -r dbd98d4df71d src/org/openbravo/retail/posterminal/PaidReceipts.java
--- a/src/org/openbravo/retail/posterminal/PaidReceipts.java	Thu Sep 28 14:15:39 2017 +0200
+++ b/src/org/openbravo/retail/posterminal/PaidReceipts.java	Thu Sep 28 19:12:29 2017 +0530
@@ -88,7 +88,7 @@
       JSONArray respArray = new JSONArray();
       List<String> orderIds = new ArrayList<String>();
 
-      final DateFormat parseDateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
+      final DateFormat parseDateFormat = (DateFormat) POSUtils.dateFormatUTC.clone();
       parseDateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
       final DateFormat paymentDateFormat = new SimpleDateFormat("yyyy-MM-dd 00:00:00");
       paymentDateFormat.setTimeZone(TimeZone.getTimeZone(Calendar.getInstance().getTimeZone()
diff -r 3e73374b406e -r dbd98d4df71d src/org/openbravo/retail/posterminal/ProcessVoidLayaway.java
--- a/src/org/openbravo/retail/posterminal/ProcessVoidLayaway.java	Thu Sep 28 14:15:39 2017 +0200
+++ b/src/org/openbravo/retail/posterminal/ProcessVoidLayaway.java	Thu Sep 28 19:12:29 2017 +0530
@@ -14,10 +14,15 @@
 import org.codehaus.jettison.json.JSONArray;
 import org.codehaus.jettison.json.JSONObject;
 import org.openbravo.base.weld.WeldUtils;
+import org.openbravo.dal.core.OBContext;
 import org.openbravo.dal.service.OBDal;
+import org.openbravo.erpCommon.utility.Utility;
 import org.openbravo.mobile.core.process.DataSynchronizationImportProcess;
+import org.openbravo.mobile.core.process.OutDatedDataChangeException;
+import org.openbravo.mobile.core.utils.OBMOBCUtils;
 import org.openbravo.model.common.enterprise.DocumentType;
 import org.openbravo.model.common.order.Order;
+import org.openbravo.service.db.DalConnectionProvider;
 import org.openbravo.service.json.JsonConstants;
 
 public class ProcessVoidLayaway extends POSDataSynchronizationProcess implements
@@ -31,6 +36,16 @@
 
     JSONArray respArray = new JSONArray();
     JSONObject jsonorder = (JSONObject) jsonRecord.get("order");
+    Order order = OBDal.getInstance().get(Order.class, jsonorder.getString("id"));
+
+    if (order != null) {
+      final Date loaded = POSUtils.dateFormatUTC.parse(jsonorder.getString("loaded")), updated = OBMOBCUtils
+          .convertToUTC(order.getUpdated());
+      if (!(loaded.compareTo(updated) >= 0)) {
+        throw new OutDatedDataChangeException(Utility.messageBD(new DalConnectionProvider(false),
+            "OBPOS_outdatedLayaway", OBContext.getOBContext().getLanguage().getLanguage()));
+      }
+    }
 
     // Update CashUp Report
     JSONObject jsoncashup = jsonorder.getJSONObject("cashUpReportInformation");
@@ -38,8 +53,6 @@
 
     UpdateCashup.getAndUpdateCashUp(jsoncashup.getString("id"), jsoncashup, cashUpDate);
 
-    Order order = OBDal.getInstance().get(Order.class, jsonorder.getString("id"));
-
     VoidLayaway proc = WeldUtils.getInstanceFromStaticBeanManager(VoidLayaway.class);
     proc.voidLayaway(jsonorder, order);