ronaldochristnawan
/
pos-terminal-app
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: ronaldochristnawan:837f109692ed538ab2236c673d02fcb8c889cfd8
Branches Tags
ronaldochristnawan:master
..
compare: ronaldochristnawan:06bbac298bef89cfc2403ecbf8bdf200a202c93d
Branches Tags
ronaldochristnawan:master

No commits in common. '837f109692ed538ab2236c673d02fcb8c889cfd8' and '06bbac298bef89cfc2403ecbf8bdf200a202c93d' have entirely different histories.
837f109692 ... 06bbac298b

5 changed files with 11 additions and 54 deletions
Show Stats

8
src/main/java/id/amigogroup/posterminal/pencarian/DialogCariNotaTundaController.java
Unescape Escape View File

@ -21,7 +21,6 @@ import java.util.logging.Logger;
import javafx.beans.property.ReadOnlyObjectWrapper;
import javafx.collections.FXCollections;
import javafx.collections.ObservableList;
import javafx.event.ActionEvent;
import javafx.fxml.FXML;
import javafx.fxml.FXMLLoader;
import javafx.fxml.Initializable;
@ -34,7 +33,6 @@ import javafx.scene.control.Dialog;
import javafx.scene.control.TableColumn;
import javafx.scene.control.TableView;
import javafx.scene.control.cell.PropertyValueFactory;
import javafx.scene.input.KeyCode;
import javafx.scene.input.KeyEvent;
import javafx.scene.layout.AnchorPane;
import javafx.stage.Window;
@ -109,11 +107,7 @@ public class DialogCariNotaTundaController extends Dialog<String> implements Ini
.getName()).log(Level.SEVERE, null, e);
}
}
@FXML
void cbxNotaTundaOnAction(ActionEvent event) {
}
public Observer<Pagination<MNotaTunai>> getNotaTunaiTundaObserver = new Observer<Pagination<MNotaTunai>>() {
@Override

34
src/main/java/id/amigogroup/posterminal/transaksi/FormTransaksiReturController.java
Unescape Escape View File

@ -136,7 +136,7 @@ public class FormTransaksiReturController implements Initializable {
tcDisc2.setCellValueFactory(new PropertyValueFactory<>("disc2"));
tcSubTotal.setCellValueFactory(new PropertyValueFactory<>("subTotal"));
tcPramuniaga.setCellValueFactory(new PropertyValueFactory<>("fldPramuniaga"));
// tcBtnBatal.setCellValueFactory(new PropertyValueFactory<>("btnBatal"));
// tcBtnBatal.setCellValueFactory(new PropertyValueFactory<>("btnBatal"));
tbvPenjualan.setItems(daftarTabelPenjualan);
tcNoRetur.setCellValueFactory((TableColumn.CellDataFeatures<TabelBarangRetur, Integer> cell) -> {
@ -151,7 +151,6 @@ public class FormTransaksiReturController implements Initializable {
tcDisc2Retur.setCellValueFactory(new PropertyValueFactory<>("disc2"));
tcSubTotalRetur.setCellValueFactory(new PropertyValueFactory<>("subTotal"));
tcPramuniagaRetur.setCellValueFactory(new PropertyValueFactory<>("fldPramuniaga"));
tcBtnBatal.setCellValueFactory(new PropertyValueFactory<>("btnBatal"));
tbvRetur.setItems(daftarTabelRetur);
Platform.runLater(() -> {
@ -221,18 +220,9 @@ public class FormTransaksiReturController implements Initializable {
private void refreshDataRetur(List<DNotaRetur> daftarDNotaRetur) {
daftarTabelRetur.clear();
for (DNotaRetur dNotaRetur : daftarDNotaRetur) {
//Button
Button btnBatal = ButtonUtility.generateButton(ButtonUtility.CLOSE_ICON);
btnBatal.setOnAction((t) -> {
Alert alert = AlertUtil.getAlertDialogKonfirmasi(
AlertUtil.DIALOG_KONFIRMASI_MESSAGE,
"Yakin ingin menghapus barang?");
alert.initOwner(apMain.getScene().getWindow());
alert.show();
});
for(DNotaRetur dNotaRetur : daftarDNotaRetur){
//Button
TextField fldPramuniaga = new TextField(dNotaRetur.getKodePram());
String namaBarang = "...";
@ -254,8 +244,7 @@ public class FormTransaksiReturController implements Initializable {
Fucout.getText(Fucout.formatRibuan(
dNotaRetur.getHargaJual() * dNotaRetur.getJumlah()
)),
fldPramuniaga,
btnBatal);
fldPramuniaga);
tbr.setData(dNotaRetur);
daftarTabelRetur.add(tbr);
@ -394,15 +383,6 @@ public class FormTransaksiReturController implements Initializable {
success = true;
if (!ada) {
Button btnBatal = ButtonUtility.generateButton(ButtonUtility.CLOSE_ICON);
btnBatal.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();
DNotaRetur dNotaRetur = new DNotaRetur(noNota, draggedTabelBarangTunai.getData());
@ -417,9 +397,7 @@ public class FormTransaksiReturController implements Initializable {
Fucout.getText(Fucout.formatRibuan(
dNotaRetur.getJumlah() * dNotaRetur.getHargaJual()
)),
fldPramuniaga,
btnBatal);
fldPramuniaga);
tbr.setData(dNotaRetur);
daftarTabelRetur.add(tbr);

1
src/main/java/id/amigogroup/posterminal/transaksi/FormTransaksiTunaiController.java
Unescape Escape View File

@ -97,6 +97,7 @@ public class FormTransaksiTunaiController implements Initializable {
private Text lblGrandTotal;
public final ObservableList<TabelBarangTunai> daftarTabelTransaksi = FXCollections.observableArrayList();
public static final ButtonType btnAction = new ButtonType("BATAL", ButtonBar.ButtonData.YES);
private String noNota = "";
private AmigoPosRx posRx = new AmigoPosRx();
public int total = 0;

20
src/main/java/id/amigogroup/posterminal/transaksi/TabelBarangRetur.java
Unescape Escape View File

@ -8,7 +8,6 @@ package id.amigogroup.posterminal.transaksi;
import id.amigogroup.posterminal.model.DNotaRetur;
import javafx.beans.property.SimpleObjectProperty;
import javafx.beans.property.SimpleStringProperty;
import javafx.scene.control.Button;
import javafx.scene.control.TextField;
/**
@ -26,11 +25,11 @@ public class TabelBarangRetur {
private SimpleStringProperty disc2;
private SimpleStringProperty subTotal;
private SimpleObjectProperty<TextField> fldPramuniaga;
private SimpleObjectProperty<Button> btnBatal;
private DNotaRetur data;
public TabelBarangRetur(String kode, String nama, String ukur, String jumlah, String harga, String disc1,
String disc2, String subTotal, TextField fldPramuniaga, Button btnBatal) {
String disc2, String subTotal, TextField fldPramuniaga) {
this.kode = new SimpleStringProperty(kode);
this.nama = new SimpleStringProperty(nama);
this.ukur = new SimpleStringProperty(ukur);
@ -40,7 +39,6 @@ public class TabelBarangRetur {
this.disc2 = new SimpleStringProperty(disc2);
this.subTotal = new SimpleStringProperty(subTotal);
this.fldPramuniaga = new SimpleObjectProperty<TextField>(fldPramuniaga);
this.btnBatal = new SimpleObjectProperty<>(btnBatal);
}
/**
@ -182,18 +180,4 @@ public class TabelBarangRetur {
public void setData(DNotaRetur data) {
this.data = data;
}
/**
* @return the action
*/
public Button getBtnBatal() {
return btnBatal.get();
}
/**
* @param action the action to set
*/
public void setBtnBatal(Button btnBatal) {
this.btnBatal.set(btnBatal);
}
}

2
src/main/resources/fxml/DialogCariNotaTunda.fxml
Unescape Escape View File

@ -14,7 +14,7 @@
<Font size="16.0" />
</font>
</Label>
<ComboBox fx:id="cbxCariNotaTunda" layoutX="4.0" layoutY="46.0" onAction="#cbxNotaTundaOnAction" prefWidth="281.0" promptText="Nomor Nota" AnchorPane.leftAnchor="4.0" AnchorPane.topAnchor="46.0" />
<ComboBox fx:id="cbxCariNotaTunda" layoutX="4.0" layoutY="46.0" prefWidth="281.0" promptText="Nomor Nota" AnchorPane.leftAnchor="4.0" AnchorPane.topAnchor="46.0" />
<Label layoutY="29.0" text="Nomor Nota Tunda" AnchorPane.leftAnchor="4.0" AnchorPane.topAnchor="29.0" />
<Label layoutX="14.0" layoutY="76.0" text="Pelanggan" AnchorPane.leftAnchor="4.0" AnchorPane.topAnchor="76.0">
<font>

Write Preview
Loading…
Cancel
Save