0037726: Models need to be saved again while loading from remote

# HG changeset patch
# User Ranjith S R <ranjith@qualiantech.com>
# Date 1517896633 -19800
#      Tue Feb 06 11:27:13 2018 +0530
# Node ID 44c4bf9ab5024292ace5bcd59aa823fa992516e0
# Parent  995dffbf1f6bcf67a9e8bafdb62bac071e7d7145
Related to issue 37777 : Payment should eb shown if use credit is enabled with no refundable payment methods

diff -r 995dffbf1f6b -r 44c4bf9ab502 web/org.openbravo.retail.posterminal/js/model/order.js
--- a/web/org.openbravo.retail.posterminal/js/model/order.js	Mon Feb 05 14:08:08 2018 +0530
+++ b/web/org.openbravo.retail.posterminal/js/model/order.js	Tue Feb 06 11:27:13 2018 +0530
@@ -2926,7 +2926,7 @@
 
 
       if (OB.MobileApp.model.hasPermission('OBPOS_remote.product', true)) {
-        OB.Dal.saveIfNew(p, function () {}, function () {
+        OB.Dal.saveOrUpdate(p, function () {}, function () {
           OB.error(arguments);
         });
 
@@ -2944,7 +2944,7 @@
             if (i === characteristics.length) {
               me.calculateReceipt();
             } else {
-              OB.Dal.saveIfNew(characteristics[i], function () {
+              OB.Dal.saveOrUpdate(characteristics[i], function () {
                 saveCharacteristics(characteristics, i + 1);
               }, function () {
                 OB.error(arguments);
@@ -3212,7 +3212,7 @@
       }
       if (OB.MobileApp.model.hasPermission('OBPOS_remote.customer', true)) {
         if (oldbp.id !== businessPartner.id) { //Business Partner have changed
-          OB.Dal.saveIfNew(businessPartner, function () {}, function () {
+          OB.Dal.saveOrUpdate(businessPartner, function () {}, function () {
             OB.error(arguments);
           });
           if (OB.MobileApp.model.hasPermission('OBPOS_remote.discount.bp', true)) {
@@ -3227,7 +3227,7 @@
             criteriaFilter.remoteFilters = remoteCriteria;
             OB.Dal.find(OB.Model.DiscountFilterBusinessPartner, criteriaFilter, function (discountsBP) {
               _.each(discountsBP.models, function (dsc) {
-                OB.Dal.saveIfNew(dsc, function () {}, function () {
+                OB.Dal.saveOrUpdate(dsc, function () {}, function () {
                   OB.error(arguments);
                 });
               });
@@ -3258,14 +3258,14 @@
 
                 me.set('bp', businessPartner);
                 me.save();
-                // copy the modelOrder again, as saveIfNew is possibly async
+                // copy the modelOrder again, as saveOrUpdate is possibly async
                 OB.MobileApp.model.orderList.saveCurrent();
                 finishSaveData(callback);
               }, businessPartner.get('id'));
             } else {
               me.set('bp', businessPartner);
               me.save();
-              // copy the modelOrder again, as saveIfNew is possibly async
+              // copy the modelOrder again, as saveOrUpdate is possibly async
               OB.MobileApp.model.orderList.saveCurrent();
               finishSaveData(callback);
             }
@@ -3273,7 +3273,7 @@
 
         var saveLocModel = function (locModel, lid, callback) {
             if (businessPartner.get(locModel)) {
-              OB.Dal.saveIfNew(businessPartner.get(locModel), function () {}, function (tx, error) {
+              OB.Dal.saveOrUpdate(businessPartner.get(locModel), function () {}, function (tx, error) {
                 OB.UTIL.showError("OBDAL error: " + error);
               });
               if (callback) {
@@ -3281,7 +3281,7 @@
               }
             } else {
               OB.Dal.get(OB.Model.BPLocation, businessPartner.get(lid), function (location) {
-                OB.Dal.saveIfNew(location, function () {}, function (tx, error) {
+                OB.Dal.saveOrUpdate(location, function () {}, function (tx, error) {
                   OB.UTIL.showError("OBDAL error: " + error);
                 });
                 businessPartner.set(locModel, location);
@@ -5529,7 +5529,7 @@
                 iter.linepos = linepos;
                 var addLineForProduct = function (prod) {
                     if (OB.MobileApp.model.hasPermission('OBPOS_remote.product', true)) {
-                      OB.Dal.saveIfNew(prod, function () {
+                      OB.Dal.saveOrUpdate(prod, function () {
                         var productcriteria = {
                           columns: ['product'],
                           operator: 'equals',
@@ -5541,7 +5541,7 @@
                         criteriaFilter.remoteFilters = remoteCriteria;
                         OB.Dal.find(OB.Model.ProductCharacteristicValue, criteriaFilter, function (productcharacteristic) {
                           _.each(productcharacteristic.models, function (pchv) {
-                            OB.Dal.saveIfNew(pchv, function () {}, function () {
+                            OB.Dal.saveOrUpdate(pchv, function () {}, function () {
                               OB.error(arguments);
                             });
                           });
@@ -5932,10 +5932,10 @@
     },
 
     doRemoteBPSettings: function (businessPartner) {
-      OB.Dal.saveIfNew(businessPartner, function () {}, function () {
+      OB.Dal.saveOrUpdate(businessPartner, function () {}, function () {
         OB.error(arguments);
       });
-      OB.Dal.saveIfNew(businessPartner.get('locationModel'), function () {}, function () {
+      OB.Dal.saveOrUpdate(businessPartner.get('locationModel'), function () {}, function () {
         OB.error(arguments);
       });
       if (OB.MobileApp.model.hasPermission('OBPOS_remote.discount.bp', true)) {
@@ -5951,7 +5951,7 @@
 
         findDiscountFilterBusinessPartner(criteria, function (discountsBP) {
           _.each(discountsBP.models, function (dsc) {
-            OB.Dal.saveIfNew(dsc, function () {}, function () {
+            OB.Dal.saveOrUpdate(dsc, function () {}, function () {
               OB.error(arguments);
             });
           });

# HG changeset patch
# User Ranjith S R <ranjith@qualiantech.com>
# Date 1517896664 -19800
#      Tue Feb 06 11:27:44 2018 +0530
# Node ID 236300b08d01d11c2d5fda2e1540d504ade50924
# Parent  ef437a40ba5d6bee5c3ccb1fef1e4ce579dcc3cf
Related to issue 37726 : Model should be saved again in local, if its loaded from remote and already exist in local db

diff -r ef437a40ba5d -r 236300b08d01 web/org.openbravo.retail.returns/js/modalReturnLines.js
--- a/web/org.openbravo.retail.returns/js/modalReturnLines.js	Thu Jan 25 09:29:02 2018 +0100
+++ b/web/org.openbravo.retail.returns/js/modalReturnLines.js	Tue Feb 06 11:27:44 2018 +0530
@@ -496,7 +496,7 @@
             criteriaFilter.remoteFilters = remoteCriteria;
             OB.Dal.find(OB.Model.DiscountFilterBusinessPartner, criteriaFilter, function (discountsBP) {
               _.each(discountsBP.models, function (dsc) {
-                OB.Dal.saveIfNew(dsc, function () {}, function () {
+                OB.Dal.saveOrUpdate(dsc, function () {}, function () {
                   OB.error(arguments);
                 });
               });

# HG changeset patch
# User Ranjith S R <ranjith@qualiantech.com>
# Date 1517901019 -19800
#      Tue Feb 06 12:40:19 2018 +0530
# Node ID 1a22d9128603ab8319502732c17150ccc2d83d3c
# Parent  10e3524e47956dac406eac480e71fed8dc179b70
Related to issue 37726 : Added new dal method saveOrUpdate

* saveOrUpdate, It will check whether model is present in local db, if it is present then it will update in localdb else it will insert.

diff -r 10e3524e4795 -r 1a22d9128603 web/org.openbravo.mobile.core/source/data/ob-dal.js
--- a/web/org.openbravo.mobile.core/source/data/ob-dal.js	Tue Feb 06 12:39:57 2018 +0530
+++ b/web/org.openbravo.mobile.core/source/data/ob-dal.js	Tue Feb 06 12:40:19 2018 +0530
@@ -1006,6 +1006,20 @@
     });
   };
 
+  /*
+   * This method checks if model to save is present in the database before saving it.
+   * If the model is there it will update, else it will insert.
+   */
+  OB.Dal.saveOrUpdate = function (model, success, error) {
+    OB.Dal.transaction(function (tx) {
+      OB.Dal.getInTransaction(tx, OB.Model[model.modelName], model.get('id'), function () {
+        OB.Dal.save(model, success, error, false, tx);
+      }, error, function () {
+        OB.Dal.saveInTransaction(tx, model, success, error, true);
+      }, true);
+    });
+  };
+
   OB.Dal.updateRecordColumn = function (record, columnName, newValue, successCallback, errorCallback) {
     if (OB.Data.localDB) {
       var modelProto = record.constructor.prototype;