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

 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
- * Copyright 2011 OpenConcerto, by ILM Informatique. All rights reserved.
+ * Copyright 2011-2019 OpenConcerto, by ILM Informatique. All rights reserved.
+ *
  * The contents of this file are subject to the terms of the GNU General Public License Version 3
  * only ("GPL"). You may not use this file except in compliance with the License. You can obtain a
  * copy of the License at http://www.gnu.org/licenses/gpl-3.0.html See the License for the specific
  * language governing permissions and limitations under the License.
 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 java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Date;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Set;
 import org.jdom2.Attribute;
 import org.jdom2.Document;
 import org.jdom2.Element;
                 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 String declinaison = element.getAttributeValue("declinaison");
                 final Categorie cat = new Categorie(categorie);
+                final BigDecimal discount_pct = new BigDecimal(element.getAttributeValue("discount_pct", "0.00"));
+                final BigDecimal ecotaxe = new BigDecimal(element.getAttributeValue("ecotaxe", "0.00"));
                 final String valueID = element.getAttributeValue("id");
                 final int id = valueID == null || valueID.trim().length() == 0 ? tableArticle.getUndefinedID() : Integer.parseInt(valueID);
                 final Article art = new Article(cat, name, id);
                 art.setPriceWithTax(prix_unitaire_cents);
                 art.setCode(codeArt);
                 art.setPriceWithoutTax(prix_unitaire_cents_ht);
                 art.setIdTaxe(idTaxe);
                 art.setBarCode(codebarre);
                 art.setSalesUnit(salesUnit);
+                art.setDeclinaison(declinaison);
+                art.setDiscountPct(discount_pct);
+                art.setEcoTaxe(ecotaxe);
                 final TicketItem line = new TicketItem(art, qte);
                 t.items.add(line);
+            }
             // paiement
         } 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
+    // 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
+    // not the day of the present time. E.g. for work day beginning at 15:00, even
+    // at 3:00 the
     // receipt code should contain the previous day.
-    // The creationCal should only be set once the ticket is done (i.e. no further modifications
+    // The creationCal should only be set once the ticket is done (i.e. no further
+    // modifications
     // should be allowed)
     // create new ticket, i.e. null creationDate since it's not done
     public Ticket(final int caisse, final int number, final String previousHash) {
         this(new ReceiptCode(caisse, Calendar.getInstance(), number), null, previousHash);
         for (final TicketItem item : this.items) {
             final Element e = new Element("article");
             e.setAttribute("qte", String.valueOf(item.getQty()));
             // Prix unitaire
             final Article article = item.getArticle();
-            e.setAttribute("prix", String.valueOf(article.getPriceWithTax()));
+            e.setAttribute("prix", String.valueOf(article.getPriceWithTax(item.getQty(), false)));
-            e.setAttribute("prixHT", String.valueOf(article.getPriceWithoutTax()));
+            e.setAttribute("prixHT", String.valueOf(article.getPriceWithoutTax(item.getQty(), false)));
             e.setAttribute("idTaxe", String.valueOf(article.getIdTaxe()));
             e.setAttribute("categorie", article.getCategorie().getName());
             e.setAttribute("codebarre", article.getBarCode());
             e.setAttribute("code", article.getCode());
             e.setAttribute("id", String.valueOf(article.getId()));
+            e.setAttribute("ecotaxe", String.valueOf(article.getEcoTaxe()));
+            e.setAttribute("discount_pct", String.valueOf(article.getDiscountPct()));
             if (article.getSalesUnit() != null) {
                 e.setAttribute("unit", article.getSalesUnit());
+            }
+            if (article.getDeclinaison() != null) {
+                e.setAttribute("declinaison", article.getDeclinaison());
+            }
             e.setText(article.getName());
             topLevel.addContent(e);
+        }
         // Paiements
         for (final Paiement paiement : this.paiements) {
+                }
+            }
             final BigDecimal nb = item.getQty();
             final Float tauxFromId = TaxeCache.getCache().getTauxFromId(article.getIdTaxe());
             final BigDecimal tauxTVA = BigDecimal.valueOf(tauxFromId).movePointLeft(2).add(BigDecimal.ONE);
-            final BigDecimal unitPrice = article.getPriceWithoutTax().multiply(tauxTVA, DecimalUtils.HIGH_PRECISION);
+            final BigDecimal unitPrice = article.getPriceWithoutTax(nb, false).multiply(tauxTVA, DecimalUtils.HIGH_PRECISION);
-            final BigDecimal multiply = article.getPriceWithoutTax().multiply(nb, DecimalUtils.HIGH_PRECISION).multiply(tauxTVA, DecimalUtils.HIGH_PRECISION);
+            final BigDecimal multiply = article.getPriceWithoutTax(nb, false).multiply(nb, DecimalUtils.HIGH_PRECISION).multiply(tauxTVA, DecimalUtils.HIGH_PRECISION);
             String qtyString = DefaultTicketPrinter.formatRight(MAX_QTE_WIDTH, String.valueOf(nb));
             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 = "";
             } 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.getDeclinaison() != null) {
+                prt.addToBuffer("      " + article.getDeclinaison());
+            }
             if (article.getSalesUnit() != null) {
                 prt.addToBuffer(
                         "      (" + nb.abs() + " " + article.getSalesUnit() + " x " + TicketCellRenderer.centsToString(unitPrice.movePointRight(2).setScale(0, RoundingMode.HALF_UP).intValue()) + ")");
+            }
+            if (article.getEcoTaxe().compareTo(BigDecimal.ZERO) != 0) {
+                final String nameString = "       * dont eco-part.:";
+                BigDecimal eco = article.getEcoTaxe().movePointRight(2).setScale(0, RoundingMode.HALF_UP);
+                final String ecoString = DefaultTicketPrinter.formatRight(MAX_PRICE_WIDTH, TicketCellRenderer.centsToString(eco.intValue()));
+                prt.addToBuffer(nameString + ecoString);
+            }
+            if (article.getDiscountPct().compareTo(BigDecimal.ZERO) != 0) {
+                final String nameString = DefaultTicketPrinter.formatLeft(maxWidth - 2 - MAX_PRICE_WIDTH - 1, " * Remise");
+                BigDecimal discount = multiply.movePointRight(2).multiply(article.getDiscountPct()).negate().setScale(0, RoundingMode.HALF_UP);
+                final String discountString = DefaultTicketPrinter.formatRight(MAX_PRICE_WIDTH, TicketCellRenderer.centsToString(discount.intValue()));
+                prt.addToBuffer(" " + nameString + " " + " " + discountString);
+            }
+        }
         final StringBuilder spacer = new StringBuilder();
         for (int i = 0; i <= MAX_QTE_WIDTH; i++) {
             spacer.append(' ');
+    }
     public void incrementArticle(final Article a) {
         System.err.println("Ticket.incrementArticle()" + a.getName());
+        TicketItem ticketLine;
         boolean alreadyExist = false;
         if (a.getSalesUnit() == null) {
             for (final TicketItem line : this.items) {
                 if (line.getArticle().equals(a)) {
                     alreadyExist = true;
+                    ticketLine = line;
-                    line.setQty(line.getQty().add(BigDecimal.ONE));
+                    ticketLine.setQty(line.getQty().add(BigDecimal.ONE));
                     break;
+                }
+            }
+        }
         if (!alreadyExist) {
-            final TicketItem line = new TicketItem(a, BigDecimal.ONE);
+            ticketLine = new TicketItem(a, BigDecimal.ONE);
-            this.items.add(line);
+            this.items.add(ticketLine);
+        }
+    }
     public void addItem(TicketItem item) {
         this.items.add(item);
+    }
         final TotalCalculator calc = new TotalCalculator("T_PA_HT", "T_PV_HT", null, null);
         final String val = DefaultNXProps.getInstance().getStringProperty("ArticleService");
         final Boolean bServiceActive = Boolean.valueOf(val);
         calc.setServiceActive(bServiceActive != null && bServiceActive);
         final int size = this.items.size();
+        Set<Integer> ids = new HashSet<>();
+        ArticleCache cache = ArticleCache.getInstance();
+        for (int i = 0; i < size; i++) {
+            final TicketItem line = this.items.get(i);
+            final Article art = line.getArticle();
+            int id = art.getId();
+            if (!cache.isInCache(id)) {
+                ids.add(id);
+            }
+        }
+        if (!ids.isEmpty()) {
+            cache.preloadCacheArticleMap(new ArrayList<>(ids));
+        }
         for (int i = 0; i < size; i++) {
             final TicketItem line = this.items.get(i);
             final BigDecimal count = line.getQty();
             final Article art = line.getArticle();
             final SQLRowValues rowVals = new SQLRowValues(tableElt);
-            rowVals.put("T_PV_HT", art.getPriceWithoutTax().multiply(count));
+            rowVals.put("T_PV_HT", art.getPriceWithoutTax(count, true).multiply(count));
             if (art.getSalesUnit() != null) {
                 rowVals.put("QTE_UNITAIRE", count);
                 rowVals.put("QTE", BigDecimal.ONE);
             } else {
                 rowVals.put("QTE", count.intValue());
+            }
             rowVals.put("ID_TAXE", art.getIdTaxe());
+            System.out.println("Ticket.getTotalCalculator()" + rowVals);
-            calc.addLine(rowVals, CaissePanel.getArticleRowValuesFromCache(art.getId()), i, false);
+            calc.addLine(rowVals, cache.getArticleRowValuesFromCache(art.getId()), i, false);
+        }
         calc.checkResult();
         return calc;
+    }

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 @ 174 - Rev 174 → 182