diff --git a/src/main/java/id/amigogroup/posterminal/transaksi/FormTransaksiReturController.java b/src/main/java/id/amigogroup/posterminal/transaksi/FormTransaksiReturController.java index 200d733..f0732e3 100644 --- a/src/main/java/id/amigogroup/posterminal/transaksi/FormTransaksiReturController.java +++ b/src/main/java/id/amigogroup/posterminal/transaksi/FormTransaksiReturController.java @@ -12,6 +12,7 @@ import id.amigogroup.posterminal.model.DNotaRetur; import id.amigogroup.posterminal.model.DNotaTunai; import id.amigogroup.posterminal.util.AmigoPosCache; import id.amigogroup.posterminal.util.AlertUtil; +import id.amigogroup.posterminal.util.ButtonUtility; import id.amigogroup.posterminal.util.Fucout; import io.reactivex.Observer; import io.reactivex.disposables.Disposable; @@ -29,6 +30,7 @@ import javafx.collections.ObservableList; import javafx.fxml.FXML; import javafx.fxml.Initializable; import javafx.scene.control.Alert; +import javafx.scene.control.Button; import javafx.scene.control.Label; import javafx.scene.control.TableColumn; import javafx.scene.control.TableView; @@ -106,6 +108,7 @@ public class FormTransaksiReturController implements Initializable { private StackPane stpReturDrop; @FXML private Label lblTambahKeTabelRetur; + private TableColumn tcAction; private final AmigoPosRx posRx = new AmigoPosRx(); private String noNota = ""; @@ -130,6 +133,7 @@ public class FormTransaksiReturController implements Initializable { tcDisc2.setCellValueFactory(new PropertyValueFactory<>("disc2")); tcSubTotal.setCellValueFactory(new PropertyValueFactory<>("subTotal")); tcPramuniaga.setCellValueFactory(new PropertyValueFactory<>("fldPramuniaga")); + tcAction.setCellValueFactory(new PropertyValueFactory<>("btnAction")); tbvPenjualan.setItems(daftarTabelPenjualan); tcNoRetur.setCellValueFactory((TableColumn.CellDataFeatures cell) -> { @@ -161,8 +165,18 @@ public class FormTransaksiReturController implements Initializable { daftarTabelRetur.clear(); for (DNotaTunai dNotaTunai : daftarNotaTunai) { + //Button + Button btnAction = ButtonUtility.generateButton(ButtonUtility.CLOSE_ICON); + btnAction.setOnAction((t) -> { + Alert alert = AlertUtil.getAlertDialogKonfirmasi( + AlertUtil.DIALOG_KONFIRMASI_MESSAGE, + "Yakin ingin menghapus barang?"); + alert.initOwner(apMain.getScene().getWindow()); + alert.show(); + + }); TextField fldPramuniaga = new TextField(dNotaTunai.getKodePram()); - + String namaBarang = "..."; if (AmigoPosCache.getInstance().getDaftarBarang().containsKey(dNotaTunai.getKdBarang())) { Barang barang = AmigoPosCache.getInstance().getDaftarBarang() @@ -183,10 +197,12 @@ public class FormTransaksiReturController implements Initializable { Fucout.getText(Fucout.formatRibuan( dNotaTunai.getHargaJual() * dNotaTunai.getJumlah() )), - fldPramuniaga); + fldPramuniaga, + btnAction); + tbt.setData(dNotaTunai); daftarTabelPenjualan.add(tbt); - + if (!AmigoPosCache.getInstance().getDaftarBarang().containsKey(dNotaTunai.getKdBarang())) { posRx.getBarangByKodeBarang(dNotaTunai.getKdBarang()).subscribe(getBarangObserver); } diff --git a/src/main/java/id/amigogroup/posterminal/transaksi/FormTransaksiTunaiController.java b/src/main/java/id/amigogroup/posterminal/transaksi/FormTransaksiTunaiController.java index 4f14a2e..fc2c950 100644 --- a/src/main/java/id/amigogroup/posterminal/transaksi/FormTransaksiTunaiController.java +++ b/src/main/java/id/amigogroup/posterminal/transaksi/FormTransaksiTunaiController.java @@ -30,6 +30,9 @@ import javafx.collections.ObservableList; import javafx.fxml.FXML; import javafx.fxml.Initializable; import javafx.scene.control.Alert; +import javafx.scene.control.Button; +import javafx.scene.control.ButtonBar; +import javafx.scene.control.ButtonType; import javafx.scene.control.ComboBox; import javafx.scene.control.Label; import javafx.scene.control.TableColumn; @@ -40,6 +43,7 @@ import javafx.scene.input.KeyCode; import javafx.scene.input.KeyEvent; import javafx.scene.layout.AnchorPane; import javafx.scene.text.Text; +import javax.swing.JOptionPane; import retrofit2.HttpException; /** @@ -80,10 +84,13 @@ public class FormTransaksiTunaiController implements Initializable { @FXML private TableColumn tcPramuniaga; @FXML + private TableColumn tcAction; + @FXML private Label txtTanggal; final ObservableList daftarTabelTransaksi = FXCollections.observableArrayList(); @FXML private Text lblGrandTotal; + public static final ButtonType btnAction = new ButtonType("BATAL", ButtonBar.ButtonData.YES); private String noNota = ""; private AmigoPosRx posRx = new AmigoPosRx(); @@ -108,6 +115,7 @@ public class FormTransaksiTunaiController implements Initializable { tcPromo.setCellValueFactory(new PropertyValueFactory<>("cbxPromo")); tcSubtotal.setCellValueFactory(new PropertyValueFactory<>("subTotal")); tcPramuniaga.setCellValueFactory(new PropertyValueFactory<>("fldPramuniaga")); + tcAction.setCellValueFactory(new PropertyValueFactory<>("btnAction")); tbvTransaksi.setItems(daftarTabelTransaksi); // fillTable(new ArrayList<>()); @@ -133,14 +141,26 @@ public class FormTransaksiTunaiController implements Initializable { String[] promo = {"Ulang Tahun", "Harbolnas", "Ultah Amigo"}; for (DNotaTunai dNotaTunai : daftarNotaTunai) { + //ComboBox ComboBox cbxPromo = new ComboBox<>(FXCollections.observableArrayList(promo)); cbxPromo.getSelectionModel().select("Ulang Tahun"); + //Button + Button btnAction = new Button("BATAL"); + btnAction.setOnAction((t) -> { + Alert alert = AlertUtil.getAlertError( + AlertUtil.DIALOG_KONFIRMASI_MESSAGE, + "Yakin ingin menghapus barang?"); + alert.initOwner(apMain.getScene().getWindow()); + alert.show(); + }); + //TextField TextField fldPramuniaga = new TextField(dNotaTunai.getKodePram()); fldPramuniaga.setOnKeyPressed((t) -> { if (t.getCode() == KeyCode.ENTER) { fldScan.requestFocus(); } + }); String namaBarang = "..."; @@ -161,7 +181,8 @@ public class FormTransaksiTunaiController implements Initializable { Fucout.getText(Fucout.formatRibuan( dNotaTunai.getHargaJual() * dNotaTunai.getJumlah() )), - fldPramuniaga)); + fldPramuniaga, + btnAction)); if (!AmigoPosCache.getInstance().getDaftarBarang().containsKey(dNotaTunai.getKdBarang())) { posRx.getBarangByKodeBarang(dNotaTunai.getKdBarang()).subscribe(getBarangObserver); @@ -199,6 +220,17 @@ public class FormTransaksiTunaiController implements Initializable { String[] promo = {"Ulang Tahun", "Harbolnas", "Ultah Amigo"}; ComboBox cbxPromo = new ComboBox<>(FXCollections.observableArrayList(promo)); cbxPromo.getSelectionModel().select("Ulang Tahun"); + + Button btnAction = new Button("BATAL"); + btnAction.setOnAction((t) -> { + Alert alert = AlertUtil.getAlertDialogKonfirmasi( + AlertUtil.DIALOG_KONFIRMASI_MESSAGE, + "Yakin ingin menghapus barang?"); + alert.initOwner(apMain.getScene().getWindow()); + alert.show(); + + }); + TextField fldPramuniaga = new TextField(); fldPramuniaga.setOnKeyPressed((t) -> { if (t.getCode() == KeyCode.ENTER) { @@ -230,7 +262,8 @@ public class FormTransaksiTunaiController implements Initializable { Fucout.getText(Fucout.formatRibuan( 1 * noBarang.getHargaJual()) ), - fldPramuniaga); + fldPramuniaga, + btnAction); tbt.setData(dNotaTunai); daftarTabelTransaksi.add(tbt); diff --git a/src/main/java/id/amigogroup/posterminal/transaksi/TabelBarangTunai.java b/src/main/java/id/amigogroup/posterminal/transaksi/TabelBarangTunai.java index 9a29596..86abb8d 100644 --- a/src/main/java/id/amigogroup/posterminal/transaksi/TabelBarangTunai.java +++ b/src/main/java/id/amigogroup/posterminal/transaksi/TabelBarangTunai.java @@ -8,6 +8,7 @@ package id.amigogroup.posterminal.transaksi; import id.amigogroup.posterminal.model.DNotaTunai; import javafx.beans.property.SimpleObjectProperty; import javafx.beans.property.SimpleStringProperty; +import javafx.scene.control.Button; import javafx.scene.control.ComboBox; import javafx.scene.control.TextField; @@ -16,6 +17,7 @@ import javafx.scene.control.TextField; * @author AGNES */ public class TabelBarangTunai { + private SimpleStringProperty kode; private SimpleStringProperty nama; private SimpleStringProperty ukur; @@ -26,11 +28,12 @@ public class TabelBarangTunai { private SimpleObjectProperty cbxPromo; private SimpleStringProperty subTotal; private SimpleObjectProperty fldPramuniaga; - + private DNotaTunai data; + private SimpleObjectProperty