WebSVN - OpenConcerto - Diff - Rev 156 and 174 - /trunk/OpenConcerto/src/org/openconcerto/erp/core/sales/pos/model/Ticket.java

 import org.openconcerto.erp.core.sales.pos.POSConfiguration;
 import org.openconcerto.erp.core.sales.pos.io.DefaultTicketPrinter;
 import org.openconcerto.erp.core.sales.pos.io.Printable;
 import org.openconcerto.erp.core.sales.pos.io.TicketPrinter;
 import org.openconcerto.erp.core.sales.pos.model.RegisterFiles.HashMode;
+import org.openconcerto.erp.core.sales.pos.ui.CaissePanel;
 import org.openconcerto.erp.core.sales.pos.ui.TicketCellRenderer;
 import org.openconcerto.erp.generationEcritures.GenerationEcritures;
 import org.openconcerto.erp.generationEcritures.GenerationMvtVirement;
 import org.openconcerto.erp.preferences.DefaultNXProps;
 import org.openconcerto.sql.Configuration;
 import org.openconcerto.sql.element.SQLElementDirectory;
+import org.openconcerto.sql.model.SQLBackgroundTableCache;
+import org.openconcerto.sql.model.SQLBackgroundTableCacheItem;
 import org.openconcerto.sql.model.SQLRow;
 import org.openconcerto.sql.model.SQLRowAccessor;
 import org.openconcerto.sql.model.SQLRowValues;
 import org.openconcerto.sql.model.SQLTable;
 import org.openconcerto.sql.utils.SQLUtils;
 import org.openconcerto.utils.DecimalUtils;
-import org.openconcerto.utils.Pair;
 import org.openconcerto.utils.Tuple2;
 import org.openconcerto.utils.XMLDateFormat;
 import java.io.File;
 import java.io.IOException;
 public class Ticket implements Printable {
     private static final XMLDateFormat DATE_FMT = new XMLDateFormat();
     // Propre a ticket
-    private final List<Paiement> paiements = new ArrayList<Paiement>();
+    private final List<Paiement> paiements = new ArrayList<>();
-    private final List<Pair<Article, Integer>> items = new ArrayList<Pair<Article, Integer>>();
+    private final List<TicketItem> items = new ArrayList<>();
     private Calendar creationCal;
     private Client client = Client.NONE;
     private final int number;
     private final String previousHash;
     private boolean additionnalCopyRequested = false;
+    private String codePostal = "";
     // Propre à la caisse
     private final int caisseNumber;
     private static final SQLTable tableArticle = Configuration.getInstance().getRoot().findTable("ARTICLE");
         } catch (final Exception e) {
             return null;
+        }
+    }
+    public String getCodePostal() {
+        return this.codePostal;
+    }
+    public void setCodePostal(String codePostal) {
+        this.codePostal = codePostal;
+    }
     public void setClient(final Client client) {
         this.client = client;
+    }
     public Client getClient() {
         return this.client;
+    }
-    public static Ticket parseFile(final File file) {
+    public static Ticket parseFile(final File file) throws IOException {
         return parseFile(file, HashMode.REQUIRED);
+    }
-    public static Ticket parseFile(final File file, final HashMode hashMode) {
+    public static Ticket parseFile(final File file, final HashMode hashMode) throws IOException {
-        if (!file.exists()) {
-            return null;
-        }
         try {
             // XML Reading
             final Document document = RegisterFiles.parse(file.toPath(), hashMode);
             final Element root = document.getRootElement();
+            }
             final String client = root.getAttributeValue("clientID", "1");
             final Ticket t = new Ticket(receiptCode, c, root.getAttributeValue("previousHash"));
             t.setClient(new Client(Integer.parseInt(client), "", BigDecimal.ZERO));
+            t.setCodePostal(root.getAttributeValue("codePostal", ""));
             // article
             final List<Element> children = root.getChildren("article");
             for (final Element element : children) {
-                final int qte = Integer.parseInt(element.getAttributeValue("qte"));
+                final BigDecimal qte = new BigDecimal(element.getAttributeValue("qte"));
                 final BigDecimal prix_unitaire_cents_ht = new BigDecimal(element.getAttributeValue("prixHT"));
                 final int idTaxe = Integer.parseInt(element.getAttributeValue("idTaxe"));
                 final BigDecimal prix_unitaire_cents = new BigDecimal(element.getAttributeValue("prix"));
                 final String categorie = element.getAttributeValue("categorie");
                 final String name = element.getValue();
                 final String codebarre = element.getAttributeValue("codebarre");
                 final String codeArt = element.getAttributeValue("code");
+                final String salesUnit = element.getAttributeValue("unit");
                 final Categorie cat = new Categorie(categorie);
                 final String valueID = element.getAttributeValue("id");
                 final int id = valueID == null || valueID.trim().length() == 0 ? tableArticle.getUndefinedID() : Integer.parseInt(valueID);
                 art.setPriceWithTax(prix_unitaire_cents);
                 art.setCode(codeArt);
                 art.setPriceWithoutTax(prix_unitaire_cents_ht);
                 art.setIdTaxe(idTaxe);
                 art.setBarCode(codebarre);
+                art.setSalesUnit(salesUnit);
-                final Pair<Article, Integer> line = new Pair<Article, Integer>(art, qte);
+                final TicketItem line = new TicketItem(art, qte);
                 t.items.add(line);
+            }
             // paiement
             final List<Element> payChildren = root.getChildren("paiement");
                     t.paiements.add(p);
+                }
+            }
             return t;
-        } catch (final Exception e) {
+        } catch (IOException e) {
-            System.err.println("Error with ticket : " + file + " : " + e.getMessage());
-            e.printStackTrace();
+            throw e;
-            return null;
+        } catch (Exception e) {
+            throw new IOException("Couldn't parse " + file, e);
+        }
+    }
     // TODO receiptCode should be immutable and the day part should be the current accounting day
     // not the day of the present time. E.g. for work day beginning at 15:00, even at 3:00 the
     public final String getPreviousHash() {
         return this.previousHash;
+    }
+    public void clear() {
+        this.client = Client.NONE;
+        this.codePostal = "";
+        this.paiements.clear();
+    }
     public final ReceiptCode getReceiptCode() {
         // TODO replace our fields by one ReceiptCode
         return new ReceiptCode(this.getCaisseNumber(), this.getCreationCal(), this.getNumber());
+    }
         topLevel.setAttribute(new Attribute("code", this.getCode()));
         if (this.getPreviousHash() != null)
             topLevel.setAttribute("previousHash", this.getPreviousHash());
         topLevel.setAttribute("creationDate", DATE_FMT.format(c.getTime()));
         topLevel.setAttribute("clientID", String.valueOf(this.client.getId()));
+        topLevel.setAttribute("codePostal", this.codePostal);
         // Articles
-        for (final Pair<Article, Integer> item : this.items) {
+        for (final TicketItem item : this.items) {
             final Element e = new Element("article");
-            e.setAttribute("qte", String.valueOf(item.getSecond()));
+            e.setAttribute("qte", String.valueOf(item.getQty()));
             // Prix unitaire
+            final Article article = item.getArticle();
-            e.setAttribute("prix", String.valueOf(item.getFirst().getPriceWithTax()));
+            e.setAttribute("prix", String.valueOf(article.getPriceWithTax()));
-            e.setAttribute("prixHT", String.valueOf(item.getFirst().getPriceWithoutTax()));
+            e.setAttribute("prixHT", String.valueOf(article.getPriceWithoutTax()));
-            e.setAttribute("idTaxe", String.valueOf(item.getFirst().getIdTaxe()));
+            e.setAttribute("idTaxe", String.valueOf(article.getIdTaxe()));
-            e.setAttribute("categorie", item.getFirst().getCategorie().getName());
+            e.setAttribute("categorie", article.getCategorie().getName());
-            e.setAttribute("codebarre", item.getFirst().getBarCode());
+            e.setAttribute("codebarre", article.getBarCode());
-            e.setAttribute("code", item.getFirst().getCode());
+            e.setAttribute("code", article.getCode());
-            e.setAttribute("id", String.valueOf(item.getFirst().getId()));
+            e.setAttribute("id", String.valueOf(article.getId()));
+            if (article.getSalesUnit() != null) {
+                e.setAttribute("unit", article.getSalesUnit());
+            }
-            e.setText(item.getFirst().getName());
+            e.setText(article.getName());
             topLevel.addContent(e);
+        }
         // Paiements
         for (final Paiement paiement : this.paiements) {
             final int montantInCents = paiement.getMontantInCents();
         // Date
         prt.addToBuffer("");
         final SimpleDateFormat df = new SimpleDateFormat("EEEE d MMMM yyyy à HH:mm", Locale.FRENCH);
         prt.addToBuffer(DefaultTicketPrinter.formatCenter(maxWidth, "Le " + df.format(getCreationDate())));
         prt.addToBuffer("");
-        List<Pair<Article, Integer>> itemsToPrint = new ArrayList<>(this.items);
+        List<TicketItem> itemsToPrint = new ArrayList<>(this.items);
-        Collections.sort(itemsToPrint, new Comparator<Pair<Article, Integer>>() {
+        Collections.sort(itemsToPrint, new Comparator<TicketItem>() {
             @Override
-            public int compare(Pair<Article, Integer> o1, Pair<Article, Integer> o2) {
+            public int compare(TicketItem o1, TicketItem o2) {
-                final Article p1 = o1.getFirst();
+                final Article p1 = o1.getArticle();
-                final Article p2 = o2.getFirst();
+                final Article p2 = o2.getArticle();
                 final Categorie c1 = p1.getCategorie();
                 final Categorie c2 = p2.getCategorie();
                 if (c1.equals(c2)) {
                     return p1.getName().compareTo(p2.getName());
+                }
                 // Sort by name
                 return c1.getName().compareTo(c2.getName());
+            }
         });
         Categorie currentCategorie = null;
-        for (final Pair<Article, Integer> item : this.items) {
+        for (final TicketItem item : this.items) {
-            final Article article = item.getFirst();
+            final Article article = item.getArticle();
+            System.err.println("Ticket.print()" + item);
             if (currentCategorie == null || !currentCategorie.getName().equals(article.getCategorie().getName())) {
                 // Print category name, except for unknown
                 currentCategorie = article.getCategorie();
                 if (!currentCategorie.isUnknown()) {
                     prt.addToBuffer(currentCategorie.getName(), TicketPrinter.BOLD);
+                }
+            }
-            final Integer nb = item.getSecond();
+            final BigDecimal nb = item.getQty();
             final Float tauxFromId = TaxeCache.getCache().getTauxFromId(article.getIdTaxe());
-            final BigDecimal tauxTVA = new BigDecimal(tauxFromId).movePointLeft(2).add(BigDecimal.ONE);
+            final BigDecimal tauxTVA = BigDecimal.valueOf(tauxFromId).movePointLeft(2).add(BigDecimal.ONE);
             final BigDecimal unitPrice = article.getPriceWithoutTax().multiply(tauxTVA, DecimalUtils.HIGH_PRECISION);
-            final BigDecimal multiply = article.getPriceWithoutTax().multiply(new BigDecimal(nb), DecimalUtils.HIGH_PRECISION).multiply(tauxTVA, DecimalUtils.HIGH_PRECISION);
+            final BigDecimal multiply = article.getPriceWithoutTax().multiply(nb, DecimalUtils.HIGH_PRECISION).multiply(tauxTVA, DecimalUtils.HIGH_PRECISION);
-            final String qtyString = DefaultTicketPrinter.formatRight(MAX_QTE_WIDTH, String.valueOf(nb));
+            String qtyString = DefaultTicketPrinter.formatRight(MAX_QTE_WIDTH, String.valueOf(nb));
-            final String priceString = DefaultTicketPrinter.formatRight(MAX_PRICE_WIDTH, TicketCellRenderer.centsToString(multiply.movePointRight(2).setScale(0, RoundingMode.HALF_UP).intValue()));
+            final String priceUnformated = TicketCellRenderer.centsToString(multiply.movePointRight(2).setScale(0, RoundingMode.HALF_UP).intValue());
+            final String priceString = DefaultTicketPrinter.formatRight(MAX_PRICE_WIDTH, priceUnformated);
             String unitPriceString = "";
+            if (article.getSalesUnit() == null) {
-            if (nb != 1) {
+                if (nb.intValue() != 1) {
-                unitPriceString = DefaultTicketPrinter.formatRight(MAX_PRICE_WIDTH, TicketCellRenderer.centsToString(unitPrice.movePointRight(2).setScale(0, RoundingMode.HALF_UP).intValue()));
+                    unitPriceString = DefaultTicketPrinter.formatRight(MAX_PRICE_WIDTH, TicketCellRenderer.centsToString(unitPrice.movePointRight(2).setScale(0, RoundingMode.HALF_UP).intValue()));
+                }
+            } else {
+                unitPriceString = DefaultTicketPrinter.formatRight(MAX_PRICE_WIDTH, "");
+                if (nb.signum() >= 0) {
+                    qtyString = DefaultTicketPrinter.formatRight(MAX_QTE_WIDTH, "1");
+                } else {
+                    qtyString = DefaultTicketPrinter.formatRight(MAX_QTE_WIDTH, "-1");
+                }
+            }
-            if (article.getCode() != null && !article.getCode().isEmpty()) {
+            if (article.getCode() != null && !article.getCode().isEmpty() && !article.getCode().equalsIgnoreCase(article.getName())) {
                 // 2 lines
                 final String codeString = DefaultTicketPrinter.formatLeft(maxWidth - 2 - MAX_PRICE_WIDTH - MAX_QTE_WIDTH - 1 - unitPriceString.length(), article.getCode());
                 prt.addToBuffer(qtyString + " " + codeString + " " + unitPriceString + " " + priceString);
                 final String nameString = DefaultTicketPrinter.formatLeft(maxWidth - MAX_QTE_WIDTH - 1, article.getName());
                 prt.addToBuffer("      " + nameString);
             } else {
                 // 1 line
                 final String nameString = DefaultTicketPrinter.formatLeft(maxWidth - 2 - MAX_PRICE_WIDTH - MAX_QTE_WIDTH - 1 - unitPriceString.length(), article.getName());
                 prt.addToBuffer(qtyString + " " + nameString + " " + unitPriceString + " " + priceString);
+            }
+            if (article.getSalesUnit() != null) {
+                prt.addToBuffer(
+                        "      (" + nb.abs() + " " + article.getSalesUnit() + " x " + TicketCellRenderer.centsToString(unitPrice.movePointRight(2).setScale(0, RoundingMode.HALF_UP).intValue()) + ")");
+            }
+        }
         final StringBuilder spacer = new StringBuilder();
         for (int i = 0; i <= MAX_QTE_WIDTH; i++) {
             spacer.append(' ');
                     type = "Paiement ";
                 } else {
                     type = "Remboursement ";
+                }
                 if (paiement.getType() == Paiement.CB) {
-                    type = "CB";
+                    type += "CB";
                 } else if (paiement.getType() == Paiement.CHEQUE) {
-                    type = "par chèque";
+                    type += "par chèque";
                 } else if (paiement.getType() == Paiement.ESPECES) {
-                    type = "en espèces";
+                    type += "en espèces";
                 } else if (paiement.getType() == Paiement.SOLDE) {
-                    type = "depuis solde";
+                    type += "depuis solde";
+                }
+                if (montantInCents > 0) {
-                type += " de " + TicketCellRenderer.centsToString(montantInCents);
+                    type += " de " + TicketCellRenderer.centsToString(montantInCents);
+                } else {
+                    type += " de " + TicketCellRenderer.centsToString(-montantInCents);
+                }
-                if (montantInCents > 100) {
+                if (Math.abs(montantInCents) > 100) {
                     type += " euros";
                 } else {
                     type += " euro";
+                }
                 prt.addToBuffer(type);
+        }
         // Montant Rendu
         if (getTotalInCents() < getPaidTotal()) {
             final int montantInCents = getPaidTotal() - getTotalInCents();
             String type = "Rendu : " + TicketCellRenderer.centsToString(montantInCents);
-            if (montantInCents > 100) {
+            if (Math.abs(montantInCents) > 100) {
                 type += " euros";
             } else {
                 type += " euro";
+            }
             prt.addToBuffer(type);
         this.paiements.add(p1);
+    }
     public boolean isAdditionnalCopyRequested() {
-        return additionnalCopyRequested;
+        return this.additionnalCopyRequested;
+    }
     public void addArticle(final Article a) {
+        System.err.println("Ticket.addArticle()" + a);
         boolean alreadyExist = false;
         if (a.isAdditionalCopyRequested()) {
             this.additionnalCopyRequested = true;
+        }
+        if (a.getSalesUnit() == null) {
-        for (final Pair<Article, Integer> line : this.items) {
+            for (final TicketItem line : this.items) {
-            if (line.getFirst().equals(a)) {
+                if (line.getArticle().equals(a)) {
-                alreadyExist = true;
+                    alreadyExist = true;
-                break;
+                    break;
+                }
+            }
+        }
         if (!alreadyExist) {
-            final Pair<Article, Integer> line = new Pair<Article, Integer>(new Article(a), 1);
+            final TicketItem line = new TicketItem(new Article(a), BigDecimal.ONE);
             this.items.add(line);
+        }
+    }
     public void incrementArticle(final Article a) {
+        System.err.println("Ticket.incrementArticle()" + a.getName());
         boolean alreadyExist = false;
+        if (a.getSalesUnit() == null) {
-        for (final Pair<Article, Integer> line : this.items) {
+            for (final TicketItem line : this.items) {
-            if (line.getFirst().equals(a)) {
+                if (line.getArticle().equals(a)) {
-                alreadyExist = true;
+                    alreadyExist = true;
-                line.setSecond(line.getSecond() + 1);
+                    line.setQty(line.getQty().add(BigDecimal.ONE));
-                break;
+                    break;
+                }
+            }
+        }
         if (!alreadyExist) {
-            final Pair<Article, Integer> line = new Pair<Article, Integer>(a, 1);
+            final TicketItem line = new TicketItem(a, BigDecimal.ONE);
             this.items.add(line);
+        }
+    }
+    public void addItem(TicketItem item) {
+        this.items.add(item);
+    }
     public List<Paiement> getPaiements() {
         return this.paiements;
+    }
     public int getTotalInCents() {
         final String val = DefaultNXProps.getInstance().getStringProperty("ArticleService");
         final Boolean bServiceActive = Boolean.valueOf(val);
         calc.setServiceActive(bServiceActive != null && bServiceActive);
         final int size = this.items.size();
         for (int i = 0; i < size; i++) {
-            final Pair<Article, Integer> line = this.items.get(i);
+            final TicketItem line = this.items.get(i);
-            final int count = line.getSecond();
+            final BigDecimal count = line.getQty();
-            final Article art = line.getFirst();
+            final Article art = line.getArticle();
             final SQLRowValues rowVals = new SQLRowValues(tableElt);
-            rowVals.put("T_PV_HT", art.getPriceWithoutTax().multiply(new BigDecimal(count)));
+            rowVals.put("T_PV_HT", art.getPriceWithoutTax().multiply(count));
+            if (art.getSalesUnit() != null) {
-            rowVals.put("QTE", count);
+                rowVals.put("QTE_UNITAIRE", count);
+                rowVals.put("QTE", BigDecimal.ONE);
+            } else {
+                rowVals.put("QTE", count.intValue());
+            }
             rowVals.put("ID_TAXE", art.getIdTaxe());
-            calc.addLine(rowVals, tableArticle.getRow(art.getId()), i, false);
+            calc.addLine(rowVals, CaissePanel.getArticleRowValuesFromCache(art.getId()), i, false);
+        }
         calc.checkResult();
         return calc;
+    }
-    public List<Pair<Article, Integer>> getArticles() {
+    public List<TicketItem> getItems() {
         return this.items;
+    }
     public void clearArticle(final Article article) {
-        Pair<Article, Integer> toRemove = null;
+        TicketItem toRemove = null;
-        for (final Pair<Article, Integer> line : this.items) {
+        for (final TicketItem line : this.items) {
-            if (line.getFirst().equals(article)) {
+            if (line.getArticle().equals(article)) {
+                toRemove = line;
+                break;
+            }
+        }
+        if (toRemove != null) {
+            this.items.remove(toRemove);
+        }
+    }
+    public void removeTicketItem(TicketItem item) {
+        TicketItem toRemove = null;
+        for (final TicketItem line : this.items) {
+            if (line.equals(item)) {
                 toRemove = line;
                 break;
+            }
+        }
         if (toRemove != null) {
             this.items.remove(toRemove);
+        }
+    }
-    public void setArticleCount(final Article article, final int count) {
+    public void setArticleCount(final Article article, final BigDecimal count) {
         // TODO Allow only if annulation?
         // if (count <= 0) {
         // this.clearArticle(article);
         // return;
         // }
-        Pair<Article, Integer> toModify = null;
+        TicketItem toModify = null;
-        for (final Pair<Article, Integer> line : this.items) {
+        for (final TicketItem line : this.items) {
-            if (line.getFirst().equals(article)) {
+            if (line.getArticle().equals(article)) {
                 toModify = line;
                 break;
+            }
+        }
         if (toModify != null) {
-            toModify.setSecond(count);
+            toModify.setQty(count);
+        }
+    }
-    public int getItemCount(final Article article) {
+    public BigDecimal getItemCount(final Article article) {
-        for (final Pair<Article, Integer> line : this.items) {
+        for (final TicketItem line : this.items) {
-            if (line.getFirst().equals(article)) {
+            if (line.getArticle().equals(article)) {
-                return line.getSecond();
+                return line.getQty();
+            }
+        }
-        return 0;
+        return BigDecimal.ZERO;
+    }
     public int getPaidTotal() {
         int paid = 0;
         for (final Paiement p : this.paiements) {
+        }
         return paid;
+    }
     public void removeArticle(final Article a) {
-        Pair<Article, Integer> lineToDelete = null;
+        TicketItem lineToDelete = null;
-        for (final Pair<Article, Integer> line : this.items) {
+        for (final TicketItem line : this.items) {
-            if (line.getFirst().equals(a)) {
+            if (line.getArticle().equals(a)) {
-                final int count = line.getSecond() + 1;
+                final BigDecimal count = line.getQty().add(BigDecimal.ONE);
-                if (count <= 0) {
+                if (count.signum() <= 0) {
                     lineToDelete = line;
+                }
-                line.setSecond(count);
+                line.setQty(count);
                 break;
+            }
+        }
         if (lineToDelete != null) {
             this.items.remove(lineToDelete);
+            }
+        }
         getReceiptCode().markDeleted();
+    }
+}

Dépôt officiel du code source de l'ERP OpenConcerto

svn://code.openconcerto.org/openconcerto

(root)/trunk/OpenConcerto/src/org/openconcerto/erp/core/sales/pos/model/Ticket.java - Rev 156 → 174