autosync_backend2 1.1.23 → 1.1.25

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import { Elysia } from "elysia";
-declare const app: Elysia<"", {
+export declare const app: Elysia<"", {
     decorator: {
         publicPermissions: {
             readonly code: import("./lib/permissions").PermissionCode;
@@ -388,6 +388,13 @@ declare const app: Elysia<"", {
                 clientId: import("@sinclair/typebox").TString;
                 clientSecret: import("@sinclair/typebox").TString;
             }>;
+        }>, import("@sinclair/typebox").TObject<{
+            type: import("@sinclair/typebox").TLiteral<"Qpay">;
+            sub: import("@sinclair/typebox").TObject<{
+                username: import("@sinclair/typebox").TString;
+                password: import("@sinclair/typebox").TString;
+                invoiceCode: import("@sinclair/typebox").TString;
+            }>;
         }>]>]>;
         readonly "CrmCpOrderPaymentModel.wsQuery": import("@sinclair/typebox").TObject<{
             paymentId: import("@sinclair/typebox").TString;
@@ -1432,22 +1439,34 @@ declare const app: Elysia<"", {
                             totalCount: number;
                             totalPage: number;
                             result: {
-                                supplierId: string;
-                                productId: string | null;
-                                name: string;
-                                description: string | null;
-                                priceSell: number;
-                                priceBuy: number;
-                                barCode: string | null;
-                                oen: string | null;
-                                partNumber: string;
-                                alias: string | null;
-                                companyId: string;
-                                type: string | null;
-                                id: string;
-                                createdAt: string;
-                                updatedAt: string;
-                                deletedAt: string | null;
+                                product: {
+                                    supplierId: string;
+                                    productId: string | null;
+                                    name: string;
+                                    description: string | null;
+                                    priceSell: number;
+                                    priceBuy: number;
+                                    barCode: string | null;
+                                    oen: string | null;
+                                    partNumber: string;
+                                    alias: string | null;
+                                    companyId: string;
+                                    type: string | null;
+                                    id: string;
+                                    createdAt: string;
+                                    updatedAt: string;
+                                    deletedAt: string | null;
+                                };
+                                supplier: {
+                                    name: string;
+                                    phone: string | null;
+                                    address: string | null;
+                                    image: string | null;
+                                    id: string;
+                                    createdAt: string;
+                                    updatedAt: string;
+                                    deletedAt: string | null;
+                                };
                             }[];
                         };
                         422: {
@@ -1822,6 +1841,27 @@ declare const app: Elysia<"", {
                             totalCount: number;
                             totalPage: number;
                             result: {
+                                item: {
+                                    warehouseId: string;
+                                    productId: string;
+                                    quantity: number;
+                                    safetyStock: number;
+                                    shelfNumber: string | null;
+                                    id: string;
+                                    createdAt: string;
+                                    updatedAt: string;
+                                    deletedAt: string | null;
+                                };
+                                supplier: {
+                                    name: string;
+                                    phone: string | null;
+                                    address: string | null;
+                                    image: string | null;
+                                    id: string;
+                                    createdAt: string;
+                                    updatedAt: string;
+                                    deletedAt: string | null;
+                                };
                                 product: {
                                     supplierId: string;
                                     productId: string | null;
@@ -1840,15 +1880,6 @@ declare const app: Elysia<"", {
                                     updatedAt: string;
                                     deletedAt: string | null;
                                 };
-                                warehouseId: string;
-                                productId: string;
-                                quantity: number;
-                                safetyStock: number;
-                                shelfNumber: string | null;
-                                id: string;
-                                createdAt: string;
-                                updatedAt: string;
-                                deletedAt: string | null;
                             }[];
                         };
                         422: {
@@ -3524,28 +3555,41 @@ declare const app: Elysia<"", {
             } & {
                 payment: {
                     storepay: {
-                        ":id": {
-                            get: {
-                                body: unknown;
-                                params: {
+                        post: {
+                            body: {
+                                paymentPackageId?: string | null | undefined;
+                                phone: number;
+                                cpOrderId: string;
+                                amount: number;
+                            };
+                            params: {};
+                            query: unknown;
+                            headers: unknown;
+                            response: {
+                                200: {
                                     id: string;
+                                    createdAt: string;
+                                    updatedAt: string;
+                                    deletedAt: string | null;
+                                    state: "NOT_PAID" | "PENDING" | "FAILED" | "EXPIRED" | "PAID" | "DECLINED" | "CANCELED" | "REFUNDING" | "REFUNDED";
+                                    cpOrderId: string;
+                                    paymentPackageId: string | null;
+                                    paymentMethod: "CASH" | "BANK_TRANSFER" | "POS_TERMINAL" | "PAYMENT_PACKAGE";
+                                    paymentChannel: string;
+                                    amount: number;
+                                    invoiceNumber: string | null;
                                 };
-                                query: unknown;
-                                headers: unknown;
-                                response: {
-                                    200: undefined;
-                                    404: "Төлбөрийн тохиргоо олдсонгүй." | "Төлбөрийн мэдээлэл олдсонгүй.";
-                                    400: string;
-                                    500: "Сервер алдаа гарлаа";
-                                    422: {
-                                        type: "validation";
-                                        on: string;
-                                        summary?: string;
-                                        message?: string;
-                                        found?: unknown;
-                                        property?: string;
-                                        expected?: string;
-                                    };
+                                404: "Төлбөрийн тохиргоо олдсонгүй.";
+                                400: string;
+                                500: "Сервер алдаа гарлаа";
+                                422: {
+                                    type: "validation";
+                                    on: string;
+                                    summary?: string;
+                                    message?: string;
+                                    found?: unknown;
+                                    property?: string;
+                                    expected?: string;
                                 };
                             };
                         };
@@ -3553,9 +3597,9 @@ declare const app: Elysia<"", {
                 };
             } & {
                 payment: {
-                    ubpay: {
+                    storepay: {
                         ":id": {
-                            post: {
+                            get: {
                                 body: unknown;
                                 params: {
                                     id: string;
@@ -3563,7 +3607,10 @@ declare const app: Elysia<"", {
                                 query: unknown;
                                 headers: unknown;
                                 response: {
-                                    200: void;
+                                    200: undefined;
+                                    404: "Төлбөрийн тохиргоо олдсонгүй." | "Төлбөрийн мэдээлэл олдсонгүй.";
+                                    400: string;
+                                    500: "Сервер алдаа гарлаа";
                                     422: {
                                         type: "validation";
                                         on: string;
@@ -3580,12 +3627,14 @@ declare const app: Elysia<"", {
                 };
             } & {
                 payment: {
-                    storepay: {
+                    ubpay: {
                         post: {
                             body: {
                                 paymentPackageId?: string | null | undefined;
-                                phone: number;
+                                state: "NOT_PAID" | "PENDING" | "FAILED" | "EXPIRED" | "PAID" | "DECLINED" | "CANCELED" | "REFUNDING" | "REFUNDED";
                                 cpOrderId: string;
+                                paymentMethod: "CASH" | "BANK_TRANSFER" | "POS_TERMINAL" | "PAYMENT_PACKAGE";
+                                paymentChannel: string;
                                 amount: number;
                             };
                             params: {};
@@ -3593,6 +3642,7 @@ declare const app: Elysia<"", {
                             headers: unknown;
                             response: {
                                 200: {
+                                    qrCode: string;
                                     id: string;
                                     createdAt: string;
                                     updatedAt: string;
@@ -3624,6 +3674,66 @@ declare const app: Elysia<"", {
             } & {
                 payment: {
                     ubpay: {
+                        ":id": {
+                            post: {
+                                body: unknown;
+                                params: {
+                                    id: string;
+                                };
+                                query: unknown;
+                                headers: unknown;
+                                response: {
+                                    200: undefined;
+                                    404: "Төлбөрийн тохиргоо олдсонгүй." | "Төлбөрийн мэдээлэл олдсонгүй.";
+                                    400: string;
+                                    500: "Сервер алдаа гарлаа";
+                                    422: {
+                                        type: "validation";
+                                        on: string;
+                                        summary?: string;
+                                        message?: string;
+                                        found?: unknown;
+                                        property?: string;
+                                        expected?: string;
+                                    };
+                                };
+                            };
+                        };
+                    };
+                };
+            } & {
+                payment: {
+                    qpay: {
+                        ":id": {
+                            get: {
+                                body: unknown;
+                                params: {
+                                    id: string;
+                                };
+                                query: unknown;
+                                headers: unknown;
+                                response: {
+                                    200: undefined;
+                                    404: "Төлбөрийн тохиргоо олдсонгүй." | "Төлбөрийн мэдээлэл олдсонгүй.";
+                                    400: string;
+                                    500: "Сервер алдаа гарлаа";
+                                    422: {
+                                        type: "validation";
+                                        on: string;
+                                        summary?: string;
+                                        message?: string;
+                                        found?: unknown;
+                                        property?: string;
+                                        expected?: string;
+                                    };
+                                };
+                            };
+                        };
+                    };
+                };
+            } & {
+                payment: {
+                    qpay: {
                         post: {
                             body: {
                                 paymentPackageId?: string | null | undefined;
@@ -3762,6 +3872,13 @@ declare const app: Elysia<"", {
                                 clientId: string;
                                 clientSecret: string;
                             };
+                        } | {
+                            type: "Qpay";
+                            sub: {
+                                password: string;
+                                username: string;
+                                invoiceCode: string;
+                            };
                         });
                         params: {};
                         query: unknown;
@@ -4916,4 +5033,3 @@ declare const app: Elysia<"", {
     standaloneSchema: {};
 }>;
 export type App = typeof app;
-export {};

package/dist/index.js

@@ -143420,11 +143420,11 @@ var WarehouseProductLogic;
     return and(softDeletedFilter(warehouseProductTable), eq(warehouseProductTable.companyId, user2.companyId), or(ilike(warehouseProductTable.name, ilikeSearch), ilike(warehouseProductTable.barCode, ilikeSearch), ilike(warehouseProductTable.oen, ilikeSearch), ilike(warehouseProductTable.partNumber, ilikeSearch))?.if(!!query.search), eq(warehouseProductTable.priceSell, query.priceSell ?? 0).if(query.priceSell), eq(warehouseProductTable.productId, query.productId ?? "").if(query.productId), eq(warehouseProductTable.supplierId, query.supplierId ?? "").if(query.supplierId), eq(warehouseProductTable.id, query.id ?? "").if(query.id), inArray(warehouseProductTable.id, query.ids ?? []).if(query.ids?.length));
   };
   WarehouseProductLogic.select = async (query, user2) => {
-    const columns = getTableColumns(warehouseProductTable);
     const baseQuery = db_default.select({
-      ...columns,
+      product: warehouseProductTable,
+      supplier: techdocSupplierTable,
       totalCount: totalCountSql
-    }).from(warehouseProductTable).where(WarehouseProductLogic.getFilter(query, user2)).$dynamic();
+    }).from(warehouseProductTable).innerJoin(techdocSupplierTable, eq(techdocSupplierTable.id, warehouseProductTable.supplierId)).where(WarehouseProductLogic.getFilter(query, user2)).$dynamic();
     const result = await pagination_helper_default(baseQuery, query.pagination);
     const content = {
       totalCount: result[0]?.totalCount ?? 0,
@@ -143550,8 +143550,8 @@ var CrmCpOrderProductLogic;
     const sk = product.result[0];
     const [result] = await db_default.insert(crmCpOrderProductTable).values({
       ...body,
-      priceUnit: sk.priceSell,
-      priceTotal: body.quantity * sk.priceSell
+      priceUnit: sk.product.priceSell,
+      priceTotal: body.quantity * sk.product.priceSell
     }).returning().onConflictDoUpdate({
       target: [
         crmCpOrderProductTable.cpOrderId,
@@ -143580,14 +143580,14 @@ var CrmCpOrderProductLogic;
     }
     const insertValues = [];
     for (const item of body) {
-      const serviceKind = serviceKinds.result.find((s) => s.id === item.companyProductId);
+      const serviceKind = serviceKinds.result.find((s) => s.product.id === item.companyProductId);
       if (!serviceKind) {
         return status("Not Found", "\u0411\u0430\u0440\u0430\u0430 \u043E\u043B\u0434\u0441\u043E\u043D\u0433\u04AF\u0439.");
       }
       insertValues.push({
         ...item,
-        priceUnit: item.priceUnit ?? serviceKind.priceSell,
-        priceTotal: item.quantity * (item.priceUnit ?? serviceKind.priceSell)
+        priceUnit: item.priceUnit ?? serviceKind.product.priceSell,
+        priceTotal: item.quantity * (item.priceUnit ?? serviceKind.product.priceSell)
       });
     }
     await tdb.insert(crmCpOrderProductTable).values(insertValues);
@@ -143920,13 +143920,125 @@ var __async = (__this, __arguments, generator3) => {
     step((generator3 = generator3.apply(__this, __arguments)).next());
   });
 };
+var Qpay = class {
+  constructor(username2, password, invoiceCode, saveToken) {
+    this.baseUrl = "https://merchant.qpay.mn";
+    this.username = username2;
+    this.password = password;
+    this.invoiceCode = invoiceCode;
+    this.saveToken = saveToken;
+  }
+  login() {
+    return __async(this, null, function* () {
+      const req = yield fetch(`${this.baseUrl}/v2/auth/token`, {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+          Authorization: `Basic ${btoa(`${this.username}:${this.password}`)}`
+        }
+      });
+      const res = yield req.json();
+      if (res.error) {
+        throw new Error(res.message);
+      }
+      const response = res;
+      return {
+        access_token: response.access_token,
+        refresh_token: response.refresh_token,
+        expires_in: response.expires_in,
+        refresh_expires_in: response.refresh_expires_in
+      };
+    });
+  }
+  getRefreshToken(refreshToken2) {
+    return __async(this, null, function* () {
+      const req = yield fetch(`${this.baseUrl}/v2/auth/refresh`, {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+          Authorization: `Bearer ${refreshToken2}`
+        }
+      });
+      const res = yield req.json();
+      if (res.error) {
+        throw new Error(res.message);
+      }
+      const response = res;
+      return {
+        access_token: response.access_token,
+        refresh_token: response.refresh_token,
+        expires_in: response.expires_in,
+        refresh_expires_in: response.refresh_expires_in
+      };
+    });
+  }
+  checkToken(inputToken) {
+    return __async(this, null, function* () {
+      let token = inputToken;
+      if (!token || !token.refresh_expires_in) {
+        token = yield this.login();
+      }
+      if (token.refresh_expires_in && new Date(token.refresh_expires_in * 1000) <= /* @__PURE__ */ new Date) {
+        token = yield this.login();
+      } else if (new Date(token.expires_in * 1000) <= /* @__PURE__ */ new Date) {
+        token = yield this.getRefreshToken(token.refresh_token);
+      }
+      if (this.saveToken && JSON.stringify(inputToken) !== JSON.stringify(token)) {
+        yield this.saveToken(token);
+      }
+      return token;
+    });
+  }
+  createInvoice(input, token) {
+    return __async(this, null, function* () {
+      token = yield this.checkToken(token);
+      const req = yield fetch(`${this.baseUrl}/v2/invoice`, {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+          Authorization: `Bearer ${token.access_token}`
+        },
+        body: JSON.stringify(__spreadProps2(__spreadValues2({}, input), {
+          invoice_code: this.invoiceCode
+        }))
+      });
+      const res = yield req.json();
+      return {
+        data: res,
+        token
+      };
+    });
+  }
+  checkInvoice(invoiceId, token) {
+    return __async(this, null, function* () {
+      token = yield this.checkToken(token);
+      const req = yield fetch(`${this.baseUrl}/v2/payment/check`, {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+          Authorization: `Bearer ${token.access_token}`
+        },
+        body: JSON.stringify({
+          object_type: "INVOICE",
+          object_id: invoiceId
+        })
+      });
+      const res = yield req.json();
+      return {
+        data: res,
+        token
+      };
+    });
+  }
+};
 var StorePay = class {
-  constructor(username2 = "88004454", password = "88004454", appUsername = "merchantapp1", appPassword = "EnRZA3@B") {
+  constructor(username2, password, appUsername, appPassword, saveToken) {
     this.baseUrl = "https://service.storepay.mn:8778";
     this.username = username2;
     this.password = password;
     this.appUsername = appUsername;
     this.appPassword = appPassword;
+    this.saveToken = saveToken;
   }
   login() {
     return __async(this, null, function* () {
@@ -143949,14 +144061,18 @@ var StorePay = class {
       return res;
     });
   }
-  checkToken(token) {
+  checkToken(inputToken) {
     return __async(this, null, function* () {
+      let token = inputToken;
       if (!token) {
         token = yield this.login();
       }
       if (new Date(token.expires_in * 1000) <= /* @__PURE__ */ new Date) {
         token = yield this.login();
       }
+      if (this.saveToken && JSON.stringify(inputToken) !== JSON.stringify(token)) {
+        yield this.saveToken(token);
+      }
       return token;
     });
   }
@@ -144000,11 +144116,12 @@ var StorePay = class {
   }
 };
 var UbPay = class {
-  constructor(clientId, clientSecret, baseUrl) {
+  constructor(clientId, clientSecret, saveToken, baseUrl) {
     this.baseUrl = "https://merchant-payment-api.dev.p.ubcabtech.com";
     this.clientId = clientId;
     this.clientSecret = clientSecret;
     this.baseUrl = baseUrl || this.baseUrl;
+    this.saveToken = saveToken;
   }
   login() {
     return __async(this, null, function* () {
@@ -144042,16 +144159,20 @@ var UbPay = class {
       });
     });
   }
-  checkToken(token) {
+  checkToken(inputToken) {
     return __async(this, null, function* () {
+      let token = inputToken;
       if (!token || !token.refresh_expires_in) {
         token = yield this.login();
       }
       if (token.refresh_expires_in && new Date(token.refresh_expires_in * 1000) <= /* @__PURE__ */ new Date) {
         token = yield this.login();
-      } else {
+      } else if (new Date(token.expires_in * 1000) <= /* @__PURE__ */ new Date) {
         token = yield this.getRefreshToken(token);
       }
+      if (this.saveToken && JSON.stringify(inputToken) !== JSON.stringify(token)) {
+        yield this.saveToken(token);
+      }
       return token;
     });
   }
@@ -144091,6 +144212,8 @@ var UbPay = class {
 };
 
 // src/routes/crm/cpOrder/payment/gateways/index.ts
+var CALLBACK_URL = "http://202.70.40.82:3000/api/crm/cp-order/payment";
+
 class PaymentGateway {
   token = undefined;
   paymentId = undefined;
@@ -144169,9 +144292,10 @@ class StorePayGateway extends PaymentGateway {
       mobileNumber: input.phone,
       description: "",
       amount: input.amount,
-      callbackUrl: `https://dev.api.autosync.mn/crm/cp-order/payment/storepay/${payment.id}`
+      callbackUrl: `${CALLBACK_URL}/storepay/${payment.id}`
     }, this.token);
     await this.updatePaymentInfo(invoice.token);
+    await this.updateInvoiceNumber(payment.id, invoice.data.value.toString());
     return payment;
   }
   async checkInvoice(id) {
@@ -144193,6 +144317,7 @@ class UbPayGateway extends PaymentGateway {
   ubPay;
   constructor(input) {
     super();
+    input[2] = this.updatePaymentInfo;
     this.ubPay = new UbPay(...input);
   }
   async createInvoice(input) {
@@ -144204,7 +144329,7 @@ class UbPayGateway extends PaymentGateway {
       amount: payment.amount,
       description: "Autosync",
       customData: undefined,
-      callbackUrl: "http://202.70.40.82:3000/api/crm/cp-order/payment/ubpay/" + payment.id
+      callbackUrl: `${CALLBACK_URL}/ubpay/${payment.id}`
     }, this.token);
     if (invoice.data.success === false) {
       throw new Error("\u041D\u044D\u0445\u044D\u043C\u0436\u043B\u044D\u043B \u04AF\u04AF\u0441\u0433\u044D\u0445\u044D\u0434 \u0430\u043B\u0434\u0430\u0430 \u0433\u0430\u0440\u043B\u0430\u0430.");
@@ -144219,7 +144344,6 @@ class UbPayGateway extends PaymentGateway {
   async checkInvoice(invoiceId) {
     const payment = await this.getPaymentById(invoiceId);
     const check2 = await this.ubPay.checkInvoice(payment.invoiceNumber ?? "", this.token);
-    console.log(check2.data);
     await this.updatePaymentInfo(check2.token);
     if (check2.data.data.status === "open") {
       throw new Error("\u0422\u04E9\u043B\u0431\u04E9\u0440 \u0442\u04E9\u043B\u04E9\u0433\u0434\u04E9\u04E9\u0433\u04AF\u0439 \u0431\u0430\u0439\u043D\u0430.");
@@ -144231,6 +144355,41 @@ class UbPayGateway extends PaymentGateway {
   }
 }
 
+// src/routes/crm/cpOrder/payment/gateways/qpay.ts
+class QpayGateway extends PaymentGateway {
+  qpay;
+  constructor(params) {
+    super();
+    params[3] = this.updatePaymentInfo;
+    this.qpay = new Qpay(...params);
+  }
+  async createInvoice(input) {
+    const payment = await this.savePayment(input);
+    const invoice = await this.qpay.createInvoice({
+      sender_invoice_no: payment.id,
+      invoice_receiver_code: payment.cpOrderId,
+      invoice_description: "test",
+      amount: payment.amount,
+      callback_url: `${CALLBACK_URL}/qpay/${payment.id}`
+    }, this.token);
+    await this.updatePaymentInfo(invoice.token);
+    await this.updateInvoiceNumber(payment.id, invoice.data.invoice_id);
+    return {
+      ...payment,
+      qrCode: invoice.data.qr_text
+    };
+  }
+  async checkInvoice(invoiceId) {
+    const payment = await this.getPaymentById(invoiceId);
+    const check2 = await this.qpay.checkInvoice(payment.invoiceNumber ?? "", this.token);
+    await this.updatePaymentInfo(check2.token);
+    if (check2.data.paid_amount !== payment.amount) {
+      throw new Error("\u0422\u04E9\u043B\u0431\u04E9\u0440 \u0442\u04E9\u043B\u04E9\u0433\u0434\u04E9\u04E9\u0433\u04AF\u0439 \u0431\u0430\u0439\u043D\u0430.");
+    }
+    await this.setPaid(invoiceId);
+  }
+}
+
 // src/routes/crm/cpOrder/payment/logic.ts
 var CrmCpOrderPaymentLogic;
 ((CrmCpOrderPaymentLogic) => {
@@ -144247,6 +144406,68 @@ var CrmCpOrderPaymentLogic;
   CrmCpOrderPaymentLogic.removePaymentInfo = async (id) => {
     await db_default.delete(crmPaymentTable).where(eq(crmPaymentTable.id, id));
   };
+  CrmCpOrderPaymentLogic.createQpay = async (body, user2) => {
+    let paymentInfo = await getPaymentInfo("Qpay", user2);
+    if ("code" in paymentInfo) {
+      return paymentInfo;
+    }
+    const auth3 = paymentInfo.sub;
+    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;
+      }
+    ]);
+    gateway.setToken(paymentInfo);
+    try {
+      const result = await gateway.createInvoice({
+        ...body,
+        paymentMethod: "POS_TERMINAL",
+        paymentChannel: "Qpay",
+        state: "PENDING"
+      });
+      return result;
+    } catch (err2) {
+      if (err2 instanceof Error) {
+        return status("Bad Request", err2.message);
+      }
+      return status("Internal Server Error", "\u0421\u0435\u0440\u0432\u0435\u0440 \u0430\u043B\u0434\u0430\u0430 \u0433\u0430\u0440\u043B\u0430\u0430");
+    }
+  };
+  CrmCpOrderPaymentLogic.checkQpay = async (id) => {
+    const paymentInfo = await getPaymentInfoByPaymentId(id, "Qpay");
+    if ("code" in paymentInfo) {
+      return paymentInfo;
+    }
+    const auth3 = paymentInfo.sub;
+    const gateway = new QpayGateway([
+      auth3.username,
+      auth3.password,
+      auth3.invoiceCode
+    ]);
+    gateway.setToken(paymentInfo);
+    try {
+      await gateway.checkInvoice(id);
+      app.server?.publish(`cp_order_payment:${id}`, "PAID");
+    } catch (err2) {
+      if (err2 instanceof Error) {
+        app.server?.publish(`cp_order_payment:${id}`, err2.message);
+        return status("Bad Request", err2.message);
+      }
+      return status("Internal Server Error", "\u0421\u0435\u0440\u0432\u0435\u0440 \u0430\u043B\u0434\u0430\u0430 \u0433\u0430\u0440\u043B\u0430\u0430");
+    }
+  };
   CrmCpOrderPaymentLogic.createStorepay = async (body, user2) => {
     const paymentInfo = await getPaymentInfo("StorePay", user2);
     if ("code" in paymentInfo) {
@@ -144291,15 +144512,17 @@ var CrmCpOrderPaymentLogic;
     gateway.setToken(paymentInfo);
     try {
       await gateway.checkInvoice(id);
+      app.server?.publish(`cp_order_payment:${id}`, "PAID");
     } catch (err2) {
       if (err2 instanceof Error) {
+        app.server?.publish(`cp_order_payment:${id}`, err2.message);
         return status("Bad Request", err2.message);
       }
       return status("Internal Server Error", "\u0421\u0435\u0440\u0432\u0435\u0440 \u0430\u043B\u0434\u0430\u0430 \u0433\u0430\u0440\u043B\u0430\u0430");
     }
   };
   CrmCpOrderPaymentLogic.createUbPay = async (body, user2) => {
-    const paymentInfo = await getPaymentInfo("UbPay", user2);
+    let paymentInfo = await getPaymentInfo("UbPay", user2);
     if ("code" in paymentInfo) {
       return paymentInfo;
     }
@@ -144331,8 +144554,10 @@ var CrmCpOrderPaymentLogic;
     gateway.setToken(paymentInfo);
     try {
       await gateway.checkInvoice(id);
+      app.server?.publish(`cp_order_payment:${id}`, "PAID");
     } catch (err2) {
       if (err2 instanceof Error) {
+        app.server?.publish(`cp_order_payment:${id}`, err2.message);
         return status("Bad Request", err2.message);
       }
       return status("Internal Server Error", "\u0421\u0435\u0440\u0432\u0435\u0440 \u0430\u043B\u0434\u0430\u0430 \u0433\u0430\u0440\u043B\u0430\u0430");
@@ -144394,6 +144619,14 @@ var CrmCpOrderPaymentModel;
           clientId: t.String(),
           clientSecret: t.String()
         })
+      }),
+      t.Object({
+        type: t.Literal("Qpay"),
+        sub: t.Object({
+          username: t.String(),
+          password: t.String(),
+          invoiceCode: t.String()
+        })
       })
     ])
   ]);
@@ -144421,13 +144654,12 @@ var paymentRoutes = new Elysia({
   },
   query: "CrmCpOrderPaymentModel.wsQuery",
   body: "CrmCpOrderPaymentModel.wsBody"
-}).get("/storepay/:id", async ({ params: { id } }) => logic_default11.checkStorePay(id)).post("/ubpay/:id", async ({ params: { id } }) => {
-  logic_default11.checkUbPay(id);
-  paymentRoutes.server?.publish(`cp_order_payment:${id}`, JSON.stringify({
-    state: "PAID"
-  }));
-}).guard({ auth: true }).post("/storepay", async ({ body, user: user2 }) => logic_default11.createStorepay(body, user2), { body: "CrmCpOrderPaymentModel.storepay" }).post("/ubpay", async ({ body, user: user2 }) => logic_default11.createUbPay(body, user2), {
-  body: "CrmCpOrderPaymentModel.create"
+}).post("/storepay", async ({ body, user: user2 }) => logic_default11.createStorepay(body, user2), { body: "CrmCpOrderPaymentModel.storepay", auth: true }).get("/storepay/:id", async ({ params: { id } }) => logic_default11.checkStorePay(id)).post("/ubpay", async ({ body, user: user2 }) => logic_default11.createUbPay(body, user2), {
+  body: "CrmCpOrderPaymentModel.create",
+  auth: true
+}).post("/ubpay/:id", async ({ params: { id } }) => logic_default11.checkUbPay(id)).get("/qpay/:id", async ({ params: { id } }) => logic_default11.checkQpay(id)).post("/qpay", async ({ body, user: user2 }) => logic_default11.createQpay(body, user2), {
+  body: "CrmCpOrderPaymentModel.create",
+  auth: true
 }).guard({
   userKind: "ADMIN"
 }).get("/", async () => logic_default11.selectPaymentInfo()).post("/", async ({ body }) => logic_default11.createPaymentInfo(body), {
@@ -145039,7 +145271,7 @@ var permissionRoutes = new Elysia({
       return status2("Forbidden", "\u0417\u04E9\u0432\u0445\u04E9\u043D \u0430\u0434\u043C\u0438\u043D \u044D\u0440\u0445\u0442\u044D\u0439 \u0445\u044D\u0440\u044D\u0433\u043B\u044D\u0433\u0447\u0438\u0434 \u044D\u043D\u044D \u04AF\u0439\u043B\u0434\u043B\u0438\u0439\u0433 \u0445\u0438\u0439\u0445 \u0431\u043E\u043B\u043E\u043C\u0436\u0442\u043E\u0439.");
     }
   }
-}).group("/group", (app) => app.guard({
+}).group("/group", (app2) => app2.guard({
   permission: "PERMISSION_GROUP_ALL"
 }).get("/", async ({ query }) => await logic_default14.selectGroups(query), {
   query: "PermissionModel.select"
@@ -145395,12 +145627,12 @@ var WarehouseItemLogic;
 ((WarehouseItemLogic) => {
   WarehouseItemLogic.select = async (query, user2) => {
     const filter = and(softDeletedFilter(warehouseItemTable), ...query.product ? [logic_default7.getFilter(query.product, user2)] : [], eq(warehouseItemTable.safetyStock, query.safetyStock ?? 0).if(query.safetyStock), ilike(warehouseItemTable.shelfNumber, sql3`%${query.shelfNumber}%`).if(query.shelfNumber));
-    const columns = getTableColumns(warehouseItemTable);
     const baseQuery = db_default.select({
-      ...columns,
+      item: warehouseItemTable,
+      supplier: techdocSupplierTable,
       product: warehouseProductTable,
       totalCount: totalCountSql
-    }).from(warehouseItemTable).where(filter).innerJoin(warehouseProductTable, and(eq(warehouseItemTable.productId, warehouseProductTable.id), isNull2(warehouseProductTable.deletedAt))).$dynamic();
+    }).from(warehouseItemTable).where(filter).innerJoin(warehouseProductTable, and(eq(warehouseItemTable.productId, warehouseProductTable.id), isNull2(warehouseProductTable.deletedAt))).innerJoin(techdocSupplierTable, eq(warehouseProductTable.supplierId, techdocSupplierTable.id)).$dynamic();
     const result = await pagination_helper_default(baseQuery, query.pagination);
     const content = {
       totalCount: result[0]?.totalCount ?? 0,
@@ -145671,3 +145903,6 @@ var app = new Elysia().use(index_default({
     tags: swagger_tags_default
   }
 })).use(requestLogger).mount(auth2.handler).use(routes_default).listen(env_default.PORT);
+export {
+  app
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "autosync_backend2",
-  "version": "1.1.23",
+  "version": "1.1.25",
   "module": "src/index.ts",
   "type": "module",
   "main": "dist/index.js",
@@ -31,7 +31,7 @@
     "exceljs": "^4.4.0",
     "fast-xml-parser": "^5.2.5",
     "generate-password": "^1.7.1",
-    "mn-payment": "^0.0.15",
+    "mn-payment": "^0.0.20",
     "nodemailer": "^7.0.3",
     "pg": "^8.16.1",
     "pino": "^9.7.0",