From 5b042fdeccf5cd28171c3bcf1539152bf7930e35 Mon Sep 17 00:00:00 2001 From: Vatsalya Verma Date: Sun, 11 Dec 2022 17:13:54 -0500 Subject: [PATCH 1/2] api settle branch implementation --- ihatemoney/templates/forms.html | 4 ++-- ihatemoney/web.py | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/ihatemoney/templates/forms.html b/ihatemoney/templates/forms.html index 48c3df2b..7e7d5ff0 100644 --- a/ihatemoney/templates/forms.html +++ b/ihatemoney/templates/forms.html @@ -174,8 +174,8 @@

- {{ _("Everyone") }} - {{_("No one")}} + {{ _("Everyone!!!!!!!") }} + {{_("No one!!!")}}

{% for key, value, checked in form.payed_for.iter_choices() | sort(attribute='1') %} diff --git a/ihatemoney/web.py b/ihatemoney/web.py index c2f19c06..ffb9f01c 100644 --- a/ihatemoney/web.py +++ b/ihatemoney/web.py @@ -747,6 +747,28 @@ def add_bill(): return render_template("add_bill.html", form=form) +@main.route("//settle", methods=["GET", "POST"]) +def settle_bill(): + form = get_billform_for(g.project) + if request.method == "POST": + if form.validate(): + # save last selected payer in session + session["last_selected_payer"] = form.payer.data + session.update() + + db.session.add(form.export(g.project)) + db.session.commit() + + flash(_("The bill has been settled")) + + args = {} + if form.submit2.data: + args["add_bill"] = True + + return redirect(url_for(".list_bills", **args)) + + return render_template("add_bill.html", form=form) + @main.route("//delete/", methods=["POST"]) def delete_bill(bill_id): From 7549af52dc664f28a216cf81eef63a72e9f224d9 Mon Sep 17 00:00:00 2001 From: Vatsalya Verma Date: Sun, 11 Dec 2022 17:16:27 -0500 Subject: [PATCH 2/2] api settle branch implementation paid --- ihatemoney/web.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ihatemoney/web.py b/ihatemoney/web.py index ffb9f01c..e1a9fad9 100644 --- a/ihatemoney/web.py +++ b/ihatemoney/web.py @@ -748,7 +748,7 @@ def add_bill(): return render_template("add_bill.html", form=form) @main.route("//settle", methods=["GET", "POST"]) -def settle_bill(): +def settle_paid(): form = get_billform_for(g.project) if request.method == "POST": if form.validate():