Verkaufszahl um Umsatz erweitern
This commit is contained in:
1 parent
d03f653848
commit
42127b0916
2 files changed
+15
-2
No files matched your search
@@ -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.market_occurrence_day_id IS NOT NULL
|
||||||
AND sale.order_source = \'direct\'
|
AND sale.order_source = \'direct\'
|
||||||
AND sale.order_status <> \'cancelled\'
|
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
|
FROM market_occurrence o
|
||||||
INNER JOIN market_definition m ON m.id = o.market_definition_id
|
INNER JOIN market_definition m ON m.id = o.market_definition_id
|
||||||
INNER JOIN market_category c ON c.id = m.category_id
|
INNER JOIN market_category c ON c.id = m.category_id
|
||||||
|
|||||||
@@ -153,7 +153,8 @@ function auth_render_markets_large_table(array $marketTable): string
|
|||||||
$statusValue = '<span' . ($statusSignalClass !== '' ? ' class="' . auth_escape_html($statusSignalClass) . '"' : '') . '>' . auth_escape_html(auth_market_status_label($status)) . '</span>';
|
$statusValue = '<span' . ($statusSignalClass !== '' ? ' class="' . auth_escape_html($statusSignalClass) . '"' : '') . '>' . auth_escape_html(auth_market_status_label($status)) . '</span>';
|
||||||
$html[] = '<div class="sg-large-table__cell" role="cell">' . $statusValue . '</div>';
|
$html[] = '<div class="sg-large-table__cell" role="cell">' . $statusValue . '</div>';
|
||||||
$soldItemCount = (int) round((float) ($row['sold_item_count'] ?? 0));
|
$soldItemCount = (int) round((float) ($row['sold_item_count'] ?? 0));
|
||||||
$html[] = '<div class="sg-large-table__cell" role="cell">' . $soldItemCount . '</div>';
|
$soldGrossRevenue = number_format((float) ($row['sold_gross_revenue'] ?? 0), 0, '.', "'");
|
||||||
|
$html[] = '<div class="sg-large-table__cell" role="cell">' . $soldItemCount . '/' . $soldGrossRevenue . 'CHF</div>';
|
||||||
$html[] = '</div>';
|
$html[] = '</div>';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user