mirror of
https://github.com/spiral-project/ihatemoney.git
synced 2025-05-14 08:21:49 +02:00
Compare commits
5 commits
e5cc83f0f8
...
464b7374d2
| Author | SHA1 | Date | |
|---|---|---|---|
|
464b7374d2 | ||
|
|
7505cbe25a | ||
|
|
889576a114 | ||
|
|
72320c19d7 | ||
|
|
d6d9fd2180 |
8 changed files with 174 additions and 4 deletions
|
|
@ -173,6 +173,14 @@ URL you want.
|
||||||
- **Default value:** `""` (empty string)
|
- **Default value:** `""` (empty string)
|
||||||
- **Production value:** The URL of your chosing.
|
- **Production value:** The URL of your chosing.
|
||||||
|
|
||||||
|
## SITE_NAME
|
||||||
|
|
||||||
|
It is possible to change the name of the site to something at your liking.
|
||||||
|
|
||||||
|
- **Default value:** `"I Hate Money"` (empty string)
|
||||||
|
- **Production value:** The name of your choosing
|
||||||
|
|
||||||
|
|
||||||
## Configuring email sending
|
## Configuring email sending
|
||||||
|
|
||||||
By default, Ihatemoney sends emails using a local SMTP server, but it's
|
By default, Ihatemoney sends emails using a local SMTP server, but it's
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,7 @@ DEBUG = SQLACHEMY_ECHO = False
|
||||||
SQLALCHEMY_DATABASE_URI = "sqlite:////tmp/ihatemoney.db"
|
SQLALCHEMY_DATABASE_URI = "sqlite:////tmp/ihatemoney.db"
|
||||||
SQLALCHEMY_TRACK_MODIFICATIONS = False
|
SQLALCHEMY_TRACK_MODIFICATIONS = False
|
||||||
SECRET_KEY = "tralala"
|
SECRET_KEY = "tralala"
|
||||||
|
SITE_NAME = "I Hate Money"
|
||||||
MAIL_DEFAULT_SENDER = "Budget manager <admin@example.com>"
|
MAIL_DEFAULT_SENDER = "Budget manager <admin@example.com>"
|
||||||
SHOW_ADMIN_EMAIL = True
|
SHOW_ADMIN_EMAIL = True
|
||||||
ACTIVATE_DEMO_PROJECT = True
|
ACTIVATE_DEMO_PROJECT = True
|
||||||
|
|
|
||||||
|
|
@ -752,6 +752,22 @@ class Bill(db.Model):
|
||||||
else:
|
else:
|
||||||
return 0
|
return 0
|
||||||
|
|
||||||
|
@property
|
||||||
|
def involves_deactivated_members(self):
|
||||||
|
"""Check whether the bill contains deactivated member.
|
||||||
|
Return:
|
||||||
|
True if it contains deactivated member,
|
||||||
|
False if not.
|
||||||
|
"""
|
||||||
|
owers_id = [int(m.id) for m in self.owers]
|
||||||
|
bill_member_id_list = owers_id + [self.payer_id]
|
||||||
|
deactivated_member_number = (
|
||||||
|
Person.query.filter(Person.id.in_(bill_member_id_list))
|
||||||
|
.filter(Person.activated.is_(False))
|
||||||
|
.count()
|
||||||
|
)
|
||||||
|
return deactivated_member_number != 0
|
||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
return self.what
|
return self.what
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -20,7 +20,7 @@
|
||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html class="h-100">
|
<html class="h-100">
|
||||||
<head>
|
<head>
|
||||||
<title>{{ _("Account manager") }}{% block title %}{% endblock %}</title>
|
<title>{{ SITE_NAME }} — {{ _("Account manager") }}{% block title %}{% endblock %}</title>
|
||||||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
<link rel=stylesheet type=text/css href="{{ url_for("static", filename='css/main.css') }}">
|
<link rel=stylesheet type=text/css href="{{ url_for("static", filename='css/main.css') }}">
|
||||||
|
|
|
||||||
|
|
@ -148,10 +148,22 @@
|
||||||
</span>
|
</span>
|
||||||
</td>
|
</td>
|
||||||
<td class="bill-actions d-flex align-items-center">
|
<td class="bill-actions d-flex align-items-center">
|
||||||
<a class="edit" href="{{ url_for(".edit_bill", bill_id=bill.id) }}" title="{{ _("edit") }}">{{ _('edit') }}</a>
|
<a class="edit" href="{{ url_for(".edit_bill", bill_id=bill.id) }}" data-toggle="tooltip"
|
||||||
|
{% if bill.involves_deactivated_members %}
|
||||||
|
title="Cannot be edited as deactivated members involved"
|
||||||
|
{% else %}
|
||||||
|
title="Click to edit this bill"
|
||||||
|
{% endif %}
|
||||||
|
>{{ _('edit') }}</a>
|
||||||
<form class="delete-bill" action="{{ url_for(".delete_bill", bill_id=bill.id) }}" method="POST">
|
<form class="delete-bill" action="{{ url_for(".delete_bill", bill_id=bill.id) }}" method="POST">
|
||||||
{{ csrf_form.csrf_token }}
|
{{ csrf_form.csrf_token }}
|
||||||
<button class="action delete" type="submit" title="{{ _("delete") }}"></button>
|
<button class="action delete" type="submit" data-toggle="tooltip"
|
||||||
|
{% if bill.involves_deactivated_members %}
|
||||||
|
title="Cannot be deleted as deactivated members involved"
|
||||||
|
{% else %}
|
||||||
|
title="Click to delete this bill"
|
||||||
|
{% endif %}
|
||||||
|
></button>
|
||||||
</form>
|
</form>
|
||||||
{% if bill.external_link %}
|
{% if bill.external_link %}
|
||||||
<a class="show" href="{{ bill.external_link }}" ref="noopener" target="_blank" title="{{ _("show") }}">{{ _('show') }} </a>
|
<a class="show" href="{{ bill.external_link }}" ref="noopener" target="_blank" title="{{ _("show") }}">{{ _('show') }} </a>
|
||||||
|
|
|
||||||
|
|
@ -238,7 +238,10 @@ class TestBudget(IhatemoneyTestCase):
|
||||||
url, data={"password": "pass", "password_confirmation": "pass"}
|
url, data={"password": "pass", "password_confirmation": "pass"}
|
||||||
)
|
)
|
||||||
resp = self.login("raclette", password="pass")
|
resp = self.login("raclette", password="pass")
|
||||||
assert "<title>Account manager - raclette</title>" in resp.data.decode("utf-8")
|
assert (
|
||||||
|
"<title>I Hate Money — Account manager - raclette</title>"
|
||||||
|
in resp.data.decode("utf-8")
|
||||||
|
)
|
||||||
# Test empty and null tokens
|
# Test empty and null tokens
|
||||||
resp = self.client.get("/reset-password")
|
resp = self.client.get("/reset-password")
|
||||||
assert "No token provided" in resp.data.decode("utf-8")
|
assert "No token provided" in resp.data.decode("utf-8")
|
||||||
|
|
@ -869,6 +872,122 @@ class TestBudget(IhatemoneyTestCase):
|
||||||
balance = self.get_project("raclette").balance
|
balance = self.get_project("raclette").balance
|
||||||
assert set(balance.values()) == set([6, -6])
|
assert set(balance.values()) == set([6, -6])
|
||||||
|
|
||||||
|
def test_edit_bill_with_deactivated_member(self):
|
||||||
|
"""
|
||||||
|
Bills involving deactivated members should not allowed to be edited or deleted.
|
||||||
|
"""
|
||||||
|
self.post_project("raclette")
|
||||||
|
|
||||||
|
# add two participants
|
||||||
|
self.client.post("/raclette/members/add", data={"name": "zorglub"})
|
||||||
|
self.client.post("/raclette/members/add", data={"name": "fred"})
|
||||||
|
|
||||||
|
members_ids = [m.id for m in self.get_project("raclette").members]
|
||||||
|
|
||||||
|
# create one bill
|
||||||
|
self.client.post(
|
||||||
|
"/raclette/add",
|
||||||
|
data={
|
||||||
|
"date": "2011-08-10",
|
||||||
|
"what": "fromage à raclette",
|
||||||
|
"payer": members_ids[0],
|
||||||
|
"payed_for": members_ids,
|
||||||
|
"amount": "25",
|
||||||
|
},
|
||||||
|
)
|
||||||
|
bill = models.Bill.query.one()
|
||||||
|
self.assertEqual(bill.amount, 25)
|
||||||
|
|
||||||
|
# deactivate one user
|
||||||
|
self.client.post(
|
||||||
|
"/raclette/members/%s/delete" % self.get_project("raclette").members[-1].id
|
||||||
|
)
|
||||||
|
self.assertEqual(len(self.get_project("raclette").members), 2)
|
||||||
|
self.assertEqual(len(self.get_project("raclette").active_members), 1)
|
||||||
|
|
||||||
|
# editing would fail because the bill involves deactivated user
|
||||||
|
self.client.post(
|
||||||
|
f"/raclette/edit/{bill.id}",
|
||||||
|
data={
|
||||||
|
"date": "2011-08-10",
|
||||||
|
"what": "fromage à raclette",
|
||||||
|
"payer": members_ids[0],
|
||||||
|
"payed_for": members_ids,
|
||||||
|
"amount": "10",
|
||||||
|
},
|
||||||
|
)
|
||||||
|
bill = models.Bill.query.one()
|
||||||
|
self.assertNotEqual(bill.amount, 10, "bill edition")
|
||||||
|
|
||||||
|
# reactivate the user
|
||||||
|
self.client.post(
|
||||||
|
"/raclette/members/%s/reactivate"
|
||||||
|
% self.get_project("raclette").members[-1].id
|
||||||
|
)
|
||||||
|
self.assertEqual(len(self.get_project("raclette").active_members), 2)
|
||||||
|
|
||||||
|
# try to edit the bill again. It should succeed
|
||||||
|
self.client.post(
|
||||||
|
f"/raclette/edit/{bill.id}",
|
||||||
|
data={
|
||||||
|
"date": "2011-08-10",
|
||||||
|
"what": "fromage à raclette",
|
||||||
|
"payer": members_ids[0],
|
||||||
|
"payed_for": members_ids,
|
||||||
|
"amount": "10",
|
||||||
|
},
|
||||||
|
)
|
||||||
|
bill = models.Bill.query.one()
|
||||||
|
self.assertEqual(bill.amount, 10, "bill edition")
|
||||||
|
|
||||||
|
def test_delete_bill_with_deactivated_member(self):
|
||||||
|
"""
|
||||||
|
Bills involving deactivated members should not allowed to be edited or deleted.
|
||||||
|
"""
|
||||||
|
self.post_project("raclette")
|
||||||
|
|
||||||
|
# add two participants
|
||||||
|
self.client.post("/raclette/members/add", data={"name": "zorglub"})
|
||||||
|
self.client.post("/raclette/members/add", data={"name": "fred"})
|
||||||
|
|
||||||
|
members_ids = [m.id for m in self.get_project("raclette").members]
|
||||||
|
|
||||||
|
# create one bill
|
||||||
|
self.client.post(
|
||||||
|
"/raclette/add",
|
||||||
|
data={
|
||||||
|
"date": "2011-08-10",
|
||||||
|
"what": "fromage à raclette",
|
||||||
|
"payer": members_ids[0],
|
||||||
|
"payed_for": members_ids,
|
||||||
|
"amount": "25",
|
||||||
|
},
|
||||||
|
)
|
||||||
|
bill = models.Bill.query.one()
|
||||||
|
self.assertEqual(bill.amount, 25)
|
||||||
|
|
||||||
|
# deactivate one user
|
||||||
|
self.client.post(
|
||||||
|
"/raclette/members/%s/delete" % self.get_project("raclette").members[-1].id
|
||||||
|
)
|
||||||
|
self.assertEqual(len(self.get_project("raclette").active_members), 1)
|
||||||
|
|
||||||
|
# deleting should fail because the bill involves deactivated user
|
||||||
|
response = self.client.get(f"/raclette/delete/{bill.id}")
|
||||||
|
self.assertEqual(response.status_code, 405)
|
||||||
|
self.assertEqual(1, len(models.Bill.query.all()), "bill deletion")
|
||||||
|
|
||||||
|
# reactivate the user
|
||||||
|
self.client.post(
|
||||||
|
"/raclette/members/%s/reactivate"
|
||||||
|
% self.get_project("raclette").members[-1].id
|
||||||
|
)
|
||||||
|
self.assertEqual(len(self.get_project("raclette").active_members), 2)
|
||||||
|
|
||||||
|
# try to delete the bill again. It should succeed
|
||||||
|
self.client.post(f"/raclette/delete/{bill.id}")
|
||||||
|
self.assertEqual(0, len(models.Bill.query.all()), "bill deletion")
|
||||||
|
|
||||||
def test_trimmed_members(self):
|
def test_trimmed_members(self):
|
||||||
self.post_project("raclette")
|
self.post_project("raclette")
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,7 @@
|
||||||
DEBUG = False
|
DEBUG = False
|
||||||
SQLALCHEMY_DATABASE_URI = 'sqlite:///budget.db'
|
SQLALCHEMY_DATABASE_URI = 'sqlite:///budget.db'
|
||||||
SQLACHEMY_ECHO = DEBUG
|
SQLACHEMY_ECHO = DEBUG
|
||||||
|
SITE_NAME = "I Hate Money"
|
||||||
|
|
||||||
SECRET_KEY = "supersecret"
|
SECRET_KEY = "supersecret"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -137,6 +137,11 @@ def set_show_admin_dashboard_link(endpoint, values):
|
||||||
g.logout_form = LogoutForm()
|
g.logout_form = LogoutForm()
|
||||||
|
|
||||||
|
|
||||||
|
@main.context_processor
|
||||||
|
def add_template_variables():
|
||||||
|
return {"SITE_NAME": current_app.config.get("SITE_NAME")}
|
||||||
|
|
||||||
|
|
||||||
@main.url_value_preprocessor
|
@main.url_value_preprocessor
|
||||||
def pull_project(endpoint, values):
|
def pull_project(endpoint, values):
|
||||||
"""When a request contains a project_id value, transform it directly
|
"""When a request contains a project_id value, transform it directly
|
||||||
|
|
@ -801,6 +806,10 @@ def delete_bill(bill_id):
|
||||||
if not bill:
|
if not bill:
|
||||||
return redirect(url_for(".list_bills"))
|
return redirect(url_for(".list_bills"))
|
||||||
|
|
||||||
|
# Check if the bill contains deactivated member. If yes, stop deleting.
|
||||||
|
if bill.involves_deactivated_members:
|
||||||
|
return redirect(url_for(".list_bills"))
|
||||||
|
|
||||||
db.session.delete(bill)
|
db.session.delete(bill)
|
||||||
db.session.commit()
|
db.session.commit()
|
||||||
flash(_("The bill has been deleted"))
|
flash(_("The bill has been deleted"))
|
||||||
|
|
@ -815,6 +824,10 @@ def edit_bill(bill_id):
|
||||||
if not bill:
|
if not bill:
|
||||||
raise NotFound()
|
raise NotFound()
|
||||||
|
|
||||||
|
# Check if the bill contains deactivated member. If yes, stop editing.
|
||||||
|
if bill.involves_deactivated_members:
|
||||||
|
return redirect(url_for(".list_bills"))
|
||||||
|
|
||||||
form = get_billform_for(g.project, set_default=False)
|
form = get_billform_for(g.project, set_default=False)
|
||||||
|
|
||||||
if request.method == "POST" and form.validate():
|
if request.method == "POST" and form.validate():
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue