npm - autosync_backend2 - Versions diffs - 1.1.18 → 1.1.19 - Mend

autosync_backend2 1.1.18 → 1.1.19

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/dist/index.d.ts CHANGED Viewed

@@ -365,29 +365,30 @@ declare const app: Elysia<"", {
             amount: import("@sinclair/typebox").TNumber;
         }>;
         readonly "CrmCpOrderPaymentModel.storepay": import("@sinclair/typebox").TObject<{
-            state: import("@sinclair/typebox").TEnum<{
-                NOT_PAID: "NOT_PAID";
-                PENDING: "PENDING";
-                FAILED: "FAILED";
-                EXPIRED: "EXPIRED";
-                PAID: "PAID";
-                DECLINED: "DECLINED";
-                CANCELED: "CANCELED";
-                REFUNDING: "REFUNDING";
-                REFUNDED: "REFUNDED";
-            }>;
             cpOrderId: import("@sinclair/typebox").TString;
             paymentPackageId: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TString, import("@sinclair/typebox").TNull]>>;
-            paymentMethod: import("@sinclair/typebox").TEnum<{
-                CASH: "CASH";
-                BANK_TRANSFER: "BANK_TRANSFER";
-                POS_TERMINAL: "POS_TERMINAL";
-                PAYMENT_PACKAGE: "PAYMENT_PACKAGE";
-            }>;
-            paymentChannel: import("@sinclair/typebox").TString;
             amount: import("@sinclair/typebox").TNumber;
             phone: import("@sinclair/typebox").TNumber;
         }>;
+        readonly "CrmCpOrderPaymentModel.createPaymentInfo": import("@sinclair/typebox").TIntersect<[import("@sinclair/typebox").TObject<{
+            branchId: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
+            companyId: import("@sinclair/typebox").TString;
+        }>, import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TObject<{
+            type: import("@sinclair/typebox").TLiteral<"StorePay">;
+            sub: import("@sinclair/typebox").TObject<{
+                username: import("@sinclair/typebox").TString;
+                password: import("@sinclair/typebox").TString;
+                appUserName: import("@sinclair/typebox").TString;
+                appPassword: import("@sinclair/typebox").TString;
+                storeId: import("@sinclair/typebox").TString;
+            }>;
+        }>, import("@sinclair/typebox").TObject<{
+            type: import("@sinclair/typebox").TLiteral<"UbPay">;
+            sub: import("@sinclair/typebox").TObject<{
+                username: import("@sinclair/typebox").TString;
+                password: import("@sinclair/typebox").TString;
+            }>;
+        }>]>]>;
         readonly "CrmCpOrderModel.create": import("@sinclair/typebox").TObject<{
             phone: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
             vin: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
@@ -3535,10 +3536,7 @@ declare const app: Elysia<"", {
                             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: {};
@@ -3572,6 +3570,157 @@ declare const app: Elysia<"", {
                         };
                     };
                 };
+            } & {
+                payment: {
+                    get: {
+                        body: unknown;
+                        params: {};
+                        query: unknown;
+                        headers: unknown;
+                        response: {
+                            200: {
+                                company: {
+                                    name: string;
+                                    regNumber: string;
+                                    phone: string;
+                                    email: string;
+                                    serviceName: string;
+                                    logoUrl: string;
+                                    province: string | null;
+                                    district: string | null;
+                                    khoroo: string | null;
+                                    street: string | null;
+                                    socialUrls: string[] | null;
+                                    ceoName: string | null;
+                                    webUrl: string | null;
+                                    googleMapUrl: string | null;
+                                    isContract: boolean;
+                                    isNoat: boolean;
+                                    isNexus: boolean;
+                                    isActive: boolean;
+                                    branchCount: number;
+                                    id: string;
+                                    createdAt: string;
+                                    updatedAt: string;
+                                    deletedAt: string | null;
+                                };
+                                branch: {
+                                    name: string;
+                                    phone: string;
+                                    logoUrl: string;
+                                    email: string | null;
+                                    regNumber: string | null;
+                                    province: string | null;
+                                    district: string | null;
+                                    khoroo: string | null;
+                                    street: string | null;
+                                    socialUrls: string[] | null;
+                                    ceoName: string | null;
+                                    googleMapUrl: string | null;
+                                    isNoat: boolean;
+                                    isActive: boolean;
+                                    packageId: string;
+                                    merchantId: string;
+                                    id: string;
+                                    createdAt: string;
+                                    updatedAt: string;
+                                    deletedAt: string | null;
+                                } | null;
+                                payment: {
+                                    accessToken: string | null;
+                                    refreshToken: string | null;
+                                    companyId: string;
+                                    expiresIn: number | null;
+                                    refreshExpiresIn: number | null;
+                                    branchId: string | null;
+                                    type: "StorePay" | "Qpay" | "MinuPos" | "UbPay";
+                                    sub: unknown;
+                                    id: string;
+                                    createdAt: string;
+                                    updatedAt: string;
+                                    deletedAt: string | null;
+                                };
+                            }[];
+                        };
+                    };
+                };
+            } & {
+                payment: {
+                    post: {
+                        body: {
+                            branchId?: string | undefined;
+                            companyId: string;
+                        } & ({
+                            type: "StorePay";
+                            sub: {
+                                password: string;
+                                username: string;
+                                appUserName: string;
+                                appPassword: string;
+                                storeId: string;
+                            };
+                        } | {
+                            type: "UbPay";
+                            sub: {
+                                password: string;
+                                username: string;
+                            };
+                        });
+                        params: {};
+                        query: unknown;
+                        headers: unknown;
+                        response: {
+                            200: {
+                                type: "StorePay" | "Qpay" | "MinuPos" | "UbPay";
+                                id: string;
+                                sub: unknown;
+                                createdAt: string;
+                                updatedAt: string;
+                                companyId: string;
+                                branchId: string | null;
+                                accessToken: string | null;
+                                refreshToken: string | null;
+                                deletedAt: string | null;
+                                expiresIn: number | null;
+                                refreshExpiresIn: number | null;
+                            };
+                            422: {
+                                type: "validation";
+                                on: string;
+                                summary?: string;
+                                message?: string;
+                                found?: unknown;
+                                property?: string;
+                                expected?: string;
+                            };
+                        };
+                    };
+                };
+            } & {
+                payment: {
+                    ":id": {
+                        delete: {
+                            body: unknown;
+                            params: {
+                                id: string;
+                            };
+                            query: unknown;
+                            headers: unknown;
+                            response: {
+                                200: void;
+                                422: {
+                                    type: "validation";
+                                    on: string;
+                                    summary?: string;
+                                    message?: string;
+                                    found?: unknown;
+                                    property?: string;
+                                    expected?: string;
+                                };
+                            };
+                        };
+                    };
+                };
             };
         } & {
             "cp-order": {

package/dist/index.js CHANGED Viewed

@@ -143975,7 +143975,7 @@ var CrmCpOrderPaymentModel;
   const createSchema = createInsertSchema(crmCpOrderPaymentTable);
   CrmCpOrderPaymentModel.create = t.Omit(OmitBaseSchema(createSchema), ["invoiceNumber"]);
   CrmCpOrderPaymentModel.storepay = t.Composite([
-    CrmCpOrderPaymentModel.create,
+    t.Omit(CrmCpOrderPaymentModel.create, ["paymentMethod", "paymentChannel", "state"]),
     t.Object({
       phone: t.Number({
         minimum: 1e7,
@@ -143983,6 +143983,31 @@ var CrmCpOrderPaymentModel;
       })
     })
   ]);
+  CrmCpOrderPaymentModel.createPaymentInfo = t.Intersect([
+    t.Object({
+      branchId: t.Optional(t.String({ format: "uuid" })),
+      companyId: t.String({ format: "uuid" })
+    }),
+    t.Union([
+      t.Object({
+        type: t.Literal("StorePay"),
+        sub: t.Object({
+          username: t.String(),
+          password: t.String(),
+          appUserName: t.String(),
+          appPassword: t.String(),
+          storeId: t.String()
+        })
+      }),
+      t.Object({
+        type: t.Literal("UbPay"),
+        sub: t.Object({
+          username: t.String(),
+          password: t.String()
+        })
+      })
+    ])
+  ]);
 })(CrmCpOrderPaymentModel ||= {});
 var model_default8 = CrmCpOrderPaymentModel;
@@ -144182,6 +144207,19 @@ class StorePayGateway extends PaymentGateway {
 // src/routes/crm/cpOrder/payment/logic.ts
 var CrmCpOrderPaymentLogic;
 ((CrmCpOrderPaymentLogic) => {
+  CrmCpOrderPaymentLogic.selectPaymentInfo = async () => {
+    const paymentInfos = await db_default.select().from(crmPaymentTable).innerJoin(companyCompanyTable, eq(companyCompanyTable.id, crmPaymentTable.companyId)).leftJoin(companyBranchTable, eq(companyBranchTable.id, crmPaymentTable.branchId));
+    return paymentInfos;
+  };
+  CrmCpOrderPaymentLogic.createPaymentInfo = async (body) => {
+    const [paymentInfo] = await db_default.insert(crmPaymentTable).values({
+      ...body
+    }).returning();
+    return paymentInfo;
+  };
+  CrmCpOrderPaymentLogic.removePaymentInfo = async (id) => {
+    await db_default.delete(crmPaymentTable).where(eq(crmPaymentTable.id, id));
+  };
   CrmCpOrderPaymentLogic.createStorepay = async (body, user2) => {
     const paymentInfo = await getPaymentInfo("StorePay", user2);
     if ("code" in paymentInfo) {
@@ -144196,7 +144234,12 @@ var CrmCpOrderPaymentLogic;
     ]);
     gateway.setToken(paymentInfo);
     gateway.storeId = auth3.storeId;
-    const result = await gateway.createInvoice(body);
+    const result = await gateway.createInvoice({
+      ...body,
+      paymentMethod: "POS_TERMINAL",
+      paymentChannel: "STOREPAY",
+      state: "PENDING"
+    });
     return result;
   };
   CrmCpOrderPaymentLogic.checkStorePay = async (id) => {
@@ -144245,7 +144288,13 @@ var logic_default11 = CrmCpOrderPaymentLogic;
 var paymentRoutes = new Elysia({
   prefix: "/payment",
   tags: ["CrmCpOrderPayment"]
-}).use(better_auth_default).model(prefix_model_default("CrmCpOrderPaymentModel", model_default8)).get("/storepay/:id", async ({ params: { id } }) => logic_default11.checkStorePay(id)).guard({ auth: true }).post("/storepay", async ({ body, user: user2 }) => logic_default11.createStorepay(body, user2), { body: "CrmCpOrderPaymentModel.storepay" });
+}).use(better_auth_default).model(prefix_model_default("CrmCpOrderPaymentModel", model_default8)).get("/storepay/:id", async ({ params: { id } }) => logic_default11.checkStorePay(id)).guard({ auth: true }).post("/storepay", async ({ body, user: user2 }) => logic_default11.createStorepay(body, user2), { body: "CrmCpOrderPaymentModel.storepay" }).guard({
+  userKind: "ADMIN"
+}).get("/", async () => logic_default11.selectPaymentInfo()).post("/", async ({ body }) => logic_default11.createPaymentInfo(body), {
+  body: "CrmCpOrderPaymentModel.createPaymentInfo"
+}).delete("/:id", async ({ params: { id } }) => logic_default11.removePaymentInfo(id), {
+  params: IdSchema
+});
 var payment_default = paymentRoutes;
 // src/routes/crm/cpOrder/index.ts

package/package.json CHANGED Viewed

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