cabloy 5.1.149 → 5.1.151

package/vona/src/suite/a-commerce/modules/commerce-catalog/src/.metadata/index.ts

@@ -357,114 +357,6 @@ declare module 'vona-module-a-orm' {
   }
 }
 /** model: end */
-/** service: begin */
-export * from '../service/category.ts';
-export * from '../service/product.ts';
-export * from '../service/sku.ts';
-
-import 'vona-module-a-bean';
-declare module 'vona-module-a-bean' {
-
-    export interface IServiceRecord {
-      'commerce-catalog:category': never;
-'commerce-catalog:product': never;
-'commerce-catalog:sku': never;
-    }
-
-
-}
-declare module 'vona-module-commerce-catalog' {
-
-        export interface ServiceCategory {
-          /** @internal */
-          get scope(): ScopeModuleCommerceCatalog;
-        }
-
-          export interface ServiceCategory {
-            get $beanFullName(): 'commerce-catalog.service.category';
-            get $onionName(): 'commerce-catalog:category';
-          }
-
-        export interface ServiceProduct {
-          /** @internal */
-          get scope(): ScopeModuleCommerceCatalog;
-        }
-
-          export interface ServiceProduct {
-            get $beanFullName(): 'commerce-catalog.service.product';
-            get $onionName(): 'commerce-catalog:product';
-          }
-
-        export interface ServiceSku {
-          /** @internal */
-          get scope(): ScopeModuleCommerceCatalog;
-        }
-
-          export interface ServiceSku {
-            get $beanFullName(): 'commerce-catalog.service.sku';
-            get $onionName(): 'commerce-catalog:sku';
-          }
-}
-/** service: end */
-/** service: begin */
-import type { ServiceCategory } from '../service/category.ts';
-import type { ServiceProduct } from '../service/product.ts';
-import type { ServiceSku } from '../service/sku.ts';
-export interface IModuleService {
-  'category': ServiceCategory;
-'product': ServiceProduct;
-'sku': ServiceSku;
-}
-/** service: end */
-/** service: begin */
-
-import 'vona';
-declare module 'vona' {
-  export interface IBeanRecordGeneral {
-    'commerce-catalog.service.category': ServiceCategory;
-'commerce-catalog.service.product': ServiceProduct;
-'commerce-catalog.service.sku': ServiceSku;
-  }
-}
-/** service: end */
-/** meta: begin */
-export * from '../bean/meta.index.ts';
-export * from '../bean/meta.version.ts';
-import type { IMetaOptionsIndex } from 'vona-module-a-index';
-import 'vona-module-a-meta';
-declare module 'vona-module-a-meta' {
-
-    export interface IMetaRecord {
-      'commerce-catalog:index': IMetaOptionsIndex;
-'commerce-catalog:version': never;
-    }
-
-
-}
-declare module 'vona-module-commerce-catalog' {
-
-        export interface MetaIndex {
-          /** @internal */
-          get scope(): ScopeModuleCommerceCatalog;
-        }
-
-          export interface MetaIndex {
-            get $beanFullName(): 'commerce-catalog.meta.index';
-            get $onionName(): 'commerce-catalog:index';
-            get $onionOptions(): IMetaOptionsIndex;
-          }
-
-        export interface MetaVersion {
-          /** @internal */
-          get scope(): ScopeModuleCommerceCatalog;
-        }
-
-          export interface MetaVersion {
-            get $beanFullName(): 'commerce-catalog.meta.version';
-            get $onionName(): 'commerce-catalog:version';
-          }
-}
-/** meta: end */
 /** dto: begin */
 export * from '../dto/categoryCreate.tsx';
 export * from '../dto/categorySelectReq.tsx';
@@ -803,6 +695,114 @@ import 'vona-module-a-openapi';
   }
 
 /** controller: end */
+/** service: begin */
+export * from '../service/category.ts';
+export * from '../service/product.ts';
+export * from '../service/sku.ts';
+
+import 'vona-module-a-bean';
+declare module 'vona-module-a-bean' {
+
+    export interface IServiceRecord {
+      'commerce-catalog:category': never;
+'commerce-catalog:product': never;
+'commerce-catalog:sku': never;
+    }
+
+
+}
+declare module 'vona-module-commerce-catalog' {
+
+        export interface ServiceCategory {
+          /** @internal */
+          get scope(): ScopeModuleCommerceCatalog;
+        }
+
+          export interface ServiceCategory {
+            get $beanFullName(): 'commerce-catalog.service.category';
+            get $onionName(): 'commerce-catalog:category';
+          }
+
+        export interface ServiceProduct {
+          /** @internal */
+          get scope(): ScopeModuleCommerceCatalog;
+        }
+
+          export interface ServiceProduct {
+            get $beanFullName(): 'commerce-catalog.service.product';
+            get $onionName(): 'commerce-catalog:product';
+          }
+
+        export interface ServiceSku {
+          /** @internal */
+          get scope(): ScopeModuleCommerceCatalog;
+        }
+
+          export interface ServiceSku {
+            get $beanFullName(): 'commerce-catalog.service.sku';
+            get $onionName(): 'commerce-catalog:sku';
+          }
+}
+/** service: end */
+/** service: begin */
+import type { ServiceCategory } from '../service/category.ts';
+import type { ServiceProduct } from '../service/product.ts';
+import type { ServiceSku } from '../service/sku.ts';
+export interface IModuleService {
+  'category': ServiceCategory;
+'product': ServiceProduct;
+'sku': ServiceSku;
+}
+/** service: end */
+/** service: begin */
+
+import 'vona';
+declare module 'vona' {
+  export interface IBeanRecordGeneral {
+    'commerce-catalog.service.category': ServiceCategory;
+'commerce-catalog.service.product': ServiceProduct;
+'commerce-catalog.service.sku': ServiceSku;
+  }
+}
+/** service: end */
+/** meta: begin */
+export * from '../bean/meta.index.ts';
+export * from '../bean/meta.version.ts';
+import type { IMetaOptionsIndex } from 'vona-module-a-index';
+import 'vona-module-a-meta';
+declare module 'vona-module-a-meta' {
+
+    export interface IMetaRecord {
+      'commerce-catalog:index': IMetaOptionsIndex;
+'commerce-catalog:version': never;
+    }
+
+
+}
+declare module 'vona-module-commerce-catalog' {
+
+        export interface MetaIndex {
+          /** @internal */
+          get scope(): ScopeModuleCommerceCatalog;
+        }
+
+          export interface MetaIndex {
+            get $beanFullName(): 'commerce-catalog.meta.index';
+            get $onionName(): 'commerce-catalog:index';
+            get $onionOptions(): IMetaOptionsIndex;
+          }
+
+        export interface MetaVersion {
+          /** @internal */
+          get scope(): ScopeModuleCommerceCatalog;
+        }
+
+          export interface MetaVersion {
+            get $beanFullName(): 'commerce-catalog.meta.version';
+            get $onionName(): 'commerce-catalog:version';
+          }
+}
+/** meta: end */
 /** ssrMenu: begin */
 export * from '../bean/ssrMenu.category.ts';
 export * from '../bean/ssrMenu.product.ts';

package/vona/src/suite/a-commerce/modules/commerce-catalog/src/dto/skuSelectResItem.tsx

@@ -3,6 +3,7 @@ import type { IDecoratorDtoOptions } from 'vona-module-a-web';
 import { Api, v } from 'vona-module-a-openapiutils';
 import { $Dto } from 'vona-module-a-orm';
 import { Dto } from 'vona-module-a-web';
+import { z } from 'zod';
 import { ZovaRender } from 'zova-rest-cabloy-basic-admin';
 
 import { $locale } from '../.metadata/locales.ts';
@@ -62,11 +63,22 @@ export class DtoSkuSelectResItem extends $Dto.get(() => ModelSku, {
     product: { columns: ['id', 'title'] },
   },
 }) {
+  @Api.field(
+    v.title($locale('Available')),
+    v.required(),
+    z.number().int().nonnegative(),
+    ZovaRender.order(5),
+  )
+  available: number;
+
   @Api.field(
     v.title($locale('Operations')),
     ZovaRender.order(1, 'max'),
     ZovaRender.cell('basic-table:actionOperationsRow', {
       actions: [
+        ZovaRender.tableActionRow('commerce-trade:actionAdjustStock', {
+          permission: { actionInherit: 'update' },
+        }),
         ZovaRender.tableActionRow('basic-table:actionUpdate'),
         ZovaRender.tableActionRow('basic-table:actionDelete'),
       ],

package/vona/src/suite/a-commerce/modules/commerce-catalog/src/service/sku.ts

@@ -28,13 +28,31 @@ export class ServiceSku extends BeanBase {
   }
 
   async select(params?: IQueryParams<ModelSku>): Promise<DtoSkuSelectRes> {
-    return await this.scope.model.sku.selectAndCount({
+    const result = await this.scope.model.sku.selectAndCount({
       ...params,
       include: {
         ...params?.include,
         product: { columns: ['id', 'title'] },
       },
     });
+    if (result.list.length === 0) return result as unknown as DtoSkuSelectRes;
+
+    const balances = await this.$scope.commerceTrade.model.stockBalance.select({
+      columns: ['skuId', 'available'],
+      where: {
+        skuId: result.list.map(sku => sku.id),
+      },
+    });
+    const availableBySkuId = new Map(
+      balances.map(balance => [String(balance.skuId), balance.available]),
+    );
+    return {
+      ...result,
+      list: result.list.map(sku => ({
+        ...sku,
+        available: availableBySkuId.get(String(sku.id)) ?? 0,
+      })),
+    } as DtoSkuSelectRes;
   }
 
   async view(id: TableIdentity): Promise<DtoSkuView | undefined> {

package/vona/src/suite/a-commerce/modules/commerce-catalog/test/skuPresentation.test.ts

@@ -178,12 +178,21 @@ describe('skuPresentation.test.ts', () => {
         listComponent.properties.productId.rest?.table?.columnProps,
         productPickerOptions,
       );
+      assert.equal(listComponent.properties.available.rest?.table?.order, undefined);
+      assert.equal(listComponent.properties.available.rest?.table?.render, undefined);
+      assert.equal(listComponent.properties.available.type, 'integer');
+      assert.equal(listComponent.properties.available.minimum, 0);
+      assert.equal(listComponent.properties.available.title.toJSON(), 'Available');
+      const actions = listComponent.properties._operationsRow.rest.table.columnProps.actions;
       assert.deepEqual(
-        listComponent.properties._operationsRow.rest.table.columnProps.actions.map(
-          (action: any) => action.render,
-        ),
-        ['basic-table:actionUpdate', 'basic-table:actionDelete'],
+        actions.map((action: any) => action.render),
+        [
+          'commerce-trade:actionAdjustStock',
+          'basic-table:actionUpdate',
+          'basic-table:actionDelete',
+        ],
       );
+      assert.deepEqual(actions[0].options.permission, { actionInherit: 'update' });
 
       const filterBlock = listComponent.rest.blocks[0].options.blocks[0];
       const filterLayout = filterBlock.options.blocks[0].options.formLayout;
@@ -204,6 +213,7 @@ describe('skuPresentation.test.ts', () => {
       let categoryId: number | string | undefined;
       let productId: number | string | undefined;
       let skuId: number | string | undefined;
+      let skuIdWithBalance: number | string | undefined;
       await app.bean.passport.signinMock();
       try {
         categoryId = await app.bean.executor.performAction('post', '/commerce/catalog/category', {
@@ -224,6 +234,26 @@ describe('skuPresentation.test.ts', () => {
             lifecycle: 'draft',
           },
         });
+        const skuIdWithBalance = await app.bean.executor.performAction(
+          'post',
+          '/commerce/catalog/sku',
+          {
+            body: {
+              code: `presentation-sku-balance-${suffix}`,
+              productId,
+              priceCents: 2345,
+              lifecycle: 'draft',
+            },
+          },
+        );
+        await app.bean.executor.performAction('post', '/commerce/trade/stockBalance/adjustStock', {
+          body: {
+            skuId: skuIdWithBalance,
+            delta: 7,
+            reason: `presentation stock ${suffix}`,
+            correlationId: `presentation-${suffix}`,
+          },
+        });
 
         const view: any = await app.bean.executor.performAction(
           'get',
@@ -247,12 +277,31 @@ describe('skuPresentation.test.ts', () => {
         });
         assert.equal(select.list.length, 1);
         assert.equal(String(select.list[0].id), String(skuId));
+        assert.equal(select.list[0].available, 0);
         assert.deepEqual(select.list[0].product, {
           id: productId,
           title: `presentation-sku-product-${suffix}`,
         });
         assert.equal(select.list[0].attributes, undefined);
+
+        const balanceSelect: any = await app.bean.executor.performAction(
+          'get',
+          '/commerce/catalog/sku',
+          { query: { code: `presentation-sku-balance-${suffix}` } },
+        );
+        assert.equal(balanceSelect.list.length, 1);
+        assert.equal(String(balanceSelect.list[0].id), String(skuIdWithBalance));
+        assert.equal(balanceSelect.list[0].available, 7);
       } finally {
+        const tradeScope = app.scope('commerce-trade');
+        if (skuIdWithBalance) {
+          await tradeScope.model.stockAudit.delete({ skuId: skuIdWithBalance });
+          await tradeScope.model.stockReservation.delete({ skuId: skuIdWithBalance });
+          await tradeScope.model.stockBalance.delete({ skuId: skuIdWithBalance });
+          await app.bean.executor.performAction('delete', '/commerce/catalog/sku/:id', {
+            params: { id: skuIdWithBalance },
+          });
+        }
         if (skuId) {
           await app.bean.executor.performAction('delete', '/commerce/catalog/sku/:id', {
             params: { id: skuId },

package/vona/src/suite/a-commerce/modules/commerce-trade/src/.metadata/index.ts

@@ -675,154 +675,6 @@ declare module 'vona-module-a-orm' {
   }
 }
 /** model: end */
-/** bean: begin */
-export * from '../bean/bean.scheduleOrderExpiry.ts';
-
-import 'vona';
-declare module 'vona' {
-
-
-}
-declare module 'vona-module-commerce-trade' {
-
-        export interface BeanScheduleOrderExpiry {
-          /** @internal */
-          get scope(): ScopeModuleCommerceTrade;
-        }
-}
-/** bean: end */
-/** bean: begin */
-import type { BeanScheduleOrderExpiry } from '../bean/bean.scheduleOrderExpiry.ts';
-import 'vona';
-declare module 'vona' {
-  export interface IBeanRecordGlobal {
-    'scheduleOrderExpiry': BeanScheduleOrderExpiry;
-  }
-}
-/** bean: end */
-/** service: begin */
-export * from '../service/cart.ts';
-export * from '../service/order.ts';
-export * from '../service/stockAudit.ts';
-export * from '../service/stockBalance.ts';
-
-import 'vona-module-a-bean';
-declare module 'vona-module-a-bean' {
-
-    export interface IServiceRecord {
-      'commerce-trade:cart': never;
-'commerce-trade:order': never;
-'commerce-trade:stockAudit': never;
-'commerce-trade:stockBalance': never;
-    }
-
-
-}
-declare module 'vona-module-commerce-trade' {
-
-        export interface ServiceCart {
-          /** @internal */
-          get scope(): ScopeModuleCommerceTrade;
-        }
-
-          export interface ServiceCart {
-            get $beanFullName(): 'commerce-trade.service.cart';
-            get $onionName(): 'commerce-trade:cart';
-          }
-
-        export interface ServiceOrder {
-          /** @internal */
-          get scope(): ScopeModuleCommerceTrade;
-        }
-
-          export interface ServiceOrder {
-            get $beanFullName(): 'commerce-trade.service.order';
-            get $onionName(): 'commerce-trade:order';
-          }
-
-        export interface ServiceStockAudit {
-          /** @internal */
-          get scope(): ScopeModuleCommerceTrade;
-        }
-
-          export interface ServiceStockAudit {
-            get $beanFullName(): 'commerce-trade.service.stockAudit';
-            get $onionName(): 'commerce-trade:stockAudit';
-          }
-
-        export interface ServiceStockBalance {
-          /** @internal */
-          get scope(): ScopeModuleCommerceTrade;
-        }
-
-          export interface ServiceStockBalance {
-            get $beanFullName(): 'commerce-trade.service.stockBalance';
-            get $onionName(): 'commerce-trade:stockBalance';
-          }
-}
-/** service: end */
-/** service: begin */
-import type { ServiceCart } from '../service/cart.ts';
-import type { ServiceOrder } from '../service/order.ts';
-import type { ServiceStockAudit } from '../service/stockAudit.ts';
-import type { ServiceStockBalance } from '../service/stockBalance.ts';
-export interface IModuleService {
-  'cart': ServiceCart;
-'order': ServiceOrder;
-'stockAudit': ServiceStockAudit;
-'stockBalance': ServiceStockBalance;
-}
-/** service: end */
-/** service: begin */
-
-import 'vona';
-declare module 'vona' {
-  export interface IBeanRecordGeneral {
-    'commerce-trade.service.cart': ServiceCart;
-'commerce-trade.service.order': ServiceOrder;
-'commerce-trade.service.stockAudit': ServiceStockAudit;
-'commerce-trade.service.stockBalance': ServiceStockBalance;
-  }
-}
-/** service: end */
-/** meta: begin */
-export * from '../bean/meta.index.ts';
-export * from '../bean/meta.version.ts';
-import type { IMetaOptionsIndex } from 'vona-module-a-index';
-import 'vona-module-a-meta';
-declare module 'vona-module-a-meta' {
-
-    export interface IMetaRecord {
-      'commerce-trade:index': IMetaOptionsIndex;
-'commerce-trade:version': never;
-    }
-
-
-}
-declare module 'vona-module-commerce-trade' {
-
-        export interface MetaIndex {
-          /** @internal */
-          get scope(): ScopeModuleCommerceTrade;
-        }
-
-          export interface MetaIndex {
-            get $beanFullName(): 'commerce-trade.meta.index';
-            get $onionName(): 'commerce-trade:index';
-            get $onionOptions(): IMetaOptionsIndex;
-          }
-
-        export interface MetaVersion {
-          /** @internal */
-          get scope(): ScopeModuleCommerceTrade;
-        }
-
-          export interface MetaVersion {
-            get $beanFullName(): 'commerce-trade.meta.version';
-            get $onionName(): 'commerce-trade:version';
-          }
-}
-/** meta: end */
 /** dto: begin */
 export * from '../dto/cartAddItem.tsx';
 export * from '../dto/cartItem.tsx';
@@ -1368,6 +1220,154 @@ import 'vona-module-a-openapi';
   }
 
 /** controller: end */
+/** bean: begin */
+export * from '../bean/bean.scheduleOrderExpiry.ts';
+
+import 'vona';
+declare module 'vona' {
+
+
+}
+declare module 'vona-module-commerce-trade' {
+
+        export interface BeanScheduleOrderExpiry {
+          /** @internal */
+          get scope(): ScopeModuleCommerceTrade;
+        }
+}
+/** bean: end */
+/** bean: begin */
+import type { BeanScheduleOrderExpiry } from '../bean/bean.scheduleOrderExpiry.ts';
+import 'vona';
+declare module 'vona' {
+  export interface IBeanRecordGlobal {
+    'scheduleOrderExpiry': BeanScheduleOrderExpiry;
+  }
+}
+/** bean: end */
+/** service: begin */
+export * from '../service/cart.ts';
+export * from '../service/order.ts';
+export * from '../service/stockAudit.ts';
+export * from '../service/stockBalance.ts';
+
+import 'vona-module-a-bean';
+declare module 'vona-module-a-bean' {
+
+    export interface IServiceRecord {
+      'commerce-trade:cart': never;
+'commerce-trade:order': never;
+'commerce-trade:stockAudit': never;
+'commerce-trade:stockBalance': never;
+    }
+
+
+}
+declare module 'vona-module-commerce-trade' {
+
+        export interface ServiceCart {
+          /** @internal */
+          get scope(): ScopeModuleCommerceTrade;
+        }
+
+          export interface ServiceCart {
+            get $beanFullName(): 'commerce-trade.service.cart';
+            get $onionName(): 'commerce-trade:cart';
+          }
+
+        export interface ServiceOrder {
+          /** @internal */
+          get scope(): ScopeModuleCommerceTrade;
+        }
+
+          export interface ServiceOrder {
+            get $beanFullName(): 'commerce-trade.service.order';
+            get $onionName(): 'commerce-trade:order';
+          }
+
+        export interface ServiceStockAudit {
+          /** @internal */
+          get scope(): ScopeModuleCommerceTrade;
+        }
+
+          export interface ServiceStockAudit {
+            get $beanFullName(): 'commerce-trade.service.stockAudit';
+            get $onionName(): 'commerce-trade:stockAudit';
+          }
+
+        export interface ServiceStockBalance {
+          /** @internal */
+          get scope(): ScopeModuleCommerceTrade;
+        }
+
+          export interface ServiceStockBalance {
+            get $beanFullName(): 'commerce-trade.service.stockBalance';
+            get $onionName(): 'commerce-trade:stockBalance';
+          }
+}
+/** service: end */
+/** service: begin */
+import type { ServiceCart } from '../service/cart.ts';
+import type { ServiceOrder } from '../service/order.ts';
+import type { ServiceStockAudit } from '../service/stockAudit.ts';
+import type { ServiceStockBalance } from '../service/stockBalance.ts';
+export interface IModuleService {
+  'cart': ServiceCart;
+'order': ServiceOrder;
+'stockAudit': ServiceStockAudit;
+'stockBalance': ServiceStockBalance;
+}
+/** service: end */
+/** service: begin */
+
+import 'vona';
+declare module 'vona' {
+  export interface IBeanRecordGeneral {
+    'commerce-trade.service.cart': ServiceCart;
+'commerce-trade.service.order': ServiceOrder;
+'commerce-trade.service.stockAudit': ServiceStockAudit;
+'commerce-trade.service.stockBalance': ServiceStockBalance;
+  }
+}
+/** service: end */
+/** meta: begin */
+export * from '../bean/meta.index.ts';
+export * from '../bean/meta.version.ts';
+import type { IMetaOptionsIndex } from 'vona-module-a-index';
+import 'vona-module-a-meta';
+declare module 'vona-module-a-meta' {
+
+    export interface IMetaRecord {
+      'commerce-trade:index': IMetaOptionsIndex;
+'commerce-trade:version': never;
+    }
+
+
+}
+declare module 'vona-module-commerce-trade' {
+
+        export interface MetaIndex {
+          /** @internal */
+          get scope(): ScopeModuleCommerceTrade;
+        }
+
+          export interface MetaIndex {
+            get $beanFullName(): 'commerce-trade.meta.index';
+            get $onionName(): 'commerce-trade:index';
+            get $onionOptions(): IMetaOptionsIndex;
+          }
+
+        export interface MetaVersion {
+          /** @internal */
+          get scope(): ScopeModuleCommerceTrade;
+        }
+
+          export interface MetaVersion {
+            get $beanFullName(): 'commerce-trade.meta.version';
+            get $onionName(): 'commerce-trade:version';
+          }
+}
+/** meta: end */
 /** ssrMenu: begin */
 export * from '../bean/ssrMenu.order.ts';
 export * from '../bean/ssrMenu.stockAudit.ts';