Merge pull request adfinis#840 from open-dynaMIX/accounting-cover-vorschuss

feat: add advance-credit info to accounting export

Author: open-dynaMIX

api/mysagw/accounting/conftest.py

@@ -215,6 +215,22 @@ def receipt_mock(requests_mock):
                         }
                     ]
                 },
+                "advanceCredits": {
+                    "edges": [
+                        {
+                            "node": {
+                                "document": {
+                                    "vorschussbetrag": {
+                                        "edges": [{"node": {"value": 5000}}]
+                                    },
+                                    "vorschussdatum": {
+                                        "edges": [{"node": {"value": "2023-05-04"}}]
+                                    },
+                                }
+                            }
+                        }
+                    ]
+                },
             }
         }
     }

api/mysagw/accounting/queries/get_receipts.gql

@@ -213,6 +213,32 @@ query Receipts($case_id: ID!) {
           }
         }
       }
+      advanceCredits: workItems(filter: [{task: "advance-credits"}], order: [{attribute: CREATED_AT, direction: DESC}], first: 1) {
+        edges {
+          node {
+            document {
+              vorschussbetrag: answers(filter: [{question: "advance-credit-amount-float"}]) {
+                edges {
+                  node {
+                    ... on FloatAnswer {
+                      value
+                    }
+                  }
+                }
+              }
+              vorschussdatum: answers(filter: [{question: "advance-credit-date"}]) {
+                edges {
+                  node {
+                    ... on DateAnswer {
+                      value
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
     }
   }
 }

api/mysagw/accounting/templates/accounting-cover.docx

@@ -17,7 +17,9 @@
       'iban': 'CH56 0483 5012 3456 7800 9',
       'mitgliedinstitution': 'Foo institute',
       'section': '6',
-      'total': 5000.0,
+      'total': "CHF 5'000.-",
+      'vorschussbetrag': "CHF 5'000.-",
+      'vorschussdatum': '04. 05. 2023',
       'vp_year': '',
       'zahlungszweck': 'Foo Bar',
     }),
@@ -45,6 +47,8 @@
       'mitgliedinstitution': '',
       'section': '',
       'total': '',
+      'vorschussbetrag': '',
+      'vorschussdatum': '',
       'vp_year': '',
       'zahlungszweck': '',
     }),
@@ -71,7 +75,9 @@
       'iban': 'CH56 0483 5012 3456 7800 9',
       'mitgliedinstitution': 'Foo institute',
       'section': '6',
-      'total': 5000.0,
+      'total': "CHF 5'000.-",
+      'vorschussbetrag': "CHF 5'000.-",
+      'vorschussdatum': '04. 05. 2023',
       'vp_year': '',
       'zahlungszweck': 'Foo Bar',
     }),

api/mysagw/accounting/tests/__snapshots__/test_views.ambr

@@ -13,6 +13,7 @@
 from mysagw.dms_client import DMSClient, get_dms_error_response
 from mysagw.oidc_auth.permissions import IsAdmin, IsAuthenticated, IsStaff
 from mysagw.pdf_utils import SUPPORTED_MERGE_CONTENT_TYPES, add_caluma_files_to_pdf
+from mysagw.utils import format_currency
 
 GQL_DIR = Path(__file__).parent.resolve() / "queries"
 
@@ -258,7 +259,7 @@ def circ_kontonummer_label(slug):
                 "node",
                 "value",
             ],
-            None,
+            lambda x: format_currency(x, "CHF") if x else "",
         ),
         "vp_year": (
             [
@@ -303,6 +304,42 @@ def circ_kontonummer_label(slug):
             ],
             circ_kontonummer_label,
         ),
+        "vorschussbetrag": (
+            [
+                "data",
+                "node",
+                "advanceCredits",
+                "edges",
+                0,
+                "node",
+                "document",
+                "vorschussbetrag",
+                "edges",
+                0,
+                "node",
+                "value",
+            ],
+            lambda x: format_currency(x, "CHF") if x else "",
+        ),
+        "vorschussdatum": (
+            [
+                "data",
+                "node",
+                "advanceCredits",
+                "edges",
+                0,
+                "node",
+                "document",
+                "vorschussdatum",
+                "edges",
+                0,
+                "node",
+                "value",
+            ],
+            lambda x: timezone.datetime.fromisoformat(x).strftime("%d. %m. %Y")
+            if x
+            else "",
+        ),
     }
 
     result = {}