autosync_backend2 1.1.27 → 1.1.29

package/dist/index.d.ts

@@ -4092,6 +4092,49 @@ export declare const app: Elysia<"", {
                     };
                 };
             };
+        } & {
+            "cp-order": {
+                ":id": {
+                    payment: {
+                        get: {
+                            body: unknown;
+                            params: {
+                                id: string;
+                            };
+                            query: unknown;
+                            headers: unknown;
+                            response: {
+                                200: {
+                                    payments: {
+                                        cpOrderId: string;
+                                        paymentPackageId: string | null;
+                                        paymentMethod: "CASH" | "BANK_TRANSFER" | "POS_TERMINAL" | "PAYMENT_PACKAGE";
+                                        paymentChannel: string;
+                                        amount: number;
+                                        state: "NOT_PAID" | "PENDING" | "FAILED" | "EXPIRED" | "PAID" | "DECLINED" | "CANCELED" | "REFUNDING" | "REFUNDED";
+                                        invoiceNumber: string | null;
+                                        id: string;
+                                        createdAt: string;
+                                        updatedAt: string;
+                                        deletedAt: string | null;
+                                    }[];
+                                    totalAmount: number;
+                                    paidAmount: number;
+                                };
+                                422: {
+                                    type: "validation";
+                                    on: string;
+                                    summary?: string;
+                                    message?: string;
+                                    found?: unknown;
+                                    property?: string;
+                                    expected?: string;
+                                };
+                            };
+                        };
+                    };
+                };
+            };
         };
     } & {
         crm: {

package/dist/index.js

@@ -143968,6 +143968,10 @@ var CrmCpOrderPaymentLogic;
   CrmCpOrderPaymentLogic.removePaymentInfo = async (id) => {
     await db_default.delete(crmPaymentTable).where(eq(crmPaymentTable.id, id));
   };
+  CrmCpOrderPaymentLogic.create = async (body) => {
+    const [payment] = await db_default.insert(crmCpOrderPaymentTable).values(body).returning();
+    return payment;
+  };
   CrmCpOrderPaymentLogic.createQpay = async (body, user2) => {
     let paymentInfo = await getPaymentInfo("Qpay", user2);
     if ("code" in paymentInfo) {
@@ -144303,20 +144307,22 @@ var CrmCpOrderItemLogic;
     if (!product && !sk) {
       return status("Bad Request", "\u04AE\u0439\u043B\u0447\u0438\u043B\u0433\u044D\u044D\u043D\u0438\u0439 \u0442\u04E9\u0440\u04E9\u043B \u044D\u0441\u0432\u044D\u043B \u0431\u0430\u0440\u0430\u0430 \u0441\u043E\u043D\u0433\u043E\u043D\u043E \u0443\u0443.");
     }
+    const curr = await db_default.select({
+      id: crmCpOrderItemTable.id
+    }).from(crmCpOrderItemTable).where(and(eq(crmCpOrderItemTable.cpOrderId, body.cpOrderId), eq(crmCpOrderItemTable.companyServiceKindId, body.companyServiceKindId ?? "").if(body.companyServiceKindId), eq(crmCpOrderItemTable.companyProductId, body.companyProductId ?? "").if(body.companyProductId)));
+    if (curr.length > 0) {
+      const [updated] = await db_default.update(crmCpOrderItemTable).set({
+        ...body,
+        priceUnit: sk?.price ?? product?.product.priceSell ?? 0,
+        priceTotal: body.quantity * (sk?.price ?? product?.product.priceSell ?? 0)
+      }).where(eq(crmCpOrderItemTable.id, curr[0].id)).returning();
+      return updated;
+    }
     const [result] = await db_default.insert(crmCpOrderItemTable).values({
       ...body,
       priceUnit: sk?.price ?? product?.product.priceSell ?? 0,
       priceTotal: body.quantity * (sk?.price ?? product?.product.priceSell ?? 0)
-    }).returning().onConflictDoUpdate({
-      set: {
-        quantity: sql3`excluded.quantity + ${crmCpOrderItemTable.quantity}`,
-        priceTotal: sql3`(excluded.quantity + ${crmCpOrderItemTable.quantity}) * excluded.price_unit`
-      },
-      target: [
-        crmCpOrderItemTable.cpOrderId,
-        crmCpOrderItemTable.companyServiceKindId
-      ]
-    });
+    }).returning();
     return result;
   };
   CrmCpOrderItemLogic.createMany = async (body, user2, tdb = db_default) => {
@@ -144327,20 +144333,20 @@ var CrmCpOrderItemLogic;
       ids: body.map((item) => item.companyServiceKindId).filter((i2) => !!i2),
       pagination: {
         page: 1,
-        size: body.length
+        size: body.filter((i2) => !!i2.companyServiceKindId).length
       }
     }, user2);
-    if (serviceKinds.results.length !== body.length) {
+    if (serviceKinds.results.length !== body.map((i2) => i2.companyServiceKindId).filter(Boolean).length) {
       return status("Not Found", "\u04AE\u0439\u043B\u0447\u0438\u043B\u0433\u044D\u044D\u043D\u0438\u0439 \u0442\u04E9\u0440\u04E9\u043B \u0437\u0430\u0440\u0438\u043C \u043D\u044C \u043E\u043B\u0434\u0441\u043E\u043D\u0433\u04AF\u0439.");
     }
     const products = await logic_default8.select({
       ids: body.map((item) => item.companyProductId).filter((i2) => !!i2),
       pagination: {
         page: 1,
-        size: body.length
+        size: body.filter((i2) => !!i2.companyProductId).length
       }
     }, user2);
-    if (products.result.length !== body.length) {
+    if (products.result.length !== body.map((i2) => i2.companyProductId).filter(Boolean).length) {
       return status("Not Found", "\u0411\u0430\u0440\u0430\u0430\u043D\u044B \u0442\u04E9\u0440\u04E9\u043B \u0437\u0430\u0440\u0438\u043C \u043D\u044C \u043E\u043B\u0434\u0441\u043E\u043D\u0433\u04AF\u0439.");
     }
     const insertValues = [];
@@ -144352,10 +144358,16 @@ var CrmCpOrderItemLogic;
       }
       insertValues.push({
         ...item,
+        companyServiceKindId: item.companyServiceKindId ?? null,
+        companyProductId: item.companyProductId ?? null,
         priceUnit: item.priceUnit ?? serviceKind?.price ?? product?.product.priceSell ?? 0,
         priceTotal: item.quantity * (item.priceUnit ?? serviceKind?.price ?? product?.product.priceSell ?? 0)
       });
     }
+    const currentValues = await db_default.select().from(crmCpOrderItemTable).where(and(eq(crmCpOrderItemTable.cpOrderId, insertValues[0].cpOrderId), or(inArray(crmCpOrderItemTable.companyProductId, insertValues.map((i2) => i2.companyProductId).filter((i2) => !!i2)), inArray(crmCpOrderItemTable.companyServiceKindId, insertValues.map((i2) => i2.companyServiceKindId).filter((i2) => !!i2)))));
+    if (currentValues.length > 0) {
+      return status("Bad Request", "\u0417\u0430\u0445\u0438\u0430\u043B\u0433\u044B\u043D \u04AF\u0439\u043B\u0447\u0438\u043B\u0433\u044D\u044D \u044D\u0441\u0432\u044D\u043B \u0431\u0430\u0440\u0430\u0430 \u0430\u043B\u044C \u0445\u044D\u0434\u0438\u0439\u043D \u043E\u0440\u0441\u043E\u043D \u0431\u0430\u0439\u043D\u0430.");
+    }
     await tdb.insert(crmCpOrderItemTable).values(insertValues);
   };
   CrmCpOrderItemLogic.update = async (id, body) => {
@@ -144381,6 +144393,12 @@ var CrmCpOrderItemLogic;
   CrmCpOrderItemLogic.remove = async (id) => {
     await db_default.delete(crmCpOrderItemTable).where(eq(crmCpOrderItemTable.id, id));
   };
+  CrmCpOrderItemLogic.selectAmountTotal = async (cpOrderId) => {
+    const [amount] = await db_default.select({
+      amount: sum(crmCpOrderItemTable.priceTotal).mapWith((value) => value === null ? 0 : Number(value))
+    }).from(crmCpOrderItemTable).where(eq(crmCpOrderItemTable.cpOrderId, cpOrderId));
+    return amount.amount;
+  };
 })(CrmCpOrderItemLogic ||= {});
 var logic_default9 = CrmCpOrderItemLogic;
 
@@ -144398,9 +144416,9 @@ var CrmCpOrderLogic;
       make,
       model,
       customer: crmCustomerTable,
-      isDeleteAble: sql3`(
+      isDeleteAble: sql3`
         (select count(*) from ${crmCpOrderItemTable} where ${crmCpOrderItemTable.cpOrderId} = ${crmCpOrderTable.id} and ${crmCpOrderItemTable.deletedAt} is null)
-        ) = 0`.mapWith(Boolean).as("is_delete_able")
+         = 0`.mapWith(Boolean).as("is_delete_able")
     }).from(crmCpOrderTable).innerJoin(crmVehicleTable, eq(crmVehicleTable.id, crmCpOrderTable.vehicleId)).leftJoin(crmCustomerTable, eq(crmCustomerTable.id, crmCpOrderTable.customerId)).leftJoin(model, eq(model.id, crmVehicleTable.vehicleKindId)).leftJoin(make, eq(make.id, model.parentId)).where(filter).orderBy(desc(crmCpOrderTable.createdAt)).$dynamic();
     const result = await pagination_helper_default(baseQuery, query.pagination);
     const content = {
@@ -144494,7 +144512,7 @@ var CrmCpOrderLogic;
           name: i2.name ?? undefined
         })), user2, db2);
         if (res && "code" in res) {
-          throw res;
+          throw new Error(res.response);
         }
       }
       if (spPackage.products.length > 0) {
@@ -144507,7 +144525,7 @@ var CrmCpOrderLogic;
           name: i2.name
         })), user2, db2);
         if (res && "code" in res) {
-          throw res;
+          throw new Error(res.response);
         }
       }
     });
@@ -144534,13 +144552,11 @@ var CrmCpOrderLogic;
     }).where(eq(crmCpOrderTable.id, id));
   };
   CrmCpOrderLogic.selectPayments = async (id) => {
-    const [totalAmount] = await db_default.select({
-      amount: sum(crmCpOrderItemTable.priceTotal)
-    }).from(crmCpOrderItemTable).where(eq(crmCpOrderItemTable.cpOrderId, id));
+    const totalAmount = await logic_default9.selectAmountTotal(id);
     const payments = await logic_default7.selectByCpOrderId(id);
     return {
       payments,
-      totalAmount: totalAmount.amount ? +totalAmount.amount : 0,
+      totalAmount,
       paidAmount: payments.map((p) => p.state === "PAID" ? p.amount : 0).reduce((a12, b) => a12 + b, 0)
     };
   };
@@ -144739,7 +144755,9 @@ var cpOrderRoutes = new Elysia({
   body: "CrmCpOrderModel.addPackage"
 }).guard({
   params: IdSchema
-}).post("/:id/complete", async ({ user: user2, params: { id } }) => logic_default10.complete(id, user2)).delete("/:id", async ({ user: user2, params: { id } }) => logic_default10.remove(id, user2));
+}).post("/:id/complete", async ({ user: user2, params: { id } }) => logic_default10.complete(id, user2)).delete("/:id", async ({ user: user2, params: { id } }) => logic_default10.remove(id, user2)).get("/:id/payment", async ({ params: { id } }) => logic_default10.selectPayments(id), {
+  tags: ["CrmCpOrderPayment", "CrmCpOrder"]
+});
 var cpOrder_default = cpOrderRoutes;
 
 // src/routes/crm/customer/model.ts

package/package.json

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