@apptimate/core-lib 4.9.0 → 5.2.0

package/package.json

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

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

@@ -15,6 +15,14 @@ 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;

package/src/constants/menus.ts

@@ -111,6 +111,7 @@ export const MENU_ITEM_REGISTRY: RegistryItem[] = [
   { key: 'sales__orders', label: 'Sales Orders', path: '/sales/orders', module: 'Sales', defaultGroup: 'Orders', permission: null },
   { key: 'sales__goods_issue_notes', label: 'Goods Issue Notes', path: '/sales/delivery-notes', module: 'Sales', defaultGroup: 'Fulfillment', permission: null },
   { key: 'sales__returns', label: 'Sales Returns', path: '/sales/returns', module: 'Sales', defaultGroup: 'Post-Sales', permission: null },
+  { key: 'sales__invoices', label: 'Sales Invoices', path: '/sales/invoices', 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 },
@@ -249,16 +250,10 @@ 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__workforce_allocation', label: 'Workforce Allocation', path: '/construction/workforce/allocation', 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 },
 
@@ -398,7 +393,7 @@ export const MENU_PRESETS: MenuPreset[] = [
         secondaryItems: [
           'sales__price_lists',
           'sales__quotations', 'sales__orders', 'sales__goods_issue_notes',
-          'sales__returns', 'sales__credit_notes',
+          'sales__invoices', 'sales__returns', 'sales__credit_notes',
           'sales__pos', 'sales__pos_sessions',
           'sales__settings'
         ],
@@ -519,6 +514,7 @@ export const MENU_PRESETS: MenuPreset[] = [
           'construction__wastage_returns',
           'construction__variations',
           'construction__workforce',
+          'construction__workforce_allocation',
           'construction__shifts',
           'construction__attendance',
           'construction__equipment_types',

package/src/utils/PriceCalculationService.ts

@@ -4,6 +4,7 @@ export interface IPricingRule {
   min_quantity: number;
   rate: number | null;
   markdown_percentage: number | null;
+  batch_id?: number | null;
   final_rate?: number;
 }
 
@@ -14,21 +15,30 @@ export class PriceCalculationService {
   public static calculatePriceDetails(
     basePrice: number,
     quantity: number,
-    rules?: IPricingRule[]
+    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
-    const applicableRules = rules.filter(r => quantity >= r.min_quantity);
+    // 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 min_quantity descending (highest threshold wins)
-    applicableRules.sort((a, b) => b.min_quantity - a.min_quantity);
+    // 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];