0025399: Under very specific circumstances, an error in the OrderLoader could lead to data loss

diff -r 4cb0a58b5bfa web/org.openbravo.mobile.core/source/data/ob-datasource.js
--- a/web/org.openbravo.mobile.core/source/data/ob-datasource.js	Wed Dec 18 13:29:28 2013 +0100
+++ b/web/org.openbravo.mobile.core/source/data/ob-datasource.js	Thu Dec 26 11:54:16 2013 +0100
@@ -26,13 +26,15 @@
       } else if (response.errors) {
         callback({
           exception: {
-            message: response.errors.id
+            message: response.errors.id,
+            status: response
           }
         });
       } else {
         callback({
           exception: {
-            message: response.error.message
+            message: response.error.message,
+            status: response
           }
         });
       }
@@ -74,6 +76,10 @@
         serviceSuccess(inResponse, callback);
       },
       fail: function (inSender, inResponse) {
+        var inResponse = inResponse || {};
+        if (inSender && inSender === "timeout"){
+          inResponse.timeout = true;
+        }
         serviceError(inResponse, callback, callbackError);
       }
     });

diff -r e10c7f2f7aef src/org/openbravo/retail/posterminal/OrderLoader.java
--- a/src/org/openbravo/retail/posterminal/OrderLoader.java	Fri Dec 20 13:05:16 2013 +0100
+++ b/src/org/openbravo/retail/posterminal/OrderLoader.java	Thu Dec 26 18:56:53 2013 +0100
@@ -143,6 +143,7 @@
 
   public JSONObject saveOrder(JSONArray jsonarray) throws JSONException {
     boolean error = false;
+    List<String> errorIds = new ArrayList<String>();
     String currentOrg = (String) RequestContext.get().getSession().getAttribute("#AD_ORG_ID");
     String currentUser = (String) RequestContext.get().getSession().getAttribute("#AD_USER_ID");
     String currentRole = (String) RequestContext.get().getSession().getAttribute("#AD_ROLE_ID");
@@ -163,6 +164,7 @@
               JsonConstants.RPCREQUEST_STATUS_SUCCESS)) {
             log.error("There was an error importing order: " + jsonorder.toString());
             error = true;
+            errorIds.add(jsonorder.getString("id"));
           }
           if (i % 1 == 0) {
             OBDal.getInstance().getConnection(false).commit();
@@ -201,12 +203,16 @@
           try {
             OBDal.getInstance().getConnection().commit();
           } catch (SQLException e1) {
-            // this won't happen
+            error = true;
+            errorIds.add(jsonorder.getString("id"));
+            log.error(
+                "Critical Error: The process to save the order"
+                    + jsonorder.getString("id")
+                    + " has failed and the order cannot be saved as an error. To avoid lose data, please don't remove the browser cache. \n Order: "
+                    + jsonorder.toString() + " \n", e1);
           }
-
         }
       }
-
     } finally {
       OBContext.restorePreviousMode();
     }
@@ -217,6 +223,14 @@
     } else {
       jsonResponse.put(JsonConstants.RESPONSE_STATUS, JsonConstants.RPCREQUEST_STATUS_FAILURE);
       jsonResponse.put("result", "0");
+      JSONObject errors = new JSONObject();
+      if (errorIds.size() > 0) {
+        jsonResponse.put("errorids", errorIds);
+        errors.put("message", "Orders [" + errorIds.toString() + "] cannot be saved");
+      } else {
+        errors.put("message", "Some orders cannot be saved");
+      }
+      jsonResponse.put("error", errors);
     }
     return jsonResponse;
   }
diff -r e10c7f2f7aef web/org.openbravo.retail.posterminal/js/utils/ordersSyncUtils.js
--- a/web/org.openbravo.retail.posterminal/js/utils/ordersSyncUtils.js	Fri Dec 20 13:05:16 2013 +0100
+++ b/web/org.openbravo.retail.posterminal/js/utils/ordersSyncUtils.js	Thu Dec 26 18:56:53 2013 +0100
@@ -29,7 +29,7 @@
         ordersPaidNotProcessed.each(function (order) {
           order.set('isbeingretriggered', 'Y');
         });
-        pendingOrdersMessage = OB.UTIL.showAlert.display(OB.I18N.getLabel('OBPOS_ProcessPendingOrders'), OB.I18N.getLabel('OBPOS_Info'));
+        pendingOrdersMessage = OB.UTIL.showAlert.display(OB.I18N.getLabel('OBPOS_ProcessPendingOrders'), OB.I18N.getLabel('OBPOS_Info'), null, true);
         successCallback = function () {
           pendingOrdersMessage.hide();
           if (orderSucessCallback) {
@@ -60,12 +60,51 @@
       }, function (data, message) {
         if (data && data.exception) {
           // Orders have not been processed
-          orders.each(function (order) {
-            order.set('isbeingprocessed', 'N');
-            OB.Dal.save(order, null, function (tx, err) {
-              OB.UTIL.showError(err);
+          // 2 options:
+          // a-> timeout -> Don't remove from local DB. We are not sure if the information was or not processed. If yes we will send again the orders and the mechanism to detect duplicates will act.
+          // b-> At least one error -> Remove the orders which was saved in the backend (correctly or as an error). Don't remove those which failed.
+          if (data.exception && data.exception.status && data.exception.status.timeout) {
+            //FLOW A
+            orders.each(function (order) {
+              order.set('isbeingprocessed', 'N');
+              OB.Dal.save(order, null, function (tx, err) {
+                OB.UTIL.showError(err);
+              });
             });
-          });
+          } else {
+            // FLOW B
+            if (data.exception && data.exception.status && data.exception.status.errorids && data.exception.status.errorids.length > 0) {
+              var notProcessedOrders = data.exception.status.errorids;
+              orders.each(function (order) {
+                var isErrorId = _.find(notProcessedOrders, function (errId) {
+                  if (order.get('id') === errId) {
+                    return true
+                  }
+                });
+                if (isErrorId) {
+                  order.set('isbeingprocessed', 'N');
+                  OB.Dal.save(order, null, function (tx, err) {
+                    OB.UTIL.showError(err);
+                  });
+                } else {
+                  if (model) {
+                    model.get('orderList').remove(order);
+                  }
+                  OB.Dal.remove(order, null, function (tx, err) {
+                    OB.UTIL.showError(err);
+                  });
+                }
+              });
+            } else {
+              //Others, Again flow A. Don't remove from local DB.
+              orders.each(function (order) {
+                order.set('isbeingprocessed', 'N');
+                OB.Dal.save(order, null, function (tx, err) {
+                  OB.UTIL.showError(err);
+                });
+              });
+            }
+          }
           if (errorCallback) {
             errorCallback();
           }
@@ -83,7 +122,7 @@
             successCallback();
           }
         }
-      }, null, null, 4000);
+      }, null, null, 7000);
     }
   };
 }());
\ No newline at end of file