@open-mercato/core 0.4.8-develop-d16e2f51dc → 0.4.8-develop-4b58cde65d

package/src/modules/sales/migrations/.snapshot-open-mercato.json

@@ -3526,6 +3526,198 @@
       },
       "nativeEnums": {}
     },
+    {
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "default": "gen_random_uuid()",
+          "mappedType": "uuid"
+        },
+        "order_id": {
+          "name": "order_id",
+          "type": "uuid",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "mappedType": "uuid"
+        },
+        "organization_id": {
+          "name": "organization_id",
+          "type": "uuid",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "mappedType": "uuid"
+        },
+        "tenant_id": {
+          "name": "tenant_id",
+          "type": "uuid",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "mappedType": "uuid"
+        },
+        "return_number": {
+          "name": "return_number",
+          "type": "text",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "mappedType": "text"
+        },
+        "status_entry_id": {
+          "name": "status_entry_id",
+          "type": "uuid",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": true,
+          "mappedType": "uuid"
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": true,
+          "mappedType": "text"
+        },
+        "reason": {
+          "name": "reason",
+          "type": "text",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": true,
+          "mappedType": "text"
+        },
+        "notes": {
+          "name": "notes",
+          "type": "text",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": true,
+          "mappedType": "text"
+        },
+        "returned_at": {
+          "name": "returned_at",
+          "type": "timestamptz",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": true,
+          "length": 6,
+          "mappedType": "datetime"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamptz",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "length": 6,
+          "mappedType": "datetime"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamptz",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "length": 6,
+          "mappedType": "datetime"
+        },
+        "deleted_at": {
+          "name": "deleted_at",
+          "type": "timestamptz",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": true,
+          "length": 6,
+          "mappedType": "datetime"
+        }
+      },
+      "name": "sales_returns",
+      "schema": "public",
+      "indexes": [
+        {
+          "keyName": "sales_returns_status_idx",
+          "columnNames": [
+            "organization_id",
+            "tenant_id",
+            "status"
+          ],
+          "composite": true,
+          "constraint": false,
+          "primary": false,
+          "unique": false
+        },
+        {
+          "keyName": "sales_returns_scope_idx",
+          "columnNames": [
+            "order_id",
+            "organization_id",
+            "tenant_id"
+          ],
+          "composite": true,
+          "constraint": false,
+          "primary": false,
+          "unique": false
+        },
+        {
+          "keyName": "sales_returns_number_unique",
+          "columnNames": [
+            "organization_id",
+            "tenant_id",
+            "return_number"
+          ],
+          "composite": true,
+          "constraint": true,
+          "primary": false,
+          "unique": true
+        },
+        {
+          "keyName": "sales_returns_pkey",
+          "columnNames": [
+            "id"
+          ],
+          "composite": false,
+          "constraint": true,
+          "primary": true,
+          "unique": true
+        }
+      ],
+      "checks": [],
+      "foreignKeys": {
+        "sales_returns_order_id_foreign": {
+          "constraintName": "sales_returns_order_id_foreign",
+          "columnNames": [
+            "order_id"
+          ],
+          "localTableName": "public.sales_returns",
+          "referencedColumnNames": [
+            "id"
+          ],
+          "referencedTableName": "public.sales_orders",
+          "updateRule": "cascade"
+        }
+      },
+      "nativeEnums": {}
+    },
     {
       "columns": {
         "id": {
@@ -4388,6 +4580,212 @@
       },
       "nativeEnums": {}
     },
+    {
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "default": "gen_random_uuid()",
+          "mappedType": "uuid"
+        },
+        "return_id": {
+          "name": "return_id",
+          "type": "uuid",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "mappedType": "uuid"
+        },
+        "order_line_id": {
+          "name": "order_line_id",
+          "type": "uuid",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "mappedType": "uuid"
+        },
+        "organization_id": {
+          "name": "organization_id",
+          "type": "uuid",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "mappedType": "uuid"
+        },
+        "tenant_id": {
+          "name": "tenant_id",
+          "type": "uuid",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "mappedType": "uuid"
+        },
+        "quantity_returned": {
+          "name": "quantity_returned",
+          "type": "numeric(18,4)",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "precision": 18,
+          "scale": 4,
+          "default": "'0'",
+          "mappedType": "decimal"
+        },
+        "unit_price_net": {
+          "name": "unit_price_net",
+          "type": "numeric(18,4)",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "precision": 18,
+          "scale": 4,
+          "default": "'0'",
+          "mappedType": "decimal"
+        },
+        "unit_price_gross": {
+          "name": "unit_price_gross",
+          "type": "numeric(18,4)",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "precision": 18,
+          "scale": 4,
+          "default": "'0'",
+          "mappedType": "decimal"
+        },
+        "total_net_amount": {
+          "name": "total_net_amount",
+          "type": "numeric(18,4)",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "precision": 18,
+          "scale": 4,
+          "default": "'0'",
+          "mappedType": "decimal"
+        },
+        "total_gross_amount": {
+          "name": "total_gross_amount",
+          "type": "numeric(18,4)",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "precision": 18,
+          "scale": 4,
+          "default": "'0'",
+          "mappedType": "decimal"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamptz",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "length": 6,
+          "mappedType": "datetime"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamptz",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "length": 6,
+          "mappedType": "datetime"
+        },
+        "deleted_at": {
+          "name": "deleted_at",
+          "type": "timestamptz",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": true,
+          "length": 6,
+          "mappedType": "datetime"
+        }
+      },
+      "name": "sales_return_lines",
+      "schema": "public",
+      "indexes": [
+        {
+          "keyName": "sales_return_lines_order_line_idx",
+          "columnNames": [
+            "order_line_id",
+            "organization_id",
+            "tenant_id"
+          ],
+          "composite": true,
+          "constraint": false,
+          "primary": false,
+          "unique": false
+        },
+        {
+          "keyName": "sales_return_lines_return_idx",
+          "columnNames": [
+            "return_id",
+            "organization_id",
+            "tenant_id"
+          ],
+          "composite": true,
+          "constraint": false,
+          "primary": false,
+          "unique": false
+        },
+        {
+          "keyName": "sales_return_lines_pkey",
+          "columnNames": [
+            "id"
+          ],
+          "composite": false,
+          "constraint": true,
+          "primary": true,
+          "unique": true
+        }
+      ],
+      "checks": [],
+      "foreignKeys": {
+        "sales_return_lines_return_id_foreign": {
+          "constraintName": "sales_return_lines_return_id_foreign",
+          "columnNames": [
+            "return_id"
+          ],
+          "localTableName": "public.sales_return_lines",
+          "referencedColumnNames": [
+            "id"
+          ],
+          "referencedTableName": "public.sales_returns",
+          "updateRule": "cascade"
+        },
+        "sales_return_lines_order_line_id_foreign": {
+          "constraintName": "sales_return_lines_order_line_id_foreign",
+          "columnNames": [
+            "order_line_id"
+          ],
+          "localTableName": "public.sales_return_lines",
+          "referencedColumnNames": [
+            "id"
+          ],
+          "referencedTableName": "public.sales_order_lines",
+          "updateRule": "cascade"
+        }
+      },
+      "nativeEnums": {}
+    },
     {
       "columns": {
         "id": {

package/src/modules/sales/migrations/Migration20260309073310.ts

@@ -0,0 +1,26 @@
+import { Migration } from '@mikro-orm/migrations';
+
+export class Migration20260309073310 extends Migration {
+
+  override async up(): Promise<void> {
+    this.addSql(`create table "sales_returns" ("id" uuid not null default gen_random_uuid(), "order_id" uuid not null, "organization_id" uuid not null, "tenant_id" uuid not null, "return_number" text not null, "status_entry_id" uuid null, "status" text null, "reason" text null, "notes" text null, "returned_at" timestamptz null, "created_at" timestamptz not null, "updated_at" timestamptz not null, "deleted_at" timestamptz null, constraint "sales_returns_pkey" primary key ("id"));`);
+    this.addSql(`create index "sales_returns_status_idx" on "sales_returns" ("organization_id", "tenant_id", "status");`);
+    this.addSql(`create index "sales_returns_scope_idx" on "sales_returns" ("order_id", "organization_id", "tenant_id");`);
+    this.addSql(`alter table "sales_returns" add constraint "sales_returns_number_unique" unique ("organization_id", "tenant_id", "return_number");`);
+
+    this.addSql(`create table "sales_return_lines" ("id" uuid not null default gen_random_uuid(), "return_id" uuid not null, "order_line_id" uuid not null, "organization_id" uuid not null, "tenant_id" uuid not null, "quantity_returned" numeric(18,4) not null default '0', "unit_price_net" numeric(18,4) not null default '0', "unit_price_gross" numeric(18,4) not null default '0', "total_net_amount" numeric(18,4) not null default '0', "total_gross_amount" numeric(18,4) not null default '0', "created_at" timestamptz not null, "updated_at" timestamptz not null, "deleted_at" timestamptz null, constraint "sales_return_lines_pkey" primary key ("id"));`);
+    this.addSql(`create index "sales_return_lines_order_line_idx" on "sales_return_lines" ("order_line_id", "organization_id", "tenant_id");`);
+    this.addSql(`create index "sales_return_lines_return_idx" on "sales_return_lines" ("return_id", "organization_id", "tenant_id");`);
+
+    this.addSql(`alter table "sales_returns" add constraint "sales_returns_order_id_foreign" foreign key ("order_id") references "sales_orders" ("id") on update cascade;`);
+
+    this.addSql(`alter table "sales_return_lines" add constraint "sales_return_lines_return_id_foreign" foreign key ("return_id") references "sales_returns" ("id") on update cascade;`);
+    this.addSql(`alter table "sales_return_lines" add constraint "sales_return_lines_order_line_id_foreign" foreign key ("order_line_id") references "sales_order_lines" ("id") on update cascade;`);
+  }
+
+  override async down(): Promise<void> {
+    this.addSql(`drop table if exists "sales_return_lines" cascade;`);
+    this.addSql(`drop table if exists "sales_returns" cascade;`);
+  }
+
+}

package/src/modules/sales/services/salesDocumentNumberGenerator.ts

@@ -4,6 +4,7 @@ import { SalesDocumentSequence, SalesSettings } from '../data/entities'
 import {
   DEFAULT_ORDER_NUMBER_FORMAT,
   DEFAULT_QUOTE_NUMBER_FORMAT,
+  DEFAULT_RETURN_NUMBER_FORMAT,
   type SalesDocumentNumberKind,
 } from '../lib/documentNumberTokens'
 
@@ -25,6 +26,7 @@ type SettingsSnapshot = {
 type SequenceSnapshot = {
   order: number
   quote: number
+  return: number
 }
 
 const MAX_SEQUENCE = 1_000_000_000
@@ -68,11 +70,12 @@ export class SalesDocumentNumberGenerator {
   }
 
   async peekSequences(scope: Scope): Promise<SequenceSnapshot> {
-    const [order, quote] = await Promise.all([
+    const [order, quote, salesReturn] = await Promise.all([
       this.peekNextSequence('order', scope),
       this.peekNextSequence('quote', scope),
+      this.peekNextSequence('return', scope),
     ])
-    return { order, quote }
+    return { order, quote, return: salesReturn }
   }
 
   async setNextSequence(kind: SalesDocumentNumberKind, scope: Scope, nextValue: number): Promise<void> {
@@ -93,7 +96,11 @@ export class SalesDocumentNumberGenerator {
     const settings = await this.getSettings(params)
     const format =
       params.format?.trim() ||
-      (params.kind === 'order' ? settings.orderNumberFormat : settings.quoteNumberFormat)
+      (params.kind === 'order'
+        ? settings.orderNumberFormat
+        : params.kind === 'quote'
+          ? settings.quoteNumberFormat
+          : DEFAULT_RETURN_NUMBER_FORMAT)
     const sequence = await this.claimSequence(params.kind, params)
     const number = this.formatNumber(format, {
       kind: params.kind,
@@ -138,7 +145,11 @@ export class SalesDocumentNumberGenerator {
   ): string {
     const source =
       template?.trim() ||
-      (context.kind === 'order' ? DEFAULT_ORDER_NUMBER_FORMAT : DEFAULT_QUOTE_NUMBER_FORMAT)
+      (context.kind === 'order'
+        ? DEFAULT_ORDER_NUMBER_FORMAT
+        : context.kind === 'quote'
+          ? DEFAULT_QUOTE_NUMBER_FORMAT
+          : DEFAULT_RETURN_NUMBER_FORMAT)
     const now = context.date
     return source.replace(/\{([a-zA-Z]+)(?::([^}]+))?\}/g, (match, rawToken, rawArg) => {
       const token = rawToken.toLowerCase()

package/src/modules/sales/setup.ts

@@ -67,7 +67,7 @@ export const setup: ModuleSetupConfig = {
       )
     }
 
-    for (const kind of ['order', 'quote'] as const) {
+    for (const kind of ['order', 'quote', 'return'] as const) {
       const seq = await em.findOne(SalesDocumentSequence, {
         tenantId,
         organizationId,

package/src/modules/sales/widgets/injection/document-history/widget.client.tsx

@@ -258,24 +258,33 @@ export const DocumentHistoryWidget: React.FC<InjectionWidgetComponentProps<unkno
   const [filter, setFilter] = React.useState<FilterKind>('all')
 
   React.useEffect(() => {
-    apiCall<{ items?: unknown[] }>('/api/sales/order-statuses?pageSize=100')
-      .then((res) => {
-        if (res.ok && Array.isArray(res.result?.items)) {
-          const map: Record<string, StatusOption> = {}
-          for (const item of res.result.items) {
-            if (!item || typeof item !== 'object') continue
-            const d = item as Record<string, unknown>
-            const value = typeof d.value === 'string' ? d.value : null
-            if (!value) continue
-            map[value] = {
-              value,
-              label: typeof d.label === 'string' && d.label.length ? d.label : value,
-              color: typeof d.color === 'string' && d.color.length ? d.color : null,
-              icon: typeof d.icon === 'string' && d.icon.length ? d.icon : null,
-            }
-          }
-          setStatusMap(map)
+    const urls = [
+      '/api/sales/order-statuses?pageSize=100',
+      '/api/sales/shipment-statuses?pageSize=100',
+      '/api/sales/payment-statuses?pageSize=100',
+    ]
+    const map: Record<string, StatusOption> = {}
+    const merge = (items: unknown[]) => {
+      if (!Array.isArray(items)) return
+      for (const item of items) {
+        if (!item || typeof item !== 'object') continue
+        const d = item as Record<string, unknown>
+        const value = typeof d.value === 'string' ? d.value : null
+        if (!value) continue
+        map[value] = {
+          value,
+          label: typeof d.label === 'string' && d.label.length ? d.label : value,
+          color: typeof d.color === 'string' && d.color.length ? d.color : null,
+          icon: typeof d.icon === 'string' && d.icon.length ? d.icon : null,
+        }
+      }
+    }
+    Promise.all(urls.map((url) => apiCall<{ items?: unknown[] }>(url)))
+      .then((responses) => {
+        for (const res of responses) {
+          if (res.ok && Array.isArray(res.result?.items)) merge(res.result.items)
         }
+        setStatusMap(map)
       })
       .catch(() => {})
   }, [])