diff --git a/.gitignore b/.gitignore index fdf06fb..c406e23 100644 --- a/.gitignore +++ b/.gitignore @@ -354,4 +354,5 @@ tests* *.pdf *.backup Dockerfile.* -docker-compose.* \ No newline at end of file +docker-compose.* +*debug.py \ No newline at end of file diff --git a/backend/src/establishment/payment/forms.py b/backend/src/establishment/payment/forms.py index ed51109..bfebd36 100644 --- a/backend/src/establishment/payment/forms.py +++ b/backend/src/establishment/payment/forms.py @@ -1,12 +1,12 @@ from models import LoginToken from flask_wtf import FlaskForm -from wtforms import DateField, FloatField, IntegerField, SelectField, SelectMultipleField, StringField, SubmitField -from wtforms.validators import DataRequired, Optional +from wtforms import DateField, DecimalField, SelectField, SubmitField +from wtforms.validators import DataRequired class NewPaymentForm(FlaskForm): token = SelectField("User", validators=[DataRequired()], render_kw={"class": "form-control"}) date = DateField("Date", validators=[DataRequired()], render_kw={"class": "form-control"}) - amount = IntegerField("Amount (in ct)", validators=[DataRequired()], render_kw={"class": "form-control"}) + amount = DecimalField("Amount (€)", validators=[DataRequired()], render_kw={"class": "form-control"}) submit = SubmitField("Submit", render_kw={"class": "btn btn-primary mt-3"}) @classmethod diff --git a/backend/src/establishment/payment/routes.py b/backend/src/establishment/payment/routes.py index b852319..52a9ca3 100644 --- a/backend/src/establishment/payment/routes.py +++ b/backend/src/establishment/payment/routes.py @@ -17,7 +17,7 @@ def insert_payment(establishment_id: int): if form.validate_on_submit(): new_payment = Payment(token = form.token.data, date = form.date.data, - amount = form.amount.data) + amount = int(form.amount.data*100)) db.session.add(new_payment) db.session.commit() return redirect(url_for("main.index")) diff --git a/backend/src/receipts/check_items/utils.py b/backend/src/receipts/check_items/utils.py index f9ecb6b..745a1e5 100644 --- a/backend/src/receipts/check_items/utils.py +++ b/backend/src/receipts/check_items/utils.py @@ -1,4 +1,5 @@ from datetime import date +from decimal import Decimal from models import AmountChange, Item, PriceChange, Receipt, ReceiptItem from src import db, LOGGER @@ -35,7 +36,7 @@ def insert_existing_item(formitemdict: dict[str: str], receipt_date: date = None db.session.commit() def insert_item_to_receipt(receipt: Receipt, item_dict: dict[str: str], item_index:int=0): - receipt.ReceiptItem.append(ReceiptItem(item=item_index, name=item_dict.get('itemname'), amount=item_dict.get('amount'), price=int(str(item_dict.get('price')).replace(',','').replace('.', '')))) + receipt.ReceiptItem.append(ReceiptItem(item=item_index, name=item_dict.get('itemname'), amount=item_dict.get('amount'), price=int(item_dict.get('price')*100))) db.session.add(receipt) db.session.commit()