From 5c0b63348ef2f073a920e4bdbea640a258ed77af Mon Sep 17 00:00:00 2001 From: Josua Pascario Date: Fri, 13 Mar 2020 15:11:46 +0700 Subject: [PATCH] Bug fixed Cetak Nota --- .../posterminal/FormUtamaController.java | 7 +++-- .../pencarian/DialogCetakNotaController.java | 30 ++++++++++++++++--- .../transaksi/TabelBarangRetur.java | 30 ++++++++++++++++++- .../transaksi/TabelBarangTunai.java | 30 +++++++++++++++++++ 4 files changed, 89 insertions(+), 8 deletions(-) diff --git a/src/main/java/id/amigogroup/posterminal/FormUtamaController.java b/src/main/java/id/amigogroup/posterminal/FormUtamaController.java index e3071e2..5fa984a 100644 --- a/src/main/java/id/amigogroup/posterminal/FormUtamaController.java +++ b/src/main/java/id/amigogroup/posterminal/FormUtamaController.java @@ -231,8 +231,9 @@ public class FormUtamaController implements Initializable { private void openCetakNota() { DialogCetakNotaController dialogCetakNotaController = new DialogCetakNotaController(); dialogCetakNotaController.initOwner(bpMain.getScene().getWindow()); - dialogCetakNotaController.initData(notaContent.controllerTunai.daftarTabelTransaksi, - notaContent.controllerRetur.daftarTabelRetur); + dialogCetakNotaController.initData( + notaContent.controllerTunai != null ? notaContent.controllerTunai.daftarTabelTransaksi : null, + notaContent.controllerRetur != null ? notaContent.controllerRetur.daftarTabelRetur : null); Optional result = dialogCetakNotaController.showAndWait(); } @@ -483,7 +484,7 @@ public class FormUtamaController implements Initializable { notaContent.setBtnTunai(buttonBaru); break; } - + if (buttonBaru != null) { navigasi.add(buttonBaru); vbNavigasi.getChildren().add(buttonBaru); diff --git a/src/main/java/id/amigogroup/posterminal/pencarian/DialogCetakNotaController.java b/src/main/java/id/amigogroup/posterminal/pencarian/DialogCetakNotaController.java index d33bda8..b04220b 100644 --- a/src/main/java/id/amigogroup/posterminal/pencarian/DialogCetakNotaController.java +++ b/src/main/java/id/amigogroup/posterminal/pencarian/DialogCetakNotaController.java @@ -7,12 +7,14 @@ package id.amigogroup.posterminal.pencarian; import id.amigogroup.posterminal.transaksi.TabelBarangRetur; import id.amigogroup.posterminal.transaksi.TabelBarangTunai; +import id.amigogroup.posterminal.util.Fucout; import java.io.IOException; import java.net.URL; import java.util.ResourceBundle; import java.util.logging.Level; import java.util.logging.Logger; import javafx.beans.property.ReadOnlyObjectWrapper; +import javafx.collections.FXCollections; import javafx.collections.ObservableList; import javafx.fxml.FXML; import javafx.fxml.FXMLLoader; @@ -20,10 +22,12 @@ import javafx.fxml.Initializable; import javafx.scene.Parent; import javafx.scene.control.ButtonBar.ButtonData; import javafx.scene.control.ButtonType; +import javafx.scene.control.ComboBox; import javafx.scene.control.Dialog; import javafx.scene.control.ScrollPane; import javafx.scene.control.TableColumn; import javafx.scene.control.TableView; +import javafx.scene.control.TextField; import javafx.scene.control.TitledPane; import javafx.scene.control.cell.PropertyValueFactory; import javafx.scene.layout.AnchorPane; @@ -145,6 +149,9 @@ public class DialogCetakNotaController extends Dialog implements Initial @FXML private TableColumn tcPramuniagaRetur; + public final ObservableList daftarTabelTunai = FXCollections.observableArrayList(); + public final ObservableList daftarTabelRetur = FXCollections.observableArrayList(); + @Override public void initialize(URL url, ResourceBundle rb) { getDialogPane().getButtonTypes().add(new ButtonType("Tutup", ButtonData.CANCEL_CLOSE)); @@ -160,7 +167,9 @@ public class DialogCetakNotaController extends Dialog implements Initial tcDisc1Tunai.setCellValueFactory(new PropertyValueFactory<>("disc1")); tcDisc2Tunai.setCellValueFactory(new PropertyValueFactory<>("disc2")); tcSubTotalTunai.setCellValueFactory(new PropertyValueFactory<>("subTotal")); - tcPramuniagaTunai.setCellValueFactory(new PropertyValueFactory<>("fldPramuniaga")); + tcPramuniagaTunai.setCellValueFactory(new PropertyValueFactory<>("pramuniaga")); + + tbvTunai.setItems(daftarTabelTunai); //Bawa //Bon //Retur @@ -175,7 +184,8 @@ public class DialogCetakNotaController extends Dialog implements Initial tcDisc1Retur.setCellValueFactory(new PropertyValueFactory<>("disc1")); tcDisc2Retur.setCellValueFactory(new PropertyValueFactory<>("disc2")); tcSubTotalRetur.setCellValueFactory(new PropertyValueFactory<>("subTotal")); - tcPramuniagaRetur.setCellValueFactory(new PropertyValueFactory<>("fldPramuniaga")); + tcPramuniagaRetur.setCellValueFactory(new PropertyValueFactory<>("pramuniaga")); + tbvRetur.setItems(daftarTabelRetur); } public DialogCetakNotaController() { @@ -196,7 +206,19 @@ public class DialogCetakNotaController extends Dialog implements Initial public void initData(ObservableList daftarTabelTransaksiTunai, ObservableList daftarTabelTransaksiRetur) { - tbvTunai.setItems(daftarTabelTransaksiTunai); - tbvRetur.setItems(daftarTabelTransaksiRetur); + if (daftarTabelTransaksiTunai != null) { + for (TabelBarangTunai tbt : daftarTabelTransaksiTunai) { + daftarTabelTunai.add(new TabelBarangTunai(tbt.getKode(), tbt.getNama(), tbt.getUkur(), + tbt.getJumlah(), tbt.getHarga(), tbt.getDisc1(), tbt.getDisc2(), null, + tbt.getSubTotal(), Fucout.getText(tbt.getFldPramuniaga().getText()), null)); + } + } + if (daftarTabelTransaksiRetur != null) { + for (TabelBarangRetur tbr : daftarTabelTransaksiRetur) { + daftarTabelRetur.add(new TabelBarangRetur(tbr.getKode(), tbr.getNama(), tbr.getUkur(), + tbr.getJumlah(), tbr.getHarga(), tbr.getDisc1(), tbr.getDisc2(), tbr.getSubTotal(), + Fucout.getText(tbr.getFldPramuniaga().getText()))); + } + } } } diff --git a/src/main/java/id/amigogroup/posterminal/transaksi/TabelBarangRetur.java b/src/main/java/id/amigogroup/posterminal/transaksi/TabelBarangRetur.java index ad8e5c9..9608cc1 100644 --- a/src/main/java/id/amigogroup/posterminal/transaksi/TabelBarangRetur.java +++ b/src/main/java/id/amigogroup/posterminal/transaksi/TabelBarangRetur.java @@ -25,7 +25,8 @@ public class TabelBarangRetur { private SimpleStringProperty disc2; private SimpleStringProperty subTotal; private SimpleObjectProperty fldPramuniaga; - + private SimpleStringProperty pramuniaga; + private DNotaRetur data; public TabelBarangRetur(String kode, String nama, String ukur, String jumlah, String harga, String disc1, @@ -41,6 +42,19 @@ public class TabelBarangRetur { this.fldPramuniaga = new SimpleObjectProperty(fldPramuniaga); } + public TabelBarangRetur(String kode, String nama, String ukur, String jumlah, String harga, String disc1, + String disc2, String subTotal, String pramuniaga) { + this.kode = new SimpleStringProperty(kode); + this.nama = new SimpleStringProperty(nama); + this.ukur = new SimpleStringProperty(ukur); + this.jumlah = new SimpleStringProperty(jumlah); + this.harga = new SimpleStringProperty(harga); + this.disc1 = new SimpleStringProperty(disc1); + this.disc2 = new SimpleStringProperty(disc2); + this.subTotal = new SimpleStringProperty(subTotal); + this.pramuniaga = new SimpleStringProperty(pramuniaga); + } + /** * @return the kode */ @@ -167,6 +181,20 @@ public class TabelBarangRetur { this.fldPramuniaga.set(fldPramuniaga); } + /** + * @return the pramuniaga + */ + public String getPramuniaga() { + return pramuniaga.get(); + } + + /** + * @param pramuniaga the pramuniaga to set + */ + public void setPramuniaga(String pramuniaga) { + this.pramuniaga.set(pramuniaga); + } + /** * @return the data */ diff --git a/src/main/java/id/amigogroup/posterminal/transaksi/TabelBarangTunai.java b/src/main/java/id/amigogroup/posterminal/transaksi/TabelBarangTunai.java index f6bd925..c1c315f 100644 --- a/src/main/java/id/amigogroup/posterminal/transaksi/TabelBarangTunai.java +++ b/src/main/java/id/amigogroup/posterminal/transaksi/TabelBarangTunai.java @@ -28,6 +28,7 @@ public class TabelBarangTunai { private SimpleObjectProperty cbxPromo; private SimpleStringProperty subTotal; private SimpleObjectProperty fldPramuniaga; + private SimpleStringProperty pramuniaga; private DNotaTunai data; private SimpleObjectProperty