@apptimate/core-lib 4.8.0 → 5.1.0

package/package.json

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

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

@@ -15,6 +15,31 @@ export async function getItemBatches(itemId: number, params: Record<string, stri
   return response.responseData as IApiResponse;
 }
 
+export async function checkHasActivePriceLists(): Promise<IApiResponse> {
+  const response = await sendRequest({ 
+    url: `${process.env.NEXT_PUBLIC_API_URL}/api/sales/price-lists/has-active?t=${new Date().getTime()}`, 
+    method: "GET" 
+  });
+  return response.responseData as IApiResponse;
+}
+
+export async function evaluatePriceLists(data: {
+  party_id?: number | null;
+  transaction_type: string;
+  items: Array<{ variant_id: number }>;
+}): Promise<IApiResponse> {
+  const variant_ids = data.items.map(item => item.variant_id);
+  const response = await sendRequest({ 
+    url: `${process.env.NEXT_PUBLIC_API_URL}/api/sales/price-lists/evaluate`, 
+    method: "POST", 
+    data: {
+      party_id: data.party_id,
+      variant_ids
+    }
+  });
+  return response.responseData as IApiResponse;
+}
+
 export async function bulkStockCheck(data: {
   warehouse_id: number;
   lines: Array<{ item_id: number; variant_id?: number | null; batch_id?: number | null; quantity: number }>;

package/src/constants/menus.ts

@@ -90,6 +90,7 @@ export const MENU_ITEM_REGISTRY: RegistryItem[] = [
   { key: 'core__terminals', label: 'Terminals', path: '/terminals', module: 'Core', defaultGroup: 'Resources', permission: 'terminal.view' },
   { key: 'core__currencies', label: 'Currencies', path: '/currencies', module: 'Core', defaultGroup: 'Resources', permission: 'currency.view' },
   { key: 'core__settings', label: 'Settings', path: '/settings', module: 'Core', defaultGroup: 'Configuration', permission: 'core_setting.view' },
+  { key: 'core__approval_workflows', label: 'Approval Workflows', path: '/settings/approvals', module: 'Core', defaultGroup: 'Configuration', permission: null },
 
   // ── Inventory Module ──
   { key: 'inventory__items', label: 'Items', path: '/inventory/items', module: 'Inventory', defaultGroup: 'Catalog', permission: null },
@@ -112,9 +113,9 @@ export const MENU_ITEM_REGISTRY: RegistryItem[] = [
   { key: 'sales__returns', label: 'Sales Returns', path: '/sales/returns', module: 'Sales', defaultGroup: 'Post-Sales', permission: null },
   { key: 'sales__credit_notes', label: 'Credit Notes', path: '/sales/credit-notes', module: 'Sales', defaultGroup: 'Post-Sales', permission: null },
   { key: 'sales__pos', label: 'POS Terminal', path: '/sales/pos', module: 'Sales', defaultGroup: 'POS', permission: null },
-
   { key: 'sales__pos_sessions', label: 'Terminal Sessions', path: '/sales/pos/sessions', module: 'Sales', defaultGroup: 'POS', permission: null },
   { key: 'sales__reports', label: 'Sales Reports', path: '/sales/reports', module: 'Sales', defaultGroup: 'Analytics', permission: null },
+  { key: 'sales__settings', label: 'Settings', path: '/sales/settings', module: 'Sales', defaultGroup: 'Settings', permission: 'sales_setting.view' },
 
   // ── Procurement Module ──
   { key: 'procurement__orders', label: 'Purchase Orders', path: '/procurement/orders', module: 'Procurement', defaultGroup: 'Orders', permission: null },
@@ -248,21 +249,14 @@ export const MENU_ITEM_REGISTRY: RegistryItem[] = [
   { key: 'construction__ipcs', label: 'Progress Billing', path: '/construction/contracts/ipcs', module: 'Construction', defaultGroup: 'Contracts & Billing', permission: null },
   { key: 'construction__variations', label: 'Subcontractor Variations', path: '/construction/variations', module: 'Construction', defaultGroup: 'Contracts & Billing', permission: null },
 
-  { key: 'construction__prs', label: 'Purchase Requisitions', path: '/construction/procurement/prs', module: 'Construction', defaultGroup: 'Procurement', permission: null },
-  { key: 'construction__pos', label: 'Purchase Orders', path: '/construction/procurement/pos', module: 'Construction', defaultGroup: 'Procurement', permission: null },
-  { key: 'construction__grns', label: 'Goods Receipt', path: '/construction/procurement/grns', module: 'Construction', defaultGroup: 'Procurement', permission: null },
-  { key: 'construction__mtrs', label: 'Transfer Requests', path: '/construction/procurement/mtrs', module: 'Construction', defaultGroup: 'Procurement', permission: null },
 
-  { key: 'construction__site_ledger', label: 'Project Ledger', path: '/construction/site-inventory/ledger', module: 'Construction', defaultGroup: 'Project Inventory', permission: null },
-  { key: 'construction__site_issues', label: 'Project Issues', path: '/construction/site-inventory/issues', module: 'Construction', defaultGroup: 'Project Inventory', permission: null },
-  { key: 'construction__wastage_returns', label: 'Wastage & Returns', path: '/construction/site-inventory/wastage-returns', module: 'Construction', defaultGroup: 'Project Inventory', permission: null },
-  
+
   { key: 'construction__workforce', label: 'Workforce Master', path: '/construction/workforce', module: 'Construction', defaultGroup: 'Workforce', permission: null },
   { key: 'construction__shifts', label: 'Shift Master', path: '/construction/shifts', module: 'Construction', defaultGroup: 'Workforce', permission: null },
   { key: 'construction__attendance', label: 'Attendance & Timesheets', path: '/construction/attendance', module: 'Construction', defaultGroup: 'Workforce', permission: null },
 
   { key: 'construction__equipment_types', label: 'Equipment Types', path: '/construction/equipment/types', module: 'Construction', defaultGroup: 'Equipment & Plant', permission: null },
-  { key: 'construction__equipment', label: 'Equipment Master', path: '/construction/equipment', module: 'Construction', defaultGroup: 'Equipment & Plant', permission: null },
+  { key: 'construction__equipment', label: 'Equipments', path: '/construction/equipment', module: 'Construction', defaultGroup: 'Equipment & Plant', permission: null },
   { key: 'construction__equipment_allocation', label: 'Equipment Allocation', path: '/construction/equipment/allocation', module: 'Construction', defaultGroup: 'Equipment & Plant', permission: null },
   { key: 'construction__fuel_logs', label: 'Fuel Logs', path: '/construction/equipment/fuel-logs', module: 'Construction', defaultGroup: 'Equipment & Plant', permission: null },
   { key: 'construction__maintenance', label: 'Maintenance', path: '/construction/equipment/maintenance', module: 'Construction', defaultGroup: 'Equipment & Plant', permission: null },
@@ -281,8 +275,8 @@ export const MENU_ITEM_REGISTRY: RegistryItem[] = [
   { key: 'construction__drawings', label: 'Drawing Register', path: '/construction/document-control/drawings', 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__approval_workflows', label: 'Approval Workflows', path: '/construction/settings/approvals', module: 'Construction', defaultGroup: 'Configuration', permission: null },
   { key: 'construction__test_types', label: 'Test Types', path: '/construction/settings/test-types', module: 'Construction', defaultGroup: 'Configuration', permission: null },
+  { key: 'construction__project_categories', label: 'Project Categories', path: '/construction/settings/project-categories', module: 'Construction', defaultGroup: 'Configuration', permission: 'project_category.view' },
   { key: 'construction__settings', label: 'Settings', path: '/construction/settings', module: 'Construction', defaultGroup: 'Configuration', permission: null },
 
   // ── CRM Module ──
@@ -377,7 +371,7 @@ export const MENU_PRESETS: MenuPreset[] = [
           'core__warehouses', 'core__terminals',
           'core__activity_logs', 'core__api_requests', 'core__feature_access_logs',
           'core__issue_logs', 'core__feature_registry', 'core__menu_config',
-          'core__printables', 'core__template_groups', 'core__currencies', 'core__settings',
+          'core__printables', 'core__template_groups', 'core__currencies', 'core__settings', 'core__approval_workflows',
         ],
       },
       {
@@ -399,6 +393,7 @@ export const MENU_PRESETS: MenuPreset[] = [
           'sales__quotations', 'sales__orders', 'sales__goods_issue_notes',
           'sales__returns', 'sales__credit_notes',
           'sales__pos', 'sales__pos_sessions',
+          'sales__settings'
         ],
       },
       {
@@ -540,8 +535,8 @@ export const MENU_PRESETS: MenuPreset[] = [
           'construction__material_testing',
           'construction__safety_incidents',
           'construction__ptw',
-          'construction__approval_workflows',
           'construction__test_types',
+          'construction__project_categories',
           'construction__settings',
         ],
       },

package/src/index.ts

@@ -9,4 +9,5 @@ export * from './api-services/inventory/brands.client';
 export * from './api-services/inventory/uom.client';
 export * from './api-services/inventory/uom-group.client';
 export * from './api-services/inventory/parties.client';
-export * from './api-services/inventory/transaction.client';
+export * from './api-services/inventory/transaction.client';
+export * from './utils/PriceCalculationService';

package/src/schemas/approvalWorkflowSchema.ts

@@ -3,7 +3,8 @@ import { z } from "zod";
 export const approvalStepSchema = z.object({
   step_order: z.number().int().positive(),
   approver_type: z.enum(["user", "role"]),
-  approver_id: z.string().min(1, "Approver is required")
+  approver_ids: z.array(z.string()).min(1, "At least one approver is required"),
+  required_approvals: z.number().int().min(1, "Must be at least 1")
 });
 
 export const approvalWorkflowSchema = z.object({

package/src/utils/PriceCalculationService.ts

@@ -0,0 +1,57 @@
+export interface IPricingRule {
+  id: number;
+  price_list_name?: string;
+  min_quantity: number;
+  rate: number | null;
+  markdown_percentage: number | null;
+  batch_id?: number | null;
+  final_rate?: number;
+}
+
+export class PriceCalculationService {
+  /**
+   * Calculate detailed price breakdown for a given quantity using pricing rules
+   */
+  public static calculatePriceDetails(
+    basePrice: number,
+    quantity: number,
+    rules?: IPricingRule[],
+    batchId?: number | null
+  ): { unitPrice: number; discountPercent: number; discountAmount: number; appliedRule?: IPricingRule } {
+    if (!rules || rules.length === 0) {
+      return { unitPrice: basePrice, discountPercent: 0, discountAmount: 0 };
+    }
+
+    // Filter rules that match the quantity condition and batch condition
+    const applicableRules = rules.filter(r => {
+      if (quantity < r.min_quantity) return false;
+      if (r.batch_id && String(r.batch_id) !== String(batchId)) return false;
+      return true;
+    });
+
+    if (applicableRules.length === 0) {
+      return { unitPrice: basePrice, discountPercent: 0, discountAmount: 0 };
+    }
+
+    // Sort by batch specificity first, then min_quantity descending (highest threshold wins)
+    applicableRules.sort((a, b) => {
+      if (a.batch_id && !b.batch_id) return -1;
+      if (!a.batch_id && b.batch_id) return 1;
+      return b.min_quantity - a.min_quantity;
+    });
+
+    const activeRule = applicableRules[0];
+
+    if (activeRule.rate !== null && activeRule.rate !== undefined) {
+      return { unitPrice: activeRule.rate, discountPercent: 0, discountAmount: 0, appliedRule: { ...activeRule, final_rate: activeRule.rate } };
+    }
+
+    if (activeRule.markdown_percentage !== null && activeRule.markdown_percentage !== undefined) {
+      const markdownAmount = basePrice * (activeRule.markdown_percentage / 100);
+      const newUnitPrice = basePrice - markdownAmount;
+      return { unitPrice: newUnitPrice, discountPercent: 0, discountAmount: 0, appliedRule: { ...activeRule, final_rate: newUnitPrice } };
+    }
+
+    return { unitPrice: basePrice, discountPercent: 0, discountAmount: 0 };
+  }
+}