Skip to content

All done finally! #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Open
wants to merge 87 commits into
base: master
Choose a base branch
from
Open

All done finally! #38

wants to merge 87 commits into from

Conversation

jorget93
Copy link

No description provided.

Abiel Figueroa and others added 30 commits March 12, 2021 17:40
Account class complete
80e9801
Account class done
693d338
@Abielf
Merge branch 'master' into abby
9e556c3
@Abielf
Merge pull request #1 from jorget93/abby
f33fc18 
Account class done
@jorget93
Played with CLI
6c5e506
@jorget93
Merge pull request #2 from jorget93/miscbranch
defe368 
basic user interface
@jorget93
added to console
44b4d17
@jorget93
stuff
31bd570
@jorget93
testin
f3a68e9
@jorget93
Merge pull request #3 from jorget93/myBranch
ebbd54b 
stuff
@jorget93
ryans methods
3514df4
@jorget93
testing again
e03bb56
@jorget93
modded console
1456c9f
@jorget93
more updates
7e64ff2
@r-m-hufford
added transfer
5da1ca5
@r-m-hufford
Merge branch 'master' of https://github.com/jorget93/CR-MacroLabs-OOP…
2984303 
…-ATM

# Conflicts:
#	src/main/java/Console.java
@jorget93
greetingTest
146fc64
WOOT atmEngine 1.0 complete
1547a76
@Abielf
Merge pull request #5 from jorget93/abby
7da9608 
WOOT atmEngine 1.0 complete
@r-m-hufford
refined console input validation
a2b4cac
@r-m-hufford
Merge branch 'master' of https://github.com/jorget93/CR-MacroLabs-OOP…
61a58c7 
…-ATM

# Conflicts:
#	src/main/test/AccountTest.java
#	src/main/test/ConsoleTest.java
@r-m-hufford
input loops complete and pin started
b930807
atm version2
3ba86be
@Abielf
Merge pull request #6 from jorget93/abby
b63d4b1 
atm version2
account tests begun
ddff2a7
@Abielf
Merge pull request #7 from jorget93/abby
8c17751 
account tests begun
@r-m-hufford
console updates
b04e7f4
@r-m-hufford
started adding functionality between console and engine
08939aa
finished Account tests properly now onto the engine
d33883c
@Abielf
Merge pull request #8 from jorget93/abby
c7d32b6 
finished Account tests properly now onto the engine
r-m-hufford and others added 30 commits March 14, 2021 14:10
@r-m-hufford
added exit and go back
152389c
@r-m-hufford
same as last
bfed7f1
finished transaction history and balance will now return rounded to n…
4be6f2a 
…earest cent
@Abielf
Merge pull request #13 from jorget93/abby
374d590 
finished transaction history and balance will now return rounded to n…
@jorget93
tests
b1b7b4b
@r-m-hufford
Merge branch 'master' of https://github.com/jorget93/CR-MacroLabs-OOP…
ff83388 
…-ATM

# Conflicts:
#	src/main/test/AccountTest.java
#	src/main/test/ConsoleTest.java
@r-m-hufford
Merge branch 'master' of https://github.com/jorget93/CR-MacroLabs-OOP…
3508276 
…-ATM

# Conflicts:
#	src/main/test/AccountTest.java
#	src/main/test/ConsoleTest.java
@r-m-hufford
Merge branch 'master' of https://github.com/jorget93/CR-MacroLabs-OOP…
48dd7f7 
…-ATM
@jorget93
tests
6331cf5
@jorget93
accepted merge
8e52691
@jorget93
testing level 8
ed713f7
@jorget93
BreakCheckTests done
e06b15e
@r-m-hufford
existing customers, add accounts
827cc15
@jorget93
woking on console tests
2e39db1
@jorget93
Merge branch 'master' of https://github.com/jorget93/CR-MacroLabs-OOP…
2d86bea 
…-ATM
@r-m-hufford
close, choose and transfer functional
2ab6093
@jorget93
Added consoleTest
3038c70
@jorget93
Merge branch 'master' of https://github.com/jorget93/CR-MacroLabs-OOP…
8379e05 
…-ATM
@r-m-hufford
final bug fixes
49854fe
@r-m-hufford
Merge branch 'master' of https://github.com/jorget93/CR-MacroLabs-OOP…
f1ebccd 
…-ATM
@jorget93
started ascii art class
b06a8fb
@jorget93
Merge branch 'master' of https://github.com/jorget93/CR-MacroLabs-OOP…
7b88744 
…-ATM
@r-m-hufford
pin validation
39a0bb4
new method in ATMengine
11a000e
@Abielf
Merge pull request #14 from jorget93/abby
e2bbe0d 
new method in ATMengine
@r-m-hufford
final fixes
4e17cd3
@jorget93
Merge branch 'master' of https://github.com/jorget93/CR-MacroLabs-OOP…
b976388 
…-ATM
@jorget93
added ascii art
dcfa8e6
@r-m-hufford
Merge branch 'master' of https://github.com/jorget93/CR-MacroLabs-OOP…
fa70163 
…-ATM

# Conflicts:
#	src/main/test/AccountTest.java
#	src/main/test/ConsoleTest.java
@r-m-hufford
transfer minor update
01551d0
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@jorget93 @Abielf @r-m-hufford