diff --git a/ordr3.sqlite b/ordr3.sqlite index 6d5a750..06ace2c 100644 Binary files a/ordr3.sqlite and b/ordr3.sqlite differ diff --git a/ordr3/schemas/orders.py b/ordr3/schemas/orders.py index ed73238..8e20dce 100644 --- a/ordr3/schemas/orders.py +++ b/ordr3/schemas/orders.py @@ -217,6 +217,7 @@ class AddOrderSchema(CSRFSchema): item = OrderItem() pricing = OrderPricing() + funding = OrderFunding() optional = OrderOptionals() @classmethod diff --git a/ordr3/views/orders.py b/ordr3/views/orders.py index 738ee17..7b68ac6 100644 --- a/ordr3/views/orders.py +++ b/ordr3/views/orders.py @@ -75,6 +75,7 @@ def get_form_data_from_order(order): def update_order_with_form_data(order, form_data): form_item = form_data["item"] form_pricing = form_data["pricing"] + form_funding = form_data["funding"] form_optional = form_data["optional"] order.cas_description = form_item["cas_description"] @@ -87,7 +88,8 @@ def update_order_with_form_data(order, form_data): order.currency = form_pricing["unit_price"]["currency"] order.amount = form_pricing["quantity"] - order.account = form_optional["funds"] + order.account = form_funding["funds"] + order.comment = form_optional["comment"] diff --git a/tests/functional/test_order.py b/tests/functional/test_order.py index 2b4ec27..914c8e4 100644 --- a/tests/functional/test_order.py +++ b/tests/functional/test_order.py @@ -53,7 +53,7 @@ def test_add_order_ok(testapp, login_as, contains): form["vendor"] = "Carl Roth" form["package_size"] = "25 l" form["quantity"] = "5" - form["account"] = "DFG" + form["funds"] = "DFG" form["comment"] = "Ein Kommentar!" form.fields["amount"][0].value = "5.67" form.fields["amount"][1].value = "5.67" @@ -140,7 +140,7 @@ def test_add_order_cancel(testapp, login_as, contains): form["vendor"] = "Carl Roth" form["package_size"] = "25 l" form["quantity"] = "5" - form["account"] = "DFG" + form["funds"] = "DFG" form["comment"] = "Ein Kommentar!" form.fields["amount"][0].value = "5.67" form.fields["amount"][1].value = "5.67" @@ -185,7 +185,7 @@ def test_edit_order_ok(testapp, login_as, contains, parse_latest_mail): form["vendor"] = "Carl Roth" form["package_size"] = "25 l" form["quantity"] = "5" - form["account"] = "DFG" + form["funds"] = "DFG" form["comment"] = "Ein Kommentar!" form.fields["amount"][0].value = "5.67" form.fields["amount"][1].value = "5.67" @@ -238,7 +238,7 @@ def test_edit_order_form_error(testapp, login_as, contains): form["vendor"] = "Carl Roth" form["package_size"] = "25 l" form["quantity"] = "5" - form["account"] = "DFG" + form["funds"] = "DFG" form["comment"] = "Ein Kommentar!" form.fields["amount"][0].value = "5.67" form.fields["amount"][1].value = "5.67" @@ -276,7 +276,7 @@ def test_edit_order_cancel(testapp, login_as, contains): form["vendor"] = "Carl Roth" form["package_size"] = "25 l" form["quantity"] = "5" - form["account"] = "DFG" + form["funds"] = "DFG" form["comment"] = "Ein Kommentar!" form.fields["amount"][0].value = "5.67" form.fields["amount"][1].value = "5.67"