autosync_backend2 1.1.31 → 1.1.33

package/dist/index.d.ts

@@ -117,19 +117,19 @@ export declare const app: Elysia<"", {
                 size: import("@sinclair/typebox").TInteger;
             }>;
             userId: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
+            employeeId: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
             transactionType: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TEnum<{
                 IN: "IN";
                 OUT: "OUT";
             }>>;
             transactionKind: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TEnum<{
+                ORDER: "ORDER";
                 TRANSFER: "TRANSFER";
                 RETURN: "RETURN";
                 ADJUSTMENT: "ADJUSTMENT";
                 REJECTION: "REJECTION";
-                ORDER: "ORDER";
                 SALES: "SALES";
             }>>;
-            employeeId: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
             product: import("@sinclair/typebox").TObject<{
                 id: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
                 search: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
@@ -346,6 +346,7 @@ export declare const app: Elysia<"", {
                 BANK_TRANSFER: "BANK_TRANSFER";
                 POS_TERMINAL: "POS_TERMINAL";
                 PAYMENT_PACKAGE: "PAYMENT_PACKAGE";
+                CARD: "CARD";
             }>;
             paymentChannel: import("@sinclair/typebox").TString;
             amount: import("@sinclair/typebox").TNumber;
@@ -432,7 +433,6 @@ export declare const app: Elysia<"", {
             spPackageId: import("@sinclair/typebox").TString;
         }>;
         readonly "CrmSpPackageProductModel.create": import("@sinclair/typebox").TObject<{
-            priceTotal: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TNumber>;
             spPackageId: import("@sinclair/typebox").TString;
             quantity: import("@sinclair/typebox").TInteger;
             priceUnit: import("@sinclair/typebox").TNumber;
@@ -1966,9 +1966,9 @@ export declare const app: Elysia<"", {
                         params: {};
                         query: {
                             userId?: string | undefined;
-                            transactionType?: "IN" | "OUT" | undefined;
-                            transactionKind?: "TRANSFER" | "RETURN" | "ADJUSTMENT" | "REJECTION" | "ORDER" | "SALES" | undefined;
                             employeeId?: string | undefined;
+                            transactionType?: "IN" | "OUT" | undefined;
+                            transactionKind?: "ORDER" | "TRANSFER" | "RETURN" | "ADJUSTMENT" | "REJECTION" | "SALES" | undefined;
                             product: {
                                 id?: string | undefined;
                                 search?: string | undefined;
@@ -2022,7 +2022,7 @@ export declare const app: Elysia<"", {
                                     itemId: string;
                                     productId: string | null;
                                     transactionType: "IN" | "OUT";
-                                    transactionKind: "TRANSFER" | "RETURN" | "ADJUSTMENT" | "REJECTION" | "ORDER" | "SALES";
+                                    transactionKind: "ORDER" | "TRANSFER" | "RETURN" | "ADJUSTMENT" | "REJECTION" | "SALES";
                                     quantity: number;
                                     quantityBefore: number;
                                     quantityAfter: number;
@@ -3410,7 +3410,7 @@ export declare const app: Elysia<"", {
                             paymentPackageId?: string | null | undefined;
                             state: "NOT_PAID" | "PENDING" | "FAILED" | "EXPIRED" | "PAID" | "DECLINED" | "CANCELED" | "REFUNDING" | "REFUNDED";
                             cpOrderId: string;
-                            paymentMethod: "CASH" | "BANK_TRANSFER" | "POS_TERMINAL" | "PAYMENT_PACKAGE";
+                            paymentMethod: "CASH" | "BANK_TRANSFER" | "POS_TERMINAL" | "PAYMENT_PACKAGE" | "CARD";
                             paymentChannel: string;
                             amount: number;
                         };
@@ -3426,7 +3426,7 @@ export declare const app: Elysia<"", {
                                 state: "NOT_PAID" | "PENDING" | "FAILED" | "EXPIRED" | "PAID" | "DECLINED" | "CANCELED" | "REFUNDING" | "REFUNDED";
                                 cpOrderId: string;
                                 paymentPackageId: string | null;
-                                paymentMethod: "CASH" | "BANK_TRANSFER" | "POS_TERMINAL" | "PAYMENT_PACKAGE";
+                                paymentMethod: "CASH" | "BANK_TRANSFER" | "POS_TERMINAL" | "PAYMENT_PACKAGE" | "CARD";
                                 paymentChannel: string;
                                 amount: number;
                                 invoiceNumber: string | null;
@@ -3490,7 +3490,7 @@ export declare const app: Elysia<"", {
                                     state: "NOT_PAID" | "PENDING" | "FAILED" | "EXPIRED" | "PAID" | "DECLINED" | "CANCELED" | "REFUNDING" | "REFUNDED";
                                     cpOrderId: string;
                                     paymentPackageId: string | null;
-                                    paymentMethod: "CASH" | "BANK_TRANSFER" | "POS_TERMINAL" | "PAYMENT_PACKAGE";
+                                    paymentMethod: "CASH" | "BANK_TRANSFER" | "POS_TERMINAL" | "PAYMENT_PACKAGE" | "CARD";
                                     paymentChannel: string;
                                     amount: number;
                                     invoiceNumber: string | null;
@@ -3549,7 +3549,7 @@ export declare const app: Elysia<"", {
                                 paymentPackageId?: string | null | undefined;
                                 state: "NOT_PAID" | "PENDING" | "FAILED" | "EXPIRED" | "PAID" | "DECLINED" | "CANCELED" | "REFUNDING" | "REFUNDED";
                                 cpOrderId: string;
-                                paymentMethod: "CASH" | "BANK_TRANSFER" | "POS_TERMINAL" | "PAYMENT_PACKAGE";
+                                paymentMethod: "CASH" | "BANK_TRANSFER" | "POS_TERMINAL" | "PAYMENT_PACKAGE" | "CARD";
                                 paymentChannel: string;
                                 amount: number;
                             };
@@ -3566,7 +3566,7 @@ export declare const app: Elysia<"", {
                                     state: "NOT_PAID" | "PENDING" | "FAILED" | "EXPIRED" | "PAID" | "DECLINED" | "CANCELED" | "REFUNDING" | "REFUNDED";
                                     cpOrderId: string;
                                     paymentPackageId: string | null;
-                                    paymentMethod: "CASH" | "BANK_TRANSFER" | "POS_TERMINAL" | "PAYMENT_PACKAGE";
+                                    paymentMethod: "CASH" | "BANK_TRANSFER" | "POS_TERMINAL" | "PAYMENT_PACKAGE" | "CARD";
                                     paymentChannel: string;
                                     amount: number;
                                     invoiceNumber: string | null;
@@ -3655,7 +3655,7 @@ export declare const app: Elysia<"", {
                                 paymentPackageId?: string | null | undefined;
                                 state: "NOT_PAID" | "PENDING" | "FAILED" | "EXPIRED" | "PAID" | "DECLINED" | "CANCELED" | "REFUNDING" | "REFUNDED";
                                 cpOrderId: string;
-                                paymentMethod: "CASH" | "BANK_TRANSFER" | "POS_TERMINAL" | "PAYMENT_PACKAGE";
+                                paymentMethod: "CASH" | "BANK_TRANSFER" | "POS_TERMINAL" | "PAYMENT_PACKAGE" | "CARD";
                                 paymentChannel: string;
                                 amount: number;
                             };
@@ -3672,7 +3672,7 @@ export declare const app: Elysia<"", {
                                     state: "NOT_PAID" | "PENDING" | "FAILED" | "EXPIRED" | "PAID" | "DECLINED" | "CANCELED" | "REFUNDING" | "REFUNDED";
                                     cpOrderId: string;
                                     paymentPackageId: string | null;
-                                    paymentMethod: "CASH" | "BANK_TRANSFER" | "POS_TERMINAL" | "PAYMENT_PACKAGE";
+                                    paymentMethod: "CASH" | "BANK_TRANSFER" | "POS_TERMINAL" | "PAYMENT_PACKAGE" | "CARD";
                                     paymentChannel: string;
                                     amount: number;
                                     invoiceNumber: string | null;
@@ -4179,7 +4179,7 @@ export declare const app: Elysia<"", {
                                     payments: {
                                         cpOrderId: string;
                                         paymentPackageId: string | null;
-                                        paymentMethod: "CASH" | "BANK_TRANSFER" | "POS_TERMINAL" | "PAYMENT_PACKAGE";
+                                        paymentMethod: "CASH" | "BANK_TRANSFER" | "POS_TERMINAL" | "PAYMENT_PACKAGE" | "CARD";
                                         paymentChannel: string;
                                         amount: number;
                                         state: "NOT_PAID" | "PENDING" | "FAILED" | "EXPIRED" | "PAID" | "DECLINED" | "CANCELED" | "REFUNDING" | "REFUNDED";
@@ -4452,7 +4452,6 @@ export declare const app: Elysia<"", {
                 product: {
                     post: {
                         body: {
-                            priceTotal?: number | undefined;
                             spPackageId: string;
                             quantity: number;
                             priceUnit: number;
@@ -4490,7 +4489,6 @@ export declare const app: Elysia<"", {
                     many: {
                         post: {
                             body: {
-                                priceTotal?: number | undefined;
                                 spPackageId: string;
                                 quantity: number;
                                 priceUnit: number;

package/dist/index.js

@@ -137672,6 +137672,12 @@ __export(exports_schema, {
   crmSchema: () => crmSchema,
   crmPaymentTypeEnum: () => crmPaymentTypeEnum,
   crmPaymentTable: () => crmPaymentTable,
+  crmDiscountTypeEnum: () => crmDiscountTypeEnum,
+  crmDiscountTable: () => crmDiscountTable,
+  crmDiscountConditionTypeEnum: () => crmDiscountConditionTypeEnum,
+  crmDiscountConditionTable: () => crmDiscountConditionTable,
+  crmDiscountApplyTypeEnum: () => crmDiscountApplyTypeEnum,
+  crmDiscountApplyTable: () => crmDiscountApplyTable,
   crmCustomerVehicleTable: () => crmCustomerVehicleTable,
   crmCustomerTable: () => crmCustomerTable,
   crmCustomerRelations: () => crmCustomerRelations,
@@ -137918,7 +137924,7 @@ var crmSpPackageProductTable = crmSchema.table("sp_package_product", {
   companyProductId: uuid().notNull(),
   quantity: integer().notNull(),
   priceUnit: numeric({ mode: "number" }).notNull(),
-  priceTotal: numeric({ mode: "number" }).notNull().$onUpdateFn(() => sql3`${crmSpPackageProductTable.priceUnit} * ${crmSpPackageProductTable.quantity}`).$defaultFn(() => sql3`${crmSpPackageProductTable.priceUnit} * ${crmSpPackageProductTable.quantity}`)
+  priceTotal: numeric({ mode: "number" }).notNull()
 }, (t2) => [unique().on(t2.spPackageId, t2.companyProductId)]);
 var crmCpOrderStateEnum = pgEnum("cp_order_state", [
   "CREATED",
@@ -137966,7 +137972,8 @@ var crmCpOrderPaymentMethodEnum = crmSchema.enum("payment_method", [
   "CASH",
   "BANK_TRANSFER",
   "POS_TERMINAL",
-  "PAYMENT_PACKAGE"
+  "PAYMENT_PACKAGE",
+  "CARD"
 ]);
 var crmCpOrderPaymentStateEnum = crmSchema.enum("payment_state", [
   "NOT_PAID",
@@ -138006,6 +138013,52 @@ var crmCpOrderPaymentTable = crmSchema.table("cp_order_payment", {
   state: crmCpOrderPaymentStateEnum().notNull(),
   invoiceNumber: varchar()
 });
+var crmDiscountTypeEnum = crmSchema.enum("discount_type", [
+  "PERCENTAGE",
+  "FIXED"
+]);
+var crmDiscountApplyTypeEnum = crmSchema.enum("discount_apply_type", [
+  "ORDER",
+  "ITEM"
+]);
+var crmDiscountTable = crmSchema.table("discount", {
+  ...base_schema_helper_default,
+  companyId: uuid().notNull(),
+  name: varchar().notNull(),
+  description: varchar(),
+  applyType: crmDiscountApplyTypeEnum().notNull(),
+  discountType: crmDiscountTypeEnum().notNull(),
+  timeStart: timestamp({ withTimezone: true }).notNull(),
+  timeEnd: timestamp({ withTimezone: true }).notNull(),
+  state: varchar()
+});
+var crmDiscountConditionTypeEnum = crmSchema.enum("discount_condition_type", [
+  "MIN_TOTAL",
+  "PRODUCT_CATEGORY",
+  "CUSTOMER_GROUP",
+  "PAYMENT_METHOD",
+  "DATE_RANGE",
+  "ITEM_QUANTITY",
+  "COUPON_CODE"
+]);
+var crmDiscountConditionTable = crmSchema.table("discount_condition", {
+  ...base_schema_helper_default,
+  discountId: uuid().notNull(),
+  conditionType: crmDiscountConditionTypeEnum().notNull(),
+  conditionValue: varchar()
+});
+var crmDiscountApplyTable = crmSchema.table("discount_apply", {
+  ...base_schema_helper_default,
+  discountId: uuid().notNull(),
+  cpOrderId: uuid().notNull(),
+  cpOrderItemId: uuid(),
+  valueApplied: varchar(),
+  priceBeforeDiscount: numeric({ mode: "number" }).notNull(),
+  priceAfterDiscount: numeric({ mode: "number" }).notNull(),
+  note: varchar(),
+  authUserId: text().notNull(),
+  employeeId: uuid().notNull()
+});
 // src/lib/db/schema/techdoc.schema.ts
 var techdocSchema = pgSchema("techdoc");
 var techdocVehicleKindEnum = pgEnum("vehicle_kind_enum", [
@@ -140989,7 +141042,14 @@ var auth2 = betterAuth({
       }
     }
   },
-  trustedOrigins: ["http://192.168.0.117:3000"]
+  trustedOrigins: ["http://192.168.0.117:3000"],
+  logger: {
+    log(level, ...args) {
+      if (level === "error" && args[0] === "Error" && args.length === 2 && args[1] instanceof Error && args[1].message === "NOT_FOUND")
+        return;
+      console[level](...args);
+    }
+  }
 });
 var _schema;
 var getSchema2 = async () => _schema ??= auth2.api.generateOpenAPISchema();
@@ -143794,12 +143854,14 @@ class PaymentGateway {
     }
     this.token = token;
     if (this.paymentId) {
-      await db_default.update(crmPaymentTable).set({
+      const [updated] = await db_default.update(crmPaymentTable).set({
         accessToken: token.access_token,
         refreshToken: token.refresh_token,
         expiresIn: token.expires_in,
         refreshExpiresIn: token.refresh_expires_in
-      }).where(eq(crmPaymentTable.id, this.paymentId));
+      }).where(eq(crmPaymentTable.id, this.paymentId)).returning();
+      const cacheKey = `crm_payment:${updated.companyId}:${updated.type}:${updated.branchId ?? "null"}`;
+      await redis_client_default.set(cacheKey, updated);
     }
   }
   async getPaymentById(id) {
@@ -143990,19 +144052,7 @@ var CrmCpOrderPaymentLogic;
     const gateway = new QpayGateway([
       auth3.username,
       auth3.password,
-      auth3.invoiceCode,
-      async (token) => {
-        await db_default.update(crmPaymentTable).set({
-          accessToken: token.access_token,
-          refreshToken: token.refresh_token,
-          expiresIn: token.expires_in,
-          refreshExpiresIn: token.refresh_expires_in
-        }).where(eq(crmPaymentTable.id, paymentInfo.id));
-        paymentInfo.accessToken = token.access_token;
-        paymentInfo.refreshToken = token.refresh_token;
-        paymentInfo.expiresIn = token.expires_in;
-        paymentInfo.refreshExpiresIn = token.refresh_expires_in ?? 0;
-      }
+      auth3.invoiceCode
     ]);
     gateway.setToken(paymentInfo);
     try {
@@ -144139,10 +144189,16 @@ var CrmCpOrderPaymentLogic;
     }
   };
   const getPaymentInfo = async (type, user2) => {
+    const cacheKey = `crm_payment:${user2.companyId}:${type}:${user2.branchId ?? "null"}`;
+    const cached = await redis_client_default.get(cacheKey);
+    if (cached) {
+      return cached;
+    }
     const [payment] = await db_default.select().from(crmPaymentTable).where(and(eq(crmPaymentTable.companyId, user2.companyId), eq(crmPaymentTable.type, type), or(isNull2(crmPaymentTable.branchId), eq(crmPaymentTable.branchId, user2.branchId)))).limit(1);
     if (!payment) {
       return status("Not Found", "\u0422\u04E9\u043B\u0431\u04E9\u0440\u0438\u0439\u043D \u0442\u043E\u0445\u0438\u0440\u0433\u043E\u043E \u043E\u043B\u0434\u0441\u043E\u043D\u0433\u04AF\u0439.");
     }
+    await redis_client_default.set(cacheKey, payment);
     return payment;
   };
   const getPaymentInfoByPaymentId = async (id, type) => {
@@ -144318,8 +144374,9 @@ var CrmCpOrderItemLogic;
     if (curr.length > 0) {
       const [updated] = await db_default.update(crmCpOrderItemTable).set({
         ...body,
+        quantity: sql3`${crmCpOrderItemTable.quantity} + ${body.quantity}`,
         priceUnit: sk?.price ?? product?.product.priceSell ?? 0,
-        priceTotal: body.quantity * (sk?.price ?? product?.product.priceSell ?? 0)
+        priceTotal: sql3`${crmCpOrderItemTable.quantity} * ${body.quantity * (sk?.price ?? product?.product.priceSell ?? 0)}`
       }).where(eq(crmCpOrderItemTable.id, curr[0].id)).returning();
       return updated;
     }
@@ -144825,16 +144882,25 @@ var CrmSpPackageProductLogic;
     return result;
   };
   CrmSpPackageProductLogic.create = async (body) => {
-    const [result] = await db_default.insert(crmSpPackageProductTable).values(body).returning();
+    const [result] = await db_default.insert(crmSpPackageProductTable).values({
+      ...body,
+      priceTotal: body.quantity * body.priceUnit
+    }).returning();
     return result;
   };
   CrmSpPackageProductLogic.createMany = async (body) => {
     if (body.length === 0) {
       return status("Bad Request", "\u0411\u04AF\u0442\u044D\u044D\u0433\u0434\u044D\u0445\u04AF\u04AF\u043D \u043E\u0440\u0443\u0443\u043B\u0430\u0445 \u043C\u044D\u0434\u044D\u044D\u043B\u044D\u043B \u0431\u0430\u0439\u0445\u0433\u04AF\u0439 \u0431\u0430\u0439\u043D\u0430.");
     }
+    console.dir(body, {
+      depth: Infinity
+    });
     await db_default.transaction(async (db2) => {
       await db2.delete(crmSpPackageProductTable).where(eq(crmSpPackageProductTable.spPackageId, body[0].spPackageId));
-      await db2.insert(crmSpPackageProductTable).values(body);
+      await db2.insert(crmSpPackageProductTable).values(body.map((i2) => ({
+        ...i2,
+        priceTotal: i2.quantity * i2.priceUnit
+      })));
     });
   };
   CrmSpPackageProductLogic.update = async (id, body) => {
@@ -144858,7 +144924,7 @@ var CrmSpPackageProductModel;
   const createSchema = createInsertSchema(crmSpPackageProductTable);
   const updateSchema = createUpdateSchema(crmSpPackageProductTable);
   const selectSchema = createSelectSchema(crmSpPackageProductTable);
-  CrmSpPackageProductModel.create = OmitBaseSchema(createSchema);
+  CrmSpPackageProductModel.create = t.Omit(OmitBaseSchema(createSchema), ["priceTotal"]);
   CrmSpPackageProductModel.update = OmitBaseSchema(updateSchema);
   CrmSpPackageProductModel.select = t.Pick(selectSchema, ["spPackageId"]);
 })(CrmSpPackageProductModel ||= {});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "autosync_backend2",
-  "version": "1.1.31",
+  "version": "1.1.33",
   "module": "src/index.ts",
   "type": "module",
   "main": "dist/index.js",