WIP: Update morefiles #152

Closed
RecentRunner wants to merge 183 commits from main into morefiles
5 changed files with 4 additions and 7 deletions
Showing only changes of commit 39f4b6bd8a - Show all commits

View File

@@ -34,7 +34,7 @@ public class RefundFragment extends Fragment {
// Items user has added to refund cart
private List<RefundItem> refundCart = new ArrayList<>();
private final String[] PAYMENT_METHODS = {"Cash", "Card", "Debit"};
private final String[] PAYMENT_METHODS = {"Cash", "Card"};
// Inner class to track refund items
static class RefundItem {

View File

@@ -31,7 +31,7 @@ public class SaleDetailFragment extends Fragment {
private List<ProductDTO> productList = new ArrayList<>();
private List<SaleDTO.SaleItemDTO> cartItems = new ArrayList<>();
private final String[] PAYMENT_METHODS = { "Cash", "Credit Card", "Debit Card", "Online" };
private final String[] PAYMENT_METHODS = { "Cash", "Card" };
@Override
public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,

View File

@@ -242,9 +242,6 @@ public class SaleService {
}
String normalized = paymentMethod.trim();
if (normalized.equalsIgnoreCase("Debit")) {
return "Card";
}
if (normalized.equalsIgnoreCase("Cash")) {
return "Cash";
}

View File

@@ -186,7 +186,7 @@ public class SaleController {
spQuantity.setValueFactory(new SpinnerValueFactory.IntegerSpinnerValueFactory(1, 999, 1));
spQuantity.setEditable(true);
cbPaymentMethod.setItems(FXCollections.observableArrayList("Cash", "Card", "Debit"));
cbPaymentMethod.setItems(FXCollections.observableArrayList("Cash", "Card"));
cbPaymentMethod.getSelectionModel().selectFirst();
updateCartTotal();

View File

@@ -99,7 +99,7 @@ public class RefundDialogController {
@FXML
public void initialize() {
setupTables();
cbPaymentMethod.setItems(FXCollections.observableArrayList("Cash", "Card", "Debit"));
cbPaymentMethod.setItems(FXCollections.observableArrayList("Cash", "Card"));
cbPaymentMethod.getSelectionModel().selectFirst();
updateRefundTotal();
}