@apptimate/ui 4.5.0 → 4.7.0

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

@@ -1,10 +1,12 @@
 'use client';
 
 import React, { useState, useCallback, useMemo, useEffect } from 'react';
-import { cn } from '@apptimate/core-lib';
+import { cn, PriceCalculationService, evaluatePriceLists, checkHasActivePriceLists } from '@apptimate/core-lib';
 import toast from 'react-hot-toast';
 import { ProductSelectionPanel } from './ProductSelectionPanel';
 import { MetadataPanel } from './MetadataPanel';
+import { Modal, ModalFooter } from '../../base-components/Modal';
+import { Button } from '../../base-components/Button';
 import type {
   ProductTransactionScreenProps, TransactionItem, TransactionLineItem,
   TransactionPayload, PaymentEntry, PartyLookup,
@@ -42,6 +44,60 @@ export function ProductTransactionScreen({
   const [notes, setNotes] = useState('');
   const [payments, setPayments] = useState<PaymentEntry[]>([]);
   const [isSubmitting, setIsSubmitting] = useState(false);
+  const [hasActivePriceLists, setHasActivePriceLists] = useState<boolean>(false);
+  const [priceEvaluationModal, setPriceEvaluationModal] = useState<{
+    isOpen: boolean;
+    type: 'confirm' | 'force';
+    evaluatedRules: Record<number, any[]>;
+    pendingPartyId: number | null;
+    pendingParty: any;
+  } | null>(null);
+
+  const applyEvaluatedPrices = useCallback((evaluatedRules: Record<number, any[]>) => {
+    setLineItems(prev => prev.map(l => {
+      if (l.is_free_qty || !l.variant_id || !evaluatedRules[l.variant_id]) return l;
+      const rules = evaluatedRules[l.variant_id];
+      
+      const variantPriceField = config.priceField === 'default_cost_price' ? 'cost_price' : 'sale_price';
+      const actualVariant = l.item.variants?.find((v: any) => v.id === l.variant_id);
+      const batchPriceField = config.priceField === 'default_cost_price' ? 'cost_price' : 'selling_price';
+      const batchPrice = ['sales', 'quotation'].includes(config.type) && l.batches?.[0] ? (l.batches[0] as any)[batchPriceField] : undefined;
+      const basePrice = (batchPrice !== undefined && batchPrice !== null)
+        ? Number(batchPrice)
+        : (actualVariant 
+          ? Number(actualVariant[variantPriceField] || l.item[config.priceField] || 0) 
+          : Number(l.item[config.priceField] || 0));
+      
+      const uoms = l.item.uom?.uom_group?.uoms || [];
+      const currentUom = uoms.find((u: any) => u.id === (l.uom_id || l.item.uom_id));
+      const factor = Number(currentUom?.conversion_factor) || 1;
+      const effectiveQty = l.quantity * factor;
+
+      const priceDetails = PriceCalculationService.calculatePriceDetails(basePrice, effectiveQty, rules, l.batches?.[0]?.batch_id);
+      
+      return {
+        ...l,
+        pricing_rules: rules,
+        unit_price: priceDetails.unitPrice * factor,
+        discount_percent: priceDetails.discountPercent,
+        discount_amount: priceDetails.discountAmount * factor,
+        applied_price_rule: priceDetails.appliedRule,
+        line_total: (priceDetails.unitPrice * factor * l.quantity) - (priceDetails.discountAmount * factor)
+      };
+    }));
+  }, [config.priceField]);
+
+  useEffect(() => {
+    if (['sales', 'pos', 'quotation'].includes(config.type)) {
+      checkHasActivePriceLists().then(res => {
+        if (res.is_success) {
+          setHasActivePriceLists(res.result as boolean);
+        }
+      }).catch(() => {
+        // Silently ignore
+      });
+    }
+  }, [config.type]);
 
   const submitting = externalSubmitting ?? isSubmitting;
 
@@ -53,24 +109,25 @@ export function ProductTransactionScreen({
       }
       if (initialData.warehouse_id) {
         setWarehouseId(initialData.warehouse_id);
+        if (initialData.warehouse?.name) setWarehouseName(initialData.warehouse.name);
       }
       if (initialData.lines && Array.isArray(initialData.lines)) {
         setLineItems(
           initialData.lines.map((l: any) => {
-            const qty = l.quantity || 1;
-            const unitPrice = l.unit_price || 0;
+            const qty = l.quantity !== undefined ? Number(l.quantity) : 1;
+            const unitPrice = l.unit_price !== undefined ? Number(l.unit_price) : 0;
             return {
               uid: l.uid || Math.random().toString(36).slice(2, 7),
               item: l.item,
               variant_id: l.variant_id || null,
-              batches: [],
-              serial_numbers: [],
+              batches: l.batches || [],
+              serial_numbers: l.serial_numbers || [],
               quantity: qty,
               unit_price: unitPrice,
-              discount_percent: 0,
-              discount_amount: 0,
-              line_total: unitPrice * qty,
-              expanded: false,
+              discount_percent: l.discount_percent !== undefined ? Number(l.discount_percent) : 0,
+              discount_amount: l.discount_amount !== undefined ? Number(l.discount_amount) : 0,
+              line_total: l.line_total !== undefined ? Number(l.line_total) : (unitPrice * qty - (l.discount_amount || 0)),
+              expanded: l.expanded || false,
               is_free_qty: l.is_free_qty,
               parent_line_uids: l.parent_line_uids,
               uom_id: l.uom_id,
@@ -78,6 +135,25 @@ export function ProductTransactionScreen({
             };
           })
         );
+        
+        // Populate pricing rules for existing items if party is selected
+        if (initialData.party_id && ['sales', 'pos', 'quotation'].includes(config.type)) {
+          evaluatePriceLists({
+            party_id: initialData.party_id,
+            transaction_type: config.type,
+            items: initialData.lines.filter((l: any) => l.variant_id && !l.is_free_qty).map((l: any) => ({ variant_id: l.variant_id }))
+          }).then(res => {
+            if (res.is_success && res.result) {
+              const evaluatedRules = res.result as Record<number, any[]>;
+              setLineItems(prev => prev.map(line => {
+                if (!line.is_free_qty && line.variant_id && evaluatedRules[line.variant_id]) {
+                  return { ...line, pricing_rules: evaluatedRules[line.variant_id] };
+                }
+                return line;
+              }));
+            }
+          }).catch(() => {});
+        }
       }
     }
   }, [initialData]);
@@ -104,9 +180,32 @@ export function ProductTransactionScreen({
         }
 
         const variantPriceField = config.priceField === 'default_cost_price' ? 'cost_price' : 'sale_price';
-        const unitPrice = actualVariant ? Number(actualVariant[variantPriceField] || 0) : 0;
+        const batchPriceField = config.priceField === 'default_cost_price' ? 'cost_price' : 'selling_price';
+        const batchPrice = ['sales', 'quotation'].includes(config.type) && extra?.batches?.[0] ? (extra.batches[0] as any)[batchPriceField] : undefined;
+        const basePrice = (batchPrice !== undefined && batchPrice !== null)
+          ? Number(batchPrice)
+          : (actualVariant ? Number(actualVariant[variantPriceField] || itemWithVariants[config.priceField] || 0) : Number(itemWithVariants[config.priceField] || 0));
         const qty = extra?.quantity || 1;
-        const discountAmt = 0; // Initial discount
+        
+        const uomId = itemWithVariants.uom_id;
+        const uoms = itemWithVariants.uom?.uom_group?.uoms || [];
+        const currentUom = uoms.find((u: any) => u.id === uomId);
+        const factor = Number(currentUom?.conversion_factor) || 1;
+
+        let unitPrice = basePrice * factor;
+        let discountPercent = 0;
+        let discountAmt = 0;
+
+        let appliedRule = undefined;
+
+        if (actualVariant && actualVariant.pricing_rules) {
+          const effectiveQty = qty * factor;
+          const priceDetails = PriceCalculationService.calculatePriceDetails(basePrice, effectiveQty, actualVariant.pricing_rules, extra?.batches?.[0]?.batch_id);
+          unitPrice = priceDetails.unitPrice * factor;
+          discountPercent = priceDetails.discountPercent;
+          discountAmt = priceDetails.discountAmount * factor;
+          appliedRule = priceDetails.appliedRule;
+        }
         
         const newLine: TransactionLineItem = {
           uid: `${itemWithVariants.id}-${Date.now()}-${Math.random().toString(36).slice(2, 7)}`,
@@ -116,11 +215,13 @@ export function ProductTransactionScreen({
           serial_numbers: extra?.serial_numbers || [],
           quantity: qty,
           unit_price: unitPrice,
-          discount_percent: 0,
+          discount_percent: discountPercent,
           discount_amount: discountAmt,
-          line_total: unitPrice * qty - discountAmt,
+          line_total: (unitPrice * qty) - discountAmt,
           expanded: false,
           uom_id: itemWithVariants.uom_id,
+          pricing_rules: actualVariant?.pricing_rules,
+          applied_price_rule: appliedRule,
         };
         return [...prevLineItems, newLine];
       });
@@ -131,13 +232,76 @@ export function ProductTransactionScreen({
   // ── Update line ──
   const handleUpdateLine = useCallback((uid: string, updates: Partial<TransactionLineItem>) => {
     setLineItems((prev) =>
-      prev.map((l) => (l.uid === uid ? { ...l, ...updates } : l))
+      prev.map((l) => {
+        if (l.uid !== uid) return l;
+
+        const updatedLine = { ...l, ...updates };
+
+        const isQtyChanged = 'quantity' in updates && updates.quantity !== l.quantity;
+        const isUomChanged = 'uom_id' in updates && updates.uom_id !== l.uom_id;
+        const isPriceChanged = 'unit_price' in updates && updates.unit_price !== l.unit_price;
+        const isDiscountChanged = ('discount_amount' in updates && updates.discount_amount !== l.discount_amount) || ('discount_percent' in updates && updates.discount_percent !== l.discount_percent);
+        const isBatchChanged = 'batches' in updates;
+        const isFreeQtyChanged = 'is_free_qty' in updates && updates.is_free_qty !== l.is_free_qty;
+
+        const isQtyOrUomOrBatchChanged = isQtyChanged || isUomChanged || isBatchChanged || (isFreeQtyChanged && !updates.is_free_qty);
+
+        if (isQtyOrUomOrBatchChanged && updatedLine.pricing_rules && updatedLine.pricing_rules.length > 0 && !updatedLine.is_free_qty) {
+          const variantPriceField = config.priceField === 'default_cost_price' ? 'cost_price' : 'sale_price';
+          const actualVariant = updatedLine.item.variants?.find((v: any) => v.id === updatedLine.variant_id);
+          const batchPriceField = config.priceField === 'default_cost_price' ? 'cost_price' : 'selling_price';
+          const batchPrice = ['sales', 'quotation'].includes(config.type) && updatedLine.batches?.[0] ? (updatedLine.batches[0] as any)[batchPriceField] : undefined;
+          const basePrice = (batchPrice !== undefined && batchPrice !== null)
+            ? Number(batchPrice)
+            : (actualVariant 
+              ? Number(actualVariant[variantPriceField] || updatedLine.item[config.priceField] || 0) 
+              : Number(updatedLine.item[config.priceField] || 0));
+          
+          const uoms = updatedLine.item.uom?.uom_group?.uoms || [];
+          const currentUom = uoms.find((u: any) => u.id === (updatedLine.uom_id || updatedLine.item.uom_id));
+          const factor = Number(currentUom?.conversion_factor) || 1;
+          
+          const effectiveQty = updatedLine.quantity * factor;
+
+          console.log("DEBUG: handleUpdateLine rules -> ", {
+            basePrice, effectiveQty, rules: updatedLine.pricing_rules
+          });
+
+          const priceDetails = PriceCalculationService.calculatePriceDetails(basePrice, effectiveQty, updatedLine.pricing_rules, updatedLine.batches?.[0]?.batch_id);
+          updatedLine.unit_price = priceDetails.unitPrice * factor;
+          updatedLine.discount_percent = priceDetails.discountPercent;
+          updatedLine.discount_amount = priceDetails.discountAmount * factor;
+          updatedLine.applied_price_rule = priceDetails.appliedRule;
+          updatedLine.line_total = (updatedLine.unit_price * updatedLine.quantity) - updatedLine.discount_amount;
+        } else if (isQtyChanged || isUomChanged || isPriceChanged || isDiscountChanged) {
+          updatedLine.line_total = (updatedLine.unit_price * updatedLine.quantity) - updatedLine.discount_amount;
+          
+          const isManualPriceOverride = isPriceChanged && !isUomChanged;
+          if (isManualPriceOverride) {
+            updatedLine.applied_price_rule = undefined;
+          }
+        }
+
+        if (isQtyChanged && updatedLine.batches && updatedLine.batches.length === 1) {
+          updatedLine.batches[0].quantity = updatedLine.quantity;
+        }
+
+        return updatedLine;
+      })
     );
-  }, []);
+  }, [config.priceField]);
 
   // ── Remove line ──
   const handleRemoveLine = useCallback((uid: string) => {
-    setLineItems((prev) => prev.filter((l) => l.uid !== uid));
+    setLineItems((prev) => prev
+      .filter((l) => l.uid !== uid)
+      .map((l) => {
+        if (l.parent_line_uids && l.parent_line_uids.includes(uid)) {
+          return { ...l, parent_line_uids: l.parent_line_uids.filter((pUid) => pUid !== uid) };
+        }
+        return l;
+      })
+    );
   }, []);
 
   // ── Toggle expand ──
@@ -148,8 +312,8 @@ export function ProductTransactionScreen({
   }, []);
 
   // ── Calculations ──
-  const subtotal = useMemo(() => lineItems.reduce((s, l) => s + l.unit_price * l.quantity, 0), [lineItems]);
-  const discountTotal = useMemo(() => lineItems.reduce((s, l) => s + l.discount_amount, 0), [lineItems]);
+  const subtotal = useMemo(() => lineItems.reduce((s, l) => s + (Number(l.unit_price) || 0) * (Number(l.quantity) || 1), 0), [lineItems]);
+  const discountTotal = useMemo(() => lineItems.reduce((s, l) => s + (Number(l.discount_amount) || 0), 0), [lineItems]);
   const grandTotal = useMemo(() => subtotal - discountTotal, [subtotal, discountTotal]);
 
   // ── Submit handler ──
@@ -164,16 +328,25 @@ export function ProductTransactionScreen({
       }
     }
 
-    if (!config.disableTrackingSelection) {
-      for (const line of lineItems) {
-        if (line.item.tracking_type === 'batch') {
+    if (config.showWarehouse && !warehouseId) {
+      toast.error('Please select a warehouse.');
+      return;
+    }
+
+    for (const line of lineItems) {
+      if (line.item.tracking_type === 'batch') {
+        const requiresBatch = !config.disableTrackingSelection || ['sales', 'quotation'].includes(config.type);
+        if (requiresBatch) {
           const selectedTotal = line.batches?.reduce((sum, b) => sum + b.quantity, 0) || 0;
           if (selectedTotal !== line.quantity) {
             toast.error(`Please select batches for ${line.item.name} to match the total quantity.`);
             return;
           }
         }
-        if (line.item.tracking_type === 'serial') {
+      }
+      if (line.item.tracking_type === 'serial') {
+        const requiresSerial = !config.disableTrackingSelection;
+        if (requiresSerial) {
           const selectedCount = line.serial_numbers?.length || 0;
           if (selectedCount !== line.quantity) {
             toast.error(`Please select exactly ${line.quantity} serial numbers for ${line.item.name}.`);
@@ -190,6 +363,7 @@ export function ProductTransactionScreen({
       transaction_date: transactionDate,
       expected_delivery_date: expectedDeliveryDate || undefined,
       notes: notes || undefined,
+      revised_from_id: initialData?.revised_from_id || undefined,
       lines: lineItems.flatMap((l): TransactionPayload['lines'] => {
         if (l.batches && l.batches.length > 0) {
           return l.batches.map(b => ({
@@ -210,7 +384,7 @@ export function ProductTransactionScreen({
             purchase_order_line_id: l.purchase_order_line_id,
             unit_price: l.unit_price,
             discount_percent: l.discount_percent,
-            discount_amount: (l.discount_amount / l.quantity) * b.quantity,
+            unit_discount: l.discount_amount / l.quantity,
             line_total: (l.line_total / l.quantity) * b.quantity,
           }));
         }
@@ -232,7 +406,7 @@ export function ProductTransactionScreen({
           purchase_order_line_id: l.purchase_order_line_id,
           unit_price: l.unit_price,
           discount_percent: l.discount_percent,
-          discount_amount: l.discount_amount,
+          unit_discount: l.discount_amount / l.quantity,
           line_total: l.line_total,
         }];
       }),
@@ -260,7 +434,7 @@ export function ProductTransactionScreen({
     } finally {
       setIsSubmitting(false);
     }
-  }, [lineItems, config, partyId, warehouseId, transactionDate, expectedDeliveryDate, notes, payments, subtotal, discountTotal, grandTotal, onSubmit, defaultWarehouseId]);
+  }, [lineItems, config, partyId, warehouseId, transactionDate, expectedDeliveryDate, notes, payments, subtotal, discountTotal, grandTotal, onSubmit, defaultWarehouseId, initialData]);
 
   return (
     <div className="flex flex-col h-full">
@@ -270,6 +444,7 @@ export function ProductTransactionScreen({
         <div className="flex-[3] min-w-0 flex flex-col">
           <ProductSelectionPanel
             config={config}
+            partyId={partyId}
             warehouseId={warehouseId ?? undefined}
             lineItems={lineItems}
             onAddItem={handleAddItem}
@@ -295,7 +470,81 @@ export function ProductTransactionScreen({
             expectedDeliveryDate={expectedDeliveryDate}
             notes={notes}
             payments={payments}
-            onPartyChange={(id, party) => { setPartyId(id); setPartyName(party?.name ?? null); }}
+            onPartyChange={async (id, party) => { 
+              if (partyId !== id && lineItems.length > 0 && ['sales', 'pos', 'quotation'].includes(config.type)) {
+                if (hasActivePriceLists) {
+                  toast.loading('Checking price changes...', { id: 'price-calc' });
+                  try {
+                    const res = await evaluatePriceLists({
+                      party_id: id || null,
+                      transaction_type: config.type,
+                      items: lineItems.filter(l => l.variant_id && !l.is_free_qty).map(l => ({ variant_id: l.variant_id! }))
+                    });
+                    
+                    toast.dismiss('price-calc');
+                    
+                    if (res.is_success && res.result) {
+                      const evaluatedRules = res.result as Record<number, any[]>;
+                      
+                      let hasActualPriceChanges = false;
+                      for (const l of lineItems) {
+                        if (!l.is_free_qty && l.variant_id && evaluatedRules[l.variant_id]) {
+                          const rules = evaluatedRules[l.variant_id];
+                          const variantPriceField = config.priceField === 'default_cost_price' ? 'cost_price' : 'sale_price';
+                          const actualVariant = l.item.variants?.find((v: any) => v.id === l.variant_id);
+                          const batchPriceField = config.priceField === 'default_cost_price' ? 'cost_price' : 'selling_price';
+                          const batchPrice = ['sales', 'quotation'].includes(config.type) && l.batches?.[0] ? (l.batches[0] as any)[batchPriceField] : undefined;
+                          const basePrice = (batchPrice !== undefined && batchPrice !== null)
+                            ? Number(batchPrice)
+                            : (actualVariant 
+                              ? Number(actualVariant[variantPriceField] || l.item[config.priceField] || 0) 
+                              : Number(l.item[config.priceField] || 0));
+                          
+                          const uoms = l.item.uom?.uom_group?.uoms || [];
+                          const currentUom = uoms.find((u: any) => u.id === (l.uom_id || l.item.uom_id));
+                          const factor = Number(currentUom?.conversion_factor) || 1;
+                          const effectiveQty = l.quantity * factor;
+
+                          const priceDetails = PriceCalculationService.calculatePriceDetails(basePrice, effectiveQty, rules, l.batches?.[0]?.batch_id);
+                          
+                          if (Math.abs((priceDetails.unitPrice * factor) - l.unit_price) > 0.001) {
+                            hasActualPriceChanges = true;
+                            break;
+                          }
+                        }
+                      }
+                      
+                      if (hasActualPriceChanges) {
+                        const previousRulesApplied = lineItems.some(l => l.applied_price_rule);
+                        setPriceEvaluationModal({
+                          isOpen: true,
+                          type: (partyId && previousRulesApplied) ? 'force' : 'confirm',
+                          evaluatedRules,
+                          pendingPartyId: id,
+                          pendingParty: party
+                        });
+                        return;
+                      } else {
+                        // No immediate price changes for current quantities,
+                        // but we still need to update the rules in the background
+                        // so that if they change quantity later, it uses the new rules!
+                        setLineItems(prev => prev.map(l => {
+                          if (!l.is_free_qty && l.variant_id && evaluatedRules[l.variant_id]) {
+                            return { ...l, pricing_rules: evaluatedRules[l.variant_id] };
+                          }
+                          return l;
+                        }));
+                      }
+                    }
+                  } catch (e) {
+                    toast.dismiss('price-calc');
+                    toast.error('Failed to check prices');
+                  }
+                }
+              }
+              setPartyId(id); 
+              setPartyName(party?.name ?? null); 
+            }}
             onWarehouseChange={(id, name) => { setWarehouseId(id); setWarehouseName(name ?? null); }}
             onDateChange={setTransactionDate}
             onExpectedDeliveryDateChange={setExpectedDeliveryDate}
@@ -308,6 +557,56 @@ export function ProductTransactionScreen({
           />
         </div>
       </div>
+
+      {/* ── Price Evaluation Modal ── */}
+      {priceEvaluationModal && (
+        <Modal
+          isOpen={priceEvaluationModal.isOpen}
+          onClose={() => {
+            if (priceEvaluationModal.type === 'confirm') {
+              setPartyId(priceEvaluationModal.pendingPartyId);
+              setPartyName(priceEvaluationModal.pendingParty?.name ?? null);
+              setPriceEvaluationModal(null);
+            }
+          }}
+          title="Price List Update"
+          backdrop="opaque"
+          size="sm"
+        >
+          <div className="text-[14px] text-foreground-1 leading-relaxed">
+            {priceEvaluationModal.type === 'confirm' 
+              ? "A few items have price changes based on the price list. Do you want to apply them?"
+              : "Prices need to be changed based on the party selection."}
+          </div>
+          <ModalFooter>
+            {priceEvaluationModal.type === 'confirm' && (
+              <Button 
+                variant="flat" 
+                color="secondary" 
+                onClick={() => {
+                  setPartyId(priceEvaluationModal.pendingPartyId);
+                  setPartyName(priceEvaluationModal.pendingParty?.name ?? null);
+                  setPriceEvaluationModal(null);
+                }}
+              >
+                No
+              </Button>
+            )}
+            <Button 
+              color="primary" 
+              onClick={() => {
+                applyEvaluatedPrices(priceEvaluationModal.evaluatedRules);
+                setPartyId(priceEvaluationModal.pendingPartyId);
+                setPartyName(priceEvaluationModal.pendingParty?.name ?? null);
+                setPriceEvaluationModal(null);
+                toast.success('Prices updated based on party selection');
+              }}
+            >
+              {priceEvaluationModal.type === 'confirm' ? 'Yes' : 'OK'}
+            </Button>
+          </ModalFooter>
+        </Modal>
+      )}
     </div>
   );
 }

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

@@ -19,9 +19,9 @@ export interface TransactionItem {
   is_discountable: boolean;
   category?: { id: number; name: string };
   brand?: { id: number; name: string };
-  uom?: { 
-    id: number; 
-    name: string; 
+  uom?: {
+    id: number;
+    name: string;
     abbreviation: string;
     uom_group?: {
       id: number;
@@ -41,6 +41,7 @@ export interface TransactionItemVariant {
   cost_price?: number;
   sale_price?: number;
   additional_price?: number;
+  pricing_rules?: any[];
 }
 
 export interface TransactionBatch {
@@ -78,12 +79,16 @@ export interface TransactionLineItem {
   parent_line_uids?: string[];
   uom_id?: number;
   purchase_order_line_id?: number | null;
+  sales_order_line_id?: number | null;
+  sales_quotation_line_id?: number | null;
   unit_price: number;
   discount_percent: number;
   discount_amount: number;
   line_total: number;
   notes?: string;
   expanded?: boolean;         // Whether the detail row is expanded
+  pricing_rules?: any[];
+  applied_price_rule?: any;
 }
 
 import type { PaymentModeField, PaymentMode, PaymentEntry, BankAccount } from '../PaymentSection';
@@ -150,12 +155,20 @@ export interface TransactionScreenConfig {
   showStock?: boolean;
   /** Enable purchase unit selection (dynamic setting) */
   enablePurchaseUnit?: boolean;
+  /** Enable sales unit selection (dynamic setting) */
+  enableSalesUnit?: boolean;
   /** Show expected delivery date */
   showExpectedDeliveryDate?: boolean;
+  /** Label for the expected delivery date field */
+  expectedDeliveryDateLabel?: string;
   /** Disable batch/serial selection completely (e.g. for Purchase Orders and Quotations) */
   disableTrackingSelection?: boolean;
   /** Enforce that the sum of payments equals the grand total before allowing submission */
   requireFullPayment?: boolean;
+  /** Disable party selection (e.g. for revisions) */
+  disablePartySelection?: boolean;
+  /** Disable warehouse selection (e.g. for revisions) */
+  disableWarehouseSelection?: boolean;
 }
 
 // ── Module Presets ──
@@ -174,7 +187,7 @@ export const TRANSACTION_PRESETS: Record<TransactionType, TransactionScreenConfi
     submitLabel: 'Create Sales Order',
     title: 'New Sale',
     allowCreateBatchAndSerial: false,
-    allowEditPrice: false,
+    allowEditPrice: true,
     showStock: true,
   },
   quotation: {
@@ -190,8 +203,10 @@ export const TRANSACTION_PRESETS: Record<TransactionType, TransactionScreenConfi
     submitLabel: 'Create Quotation',
     title: 'New Quotation',
     allowCreateBatchAndSerial: false,
-    allowEditPrice: false,
+    allowEditPrice: true,
     showStock: true,
+    showExpectedDeliveryDate: true,
+    expectedDeliveryDateLabel: 'Valid Until',
     disableTrackingSelection: true,
   },
   purchase: {
@@ -243,7 +258,7 @@ export const TRANSACTION_PRESETS: Record<TransactionType, TransactionScreenConfi
     submitLabel: 'Complete Sale',
     title: 'POS Checkout',
     allowCreateBatchAndSerial: false,
-    allowEditPrice: false,
+    allowEditPrice: true,
     showStock: true,
   },
   opening_stock: {
@@ -308,6 +323,7 @@ export interface TransactionPayload {
   transaction_date?: string;
   expected_delivery_date?: string;
   notes?: string;
+  revised_from_id?: number | null;
   lines: Array<{
     item_id: number;
     variant_id?: number | null;
@@ -326,7 +342,7 @@ export interface TransactionPayload {
     purchase_order_line_id?: number | null;
     unit_price: number;
     discount_percent: number;
-    discount_amount: number;
+    unit_discount: number;
     line_total: number;
   }>;
   payments?: PaymentEntry[];