diff --git a/src/main/java/id/amigogroup/posterminal/bayar/FormBayarController.java b/src/main/java/id/amigogroup/posterminal/bayar/FormBayarController.java
index 3f9b24e..249d136 100644
--- a/src/main/java/id/amigogroup/posterminal/bayar/FormBayarController.java
+++ b/src/main/java/id/amigogroup/posterminal/bayar/FormBayarController.java
@@ -7,6 +7,7 @@ package id.amigogroup.posterminal.bayar;
 
 import id.amigogroup.posterminal.FormUtamaController;
 import id.amigogroup.posterminal.pencarian.DialogCetakNotaController;
+import id.amigogroup.posterminal.transaksi.TabelBarangRetur;
 import id.amigogroup.posterminal.util.Fucout;
 import java.io.IOException;
 import java.net.URL;
@@ -93,13 +94,21 @@ public class FormBayarController implements Initializable, BayarInterface {
     public void initData(FormUtamaController parent) {
         this.parent = parent;
         if (parent != null && parent.notaContent.getControllerTunai() != null) {
-            int bayarRetur = 0;
+            int bayarReturTunai = 0;
             if (parent.notaContent.getControllerRetur() != null
                     && parent.notaContent.getControllerRetur().tipeRetur.equals(
                             Fucout.TEKS_TIPE_NOTA_TUNAI)) {
-                bayarRetur = parent.notaContent.getControllerRetur().nominalRetur;
+                for(TabelBarangRetur tbr : parent.notaContent.getControllerRetur().daftarTabelRetur){
+                    switch(tbr.getData().getNoNotaTunai().charAt(0)){
+                        case Fucout.KODE_NOTA_BON:
+                            break;
+                        default:
+                            bayarReturTunai += tbr.getData().getJumlah() * tbr.getData().getHargaJual();
+                            break;
+                    }
+                }
             }
-            bayarContent.setTotalPerluBayar(parent.notaContent.getControllerTunai().total - bayarRetur);
+            bayarContent.setTotalPerluBayar(parent.notaContent.getControllerTunai().total - bayarReturTunai);
             updateGrandTotalView();
             updateKurangBayarView();
         }
diff --git a/src/main/java/id/amigogroup/posterminal/transaksi/FormTransaksiReturController.java b/src/main/java/id/amigogroup/posterminal/transaksi/FormTransaksiReturController.java
index 9634388..a117779 100644
--- a/src/main/java/id/amigogroup/posterminal/transaksi/FormTransaksiReturController.java
+++ b/src/main/java/id/amigogroup/posterminal/transaksi/FormTransaksiReturController.java
@@ -262,7 +262,7 @@ public class FormTransaksiReturController implements Initializable {
     private void batalRetur(TabelBarangRetur tbr) {
         Alert alert = AlertUtil.getAlertDialogKonfirmasi(
                 AlertUtil.DIALOG_KONFIRMASI_MESSAGE,
-                "Yakin ingin menghapus barang?");
+                "Yakin ingin membatalkan barang?");
         alert.initOwner(apMain.getScene().getWindow());
         Optional<ButtonType> result = alert.showAndWait();
 
diff --git a/src/main/java/id/amigogroup/posterminal/transaksi/FormTransaksiTunaiController.java b/src/main/java/id/amigogroup/posterminal/transaksi/FormTransaksiTunaiController.java
index d54404e..f738337 100644
--- a/src/main/java/id/amigogroup/posterminal/transaksi/FormTransaksiTunaiController.java
+++ b/src/main/java/id/amigogroup/posterminal/transaksi/FormTransaksiTunaiController.java
@@ -254,12 +254,6 @@ public class FormTransaksiTunaiController implements Initializable {
             daftarTabelTransaksi.add(tbt);
 
             btnBatal.setOnAction((t) -> {
-                Alert alert = AlertUtil.getAlertError(
-                        AlertUtil.DIALOG_KONFIRMASI_MESSAGE,
-                        "Yakin ingin menghapus barang?");
-                alert.initOwner(apMain.getScene().getWindow());
-                alert.show();
-
                 batalTunai(tbt);
             });
 
@@ -272,18 +266,22 @@ public class FormTransaksiTunaiController implements Initializable {
     private void batalTunai(TabelBarangTunai tbt) {
         Alert alert = AlertUtil.getAlertDialogKonfirmasi(
                 AlertUtil.DIALOG_KONFIRMASI_MESSAGE,
-                "Yakin ingin menghapus barang?");
+                "Yakin ingin membatalkan barang?");
         alert.initOwner(apMain.getScene().getWindow());
         Optional<ButtonType> result = alert.showAndWait();
 
         if (result.isPresent() && result.get() == AlertUtil.BUTTON_YA) {
-            if (tbt.getData().getJumlah() > 1) {
+            if (tbt.getData() != null && tbt.getData().getJumlah() > 1) {
                 tbt.getData().setJumlah(tbt.getData().getJumlah() - 1);
                 tbt.setJumlah(String.valueOf(tbt.getData().getJumlah()));
+                tbt.setSubTotal(Fucout.formatRibuan(tbt.getData().getJumlah() * tbt.getData().getHargaJual()));
                 tbvTransaksi.refresh();
             } else {
                 daftarTabelTransaksi.remove(tbt);
             }
+            
+           total -= tbt.getData().getHargaJual();
+           updateLabelGrandTotal();
         }
     }