@apptimate/core-lib 6.6.0 → 6.8.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@apptimate/core-lib",
-  "version": "6.6.0",
+  "version": "6.8.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "publishConfig": {

package/src/api-services/finance-shared.client.ts

@@ -53,3 +53,8 @@ export async function getChartOfAccountsLookupShared(type?: string): Promise<IAp
   const response = await sendRequest({ url: `${BASE}/chart-of-accounts/lookup`, method: "GET", params });
   return response.responseData as IApiResponse;
 }
+
+export async function getDirectTransactionsShared(params?: any): Promise<IApiResponse> {
+  const response = await sendRequest({ url: `${BASE}/direct-transactions`, method: "GET", params });
+  return response.responseData as IApiResponse;
+}

package/src/api-services/inventory/items.client.ts

@@ -34,8 +34,9 @@ export async function deleteItem(id: number): Promise<IApiResponse> {
   return response.responseData as IApiResponse;
 }
 
-export async function lookupItems(): Promise<IApiResponse> {
-  const response = await sendRequest({ url: `${BASE}/lookup`, method: "GET" });
+export async function lookupItems(params?: Record<string, string | number | boolean>): Promise<IApiResponse> {
+  const queryParams = params ? new URLSearchParams(params as Record<string, string>).toString() : "";
+  const response = await sendRequest({ url: `${BASE}/lookup${queryParams ? `?${queryParams}` : ""}`, method: "GET" });
   return response.responseData as IApiResponse;
 }
 

package/src/constants/menus.ts

@@ -78,11 +78,11 @@ export const MENU_ITEM_REGISTRY: RegistryItem[] = [
   { key: 'core__organizations', label: 'Organizations', path: '/organizations', module: 'Core', defaultGroup: 'User Management', permission: 'organization.view' },
   { key: 'core__parties', label: 'Parties', path: '/parties', module: 'Core', defaultGroup: 'User Management', permission: 'party.view' },
   { key: 'core__party_groups', label: 'Party Groups', path: '/party-groups', module: 'Core', defaultGroup: 'User Management', permission: 'party_group.view' },
-  { key: 'core__activity_logs', label: 'Activity Logs', path: '/activity-logs', module: 'Core', defaultGroup: 'System Auditing', permission: 'activity_log.view' },
-  { key: 'core__api_requests', label: 'API Requests', path: '/system/api-requests', module: 'Core', defaultGroup: 'System Auditing', permission: 'api_request_log.view' },
-  { key: 'core__feature_access_logs', label: 'Feature Access Logs', path: '/system/feature-access-logs', module: 'Core', defaultGroup: 'System Auditing', permission: 'feature_access_log.view' },
-  { key: 'core__issue_logs', label: 'Issue Logs', path: '/system/issue-logs', module: 'Core', defaultGroup: 'System Auditing', permission: 'issue_log.view' },
-  { key: 'core__feature_registry', label: 'Feature Registry', path: '/system/features', module: 'Core', defaultGroup: 'System Auditing', permission: 'feature.view' },
+  // { key: 'core__activity_logs', label: 'Activity Logs', path: '/activity-logs', module: 'Core', defaultGroup: 'System Auditing', permission: 'activity_log.view' },
+  // { key: 'core__api_requests', label: 'API Requests', path: '/system/api-requests', module: 'Core', defaultGroup: 'System Auditing', permission: 'api_request_log.view' },
+  // { key: 'core__feature_access_logs', label: 'Feature Access Logs', path: '/system/feature-access-logs', module: 'Core', defaultGroup: 'System Auditing', permission: 'feature_access_log.view' },
+  // { key: 'core__issue_logs', label: 'Issue Logs', path: '/system/issue-logs', module: 'Core', defaultGroup: 'System Auditing', permission: 'issue_log.view' },
+  // { key: 'core__feature_registry', label: 'Feature Registry', path: '/system/features', module: 'Core', defaultGroup: 'System Auditing', permission: 'feature.view' },
   { key: 'core__menu_config', label: 'Menu Configuration', path: '/menu-config', module: 'Core', defaultGroup: 'System', permission: 'menu_config.view' },
   { key: 'core__printables', label: 'Printable Templates', path: '/system/printables', module: 'Core', defaultGroup: 'System', permission: 'printable_template.view' },
   { key: 'core__email_templates', label: 'Email Templates', path: '/system/email-templates', module: 'Core', defaultGroup: 'System', permission: 'email_template.view' },
@@ -94,6 +94,12 @@ export const MENU_ITEM_REGISTRY: RegistryItem[] = [
   { key: 'core__field_configs', label: 'Field Configurations', path: '/settings/field-configs', module: 'Core', defaultGroup: 'Configuration', permission: 'entity_field_config.view' },
   { key: 'core__email_services', label: 'Integrations', path: '/settings/integrations', module: 'Core', defaultGroup: 'Configuration', permission: 'email_connection.view' },
   { key: 'core__approval_workflows', label: 'Approval Workflows', path: '/settings/approvals', module: 'Core', defaultGroup: 'Configuration', permission: null },
+  { key: 'core__commission_salespersons', label: 'Salespersons', path: '/commission/salespersons', module: 'Core', defaultGroup: 'Commission', permission: 'commission_salesperson.view' },
+  { key: 'core__commission_plans', label: 'Commission Plans', path: '/commission/plans', module: 'Core', defaultGroup: 'Commission', permission: 'commission_plan.view' },
+  { key: 'core__commission_assignments', label: 'Assignments', path: '/commission/assignments', module: 'Core', defaultGroup: 'Commission', permission: 'commission_assignment.view' },
+  { key: 'core__commission_transactions', label: 'Transactions', path: '/commission/transactions', module: 'Core', defaultGroup: 'Commission', permission: 'commission_transaction.view' },
+  { key: 'core__commission_adjustments', label: 'Adjustments', path: '/commission/adjustments', module: 'Core', defaultGroup: 'Commission', permission: 'commission_adjustment.view' },
+  { key: 'core__commission_payouts', label: 'Payout Batches', path: '/commission/payouts', module: 'Core', defaultGroup: 'Commission', permission: 'commission_payout.view' },
 
   // ── Inventory Module ──
   { key: 'inventory__items', label: 'Items', path: '/inventory/items', module: 'Inventory', defaultGroup: 'Catalog', permission: null },
@@ -126,8 +132,7 @@ export const MENU_ITEM_REGISTRY: RegistryItem[] = [
   { key: 'procurement__orders', label: 'Purchase Orders', path: '/procurement/orders', module: 'Procurement', defaultGroup: 'Orders', permission: null },
   { key: 'procurement__grn', label: 'Goods Receipt', path: '/procurement/grns', module: 'Procurement', defaultGroup: 'Receiving', permission: null },
   { key: 'procurement__settings', label: 'Settings', path: '/procurement/settings', module: 'Procurement', defaultGroup: 'Configuration', permission: 'procurement_setting.view' },
-  { key: 'procurement__invoices', label: 'Invoices', path: '/finance/invoices', module: 'Procurement', defaultGroup: 'Finance', permission: null },
-  { key: 'procurement__payments', label: 'Payments', path: '/finance/payments', module: 'Procurement', defaultGroup: 'Finance', permission: null },
+  { key: 'procurement__invoices', label: 'Supplier Invoices', path: '/procurement/invoices', module: 'Procurement', defaultGroup: 'Post-Purchase', permission: null },
 
   // ── Finance Module ──
   { key: 'finance__invoices', label: 'Invoices', path: '/finance/invoices', module: 'Finance', defaultGroup: 'Transactions', permission: 'finance.invoice.view' },
@@ -253,6 +258,7 @@ export const MENU_ITEM_REGISTRY: RegistryItem[] = [
   { key: 'construction__hierarchy', label: 'Hierarchy', path: '/construction/hierarchy', module: 'Construction', defaultGroup: 'Project Planning', permission: null },
   { key: 'construction__team', label: 'Team', path: '/construction/team', module: 'Construction', defaultGroup: 'Project Planning', permission: null },
   { key: 'construction__budget', label: 'Budget', path: '/construction/budget', module: 'Construction', defaultGroup: 'Project Planning', permission: null },
+  { key: 'construction__expenses', label: 'Expenses', path: '/construction/expenses', module: 'Construction', defaultGroup: 'Project Planning', permission: null },
 
   { key: 'construction__main_contract', label: 'Client', path: '/construction/contracts/main-contract', module: 'Construction', defaultGroup: 'Contracts & Billing', permission: null },
   { key: 'construction__subcontractors', label: 'Subcontractors', path: '/construction/contracts/subcontractors', module: 'Construction', defaultGroup: 'Contracts & Billing', permission: null },
@@ -289,16 +295,22 @@ export const MENU_ITEM_REGISTRY: RegistryItem[] = [
   { key: 'construction__safety_incidents', label: 'Incident Log', path: '/construction/safety/incidents', module: 'Construction', defaultGroup: 'Quality & Safety', permission: null },
   { key: 'construction__ptw', label: 'Permit to Work', path: '/construction/safety/ptw', module: 'Construction', defaultGroup: 'Quality & Safety', permission: null },
 
-  { key: 'construction__drawings', label: 'Drawing Register', path: '/construction/document-control/drawings', module: 'Construction', defaultGroup: 'Document Control', permission: null },
+  { key: 'construction__documents', label: 'Documents', path: '/construction/document-control/documents', module: 'Construction', defaultGroup: 'Document Control', permission: null },
   { key: 'construction__rfis', label: 'RFIs', path: '/construction/document-control/rfis', module: 'Construction', defaultGroup: 'Document Control', permission: null },
 
   { key: 'construction__test_types', label: 'Test Types', path: '/construction/settings/test-types', module: 'Construction', defaultGroup: 'Configuration', permission: null },
   { key: 'construction__material_types', label: 'Material Types', path: '/construction/settings/material-types', module: 'Construction', defaultGroup: 'Configuration', permission: 'construction_material_type.view' },
+  { key: 'construction__document_categories', label: 'Document Categories', path: '/construction/settings/document-categories', module: 'Construction', defaultGroup: 'Configuration', permission: 'construction_document_category.view' },
   { key: 'construction__project_categories', label: 'Project Categories', path: '/construction/settings/project-categories', module: 'Construction', defaultGroup: 'Configuration', permission: 'project_category.view' },
   { key: 'construction__daily_tasks', label: 'Daily Tasks', path: '/construction/settings/daily-tasks', module: 'Construction', defaultGroup: 'Configuration', permission: null },
   { key: 'construction__incident_notifications', label: 'Incident Reminders', path: '/construction/settings/incident-notifications', module: 'Construction', defaultGroup: 'Configuration', permission: null },
   { key: 'construction__settings', label: 'Settings', path: '/construction/settings', module: 'Construction', defaultGroup: 'Configuration', permission: null },
 
+  // ── Production Module ──
+  { key: 'production_min__dashboard', label: 'Dashboard', path: '/production-min', module: 'Production', defaultGroup: 'Overview', permission: null },
+  { key: 'production_min__phantom_boms', label: 'Phantom BOMs', path: '/production-min/boms', module: 'Production', defaultGroup: 'Operations', permission: null },
+  { key: 'production_min__settings', label: 'Settings', path: '/production-min/settings', module: 'Production', defaultGroup: 'Configuration', permission: null },
+
   // ── CRM Module ──
   { key: 'crm__spaces', label: 'Spaces', path: '/crm/spaces', module: 'CRM', defaultGroup: 'Sales', permission: 'crm_space.view' },
   { key: 'crm__tasks', label: 'Tasks', path: '/crm/tasks', module: 'CRM', defaultGroup: 'Operations', permission: 'crm_task.view' },
@@ -392,6 +404,7 @@ export const MENU_PRESETS: MenuPreset[] = [
           'core__activity_logs', 'core__api_requests', 'core__feature_access_logs',
           'core__issue_logs', 'core__feature_registry', 'core__menu_config',
           'core__printables', 'core__email_templates', 'core__template_groups', 'core__currencies', 'core__settings', 'core__field_configs', 'core__email_services', 'core__approval_workflows',
+          'core__commission_salespersons', 'core__commission_plans', 'core__commission_assignments', 'core__commission_transactions', 'core__commission_adjustments', 'core__commission_payouts',
         ],
       },
       {
@@ -423,7 +436,7 @@ export const MENU_PRESETS: MenuPreset[] = [
         iconName: 'Truck',
         secondaryItems: [
           'procurement__orders', 'procurement__grn',
-          'procurement__invoices', 'procurement__payments',
+          'procurement__invoices',
           'procurement__settings',
         ],
       },
@@ -541,11 +554,20 @@ export const MENU_PRESETS: MenuPreset[] = [
           'construction__project_categories',
           'construction__test_types',
           'construction__material_types',
+          'construction__document_categories',
           'construction__daily_tasks',
           'construction__incident_notifications',
           'construction__settings',
         ],
       },
+      {
+        id: 'production_min',
+        label: 'Production',
+        iconName: 'Factory',
+        secondaryItems: [
+          'production_min__phantom_boms',
+        ],
+      },
       {
         id: 'crm',
         label: 'CRM',
@@ -613,12 +635,13 @@ const PROJECT_KEY_MAPPING: Record<string, string> = {
   'project_hierarchy': 'construction__hierarchy',
   'project_team': 'construction__team',
   'project_budget': 'construction__budget',
+  'project_expenses': 'construction__expenses',
   'project_resource_calendar': 'construction__schedule_calendar',
   'project_progress_billing': 'construction__ipcs',
   'project_variations': 'construction__variations',
   'project_boq': 'construction__boq',
   'project_boq_revisions': 'construction__boq_revisions',
-  'project_drawings': 'construction__drawings',
+  'project_documents': 'construction__documents',
   'project_rfis': 'construction__rfis',
   'project_dsr': 'construction__dsr',
   'project_progress_updates': 'construction__progress_updates',
@@ -671,13 +694,14 @@ export const getProjectConstructionGroups = (projectId: string | number): MainMe
       items: [
         { id: 'project_boq', label: 'Bill of Quantities (BOQ)', path: `/construction/projects/${projectId}/boq` },
         { id: 'project_boq_revisions', label: 'BOQ Revisions', path: `/construction/projects/${projectId}/boq/revisions` },
+        { id: 'project_expenses', label: 'Direct Expenses', path: `/construction/projects/${projectId}/expenses` },
       ]
     },
     {
       id: 'project_document_control',
       label: 'Document Control',
       items: [
-        { id: 'project_drawings', label: 'Drawing Register', path: `/construction/projects/${projectId}/drawings` },
+        { id: 'project_documents', label: 'Documents', path: `/construction/projects/${projectId}/documents` },
         { id: 'project_rfis', label: 'RFIs', path: `/construction/projects/${projectId}/rfis` },
       ]
     },

package/src/constants/storageKeys.ts

@@ -12,5 +12,8 @@ export const local_storage = {
     user_info: { name: 'user_info', secretName: 'USER_INFO_SECRET', encrypted: false } as IStorageOptions,
     selected_organization: { name: 'selected_organization', secretName: 'SELECTED_ORG', encrypted: false } as IStorageOptions,
     sales_terminal: { name: 'sales_terminal', secretName: 'SALES_TERMINAL', encrypted: false } as IStorageOptions,
-    active_project: { name: 'active_project', secretName: 'ACTIVE_PROJECT', encrypted: false } as IStorageOptions
+    active_project: { name: 'active_project', secretName: 'ACTIVE_PROJECT', encrypted: false } as IStorageOptions,
+    pos_fullscreen: { name: 'pos_fullscreen', secretName: 'POS_FULLSCREEN', encrypted: false } as IStorageOptions,
+    hide_pricing_note: { name: 'hide_pricing_note', secretName: 'HIDE_PRICING_NOTE', encrypted: false } as IStorageOptions,
+    hide_rule_note: { name: 'hide_rule_note', secretName: 'HIDE_RULE_NOTE', encrypted: false } as IStorageOptions
 };

package/src/utils/PriceCalculationService.ts

@@ -6,6 +6,7 @@ export interface IPricingRule {
   markdown_percentage: number | null;
   batch_id?: number | null;
   final_rate?: number;
+  specificity_score?: number;
 }
 
 export class PriceCalculationService {
@@ -33,10 +34,17 @@ export class PriceCalculationService {
       return { unitPrice: basePrice, discountPercent: 0, discountAmount: 0 };
     }
 
-    // Sort by batch specificity first, then min_quantity descending (highest threshold wins)
+    // Sort by batch specificity first, then specificity score, then min_quantity descending
     applicableRules.sort((a, b) => {
       if (a.batch_id && !b.batch_id) return -1;
       if (!a.batch_id && b.batch_id) return 1;
+
+      const scoreA = a.specificity_score || 0;
+      const scoreB = b.specificity_score || 0;
+      if (scoreA !== scoreB) {
+        return scoreB - scoreA;
+      }
+
       return b.min_quantity - a.min_quantity;
     });
 

package/src/utils/apiProxy.ts

@@ -117,6 +117,8 @@ export async function forwardApiProxyRequest(request: Request, pathSegments: str
     const contentType = request.headers.get("content-type");
     const organizationId = request.headers.get("x-organization-id") ?? selectedOrganizationId;
 
+    const tenantDomain = request.headers.get("x-tenant-domain");
+
     if (accept) {
         headers.set("accept", accept);
     }
@@ -129,6 +131,10 @@ export async function forwardApiProxyRequest(request: Request, pathSegments: str
         headers.set("x-organization-id", organizationId);
     }
 
+    if (tenantDomain) {
+        headers.set("x-tenant-domain", tenantDomain);
+    }
+
     if (token) {
         headers.set("authorization", `Bearer ${token}`);
     }

package/src/utils/httpClient.ts

@@ -113,6 +113,9 @@ export async function sendRequest<T = any>({ url, method, data, params, headers,
 
         finalUrl = buildBrowserProxyUrl(finalUrl);
 
+        // Inject Tenant Domain dynamically for Database-per-Tenant isolation
+        defaultHeaders['X-Tenant-Domain'] = window.location.hostname;
+
         // Automatically inject selected organization ID into every request
         try {
             const orgRaw = localStorage.getItem('selected_organization');
@@ -131,6 +134,22 @@ export async function sendRequest<T = any>({ url, method, data, params, headers,
         defaultHeaders['Content-Type'] = 'application/json';
     }
 
+    // Server-side Tenant Domain extraction
+    if (typeof window === 'undefined') {
+        try {
+            // Dynamically import next/headers to avoid client-side bundling issues
+            const nextHeaders = require('next/headers');
+            if (nextHeaders && typeof nextHeaders.headers === 'function') {
+                const host = nextHeaders.headers().get('host');
+                if (host) {
+                    defaultHeaders['X-Tenant-Domain'] = host.split(':')[0];
+                }
+            }
+        } catch (error) {
+            // Ignore if next/headers is unavailable
+        }
+    }
+
     try {
         const response = await fetch(finalUrl, {
             method,