From f8cd835ea33c7cbf5ad3b72112843cacd0804ccf Mon Sep 17 00:00:00 2001 From: Josua Pascario Date: Tue, 31 Mar 2020 10:55:13 +0700 Subject: [PATCH] Sistem menampilkan pesan di form pembayaran jika jenis pilihan belum ada yang dipilih --- .../posterminal/FormUtamaController.java | 6 +-- .../bayar/FormBayarController.java | 44 +++++++++++++------ .../posterminal/util/AlertUtil.java | 1 + src/main/resources/fxml/FormUtama.fxml | 2 +- 4 files changed, 36 insertions(+), 17 deletions(-) diff --git a/src/main/java/id/amigogroup/posterminal/FormUtamaController.java b/src/main/java/id/amigogroup/posterminal/FormUtamaController.java index 9b1222e..56cceae 100644 --- a/src/main/java/id/amigogroup/posterminal/FormUtamaController.java +++ b/src/main/java/id/amigogroup/posterminal/FormUtamaController.java @@ -27,8 +27,6 @@ import java.util.List; import java.util.Map; import java.util.Optional; import java.util.ResourceBundle; -import java.util.Timer; -import java.util.TimerTask; import java.util.logging.Level; import java.util.logging.Logger; import javafx.animation.Animation; @@ -86,6 +84,8 @@ public class FormUtamaController implements Initializable { @FXML private TextField tfScanMember; @FXML + private Label lblJmlItem; + @FXML private Label lblTanggal; private final FormFactory formFactory = new FormFactory(); @@ -112,7 +112,7 @@ public class FormUtamaController implements Initializable { if (SystemValue.konversiPoin == null) { posRx.getNilaiKonversiPoin().subscribe(getNilaiKonversiPoin); } - + setTanggalJam(); initShorcuts(); } diff --git a/src/main/java/id/amigogroup/posterminal/bayar/FormBayarController.java b/src/main/java/id/amigogroup/posterminal/bayar/FormBayarController.java index f4a9c66..f3eb8f5 100644 --- a/src/main/java/id/amigogroup/posterminal/bayar/FormBayarController.java +++ b/src/main/java/id/amigogroup/posterminal/bayar/FormBayarController.java @@ -8,6 +8,7 @@ package id.amigogroup.posterminal.bayar; import id.amigogroup.posterminal.FormUtamaController; import id.amigogroup.posterminal.pencarian.DialogCetakNotaController; import id.amigogroup.posterminal.transaksi.TabelBarangRetur; +import id.amigogroup.posterminal.util.AlertUtil; import id.amigogroup.posterminal.util.Fucout; import java.io.IOException; import java.net.URL; @@ -25,6 +26,7 @@ import javafx.fxml.FXML; import javafx.fxml.FXMLLoader; import javafx.fxml.Initializable; import javafx.scene.Node; +import javafx.scene.control.Alert; import javafx.scene.control.CheckBox; import javafx.scene.control.Label; import javafx.scene.input.KeyCode; @@ -99,8 +101,8 @@ public class FormBayarController implements Initializable, BayarInterface { if (parent.notaContent.getControllerRetur() != null && parent.notaContent.getControllerRetur().tipeRetur.equals( Fucout.TEKS_TIPE_NOTA_TUNAI)) { - for(TabelBarangRetur tbr : parent.notaContent.getControllerRetur().daftarTabelRetur){ - switch(tbr.getData().getNoNotaTunai().charAt(0)){ + for (TabelBarangRetur tbr : parent.notaContent.getControllerRetur().daftarTabelRetur) { + switch (tbr.getData().getNoNotaTunai().charAt(0)) { case Fucout.KODE_NOTA_BON: break; default: @@ -125,21 +127,37 @@ public class FormBayarController implements Initializable, BayarInterface { DialogCetakNotaController dialogCetakNotaController = new DialogCetakNotaController(); dialogCetakNotaController.initOwner(apContent.getScene().getWindow()); dialogCetakNotaController.initData( - parent.notaContent.getControllerTunai() != null ? - parent.notaContent.getControllerTunai().daftarTabelTransaksi : null, - parent.notaContent.getControllerRetur() != null ? - parent.notaContent.getControllerRetur().daftarTabelRetur : null, + parent.notaContent.getControllerTunai() != null + ? parent.notaContent.getControllerTunai().daftarTabelTransaksi : null, + parent.notaContent.getControllerRetur() != null + ? parent.notaContent.getControllerRetur().daftarTabelRetur : null, this); Optional result = dialogCetakNotaController.showAndWait(); } } else { - DialogSelesaiBayarTidakLunasController dsbtlc - = new DialogSelesaiBayarTidakLunasController(this, - bayarContent.getTotalPerluBayar() - - bayarContent.getTotalBayar()); - dsbtlc.initData(parent); - dsbtlc.initOwner(apContent.getScene().getWindow()); - dsbtlc.show(); + //Jika ingin menampilkan dialog belum selesai bayar +// DialogSelesaiBayarTidakLunasController dsbtlc +// = new DialogSelesaiBayarTidakLunasController(this, +// bayarContent.getTotalPerluBayar() +// - bayarContent.getTotalBayar()); +// dsbtlc.initData(parent); +// dsbtlc.initOwner(apContent.getScene().getWindow()); +// dsbtlc.show(); + //Pengecekan pilih jenis pembayaran + if (chkTunai.isSelected() || chkRetur.isSelected() || chkPromo.isSelected() + || chkPoin.isSelected() || chkOvo.isSelected() || chkKartu.isSelected() + || chkGopay.isSelected()) { + //Menampilkan notifikasi jika pembayaran kurang + Alert alert = AlertUtil.getAlertWarning( + AlertUtil.DIALOG_UANG_BELUM_CUKUP, + "Nominal yang anda masukan masih kurang"); + alert.show(); + } else { + Alert alert = AlertUtil.getAlertWarning( + AlertUtil.DIALOG_PILIH_JENIS_TRANSAKSI, + "Silahkan pilih jenis pembayaran anda!"); + alert.show(); + } } }; listShortcuts.put(kcSelesaiBayar, rnSelesaiBayar); diff --git a/src/main/java/id/amigogroup/posterminal/util/AlertUtil.java b/src/main/java/id/amigogroup/posterminal/util/AlertUtil.java index 908f8a1..f8dad80 100644 --- a/src/main/java/id/amigogroup/posterminal/util/AlertUtil.java +++ b/src/main/java/id/amigogroup/posterminal/util/AlertUtil.java @@ -26,6 +26,7 @@ public class AlertUtil { public static final String DIALOG_KONFIRMASI_MESSAGE = "Apakah anda yakin?"; public static final String ERROR_TIDAK_LENGKAP_TITLE = "Error: Data Tidak Lengkap"; public static final String DIALOG_UANG_BELUM_CUKUP = "Nominal Belum Cukup"; + public static final String DIALOG_PILIH_JENIS_TRANSAKSI = "Pilih Transaksi"; public static final ButtonType BUTTON_YA = new ButtonType("Ya", ButtonData.YES); public static final ButtonType BUTTON_TIDAK = new ButtonType("Tidak", ButtonData.NO); diff --git a/src/main/resources/fxml/FormUtama.fxml b/src/main/resources/fxml/FormUtama.fxml index f57e26e..33a047a 100644 --- a/src/main/resources/fxml/FormUtama.fxml +++ b/src/main/resources/fxml/FormUtama.fxml @@ -54,7 +54,7 @@ -