diff --git a/src/main/java/id/amigogroup/posterminal/bayar/FormBayarController.java b/src/main/java/id/amigogroup/posterminal/bayar/FormBayarController.java index 249d136..83629fd 100644 --- a/src/main/java/id/amigogroup/posterminal/bayar/FormBayarController.java +++ b/src/main/java/id/amigogroup/posterminal/bayar/FormBayarController.java @@ -127,7 +127,8 @@ public class FormBayarController implements Initializable, BayarInterface { parent.notaContent.getControllerTunai() != null ? parent.notaContent.getControllerTunai().daftarTabelTransaksi : null, parent.notaContent.getControllerRetur() != null ? - parent.notaContent.getControllerRetur().daftarTabelRetur : null); + parent.notaContent.getControllerRetur().daftarTabelRetur : null, + this); Optional result = dialogCetakNotaController.showAndWait(); } } else { diff --git a/src/main/java/id/amigogroup/posterminal/pencarian/DialogCetakNotaController.java b/src/main/java/id/amigogroup/posterminal/pencarian/DialogCetakNotaController.java index 34dc6c0..e58a496 100644 --- a/src/main/java/id/amigogroup/posterminal/pencarian/DialogCetakNotaController.java +++ b/src/main/java/id/amigogroup/posterminal/pencarian/DialogCetakNotaController.java @@ -5,6 +5,7 @@ */ package id.amigogroup.posterminal.pencarian; +import id.amigogroup.posterminal.bayar.BayarInterface; import id.amigogroup.posterminal.transaksi.TabelBarangRetur; import id.amigogroup.posterminal.transaksi.TabelBarangTunai; import id.amigogroup.posterminal.util.Fucout; @@ -23,12 +24,14 @@ import javafx.scene.Parent; import javafx.scene.control.ButtonBar.ButtonData; import javafx.scene.control.ButtonType; import javafx.scene.control.Dialog; +import javafx.scene.control.Label; import javafx.scene.control.ScrollPane; import javafx.scene.control.TableColumn; import javafx.scene.control.TableView; import javafx.scene.control.TitledPane; import javafx.scene.control.cell.PropertyValueFactory; import javafx.scene.layout.AnchorPane; +import javafx.scene.layout.GridPane; import javafx.scene.layout.VBox; import javafx.stage.Window; @@ -146,6 +149,16 @@ public class DialogCetakNotaController extends Dialog implements Initial private TableColumn tcSubTotalRetur; @FXML private TableColumn tcPramuniagaRetur; + @FXML + private GridPane gpUang; + @FXML + private Label lblKembalian; + @FXML + private Label lblTotal; + @FXML + private Label lblTunai; + + private BayarInterface parent; public final ObservableList daftarTabelTunai = FXCollections.observableArrayList(); public final ObservableList daftarTabelRetur = FXCollections.observableArrayList(); @@ -204,6 +217,12 @@ public class DialogCetakNotaController extends Dialog implements Initial public void initData(ObservableList daftarTabelTransaksiTunai, ObservableList daftarTabelTransaksiRetur) { + initData(daftarTabelTransaksiTunai, daftarTabelTransaksiRetur, null); + } + + public void initData(ObservableList daftarTabelTransaksiTunai, + ObservableList daftarTabelTransaksiRetur, + BayarInterface parent) { if (daftarTabelTransaksiTunai != null && !daftarTabelTransaksiTunai.isEmpty()) { for (TabelBarangTunai tbt : daftarTabelTransaksiTunai) { daftarTabelTunai.add(new TabelBarangTunai(tbt.getKode(), tbt.getNama(), tbt.getUkur(), @@ -215,6 +234,7 @@ public class DialogCetakNotaController extends Dialog implements Initial } vbCetakNota.getChildren().remove(tpBon); vbCetakNota.getChildren().remove(tpBawa); + if (daftarTabelTransaksiRetur != null && !daftarTabelTransaksiRetur.isEmpty()) { for (TabelBarangRetur tbr : daftarTabelTransaksiRetur) { daftarTabelRetur.add(new TabelBarangRetur(tbr.getKode(), tbr.getNama(), tbr.getUkur(), @@ -224,5 +244,25 @@ public class DialogCetakNotaController extends Dialog implements Initial } else { vbCetakNota.getChildren().remove(tpRetur); } + + //Menampilkan total, tunai dan kembalian + if (parent != null) { + this.parent = parent; + int bayar = 0; + if (parent != null && parent.getBayarContent() != null) { + lblTotal.setText(Fucout.formatRibuan(parent.getBayarContent().getTotalPerluBayar())); + lblTunai.setText(Fucout.formatRibuan(parent.getBayarContent().getBayarTunai())); + if (parent.getBayarContent().getTotalPerluBayar() + < parent.getBayarContent().getTotalBayar()) { + int kembali = parent.getBayarContent().getTotalBayar() + - parent.getBayarContent().getTotalPerluBayar(); + lblKembalian.setText(Fucout.getText(Fucout.formatRibuan(kembali))); + } else { + lblKembalian.setText("-"); + } + } + } else { + vbCetakNota.getChildren().remove(gpUang); + } } } diff --git a/src/main/resources/fxml/DialogCetakNota.fxml b/src/main/resources/fxml/DialogCetakNota.fxml index a2bb0a8..171bbc9 100644 --- a/src/main/resources/fxml/DialogCetakNota.fxml +++ b/src/main/resources/fxml/DialogCetakNota.fxml @@ -1,13 +1,17 @@ + + + + - + @@ -111,6 +115,29 @@ + + + + + + + + + + + + + +