From 42127b091668351575664d1fd74e14d24e087c84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mathias=20Gla=CC=88ser?= Date: Mon, 21 Sep 2026 08:21:02 +0200 Subject: [PATCH] Verkaufszahl um Umsatz erweitern --- modules/market_management/service.php | 14 +++++++++++++- modules/shared/auth/ui/home.php | 3 ++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/modules/market_management/service.php b/modules/market_management/service.php index 3572087..2829b16 100644 --- a/modules/market_management/service.php +++ b/modules/market_management/service.php @@ -563,7 +563,19 @@ function market_management_search_occurrences(PDO $pdo, array $input): array AND sale.market_occurrence_day_id IS NOT NULL AND sale.order_source = \'direct\' AND sale.order_status <> \'cancelled\' - ), 0) AS sold_item_count + ), 0) AS sold_item_count, + COALESCE(( + SELECT SUM(CASE + WHEN line.line_status = \'cancelled\' OR line.line_total IS NULL THEN 0 + ELSE line.line_total * GREATEST(line.qty - line.qty_cancelled, 0) / NULLIF(line.qty, 0) + END) + FROM sales_order sale + INNER JOIN sales_order_line line ON line.sales_order_id = sale.id + WHERE sale.market_occurrence_id = o.id + AND sale.market_occurrence_day_id IS NOT NULL + AND sale.order_source = \'direct\' + AND sale.order_status <> \'cancelled\' + ), 0) AS sold_gross_revenue FROM market_occurrence o INNER JOIN market_definition m ON m.id = o.market_definition_id INNER JOIN market_category c ON c.id = m.category_id diff --git a/modules/shared/auth/ui/home.php b/modules/shared/auth/ui/home.php index 36106a7..701f6ed 100644 --- a/modules/shared/auth/ui/home.php +++ b/modules/shared/auth/ui/home.php @@ -153,7 +153,8 @@ function auth_render_markets_large_table(array $marketTable): string $statusValue = '' . auth_escape_html(auth_market_status_label($status)) . ''; $html[] = '
' . $statusValue . '
'; $soldItemCount = (int) round((float) ($row['sold_item_count'] ?? 0)); - $html[] = '
' . $soldItemCount . '
'; + $soldGrossRevenue = number_format((float) ($row['sold_gross_revenue'] ?? 0), 0, '.', "'"); + $html[] = '
' . $soldItemCount . '/' . $soldGrossRevenue . 'CHF
'; $html[] = ''; }