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

 import org.openconcerto.erp.core.sales.pos.model.RegisterFiles;
 import org.openconcerto.erp.core.sales.pos.model.RegisterLog;
 import org.openconcerto.erp.core.sales.pos.model.RegisterLogEntry.ReceiptEntry;
 import org.openconcerto.erp.core.sales.pos.model.RegisterState.Status;
 import org.openconcerto.erp.core.sales.pos.model.Ticket;
+import org.openconcerto.erp.core.sales.pos.model.TicketItem;
 import org.openconcerto.erp.preferences.TemplateNXProps;
 import org.openconcerto.sql.element.SQLElementDirectory;
 import org.openconcerto.utils.FileUtils;
-import org.openconcerto.utils.Pair;
 import org.openconcerto.utils.StringUtils;
 import java.awt.event.KeyEvent;
 import java.io.File;
 import java.io.FileOutputStream;
     private Article articleSelected;
     private Paiement paiementSelected;
     private Ticket t;
     private Client client = Client.NONE;
-    private List<CaisseListener> listeners = new ArrayList<CaisseListener>();
+    private List<CaisseListener> listeners = new ArrayList<>();
     private final BarcodeReader r;
     private Paiement p1 = new Paiement(Paiement.ESPECES);
     private Paiement p2 = new Paiement(Paiement.CB);
     private Paiement p3 = new Paiement(Paiement.CHEQUE);
     private final CaisseFrame caisseFrame;
     private final POSDisplay lcd;
+    private TicketItem ticketItemSelected;
     public CaisseControler(CaisseFrame caisseFrame) throws ParseException, JDOMException, IOException {
         this.caisseFrame = caisseFrame;
         final RegisterLog lastLog = caisseFrame.getFiles().getLastLog();
         if (lastLog == null || lastLog.getRegisterState().getStatus() != Status.OPEN)
         final int scanDelay = posConf.getScanDelay();
         this.r = new BarcodeReader(scanDelay);
         this.r.start();
         this.r.addBarcodeListener(this);
         if (posConf.getLCDType().equals("serial")) {
-            lcd = new ESCSerialDisplay(posConf.getLCDPort());
+            this.lcd = new ESCSerialDisplay(posConf.getLCDPort());
         } else {
-            lcd = new PrinterPOSDisplay(posConf.getLCDPort());
+            this.lcd = new PrinterPOSDisplay(posConf.getLCDPort());
+        }
         this.setLCDDefaultDisplay(0);
+    }
     public final CaisseFrame getCaisseFrame() {
     public Paiement getPaiementSelected() {
         return this.paiementSelected;
+    }
     void setArticleSelected(Article a) {
-        if (a != articleSelected) {
+        if (a != this.articleSelected) {
             this.articleSelected = a;
             this.paiementSelected = null;
             fire();
+        }
+    }
     void setPaiementSelected(Paiement p) {
         this.paiementSelected = p;
         this.articleSelected = null;
+        this.ticketItemSelected = null;
         fire();
+    }
     // Listeners
     private void fire() {
     public boolean isClientDefined() {
         return this.client != Client.NONE;
+    }
     public Client getClient() {
-        return client;
+        return this.client;
+    }
+    public void setCodePostal(String codePostal) {
+        this.t.setCodePostal(codePostal);
+    }
     // Articles
     public void addArticle(Article a) {
         this.t.addArticle(a);
         return this.t.getPaidTotal();
+    }
     //
-    public List<Pair<Article, Integer>> getItems() {
+    public List<TicketItem> getItems() {
-        return this.t.getArticles();
+        return this.t.getItems();
+    }
-    public int getItemCount(Article article) {
+    public BigDecimal getItemCount(Article article) {
         return this.t.getItemCount(article);
+    }
     public void clearArticle(Article article) {
         this.t.clearArticle(article);
-        this.setArticleSelected(null);
+        this.setTicketItemSelected(null);
+    }
-    public void setArticleCount(Article article, int count) {
+    public void setArticleCount(Article article, BigDecimal count) {
         this.t.setArticleCount(article, count);
         this.setArticleSelected(null);
+    }
     @Override
             autoFillPaiement(this.p3);
         } else if (code.equalsIgnoreCase("annuler")) {
             if (this.articleSelected != null) {
                 this.clearArticle(this.articleSelected);
-            } else {
-                if (this.paiementSelected != null) {
+            } else if (this.paiementSelected != null) {
-                    this.paiementSelected.setMontantInCents(0);
+                this.paiementSelected.setMontantInCents(0);
-                    // setPaiementSelected(null);
-                    fire();
+                fire();
-                }
+            }
         } else if (code.equalsIgnoreCase("valider")) {
         } else if (code.equalsIgnoreCase("facture")) {
             } else {
                 System.err.println("CaisseControler.barcodeRead() barcode : " + code + " : no product found");
                 Ticket t = Ticket.getTicketFromCode(code, this.caisseFrame.getFiles());
                 if (t != null) {
                     System.err.println("CaisseControler.barcodeRead() barcode : " + code + " : receipt found :" + t.getNumber());
-                    caisseFrame.showTickets(t);
+                    this.caisseFrame.showTickets(t);
+                }
+            }
+        }
+    }
         return true;
+    }
     @Override
     public void keyReceived(KeyEvent ee) {
+        // nothing
+    }
     public static String getCents(int cents) {
         String s = String.valueOf(Math.abs(cents) % 100);
         if (s.length() < 2) {
+        }
         return s;
+    }
     public static String getEuros(int cents) {
-        String s = String.valueOf(cents / 100);
+        return String.valueOf(cents / 100);
-        return s;
+    }
     public Ticket saveAndClearTicket(final RegisterFiles files, final SQLElementDirectory dir) throws IOException, SQLException {
         if (!this.isTicketValid())
             return null;
         this.t.setCreationCal(Calendar.getInstance());
         final String fileHash = this.t.save(files, dir);
         final Ticket res = this.t;
         final int newIndex = this.t.getNumber() + 1;
-        t = new Ticket(getPOSConf().getPosID(), newIndex, fileHash);
+        this.t = new Ticket(getPOSConf().getPosID(), newIndex, fileHash);
-        p1 = new Paiement(Paiement.ESPECES);
+        this.p1 = new Paiement(Paiement.ESPECES);
-        p2 = new Paiement(Paiement.CB);
+        this.p2 = new Paiement(Paiement.CB);
-        p3 = new Paiement(Paiement.CHEQUE);
+        this.p3 = new Paiement(Paiement.CHEQUE);
         this.t.addPaiement(this.p1);
         this.t.addPaiement(this.p2);
         this.t.addPaiement(this.p3);
         this.setPaiementSelected(null);
         this.setArticleSelected(null);
-        client = Client.NONE;
+        this.client = Client.NONE;
         return res;
+    }
     public int getTicketNumber() {
         return this.t.getNumber();
+        }
+    }
     public void switchListMode() {
-        caisseFrame.mainPanel.switchListMode();
+        this.caisseFrame.mainPanel.switchListMode();
+    }
     public void setLCD(final String line1, final String line2, final int delay) {
         final TimerTask task = new TimerTask() {
             @Override
             public void run() {
                 try {
-                    lcd.setMessage(line1, line2);
+                    CaisseControler.this.lcd.setMessage(line1, line2);
                 } catch (Exception e) {
                     e.printStackTrace();
+                }
+            }
         };
         final Timer timer = new Timer("LCD : " + line1, true);
-        timer.schedule(task, delay * 1000);
+        timer.schedule(task, delay * 1000L);
+    }
     public void setLCDDefaultDisplay(int delay) {
-        if (t.getTotalInCents() > 0) {
+        if (this.t.getTotalInCents() > 0) {
             int count = 0;
-            final List<Pair<Article, Integer>> articles = t.getArticles();
+            final List<TicketItem> articles = this.t.getItems();
-            for (Pair<Article, Integer> pair : articles) {
+            for (TicketItem pair : articles) {
+                Article a = pair.getArticle();
+                if (a.getSalesUnit() == null) {
-                count += pair.getSecond();
+                    count += pair.getQty().intValue();
+                } else {
+                    count++;
+                }
+            }
             String line1;
             if (count == 1) {
                 line1 = "1 article";
             } else {
                 line1 = count + " articles";
+            }
-            int cents = t.getTotalInCents();
+            int cents = this.t.getTotalInCents();
             setLCD(line1, "Total : " + TicketCellRenderer.centsToString(cents), delay);
         } else {
             setLCD(getPOSConf().getLCDLine1(), getPOSConf().getLCDLine2(), delay);
+        }
+    }
     public void sendCBRequest(final Paiement p) {
         final String creditCardPort = getPOSConf().getCreditCardPort();
         if (creditCardPort != null && creditCardPort.trim().length() > 2) {
-            final Thread t = new Thread(new Runnable() {
+            final Thread thread = new Thread(new Runnable() {
                 @Override
                 public void run() {
                     try {
                         ConcertProtocol cp = new ConcertProtocol(creditCardPort);
                     } catch (Throwable ex) {
                         JOptionPane.showMessageDialog(null, "Erreur terminal CB");
+                    }
+                }
             });
-            t.setDaemon(true);
+            thread.setDaemon(true);
-            t.start();
+            thread.start();
+        }
+    }
-    public void setArticleHT(Article article, BigDecimal ht) {
+    public void setArticleHT(TicketItem item, BigDecimal ht) {
-        Article existingArticle = null;
-        final List<Pair<Article, Integer>> articles = t.getArticles();
+        final Article newArticle = new Article(item.getArticle());
-        for (Pair<Article, Integer> pair : articles) {
-            final Article a = pair.getFirst();
+        newArticle.updatePriceWithoutTax(ht);
-            if (a.getId() == article.getId()) {
-                if (article.getPriceWithoutTax().doubleValue() == a.getPriceWithoutTax().doubleValue()) {
-                    existingArticle = a;
-                    break;
-                }
-            }
-        }
-        if (existingArticle != null) {
+        item.setArticle(newArticle);
-            existingArticle.updatePriceWithoutTax(ht);
-            fire();
+        fire();
-        }
+    }
-    public void openPriceEditor(Article article) {
+    public void openPriceEditor(TicketItem item) {
-        caisseFrame.showPriceEditor(article, this);
+        this.caisseFrame.showPriceEditor(item, this);
+    }
     public void enableBarcodeReader() {
         this.r.setEnabled(true);
+    }
     public void disableBarcodeReader() {
         this.r.setEnabled(false);
+    }
     public boolean isTicketValid() {
-        return (!this.t.getArticles().isEmpty()) && ((this.getTotal() >= 0 && this.getPaidTotal() >= this.getTotal()) || (this.getTotal() < 0 && this.getPaidTotal() == this.getTotal()));
+        return (!this.t.getItems().isEmpty()) && ((this.getTotal() >= 0 && this.getPaidTotal() >= this.getTotal()) || (this.getTotal() < 0 && this.getPaidTotal() == this.getTotal()));
+    }
     public Set<Integer> loadFavoriteProductsIds() {
         final TemplateNXProps nxprops = (TemplateNXProps) TemplateNXProps.getInstance();
         final File f = new File(nxprops.getDefaultStringValue(), "favorites.txt");
         } catch (IOException e) {
             e.printStackTrace();
+        }
+    }
+    public void setTicketItemSelected(TicketItem item) {
+        this.ticketItemSelected = item;
+        if (item == null) {
+            this.articleSelected = null;
+        } else {
+            this.articleSelected = item.getArticle();
+            this.paiementSelected = null;
+        }
+        fire();
+    }
+    public TicketItem getTicketItemSelected() {
+        return this.ticketItemSelected;
+    }
+    public void removeTicketItem(TicketItem item) {
+        this.t.removeTicketItem(item);
+        this.setTicketItemSelected(null);
+    }
+    public void cancel(Ticket ticket) {
+        this.t.clear();
+        // Annulation du ticket
+        for (TicketItem a : ticket.getItems()) {
+            final Article article = a.getArticle();
+            TicketItem item = new TicketItem(article, a.getQty().multiply(new BigDecimal(-1)));
+            this.t.addItem(item);
+        }
+        for (Paiement p : ticket.getPaiements()) {
+            final Paiement paiement = new Paiement(p.getType());
+            paiement.setMontantInCents(-1 * p.getMontantInCents());
+            this.t.addPaiement(paiement);
+        }
+        this.caisseFrame.showCaisse();
+        fire();
+    }
+}

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/ui/CaisseControler.java - Rev 156 → 174