From 9b31af67aafa997a49e676e42d7b9233f192b3be Mon Sep 17 00:00:00 2001
From: Holger Frey <frey@imtek.de>
Date: Thu, 5 Sep 2024 13:26:09 +0200
Subject: [PATCH] renamed 'accounts' to 'funds'

---
 ordr3.sqlite                   | Bin 3129344 -> 3129344 bytes
 ordr3/schemas/orders.py        |   1 +
 ordr3/views/orders.py          |   4 +++-
 tests/functional/test_order.py |  10 +++++-----
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/ordr3.sqlite b/ordr3.sqlite
index 6d5a750aaa0af865a7b0f64cbe33166eec237368..06ace2cef394728247ece4248824d161e38f35e7 100644
GIT binary patch
delta 322
zcmWN=%}T-m0KoBCX_=O-v@-3(TAwbFHYXkIk~ES;`ylaXWvNBT7B=fL>Cm<C1)?|T
z)Uiis4>IT#`v2f(+dm$gZ!wSf9^dzhLdy8~y88U}6@<{UQ0NDpy+BW@`h`R^QtFlZ
zO-C<lnT(>z4>?6{=TymTS5MV@t8-Sr+cmQ1J1s-6q;I6;WA>=lY~7|is@7FaU8!9(
zDrNofI)73xTEzoPF`rDck?$T~zPQe->v%Z8K@QPNABQ<YKSvp0kYgNYh!Ye!$ti{z
q;WTGB%P8j<W1RC`;3Aip;4)Vzag}Ra=LR>q#Uy2Jf4fd9{Pz#c5t@Ji

delta 306
zcmWN=&q~5@0KoCBQZp@=&C;|#=F0von<gwMyL1SGh@orbK`16d6#O8gLzhX1uEpM<
zH|W%{N9gw;gXj(Ve&7=X-)g|OqN=@@PGXu;JN*0fKYrppCG)KG!n8aN^I1JL(yo$9
zxsbaURYO;v9@VWz)3VHAt6_@Pf#E$oc3n%Hwfpz}dGq>dC~n&Qfl<Hf*qz%;*AaVz
zuJHDK+p#_8C6cd^R5`|RPB6we6P#p{Q%o_<Y0fZ1jkC;hjyiLk=K}LAaFIopxWr|y
caFu1Qu|k9E++dZP+~PKOXma-}k~RJJA36h*)c^nh

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"