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

Compare commits

base: ronaldochristnawan:5c0de8e7a23743a737caf5af34e7f8dda13ccae2
Branches Tags
ronaldochristnawan:master
..
compare: ronaldochristnawan:d5b49a0985d4e4b97f217db97454cde15c7fe117
Branches Tags
ronaldochristnawan:master

No commits in common. '5c0de8e7a23743a737caf5af34e7f8dda13ccae2' and 'd5b49a0985d4e4b97f217db97454cde15c7fe117' have entirely different histories.
5c0de8e7a2 ... d5b49a0985

6 changed files with 11 additions and 112 deletions
Show Stats

5
src/main/java/id/amigogroup/posterminal/api/AmigoPosRx.java
Unescape Escape View File

@ -66,11 +66,6 @@ public class AmigoPosRx {
return UtilsApi.getServiceApiBarang().getMNotaTunaiByNoNota(noNota)
.subscribeOn(Schedulers.trampoline());
}
public Observable<Pagination<MNotaTunai>> getMNotaTunaiByStatus(String status, Integer limit) {
return UtilsApi.getServiceApiBarang().getMNotaTunaiByStatus(status, limit)
.subscribeOn(Schedulers.io());
}
public Observable<ResponseBody> validasiMNotaTunaiByNoNotaTanggal(String noNota) {
return UtilsApi.getServiceApiBarang().validasiMNotaTunaiByNoNotaTanggal(noNota)

5
src/main/java/id/amigogroup/posterminal/api/ServiceApiBarang.java
Unescape Escape View File

@ -58,11 +58,6 @@ public interface ServiceApiBarang {
@GET("m-nota-tunai/no-nota/{noNota}")
Observable<MNotaTunai> getMNotaTunaiByNoNota(@Path("noNota") String noNota);
//Mengambil Master Nota Tunai By Status Tunda
@GET("m-nota-tunai/status/{status}/limit/{limit}")
Observable<Pagination<MNotaTunai>> getMNotaTunaiByStatus(
@Path("status") String status,
@Path("limit") Integer limit);
//Validasi Master Nota Tunai by No Nota
@GET("m-nota-tunai/no-nota/{noNota}/valid")
Observable<ResponseBody> validasiMNotaTunaiByNoNotaTanggal(@Path("noNota") String noNota);

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

@ -5,38 +5,18 @@
*/
package id.amigogroup.posterminal.pencarian;
import id.amigogroup.posterminal.api.AmigoPosRx;
import id.amigogroup.posterminal.model.MNotaTunai;
import id.amigogroup.posterminal.model.Pagination;
import id.amigogroup.posterminal.transaksi.TabelBarangTunai;
import id.amigogroup.posterminal.util.AlertUtil;
import io.reactivex.Observer;
import io.reactivex.disposables.Disposable;
import java.io.IOException;
import java.net.HttpURLConnection;
import java.net.URL;
import java.util.ResourceBundle;
import java.util.logging.Level;
import java.util.logging.Logger;
import javafx.beans.property.ReadOnlyObjectWrapper;
import javafx.collections.FXCollections;
import javafx.collections.ObservableList;
import javafx.fxml.FXML;
import javafx.fxml.FXMLLoader;
import javafx.fxml.Initializable;
import javafx.scene.Parent;
import javafx.scene.control.Alert;
import javafx.scene.control.ButtonBar.ButtonData;
import javafx.scene.control.ButtonType;
import javafx.scene.control.ComboBox;
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.KeyEvent;
import javafx.scene.layout.AnchorPane;
import javafx.stage.Window;
import retrofit2.HttpException;
/**
* FXML Controller class
@ -44,37 +24,6 @@ import retrofit2.HttpException;
* @author ronal
*/
public class DialogCariNotaTundaController extends Dialog<String> implements Initializable {
@FXML
AnchorPane apContent;
@FXML
private ComboBox<String> cbxCariNotaTunda;
@FXML
private TableView<TabelBarangTunai> tbvBarangTunda;
@FXML
private TableColumn<TabelBarangTunai, Integer> tcNo;
@FXML
private TableColumn<TabelBarangTunai, String> tcKode;
@FXML
private TableColumn<TabelBarangTunai, String> tcNama;
@FXML
private TableColumn<TabelBarangTunai, String> tcUkur;
@FXML
private TableColumn<TabelBarangTunai, String> tcJml;
@FXML
private TableColumn<TabelBarangTunai, String> tcHarga;
@FXML
private TableColumn<TabelBarangTunai, String> tcDisc1;
@FXML
private TableColumn<TabelBarangTunai, String> tcDisc2;
@FXML
private TableColumn<TabelBarangTunai, String> tcSubTotal;
@FXML
private TableColumn<TabelBarangTunai, String> tcPromo;
@FXML
private TableColumn<TabelBarangTunai, String> tcPramuniaga;
final ObservableList<TabelBarangTunai> daftarTabelBarangTunai = FXCollections.observableArrayList();
AmigoPosRx posRx = new AmigoPosRx();
/**
* Initializes the controller class.
@ -82,9 +31,7 @@ public class DialogCariNotaTundaController extends Dialog<String> implements Ini
@Override
public void initialize(URL url, ResourceBundle rb) {
getDialogPane().getButtonTypes().add(new ButtonType("Tutup", ButtonData.CANCEL_CLOSE));
//
}
}
public DialogCariNotaTundaController(/*FormPresensiController parent*/) {
try {
@ -97,7 +44,7 @@ public class DialogCariNotaTundaController extends Dialog<String> implements Ini
Parent root = loader.load();
getDialogPane().setContent(root);
setTitle("Cari Nota Tunda");
posRx.getMNotaTunaiByStatus("T", 25).subscribe(getNotaTunaiTundaObserver);
// getDialogPane().getButtonTypes().add(ButtonType.CANCEL);
// setResultConverter(buttonType -> {
// return str;
@ -107,38 +54,4 @@ public class DialogCariNotaTundaController extends Dialog<String> implements Ini
.getName()).log(Level.SEVERE, null, e);
}
}
public Observer<Pagination<MNotaTunai>> getNotaTunaiTundaObserver = new Observer<Pagination<MNotaTunai>>() {
@Override
public void onSubscribe(Disposable dspsbl) {
}
@Override
public void onNext(Pagination<MNotaTunai> daftarMNotaTunai) {
for (MNotaTunai mNotaTunai : daftarMNotaTunai.getData()){
cbxCariNotaTunda.getItems().add(mNotaTunai.getNoNota());
}
}
@Override
public void onError(Throwable error) {
if (error instanceof HttpException) {
switch (((HttpException) error).code()) {
case HttpURLConnection.HTTP_NOT_FOUND:
Alert alert = AlertUtil.getAlertError(
AlertUtil.ERROR_TIDAK_DITEMUKAN_TITLE,
"Nota Tunda Tidak Ditemukan");
alert.initOwner(apContent.getScene().getWindow());
alert.show();
}
} else {
AmigoPosRx.handleGenericError(error, apContent.getScene().getWindow());
}
}
@Override
public void onComplete() {
}
};
}

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

@ -107,8 +107,6 @@ public class FormTransaksiReturController implements Initializable {
@FXML
private TableColumn<TabelBarangRetur, TextField> tcPramuniagaRetur;
@FXML
private TableColumn<TabelBarangRetur, Button> tcBtnBatal;
@FXML
private StackPane stpReturDrop;
@FXML
private Label lblTambahKeTabelRetur;
@ -136,7 +134,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"));
// tcAction.setCellValueFactory(new PropertyValueFactory<>("btnAction"));
tbvPenjualan.setItems(daftarTabelPenjualan);
tcNoRetur.setCellValueFactory((TableColumn.CellDataFeatures<TabelBarangRetur, Integer> cell) -> {
@ -175,9 +173,9 @@ public class FormTransaksiReturController implements Initializable {
daftarTabelRetur.clear();
for (DNotaTunai dNotaTunai : daftarNotaTunai) {
//Button
Button btnBatal = ButtonUtility.generateButton(ButtonUtility.CLOSE_ICON);
btnBatal.setOnAction((t) -> {
//Button
Button btnAction = ButtonUtility.generateButton(ButtonUtility.CLOSE_ICON);
btnAction.setOnAction((t) -> {
Alert alert = AlertUtil.getAlertDialogKonfirmasi(
AlertUtil.DIALOG_KONFIRMASI_MESSAGE,
"Yakin ingin menghapus barang?");
@ -208,7 +206,7 @@ public class FormTransaksiReturController implements Initializable {
dNotaTunai.getHargaJual() * dNotaTunai.getJumlah()
)),
fldPramuniaga,
btnBatal);
btnAction);
tbt.setData(dNotaTunai);
daftarTabelPenjualan.add(tbt);

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

@ -14,7 +14,6 @@ import id.amigogroup.posterminal.model.MNotaTunai;
import id.amigogroup.posterminal.model.NoBarang;
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.Observable;
import io.reactivex.Observer;
@ -216,7 +215,7 @@ public class FormTransaksiTunaiController implements Initializable {
ComboBox<String> cbxPromo = new ComboBox<>(FXCollections.observableArrayList(promo));
cbxPromo.getSelectionModel().select("Ulang Tahun");
//Button
Button btnAction = ButtonUtility.generateButton(ButtonUtility.CLOSE_ICON);
Button btnAction = new Button("BATAL");
btnAction.setOnAction((t) -> {
Alert alert = AlertUtil.getAlertError(
AlertUtil.DIALOG_KONFIRMASI_MESSAGE,
@ -299,7 +298,7 @@ public class FormTransaksiTunaiController implements Initializable {
ComboBox<String> cbxPromo = new ComboBox<>(FXCollections.observableArrayList(promo));
cbxPromo.getSelectionModel().select("Ulang Tahun");
Button btnAction = ButtonUtility.generateButton(ButtonUtility.CLOSE_ICON);
Button btnAction = new Button("BATAL");
btnAction.setOnAction((t) -> {
Alert alert = AlertUtil.getAlertDialogKonfirmasi(
AlertUtil.DIALOG_KONFIRMASI_MESSAGE,

5
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" prefWidth="281.0" promptText="Nomor Nota" AnchorPane.leftAnchor="4.0" AnchorPane.topAnchor="46.0" />
<ComboBox fx:id="ddCariNota" 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>
@ -26,7 +26,7 @@
<Font size="14.0" />
</font>
</Label>
<TableView fx:id="tbvBarangTunda" layoutX="8.0" layoutY="100.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="100.0">
<TableView layoutX="8.0" layoutY="100.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="100.0">
<columns>
<TableColumn fx:id="tcNo" editable="false" maxWidth="30.0" minWidth="30.0" prefWidth="30.0" resizable="false" sortable="false" text="No" />
<TableColumn fx:id="tcKode" editable="false" prefWidth="75.0" text="Kode Barang" />
@ -37,7 +37,6 @@
<TableColumn fx:id="tcDisc1" editable="false" maxWidth="50.0" minWidth="50.0" prefWidth="50.0" resizable="false" text="Disc I" />
<TableColumn fx:id="tcDisc2" editable="false" maxWidth="50.0" minWidth="50.0" prefWidth="50.0" resizable="false" text="Disc II" />
<TableColumn fx:id="tcSubTotal" editable="false" prefWidth="75.0" text="Sub Total" />
<TableColumn fx:id="tcPromo" prefWidth="75.0" text="Promo" />
<TableColumn fx:id="tcPramuniaga" editable="false" prefWidth="75.0" text="Pramuniaga" />
</columns>
<columnResizePolicy>

Write Preview
Loading…
Cancel
Save