0031776: [SERQA 506] Duplicated receipt payments in webpos with shared payments configured

# HG changeset patch
# User Silambarasan Sekar <silambarasan@qualiantech.com>
# Date 1451378771 -19800
#      Tue Dec 29 14:16:11 2015 +0530
# Node ID 10c80200bcefa48cdd7550276945ee55d808bcde
# Parent  68811a899cdf072eec4b7521e54f28dca9c3d883
Related to issue 31776 :Avoid Duplicate Payments in shared payments configuration.

diff --git a/src/org/openbravo/retail/posterminal/PaidReceipts.java b/src/org/openbravo/retail/posterminal/PaidReceipts.java
--- a/src/org/openbravo/retail/posterminal/PaidReceipts.java
+++ b/src/org/openbravo/retail/posterminal/PaidReceipts.java
@@ -64,8 +64,11 @@
 
       // get the orderId
       HQLPropertyList hqlProperties = ModelExtensionUtils.getPropertyExtensions(extensions);
-      String hqlPaidReceipts = "select " + hqlProperties.getHqlSelect() + //
-          " from Order as ord LEFT OUTER JOIN ord.obposApplications AS pos LEFT OUTER JOIN ord.salesRepresentative as salesRepresentative" + //
+      String hqlPaidReceipts = "select "
+          + hqlProperties.getHqlSelect()
+          + //
+          " from Order as ord LEFT OUTER JOIN ord.obposApplications AS pos LEFT OUTER JOIN ord.salesRepresentative as salesRepresentative"
+          + //
           " where ord.id = :orderId";
       Query paidReceiptsQuery = OBDal.getInstance().getSession().createQuery(hqlPaidReceipts);
       paidReceiptsQuery.setString("orderId", orderid);
@@ -217,7 +220,11 @@
             + "c_currency_rate(p.obposApplications.organization.currency, p.financialAccount.currency, null, null, p.obposApplications.client.id, p.obposApplications.organization.id) as mulrate, "
             + "p.financialAccount.currency.iSOCode as isocode, "
             + "p.paymentMethod.openDrawer as openDrawer "
-            + " from OBPOS_App_Payment as p where p.financialAccount.id in (select scheduleDetail.paymentDetails.finPayment.account.id from FIN_Payment_ScheduleDetail as scheduleDetail where scheduleDetail.orderPaymentSchedule.order.id=?)";
+            + " from OBPOS_App_Payment as p where p.financialAccount.id in (select scheduleDetail.paymentDetails.finPayment.account.id from FIN_Payment_ScheduleDetail as scheduleDetail where scheduleDetail.orderPaymentSchedule.order.id=?)"
+            + "group by  p.financialAccount.id, p.commercialName ,p.searchKey,"
+            + "c_currency_rate(p.financialAccount.currency, p.obposApplications.organization.currency, null, null, p.obposApplications.client.id, p.obposApplications.organization.id),"
+            + "c_currency_rate(p.obposApplications.organization.currency, p.financialAccount.currency, null, null, p.obposApplications.client.id, p.obposApplications.organization.id),"
+            + "p.financialAccount.currency.iSOCode ,p.paymentMethod.openDrawer";
         Query paymentsTypeQuery = OBDal.getInstance().getSession().createQuery(hqlPaymentsType);
         // paidReceiptsQuery.setString(0, id);
         paymentsTypeQuery.setString(0, orderid);

# HG changeset patch
# User Silambarasan Sekar <silambarasan@qualiantech.com>
# Date 1451386677 -19800
#      Tue Dec 29 16:27:57 2015 +0530
# Node ID 983522ce74e546b9367cc0e5335cade3b3513704
# Parent  d45c402031ce1384b22e9aa2a0c170502a7cea35
Added automated test 'I31776_AvoidDuplicatePaymentsInLayaways

diff --git a/src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/layaway/I31776_AvoidDuplicatePaymentsInLayaways.java b/src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/layaway/I31776_AvoidDuplicatePaymentsInLayaways.java
new file mode 100644
--- /dev/null
+++ b/src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/layaway/I31776_AvoidDuplicatePaymentsInLayaways.java
@@ -0,0 +1,75 @@
+/*
+ *************************************************************************
+ * 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) 2008-2015 Openbravo S.L.U.
+ * All Rights Reserved.
+ * Contributor(s):
+ ************************************************************************
+ *
+ * @author = Silambarasan Sekar
+ *
+ */
+
+package org.openbravo.test.mobile.retail.pack.selenium.tests.layaway;
+
+import org.junit.Test;
+import org.openbravo.test.mobile.common.selenium.javascript.BackboneHelper;
+import org.openbravo.test.mobile.common.selenium.javascript.TestId;
+import org.openbravo.test.mobile.common.selenium.terminals.WebPOSSPMTerminalHelper;
+
+/**
+ * 
+ * Verifying Avoid Duplicate payments in Share Payment Method
+ * 
+ */
+
+public class I31776_AvoidDuplicatePaymentsInLayaways extends WebPOSSPMTerminalHelper {
+
+  private static String receiptNo;
+
+  @Test
+  public void test1() {
+
+    // create the layaway
+    tap(TestId.BUTTON_MENU);
+    tap(TestId.BUTTON_MENU_LAYAWAYTHISRECEIPT);
+    verify(TestId.LABEL_RECEIPT_TYPE, "To be laid away");
+    tap(TestId.BUTTON_BROWSE);
+    tap(TestId.BUTTON_CATEGORY_BACKPACKSANDTRAVEL);
+    tap(TestId.BUTTON_PRODUCT_BACKPACKSANDTRAVEL_ALPINESKIING);
+    tap(TestId.BUTTON_PRODUCT_BACKPACKSANDTRAVEL_ALPINESKIING);
+    tap(TestId.BUTTON_PRODUCT_BACKPACKSANDTRAVEL_ALPINESKIING);
+    tap(TestId.BUTTON_PRODUCT_BACKPACKSANDTRAVEL_ALPINESKIING);
+    tap(TestId.BUTTON_PRODUCT_BACKPACKSANDTRAVEL_ALPINESKIING);
+    receiptNo = BackboneHelper.getDocumentNo();
+    verify(TestId.LABEL_TOTALTOPAY, "549.50");
+    tap(TestId.BUTTON_PAY);
+    tap(TestId.BUTTON_SHAREDCREDITCARD);
+    tap(TestId.BUTTON_KEYPAD_1);
+    tap(TestId.BUTTON_KEYPAD_1);
+    tap(TestId.BUTTON_KEYPAD_ENTER);
+    tap(TestId.BUTTON_LAYAWAY);
+
+    // checking Payments
+    tap(TestId.BUTTON_MENU);
+    tap(TestId.BUTTON_MENU_LAYAWAYS);
+    write(TestId.FIELD_SEARCH_RECEIPT, receiptNo);
+    tap(TestId.BUTTON_LAYAWAYS_SEARCH);
+    tap(TestId.BUTTON_LAYAWAYS_ROW1);
+    tap(TestId.BUTTON_PAY);
+    verify(TestId.LABEL_RECEIPT_PAY_REMAINING, "538.50€");
+    tap(TestId.BUTTON_PAY_EXACT);
+    tap(TestId.BUTTON_PAY_DONE);
+
+  }
+}