0047706: Issue with loyalty card duplicity when editing business partner

diff --git a/web/org.openbravo.retail.loyalty.programs/js/hooks/obrlp_postCustomerSave.js b/web/org.openbravo.retail.loyalty.programs/js/hooks/obrlp_postCustomerSave.js
index a38995c..318c7e3 100755
--- a/web/org.openbravo.retail.loyalty.programs/js/hooks/obrlp_postCustomerSave.js
+++ b/web/org.openbravo.retail.loyalty.programs/js/hooks/obrlp_postCustomerSave.js
@@ -19,7 +19,6 @@
   ) {
     const customer = args.customer;
     let listOfProgramsToInclude = [];
-    const pattern = 'obrlpLoyaltyCardNumber_';
 
     // End hook callback
     const exitHookCallback = function() {
@@ -43,10 +42,13 @@
       for (key in customerModel.attributes) {
         // eslint-disable-next-line
         if (customerModel.attributes.hasOwnProperty(key)) {
-          if (key.indexOf(pattern) !== -1) {
+          if (key.indexOf(OBRLP.Util.loyaltyCardNumberPattern) !== -1) {
             // Found a match
             loyaltyInfo = {
-              searchKey: key.substring(key.indexOf(pattern) + pattern.length),
+              searchKey: key.substring(
+                key.indexOf(OBRLP.Util.loyaltyCardNumberPattern) +
+                  OBRLP.Util.loyaltyCardNumberPattern.length
+              ),
               cardNumber: customerModel.get(key)
             };
             listOfPrograms.push(loyaltyInfo);
@@ -140,7 +142,10 @@
 
     const updateCustomerLoyaltySummary = function() {
       const customerDetailsPopup = OB.MobileApp.view.openedPopup;
-      if (customerDetailsPopup.name === 'customerView') {
+      if (
+        customerDetailsPopup &&
+        customerDetailsPopup.name === 'customerView'
+      ) {
         const customerViewLoyaltyInfo =
           customerDetailsPopup.$.body.$.editcustomers_impl.$.customerAttributes
             .$.line_customerViewLoyaltyInfo.$.newAttribute.$
diff --git a/web/org.openbravo.retail.loyalty.programs/js/utils/obrlputils.js b/web/org.openbravo.retail.loyalty.programs/js/utils/obrlputils.js
index 6425e09..a0ebff2 100755
--- a/web/org.openbravo.retail.loyalty.programs/js/utils/obrlputils.js
+++ b/web/org.openbravo.retail.loyalty.programs/js/utils/obrlputils.js
@@ -12,6 +12,8 @@
 
 OBRLP.Util = window.OBRLP.Util || {};
 
+OBRLP.Util.loyaltyCardNumberPattern = 'obrlpLoyaltyCardNumber_';
+
 OBRLP.Util.refreshCustomer = function(bp, callback) {
   const customerId = !OB.UTIL.isNullOrUndefined(bp.get('bpartnerId'))
     ? bp.get('bpartnerId')
diff --git a/web/org.openbravo.retail.loyalty.programs/js/view/customeredit-fields.js b/web/org.openbravo.retail.loyalty.programs/js/view/customeredit-fields.js
index 86c190b..7d34eee 100755
--- a/web/org.openbravo.retail.loyalty.programs/js/view/customeredit-fields.js
+++ b/web/org.openbravo.retail.loyalty.programs/js/view/customeredit-fields.js
@@ -46,52 +46,132 @@
   (function() {
     const _inherited =
       OB.OBPOSPointOfSale.UI.customers.newcustomer.prototype.executeOnShown;
+    const componentsList = [];
     OB.OBPOSPointOfSale.UI.customers.newcustomer.prototype.executeOnShown = function() {
       const me = this;
+      const edit_createcustomers_impl = this.$.body.$.edit_createcustomers_impl;
+      const customerModel = edit_createcustomers_impl.customer;
       const ret =
         typeof _inherited === 'function'
           ? _inherited.apply(me, arguments)
           : undefined;
-      if (OB.UTIL.isNullOrUndefined(me.automaticFieldsCreated)) {
-        const edit_createcustomers_impl = this.$.body.$
-          .edit_createcustomers_impl;
-        const createProgramFields = function(program) {
-          const natt = {
-            kind: 'OB.UI.CustomerTextProperty',
-            name: 'obrlpLoyaltyCardNumber_' + program.searchKey,
-            modelProperty: 'obrlpLoyaltyCardNumber_' + program.searchKey,
-            maxlength: 60,
-            label: program.name,
-            program: program,
-            mandatory: false,
-            displayLogic: function() {
-              // Only show this component if it is a new business partner
-              this.owner.owner.setShowing(
-                OB.UTIL.isNullOrUndefined(me.args.businessPartner)
-              );
-              return OB.MobileApp.model.get('terminal').terminalType
-                .obrlpEnableloyalty;
-            }
-          };
+      componentsList.forEach(comp => {
+        comp.destroyComponents();
+        comp.destroy();
+        if (
+          me.args.businessPartner != null &&
+          edit_createcustomers_impl &&
+          customerModel
+        ) {
+          customerModel.unset(comp.propertyName);
+        }
+      });
+      componentsList.length = 0;
 
-          const comp = edit_createcustomers_impl.$.customerAttributes.createComponent(
-            {
-              kind: 'OB.UI.CustomerPropertyLine',
-              name: 'line_' + natt.name,
-              newAttribute: natt
-            }
-          );
-          comp.render();
-          comp.setShowing(OB.UTIL.isNullOrUndefined(me.args.businessPartner));
+      if (!OB.MobileApp.model.get('terminal').terminalType.obrlpEnableloyalty) {
+        return ret;
+      }
+      const createProgramFields = function(program) {
+        const natt = {
+          kind: 'OB.UI.CustomerTextProperty',
+          name: OBRLP.Util.loyaltyCardNumberPattern + program.searchKey,
+          modelProperty:
+            OBRLP.Util.loyaltyCardNumberPattern + program.searchKey,
+          maxlength: 60,
+          label: program.name,
+          program: program,
+          mandatory: false
         };
+        const comp = edit_createcustomers_impl.$.customerAttributes.createComponent(
+          {
+            kind: 'OB.UI.CustomerPropertyLine',
+            name: 'line_' + natt.name,
+            propertyName: natt.name,
+            newAttribute: natt
+          }
+        );
+        comp.render();
+        componentsList.push(comp);
+      };
 
-        var programsWithAutomaticMembership = OBRLP.Util.getLoyaltyProgramsWithAutomaticMembership();
-        _.forEach(programsWithAutomaticMembership, function(program) {
+      const createUnsubscribedAutoLoyaltyProgramFields = function(
+        programsSubscribedByBP
+      ) {
+        const programsWithAutomaticMembership = OBRLP.Util.getLoyaltyProgramsWithAutomaticMembership();
+        let programsToBeSubscribed = [];
+
+        if (programsSubscribedByBP && programsSubscribedByBP.length > 0) {
+          _.forEach(programsWithAutomaticMembership, function(autoProgram) {
+            const subscribed = programsSubscribedByBP.find(function(subs) {
+              return subs.get('programId') === autoProgram.id;
+            });
+            if (!subscribed) {
+              programsToBeSubscribed.push(autoProgram);
+            }
+          });
+        } else {
+          programsToBeSubscribed = programsWithAutomaticMembership;
+        }
+
+        _.forEach(programsToBeSubscribed, function(program) {
           createProgramFields(program);
         });
 
-        me.automaticFieldsCreated = true;
+        if (customerModel) {
+          edit_createcustomers_impl.setCustomer(customerModel);
+        }
+
         return ret;
+      };
+
+      const errorCallback = function(error) {
+        OB.error(
+          'Error getting loyalty Programs Subscribed By Customer ' +
+            me.args.businessPartner.id
+        );
+        createUnsubscribedAutoLoyaltyProgramFields();
+      };
+
+      const getLoyaltySubscribedByBP = function(
+        customer,
+        successCallback,
+        errorCallback
+      ) {
+        let criteria = {
+          customerId: customer.id
+        };
+
+        if (OB.MobileApp.model.hasPermission('OBPOS_remote.customer', true)) {
+          criteria.remoteFilters = [
+            {
+              columns: ['customerId'],
+              operator: OB.Dal.EQ,
+              value: customer.id,
+              isId: true
+            }
+          ];
+        }
+
+        OB.Dal.find(
+          OB.Model.OBRLP_LoyaltySubscriptions,
+          criteria,
+          function(results) {
+            successCallback(results);
+          },
+          function(e) {
+            errorCallback(e);
+          }
+        );
+      };
+
+      if (me.args.businessPartner != null) {
+        getLoyaltySubscribedByBP(
+          me.args.businessPartner,
+          createUnsubscribedAutoLoyaltyProgramFields,
+          errorCallback
+        );
+      } else {
+        createUnsubscribedAutoLoyaltyProgramFields();
       }
     };
   })();