0035631: [SERQA 2676] In step count cash in cash ups it is not possible to enter negative amounts

# HG changeset patch
# User Ranjith S R <ranjith@qualiantech.com>
# Date 1491210998 -19800
#      Mon Apr 03 14:46:38 2017 +0530
# Node ID be85b56f567d9e0fbe26866e4458e1dfbeab3f29
# Parent  661d21a689e279c183d6b8f02af633d150ec4b7a
Related to issue 35631 : Enabled Negative Symbol in Cashup Keyboard

* In Cashup Step 2, Negative Amount should not be allowed for Cash payment methods

diff -r 661d21a689e2 -r be85b56f567d src-db/database/sourcedata/AD_MESSAGE.xml
--- a/src-db/database/sourcedata/AD_MESSAGE.xml	Fri Mar 31 11:46:41 2017 +0200
+++ b/src-db/database/sourcedata/AD_MESSAGE.xml	Mon Apr 03 14:46:38 2017 +0530
@@ -4528,6 +4528,18 @@
 <!--81F370EBC2754D57A8FE76FB694D98F9-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--81F370EBC2754D57A8FE76FB694D98F9--></AD_MESSAGE>
 
+<!--82636353D391403393C50A4928117917--><AD_MESSAGE>
+<!--82636353D391403393C50A4928117917-->  <AD_MESSAGE_ID><![CDATA[82636353D391403393C50A4928117917]]></AD_MESSAGE_ID>
+<!--82636353D391403393C50A4928117917-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--82636353D391403393C50A4928117917-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--82636353D391403393C50A4928117917-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--82636353D391403393C50A4928117917-->  <VALUE><![CDATA[OBPOS_CashUpNegativeAmtForCashPayment]]></VALUE>
+<!--82636353D391403393C50A4928117917-->  <MSGTEXT><![CDATA[Negative Amount '%0' cannot be added for cash payment methods]]></MSGTEXT>
+<!--82636353D391403393C50A4928117917-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--82636353D391403393C50A4928117917-->  <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
+<!--82636353D391403393C50A4928117917-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--82636353D391403393C50A4928117917--></AD_MESSAGE>
+
 <!--8296E08D474747FD9D7E9E423668112E--><AD_MESSAGE>
 <!--8296E08D474747FD9D7E9E423668112E-->  <AD_MESSAGE_ID><![CDATA[8296E08D474747FD9D7E9E423668112E]]></AD_MESSAGE_ID>
 <!--8296E08D474747FD9D7E9E423668112E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 661d21a689e2 -r be85b56f567d web/org.openbravo.retail.posterminal/js/closecash/view/closekeyboard.js
--- a/web/org.openbravo.retail.posterminal/js/closecash/view/closekeyboard.js	Fri Mar 31 11:46:41 2017 +0200
+++ b/web/org.openbravo.retail.posterminal/js/closecash/view/closekeyboard.js	Mon Apr 03 14:46:38 2017 +0530
@@ -1,6 +1,6 @@
 /*
  ************************************************************************************
- * Copyright (C) 2012 Openbravo S.L.U.
+ * Copyright (C) 2012-2017 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.
@@ -25,6 +25,13 @@
       disabled: true,
       commands: ['%']
     });
+    this.addCommand('-', {
+      stateless: true,
+      action: function (keyboard, txt) {
+        var t = keyboard.$.editbox.getContent();
+        keyboard.$.editbox.setContent(t + '-');
+      }
+    });
     this.addToolbar({
       name: 'toolbarempty',
       buttons: []
@@ -138,6 +145,10 @@
                   OB.UTIL.showWarning(OB.I18N.getLabel('OBPOS_NotValidNumber', [amt]));
                   return;
                 }
+                if (payment.get('paymentMethod').iscash && convAmt < 0) {
+                  OB.UTIL.showWarning(OB.I18N.getLabel('OBPOS_CashUpNegativeAmtForCashPayment', [amt]));
+                  return;
+                }
                 payment.set('foreignCounted', OB.DEC.add(0, convAmt));
                 payment.set('counted', OB.DEC.mul(convAmt, payment.get('rate')));
               }

# HG changeset patch
# User Ranjith S R <ranjith@qualiantech.com>
# Date 1491210967 -19800
#      Mon Apr 03 14:46:07 2017 +0530
# Node ID 4f0e78722777f824ccefb10f5abbe98ac76f5295
# Parent  add3fd8acea751d546a0261c2a78ca5530e6053f
Related to issue 35631 : Enabled Minus key in Cashup Keyboard

diff -r add3fd8acea7 -r 4f0e78722777 web/org.openbravo.mobile.core/source/component/ob-keyboard.js
--- a/web/org.openbravo.mobile.core/source/component/ob-keyboard.js	Thu Mar 30 17:05:22 2017 +0200
+++ b/web/org.openbravo.mobile.core/source/component/ob-keyboard.js	Mon Apr 03 14:46:07 2017 +0530
@@ -287,7 +287,9 @@
                   kind: 'OB.UI.ButtonKey',
                   label: '-',
                   classButton: 'btnkeyboard-num btnkeyboard-minus',
-                  name: 'OBKEY_right_cashup_A'
+                  command: '-',
+                  name: 'OBKEY_right_cashup_A',
+                  description: '- button used for cashup'
                 }]
               }, {
                 classes: 'span6',

# HG changeset patch
# User Ranjith S R <ranjith@qualiantech.com>
# Date 1491211023 -19800
#      Mon Apr 03 14:47:03 2017 +0530
# Node ID 0ba43779e4b0c4a91ff608ae4895fc95d9b5485e
# Parent  97a503d6234e5462bf1d2f81b6e086aaefb61a45
Verifies issue 35631 : Added automated test 'I35631_VerifyCashupKeyboard'

diff -r 97a503d6234e -r 0ba43779e4b0 src-test/org/openbravo/test/mobile/retail/pack/selenium/TestIdPack.java
--- a/src-test/org/openbravo/test/mobile/retail/pack/selenium/TestIdPack.java	Thu Mar 30 22:16:40 2017 +0530
+++ b/src-test/org/openbravo/test/mobile/retail/pack/selenium/TestIdPack.java	Mon Apr 03 14:47:03 2017 +0530
@@ -2047,6 +2047,8 @@
       "paymentsList_row3_buttonEdit", EnyoKind.BUTTON); //
   public static TestIdConstructor LABEL_CASHUP_CASHUSACOUNTED = new TestIdConstructor(
       "paymentsList_row3_foreignCounted"); //
+  public static TestIdConstructor LABEL_CASHUP_CASHUSA_COUNTED = new TestIdConstructor(
+      "paymentsList_row3_counted"); //
   public static TestIdConstructor LABEL_CASHUP_VOUCHERNAME = new TestIdConstructor(
       "paymentsList_row4_name"); //
   public static TestIdConstructor LABEL_CASHUP_VOUCHEREXPECTED = new TestIdConstructor(
diff -r 97a503d6234e -r 0ba43779e4b0 src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/cashup/I35631_VerifyCashupKeyboard.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/cashup/I35631_VerifyCashupKeyboard.java	Mon Apr 03 14:47:03 2017 +0530
@@ -0,0 +1,65 @@
+/*
+ *************************************************************************
+ * The contents of this file are subject to the Openbravo Public License
+ * Version 1.0 (the "License"), being the Mozilla Public License
+ * Version 1.1 with a permitted attribution clause; you may not use this
+ * file except in compliance with the License. You may obtain a copy of
+ * the License at http://www.openbravo.com/legal/license.html
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * The Original Code is Openbravo ERP.
+ * The Initial Developer of the Original Code is Openbravo S.L.U.
+ * All portions are Copyright (C) 2017 Openbravo S.L.U.
+ * All Rights Reserved.
+ * Contributor(s):
+ ************************************************************************
+ *
+ * @author RAN
+ *
+ */
+
+package org.openbravo.test.mobile.retail.pack.selenium.tests.cashup;
+
+import org.junit.Test;
+import org.openbravo.test.mobile.retail.pack.selenium.TestIdPack;
+import org.openbravo.test.mobile.retail.pack.selenium.terminals.WebPOSTerminalHelper;
+
+public class I35631_VerifyCashupKeyboard extends WebPOSTerminalHelper {
+
+  @Test
+  public void test() {
+    // Check Other Max Amount in Cashup
+    tap(TestIdPack.BUTTON_MENU);
+    tap(TestIdPack.BUTTON_MENU_CASHUP);
+
+    // step 1 Count Cash
+    tap(TestIdPack.BUTTON_CASHUP_NEXT);
+
+    // step 2 Check Counted
+    // Check Negative Amount Counted for Non-cash Payment methods
+    tap(TestIdPack.BUTTON_KEYPAD_MINUS);
+    tap(TestIdPack.BUTTON_KEYPAD_1);
+    tap(TestIdPack.BUTTON_KEYPAD_0);
+    tap(TestIdPack.BUTTON_PAYMENT_CARD);
+    verify(TestIdPack.LABEL_CASHUP_CARDCOUNTED, "-10.00");
+
+    // Check Negative Amount Counted for cash Payment methods
+    tap(TestIdPack.BUTTON_KEYPAD_MINUS);
+    tap(TestIdPack.BUTTON_KEYPAD_1);
+    tap(TestIdPack.BUTTON_KEYPAD_0);
+    tap(TestIdPack.BUTTON_PAYMENT_USACASH);
+    isVisible(TestIdPack.ERROR_POPUP, true);
+    verify(TestIdPack.LABEL_CASHUP_CASHUSA_COUNTED, "");
+
+    // Check Negative Amount Counted for cash Payment methods
+    tap(TestIdPack.BUTTON_KEYPAD_1);
+    tap(TestIdPack.BUTTON_KEYPAD_0);
+    tap(TestIdPack.BUTTON_PAYMENT_USACASH);
+    verify(TestIdPack.LABEL_CASHUP_CASHUSA_COUNTED, "7.61");
+
+    // Cancel Cashup
+    tap(TestIdPack.BUTTON_CASHMANAGEMENT_CANCEL);
+  }
+}
\ No newline at end of file