From 1d56198ed3cba8542eb094d3bba44fcdf100cd28 Mon Sep 17 00:00:00 2001
From: Josua Pascario <>
Date: Mon, 24 Feb 2020 10:33:46 +0700
Subject: [PATCH] bug fix menambahkan transaksi nota

---
 .../posterminal/FormUtamaController.java          | 15 +++++++++++----
 .../transaksi/DialogTambahNotaController.java     |  4 ++--
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/main/java/id/amigogroup/posterminal/FormUtamaController.java b/src/main/java/id/amigogroup/posterminal/FormUtamaController.java
index 3a9dff9..9d3675f 100644
--- a/src/main/java/id/amigogroup/posterminal/FormUtamaController.java
+++ b/src/main/java/id/amigogroup/posterminal/FormUtamaController.java
@@ -376,7 +376,7 @@ public class FormUtamaController implements Initializable {
         dialogTambahNota.initOwner(bpMain.getScene().getWindow());
         Optional<String> hasilReturn = dialogTambahNota.showAndWait();
 
-        if (hasilReturn.isPresent() && hasilReturn.get().equals("Tunai")) {
+        if (hasilReturn.isPresent() && hasilReturn.get().equals("Baru:Tunai")) {
 
             Button buttonBaru = generateButtonNota("10-0220-0000X",
                     FormConstanta.TRANSAKSI_TUNAI,
@@ -385,7 +385,7 @@ public class FormUtamaController implements Initializable {
             vbNavigasi.getChildren().add(buttonBaru);
             jumlahNota++;
         }
-        else if (hasilReturn.isPresent() && hasilReturn.get().equals("Bon")) {
+        else if (hasilReturn.isPresent() && hasilReturn.get().equals("Baru:Bon")) {
 
             Button buttonBaru = generateButtonNota("10-0220-0000X",
                     FormConstanta.TRANSAKSI_BON,
@@ -394,7 +394,7 @@ public class FormUtamaController implements Initializable {
             vbNavigasi.getChildren().add(buttonBaru);
             jumlahNota++;
         }
-        else if (hasilReturn.isPresent() && hasilReturn.get().equals("Bawa Dulu")) {
+        else if (hasilReturn.isPresent() && hasilReturn.get().equals("Baru:Bawa Dulu")) {
 
             Button buttonBaru = generateButtonNota("10-0220-0000X",
                     FormConstanta.TRANSAKSI_BAWA,
@@ -403,7 +403,7 @@ public class FormUtamaController implements Initializable {
             vbNavigasi.getChildren().add(buttonBaru);
             jumlahNota++;
         }
-        else if (hasilReturn.isPresent() && hasilReturn.get().equals("Retur")) {
+        else if (hasilReturn.isPresent() && hasilReturn.get().equals("Baru:Retur")) {
 
             Button buttonBaru = generateButtonNota("10-0220-0000X",
                     FormConstanta.TRANSAKSI_RETUR,
@@ -411,6 +411,13 @@ public class FormUtamaController implements Initializable {
             navigasi.add(buttonBaru);
             vbNavigasi.getChildren().add(buttonBaru);
             jumlahNota++;
+        } else if(hasilReturn.isPresent() && hasilReturn.get().contains("Checkout:")){
+            Button buttonBaru = generateButtonNota(hasilReturn.get().substring(9),
+                    FormConstanta.TRANSAKSI_TUNAI,
+                    Fucout.TIPE_NOTA_TUNAI);
+            navigasi.add(buttonBaru);
+            vbNavigasi.getChildren().add(buttonBaru);
+            jumlahNota++;
         }
     }
 
diff --git a/src/main/java/id/amigogroup/posterminal/transaksi/DialogTambahNotaController.java b/src/main/java/id/amigogroup/posterminal/transaksi/DialogTambahNotaController.java
index d4b660c..8a20fa5 100644
--- a/src/main/java/id/amigogroup/posterminal/transaksi/DialogTambahNotaController.java
+++ b/src/main/java/id/amigogroup/posterminal/transaksi/DialogTambahNotaController.java
@@ -74,9 +74,9 @@ public class DialogTambahNotaController extends Dialog<String> implements Initia
                 if (buttonType == btnLanjutkan) {
                     //radio button mana yang dipilih
                     if (((RadioButton) tgTipe.getSelectedToggle()) == rbBaru) {
-                        return cbxPilihNota.getValue();
+                        return "Baru:" + cbxPilihNota.getValue();
                     } else if (((RadioButton) tgTipe.getSelectedToggle()) == rbAmbilDariCheckout) {
-                        return txtFieldAmbilDariCheckout.getText();
+                        return "Checkout:" + txtFieldAmbilDariCheckout.getText();
                     }
                     //baru, balikin tipe yang dipilih
                     //dari checkout, balikin isi nomor nota (hanya jika nota ditemukan)