Domain: Done breaking changes, Payment related stuff

Author: poolborges

kriolos-opos-domain/src/main/java/com/openbravo/pos/forms/DataLogicSales.java

@@ -281,7 +281,7 @@ public final ProductInfoExt getProductInfo(String id) throws BasicException {
      * @return
      * @throws BasicException
      */
-    public final ProductInfoExt getProductInfoByCode(String sCode) throws BasicException {      
+    public final ProductInfoExt getProductInfoByCode(String sCode) throws BasicException {
         return new PreparedSentence<String, ProductInfoExt>(s,
                 "SELECT "
                 + "ID, "
@@ -1610,15 +1610,14 @@ public final TicketInfo loadTicket(final int tickettype, final int ticketid) thr
     }
 
     /**
-     *
+     * Save Ticket information (Receipt, Payments, Ticket, TaxLine, TicketLine, Customer debt, Voucher)
      * @param ticket
      * @param location
      * @throws BasicException
      */
     public final void saveTicket(final TicketInfo ticket, final String location) throws BasicException {
 
-        Transaction t;
-        t = new Transaction(s) {
+        Transaction t = new Transaction(s) {
             @Override
             public Object transact() throws BasicException {
 
@@ -1642,6 +1641,7 @@ public Object transact() throws BasicException {
                     }
                 }
 
+                //Ticket Properties
                 byte[] properties = null;
                 try {
                     ByteArrayOutputStream o = new ByteArrayOutputStream();
@@ -1651,6 +1651,7 @@ public Object transact() throws BasicException {
 
                 }
 
+                //Receipt Writer
                 SerializerWrite<Object[]> sw = new SerializerWriteBasicExt(
                         new Datas[]{Datas.STRING, Datas.STRING, Datas.TIMESTAMP, Datas.BYTES, Datas.STRING},
                         new int[]{0, 1, 2, 3, 4});
@@ -1661,6 +1662,7 @@ public Object transact() throws BasicException {
                     properties,
                     ticket.getProperty("person")};
 
+                //Receipt Prepared
                 new PreparedSentence(s,
                         "INSERT INTO receipts (ID, MONEY, DATENEW, ATTRIBUTES, PERSON) VALUES (?, ?, ?, ?, ?)",
                         sw)
@@ -1684,7 +1686,7 @@ public Object transact() throws BasicException {
                         sw)
                         .exec(params);
 
-                // update status of existing ticket
+                //Ticket: Update status (This is Receipt or TicketType: 0)
                 new PreparedSentence(s,
                         "UPDATE tickets SET STATUS = ? "
                         + "WHERE TICKETTYPE = 0 AND TICKETID = ?",
@@ -1698,6 +1700,7 @@ public void writeValues() throws BasicException {
                             }
                         });
 
+                //Ticket Lines
                 SentenceExec ticketlineinsert = new PreparedSentenceExec(s,
                         "INSERT INTO ticketlines (TICKET, LINE, "
                         + "PRODUCT, ATTRIBUTESETINSTANCE_ID, "
@@ -1723,6 +1726,7 @@ public void writeValues() throws BasicException {
                     }
                 }
 
+                //Payments
                 final Payments payments = new Payments();
                 SentenceExec paymentinsert = new PreparedSentence(s,
                         "INSERT INTO payments (ID, RECEIPT, PAYMENT, TOTAL, TRANSID, RETURNMSG, "
@@ -1733,33 +1737,38 @@ public void writeValues() throws BasicException {
                     payments.addPayment(p.getName(), p.getTotal(), p.getPaid(), ticket.getReturnMessage(), p.getVoucher());
                 });
                 while (payments.getSize() >= 1) {
+
+                    pName = payments.getFirstElement();
+                    getTotal = payments.getPaidAmount(pName);
+                    getTendered = payments.getTendered(pName);
+                    getRetMsg = payments.getRtnMessage(pName);
+                    getVoucher = payments.getVoucher(pName);
+                    payments.removeFirst(pName);
+                    
                     paymentinsert.exec(new DataParams() {
+
                         @Override
                         public void writeValues() throws BasicException {
-                            pName = payments.getFirstElement();
-                            getTotal = payments.getPaidAmount(pName);
-                            getTendered = payments.getTendered(pName);
-                            getRetMsg = payments.getRtnMessage(pName);
-                            getVoucher = payments.getVoucher(pName);
-                            payments.removeFirst(pName);
 
                             setString(1, UUID.randomUUID().toString());
                             setString(2, ticket.getId());
                             setString(3, pName);
                             setDouble(4, getTotal);
                             setString(5, ticket.getTransactionID());
-                            setBytes(6, (byte[]) Formats.BYTEA.parseValue(getRetMsg));
+                            setBytes(6, Formats.BYTEA.parseValue(getRetMsg));
                             setDouble(7, getTendered);
                             setString(8, getCardName);
                             setString(9, getVoucher);
                             payments.removeFirst(pName);
                         }
                     });
 
+                    // Payment method: Disable that Voucher
                     if (payments.getVoucher(pName) != null) {
                         getVoucherNonActive().exec(payments.getVoucher(pName));
                     }
 
+                    //Payment method: Add debt to Customer Account
                     if ("debt".equals(pName) || "debtpaid".equals(pName)) {
                         ticket.getCustomer().updateCurDebt(getTotal, ticket.getDate());
                         getDebtUpdate().exec(new DataParams() {
@@ -1774,6 +1783,7 @@ public void writeValues() throws BasicException {
                     }
                 }
 
+                //TAX Lines
                 SentenceExec taxlinesinsert = new PreparedSentence(s,
                         "INSERT INTO taxlines (ID, RECEIPT, TAXID, BASE, AMOUNT)  "
                         + "VALUES (?, ?, ?, ?, ?)",

kriolos-opos-domain/src/main/java/com/openbravo/pos/forms/Payments.java

@@ -13,7 +13,6 @@
 //
 //    You should have received a copy of the GNU General Public License
 //    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
 package com.openbravo.pos.forms;
 
 import java.util.HashMap;
@@ -23,23 +22,21 @@
  * @author Jack Gerrard
  */
 public class Payments {
-    private Double amount;
-    private Double tendered;
-    private final HashMap paymentPaid;
-    private final HashMap paymentTendered;
-    private final HashMap rtnMessage;
-    private String name;
-    private final HashMap paymentVoucher;
+
+    private final HashMap<String, Double> paymentPaid;
+    private final HashMap<String, Double> paymentTendered;
+    private final HashMap<String, String> rtnMessage;
+    private final HashMap<String, String> paymentVoucher;
 
     /**
      *
      */
     public Payments() {
-    paymentPaid =  new HashMap();
-    paymentTendered =  new HashMap();
-    rtnMessage = new HashMap();
-    paymentVoucher = new HashMap();
-     
+        paymentPaid = new HashMap<>();
+        paymentTendered = new HashMap<>();
+        rtnMessage = new HashMap<>();
+        paymentVoucher = new HashMap<>();
+
     }
 
     /**
@@ -49,19 +46,18 @@ public Payments() {
      * @param pTendered
      * @param rtnMsg
      */
-
-    public void addPayment (String pName, Double pAmountPaid, Double pTendered, String rtnMsg){    
-        if (paymentPaid.containsKey(pName)){
-            paymentPaid.put(pName,Double.parseDouble(paymentPaid.get(pName).toString()) + pAmountPaid);
-            paymentTendered.put(pName,Double.parseDouble(paymentTendered.get(pName).toString()) + pTendered); 
-            rtnMessage.put(pName, rtnMsg);           
-        }else {    
+    public void addPayment(String pName, Double pAmountPaid, Double pTendered, String rtnMsg) {
+        if (paymentPaid.containsKey(pName)) {
+            paymentPaid.put(pName, paymentPaid.get(pName) + pAmountPaid);
+            paymentTendered.put(pName, paymentTendered.get(pName) + pTendered);
+            rtnMessage.put(pName, rtnMsg);
+        } else {
             paymentPaid.put(pName, pAmountPaid);
-            paymentTendered.put(pName,pTendered);
-            rtnMessage.put(pName, rtnMsg); 
-        }        
+            paymentTendered.put(pName, pTendered);
+            rtnMessage.put(pName, rtnMsg);
+        }
     }
-    
+
     /**
      *
      * @param pName
@@ -70,79 +66,78 @@ public void addPayment (String pName, Double pAmountPaid, Double pTendered, Stri
      * @param rtnMsg
      * @param pVoucher
      */
-    public void addPayment (String pName, Double pAmountPaid, Double pTendered, String rtnMsg, String pVoucher){
-        if (paymentPaid.containsKey(pName)){
-            paymentPaid.put(pName,Double.parseDouble(paymentPaid.get(pName).toString()) + pAmountPaid);
-            paymentTendered.put(pName,Double.parseDouble(paymentTendered.get(pName).toString()) + pTendered); 
+    public void addPayment(String pName, Double pAmountPaid, Double pTendered, String rtnMsg, String pVoucher) {
+        if (paymentPaid.containsKey(pName)) {
+            paymentPaid.put(pName, paymentPaid.get(pName) + pAmountPaid);
+            paymentTendered.put(pName, paymentTendered.get(pName) + pTendered);
             rtnMessage.put(pName, rtnMsg);
             paymentVoucher.put(pName, pVoucher);
-            
-        }else {    
+
+        } else {
             paymentPaid.put(pName, pAmountPaid);
-            paymentTendered.put(pName,pTendered);
+            paymentTendered.put(pName, pTendered);
             rtnMessage.put(pName, rtnMsg);
-            if (pVoucher !=null) {
-                paymentVoucher.put(pName, pVoucher);                            
+            if (pVoucher != null) {
+                paymentVoucher.put(pName, pVoucher);
             } else {
                 pVoucher = "0";
-                paymentVoucher.put(pName, pVoucher);                
+                paymentVoucher.put(pName, pVoucher);
             }
-        }        
+        }
     }
-    
 
     /**
      *
      * @param pName
      * @return
      */
-    public Double getTendered (String pName){
-        return(Double.parseDouble(paymentTendered.get(pName).toString()));
+    public Double getTendered(String pName) {
+        return paymentTendered.get(pName);
     }
 
     /**
      *
      * @param pName
      * @return
      */
-    public Double getPaidAmount (String pName){
-        return(Double.parseDouble(paymentPaid.get(pName).toString()));
+    public Double getPaidAmount(String pName) {
+        return paymentPaid.get(pName);
     }
 
     /**
      *
      * @return
      */
-    public Integer getSize(){
-        return (paymentPaid.size());
+    public Integer getSize() {
+        return paymentPaid.size();
     }
 
     /**
      *
      * @param pName
      * @return
      */
-    public String getRtnMessage(String pName){
-        return (rtnMessage.get(pName).toString());
+    public String getRtnMessage(String pName) {
+        return rtnMessage.get(pName);
     }
-    
-    public String getVoucher(String pName){
-        return (paymentVoucher.get(pName).toString());    
+
+    public String getVoucher(String pName) {
+        return paymentVoucher.get(pName);
     }
 
-    public String getFirstElement(){
-        String rtnKey= paymentPaid.keySet().iterator().next().toString();
-        return(rtnKey);
+    public String getFirstElement() {
+        String rtnKey = paymentPaid.keySet().iterator().next();
+        return rtnKey;
     }
 
     /**
      *
      * @param pName
      */
-    public void removeFirst (String pName){
+    public void removeFirst(String pName) {
         paymentPaid.remove(pName);
         paymentTendered.remove(pName);
         rtnMessage.remove(pName);
     }
 
-}
+}