diff --git a/src/main/java/id/amigogroup/posterminal/App.java b/src/main/java/id/amigogroup/posterminal/App.java index 8d9b090..78ac28c 100644 --- a/src/main/java/id/amigogroup/posterminal/App.java +++ b/src/main/java/id/amigogroup/posterminal/App.java @@ -24,6 +24,7 @@ public class App extends Application { Scene scene = new Scene(root); stage.setScene(scene); + stage.setResizable(false); stage.setTitle(Fucout.APP_TITLE); stage.getIcons().add(new Image(Fucout.APP_ICON)); stage.show(); diff --git a/src/main/java/id/amigogroup/posterminal/FormUtamaController.java b/src/main/java/id/amigogroup/posterminal/FormUtamaController.java index 34b7747..bf376a1 100644 --- a/src/main/java/id/amigogroup/posterminal/FormUtamaController.java +++ b/src/main/java/id/amigogroup/posterminal/FormUtamaController.java @@ -60,6 +60,8 @@ public class FormUtamaController implements Initializable { @FXML private VBox vbNavigasi; @FXML + private Button btnTambahNota; + @FXML private Label lblNamaLogin; @FXML private Label lblMemberNonMember; @@ -280,15 +282,6 @@ public class FormUtamaController implements Initializable { }; listShortcuts.put(kcCariNotaTunda, rnCariNotaTunda); - KeyCombination kcCariCetakUlangNota = new KeyCodeCombination(KeyCode.P, KeyCombination.CONTROL_DOWN); - Runnable rnCetakUlangNota = () -> { - DialogCetakUlangNotaController dialogCetakUlangNota = new DialogCetakUlangNotaController(); - dialogCetakUlangNota.initOwner(bpMain.getScene().getWindow()); - - Optional result = dialogCetakUlangNota.showAndWait(); - }; - listShortcuts.put(kcCariCetakUlangNota, rnCetakUlangNota); - KeyCombination kcCheckout = new KeyCodeCombination(KeyCode.F8); Runnable rnCheckout = () -> { switch (tipeTransaksiState) { @@ -304,6 +297,27 @@ public class FormUtamaController implements Initializable { }; listShortcuts.put(kcCheckout, rnCheckout); + KeyCombination kcCariCetakUlangNota = new KeyCodeCombination(KeyCode.P, KeyCombination.CONTROL_DOWN); + Runnable rnCetakUlangNota = () -> { + DialogCetakUlangNotaController dialogCetakUlangNota = new DialogCetakUlangNotaController(); + dialogCetakUlangNota.initOwner(bpMain.getScene().getWindow()); + + Optional result = dialogCetakUlangNota.showAndWait(); + }; + listShortcuts.put(kcCariCetakUlangNota, rnCetakUlangNota); + + KeyCombination kcTambah = new KeyCodeCombination(KeyCode.T, KeyCombination.CONTROL_DOWN); + Runnable rnTambah = () -> { + btnTambahNota.fire(); + }; + listShortcuts.put(kcTambah, rnTambah); + + KeyCombination kcScanMember = new KeyCodeCombination(KeyCode.S, KeyCombination.CONTROL_DOWN); + Runnable rnScanMember = () -> { + tfScanMember.requestFocus(); + }; + listShortcuts.put(kcScanMember, rnScanMember); + KeyCombination kcLogout = new KeyCodeCombination(KeyCode.L, KeyCombination.CONTROL_DOWN); Runnable rnLogout = () -> { try { diff --git a/src/main/java/id/amigogroup/posterminal/bayar/FormBayarKartuController.java b/src/main/java/id/amigogroup/posterminal/bayar/FormBayarKartuController.java index 73bc6e2..a0d9ca8 100644 --- a/src/main/java/id/amigogroup/posterminal/bayar/FormBayarKartuController.java +++ b/src/main/java/id/amigogroup/posterminal/bayar/FormBayarKartuController.java @@ -10,6 +10,7 @@ import java.net.URL; import java.util.ResourceBundle; import javafx.fxml.FXML; import javafx.fxml.Initializable; +import javafx.scene.control.Label; import javafx.scene.control.TextField; import javafx.scene.input.KeyCode; import javafx.scene.input.KeyEvent; @@ -30,6 +31,8 @@ public class FormBayarKartuController implements Initializable { private TextField fldNoKartu3; @FXML private TextField fldNoKartu4; + @FXML + private TextField fldBayar; private BayarInterface parent; @@ -43,11 +46,11 @@ public class FormBayarKartuController implements Initializable { public void initData(BayarInterface parent) { this.parent = parent; - if (parent != null && parent.getBayarContent() != null - && parent.getBayarContent().getNodeKartu() != null) { - parent.getBayarContent().setBayarKartu(50000); - parent.updateKurangBayarView(); - } +// if (parent != null && parent.getBayarContent() != null +// && parent.getBayarContent().getNodeKartu() != null) { +// parent.getBayarContent().setBayarKartu(50000); +// parent.updateKurangBayarView(); +// } } private void initComponents() { @@ -71,4 +74,28 @@ public class FormBayarKartuController implements Initializable { } } } + + @FXML + void fldBayarOnKeyReleased(KeyEvent event) { + int bayar = 0; + if (!fldBayar.getText().equals("")) { + try { + bayar = Integer.parseInt(fldBayar.getText()); + } catch (NumberFormatException nfe) { + fldBayar.setText(""); + } + } + + if (parent != null && parent.getBayarContent() != null + && parent.getBayarContent().getNodeKartu() != null) { + parent.getBayarContent().setBayarKartu(bayar); + parent.updateKurangBayarView(); + + if (parent.getBayarContent().getTotalPerluBayar() + < parent.getBayarContent().getTotalBayar()) { + int kembali = parent.getBayarContent().getTotalBayar() + - parent.getBayarContent().getTotalPerluBayar(); + } + } + } } diff --git a/src/main/java/id/amigogroup/posterminal/model/DNotaTunai.java b/src/main/java/id/amigogroup/posterminal/model/DNotaTunai.java index 6ee0bf3..30ba7cc 100644 --- a/src/main/java/id/amigogroup/posterminal/model/DNotaTunai.java +++ b/src/main/java/id/amigogroup/posterminal/model/DNotaTunai.java @@ -48,6 +48,10 @@ public class DNotaTunai { private Barang barang; + public DNotaTunai() { + + } + public DNotaTunai(String noNota, String kdBarang, String noBarang, int jumlah, int diskon, int diskon2, int hargaJual, String hargaPokok, String kodePram, int bonus) { diff --git a/src/main/resources/fxml/FormBayarKartu.fxml b/src/main/resources/fxml/FormBayarKartu.fxml index e10a362..f6edc87 100644 --- a/src/main/resources/fxml/FormBayarKartu.fxml +++ b/src/main/resources/fxml/FormBayarKartu.fxml @@ -10,27 +10,22 @@ - - + - - + - - + + + diff --git a/src/main/resources/fxml/FormUtama.fxml b/src/main/resources/fxml/FormUtama.fxml index 3a5b752..561b4c2 100644 --- a/src/main/resources/fxml/FormUtama.fxml +++ b/src/main/resources/fxml/FormUtama.fxml @@ -96,7 +96,7 @@ -