diff --git a/Projects/Project 0/src/main/java/DAOs/AccDAO.java b/Projects/Project 0/src/main/java/DAOs/AccDAO.java index 84d0739..8c2bef9 100644 --- a/Projects/Project 0/src/main/java/DAOs/AccDAO.java +++ b/Projects/Project 0/src/main/java/DAOs/AccDAO.java @@ -285,24 +285,25 @@ public boolean depositFunds(int amount, int accID) throws SQLException { */ public boolean transferFunds(int amount, int accID, int otherAccID){ boolean success = false; - withdrawFunds(amount, accID); - NumberFormat formatter = NumberFormat.getCurrencyInstance(Locale.US); - try { - sql = "UPDATE ACCOUNTS " + - "SET BALANCE = (BALANCE + ?) " + - "WHERE ACCOUNT_ID = ?"; - pstmt = conn.prepareStatement(sql); - pstmt.setInt(1, amount); - pstmt.setInt(2, otherAccID); - - if (pstmt.executeUpdate() != 0) { - System.out.println(formatter.format(amount) + " has been deposited to Account: " + otherAccID); - success = true; + if(withdrawFunds(amount, accID)){ + NumberFormat formatter = NumberFormat.getCurrencyInstance(Locale.US); + try { + sql = "UPDATE ACCOUNTS " + + "SET BALANCE = (BALANCE + ?) " + + "WHERE ACCOUNT_ID = ?"; + pstmt = conn.prepareStatement(sql); + pstmt.setInt(1, amount); + pstmt.setInt(2, otherAccID); + + if (pstmt.executeUpdate() != 0) { + System.out.println(formatter.format(amount) + " has been deposited to Account: " + otherAccID); + success = true; + } + } catch (SQLException e) { + System.out.println(NullAccount(otherAccID)); + e.printStackTrace(); + success = false; } - } catch (SQLException e) { - System.out.println(NullAccount(otherAccID)); - e.printStackTrace(); - success = false; } return success; diff --git a/Projects/Project 0/src/main/java/Menu/TransferFunds.java b/Projects/Project 0/src/main/java/Menu/TransferFunds.java index c6362e1..039c020 100644 --- a/Projects/Project 0/src/main/java/Menu/TransferFunds.java +++ b/Projects/Project 0/src/main/java/Menu/TransferFunds.java @@ -78,10 +78,13 @@ public void printMenu() throws SQLException { pm.navigate("class Menu.LoggedIn"); isTransferring = false; } + else{ + pm.navigate("class Menu.LoggedIn"); + isTransferring = false; + } } catch (SQLException e) { e.printStackTrace(); } } - pm.navigate("class Menu.LoggedIn"); } }