0044001: Payment button disappears in livebuilds with modules

# HG changeset patch
# User Prakash M <prakash@qualiantech.com>
# Date 1592300405 -19800
#      Tue Jun 16 15:10:05 2020 +0530
# Node ID 7ad1fbb9ffd71777f9554713fdcdc36869b2d854
# Parent  396cae2f7c07875849122c94ffd9cd4c4c6b47ec
Related to BUG 44001: Pay Exact button disappears on unselecting a payment
in keyboard

* We are getting problem when 'OB.UI.Keyboard' is extended twice.
* 'OB.UI.Keyboard' subscribes to 'keyboardstatus'
* Therefore it is subscribed twice for both keyboards,
OB.OBPOSPointOfSale.UI.KeyboardOrder,
OBRLP.UI.AddPoints.Keyboard
* Whenever a payment is selected, 'notifyKeyboardStatus' is called twice
* Based on inEvent.value.keyboard.hasActivePayment pay exact but is hided.
* This value is true for KeyboardOrder and undefined for addloyaltyPoints
keyboard
* Therefore it is hidden.

* As it occurs lot of issues on extending 'OB.UI.Keyboard' more than once.
* Also addLoyaltyPoint requires just a simple number keypad.
* Extending from 'OB.UI.Keyboard' triggers several unnecessary flow that is not
required.
* So it is better to implement seperate simple number keyboard for addLoyaltyPoints.

* Created separate number keyboard for add loyalty points.
* This solves trigger of unnecessary flows.

diff -r 396cae2f7c07 -r 7ad1fbb9ffd7 src-db/database/sourcedata/AD_MESSAGE.xml
--- a/src-db/database/sourcedata/AD_MESSAGE.xml	Tue Oct 29 12:45:08 2019 +0100
+++ b/src-db/database/sourcedata/AD_MESSAGE.xml	Tue Jun 16 15:10:05 2020 +0530
@@ -265,6 +265,18 @@
 <!--71763A14DA9C472282F5FB8042A0B8EC-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--71763A14DA9C472282F5FB8042A0B8EC--></AD_MESSAGE>
 
+<!--7186464B831C4695B14A240FC945BEB6--><AD_MESSAGE>
+<!--7186464B831C4695B14A240FC945BEB6-->  <AD_MESSAGE_ID><![CDATA[7186464B831C4695B14A240FC945BEB6]]></AD_MESSAGE_ID>
+<!--7186464B831C4695B14A240FC945BEB6-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7186464B831C4695B14A240FC945BEB6-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7186464B831C4695B14A240FC945BEB6-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7186464B831C4695B14A240FC945BEB6-->  <VALUE><![CDATA[OBRLP_EnterValitPoints]]></VALUE>
+<!--7186464B831C4695B14A240FC945BEB6-->  <MSGTEXT><![CDATA[Please enter valid points!!!]]></MSGTEXT>
+<!--7186464B831C4695B14A240FC945BEB6-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--7186464B831C4695B14A240FC945BEB6-->  <AD_MODULE_ID><![CDATA[9A07DBDB8C5D40B2B1E091C55DB501DA]]></AD_MODULE_ID>
+<!--7186464B831C4695B14A240FC945BEB6-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--7186464B831C4695B14A240FC945BEB6--></AD_MESSAGE>
+
 <!--71BCC754F99246CEABBE6AD00C05C0BD--><AD_MESSAGE>
 <!--71BCC754F99246CEABBE6AD00C05C0BD-->  <AD_MESSAGE_ID><![CDATA[71BCC754F99246CEABBE6AD00C05C0BD]]></AD_MESSAGE_ID>
 <!--71BCC754F99246CEABBE6AD00C05C0BD-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 396cae2f7c07 -r 7ad1fbb9ffd7 src/org/openbravo/retail/loyalty/programs/OBRLPComponentProvider.java
--- a/src/org/openbravo/retail/loyalty/programs/OBRLPComponentProvider.java	Tue Oct 29 12:45:08 2019 +0100
+++ b/src/org/openbravo/retail/loyalty/programs/OBRLPComponentProvider.java	Tue Jun 16 15:10:05 2020 +0530
@@ -54,6 +54,7 @@
     grhelper.add("component/subscription-buttons.js");
     grhelper.add("component/program-selection-popup.js");
     grhelper.add("component/menu.js");
+    grhelper.add("component/numerickeyboard.js");
     grhelper.add("component/addpoints-keyboard.js");
     grhelper.add("utils/obrlputils.js");
     grhelper.add("view/businesspartner-selectors.js");
diff -r 396cae2f7c07 -r 7ad1fbb9ffd7 web/org.openbravo.retail.loyalty.programs/css/loyalty.css
--- a/web/org.openbravo.retail.loyalty.programs/css/loyalty.css	Tue Oct 29 12:45:08 2019 +0100
+++ b/web/org.openbravo.retail.loyalty.programs/css/loyalty.css	Tue Jun 16 15:10:05 2020 +0530
@@ -349,4 +349,54 @@
   .addPoints-popup-family-selectedproductstext {
     text-overflow: ellipsis;
   }
+}
+
+/***********************   ***********************/
+/*            File: numerickeyboard.js        */
+/*             Folder: component/                */
+/***********************   ***********************/
+
+.obrlpUiNumberKeyboard {
+  height: 100%;
+}
+
+.obrlpUiNumberKeyboard-keyboardEditBox {}
+
+.obrlpUiNumberKeyboard-addqty {}
+
+.obrlpUiNumberKeyboard-removeqty {}
+
+.obrlpUiNumberKeyboard-backspace {}
+
+.obrlpUiNumberKeyboard-keyboardkey0 {}
+
+.obrlpUiNumberKeyboard-keyboardkey1 {}
+
+.obrlpUiNumberKeyboard-keyboardkey2 {}
+
+.obrlpUiNumberKeyboard-keyboardkey3 {}
+
+.obrlpUiNumberKeyboard-keyboardkey4 {}
+
+.obrlpUiNumberKeyboard-keyboardkey5 {}
+
+.obrlpUiNumberKeyboard-keyboardkey6 {}
+
+.obrlpUiNumberKeyboard-keyboardkey7 {}
+
+.obrlpUiNumberKeyboard-keyboardkey8 {}
+
+.obrlpUiNumberKeyboard-keyboardkey9 {}
+
+.obrlpUiNumberKeyboard-keyboardkeyPeriod {}
+
+.obrlpUiNumberKeyboard-keyboardkeyEnter {}
+
+/***********************   ***********************/
+/*            File: addpoints-keyboard.js        */
+/*             Folder: component/                */
+/***********************   ***********************/
+
+.obrlpUiAddPointsKeyboard {
+  /*Inherits: [OBRLP.UI.NumberKeyboard]*/
 }
\ No newline at end of file
diff -r 396cae2f7c07 -r 7ad1fbb9ffd7 web/org.openbravo.retail.loyalty.programs/js/component/addpoints-keyboard.js
--- a/web/org.openbravo.retail.loyalty.programs/js/component/addpoints-keyboard.js	Tue Oct 29 12:45:08 2019 +0100
+++ b/web/org.openbravo.retail.loyalty.programs/js/component/addpoints-keyboard.js	Tue Jun 16 15:10:05 2020 +0530
@@ -11,28 +11,22 @@
 
 enyo.kind({
   name: 'OBRLP.UI.AddPoints.Keyboard',
-  kind: 'OB.UI.Keyboard',
-  keyMatcher: /^([0-9]|\.|,| |-|\/|[a-z]|[A-Z])$/,
+  kind: 'OBRLP.UI.NumberKeyboard',
+  classes: 'obrlpUiAddPointsKeyboard',
   events: {
-    onShowPopup: ''
+    onShowPopup: '',
+    onSetPointsAmt: ''
+  },
+  handlers: {
+    onSetValue: 'setValue'
   },
   init: function(model) {
     this.model = model;
   },
+  setValue: function(inSender, inEvent) {
+    this.doSetPointsAmt({ points: inEvent.points });
+  },
   initComponents: function() {
     this.inherited(arguments);
-    this.disableCommandKey(this, {
-      disabled: true,
-      commands: ['/']
-    });
-    this.addCommand('addLoyaltyPoints', {
-      action: function(keyboard, txt) {
-        keyboard.owner.owner.owner.stepButtons[
-          keyboard.owner.owner.owner.selectedStep
-        ].assignStepValue(txt);
-        keyboard.owner.owner.owner.setAddLPPoints(txt);
-      }
-    });
-    this.defaultcommand = 'addLoyaltyPoints';
   }
 });
diff -r 396cae2f7c07 -r 7ad1fbb9ffd7 web/org.openbravo.retail.loyalty.programs/js/component/numerickeyboard.js
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/web/org.openbravo.retail.loyalty.programs/js/component/numerickeyboard.js	Tue Jun 16 15:10:05 2020 +0530
@@ -0,0 +1,222 @@
+/*
+ ************************************************************************************
+ * Copyright (C) 2020 Openbravo S.L.U.
+ * Licensed under the Openbravo Commercial License version 1.0
+ * You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html
+ * or in the legal folder of this module distribution.
+ ************************************************************************************
+ */
+
+/*global enyo*/
+
+enyo.kind({
+  name: 'OBRLP.UI.NumberKeyboard',
+  classes:
+    'obUiGridKeyboard obObposPointOfSaleUiGridKeyboard obrlpUiNumberKeyboard',
+  events: {
+    onSetValue: ''
+  },
+  components: [
+    {
+      kind: 'OB.UI.KeyboardEditBox',
+      name: 'keyboardEditBox',
+      statename: 'editbox',
+      classes:
+        'obObposPointOfSaleUiGridKeyboard-obUiActionEditBox-generic obObposPointOfSaleUiGridKeyboard-keyboardEditBox obUiActionEditBox .obUiActionEditBox_fontnormal obrlpUiNumberKeyboard-keyboardEditBox'
+    },
+    {
+      kind: 'OB.UI.Button',
+      name: 'addqty',
+      classes:
+        'obObposPointOfSaleUiGridKeyboard-obUiActionButton-generic obObposPointOfSaleUiGridKeyboard-addqty obUiActionButton obrlpUiNumberKeyboard-addqty',
+      label: '+',
+      value: 'plus',
+      ontap: 'keyboardKeyPressed'
+    },
+    {
+      kind: 'OB.UI.Button',
+      name: 'removeqty',
+      classes:
+        'obObposPointOfSaleUiGridKeyboard-obUiActionButton-generic obObposPointOfSaleUiGridKeyboard-removeqty obUiActionButton obrlpUiNumberKeyboard-removeqty',
+      label: '-',
+      value: 'minus',
+      ontap: 'keyboardKeyPressed'
+    },
+    {
+      kind: 'OB.UI.Button',
+      name: 'backspace',
+      classes:
+        'btn-icon btn-icon-backspace obObposPointOfSaleUiGridKeyboard-obUiActionButton-generic obObposPointOfSaleUiGridKeyboard-backspace obUiActionButton obrlpUiNumberKeyboard-backspace',
+      value: 'del',
+      ontap: 'keyboardKeyPressed'
+    },
+    {
+      kind: 'OB.UI.Button',
+      name: 'keyboardkey0',
+      classes:
+        'obObposPointOfSaleUiGridKeyboard-obUiActionButton-generic obObposPointOfSaleUiGridKeyboard-keyboardkey0 obUiActionButton obrlpUiNumberKeyboard-keyboardkey0',
+      value: '0',
+      label: '0',
+      ontap: 'keyboardKeyPressed'
+    },
+    {
+      kind: 'OB.UI.Button',
+      name: 'keyboardkey1',
+      classes:
+        'obObposPointOfSaleUiGridKeyboard-obUiActionButton-generic obObposPointOfSaleUiGridKeyboard-keyboardkey1 obUiActionButton obrlpUiNumberKeyboard-keyboardkey1',
+      label: '1',
+      value: '1',
+      ontap: 'keyboardKeyPressed'
+    },
+    {
+      kind: 'OB.UI.Button',
+      name: 'keyboardkey2',
+      classes:
+        'obObposPointOfSaleUiGridKeyboard-obUiActionButton-generic obObposPointOfSaleUiGridKeyboard-keyboardkey2 obUiActionButton obrlpUiNumberKeyboard-keyboardkey2',
+      label: '2',
+      value: '2',
+      ontap: 'keyboardKeyPressed'
+    },
+    {
+      kind: 'OB.UI.Button',
+      name: 'keyboardkey3',
+      classes:
+        'obObposPointOfSaleUiGridKeyboard-obUiActionButton-generic obObposPointOfSaleUiGridKeyboard-keyboardkey3 obUiActionButton obrlpUiNumberKeyboard-keyboardkey3',
+      label: '3',
+      value: '3',
+      ontap: 'keyboardKeyPressed'
+    },
+    {
+      kind: 'OB.UI.Button',
+      name: 'keyboardkey4',
+      classes:
+        'obObposPointOfSaleUiGridKeyboard-obUiActionButton-generic obObposPointOfSaleUiGridKeyboard-keyboardkey4 obUiActionButton obrlpUiNumberKeyboard-keyboardkey4',
+      label: '4',
+      value: '4',
+      ontap: 'keyboardKeyPressed'
+    },
+    {
+      kind: 'OB.UI.Button',
+      name: 'keyboardkey5',
+      classes:
+        'obObposPointOfSaleUiGridKeyboard-obUiActionButton-generic obObposPointOfSaleUiGridKeyboard-keyboardkey5 obUiActionButton obrlpUiNumberKeyboard-keyboardkey5',
+      label: '5',
+      value: '5',
+      ontap: 'keyboardKeyPressed'
+    },
+    {
+      kind: 'OB.UI.Button',
+      name: 'keyboardkey6',
+      classes:
+        'obObposPointOfSaleUiGridKeyboard-obUiActionButton-generic obObposPointOfSaleUiGridKeyboard-keyboardkey6 obUiActionButton obrlpUiNumberKeyboard-keyboardkey6',
+      label: '6',
+      value: '6',
+      ontap: 'keyboardKeyPressed'
+    },
+    {
+      kind: 'OB.UI.Button',
+      name: 'keyboardkey7',
+      classes:
+        'obObposPointOfSaleUiGridKeyboard-obUiActionButton-generic obObposPointOfSaleUiGridKeyboard-keyboardkey7 obUiActionButton obrlpUiNumberKeyboard-keyboardkey7',
+      label: '7',
+      value: '7',
+      ontap: 'keyboardKeyPressed'
+    },
+    {
+      kind: 'OB.UI.Button',
+      name: 'keyboardkey8',
+      classes:
+        'obObposPointOfSaleUiGridKeyboard-obUiActionButton-generic obObposPointOfSaleUiGridKeyboard-keyboardkey8 obUiActionButton obrlpUiNumberKeyboard-keyboardkey8',
+      label: '8',
+      value: '8',
+      ontap: 'keyboardKeyPressed'
+    },
+    {
+      kind: 'OB.UI.Button',
+      name: 'keyboardkey9',
+      classes:
+        'obObposPointOfSaleUiGridKeyboard-obUiActionButton-generic obObposPointOfSaleUiGridKeyboard-keyboardkey9 obUiActionButton obrlpUiNumberKeyboard-keyboardkey9',
+      label: '9',
+      value: '9',
+      ontap: 'keyboardKeyPressed'
+    },
+    {
+      kind: 'OB.UI.Button',
+      name: 'keyboardkeyPeriod',
+      classes:
+        'obObposPointOfSaleUiGridKeyboard-obUiActionButton-generic obObposPointOfSaleUiGridKeyboard-keyboardkeyPeriod obUiActionButton obrlpUiNumberKeyboard-keyboardkeyPeriod',
+      value: '.',
+      label: '.',
+      ontap: 'keyboardKeyPressed'
+    },
+    {
+      kind: 'OB.UI.Button',
+      name: 'keyboardkeyEnter',
+      classes:
+        'btn-icon btn-icon-enter obObposPointOfSaleUiGridKeyboard-obUiActionButton-generic obObposPointOfSaleUiGridKeyboard-keyboardkeyEnter obUiActionButton obrlpUiNumberKeyboard-keyboardkeyEnter',
+      value: 'enter',
+      ontap: 'keyboardKeyPressed'
+    }
+  ],
+  keyboardKeyPressed: function(inSender, inEvent) {
+    if (this.isFirstInput === true) {
+      if (inSender.value === 'enter') {
+        OB.UTIL.showError(OB.I18N.getLabel('OBRLP_EnterValitPoints'));
+        return false;
+      } else if (
+        inSender.value === 'del' ||
+        inSender.value === 'minus' ||
+        inSender.value === '0'
+      ) {
+        this.clearEditBox();
+      } else if (inSender.value === '.') {
+        this.$.keyboardEditBox.setContent('0' + inSender.value);
+        this.isFirstInput = false;
+      } else if (inSender.value === 'plus') {
+        this.$.keyboardEditBox.setContent('1');
+        this.isFirstInput = false;
+      } else {
+        this.$.keyboardEditBox.setContent(inSender.value);
+        this.isFirstInput = false;
+      }
+    } else {
+      let content = this.$.keyboardEditBox.getContent(),
+        contentLength = content.length;
+      if (inSender.value === 'del') {
+        if (contentLength === 1) {
+          this.clearEditBox();
+        } else if (contentLength > 0) {
+          this.$.keyboardEditBox.setContent(
+            content.substring(0, contentLength - 1)
+          );
+        }
+      } else if (inSender.value === '.' && content.indexOf('.') >= 0) {
+        return false;
+      } else if (inSender.value === 'plus') {
+        this.$.keyboardEditBox.setContent(
+          (Number(content) + Number(1)).toString()
+        );
+      } else if (inSender.value === 'minus') {
+        if (Number(content) > 0) {
+          this.$.keyboardEditBox.setContent(
+            (Number(content) - Number(1)).toString()
+          );
+        }
+      } else if (inSender.value === 'enter') {
+        if (contentLength > 0 && Number(content) > 0) {
+          this.doSetValue({ points: content });
+        } else {
+          OB.UTIL.showError(OB.I18N.getLabel('OBRLP_EnterValitPoints'));
+          return false;
+        }
+      } else {
+        this.$.keyboardEditBox.setContent(content + inSender.value);
+      }
+    }
+    return true;
+  },
+  clearEditBox: function(inSender, inEvent) {
+    this.$.keyboardEditBox.setContent('0');
+    this.isFirstInput = true;
+  }
+});
diff -r 396cae2f7c07 -r 7ad1fbb9ffd7 web/org.openbravo.retail.loyalty.programs/js/view/addpoints-popup.js
--- a/web/org.openbravo.retail.loyalty.programs/js/view/addpoints-popup.js	Tue Oct 29 12:45:08 2019 +0100
+++ b/web/org.openbravo.retail.loyalty.programs/js/view/addpoints-popup.js	Tue Jun 16 15:10:05 2020 +0530
@@ -471,7 +471,8 @@
     onHideThisPopup: ''
   },
   handlers: {
-    onChangeBPartner: 'changeBPartner'
+    onChangeBPartner: 'changeBPartner',
+    onSetPointsAmt: 'setPointsAmt'
   },
   initComponents: function() {
     this.inherited(arguments);
@@ -553,7 +554,7 @@
     this.$.body.$.addPointsBody.$.addPoints_Description.$.addPtEvent.setValue(
       ''
     );
-    this.$.body.$.addPointsBody.$.keyboard.$.editbox.setContent('');
+    this.$.body.$.addPointsBody.$.keyboard.$.keyboardEditBox.setContent('');
   },
   enableApplyBtn: function(flag) {
     if (flag) {
@@ -638,6 +639,10 @@
       this.setAddLPCustomer(inEvent.businessPartner.get('id'));
     }
   },
+  setPointsAmt: function(inSender, inEvent) {
+    this.stepButtons[this.selectedStep].assignStepValue(inEvent.points);
+    this.setAddLPPoints(inEvent.points);
+  },
   saveLoyaltyPoints: function(approval) {
     var me = this,
       execution = OB.UTIL.ProcessController.start('OBLPSaveEarnedPoints'),
@@ -1015,6 +1020,7 @@
 //Popup Body
 enyo.kind({
   name: 'OBRLP.UI.AddPoints.popup.body',
+  style: 'height: 100%;',
   components: [
     {
       style: 'text-align: center; float: left; width: 39%;',
@@ -1104,6 +1110,7 @@
         },
         {
           name: 'addPoints_Keyboard',
+          style: 'height: 63%;',
           scrollAreaMaxHeight: '330px ',
           showing: false,
           components: [
@@ -1313,9 +1320,6 @@
     {
       name: 'subscriptionContainer',
       style: 'float: left; width: 100%',
-      tap: function() {
-        this.owner.model.trigger('click', this.owner.model);
-      },
       components: [
         {
           name: 'subscriptionInfo',
@@ -1339,7 +1343,10 @@
                 }
               ]
             }
-          ]
+          ],
+          tap: function() {
+            this.owner.model.trigger('click', this.owner.model);
+          }
         }
       ]
     }

# HG changeset patch
# User Prakash M <prakash@qualiantech.com>
# Date 1592310148 -19800
#      Tue Jun 16 17:52:28 2020 +0530
# Node ID dc11d8e61a67c6590f75996046b1ae90285a846b
# Parent  5c8fa8113e38aa6747c978d4e86cb49210ea11a6
Related to BUG 44001: Changed keyboard buttons testid for add loyalty point test
as per new keyboard change

diff -r 5c8fa8113e38 -r dc11d8e61a67 src-test/org/openbravo/test/mobile/retail/extmodules/selenium/TestIdExtModules.java
--- a/src-test/org/openbravo/test/mobile/retail/extmodules/selenium/TestIdExtModules.java	Tue Jun 16 15:21:08 2020 +0530
+++ b/src-test/org/openbravo/test/mobile/retail/extmodules/selenium/TestIdExtModules.java	Tue Jun 16 17:52:28 2020 +0530
@@ -1372,21 +1372,21 @@
   public static TestIdConstructor ADD_POINTS_POPUP_RIGHTBAR_SUBSCRIPTION_ROW2_TEXT = new TestIdConstructor(
       "addPoints_Subscription_row2_subscription");
   public static TestIdConstructor ADD_POINTS_POPUP_RIGHTBAR_KEYPAD_0_BUTTON = new TestIdConstructor(
-      "addPointsBody_keyboard_keypadcontainer_keypadBasic_keypadBtn0_button", EnyoKind.BUTTON);
+      "keyboard_keyboardkey0", EnyoKind.BUTTON);
   public static TestIdConstructor ADD_POINTS_POPUP_RIGHTBAR_KEYPAD_1_BUTTON = new TestIdConstructor(
-      "addPointsBody_keyboard_keypadcontainer_keypadBasic_keypadBtn1_button", EnyoKind.BUTTON);
+      "keyboard_keyboardkey1", EnyoKind.BUTTON);
   public static TestIdConstructor ADD_POINTS_POPUP_RIGHTBAR_KEYPAD_2_BUTTON = new TestIdConstructor(
-      "addPointsBody_keyboard_keypadcontainer_keypadBasic_keypadBtn2_button", EnyoKind.BUTTON);
+      "keyboard_keyboardkey2", EnyoKind.BUTTON);
   public static TestIdConstructor ADD_POINTS_POPUP_RIGHTBAR_KEYPAD_3_BUTTON = new TestIdConstructor(
-      "addPointsBody_keyboard_keypadcontainer_keypadBasic_keypadBtn3_button", EnyoKind.BUTTON);
+      "keyboard_keyboardkey3", EnyoKind.BUTTON);
   public static TestIdConstructor ADD_POINTS_POPUP_RIGHTBAR_KEYPAD_4_BUTTON = new TestIdConstructor(
-      "addPointsBody_keyboard_keypadcontainer_keypadBasic_keypadBtn4_button", EnyoKind.BUTTON);
+      "keyboard_keyboardkey4", EnyoKind.BUTTON);
   public static TestIdConstructor ADD_POINTS_POPUP_RIGHTBAR_KEYPAD_5_BUTTON = new TestIdConstructor(
-      "addPointsBody_keyboard_keypadcontainer_keypadBasic_keypadBtn5_button", EnyoKind.BUTTON);
+      "keyboard_keyboardkey5", EnyoKind.BUTTON);
   public static TestIdConstructor ADD_POINTS_POPUP_RIGHTBAR_KEYPAD_6_BUTTON = new TestIdConstructor(
-      "addPointsBody_keyboard_keypadcontainer_keypadBasic_keypadBtn6_button", EnyoKind.BUTTON);
+      "keyboard_keyboardkey6", EnyoKind.BUTTON);
   public static TestIdConstructor ADD_POINTS_POPUP_RIGHTBAR_KEYPAD_ENTER_BUTTON = new TestIdConstructor(
-      "addPointsBody_keyboard_btnEnter_button", EnyoKind.BUTTON);
+      "keyboard_keyboardkeyEnter", EnyoKind.BUTTON);
   public static TestIdConstructor ADD_POINTS_POPUP_RIGHTBAR_REASON_COMBO = new TestIdConstructor(
       "Description_addPtReason");
   public static TestIdConstructor ADD_POINTS_POPUP_RIGHTBAR_REASON_TEXT = new TestIdConstructor(