diff --git a/src/main/java/id/amigogroup/posterminal/transaksi/FormTransaksiReturController.java b/src/main/java/id/amigogroup/posterminal/transaksi/FormTransaksiReturController.java index 39807bf..7499c60 100644 --- a/src/main/java/id/amigogroup/posterminal/transaksi/FormTransaksiReturController.java +++ b/src/main/java/id/amigogroup/posterminal/transaksi/FormTransaksiReturController.java @@ -29,6 +29,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; @@ -72,6 +73,8 @@ public class FormTransaksiReturController implements Initializable { private TableColumn tcSubTotal; @FXML private TableColumn tcPramuniaga; + @FXML + private TableColumn tcAction; // @FXML // private TableView tbvRetur; @@ -117,6 +120,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); Platform.runLater(() -> { fldNotaPenjualan.requestFocus(); @@ -136,8 +140,18 @@ public class FormTransaksiReturController implements Initializable { daftarTabelPenjualan.clear(); for (DNotaTunai dNotaTunai : daftarNotaTunai) { + //Button + 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(dNotaTunai.getKodePram()); - + String namaBarang = "..."; if (BarangCache.getInstance().getDaftarBarang().containsKey(dNotaTunai.getKdBarang())) { namaBarang = Fucout.getText(BarangCache.getInstance().getDaftarBarang() @@ -156,7 +170,8 @@ public class FormTransaksiReturController implements Initializable { Fucout.getText(Fucout.formatRibuan( dNotaTunai.getHargaJual() * dNotaTunai.getJumlah() )), - fldPramuniaga)); + fldPramuniaga, + btnAction)); if (!BarangCache.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 1b20850..798f796 100644 --- a/src/main/java/id/amigogroup/posterminal/transaksi/FormTransaksiTunaiController.java +++ b/src/main/java/id/amigogroup/posterminal/transaksi/FormTransaksiTunaiController.java @@ -28,6 +28,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; @@ -38,6 +41,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; /** @@ -78,10 +82,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 AmigoPosRx posRx = new AmigoPosRx(); @@ -103,6 +110,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<>()); @@ -114,6 +122,8 @@ public class FormTransaksiTunaiController implements Initializable { setTanggal(); } + + public void setTanggal(){ java.util.Date skrg = new java.util.Date(); java.text.SimpleDateFormat kal = new @@ -126,14 +136,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 = "..."; @@ -154,7 +176,8 @@ public class FormTransaksiTunaiController implements Initializable { Fucout.getText(Fucout.formatRibuan( dNotaTunai.getHargaJual() * dNotaTunai.getJumlah() )), - fldPramuniaga)); + fldPramuniaga, + btnAction)); if (!BarangCache.getInstance().getDaftarBarang().containsKey(dNotaTunai.getKdBarang())) { posRx.getBarangByKodeBarang(dNotaTunai.getKdBarang()).subscribe(getBarangObserver); @@ -166,11 +189,22 @@ 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 + 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) { fldScan.requestFocus(); } + }); daftarTabelTransaksi.add(new TabelBarangTunai( Fucout.getText(barang.getKodeBarang()), @@ -182,7 +216,8 @@ public class FormTransaksiTunaiController implements Initializable { "...", cbxPromo, "...", - fldPramuniaga)); + fldPramuniaga, + btnAction)); } //SCAN BARANG diff --git a/src/main/java/id/amigogroup/posterminal/transaksi/TabelBarangTunai.java b/src/main/java/id/amigogroup/posterminal/transaksi/TabelBarangTunai.java index 09ea94a..ad38c9d 100644 --- a/src/main/java/id/amigogroup/posterminal/transaksi/TabelBarangTunai.java +++ b/src/main/java/id/amigogroup/posterminal/transaksi/TabelBarangTunai.java @@ -26,9 +26,10 @@ public class TabelBarangTunai { private SimpleObjectProperty cbxPromo; private SimpleStringProperty subTotal; private SimpleObjectProperty fldPramuniaga; + private SimpleObjectProperty