Merge Josua-MenambahkanTotalTunaiKembalian

src/main/java/id/amigogroup/posterminal/bayar/FormBayarController.java

@@ -127,7 +127,8 @@ public class FormBayarController implements Initializable, BayarInterface {
                             parent.notaContent.getControllerTunai() != null ?
                                     parent.notaContent.getControllerTunai().daftarTabelTransaksi : null,
                             parent.notaContent.getControllerRetur() != null ?
-                                    parent.notaContent.getControllerRetur().daftarTabelRetur : null);
+                                    parent.notaContent.getControllerRetur().daftarTabelRetur : null,
+                            this);
                     Optional<String> result = dialogCetakNotaController.showAndWait();
                 }
             } else {

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

@@ -5,6 +5,7 @@
  */
 package id.amigogroup.posterminal.pencarian;
 
+import id.amigogroup.posterminal.bayar.BayarInterface;
 import id.amigogroup.posterminal.transaksi.TabelBarangRetur;
 import id.amigogroup.posterminal.transaksi.TabelBarangTunai;
 import id.amigogroup.posterminal.util.Fucout;
@@ -23,12 +24,14 @@ import javafx.scene.Parent;
 import javafx.scene.control.ButtonBar.ButtonData;
 import javafx.scene.control.ButtonType;
 import javafx.scene.control.Dialog;
+import javafx.scene.control.Label;
 import javafx.scene.control.ScrollPane;
 import javafx.scene.control.TableColumn;
 import javafx.scene.control.TableView;
 import javafx.scene.control.TitledPane;
 import javafx.scene.control.cell.PropertyValueFactory;
 import javafx.scene.layout.AnchorPane;
+import javafx.scene.layout.GridPane;
 import javafx.scene.layout.VBox;
 import javafx.stage.Window;
 
@@ -146,6 +149,16 @@ public class DialogCetakNotaController extends Dialog<String> implements Initial
     private TableColumn<TabelBarangRetur, String> tcSubTotalRetur;
     @FXML
     private TableColumn<TabelBarangRetur, String> tcPramuniagaRetur;
+    @FXML
+    private GridPane gpUang;
+    @FXML
+    private Label lblKembalian;
+    @FXML
+    private Label lblTotal;
+    @FXML
+    private Label lblTunai;
+
+    private BayarInterface parent;
 
     public final ObservableList<TabelBarangTunai> daftarTabelTunai = FXCollections.observableArrayList();
     public final ObservableList<TabelBarangRetur> daftarTabelRetur = FXCollections.observableArrayList();
@@ -204,6 +217,12 @@ public class DialogCetakNotaController extends Dialog<String> implements Initial
 
     public void initData(ObservableList<TabelBarangTunai> daftarTabelTransaksiTunai,
             ObservableList<TabelBarangRetur> daftarTabelTransaksiRetur) {
+        initData(daftarTabelTransaksiTunai, daftarTabelTransaksiRetur, null);
+    }
+
+    public void initData(ObservableList<TabelBarangTunai> daftarTabelTransaksiTunai,
+            ObservableList<TabelBarangRetur> daftarTabelTransaksiRetur,
+            BayarInterface parent) {
         if (daftarTabelTransaksiTunai != null && !daftarTabelTransaksiTunai.isEmpty()) {
             for (TabelBarangTunai tbt : daftarTabelTransaksiTunai) {
                 daftarTabelTunai.add(new TabelBarangTunai(tbt.getKode(), tbt.getNama(), tbt.getUkur(),
@@ -215,6 +234,7 @@ public class DialogCetakNotaController extends Dialog<String> implements Initial
         }
         vbCetakNota.getChildren().remove(tpBon);
         vbCetakNota.getChildren().remove(tpBawa);
+        
         if (daftarTabelTransaksiRetur != null && !daftarTabelTransaksiRetur.isEmpty()) {
             for (TabelBarangRetur tbr : daftarTabelTransaksiRetur) {
                 daftarTabelRetur.add(new TabelBarangRetur(tbr.getKode(), tbr.getNama(), tbr.getUkur(),
@@ -224,5 +244,25 @@ public class DialogCetakNotaController extends Dialog<String> implements Initial
         } else {
             vbCetakNota.getChildren().remove(tpRetur);
         }
+        
+        //Menampilkan total, tunai dan kembalian
+        if (parent != null) {
+            this.parent = parent;
+            int bayar = 0;
+            if (parent != null && parent.getBayarContent() != null) {
+                lblTotal.setText(Fucout.formatRibuan(parent.getBayarContent().getTotalPerluBayar()));
+                lblTunai.setText(Fucout.formatRibuan(parent.getBayarContent().getBayarTunai()));
+                if (parent.getBayarContent().getTotalPerluBayar()
+                        < parent.getBayarContent().getTotalBayar()) {
+                    int kembali = parent.getBayarContent().getTotalBayar()
+                            - parent.getBayarContent().getTotalPerluBayar();
+                    lblKembalian.setText(Fucout.getText(Fucout.formatRibuan(kembali)));
+                } else {
+                    lblKembalian.setText("-");
+                }
+            }
+        } else {
+            vbCetakNota.getChildren().remove(gpUang);
+        }
     }
 }

src/main/resources/fxml/DialogCetakNota.fxml

@@ -1,13 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import javafx.scene.control.Label?>
 <?import javafx.scene.control.ScrollPane?>
 <?import javafx.scene.control.TableColumn?>
 <?import javafx.scene.control.TableView?>
 <?import javafx.scene.control.TitledPane?>
 <?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.layout.ColumnConstraints?>
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.layout.RowConstraints?>
 <?import javafx.scene.layout.VBox?>
 
-<ScrollPane fx:id="spCetakNota" fitToWidth="true" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="550.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1">
+<ScrollPane fx:id="spCetakNota" fitToWidth="true" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="500.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1">
    <content>
       <VBox fx:id="vbCetakNota">
          <children>
@@ -111,6 +115,29 @@
                   </AnchorPane>
               </content>
             </TitledPane>
+            <GridPane fx:id="gpUang" maxWidth="1.7976931348623157E308">
+              <columnConstraints>
+                <ColumnConstraints halignment="RIGHT" hgrow="SOMETIMES" maxWidth="1.7976931348623157E308" minWidth="10.0" prefWidth="706.0" />
+                  <ColumnConstraints halignment="CENTER" hgrow="SOMETIMES" maxWidth="1.7976931348623157E308" minWidth="9.0" prefWidth="13.0" />
+                <ColumnConstraints halignment="RIGHT" hgrow="SOMETIMES" maxWidth="181.0" minWidth="10.0" prefWidth="79.0" />
+              </columnConstraints>
+              <rowConstraints>
+                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+              </rowConstraints>
+               <children>
+                  <Label text="Total" />
+                  <Label text="Tunai" GridPane.rowIndex="1" />
+                  <Label fx:id="lblKembali" text="Kembali" GridPane.rowIndex="2" />
+                  <Label fx:id="lblTotal" text="-" GridPane.columnIndex="2" />
+                  <Label fx:id="lblTunai" text="-" GridPane.columnIndex="2" GridPane.rowIndex="1" />
+                  <Label fx:id="lblKembalian" text="-" GridPane.columnIndex="2" GridPane.rowIndex="2" />
+                  <Label text=":" GridPane.columnIndex="1" />
+                  <Label text=":" GridPane.columnIndex="1" GridPane.rowIndex="1" />
+                  <Label text=":" GridPane.columnIndex="1" GridPane.rowIndex="2" />
+               </children>
+            </GridPane>
          </children>
       </VBox>
    </content>