task-d5.5.1

2026-06-25 12:16:41 +07:00
parent f2c7156851
commit c2a74b6764
121 changed files with 3407 additions and 2679 deletions
--- a/src/features/crm/customers/api/types.ts
+++ b/src/features/crm/customers/api/types.ts
@@ -117,7 +117,7 @@ export interface CustomerActivityRecord {
  actorName: string | null;
 }

-export interface CustomerRelatedEnquiryItem {
+export interface CustomerRelatedOpportunityItem {
  id: string;
  code: string;
  title: string;
@@ -230,3 +230,4 @@ export interface MutationSuccessResponse {
  success: boolean;
  message: string;
 }
+
--- a/src/features/crm/customers/components/customer-detail.tsx
+++ b/src/features/crm/customers/components/customer-detail.tsx
@@ -16,7 +16,7 @@ import { CustomerFormSheet } from './customer-form-sheet';
 import { CustomerContactsTab } from './customer-contacts-tab';
 import { CustomerOwnerCard } from './customer-owner-card';
 import { CustomerStatusBadge } from './customer-status-badge';
-import type { CustomerRelatedEnquiryItem } from '../api/types';
+import type { CustomerRelatedOpportunityItem } from '../api/types';
 import type { QuotationRelationItem } from '@/features/crm/quotations/api/types';

 function FieldItem({ label, value }: { label: string; value: string | null | undefined }) {
@@ -37,7 +37,7 @@ export function CustomerDetail({
  canReadContactShares,
  canManageContactShares,
  canManageOwner,
-  relatedEnquiries,
+  relatedOpportunities,
  relatedQuotations
 }: {
  customerId: string;
@@ -52,7 +52,7 @@ export function CustomerDetail({
  canReadContactShares: boolean;
  canManageContactShares: boolean;
  canManageOwner: boolean;
-  relatedEnquiries: CustomerRelatedEnquiryItem[];
+  relatedOpportunities: CustomerRelatedOpportunityItem[];
  relatedQuotations: QuotationRelationItem[];
 }) {
  const { data } = useSuspenseQuery(customerByIdOptions(customerId));
@@ -239,23 +239,23 @@ export function CustomerDetail({
                      <CardDescription>ลิงก์ไปยังโอกาสขายและใบเสนอราคาที่เกี่ยวข้องกับลูกค้ารายนี้</CardDescription>
                    </CardHeader>
                    <CardContent>
-                      {!relatedEnquiries.length && !relatedQuotations.length ? (
+                      {!relatedOpportunities.length && !relatedQuotations.length ? (
                        <div className='text-muted-foreground rounded-lg border border-dashed p-8 text-center text-sm'>
                          ยังไม่มีโอกาสขายหรือใบเสนอราคาที่เชื่อมกับลูกค้ารายนี้
                        </div>
                      ) : (
                        <div className='space-y-3'>
-                          {relatedEnquiries.map((enquiry) => (
+                          {relatedOpportunities.map((opportunity) => (
                            <Link
-                              key={enquiry.id}
-                              href={`/dashboard/crm/enquiries/${enquiry.id}`}
+                              key={opportunity.id}
+                              href={`/dashboard/crm/opportunities/${opportunity.id}`}
                              className='block rounded-lg border p-4 transition-colors hover:bg-muted/40'
                            >
                              <div className='flex items-center justify-between gap-3'>
                                <div className='space-y-1'>
-                                  <div className='font-medium'>{enquiry.title}</div>
+                                  <div className='font-medium'>{opportunity.title}</div>
                                  <div className='text-muted-foreground font-mono text-xs'>
-                                    {enquiry.code}
+                                    {opportunity.code}
                                  </div>
                                </div>
                                <Icons.arrowRight className='text-muted-foreground h-4 w-4' />
@@ -297,7 +297,7 @@ export function CustomerDetail({
          />
          <Card>
            <CardHeader>
-              <CardTitle>ข้อมูลระบบ</CardTitle>
+              <CardTitle>เธเนเธญเธกเธนเธฅเธฃเธฐเธเธ</CardTitle>
              <CardDescription>ข้อมูลประกอบการติดตามและตรวจสอบของรายการลูกค้านี้</CardDescription>
            </CardHeader>
            <CardContent className='space-y-4'>
@@ -319,3 +319,4 @@ export function CustomerDetail({
    </div>
  );
 }
+
--- a/src/features/crm/customers/server/service.ts
+++ b/src/features/crm/customers/server/service.ts
@@ -16,7 +16,7 @@ import {
  crmCustomerContacts,
  crmCustomerOwnerHistory,
  crmCustomers,
-  crmEnquiries,
+  crmOpportunities,
  crmQuotations,
  memberships,
  msOptions,
@@ -476,20 +476,20 @@ async function resolveAccessibleCustomerRelationSets(
  organizationId: string,
  accessContext: CustomerAccessContext,
 ) {
-  const [enquiries, quotations] = await Promise.all([
+  const [opportunities, quotations] = await Promise.all([
    db
      .select({
-        customerId: crmEnquiries.customerId,
-        createdBy: crmEnquiries.createdBy,
-        assignedToUserId: crmEnquiries.assignedToUserId,
-        branchId: crmEnquiries.branchId,
-        productType: crmEnquiries.productType,
+        customerId: crmOpportunities.customerId,
+        createdBy: crmOpportunities.createdBy,
+        assignedToUserId: crmOpportunities.assignedToUserId,
+        branchId: crmOpportunities.branchId,
+        productType: crmOpportunities.productType,
      })
-      .from(crmEnquiries)
+      .from(crmOpportunities)
      .where(
        and(
-          eq(crmEnquiries.organizationId, organizationId),
-          isNull(crmEnquiries.deletedAt),
+          eq(crmOpportunities.organizationId, organizationId),
+          isNull(crmOpportunities.deletedAt),
        ),
      ),
    db
@@ -509,10 +509,10 @@ async function resolveAccessibleCustomerRelationSets(
      ),
  ]);

-  const enquiryCustomerIds = new Set<string>();
+  const opportunityCustomerIds = new Set<string>();
  const quotationCustomerIds = new Set<string>();

-  for (const row of enquiries) {
+  for (const row of opportunities) {
    if (!hasBranchScopeAccess(accessContext, row.branchId)) {
      continue;
    }
@@ -529,7 +529,7 @@ async function resolveAccessibleCustomerRelationSets(
      row.createdBy === accessContext.userId ||
      row.assignedToUserId === accessContext.userId
    ) {
-      enquiryCustomerIds.add(row.customerId);
+      opportunityCustomerIds.add(row.customerId);
    }
  }

@@ -553,7 +553,7 @@ async function resolveAccessibleCustomerRelationSets(
    }
  }

-  return { enquiryCustomerIds, quotationCustomerIds };
+  return { opportunityCustomerIds, quotationCustomerIds };
 }

 async function canAccessCustomerRow(
@@ -585,7 +585,7 @@ async function canAccessCustomerRow(
    return true;
  }

-  const { enquiryCustomerIds, quotationCustomerIds } =
+  const { opportunityCustomerIds, quotationCustomerIds } =
    relationSets ??
    (await resolveAccessibleCustomerRelationSets(
      row.organizationId,
@@ -593,13 +593,13 @@ async function canAccessCustomerRow(
    ));

  if (accessContext.ownershipScope === "monitor") {
-    return enquiryCustomerIds.has(row.id);
+    return opportunityCustomerIds.has(row.id);
  }

  return (
    row.createdBy === accessContext.userId ||
    row.ownerUserId === accessContext.userId ||
-    enquiryCustomerIds.has(row.id) ||
+    opportunityCustomerIds.has(row.id) ||
    quotationCustomerIds.has(row.id)
  );
 }
@@ -1615,3 +1615,4 @@ export async function resolveCustomerOptionLabel(

  return row?.label ?? null;
 }
+
--- a/src/features/crm/dashboard/api/types.ts
+++ b/src/features/crm/dashboard/api/types.ts
@@ -32,14 +32,14 @@ export interface CrmDashboardSummary {
    unassignedLeads: number;
    averageLeadAgingDays: number;
  };
-  enquiry: {
-    enquiryCount: number;
-    activeEnquiries: number;
+  opportunity: {
+    opportunityCount: number;
+    activeOpportunities: number;
    wonCount: number;
    lostCount: number;
    winRate: number;
-    hotEnquiries: number;
-    enquiryValue: number;
+    hotOpportunities: number;
+    opportunityValue: number;
  };
  quotation: {
    draftQuotations: number;
@@ -76,7 +76,7 @@ export interface CrmDashboardSalesRankingRow {
  salesPersonId: string;
  salesPersonName: string;
  leadCount: number;
-  enquiryCount: number;
+  opportunityCount: number;
  quotationCount: number;
  approvedQuotations: number;
  wonRevenue: number;
@@ -92,10 +92,10 @@ export interface CrmDashboardFollowupSummary {

 export interface CrmDashboardFollowupRow {
  id: string;
-  sourceType: 'enquiry' | 'quotation';
+  sourceType: 'opportunity' | 'quotation';
  followupDate: string;
  customerName: string;
-  enquiryName: string;
+  opportunityName: string;
  assignedSalesName: string | null;
  outcome: string | null;
 }
@@ -118,8 +118,8 @@ export interface CrmDashboardApprovalRow {
 }

 export interface CrmDashboardHotProjectRow {
-  enquiryId: string;
-  enquiryCode: string;
+  opportunityId: string;
+  opportunityCode: string;
  projectName: string;
  customerName: string;
  value: number;
@@ -161,3 +161,4 @@ export interface CrmDashboardResponse {
    canViewApprovalData: boolean;
  };
 }
+
--- a/src/features/crm/dashboard/components/dashboard-followups.tsx
+++ b/src/features/crm/dashboard/components/dashboard-followups.tsx
@@ -38,7 +38,7 @@ export function DashboardFollowups({
              <TableHead>ลูกค้า</TableHead>
              <TableHead>โอกาสขาย</TableHead>
              <TableHead>ผู้ดูแลโอกาสขาย</TableHead>
-              <TableHead>ที่มา</TableHead>
+              <TableHead>เธ—เธตเนเธกเธฒ</TableHead>
            </TableRow>
          </TableHeader>
          <TableBody>
@@ -53,7 +53,7 @@ export function DashboardFollowups({
                <TableRow key={`${row.sourceType}-${row.id}`}>
                  <TableCell>{new Date(row.followupDate).toLocaleDateString()}</TableCell>
                  <TableCell>{row.customerName}</TableCell>
-                  <TableCell>{row.enquiryName}</TableCell>
+                  <TableCell>{row.opportunityName}</TableCell>
                  <TableCell>{row.assignedSalesName ?? '-'}</TableCell>
                  <TableCell className='capitalize'>{row.sourceType}</TableCell>
                </TableRow>
@@ -65,3 +65,4 @@ export function DashboardFollowups({
    </Card>
  );
 }
+
--- a/src/features/crm/dashboard/components/dashboard-hot-projects.tsx
+++ b/src/features/crm/dashboard/components/dashboard-hot-projects.tsx
@@ -21,7 +21,7 @@ export function DashboardHotProjects({ rows }: { rows: CrmDashboardHotProjectRow
            <TableRow>
              <TableHead>โครงการ</TableHead>
              <TableHead>ลูกค้า</TableHead>
-              <TableHead className='text-right'>มูลค่า</TableHead>
+              <TableHead className='text-right'>เธกเธนเธฅเธเนเธฒ</TableHead>
              <TableHead>ผู้ดูแลโอกาสขาย</TableHead>
              <TableHead className='text-right'>ความน่าจะเป็น</TableHead>
            </TableRow>
@@ -35,10 +35,10 @@ export function DashboardHotProjects({ rows }: { rows: CrmDashboardHotProjectRow
              </TableRow>
            ) : (
              rows.map((row) => (
-                <TableRow key={row.enquiryId}>
+                <TableRow key={row.opportunityId}>
                  <TableCell>
                    <div className='font-medium'>{row.projectName}</div>
-                    <div className='text-muted-foreground text-xs'>{row.enquiryCode}</div>
+                    <div className='text-muted-foreground text-xs'>{row.opportunityCode}</div>
                  </TableCell>
                  <TableCell>{row.customerName}</TableCell>
                  <TableCell className='text-right'>{formatNumber(row.value)}</TableCell>
@@ -53,3 +53,4 @@ export function DashboardHotProjects({ rows }: { rows: CrmDashboardHotProjectRow
    </Card>
  );
 }
+
--- a/src/features/crm/dashboard/components/dashboard-sales-ranking.tsx
+++ b/src/features/crm/dashboard/components/dashboard-sales-ranking.tsx
@@ -19,7 +19,7 @@ export function DashboardSalesRanking({ rows }: { rows: CrmDashboardSalesRanking
        <Table>
          <TableHeader>
            <TableRow>
-              <TableHead>ฝ่ายขาย</TableHead>
+ <TableHead>ผู้ขาย</TableHead>
              <TableHead className='text-right'>ลีด</TableHead>
              <TableHead className='text-right'>โอกาสขาย</TableHead>
              <TableHead className='text-right'>ใบเสนอราคา</TableHead>
@@ -40,7 +40,7 @@ export function DashboardSalesRanking({ rows }: { rows: CrmDashboardSalesRanking
                <TableRow key={row.salesPersonId}>
                  <TableCell className='font-medium'>{row.salesPersonName}</TableCell>
                  <TableCell className='text-right'>{formatNumber(row.leadCount)}</TableCell>
-                  <TableCell className='text-right'>{formatNumber(row.enquiryCount)}</TableCell>
+                  <TableCell className='text-right'>{formatNumber(row.opportunityCount)}</TableCell>
                  <TableCell className='text-right'>{formatNumber(row.quotationCount)}</TableCell>
                  <TableCell className='text-right'>{formatNumber(row.approvedQuotations)}</TableCell>
                  <TableCell className='text-right'>{formatNumber(row.wonRevenue)}</TableCell>
--- a/src/features/crm/dashboard/components/dashboard-summary-cards.tsx
+++ b/src/features/crm/dashboard/components/dashboard-summary-cards.tsx
@@ -65,12 +65,12 @@ export function DashboardSummaryCards({
      <SummaryCard
        title='โอกาสขาย'
        description='รายการที่อยู่ในขั้นโอกาสขาย รวมถึงผลลัพธ์ชนะและแพ้'
-        href='/dashboard/crm/enquiries'
+        href='/dashboard/crm/opportunities'
        items={[
-          { label: 'จำนวนโอกาสขาย', value: summary.enquiry.enquiryCount },
-          { label: 'โอกาสขายที่กำลังดำเนินการ', value: summary.enquiry.activeEnquiries },
-          { label: 'จำนวนงานที่ชนะ', value: summary.enquiry.wonCount },
-          { label: 'Win Rate', value: summary.enquiry.winRate, suffix: '%' }
+          { label: 'จำนวนโอกาสขาย', value: summary.opportunity.opportunityCount },
+          { label: 'โอกาสขายที่กำลังดำเนินการ', value: summary.opportunity.activeOpportunities },
+          { label: 'จำนวนงานที่ชนะ', value: summary.opportunity.wonCount },
+          { label: 'Win Rate', value: summary.opportunity.winRate, suffix: '%' }
        ]}
      />
      {canViewCommercialData ? (
@@ -99,3 +99,4 @@ export function DashboardSummaryCards({
    </div>
  );
 }
+
--- a/src/features/crm/dashboard/server/service.ts
+++ b/src/features/crm/dashboard/server/service.ts
@@ -12,8 +12,8 @@ import {
 import {
  crmApprovalRequests,
  crmCustomers,
-  crmEnquiries,
-  crmEnquiryFollowups,
+  crmOpportunities,
+  crmOpportunityFollowups,
  crmQuotationFollowups,
  crmQuotations,
  memberships,
@@ -53,7 +53,7 @@ import type {
  CrmDashboardSummary
 } from '../api/types';

-const ENQUIRY_STATUS_CATEGORY = 'crm_enquiry_status';
+const ENQUIRY_STATUS_CATEGORY = 'crm_opportunity_status';
 const QUOTATION_STATUS_CATEGORY = 'crm_quotation_status';
 const PRODUCT_TYPE_CATEGORY = 'crm_product_type';
 const PROJECT_PARTY_ROLE_CATEGORY = 'crm_project_party_role';
@@ -81,7 +81,7 @@ type NormalizedFilters = {
 };

 type StatusMaps = {
-  enquiryStatusById: Map<string, string>;
+  opportunityStatusById: Map<string, string>;
  quotationStatusById: Map<string, string>;
 };

@@ -132,8 +132,8 @@ function hasDashboardFullScope(context: DashboardContext) {
  return context.membershipRole === 'admin' || context.ownershipScope !== 'own';
 }

-function canAccessDashboardEnquiry(
-  row: typeof crmEnquiries.$inferSelect,
+function canAccessDashboardOpportunity(
+  row: typeof crmOpportunities.$inferSelect,
  context: DashboardContext
 ) {
  if (!hasBranchScopeAccess(context, row.branchId)) {
@@ -179,13 +179,13 @@ function canAccessDashboardQuotation(
 }

 async function getStatusMaps(organizationId: string): Promise<StatusMaps> {
-  const [enquiryOptions, quotationOptions] = await Promise.all([
+  const [opportunityOptions, quotationOptions] = await Promise.all([
    getActiveOptionsByCategory(ENQUIRY_STATUS_CATEGORY, { organizationId }),
    getActiveOptionsByCategory(QUOTATION_STATUS_CATEGORY, { organizationId })
  ]);

  return {
-    enquiryStatusById: new Map(enquiryOptions.map((item) => [item.id, item.code])),
+    opportunityStatusById: new Map(opportunityOptions.map((item) => [item.id, item.code])),
    quotationStatusById: new Map(quotationOptions.map((item) => [item.id, item.code]))
  };
 }
@@ -219,8 +219,8 @@ async function getReferenceData(organizationId: string): Promise<CrmDashboardRef
  };
 }

-function matchesEnquiryFilters(
-  row: typeof crmEnquiries.$inferSelect,
+function matchesOpportunityFilters(
+  row: typeof crmOpportunities.$inferSelect,
  filters: NormalizedFilters
 ) {
  const { from, to } = toDayBounds(filters);
@@ -248,22 +248,22 @@ function matchesQuotationFilters(
 }

 function isPipelineStage(
-  enquiry: typeof crmEnquiries.$inferSelect,
-  stage: 'lead' | 'enquiry' | 'closed_won' | 'closed_lost'
+  opportunity: typeof crmOpportunities.$inferSelect,
+  stage: 'lead' | 'opportunity' | 'closed_won' | 'closed_lost'
 ) {
-  return enquiry.pipelineStage === stage;
+  return opportunity.pipelineStage === stage;
 }

 async function loadScopedRows(
  context: DashboardContext,
  filters: NormalizedFilters
 ) {
-  const [enquiries, quotations] = await Promise.all([
+  const [opportunities, quotations] = await Promise.all([
    db
      .select()
-      .from(crmEnquiries)
+      .from(crmOpportunities)
      .where(
-        and(eq(crmEnquiries.organizationId, context.organizationId), isNull(crmEnquiries.deletedAt))
+        and(eq(crmOpportunities.organizationId, context.organizationId), isNull(crmOpportunities.deletedAt))
      ),
    db
      .select()
@@ -274,9 +274,9 @@ async function loadScopedRows(
  ]);

  return {
-    enquiries: enquiries
-      .filter((row) => canAccessDashboardEnquiry(row, context))
-      .filter((row) => matchesEnquiryFilters(row, filters)),
+    opportunities: opportunities
+      .filter((row) => canAccessDashboardOpportunity(row, context))
+      .filter((row) => matchesOpportunityFilters(row, filters)),
    quotations: quotations
      .filter((row) => canAccessDashboardQuotation(row, context))
      .filter((row) => matchesQuotationFilters(row, filters))
@@ -284,16 +284,16 @@ async function loadScopedRows(
 }

 function buildSummary(
-  scopedEnquiries: Array<typeof crmEnquiries.$inferSelect>,
+  scopedOpportunities: Array<typeof crmOpportunities.$inferSelect>,
  scopedQuotations: Array<typeof crmQuotations.$inferSelect>,
  statusMaps: StatusMaps,
  outcomeMetrics: { wonValue: number; lostValue: number; winRate: number }
 ): CrmDashboardSummary {
  const now = new Date();
-  const leadRows = scopedEnquiries.filter((row) => isPipelineStage(row, 'lead'));
-  const enquiryRows = scopedEnquiries.filter((row) => isPipelineStage(row, 'enquiry'));
-  const wonRows = scopedEnquiries.filter((row) => isPipelineStage(row, 'closed_won'));
-  const lostRows = scopedEnquiries.filter((row) => isPipelineStage(row, 'closed_lost'));
+  const leadRows = scopedOpportunities.filter((row) => isPipelineStage(row, 'lead'));
+  const opportunityRows = scopedOpportunities.filter((row) => isPipelineStage(row, 'opportunity'));
+  const wonRows = scopedOpportunities.filter((row) => isPipelineStage(row, 'closed_won'));
+  const lostRows = scopedOpportunities.filter((row) => isPipelineStage(row, 'closed_lost'));

  const leadAges = leadRows.map((row) => (now.getTime() - row.createdAt.getTime()) / (1000 * 60 * 60 * 24));
  const quotationStatusCodes = scopedQuotations.map((row) => statusMaps.quotationStatusById.get(row.status) ?? '');
@@ -305,14 +305,14 @@ function buildSummary(
      unassignedLeads: leadRows.filter((row) => row.assignedToUserId === null).length,
      averageLeadAgingDays: average(leadAges)
    },
-    enquiry: {
-      enquiryCount: enquiryRows.length,
-      activeEnquiries: enquiryRows.length,
+    opportunity: {
+      opportunityCount: opportunityRows.length,
+      activeOpportunities: opportunityRows.length,
      wonCount: wonRows.length,
      lostCount: lostRows.length,
      winRate: outcomeMetrics.winRate,
-      hotEnquiries: enquiryRows.filter((row) => row.isHotProject).length,
-      enquiryValue: round2(enquiryRows.reduce((sum, row) => sum + (row.estimatedValue ?? 0), 0))
+      hotOpportunities: opportunityRows.filter((row) => row.isHotProject).length,
+      opportunityValue: round2(opportunityRows.reduce((sum, row) => sum + (row.estimatedValue ?? 0), 0))
    },
    quotation: {
      draftQuotations: quotationStatusCodes.filter((code) => code === 'draft').length,
@@ -345,10 +345,10 @@ function buildFunnel(
      value: 0
    },
    {
-      key: 'enquiry',
-      label: getPipelineStageThaiLabel('enquiry'),
-      count: summary.enquiry.enquiryCount,
-      value: summary.enquiry.enquiryValue
+      key: 'opportunity',
+      label: getPipelineStageThaiLabel('opportunity'),
+      count: summary.opportunity.opportunityCount,
+      value: summary.opportunity.opportunityValue
    },
    {
      key: 'quotation',
@@ -383,7 +383,7 @@ function buildFunnel(
    {
      key: 'closed_won',
      label: getPipelineStageThaiLabel('closed_won'),
-      count: summary.enquiry.wonCount,
+      count: summary.opportunity.wonCount,
      value: summary.revenue.wonValue
    }
  ];
@@ -456,7 +456,7 @@ async function buildRevenueAnalytics(
 }

 async function buildSalesRanking(
-  scopedEnquiries: Array<typeof crmEnquiries.$inferSelect>,
+  scopedOpportunities: Array<typeof crmOpportunities.$inferSelect>,
  scopedQuotations: Array<typeof crmQuotations.$inferSelect>,
  statusMaps: StatusMaps,
  wonRevenueRows: Array<{ assignedToUserId: string | null; revenue: number }>
@@ -464,7 +464,7 @@ async function buildSalesRanking(
  const userIds = [
    ...new Set(
      [
-        ...scopedEnquiries.map((row) => row.assignedToUserId).filter(Boolean),
+        ...scopedOpportunities.map((row) => row.assignedToUserId).filter(Boolean),
        ...scopedQuotations.map((row) => row.salesmanId).filter(Boolean)
      ] as string[]
    )
@@ -475,7 +475,7 @@ async function buildSalesRanking(
  const userMap = new Map(salesUsers.map((row) => [row.id, row.name]));
  const rankingMap = new Map<string, CrmDashboardSalesRankingRow>();

-  for (const row of scopedEnquiries) {
+  for (const row of scopedOpportunities) {
    if (!row.assignedToUserId) continue;
    const current =
      rankingMap.get(row.assignedToUserId) ??
@@ -483,7 +483,7 @@ async function buildSalesRanking(
        salesPersonId: row.assignedToUserId,
        salesPersonName: userMap.get(row.assignedToUserId) ?? 'Unknown',
        leadCount: 0,
-        enquiryCount: 0,
+        opportunityCount: 0,
        quotationCount: 0,
        approvedQuotations: 0,
        wonRevenue: 0,
@@ -494,8 +494,8 @@ async function buildSalesRanking(
      current.leadCount += 1;
    }

-    if (isPipelineStage(row, 'enquiry')) {
-      current.enquiryCount += 1;
+    if (isPipelineStage(row, 'opportunity')) {
+      current.opportunityCount += 1;
    }

    rankingMap.set(row.assignedToUserId, current);
@@ -509,7 +509,7 @@ async function buildSalesRanking(
        salesPersonId: row.salesmanId,
        salesPersonName: userMap.get(row.salesmanId) ?? 'Unknown',
        leadCount: 0,
-        enquiryCount: 0,
+        opportunityCount: 0,
        quotationCount: 0,
        approvedQuotations: 0,
        wonRevenue: 0,
@@ -539,7 +539,7 @@ async function buildSalesRanking(
        salesPersonId: row.assignedToUserId,
        salesPersonName: userMap.get(row.assignedToUserId) ?? 'Unknown',
        leadCount: 0,
-        enquiryCount: 0,
+        opportunityCount: 0,
        quotationCount: 0,
        approvedQuotations: 0,
        wonRevenue: 0,
@@ -570,17 +570,17 @@ async function buildFollowups(
  filters: NormalizedFilters
 ): Promise<{ summary: CrmDashboardFollowupSummary; upcoming: CrmDashboardFollowupRow[] }> {
  const allowQuotationFollowups = canViewCommercialData(context);
-  const [enquiryFollowups, quotationFollowups] = await Promise.all([
+  const [opportunityFollowups, quotationFollowups] = await Promise.all([
    db
      .select()
-      .from(crmEnquiryFollowups)
+      .from(crmOpportunityFollowups)
      .where(
        and(
-          eq(crmEnquiryFollowups.organizationId, context.organizationId),
-          isNull(crmEnquiryFollowups.deletedAt)
+          eq(crmOpportunityFollowups.organizationId, context.organizationId),
+          isNull(crmOpportunityFollowups.deletedAt)
        )
      )
-      .orderBy(asc(crmEnquiryFollowups.followupDate)),
+      .orderBy(asc(crmOpportunityFollowups.followupDate)),
    allowQuotationFollowups
      ? db
          .select()
@@ -599,49 +599,49 @@ async function buildFollowups(
  const now = new Date();
  const weekStart = startOfWeek(now, { weekStartsOn: 1 });
  const weekEnd = endOfWeek(now, { weekStartsOn: 1 });
-  const enquiryIds = [...new Set(enquiryFollowups.map((row) => row.enquiryId))];
+  const opportunityIds = [...new Set(opportunityFollowups.map((row) => row.opportunityId))];
  const quotationIds = [...new Set(quotationFollowups.map((row) => row.quotationId))];
-  const [enquiries, quotations] = await Promise.all([
-    enquiryIds.length ? db.select().from(crmEnquiries).where(inArray(crmEnquiries.id, enquiryIds)) : [],
+  const [opportunities, quotations] = await Promise.all([
+    opportunityIds.length ? db.select().from(crmOpportunities).where(inArray(crmOpportunities.id, opportunityIds)) : [],
    quotationIds.length ? db.select().from(crmQuotations).where(inArray(crmQuotations.id, quotationIds)) : []
  ]);
-  const customerIds = [...new Set([...enquiries.map((row) => row.customerId), ...quotations.map((row) => row.customerId)])];
+  const customerIds = [...new Set([...opportunities.map((row) => row.customerId), ...quotations.map((row) => row.customerId)])];
  const salesIds = [
    ...new Set(
-      [...enquiries.map((row) => row.assignedToUserId).filter(Boolean), ...quotations.map((row) => row.salesmanId).filter(Boolean)] as string[]
+      [...opportunities.map((row) => row.assignedToUserId).filter(Boolean), ...quotations.map((row) => row.salesmanId).filter(Boolean)] as string[]
    )
  ];
  const [customers, salesUsers] = await Promise.all([
    customerIds.length ? db.select().from(crmCustomers).where(inArray(crmCustomers.id, customerIds)) : [],
    salesIds.length ? db.select({ id: users.id, name: users.name }).from(users).where(inArray(users.id, salesIds)) : []
  ]);
-  const enquiryMap = new Map(enquiries.map((row) => [row.id, row]));
+  const opportunityMap = new Map(opportunities.map((row) => [row.id, row]));
  const quotationMap = new Map(quotations.map((row) => [row.id, row]));
  const customerMap = new Map(customers.map((row) => [row.id, row.name]));
  const salesMap = new Map(salesUsers.map((row) => [row.id, row.name]));

-  const enquiryRows = enquiryFollowups
+  const opportunityRows = opportunityFollowups
    .filter((row) => {
-      const enquiry = enquiryMap.get(row.enquiryId);
-      return enquiry ? canAccessDashboardEnquiry(enquiry, context) : false;
+      const opportunity = opportunityMap.get(row.opportunityId);
+      return opportunity ? canAccessDashboardOpportunity(opportunity, context) : false;
    })
    .filter((row) => !isBefore(row.followupDate, from) && !isAfter(row.followupDate, to))
    .flatMap<CrmDashboardFollowupRow>((row) => {
-      const enquiry = enquiryMap.get(row.enquiryId);
+      const opportunity = opportunityMap.get(row.opportunityId);

-      if (!enquiry) {
+      if (!opportunity) {
        return [];
      }

      return [
        {
          id: row.id,
-          sourceType: 'enquiry',
+          sourceType: 'opportunity',
          followupDate: row.followupDate.toISOString(),
-          customerName: customerMap.get(enquiry.customerId) ?? 'Unknown customer',
-          enquiryName: enquiry.projectName ?? enquiry.title,
-          assignedSalesName: enquiry.assignedToUserId
-            ? (salesMap.get(enquiry.assignedToUserId) ?? null)
+          customerName: customerMap.get(opportunity.customerId) ?? 'Unknown customer',
+          opportunityName: opportunity.projectName ?? opportunity.title,
+          assignedSalesName: opportunity.assignedToUserId
+            ? (salesMap.get(opportunity.assignedToUserId) ?? null)
            : null,
          outcome: row.outcome
        }
@@ -666,7 +666,7 @@ async function buildFollowups(
          sourceType: 'quotation',
          followupDate: row.followupDate.toISOString(),
          customerName: customerMap.get(quotation.customerId) ?? 'Unknown customer',
-          enquiryName: quotation.projectName ?? quotation.code,
+          opportunityName: quotation.projectName ?? quotation.code,
          assignedSalesName: quotation.salesmanId
            ? (salesMap.get(quotation.salesmanId) ?? null)
            : null,
@@ -674,7 +674,7 @@ async function buildFollowups(
        }
      ];
    });
-  const rows: CrmDashboardFollowupRow[] = [...enquiryRows, ...quotationRows];
+  const rows: CrmDashboardFollowupRow[] = [...opportunityRows, ...quotationRows];

  return {
    summary: {
@@ -749,19 +749,19 @@ async function buildHotProjects(
 ): Promise<CrmDashboardHotProjectRow[]> {
  const rows = await db
    .select()
-    .from(crmEnquiries)
+    .from(crmOpportunities)
    .where(
      and(
-        eq(crmEnquiries.organizationId, context.organizationId),
-        isNull(crmEnquiries.deletedAt),
-        eq(crmEnquiries.isHotProject, true)
+        eq(crmOpportunities.organizationId, context.organizationId),
+        isNull(crmOpportunities.deletedAt),
+        eq(crmOpportunities.isHotProject, true)
      )
    )
-    .orderBy(desc(crmEnquiries.updatedAt));
+    .orderBy(desc(crmOpportunities.updatedAt));
  const scoped = rows
-    .filter((row) => canAccessDashboardEnquiry(row, context))
-    .filter((row) => matchesEnquiryFilters(row, filters))
-    .filter((row) => isPipelineStage(row, 'enquiry'))
+    .filter((row) => canAccessDashboardOpportunity(row, context))
+    .filter((row) => matchesOpportunityFilters(row, filters))
+    .filter((row) => isPipelineStage(row, 'opportunity'))
    .slice(0, 10);
  const customerIds = [...new Set(scoped.map((row) => row.customerId))];
  const salesIds = [...new Set(scoped.map((row) => row.assignedToUserId).filter(Boolean))] as string[];
@@ -773,8 +773,8 @@ async function buildHotProjects(
  const salesMap = new Map(salesUsers.map((row) => [row.id, row.name]));

  return scoped.map((row) => ({
-    enquiryId: row.id,
-    enquiryCode: row.code,
+    opportunityId: row.id,
+    opportunityCode: row.code,
    projectName: row.projectName ?? row.title,
    customerName: customerMap.get(row.customerId) ?? 'Unknown customer',
    value: row.estimatedValue ?? 0,
@@ -812,7 +812,7 @@ export async function getCrmDashboardData(
          getLostByCompetitor(context.organizationId, outcomeFilters)
        ])
      : [[], [], 0, [], []];
-  const summary = buildSummary(scoped.enquiries, scoped.quotations, statusMaps, {
+  const summary = buildSummary(scoped.opportunities, scoped.quotations, statusMaps, {
    wonValue: wonRevenueRows.reduce((sum, row) => sum + row.revenue, 0),
    lostValue: lostRevenueRows.reduce((sum, row) => sum + row.revenue, 0),
    winRate
@@ -827,7 +827,7 @@ export async function getCrmDashboardData(
          topConsultants: []
        }),
    allowCommercialData
-      ? buildSalesRanking(scoped.enquiries, scoped.quotations, statusMaps, wonRevenueRows)
+      ? buildSalesRanking(scoped.opportunities, scoped.quotations, statusMaps, wonRevenueRows)
      : Promise.resolve([]),
    buildFollowups(context, filters),
    allowApprovalData
@@ -871,3 +871,4 @@ export async function getCrmDashboardData(
    }
  };
 }
+
--- a/src/features/crm/enquiries/api/mutations.ts
+++ b/src/features/crm/enquiries/api/mutations.ts
@@ -1,190 +0,0 @@
-import { mutationOptions } from '@tanstack/react-query';
-import { getQueryClient } from '@/lib/query-client';
-import {
-  assignEnquiry,
-  createEnquiry,
-  createEnquiryFollowup,
-  deleteEnquiry,
-  deleteEnquiryFollowup,
-  markEnquiryLost,
-  markEnquiryWon,
-  reassignEnquiry,
-  reopenEnquiry,
-  updateEnquiry,
-  updateEnquiryFollowup
-} from './service';
-import { enquiryKeys } from './queries';
-import type {
-  EnquiryAssignmentMutationPayload,
-  EnquiryFollowupMutationPayload,
-  EnquiryMarkLostPayload,
-  EnquiryMarkWonPayload,
-  EnquiryMutationPayload
-} from './types';
-import { crmDashboardKeys } from '@/features/crm/dashboard/api/queries';
-
-async function invalidateEnquiryLists() {
-  await getQueryClient().invalidateQueries({ queryKey: enquiryKeys.lists() });
-}
-
-async function invalidateDashboardQueries() {
-  await getQueryClient().invalidateQueries({ queryKey: crmDashboardKeys.all });
-}
-
-async function invalidateEnquiryDetail(id: string) {
-  await getQueryClient().invalidateQueries({ queryKey: enquiryKeys.detail(id) });
-}
-
-async function invalidateEnquiryProjectParties(id: string) {
-  await getQueryClient().invalidateQueries({ queryKey: enquiryKeys.projectParties(id) });
-}
-
-async function invalidateEnquiryFollowups(id: string) {
-  await getQueryClient().invalidateQueries({ queryKey: enquiryKeys.followups(id) });
-}
-
-async function invalidateEnquiryAttachments(id: string) {
-  await getQueryClient().invalidateQueries({ queryKey: enquiryKeys.attachments(id) });
-}
-
-export async function invalidateEnquiryMutationQueries(id: string) {
-  await Promise.all([
-    invalidateEnquiryLists(),
-    invalidateEnquiryDetail(id),
-    invalidateEnquiryProjectParties(id),
-    invalidateEnquiryAttachments(id),
-    invalidateDashboardQueries()
-  ]);
-}
-
-export async function invalidateEnquiryFollowupMutationQueries(enquiryId: string) {
-  await Promise.all([
-    invalidateEnquiryLists(),
-    invalidateEnquiryDetail(enquiryId),
-    invalidateEnquiryFollowups(enquiryId),
-    invalidateDashboardQueries()
-  ]);
-}
-
-export const createEnquiryMutation = mutationOptions({
-  mutationFn: (data: EnquiryMutationPayload) => createEnquiry(data),
-  onSettled: async (_data, error) => {
-    if (!error) {
-      await Promise.all([invalidateEnquiryLists(), invalidateDashboardQueries()]);
-    }
-  }
-});
-
-export const updateEnquiryMutation = mutationOptions({
-  mutationFn: ({ id, values }: { id: string; values: EnquiryMutationPayload }) =>
-    updateEnquiry(id, values),
-  onSettled: async (_data, error, variables) => {
-    if (!error) {
-      await invalidateEnquiryMutationQueries(variables.id);
-    }
-  }
-});
-
-export const deleteEnquiryMutation = mutationOptions({
-  mutationFn: (id: string) => deleteEnquiry(id),
-  onSettled: async (_data, error, id) => {
-    if (!error) {
-      getQueryClient().removeQueries({ queryKey: enquiryKeys.detail(id) });
-      getQueryClient().removeQueries({ queryKey: enquiryKeys.projectParties(id) });
-      getQueryClient().removeQueries({ queryKey: enquiryKeys.followups(id) });
-      await Promise.all([invalidateEnquiryLists(), invalidateDashboardQueries()]);
-    }
-  }
-});
-
-export const assignEnquiryMutation = mutationOptions({
-  mutationFn: ({ id, values }: { id: string; values: EnquiryAssignmentMutationPayload }) =>
-    assignEnquiry(id, values),
-  onSettled: async (_data, error, variables) => {
-    if (!error) {
-      await invalidateEnquiryMutationQueries(variables.id);
-    }
-  }
-});
-
-export const reassignEnquiryMutation = mutationOptions({
-  mutationFn: ({ id, values }: { id: string; values: EnquiryAssignmentMutationPayload }) =>
-    reassignEnquiry(id, values),
-  onSettled: async (_data, error, variables) => {
-    if (!error) {
-      await invalidateEnquiryMutationQueries(variables.id);
-    }
-  }
-});
-
-export const createEnquiryFollowupMutation = mutationOptions({
-  mutationFn: ({
-    enquiryId,
-    values
-  }: {
-    enquiryId: string;
-    values: EnquiryFollowupMutationPayload;
-  }) => createEnquiryFollowup(enquiryId, values),
-  onSettled: async (_data, error, variables) => {
-    if (!error) {
-      await invalidateEnquiryFollowupMutationQueries(variables.enquiryId);
-    }
-  }
-});
-
-export const updateEnquiryFollowupMutation = mutationOptions({
-  mutationFn: ({
-    enquiryId,
-    followupId,
-    values
-  }: {
-    enquiryId: string;
-    followupId: string;
-    values: EnquiryFollowupMutationPayload;
-  }) => updateEnquiryFollowup(enquiryId, followupId, values),
-  onSettled: async (_data, error, variables) => {
-    if (!error) {
-      await invalidateEnquiryFollowupMutationQueries(variables.enquiryId);
-    }
-  }
-});
-
-export const deleteEnquiryFollowupMutation = mutationOptions({
-  mutationFn: ({ enquiryId, followupId }: { enquiryId: string; followupId: string }) =>
-    deleteEnquiryFollowup(enquiryId, followupId),
-  onSettled: async (_data, error, variables) => {
-    if (!error) {
-      await invalidateEnquiryFollowupMutationQueries(variables.enquiryId);
-    }
-  }
-});
-
-export const markEnquiryWonMutation = mutationOptions({
-  mutationFn: ({ id, values }: { id: string; values: EnquiryMarkWonPayload }) =>
-    markEnquiryWon(id, values),
-  onSettled: async (_data, error, variables) => {
-    if (!error) {
-      await invalidateEnquiryMutationQueries(variables.id);
-    }
-  }
-});
-
-export const markEnquiryLostMutation = mutationOptions({
-  mutationFn: ({ id, values }: { id: string; values: EnquiryMarkLostPayload }) =>
-    markEnquiryLost(id, values),
-  onSettled: async (_data, error, variables) => {
-    if (!error) {
-      await invalidateEnquiryMutationQueries(variables.id);
-    }
-  }
-});
-
-export const reopenEnquiryMutation = mutationOptions({
-  mutationFn: ({ id, reason }: { id: string; reason: string }) =>
-    reopenEnquiry(id, { reopenReason: reason }),
-  onSettled: async (_data, error, variables) => {
-    if (!error) {
-      await invalidateEnquiryMutationQueries(variables.id);
-    }
-  }
-});
--- a/src/features/crm/enquiries/api/queries.ts
+++ b/src/features/crm/enquiries/api/queries.ts
@@ -1,53 +0,0 @@
-import { queryOptions } from '@tanstack/react-query';
-import {
-  getEnquiryAttachments,
-  getEnquiries,
-  getEnquiryById,
-  getEnquiryFollowups,
-  getEnquiryProjectParties
-} from './service';
-import type { EnquiryFilters } from './types';
-
-export const enquiryKeys = {
-  all: ['crm-enquiries'] as const,
-  lists: () => [...enquiryKeys.all, 'list'] as const,
-  list: (filters: EnquiryFilters) => [...enquiryKeys.lists(), filters] as const,
-  details: () => [...enquiryKeys.all, 'detail'] as const,
-  detail: (id: string) => [...enquiryKeys.details(), id] as const,
-  projectPartiesRoot: () => [...enquiryKeys.all, 'project-parties'] as const,
-  projectParties: (id: string) => [...enquiryKeys.projectPartiesRoot(), id] as const,
-  followupsRoot: () => [...enquiryKeys.all, 'followups'] as const,
-  followups: (id: string) => [...enquiryKeys.followupsRoot(), id] as const,
-  attachmentsRoot: () => [...enquiryKeys.all, 'attachments'] as const,
-  attachments: (id: string) => [...enquiryKeys.attachmentsRoot(), id] as const
-};
-
-export const enquiriesQueryOptions = (filters: EnquiryFilters) =>
-  queryOptions({
-    queryKey: enquiryKeys.list(filters),
-    queryFn: () => getEnquiries(filters)
-  });
-
-export const enquiryByIdOptions = (id: string) =>
-  queryOptions({
-    queryKey: enquiryKeys.detail(id),
-    queryFn: () => getEnquiryById(id)
-  });
-
-export const enquiryProjectPartiesOptions = (id: string) =>
-  queryOptions({
-    queryKey: enquiryKeys.projectParties(id),
-    queryFn: () => getEnquiryProjectParties(id)
-  });
-
-export const enquiryFollowupsOptions = (id: string) =>
-  queryOptions({
-    queryKey: enquiryKeys.followups(id),
-    queryFn: () => getEnquiryFollowups(id)
-  });
-
-export const enquiryAttachmentsOptions = (id: string) =>
-  queryOptions({
-    queryKey: enquiryKeys.attachments(id),
-    queryFn: () => getEnquiryAttachments(id)
-  });
--- a/src/features/crm/enquiries/api/service.ts
+++ b/src/features/crm/enquiries/api/service.ts
@@ -1,133 +0,0 @@
-import { apiClient } from '@/lib/api-client';
-import type {
-  EnquiryAttachmentsResponse,
-  EnquiryAssignmentMutationPayload,
-  EnquiryDetailResponse,
-  EnquiryFilters,
-  EnquiryFollowupMutationPayload,
-  EnquiryFollowupsResponse,
-  EnquiryListResponse,
-  EnquiryMarkLostPayload,
-  EnquiryMarkWonPayload,
-  EnquiryMutationPayload,
-  EnquiryProjectPartiesResponse,
-  EnquiryReopenPayload,
-  MutationSuccessResponse
-} from './types';
-
-export async function getEnquiries(filters: EnquiryFilters): Promise<EnquiryListResponse> {
-  const searchParams = new URLSearchParams();
-
-  if (filters.page) searchParams.set('page', String(filters.page));
-  if (filters.limit) searchParams.set('limit', String(filters.limit));
-  if (filters.search) searchParams.set('search', filters.search);
-  if (filters.pipelineStage) searchParams.set('pipelineStage', filters.pipelineStage);
-  if (filters.status) searchParams.set('status', filters.status);
-  if (filters.productType) searchParams.set('productType', filters.productType);
-  if (filters.priority) searchParams.set('priority', filters.priority);
-  if (filters.branch) searchParams.set('branch', filters.branch);
-  if (filters.customer) searchParams.set('customer', filters.customer);
-  if (filters.sort) searchParams.set('sort', filters.sort);
-
-  const query = searchParams.toString();
-
-  return apiClient<EnquiryListResponse>(`/crm/enquiries${query ? `?${query}` : ''}`);
-}
-
-export async function getEnquiryById(id: string): Promise<EnquiryDetailResponse> {
-  return apiClient<EnquiryDetailResponse>(`/crm/enquiries/${id}`);
-}
-
-export async function getEnquiryProjectParties(id: string): Promise<EnquiryProjectPartiesResponse> {
-  return apiClient<EnquiryProjectPartiesResponse>(`/crm/enquiries/${id}/customers`);
-}
-
-export async function createEnquiry(data: EnquiryMutationPayload) {
-  return apiClient<MutationSuccessResponse>('/crm/enquiries', {
-    method: 'POST',
-    body: JSON.stringify(data)
-  });
-}
-
-export async function updateEnquiry(id: string, data: EnquiryMutationPayload) {
-  return apiClient<MutationSuccessResponse>(`/crm/enquiries/${id}`, {
-    method: 'PATCH',
-    body: JSON.stringify(data)
-  });
-}
-
-export async function deleteEnquiry(id: string) {
-  return apiClient<MutationSuccessResponse>(`/crm/enquiries/${id}`, {
-    method: 'DELETE'
-  });
-}
-
-export async function assignEnquiry(id: string, data: EnquiryAssignmentMutationPayload) {
-  return apiClient<MutationSuccessResponse>(`/crm/enquiries/${id}/assign`, {
-    method: 'POST',
-    body: JSON.stringify(data)
-  });
-}
-
-export async function reassignEnquiry(id: string, data: EnquiryAssignmentMutationPayload) {
-  return apiClient<MutationSuccessResponse>(`/crm/enquiries/${id}/reassign`, {
-    method: 'POST',
-    body: JSON.stringify(data)
-  });
-}
-
-export async function getEnquiryFollowups(id: string): Promise<EnquiryFollowupsResponse> {
-  return apiClient<EnquiryFollowupsResponse>(`/crm/enquiries/${id}/followups`);
-}
-
-export async function getEnquiryAttachments(id: string): Promise<EnquiryAttachmentsResponse> {
-  return apiClient<EnquiryAttachmentsResponse>(`/crm/enquiries/${id}/po-attachments`);
-}
-
-export async function createEnquiryFollowup(
-  enquiryId: string,
-  data: EnquiryFollowupMutationPayload
-) {
-  return apiClient<MutationSuccessResponse>(`/crm/enquiries/${enquiryId}/followups`, {
-    method: 'POST',
-    body: JSON.stringify(data)
-  });
-}
-
-export async function updateEnquiryFollowup(
-  enquiryId: string,
-  followupId: string,
-  data: EnquiryFollowupMutationPayload
-) {
-  return apiClient<MutationSuccessResponse>(`/crm/enquiries/${enquiryId}/followups/${followupId}`, {
-    method: 'PATCH',
-    body: JSON.stringify(data)
-  });
-}
-
-export async function deleteEnquiryFollowup(enquiryId: string, followupId: string) {
-  return apiClient<MutationSuccessResponse>(`/crm/enquiries/${enquiryId}/followups/${followupId}`, {
-    method: 'DELETE'
-  });
-}
-
-export async function markEnquiryWon(id: string, data: EnquiryMarkWonPayload) {
-  return apiClient<MutationSuccessResponse>(`/crm/enquiries/${id}/mark-won`, {
-    method: 'POST',
-    body: JSON.stringify(data)
-  });
-}
-
-export async function markEnquiryLost(id: string, data: EnquiryMarkLostPayload) {
-  return apiClient<MutationSuccessResponse>(`/crm/enquiries/${id}/mark-lost`, {
-    method: 'POST',
-    body: JSON.stringify(data)
-  });
-}
-
-export async function reopenEnquiry(id: string, data: EnquiryReopenPayload) {
-  return apiClient<MutationSuccessResponse>(`/crm/enquiries/${id}/reopen`, {
-    method: 'POST',
-    body: JSON.stringify(data)
-  });
-}
--- a/src/features/crm/leads/api/types.ts
+++ b/src/features/crm/leads/api/types.ts
@@ -9,7 +9,7 @@ export type {
  LeadDetail,
  LeadDetailResponse,
  LeadFollowupSummary,
-  LeadLinkedEnquirySummary,
+  LeadLinkedOpportunitySummary,
  LeadListFilters,
  LeadListResponse,
  LeadMutationSuccessResponse,
@@ -18,3 +18,4 @@ export type {
  LeadSummary,
  UpdateLeadInput
 } from '../types';
+
--- a/src/features/crm/leads/components/lead-assignment-dialog.tsx
+++ b/src/features/crm/leads/components/lead-assignment-dialog.tsx
@@ -54,9 +54,9 @@ export function LeadAssignmentDialog({
    ...assignLeadMutation,
    onSuccess: (result) => {
      toast.success(
-        result.reusedExistingEnquiry
-          ? `มอบหมายสำเร็จและใช้ enquiry เดิม ${result.enquiryCode}`
-          : `มอบหมายสำเร็จและสร้าง enquiry ${result.enquiryCode}`
+        result.reusedExistingOpportunity
+          ? `มอบหมายสำเร็จและใช้ opportunity เดิม ${result.opportunityCode}`
+          : `มอบหมายสำเร็จและสร้าง opportunity ${result.opportunityCode}`
      );
      onOpenChange(false);
    },
@@ -90,7 +90,7 @@ export function LeadAssignmentDialog({
        <DialogHeader>
          <DialogTitle>Assign Lead to Sales</DialogTitle>
          <DialogDescription>
-            มอบหมายลีดให้ฝ่ายขายและสร้าง enquiry workspace แยกจาก lead workspace
+            มอบหมายลีดให้ฝ่ายขายและสร้าง opportunity workspace แยกจาก lead workspace
          </DialogDescription>
        </DialogHeader>

@@ -127,17 +127,17 @@ export function LeadAssignmentDialog({
          </Button>
        </DialogFooter>

-        {'linkedEnquiries' in lead && lead.linkedEnquiries.length > 0 ? (
+        {'linkedOpportunities' in lead && lead.linkedOpportunities.length > 0 ? (
          <div className='border-border rounded-md border p-3 text-sm'>
-            <div className='mb-2 font-medium'>Linked enquiries</div>
+            <div className='mb-2 font-medium'>Linked opportunities</div>
            <div className='space-y-1'>
-              {lead.linkedEnquiries.map((enquiry) => (
+              {lead.linkedOpportunities.map((opportunity) => (
                <Link
-                  key={enquiry.id}
-                  href={`/dashboard/crm/enquiries/${enquiry.id}`}
+                  key={opportunity.id}
+                  href={`/dashboard/crm/opportunities/${opportunity.id}`}
                  className='block hover:underline'
                >
-                  {enquiry.code} - {enquiry.title}
+                  {opportunity.code} - {opportunity.title}
                </Link>
              ))}
            </div>
@@ -147,3 +147,4 @@ export function LeadAssignmentDialog({
    </Dialog>
  );
 }
+
--- a/src/features/crm/leads/components/lead-detail.tsx
+++ b/src/features/crm/leads/components/lead-detail.tsx
@@ -57,7 +57,7 @@ export function LeadDetail({
            <Badge variant='outline'>{lead.statusLabel ?? lead.status}</Badge>
          </div>
          <p className='text-muted-foreground mt-2 text-sm'>
-            Lead workspace for marketing qualification before sales enquiry handoff
+            Lead workspace for marketing qualification before sales opportunity handoff
          </p>
        </div>

@@ -103,7 +103,7 @@ export function LeadDetail({
          <Tabs defaultValue='followups' className='space-y-4'>
            <TabsList>
              <TabsTrigger value='followups'>Follow-ups</TabsTrigger>
-              <TabsTrigger value='linked-enquiries'>Linked Enquiries</TabsTrigger>
+              <TabsTrigger value='linked-opportunities'>Linked Opportunities</TabsTrigger>
              <TabsTrigger value='activity'>Activity</TabsTrigger>
            </TabsList>

@@ -111,29 +111,29 @@ export function LeadDetail({
              <LeadFollowupPanel leadId={leadId} detail={data} />
            </TabsContent>

-            <TabsContent value='linked-enquiries'>
+            <TabsContent value='linked-opportunities'>
              <Card>
                <CardHeader>
-                  <CardTitle>Linked Enquiries</CardTitle>
+                  <CardTitle>Linked Opportunities</CardTitle>
                </CardHeader>
                <CardContent className='space-y-3'>
-                  {lead.linkedEnquiries.length === 0 ? (
-                    <div className='text-muted-foreground text-sm'>No linked enquiries yet.</div>
+                  {lead.linkedOpportunities.length === 0 ? (
+                    <div className='text-muted-foreground text-sm'>No linked opportunities yet.</div>
                  ) : (
-                    lead.linkedEnquiries.map((enquiry) => (
-                      <div key={enquiry.id} className='border-border rounded-md border p-3'>
+                    lead.linkedOpportunities.map((opportunity) => (
+                      <div key={opportunity.id} className='border-border rounded-md border p-3'>
                        <div className='flex items-center justify-between gap-3'>
                          <Link
-                            href={`/dashboard/crm/enquiries/${enquiry.id}`}
+                            href={`/dashboard/crm/opportunities/${opportunity.id}`}
                            className='font-medium hover:underline'
                          >
-                            {enquiry.code}
+                            {opportunity.code}
                          </Link>
-                          <Badge variant='outline'>{enquiry.status}</Badge>
+                          <Badge variant='outline'>{opportunity.status}</Badge>
                        </div>
-                        <div className='mt-1 text-sm'>{enquiry.title}</div>
+                        <div className='mt-1 text-sm'>{opportunity.title}</div>
                        <div className='text-muted-foreground mt-2 text-xs'>
-                          Owner: {enquiry.assignedToName ?? '-'}
+                          Owner: {opportunity.assignedToName ?? '-'}
                        </div>
                      </div>
                    ))
@@ -174,7 +174,7 @@ export function LeadDetail({
            </CardHeader>
            <CardContent className='space-y-3'>
              <FieldItem label='Current Workspace' value='Lead' />
-              <FieldItem label='Related Enquiries' value={String(lead.relatedEnquiryCount)} />
+              <FieldItem label='Related Opportunities' value={String(lead.relatedOpportunityCount)} />
              <FieldItem
                label='Assigned At'
                value={lead.assignedAt ? new Date(lead.assignedAt).toLocaleString() : null}
@@ -188,3 +188,4 @@ export function LeadDetail({
    </div>
  );
 }
+
--- a/src/features/crm/leads/server/assignment.service.ts
+++ b/src/features/crm/leads/server/assignment.service.ts
@@ -1,5 +1,5 @@
 import { and, asc, eq, inArray, isNull } from 'drizzle-orm';
-import { crmEnquiries, crmLeads } from '@/db/schema';
+import { crmOpportunities, crmLeads } from '@/db/schema';
 import { db } from '@/lib/db';
 import { AuthError } from '@/lib/auth/session';
 import { generateNextDocumentCode } from '@/features/foundation/document-sequence/service';
@@ -13,13 +13,13 @@ import {
  assertAssignableUserBelongsToOrganization,
  assertContactBelongsToOrganization,
  assertCustomerBelongsToOrganization
-} from '@/features/crm/enquiries/server/service';
+} from '@/features/crm/opportunities/server/service';
 import type { AssignLeadInput, AssignLeadResult } from '../types';

 export type LeadAssignmentAccessContext = CrmSecurityContext;

 type LeadRow = typeof crmLeads.$inferSelect;
-type EnquiryRow = typeof crmEnquiries.$inferSelect;
+type OpportunityRow = typeof crmOpportunities.$inferSelect;

 function canAccessLeadRow(row: LeadRow, accessContext: LeadAssignmentAccessContext) {
  return canAccessScopedCrmRecord(accessContext, {
@@ -57,34 +57,34 @@ async function assertLeadBelongsToOrganization(
  return lead;
 }

-async function resolveDefaultEnquiryStatusId(organizationId: string) {
-  const options = await getActiveOptionsByCategory('crm_enquiry_status', { organizationId });
+async function resolveDefaultOpportunityStatusId(organizationId: string) {
+  const options = await getActiveOptionsByCategory('crm_opportunity_status', { organizationId });
  const preferred = options.find((option) => option.code === 'new');
  const resolved = preferred ?? options[0];

  if (!resolved) {
-    throw new AuthError('Enquiry status options are not configured', 400);
+    throw new AuthError('Opportunity status options are not configured', 400);
  }

  return resolved.id;
 }

-async function findActiveEnquiryByLead(leadId: string, organizationId: string) {
-  const [enquiry] = await db
+async function findActiveOpportunityByLead(leadId: string, organizationId: string) {
+  const [opportunity] = await db
    .select()
-    .from(crmEnquiries)
+    .from(crmOpportunities)
    .where(
      and(
-        eq(crmEnquiries.leadId, leadId),
-        eq(crmEnquiries.organizationId, organizationId),
-        inArray(crmEnquiries.pipelineStage, ['lead', 'enquiry']),
-        isNull(crmEnquiries.deletedAt)
+        eq(crmOpportunities.leadId, leadId),
+        eq(crmOpportunities.organizationId, organizationId),
+        inArray(crmOpportunities.pipelineStage, ['lead', 'opportunity']),
+        isNull(crmOpportunities.deletedAt)
      )
    )
-    .orderBy(asc(crmEnquiries.createdAt))
+    .orderBy(asc(crmOpportunities.createdAt))
    .limit(1);

-  return enquiry ?? null;
+  return opportunity ?? null;
 }

 async function syncLeadAssignment(input: {
@@ -109,7 +109,7 @@ async function syncLeadAssignment(input: {
    .where(eq(crmLeads.id, input.leadId));
 }

-async function createEnquiryFromLead(input: {
+async function createOpportunityFromLead(input: {
  lead: LeadRow;
  organizationId: string;
  actorUserId: string;
@@ -139,17 +139,17 @@ async function createEnquiryFromLead(input: {
  }

  const [statusId, documentCode] = await Promise.all([
-    resolveDefaultEnquiryStatusId(input.organizationId),
+    resolveDefaultOpportunityStatusId(input.organizationId),
    generateNextDocumentCode({
      organizationId: input.organizationId,
-      documentType: 'crm_enquiry',
+      documentType: 'crm_opportunity',
      branchId: input.lead.branchId ?? null
    })
  ]);

  const now = new Date();
  const [created] = await db
-    .insert(crmEnquiries)
+    .insert(crmOpportunities)
    .values({
      id: crypto.randomUUID(),
      organizationId: input.organizationId,
@@ -175,7 +175,7 @@ async function createEnquiryFromLead(input: {
      notes: null,
      isHotProject: false,
      isActive: true,
-      pipelineStage: 'enquiry',
+      pipelineStage: 'opportunity',
      assignedToUserId: input.salesOwnerId,
      assignedAt: now,
      assignedBy: input.actorUserId,
@@ -197,16 +197,16 @@ export async function assignLead(
  const lead = await assertLeadBelongsToOrganization(input.leadId, organizationId, accessContext);
  await assertAssignableUserBelongsToOrganization(input.salesOwnerId, organizationId);

-  const existingEnquiry = await findActiveEnquiryByLead(input.leadId, organizationId);
+  const existingOpportunity = await findActiveOpportunityByLead(input.leadId, organizationId);

-  if (existingEnquiry) {
-    const resolvedSalesOwnerId = existingEnquiry.assignedToUserId ?? input.salesOwnerId;
+  if (existingOpportunity) {
+    const resolvedSalesOwnerId = existingOpportunity.assignedToUserId ?? input.salesOwnerId;

-    if (!existingEnquiry.assignedToUserId) {
+    if (!existingOpportunity.assignedToUserId) {
      await db
-        .update(crmEnquiries)
+        .update(crmOpportunities)
        .set({
-          pipelineStage: 'enquiry',
+          pipelineStage: 'opportunity',
          assignedToUserId: input.salesOwnerId,
          assignedAt: new Date(),
          assignedBy: actorUserId,
@@ -214,7 +214,7 @@ export async function assignLead(
          updatedAt: new Date(),
          updatedBy: actorUserId
        })
-        .where(eq(crmEnquiries.id, existingEnquiry.id));
+        .where(eq(crmOpportunities.id, existingOpportunity.id));
    }

    await syncLeadAssignment({
@@ -234,21 +234,21 @@ export async function assignLead(
      action: 'assign_lead',
      afterData: {
        leadId: input.leadId,
-        enquiryId: existingEnquiry.id,
+        opportunityId: existingOpportunity.id,
        salesOwnerId: resolvedSalesOwnerId,
-        reusedExistingEnquiry: true
+        reusedExistingOpportunity: true
      }
    });

    return {
      leadId: input.leadId,
-      enquiryId: existingEnquiry.id,
-      enquiryCode: existingEnquiry.code,
-      reusedExistingEnquiry: true
+      opportunityId: existingOpportunity.id,
+      opportunityCode: existingOpportunity.code,
+      reusedExistingOpportunity: true
    };
  }

-  const createdEnquiry = await createEnquiryFromLead({
+  const createdOpportunity = await createOpportunityFromLead({
    lead,
    organizationId,
    actorUserId,
@@ -268,12 +268,12 @@ export async function assignLead(
    organizationId,
    branchId: lead.branchId,
    userId: actorUserId,
-    entityType: 'crm_enquiry',
-    entityId: createdEnquiry.id,
-    action: 'create_enquiry_from_lead',
+    entityType: 'crm_opportunity',
+    entityId: createdOpportunity.id,
+    action: 'create_opportunity_from_lead',
    afterData: {
      leadId: input.leadId,
-      enquiryId: createdEnquiry.id,
+      opportunityId: createdOpportunity.id,
      salesOwnerId: input.salesOwnerId
    }
  });
@@ -287,16 +287,17 @@ export async function assignLead(
    action: 'assign_lead',
    afterData: {
      leadId: input.leadId,
-      enquiryId: createdEnquiry.id,
+      opportunityId: createdOpportunity.id,
      salesOwnerId: input.salesOwnerId,
-      reusedExistingEnquiry: false
+      reusedExistingOpportunity: false
    }
  });

  return {
    leadId: input.leadId,
-    enquiryId: createdEnquiry.id,
-    enquiryCode: createdEnquiry.code,
-    reusedExistingEnquiry: false
+    opportunityId: createdOpportunity.id,
+    opportunityCode: createdOpportunity.code,
+    reusedExistingOpportunity: false
  };
 }
+
--- a/src/features/crm/leads/server/service.ts
+++ b/src/features/crm/leads/server/service.ts
@@ -13,7 +13,7 @@ import {
 import {
  crmCustomerContacts,
  crmCustomers,
-  crmEnquiries,
+  crmOpportunities,
  crmLeads,
  memberships,
  trAuditLogs,
@@ -41,7 +41,7 @@ import type {
  LeadCustomerLookup,
  LeadDetail,
  LeadFollowupSummary,
-  LeadLinkedEnquirySummary,
+  LeadLinkedOpportunitySummary,
  LeadListFilters,
  LeadListResponse,
  LeadOption,
@@ -187,28 +187,28 @@ async function listLeadContacts(organizationId: string): Promise<LeadContactLook
  }));
 }

-async function listLinkedEnquiries(
+async function listLinkedOpportunities(
  leadId: string,
  organizationId: string
-): Promise<LeadLinkedEnquirySummary[]> {
+): Promise<LeadLinkedOpportunitySummary[]> {
  const rows = await db
    .select({
-      id: crmEnquiries.id,
-      code: crmEnquiries.code,
-      title: crmEnquiries.title,
-      status: crmEnquiries.status,
-      assignedToUserId: crmEnquiries.assignedToUserId,
-      updatedAt: crmEnquiries.updatedAt
+      id: crmOpportunities.id,
+      code: crmOpportunities.code,
+      title: crmOpportunities.title,
+      status: crmOpportunities.status,
+      assignedToUserId: crmOpportunities.assignedToUserId,
+      updatedAt: crmOpportunities.updatedAt
    })
-    .from(crmEnquiries)
+    .from(crmOpportunities)
    .where(
      and(
-        eq(crmEnquiries.organizationId, organizationId),
-        eq(crmEnquiries.leadId, leadId),
-        isNull(crmEnquiries.deletedAt)
+        eq(crmOpportunities.organizationId, organizationId),
+        eq(crmOpportunities.leadId, leadId),
+        isNull(crmOpportunities.deletedAt)
      )
    )
-    .orderBy(desc(crmEnquiries.updatedAt));
+    .orderBy(desc(crmOpportunities.updatedAt));

  const assigneeIds = [
    ...new Set(rows.map((row) => row.assignedToUserId).filter((value): value is string => Boolean(value)))
@@ -340,13 +340,13 @@ function mapLeadDetail(
  row: LeadRow,
  lookups: LeadLookupMaps,
  suggestedSalesOwnerId: string | null,
-  relatedEnquiryCount: number
+  relatedOpportunityCount: number
 ): LeadDetail {
  return {
    ...mapLeadSummary(row, lookups),
    suggestedSalesOwnerId,
-    relatedEnquiryCount,
-    linkedEnquiries: [],
+    relatedOpportunityCount,
+    linkedOpportunities: [],
    activity: []
  };
 }
@@ -766,32 +766,32 @@ export async function getLeadById(
  accessContext?: LeadAccessContext
 ): Promise<LeadDetail> {
  const lead = await assertLeadBelongsToOrganization(id, organizationId, accessContext);
-  const [lookups, relatedEnquiryResult, customer, linkedEnquiries, activity] = await Promise.all([
+  const [lookups, relatedOpportunityResult, customer, linkedOpportunities, activity] = await Promise.all([
    buildLookupMaps(organizationId, [lead]),
    db
      .select({ value: count() })
-      .from(crmEnquiries)
+      .from(crmOpportunities)
      .where(
        and(
-          eq(crmEnquiries.organizationId, organizationId),
-          eq(crmEnquiries.leadId, id),
-          isNull(crmEnquiries.deletedAt)
+          eq(crmOpportunities.organizationId, organizationId),
+          eq(crmOpportunities.leadId, id),
+          isNull(crmOpportunities.deletedAt)
        )
      ),
    lead.customerId ? assertCustomerBelongsToOrganization(lead.customerId, organizationId) : Promise.resolve(null),
-    listLinkedEnquiries(id, organizationId),
+    listLinkedOpportunities(id, organizationId),
    listLeadActivity(id, organizationId)
  ]);
  const detail = mapLeadDetail(
    lead,
    lookups,
    customer?.ownerUserId ?? null,
-    relatedEnquiryResult[0]?.value ?? 0
+    relatedOpportunityResult[0]?.value ?? 0
  );

  return {
    ...detail,
-    linkedEnquiries,
+    linkedOpportunities,
    activity
  };
 }
@@ -926,7 +926,7 @@ export async function deleteLead(

    return {
      ...mapLeadDetail(deleted!, lookups, null, 0),
-      linkedEnquiries: [],
+      linkedOpportunities: [],
      activity: []
    };
  });
@@ -1077,3 +1077,4 @@ export function buildLeadAccessContext(input: {
 }) {
  return buildCrmSecurityContext(input);
 }
+
--- a/src/features/crm/leads/types.ts
+++ b/src/features/crm/leads/types.ts
@@ -37,7 +37,7 @@ export interface LeadContactLookup {
  isPrimary: boolean;
 }

-export interface LeadLinkedEnquirySummary {
+export interface LeadLinkedOpportunitySummary {
  id: string;
  code: string;
  title: string;
@@ -174,8 +174,8 @@ export interface LeadSummary {
 }

 export interface LeadDetail extends LeadSummary {
-  relatedEnquiryCount: number;
-  linkedEnquiries: LeadLinkedEnquirySummary[];
+  relatedOpportunityCount: number;
+  linkedOpportunities: LeadLinkedOpportunitySummary[];
  activity: LeadActivityRecord[];
 }

@@ -194,9 +194,9 @@ export interface LeadFollowupSummary {

 export interface AssignLeadResult {
  leadId: string;
-  enquiryId: string;
-  enquiryCode: string;
-  reusedExistingEnquiry: boolean;
+  opportunityId: string;
+  opportunityCode: string;
+  reusedExistingOpportunity: boolean;
 }

 export interface LeadListResponse {
@@ -225,3 +225,4 @@ export interface LeadMutationSuccessResponse {
  lead?: LeadDetail;
  followup?: LeadFollowupSummary;
 }
+
--- a/src/features/crm/opportunities/api/mutations.ts
+++ b/src/features/crm/opportunities/api/mutations.ts
@@ -0,0 +1,191 @@
+import { mutationOptions } from '@tanstack/react-query';
+import { getQueryClient } from '@/lib/query-client';
+import {
+  assignOpportunity,
+  createOpportunity,
+  createOpportunityFollowup,
+  deleteOpportunity,
+  deleteOpportunityFollowup,
+  markOpportunityLost,
+  markOpportunityWon,
+  reassignOpportunity,
+  reopenOpportunity,
+  updateOpportunity,
+  updateOpportunityFollowup
+} from './service';
+import { opportunityKeys } from './queries';
+import type {
+  OpportunityAssignmentMutationPayload,
+  OpportunityFollowupMutationPayload,
+  OpportunityMarkLostPayload,
+  OpportunityMarkWonPayload,
+  OpportunityMutationPayload
+} from './types';
+import { crmDashboardKeys } from '@/features/crm/dashboard/api/queries';
+
+async function invalidateOpportunityLists() {
+  await getQueryClient().invalidateQueries({ queryKey: opportunityKeys.lists() });
+}
+
+async function invalidateDashboardQueries() {
+  await getQueryClient().invalidateQueries({ queryKey: crmDashboardKeys.all });
+}
+
+async function invalidateOpportunityDetail(id: string) {
+  await getQueryClient().invalidateQueries({ queryKey: opportunityKeys.detail(id) });
+}
+
+async function invalidateOpportunityProjectParties(id: string) {
+  await getQueryClient().invalidateQueries({ queryKey: opportunityKeys.projectParties(id) });
+}
+
+async function invalidateOpportunityFollowups(id: string) {
+  await getQueryClient().invalidateQueries({ queryKey: opportunityKeys.followups(id) });
+}
+
+async function invalidateOpportunityAttachments(id: string) {
+  await getQueryClient().invalidateQueries({ queryKey: opportunityKeys.attachments(id) });
+}
+
+export async function invalidateOpportunityMutationQueries(id: string) {
+  await Promise.all([
+    invalidateOpportunityLists(),
+    invalidateOpportunityDetail(id),
+    invalidateOpportunityProjectParties(id),
+    invalidateOpportunityAttachments(id),
+    invalidateDashboardQueries()
+  ]);
+}
+
+export async function invalidateOpportunityFollowupMutationQueries(opportunityId: string) {
+  await Promise.all([
+    invalidateOpportunityLists(),
+    invalidateOpportunityDetail(opportunityId),
+    invalidateOpportunityFollowups(opportunityId),
+    invalidateDashboardQueries()
+  ]);
+}
+
+export const createOpportunityMutation = mutationOptions({
+  mutationFn: (data: OpportunityMutationPayload) => createOpportunity(data),
+  onSettled: async (_data, error) => {
+    if (!error) {
+      await Promise.all([invalidateOpportunityLists(), invalidateDashboardQueries()]);
+    }
+  }
+});
+
+export const updateOpportunityMutation = mutationOptions({
+  mutationFn: ({ id, values }: { id: string; values: OpportunityMutationPayload }) =>
+    updateOpportunity(id, values),
+  onSettled: async (_data, error, variables) => {
+    if (!error) {
+      await invalidateOpportunityMutationQueries(variables.id);
+    }
+  }
+});
+
+export const deleteOpportunityMutation = mutationOptions({
+  mutationFn: (id: string) => deleteOpportunity(id),
+  onSettled: async (_data, error, id) => {
+    if (!error) {
+      getQueryClient().removeQueries({ queryKey: opportunityKeys.detail(id) });
+      getQueryClient().removeQueries({ queryKey: opportunityKeys.projectParties(id) });
+      getQueryClient().removeQueries({ queryKey: opportunityKeys.followups(id) });
+      await Promise.all([invalidateOpportunityLists(), invalidateDashboardQueries()]);
+    }
+  }
+});
+
+export const assignOpportunityMutation = mutationOptions({
+  mutationFn: ({ id, values }: { id: string; values: OpportunityAssignmentMutationPayload }) =>
+    assignOpportunity(id, values),
+  onSettled: async (_data, error, variables) => {
+    if (!error) {
+      await invalidateOpportunityMutationQueries(variables.id);
+    }
+  }
+});
+
+export const reassignOpportunityMutation = mutationOptions({
+  mutationFn: ({ id, values }: { id: string; values: OpportunityAssignmentMutationPayload }) =>
+    reassignOpportunity(id, values),
+  onSettled: async (_data, error, variables) => {
+    if (!error) {
+      await invalidateOpportunityMutationQueries(variables.id);
+    }
+  }
+});
+
+export const createOpportunityFollowupMutation = mutationOptions({
+  mutationFn: ({
+    opportunityId,
+    values
+  }: {
+    opportunityId: string;
+    values: OpportunityFollowupMutationPayload;
+  }) => createOpportunityFollowup(opportunityId, values),
+  onSettled: async (_data, error, variables) => {
+    if (!error) {
+      await invalidateOpportunityFollowupMutationQueries(variables.opportunityId);
+    }
+  }
+});
+
+export const updateOpportunityFollowupMutation = mutationOptions({
+  mutationFn: ({
+    opportunityId,
+    followupId,
+    values
+  }: {
+    opportunityId: string;
+    followupId: string;
+    values: OpportunityFollowupMutationPayload;
+  }) => updateOpportunityFollowup(opportunityId, followupId, values),
+  onSettled: async (_data, error, variables) => {
+    if (!error) {
+      await invalidateOpportunityFollowupMutationQueries(variables.opportunityId);
+    }
+  }
+});
+
+export const deleteOpportunityFollowupMutation = mutationOptions({
+  mutationFn: ({ opportunityId, followupId }: { opportunityId: string; followupId: string }) =>
+    deleteOpportunityFollowup(opportunityId, followupId),
+  onSettled: async (_data, error, variables) => {
+    if (!error) {
+      await invalidateOpportunityFollowupMutationQueries(variables.opportunityId);
+    }
+  }
+});
+
+export const markOpportunityWonMutation = mutationOptions({
+  mutationFn: ({ id, values }: { id: string; values: OpportunityMarkWonPayload }) =>
+    markOpportunityWon(id, values),
+  onSettled: async (_data, error, variables) => {
+    if (!error) {
+      await invalidateOpportunityMutationQueries(variables.id);
+    }
+  }
+});
+
+export const markOpportunityLostMutation = mutationOptions({
+  mutationFn: ({ id, values }: { id: string; values: OpportunityMarkLostPayload }) =>
+    markOpportunityLost(id, values),
+  onSettled: async (_data, error, variables) => {
+    if (!error) {
+      await invalidateOpportunityMutationQueries(variables.id);
+    }
+  }
+});
+
+export const reopenOpportunityMutation = mutationOptions({
+  mutationFn: ({ id, reason }: { id: string; reason: string }) =>
+    reopenOpportunity(id, { reopenReason: reason }),
+  onSettled: async (_data, error, variables) => {
+    if (!error) {
+      await invalidateOpportunityMutationQueries(variables.id);
+    }
+  }
+});
+
--- a/src/features/crm/opportunities/api/queries.ts
+++ b/src/features/crm/opportunities/api/queries.ts
@@ -0,0 +1,54 @@
+import { queryOptions } from '@tanstack/react-query';
+import {
+  getOpportunityAttachments,
+  getOpportunities,
+  getOpportunityById,
+  getOpportunityFollowups,
+  getOpportunityProjectParties
+} from './service';
+import type { OpportunityFilters } from './types';
+
+export const opportunityKeys = {
+  all: ['crm-opportunities'] as const,
+  lists: () => [...opportunityKeys.all, 'list'] as const,
+  list: (filters: OpportunityFilters) => [...opportunityKeys.lists(), filters] as const,
+  details: () => [...opportunityKeys.all, 'detail'] as const,
+  detail: (id: string) => [...opportunityKeys.details(), id] as const,
+  projectPartiesRoot: () => [...opportunityKeys.all, 'project-parties'] as const,
+  projectParties: (id: string) => [...opportunityKeys.projectPartiesRoot(), id] as const,
+  followupsRoot: () => [...opportunityKeys.all, 'followups'] as const,
+  followups: (id: string) => [...opportunityKeys.followupsRoot(), id] as const,
+  attachmentsRoot: () => [...opportunityKeys.all, 'attachments'] as const,
+  attachments: (id: string) => [...opportunityKeys.attachmentsRoot(), id] as const
+};
+
+export const opportunitiesQueryOptions = (filters: OpportunityFilters) =>
+  queryOptions({
+    queryKey: opportunityKeys.list(filters),
+    queryFn: () => getOpportunities(filters)
+  });
+
+export const opportunityByIdOptions = (id: string) =>
+  queryOptions({
+    queryKey: opportunityKeys.detail(id),
+    queryFn: () => getOpportunityById(id)
+  });
+
+export const opportunityProjectPartiesOptions = (id: string) =>
+  queryOptions({
+    queryKey: opportunityKeys.projectParties(id),
+    queryFn: () => getOpportunityProjectParties(id)
+  });
+
+export const opportunityFollowupsOptions = (id: string) =>
+  queryOptions({
+    queryKey: opportunityKeys.followups(id),
+    queryFn: () => getOpportunityFollowups(id)
+  });
+
+export const opportunityAttachmentsOptions = (id: string) =>
+  queryOptions({
+    queryKey: opportunityKeys.attachments(id),
+    queryFn: () => getOpportunityAttachments(id)
+  });
+
--- a/src/features/crm/opportunities/api/service.ts
+++ b/src/features/crm/opportunities/api/service.ts
@@ -0,0 +1,134 @@
+import { apiClient } from '@/lib/api-client';
+import type {
+  OpportunityAttachmentsResponse,
+  OpportunityAssignmentMutationPayload,
+  OpportunityDetailResponse,
+  OpportunityFilters,
+  OpportunityFollowupMutationPayload,
+  OpportunityFollowupsResponse,
+  OpportunityListResponse,
+  OpportunityMarkLostPayload,
+  OpportunityMarkWonPayload,
+  OpportunityMutationPayload,
+  OpportunityProjectPartiesResponse,
+  OpportunityReopenPayload,
+  MutationSuccessResponse
+} from './types';
+
+export async function getOpportunities(filters: OpportunityFilters): Promise<OpportunityListResponse> {
+  const searchParams = new URLSearchParams();
+
+  if (filters.page) searchParams.set('page', String(filters.page));
+  if (filters.limit) searchParams.set('limit', String(filters.limit));
+  if (filters.search) searchParams.set('search', filters.search);
+  if (filters.pipelineStage) searchParams.set('pipelineStage', filters.pipelineStage);
+  if (filters.status) searchParams.set('status', filters.status);
+  if (filters.productType) searchParams.set('productType', filters.productType);
+  if (filters.priority) searchParams.set('priority', filters.priority);
+  if (filters.branch) searchParams.set('branch', filters.branch);
+  if (filters.customer) searchParams.set('customer', filters.customer);
+  if (filters.sort) searchParams.set('sort', filters.sort);
+
+  const query = searchParams.toString();
+
+  return apiClient<OpportunityListResponse>(`/crm/opportunities${query ? `?${query}` : ''}`);
+}
+
+export async function getOpportunityById(id: string): Promise<OpportunityDetailResponse> {
+  return apiClient<OpportunityDetailResponse>(`/crm/opportunities/${id}`);
+}
+
+export async function getOpportunityProjectParties(id: string): Promise<OpportunityProjectPartiesResponse> {
+  return apiClient<OpportunityProjectPartiesResponse>(`/crm/opportunities/${id}/customers`);
+}
+
+export async function createOpportunity(data: OpportunityMutationPayload) {
+  return apiClient<MutationSuccessResponse>('/crm/opportunities', {
+    method: 'POST',
+    body: JSON.stringify(data)
+  });
+}
+
+export async function updateOpportunity(id: string, data: OpportunityMutationPayload) {
+  return apiClient<MutationSuccessResponse>(`/crm/opportunities/${id}`, {
+    method: 'PATCH',
+    body: JSON.stringify(data)
+  });
+}
+
+export async function deleteOpportunity(id: string) {
+  return apiClient<MutationSuccessResponse>(`/crm/opportunities/${id}`, {
+    method: 'DELETE'
+  });
+}
+
+export async function assignOpportunity(id: string, data: OpportunityAssignmentMutationPayload) {
+  return apiClient<MutationSuccessResponse>(`/crm/opportunities/${id}/assign`, {
+    method: 'POST',
+    body: JSON.stringify(data)
+  });
+}
+
+export async function reassignOpportunity(id: string, data: OpportunityAssignmentMutationPayload) {
+  return apiClient<MutationSuccessResponse>(`/crm/opportunities/${id}/reassign`, {
+    method: 'POST',
+    body: JSON.stringify(data)
+  });
+}
+
+export async function getOpportunityFollowups(id: string): Promise<OpportunityFollowupsResponse> {
+  return apiClient<OpportunityFollowupsResponse>(`/crm/opportunities/${id}/followups`);
+}
+
+export async function getOpportunityAttachments(id: string): Promise<OpportunityAttachmentsResponse> {
+  return apiClient<OpportunityAttachmentsResponse>(`/crm/opportunities/${id}/po-attachments`);
+}
+
+export async function createOpportunityFollowup(
+  opportunityId: string,
+  data: OpportunityFollowupMutationPayload
+) {
+  return apiClient<MutationSuccessResponse>(`/crm/opportunities/${opportunityId}/followups`, {
+    method: 'POST',
+    body: JSON.stringify(data)
+  });
+}
+
+export async function updateOpportunityFollowup(
+  opportunityId: string,
+  followupId: string,
+  data: OpportunityFollowupMutationPayload
+) {
+  return apiClient<MutationSuccessResponse>(`/crm/opportunities/${opportunityId}/followups/${followupId}`, {
+    method: 'PATCH',
+    body: JSON.stringify(data)
+  });
+}
+
+export async function deleteOpportunityFollowup(opportunityId: string, followupId: string) {
+  return apiClient<MutationSuccessResponse>(`/crm/opportunities/${opportunityId}/followups/${followupId}`, {
+    method: 'DELETE'
+  });
+}
+
+export async function markOpportunityWon(id: string, data: OpportunityMarkWonPayload) {
+  return apiClient<MutationSuccessResponse>(`/crm/opportunities/${id}/mark-won`, {
+    method: 'POST',
+    body: JSON.stringify(data)
+  });
+}
+
+export async function markOpportunityLost(id: string, data: OpportunityMarkLostPayload) {
+  return apiClient<MutationSuccessResponse>(`/crm/opportunities/${id}/mark-lost`, {
+    method: 'POST',
+    body: JSON.stringify(data)
+  });
+}
+
+export async function reopenOpportunity(id: string, data: OpportunityReopenPayload) {
+  return apiClient<MutationSuccessResponse>(`/crm/opportunities/${id}/reopen`, {
+    method: 'POST',
+    body: JSON.stringify(data)
+  });
+}
+
--- a/src/features/crm/opportunities/api/types.ts
+++ b/src/features/crm/opportunities/api/types.ts
@@ -1,14 +1,14 @@
-export interface EnquiryOption {
+export interface OpportunityOption {
  id: string;
  code: string;
  label: string;
  value: string | null;
 }

-export interface EnquiryProjectPartyRecord {
+export interface OpportunityProjectPartyRecord {
  id: string;
  organizationId: string;
-  enquiryId: string;
+  opportunityId: string;
  customerId: string;
  role: string;
  roleCode: string;
@@ -19,19 +19,19 @@ export interface EnquiryProjectPartyRecord {
  deletedAt: string | null;
 }

-export interface EnquiryProjectPartyListItem extends EnquiryProjectPartyRecord {
+export interface OpportunityProjectPartyListItem extends OpportunityProjectPartyRecord {
  customerName: string;
  customerCode: string;
 }

-export interface EnquiryBranchOption {
+export interface OpportunityBranchOption {
  id: string;
  code: string;
  name: string;
  value: string | null;
 }

-export interface EnquiryCustomerLookup {
+export interface OpportunityCustomerLookup {
  id: string;
  code: string;
  name: string;
@@ -40,7 +40,7 @@ export interface EnquiryCustomerLookup {
  ownerName: string | null;
 }

-export interface EnquiryContactLookup {
+export interface OpportunityContactLookup {
  id: string;
  customerId: string;
  name: string;
@@ -49,17 +49,17 @@ export interface EnquiryContactLookup {
  isPrimary: boolean;
 }

-export interface EnquiryAssignableUserLookup {
+export interface OpportunityAssignableUserLookup {
  id: string;
  name: string;
  membershipRole: 'admin' | 'user';
  businessRole: string;
 }

-export interface EnquiryAttachmentRecord {
+export interface OpportunityAttachmentRecord {
  id: string;
  organizationId: string;
-  enquiryId: string;
+  opportunityId: string;
  category: string;
  fileName: string;
  originalFileName: string;
@@ -75,9 +75,9 @@ export interface EnquiryAttachmentRecord {
  deletedAt: string | null;
 }

-export type EnquiryPipelineStage = 'lead' | 'enquiry' | 'closed_won' | 'closed_lost';
+export type OpportunityPipelineStage = 'lead' | 'opportunity' | 'closed_won' | 'closed_lost';

-export interface EnquiryRecord {
+export interface OpportunityRecord {
  id: string;
  organizationId: string;
  branchId: string | null;
@@ -102,7 +102,7 @@ export interface EnquiryRecord {
  notes: string | null;
  isHotProject: boolean;
  isActive: boolean;
-  pipelineStage: EnquiryPipelineStage;
+  pipelineStage: OpportunityPipelineStage;
  closedWonAt: string | null;
  closedLostAt: string | null;
  closedByUserId: string | null;
@@ -129,7 +129,7 @@ export interface EnquiryRecord {
  updatedBy: string;
 }

-export interface EnquiryListItem extends EnquiryRecord {
+export interface OpportunityListItem extends OpportunityRecord {
  customerName: string;
  contactName: string | null;
  sourceLeadCode?: string | null;
@@ -141,10 +141,10 @@ export interface EnquiryListItem extends EnquiryRecord {
  createdByName: string | null;
 }

-export interface EnquiryFollowupRecord {
+export interface OpportunityFollowupRecord {
  id: string;
  organizationId: string;
-  enquiryId: string;
+  opportunityId: string;
  followupDate: string;
  followupType: string;
  contactId: string | null;
@@ -159,7 +159,7 @@ export interface EnquiryFollowupRecord {
  updatedBy: string;
 }

-export interface EnquiryActivityRecord {
+export interface OpportunityActivityRecord {
  id: string;
  action: string;
  entityType: string;
@@ -169,25 +169,25 @@ export interface EnquiryActivityRecord {
  actorName: string | null;
 }

-export interface EnquiryReferenceData {
-  branches: EnquiryBranchOption[];
-  statuses: EnquiryOption[];
-  productTypes: EnquiryOption[];
-  priorities: EnquiryOption[];
-  leadChannels: EnquiryOption[];
-  followupTypes: EnquiryOption[];
-  lostReasons: EnquiryOption[];
-  projectPartyRoles: EnquiryOption[];
-  customers: EnquiryCustomerLookup[];
-  contacts: EnquiryContactLookup[];
-  assignableUsers: EnquiryAssignableUserLookup[];
+export interface OpportunityReferenceData {
+  branches: OpportunityBranchOption[];
+  statuses: OpportunityOption[];
+  productTypes: OpportunityOption[];
+  priorities: OpportunityOption[];
+  leadChannels: OpportunityOption[];
+  followupTypes: OpportunityOption[];
+  lostReasons: OpportunityOption[];
+  projectPartyRoles: OpportunityOption[];
+  customers: OpportunityCustomerLookup[];
+  contacts: OpportunityContactLookup[];
+  assignableUsers: OpportunityAssignableUserLookup[];
 }

-export interface EnquiryFilters {
+export interface OpportunityFilters {
  page?: number;
  limit?: number;
  search?: string;
-  pipelineStage?: EnquiryPipelineStage;
+  pipelineStage?: OpportunityPipelineStage;
  status?: string;
  productType?: string;
  priority?: string;
@@ -196,52 +196,52 @@ export interface EnquiryFilters {
  sort?: string;
 }

-export interface EnquiryListResponse {
+export interface OpportunityListResponse {
  success: boolean;
  time: string;
  message: string;
  totalItems: number;
  offset: number;
  limit: number;
-  items: EnquiryListItem[];
+  items: OpportunityListItem[];
 }

-export interface EnquiryDetailResponse {
+export interface OpportunityDetailResponse {
  success: boolean;
  time: string;
  message: string;
-  enquiry: EnquiryRecord;
-  activity: EnquiryActivityRecord[];
+  opportunity: OpportunityRecord;
+  activity: OpportunityActivityRecord[];
 }

-export interface EnquiryProjectPartiesResponse {
+export interface OpportunityProjectPartiesResponse {
  success: boolean;
  time: string;
  message: string;
-  items: EnquiryProjectPartyListItem[];
+  items: OpportunityProjectPartyListItem[];
 }

-export interface EnquiryFollowupsResponse {
+export interface OpportunityFollowupsResponse {
  success: boolean;
  time: string;
  message: string;
-  items: EnquiryFollowupRecord[];
+  items: OpportunityFollowupRecord[];
 }

-export interface EnquiryAttachmentsResponse {
+export interface OpportunityAttachmentsResponse {
  success: boolean;
  time: string;
  message: string;
-  items: EnquiryAttachmentRecord[];
+  items: OpportunityAttachmentRecord[];
 }

-export interface EnquiryProjectPartyMutationPayload {
+export interface OpportunityProjectPartyMutationPayload {
  customerId: string;
  role: string;
  remark?: string | null;
 }

-export interface EnquiryMutationPayload {
+export interface OpportunityMutationPayload {
  customerId: string;
  contactId?: string | null;
  assignedToUserId?: string | null;
@@ -263,10 +263,10 @@ export interface EnquiryMutationPayload {
  isHotProject?: boolean;
  notes?: string;
  isActive?: boolean;
-  projectParties?: EnquiryProjectPartyMutationPayload[];
+  projectParties?: OpportunityProjectPartyMutationPayload[];
 }

-export interface EnquiryFollowupMutationPayload {
+export interface OpportunityFollowupMutationPayload {
  followupDate: string;
  followupType: string;
  contactId?: string | null;
@@ -276,12 +276,12 @@ export interface EnquiryFollowupMutationPayload {
  nextAction?: string;
 }

-export interface EnquiryAssignmentMutationPayload {
+export interface OpportunityAssignmentMutationPayload {
  assignedToUserId: string;
  remark?: string;
 }

-export interface EnquiryMarkWonPayload {
+export interface OpportunityMarkWonPayload {
  poNumber: string;
  poDate: string;
  poAmount?: number | null;
@@ -289,17 +289,17 @@ export interface EnquiryMarkWonPayload {
  remark?: string | null;
 }

-export interface EnquiryMarkLostPayload {
+export interface OpportunityMarkLostPayload {
  lostReason: string;
  lostCompetitor?: string | null;
  lostRemark?: string | null;
 }

-export interface EnquiryReopenPayload {
+export interface OpportunityReopenPayload {
  reopenReason: string;
 }

-export interface EnquiryCustomerRelationItem {
+export interface OpportunityCustomerRelationItem {
  id: string;
  code: string;
  title: string;
@@ -312,3 +312,4 @@ export interface MutationSuccessResponse {
  success: boolean;
  message: string;
 }
+
--- a/src/features/crm/opportunities/components/followup-form-sheet.tsx
+++ b/src/features/crm/opportunities/components/followup-form-sheet.tsx
@@ -21,15 +21,15 @@ import {
  SheetTitle
 } from '@/components/ui/sheet';
 import { useAppForm, useFormFields } from '@/components/ui/tanstack-form';
-import { createEnquiryFollowupMutation, updateEnquiryFollowupMutation } from '../api/mutations';
+import { createOpportunityFollowupMutation, updateOpportunityFollowupMutation } from '../api/mutations';
 import type {
-  EnquiryFollowupMutationPayload,
-  EnquiryFollowupRecord,
-  EnquiryReferenceData
+  OpportunityFollowupMutationPayload,
+  OpportunityFollowupRecord,
+  OpportunityReferenceData
 } from '../api/types';
-import { enquiryFollowupSchema, type EnquiryFollowupFormValues } from '../schemas/enquiry.schema';
+import { opportunityFollowupSchema, type OpportunityFollowupFormValues } from '../schemas/opportunity.schema';

-function toDefaultValues(followup: EnquiryFollowupRecord | undefined): EnquiryFollowupFormValues {
+function toDefaultValues(followup: OpportunityFollowupRecord | undefined): OpportunityFollowupFormValues {
  return {
    followupDate: followup?.followupDate ? followup.followupDate.slice(0, 10) : '',
    followupType: followup?.followupType ?? '',
@@ -42,28 +42,28 @@ function toDefaultValues(followup: EnquiryFollowupRecord | undefined): EnquiryFo
 }

 export function FollowupFormSheet({
-  enquiryId,
+  opportunityId,
  followup,
  open,
  onOpenChange,
  referenceData,
  customerId
 }: {
-  enquiryId: string;
-  followup?: EnquiryFollowupRecord;
+  opportunityId: string;
+  followup?: OpportunityFollowupRecord;
  open: boolean;
  onOpenChange: (open: boolean) => void;
-  referenceData: EnquiryReferenceData;
+  referenceData: OpportunityReferenceData;
  customerId: string;
 }) {
  const isEdit = !!followup;
  const defaultValues = useMemo(() => toDefaultValues(followup), [followup]);
  const { FormTextField, FormTextareaField, FormDatePickerField } =
-    useFormFields<EnquiryFollowupFormValues>();
+    useFormFields<OpportunityFollowupFormValues>();
  const contactOptions = referenceData.contacts.filter((item) => item.customerId === customerId);

  const createMutation = useMutation({
-    ...createEnquiryFollowupMutation,
+    ...createOpportunityFollowupMutation,
    onSuccess: () => {
      toast.success('Follow-up created successfully');
      onOpenChange(false);
@@ -73,7 +73,7 @@ export function FollowupFormSheet({
  });

  const updateMutation = useMutation({
-    ...updateEnquiryFollowupMutation,
+    ...updateOpportunityFollowupMutation,
    onSuccess: () => {
      toast.success('Follow-up updated successfully');
      onOpenChange(false);
@@ -85,10 +85,10 @@ export function FollowupFormSheet({
  const form = useAppForm({
    defaultValues,
    validators: {
-      onSubmit: enquiryFollowupSchema
+      onSubmit: opportunityFollowupSchema
    },
    onSubmit: async ({ value }) => {
-      const payload: EnquiryFollowupMutationPayload = {
+      const payload: OpportunityFollowupMutationPayload = {
        followupDate: value.followupDate,
        followupType: value.followupType,
        contactId: value.contactId || null,
@@ -100,7 +100,7 @@ export function FollowupFormSheet({

      if (isEdit && followup) {
        await updateMutation.mutateAsync({
-          enquiryId,
+          opportunityId,
          followupId: followup.id,
          values: payload
        });
@@ -108,7 +108,7 @@ export function FollowupFormSheet({
      }

      await createMutation.mutateAsync({
-        enquiryId,
+        opportunityId,
        values: payload
      });
    }
@@ -130,13 +130,13 @@ export function FollowupFormSheet({
        <SheetHeader>
          <SheetTitle>{isEdit ? 'Edit Follow-up' : 'New Follow-up'}</SheetTitle>
          <SheetDescription>
-            Keep the enquiry timeline current with the latest customer interaction and next step.
+            Keep the opportunity timeline current with the latest customer interaction and next step.
          </SheetDescription>
        </SheetHeader>

        <div className='flex-1 overflow-auto'>
          <form.AppForm>
-            <form.Form id='enquiry-followup-form' className='grid gap-4 md:grid-cols-2'>
+            <form.Form id='opportunity-followup-form' className='grid gap-4 md:grid-cols-2'>
              <FormDatePickerField
                name='followupDate'
                label='Follow-up Date'
@@ -239,7 +239,7 @@ export function FollowupFormSheet({
          <Button type='button' variant='outline' onClick={() => onOpenChange(false)}>
            Cancel
          </Button>
-          <Button type='submit' form='enquiry-followup-form' isLoading={isPending}>
+          <Button type='submit' form='opportunity-followup-form' isLoading={isPending}>
            <Icons.check className='mr-2 h-4 w-4' />
            {isEdit ? 'Update Follow-up' : 'Create Follow-up'}
          </Button>
@@ -248,3 +248,4 @@ export function FollowupFormSheet({
    </Sheet>
  );
 }
+
--- a/src/features/crm/opportunities/components/opportunities-table.tsx
+++ b/src/features/crm/opportunities/components/opportunities-table.tsx
@@ -7,11 +7,11 @@ import { DataTable } from '@/components/ui/table/data-table';
 import { DataTableToolbar } from '@/components/ui/table/data-table-toolbar';
 import { useDataTable } from '@/hooks/use-data-table';
 import { getSortingStateParser } from '@/lib/parsers';
-import { enquiriesQueryOptions } from '../api/queries';
-import type { EnquiryReferenceData } from '../api/types';
-import { getEnquiryColumns } from './enquiry-columns';
+import { opportunitiesQueryOptions } from '../api/queries';
+import type { OpportunityReferenceData } from '../api/types';
+import { getOpportunityColumns } from './opportunity-columns';

-export function EnquiriesTable({
+export function OpportunitiesTable({
  referenceData,
  workspace,
  canUpdate,
@@ -19,8 +19,8 @@ export function EnquiriesTable({
  canAssign,
  canReassign
 }: {
-  referenceData: EnquiryReferenceData;
-  workspace: 'lead' | 'enquiry';
+  referenceData: OpportunityReferenceData;
+  workspace: 'lead' | 'opportunity';
  canUpdate: boolean;
  canDelete: boolean;
  canAssign: boolean;
@@ -28,7 +28,7 @@ export function EnquiriesTable({
 }) {
  const columns = useMemo(
    () =>
-      getEnquiryColumns({
+      getOpportunityColumns({
        referenceData,
        workspace,
        canUpdate,
@@ -65,7 +65,7 @@ export function EnquiriesTable({
    ...(params.sort.length > 0 && { sort: JSON.stringify(params.sort) })
  };

-  const { data } = useSuspenseQuery(enquiriesQueryOptions(filters));
+  const { data } = useSuspenseQuery(opportunitiesQueryOptions(filters));
  const pageCount = Math.max(1, Math.ceil((data.totalItems || 0) / params.perPage));

  const { table } = useDataTable({
@@ -83,3 +83,4 @@ export function EnquiriesTable({
    </DataTable>
  );
 }
+
--- a/src/features/crm/opportunities/components/opportunity-assignment-dialog.tsx
+++ b/src/features/crm/opportunities/components/opportunity-assignment-dialog.tsx
@@ -15,47 +15,47 @@ import {
 import { Button } from '@/components/ui/button';
 import { useAppForm, useFormFields } from '@/components/ui/tanstack-form';
 import { Icons } from '@/components/icons';
-import { assignEnquiryMutation, reassignEnquiryMutation } from '../api/mutations';
-import type { EnquiryRecord, EnquiryReferenceData } from '../api/types';
+import { assignOpportunityMutation, reassignOpportunityMutation } from '../api/mutations';
+import type { OpportunityRecord, OpportunityReferenceData } from '../api/types';

-const enquiryAssignmentSchema = z.object({
+const opportunityAssignmentSchema = z.object({
  assignedToUserId: z.string().min(1, 'Sales user is required'),
  remark: z.string().optional()
 });

-type EnquiryAssignmentFormValues = z.infer<typeof enquiryAssignmentSchema>;
+type OpportunityAssignmentFormValues = z.infer<typeof opportunityAssignmentSchema>;

 function toDefaultValues(
-  enquiry: EnquiryRecord,
-  referenceData: EnquiryReferenceData
-): EnquiryAssignmentFormValues {
+  opportunity: OpportunityRecord,
+  referenceData: OpportunityReferenceData
+): OpportunityAssignmentFormValues {
  return {
-    assignedToUserId: enquiry.assignedToUserId ?? referenceData.assignableUsers[0]?.id ?? '',
-    remark: enquiry.assignmentRemark ?? ''
+    assignedToUserId: opportunity.assignedToUserId ?? referenceData.assignableUsers[0]?.id ?? '',
+    remark: opportunity.assignmentRemark ?? ''
  };
 }

-export function EnquiryAssignmentDialog({
-  enquiry,
+export function OpportunityAssignmentDialog({
+  opportunity,
  referenceData,
  mode,
  open,
  onOpenChange
 }: {
-  enquiry: EnquiryRecord;
-  referenceData: EnquiryReferenceData;
+  opportunity: OpportunityRecord;
+  referenceData: OpportunityReferenceData;
  mode: 'assign' | 'reassign';
  open: boolean;
  onOpenChange: (open: boolean) => void;
 }) {
  const defaultValues = useMemo(
-    () => toDefaultValues(enquiry, referenceData),
-    [enquiry, referenceData]
+    () => toDefaultValues(opportunity, referenceData),
+    [opportunity, referenceData]
  );
-  const { FormSelectField, FormTextareaField } = useFormFields<EnquiryAssignmentFormValues>();
+  const { FormSelectField, FormTextareaField } = useFormFields<OpportunityAssignmentFormValues>();

  const assignMutation = useMutation({
-    ...assignEnquiryMutation,
+    ...assignOpportunityMutation,
    onSuccess: () => {
      toast.success('ส่งต่อลีดไปยังฝ่ายขายสำเร็จ');
      onOpenChange(false);
@@ -65,7 +65,7 @@ export function EnquiryAssignmentDialog({
  });

  const reassignMutation = useMutation({
-    ...reassignEnquiryMutation,
+    ...reassignOpportunityMutation,
    onSuccess: () => {
      toast.success('เปลี่ยนผู้ดูแลโอกาสขายสำเร็จ');
      onOpenChange(false);
@@ -77,7 +77,7 @@ export function EnquiryAssignmentDialog({
  const form = useAppForm({
    defaultValues,
    validators: {
-      onSubmit: enquiryAssignmentSchema
+      onSubmit: opportunityAssignmentSchema
    },
    onSubmit: async ({ value }) => {
      const values = {
@@ -86,11 +86,11 @@ export function EnquiryAssignmentDialog({
      };

      if (mode === 'assign') {
-        await assignMutation.mutateAsync({ id: enquiry.id, values });
+        await assignMutation.mutateAsync({ id: opportunity.id, values });
        return;
      }

-      await reassignMutation.mutateAsync({ id: enquiry.id, values });
+      await reassignMutation.mutateAsync({ id: opportunity.id, values });
    }
  });

@@ -118,7 +118,7 @@ export function EnquiryAssignmentDialog({
        </DialogHeader>

        <form.AppForm>
-          <form.Form id='enquiry-assignment-form' className='px-0 md:px-0'>
+          <form.Form id='opportunity-assignment-form' className='px-0 md:px-0'>
            {noUsersAvailable ? (
              <div className='text-muted-foreground rounded-lg border border-dashed p-4 text-sm'>
                ยังไม่มีผู้ใช้ฝ่ายขายที่สามารถมอบหมายงานได้ใน workspace นี้
@@ -151,7 +151,7 @@ export function EnquiryAssignmentDialog({
          </Button>
          <Button
            type='submit'
-            form='enquiry-assignment-form'
+            form='opportunity-assignment-form'
            isLoading={isPending}
            disabled={noUsersAvailable}
          >
@@ -163,3 +163,4 @@ export function EnquiryAssignmentDialog({
    </Dialog>
  );
 }
+
--- a/src/features/crm/opportunities/components/opportunity-cell-action.tsx
+++ b/src/features/crm/opportunities/components/opportunity-cell-action.tsx
@@ -14,11 +14,11 @@ import {
  DropdownMenuLabel,
  DropdownMenuTrigger
 } from '@/components/ui/dropdown-menu';
-import { deleteEnquiryMutation } from '../api/mutations';
-import type { EnquiryListItem, EnquiryReferenceData } from '../api/types';
-import { EnquiryFormSheet } from './enquiry-form-sheet';
+import { deleteOpportunityMutation } from '../api/mutations';
+import type { OpportunityListItem, OpportunityReferenceData } from '../api/types';
+import { OpportunityFormSheet } from './opportunity-form-sheet';

-export function EnquiryCellAction({
+export function OpportunityCellAction({
  data,
  referenceData,
  workspace,
@@ -27,9 +27,9 @@ export function EnquiryCellAction({
  canAssign: _canAssign,
  canReassign: _canReassign
 }: {
-  data: EnquiryListItem;
-  referenceData: EnquiryReferenceData;
-  workspace: 'lead' | 'enquiry';
+  data: OpportunityListItem;
+  referenceData: OpportunityReferenceData;
+  workspace: 'lead' | 'opportunity';
  canUpdate: boolean;
  canDelete: boolean;
  canAssign: boolean;
@@ -40,7 +40,7 @@ export function EnquiryCellAction({
  const [editOpen, setEditOpen] = useState(false);

  const deleteMutation = useMutation({
-    ...deleteEnquiryMutation,
+    ...deleteOpportunityMutation,
    onSuccess: () => {
      toast.success(`${workspace === 'lead' ? 'ลบลีดสำเร็จ' : 'ลบโอกาสขายสำเร็จ'}`);
      setDeleteOpen(false);
@@ -61,8 +61,8 @@ export function EnquiryCellAction({
        onConfirm={() => deleteMutation.mutate(data.id)}
        loading={deleteMutation.isPending}
      />
-      <EnquiryFormSheet
-        enquiry={data}
+      <OpportunityFormSheet
+        opportunity={data}
        open={editOpen}
        onOpenChange={setEditOpen}
        referenceData={referenceData}
@@ -82,7 +82,7 @@ export function EnquiryCellAction({
              router.push(
                workspace === 'lead'
                  ? `/dashboard/crm/leads/${data.id}`
-                  : `/dashboard/crm/enquiries/${data.id}`
+                  : `/dashboard/crm/opportunities/${data.id}`
              )
            }
          >
@@ -92,10 +92,11 @@ export function EnquiryCellAction({
            <Icons.edit className='mr-2 h-4 w-4' /> {workspace === 'lead' ? 'แก้ไขลีด' : 'แก้ไขโอกาสขาย'}
          </DropdownMenuItem>
          <DropdownMenuItem onClick={() => setDeleteOpen(true)} disabled={!canDelete}>
-            <Icons.trash className='mr-2 h-4 w-4' /> ลบ
+            <Icons.trash className='mr-2 h-4 w-4' /> เธฅเธ
          </DropdownMenuItem>
        </DropdownMenuContent>
      </DropdownMenu>
    </>
  );
 }
+
--- a/src/features/crm/opportunities/components/opportunity-columns.tsx
+++ b/src/features/crm/opportunities/components/opportunity-columns.tsx
@@ -5,12 +5,12 @@ import type { Column, ColumnDef } from '@tanstack/react-table';
 import { Icons } from '@/components/icons';
 import { Badge } from '@/components/ui/badge';
 import { DataTableColumnHeader } from '@/components/ui/table/data-table-column-header';
-import type { EnquiryListItem, EnquiryReferenceData } from '../api/types';
-import { EnquiryCellAction } from './enquiry-cell-action';
-import { EnquiryStatusBadge } from './enquiry-status-badge';
+import type { OpportunityListItem, OpportunityReferenceData } from '../api/types';
+import { OpportunityCellAction } from './opportunity-cell-action';
+import { OpportunityStatusBadge } from './opportunity-status-badge';

 type SharedColumnsConfig = {
-  referenceData: EnquiryReferenceData;
+  referenceData: OpportunityReferenceData;
  canUpdate: boolean;
  canDelete: boolean;
  canAssign: boolean;
@@ -23,7 +23,7 @@ function getLeadColumns({
  canDelete,
  canAssign,
  canReassign
-}: SharedColumnsConfig): ColumnDef<EnquiryListItem>[] {
+}: SharedColumnsConfig): ColumnDef<OpportunityListItem>[] {
  const statusMap = new Map(referenceData.statuses.map((item) => [item.id, item]));
  const leadChannelMap = new Map(referenceData.leadChannels.map((item) => [item.id, item.label]));

@@ -31,7 +31,7 @@ function getLeadColumns({
    {
      id: 'code',
      accessorKey: 'code',
-      header: ({ column }: { column: Column<EnquiryListItem, unknown> }) => (
+      header: ({ column }: { column: Column<OpportunityListItem, unknown> }) => (
        <DataTableColumnHeader column={column} title='Code' />
      ),
      cell: ({ row }) => (
@@ -53,7 +53,7 @@ function getLeadColumns({
    {
      id: 'leadChannel',
      accessorFn: (row) => row.leadChannel ?? '',
-      header: ({ column }: { column: Column<EnquiryListItem, unknown> }) => (
+      header: ({ column }: { column: Column<OpportunityListItem, unknown> }) => (
        <DataTableColumnHeader column={column} title='Lead Source' />
      ),
      cell: ({ row }) => <span>{leadChannelMap.get(row.original.leadChannel ?? '') ?? '-'}</span>
@@ -61,7 +61,7 @@ function getLeadColumns({
    {
      id: 'customer',
      accessorFn: (row) => row.customerId,
-      header: ({ column }: { column: Column<EnquiryListItem, unknown> }) => (
+      header: ({ column }: { column: Column<OpportunityListItem, unknown> }) => (
        <DataTableColumnHeader column={column} title='Customer' />
      ),
      cell: ({ row }) => <span>{row.original.customerName}</span>,
@@ -78,12 +78,12 @@ function getLeadColumns({
    {
      id: 'status',
      accessorKey: 'status',
-      header: ({ column }: { column: Column<EnquiryListItem, unknown> }) => (
+      header: ({ column }: { column: Column<OpportunityListItem, unknown> }) => (
        <DataTableColumnHeader column={column} title='Status' />
      ),
      cell: ({ row }) => {
        const status = statusMap.get(row.original.status);
-        return <EnquiryStatusBadge code={status?.code} label={status?.label ?? 'Unknown'} />;
+        return <OpportunityStatusBadge code={status?.code} label={status?.label ?? 'Unknown'} />;
      },
      meta: {
        label: 'Status',
@@ -98,7 +98,7 @@ function getLeadColumns({
    {
      id: 'actions',
      cell: ({ row }) => (
-        <EnquiryCellAction
+        <OpportunityCellAction
          data={row.original}
          referenceData={referenceData}
          workspace='lead'
@@ -112,13 +112,13 @@ function getLeadColumns({
  ];
 }

-function getEnquiryWorkspaceColumns({
+function getOpportunityWorkspaceColumns({
  referenceData,
  canUpdate,
  canDelete,
  canAssign,
  canReassign
-}: SharedColumnsConfig): ColumnDef<EnquiryListItem>[] {
+}: SharedColumnsConfig): ColumnDef<OpportunityListItem>[] {
  const statusMap = new Map(referenceData.statuses.map((item) => [item.id, item]));
  const productTypeMap = new Map(referenceData.productTypes.map((item) => [item.id, item.label]));

@@ -126,13 +126,13 @@ function getEnquiryWorkspaceColumns({
    {
      id: 'code',
      accessorKey: 'code',
-      header: ({ column }: { column: Column<EnquiryListItem, unknown> }) => (
+      header: ({ column }: { column: Column<OpportunityListItem, unknown> }) => (
        <DataTableColumnHeader column={column} title='Opportunity Code' />
      ),
      cell: ({ row }) => (
        <div className='flex flex-col'>
          <Link
-            href={`/dashboard/crm/enquiries/${row.original.id}`}
+            href={`/dashboard/crm/opportunities/${row.original.id}`}
            className='font-medium hover:underline'
          >
            {row.original.code}
@@ -151,7 +151,7 @@ function getEnquiryWorkspaceColumns({
    {
      id: 'sourceLead',
      accessorFn: (row) => (row.leadId ? 'linked' : 'direct'),
-      header: ({ column }: { column: Column<EnquiryListItem, unknown> }) => (
+      header: ({ column }: { column: Column<OpportunityListItem, unknown> }) => (
        <DataTableColumnHeader column={column} title='Source Lead' />
      ),
      cell: ({ row }) =>
@@ -164,7 +164,7 @@ function getEnquiryWorkspaceColumns({
    {
      id: 'customer',
      accessorFn: (row) => row.customerId,
-      header: ({ column }: { column: Column<EnquiryListItem, unknown> }) => (
+      header: ({ column }: { column: Column<OpportunityListItem, unknown> }) => (
        <DataTableColumnHeader column={column} title='Customer' />
      ),
      cell: ({ row }) => <span>{row.original.customerName}</span>,
@@ -181,7 +181,7 @@ function getEnquiryWorkspaceColumns({
    {
      id: 'projectName',
      accessorFn: (row) => row.projectName ?? '',
-      header: ({ column }: { column: Column<EnquiryListItem, unknown> }) => (
+      header: ({ column }: { column: Column<OpportunityListItem, unknown> }) => (
        <DataTableColumnHeader column={column} title='Project Name' />
      ),
      cell: ({ row }) => <span>{row.original.projectName ?? '-'}</span>
@@ -189,7 +189,7 @@ function getEnquiryWorkspaceColumns({
    {
      id: 'productType',
      accessorFn: (row) => row.productType,
-      header: ({ column }: { column: Column<EnquiryListItem, unknown> }) => (
+      header: ({ column }: { column: Column<OpportunityListItem, unknown> }) => (
        <DataTableColumnHeader column={column} title='Product Type' />
      ),
      cell: ({ row }) => <span>{productTypeMap.get(row.original.productType) ?? row.original.productType}</span>,
@@ -206,7 +206,7 @@ function getEnquiryWorkspaceColumns({
    {
      id: 'assignedToName',
      accessorFn: (row) => row.assignedToName ?? '',
-      header: ({ column }: { column: Column<EnquiryListItem, unknown> }) => (
+      header: ({ column }: { column: Column<OpportunityListItem, unknown> }) => (
        <DataTableColumnHeader column={column} title='Sales Owner' />
      ),
      cell: ({ row }) => <span>{row.original.assignedToName ?? '-'}</span>
@@ -214,12 +214,12 @@ function getEnquiryWorkspaceColumns({
    {
      id: 'status',
      accessorKey: 'status',
-      header: ({ column }: { column: Column<EnquiryListItem, unknown> }) => (
+      header: ({ column }: { column: Column<OpportunityListItem, unknown> }) => (
        <DataTableColumnHeader column={column} title='Status' />
      ),
      cell: ({ row }) => {
        const status = statusMap.get(row.original.status);
-        return <EnquiryStatusBadge code={status?.code} label={status?.label ?? 'Unknown'} />;
+        return <OpportunityStatusBadge code={status?.code} label={status?.label ?? 'Unknown'} />;
      },
      meta: {
        label: 'Status',
@@ -234,7 +234,7 @@ function getEnquiryWorkspaceColumns({
    {
      id: 'estimatedValue',
      accessorKey: 'estimatedValue',
-      header: ({ column }: { column: Column<EnquiryListItem, unknown> }) => (
+      header: ({ column }: { column: Column<OpportunityListItem, unknown> }) => (
        <DataTableColumnHeader column={column} title='Estimated Value' />
      ),
      cell: ({ row }) => (
@@ -246,7 +246,7 @@ function getEnquiryWorkspaceColumns({
    {
      id: 'chancePercent',
      accessorKey: 'chancePercent',
-      header: ({ column }: { column: Column<EnquiryListItem, unknown> }) => (
+      header: ({ column }: { column: Column<OpportunityListItem, unknown> }) => (
        <DataTableColumnHeader column={column} title='Chance %' />
      ),
      cell: ({ row }) => <span>{row.original.chancePercent !== null ? `${row.original.chancePercent}%` : '-'}</span>
@@ -254,7 +254,7 @@ function getEnquiryWorkspaceColumns({
    {
      id: 'expectedCloseDate',
      accessorKey: 'expectedCloseDate',
-      header: ({ column }: { column: Column<EnquiryListItem, unknown> }) => (
+      header: ({ column }: { column: Column<OpportunityListItem, unknown> }) => (
        <DataTableColumnHeader column={column} title='Expected Close' />
      ),
      cell: ({ row }) => (
@@ -268,7 +268,7 @@ function getEnquiryWorkspaceColumns({
    {
      id: 'nextFollowupDate',
      accessorKey: 'nextFollowupDate',
-      header: ({ column }: { column: Column<EnquiryListItem, unknown> }) => (
+      header: ({ column }: { column: Column<OpportunityListItem, unknown> }) => (
        <DataTableColumnHeader column={column} title='Next Follow-up' />
      ),
      cell: ({ row }) => (
@@ -280,7 +280,7 @@ function getEnquiryWorkspaceColumns({
    {
      id: 'createdAt',
      accessorKey: 'createdAt',
-      header: ({ column }: { column: Column<EnquiryListItem, unknown> }) => (
+      header: ({ column }: { column: Column<OpportunityListItem, unknown> }) => (
        <DataTableColumnHeader column={column} title='Created Date' />
      ),
      cell: ({ row }) => <span>{new Date(row.original.createdAt).toLocaleDateString()}</span>
@@ -288,10 +288,10 @@ function getEnquiryWorkspaceColumns({
    {
      id: 'actions',
      cell: ({ row }) => (
-        <EnquiryCellAction
+        <OpportunityCellAction
          data={row.original}
          referenceData={referenceData}
-          workspace='enquiry'
+          workspace='opportunity'
          canUpdate={canUpdate}
          canDelete={canDelete}
          canAssign={canAssign}
@@ -302,14 +302,15 @@ function getEnquiryWorkspaceColumns({
  ];
 }

-export function getEnquiryColumns({
+export function getOpportunityColumns({
  referenceData,
  workspace,
  canUpdate,
  canDelete,
  canAssign,
  canReassign
-}: SharedColumnsConfig & { workspace: 'lead' | 'enquiry' }): ColumnDef<EnquiryListItem>[] {
+}: SharedColumnsConfig & { workspace: 'lead' | 'opportunity' }): ColumnDef<OpportunityListItem>[] {
  const sharedConfig = { referenceData, canUpdate, canDelete, canAssign, canReassign };
-  return workspace === 'lead' ? getLeadColumns(sharedConfig) : getEnquiryWorkspaceColumns(sharedConfig);
+  return workspace === 'lead' ? getLeadColumns(sharedConfig) : getOpportunityWorkspaceColumns(sharedConfig);
 }
+
--- a/src/features/crm/opportunities/components/opportunity-detail.tsx
+++ b/src/features/crm/opportunities/components/opportunity-detail.tsx
@@ -11,13 +11,13 @@ import { Tabs, TabsContent, TabsList, TabsTrigger } from '@/components/ui/tabs';
 import type { QuotationReferenceData, QuotationRelationItem } from '@/features/crm/quotations/api/types';
 import { QuotationFormSheet } from '@/features/crm/quotations/components/quotation-form-sheet';
 import { getPipelineStageThaiLabel } from '@/features/crm/shared/terminology';
-import { enquiryByIdOptions, enquiryProjectPartiesOptions } from '../api/queries';
-import type { EnquiryRecord, EnquiryReferenceData } from '../api/types';
-import { EnquiryAssignmentDialog } from './enquiry-assignment-dialog';
-import { EnquiryFollowupsTab } from './enquiry-followups-tab';
-import { EnquiryFormSheet } from './enquiry-form-sheet';
-import { EnquiryOutcomeCard } from './enquiry-outcome-card';
-import { EnquiryStatusBadge } from './enquiry-status-badge';
+import { opportunityByIdOptions, opportunityProjectPartiesOptions } from '../api/queries';
+import type { OpportunityRecord, OpportunityReferenceData } from '../api/types';
+import { OpportunityAssignmentDialog } from './opportunity-assignment-dialog';
+import { OpportunityFollowupsTab } from './opportunity-followups-tab';
+import { OpportunityFormSheet } from './opportunity-form-sheet';
+import { OpportunityOutcomeCard } from './opportunity-outcome-card';
+import { OpportunityStatusBadge } from './opportunity-status-badge';
 import { QuotationReadinessPanel } from './quotation-readiness-panel';
 import { SourceLeadCard, type SourceLeadSummary } from './source-lead-card';

@@ -30,15 +30,15 @@ function FieldItem({ label, value }: { label: string; value: string | null | und
  );
 }

-function getPipelineStageLabel(stage: EnquiryRecord['pipelineStage']) {
+function getPipelineStageLabel(stage: OpportunityRecord['pipelineStage']) {
  return getPipelineStageThaiLabel(stage);
 }

-interface EnquiryDetailProps {
-  enquiryId: string;
-  referenceData: EnquiryReferenceData;
+interface OpportunityDetailProps {
+  opportunityId: string;
+  referenceData: OpportunityReferenceData;
  relatedQuotations: QuotationRelationItem[];
-  workspace: 'lead' | 'enquiry';
+  workspace: 'lead' | 'opportunity';
  canUpdate: boolean;
  canAssign: boolean;
  canReassign: boolean;
@@ -57,8 +57,8 @@ interface EnquiryDetailProps {
  quotationReferenceData?: QuotationReferenceData | null;
 }

-export function EnquiryDetail({
-  enquiryId,
+export function OpportunityDetail({
+  opportunityId,
  referenceData,
  relatedQuotations,
  workspace,
@@ -74,13 +74,13 @@ export function EnquiryDetail({
  canManageFollowups,
  sourceLead = null,
  quotationReferenceData = null
-}: EnquiryDetailProps) {
-  const { data } = useSuspenseQuery(enquiryByIdOptions(enquiryId));
-  const { data: projectPartiesData } = useSuspenseQuery(enquiryProjectPartiesOptions(enquiryId));
+}: OpportunityDetailProps) {
+  const { data } = useSuspenseQuery(opportunityByIdOptions(opportunityId));
+  const { data: projectPartiesData } = useSuspenseQuery(opportunityProjectPartiesOptions(opportunityId));
  const [editOpen, setEditOpen] = useState(false);
  const [assignmentOpen, setAssignmentOpen] = useState(false);
  const [quotationOpen, setQuotationOpen] = useState(false);
-  const enquiry = data.enquiry;
+  const opportunity = data.opportunity;

  const branchMap = useMemo(
    () => new Map(referenceData.branches.map((item) => [item.id, item.name])),
@@ -107,24 +107,24 @@ export function EnquiryDetail({
    [referenceData]
  );

-  const customer = customerMap.get(enquiry.customerId);
-  const contact = enquiry.contactId ? contactMap.get(enquiry.contactId) : null;
-  const status = statusMap.get(enquiry.status);
-  const pipelineStageLabel = getPipelineStageLabel(enquiry.pipelineStage);
-  const canManageAssignment = enquiry.assignedToUserId ? canReassign : canAssign;
-  const assignmentMode = enquiry.assignedToUserId ? 'reassign' : 'assign';
+  const customer = customerMap.get(opportunity.customerId);
+  const contact = opportunity.contactId ? contactMap.get(opportunity.contactId) : null;
+  const status = statusMap.get(opportunity.status);
+  const pipelineStageLabel = getPipelineStageLabel(opportunity.pipelineStage);
+  const canManageAssignment = opportunity.assignedToUserId ? canReassign : canAssign;
+  const assignmentMode = opportunity.assignedToUserId ? 'reassign' : 'assign';

  return (
    <div className='space-y-6'>
-      <EnquiryFormSheet
+      <OpportunityFormSheet
        open={editOpen}
        onOpenChange={setEditOpen}
        referenceData={referenceData}
        workspace={workspace}
-        enquiry={enquiry}
+        opportunity={opportunity}
      />
-      <EnquiryAssignmentDialog
-        enquiry={enquiry}
+      <OpportunityAssignmentDialog
+        opportunity={opportunity}
        referenceData={referenceData}
        mode={assignmentMode}
        open={assignmentOpen}
@@ -141,8 +141,8 @@ export function EnquiryDetail({
      <div className='flex items-start justify-between gap-4'>
        <div>
          <div className='flex items-center gap-3'>
-            <h2 className='text-2xl font-semibold'>{enquiry.code}</h2>
-            <EnquiryStatusBadge code={status?.code} label={status?.label ?? enquiry.status} />
+            <h2 className='text-2xl font-semibold'>{opportunity.code}</h2>
+            <OpportunityStatusBadge code={status?.code} label={status?.label ?? opportunity.status} />
          </div>
          <p className='text-muted-foreground mt-2 text-sm'>
            Opportunity detail for sales execution, follow-up continuity, and quotation readiness.
@@ -184,22 +184,22 @@ export function EnquiryDetail({
            <CardContent className='grid gap-4 md:grid-cols-2 xl:grid-cols-3'>
              <FieldItem label='Customer' value={customer?.name} />
              <FieldItem label='Contact' value={contact?.name} />
-              <FieldItem label='Project Name' value={enquiry.projectName} />
-              <FieldItem label='Project Location' value={enquiry.projectLocation} />
+              <FieldItem label='Project Name' value={opportunity.projectName} />
+              <FieldItem label='Project Location' value={opportunity.projectLocation} />
              <FieldItem label='Pipeline Stage' value={pipelineStageLabel} />
-              <FieldItem label='Sales Owner' value={enquiry.assignedToName} />
-              <FieldItem label='Status' value={status?.label ?? enquiry.status} />
+              <FieldItem label='Sales Owner' value={opportunity.assignedToName} />
+              <FieldItem label='Status' value={status?.label ?? opportunity.status} />
              <FieldItem
                label='Expected Close Date'
                value={
-                  enquiry.expectedCloseDate
-                    ? new Date(enquiry.expectedCloseDate).toLocaleDateString()
+                  opportunity.expectedCloseDate
+                    ? new Date(opportunity.expectedCloseDate).toLocaleDateString()
                    : null
                }
              />
              <FieldItem
                label='Estimated Value'
-                value={enquiry.estimatedValue !== null ? enquiry.estimatedValue.toLocaleString() : null}
+                value={opportunity.estimatedValue !== null ? opportunity.estimatedValue.toLocaleString() : null}
              />
            </CardContent>
          </Card>
@@ -216,7 +216,7 @@ export function EnquiryDetail({
              <FieldItem label='Contact Name' value={contact?.name} />
              <FieldItem label='Contact Email' value={contact?.email} />
              <FieldItem label='Contact Mobile' value={contact?.mobile} />
-              <FieldItem label='Branch' value={enquiry.branchId ? branchMap.get(enquiry.branchId) : null} />
+              <FieldItem label='Branch' value={opportunity.branchId ? branchMap.get(opportunity.branchId) : null} />
            </CardContent>
          </Card>

@@ -225,12 +225,12 @@ export function EnquiryDetail({
              <CardTitle>Requirement</CardTitle>
            </CardHeader>
            <CardContent className='space-y-4'>
-              <FieldItem label='Title' value={enquiry.title} />
-              <FieldItem label='Description' value={enquiry.description} />
-              <FieldItem label='Requirement' value={enquiry.requirement} />
+              <FieldItem label='Title' value={opportunity.title} />
+              <FieldItem label='Description' value={opportunity.description} />
+              <FieldItem label='Requirement' value={opportunity.requirement} />
              <div className='grid gap-4 md:grid-cols-2'>
-                <FieldItem label='Source' value={enquiry.source} />
-                <FieldItem label='Assignment Remark' value={enquiry.assignmentRemark} />
+                <FieldItem label='Source' value={opportunity.source} />
+                <FieldItem label='Assignment Remark' value={opportunity.assignmentRemark} />
              </div>
            </CardContent>
          </Card>
@@ -240,18 +240,18 @@ export function EnquiryDetail({
              <CardTitle>Sales Qualification</CardTitle>
            </CardHeader>
            <CardContent className='grid gap-4 md:grid-cols-2 xl:grid-cols-3'>
-              <FieldItem label='Product Type' value={productTypeMap.get(enquiry.productType) ?? enquiry.productType} />
-              <FieldItem label='Priority' value={priorityMap.get(enquiry.priority) ?? enquiry.priority} />
+              <FieldItem label='Product Type' value={productTypeMap.get(opportunity.productType) ?? opportunity.productType} />
+              <FieldItem label='Priority' value={priorityMap.get(opportunity.priority) ?? opportunity.priority} />
              <FieldItem
                label='Chance %'
-                value={enquiry.chancePercent !== null ? `${enquiry.chancePercent}%` : null}
+                value={opportunity.chancePercent !== null ? `${opportunity.chancePercent}%` : null}
              />
-              <FieldItem label='Competitor' value={enquiry.competitor} />
+              <FieldItem label='Competitor' value={opportunity.competitor} />
              <FieldItem
                label='Assigned At'
-                value={enquiry.assignedAt ? new Date(enquiry.assignedAt).toLocaleString() : null}
+                value={opportunity.assignedAt ? new Date(opportunity.assignedAt).toLocaleString() : null}
              />
-              <FieldItem label='Assigned By' value={enquiry.assignedByName} />
+              <FieldItem label='Assigned By' value={opportunity.assignedByName} />
            </CardContent>
          </Card>

@@ -263,9 +263,9 @@ export function EnquiryDetail({
            </TabsList>

            <TabsContent value='followups'>
-              <EnquiryFollowupsTab
-                enquiryId={enquiryId}
-                customerId={enquiry.customerId}
+              <OpportunityFollowupsTab
+                opportunityId={opportunityId}
+                customerId={opportunity.customerId}
                referenceData={referenceData}
                canCreate={canManageFollowups.create}
                canUpdate={canManageFollowups.update}
@@ -329,10 +329,10 @@ export function EnquiryDetail({
        </div>

        <div className='space-y-6'>
-          <QuotationReadinessPanel enquiry={enquiry} />
+          <QuotationReadinessPanel opportunity={opportunity} />

-          <EnquiryOutcomeCard
-            enquiryId={enquiryId}
+          <OpportunityOutcomeCard
+            opportunityId={opportunityId}
            referenceData={referenceData}
            canViewCommercialData={canViewOutcomeCommercialData}
            canMarkWon={canMarkWon}
@@ -350,7 +350,7 @@ export function EnquiryDetail({
                label='Project Parties'
                value={String(projectPartiesData.items.length)}
              />
-              <FieldItem label='Record Type' value={workspace === 'enquiry' ? 'Opportunity' : 'Lead'} />
+              <FieldItem label='Record Type' value={workspace === 'opportunity' ? 'Opportunity' : 'Lead'} />
            </CardContent>
          </Card>
        </div>
@@ -358,3 +358,4 @@ export function EnquiryDetail({
    </div>
  );
 }
+
--- a/src/features/crm/opportunities/components/opportunity-followups-tab.tsx
+++ b/src/features/crm/opportunities/components/opportunity-followups-tab.tsx
@@ -8,27 +8,27 @@ import { Icons } from '@/components/icons';
 import { Button } from '@/components/ui/button';
 import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card';
 import { Badge } from '@/components/ui/badge';
-import { deleteEnquiryFollowupMutation } from '../api/mutations';
-import { enquiryFollowupsOptions } from '../api/queries';
-import type { EnquiryReferenceData } from '../api/types';
+import { deleteOpportunityFollowupMutation } from '../api/mutations';
+import { opportunityFollowupsOptions } from '../api/queries';
+import type { OpportunityReferenceData } from '../api/types';
 import { FollowupFormSheet } from './followup-form-sheet';

-export function EnquiryFollowupsTab({
-  enquiryId,
+export function OpportunityFollowupsTab({
+  opportunityId,
  customerId,
  referenceData,
  canCreate,
  canUpdate,
  canDelete
 }: {
-  enquiryId: string;
+  opportunityId: string;
  customerId: string;
-  referenceData: EnquiryReferenceData;
+  referenceData: OpportunityReferenceData;
  canCreate: boolean;
  canUpdate: boolean;
  canDelete: boolean;
 }) {
-  const { data } = useSuspenseQuery(enquiryFollowupsOptions(enquiryId));
+  const { data } = useSuspenseQuery(opportunityFollowupsOptions(opportunityId));
  const [selectedId, setSelectedId] = useState<string | null>(null);
  const [open, setOpen] = useState(false);
  const [deleteOpen, setDeleteOpen] = useState(false);
@@ -36,7 +36,7 @@ export function EnquiryFollowupsTab({
  const followupTypeMap = new Map(referenceData.followupTypes.map((item) => [item.id, item.label]));

  const deleteMutation = useMutation({
-    ...deleteEnquiryFollowupMutation,
+    ...deleteOpportunityFollowupMutation,
    onSuccess: () => {
      toast.success('ลบงานติดตามสำเร็จ');
      setDeleteOpen(false);
@@ -117,7 +117,7 @@ export function EnquiryFollowupsTab({
                    setDeleteOpen(true);
                  }}
                >
-                  <Icons.trash className='mr-2 h-4 w-4' /> ลบ
+                  <Icons.trash className='mr-2 h-4 w-4' /> เธฅเธ
                </Button>
              </div>
            </div>
@@ -126,7 +126,7 @@ export function EnquiryFollowupsTab({
      </CardContent>

      <FollowupFormSheet
-        enquiryId={enquiryId}
+        opportunityId={opportunityId}
        followup={selected}
        open={open}
        onOpenChange={setOpen}
@@ -138,7 +138,7 @@ export function EnquiryFollowupsTab({
        onClose={() => setDeleteOpen(false)}
        onConfirm={() => {
          if (selectedId) {
-            deleteMutation.mutate({ enquiryId, followupId: selectedId });
+            deleteMutation.mutate({ opportunityId, followupId: selectedId });
          }
        }}
        loading={deleteMutation.isPending}
@@ -146,3 +146,4 @@ export function EnquiryFollowupsTab({
    </Card>
  );
 }
+
--- a/src/features/crm/opportunities/components/opportunity-form-sheet.tsx
+++ b/src/features/crm/opportunities/components/opportunity-form-sheet.tsx
@@ -26,58 +26,58 @@ import {
  SheetTitle
 } from '@/components/ui/sheet';
 import { useAppForm, useFormFields } from '@/components/ui/tanstack-form';
-import { enquiryProjectPartiesOptions } from '../api/queries';
-import { createEnquiryMutation, updateEnquiryMutation } from '../api/mutations';
-import type { EnquiryMutationPayload, EnquiryRecord, EnquiryReferenceData } from '../api/types';
-import { enquirySchema, type EnquiryFormValues } from '../schemas/enquiry.schema';
+import { opportunityProjectPartiesOptions } from '../api/queries';
+import { createOpportunityMutation, updateOpportunityMutation } from '../api/mutations';
+import type { OpportunityMutationPayload, OpportunityRecord, OpportunityReferenceData } from '../api/types';
+import { opportunitySchema, type OpportunityFormValues } from '../schemas/opportunity.schema';

 function toDefaultValues(
-  enquiry: EnquiryRecord | undefined,
-  referenceData: EnquiryReferenceData
-): EnquiryFormValues {
+  opportunity: OpportunityRecord | undefined,
+  referenceData: OpportunityReferenceData
+): OpportunityFormValues {
  return {
-    customerId: enquiry?.customerId ?? referenceData.customers[0]?.id ?? '',
-    contactId: enquiry?.contactId ?? undefined,
-    assignedToUserId: enquiry?.assignedToUserId ?? undefined,
-    title: enquiry?.title ?? '',
-    description: enquiry?.description ?? '',
-    requirement: enquiry?.requirement ?? '',
-    projectName: enquiry?.projectName ?? '',
-    projectLocation: enquiry?.projectLocation ?? '',
-    branchId: enquiry?.branchId ?? undefined,
-    productType: enquiry?.productType ?? referenceData.productTypes[0]?.id ?? '',
-    status: enquiry?.status ?? referenceData.statuses[0]?.id ?? '',
+    customerId: opportunity?.customerId ?? referenceData.customers[0]?.id ?? '',
+    contactId: opportunity?.contactId ?? undefined,
+    assignedToUserId: opportunity?.assignedToUserId ?? undefined,
+    title: opportunity?.title ?? '',
+    description: opportunity?.description ?? '',
+    requirement: opportunity?.requirement ?? '',
+    projectName: opportunity?.projectName ?? '',
+    projectLocation: opportunity?.projectLocation ?? '',
+    branchId: opportunity?.branchId ?? undefined,
+    productType: opportunity?.productType ?? referenceData.productTypes[0]?.id ?? '',
+    status: opportunity?.status ?? referenceData.statuses[0]?.id ?? '',
    priority:
-      enquiry?.priority ?? referenceData.priorities[1]?.id ?? referenceData.priorities[0]?.id ?? '',
-    leadChannel: enquiry?.leadChannel ?? undefined,
-    estimatedValue: enquiry?.estimatedValue ?? undefined,
-    chancePercent: enquiry?.chancePercent ?? undefined,
-    expectedCloseDate: enquiry?.expectedCloseDate ? enquiry.expectedCloseDate.slice(0, 10) : '',
-    competitor: enquiry?.competitor ?? '',
-    source: enquiry?.source ?? '',
-    isHotProject: enquiry?.isHotProject ?? false,
-    notes: enquiry?.notes ?? '',
-    isActive: enquiry?.isActive ?? true
+      opportunity?.priority ?? referenceData.priorities[1]?.id ?? referenceData.priorities[0]?.id ?? '',
+    leadChannel: opportunity?.leadChannel ?? undefined,
+    estimatedValue: opportunity?.estimatedValue ?? undefined,
+    chancePercent: opportunity?.chancePercent ?? undefined,
+    expectedCloseDate: opportunity?.expectedCloseDate ? opportunity.expectedCloseDate.slice(0, 10) : '',
+    competitor: opportunity?.competitor ?? '',
+    source: opportunity?.source ?? '',
+    isHotProject: opportunity?.isHotProject ?? false,
+    notes: opportunity?.notes ?? '',
+    isActive: opportunity?.isActive ?? true
  };
 }

-export function EnquiryFormSheet({
-  enquiry,
+export function OpportunityFormSheet({
+  opportunity,
  open,
  onOpenChange,
  referenceData,
-  workspace = 'enquiry'
+  workspace = 'opportunity'
 }: {
-  enquiry?: EnquiryRecord;
+  opportunity?: OpportunityRecord;
  open: boolean;
  onOpenChange: (open: boolean) => void;
-  referenceData: EnquiryReferenceData;
-  workspace?: 'lead' | 'enquiry';
+  referenceData: OpportunityReferenceData;
+  workspace?: 'lead' | 'opportunity';
 }) {
-  const isEdit = !!enquiry;
+  const isEdit = !!opportunity;
  const defaultValues = useMemo(
-    () => toDefaultValues(enquiry, referenceData),
-    [enquiry, referenceData]
+    () => toDefaultValues(opportunity, referenceData),
+    [opportunity, referenceData]
  );
  const [selectedCustomerId, setSelectedCustomerId] = useState(defaultValues.customerId);
  const [projectParties, setProjectParties] = useState<ProjectPartyEditorItem[]>([]);
@@ -89,14 +89,14 @@ export function EnquiryFormSheet({
    FormDatePickerField,
    FormCurrencyField,
    FormPercentageField
-  } = useFormFields<EnquiryFormValues>();
+  } = useFormFields<OpportunityFormValues>();
  const projectPartiesQuery = useQuery({
-    ...enquiryProjectPartiesOptions(enquiry?.id ?? ''),
-    enabled: open && !!enquiry?.id
+    ...opportunityProjectPartiesOptions(opportunity?.id ?? ''),
+    enabled: open && !!opportunity?.id
  });

  const createMutation = useMutation({
-    ...createEnquiryMutation,
+    ...createOpportunityMutation,
    onSuccess: () => {
      toast.success(`สร้าง${recordLabel}สำเร็จ`);
      onOpenChange(false);
@@ -106,7 +106,7 @@ export function EnquiryFormSheet({
  });

  const updateMutation = useMutation({
-    ...updateEnquiryMutation,
+    ...updateOpportunityMutation,
    onSuccess: () => {
      toast.success(`อัปเดต${recordLabel}สำเร็จ`);
      onOpenChange(false);
@@ -123,10 +123,10 @@ export function EnquiryFormSheet({
  const form = useAppForm({
    defaultValues,
    validators: {
-      onSubmit: enquirySchema
+      onSubmit: opportunitySchema
    },
    onSubmit: async ({ value }) => {
-      const payload: EnquiryMutationPayload = {
+      const payload: OpportunityMutationPayload = {
        customerId: value.customerId,
        contactId: value.contactId || null,
        assignedToUserId: value.assignedToUserId || null,
@@ -159,8 +159,8 @@ export function EnquiryFormSheet({
          }))
      };

-      if (isEdit && enquiry) {
-        await updateMutation.mutateAsync({ id: enquiry.id, values: payload });
+      if (isEdit && opportunity) {
+        await updateMutation.mutateAsync({ id: opportunity.id, values: payload });
        return;
      }

@@ -176,7 +176,7 @@ export function EnquiryFormSheet({
    setSelectedCustomerId(defaultValues.customerId);
    form.reset(defaultValues);
    setProjectParties(
-      enquiry
+      opportunity
        ? (projectPartiesQuery.data?.items ?? []).map((item) => ({
            key: item.id,
            customerId: item.customerId,
@@ -185,7 +185,7 @@ export function EnquiryFormSheet({
          }))
        : []
    );
-  }, [defaultValues, enquiry, form, open, projectPartiesQuery.data?.items]);
+  }, [defaultValues, opportunity, form, open, projectPartiesQuery.data?.items]);

  useEffect(() => {
    if (!open || isEdit) {
@@ -216,7 +216,7 @@ export function EnquiryFormSheet({

        <div className='flex-1 overflow-auto'>
          <form.AppForm>
-            <form.Form id='enquiry-form-sheet' className='grid gap-4 md:grid-cols-2'>
+            <form.Form id='opportunity-form-sheet' className='grid gap-4 md:grid-cols-2'>
              <form.AppField
                name='customerId'
                children={(field) => (
@@ -289,7 +289,7 @@ export function EnquiryFormSheet({
                description={
                  selectedCustomer?.ownerName
                    ? `Suggested from customer owner: ${selectedCustomer.ownerName}`
-                    : 'Optional sales owner suggestion for this lead or enquiry'
+                    : 'Optional sales owner suggestion for this lead or opportunity'
                }
                options={referenceData.assignableUsers.map((user) => ({
                  value: user.id,
@@ -301,7 +301,7 @@ export function EnquiryFormSheet({
                name='title'
                label='ชื่อรายการ'
                required
-                placeholder='Warehouse crane upgrade enquiry'
+                placeholder='Warehouse crane upgrade opportunity'
              />
              <FormTextField
                name='projectName'
@@ -429,7 +429,7 @@ export function EnquiryFormSheet({
          <Button type='button' variant='outline' onClick={() => onOpenChange(false)}>
            ยกเลิก
          </Button>
-          <Button type='submit' form='enquiry-form-sheet' isLoading={isPending}>
+          <Button type='submit' form='opportunity-form-sheet' isLoading={isPending}>
            <Icons.check className='mr-2 h-4 w-4' />
            {isEdit ? `อัปเดต${recordLabel}` : `สร้าง${recordLabel}`}
          </Button>
@@ -439,12 +439,12 @@ export function EnquiryFormSheet({
  );
 }

-export function EnquiryFormSheetTrigger({
+export function OpportunityFormSheetTrigger({
  referenceData,
-  workspace = 'enquiry'
+  workspace = 'opportunity'
 }: {
-  referenceData: EnquiryReferenceData;
-  workspace?: 'lead' | 'enquiry';
+  referenceData: OpportunityReferenceData;
+  workspace?: 'lead' | 'opportunity';
 }) {
  const [open, setOpen] = React.useState(false);

@@ -453,7 +453,7 @@ export function EnquiryFormSheetTrigger({
      <Button onClick={() => setOpen(true)}>
        <Icons.add className='mr-2 h-4 w-4' /> {workspace === 'lead' ? 'เพิ่มลีด' : 'เพิ่มโอกาสขาย'}
      </Button>
-      <EnquiryFormSheet
+      <OpportunityFormSheet
        open={open}
        onOpenChange={setOpen}
        referenceData={referenceData}
@@ -462,3 +462,4 @@ export function EnquiryFormSheetTrigger({
    </>
  );
 }
+
--- a/src/features/crm/opportunities/components/opportunity-listing.tsx
+++ b/src/features/crm/opportunities/components/opportunity-listing.tsx
@@ -1,11 +1,11 @@
 import { HydrationBoundary, dehydrate } from '@tanstack/react-query';
 import { getQueryClient } from '@/lib/query-client';
 import { searchParamsCache } from '@/lib/searchparams';
-import type { EnquiryReferenceData } from '../api/types';
-import { enquiriesQueryOptions } from '../api/queries';
-import { EnquiriesTable } from './enquiries-table';
+import type { OpportunityReferenceData } from '../api/types';
+import { opportunitiesQueryOptions } from '../api/queries';
+import { OpportunitiesTable } from './opportunities-table';

-export default function EnquiryListing({
+export default function OpportunityListing({
  referenceData,
  workspace,
  canUpdate,
@@ -13,8 +13,8 @@ export default function EnquiryListing({
  canAssign,
  canReassign
 }: {
-  referenceData: EnquiryReferenceData;
-  workspace: 'lead' | 'enquiry';
+  referenceData: OpportunityReferenceData;
+  workspace: 'lead' | 'opportunity';
  canUpdate: boolean;
  canDelete: boolean;
  canAssign: boolean;
@@ -44,11 +44,11 @@ export default function EnquiryListing({
  };

  const queryClient = getQueryClient();
-  void queryClient.prefetchQuery(enquiriesQueryOptions(filters));
+  void queryClient.prefetchQuery(opportunitiesQueryOptions(filters));

  return (
    <HydrationBoundary state={dehydrate(queryClient)}>
-      <EnquiriesTable
+      <OpportunitiesTable
        referenceData={referenceData}
        workspace={workspace}
        canUpdate={canUpdate}
@@ -59,3 +59,4 @@ export default function EnquiryListing({
    </HydrationBoundary>
  );
 }
+
--- a/src/features/crm/opportunities/components/opportunity-outcome-card.tsx
+++ b/src/features/crm/opportunities/components/opportunity-outcome-card.tsx
@@ -31,13 +31,13 @@ import {
  CrmTextarea
 } from '@/features/crm/components/crm-form-controls';
 import {
-  invalidateEnquiryMutationQueries,
-  markEnquiryLostMutation,
-  markEnquiryWonMutation,
-  reopenEnquiryMutation
+  invalidateOpportunityMutationQueries,
+  markOpportunityLostMutation,
+  markOpportunityWonMutation,
+  reopenOpportunityMutation
 } from '../api/mutations';
-import { enquiryAttachmentsOptions, enquiryByIdOptions } from '../api/queries';
-import type { EnquiryReferenceData } from '../api/types';
+import { opportunityAttachmentsOptions, opportunityByIdOptions } from '../api/queries';
+import type { OpportunityReferenceData } from '../api/types';

 function FieldItem({ label, value }: { label: string; value: string | null | undefined }) {
  return (
@@ -54,29 +54,29 @@ function getOutcomeLabel(stage: string) {
  return 'Open';
 }

-type EnquiryOutcomeCardProps = {
-  enquiryId: string;
-  referenceData: EnquiryReferenceData;
+type OpportunityOutcomeCardProps = {
+  opportunityId: string;
+  referenceData: OpportunityReferenceData;
  canViewCommercialData: boolean;
  canMarkWon: boolean;
  canMarkLost: boolean;
  canReopen: boolean;
 };

-export function EnquiryOutcomeCard({
-  enquiryId,
+export function OpportunityOutcomeCard({
+  opportunityId,
  referenceData,
  canViewCommercialData,
  canMarkWon,
  canMarkLost,
  canReopen
-}: EnquiryOutcomeCardProps) {
-  const { data } = useSuspenseQuery(enquiryByIdOptions(enquiryId));
+}: OpportunityOutcomeCardProps) {
+  const { data } = useSuspenseQuery(opportunityByIdOptions(opportunityId));
  const attachmentsQuery = useQuery({
-    ...enquiryAttachmentsOptions(enquiryId),
+    ...opportunityAttachmentsOptions(opportunityId),
    enabled: canViewCommercialData
  });
-  const enquiry = data.enquiry;
+  const opportunity = data.opportunity;
  const [wonOpen, setWonOpen] = useState(false);
  const [lostOpen, setLostOpen] = useState(false);
  const [reopenOpen, setReopenOpen] = useState(false);
@@ -93,31 +93,31 @@ export function EnquiryOutcomeCard({
  const [poFileDescription, setPoFileDescription] = useState('');

  const wonMutation = useMutation({
-    ...markEnquiryWonMutation,
+    ...markOpportunityWonMutation,
    onSuccess: async () => {
-      toast.success('Marked enquiry as won');
+      toast.success('Marked opportunity as won');
      setWonOpen(false);
-      await invalidateEnquiryMutationQueries(enquiryId);
+      await invalidateOpportunityMutationQueries(opportunityId);
    },
    onError: (error) => toast.error(error instanceof Error ? error.message : 'Failed to mark won')
  });
  const lostMutation = useMutation({
-    ...markEnquiryLostMutation,
+    ...markOpportunityLostMutation,
    onSuccess: async () => {
-      toast.success('Marked enquiry as lost');
+      toast.success('Marked opportunity as lost');
      setLostOpen(false);
-      await invalidateEnquiryMutationQueries(enquiryId);
+      await invalidateOpportunityMutationQueries(opportunityId);
    },
    onError: (error) => toast.error(error instanceof Error ? error.message : 'Failed to mark lost')
  });
  const reopenMutation = useMutation({
-    ...reopenEnquiryMutation,
+    ...reopenOpportunityMutation,
    onSuccess: async () => {
-      toast.success('Reopened enquiry');
+      toast.success('Reopened opportunity');
      setReopenOpen(false);
-      await invalidateEnquiryMutationQueries(enquiryId);
+      await invalidateOpportunityMutationQueries(opportunityId);
    },
-    onError: (error) => toast.error(error instanceof Error ? error.message : 'Failed to reopen enquiry')
+    onError: (error) => toast.error(error instanceof Error ? error.message : 'Failed to reopen opportunity')
  });
  const uploadMutation = useMutation({
    mutationFn: async () => {
@@ -128,7 +128,7 @@ export function EnquiryOutcomeCard({
      const formData = new FormData();
      formData.append('file', poFile);
      formData.append('description', poFileDescription);
-      const response = await fetch(`/api/crm/enquiries/${enquiryId}/po-attachments`, {
+      const response = await fetch(`/api/crm/opportunities/${opportunityId}/po-attachments`, {
        method: 'POST',
        body: formData
      });
@@ -144,26 +144,26 @@ export function EnquiryOutcomeCard({
      toast.success('PO attachment uploaded');
      setPoFile(null);
      setPoFileDescription('');
-      await invalidateEnquiryMutationQueries(enquiryId);
+      await invalidateOpportunityMutationQueries(opportunityId);
    },
    onError: (error) =>
      toast.error(error instanceof Error ? error.message : 'Failed to upload PO attachment')
  });

-  const closedDate = enquiry.closedWonAt ?? enquiry.closedLostAt;
+  const closedDate = opportunity.closedWonAt ?? opportunity.closedLostAt;
  const lostReasonLabel = useMemo(() => {
-    if (!enquiry.lostReason) {
+    if (!opportunity.lostReason) {
      return null;
    }

    return (
-      enquiry.lostReasonLabel ??
+      opportunity.lostReasonLabel ??
      referenceData.lostReasons.find(
-        (item) => item.id === enquiry.lostReason || item.code === enquiry.lostReason
+        (item) => item.id === opportunity.lostReason || item.code === opportunity.lostReason
      )?.label ??
-      enquiry.lostReason
+      opportunity.lostReason
    );
-  }, [enquiry.lostReason, enquiry.lostReasonLabel, referenceData.lostReasons]);
+  }, [opportunity.lostReason, opportunity.lostReasonLabel, referenceData.lostReasons]);
  const attachmentItems = attachmentsQuery.data?.items ?? [];

  return (
@@ -175,16 +175,16 @@ export function EnquiryOutcomeCard({
        </CardHeader>
        <CardContent className='space-y-4'>
          <div className='flex items-center justify-between gap-3'>
-            <Badge variant={enquiry.pipelineStage === 'closed_won' ? 'default' : enquiry.pipelineStage === 'closed_lost' ? 'destructive' : 'secondary'}>
-              {getOutcomeLabel(enquiry.pipelineStage)}
+            <Badge variant={opportunity.pipelineStage === 'closed_won' ? 'default' : opportunity.pipelineStage === 'closed_lost' ? 'destructive' : 'secondary'}>
+              {getOutcomeLabel(opportunity.pipelineStage)}
            </Badge>
            <div className='flex flex-wrap gap-2'>
-              {enquiry.pipelineStage === 'enquiry' && canMarkWon ? (
+              {opportunity.pipelineStage === 'opportunity' && canMarkWon ? (
                <Button size='sm' onClick={() => {
-                  setPoNumber(enquiry.poNumber ?? '');
-                  setPoDate(enquiry.poDate ? enquiry.poDate.slice(0, 10) : '');
-                  setPoAmount(enquiry.poAmount !== null && enquiry.poAmount !== undefined ? String(enquiry.poAmount) : '');
-                  setPoCurrency(enquiry.poCurrency ?? 'THB');
+                  setPoNumber(opportunity.poNumber ?? '');
+                  setPoDate(opportunity.poDate ? opportunity.poDate.slice(0, 10) : '');
+                  setPoAmount(opportunity.poAmount !== null && opportunity.poAmount !== undefined ? String(opportunity.poAmount) : '');
+                  setPoCurrency(opportunity.poCurrency ?? 'THB');
                  setWonRemark('');
                  setWonOpen(true);
                }}>
@@ -192,18 +192,18 @@ export function EnquiryOutcomeCard({
                  Mark Won
                </Button>
              ) : null}
-              {enquiry.pipelineStage === 'enquiry' && canMarkLost ? (
+              {opportunity.pipelineStage === 'opportunity' && canMarkLost ? (
                <Button variant='destructive' size='sm' onClick={() => {
-                  setLostReason(enquiry.lostReason ?? '');
-                  setLostCompetitor(enquiry.lostCompetitor ?? '');
-                  setLostRemark(enquiry.lostRemark ?? '');
+                  setLostReason(opportunity.lostReason ?? '');
+                  setLostCompetitor(opportunity.lostCompetitor ?? '');
+                  setLostRemark(opportunity.lostRemark ?? '');
                  setLostOpen(true);
                }}>
                  <Icons.xCircle className='mr-2 h-4 w-4' />
                  Mark Lost
                </Button>
              ) : null}
-              {enquiry.pipelineStage === 'closed_lost' && canReopen ? (
+              {opportunity.pipelineStage === 'closed_lost' && canReopen ? (
                <Button variant='outline' size='sm' onClick={() => setReopenOpen(true)}>
                  Reopen
                </Button>
@@ -212,32 +212,32 @@ export function EnquiryOutcomeCard({
          </div>

          <div className='grid gap-4 md:grid-cols-2'>
-            <FieldItem label='Closed By' value={enquiry.closedByName} />
+            <FieldItem label='Closed By' value={opportunity.closedByName} />
            <FieldItem
              label='Closed Date'
              value={closedDate ? new Date(closedDate).toLocaleString() : null}
            />
-            <FieldItem label='PO Number' value={enquiry.poNumber} />
+            <FieldItem label='PO Number' value={opportunity.poNumber} />
            <FieldItem
              label='PO Date'
-              value={enquiry.poDate ? new Date(enquiry.poDate).toLocaleDateString() : null}
+              value={opportunity.poDate ? new Date(opportunity.poDate).toLocaleDateString() : null}
            />
            <FieldItem
              label='PO Amount'
              value={
-                canViewCommercialData && enquiry.poAmount !== null
-                  ? `${enquiry.poAmount.toLocaleString()} ${enquiry.poCurrency ?? ''}`.trim()
+                canViewCommercialData && opportunity.poAmount !== null
+                  ? `${opportunity.poAmount.toLocaleString()} ${opportunity.poCurrency ?? ''}`.trim()
                  : canViewCommercialData
                    ? null
                    : 'Restricted'
              }
            />
            <FieldItem label='Lost Reason' value={lostReasonLabel} />
-            <FieldItem label='Lost Competitor' value={enquiry.lostCompetitor} />
-            <FieldItem label='Remark' value={enquiry.lostRemark} />
+            <FieldItem label='Lost Competitor' value={opportunity.lostCompetitor} />
+            <FieldItem label='Remark' value={opportunity.lostRemark} />
          </div>

-          {canViewCommercialData && enquiry.pipelineStage === 'closed_won' ? (
+          {canViewCommercialData && opportunity.pipelineStage === 'closed_won' ? (
            <div className='space-y-4 rounded-lg border p-4'>
              <div className='space-y-1'>
                <div className='font-medium'>Purchase Order Attachment</div>
@@ -295,12 +295,12 @@ export function EnquiryOutcomeCard({
                      </div>
                      <div className='flex gap-2'>
                        <Button asChild variant='outline' size='sm'>
-                          <Link href={`/api/crm/enquiries/${enquiryId}/po-attachments/${attachment.id}`}>
+                          <Link href={`/api/crm/opportunities/${opportunityId}/po-attachments/${attachment.id}`}>
                            View
                          </Link>
                        </Button>
                        <Button asChild variant='outline' size='sm'>
-                          <Link href={`/api/crm/enquiries/${enquiryId}/po-attachments/${attachment.id}?download=1`}>
+                          <Link href={`/api/crm/opportunities/${opportunityId}/po-attachments/${attachment.id}?download=1`}>
                            Download
                          </Link>
                        </Button>
@@ -370,7 +370,7 @@ export function EnquiryOutcomeCard({
              isLoading={wonMutation.isPending}
              onClick={() =>
                wonMutation.mutate({
-                  id: enquiryId,
+                  id: opportunityId,
                  values: {
                    poNumber,
                    poDate,
@@ -436,7 +436,7 @@ export function EnquiryOutcomeCard({
              isLoading={lostMutation.isPending}
              onClick={() =>
                lostMutation.mutate({
-                  id: enquiryId,
+                  id: opportunityId,
                  values: {
                    lostReason,
                    lostCompetitor,
@@ -472,7 +472,7 @@ export function EnquiryOutcomeCard({
            </Button>
            <Button
              isLoading={reopenMutation.isPending}
-              onClick={() => reopenMutation.mutate({ id: enquiryId, reason: reopenReason })}
+              onClick={() => reopenMutation.mutate({ id: opportunityId, reason: reopenReason })}
            >
              Reopen
            </Button>
@@ -482,3 +482,4 @@ export function EnquiryOutcomeCard({
    </>
  );
 }
+
--- a/src/features/crm/opportunities/components/opportunity-status-badge.tsx
+++ b/src/features/crm/opportunities/components/opportunity-status-badge.tsx
@@ -3,7 +3,7 @@
 import { Badge } from '@/components/ui/badge';
 import { Icons } from '@/components/icons';

-export function EnquiryStatusBadge({ code, label }: { code?: string | null; label: string }) {
+export function OpportunityStatusBadge({ code, label }: { code?: string | null; label: string }) {
  const normalized = code?.toLowerCase() ?? '';
  const variant =
    normalized === 'closed_lost' || normalized === 'cancelled'
@@ -29,3 +29,4 @@ export function EnquiryStatusBadge({ code, label }: { code?: string | null; labe
    </Badge>
  );
 }
+
--- a/src/features/crm/opportunities/components/quotation-readiness-panel.tsx
+++ b/src/features/crm/opportunities/components/quotation-readiness-panel.tsx
@@ -1,21 +1,21 @@
 'use client';

 import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card';
-import type { EnquiryRecord } from '../api/types';
+import type { OpportunityRecord } from '../api/types';

 type ReadinessItem = {
  label: string;
  ready: boolean;
 };

-export function QuotationReadinessPanel({ enquiry }: { enquiry: EnquiryRecord }) {
+export function QuotationReadinessPanel({ opportunity }: { opportunity: OpportunityRecord }) {
  const checks: ReadinessItem[] = [
-    { label: 'Customer selected', ready: Boolean(enquiry.customerId) },
-    { label: 'Contact selected', ready: Boolean(enquiry.contactId) },
-    { label: 'Project name present', ready: Boolean(enquiry.projectName?.trim()) },
-    { label: 'Product type present', ready: Boolean(enquiry.productType) },
-    { label: 'Requirement present', ready: Boolean(enquiry.requirement?.trim()) },
-    { label: 'Estimated value present', ready: enquiry.estimatedValue !== null }
+    { label: 'Customer selected', ready: Boolean(opportunity.customerId) },
+    { label: 'Contact selected', ready: Boolean(opportunity.contactId) },
+    { label: 'Project name present', ready: Boolean(opportunity.projectName?.trim()) },
+    { label: 'Product type present', ready: Boolean(opportunity.productType) },
+    { label: 'Requirement present', ready: Boolean(opportunity.requirement?.trim()) },
+    { label: 'Estimated value present', ready: opportunity.estimatedValue !== null }
  ];

  const readyCount = checks.filter((item) => item.ready).length;
@@ -44,3 +44,4 @@ export function QuotationReadinessPanel({ enquiry }: { enquiry: EnquiryRecord })
    </Card>
  );
 }
+
--- a/src/features/crm/opportunities/components/source-lead-card.tsx
+++ b/src/features/crm/opportunities/components/source-lead-card.tsx
--- a/src/features/crm/opportunities/schemas/opportunity.schema.ts
+++ b/src/features/crm/opportunities/schemas/opportunity.schema.ts
@@ -24,7 +24,7 @@ function coerceOptionalNumber(message: string) {
  }, z.number().refine((value) => !Number.isNaN(value), message).optional());
 }

-export const enquirySchema = z.object({
+export const opportunitySchema = z.object({
  customerId: z.string().min(1, 'Please select a customer'),
  contactId: z.string().optional().nullable(),
  assignedToUserId: z.string().optional().nullable(),
@@ -63,7 +63,7 @@ export const enquirySchema = z.object({
    .optional()
 });

-export const enquiryFollowupSchema = z.object({
+export const opportunityFollowupSchema = z.object({
  followupDate: z.string().min(1, 'Follow-up date is required'),
  followupType: z.string().min(1, 'Please select a follow-up type'),
  contactId: z.string().optional().nullable(),
@@ -73,7 +73,7 @@ export const enquiryFollowupSchema = z.object({
  nextAction: z.string().optional()
 });

-export const enquiryMarkWonSchema = z.object({
+export const opportunityMarkWonSchema = z.object({
  poNumber: z.string().min(1, 'PO number is required'),
  poDate: z.string().min(1, 'PO date is required'),
  poAmount: coerceOptionalNumber('PO amount must be a number').refine(
@@ -84,18 +84,19 @@ export const enquiryMarkWonSchema = z.object({
  remark: z.string().optional().nullable()
 });

-export const enquiryMarkLostSchema = z.object({
+export const opportunityMarkLostSchema = z.object({
  lostReason: z.string().min(1, 'Lost reason is required'),
  lostCompetitor: z.string().optional().nullable(),
  lostRemark: z.string().optional().nullable()
 });

-export const enquiryReopenSchema = z.object({
+export const opportunityReopenSchema = z.object({
  reopenReason: z.string().min(3, 'Reopen reason is required')
 });

-export type EnquiryFormValues = z.input<typeof enquirySchema>;
-export type EnquiryFollowupFormValues = z.input<typeof enquiryFollowupSchema>;
-export type EnquiryMarkWonFormValues = z.input<typeof enquiryMarkWonSchema>;
-export type EnquiryMarkLostFormValues = z.input<typeof enquiryMarkLostSchema>;
-export type EnquiryReopenFormValues = z.input<typeof enquiryReopenSchema>;
+export type OpportunityFormValues = z.input<typeof opportunitySchema>;
+export type OpportunityFollowupFormValues = z.input<typeof opportunityFollowupSchema>;
+export type OpportunityMarkWonFormValues = z.input<typeof opportunityMarkWonSchema>;
+export type OpportunityMarkLostFormValues = z.input<typeof opportunityMarkLostSchema>;
+export type OpportunityReopenFormValues = z.input<typeof opportunityReopenSchema>;
+
--- a/src/features/crm/opportunities/server/service.ts
+++ b/src/features/crm/opportunities/server/service.ts
--- a/src/features/crm/quotations/api/service.ts
+++ b/src/features/crm/quotations/api/service.ts
@@ -28,7 +28,7 @@ export async function getQuotations(filters: QuotationFilters): Promise<Quotatio
  if (filters.quotationType) searchParams.set('quotationType', filters.quotationType);
  if (filters.branch) searchParams.set('branch', filters.branch);
  if (filters.customer) searchParams.set('customer', filters.customer);
-  if (filters.enquiry) searchParams.set('enquiry', filters.enquiry);
+  if (filters.opportunity) searchParams.set('opportunity', filters.opportunity);
  if (filters.hot) searchParams.set('hot', filters.hot);
  if (filters.sort) searchParams.set('sort', filters.sort);

@@ -212,3 +212,4 @@ export async function createQuotationRevision(id: string, revisionRemark?: strin
    body: JSON.stringify({ revisionRemark })
  });
 }
+
--- a/src/features/crm/quotations/api/types.ts
+++ b/src/features/crm/quotations/api/types.ts
@@ -28,7 +28,7 @@ export interface QuotationContactLookup {
  isPrimary: boolean;
 }

-export interface QuotationEnquiryLookup {
+export interface QuotationOpportunityLookup {
  id: string;
  code: string;
  customerId: string;
@@ -64,7 +64,7 @@ export interface QuotationRecord {
  organizationId: string;
  branchId: string | null;
  code: string;
-  enquiryId: string | null;
+  opportunityId: string | null;
  customerId: string;
  contactId: string | null;
  quotationDate: string;
@@ -115,7 +115,7 @@ export interface QuotationRecord {
 export interface QuotationListItem extends QuotationRecord {
  customerName: string;
  contactName: string | null;
-  enquiryCode: string | null;
+  opportunityCode: string | null;
  itemCount: number;
  revisionLabel: string;
 }
@@ -253,7 +253,7 @@ export interface QuotationReferenceData {
  productTypes: QuotationOption[];
  customers: QuotationCustomerLookup[];
  contacts: QuotationContactLookup[];
-  enquiries: QuotationEnquiryLookup[];
+  opportunities: QuotationOpportunityLookup[];
  salesmen: QuotationSalesmanLookup[];
 }

@@ -265,7 +265,7 @@ export interface QuotationFilters {
  quotationType?: string;
  branch?: string;
  customer?: string;
-  enquiry?: string;
+  opportunity?: string;
  hot?: string;
  sort?: string;
 }
@@ -331,7 +331,7 @@ export interface QuotationRevisionsResponse {
 }

 export interface QuotationMutationPayload {
-  enquiryId?: string | null;
+  opportunityId?: string | null;
  customerId: string;
  contactId?: string | null;
  quotationDate: string;
@@ -420,3 +420,4 @@ export interface MutationSuccessResponse {
  success: boolean;
  message: string;
 }
+
--- a/src/features/crm/quotations/components/quotation-columns.tsx
+++ b/src/features/crm/quotations/components/quotation-columns.tsx
@@ -114,16 +114,16 @@ export function getQuotationColumns({
      enableColumnFilter: true
    },
    {
-      id: 'enquiry',
-      accessorFn: (row) => row.enquiryId ?? '',
+      id: 'opportunity',
+      accessorFn: (row) => row.opportunityId ?? '',
      header: ({ column }: { column: Column<QuotationListItem, unknown> }) => (
        <DataTableColumnHeader column={column} title='โอกาสขาย' />
      ),
-      cell: ({ row }) => row.original.enquiryCode ?? '-',
+      cell: ({ row }) => row.original.opportunityCode ?? '-',
      meta: {
        label: 'โอกาสขาย',
        variant: 'multiSelect' as const,
-        options: referenceData.enquiries.map((item) => ({ value: item.id, label: `${item.code} - ${item.title}` }))
+        options: referenceData.opportunities.map((item) => ({ value: item.id, label: `${item.code} - ${item.title}` }))
      },
      enableColumnFilter: true
    },
@@ -165,3 +165,4 @@ export function getQuotationColumns({
    }
  ];
 }
+
--- a/src/features/crm/quotations/components/quotation-form-sheet.tsx
+++ b/src/features/crm/quotations/components/quotation-form-sheet.tsx
@@ -39,7 +39,7 @@ import { createQuotationMutation, updateQuotationMutation } from '../api/mutatio
 import type { QuotationMutationPayload, QuotationRecord, QuotationReferenceData } from '../api/types';

 type FormState = {
-  enquiryId: string;
+  opportunityId: string;
  customerId: string;
  contactId: string;
  quotationDate: string;
@@ -71,7 +71,7 @@ function toFormState(
  referenceData: QuotationReferenceData
 ): FormState {
  return {
-    enquiryId: quotation?.enquiryId ?? '',
+    opportunityId: quotation?.opportunityId ?? '',
    customerId: quotation?.customerId ?? referenceData.customers[0]?.id ?? '',
    contactId: quotation?.contactId ?? '',
    quotationDate:
@@ -190,16 +190,16 @@ export function QuotationFormSheet({
    setState((current) => ({ ...current, [key]: value }));
  }

-  function handleEnquiryChange(value: string) {
-    const enquiry = referenceData.enquiries.find((item) => item.id === value);
+  function handleOpportunityChange(value: string) {
+    const opportunity = referenceData.opportunities.find((item) => item.id === value);
    setState((current) => ({
      ...current,
-      enquiryId: value === '__none__' ? '' : value,
-      customerId: enquiry?.customerId ?? current.customerId,
-      contactId: enquiry?.contactId ?? '',
-      projectName: enquiry?.projectName ?? current.projectName,
-      projectLocation: enquiry?.projectLocation ?? current.projectLocation,
-      branchId: enquiry?.branchId ?? current.branchId
+      opportunityId: value === '__none__' ? '' : value,
+      customerId: opportunity?.customerId ?? current.customerId,
+      contactId: opportunity?.contactId ?? '',
+      projectName: opportunity?.projectName ?? current.projectName,
+      projectLocation: opportunity?.projectLocation ?? current.projectLocation,
+      branchId: opportunity?.branchId ?? current.branchId
    }));
  }

@@ -207,7 +207,7 @@ export function QuotationFormSheet({
    event.preventDefault();

    const payload: QuotationMutationPayload = {
-      enquiryId: state.enquiryId || null,
+      opportunityId: state.opportunityId || null,
      customerId: state.customerId,
      contactId: state.contactId || null,
      quotationDate: state.quotationDate,
@@ -263,14 +263,14 @@ export function QuotationFormSheet({

        <form id='quotation-form-sheet' onSubmit={onSubmit} className='flex-1 overflow-auto'>
          <div className='grid gap-4 py-4 md:grid-cols-2'>
-            <Field label='Enquiry'>
-              <Select value={state.enquiryId || '__none__'} onValueChange={handleEnquiryChange}>
+            <Field label='Opportunity'>
+              <Select value={state.opportunityId || '__none__'} onValueChange={handleOpportunityChange}>
                <SelectTrigger>
-                  <SelectValue placeholder='Select enquiry' />
+                  <SelectValue placeholder='Select opportunity' />
                </SelectTrigger>
                <SelectContent>
-                  <SelectItem value='__none__'>No linked enquiry</SelectItem>
-                  {referenceData.enquiries.map((item) => (
+                  <SelectItem value='__none__'>No linked opportunity</SelectItem>
+                  {referenceData.opportunities.map((item) => (
                    <SelectItem key={item.id} value={item.id}>
                      {item.code} - {item.title}
                    </SelectItem>
@@ -541,3 +541,4 @@ export function QuotationFormSheetTrigger({
    </>
  );
 }
+
--- a/src/features/crm/quotations/components/quotation-listing.tsx
+++ b/src/features/crm/quotations/components/quotation-listing.tsx
@@ -21,7 +21,7 @@ export default function QuotationListing({
  const quotationType = searchParamsCache.get('quotationType');
  const branch = searchParamsCache.get('branch');
  const customer = searchParamsCache.get('customer');
-  const enquiry = searchParamsCache.get('enquiry');
+  const opportunity = searchParamsCache.get('opportunity');
  const hot = searchParamsCache.get('hot');
  const sort = searchParamsCache.get('sort');
  const filters = {
@@ -32,7 +32,7 @@ export default function QuotationListing({
    ...(quotationType && { quotationType }),
    ...(branch && { branch }),
    ...(customer && { customer }),
-    ...(enquiry && { enquiry }),
+    ...(opportunity && { opportunity }),
    ...(hot && { hot }),
    ...(sort && { sort })
  };
@@ -46,3 +46,4 @@ export default function QuotationListing({
    </HydrationBoundary>
  );
 }
+
--- a/src/features/crm/quotations/components/quotations-table.tsx
+++ b/src/features/crm/quotations/components/quotations-table.tsx
@@ -33,7 +33,7 @@ export function QuotationsTable({
    quotationType: parseAsString,
    branch: parseAsString,
    customer: parseAsString,
-    enquiry: parseAsString,
+    opportunity: parseAsString,
    hot: parseAsString,
    sort: getSortingStateParser(columnIds).withDefault([])
  });
@@ -46,7 +46,7 @@ export function QuotationsTable({
    ...(params.quotationType && { quotationType: params.quotationType }),
    ...(params.branch && { branch: params.branch }),
    ...(params.customer && { customer: params.customer }),
-    ...(params.enquiry && { enquiry: params.enquiry }),
+    ...(params.opportunity && { opportunity: params.opportunity }),
    ...(params.hot && { hot: params.hot }),
    ...(params.sort.length > 0 && { sort: JSON.stringify(params.sort) })
  };
@@ -70,3 +70,4 @@ export function QuotationsTable({
    </DataTable>
  );
 }
+
--- a/src/features/crm/quotations/schemas/quotation.schema.ts
+++ b/src/features/crm/quotations/schemas/quotation.schema.ts
@@ -39,7 +39,7 @@ function coerceRequiredNumber(message: string) {
 }

 export const quotationSchema = z.object({
-  enquiryId: z.string().optional().nullable(),
+  opportunityId: z.string().optional().nullable(),
  customerId: z.string().min(1, 'Please select a customer'),
  contactId: z.string().optional().nullable(),
  quotationDate: z.string().min(1, 'Quotation date is required'),
@@ -159,3 +159,4 @@ export type QuotationCustomerFormValues = z.input<typeof quotationCustomerSchema
 export type QuotationTopicFormValues = z.input<typeof quotationTopicSchema>;
 export type QuotationFollowupFormValues = z.input<typeof quotationFollowupSchema>;
 export type QuotationAttachmentFormValues = z.input<typeof quotationAttachmentSchema>;
+
--- a/src/features/crm/quotations/server/service.ts
+++ b/src/features/crm/quotations/server/service.ts
@@ -3,7 +3,7 @@ import {
  crmDocumentArtifacts,
  crmCustomerContacts,
  crmCustomers,
-  crmEnquiries,
+  crmOpportunities,
  crmQuotationAttachments,
  crmQuotationCustomers,
  crmQuotationFollowups,
@@ -25,7 +25,7 @@ import {
 } from '@/features/crm/security/server/service';
 import { generateNextDocumentCode } from '@/features/foundation/document-sequence/service';
 import { getActiveOptionsByCategory } from '@/features/foundation/master-options/service';
-import { syncEnquiryPipelineStageFromQuotationStatus } from '@/features/crm/enquiries/server/service';
+import { syncOpportunityPipelineStageFromQuotationStatus } from '@/features/crm/opportunities/server/service';
 import type {
  QuotationActivityRecord,
  QuotationAttachmentMutationPayload,
@@ -37,7 +37,7 @@ import type {
  QuotationCustomerLookup,
  QuotationCustomerMutationPayload,
  QuotationCustomerRecord,
-  QuotationEnquiryLookup,
+  QuotationOpportunityLookup,
  QuotationFilters,
  QuotationFollowupMutationPayload,
  QuotationFollowupRecord,
@@ -128,7 +128,7 @@ function mapQuotationRecord(
    organizationId: row.organizationId,
    branchId: row.branchId,
    code: row.code,
-    enquiryId: row.enquiryId,
+    opportunityId: row.opportunityId,
    customerId: row.customerId,
    contactId: row.contactId,
    quotationDate: row.quotationDate.toISOString(),
@@ -437,24 +437,24 @@ export async function assertContactBelongsToOrganization(
  return contact;
 }

-async function assertEnquiryBelongsToOrganization(id: string, organizationId: string) {
-  const [enquiry] = await db
+async function assertOpportunityBelongsToOrganization(id: string, organizationId: string) {
+  const [opportunity] = await db
    .select()
-    .from(crmEnquiries)
+    .from(crmOpportunities)
    .where(
      and(
-        eq(crmEnquiries.id, id),
-        eq(crmEnquiries.organizationId, organizationId),
-        isNull(crmEnquiries.deletedAt)
+        eq(crmOpportunities.id, id),
+        eq(crmOpportunities.organizationId, organizationId),
+        isNull(crmOpportunities.deletedAt)
      )
    )
    .limit(1);

-  if (!enquiry) {
-    throw new AuthError('Enquiry not found', 404);
+  if (!opportunity) {
+    throw new AuthError('Opportunity not found', 404);
  }

-  return enquiry;
+  return opportunity;
 }

 async function assertQuotationBelongsToOrganization(
@@ -665,11 +665,11 @@ async function validateQuotationPayload(
    await assertContactBelongsToOrganization(payload.contactId, organizationId, payload.customerId);
  }

-  if (payload.enquiryId) {
-    const enquiry = await assertEnquiryBelongsToOrganization(payload.enquiryId, organizationId);
+  if (payload.opportunityId) {
+    const opportunity = await assertOpportunityBelongsToOrganization(payload.opportunityId, organizationId);

-    if (enquiry.customerId !== payload.customerId) {
-      throw new AuthError('Selected enquiry belongs to a different customer', 400);
+    if (opportunity.customerId !== payload.customerId) {
+      throw new AuthError('Selected opportunity belongs to a different customer', 400);
    }
  }

@@ -941,7 +941,7 @@ function buildQuotationFilters(
  const quotationTypes = splitFilterValue(filters.quotationType);
  const branches = splitFilterValue(filters.branch);
  const customers = splitFilterValue(filters.customer);
-  const enquiries = splitFilterValue(filters.enquiry);
+  const opportunities = splitFilterValue(filters.opportunity);

  return [
    eq(crmQuotations.organizationId, organizationId),
@@ -951,7 +951,7 @@ function buildQuotationFilters(
    ...(quotationTypes.length ? [inArray(crmQuotations.quotationType, quotationTypes)] : []),
    ...(branches.length ? [inArray(crmQuotations.branchId, branches)] : []),
    ...(customers.length ? [inArray(crmQuotations.customerId, customers)] : []),
-    ...(enquiries.length ? [inArray(crmQuotations.enquiryId, enquiries)] : []),
+    ...(opportunities.length ? [inArray(crmQuotations.opportunityId, opportunities)] : []),
    ...(filters.hot === 'true' ? [eq(crmQuotations.isHotProject, true)] : []),
    ...(filters.hot === 'false' ? [eq(crmQuotations.isHotProject, false)] : []),
    ...(filters.search
@@ -1035,7 +1035,7 @@ export async function getQuotationReferenceData(
    productTypes,
    customers,
    contacts,
-    enquiries,
+    opportunities,
    salesmen
  ] = await Promise.all([
    getUserBranches(),
@@ -1066,9 +1066,9 @@ export async function getQuotationReferenceData(
      .orderBy(desc(crmCustomerContacts.isPrimary), asc(crmCustomerContacts.name)),
    db
      .select()
-      .from(crmEnquiries)
-      .where(and(eq(crmEnquiries.organizationId, organizationId), isNull(crmEnquiries.deletedAt)))
-      .orderBy(desc(crmEnquiries.updatedAt)),
+      .from(crmOpportunities)
+      .where(and(eq(crmOpportunities.organizationId, organizationId), isNull(crmOpportunities.deletedAt)))
+      .orderBy(desc(crmOpportunities.updatedAt)),
    db
      .select({ id: users.id, name: users.name })
      .from(memberships)
@@ -1103,15 +1103,15 @@ export async function getQuotationReferenceData(
      mobile: contact.mobile,
      isPrimary: contact.isPrimary
    })),
-    enquiries: enquiries.map<QuotationEnquiryLookup>((enquiry) => ({
-      id: enquiry.id,
-      code: enquiry.code,
-      customerId: enquiry.customerId,
-      contactId: enquiry.contactId,
-      title: enquiry.title,
-      projectName: enquiry.projectName,
-      projectLocation: enquiry.projectLocation,
-      branchId: enquiry.branchId
+    opportunities: opportunities.map<QuotationOpportunityLookup>((opportunity) => ({
+      id: opportunity.id,
+      code: opportunity.code,
+      customerId: opportunity.customerId,
+      contactId: opportunity.contactId,
+      title: opportunity.title,
+      projectName: opportunity.projectName,
+      projectLocation: opportunity.projectLocation,
+      branchId: opportunity.branchId
    })),
    salesmen: salesmen.map<QuotationSalesmanLookup>((salesman) => ({
      id: salesman.id,
@@ -1142,18 +1142,18 @@ export async function listQuotations(

  const customerIds = [...new Set(rows.map((row) => row.customerId))];
  const contactIds = [...new Set(rows.map((row) => row.contactId).filter(Boolean))] as string[];
-  const enquiryIds = [...new Set(rows.map((row) => row.enquiryId).filter(Boolean))] as string[];
+  const opportunityIds = [...new Set(rows.map((row) => row.opportunityId).filter(Boolean))] as string[];
  const quotationIds = rows.map((row) => row.id);

-  const [customers, contacts, enquiries, itemCounts] = await Promise.all([
+  const [customers, contacts, opportunities, itemCounts] = await Promise.all([
    customerIds.length
      ? db.select().from(crmCustomers).where(inArray(crmCustomers.id, customerIds))
      : [],
    contactIds.length
      ? db.select().from(crmCustomerContacts).where(inArray(crmCustomerContacts.id, contactIds))
      : [],
-    enquiryIds.length
-      ? db.select().from(crmEnquiries).where(inArray(crmEnquiries.id, enquiryIds))
+    opportunityIds.length
+      ? db.select().from(crmOpportunities).where(inArray(crmOpportunities.id, opportunityIds))
      : [],
    quotationIds.length
      ? db
@@ -1172,7 +1172,7 @@ export async function listQuotations(

  const customerMap = new Map(customers.map((item) => [item.id, item]));
  const contactMap = new Map(contacts.map((item) => [item.id, item]));
-  const enquiryMap = new Map(enquiries.map((item) => [item.id, item]));
+  const opportunityMap = new Map(opportunities.map((item) => [item.id, item]));
  const itemCountMap = new Map(itemCounts.map((item) => [item.quotationId, item.value]));

  return {
@@ -1180,7 +1180,7 @@ export async function listQuotations(
      ...mapQuotationRecord(row),
      customerName: customerMap.get(row.customerId)?.name ?? 'Unknown customer',
      contactName: row.contactId ? (contactMap.get(row.contactId)?.name ?? null) : null,
-      enquiryCode: row.enquiryId ? (enquiryMap.get(row.enquiryId)?.code ?? null) : null,
+      opportunityCode: row.opportunityId ? (opportunityMap.get(row.opportunityId)?.code ?? null) : null,
      itemCount: itemCountMap.get(row.id) ?? 0,
      revisionLabel: toRevisionLabel(row.revision)
    })),
@@ -1289,13 +1289,13 @@ export async function createQuotation(
    payload.status
  );

-  const enquiry = payload.enquiryId
-    ? await assertEnquiryBelongsToOrganization(payload.enquiryId, organizationId)
+  const opportunity = payload.opportunityId
+    ? await assertOpportunityBelongsToOrganization(payload.opportunityId, organizationId)
    : null;
  const documentCode = await generateNextDocumentCode({
    organizationId,
    documentType: 'quotation',
-    branchId: payload.branchId ?? enquiry?.branchId ?? ''
+    branchId: payload.branchId ?? opportunity?.branchId ?? ''
  });

  return db.transaction(async (tx) => {
@@ -1304,16 +1304,16 @@ export async function createQuotation(
      .values({
        id: crypto.randomUUID(),
        organizationId,
-        branchId: payload.branchId ?? enquiry?.branchId ?? null,
+        branchId: payload.branchId ?? opportunity?.branchId ?? null,
        code: documentCode.code,
-        enquiryId: payload.enquiryId ?? null,
+        opportunityId: payload.opportunityId ?? null,
        customerId: payload.customerId,
-        contactId: payload.contactId ?? enquiry?.contactId ?? null,
+        contactId: payload.contactId ?? opportunity?.contactId ?? null,
        quotationDate: new Date(payload.quotationDate),
        validUntil: payload.validUntil ? new Date(payload.validUntil) : null,
        quotationType: payload.quotationType,
-        projectName: payload.projectName?.trim() || enquiry?.projectName || null,
-        projectLocation: payload.projectLocation?.trim() || enquiry?.projectLocation || null,
+        projectName: payload.projectName?.trim() || opportunity?.projectName || null,
+        projectLocation: payload.projectLocation?.trim() || opportunity?.projectLocation || null,
        attention: payload.attention?.trim() || null,
        reference: payload.reference?.trim() || null,
        notes: payload.notes?.trim() || null,
@@ -1325,9 +1325,9 @@ export async function createQuotation(
        discount: payload.discount ?? 0,
        discountType: payload.discountType ?? null,
        taxRate: payload.taxRate ?? 0,
-        chancePercent: payload.chancePercent ?? enquiry?.chancePercent ?? null,
-        isHotProject: payload.isHotProject ?? enquiry?.isHotProject ?? false,
-        competitor: payload.competitor?.trim() || enquiry?.competitor || null,
+        chancePercent: payload.chancePercent ?? opportunity?.chancePercent ?? null,
+        isHotProject: payload.isHotProject ?? opportunity?.isHotProject ?? false,
+        competitor: payload.competitor?.trim() || opportunity?.competitor || null,
        salesmanId: payload.salesmanId ?? null,
        isSent: false,
        sentVia: payload.sentVia ?? null,
@@ -1350,9 +1350,9 @@ export async function createQuotation(
      payload.projectParties ?? []
    );

-    if (created.enquiryId) {
-      await syncEnquiryPipelineStageFromQuotationStatus(
-        created.enquiryId,
+    if (created.opportunityId) {
+      await syncOpportunityPipelineStageFromQuotationStatus(
+        created.opportunityId,
        organizationId,
        quotationStatusCode
      );
@@ -1376,23 +1376,23 @@ export async function updateQuotation(
    payload.status
  );
  const existing = await assertQuotationBelongsToOrganization(id, organizationId, accessContext);
-  const enquiry = payload.enquiryId
-    ? await assertEnquiryBelongsToOrganization(payload.enquiryId, organizationId)
+  const opportunity = payload.opportunityId
+    ? await assertOpportunityBelongsToOrganization(payload.opportunityId, organizationId)
    : null;

  const updated = await db.transaction(async (tx) => {
    const [row] = await tx
      .update(crmQuotations)
      .set({
-        branchId: payload.branchId ?? enquiry?.branchId ?? null,
-        enquiryId: payload.enquiryId ?? null,
+        branchId: payload.branchId ?? opportunity?.branchId ?? null,
+        opportunityId: payload.opportunityId ?? null,
        customerId: payload.customerId,
-        contactId: payload.contactId ?? enquiry?.contactId ?? null,
+        contactId: payload.contactId ?? opportunity?.contactId ?? null,
        quotationDate: new Date(payload.quotationDate),
        validUntil: payload.validUntil ? new Date(payload.validUntil) : null,
        quotationType: payload.quotationType,
-        projectName: payload.projectName?.trim() || enquiry?.projectName || null,
-        projectLocation: payload.projectLocation?.trim() || enquiry?.projectLocation || null,
+        projectName: payload.projectName?.trim() || opportunity?.projectName || null,
+        projectLocation: payload.projectLocation?.trim() || opportunity?.projectLocation || null,
        attention: payload.attention?.trim() || null,
        reference: payload.reference?.trim() || null,
        notes: payload.notes?.trim() || null,
@@ -1403,9 +1403,9 @@ export async function updateQuotation(
        discount: payload.discount ?? 0,
        discountType: payload.discountType ?? null,
        taxRate: payload.taxRate ?? 0,
-        chancePercent: payload.chancePercent ?? enquiry?.chancePercent ?? null,
+        chancePercent: payload.chancePercent ?? opportunity?.chancePercent ?? null,
        isHotProject: payload.isHotProject ?? false,
-        competitor: payload.competitor?.trim() || enquiry?.competitor || null,
+        competitor: payload.competitor?.trim() || opportunity?.competitor || null,
        salesmanId: payload.salesmanId ?? null,
        sentVia: payload.sentVia ?? null,
        isActive: payload.isActive ?? true,
@@ -1423,9 +1423,9 @@ export async function updateQuotation(
      payload.projectParties ?? []
    );

-    if (row.enquiryId) {
-      await syncEnquiryPipelineStageFromQuotationStatus(
-        row.enquiryId,
+    if (row.opportunityId) {
+      await syncOpportunityPipelineStageFromQuotationStatus(
+        row.opportunityId,
        organizationId,
        quotationStatusCode
      );
@@ -2160,7 +2160,7 @@ export async function createQuotationRevision(
        organizationId,
        branchId: parent.branchId,
        code: documentCode.code,
-        enquiryId: parent.enquiryId,
+        opportunityId: parent.opportunityId,
        customerId: parent.customerId,
        contactId: parent.contactId,
        quotationDate: new Date(),
@@ -2291,8 +2291,8 @@ export async function listQuotationRevisions(id: string, organizationId: string)
  }));
 }

-export async function listEnquiryQuotationRelations(
-  enquiryId: string,
+export async function listOpportunityQuotationRelations(
+  opportunityId: string,
  organizationId: string
 ): Promise<QuotationRelationItem[]> {
  const rows = await db
@@ -2301,7 +2301,7 @@ export async function listEnquiryQuotationRelations(
    .where(
      and(
        eq(crmQuotations.organizationId, organizationId),
-        eq(crmQuotations.enquiryId, enquiryId),
+        eq(crmQuotations.opportunityId, opportunityId),
        isNull(crmQuotations.deletedAt)
      )
    )
@@ -2345,3 +2345,4 @@ export async function listCustomerQuotationRelations(
      updatedAt: row.updatedAt.toISOString()
    }));
 }
+
--- a/src/features/crm/reporting/server/service.ts
+++ b/src/features/crm/reporting/server/service.ts
@@ -14,8 +14,8 @@ import {
 } from 'drizzle-orm';
 import {
  crmCustomers,
-  crmEnquiries,
-  crmEnquiryCustomers,
+  crmOpportunities,
+  crmOpportunityCustomers,
  crmQuotationCustomers,
  crmQuotations
 } from '@/db/schema';
@@ -41,7 +41,7 @@ interface NormalizedProjectParty {
 }

 type ProjectPartyTableAvailability = {
-  enquiryCustomers: boolean;
+  opportunityCustomers: boolean;
  quotationCustomers: boolean;
 };

@@ -62,7 +62,7 @@ function buildRevenueAttributionFilters(
  const quotationTypes = splitFilterValue(filters.quotationType);
  const branches = splitFilterValue(filters.branch);
  const customers = splitFilterValue(filters.customer);
-  const enquiries = splitFilterValue(filters.enquiry);
+  const opportunities = splitFilterValue(filters.opportunity);

  return [
    eq(crmQuotations.organizationId, organizationId),
@@ -75,7 +75,7 @@ function buildRevenueAttributionFilters(
    ...(quotationTypes.length ? [inArray(crmQuotations.quotationType, quotationTypes)] : []),
    ...(branches.length ? [inArray(crmQuotations.branchId, branches)] : []),
    ...(customers.length ? [inArray(crmQuotations.customerId, customers)] : []),
-    ...(enquiries.length ? [inArray(crmQuotations.enquiryId, enquiries)] : []),
+    ...(opportunities.length ? [inArray(crmQuotations.opportunityId, opportunities)] : []),
    ...(filters.hot === 'true' ? [eq(crmQuotations.isHotProject, true)] : []),
    ...(filters.hot === 'false' ? [eq(crmQuotations.isHotProject, false)] : []),
    ...(filters.quotationDateFrom ? [gte(crmQuotations.quotationDate, new Date(filters.quotationDateFrom))] : []),
@@ -150,9 +150,9 @@ function groupNormalizedParties<TGroupKey extends string>(
 function pickAttributedParties(
  roleCode: SupportedRevenueRole,
  quotationParties: NormalizedProjectParty[],
-  enquiryParties: NormalizedProjectParty[]
+  opportunityParties: NormalizedProjectParty[]
 ) {
-  const authoritativeParties = quotationParties.length > 0 ? quotationParties : enquiryParties;
+  const authoritativeParties = quotationParties.length > 0 ? quotationParties : opportunityParties;

  if (roleCode === 'end_customer') {
    const endCustomers = authoritativeParties.filter((party) => party.roleCode === 'end_customer');
@@ -176,13 +176,13 @@ async function getProjectPartyTableAvailability(): Promise<ProjectPartyTableAvai
    select table_name as "tableName"
    from information_schema.tables
    where table_schema = 'public'
-      and table_name in ('crm_enquiry_customers', 'crm_quotation_customers')
+      and table_name in ('crm_opportunity_customers', 'crm_quotation_customers')
  `);

  const available = new Set(rows.map((row) => row.tableName));

  projectPartyTableAvailability = {
-    enquiryCustomers: available.has('crm_enquiry_customers'),
+    opportunityCustomers: available.has('crm_opportunity_customers'),
    quotationCustomers: available.has('crm_quotation_customers')
  };

@@ -201,7 +201,7 @@ async function getRevenueByRole(
  const quotations = await db
    .select({
      id: crmQuotations.id,
-      enquiryId: crmQuotations.enquiryId,
+      opportunityId: crmQuotations.opportunityId,
      customerId: crmQuotations.customerId,
      totalAmount: crmQuotations.totalAmount
    })
@@ -214,9 +214,9 @@ async function getRevenueByRole(
  }

  const quotationIds = quotations.map((quotation) => quotation.id);
-  const enquiryIds = [...new Set(quotations.map((quotation) => quotation.enquiryId).filter(Boolean))] as string[];
+  const opportunityIds = [...new Set(quotations.map((quotation) => quotation.opportunityId).filter(Boolean))] as string[];

-  const [roleOptions, quotationParties, enquiryParties] = await Promise.all([
+  const [roleOptions, quotationParties, opportunityParties] = await Promise.all([
    getActiveOptionsByCategory(PROJECT_PARTY_OPTION_CATEGORY, { organizationId }),
    tableAvailability.quotationCustomers
      ? db
@@ -234,19 +234,19 @@ async function getRevenueByRole(
            )
          )
      : [],
-    tableAvailability.enquiryCustomers && enquiryIds.length
+    tableAvailability.opportunityCustomers && opportunityIds.length
      ? db
          .select({
-            enquiryId: crmEnquiryCustomers.enquiryId,
-            customerId: crmEnquiryCustomers.customerId,
-            role: crmEnquiryCustomers.role
+            opportunityId: crmOpportunityCustomers.opportunityId,
+            customerId: crmOpportunityCustomers.customerId,
+            role: crmOpportunityCustomers.role
          })
-          .from(crmEnquiryCustomers)
+          .from(crmOpportunityCustomers)
          .where(
            and(
-              eq(crmEnquiryCustomers.organizationId, organizationId),
-              inArray(crmEnquiryCustomers.enquiryId, enquiryIds),
-              isNull(crmEnquiryCustomers.deletedAt)
+              eq(crmOpportunityCustomers.organizationId, organizationId),
+              inArray(crmOpportunityCustomers.opportunityId, opportunityIds),
+              isNull(crmOpportunityCustomers.deletedAt)
            )
          )
      : []
@@ -261,9 +261,9 @@ async function getRevenueByRole(
    roleOptions
  );

-  const enquiryPartyMap = groupNormalizedParties(
-    enquiryParties.map((row) => ({
-      groupKey: row.enquiryId,
+  const opportunityPartyMap = groupNormalizedParties(
+    opportunityParties.map((row) => ({
+      groupKey: row.opportunityId,
      customerId: row.customerId,
      role: row.role
    })),
@@ -275,12 +275,12 @@ async function getRevenueByRole(

  for (const quotation of quotations) {
    const quotationAttributedParties = quotationPartyMap.get(quotation.id) ?? [];
-    const enquiryAttributedParties = quotation.enquiryId
-      ? (enquiryPartyMap.get(quotation.enquiryId) ?? [])
+    const opportunityAttributedParties = quotation.opportunityId
+      ? (opportunityPartyMap.get(quotation.opportunityId) ?? [])
      : [];
    const attributedParties =
-      quotationAttributedParties.length > 0 || enquiryAttributedParties.length > 0
-        ? pickAttributedParties(roleCode, quotationAttributedParties, enquiryAttributedParties)
+      quotationAttributedParties.length > 0 || opportunityAttributedParties.length > 0
+        ? pickAttributedParties(roleCode, quotationAttributedParties, opportunityAttributedParties)
        : roleCode === 'end_customer' || roleCode === 'billing_customer'
          ? [{ customerId: quotation.customerId, roleCode }]
          : [];
@@ -391,15 +391,15 @@ function buildOutcomeRevenueFilters(
  stage: 'closed_won' | 'closed_lost',
  filters: OutcomeRevenueFilters
 ): SQL[] {
-  const dateColumn = stage === 'closed_won' ? crmEnquiries.closedWonAt : crmEnquiries.closedLostAt;
+  const dateColumn = stage === 'closed_won' ? crmOpportunities.closedWonAt : crmOpportunities.closedLostAt;

  return [
-    eq(crmEnquiries.organizationId, organizationId),
-    isNull(crmEnquiries.deletedAt),
-    eq(crmEnquiries.pipelineStage, stage),
-    ...(filters.branch ? [eq(crmEnquiries.branchId, filters.branch)] : []),
-    ...(filters.salesman ? [eq(crmEnquiries.assignedToUserId, filters.salesman)] : []),
-    ...(filters.productType ? [eq(crmEnquiries.productType, filters.productType)] : []),
+    eq(crmOpportunities.organizationId, organizationId),
+    isNull(crmOpportunities.deletedAt),
+    eq(crmOpportunities.pipelineStage, stage),
+    ...(filters.branch ? [eq(crmOpportunities.branchId, filters.branch)] : []),
+    ...(filters.salesman ? [eq(crmOpportunities.assignedToUserId, filters.salesman)] : []),
+    ...(filters.productType ? [eq(crmOpportunities.productType, filters.productType)] : []),
    ...(filters.dateFrom ? [gte(dateColumn, new Date(filters.dateFrom))] : []),
    ...(filters.dateTo ? [lte(dateColumn, new Date(filters.dateTo))] : [])
  ];
@@ -412,38 +412,38 @@ async function getOutcomeRevenueRecords(
 ): Promise<OutcomeRevenueRecord[]> {
  const whereFilters = buildOutcomeRevenueFilters(organizationId, stage, filters);
  const where = whereFilters.length === 1 ? whereFilters[0] : and(...whereFilters);
-  const enquiries = await db.select().from(crmEnquiries).where(where);
+  const opportunities = await db.select().from(crmOpportunities).where(where);

-  if (!enquiries.length) {
+  if (!opportunities.length) {
    return [];
  }

-  const enquiryIds = enquiries.map((row) => row.id);
+  const opportunityIds = opportunities.map((row) => row.id);
  const quotationRows = await db
    .select({
-      enquiryId: crmQuotations.enquiryId,
+      opportunityId: crmQuotations.opportunityId,
      totalAmount: crmQuotations.totalAmount
    })
    .from(crmQuotations)
    .where(
      and(
        eq(crmQuotations.organizationId, organizationId),
-        inArray(crmQuotations.enquiryId, enquiryIds),
+        inArray(crmQuotations.opportunityId, opportunityIds),
        isNull(crmQuotations.deletedAt)
      )
    );
  const quotationTotals = new Map<string, number>();

  for (const row of quotationRows) {
-    if (!row.enquiryId) {
+    if (!row.opportunityId) {
      continue;
    }

-    quotationTotals.set(row.enquiryId, (quotationTotals.get(row.enquiryId) ?? 0) + row.totalAmount);
+    quotationTotals.set(row.opportunityId, (quotationTotals.get(row.opportunityId) ?? 0) + row.totalAmount);
  }

-  return enquiries.map((row) => ({
-    enquiryId: row.id,
+  return opportunities.map((row) => ({
+    opportunityId: row.id,
    customerId: row.customerId,
    branchId: row.branchId,
    productType: row.productType,
@@ -473,17 +473,17 @@ export async function getLostByReason(
  filters: OutcomeRevenueFilters = {}
 ): Promise<OutcomeBreakdownRow[]> {
  const records = await getLostRevenue(organizationId, filters);
-  const enquiryIds = records.map((row) => row.enquiryId);
+  const opportunityIds = records.map((row) => row.opportunityId);

-  if (!enquiryIds.length) {
+  if (!opportunityIds.length) {
    return [];
  }

-  const [enquiries, lostReasonOptions] = await Promise.all([
+  const [opportunities, lostReasonOptions] = await Promise.all([
    db
-      .select({ id: crmEnquiries.id, lostReason: crmEnquiries.lostReason })
-      .from(crmEnquiries)
-      .where(inArray(crmEnquiries.id, enquiryIds)),
+      .select({ id: crmOpportunities.id, lostReason: crmOpportunities.lostReason })
+      .from(crmOpportunities)
+      .where(inArray(crmOpportunities.id, opportunityIds)),
    getActiveOptionsByCategory('crm_lost_reason', { organizationId })
  ]);
  const lostReasonMap = new Map(
@@ -495,8 +495,8 @@ export async function getLostByReason(
  const grouped = new Map<string, OutcomeBreakdownRow>();

  for (const row of records) {
-    const enquiry = enquiries.find((item) => item.id === row.enquiryId);
-    const key = enquiry?.lostReason ?? 'unknown';
+    const opportunity = opportunities.find((item) => item.id === row.opportunityId);
+    const key = opportunity?.lostReason ?? 'unknown';
    const current = grouped.get(key) ?? {
      key,
      label: lostReasonMap.get(key) ?? key,
@@ -516,21 +516,21 @@ export async function getLostByCompetitor(
  filters: OutcomeRevenueFilters = {}
 ): Promise<OutcomeBreakdownRow[]> {
  const records = await getLostRevenue(organizationId, filters);
-  const enquiryIds = records.map((row) => row.enquiryId);
+  const opportunityIds = records.map((row) => row.opportunityId);

-  if (!enquiryIds.length) {
+  if (!opportunityIds.length) {
    return [];
  }

-  const enquiries = await db
-    .select({ id: crmEnquiries.id, lostCompetitor: crmEnquiries.lostCompetitor })
-    .from(crmEnquiries)
-    .where(inArray(crmEnquiries.id, enquiryIds));
+  const opportunities = await db
+    .select({ id: crmOpportunities.id, lostCompetitor: crmOpportunities.lostCompetitor })
+    .from(crmOpportunities)
+    .where(inArray(crmOpportunities.id, opportunityIds));
  const grouped = new Map<string, OutcomeBreakdownRow>();

  for (const row of records) {
-    const enquiry = enquiries.find((item) => item.id === row.enquiryId);
-    const key = enquiry?.lostCompetitor?.trim() || 'unknown';
+    const opportunity = opportunities.find((item) => item.id === row.opportunityId);
+    const key = opportunity?.lostCompetitor?.trim() || 'unknown';
    const current = grouped.get(key) ?? { key, label: key, count: 0, revenue: 0 };
    current.count += 1;
    current.revenue += row.revenue;
@@ -556,3 +556,4 @@ export async function getWinRate(

  return Math.round((wonRows.length / denominator) * 10000) / 100;
 }
+
--- a/src/features/crm/reporting/server/types.ts
+++ b/src/features/crm/reporting/server/types.ts
@@ -4,7 +4,7 @@ export interface RevenueAttributionFilters {
  quotationType?: string;
  branch?: string;
  customer?: string;
-  enquiry?: string;
+  opportunity?: string;
  hot?: string;
  quotationDateFrom?: string | null;
  quotationDateTo?: string | null;
@@ -30,7 +30,7 @@ export interface OutcomeRevenueFilters {
 }

 export interface OutcomeRevenueRecord {
-  enquiryId: string;
+  opportunityId: string;
  customerId: string;
  branchId: string | null;
  productType: string;
@@ -45,3 +45,4 @@ export interface OutcomeBreakdownRow {
  count: number;
  revenue: number;
 }
+
--- a/src/features/crm/reports/api/queries.ts
+++ b/src/features/crm/reports/api/queries.ts
@@ -1,7 +1,7 @@
 import { queryOptions } from '@tanstack/react-query';
 import type { CrmSharedReportFilters } from './types';
 import {
-  getCrmEnquiryAgingReport,
+  getCrmOpportunityAgingReport,
  getCrmLeadAgingReport,
  getCrmPipelineReport,
  getCrmReportCatalog,
@@ -18,8 +18,8 @@ export const crmReportKeys = {
  pipeline: (filters: CrmSharedReportFilters) => [...crmReportKeys.pipelineRoot(), filters] as const,
  leadAgingRoot: () => [...crmReportKeys.all, 'lead-aging'] as const,
  leadAging: (filters: CrmSharedReportFilters) => [...crmReportKeys.leadAgingRoot(), filters] as const,
-  enquiryAgingRoot: () => [...crmReportKeys.all, 'enquiry-aging'] as const,
-  enquiryAging: (filters: CrmSharedReportFilters) => [...crmReportKeys.enquiryAgingRoot(), filters] as const
+  opportunityAgingRoot: () => [...crmReportKeys.all, 'opportunity-aging'] as const,
+  opportunityAging: (filters: CrmSharedReportFilters) => [...crmReportKeys.opportunityAgingRoot(), filters] as const
 };

 export const crmReportsQueryOptions = () =>
@@ -52,8 +52,9 @@ export const crmLeadAgingReportQueryOptions = (filters: CrmSharedReportFilters)
    queryFn: () => getCrmLeadAgingReport(filters)
  });

-export const crmEnquiryAgingReportQueryOptions = (filters: CrmSharedReportFilters) =>
+export const crmOpportunityAgingReportQueryOptions = (filters: CrmSharedReportFilters) =>
  queryOptions({
-    queryKey: crmReportKeys.enquiryAging(filters),
-    queryFn: () => getCrmEnquiryAgingReport(filters)
+    queryKey: crmReportKeys.opportunityAging(filters),
+    queryFn: () => getCrmOpportunityAgingReport(filters)
  });
+
--- a/src/features/crm/reports/api/service.ts
+++ b/src/features/crm/reports/api/service.ts
@@ -6,7 +6,7 @@ import type {
  CrmSharedReportFilters,
  CrmPipelineReportResponse,
  CrmLeadAgingReportResponse,
-  CrmEnquiryAgingReportResponse
+  CrmOpportunityAgingReportResponse
 } from './types';

 function buildReportQuery(filters: CrmSharedReportFilters) {
@@ -51,9 +51,10 @@ export async function getCrmLeadAgingReport(filters: CrmSharedReportFilters) {
  );
 }

-export async function getCrmEnquiryAgingReport(filters: CrmSharedReportFilters) {
+export async function getCrmOpportunityAgingReport(filters: CrmSharedReportFilters) {
  const query = buildReportQuery(filters);
-  return apiClient<CrmEnquiryAgingReportResponse>(
-    `/crm/reports/enquiry-aging${query ? `?${query}` : ''}`
+  return apiClient<CrmOpportunityAgingReportResponse>(
+    `/crm/reports/opportunity-aging${query ? `?${query}` : ''}`
  );
 }
+
--- a/src/features/crm/reports/api/types.ts
+++ b/src/features/crm/reports/api/types.ts
@@ -87,12 +87,12 @@ export interface CrmPipelineReportRow {
  convertedLeads: number;
 }

-export interface CrmEnquiryPipelineReportRow {
+export interface CrmOpportunityPipelineReportRow {
  salesmanName: string;
  branchLabel: string;
  productTypeLabel: string;
  customerOwnerName: string;
-  openEnquiries: number;
+  openOpportunities: number;
  convertedToQuotation: number;
  won: number;
  lost: number;
@@ -104,21 +104,21 @@ export interface CrmLeadConversionReportRow {
  productTypeLabel: string;
  marketingUserName: string;
  totalLeads: number;
-  convertedEnquiries: number;
+  convertedOpportunities: number;
  conversionRate: number;
 }

-export interface CrmEnquiryConversionReportRow {
+export interface CrmOpportunityConversionReportRow {
  salesmanName: string;
  branchLabel: string;
  productTypeLabel: string;
-  totalEnquiries: number;
-  enquiriesWithQuotation: number;
+  totalOpportunities: number;
+  opportunitiesWithQuotation: number;
  conversionRate: number;
 }

 export interface CrmPipelineFunnelRow {
-  stageKey: 'lead' | 'enquiry' | 'quotation' | 'closed_won' | 'closed_lost';
+  stageKey: 'lead' | 'opportunity' | 'quotation' | 'closed_won' | 'closed_lost';
  stageLabel: string;
  count: number;
  value: number | null;
@@ -127,7 +127,7 @@ export interface CrmPipelineFunnelRow {

 export interface CrmPipelineKpiSummary {
  totalLeads: number;
-  openEnquiries: number;
+  openOpportunities: number;
  quotations: number;
  won: number;
  lost: number;
@@ -141,9 +141,9 @@ export interface CrmPipelineReportResponse {
  filters: Required<CrmSharedReportFilters>;
  summary: CrmPipelineKpiSummary;
  leadPipeline: CrmPipelineReportRow[];
-  enquiryPipeline: CrmEnquiryPipelineReportRow[];
+  opportunityPipeline: CrmOpportunityPipelineReportRow[];
  leadConversion: CrmLeadConversionReportRow[];
-  enquiryConversion: CrmEnquiryConversionReportRow[];
+  opportunityConversion: CrmOpportunityConversionReportRow[];
  funnel: CrmPipelineFunnelRow[];
 }

@@ -176,25 +176,26 @@ export interface CrmLeadAgingReportResponse {
  rows: CrmLeadAgingRow[];
 }

-export interface CrmEnquiryAgingRow {
-  enquiryId: string;
-  enquiryCode: string;
+export interface CrmOpportunityAgingRow {
+  opportunityId: string;
+  opportunityCode: string;
  customerName: string;
  salesmanName: string | null;
  lastFollowupDate: string | null;
  agingDays: number;
 }

-export interface CrmEnquiryAgingReportResponse {
+export interface CrmOpportunityAgingReportResponse {
  success: boolean;
  time: string;
  message: string;
  filters: Required<CrmSharedReportFilters>;
  summary: {
-    openEnquiries: number;
+    openOpportunities: number;
    averageAgingDays: number;
    maximumAgingDays: number;
  };
  buckets: CrmAgingBucket[];
-  rows: CrmEnquiryAgingRow[];
+  rows: CrmOpportunityAgingRow[];
 }
+
--- a/src/features/crm/reports/components/aging-report-view.tsx
+++ b/src/features/crm/reports/components/aging-report-view.tsx
@@ -13,11 +13,11 @@ import {
  TableRow
 } from '@/components/ui/table';
 import type {
-  CrmEnquiryAgingReportResponse,
+  CrmOpportunityAgingReportResponse,
  CrmLeadAgingReportResponse
 } from '../api/types';
 import {
-  crmEnquiryAgingReportQueryOptions,
+  crmOpportunityAgingReportQueryOptions,
  crmLeadAgingReportQueryOptions,
  crmReportFiltersQueryOptions
 } from '../api/queries';
@@ -32,9 +32,9 @@ function AgingReportLayout({
  canExport,
  data
 }: {
-  variant: 'lead' | 'enquiry';
+  variant: 'lead' | 'opportunity';
  canExport: boolean;
-  data: CrmLeadAgingReportResponse | CrmEnquiryAgingReportResponse;
+  data: CrmLeadAgingReportResponse | CrmOpportunityAgingReportResponse;
 }) {
  const { data: filterData } = useSuspenseQuery(crmReportFiltersQueryOptions());

@@ -47,8 +47,8 @@ function AgingReportLayout({
        ]
      : [
          [
-            'Open Enquiries',
-            formatNumber('openEnquiries' in data.summary ? data.summary.openEnquiries : 0)
+            'Open Opportunities',
+            formatNumber('openOpportunities' in data.summary ? data.summary.openOpportunities : 0)
          ],
          ['Average Aging', `${data.summary.averageAgingDays} days`],
          ['Maximum Aging', `${data.summary.maximumAgingDays} days`]
@@ -64,11 +64,11 @@ function AgingReportLayout({
            : ['dateFrom', 'dateTo', 'branch', 'productType', 'sales']
        }
        canExport={canExport}
-        reportCode={variant === 'lead' ? 'lead_aging' : 'enquiry_aging'}
+        reportCode={variant === 'lead' ? 'lead_aging' : 'opportunity_aging'}
        pageLinks={[
          { href: '/dashboard/crm/reports/pipeline', label: 'Pipeline Suite' },
          { href: '/dashboard/crm/reports/lead-aging', label: 'Lead Aging', active: variant === 'lead' },
-          { href: '/dashboard/crm/reports/enquiry-aging', label: 'Enquiry Aging', active: variant === 'enquiry' }
+          { href: '/dashboard/crm/reports/opportunity-aging', label: 'Opportunity Aging', active: variant === 'opportunity' }
        ]}
      />

@@ -87,7 +87,7 @@ function AgingReportLayout({

      <Card>
        <CardHeader>
-          <CardTitle>{variant === 'lead' ? 'Lead Aging Buckets' : 'Enquiry Aging Buckets'}</CardTitle>
+          <CardTitle>{variant === 'lead' ? 'Lead Aging Buckets' : 'Opportunity Aging Buckets'}</CardTitle>
          <CardDescription>Bucketed view to spot stagnant records quickly.</CardDescription>
        </CardHeader>
        <CardContent className='grid gap-4 md:grid-cols-2 xl:grid-cols-4'>
@@ -102,11 +102,11 @@ function AgingReportLayout({

      <Card>
        <CardHeader>
-          <CardTitle>{variant === 'lead' ? 'Lead Drill-down' : 'Enquiry Drill-down'}</CardTitle>
+          <CardTitle>{variant === 'lead' ? 'Lead Drill-down' : 'Opportunity Drill-down'}</CardTitle>
          <CardDescription>
            {variant === 'lead'
              ? 'Open leads sorted from oldest to newest.'
-              : 'Open enquiries with latest follow-up visibility.'}
+              : 'Open opportunities with latest follow-up visibility.'}
          </CardDescription>
        </CardHeader>
        <CardContent>
@@ -124,7 +124,7 @@ function AgingReportLayout({
                    </>
                  ) : (
                    <>
-                      <TableHead>Enquiry No</TableHead>
+                      <TableHead>Opportunity No</TableHead>
                      <TableHead>Customer</TableHead>
                      <TableHead>Salesman</TableHead>
                      <TableHead>Last Follow-Up</TableHead>
@@ -136,7 +136,7 @@ function AgingReportLayout({
              <TableBody>
                {data.rows.length ? (
                  data.rows.map((row) => (
-                    <TableRow key={'leadId' in row ? row.leadId : row.enquiryId}>
+                    <TableRow key={'leadId' in row ? row.leadId : row.opportunityId}>
                      {'leadId' in row ? (
                        <>
                          <TableCell>{row.leadCode}</TableCell>
@@ -147,7 +147,7 @@ function AgingReportLayout({
                        </>
                      ) : (
                        <>
-                          <TableCell>{row.enquiryCode}</TableCell>
+                          <TableCell>{row.opportunityCode}</TableCell>
                          <TableCell>{row.customerName}</TableCell>
                          <TableCell>{row.salesmanName ?? '-'}</TableCell>
                          <TableCell>
@@ -202,7 +202,7 @@ function LeadAgingReportInner({ canExport }: { canExport: boolean }) {
  return <AgingReportLayout variant='lead' canExport={canExport} data={data} />;
 }

-function EnquiryAgingReportInner({ canExport }: { canExport: boolean }) {
+function OpportunityAgingReportInner({ canExport }: { canExport: boolean }) {
  const [params] = useQueryStates({
    dateFrom: parseAsString,
    dateTo: parseAsString,
@@ -222,21 +222,22 @@ function EnquiryAgingReportInner({ canExport }: { canExport: boolean }) {
    }),
    [params]
  );
-  const { data } = useSuspenseQuery(crmEnquiryAgingReportQueryOptions(filters));
+  const { data } = useSuspenseQuery(crmOpportunityAgingReportQueryOptions(filters));

-  return <AgingReportLayout variant='enquiry' canExport={canExport} data={data} />;
+  return <AgingReportLayout variant='opportunity' canExport={canExport} data={data} />;
 }

 export function AgingReportView({
  variant,
  canExport
 }: {
-  variant: 'lead' | 'enquiry';
+  variant: 'lead' | 'opportunity';
  canExport: boolean;
 }) {
  return variant === 'lead' ? (
    <LeadAgingReportInner canExport={canExport} />
  ) : (
-    <EnquiryAgingReportInner canExport={canExport} />
+    <OpportunityAgingReportInner canExport={canExport} />
  );
 }
+
--- a/src/features/crm/reports/components/pipeline-report-view.tsx
+++ b/src/features/crm/reports/components/pipeline-report-view.tsx
@@ -124,14 +124,14 @@ export function PipelineReportView({ canExport }: { canExport: boolean }) {
        pageLinks={[
          { href: '/dashboard/crm/reports/pipeline', label: 'Pipeline Suite', active: true },
          { href: '/dashboard/crm/reports/lead-aging', label: 'Lead Aging' },
-          { href: '/dashboard/crm/reports/enquiry-aging', label: 'Enquiry Aging' }
+          { href: '/dashboard/crm/reports/opportunity-aging', label: 'Opportunity Aging' }
        ]}
      />

      <div className='grid gap-4 md:grid-cols-2 xl:grid-cols-5'>
        {[
          ['Total Leads', formatNumber(data.summary.totalLeads)],
-          ['Open Enquiries', formatNumber(data.summary.openEnquiries)],
+          ['Open Opportunities', formatNumber(data.summary.openOpportunities)],
          ['Quotations', formatNumber(data.summary.quotations)],
          ['Closed Won', formatNumber(data.summary.won)],
          ['Closed Lost', formatNumber(data.summary.lost)]
@@ -193,9 +193,9 @@ export function PipelineReportView({ canExport }: { canExport: boolean }) {
      />

      <SectionTable
-        title='Enquiry Pipeline'
+        title='Opportunity Pipeline'
        description='Sales pipeline visibility grouped by salesman, branch, product type, and customer owner.'
-        reportCode='enquiry_pipeline'
+        reportCode='opportunity_pipeline'
        headers={[
          'Salesman',
          'Branch',
@@ -206,12 +206,12 @@ export function PipelineReportView({ canExport }: { canExport: boolean }) {
          'Won',
          'Lost'
        ]}
-        rows={data.enquiryPipeline.map((row) => [
+        rows={data.opportunityPipeline.map((row) => [
          row.salesmanName,
          row.branchLabel,
          row.productTypeLabel,
          row.customerOwnerName,
-          formatNumber(row.openEnquiries),
+          formatNumber(row.openOpportunities),
          formatNumber(row.convertedToQuotation),
          formatNumber(row.won),
          formatNumber(row.lost)
@@ -220,7 +220,7 @@ export function PipelineReportView({ canExport }: { canExport: boolean }) {

      <div className='grid gap-6 xl:grid-cols-2'>
        <SectionTable
-          title='Lead to Enquiry Conversion'
+          title='Lead to Opportunity Conversion'
          description='Marketing effectiveness by source, branch, product type, and creator.'
          reportCode='lead_conversion'
          headers={['Lead Source', 'Branch', 'Product Type', 'Marketing User', 'Total Leads', 'Converted', 'Conversion %']}
@@ -230,22 +230,22 @@ export function PipelineReportView({ canExport }: { canExport: boolean }) {
            row.productTypeLabel,
            row.marketingUserName,
            formatNumber(row.totalLeads),
-            formatNumber(row.convertedEnquiries),
+            formatNumber(row.convertedOpportunities),
            `${row.conversionRate}%`
          ])}
        />

        <SectionTable
-          title='Enquiry to Quotation Conversion'
+          title='Opportunity to Quotation Conversion'
          description='Sales effectiveness by salesman, branch, and product type.'
-          reportCode='enquiry_conversion'
-          headers={['Salesman', 'Branch', 'Product Type', 'Total Enquiries', 'With Quotation', 'Conversion %']}
-          rows={data.enquiryConversion.map((row) => [
+          reportCode='opportunity_conversion'
+          headers={['Salesman', 'Branch', 'Product Type', 'Total Opportunities', 'With Quotation', 'Conversion %']}
+          rows={data.opportunityConversion.map((row) => [
            row.salesmanName,
            row.branchLabel,
            row.productTypeLabel,
-            formatNumber(row.totalEnquiries),
-            formatNumber(row.enquiriesWithQuotation),
+            formatNumber(row.totalOpportunities),
+            formatNumber(row.opportunitiesWithQuotation),
            `${row.conversionRate}%`
          ])}
        />
@@ -253,3 +253,4 @@ export function PipelineReportView({ canExport }: { canExport: boolean }) {
    </div>
  );
 }
+
--- a/src/features/crm/reports/components/report-catalog.tsx
+++ b/src/features/crm/reports/components/report-catalog.tsx
@@ -9,12 +9,12 @@ import { crmReportCatalogQueryOptions, crmReportFiltersQueryOptions } from '../a

 const REPORT_LINKS: Record<string, string> = {
  lead_pipeline: '/dashboard/crm/reports/pipeline',
-  enquiry_pipeline: '/dashboard/crm/reports/pipeline',
+  opportunity_pipeline: '/dashboard/crm/reports/pipeline',
  lead_conversion: '/dashboard/crm/reports/pipeline',
-  enquiry_conversion: '/dashboard/crm/reports/pipeline',
+  opportunity_conversion: '/dashboard/crm/reports/pipeline',
  pipeline_funnel: '/dashboard/crm/reports/pipeline',
  lead_aging: '/dashboard/crm/reports/lead-aging',
-  enquiry_aging: '/dashboard/crm/reports/enquiry-aging'
+  opportunity_aging: '/dashboard/crm/reports/opportunity-aging'
 };

 export function ReportCatalog() {
@@ -88,3 +88,4 @@ export function ReportCatalog() {
    </div>
  );
 }
+
--- a/src/features/crm/reports/server/datasets/pipeline-report.dataset.ts
+++ b/src/features/crm/reports/server/datasets/pipeline-report.dataset.ts
@@ -1,8 +1,8 @@
 import { and, asc, count, eq, inArray, isNull, sql } from 'drizzle-orm';
 import {
  crmCustomers,
-  crmEnquiries,
-  crmEnquiryFollowups,
+  crmOpportunities,
+  crmOpportunityFollowups,
  crmQuotations,
  users
 } from '@/db/schema';
@@ -89,46 +89,46 @@ export async function listPipelineReportDataset(
 }> {
  const requiredFilters = buildRequiredFilters(filters);
  const { start, end } = getDateRange(requiredFilters);
-  const [branches, productTypes, leadSources, enquiryRows, quotationRows, followupRows] =
+  const [branches, productTypes, leadSources, opportunityRows, quotationRows, followupRows] =
    await Promise.all([
      getUserBranches(),
      getActiveOptionsByCategory('crm_product_type', { organizationId: context.organizationId }),
      getActiveOptionsByCategory('crm_lead_channel', { organizationId: context.organizationId }),
      db
        .select({
-          id: crmEnquiries.id,
-          code: crmEnquiries.code,
-          customerId: crmEnquiries.customerId,
-          branchId: crmEnquiries.branchId,
-          productType: crmEnquiries.productType,
-          leadChannel: crmEnquiries.leadChannel,
-          pipelineStage: crmEnquiries.pipelineStage,
-          createdAt: crmEnquiries.createdAt,
-          createdBy: crmEnquiries.createdBy,
-          assignedToUserId: crmEnquiries.assignedToUserId,
-          estimatedValue: crmEnquiries.estimatedValue,
-          poAmount: crmEnquiries.poAmount,
-          closedWonAt: crmEnquiries.closedWonAt,
-          closedLostAt: crmEnquiries.closedLostAt,
-          lostReason: crmEnquiries.lostReason,
+          id: crmOpportunities.id,
+          code: crmOpportunities.code,
+          customerId: crmOpportunities.customerId,
+          branchId: crmOpportunities.branchId,
+          productType: crmOpportunities.productType,
+          leadChannel: crmOpportunities.leadChannel,
+          pipelineStage: crmOpportunities.pipelineStage,
+          createdAt: crmOpportunities.createdAt,
+          createdBy: crmOpportunities.createdBy,
+          assignedToUserId: crmOpportunities.assignedToUserId,
+          estimatedValue: crmOpportunities.estimatedValue,
+          poAmount: crmOpportunities.poAmount,
+          closedWonAt: crmOpportunities.closedWonAt,
+          closedLostAt: crmOpportunities.closedLostAt,
+          lostReason: crmOpportunities.lostReason,
          customerName: crmCustomers.name,
          customerOwnerUserId: crmCustomers.ownerUserId
        })
-        .from(crmEnquiries)
-        .innerJoin(crmCustomers, eq(crmCustomers.id, crmEnquiries.customerId))
+        .from(crmOpportunities)
+        .innerJoin(crmCustomers, eq(crmCustomers.id, crmOpportunities.customerId))
        .where(
          and(
-            eq(crmEnquiries.organizationId, context.organizationId),
-            isNull(crmEnquiries.deletedAt),
-            eq(crmEnquiries.isActive, true),
+            eq(crmOpportunities.organizationId, context.organizationId),
+            isNull(crmOpportunities.deletedAt),
+            eq(crmOpportunities.isActive, true),
            isNull(crmCustomers.deletedAt),
            eq(crmCustomers.isActive, true)
          )
        )
-        .orderBy(asc(crmEnquiries.createdAt)),
+        .orderBy(asc(crmOpportunities.createdAt)),
      db
        .select({
-          enquiryId: crmQuotations.enquiryId,
+          opportunityId: crmQuotations.opportunityId,
          quotationCount: count(crmQuotations.id),
          quotationValue: sql<number>`coalesce(sum(${crmQuotations.totalAmount}), 0)`
        })
@@ -138,28 +138,28 @@ export async function listPipelineReportDataset(
            eq(crmQuotations.organizationId, context.organizationId),
            isNull(crmQuotations.deletedAt),
            eq(crmQuotations.isActive, true),
-            sql`${crmQuotations.enquiryId} is not null`
+            sql`${crmQuotations.opportunityId} is not null`
          )
        )
-        .groupBy(crmQuotations.enquiryId),
+        .groupBy(crmQuotations.opportunityId),
      db
        .select({
-          enquiryId: crmEnquiryFollowups.enquiryId,
-          lastFollowupDate: sql<Date | null>`max(${crmEnquiryFollowups.followupDate})`
+          opportunityId: crmOpportunityFollowups.opportunityId,
+          lastFollowupDate: sql<Date | null>`max(${crmOpportunityFollowups.followupDate})`
        })
-        .from(crmEnquiryFollowups)
+        .from(crmOpportunityFollowups)
        .where(
          and(
-            eq(crmEnquiryFollowups.organizationId, context.organizationId),
-            isNull(crmEnquiryFollowups.deletedAt)
+            eq(crmOpportunityFollowups.organizationId, context.organizationId),
+            isNull(crmOpportunityFollowups.deletedAt)
          )
        )
-        .groupBy(crmEnquiryFollowups.enquiryId)
+        .groupBy(crmOpportunityFollowups.opportunityId)
    ]);

  const userIds = [
    ...new Set(
-      enquiryRows.flatMap((row) => [
+      opportunityRows.flatMap((row) => [
        row.createdBy,
        row.assignedToUserId,
        row.customerOwnerUserId
@@ -178,19 +178,19 @@ export async function listPipelineReportDataset(
  const leadSourceLabelMap = new Map(leadSources.map((item) => [item.id, item.label]));
  const quotationMap = new Map(
    quotationRows
-      .filter((row): row is typeof row & { enquiryId: string } => typeof row.enquiryId === 'string')
+      .filter((row): row is typeof row & { opportunityId: string } => typeof row.opportunityId === 'string')
      .map((row) => [
-        row.enquiryId,
+        row.opportunityId,
        {
          quotationCount: Number(row.quotationCount ?? 0),
          quotationValue: Number(row.quotationValue ?? 0)
        }
      ])
  );
-  const followupMap = new Map(followupRows.map((row) => [row.enquiryId, row.lastFollowupDate]));
+  const followupMap = new Map(followupRows.map((row) => [row.opportunityId, row.lastFollowupDate]));
  const userMap = new Map(userRows.map((row) => [row.id, row.name]));

-  const rows = enquiryRows
+  const rows = opportunityRows
    .filter((row) => canAccessRecord(context, row))
    .filter((row) => matchesDateRange(row.createdAt, start, end))
    .filter((row) => (requiredFilters.branch ? row.branchId === requiredFilters.branch : true))
@@ -222,8 +222,8 @@ export async function listPipelineReportDataset(
      const quotation = quotationMap.get(row.id);

      return {
-        enquiryId: row.id,
-        enquiryCode: row.code,
+        opportunityId: row.id,
+        opportunityCode: row.code,
        customerId: row.customerId,
        customerName: row.customerName,
        branchId: row.branchId,
@@ -260,3 +260,4 @@ export async function listPipelineReportDataset(
    rows
  };
 }
+
--- a/src/features/crm/reports/server/filters/shared.ts
+++ b/src/features/crm/reports/server/filters/shared.ts
@@ -9,7 +9,7 @@ import type { ResolvedReportContext } from '../types';

 const PIPELINE_STAGE_OPTIONS = [
  { id: 'lead', code: 'lead', label: 'Lead' },
-  { id: 'enquiry', code: 'enquiry', label: 'Enquiry' },
+  { id: 'opportunity', code: 'opportunity', label: 'Opportunity' },
  { id: 'closed_won', code: 'closed_won', label: 'Won' },
  { id: 'closed_lost', code: 'closed_lost', label: 'Lost' }
 ] as const;
@@ -85,3 +85,4 @@ export function parseSharedReportFilters(searchParams: URLSearchParams): CrmShar
    lostReason: searchParams.get('lostReason')
  };
 }
+
--- a/src/features/crm/reports/server/service.ts
+++ b/src/features/crm/reports/server/service.ts
@@ -7,7 +7,7 @@ import type {
  CrmSharedReportFilters,
  CrmPipelineReportResponse,
  CrmLeadAgingReportResponse,
-  CrmEnquiryAgingReportResponse
+  CrmOpportunityAgingReportResponse
 } from '../api/types';
 import { buildReportCatalogGroups } from './builders/catalog-builder';
 import { resolveCrmAccess } from './context';
@@ -49,8 +49,8 @@ function isConvertedLead(row: PipelineDatasetRecord) {
  return row.pipelineStage !== 'lead' || Boolean(row.assignedToUserId);
 }

-function isOpenEnquiry(row: PipelineDatasetRecord) {
-  return row.pipelineStage === 'enquiry';
+function isOpenOpportunity(row: PipelineDatasetRecord) {
+  return row.pipelineStage === 'opportunity';
 }

 function buildLeadPipelineRows(rows: PipelineDatasetRecord[]) {
@@ -98,8 +98,8 @@ function buildLeadPipelineRows(rows: PipelineDatasetRecord[]) {
  return [...grouped.values()].toSorted((left, right) => right.totalLeads - left.totalLeads);
 }

-function buildEnquiryPipelineRows(rows: PipelineDatasetRecord[]) {
-  const grouped = new Map<string, CrmPipelineReportResponse['enquiryPipeline'][number]>();
+function buildOpportunityPipelineRows(rows: PipelineDatasetRecord[]) {
+  const grouped = new Map<string, CrmPipelineReportResponse['opportunityPipeline'][number]>();

  for (const row of rows) {
    const key = [
@@ -115,14 +115,14 @@ function buildEnquiryPipelineRows(rows: PipelineDatasetRecord[]) {
        branchLabel: row.branchLabel,
        productTypeLabel: row.productTypeLabel,
        customerOwnerName: row.customerOwnerName,
-        openEnquiries: 0,
+        openOpportunities: 0,
        convertedToQuotation: 0,
        won: 0,
        lost: 0
      };

-    if (isOpenEnquiry(row)) {
-      current.openEnquiries += 1;
+    if (isOpenOpportunity(row)) {
+      current.openOpportunities += 1;
    }

    if (row.quotationCount > 0) {
@@ -142,8 +142,8 @@ function buildEnquiryPipelineRows(rows: PipelineDatasetRecord[]) {

  return [...grouped.values()].toSorted(
    (left, right) =>
-      right.openEnquiries + right.convertedToQuotation + right.won + right.lost -
-      (left.openEnquiries + left.convertedToQuotation + left.won + left.lost)
+      right.openOpportunities + right.convertedToQuotation + right.won + right.lost -
+      (left.openOpportunities + left.convertedToQuotation + left.won + left.lost)
  );
 }

@@ -165,13 +165,13 @@ function buildLeadConversionRows(rows: PipelineDatasetRecord[]) {
        productTypeLabel: row.productTypeLabel,
        marketingUserName: row.createdByName,
        totalLeads: 0,
-        convertedEnquiries: 0,
+        convertedOpportunities: 0,
        conversionRate: 0
      };

    current.totalLeads += 1;
    if (isConvertedLead(row)) {
-      current.convertedEnquiries += 1;
+      current.convertedOpportunities += 1;
    }

    grouped.set(key, current);
@@ -180,16 +180,16 @@ function buildLeadConversionRows(rows: PipelineDatasetRecord[]) {
  return [...grouped.values()]
    .map((row) => ({
      ...row,
-      conversionRate: toPercent(row.convertedEnquiries, row.totalLeads)
+      conversionRate: toPercent(row.convertedOpportunities, row.totalLeads)
    }))
    .toSorted((left, right) => right.totalLeads - left.totalLeads);
 }

-function buildEnquiryConversionRows(rows: PipelineDatasetRecord[]) {
-  const enquiryRows = rows.filter((row) => row.pipelineStage !== 'lead' || row.assignedToUserId);
-  const grouped = new Map<string, CrmPipelineReportResponse['enquiryConversion'][number]>();
+function buildOpportunityConversionRows(rows: PipelineDatasetRecord[]) {
+  const opportunityRows = rows.filter((row) => row.pipelineStage !== 'lead' || row.assignedToUserId);
+  const grouped = new Map<string, CrmPipelineReportResponse['opportunityConversion'][number]>();

-  for (const row of enquiryRows) {
+  for (const row of opportunityRows) {
    const key = [(row.assignedToName ?? 'Unassigned'), row.branchLabel, row.productTypeLabel].join('|');
    const current =
      grouped.get(key) ??
@@ -197,14 +197,14 @@ function buildEnquiryConversionRows(rows: PipelineDatasetRecord[]) {
        salesmanName: row.assignedToName ?? 'Unassigned',
        branchLabel: row.branchLabel,
        productTypeLabel: row.productTypeLabel,
-        totalEnquiries: 0,
-        enquiriesWithQuotation: 0,
+        totalOpportunities: 0,
+        opportunitiesWithQuotation: 0,
        conversionRate: 0
      };

-    current.totalEnquiries += 1;
+    current.totalOpportunities += 1;
    if (row.quotationCount > 0) {
-      current.enquiriesWithQuotation += 1;
+      current.opportunitiesWithQuotation += 1;
    }

    grouped.set(key, current);
@@ -213,14 +213,14 @@ function buildEnquiryConversionRows(rows: PipelineDatasetRecord[]) {
  return [...grouped.values()]
    .map((row) => ({
      ...row,
-      conversionRate: toPercent(row.enquiriesWithQuotation, row.totalEnquiries)
+      conversionRate: toPercent(row.opportunitiesWithQuotation, row.totalOpportunities)
    }))
-    .toSorted((left, right) => right.totalEnquiries - left.totalEnquiries);
+    .toSorted((left, right) => right.totalOpportunities - left.totalOpportunities);
 }

 function buildFunnelRows(rows: PipelineDatasetRecord[], canViewRevenueValues: boolean) {
  const leadCount = rows.length;
-  const enquiryRows = rows.filter((row) => isConvertedLead(row));
+  const opportunityRows = rows.filter((row) => isConvertedLead(row));
  const quotationRows = rows.filter((row) => row.quotationCount > 0);
  const wonRows = rows.filter((row) => row.pipelineStage === 'closed_won');
  const lostRows = rows.filter((row) => row.pipelineStage === 'closed_lost');
@@ -236,18 +236,18 @@ function buildFunnelRows(rows: PipelineDatasetRecord[], canViewRevenueValues: bo
      conversionRate: null
    },
    {
-      stageKey: 'enquiry' as const,
-      stageLabel: 'Enquiry',
-      count: enquiryRows.length,
-      value: valueOrNull(sumValues(enquiryRows, (row) => row.estimatedValue)),
-      conversionRate: toPercent(enquiryRows.length, leadCount)
+      stageKey: 'opportunity' as const,
+      stageLabel: 'Opportunity',
+      count: opportunityRows.length,
+      value: valueOrNull(sumValues(opportunityRows, (row) => row.estimatedValue)),
+      conversionRate: toPercent(opportunityRows.length, leadCount)
    },
    {
      stageKey: 'quotation' as const,
      stageLabel: 'Quotation',
      count: quotationRows.length,
      value: valueOrNull(sumValues(quotationRows, (row) => row.quotationValue)),
-      conversionRate: toPercent(quotationRows.length, enquiryRows.length)
+      conversionRate: toPercent(quotationRows.length, opportunityRows.length)
    },
    {
      stageKey: 'closed_won' as const,
@@ -271,8 +271,8 @@ function buildLeadAging(rows: PipelineDatasetRecord[], filters: ParsedCrmReportF
  const leadRows = rows
    .filter((row) => row.pipelineStage === 'lead')
    .map((row) => ({
-      leadId: row.enquiryId,
-      leadCode: row.enquiryCode,
+      leadId: row.opportunityId,
+      leadCode: row.opportunityCode,
      customerName: row.customerName,
      assignedUserName: row.assignedToName,
      createdDate: row.createdAt.toISOString(),
@@ -302,41 +302,41 @@ function buildLeadAging(rows: PipelineDatasetRecord[], filters: ParsedCrmReportF
  };
 }

-function buildEnquiryAging(
+function buildOpportunityAging(
  rows: PipelineDatasetRecord[],
  filters: ParsedCrmReportFilters
-): CrmEnquiryAgingReportResponse {
+): CrmOpportunityAgingReportResponse {
  const now = new Date();
-  const enquiryRows = rows
-    .filter((row) => row.pipelineStage === 'enquiry')
+  const opportunityRows = rows
+    .filter((row) => row.pipelineStage === 'opportunity')
    .map((row) => ({
-      enquiryId: row.enquiryId,
-      enquiryCode: row.enquiryCode,
+      opportunityId: row.opportunityId,
+      opportunityCode: row.opportunityCode,
      customerName: row.customerName,
      salesmanName: row.assignedToName,
      lastFollowupDate: row.lastFollowupDate?.toISOString() ?? null,
      agingDays: getDayDifference(row.createdAt, now)
    }))
    .toSorted((left, right) => right.agingDays - left.agingDays);
-  const ages = enquiryRows.map((row) => row.agingDays);
+  const ages = opportunityRows.map((row) => row.agingDays);

  return {
    success: true,
    time: new Date().toISOString(),
-    message: 'CRM enquiry aging report loaded successfully',
+    message: 'CRM opportunity aging report loaded successfully',
    filters,
    summary: {
-      openEnquiries: enquiryRows.length,
+      openOpportunities: opportunityRows.length,
      averageAgingDays: average(ages),
      maximumAgingDays: ages.length ? Math.max(...ages) : 0
    },
    buckets: [
-      { key: '0_14', label: '0-14 Days', count: enquiryRows.filter((row) => row.agingDays <= 14).length },
-      { key: '15_30', label: '15-30 Days', count: enquiryRows.filter((row) => row.agingDays >= 15 && row.agingDays <= 30).length },
-      { key: '31_60', label: '31-60 Days', count: enquiryRows.filter((row) => row.agingDays >= 31 && row.agingDays <= 60).length },
-      { key: '60_plus', label: '60+ Days', count: enquiryRows.filter((row) => row.agingDays > 60).length }
+      { key: '0_14', label: '0-14 Days', count: opportunityRows.filter((row) => row.agingDays <= 14).length },
+      { key: '15_30', label: '15-30 Days', count: opportunityRows.filter((row) => row.agingDays >= 15 && row.agingDays <= 30).length },
+      { key: '31_60', label: '31-60 Days', count: opportunityRows.filter((row) => row.agingDays >= 31 && row.agingDays <= 60).length },
+      { key: '60_plus', label: '60+ Days', count: opportunityRows.filter((row) => row.agingDays > 60).length }
    ],
-    rows: enquiryRows
+    rows: opportunityRows
  };
 }

@@ -417,16 +417,16 @@ export async function getCrmPipelineReportResponse(
    filters: dataset.filters,
    summary: {
      totalLeads: dataset.rows.length,
-      openEnquiries: dataset.rows.filter((row) => row.pipelineStage === 'enquiry').length,
+      openOpportunities: dataset.rows.filter((row) => row.pipelineStage === 'opportunity').length,
      quotations: dataset.rows.filter((row) => row.quotationCount > 0).length,
      won: dataset.rows.filter((row) => row.pipelineStage === 'closed_won').length,
      lost: dataset.rows.filter((row) => row.pipelineStage === 'closed_lost').length,
      canViewRevenueValues
    },
    leadPipeline: buildLeadPipelineRows(dataset.rows),
-    enquiryPipeline: buildEnquiryPipelineRows(dataset.rows),
+    opportunityPipeline: buildOpportunityPipelineRows(dataset.rows),
    leadConversion: buildLeadConversionRows(dataset.rows),
-    enquiryConversion: buildEnquiryConversionRows(dataset.rows),
+    opportunityConversion: buildOpportunityConversionRows(dataset.rows),
    funnel: buildFunnelRows(dataset.rows, canViewRevenueValues)
  };

@@ -447,14 +447,15 @@ export async function getCrmLeadAgingReportResponse(
  return response;
 }

-export async function getCrmEnquiryAgingReportResponse(
+export async function getCrmOpportunityAgingReportResponse(
  context: ResolvedReportContext,
  filters: CrmSharedReportFilters
-): Promise<CrmEnquiryAgingReportResponse> {
+): Promise<CrmOpportunityAgingReportResponse> {
  const dataset = await listPipelineReportDataset(context, filters);
-  const response = buildEnquiryAging(dataset.rows, dataset.filters);
+  const response = buildOpportunityAging(dataset.rows, dataset.filters);

-  await auditReportView(context, 'enquiry_aging', { ...dataset.filters }, response.rows.length);
+  await auditReportView(context, 'opportunity_aging', { ...dataset.filters }, response.rows.length);

  return response;
 }
+
--- a/src/features/crm/reports/server/types.ts
+++ b/src/features/crm/reports/server/types.ts
@@ -39,8 +39,8 @@ export interface ParsedCrmReportFilters {
 }

 export interface PipelineDatasetRecord {
-  enquiryId: string;
-  enquiryCode: string;
+  opportunityId: string;
+  opportunityCode: string;
  customerId: string;
  customerName: string;
  branchId: string | null;
@@ -66,3 +66,4 @@ export interface PipelineDatasetRecord {
  closedLostAt: Date | null;
  lostReason: string | null;
 }
+
--- a/src/features/crm/shared/terminology.ts
+++ b/src/features/crm/shared/terminology.ts
@@ -3,8 +3,8 @@ export const CRM_TERMS = {
  dashboard: 'Dashboard',
  lead: 'ลีด',
  leads: 'ลีด',
-  enquiry: 'โอกาสขาย',
-  enquiries: 'โอกาสขาย',
+  opportunity: 'โอกาสขาย',
+  opportunities: 'โอกาสขาย',
  quotation: 'ใบเสนอราคา',
  quotations: 'ใบเสนอราคา',
  approval: 'อนุมัติเอกสาร',
@@ -17,7 +17,7 @@ export const CRM_TERMS = {
  projectParties: 'ผู้เกี่ยวข้องในโครงการ',
  crmSettings: 'ตั้งค่า CRM',
  leadCount: 'จำนวนลีด',
-  enquiryCount: 'จำนวนโอกาสขาย',
+  opportunityCount: 'จำนวนโอกาสขาย',
  wonCount: 'จำนวนงานที่ชนะ',
  lostCount: 'จำนวนงานที่แพ้',
  revenue: 'มูลค่าใบเสนอราคา',
@@ -26,7 +26,7 @@ export const CRM_TERMS = {

 export const PIPELINE_STAGE_THAI_LABELS = {
  lead: 'ลีด',
-  enquiry: 'โอกาสขาย',
+  opportunity: 'โอกาสขาย',
  closed_won: 'ชนะ',
  closed_lost: 'แพ้'
 } as const;
@@ -49,3 +49,4 @@ export function getPipelineStageThaiLabel(
 ) {
  return PIPELINE_STAGE_THAI_LABELS[stage as keyof typeof PIPELINE_STAGE_THAI_LABELS] ?? stage;
 }
+