task-d.5.5

2026-06-25 08:27:20 +07:00
parent 6093003b70
commit f2c7156851
11 changed files with 1049 additions and 530 deletions
--- a/src/app/dashboard/crm/enquiries/[id]/page.tsx
+++ b/src/app/dashboard/crm/enquiries/[id]/page.tsx
@@ -1,9 +1,7 @@
 import { auth } from '@/auth';
 import { HydrationBoundary, dehydrate } from '@tanstack/react-query';
 import { notFound } from 'next/navigation';
-import Link from 'next/link';
 import PageContainer from '@/components/layout/page-container';
-import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card';
 import {
  enquiryByIdOptions,
  enquiryFollowupsOptions,
@@ -13,6 +11,7 @@ import { EnquiryDetail } from '@/features/crm/enquiries/components/enquiry-detai
 import { getEnquiryDetail, getEnquiryReferenceData } from '@/features/crm/enquiries/server/service';
 import { getLeadById } from '@/features/crm/leads/server/service';
 import { listEnquiryQuotationRelations } from '@/features/crm/quotations/server/service';
+import { getQuotationReferenceData } from '@/features/crm/quotations/server/service';
 import { PERMISSIONS } from '@/lib/auth/rbac';
 import { getQueryClient } from '@/lib/query-client';

@@ -90,6 +89,12 @@ export default async function EnquiryDetailRoute({ params }: PageProps) {
      (session.user.activeMembershipRole === 'admin' ||
        session.user.activePermissions.includes(PERMISSIONS.crmQuotationRead)));

+  const canCreateQuotation =
+    session?.user?.systemRole === 'super_admin' ||
+    (!!session?.user?.activeOrganizationId &&
+      (session.user.activeMembershipRole === 'admin' ||
+        session.user.activePermissions.includes(PERMISSIONS.crmQuotationCreate)));
+
  const canViewOutcomeCommercialData = canRead;

  if (!canRead || !session?.user?.activeOrganizationId || !session.user.id) {
@@ -119,33 +124,20 @@ export default async function EnquiryDetailRoute({ params }: PageProps) {
  ]);

  const enquiryDetail = await getEnquiryDetail(id, session.user.activeOrganizationId, accessContext);
-  const [referenceData, relatedQuotations, sourceLead] = await Promise.all([
+  const [referenceData, relatedQuotations, sourceLead, quotationReferenceData] = await Promise.all([
    getEnquiryReferenceData(session.user.activeOrganizationId),
    listEnquiryQuotationRelations(id, session.user.activeOrganizationId),
    enquiryDetail.leadId
      ? getLeadById(enquiryDetail.leadId, session.user.activeOrganizationId).catch(() => null)
-      : Promise.resolve(null)
+      : Promise.resolve(null),
+    canCreateQuotation ? getQuotationReferenceData(session.user.activeOrganizationId) : Promise.resolve(null)
  ]);

  return (
    <PageContainer
-      pageTitle='รายละเอียดโอกาสขาย'
-      pageDescription='พื้นที่ทำงานของฝ่ายขายสำหรับติดตาม execution ของ enquiry และเชื่อมกับ quotation'
+      pageTitle='Opportunity Detail'
+      pageDescription='Sales execution workspace for follow-up continuity, quotation readiness, and outcome control.'
    >
-      {sourceLead ? (
-        <Card className='mb-6'>
-          <CardHeader>
-            <CardTitle>Source Lead</CardTitle>
-          </CardHeader>
-          <CardContent className='text-sm'>
-            <Link href={`/dashboard/crm/leads/${sourceLead.id}`} className='font-medium hover:underline'>
-              {sourceLead.code}
-            </Link>
-            <div className='text-muted-foreground mt-1'>{sourceLead.projectName ?? 'No project name'}</div>
-          </CardContent>
-        </Card>
-      ) : null}
-
      <HydrationBoundary state={dehydrate(queryClient)}>
        <EnquiryDetail
          enquiryId={id}
@@ -160,7 +152,20 @@ export default async function EnquiryDetailRoute({ params }: PageProps) {
          canMarkWon={canMarkWon}
          canMarkLost={canMarkLost}
          canReopen={canReopen}
+          canCreateQuotation={canCreateQuotation}
          canManageFollowups={canManageFollowups}
+          sourceLead={
+            sourceLead
+              ? {
+                  id: sourceLead.id,
+                  code: sourceLead.code,
+                  projectName: sourceLead.projectName,
+                  status: sourceLead.statusLabel,
+                  awareness: sourceLead.awarenessLabel
+                }
+              : null
+          }
+          quotationReferenceData={quotationReferenceData}
        />
      </HydrationBoundary>
    </PageContainer>
--- a/src/app/dashboard/crm/enquiries/page.tsx
+++ b/src/app/dashboard/crm/enquiries/page.tsx
@@ -1,14 +1,13 @@
-import { auth } from "@/auth";
-import PageContainer from "@/components/layout/page-container";
-import EnquiryListing from "@/features/crm/enquiries/components/enquiry-listing";
-import { EnquiryFormSheetTrigger } from "@/features/crm/enquiries/components/enquiry-form-sheet";
-import { getEnquiryReferenceData } from "@/features/crm/enquiries/server/service";
-import { PERMISSIONS } from "@/lib/auth/rbac";
-import { searchParamsCache } from "@/lib/searchparams";
-import type { SearchParams } from "nuqs/server";
+import { auth } from '@/auth';
+import PageContainer from '@/components/layout/page-container';
+import EnquiryListing from '@/features/crm/enquiries/components/enquiry-listing';
+import { EnquiryFormSheetTrigger } from '@/features/crm/enquiries/components/enquiry-form-sheet';
+import { getEnquiryReferenceData } from '@/features/crm/enquiries/server/service';
+import { PERMISSIONS } from '@/lib/auth/rbac';
+import type { SearchParams } from 'nuqs/server';

 export const metadata = {
-  title: "Dashboard: CRM Enquiries",
+  title: 'Dashboard: CRM Opportunities'
 };

 type PageProps = {
@@ -16,75 +15,69 @@ type PageProps = {
 };

 export default async function EnquiriesRoute(props: PageProps) {
-  const searchParams = await props.searchParams;
+  await props.searchParams;
  const session = await auth();
+
  const canRead =
-    session?.user?.systemRole === "super_admin" ||
+    session?.user?.systemRole === 'super_admin' ||
    (!!session?.user?.activeOrganizationId &&
-      (session.user.activeMembershipRole === "admin" ||
+      (session.user.activeMembershipRole === 'admin' ||
        session.user.activePermissions.includes(PERMISSIONS.crmEnquiryRead)));
+
  const canCreate =
-    session?.user?.systemRole === "super_admin" ||
+    session?.user?.systemRole === 'super_admin' ||
    (!!session?.user?.activeOrganizationId &&
-      (session.user.activeMembershipRole === "admin" ||
+      (session.user.activeMembershipRole === 'admin' ||
        session.user.activePermissions.includes(PERMISSIONS.crmEnquiryCreate)));
+
  const canUpdate =
-    session?.user?.systemRole === "super_admin" ||
+    session?.user?.systemRole === 'super_admin' ||
    (!!session?.user?.activeOrganizationId &&
-      (session.user.activeMembershipRole === "admin" ||
+      (session.user.activeMembershipRole === 'admin' ||
        session.user.activePermissions.includes(PERMISSIONS.crmEnquiryUpdate)));
+
  const canDelete =
-    session?.user?.systemRole === "super_admin" ||
+    session?.user?.systemRole === 'super_admin' ||
    (!!session?.user?.activeOrganizationId &&
-      (session.user.activeMembershipRole === "admin" ||
+      (session.user.activeMembershipRole === 'admin' ||
        session.user.activePermissions.includes(PERMISSIONS.crmEnquiryDelete)));
+
  const canAssign =
-    session?.user?.systemRole === "super_admin" ||
+    session?.user?.systemRole === 'super_admin' ||
    (!!session?.user?.activeOrganizationId &&
-      (session.user.activeMembershipRole === "admin" ||
+      (session.user.activeMembershipRole === 'admin' ||
        session.user.activePermissions.includes(PERMISSIONS.crmEnquiryAssign)));
+
  const canReassign =
-    session?.user?.systemRole === "super_admin" ||
+    session?.user?.systemRole === 'super_admin' ||
    (!!session?.user?.activeOrganizationId &&
-      (session.user.activeMembershipRole === "admin" ||
-        session.user.activePermissions.includes(
-          PERMISSIONS.crmEnquiryReassign,
-        )));
-  const businessRole = session?.user?.activeBusinessRole ?? null;
+      (session.user.activeMembershipRole === 'admin' ||
+        session.user.activePermissions.includes(PERMISSIONS.crmEnquiryReassign)));

-  searchParamsCache.parse(searchParams);
+  if (!canRead || !session?.user?.activeOrganizationId) {
+    return (
+      <PageContainer access={false} pageTitle='CRM Opportunities'>
+        {null}
+      </PageContainer>
+    );
+  }

-  const referenceData =
-    canRead && session?.user?.activeOrganizationId
-      ? await getEnquiryReferenceData(session.user.activeOrganizationId)
-      : null;
+  const referenceData = await getEnquiryReferenceData(session.user.activeOrganizationId);

  return (
    <PageContainer
-      pageTitle="โอกาสขาย"
-      pageDescription="พื้นที่ทำงานของฝ่ายขายสำหรับดูแลโอกาสขาย ติดตามความคืบหน้า และเตรียมใบเสนอราคา"
-      access={canRead}
-      accessFallback={
-        <div className="text-muted-foreground rounded-lg border border-dashed p-8 text-center">
-          You do not have access to CRM enquiries.
-        </div>
-      }
-      pageHeaderAction={
-        canCreate && referenceData ? (
-          <EnquiryFormSheetTrigger referenceData={referenceData} workspace='enquiry' />
-        ) : null
-      }
+      pageTitle='CRM Opportunities'
+      pageDescription='Sales execution workspace for opportunities created directly or handed off from marketing leads.'
+      pageHeaderAction={canCreate ? <EnquiryFormSheetTrigger referenceData={referenceData} /> : null}
    >
-      {referenceData ? (
-        <EnquiryListing
-          referenceData={referenceData}
-          workspace='enquiry'
-          canUpdate={canUpdate}
-          canDelete={canDelete}
-          canAssign={canAssign}
-          canReassign={canReassign}
-        />
-      ) : null}
+      <EnquiryListing
+        referenceData={referenceData}
+        workspace='enquiry'
+        canUpdate={canUpdate}
+        canDelete={canDelete}
+        canAssign={canAssign}
+        canReassign={canReassign}
+      />
    </PageContainer>
  );
 }