diff --git a/src/main/java/id/amigogroup/posterminal/bayar/DialogSelesaiBayarTidakLunasController.java b/src/main/java/id/amigogroup/posterminal/bayar/DialogSelesaiBayarTidakLunasController.java index 17002f4..805d3a0 100644 --- a/src/main/java/id/amigogroup/posterminal/bayar/DialogSelesaiBayarTidakLunasController.java +++ b/src/main/java/id/amigogroup/posterminal/bayar/DialogSelesaiBayarTidakLunasController.java @@ -179,6 +179,8 @@ public class DialogSelesaiBayarTidakLunasController extends Dialog implements In loader.setLocation(getClass().getResource("/fxml/FormBayarKartu.fxml")); node = loader.load(); + FormBayarKartuController fbkc = loader.getController(); + fbkc.initData(this); vbContent.getChildren().add(node); bayarContent.setNodeKartu(node); } else { diff --git a/src/main/java/id/amigogroup/posterminal/pencarian/DialogCetakNotaController.java b/src/main/java/id/amigogroup/posterminal/pencarian/DialogCetakNotaController.java index e58a496..0c7aeb6 100644 --- a/src/main/java/id/amigogroup/posterminal/pencarian/DialogCetakNotaController.java +++ b/src/main/java/id/amigogroup/posterminal/pencarian/DialogCetakNotaController.java @@ -21,6 +21,7 @@ import javafx.fxml.FXML; import javafx.fxml.FXMLLoader; import javafx.fxml.Initializable; import javafx.scene.Parent; +import javafx.scene.control.Button; import javafx.scene.control.ButtonBar.ButtonData; import javafx.scene.control.ButtonType; import javafx.scene.control.Dialog; @@ -152,6 +153,8 @@ public class DialogCetakNotaController extends Dialog implements Initial @FXML private GridPane gpUang; @FXML + private Label lblDebit; + @FXML private Label lblKembalian; @FXML private Label lblTotal; @@ -162,10 +165,12 @@ public class DialogCetakNotaController extends Dialog implements Initial public final ObservableList daftarTabelTunai = FXCollections.observableArrayList(); public final ObservableList daftarTabelRetur = FXCollections.observableArrayList(); + + public static final ButtonType btnPrint = new ButtonType("Print", ButtonData.YES); + public static final ButtonType btnTutup = new ButtonType("Tutup", ButtonData.CANCEL_CLOSE); @Override public void initialize(URL url, ResourceBundle rb) { - getDialogPane().getButtonTypes().add(new ButtonType("Tutup", ButtonData.CANCEL_CLOSE)); //Tunai tcNoTunai.setCellValueFactory((TableColumn.CellDataFeatures cell) -> { return new ReadOnlyObjectWrapper(tbvTunai.getItems().indexOf(cell.getValue()) + 1); @@ -208,6 +213,14 @@ public class DialogCetakNotaController extends Dialog implements Initial loader.setController(this); Parent root = loader.load(); getDialogPane().setContent(root); + + getDialogPane().getButtonTypes().add(btnTutup); + getDialogPane().getButtonTypes().add(btnPrint); + + Button btnPrints = (Button) getDialogPane().lookupButton(btnPrint); + btnPrints.setDefaultButton(true); + //Fungsi Print disini + setTitle("Cetak Nota"); } catch (IOException e) { Logger.getLogger(DialogCetakNotaController.class @@ -245,13 +258,14 @@ public class DialogCetakNotaController extends Dialog implements Initial vbCetakNota.getChildren().remove(tpRetur); } - //Menampilkan total, tunai dan kembalian + //Menampilkan total, tunai, debit 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())); + lblDebit.setText(Fucout.formatRibuan(parent.getBayarContent().getBayarKartu())); if (parent.getBayarContent().getTotalPerluBayar() < parent.getBayarContent().getTotalBayar()) { int kembali = parent.getBayarContent().getTotalBayar() diff --git a/src/main/resources/fxml/DialogCetakNota.fxml b/src/main/resources/fxml/DialogCetakNota.fxml index 171bbc9..856afb2 100644 --- a/src/main/resources/fxml/DialogCetakNota.fxml +++ b/src/main/resources/fxml/DialogCetakNota.fxml @@ -124,18 +124,22 @@ +