From 2f96552fe85410ee6c2e01cc511e68a0dffd57d3 Mon Sep 17 00:00:00 2001 From: DanielS Date: Thu, 25 Jun 2026 02:23:50 +0200 Subject: [PATCH] revert: Remove group by partner option from end customers view --- .../admin/companies/[id]/customers/page.tsx | 177 +++++++----------- 1 file changed, 69 insertions(+), 108 deletions(-) diff --git a/shop/app/admin/companies/[id]/customers/page.tsx b/shop/app/admin/companies/[id]/customers/page.tsx index 9011502..5240a1d 100644 --- a/shop/app/admin/companies/[id]/customers/page.tsx +++ b/shop/app/admin/companies/[id]/customers/page.tsx @@ -1,6 +1,6 @@ 'use client' -import { useState, useEffect, Fragment } from 'react' +import { useState, useEffect } from 'react' import { useParams, useRouter } from 'next/navigation' import Link from 'next/link' import { @@ -48,7 +48,6 @@ export default function CompanyCustomersPage() { const [loading, setLoading] = useState(true) const [loadingAction, setLoadingAction] = useState(false) const [searchQuery, setSearchQuery] = useState('') - const [groupByPartner, setGroupByPartner] = useState(false) // Dialog State const [isOpen, setIsOpen] = useState(false) @@ -159,13 +158,7 @@ export default function CompanyCustomersPage() { return nameMatch || personMatch || addressMatch || partnerMatch }) - const displayCustomers = groupByPartner - ? [...filteredCustomers].sort((a, b) => { - const nameA = a.partner_name || 'Unbekannt' - const nameB = b.partner_name || 'Unbekannt' - return nameA.localeCompare(nameB) - }) - : filteredCustomers + return (
@@ -217,29 +210,15 @@ export default function CompanyCustomersPage() { {/* Table Section */}
-
-
- - setSearchQuery(e.target.value)} - className="w-full pl-9 pr-4 py-2 text-sm bg-slate-50 dark:bg-white/5 border border-slate-200 dark:border-white/10 rounded-md text-slate-900 dark:text-slate-200 placeholder-slate-500 focus:outline-none focus:ring-2 focus:ring-indigo-500 transition-all" - /> -
-
- setGroupByPartner(e.target.checked)} - className="h-4 w-4 rounded border-slate-200 dark:border-white/10 bg-white dark:bg-slate-950 text-indigo-600 focus:ring-indigo-500 accent-indigo-600 cursor-pointer" - /> - -
+
+ + setSearchQuery(e.target.value)} + className="w-full pl-9 pr-4 py-2 text-sm bg-slate-50 dark:bg-white/5 border border-slate-200 dark:border-white/10 rounded-md text-slate-900 dark:text-slate-200 placeholder-slate-500 focus:outline-none focus:ring-2 focus:ring-indigo-500 transition-all" + />
{loading ? ( @@ -264,82 +243,64 @@ export default function CompanyCustomersPage() { - {(() => { - let lastPartnerName: string | null = null - return displayCustomers.map((customer) => { - const currentPartnerName = customer.partner_name || 'Unbekannt' - const showGroupHeader = groupByPartner && currentPartnerName !== lastPartnerName - lastPartnerName = currentPartnerName - - return ( - - {showGroupHeader && ( - - - Partner: {currentPartnerName} - - - )} - - -
- {customer.company_name} -
- {(customer.first_name || customer.last_name) && ( -
- - {customer.first_name || ''} {customer.last_name || ''} -
- )} - - - {customer.street ? ( -
- - - {customer.street}, {customer.zip} {customer.city} - -
- ) : ( - - )} - - - {customer.vat_id || } - - - - {customer.partner_name || 'Unbekannt'} - - - -
- - -
- - -
- ) - }) - })()} + {filteredCustomers.map((customer) => ( + + +
+ {customer.company_name} +
+ {(customer.first_name || customer.last_name) && ( +
+ + {customer.first_name || ''} {customer.last_name || ''} +
+ )} + + + {customer.street ? ( +
+ + + {customer.street}, {customer.zip} {customer.city} + +
+ ) : ( + + )} + + + {customer.vat_id || } + + + + {customer.partner_name || 'Unbekannt'} + + + +
+ + +
+ + + ))} )}