Merge Josua-BugFixedCetakNota

Conflicts:
	src/main/java/id/amigogroup/posterminal/transaksi/TabelBarangRetur.java

src/main/java/id/amigogroup/posterminal/FormUtamaController.java

@@ -232,8 +232,9 @@ public class FormUtamaController implements Initializable {
     private void openCetakNota() {
         DialogCetakNotaController dialogCetakNotaController = new DialogCetakNotaController();
         dialogCetakNotaController.initOwner(bpMain.getScene().getWindow());
-        dialogCetakNotaController.initData(notaContent.controllerTunai.daftarTabelTransaksi,
-                notaContent.controllerRetur.daftarTabelRetur);
+        dialogCetakNotaController.initData(
+                notaContent.controllerTunai != null ? notaContent.controllerTunai.daftarTabelTransaksi : null,
+                notaContent.controllerRetur != null ? notaContent.controllerRetur.daftarTabelRetur : null);
         Optional<String> result = dialogCetakNotaController.showAndWait();
     }
 

src/main/java/id/amigogroup/posterminal/pencarian/DialogCetakNotaController.java

@@ -7,12 +7,14 @@ package id.amigogroup.posterminal.pencarian;
 
 import id.amigogroup.posterminal.transaksi.TabelBarangRetur;
 import id.amigogroup.posterminal.transaksi.TabelBarangTunai;
+import id.amigogroup.posterminal.util.Fucout;
 import java.io.IOException;
 import java.net.URL;
 import java.util.ResourceBundle;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import javafx.beans.property.ReadOnlyObjectWrapper;
+import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
@@ -20,10 +22,12 @@ import javafx.fxml.Initializable;
 import javafx.scene.Parent;
 import javafx.scene.control.ButtonBar.ButtonData;
 import javafx.scene.control.ButtonType;
+import javafx.scene.control.ComboBox;
 import javafx.scene.control.Dialog;
 import javafx.scene.control.ScrollPane;
 import javafx.scene.control.TableColumn;
 import javafx.scene.control.TableView;
+import javafx.scene.control.TextField;
 import javafx.scene.control.TitledPane;
 import javafx.scene.control.cell.PropertyValueFactory;
 import javafx.scene.layout.AnchorPane;
@@ -145,6 +149,9 @@ public class DialogCetakNotaController extends Dialog<String> implements Initial
     @FXML
     private TableColumn<TabelBarangRetur, String> tcPramuniagaRetur;
 
+    public final ObservableList<TabelBarangTunai> daftarTabelTunai = FXCollections.observableArrayList();
+    public final ObservableList<TabelBarangRetur> daftarTabelRetur = FXCollections.observableArrayList();
+
     @Override
     public void initialize(URL url, ResourceBundle rb) {
         getDialogPane().getButtonTypes().add(new ButtonType("Tutup", ButtonData.CANCEL_CLOSE));
@@ -160,7 +167,9 @@ public class DialogCetakNotaController extends Dialog<String> implements Initial
         tcDisc1Tunai.setCellValueFactory(new PropertyValueFactory<>("disc1"));
         tcDisc2Tunai.setCellValueFactory(new PropertyValueFactory<>("disc2"));
         tcSubTotalTunai.setCellValueFactory(new PropertyValueFactory<>("subTotal"));
-        tcPramuniagaTunai.setCellValueFactory(new PropertyValueFactory<>("fldPramuniaga"));
+        tcPramuniagaTunai.setCellValueFactory(new PropertyValueFactory<>("pramuniaga"));
+
+        tbvTunai.setItems(daftarTabelTunai);
         //Bawa
         //Bon
         //Retur
@@ -175,7 +184,8 @@ public class DialogCetakNotaController extends Dialog<String> implements Initial
         tcDisc1Retur.setCellValueFactory(new PropertyValueFactory<>("disc1"));
         tcDisc2Retur.setCellValueFactory(new PropertyValueFactory<>("disc2"));
         tcSubTotalRetur.setCellValueFactory(new PropertyValueFactory<>("subTotal"));
-        tcPramuniagaRetur.setCellValueFactory(new PropertyValueFactory<>("fldPramuniaga"));
+        tcPramuniagaRetur.setCellValueFactory(new PropertyValueFactory<>("pramuniaga"));
+        tbvRetur.setItems(daftarTabelRetur);
     }
 
     public DialogCetakNotaController() {
@@ -196,7 +206,19 @@ public class DialogCetakNotaController extends Dialog<String> implements Initial
 
     public void initData(ObservableList<TabelBarangTunai> daftarTabelTransaksiTunai,
             ObservableList<TabelBarangRetur> daftarTabelTransaksiRetur) {
-        tbvTunai.setItems(daftarTabelTransaksiTunai);
-        tbvRetur.setItems(daftarTabelTransaksiRetur);
+        if (daftarTabelTransaksiTunai != null) {
+            for (TabelBarangTunai tbt : daftarTabelTransaksiTunai) {
+                daftarTabelTunai.add(new TabelBarangTunai(tbt.getKode(), tbt.getNama(), tbt.getUkur(),
+                        tbt.getJumlah(), tbt.getHarga(), tbt.getDisc1(), tbt.getDisc2(), null,
+                        tbt.getSubTotal(), Fucout.getText(tbt.getFldPramuniaga().getText()), null));
+            }
+        }
+        if (daftarTabelTransaksiRetur != null) {
+            for (TabelBarangRetur tbr : daftarTabelTransaksiRetur) {
+                daftarTabelRetur.add(new TabelBarangRetur(tbr.getKode(), tbr.getNama(), tbr.getUkur(),
+                        tbr.getJumlah(), tbr.getHarga(), tbr.getDisc1(), tbr.getDisc2(), tbr.getSubTotal(),
+                        Fucout.getText(tbr.getFldPramuniaga().getText())));
+            }
+        }
     }
 }

src/main/java/id/amigogroup/posterminal/transaksi/TabelBarangRetur.java

@@ -27,6 +27,8 @@ public class TabelBarangRetur {
     private SimpleStringProperty subTotal;
     private SimpleObjectProperty<TextField> fldPramuniaga;
     private SimpleObjectProperty<Button> btnBatal;
+    private SimpleStringProperty pramuniaga;
+
     private DNotaRetur data;
 
     public TabelBarangRetur(String kode, String nama, String ukur, String jumlah, String harga, String disc1,
@@ -43,6 +45,19 @@ public class TabelBarangRetur {
         this.btnBatal = new SimpleObjectProperty<>(btnBatal);
     }
 
+    public TabelBarangRetur(String kode, String nama, String ukur, String jumlah, String harga, String disc1,
+            String disc2, String subTotal, String pramuniaga) {
+        this.kode = new SimpleStringProperty(kode);
+        this.nama = new SimpleStringProperty(nama);
+        this.ukur = new SimpleStringProperty(ukur);
+        this.jumlah = new SimpleStringProperty(jumlah);
+        this.harga = new SimpleStringProperty(harga);
+        this.disc1 = new SimpleStringProperty(disc1);
+        this.disc2 = new SimpleStringProperty(disc2);
+        this.subTotal = new SimpleStringProperty(subTotal);
+        this.pramuniaga = new SimpleStringProperty(pramuniaga);
+    }
+
     /**
      * @return the kode
      */
@@ -169,6 +184,20 @@ public class TabelBarangRetur {
         this.fldPramuniaga.set(fldPramuniaga);
     }
 
+    /**
+     * @return the pramuniaga
+     */
+    public String getPramuniaga() {
+        return pramuniaga.get();
+    }
+
+    /**
+     * @param pramuniaga the pramuniaga to set
+     */
+    public void setPramuniaga(String pramuniaga) {
+        this.pramuniaga.set(pramuniaga);
+    }
+
     /**
      * @return the data
      */

src/main/java/id/amigogroup/posterminal/transaksi/TabelBarangTunai.java

@@ -28,6 +28,7 @@ public class TabelBarangTunai {
     private SimpleObjectProperty<ComboBox> cbxPromo;
     private SimpleStringProperty subTotal;
     private SimpleObjectProperty<TextField> fldPramuniaga;
+    private SimpleStringProperty pramuniaga;
 
     private DNotaTunai data;
     private SimpleObjectProperty<Button> btnBatal;
@@ -47,6 +48,21 @@ public class TabelBarangTunai {
         this.btnBatal = new SimpleObjectProperty<>(btnBatal);
     }
 
+    public TabelBarangTunai(String kode, String nama, String ukur, String jumlah, String harga, String disc1,
+            String disc2, ComboBox cbxPromo, String subTotal, String pramuniaga, Button btnBatal) {
+        this.kode = new SimpleStringProperty(kode);
+        this.nama = new SimpleStringProperty(nama);
+        this.ukur = new SimpleStringProperty(ukur);
+        this.jumlah = new SimpleStringProperty(jumlah);
+        this.harga = new SimpleStringProperty(harga);
+        this.disc1 = new SimpleStringProperty(disc1);
+        this.disc2 = new SimpleStringProperty(disc2);
+        this.cbxPromo = new SimpleObjectProperty<>(cbxPromo);
+        this.subTotal = new SimpleStringProperty(subTotal);
+        this.pramuniaga = new SimpleStringProperty(pramuniaga);
+        this.btnBatal = new SimpleObjectProperty<>(btnBatal);
+    }
+
     /**
      * @return the kode
      */
@@ -187,6 +203,20 @@ public class TabelBarangTunai {
         this.fldPramuniaga.set(fldPramuniaga);
     }
 
+    /**
+     * @return the pramuniaga
+     */
+    public String getPramuniaga() {
+        return pramuniaga.get();
+    }
+
+    /**
+     * @param pramuniaga the pramuniaga to set
+     */
+    public void setPramuniaga(String pramuniaga) {
+        this.pramuniaga.set(pramuniaga);
+    }
+
     /**
      * @return the data
      */