From 808b6e3d2b9cf92fe272608424aeb3e6bf595134 Mon Sep 17 00:00:00 2001 From: Harkamal Randhawa Date: Wed, 8 Apr 2026 07:57:39 -0600 Subject: [PATCH] remove debit payments --- .../listfragments/detailfragments/RefundFragment.java | 2 +- .../listfragments/detailfragments/SaleDetailFragment.java | 2 +- .../src/main/java/com/petshop/backend/service/SaleService.java | 3 --- .../org/example/petshopdesktop/controllers/SaleController.java | 2 +- .../controllers/dialogcontrollers/RefundDialogController.java | 2 +- 5 files changed, 4 insertions(+), 7 deletions(-) diff --git a/android/app/src/main/java/com/example/petstoremobile/fragments/listfragments/detailfragments/RefundFragment.java b/android/app/src/main/java/com/example/petstoremobile/fragments/listfragments/detailfragments/RefundFragment.java index a53b5402..7f2eec10 100644 --- a/android/app/src/main/java/com/example/petstoremobile/fragments/listfragments/detailfragments/RefundFragment.java +++ b/android/app/src/main/java/com/example/petstoremobile/fragments/listfragments/detailfragments/RefundFragment.java @@ -34,7 +34,7 @@ public class RefundFragment extends Fragment { // Items user has added to refund cart private List 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 { diff --git a/android/app/src/main/java/com/example/petstoremobile/fragments/listfragments/detailfragments/SaleDetailFragment.java b/android/app/src/main/java/com/example/petstoremobile/fragments/listfragments/detailfragments/SaleDetailFragment.java index d71b2686..d5e36be2 100644 --- a/android/app/src/main/java/com/example/petstoremobile/fragments/listfragments/detailfragments/SaleDetailFragment.java +++ b/android/app/src/main/java/com/example/petstoremobile/fragments/listfragments/detailfragments/SaleDetailFragment.java @@ -31,7 +31,7 @@ public class SaleDetailFragment extends Fragment { private List productList = new ArrayList<>(); private List 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, diff --git a/backend/src/main/java/com/petshop/backend/service/SaleService.java b/backend/src/main/java/com/petshop/backend/service/SaleService.java index c90ad659..5376351c 100644 --- a/backend/src/main/java/com/petshop/backend/service/SaleService.java +++ b/backend/src/main/java/com/petshop/backend/service/SaleService.java @@ -242,9 +242,6 @@ public class SaleService { } String normalized = paymentMethod.trim(); - if (normalized.equalsIgnoreCase("Debit")) { - return "Card"; - } if (normalized.equalsIgnoreCase("Cash")) { return "Cash"; } diff --git a/desktop/src/main/java/org/example/petshopdesktop/controllers/SaleController.java b/desktop/src/main/java/org/example/petshopdesktop/controllers/SaleController.java index 3d6e9388..22c96dbd 100644 --- a/desktop/src/main/java/org/example/petshopdesktop/controllers/SaleController.java +++ b/desktop/src/main/java/org/example/petshopdesktop/controllers/SaleController.java @@ -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(); diff --git a/desktop/src/main/java/org/example/petshopdesktop/controllers/dialogcontrollers/RefundDialogController.java b/desktop/src/main/java/org/example/petshopdesktop/controllers/dialogcontrollers/RefundDialogController.java index bc262e30..65b2590a 100644 --- a/desktop/src/main/java/org/example/petshopdesktop/controllers/dialogcontrollers/RefundDialogController.java +++ b/desktop/src/main/java/org/example/petshopdesktop/controllers/dialogcontrollers/RefundDialogController.java @@ -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(); }