From 367c5bdd20d298d4b77de36ce7c8f43073bfffaf Mon Sep 17 00:00:00 2001
From: Ronaldo Christnawan <ronaldo.christnawan@gmail.com>
Date: Fri, 28 Feb 2020 23:49:07 +0700
Subject: [PATCH] Bug fix F8 tidak berfungsi & menghilangkan fungsi statis
 memanggil member

---
 .../posterminal/FormUtamaController.java      | 20 ++++++++-----------
 .../amigogroup/posterminal/util/Fucout.java   |  8 ++++----
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/src/main/java/id/amigogroup/posterminal/FormUtamaController.java b/src/main/java/id/amigogroup/posterminal/FormUtamaController.java
index d5e6ff8..f9196ed 100644
--- a/src/main/java/id/amigogroup/posterminal/FormUtamaController.java
+++ b/src/main/java/id/amigogroup/posterminal/FormUtamaController.java
@@ -98,10 +98,6 @@ public class FormUtamaController implements Initializable {
         //Kode Sri Sumarmi (i140411), Nur Indah Suciati (00334), Kode Wuryaningsih/RT (010004)
         updateLabelMemberNonMember();
 
-        Platform.runLater(() -> {
-            posRx.getPelangganByKodeMember("i140411").subscribe(pelangganObserver);
-        });
-
         if (SystemValue.karyawanLogin != null) {
             lblNamaLogin.setText(Fucout.getTextColon(SystemValue.karyawanLogin.getNama()));
         }
@@ -279,10 +275,10 @@ public class FormUtamaController implements Initializable {
         KeyCombination kcCheckout = new KeyCodeCombination(KeyCode.F8);
         Runnable rnCheckout = () -> {
             switch (tipeNotaState) {
-                case Fucout.TIPE_NOTA_TUNAI:
+                case FormConstanta.TRANSAKSI_TUNAI:
                     setContent(formFactory.getForm(FormConstanta.BAYAR, this));
                     break;
-                case Fucout.TIPE_NOTA_RETUR:
+                case FormConstanta.TRANSAKSI_RETUR:
                     DialogKonfirmasiReturController dialogKonfirmasiRetur = new DialogKonfirmasiReturController();
                     dialogKonfirmasiRetur.initOwner(bpMain.getScene().getWindow());
                     dialogKonfirmasiRetur.showAndWait();
@@ -339,28 +335,28 @@ public class FormUtamaController implements Initializable {
         if (hasilReturn.isPresent() && hasilReturn.get().equals("Baru:Tunai")) {
             Button buttonBaru = generateButtonNota("10-0220-0000X",
                     FormConstanta.TRANSAKSI_TUNAI,
-                    Fucout.TIPE_NOTA_TUNAI);
+                    Fucout.TEKS_TIPE_NOTA_TUNAI);
             navigasi.add(buttonBaru);
             vbNavigasi.getChildren().add(buttonBaru);
             jumlahNota++;
         } else if (hasilReturn.isPresent() && hasilReturn.get().equals("Baru:Bon")) {
             Button buttonBaru = generateButtonNota("10-0220-0000X",
                     FormConstanta.TRANSAKSI_BON,
-                    Fucout.TIPE_NOTA_BON);
+                    Fucout.TEKS_TIPE_NOTA_BON);
             navigasi.add(buttonBaru);
             vbNavigasi.getChildren().add(buttonBaru);
             jumlahNota++;
         } else if (hasilReturn.isPresent() && hasilReturn.get().equals("Baru:Bawa Dulu")) {
             Button buttonBaru = generateButtonNota("10-0220-0000X",
                     FormConstanta.TRANSAKSI_BAWA,
-                    Fucout.TIPE_NOTA_BAWA);
+                    Fucout.TEKS_TIPE_NOTA_BAWA);
             navigasi.add(buttonBaru);
             vbNavigasi.getChildren().add(buttonBaru);
             jumlahNota++;
         } else if (hasilReturn.isPresent() && hasilReturn.get().equals("Baru:Retur")) {
             Button buttonBaru = generateButtonNota("10-0220-0000X",
                     FormConstanta.TRANSAKSI_RETUR,
-                    Fucout.TIPE_NOTA_RETUR);
+                    Fucout.TEKS_TIPE_NOTA_RETUR);
             navigasi.add(buttonBaru);
             vbNavigasi.getChildren().add(buttonBaru);
             jumlahNota++;
@@ -375,12 +371,12 @@ public class FormUtamaController implements Initializable {
                 case Fucout.KODE_NOTA_RETUR:
                     buttonBaru = generateButtonNota(noNota,
                             FormConstanta.TRANSAKSI_RETUR,
-                            Fucout.TIPE_NOTA_RETUR);
+                            Fucout.TEKS_TIPE_NOTA_RETUR);
                     break;
                 default:
                     buttonBaru = generateButtonNota(noNota,
                             FormConstanta.TRANSAKSI_TUNAI,
-                            Fucout.TIPE_NOTA_TUNAI);
+                            Fucout.TEKS_TIPE_NOTA_TUNAI);
                     break;
             }
             if (buttonBaru != null) {
diff --git a/src/main/java/id/amigogroup/posterminal/util/Fucout.java b/src/main/java/id/amigogroup/posterminal/util/Fucout.java
index bd24aac..54f4b99 100644
--- a/src/main/java/id/amigogroup/posterminal/util/Fucout.java
+++ b/src/main/java/id/amigogroup/posterminal/util/Fucout.java
@@ -27,10 +27,10 @@ public class Fucout {
     //STRINGS
     public static final String APP_TITLE = "Pos Terminal Amigo";
 
-    public static final String TIPE_NOTA_TUNAI = "Tunai";
-    public static final String TIPE_NOTA_BON = "Bon";
-    public static final String TIPE_NOTA_BAWA = "Bawa Dulu";
-    public static final String TIPE_NOTA_RETUR = "Retur";
+    public static final String TEKS_TIPE_NOTA_TUNAI = "Tunai";
+    public static final String TEKS_TIPE_NOTA_BON = "Bon";
+    public static final String TEKS_TIPE_NOTA_BAWA = "Bawa Dulu";
+    public static final String TEKS_TIPE_NOTA_RETUR = "Retur";
 
     //VALUES
     public static final char KODE_NOTA_BON = 'B';