RecentRunner/group-2-threaded-project-petshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove debit payments

Browse Source
This commit is contained in:
Harkamal Randhawa
2026-04-08 07:57:39 -06:00
parent f2932d80c8
commit 39f4b6bd8a
5 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android/app/src/main/java/com/example/petstoremobile/fragments/listfragments/detailfragments/RefundFragment.java
View File

@@ -34,7 +34,7 @@ public class RefundFragment extends Fragment {
// Items user has added to refund cart // Items user has added to refund cart
private List<RefundItem> refundCart = new ArrayList<>(); 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 // Inner class to track refund items
static class RefundItem { static class RefundItem {

2
android/app/src/main/java/com/example/petstoremobile/fragments/listfragments/detailfragments/SaleDetailFragment.java
View File

@@ -31,7 +31,7 @@ public class SaleDetailFragment extends Fragment {
private List<ProductDTO> productList = new ArrayList<>(); private List<ProductDTO> productList = new ArrayList<>();
private List<SaleDTO.SaleItemDTO> cartItems = 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 @Override
public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,

3
backend/src/main/java/com/petshop/backend/service/SaleService.java
View File

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

2
desktop/src/main/java/org/example/petshopdesktop/controllers/SaleController.java
View File

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

2
desktop/src/main/java/org/example/petshopdesktop/controllers/dialogcontrollers/RefundDialogController.java
View File

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