@apptimate/ui 3.8.0 → 3.9.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@apptimate/ui",
-  "version": "3.8.0",
+  "version": "3.9.0",
   "main": "src/index.tsx",
   "types": "src/index.tsx",
   "dependencies": {

package/src/common-components/transaction/ProductSelectionPanel.tsx

@@ -260,7 +260,7 @@ export function ProductSelectionPanel({
     }
   };
 
-  const updateLineInput = (uid: string, field: 'quantity' | 'unit_price', value: string) => {
+  const updateLineInput = (uid: string, field: 'quantity' | 'unit_price' | 'free_qty' | 'uom_id', value: string) => {
     const num = value === '' ? 0 : Number(value);
     const line = lineItems.find(l => l.uid === uid);
     if (!line) return;
@@ -273,6 +273,16 @@ export function ProductSelectionPanel({
     
     const discAmt = (price * qty * line.discount_percent) / 100;
     
+    if (field === 'free_qty') {
+      onUpdateLine(uid, { free_qty: Math.max(0, num) });
+      return;
+    }
+    
+    if (field === 'uom_id') {
+      onUpdateLine(uid, { uom_id: Number(value) });
+      return;
+    }
+
     onUpdateLine(uid, {
       quantity: qty,
       unit_price: price,
@@ -502,6 +512,8 @@ export function ProductSelectionPanel({
               <TRow>
                 <TCell isHeader className="w-[45%]">Item</TCell>
                 <TCell isHeader>Qty</TCell>
+                {config.enablePurchaseUnit && <TCell isHeader>Unit</TCell>}
+                {config.enableFreeQty && <TCell isHeader>Free Qty</TCell>}
                 {config.showPrices && <TCell isHeader>Rate</TCell>}
                 {config.showPrices && <TCell isHeader className="text-right">Total</TCell>}
                 <TCell isHeader className="w-10 text-center"></TCell>
@@ -596,6 +608,33 @@ export function ProductSelectionPanel({
                     />
                   </TCell>
 
+                  {config.enablePurchaseUnit && (
+                    <TCell label="Unit" className="py-2.5">
+                      <select
+                        value={line.uom_id || line.item.uom_id || ''}
+                        onChange={(e) => updateLineInput(line.uid, 'uom_id', e.target.value)}
+                        className="h-8 px-2 text-[13px] font-medium bg-surface-1 border border-border-subtle rounded-md focus:border-primary/50 focus:outline-none transition-colors min-w-[80px]"
+                      >
+                        {line.item.uom?.uom_group?.uoms?.map((uom: any) => (
+                          <option key={uom.id} value={uom.id}>{uom.abbreviation}</option>
+                        ))}
+                      </select>
+                    </TCell>
+                  )}
+
+                  {config.enableFreeQty && (
+                    <TCell label="Free Qty" className="py-2.5">
+                      <input
+                        type="number"
+                        value={line.free_qty || 0}
+                        onChange={(e) => updateLineInput(line.uid, 'free_qty', e.target.value)}
+                        className="w-20 h-8 px-2 text-[13px] text-center font-medium bg-surface-1 border border-border-subtle rounded-md focus:border-primary/50 focus:outline-none transition-colors"
+                        min={0}
+                        step="any"
+                      />
+                    </TCell>
+                  )}
+
                   {config.showPrices && (
                     <TCell label="Rate" className="py-2.5">
                       <input

package/src/common-components/transaction/ProductTransactionScreen.tsx

@@ -178,6 +178,8 @@ export function ProductTransactionScreen({
             selling_price: b.selling_price,
             serial_numbers: undefined,
             quantity: b.quantity,
+            free_qty: l.free_qty,
+            uom_id: l.uom_id,
             unit_price: l.unit_price,
             discount_percent: l.discount_percent,
             discount_amount: (l.discount_amount / l.quantity) * b.quantity,
@@ -195,6 +197,8 @@ export function ProductTransactionScreen({
           selling_price: undefined,
           serial_numbers: l.serial_numbers,
           quantity: l.quantity,
+          free_qty: l.free_qty,
+          uom_id: l.uom_id,
           unit_price: l.unit_price,
           discount_percent: l.discount_percent,
           discount_amount: l.discount_amount,

package/src/common-components/transaction/types.ts

@@ -19,7 +19,15 @@ export interface TransactionItem {
   is_discountable: boolean;
   category?: { id: number; name: string };
   brand?: { id: number; name: string };
-  uom?: { id: number; name: string; abbreviation: string };
+  uom?: { 
+    id: number; 
+    name: string; 
+    abbreviation: string;
+    uom_group?: {
+      id: number;
+      uoms: { id: number; name: string; abbreviation: string; base_uom_id?: number | null }[];
+    };
+  };
   variants?: TransactionItemVariant[];
   primary_image?: { id: number; url: string } | null;
   stock?: { qty_on_hand: number; qty_allocated: number; qty_available: number };
@@ -66,6 +74,8 @@ export interface TransactionLineItem {
   batches?: TransactionLineBatch[];
   serial_numbers?: string[];
   quantity: number;
+  free_qty?: number;
+  uom_id?: number;
   unit_price: number;
   discount_percent: number;
   discount_amount: number;
@@ -134,6 +144,10 @@ export interface TransactionScreenConfig {
   allowEditPrice?: boolean;
   /** Whether to show available stock for variants in the search dropdown */
   showStock?: boolean;
+  /** Enable free quantity input (dynamic setting) */
+  enableFreeQty?: boolean;
+  /** Enable purchase unit selection (dynamic setting) */
+  enablePurchaseUnit?: boolean;
 }
 
 // ── Module Presets ──
@@ -288,6 +302,8 @@ export interface TransactionPayload {
     selling_price?: number;
     serial_numbers?: string[];
     quantity: number;
+    free_qty?: number;
+    uom_id?: number;
     unit_price: number;
     discount_percent: number;
     discount_amount: number;

package/src/index.tsx

@@ -19,6 +19,7 @@ export * from './base-components/TableMobileOptions';
 export * from './base-components/DesktopSearchPopover';
 export * from './base-components/DesktopFilterPopover';
 export * from './base-components/Input';
+export * from './base-components/Textarea';
 export * from './base-components/Label';
 export * from './base-components/Modal';
 export * from './base-components/ActionModal';