From 46b4b30575198a2bb158acc7c73f83765f8a574e Mon Sep 17 00:00:00 2001 From: yasanthaniroshan Date: Tue, 31 Oct 2023 01:40:18 +0530 Subject: [PATCH 01/40] Fixed errors in auth system of bank --- Auth/auth.py | 20 +- Auth/models.py | 9 + BankAccount/bank_account.py | 79 ++++++++ Database/database_quaries.py | 4 + templates/auth/login.html | 22 ++- templates/auth/register.html | 12 +- .../existingFixedIndividual.html | 24 ++- .../bankAccount/existingUserCreateMain.html | 2 +- .../bankAccount/newCurrentIndividual.html | 177 ++++++++++++++++++ .../bankAccount/newSavingsIndividual.html | 27 ++- .../bankAccount/newUserCreationMain.html | 2 +- templates/dashboard/employee_dashboard.html | 12 +- 12 files changed, 361 insertions(+), 29 deletions(-) rename templates/{createAccount => bankAccount}/existingFixedIndividual.html (89%) create mode 100644 templates/bankAccount/newCurrentIndividual.html diff --git a/Auth/auth.py b/Auth/auth.py index aa52b8b..3243451 100644 --- a/Auth/auth.py +++ b/Auth/auth.py @@ -1,4 +1,4 @@ -from flask import Blueprint,render_template,request,session,redirect,flash,abort +from flask import Blueprint,render_template,request,session,redirect,flash,abort,url_for from Settings.settings import * from .models import * from Database.connection import Connector @@ -19,7 +19,7 @@ def login()->str: elif request.method == 'POST': if not is_user_exsists(request.form['username'],connector): - flash("User doesn't exists", 'error') + flash("User doesn't exists", 'Error') return render_template('auth/login.html') else: user_id = authenticate_user(request.form,connector) @@ -42,11 +42,13 @@ def find_from_account_number(): user_id = is_account_exsists(request.form['account_number'],connector) if user_id: if have_a_user_account(user_id,connector): + flash("User already have an account", 'Error') return redirect('login') else: return redirect('register') else: - abort(401) + flash("Please contact your neaerest branch for more details ", 'No Account Found') + return redirect('login') else: return render_template('auth/account.html') @@ -58,16 +60,22 @@ def sigup()->str: return redirect('/dashboard') if request.method == 'POST': + print(valid_account_number(request.form['account_number'],connector)) + if valid_account_number(request.form['account_number'],connector): + flash('Account number is not correct', 'Error') + return redirect(url_for('auth.register')) + if is_user_exsists(request.form['username'],connector): - flash('Username already exists', 'error') - redirect('register') + flash('Username already exists', 'Error') + return redirect(url_for('auth.register')) else: print("username",request.form['username']) print('password',request.form['password']) print('confirm password',request.form['confirm_password']) print('account number',request.form['account_number']) if request.form['confirm_password'] != request.form['password']: - flash('Passwords are mismatch','error') + flash('Passwords are mismatch','Error') + return redirect(url_for('auth.register')) user_id = create_user(request.form['username'],request.form['password'],request.form['account_number'],connector) session['user_id'] = int(user_id) print(user_id) diff --git a/Auth/models.py b/Auth/models.py index c92ae77..842be96 100644 --- a/Auth/models.py +++ b/Auth/models.py @@ -97,6 +97,15 @@ def is_account_exsists(account_number:str,connector:Connector)->bool: print("Exception has happened in verify_user ! Error : ",e) return False +def valid_account_number(account_number:str,connector:Connector)->bool: + try: + with connector: + connector.cursor.execute(CHECK_ACCOUNT_IS_VALID, (account_number,)) + return connector.cursor.fetchone() == None + except Exception as e: + print("Exception has happened in verify_user ! Error : ",e) + return False + def have_a_user_account(user_id:int,connector:Connector)->bool: try: with connector: diff --git a/BankAccount/bank_account.py b/BankAccount/bank_account.py index 3d6a728..25e994b 100644 --- a/BankAccount/bank_account.py +++ b/BankAccount/bank_account.py @@ -41,6 +41,15 @@ def get_customer_first_name_and_no_accounts(account_number): print("Error in get_customer_first_name",e) return None +def get_savings_account_id(account_number): + connector = Connector() + try : + with connector: + connector.cursor.execute(GET_SAVINGS_ACCOUNT_ID,(account_number,)) + return connector.cursor.fetchone() + except Exception as e: + print("Error in get_savings_account_id",e) + return None def create_savings_account_for_exsisting_user_individual(user_id,account_number_of_new_account,account_number_of_old_account,amount): connector = Connector() @@ -66,6 +75,17 @@ def create_current_account_for_exsisting_user_individual(user_id,account_number_ print("Error in create_current_account_for_exsisting_user",e) return False +def creat_fixed_account_for_for_exsisting_user_individual(user_id,savings_account_id,amount,duration): + connector = Connector() + try: + with connector: + connector.cursor.execute(CREATE_FIXED_DEPOSIT,(user_id,savings_account_id,amount,duration,)) + connector.connection.commit() + return True + except Exception as e: + print("Error in create_fixed_account_for_for_exsisting_user",e) + return False + def create_savings_account_for_new_user_individual(first_name,last_name,branch_id,nic,telephone,home_town,date_of_birth,first_deposit,account_number): connector = Connector() try: @@ -78,6 +98,17 @@ def create_savings_account_for_new_user_individual(first_name,last_name,branch_i return False +def create_current_account_for_new_user_individual(first_name,last_name,branch_id,nic,telephone,home_town,date_of_birth,first_deposit,account_number): + connector = Connector() + try: + with connector: + connector.cursor.execute(CREATE_BANK_ACCOUNT_FOR_NEW_USERS,(first_name,last_name,branch_id,nic,telephone,home_town,date_of_birth,first_deposit,account_number,'CURRENT')) + connector.connection.commit() + return True + except Exception as e: + print("Error in create_current_account_for_exsisting_user",e) + return False + @bank_account_app.route('/transfer',methods = DEFUALT_SUBMISSION_METHODS,endpoint='transfer') @valid_session @@ -153,6 +184,24 @@ def create_current_account_existing_individual(): elif request.method == 'GET': return render_template('bankAccount/existingCurrentIndividual.html') +@bank_account_app.route('/create-exsisting/fixed',methods = DEFUALT_SUBMISSION_METHODS,endpoint='create_fixed_account_exsisting') +@valid_employee +@valid_session +def create_fixed_account_existing_individual(): + if request.method == 'POST': + savings_account_id = get_savings_account_id(request.form['account_number']) + if savings_account_id is None: + flash("Savings Account doesn't Exists", 'Error') + return redirect(url_for('bank_account.create_fixed_account_exsisting')) + if creat_fixed_account_for_for_exsisting_user_individual(session['user_id'],savings_account_id['savings_account_id'],request.form['first_deposit'],request.form['duration']): + flash("Fixed Deposit Created Successfully", 'Account') + return redirect('/dashboard') + else: + flash("Fixed Deposit Creation Failed", 'Error') + return redirect('/dashboard') + elif request.method == 'GET': + return render_template('bankAccount/existingFixedIndividual.html') + @bank_account_app.route('/create-new/savings',methods = DEFUALT_SUBMISSION_METHODS,endpoint='create_savings_account_new') @valid_employee @valid_session @@ -185,3 +234,33 @@ def create_savings_account_new_individual(): return render_template('bankAccount/newSavingsIndividual.html',context=context) +@bank_account_app.route('/create-new/current',methods = DEFUALT_SUBMISSION_METHODS,endpoint='create_current_account_new') +@valid_employee +@valid_session +def create_current_account_new_individual(): + if request.method == 'POST': + first_name = request.form['first_name'] + last_name = request.form['last_name'] + branch_id = request.form['branch_id'] + nic = request.form['nic'] + telephone = request.form['telephone'] + home_town = request.form['home_town'] + date_of_birth = request.form['date_of_birth'] + first_deposit = request.form['first_deposit'] + ascii_values = [ord(char) for char in (first_name+last_name)] + new_account_number = f"{str(branch_id)}-{str(sum(ascii_values)%1000)}-{str(1)}" + + if check_firstname_and_last_name_exsists(first_name,last_name): + flash("User Already Exists", 'Error') + return redirect(url_for('bank_account.create_current_account_new')) + if create_current_account_for_new_user_individual(first_name,last_name,branch_id,nic,telephone,home_town,date_of_birth,first_deposit,new_account_number): + flash("Account Created Successfully","Account Creation") + return redirect('/dashboard') + else: + flash("Error Occured ", "Error") + return redirect('/dashboard') + + elif request.method == 'GET': + context = get_branch_id(session['user_id']) + print("context",context) + return render_template('bankAccount/newSavingsIndividual.html',context=context) \ No newline at end of file diff --git a/Database/database_quaries.py b/Database/database_quaries.py index 3e91757..8697c1c 100644 --- a/Database/database_quaries.py +++ b/Database/database_quaries.py @@ -21,6 +21,10 @@ CHECK_FIRSTNAME_AND_LASTNAME_EXISTS = 'SELECT first_name,last_name FROM user WHERE first_name = %s AND last_name = %s' CREATE_BANK_ACCOUNT_FOR_NEW_USERS = 'call create_bank_account_for_new_user(%s,%s,%s,%s,%s,%s,%s,%s,%s,%s)' GET_ALL_TRANSACIONS = 'call branch_wise_total_transactions(%s,%s);' +CREATE_FIXED_DEPOSIT = 'call create_fixed_deposit_for_existing_user(%s,%s,%s,%s)' +GET_SAVINGS_ACCOUNT_ID = 'SELECT savings_account_id FROM savings_account WHERE account_id = (SELECT account_id FROM account WHERE account_number = %s)' +CHECK_ACCOUNT_IS_VALID = 'SELECT account_id FROM account WHERE account_number = %s' + SELECT_USERNAME = 'SELECT username FROM user WHERE username = %s' SELECT_PASSWORD = 'SELECT password FROM user WHERE username = %s' diff --git a/templates/auth/login.html b/templates/auth/login.html index 624a44a..7b750a4 100644 --- a/templates/auth/login.html +++ b/templates/auth/login.html @@ -5,6 +5,7 @@ + @@ -17,6 +18,7 @@ body { background-image: url("{{ url_for('static',filename='img/home/group-131.png') }}"); + background-size: cover; } @@ -25,6 +27,16 @@ + {% with messages = get_flashed_messages(with_categories=True) %} +{% if messages %} +
+ {% for category, message in messages %} +
{{category}}
+
{{message}}
+ {% endfor %} +
+{% endif %} +{% endwith %}
@@ -77,16 +89,6 @@
- {% with messages = get_flashed_messages() %} - {% if messages %} -
    - {% for message in messages %} -
  • {{ message }}
    • - {% endfor %} -
- {% endif %} - {% endwith %} -
diff --git a/templates/auth/register.html b/templates/auth/register.html index 10436a5..9b1bc90 100644 --- a/templates/auth/register.html +++ b/templates/auth/register.html @@ -3,6 +3,7 @@ + @@ -14,7 +15,16 @@ rel="stylesheet"> - +{% with messages = get_flashed_messages(with_categories=True) %} +{% if messages %} +
+ {% for category, message in messages %} +
{{category}}
+
{{message}}
+ {% endfor %} +
+{% endif %} +{% endwith %}
diff --git a/templates/createAccount/existingFixedIndividual.html b/templates/bankAccount/existingFixedIndividual.html similarity index 89% rename from templates/createAccount/existingFixedIndividual.html rename to templates/bankAccount/existingFixedIndividual.html index aff94d6..de036ba 100644 --- a/templates/createAccount/existingFixedIndividual.html +++ b/templates/bankAccount/existingFixedIndividual.html @@ -5,7 +5,8 @@ - + + @@ -24,6 +25,16 @@ + {% with messages = get_flashed_messages(with_categories=True) %} + {% if messages %} +
+ {% for category, message in messages %} +
{{category}}
+
{{message}}
+ {% endfor %} +
+ {% endif %} + {% endwith %}
@@ -75,7 +86,14 @@

Employee

-
+
+ +
+ diff --git a/templates/bankAccount/existingUserCreateMain.html b/templates/bankAccount/existingUserCreateMain.html index c3d9325..8dbbf5a 100644 --- a/templates/bankAccount/existingUserCreateMain.html +++ b/templates/bankAccount/existingUserCreateMain.html @@ -112,7 +112,7 @@

×
- Individual + Individual Organization
diff --git a/templates/bankAccount/newCurrentIndividual.html b/templates/bankAccount/newCurrentIndividual.html new file mode 100644 index 0000000..b8f0e91 --- /dev/null +++ b/templates/bankAccount/newCurrentIndividual.html @@ -0,0 +1,177 @@ + + + + + + + + + + + + + + + + + + Bank + + {% with messages = get_flashed_messages(with_categories=True) %} + {% if messages %} +
+ {% for category, message in messages %} +
{{category}}
+
{{message}}
+ {% endfor %} +
+ {% endif %} + {% endwith %} + +
+
+ + + + + +

Employee

+ +
+
+ + + +
+ +
+ +
+ +
+ + +
Create Current Account for Individuals
+
+ +
+
+ +
+ +
+
+
+
+ First Name +
+ +
+ +
+ +
+ Last Name +
+ +
+ +
+
+ NIC No. +
+ +
+ +
+
+ Branch ID +
+ {% if context %} + + {% else %} + + {% endif %} +
+ +
+ +
+ Telephone +
+ +
+ +
+
+ HomeTown +
+ +
+ +
+ +
+ Date of Birth +
+ +
+ +
+
+ First Deposit +
+ +
+ +
+
+
+ +
+
+
The Customer details are correct and the Cutomer has agreed to the
terms & Conditions
+
+ + +
+
+ + + +
+ + + + +
+ + + + + + + + + + + + \ No newline at end of file diff --git a/templates/bankAccount/newSavingsIndividual.html b/templates/bankAccount/newSavingsIndividual.html index 6f3df9a..4942d20 100644 --- a/templates/bankAccount/newSavingsIndividual.html +++ b/templates/bankAccount/newSavingsIndividual.html @@ -5,6 +5,7 @@ + @@ -23,6 +24,16 @@ + {% with messages = get_flashed_messages(with_categories=True) %} + {% if messages %} +
+ {% for category, message in messages %} +
{{category}}
+
{{message}}
+ {% endfor %} +
+ {% endif %} + {% endwith %}
@@ -46,7 +57,7 @@

Employee

-
Create Fixed Deposit Individuals
+
Create Savings Account for Individuals
@@ -68,7 +79,7 @@

Employee

Last Name
- +
@@ -82,7 +93,11 @@

Employee

Branch ID
- + {% if context %} + + {% else %} + + {% endif %}
@@ -90,14 +105,14 @@

Employee

Telephone
- +
HomeTown
- +
@@ -105,7 +120,7 @@

Employee

Date of Birth
- +
diff --git a/templates/bankAccount/newUserCreationMain.html b/templates/bankAccount/newUserCreationMain.html index 08c207d..d009ee6 100644 --- a/templates/bankAccount/newUserCreationMain.html +++ b/templates/bankAccount/newUserCreationMain.html @@ -92,7 +92,7 @@

Create Current Account

×
- Individual + Individual Organization
diff --git a/templates/dashboard/employee_dashboard.html b/templates/dashboard/employee_dashboard.html index 8a7299a..890d5de 100644 --- a/templates/dashboard/employee_dashboard.html +++ b/templates/dashboard/employee_dashboard.html @@ -5,6 +5,7 @@ + @@ -24,7 +25,16 @@ - + {% with messages = get_flashed_messages(with_categories=True) %} + {% if messages %} +
+ {% for category, message in messages %} +
{{category}}
+
{{message}}
+ {% endfor %} +
+ {% endif %} + {% endwith %}
From 90a4db46ed08d1df4d655ade060d74c45009cbb8 Mon Sep 17 00:00:00 2001 From: dilumin <77558016+dilumin@users.noreply.github.com> Date: Tue, 31 Oct 2023 07:15:27 +0530 Subject: [PATCH 02/40] bugs fixs --- static/css/manager_dasdhbaord.css | 38 +++++++++++++++++++ .../existingCurrentIndividual.html | 2 +- .../bankAccount/existingFixedIndividual.html | 4 +- .../bankAccount/existingUserCreateMain.html | 4 +- .../bankAccount/newCurrentIndividual.html | 4 +- .../bankAccount/newSavingsIndividual.html | 4 +- .../bankAccount/newUserCreationMain.html | 4 +- templates/dashboard/manager_dashbaord.html | 30 ++++++++++++--- 8 files changed, 74 insertions(+), 16 deletions(-) diff --git a/static/css/manager_dasdhbaord.css b/static/css/manager_dasdhbaord.css index 43c66e8..394fd2e 100644 --- a/static/css/manager_dasdhbaord.css +++ b/static/css/manager_dasdhbaord.css @@ -586,6 +586,44 @@ body { transform: scale(0.98); } + +.btn2{ + border-radius: 12px; + border: 2px solid #a9e1f5; + font-family: Manrope; + font-weight: bold; + font-size: 20px; + background-color: transparent; + display: flex; + align-items: center; + justify-content: center; + column-gap: var(--gap); + padding: 0.6rem; + cursor: pointer; + /* border-radius: var(--radius); */ + + box-shadow: var(--shadow); + position: relative; + margin-bottom: 20px; + color: #7bbfcb ; + width: 80%; + text-decoration: none; +} + +.btn2:hover { + /* background-color: var(--color); */ + background-color: #10252c; + color: #034b6f; + transition: 0.2s; +} +.btn2:active { + transform: scale(0.98); +} + + + + + .buttons { display: flex; flex-direction: column; diff --git a/templates/bankAccount/existingCurrentIndividual.html b/templates/bankAccount/existingCurrentIndividual.html index 408eb42..ea20f5e 100644 --- a/templates/bankAccount/existingCurrentIndividual.html +++ b/templates/bankAccount/existingCurrentIndividual.html @@ -35,7 +35,7 @@

Employee

- + diff --git a/templates/bankAccount/existingFixedIndividual.html b/templates/bankAccount/existingFixedIndividual.html index de036ba..5dc5338 100644 --- a/templates/bankAccount/existingFixedIndividual.html +++ b/templates/bankAccount/existingFixedIndividual.html @@ -45,11 +45,11 @@

Employee

-
+ -
+
diff --git a/templates/bankAccount/existingUserCreateMain.html b/templates/bankAccount/existingUserCreateMain.html index 8dbbf5a..c795848 100644 --- a/templates/bankAccount/existingUserCreateMain.html +++ b/templates/bankAccount/existingUserCreateMain.html @@ -35,11 +35,11 @@

Employee

-
+ -
+
diff --git a/templates/bankAccount/newCurrentIndividual.html b/templates/bankAccount/newCurrentIndividual.html index b8f0e91..ce92468 100644 --- a/templates/bankAccount/newCurrentIndividual.html +++ b/templates/bankAccount/newCurrentIndividual.html @@ -44,11 +44,11 @@

Employee

-
+ -
+

diff --git a/templates/bankAccount/newSavingsIndividual.html b/templates/bankAccount/newSavingsIndividual.html index 4942d20..6b04799 100644 --- a/templates/bankAccount/newSavingsIndividual.html +++ b/templates/bankAccount/newSavingsIndividual.html @@ -44,11 +44,11 @@

Employee

-
+ -
+
diff --git a/templates/bankAccount/newUserCreationMain.html b/templates/bankAccount/newUserCreationMain.html index d009ee6..6208fe9 100644 --- a/templates/bankAccount/newUserCreationMain.html +++ b/templates/bankAccount/newUserCreationMain.html @@ -36,11 +36,11 @@

Employee

-
+ -
+
diff --git a/templates/dashboard/manager_dashbaord.html b/templates/dashboard/manager_dashbaord.html index 421f861..93ff041 100644 --- a/templates/dashboard/manager_dashbaord.html +++ b/templates/dashboard/manager_dashbaord.html @@ -4,7 +4,8 @@ - + + @@ -43,7 +44,7 @@

Manager

@@ -178,9 +179,9 @@

Manager

- + - +
@@ -204,7 +205,7 @@

Manager

Apply Now.

- × + ×
Existing Users @@ -217,6 +218,25 @@

+
+ +

BranchWise Report Generate

+ × +
+ + Intrabank Transactions + Interbank Transactions + Withdrawals + Deposit + +
+ +
+

+ + + From c24df3e98f5df9ade432a6c3c36276607b324f3c Mon Sep 17 00:00:00 2001 From: yasanthaniroshan Date: Tue, 31 Oct 2023 15:36:52 +0530 Subject: [PATCH 03/40] added most of employee functions --- BankAccount/bank_account.py | 137 +++++++++++- Configurations/configurations.py | 1 - Database/connection.py | 2 +- Database/database_quaries.py | 4 +- Loan/loan.py | 5 +- .../existingSavingOrganization.html | 139 +++++++++++++ .../bankAccount/existingUserCreateMain.html | 2 +- ...zationhtml => newCurrentOrganization.html} | 14 +- .../bankAccount/newSavingsOrganization.html | 196 ++++++++++++++++++ .../bankAccount/newUserCreationMain.html | 4 +- templates/loan/OnlineLoan.html | 12 ++ 11 files changed, 504 insertions(+), 12 deletions(-) create mode 100644 templates/bankAccount/existingSavingOrganization.html rename templates/bankAccount/{newSavingsOrganizationhtml => newCurrentOrganization.html} (95%) create mode 100644 templates/bankAccount/newSavingsOrganization.html diff --git a/BankAccount/bank_account.py b/BankAccount/bank_account.py index 25e994b..8bafc59 100644 --- a/BankAccount/bank_account.py +++ b/BankAccount/bank_account.py @@ -85,12 +85,24 @@ def creat_fixed_account_for_for_exsisting_user_individual(user_id,savings_accoun except Exception as e: print("Error in create_fixed_account_for_for_exsisting_user",e) return False + +def creat_savings_account_for_for_exsisting_user_organization(user_id,account_number_of_new_account,account_number_of_old_account,amount,organization_name,organization_role): + connector = Connector() + try: + with connector: + connector.cursor.execute(CREATE_BANK_ACCOUNT_FOR_EXSISTING_ORGANIZATION,(user_id,account_number_of_new_account,account_number_of_old_account,amount,"SAVINGS",organization_name,organization_role,)) + connector.connection.commit() + return True + except Exception as e: + print("Error in create_sacings_account_for_for_exsisting_user_organization",e) + return False + def create_savings_account_for_new_user_individual(first_name,last_name,branch_id,nic,telephone,home_town,date_of_birth,first_deposit,account_number): connector = Connector() try: with connector: - connector.cursor.execute(CREATE_BANK_ACCOUNT_FOR_NEW_USERS,(first_name,last_name,branch_id,nic,telephone,home_town,date_of_birth,first_deposit,account_number,'SAVINGS')) + connector.cursor.execute(CREATE_BANK_ACCOUNT_FOR_NEW_USERS,(first_name,last_name,branch_id,nic,telephone,home_town,date_of_birth,first_deposit,account_number,'SAVINGS',)) connector.connection.commit() return True except Exception as e: @@ -102,13 +114,34 @@ def create_current_account_for_new_user_individual(first_name,last_name,branch_i connector = Connector() try: with connector: - connector.cursor.execute(CREATE_BANK_ACCOUNT_FOR_NEW_USERS,(first_name,last_name,branch_id,nic,telephone,home_town,date_of_birth,first_deposit,account_number,'CURRENT')) + connector.cursor.execute(CREATE_BANK_ACCOUNT_FOR_NEW_USERS,(first_name,last_name,branch_id,nic,telephone,home_town,date_of_birth,first_deposit,account_number,'CURRENT',)) connector.connection.commit() return True except Exception as e: print("Error in create_current_account_for_exsisting_user",e) return False +def create_savings_account_for_new_organization(first_name,last_name,branch_id,nic,telephone,home_town,date_of_birth,first_deposit,account_number,organization_name,organization_role): + connector = Connector() + try: + with connector: + connector.cursor.execute(CREATE_BANK_ACCOUNT_FOR_ORGANIZATION,(organization_name,organization_role,first_name,last_name,branch_id,nic,telephone,home_town,date_of_birth,first_deposit,account_number,'SAVINGS',)) + connector.connection.commit() + return True + except Exception as e: + print("Error in create_savings_account_new_organization",e) + return False + +def create_current_account_for_new_organization(first_name,last_name,branch_id,nic,telephone,home_town,date_of_birth,first_deposit,account_number,organization_name,organization_role): + connector = Connector() + try: + with connector: + connector.cursor.execute(CREATE_BANK_ACCOUNT_FOR_ORGANIZATION,(organization_name,organization_role,first_name,last_name,branch_id,nic,telephone,home_town,date_of_birth,first_deposit,account_number,'CURRENT',)) + connector.connection.commit() + return True + except Exception as e: + print("Error in create_current_account_for_new_organization",e) + return False @bank_account_app.route('/transfer',methods = DEFUALT_SUBMISSION_METHODS,endpoint='transfer') @valid_session @@ -201,6 +234,33 @@ def create_fixed_account_existing_individual(): return redirect('/dashboard') elif request.method == 'GET': return render_template('bankAccount/existingFixedIndividual.html') + +@bank_account_app.route('/organization/savings/exsisting',methods = DEFUALT_SUBMISSION_METHODS,endpoint='create_savings_account_exsisting_org') +@valid_employee +@valid_session +def create_savings_account_existing_organization(): + if request.method == 'POST': + brach_id = get_branch_id(session['user_id']) + savings_account_id = get_savings_account_id(request.form['account_number']) + organization_name = request.form['organization_name'] + organization_role = request.form['organization_role'] + first_name_and_no_of_accounts = get_customer_first_name_and_no_accounts(str(request.form['account_number'])) + if first_name_and_no_of_accounts is None: + flash("User Doesn't Exists", 'Error') + return redirect(url_for('bank_account.create_savings_account_organization_new')) + ascii_values = [ord(char) for char in first_name_and_no_of_accounts['first_name']] + new_account_number = f"{str(brach_id['branch_id'])}-{str(sum(ascii_values)%1000)}-{str(first_name_and_no_of_accounts['number_of_accounts']+1)}" + if savings_account_id is None: + flash("Savings Account doesn't Exists", 'Error') + return redirect(url_for('bank_account.create_fixed_account_exsisting')) + if creat_savings_account_for_for_exsisting_user_organization(session['user_id'],new_account_number,request.form['account_number'],request.form['first_deposit'],organization_name,organization_role): + flash("Savings Account Created Successfully", 'Account') + return redirect('/dashboard') + else: + flash("Savings Account Creation Failed", 'Error') + return redirect('/dashboard') + elif request.method == 'GET': + return render_template('bankAccount/existingSavingOrganization.html') @bank_account_app.route('/create-new/savings',methods = DEFUALT_SUBMISSION_METHODS,endpoint='create_savings_account_new') @valid_employee @@ -263,4 +323,75 @@ def create_current_account_new_individual(): elif request.method == 'GET': context = get_branch_id(session['user_id']) print("context",context) - return render_template('bankAccount/newSavingsIndividual.html',context=context) \ No newline at end of file + return render_template('bankAccount/newSavingsIndividual.html',context=context) + + + + +@bank_account_app.route('/organization/savings/new',methods = DEFUALT_SUBMISSION_METHODS,endpoint='create_savings_account_organization_new') +@valid_employee +@valid_session +def create_savings_account_new_organization(): + if request.method == 'POST': + first_name = request.form['first_name'] + last_name = request.form['last_name'] + branch_id = request.form['branch_id'] + nic = request.form['nic'] + telephone = request.form['telephone'] + home_town = request.form['home_town'] + date_of_birth = request.form['date_of_birth'] + first_deposit = request.form['first_deposit'] + organization_name = request.form['organization_name'] + organization_role = request.form['organization_role'] + ascii_values = [ord(char) for char in (first_name+last_name)] + new_account_number = f"{str(branch_id)}-{str(sum(ascii_values)%1000)}-{str(1)}" + print(first_name,last_name,branch_id,nic,telephone,home_town,date_of_birth,first_deposit,new_account_number,organization_name,organization_role) + + if check_firstname_and_last_name_exsists(first_name,last_name): + flash("User Already Exists", 'Error') + return redirect(url_for('bank_account.create_savings_account_organization_new')) + if create_savings_account_for_new_organization(first_name,last_name,branch_id,nic,telephone,home_town,date_of_birth,first_deposit,new_account_number,organization_name,organization_role): + flash("Account Created Successfully","Account Creation") + return redirect('/dashboard') + else: + flash("Error Occured ", "Error") + return redirect('/dashboard') + + elif request.method == 'GET': + context = get_branch_id(session['user_id']) + print("context",context) + return render_template('bankAccount/newSavingsOrganization.html',context=context) + +@bank_account_app.route('/organization/current/new',methods = DEFUALT_SUBMISSION_METHODS,endpoint='create_current_account_organization_new') +@valid_employee +@valid_session +def create_current_account_new_organization(): + if request.method == 'POST': + first_name = request.form['first_name'] + last_name = request.form['last_name'] + branch_id = request.form['branch_id'] + nic = request.form['nic'] + telephone = request.form['telephone'] + home_town = request.form['home_town'] + date_of_birth = request.form['date_of_birth'] + first_deposit = request.form['first_deposit'] + organization_name = request.form['organization_name'] + organization_role = request.form['organization_role'] + ascii_values = [ord(char) for char in (first_name+last_name)] + new_account_number = f"{str(branch_id)}-{str(sum(ascii_values)%1000)}-{str(1)}" + print(first_name,last_name,branch_id,nic,telephone,home_town,date_of_birth,first_deposit,new_account_number,organization_name,organization_role) + + if check_firstname_and_last_name_exsists(first_name,last_name): + flash("User Already Exists", 'Error') + return redirect(url_for('bank_account.create_savings_account_organization_new')) + if create_current_account_for_new_organization(first_name,last_name,branch_id,nic,telephone,home_town,date_of_birth,first_deposit,new_account_number,organization_name,organization_role): + flash("Account Created Successfully","Account Creation") + return redirect('/dashboard') + else: + flash("Error Occured ", "Error") + return redirect('/dashboard') + + elif request.method == 'GET': + context = get_branch_id(session['user_id']) + print("context",context) + return render_template('bankAccount/newCurrentOrganization.html',context=context) \ No newline at end of file diff --git a/Configurations/configurations.py b/Configurations/configurations.py index 5a59834..0517245 100644 --- a/Configurations/configurations.py +++ b/Configurations/configurations.py @@ -45,7 +45,6 @@ def wrapped_view(*args, **kwargs): def valid_employee(view_func): @wraps(view_func) def wrapped_view(*args, **kwargs): - if session.get('user_role') != 'EMPLOYEE': abort(403) return view_func(*args, **kwargs) diff --git a/Database/connection.py b/Database/connection.py index 152ba07..c210d93 100644 --- a/Database/connection.py +++ b/Database/connection.py @@ -29,7 +29,7 @@ def connect(self): self.cursor = self.connection.cursor() return self.cursor except Exception as e: - print("Exception has happened in connect ! Error : ",e) + print("Exception has happened in connect ! Error : ",e.message) return None diff --git a/Database/database_quaries.py b/Database/database_quaries.py index 8697c1c..b0e66da 100644 --- a/Database/database_quaries.py +++ b/Database/database_quaries.py @@ -24,7 +24,9 @@ CREATE_FIXED_DEPOSIT = 'call create_fixed_deposit_for_existing_user(%s,%s,%s,%s)' GET_SAVINGS_ACCOUNT_ID = 'SELECT savings_account_id FROM savings_account WHERE account_id = (SELECT account_id FROM account WHERE account_number = %s)' CHECK_ACCOUNT_IS_VALID = 'SELECT account_id FROM account WHERE account_number = %s' - +CREATE_BANK_ACCOUNT_FOR_ORGANIZATION = 'call create_bank_account_for_organization(%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s)' +CHECK_IF_ORGANIZATION_EXISTS = 'SELECT name FROM organization WHERE name = %s' +CREATE_BANK_ACCOUNT_FOR_EXSISTING_ORGANIZATION = 'create_organization_account_for_existing_user(%s,%s,%s,%s,%s,%s,%s)' SELECT_USERNAME = 'SELECT username FROM user WHERE username = %s' SELECT_PASSWORD = 'SELECT password FROM user WHERE username = %s' diff --git a/Loan/loan.py b/Loan/loan.py index 3d5bdf6..93aa05e 100644 --- a/Loan/loan.py +++ b/Loan/loan.py @@ -16,7 +16,9 @@ def apply_for_online_loan(user_id,fixed_deposit_id,amount,duration,interest_rate connector.connection.commit() return True except Exception as e: - print("Error in apply_for_online_loan",e) + error_code, error_message = e.args + print(error_code, error_message) + flash(error_message,"Error") return False def get_user_details(user_id): @@ -70,5 +72,4 @@ def online_loan(): flash("Your loan has been accepted and loan amount has been transfered to your account","success") return redirect('/dashboard') else: - flash("Something went wrong") return redirect('/loan/online_loan') \ No newline at end of file diff --git a/templates/bankAccount/existingSavingOrganization.html b/templates/bankAccount/existingSavingOrganization.html new file mode 100644 index 0000000..931f775 --- /dev/null +++ b/templates/bankAccount/existingSavingOrganization.html @@ -0,0 +1,139 @@ + + + + + + + + + + + + + + + + + Bank + + + +
+
+ + + + + +

Employee

+ +
+
+ + + + + +
+ +
+ + {% with messages = get_flashed_messages(with_categories=True) %} + {% if messages %} +
+ {% for category, message in messages %} +
{{category}}
+
{{message}}
+ {% endfor %} +
+ {% endif %} + {% endwith %} + + + +
+ +
+ + +
Create Savings Account
+
+ +
+
+ +
+ +
+
+ +
+
+ +
+
+ +
+
+ + + + + +
+
+ +
+ + +
+ +
+ +
+
+
The Customer details are correct and the Cutomer has agreed to the
terms & Conditions
+
+ + +
+
+ + + +
+ + + + +
+ + + + + + + + + + + + \ No newline at end of file diff --git a/templates/bankAccount/existingUserCreateMain.html b/templates/bankAccount/existingUserCreateMain.html index 8dbbf5a..bda36a3 100644 --- a/templates/bankAccount/existingUserCreateMain.html +++ b/templates/bankAccount/existingUserCreateMain.html @@ -84,7 +84,7 @@

×
Individual - Organization + Organization
diff --git a/templates/bankAccount/newSavingsOrganizationhtml b/templates/bankAccount/newCurrentOrganization.html similarity index 95% rename from templates/bankAccount/newSavingsOrganizationhtml rename to templates/bankAccount/newCurrentOrganization.html index 9630955..dbc0e02 100644 --- a/templates/bankAccount/newSavingsOrganizationhtml +++ b/templates/bankAccount/newCurrentOrganization.html @@ -5,6 +5,7 @@ + @@ -23,6 +24,17 @@ + + {% with messages = get_flashed_messages(with_categories=True) %} + {% if messages %} +
+ {% for category, message in messages %} +
{{category}}
+
{{message}}
+ {% endfor %} +
+ {% endif %} + {% endwith %}
@@ -50,7 +62,7 @@

Employee

-
Create Savings Account for Individuals
+
Create Savings Account for Organizations
diff --git a/templates/bankAccount/newSavingsOrganization.html b/templates/bankAccount/newSavingsOrganization.html new file mode 100644 index 0000000..dbc0e02 --- /dev/null +++ b/templates/bankAccount/newSavingsOrganization.html @@ -0,0 +1,196 @@ + + + + + + + + + + + + + + + + + Bank + + + + + {% with messages = get_flashed_messages(with_categories=True) %} + {% if messages %} +
+ {% for category, message in messages %} +
{{category}}
+
{{message}}
+ {% endfor %} +
+ {% endif %} + {% endwith %} +
+
+ + + + + +

Employee

+ +
+
+ + + +
+ +
+ + + + + +
+ +
+ + +
Create Savings Account for Organizations
+
+ +
+
+ +
+ +
+
+
+
+ Organization Name +
+ +
+ +
+
+ Organization Role +
+ +
+ +
+
+ First Name +
+ +
+ +
+ +
+ Last Name +
+ +
+ +
+
+ NIC No. +
+ +
+ +
+
+ Branch ID +
+ {% if context %} + + {% else %} + + {% endif %} +
+ +
+ +
+ Telephone +
+ +
+ +
+
+ HomeTown +
+ +
+ +
+ +
+ Date of Birth +
+ +
+ +
+
+ First Deposit +
+ +
+ +
+
+
+ +
+
+
The Customer details are correct and the Cutomer has agreed to the
terms & Conditions
+
+ + +
+
+ + + +
+ + + + +
+ + + + + + + + + + + + \ No newline at end of file diff --git a/templates/bankAccount/newUserCreationMain.html b/templates/bankAccount/newUserCreationMain.html index d009ee6..f8879d8 100644 --- a/templates/bankAccount/newUserCreationMain.html +++ b/templates/bankAccount/newUserCreationMain.html @@ -79,7 +79,7 @@

×
Individual - Organization + Organization
@@ -93,7 +93,7 @@

×
Individual - Organization + Organization
diff --git a/templates/loan/OnlineLoan.html b/templates/loan/OnlineLoan.html index 09ded64..bc409b4 100644 --- a/templates/loan/OnlineLoan.html +++ b/templates/loan/OnlineLoan.html @@ -5,6 +5,7 @@ Online loan + @@ -21,6 +22,17 @@ } + + {% with messages = get_flashed_messages(with_categories=True) %} + {% if messages %} +
+ {% for category, message in messages %} +
{{category}}
+
{{message}}
+ {% endfor %} +
+ {% endif %} + {% endwith %} @@ -52,10 +52,11 @@

Employee

From e8cd93000c2d673eb4519d6d1d3bf830d8f46c1a Mon Sep 17 00:00:00 2001 From: dilumin <77558016+dilumin@users.noreply.github.com> Date: Tue, 31 Oct 2023 16:16:55 +0530 Subject: [PATCH 05/40] loan request and appoval page made --- static/css/loanRequest.css | 797 ++++++++++++++++++ ...zationhtml => newSavingsOrganization.html} | 0 templates/dashboard/manager_dashbaord.html | 2 +- templates/loan/loanRequest.html | 126 +++ templates/user_details.html | 8 +- 5 files changed, 931 insertions(+), 2 deletions(-) create mode 100644 static/css/loanRequest.css rename templates/bankAccount/{newSavingsOrganizationhtml => newSavingsOrganization.html} (100%) create mode 100644 templates/loan/loanRequest.html diff --git a/static/css/loanRequest.css b/static/css/loanRequest.css new file mode 100644 index 0000000..bb670f6 --- /dev/null +++ b/static/css/loanRequest.css @@ -0,0 +1,797 @@ +*{ + padding: 0; + margin: 0; + text-decoration: none; + list-style: none; + box-sizing: border-box; + +} + +html{ + height: 100%; +} +body { + width: auto; + margin: 0; + min-height: 100%; + background-repeat: no-repeat; + background-attachment: fixed; + background-size: cover; + background-position: center; + /* background-image: linear-gradient(to bottom right, #000428 , #243b55); */ + background-color: #000000; + margin: 0; + padding: 0; + background-image: url('img/group-131.png'); /* Replace 'your-image.jpg' with the path to your image */ + background-size: cover; + + background-attachment: fixed; + background-position: center; + background-repeat: no-repeat; + /* background-image: linear-gradient(to top, #09203f 0%, #537895 100%); background: linear-gradient(14deg, #205360 30.78%, #112731 65.44%, #13252E 95.83%, #13252E 98.9%); */ +} + +.first-row{ + display: flex; + display: flex; + align-items: center; + justify-content: center; + margin-right: 30px; + +} +.log-out{ + width: 40px; + margin-top: 30px; + margin-right: 60px; +} + +.log-out:hover{ + cursor: pointer; +} + + +.logo-container{ + margin-right: -60px; + margin-top: 30px; + width: 100%; + display: flex; + align-items: center; + justify-content: center; +} + +.logo_img{ + width: 40px; + height: 40px; + flex-shrink: 0; + margin-right: 20px; +} +.logo{ + font-family: "Righteous"; + display: block; + color: #ffffff; + text-align: center; + font-size: 40px; + font-style: normal; + font-weight: 400; + line-height: normal; +} +.nav-bar { + + font-family: "Poppins"; + margin-top: 40px; + /*margin-bottom: 40px;*/ + margin-left: 0px; + margin-right: 0px; + /* border-bottom: 1px solid #0c0230; */ + /* position: sticky; */ + top: 0; + z-index: 999; + background-color: transparent; + /* From https://css.glass */ + border-radius: 16px; + margin-top: 40px; + margin-bottom: 40px; + margin-left: 150px; + margin-right: 150px; + + /* background-color: #232e79; */ + } + + .nav-bar.glass { + border-radius: 0; + background: rgba(255, 255, 255, 0.50); + box-shadow: 0 4px 30px rgba(0, 0, 0, 0.1); + backdrop-filter: blur(18.9px); + -webkit-backdrop-filter: blur(18.9px); + } + + + + .navlist { + display: flex; + justify-content: space-around; + } + + + .aa { + display: block; + text-decoration: none; + color: #ffffff; + text-align: center; + font-family: Rubik; + font-size: 20px; + font-style: normal; + font-weight: 500; + line-height: normal; + padding: 10px; + padding-left: 15px; + padding-right: 15px; + + } + + .aa:hover, + .active { + color: #000000; + cursor: pointer; + background-color: #ffffffde; + border-radius: 6px; + font-weight: bold; + /* From https://css.glass */ + background: #ffffff; + border-radius: 16px; + transition: all 0.2s ease-in-out; + } + + + .aa-but{ + background: transparent; + border: none; + display: block; + text-decoration: none; + color: #ffffff; + text-align: center; + font-family: Roboto; + font-size: 18px; + font-style: normal; + font-weight: 400; + line-height: normal; + display: block; + text-decoration: none; + color: #ffffff; + text-align: center; + font-family: Rubik; + font-size: 20px; + font-style: normal; + font-weight: 500; + line-height: normal; + padding: 10px; + padding-left: 15px; + padding-right: 15px; + + } + .aa-but:hover{ + cursor: pointer; + } + .inputs{ + margin-top: 20px; + margin-bottom: 15px; + + + } + .aa-but:hover, + .active { + color: #000000; + cursor: pointer; + background-color: #ffffffde; + border-radius: 6px; + font-weight: bold; + /* From https://css.glass */ + background: #ffffff; + border-radius: 16px; + transition: all 0.2s ease-in-out; + } +/* Remove underlines and style anchor elements */ +#nav-list1 .op1 { + + text-decoration: none; /* Remove underlines */ +/* Adjust font size if desired */ + margin: 0 10px; /* Add some spacing between links */ +} + +.user-detail-head{ + border-radius: 5px; + background-color: #0e5875; + display: flex; + justify-content: center; + text-align: center; + font-family: Rubik; + font-size: 24px; + color: #ffffff; + margin-bottom: 20px; + margin-bottom: 60px ; + } + +/* Style links on hover */ + + +.li{ + display: block; +} + + +.tile{ + + /* width: 1469px;*/ + height: 620px; + /* height: 100%; */ + width: 100%; + flex-shrink: 0; + border-radius: 30px; + /* border: 1px solid #000; */ + /* background: rgba(0, 0, 0, 0.54); */ + /* box-shadow: 0px 4px 40px 0px rgba(0, 0, 0, 0.25) inset, 0px 4px 24px -1px rgba(0, 0, 0, 0.25), 0px 4px 4px 0px rgba(0, 0, 0, 0.25); */ +} +.first{ + display: flex; + justify-content: space-between; + margin-bottom: 50px; + align-self: auto; + margin-left: 180px; + margin-right: 100px; + margin-top: 60px; + align-items: center; + + +} + +.ab-info{ + width: 277px; + height: 260px; + flex-shrink: 0; + border-radius: 20px; + /* background: #023047; */ + box-shadow: 0px 4px 40px 0px rgba(0, 0, 0, 0.19); + display: block; + filter: drop-shadow(0px 4px 4px rgba(0, 0, 0, 0.25)); + backdrop-filter: blur(2px); + + border: 1px solid rgba(142, 202, 230, 0.17); + background: linear-gradient(180deg, rgba(0, 0, 0, 0.20) 2.08%, rgba(0, 0, 0, 0.06) 47.92%, rgba(0, 0, 0, 0.20) 100%), linear-gradient(137deg, rgba(2, 48, 71, 0.38) 21.18%, rgba(2, 48, 71, 0.07) 57.4%, rgba(2, 48, 71, 0.00) 100%); + box-shadow: 0px 4px 30px 0px rgba(0, 0, 0, 0.17); + backdrop-filter: blur(30px); + + + + +} +.welcome{ + color: white; + text-align: center; + text-shadow: 0px 4px 4px rgba(0, 0, 0, 0.25); + font-family: Rubik ; + font-size: 64px; + font-style: normal; + font-weight: 500; + line-height: normal; + + width: 531px; + height: 235px; +} +.notice-tile{ + border-radius: 20px; + filter: drop-shadow(0px 4px 4px rgba(0, 0, 0, 0.25)); + backdrop-filter: blur(2px); + box-shadow: 0px 4px 30px 0px rgba(0, 0, 0, 0.17); + backdrop-filter: blur(30px); + width: 416px; + /* height: 277px; */ + padding-bottom: 60px; + flex-shrink: 0; + + border: 1px solid rgba(142, 202, 230, 0.17); + background: linear-gradient(180deg, rgba(0, 0, 0, 0.20) 2.08%, rgba(0, 0, 0, 0.06) 47.92%, rgba(0, 0, 0, 0.20) 100%), linear-gradient(137deg, rgba(2, 48, 71, 0.38) 21.18%, rgba(2, 48, 71, 0.07) 57.4%, rgba(2, 48, 71, 0.00) 100%); + box-shadow: 0px 4px 30px 0px rgba(0, 0, 0, 0.17); + backdrop-filter: blur(30px); + +} +.dashboard{ + display: flex; + margin-left: 100px; + margin-right: 100px; + justify-content: space-between; + margin-bottom: 100px; + + +} +.info{ + border-radius: 20px; + border: 1px solid #8ECAE6; + background: linear-gradient(180deg, rgba(0, 0, 0, 0.20) 2.08%, rgba(0, 0, 0, 0.06) 47.92%, rgba(0, 0, 0, 0.20) 100%), linear-gradient(137deg, rgba(2, 48, 71, 0.78) 21.18%, rgba(2, 48, 71, 0.00) 100%); + box-shadow: 0px 4px 30px 0px rgba(0, 0, 0, 0.17); + backdrop-filter: blur(30px); + width: 100%; + padding-top: 50px; + padding-bottom: 100px; + flex-shrink: 0; + + border-radius: 20px; + border: 1px solid rgba(142, 202, 230, 0.17); + background: linear-gradient(180deg, rgba(0, 0, 0, 0.20) 2.08%, rgba(13, 16, 28, 0.15) 47.92%, rgba(0, 0, 0, 0.20) 100%), linear-gradient(137deg, rgba(2, 48, 71, 0.38) 21.18%, rgba(2, 48, 71, 0.07) 57.4%, rgba(2, 48, 71, 0.00) 100%); + box-shadow: 0px 4px 30px 0px rgba(0, 0, 0, 0.17); + backdrop-filter: blur(30px); +} +.CE-container{ + width: 420px; + padding-top: 10px; + padding-bottom: 40px; + flex-shrink: 0; + border-radius: 20px; + border: 1px solid #8ECAE6; + background: linear-gradient(180deg, rgba(0, 0, 0, 0.20) 2.08%, rgba(0, 0, 0, 0.06) 47.92%, rgba(0, 0, 0, 0.20) 100%), linear-gradient(137deg, rgba(2, 48, 71, 0.78) 21.18%, rgba(2, 48, 71, 0.00) 100%); + box-shadow: 0px 4px 30px 0px rgba(0, 0, 0, 0.17); + backdrop-filter: blur(30px); + height: 100%; + + border-radius: 20px; + border: 1px solid rgba(142, 202, 230, 0.17); + background: linear-gradient(180deg, rgba(0, 0, 0, 0.20) 2.08%, rgba(13, 16, 28, 0.15) 47.92%, rgba(0, 0, 0, 0.20) 100%), linear-gradient(137deg, rgba(2, 48, 71, 0.38) 21.18%, rgba(2, 48, 71, 0.07) 57.4%, rgba(2, 48, 71, 0.00) 100%); + box-shadow: 0px 4px 30px 0px rgba(0, 0, 0, 0.17); + backdrop-filter: blur(30px); + +} +.total1{ + color: white; + font-family: Manrope; + font-size: 24px; + font-style: normal; + font-weight: 700; + line-height: normal; + letter-spacing: 0.48px; +} +.blocc{ + display: block; +} + +.numAccounts{ + color: #FFF; + font-family: Manrope; + font-size: 54px; + font-style: normal; + font-weight: 800; + line-height: normal; +} + +/* -------------------------------------------------------- */ + + /* ------------------------------------------------- */ + + .account-s{ + + display: flex; + justify-items: flex-start; + + + } + + .accountNum .accountStats .amount{ + display: block; + + } + +.table-head{ + color: #f1e7e7; + text-align: center; + font-family: Manrope; + font-size: 28px; +} + + + +table{ + width: 100%; + text-align: center; + color: #ffffff; + text-align: center; + font-family: Rubik; + font-size: 22px; + +} + + + + +.accounts{ + /* display: flex; */ + display: grid; + grid-template-columns: 2fr 2fr 2fr; + margin-left: 100px; + align-items: center; + margin-bottom: 20px; + justify-content: space-between; + margin-right: 100px; + color: #FFF; + text-align: center; + font-family: Manrope; + font-size: 20px; + font-style: normal; + font-weight: 500; + line-height: normal; + letter-spacing: 0.32px; +} +.notice-list{ + margin-right: 20px; + margin-left: 20px; + margin-top: 20px; + font-family: roboto; + color: white; + font-size: 18px; + list-style-type: circle; +} +.notic{ + font-family: Manrope; + padding-bottom: 7px; +} + +.footer{ + display: flex; + margin-right: 25px; + margin-left: 25px; + justify-content: center; + margin-bottom: 20px; + align-items: center; + padding-bottom: 20px; +} + + + +.dropbtn { + border-radius: 12px; + border: 2px solid #105e6c; + font-family: Manrope; + font-weight: bold; + color: white; + font-size: 20px; + background-color: transparent; + display: flex; + align-items: center; + justify-content: center; + column-gap: var(--gap); + padding: 1rem; + cursor: pointer; + /* border-radius: var(--radius); */ + + box-shadow: var(--shadow); + position: relative; +} + +.dropdown { + display: block; + width: 150px; + margin: 0; + padding: 0; + box-sizing: border-box; + font-family: "Inter", sans-serif; + --shadow: rgba(0, 0, 0, 0.05) 0px 6px 10px 0px, + rgba(0, 0, 0, 0.1) 0px 0px 0px 1px; + --color: #166e67; + --gap: 0.5rem; + --radius: 5px; + margin-right: 20px; +} + +.dropdown-content { + + display: none; + position: absolute; + background-color: #4c7781; + min-width: 160px; + box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2); + z-index: 1; +} + +.dropdown-content a { + display: flex; + align-items: center; + column-gap: var(--gap); + padding: 0.8rem 1rem; + text-decoration: none; + color: black; +} + +.dropdown-content a:hover {background-color: #1A414C} + +.dropdown:hover .dropdown-content { + display: block; +} + +.dropdown:hover .dropbtn { + background-color: transparent; +} + +/* -------------------------------------- */ + +.box { + width: 40%; + margin: 0 auto; + background: rgba(255,255,255,0.2); + padding: 35px; + border: 2px solid #fff; + border-radius: 20px/50px; + background-clip: padding-box; + text-align: center; +} + +/* .button { + font-size: 1em; + padding: 10px; + color: #fff; + border: 2px solid #06D85F; + border-radius: 20px/50px; + text-decoration: none; + cursor: pointer; + transition: all 0.3s ease-out; +} +.button:hover { + background: #06D85F; +} */ + +.overlay { + position: fixed; + top: 0; + bottom: 0; + left: 0; + right: 0; + background: rgba(0, 0, 0, 0.7); + transition: opacity 500ms; + visibility: hidden; + opacity: 0; +} +.overlay:target { + visibility: visible; + opacity: 1; +} + +.popup { + margin: 70px auto; + padding: 20px; + background: #fff; + border-radius: 5px; + width: 30%; + position: relative; + transition: all 3s ease-in-out; + + border-radius: 40px; + background: linear-gradient(0deg, rgba(255, 255, 255, 0.13) 0%, rgba(255, 255, 255, 0.13) 100%), rgba(18, 92, 129, 0.22); + box-shadow: 0px 4px 30px 0px rgba(0, 0, 0, 0.17); + backdrop-filter: blur(30px); +} + +.popup h2 { + margin-top: 0; + color: #333; + font-family: Rubik; +} +.popup .close { + position: absolute; + top: 20px; + right: 30px; + transition: all 200ms; + font-size: 30px; + font-weight: bold; + text-decoration: none; + color: #333; +} +.popup .close:hover { + color: #adc5d1; +} +.popup .content { + max-height: 30%; + overflow: auto; +} + +@media screen and (max-width: 700px){ + .box{ + width: 70%; + } + .popup{ + width: 70%; + } +} + +.btn{ + border-radius: 12px; + border: 2px solid #a9e1f5; + font-family: Manrope; + font-weight: bold; + font-size: 20px; + background-color: transparent; + display: flex; + align-items: center; + justify-content: center; + column-gap: var(--gap); + padding: 0.6rem; + cursor: pointer; + /* border-radius: var(--radius); */ + + box-shadow: var(--shadow); + position: relative; + margin-bottom: 20px; + color: #7bbfcb ; + width: 200px; + text-decoration: none; +} + +.btn:hover { + /* background-color: var(--color); */ + background-color: #10252c; + color: #034b6f; + transition: 0.2s; +} +.btn:active { + transform: scale(0.98); +} + +.buttons { + display: flex; + flex-direction: column; + justify-content: center; + margin-top: 25px; + align-items: center; + text-decoration: none; +} +/* -------------------------- banner*/ + +.banner-text { + position: absolute; + top: 80%; + left: 50%; + transform: translate(-50%, -50%); + text-align: center; +} + +.banner-text1 { + font-family: Rubik; + font-size: 50px; + font-weight: 700; + color: #bcb7b5; + margin-bottom: 20px; +} + +.banner-text2 { + font-family: 'Open Sans', sans-serif; + font-size: 24px; + font-weight: 400; + color: #fff; +} +.first-container{ + display: flex; + margin-left: 50px; + align-items: center; + /* justify-content:space-between; */ + margin-right: 50px; + margin-bottom: 50px; +} +.button-con{ + display: flex; + justify-content: space-between; +} +.aa-but{ + background: transparent; + border: none; + display: block; + text-decoration: none; + color: #ffffff; + text-align: center; + font-family: Roboto; + font-size: 18px; + font-style: normal; + font-weight: 400; + line-height: normal; + +} +.aa-but:hover{ + cursor: pointer; +} +.inputs{ + margin-top: 20px; + margin-bottom: 15px; + + +} +.emailCon{ + display: flex; + flex-direction: column; + justify-content: space-between; + align-items: center; +} +.ab{ + padding-left: 20px; + display: flex; + align-items: center; + width: 480px; + height: 45px; + flex-shrink: 0; + border-radius: 48px; + background: #FFF; + margin-bottom: 20px; +} +.enq{ + width: 400px; + height: 45px; + font-size: 19px; + background:transparent; + border: none; + margin-left: 20px; + align-items: center; + cursor: pointer; +} +.final{ + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; +} +.SubBut{ + color: #FFF; + text-align: center; + font-family: 'Rubik'; + font-weight: 300; + font-size: 20px; + font-style: normal; + font-weight: bold; + line-height: normal; + text-transform: uppercase; + padding-left: 20px; + padding-right: 20px; + /* width: 140px; */ + height: 44px; + flex-shrink: 0; + border-radius: 48px; + border: none; + background: #00507C; + margin-bottom: 13px; + box-shadow: 0 8px 16px 0 rgba(0,0,0,0.2), 0 6px 20px 0 rgba(0,0,0,0.19); + + + } + + + .SubBut:hover{ + cursor: pointer; + box-shadow: 0 12px 16px 0 rgba(0,0,0,0.24),0 17px 50px 0 rgba(0,0,0,0.19); + + } + .SubBut:focus{ + outline: none; + opacity: 60%; + } +enq:active{ + border: none; +} +.detail-con{ + display: flex; + justify-content: center; + height: 100%; + +} +.user-detail-head{ + display: flex; + justify-content: center; + text-align: center; + font-family: Rubik; + font-size: 24px; + color: #ffffff; + padding-top: 40px; +} +.conn{ + display: flex; + justify-content:space-between; + width: 100%; + margin-left: 30px; +} +.back-arr:hover{ + cursor: pointer; +} +.back-arr:focus{ + opacity: 80%; +} diff --git a/templates/bankAccount/newSavingsOrganizationhtml b/templates/bankAccount/newSavingsOrganization.html similarity index 100% rename from templates/bankAccount/newSavingsOrganizationhtml rename to templates/bankAccount/newSavingsOrganization.html diff --git a/templates/dashboard/manager_dashbaord.html b/templates/dashboard/manager_dashbaord.html index df3f21b..9086f30 100644 --- a/templates/dashboard/manager_dashbaord.html +++ b/templates/dashboard/manager_dashbaord.html @@ -43,7 +43,7 @@

Manager

-
-
-
    -
  • - Date Time: -
    2019/12/12 23:30:01
    -
    • -
  • - Account No: -
    123442
    -
    • -
  • - Name: -
    Shyamal De Silva
    -
    • -
  • - Type: -
    Savings Account
    -
    • -
-
+
- - Account No: + + +
+
+
+ Account No: +
+
+
+ +
+
-
- + - - - - + +
TypeDate Time Amount RemarkDate Time
Withdrawal12389 2012-10-3 14:27:76210200Went well
- +
+
+
+ - - +
+
+ + +
+
+ +

Apply Now.

+ × +
+ + Savings Account + Current Account + Fixed Deposit + +
+ +
+
From 69ff4ef1ab816b2638ea0ec0c4f651a400a59d2f Mon Sep 17 00:00:00 2001 From: dilumin <77558016+dilumin@users.noreply.github.com> Date: Tue, 31 Oct 2023 23:35:12 +0530 Subject: [PATCH 17/40] error 404 made --- static/css/displayCreatedAccount.css | 4 +- static/css/error.css | 58 +++++++++++++++++++++++++++- templates/notfound.html | 13 +++++-- 3 files changed, 69 insertions(+), 6 deletions(-) diff --git a/static/css/displayCreatedAccount.css b/static/css/displayCreatedAccount.css index c2b1fc8..e7e49fa 100644 --- a/static/css/displayCreatedAccount.css +++ b/static/css/displayCreatedAccount.css @@ -825,7 +825,9 @@ enq:active{ box-shadow: 0 8px 16px 0 rgba(0,0,0,0.2), 0 6px 20px 0 rgba(0,0,0,0.19); padding-left: 10px; padding-right: 10px; + margin-bottom: 80px; } + .button1:hover{ opacity: 80%; transition: 0.2s; @@ -833,7 +835,7 @@ enq:active{ } .button1:focus{ opacity: 60%; -} +} .exit-button{ display: flex; justify-content: center; diff --git a/static/css/error.css b/static/css/error.css index eae35fd..e5eab58 100644 --- a/static/css/error.css +++ b/static/css/error.css @@ -173,4 +173,60 @@ body { } .error-pic{ width: 100%; - } \ No newline at end of file + display: flex; + justify-content: center; + margin-top: -50px; + } + .pic{ + width: 800px; + } + + +.info{ + border-radius: 20px; + border: 1px solid #8ECAE6; + background: linear-gradient(180deg, rgba(0, 0, 0, 0.20) 2.08%, rgba(0, 0, 0, 0.06) 47.92%, rgba(0, 0, 0, 0.20) 100%), linear-gradient(137deg, rgba(2, 48, 71, 0.78) 21.18%, rgba(2, 48, 71, 0.00) 100%); + box-shadow: 0px 4px 30px 0px rgba(0, 0, 0, 0.17); + backdrop-filter: blur(30px); + width: 100%; + padding-top: 20px; + padding-bottom: 20px; + flex-shrink: 0; + margin-bottom: 30px; + + border-radius: 20px; + border: 1px solid rgba(142, 202, 230, 0.17); + background: linear-gradient(180deg, rgba(0, 0, 0, 0.20) 2.08%, rgba(13, 16, 28, 0.15) 47.92%, rgba(0, 0, 0, 0.20) 100%), linear-gradient(137deg, rgba(2, 48, 71, 0.38) 21.18%, rgba(2, 48, 71, 0.07) 57.4%, rgba(2, 48, 71, 0.00) 100%); + box-shadow: 0px 4px 30px 0px rgba(0, 0, 0, 0.17); + backdrop-filter: blur(30px); +} + +.button1{ + color: #FFF; + text-align: center; + font-family: 'Rubik'; + font-weight: 300; + font-size: 20px; + font-style: normal; + font-weight: bold; + line-height: normal; + text-transform: uppercase; + width: 140px; + height: 44px; + flex-shrink: 0; + border-radius: 48px; + border: none; + background: #00507C; + margin-bottom: 13px; + box-shadow: 0 8px 16px 0 rgba(0,0,0,0.2), 0 6px 20px 0 rgba(0,0,0,0.19); + padding-left: 10px; + padding-right: 10px; +} +.button1:hover{ + opacity: 80%; + transition: 0.2s; + cursor: pointer; +} +.button1:focus{ + opacity: 60%; +} diff --git a/templates/notfound.html b/templates/notfound.html index 6dd2efe..eed1aa9 100644 --- a/templates/notfound.html +++ b/templates/notfound.html @@ -65,14 +65,19 @@
  • Settings
    • - + +
    - +
    - - +
    +
    + +
    \ No newline at end of file From 311538ee3a9d7b6d547af52794ca6e54a487efad Mon Sep 17 00:00:00 2001 From: dilumin <77558016+dilumin@users.noreply.github.com> Date: Tue, 31 Oct 2023 23:35:31 +0530 Subject: [PATCH 18/40] error 404 made --- templates/notfound.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/notfound.html b/templates/notfound.html index eed1aa9..8ecd25e 100644 --- a/templates/notfound.html +++ b/templates/notfound.html @@ -7,7 +7,7 @@ - + From 5d70b91619295443bf947ffc5d278bd5707fe8b0 Mon Sep 17 00:00:00 2001 From: yasanthaniroshan Date: Wed, 1 Nov 2023 11:03:39 +0530 Subject: [PATCH 19/40] Almost done But we f****d up --- BankAccount/bank_account.py | 149 ++++------ Configurations/configurations.py | 18 +- Dashboard/dashboard.py | 13 +- Database/database_quaries.py | 13 +- User/user.py | 91 +++++- .../bankAccount/displayCreatedAccount.html | 18 +- templates/bankAccount/transaction.html | 12 +- templates/createAccount/employeeAdding.html | 29 +- templates/dashboard/customer_dashboard.html | 8 +- templates/dashboard/manager_dashbaord.html | 15 +- templates/user/accountDetails.html | 1 + templates/user/settings.html | 216 ++++++++------ templates/user_details.html | 281 ++++++++++-------- 13 files changed, 533 insertions(+), 331 deletions(-) diff --git a/BankAccount/bank_account.py b/BankAccount/bank_account.py index 0c3b75f..0bba923 100644 --- a/BankAccount/bank_account.py +++ b/BankAccount/bank_account.py @@ -4,10 +4,20 @@ from Database.connection import Connector from Database.database_quaries import * from .models import Account,get_account_details,set_new_operation +from datetime import datetime bank_account_app = Blueprint('bank_account', __name__,template_folder='./templates',static_folder='static') +def get_user_id_from_account_number(account_number): + connector = Connector() + try: + with connector: + connector.cursor.execute(GET_USER_ID_FROM_ACCOUNT_NUMBER,(account_number,)) + return connector.cursor.fetchone() + except Exception as e: + print("Error in get_user_id_from_account_number",e) + return None def check_firstname_and_last_name_exsists(first_name,last_name): connector = Connector() @@ -124,35 +134,42 @@ def create_savings_account_for_new_user_individual(first_name,last_name,branch_i connector = Connector() try: with connector: - connector.cursor.execute(CREATE_BANK_ACCOUNT_FOR_NEW_USERS,(first_name,last_name,branch_id,nic,telephone,home_town,date_of_birth,first_deposit,account_number,'SAVINGS',)) - connector.connection.commit() - return True + connector.cursor.execute(CREATE_SAVINGS_ACCOUNT_FOR_NEW_INDIVIDUAL_USER,(first_name,last_name,branch_id,nic,telephone,home_town,date_of_birth,first_deposit,account_number,)) + context = connector.cursor.fetchone() + flash("Account Created Successfully", 'Account') + return render_template('bankAccount/displayCreatedAccount.html',context=context) + except Exception as e: - print("Error in create_savings_account_for_exsisting_user",e) - return False + error_code, error_message = e.args + flash(error_message,"Error") + return redirect(url_for('bank_account.create_savings_account_new')) def create_current_account_for_new_user_individual(first_name,last_name,branch_id,nic,telephone,home_town,date_of_birth,first_deposit,account_number): connector = Connector() try: with connector: - connector.cursor.execute(CREATE_BANK_ACCOUNT_FOR_NEW_USERS,(first_name,last_name,branch_id,nic,telephone,home_town,date_of_birth,first_deposit,account_number,'CURRENT',)) - connector.connection.commit() - return True + connector.cursor.execute(CREATE_CURRENT_ACCOUNT_FOR_NEW_INDIVIDUAL_USER,(first_name,last_name,branch_id,nic,telephone,home_town,date_of_birth,first_deposit,account_number,)) + context = connector.cursor.fetchone() + flash("Account Created Successfully", 'Account') + return render_template('bankAccount/displayCreatedAccount.html',context=context) except Exception as e: - print("Error in create_current_account_for_exsisting_user",e) - return False + error_code, error_message = e.args + flash(error_message,"Error") + return redirect(url_for('bank_account.create_current_account_new')) def create_savings_account_for_new_organization(first_name,last_name,branch_id,nic,telephone,home_town,date_of_birth,first_deposit,account_number,organization_name,organization_role): connector = Connector() try: with connector: - connector.cursor.execute(CREATE_BANK_ACCOUNT_FOR_ORGANIZATION,(organization_name,organization_role,first_name,last_name,branch_id,nic,telephone,home_town,date_of_birth,first_deposit,account_number,'SAVINGS',)) - connector.connection.commit() - return True + connector.cursor.execute(CREATE_SAVINGS_ACCOUNT_FOR_NEW_ORGANIZATION,(first_name,last_name,branch_id,nic,telephone,home_town,date_of_birth,first_deposit,account_number,organization_name,organization_role,)) + context = connector.cursor.fetchone() + flash("Account Created Successfully", 'Account') + return render_template('bankAccount/displayCreatedAccount.html',context=context) except Exception as e: - print("Error in create_savings_account_new_organization",e) - return False + error_code, error_message = e.args + flash(error_message,"Error") + return redirect(url_for('bank_account.create_savings_account_organization_new')) def create_current_account_for_new_organization(first_name,last_name,branch_id,nic,telephone,home_town,date_of_birth,first_deposit,account_number,organization_name,organization_role): connector = Connector() @@ -170,6 +187,10 @@ def create_current_account_for_new_organization(first_name,last_name,branch_id,n def transaction(): if request.method == 'POST': print(request.form['from_account_number'],request.form['to_account_number'],request.form['amount']) + user_id = get_user_id_from_account_number(request.form['to_account_number']) + if user_id is None: + flash("Given Account Number doesn't exists", 'Error') + return redirect(url_for('bank_account.transfer')) status = set_new_operation(request.form['from_account_number'],request.form['to_account_number'],request.form['amount'],request.form['remarks']) if status: flash("Transaction Successfull", 'Transaction') @@ -303,8 +324,9 @@ def create_current_account_existing_organization(): flash("Current Account doesn't Exists", 'Error') return redirect(url_for('bank_account.create_current_account_organization_new')) if creat_current_account_for_for_exsisting_user_organization(session['user_id'],new_account_number,request.form['account_number'],request.form['first_deposit'],organization_name,organization_role): - flash("Current Account Created Successfully", 'Account') - return redirect('/dashboard') + flash("Account Created Successfully","Account Creation") + context = {'account_number':new_account_number,'account_type':'SAVINGS','created_at':datetime.now().strftime("%Y-%m-%d %H:%M:%S"),'full_name':f'{first_name} {last_name}'} + return render_template('bankAccount/displayCreatedAccount.html',context=context) else: flash("Current Account Creation Failed", 'Error') return redirect('/dashboard') @@ -331,67 +353,30 @@ def create_fixed_account_existing_organization(): elif request.method == 'GET': return render_template('bankAccount/existingFixedOrganization.html') -@bank_account_app.route('/create-new/savings',methods = DEFUALT_SUBMISSION_METHODS,endpoint='create_savings_account_new') +@bank_account_app.route('/individual/savings/new',methods = DEFUALT_SUBMISSION_METHODS,endpoint='create_savings_account_new') @valid_employee -@valid_session def create_savings_account_new_individual(): if request.method == 'POST': - first_name = request.form['first_name'] - last_name = request.form['last_name'] - branch_id = request.form['branch_id'] - nic = request.form['nic'] - telephone = request.form['telephone'] - home_town = request.form['home_town'] - date_of_birth = request.form['date_of_birth'] - first_deposit = request.form['first_deposit'] - ascii_values = [ord(char) for char in (first_name+last_name)] - new_account_number = f"{str(branch_id)}-{str(sum(ascii_values)%1000)}-{str(1)}" - - if check_firstname_and_last_name_exsists(first_name,last_name): - flash("User Already Exists", 'Error') - return redirect(url_for('bank_account.create_savings_account_new')) - if create_savings_account_for_new_user_individual(first_name,last_name,branch_id,nic,telephone,home_town,date_of_birth,first_deposit,new_account_number): - flash("Account Created Successfully","Account Creation") - return redirect('/dashboard') - else: - flash("Error Occured ", "Error") - return redirect('/dashboard') - + first_name, last_name, branch_id, nic, telephone, home_town, date_of_birth, first_deposit = (request.form[key] for key in ['first_name', 'last_name', 'branch_id', 'nic', 'telephone', 'home_town', 'date_of_birth', 'first_deposit']) + account_number = get_account_number(first_name,last_name,branch_id) + return create_savings_account_for_new_user_individual(first_name,last_name,branch_id,nic,telephone,home_town,date_of_birth,first_deposit,account_number) + elif request.method == 'GET': context = get_branch_id(session['user_id']) - print("context",context) return render_template('bankAccount/newSavingsIndividual.html',context=context) -@bank_account_app.route('/create-new/current',methods = DEFUALT_SUBMISSION_METHODS,endpoint='create_current_account_new') +@bank_account_app.route('/individual/current/new',methods = DEFUALT_SUBMISSION_METHODS,endpoint='create_current_account_new') @valid_employee -@valid_session def create_current_account_new_individual(): if request.method == 'POST': - first_name = request.form['first_name'] - last_name = request.form['last_name'] - branch_id = request.form['branch_id'] - nic = request.form['nic'] - telephone = request.form['telephone'] - home_town = request.form['home_town'] - date_of_birth = request.form['date_of_birth'] - first_deposit = request.form['first_deposit'] - ascii_values = [ord(char) for char in (first_name+last_name)] - new_account_number = f"{str(branch_id)}-{str(sum(ascii_values)%1000)}-{str(1)}" - if check_firstname_and_last_name_exsists(first_name,last_name): - flash("User Already Exists", 'Error') - return redirect(url_for('bank_account.create_current_account_new')) - if create_current_account_for_new_user_individual(first_name,last_name,branch_id,nic,telephone,home_town,date_of_birth,first_deposit,new_account_number): - flash("Account Created Successfully","Account Creation") - return redirect('/dashboard') - else: - flash("Error Occured ", "Error") - return redirect('/dashboard') + first_name, last_name, branch_id, nic, telephone, home_town, date_of_birth, first_deposit = (request.form[key] for key in ['first_name', 'last_name', 'branch_id', 'nic', 'telephone', 'home_town', 'date_of_birth', 'first_deposit']) + account_number = get_account_number(first_name,last_name,branch_id) + return create_current_account_for_new_user_individual(first_name,last_name,branch_id,nic,telephone,home_town,date_of_birth,first_deposit,account_number) elif request.method == 'GET': context = get_branch_id(session['user_id']) - print("context",context) return render_template('bankAccount/newSavingsIndividual.html',context=context) @@ -402,29 +387,9 @@ def create_current_account_new_individual(): @valid_session def create_savings_account_new_organization(): if request.method == 'POST': - first_name = request.form['first_name'] - last_name = request.form['last_name'] - branch_id = request.form['branch_id'] - nic = request.form['nic'] - telephone = request.form['telephone'] - home_town = request.form['home_town'] - date_of_birth = request.form['date_of_birth'] - first_deposit = request.form['first_deposit'] - organization_name = request.form['organization_name'] - organization_role = request.form['organization_role'] - ascii_values = [ord(char) for char in (first_name+last_name)] - new_account_number = f"{str(branch_id)}-{str(sum(ascii_values)%1000)}-{str(1)}" - print(first_name,last_name,branch_id,nic,telephone,home_town,date_of_birth,first_deposit,new_account_number,organization_name,organization_role) - - if check_firstname_and_last_name_exsists(first_name,last_name): - flash("User Already Exists", 'Error') - return redirect(url_for('bank_account.create_savings_account_organization_new')) - if create_savings_account_for_new_organization(first_name,last_name,branch_id,nic,telephone,home_town,date_of_birth,first_deposit,new_account_number,organization_name,organization_role): - flash("Account Created Successfully","Account Creation") - return redirect('/dashboard') - else: - flash("Error Occured ", "Error") - return redirect('/dashboard') + first_name, last_name, branch_id, nic, telephone, home_town, date_of_birth, first_deposit, organization_name, organization_role = (request.form[key] for key in ['first_name', 'last_name', 'branch_id', 'nic', 'telephone', 'home_town', 'date_of_birth', 'first_deposit', 'organization_name', 'organization_role']) + account_number = get_account_number(first_name,last_name,branch_id) + return create_savings_account_for_new_organization(first_name,last_name,branch_id,nic,telephone,home_town,date_of_birth,first_deposit,account_number,organization_name,organization_role) elif request.method == 'GET': context = get_branch_id(session['user_id']) @@ -455,7 +420,8 @@ def create_current_account_new_organization(): return redirect(url_for('bank_account.create_savings_account_organization_new')) if create_current_account_for_new_organization(first_name,last_name,branch_id,nic,telephone,home_town,date_of_birth,first_deposit,new_account_number,organization_name,organization_role): flash("Account Created Successfully","Account Creation") - return redirect('/dashboard') + context = {'account_number':new_account_number,'account_type':'SAVINGS','created_at':datetime.now().strftime("%Y-%m-%d %H:%M:%S"),'full_name':f'{first_name} {last_name}'} + return render_template('bankAccount/displayCreatedAccount.html',context=context) else: flash("Error Occured ", "Error") return redirect('/dashboard') @@ -463,4 +429,11 @@ def create_current_account_new_organization(): elif request.method == 'GET': context = get_branch_id(session['user_id']) print("context",context) - return render_template('bankAccount/newCurrentOrganization.html',context=context) \ No newline at end of file + return render_template('bankAccount/newCurrentOrganization.html',context=context) + + + +def get_account_number(first_name,last_name,branch_id): + ascii_values = [ord(char) for char in (first_name+last_name)] + return f'{branch_id:03}-{sum(ascii_values)%1000:03}-{1:03}' + diff --git a/Configurations/configurations.py b/Configurations/configurations.py index 0517245..8639c41 100644 --- a/Configurations/configurations.py +++ b/Configurations/configurations.py @@ -1,6 +1,6 @@ from dotenv import load_dotenv import os -from flask import request, redirect, session, abort +from flask import request, redirect, session, abort,flash from functools import wraps from flask import session,redirect @@ -37,7 +37,7 @@ def valid_session(view_func): @wraps(view_func) def wrapped_view(*args, **kwargs): if 'user_id' not in session : - print('user not in session') + flash("Please login in again","Session Timeout") return redirect('/auth/login') return view_func(*args, **kwargs) return wrapped_view @@ -45,7 +45,21 @@ def wrapped_view(*args, **kwargs): def valid_employee(view_func): @wraps(view_func) def wrapped_view(*args, **kwargs): + if 'user_id' not in session : + flash("Please login in again","Session Timeout") + return redirect('/auth/login') if session.get('user_role') != 'EMPLOYEE': abort(403) return view_func(*args, **kwargs) + return wrapped_view + +def valid_manager(view_func): + @wraps(view_func) + def wrapped_view(*args, **kwargs): + if 'user_id' not in session : + flash("Please login in again","Session Timeout") + return redirect('/auth/login') + if session.get('position') != 'MANAGER': + abort(403) + return view_func(*args, **kwargs) return wrapped_view \ No newline at end of file diff --git a/Dashboard/dashboard.py b/Dashboard/dashboard.py index 06e435c..806e68d 100644 --- a/Dashboard/dashboard.py +++ b/Dashboard/dashboard.py @@ -40,6 +40,16 @@ def get_user_first_name(user_id): with connector: connector.cursor.execute(GET_FIRSTNAME_FROM_USER_ID,(user_id,)) return connector.cursor.fetchone() + +def get_fd_accounts(user_id): + connector = Connector() + try: + with connector: + connector.cursor.execute(GET_FIXED_DEPOSIT_DETAILS,(user_id,)) + return connector.cursor.fetchall() + except Exception as e: + print("Error in get_fd_accounts",e) + return False @dashboard_app.route('/',methods = DEFAULT_METHODS,endpoint='dashboard') @@ -48,8 +58,9 @@ def dashboard(): if session['user_role'] == 'CUSTOMER': context = {} context['accounts'] = get_account_details(session['user_id']) - print("context",context) + context['fixed_deposits'] = get_fd_accounts(session['user_id']) context['first_name'] = get_first_name(session['user_id']) + print("context",context) return render_template('dashboard/customer_dashboard.html',context = context) elif session['user_role'] == 'EMPLOYEE': diff --git a/Database/database_quaries.py b/Database/database_quaries.py index acae2b3..6126d78 100644 --- a/Database/database_quaries.py +++ b/Database/database_quaries.py @@ -28,6 +28,10 @@ CHECK_IF_ORGANIZATION_EXISTS = 'SELECT name FROM organization WHERE name = %s' CREATE_BANK_ACCOUNT_FOR_EXSISTING_ORGANIZATION = 'call create_account_for_existing_organization(%s,%s,%s,%s,%s,%s,%s)' CREATE_FIXED_DEPOSIT_FOR_ORGANIZATION = 'call create_fixed_deposit_for_existing_user_organization(%s,%s,%s,%s,%s,%s)' +GET_USER_ID_FROM_ACCOUNT_NUMBER = 'call get_user_id_from_account_number(%s)' +GET_FIXED_DEPOSIT_DETAILS = 'call get_fixed_accounts(%s)' +ADD_NEW_EMPLOYEE = 'call add_employee(%s,%s,%s,%s,%s,%s,%s,%s)' +GET_EMPLOYEE_DETAILS = 'SELECT employee_id,position,city FROM employee JOIN branch USING (branch_id) WHERE user_id = %s' SELECT_USERNAME = 'SELECT username FROM user WHERE username = %s' SELECT_PASSWORD = 'SELECT password FROM user WHERE username = %s' @@ -36,4 +40,11 @@ CREATE_CUSTOMER_ACCOUNT = "INSERT INTO customer (user_id) VALUES (%s)" # GET_USER_ACCOUNTS = 'SELECT account_number,account_type,balance FROM account WHERE user_id = %d' GET_EMPLOYEE_ROLE = 'SELECT position FROM employee WHERE user_id = %d' -GET_USER_ACCOUNT_DETAILS = "SELECT user.first_name,user.last_name,account_number,balance FROM account JOIN user USING (user_id) WHERE account_number = '%s'" +GET_USER_ACCOUNT_DETAILS = "SELECT user.first_name,user.last_name, user.home_town FROM account JOIN user USING (user_id) WHERE account_number = '%s'" + + +########################################### Quaries for account creation ########################################### + +CREATE_SAVINGS_ACCOUNT_FOR_NEW_INDIVIDUAL_USER = 'call create_savings_account_for_new_individual_user(%s,%s,%s,%s,%s,%s,%s,%s,%s)' +CREATE_CURRENT_ACCOUNT_FOR_NEW_INDIVIDUAL_USER = 'call create_current_account_for_new_individual_user(%s,%s,%s,%s,%s,%s,%s,%s,%s)' +CREATE_SAVINGS_ACCOUNT_FOR_NEW_ORGANIZATION = 'call create_savings_account_for_new_organization_user(%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s)' diff --git a/User/user.py b/User/user.py index e76cffe..0aea9aa 100644 --- a/User/user.py +++ b/User/user.py @@ -1,25 +1,80 @@ -from flask import Flask,session,render_template,Blueprint,request,redirect +from flask import Flask,session,render_template,Blueprint,request,redirect,flash,url_for from Settings.settings import * -from Configurations.configurations import valid_session +from Configurations.configurations import valid_session,valid_manager from Database.connection import Connector from Database.database_quaries import * user_app = Blueprint('user', __name__,template_folder='./templates',static_folder='static') +def get_emplyee_details(user_id): + connector = Connector() + try: + with connector: + connector.cursor.execute(GET_EMPLOYEE_DETAILS,(user_id,)) + return connector.cursor.fetchone() + except Exception as e: + print("Error in get_emplyee_details",e) + return None + + +def get_branch_id(user_id): + connector = Connector() + try : + with connector: + connector.cursor.execute(GET_BRANCH_ID % user_id) + return connector.cursor.fetchone() + except Exception as e: + print("Error in get_branch_id",e) + return None + + +def check_firstname_and_last_name_exsists(first_name,last_name): + connector = Connector() + try: + with connector: + connector.cursor.execute(CHECK_FIRSTNAME_AND_LASTNAME_EXISTS,(first_name,last_name,)) + return connector.cursor.fetchone() is not None + except Exception as e: + print("Error in check_firstname_and_last_name_exsists",e) + return None + + +def create_new_employee_account(manager_user_id,first_name,last_name,nic,date_of_birth,telephone,home_town,role): + connector = Connector() + try: + with connector: + connector.cursor.execute(ADD_NEW_EMPLOYEE,(manager_user_id,first_name,last_name,nic,telephone,home_town,date_of_birth,role)) + connector.connection.commit() + return True + except Exception as e: + print("Exception has happened in create_new_user ! Error : ",e) + return False + + def get_user__account_details(account_number): connector = Connector() with connector: connector.cursor.execute(GET_USER_ACCOUNT_DETAILS % account_number) return connector.cursor.fetchone() +def get_accounts_details(user_id): + connector = Connector() + with connector: + connector.cursor.execute(GET_ACCOUNT_DETAILS,(user_id,)) + return connector.cursor.fetchall() def get_user_informations(user_id): connector = Connector() with connector: - connector.cursor.execute(GET_USER_INFORMATIONS % user_id) + connector.cursor.execute(GET_USER_INFORMATIONS,(user_id,)) return connector.cursor.fetchone() +def get_user_id_from_account_number(account_number): + connector = Connector() + with connector: + connector.cursor.execute(GET_USER_ID_FROM_ACCOUNT_NUMBER,(account_number,)) + return connector.cursor.fetchone() def update_user_details(user_id,first_name,last_name,date_of_birth,telephone,home_town): connector = Connector() @@ -33,7 +88,12 @@ def update_user_details(user_id,first_name,last_name,date_of_birth,telephone,hom def user_account_details(): if request.method == 'POST': account_number = request.form['account_number'] + user_id = get_user_id_from_account_number(account_number) + if user_id == None: + flash("Invalid Account Number","Error") + return redirect('/dashboard') context = get_user__account_details(account_number) + context['accounts'] = get_accounts_details(user_id['user_id']) print(context) return render_template('user_details.html',context = context) @@ -43,8 +103,31 @@ def user_account_details(): def user_informations(): if request.method == 'GET': context = get_user_informations(session['user_id']) + employee_details = get_emplyee_details(session['user_id']) + if employee_details != None: + context['employee_details'] = employee_details + print(context) return render_template('user/settings.html',context=context) if request.method == 'POST': print(request.form) update_user_details(session['user_id'],request.form['first_name'],request.form['last_name'],request.form['date_of_birth'],request.form['telephone'],request.form['home_town']) - return redirect('/dashboard') \ No newline at end of file + return redirect('/dashboard') + + +@user_app.route('/add-emplyee',methods = DEFUALT_SUBMISSION_METHODS,endpoint='add_employee') +@valid_manager +@valid_session +def add_employee(): + if request.method == 'GET': + context = get_branch_id(session['user_id']) + return render_template('createAccount/employeeAdding.html',context=context) + elif request.method == 'POST': + if check_firstname_and_last_name_exsists(request.form['first_name'],request.form['last_name']): + flash("Employee Already Exists","Error") + return redirect(url_for('user.add_employee')) + elif create_new_employee_account(session['user_id'],request.form['first_name'],request.form['last_name'],request.form['nic'],request.form['date_of_birth'],request.form['telephone'],request.form['home_town'],request.form['role']): + flash("Employee Account Created Successfully","Success") + return redirect('/dashboard') + else: + flash("Something went wrong","Error") + return redirect('/dashboard') \ No newline at end of file diff --git a/templates/bankAccount/displayCreatedAccount.html b/templates/bankAccount/displayCreatedAccount.html index 1f17dba..66f2472 100644 --- a/templates/bankAccount/displayCreatedAccount.html +++ b/templates/bankAccount/displayCreatedAccount.html @@ -78,37 +78,37 @@

    Employee

    - + {% if context %}
    • - Date Time: -
      2019/12/12 23:30:01
      + Created At : +
      {{context.created_at}}
    • Account No: -
      123442
      +
      {{context.account_number}}
    • Name: -
      Shyamal De Silva
      +
      {{context.full_name}}
    • Type: -
      Savings Account
      +
      {{context.account_type}}
    - + {% endif %}
    +
    -
    - +

    diff --git a/templates/bankAccount/transaction.html b/templates/bankAccount/transaction.html index eb757ed..8bb084f 100644 --- a/templates/bankAccount/transaction.html +++ b/templates/bankAccount/transaction.html @@ -6,7 +6,7 @@ Document - + @@ -33,6 +33,16 @@ --> + {% with messages = get_flashed_messages(with_categories=True) %} + {% if messages %} +
    + {% for category, message in messages %} +
    {{category}}
    +
    {{message}}
    + {% endfor %} +
    + {% endif %} + {% endwith %}
    diff --git a/templates/createAccount/employeeAdding.html b/templates/createAccount/employeeAdding.html index b6d5cdd..00b0b40 100644 --- a/templates/createAccount/employeeAdding.html +++ b/templates/createAccount/employeeAdding.html @@ -23,6 +23,16 @@ + {% with messages = get_flashed_messages(with_categories=True) %} + {% if messages %} +
    + {% for category, message in messages %} +
    {{category}}
    +
    {{message}}
    + {% endfor %} +
    + {% endif %} + {% endwith %}
    @@ -82,7 +92,18 @@

    Manager

    Branch ID
    + {% if context %} + + {% else %} + {% endif %} +
    + +
    +
    + Role +
    +
    @@ -90,14 +111,14 @@

    Manager

    Telephone
    - +
    - HomeTown + Home Town
    - +
    @@ -105,7 +126,7 @@

    Manager

    Date of Birth
    - +
    diff --git a/templates/dashboard/customer_dashboard.html b/templates/dashboard/customer_dashboard.html index e957ba2..c2aff2e 100644 --- a/templates/dashboard/customer_dashboard.html +++ b/templates/dashboard/customer_dashboard.html @@ -221,11 +221,11 @@ - {% for account in context.accounts %} + {% for account in context.fixed_deposits %} - {{account.account_number}} - {{account.account_type}} - Rs {{account.balance}} + {{account.fixed_deposit_id}} + {{account.duration}} + Rs {{account.amount}} {% endfor %} diff --git a/templates/dashboard/manager_dashbaord.html b/templates/dashboard/manager_dashbaord.html index 9086f30..bb6f938 100644 --- a/templates/dashboard/manager_dashbaord.html +++ b/templates/dashboard/manager_dashbaord.html @@ -5,7 +5,8 @@ - + + @@ -25,6 +26,16 @@ + {% with messages = get_flashed_messages(with_categories=True) %} + {% if messages %} +
    + {% for category, message in messages %} +
    {{category}}
    +
    {{message}}
    + {% endfor %} +
    + {% endif %} + {% endwith %}
    @@ -206,7 +217,7 @@

    Existing Users New Users - Add Employees + Add Employees

    diff --git a/templates/user/accountDetails.html b/templates/user/accountDetails.html index 02c13da..1a2370a 100644 --- a/templates/user/accountDetails.html +++ b/templates/user/accountDetails.html @@ -5,6 +5,7 @@ + diff --git a/templates/user/settings.html b/templates/user/settings.html index 66b320d..a20a75e 100644 --- a/templates/user/settings.html +++ b/templates/user/settings.html @@ -1,111 +1,151 @@ - - - - - - - - - - - - - - Bank - - - - - -
    -
    - - - - -
    - - - - - + + + + + + + + + + + + + + Bank + + + + + +
    +
    + + + +
    - - -
    -
    - - -
    Configure Account
    - -
    -
    -
    - First Name -
    - -
    - + + + + + + +
    + + +
    + + + +
    Configure Account
    + +
    +
    +
    + First Name +
    +
    -
    - Last Name -
    - -
    +
    +
    + Last Name +
    +
    -
    - HomeTown -
    - -
    +
    +
    + HomeTown +
    +
    -
    - Telephone -
    - -
    +
    +
    + Telephone +
    +
    -
    - Birthday -
    - -
    +
    +
    + Birthday +
    +
    +
    +
    -
    -
    - - +
    + +
    + + + + {% if context.employee_details %} + +
    + Position +
    + +
    + +
    + +
    + Branch +
    + +
    - - + + {% endif %} + +
    + + + + \ No newline at end of file diff --git a/templates/user_details.html b/templates/user_details.html index 65b280c..74f3969 100644 --- a/templates/user_details.html +++ b/templates/user_details.html @@ -1,95 +1,107 @@ - - - - - - - - - - - - - - Bank - - - - {% with messages = get_flashed_messages(with_categories=True) %} - {% if messages %} -
    - {% for category, message in messages %} -
    {{category}}
    -
    {{message}}
    - {% endfor %} -
    - {% endif %} - {% endwith %} -
    -
    - - - - -

    Employee

    -
    - - - - - + + + + + + + + + + + + + + Bank + + + + {% with messages = get_flashed_messages(with_categories=True) %} + {% if messages %} +
    + {% for category, message in messages %} +
    {{category}}
    +
    {{message}}
    + {% endfor %} +
    + {% endif %} + {% endwith %} +
    +
    + + + + +

    Employee

    -
    + + + + +
    + +
    +
      + {% if context %} +
    • + First Name : +
      {{context.first_name}}
      +
      • +
    • + Last Name : +
      {{context.last_name}}
      +
      • +
    • + Address : +
      {{context.home_town}}
      • -
    • Settings
      • -
    - - - -
    + {% endif %} + +
    -
    -
      -
    • - First Name : -
      John
      -
      • -
    • - Last Name : -
      Doe
      -
      • -
    • - Address : -
      Molpe road
      -
      • -
    -
    +
    +
    + -
    - -
    - - -
    -
    -
    +
    +
    Employee line-height: normal; letter-spacing: 0.48px; margin-right: 20px;"> - The number of Accounts -
    -
    + The number of Accounts
    +
    +
    -
    - +
    -
    - - - - - - + +
    +
    Date TimeAccount NumberBalance
    + + + + + + + + + + + {% if context.accounts %} + {% for account in context.accounts %} + + + + - - - - - -
    Account NumberAccount TypeBalance
    {{account.account_number}}{{account.account_type}}{{account.balance}}
    2012-10-3 14:27:7621020021000
    -
    - -
    +
    -
    -
    +
    +
    -
    - +
    + -
    -
    +
    -
    -
    - -

    Apply Now.

    + + +
    + + - \ No newline at end of file From 88f12a5c3e90840b4dd465bc6139ee839f6a0d79 Mon Sep 17 00:00:00 2001 From: dilumin <77558016+dilumin@users.noreply.github.com> Date: Wed, 1 Nov 2023 11:59:19 +0530 Subject: [PATCH 20/40] navigation buttons working in account creations --- static/css/user_details.css | 8 ++ .../bankAccount/displayCreatedAccount.html | 3 +- .../existingCurrentIndividual.html | 5 +- .../existingCurrentOrganization.html | 5 +- .../bankAccount/existingFixedIndividual.html | 5 +- .../existingFixedOrganization.html | 5 +- .../bankAccount/existingSavingIndividual.html | 5 +- .../existingSavingOrganization.html | 5 +- .../bankAccount/existingUserCreateMain.html | 3 +- .../bankAccount/newCurrentIndividual.html | 3 +- .../bankAccount/newCurrentOrganization.html | 5 +- .../bankAccount/newSavingsIndividual.html | 3 +- .../bankAccount/newSavingsOrganization.html | 3 +- .../bankAccount/newUserCreationMain.html | 3 +- templates/bankAccount/transaction.html | 3 +- templates/bankAccount/withdraw.html | 3 +- templates/notfound.html | 2 +- templates/user_details.html | 123 ++++++++++-------- 18 files changed, 117 insertions(+), 75 deletions(-) diff --git a/static/css/user_details.css b/static/css/user_details.css index 0d1fbe0..2170331 100644 --- a/static/css/user_details.css +++ b/static/css/user_details.css @@ -350,6 +350,7 @@ flex-direction: column; padding-top: 50px; padding-bottom: 100px; flex-shrink: 0; + margin-bottom: 30px; border-radius: 20px; border: 1px solid rgba(142, 202, 230, 0.17); @@ -835,4 +836,11 @@ cursor: pointer; .back-arr:focus{ opacity: 80%; } +.back-arr{ + width: 50px; + margin-left: 15px; + margin-top: -10px; +} + + diff --git a/templates/bankAccount/displayCreatedAccount.html b/templates/bankAccount/displayCreatedAccount.html index 66f2472..662a8d8 100644 --- a/templates/bankAccount/displayCreatedAccount.html +++ b/templates/bankAccount/displayCreatedAccount.html @@ -69,7 +69,8 @@

    Employee

    - +
    Successfully Created the Account
    diff --git a/templates/bankAccount/existingCurrentIndividual.html b/templates/bankAccount/existingCurrentIndividual.html index ea20f5e..2ce08d4 100644 --- a/templates/bankAccount/existingCurrentIndividual.html +++ b/templates/bankAccount/existingCurrentIndividual.html @@ -62,12 +62,13 @@

    Employee

    -
    Create Current Account
    +
    Create Current Account for Individuals
    - +
    diff --git a/templates/bankAccount/existingCurrentOrganization.html b/templates/bankAccount/existingCurrentOrganization.html index 931f775..8348c27 100644 --- a/templates/bankAccount/existingCurrentOrganization.html +++ b/templates/bankAccount/existingCurrentOrganization.html @@ -62,12 +62,13 @@

    Employee

    -
    Create Savings Account
    +
    Create Current Accounts for Organizations
    - +
    diff --git a/templates/bankAccount/existingFixedIndividual.html b/templates/bankAccount/existingFixedIndividual.html index 5dc5338..1a8faab 100644 --- a/templates/bankAccount/existingFixedIndividual.html +++ b/templates/bankAccount/existingFixedIndividual.html @@ -62,12 +62,13 @@

    Employee

    -
    Create Savings Account
    +
    Create Fixed Accounts for Individuals
    - +
    diff --git a/templates/bankAccount/existingFixedOrganization.html b/templates/bankAccount/existingFixedOrganization.html index ef69c0d..d6b67c2 100644 --- a/templates/bankAccount/existingFixedOrganization.html +++ b/templates/bankAccount/existingFixedOrganization.html @@ -62,12 +62,13 @@

    Employee

    -
    Create Savings Account
    +
    Create Fixed Accounts for Organizations
    - +
    diff --git a/templates/bankAccount/existingSavingIndividual.html b/templates/bankAccount/existingSavingIndividual.html index 023aaf3..b985109 100644 --- a/templates/bankAccount/existingSavingIndividual.html +++ b/templates/bankAccount/existingSavingIndividual.html @@ -62,12 +62,13 @@

    Employee

    -
    Create Savings Account
    +
    Create Savings Account for Individuals
    - +
    diff --git a/templates/bankAccount/existingSavingOrganization.html b/templates/bankAccount/existingSavingOrganization.html index 931f775..af4c067 100644 --- a/templates/bankAccount/existingSavingOrganization.html +++ b/templates/bankAccount/existingSavingOrganization.html @@ -62,12 +62,13 @@

    Employee

    -
    Create Savings Account
    +
    Create Savings Account for Organization
    - +
    diff --git a/templates/bankAccount/existingUserCreateMain.html b/templates/bankAccount/existingUserCreateMain.html index 1286920..96bdf5d 100644 --- a/templates/bankAccount/existingUserCreateMain.html +++ b/templates/bankAccount/existingUserCreateMain.html @@ -57,7 +57,8 @@

    Employee

    - +
    Choose the Account Type : diff --git a/templates/bankAccount/newCurrentIndividual.html b/templates/bankAccount/newCurrentIndividual.html index ce92468..8db1382 100644 --- a/templates/bankAccount/newCurrentIndividual.html +++ b/templates/bankAccount/newCurrentIndividual.html @@ -62,7 +62,8 @@

    Employee

    - +
    diff --git a/templates/bankAccount/newCurrentOrganization.html b/templates/bankAccount/newCurrentOrganization.html index dbc0e02..94d02d9 100644 --- a/templates/bankAccount/newCurrentOrganization.html +++ b/templates/bankAccount/newCurrentOrganization.html @@ -62,12 +62,13 @@

    Employee

    -
    Create Savings Account for Organizations
    +
    Create Current Account for Organizations
    - +
    diff --git a/templates/bankAccount/newSavingsIndividual.html b/templates/bankAccount/newSavingsIndividual.html index 6b04799..d4e018a 100644 --- a/templates/bankAccount/newSavingsIndividual.html +++ b/templates/bankAccount/newSavingsIndividual.html @@ -62,7 +62,8 @@

    Employee

    - +
    diff --git a/templates/bankAccount/newSavingsOrganization.html b/templates/bankAccount/newSavingsOrganization.html index 3c984e0..0598f85 100644 --- a/templates/bankAccount/newSavingsOrganization.html +++ b/templates/bankAccount/newSavingsOrganization.html @@ -70,7 +70,8 @@

    Employee

    - +
    diff --git a/templates/bankAccount/newUserCreationMain.html b/templates/bankAccount/newUserCreationMain.html index 4252988..1767aa8 100644 --- a/templates/bankAccount/newUserCreationMain.html +++ b/templates/bankAccount/newUserCreationMain.html @@ -55,7 +55,8 @@

    Employee

    - +
    Choose the Account Type : diff --git a/templates/bankAccount/transaction.html b/templates/bankAccount/transaction.html index 8bb084f..ac321e3 100644 --- a/templates/bankAccount/transaction.html +++ b/templates/bankAccount/transaction.html @@ -61,7 +61,8 @@

    Manager

    - +
    Employee
    - +
    diff --git a/templates/notfound.html b/templates/notfound.html index 8ecd25e..e867596 100644 --- a/templates/notfound.html +++ b/templates/notfound.html @@ -68,7 +68,7 @@
    - +
    diff --git a/templates/user_details.html b/templates/user_details.html index 74f3969..d1beb2d 100644 --- a/templates/user_details.html +++ b/templates/user_details.html @@ -71,25 +71,29 @@

    Employee

    +
    -
      - {% if context %} -
    • - First Name : -
      {{context.first_name}}
      -
      • -
    • - Last Name : -
      {{context.last_name}}
      -
      • -
    • - Address : -
      {{context.home_town}}
      -
      • - - {% endif %} -
    + +
    +
      + {% if context %} +
    • + First Name : +
      {{context.first_name}}
      +
      • +
    • + Last Name : +
      {{context.last_name}}
      +
      • +
    • + Address : +
      {{context.home_town}}
      +
      • + + {% endif %} +
    +
    @@ -97,7 +101,7 @@

    Employee

    - +
    @@ -108,24 +112,12 @@

    Employee

    font-weight: 500; line-height: normal; letter-spacing: 0.48px; - margin-right: 20px;"> - The number of Accounts + margin-right: 20px; justify-content: center;"> + Savings & Current Accounts
    -
    @@ -138,13 +130,6 @@

    Employee

    - - - {% if context.accounts %} {% for account in context.accounts %} @@ -158,23 +143,57 @@

    Employee

    -
    From 176b78f19559e9cdde96b2bae8be8defe17fdf17 Mon Sep 17 00:00:00 2001 From: dilumin <77558016+dilumin@users.noreply.github.com> Date: Wed, 1 Nov 2023 12:54:17 +0530 Subject: [PATCH 21/40] settings done --- static/css/settings.css | 73 ++++++++++++++----- .../bankAccount/displayCreatedAccount.html | 2 + templates/dashboard/customer_dashboard.html | 2 + templates/user/settings.html | 64 ++++++++++------ 4 files changed, 98 insertions(+), 43 deletions(-) diff --git a/static/css/settings.css b/static/css/settings.css index 7675118..5a8903a 100644 --- a/static/css/settings.css +++ b/static/css/settings.css @@ -6,6 +6,9 @@ box-sizing: border-box; } +input{ + outline: none; +} html{ height: 100%; @@ -78,8 +81,7 @@ body { font-style: normal; font-weight: 400; line-height: normal; - } - .nav-bar { + }.nav-bar { font-family: "Poppins"; margin-top: 40px; @@ -123,7 +125,7 @@ body { color: #ffffff; text-align: center; font-family: Rubik; - font-size: 25px; + font-size: 20px; font-style: normal; font-weight: 500; line-height: normal; @@ -146,23 +148,56 @@ body { transition: all 0.2s ease-in-out; } - - .aa{ - display: block; - text-decoration: none; - color: #ffffff; - text-align: center; - font-family: Roboto; - font-size: 18px; - font-style: normal; - font-weight: 400; - line-height: normal; - - } -input{ - outline: none; + + + +.aa-but{ + background: transparent; + border: none; + display: block; + text-decoration: none; + color: #ffffff; + text-align: center; + font-family: Roboto; + font-size: 18px; + font-style: normal; + font-weight: 400; + line-height: normal; + display: block; + text-decoration: none; + color: #ffffff; + text-align: center; + font-family: Rubik; + font-size: 20px; + font-style: normal; + font-weight: 500; + line-height: normal; + padding: 10px; + padding-left: 15px; + padding-right: 15px; -} + } + .aa-but:hover{ + cursor: pointer; + } + .inputs{ + margin-top: 20px; + margin-bottom: 15px; + + + } + .aa-but:hover, + .active { + color: #000000; + cursor: pointer; + background-color: #ffffffde; + border-radius: 6px; + font-weight: bold; + /* From https://css.glass */ + background: #ffffff; + border-radius: 16px; + transition: all 0.2s ease-in-out; + } .contain{ border-radius: 32px 32px 32px 32px; diff --git a/templates/bankAccount/displayCreatedAccount.html b/templates/bankAccount/displayCreatedAccount.html index 662a8d8..906954f 100644 --- a/templates/bankAccount/displayCreatedAccount.html +++ b/templates/bankAccount/displayCreatedAccount.html @@ -76,6 +76,8 @@

    Employee

    + +
    diff --git a/templates/dashboard/customer_dashboard.html b/templates/dashboard/customer_dashboard.html index c2aff2e..a024fea 100644 --- a/templates/dashboard/customer_dashboard.html +++ b/templates/dashboard/customer_dashboard.html @@ -221,6 +221,7 @@ + {% if context.fixed_deposits %} {% for account in context.fixed_deposits %} {{account.fixed_deposit_id}} @@ -228,6 +229,7 @@ Rs {{account.amount}} {% endfor %} + {% endif %}
    diff --git a/templates/user/settings.html b/templates/user/settings.html index a20a75e..d543957 100644 --- a/templates/user/settings.html +++ b/templates/user/settings.html @@ -30,6 +30,9 @@ + + +
    + {% if context.employee_details %} +

    Employee

    + {% endif %} +
    @@ -51,15 +58,19 @@
    + +
    @@ -106,42 +117,47 @@
    -
    + + {% if context.employee_details %} + +
    + Position +
    + +
    +
    -
    +
    + Branch +
    + +
    -
    +
    -
    - - - {% if context.employee_details %} + {% endif %} -
    - Position -
    - -
    + -
    -
    - Branch -
    - +
    -
    +
    + +
    + + - {% endif %} +
    From 337387ad76554dfb6d310de8f365b8ead31c0647 Mon Sep 17 00:00:00 2001 From: sithum jeevantha Date: Wed, 1 Nov 2023 13:00:32 +0530 Subject: [PATCH 22/40] add all the photos,change the footer and contact us menu --- static/css/home.css | 28 ++++++++++++++++++++-------- templates/home/home.html | 20 ++++++++++---------- 2 files changed, 30 insertions(+), 18 deletions(-) diff --git a/static/css/home.css b/static/css/home.css index 74947a7..a3049ec 100644 --- a/static/css/home.css +++ b/static/css/home.css @@ -529,6 +529,9 @@ ul { margin-bottom: 30px; } +.contact-section input::placeholder,textarea::placeholder { + color: rgb(255, 255, 255); +} .contact-info { list-style: none; padding: 0; @@ -563,21 +566,27 @@ ul { .btn { padding: 12px 30px; font-size: 16px; + border: none; + color: #ffffff; } + + .btn-primary { /* From https://css.glass */ background: rgba(255, 255, 255, 0.25); border-radius: 16px; - box-shadow: 0 4px 30px rgba(0, 0, 0, 0.35); - backdrop-filter: blur(18.9px); - -webkit-backdrop-filter: blur(18.9px); + /* box-shadow: 0 4px 30px rgba(0, 0, 0, 0.35); */ + /* backdrop-filter: blur(18.9px); + -webkit-backdrop-filter: blur(18.9px); */ } .btn-primary:hover { - background-color: #0069d9; - border-color: #0069d9; + background-color: #ffffff; + color: #000000; + font-weight: 400; + } /*end of contact us section*/ @@ -646,7 +655,7 @@ ul { /*footer*/ footer { - background-color: #080431; + background: rgba(255, 255, 255, 0.50); padding: 20px; text-align: center; } @@ -662,17 +671,20 @@ footer { .footer-links a { margin: 0 10px; - color: #ffffff; + color: #000000; text-decoration: none; } .footer-links a:hover { text-decoration: underline; + color: #ffffff; } .footer-text { - color: #ffffff; + color: #000000; font-size: 14px; } + + /* end of footer */ \ No newline at end of file diff --git a/templates/home/home.html b/templates/home/home.html index 7496ac3..153755d 100644 --- a/templates/home/home.html +++ b/templates/home/home.html @@ -117,9 +117,9 @@

    Account types

    With just a few simple steps, you can become a valued customer and unlock a world of financial opportunities. Take advantage of our exceptional services, including:
      -
    • ● Account Creation for Individuals
      • -
    • ● Account Creation for Oraganizations
      • -
    • ● Creating Fixed Deposit Accounts
      • +
    • ● Accounts for Individuals
      • +
    • ● Accounts for Oraganizations
      • +
    • ● Fixed Deposit Accounts

    @@ -128,7 +128,7 @@

    Account types

    Fixed Deposit

    - +
    @@ -151,7 +151,7 @@

    Fixed Deposit

    Accounts

    - +
    @@ -162,8 +162,8 @@

    Accounts

    • ● Children - 12%, no minimum
    • ● Teen - 11%, 500 minimum
      • -
    • ● Adult (18+) - 10%, 1000 minimum
      • -
    • ● Senior (60+) - 13%, 1000 minimum
      • +
    • ● Adult (18+) - 10%,
      1000 minimum
      • +
    • ● Senior (60+) - 13%,
      1000 minimum

    @@ -172,7 +172,7 @@

    Accounts

    Transactions

    - +
    @@ -189,7 +189,7 @@

    Transactions

    Loan Request

    - +
    @@ -209,7 +209,7 @@

    Loan Request

    Security

    - +
    From 5de224dcb3305d7ecfc1f45b7c51fb9b2c332bb0 Mon Sep 17 00:00:00 2001 From: yasanthaniroshan Date: Wed, 1 Nov 2023 13:15:31 +0530 Subject: [PATCH 23/40] added account creation for new users --- BankAccount/bank_account.py | 41 ++++++------------- Database/connection.py | 2 +- Database/database_quaries.py | 1 + .../bankAccount/displayCreatedAccount.html | 2 +- 4 files changed, 15 insertions(+), 31 deletions(-) diff --git a/BankAccount/bank_account.py b/BankAccount/bank_account.py index 0bba923..7b055ce 100644 --- a/BankAccount/bank_account.py +++ b/BankAccount/bank_account.py @@ -175,12 +175,14 @@ def create_current_account_for_new_organization(first_name,last_name,branch_id,n connector = Connector() try: with connector: - connector.cursor.execute(CREATE_BANK_ACCOUNT_FOR_ORGANIZATION,(organization_name,organization_role,first_name,last_name,branch_id,nic,telephone,home_town,date_of_birth,first_deposit,account_number,'CURRENT',)) - connector.connection.commit() - return True + connector.cursor.execute(CREATE_CURRENT_ACCOUNT_FOR_NEW_ORGANIZATION,(first_name,last_name,branch_id,nic,telephone,home_town,date_of_birth,first_deposit,account_number,organization_name,organization_role,)) + context = connector.cursor.fetchone() + flash("Account Created Successfully", 'Account') + return render_template('bankAccount/displayCreatedAccount.html',context=context) except Exception as e: - print("Error in create_current_account_for_new_organization",e) - return False + error_code, error_message = e.args + flash(error_message,"Error") + return redirect(url_for('bank_account.create_current_account_organization_new')) @bank_account_app.route('/transfer',methods = DEFUALT_SUBMISSION_METHODS,endpoint='transfer') @valid_session @@ -359,6 +361,7 @@ def create_savings_account_new_individual(): if request.method == 'POST': first_name, last_name, branch_id, nic, telephone, home_town, date_of_birth, first_deposit = (request.form[key] for key in ['first_name', 'last_name', 'branch_id', 'nic', 'telephone', 'home_town', 'date_of_birth', 'first_deposit']) account_number = get_account_number(first_name,last_name,branch_id) + print(account_number) return create_savings_account_for_new_user_individual(first_name,last_name,branch_id,nic,telephone,home_town,date_of_birth,first_deposit,account_number) elif request.method == 'GET': @@ -401,30 +404,10 @@ def create_savings_account_new_organization(): @valid_session def create_current_account_new_organization(): if request.method == 'POST': - first_name = request.form['first_name'] - last_name = request.form['last_name'] - branch_id = request.form['branch_id'] - nic = request.form['nic'] - telephone = request.form['telephone'] - home_town = request.form['home_town'] - date_of_birth = request.form['date_of_birth'] - first_deposit = request.form['first_deposit'] - organization_name = request.form['organization_name'] - organization_role = request.form['organization_role'] - ascii_values = [ord(char) for char in (first_name+last_name)] - new_account_number = f"{str(branch_id)}-{str(sum(ascii_values)%1000)}-{str(1)}" - print(first_name,last_name,branch_id,nic,telephone,home_town,date_of_birth,first_deposit,new_account_number,organization_name,organization_role) - - if check_firstname_and_last_name_exsists(first_name,last_name): - flash("User Already Exists", 'Error') - return redirect(url_for('bank_account.create_savings_account_organization_new')) - if create_current_account_for_new_organization(first_name,last_name,branch_id,nic,telephone,home_town,date_of_birth,first_deposit,new_account_number,organization_name,organization_role): - flash("Account Created Successfully","Account Creation") - context = {'account_number':new_account_number,'account_type':'SAVINGS','created_at':datetime.now().strftime("%Y-%m-%d %H:%M:%S"),'full_name':f'{first_name} {last_name}'} - return render_template('bankAccount/displayCreatedAccount.html',context=context) - else: - flash("Error Occured ", "Error") - return redirect('/dashboard') + first_name, last_name, branch_id, nic, telephone, home_town, date_of_birth, first_deposit, organization_name, organization_role = (request.form[key] for key in ['first_name', 'last_name', 'branch_id', 'nic', 'telephone', 'home_town', 'date_of_birth', 'first_deposit', 'organization_name', 'organization_role']) + account_number = get_account_number(first_name,last_name,branch_id) + return create_current_account_for_new_organization(first_name,last_name,branch_id,nic,telephone,home_town,date_of_birth,first_deposit,account_number,organization_name,organization_role) + elif request.method == 'GET': context = get_branch_id(session['user_id']) diff --git a/Database/connection.py b/Database/connection.py index c210d93..e42697d 100644 --- a/Database/connection.py +++ b/Database/connection.py @@ -25,7 +25,7 @@ def __exit__(self, exc_type, exc_value, traceback): def connect(self): try: - self.connection = MySQLdb.connect(*self.configurations.values(),cursorclass=Cursor) + self.connection = MySQLdb.connect(*self.configurations.values(),cursorclass=Cursor,autocommit=True) self.cursor = self.connection.cursor() return self.cursor except Exception as e: diff --git a/Database/database_quaries.py b/Database/database_quaries.py index 6126d78..d22db8e 100644 --- a/Database/database_quaries.py +++ b/Database/database_quaries.py @@ -48,3 +48,4 @@ CREATE_SAVINGS_ACCOUNT_FOR_NEW_INDIVIDUAL_USER = 'call create_savings_account_for_new_individual_user(%s,%s,%s,%s,%s,%s,%s,%s,%s)' CREATE_CURRENT_ACCOUNT_FOR_NEW_INDIVIDUAL_USER = 'call create_current_account_for_new_individual_user(%s,%s,%s,%s,%s,%s,%s,%s,%s)' CREATE_SAVINGS_ACCOUNT_FOR_NEW_ORGANIZATION = 'call create_savings_account_for_new_organization_user(%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s)' +CREATE_CURRENT_ACCOUNT_FOR_NEW_ORGANIZATION = 'call create_current_account_for_new_organization_user(%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s)' diff --git a/templates/bankAccount/displayCreatedAccount.html b/templates/bankAccount/displayCreatedAccount.html index 66f2472..faa3584 100644 --- a/templates/bankAccount/displayCreatedAccount.html +++ b/templates/bankAccount/displayCreatedAccount.html @@ -90,7 +90,7 @@

    Employee

  • Name: -
    {{context.full_name}}
    +
    {{context.first_name}}
  • Type: From a39a45125b785d172ae76164b62d93f50421d69e Mon Sep 17 00:00:00 2001 From: sithum jeevantha Date: Wed, 1 Nov 2023 13:49:38 +0530 Subject: [PATCH 24/40] chabging the placeholder color in contact us section and changing the size of the our services tags --- static/css/home.css | 3 ++- templates/home/home.html | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/static/css/home.css b/static/css/home.css index a3049ec..667ca2e 100644 --- a/static/css/home.css +++ b/static/css/home.css @@ -416,7 +416,7 @@ ul li:hover ul.dropdown { padding: 10px; margin: 30px; /* border-radius: 20px; */ - height: 60vh; + height: 55vh; width: 40vw; opacity: 90%; /* From https://css.glass */ @@ -557,6 +557,7 @@ ul { width: 100%; padding: 10px; margin-bottom: 20px; + color: #ffffff; } .contact-form textarea { diff --git a/templates/home/home.html b/templates/home/home.html index 153755d..2048630 100644 --- a/templates/home/home.html +++ b/templates/home/home.html @@ -162,8 +162,8 @@

    Accounts

    • ● Children - 12%, no minimum
    • ● Teen - 11%, 500 minimum
      • -
    • ● Adult (18+) - 10%,
      1000 minimum
      • -
    • ● Senior (60+) - 13%,
      1000 minimum
      • +
    • ● Adult (18+) - 10%,
               1000 minimum
      • +
    • ● Senior (60+) - 13%,
               1000 minimum

    • @@ -179,7 +179,7 @@

    Transactions

    Experience hassle-free transactions with our comprehensive banking solutions. Our user-friendly platform allows you to easily manage your finances and conduct transactions securely.


    -

    Join us today and enjoy seamless banking at your fingertips.

    +
    From f8bae65a26b85e756159c132eec9931d8aa42a27 Mon Sep 17 00:00:00 2001 From: dilumin <77558016+dilumin@users.noreply.github.com> Date: Wed, 1 Nov 2023 16:06:34 +0530 Subject: [PATCH 25/40] Changed css in most Signed-off-by: dilumin <77558016+dilumin@users.noreply.github.com> --- static/css/alltransactions.css | 88 ++++++++++++++++++- .../bankAccount/displayCreatedAccount.html | 30 +++++-- .../bankAccount/newCurrentIndividual.html | 2 +- templates/dashboard/customer_dashboard.html | 50 ++++++++++- templates/dashboard/employee_dashboard.html | 4 +- templates/dashboard/manager_dashbaord.html | 6 +- templates/loan/loanRequest.html | 3 +- templates/reports/alltransactions.html | 55 +++++++++++- templates/user/accountDetails.html | 18 +--- 9 files changed, 220 insertions(+), 36 deletions(-) diff --git a/static/css/alltransactions.css b/static/css/alltransactions.css index 37783c8..c592ef1 100644 --- a/static/css/alltransactions.css +++ b/static/css/alltransactions.css @@ -284,6 +284,43 @@ body { box-shadow: 0px 4px 30px 0px rgba(0, 0, 0, 0.17); backdrop-filter: blur(30px); } + +.info2{ + border-radius: 20px; + border: 1px solid #8ECAE6; + background: linear-gradient(180deg, rgba(0, 0, 0, 0.20) 2.08%, rgba(0, 0, 0, 0.06) 47.92%, rgba(0, 0, 0, 0.20) 100%), linear-gradient(137deg, rgba(2, 48, 71, 0.78) 21.18%, rgba(2, 48, 71, 0.00) 100%); + box-shadow: 0px 4px 30px 0px rgba(0, 0, 0, 0.17); + backdrop-filter: blur(30px); + margin-right: 30px; + padding-top: 20px; + padding-bottom: 20px; + flex-shrink: 0; + + border-radius: 20px; + border: 1px solid rgba(142, 202, 230, 0.17); + background: linear-gradient(180deg, rgba(0, 0, 0, 0.20) 2.08%, rgba(13, 16, 28, 0.15) 47.92%, rgba(0, 0, 0, 0.20) 100%), linear-gradient(137deg, rgba(2, 48, 71, 0.38) 21.18%, rgba(2, 48, 71, 0.07) 57.4%, rgba(2, 48, 71, 0.00) 100%); + box-shadow: 0px 4px 30px 0px rgba(0, 0, 0, 0.17); + backdrop-filter: blur(30px); + margin-left: 100px; + margin-right: 100px; + padding-left: 120px; + display: flex; + justify-content: center; + +} +.t{ + font-family: Rubik; + font-size: 16px; + color: white; +} +.tts{ + width: 700px; + display: flex; + justify-content: space-around; + margin-bottom: 6px; + +} + .CE-container{ width: 420px; padding-top: 10px; @@ -329,6 +366,34 @@ body { /* ------------------------------------------------- */ + .button99{ + color: #FFF; + text-align: center; + font-family: 'Rubik'; + font-weight: 300; + font-size: 20px; + font-style: normal; + font-weight: bold; + line-height: normal; + text-transform: uppercase; + width: 140px; + height: 44px; + flex-shrink: 0; + border-radius: 48px; + border: none; + background: #00507C; + margin-bottom: 13px; + box-shadow: 0 8px 16px 0 rgba(0,0,0,0.2), 0 6px 20px 0 rgba(0,0,0,0.19); +} +.button99:hover{ + opacity: 80%; + transition: 0.2s; + cursor: pointer; +} +.button99:focus{ + opacity: 60%; +} + .account-s{ display: flex; @@ -603,16 +668,16 @@ body { padding-left: 20px; display: flex; align-items: center; - width: 480px; - height: 45px; + width: 300px; + height: 25px; flex-shrink: 0; border-radius: 48px; background: #FFF; margin-bottom: 20px; } .enq{ - width: 400px; - height: 45px; + width: 250px; + height: 25px; font-size: 19px; background:transparent; border: none; @@ -708,4 +773,19 @@ table{ font-family: Rubik; font-size: 20px; +} +.timeline { + display: flex; + justify-content: space-between; +} +.amount_range { + display: flex; + justify-content: space-between; + +} +.contentt{ + width: 700px; + margin-left: 30px; + + } \ No newline at end of file diff --git a/templates/bankAccount/displayCreatedAccount.html b/templates/bankAccount/displayCreatedAccount.html index 906954f..c281ac0 100644 --- a/templates/bankAccount/displayCreatedAccount.html +++ b/templates/bankAccount/displayCreatedAccount.html @@ -4,8 +4,8 @@ - - + + @@ -76,11 +76,31 @@

    Employee

    - +
    + {% if context %} +
    +
    +
    Created At :
    +
    Account No :
    +
    Name :
    +
    Type :
    + +
    +
    +
    {{context.created_at}}
    +
    {{context.account_number}}
    +
    {{context.full_name}}
    +
    {{context.account_type}}
    + +
    +
    + + {% endif %} +
    -
    + diff --git a/templates/bankAccount/newCurrentIndividual.html b/templates/bankAccount/newCurrentIndividual.html index 8db1382..826a7af 100644 --- a/templates/bankAccount/newCurrentIndividual.html +++ b/templates/bankAccount/newCurrentIndividual.html @@ -62,7 +62,7 @@

    Employee

    -
    diff --git a/templates/dashboard/customer_dashboard.html b/templates/dashboard/customer_dashboard.html index a024fea..4e8ee0f 100644 --- a/templates/dashboard/customer_dashboard.html +++ b/templates/dashboard/customer_dashboard.html @@ -42,7 +42,8 @@ - + +

    Customer

    @@ -198,6 +199,7 @@
    + {% if context.fixed_deposits %}
    +
    +
    + Loans taken +
    +
    +
    + + + + + + + + + + + {% for account in context.fixed_deposits %} + + + + + + {% endfor %} + + +
    Loan IDDuration (Months) Amount
    {{account.fixed_deposit_id}}{{account.duration}}Rs {{account.amount}}
    +
    + +
    + {% endif %} + diff --git a/templates/dashboard/employee_dashboard.html b/templates/dashboard/employee_dashboard.html index a97c2d1..df698ba 100644 --- a/templates/dashboard/employee_dashboard.html +++ b/templates/dashboard/employee_dashboard.html @@ -59,7 +59,7 @@

    Employee

  • Settings
    • -