merchant

commit 651db111b4e82ee4dea8554bbfae3fd85a3674cc
parent 776ebceec3c273c2d567a524640d42f12d2e1c0a
Author: Christian Grothoff <christian@grothoff.org>
Date:   Tue, 17 Mar 2026 11:54:28 +0100

fix #11241 / #11208

Diffstat:
M
contrib/typst/common/Makefile.am
 | 
2
+-
M
contrib/typst/kyc/Makefile.am
 | 
2
+-
M
contrib/typst/orders/Makefile.am
 | 
2
+-
M
contrib/typst/transactions/Makefile.am
 | 
2
+-
M
debian/taler-merchant-typst.install
 | 
6
++----
M
debian/taler-merchant.install
 | 
6
+++++-
M
src/backend/taler-merchant-httpd_get-private-orders.c
 | 
3
++-
M
src/backend/taler-merchant-httpd_get-private-statistics-report-transactions.c
 | 
3
++-

8 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/contrib/typst/common/Makefile.am b/contrib/typst/common/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = .
 
-formdatadir = $(prefix)/.local/share/typst/packages/taler-merchant/common/0.0.0/
+formdatadir = $(datadir)/taler-merchant/typst/packages/taler-merchant/common/0.0.0/
 dist_formdata_DATA = \
   typst.toml \
   lib.typ
diff --git a/contrib/typst/kyc/Makefile.am b/contrib/typst/kyc/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = .
 
-formdatadir = $(prefix)/.local/share/typst/packages/taler-merchant/kyc/0.0.0/
+formdatadir = $(datadir)/taler-merchant/typst/packages/taler-merchant/kyc/0.0.0/
 dist_formdata_DATA = \
   typst.toml \
   kyc.typ
diff --git a/contrib/typst/orders/Makefile.am b/contrib/typst/orders/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = .
 
-formdatadir = $(prefix)/.local/share/typst/packages/taler-merchant/orders/0.0.0/
+formdatadir = $(datadir)/taler-merchant/typst/packages/taler-merchant/orders/0.0.0/
 dist_formdata_DATA = \
   typst.toml \
   orders.typ
diff --git a/contrib/typst/transactions/Makefile.am b/contrib/typst/transactions/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = .
 
-formdatadir = $(prefix)/.local/share/typst/packages/taler-merchant/transactions/0.0.0/
+formdatadir = $(datadir)/taler-merchant/typst/packages/taler-merchant/transactions/0.0.0/
 dist_formdata_DATA = \
   typst.toml \
   transactions.typ
diff --git a/debian/taler-merchant-typst.install b/debian/taler-merchant-typst.install
@@ -1,4 +1,2 @@
-# The local Typst packages must actually be in the $HOME
-# of the user, not in the PREFIX. Move them to the right
-# location.
-usr/.local/share/typst/packages/taler-merchant/* /var/lib/taler-merchant/.local/share/typst/packages/taler-merchant/
+The local Typst packages
+usr/share/taler-merchant/typst/
diff --git a/debian/taler-merchant.install b/debian/taler-merchant.install
@@ -6,6 +6,10 @@ usr/lib/*/taler-merchant/*.so
 
 usr/share/man/man*/taler-merchant*
 usr/share/info/taler-merchant*
-usr/share/taler-merchant/*
+usr/share/taler-merchant/config.d/
+usr/share/taler-merchant/spa/
+usr/share/taler-merchant/sql/
+usr/share/taler-merchant/templates/
+usr/share/taler-merchant/terms/
 
 debian/etc/* /etc/
diff --git a/src/backend/taler-merchant-httpd_get-private-orders.c b/src/backend/taler-merchant-httpd_get-private-orders.c
@@ -1207,7 +1207,8 @@ reply_orders (struct TMH_PendingOrder *po,
       doc.form_version = "0.0.0";
       doc.data = root;
 
-      po->tc = TALER_MHD_typst (TMH_cfg,
+      po->tc = TALER_MHD_typst (TALER_MERCHANT_project_data (),
+                                TMH_cfg,
                                 false,  /* remove on exit */
                                 "merchant",
                                 1,     /* one document */
diff --git a/src/backend/taler-merchant-httpd_get-private-statistics-report-transactions.c b/src/backend/taler-merchant-httpd_get-private-statistics-report-transactions.c
@@ -728,7 +728,8 @@ TMH_private_get_statistics_report_transactions (
           .data = root
         };
 
-        rctx->tc = TALER_MHD_typst (TMH_cfg,
+        rctx->tc = TALER_MHD_typst (TALER_MERCHANT_project_data (),
+                                    TMH_cfg,
                                     false, /* remove on exit */
                                     "merchant",
                                     1, /* one document, length of "array"! */