diff --git a/src/puntocassa/PuntoCassa.java b/src/puntocassa/PuntoCassa.java index 23f8193..8112857 100644 --- a/src/puntocassa/PuntoCassa.java +++ b/src/puntocassa/PuntoCassa.java @@ -1846,33 +1846,7 @@ public class PuntoCassa extends JFrame implements ActionListener { } } //fine 21-12-18<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< - - //stessa procedura in Cercates - //prendo l'ultimo valore della griglia -// if (model.getRowCount() > 0) {// -// -// Double totAcquisto = 0.0; -// try { -// -// if (txtTotaleCassa.getText().length() > 0) { -// String saldo = txtTotaleCassa.getText().replace("? ", "").replace(".", ""); -// saldo = saldo.replace(",", "."); -// totAcquisto = Double.valueOf(saldo); -// } -// } catch (Exception ex) { -// LogManager.getLogger(PuntoCassa.class).error(ex); -// } -// //DecimalFormat df2 = new DecimalFormat("##0.00"); -// //String prezzoDisplay = ("E " + df2.format(totAcquisto)); -// /*String fa = "FASCIA " + lblFascia.getText().replaceAll("Fascia", "").trim(); -// if (fa.length() >= 10) { -// fa = fa.substring(fa.length() - 10, fa.length()); -// } else { -// fa = spaziBianchi(fa, 10, true); -// }*/ -// -// //String uProd = spaziBianchi("Totale ", 20, true); -// } + rs.close(); st.close(); dbConnection.close(); @@ -4092,6 +4066,8 @@ public class PuntoCassa extends JFrame implements ActionListener { scadenzaTessera = c.getTime(); if (scadenzaTessera.after(now) && idStato != 2) { + + MyTableModel model = (MyTableModel) tblLista.getModel(); String modoPagamento = cercaTestoModoPagamento(); lblCategoria.setText(dati[0]); @@ -4134,9 +4110,13 @@ public class PuntoCassa extends JFrame implements ActionListener { } lblScadTessera.setText("" + bonusResidui); - + + controllaCompleti(model); + controllaExtra(model); + sommaColonne(model); stoCalcolando = true; + //comprende la verifica del saldo pulsantiModoPagamento(); stoCalcolando = false; @@ -4162,14 +4142,12 @@ public class PuntoCassa extends JFrame implements ActionListener { jBtnAsportoActionPerformed(null); } - MyTableModel model = (MyTableModel) tblLista.getModel(); + if (flagPrecaricaLista) { forzaPrezzi(model); } - controllaCompleti(model); - controllaExtra(model); - sommaColonne(model); + if (abilitatoPassaggi != 0L) { controllaPrenotazioni(); @@ -4296,9 +4274,7 @@ public class PuntoCassa extends JFrame implements ActionListener { try { MyTableModel model = (MyTableModel) tblLista.getModel(); - MyTableModel model1 = (MyTableModel) tblLista1.getModel(); - /*clearTable(model); - clearTable(model1);*/ + MyTableModel model1 = (MyTableModel) tblLista1.getModel(); model.clearTable(); model1.clearTable(); sommaColonne(model);