# HG changeset patch
# User Alejandro <alekosmp86@gmail.com>
# Date 1571339083 14400
#      Thu Oct 17 15:04:43 2019 -0400
# Node ID dc9e137b6a37e85f0c2c346c49ad6e3a08389105
# Parent  7dbfd9ed7b9a3a67f1b695e3cd9c6c6f72b4eddb
Fixed issue 41973: Table number is now updated correctly when a ticket is loaded

diff --git a/web/org.openbravo.retail.restaurantmanagement/js/components/order.js b/web/org.openbravo.retail.restaurantmanagement/js/components/order.js
--- a/web/org.openbravo.retail.restaurantmanagement/js/components/order.js
+++ b/web/org.openbravo.retail.restaurantmanagement/js/components/order.js
@@ -59,20 +59,23 @@
     var callback = function(response) {
       if (!response.exception) {
         var responsible = OB.MobileApp.model.usermodel;
+        var tableNames;
+        if (response.obresmsTableNames) {
+          tableNames = response.obresmsTableNames.toString();
+        }
+
         me.model
           .get('order')
           .set('obresmsResponsibleName', responsible.get('name'));
         me.model.get('order').set('obresmsResponsible', responsible.id);
-        me.model
-          .get('order')
-          .set('obresmsTableNames', response.obresmsTableNames);
+        me.model.get('order').set('obresmsTableNames', tableNames);
         me.model
           .get('order')
           .set('obresmsReservation', response.obresmsReservation);
         me.model.get('orderList').forEach(function(order) {
           order.set('obresmsResponsibleName', responsible.get('name'));
           order.set('obresmsResponsible', responsible.id);
-          order.set('obresmsTableNames', response.obresmsTableNames);
+          order.set('obresmsTableNames', tableNames);
           order.set('obresmsReservation', response.obresmsReservation);
         });
         if (!me.model.get('order').id && response.obresmsReservation) {
@@ -186,8 +189,7 @@
 
   function tableNamesProcessor(model) {
     if (model && model.obresmsTableNames) {
-      var tableNames = model.obresmsTableNames.split(',');
-      model.obresmsTableNames = tableNames;
+      return model.obresmsTableNames;
     }
   }
   OB.Model.modelLoaders.push(tableNamesProcessor);
diff --git a/web/org.openbravo.retail.restaurantmanagement/js/components/tableloaderview.js b/web/org.openbravo.retail.restaurantmanagement/js/components/tableloaderview.js
--- a/web/org.openbravo.retail.restaurantmanagement/js/components/tableloaderview.js
+++ b/web/org.openbravo.retail.restaurantmanagement/js/components/tableloaderview.js
@@ -381,6 +381,11 @@
         createNewOrder: true,
         callback: function(response) {
           if (!response.exception) {
+            var tableNames;
+            if (response.obresmsTableNames) {
+              tableNames = response.obresmsTableNames.toString();
+            }
+
             me.model
               .get('order')
               .set(
@@ -390,9 +395,7 @@
             me.model
               .get('order')
               .set('obresmsResponsible', OB.MobileApp.model.usermodel.id);
-            me.model
-              .get('order')
-              .set('obresmsTableNames', response.obresmsTableNames);
+            me.model.get('order').set('obresmsTableNames', tableNames);
             me.model
               .get('order')
               .set('obresmsReservation', response.obresmsReservation);
diff --git a/web/org.openbravo.retail.restaurantmanagement/js/utils.js b/web/org.openbravo.retail.restaurantmanagement/js/utils.js
--- a/web/org.openbravo.retail.restaurantmanagement/js/utils.js
+++ b/web/org.openbravo.retail.restaurantmanagement/js/utils.js
@@ -236,7 +236,7 @@
 
 OB.OBRESMS.Utils.tableNamesFormat = function(tableNames) {
   if (tableNames) {
-    return tableNames.join(' + ');
+    return tableNames.replace(/,/g, ' + ');
   }
 };