fix&Update[DonationPage]: fix up merge conflict problems and update d…

…onationPage to also include payment method
Group-5 · Apr 14, 2026 · 0556c5b · 0556c5b
1 parent 40b3ba9
commit 0556c5b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/src/main/java/edu/group5/app/control/DonationController.java b/src/main/java/edu/group5/app/control/DonationController.java
@@ -72,7 +72,8 @@ public void requestDonationConfirmation() {
     confirmDialog.setHeaderText("Confirm Your Donation");
     confirmDialog.setContentText(
         "Organization: " + currentOrg.name() + "\n" +
-        "Amount: " + amount + " kr\n\n" +
+        "Amount: " + amount + " kr\n" +
+        "Payment Method: " + paymentMethod + "\n\n" +
         "Are you sure you want to proceed?"
     );
 
@@ -88,6 +89,7 @@ private void handleDonate() {
     User currentUser = appState.getCurrentUser();
     Organization currentOrg = appState.getCurrentOrganization();
     BigDecimal amount = appState.getCurrentDonationAmount();
+    String paymentMethod = appState.getCurrentPaymentMethod();
 
     if (!(currentUser instanceof Customer customer)) {
       System.err.println("Error: Only customers can donate");

diff --git a/src/main/java/edu/group5/app/view/donationpage/DonationPageView.java b/src/main/java/edu/group5/app/view/donationpage/DonationPageView.java
@@ -170,6 +170,10 @@ public HBox createPaymentMethodSection() {
     Button vippsBtn = new Button("Vipps");
     Button visaBtn = new Button("Visa");
 
+    appleBtn.setUserData("Apple Pay");
+    vippsBtn.setUserData("Vipps");
+    visaBtn.setUserData("Visa");
+
     for (Button btn : new Button[]{appleBtn, vippsBtn, visaBtn}) {
       btn.getStyleClass().add("payment-method-button");
       btn.setOnAction(e -> selectPaymentMethod(btn));
@@ -200,6 +204,9 @@ private void selectPaymentMethod(Node element) {
     }
     selectedPaymentMethod = element;
     selectedPaymentMethod.getStyleClass().add("payment-method-selected");
+
+    String paymentMethod = (String) element.getUserData();
+    appState.setCurrentPaymentMethod(paymentMethod);
     updateDonationButtonState();
   }
 

diff --git a/src/main/java/edu/group5/app/view/userpage/UserPageView.java b/src/main/java/edu/group5/app/view/userpage/UserPageView.java
@@ -105,8 +105,6 @@ private VBox createCausesSection() {
         }
       }
     }
-    ScrollPane scrollPane = new ScrollPane(causesBox);
-    scrollPane.setFitToWidth(true);
     scrollPane.setPrefHeight(150);
     scrollPane.setContent(causesFlow);
 
@@ -181,9 +179,6 @@ private VBox createDonationsSection() {
 
       }
     }
-    ScrollPane scrollPane = new ScrollPane(donationsBox);
-    scrollPane.setFitToWidth(true);
-    scrollPane.setPrefHeight(200);
     scrollPane.setContent(donationsBox);
     return new VBox(10, title, searchBox, scrollPane);