tt-entities 0.0.51 → 0.0.53

package/libs/tatayab-entities-library/src/entities/order-item-bundle-selection.entity.ts

@@ -1,7 +1,26 @@
-import { Table, Column, Model, ForeignKey, BelongsTo } from 'sequelize-typescript';
+import {
+  Table,
+  Column,
+  Model,
+  ForeignKey,
+  BelongsTo,
+  DataType,
+} from 'sequelize-typescript';
 import { OrderItem } from './order-item.entity';
 import { Product } from './product.entity';
 import { ProductVariant } from './product-variant.entity';
+import { PurchaseOrderItem } from './purchase-order-item.entity';
+
+export enum BundleSelectionFulfillmentStatus {
+  PENDING = 'pending',
+  AWAITING_STOCK = 'awaiting_stock', // needs vendor PO
+  PO_LINKED = 'po_linked', // PO created and linked
+  PO_RECEIVED = 'po_received', // stock arrived
+  STOCK_RESERVED = 'stock_reserved', // stock locked for this order
+  PACKED = 'packed',
+  SHIPPED = 'shipped',
+  DELIVERED = 'delivered',
+}
 
 @Table
 export class OrderItemBundleSelection extends Model {
@@ -17,22 +36,30 @@ export class OrderItemBundleSelection extends Model {
   @Column({ allowNull: true })
   declare productVariantId?: number;
 
-  @Column({ allowNull: true })
-  declare productNameEn?: string;
+  @Column({ allowNull: true }) declare productNameEn?: string;
+  @Column({ allowNull: true }) declare productNameAr?: string;
+  @Column({ allowNull: true }) declare variantLabelEn?: string;
+  @Column({ allowNull: true }) declare variantLabelAr?: string;
 
-  @Column({ allowNull: true })
-  declare productNameAr?: string;
+  @Column({ allowNull: false, defaultValue: 0 })
+  declare sortOrder: number;
 
-  @Column({ allowNull: true })
-  declare variantLabelEn?: string;
+  // ── NEW: per-selection fulfillment tracking ──────────────────────────────────
+  @Column({
+    type: DataType.ENUM(...Object.values(BundleSelectionFulfillmentStatus)),
+    allowNull: false,
+    defaultValue: BundleSelectionFulfillmentStatus.PENDING,
+  })
+  declare fulfillmentStatus: BundleSelectionFulfillmentStatus;
 
+  // Which PO item is fulfilling this selection (set when PO is created)
+  @ForeignKey(() => PurchaseOrderItem)
   @Column({ allowNull: true })
-  declare variantLabelAr?: string;
-
-  @Column({ allowNull: false, defaultValue: 0 })
-  declare sortOrder: number;
+  declare purchaseOrderItemId?: number;
 
-  @BelongsTo(() => OrderItem)  declare orderItem: OrderItem;
-  @BelongsTo(() => Product)    declare product: Product;
+  @BelongsTo(() => OrderItem) declare orderItem: OrderItem;
+  @BelongsTo(() => Product) declare product: Product;
   @BelongsTo(() => ProductVariant) declare variant?: ProductVariant;
+  @BelongsTo(() => PurchaseOrderItem)
+  declare purchaseOrderItem?: PurchaseOrderItem;
 }

package/libs/tatayab-entities-library/src/entities/product-store.entity.ts

@@ -3,10 +3,12 @@ import {
   Column,
   Model,
   ForeignKey,
+  BelongsTo,
   DataType,
 } from 'sequelize-typescript';
 import { Product } from './product.entity';
 import { Store } from './store.entity';
+import { ProductVariant } from './product-variant.entity';
 import { Status } from '../utils/enums/status';
 
 @Table
@@ -19,11 +21,23 @@ export class ProductStore extends Model {
   @Column({ allowNull: false })
   declare storeId: number;
 
-  // Store-specific regular price — null means use product.defaultPrice
+  // ── Variant dimension ──────────────────────────────────────────────────────
+  // null  = this pricing row is the product-level fallback
+  //         (used when product.hasVariants = false, OR as fallback for any
+  //          variant that does NOT have its own specific pricing row)
+  // set   = this pricing row applies to ONE specific variant only
+  //         (used when product.hasVariants = true — set a different price
+  //          for each variant e.g. 50ml=5.000, 100ml=8.000, 200ml=12.000)
+  @ForeignKey(() => ProductVariant)
+  @Column({ allowNull: true })
+  declare productVariantId?: number;
+
+  // Store-specific regular price
+  // null = use variant.priceOverride, then product.defaultPrice
   @Column({ type: DataType.DECIMAL(10, 3), allowNull: true })
   declare price?: number;
 
-  // Sale price — only active when today is between saleStartDate and saleEndDate
+  // Sale price — only active when today is within saleStartDate → saleEndDate
   @Column({ type: DataType.DECIMAL(10, 3), allowNull: true })
   declare salePrice?: number;
 
@@ -38,4 +52,15 @@ export class ProductStore extends Model {
     defaultValue: Status.ACTIVE,
   })
   declare status: Status;
+
+  // ─── Associations ──────────────────────────────────────────────────────────
+
+  @BelongsTo(() => Product)
+  declare product: Product;
+
+  @BelongsTo(() => Store)
+  declare store: Store;
+
+  @BelongsTo(() => ProductVariant)
+  declare variant?: ProductVariant;
 }

package/libs/tatayab-entities-library/src/entities/purchase-order-order-item.entity.ts

@@ -1,14 +1,16 @@
 import {
-  Table, Column, Model, ForeignKey, BelongsTo, DataType,
+  Table,
+  Column,
+  Model,
+  ForeignKey,
+  BelongsTo,
 } from 'sequelize-typescript';
 import { PurchaseOrder } from './purchase-order.entity';
 import { PurchaseOrderItem } from './purchase-order-item.entity';
 import { OrderItem } from './order-item.entity';
 import { Order } from './order.entity';
+import { OrderItemBundleSelection } from './order-item-bundle-selection.entity';
 
-// Junction table: links a PO item to the order item(s) it will fulfill
-// One PO item can cover items from multiple orders
-// One order item is linked to exactly one PO item
 @Table
 export class PurchaseOrderOrderItem extends Model {
   @ForeignKey(() => PurchaseOrder)
@@ -27,12 +29,20 @@ export class PurchaseOrderOrderItem extends Model {
   @Column({ allowNull: false })
   declare orderItemId: number;
 
-  // How many units of this PO item are allocated to this order item
+  // NEW: For bundle items, which specific selection this PO item fulfills
+  // null = direct product order item (not a bundle selection)
+  @ForeignKey(() => OrderItemBundleSelection)
+  @Column({ allowNull: true })
+  declare orderItemBundleSelectionId?: number;
+
   @Column({ allowNull: false, defaultValue: 1 })
   declare allocatedQuantity: number;
 
-  @BelongsTo(() => PurchaseOrder)     declare purchaseOrder: PurchaseOrder;
-  @BelongsTo(() => PurchaseOrderItem) declare purchaseOrderItem: PurchaseOrderItem;
-  @BelongsTo(() => Order)             declare order: Order;
-  @BelongsTo(() => OrderItem)         declare orderItem: OrderItem;
+  @BelongsTo(() => PurchaseOrder) declare purchaseOrder: PurchaseOrder;
+  @BelongsTo(() => PurchaseOrderItem)
+  declare purchaseOrderItem: PurchaseOrderItem;
+  @BelongsTo(() => Order) declare order: Order;
+  @BelongsTo(() => OrderItem) declare orderItem: OrderItem;
+  @BelongsTo(() => OrderItemBundleSelection)
+  declare bundleSelection?: OrderItemBundleSelection;
 }

package/libs/tatayab-entities-library/src/entities/purchase-order-receipt-item.entity.ts

@@ -0,0 +1,26 @@
+import {
+  Table,
+  Column,
+  Model,
+  ForeignKey,
+  BelongsTo,
+} from 'sequelize-typescript';
+import { PurchaseOrderReceipt } from './purchase-order-receipt.entity';
+import { PurchaseOrderItem } from './purchase-order-item.entity';
+
+@Table
+export class PurchaseOrderReceiptItem extends Model {
+  @ForeignKey(() => PurchaseOrderReceipt)
+  @Column({ allowNull: false })
+  declare receiptId: number;
+
+  @ForeignKey(() => PurchaseOrderItem)
+  @Column({ allowNull: false })
+  declare purchaseOrderItemId: number;
+
+  @Column({ allowNull: false, defaultValue: 0 })
+  declare receivedQuantity: number;
+
+  @BelongsTo(() => PurchaseOrderReceipt) declare receipt: PurchaseOrderReceipt;
+  @BelongsTo(() => PurchaseOrderItem) declare poItem: PurchaseOrderItem;
+}

package/libs/tatayab-entities-library/src/entities/purchase-order-receipt.entity.ts

@@ -0,0 +1,37 @@
+import {
+  Table,
+  Column,
+  Model,
+  ForeignKey,
+  BelongsTo,
+  HasMany,
+  DataType,
+} from 'sequelize-typescript';
+import { PurchaseOrder } from './purchase-order.entity';
+import { SysUser } from './sys.user.entity';
+import { PurchaseOrderReceiptItem } from './purchase-order-receipt-item.entity';
+
+@Table
+export class PurchaseOrderReceipt extends Model {
+  @ForeignKey(() => PurchaseOrder)
+  @Column({ allowNull: false })
+  declare purchaseOrderId: number;
+
+  @ForeignKey(() => SysUser)
+  @Column({ allowNull: true })
+  declare receivedBy?: number;
+
+  @Column({ type: DataType.TEXT, allowNull: true })
+  declare notes?: string;
+
+  @Column({ type: DataType.TEXT, allowNull: true })
+  declare invoiceUrl?: string; // optional
+
+  @Column({ type: DataType.TEXT, allowNull: false })
+  declare receivingDocumentUrl: string; // MANDATORY
+
+  @BelongsTo(() => PurchaseOrder) declare purchaseOrder: PurchaseOrder;
+  @BelongsTo(() => SysUser) declare receiver?: SysUser;
+  @HasMany(() => PurchaseOrderReceiptItem)
+  declare items: PurchaseOrderReceiptItem[];
+}

package/libs/tatayab-entities-library/src/index.ts

@@ -78,6 +78,8 @@ import { PurchaseOrderOrderItem } from './entities/purchase-order-order-item.ent
 import { RunSheet } from './entities/run-sheet.entity';
 import { RunSheetOrder } from './entities/run-sheet-order.entity';
 import { Refund } from './entities/refund.entity';
+import { PurchaseOrderReceipt } from './entities/purchase-order-receipt.entity';
+import { PurchaseOrderReceiptItem } from './entities/purchase-order-receipt-item.entity';
 
 // =============================================================================
 // EXPORTS
@@ -197,6 +199,8 @@ export {
   TransactionCategory,
 } from './entities/user-transaction.entity';
 export { PurchaseOrderOrderItem } from './entities/purchase-order-order-item.entity';
+export { PurchaseOrderReceipt } from './entities/purchase-order-receipt.entity';
+export { PurchaseOrderReceiptItem } from './entities/purchase-order-receipt-item.entity';
 
 // ─── Enums ────────────────────────────────────────────────────────────────────
 export { OsName } from './utils/enums/osName';
@@ -296,6 +300,8 @@ export function getDbModels(): ModelCtor[] {
     RunSheet,
     RunSheetOrder,
 
-    Refund
+    Refund,
+    PurchaseOrderReceipt,
+    PurchaseOrderReceiptItem,
   ];
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tt-entities",
-  "version": "0.0.51",
+  "version": "0.0.53",
   "description": "Tatayab entities library",
   "main": "dist/libs/tatayab-entities-library/index.js",
   "types": "dist/libs/tatayab-entities-library/index.d.ts",