autosync_backend2 1.2.14 → 1.2.16

package/dist/index.d.ts

@@ -1326,6 +1326,7 @@ export declare const app: Elysia<"", {
                 ":id": {
                     put: {
                         body: {
+                            deletedAt?: string | null | undefined;
                             oldId?: number | null | undefined;
                             description?: string | null | undefined;
                             productId?: string | undefined;
@@ -4072,7 +4073,9 @@ export declare const app: Elysia<"", {
             "cp-order": {
                 sell: {
                     post: {
-                        body: unknown;
+                        body: {
+                            customerId?: string | undefined;
+                        };
                         params: {};
                         query: unknown;
                         headers: unknown;
@@ -4095,6 +4098,15 @@ export declare const app: Elysia<"", {
                                 timeCompleted: string | null;
                             };
                             401: "Session not found";
+                            422: {
+                                type: "validation";
+                                on: string;
+                                summary?: string;
+                                message?: string;
+                                found?: unknown;
+                                property?: string;
+                                expected?: string;
+                            };
                         };
                     };
                 };
@@ -7029,6 +7041,47 @@ export declare const app: Elysia<"", {
                     };
                 };
             };
+        } & {
+            reports: {
+                "cp-order": {
+                    get: {
+                        body: unknown;
+                        params: {};
+                        query: {
+                            type: "Service" | "Product";
+                        };
+                        headers: unknown;
+                        response: {
+                            200: {
+                                createdAt: string | null;
+                                orderId: string | null;
+                                phone: string | null;
+                                licensePlate: string | null;
+                                name: string | null;
+                                partNumber: string | null;
+                                employeeName: unknown;
+                                quantity: number;
+                                priceBuy: number | null;
+                                price: number;
+                                discount: unknown;
+                                priceAfterDiscount: number | null;
+                                totalPrice: unknown;
+                                totalPriceNoat: unknown;
+                            }[];
+                            401: "Session not found";
+                            422: {
+                                type: "validation";
+                                on: string;
+                                summary?: string;
+                                message?: string;
+                                found?: unknown;
+                                property?: string;
+                                expected?: string;
+                            };
+                        };
+                    };
+                };
+            };
         };
     };
 } & {

package/dist/index.js

@@ -146088,7 +146088,7 @@ var requestLogger = new Elysia({ name: "Middleware.RequestLogger" }).onRequest((
     },
     query: url2.searchParams
   });
-}).onAfterResponse(async ({ request, response, server, status: status2, set: set2, body, headers }) => {
+}).onAfterResponse(async ({ request, responseValue, server, status: status2, set: set2, body, headers }) => {
   logger2.info({
     msg: "Outgoing response",
     method: request.method,
@@ -146101,8 +146101,8 @@ var requestLogger = new Elysia({ name: "Middleware.RequestLogger" }).onRequest((
       headers,
       body
     },
-    response,
-    ipAddress: headers["X-FORWARDED_FOR"] ?? server?.requestIP(request)?.address,
+    response: responseValue,
+    ipAddress: headers?.["X-FORWARDED_FOR"] ?? server?.requestIP(request)?.address,
     method: request.method,
     path: request.url,
     statusCode: set2.status?.toString() ?? "200",
@@ -147358,7 +147358,8 @@ var CrmCpOrderItemLogic;
       const [result] = await db2.insert(crmCpOrderItemTable).values({
         ...body,
         priceUnit: sk?.price ?? product?.product.priceSell ?? 0,
-        priceTotal: body.quantity * (sk?.price ?? product?.product.priceSell ?? 0)
+        priceTotal: body.quantity * (sk?.price ?? product?.product.priceSell ?? 0),
+        name: sk?.name ?? product?.product.name
       }).returning();
       if (body.companyProductId && product) {
         const res = await CrmCpOrderItemLogic.handleWarehouseQuantityChange(body.companyProductId, body.quantity, user2, {
@@ -150717,9 +150718,10 @@ var CrmCpOrderLogic;
       return result;
     });
   };
-  CrmCpOrderLogic.createSell = async (user2) => {
+  CrmCpOrderLogic.createSell = async (body, user2) => {
     const orderId = await getOrderId("ProductSell", user2);
     const [result] = await db_default.insert(crmCpOrderTable).values({
+      ...body,
       companyBranchId: user2.branchId,
       companyId: user2.companyId,
       orderId,
@@ -151293,6 +151295,9 @@ var CrmCpOrderModel;
     licensePlate: t.Optional(t.String()),
     vehicleKindId: t.Optional(t.String({ format: "uuid" }))
   });
+  CrmCpOrderModel.createSell = t.Object({
+    customerId: t.Optional(t.String({ format: "uuid" }))
+  });
   CrmCpOrderModel.addPackage = t.Object({
     spPackageId: t.String({ format: "uuid" }),
     cpOrderId: t.String({ format: "uuid" }),
@@ -151450,7 +151455,9 @@ var cpOrderRoutes = new Elysia({
   return result;
 }, {
   body: model_default9.create
-}).post("/sell", async ({ user: user2 }) => logic_default14.createSell(user2)).post("/package", async ({ body, user: user2 }) => logic_default14.addPackage(body, user2), {
+}).post("/sell", async ({ user: user2, body }) => logic_default14.createSell(body, user2), {
+  body: model_default9.createSell
+}).post("/package", async ({ body, user: user2 }) => logic_default14.addPackage(body, user2), {
   body: model_default9.addPackage
 }).post("/complete", async ({ user: user2, body }) => logic_default14.complete(body, user2), {
   body: model_default9.complete
@@ -152201,6 +152208,39 @@ var CrmReportsLogic;
     ]);
     return formatCSV(headers, rows);
   };
+  CrmReportsLogic.cpOrderReport = async (query, user2) => {
+    const result = await db_default.select({
+      createdAt: crmCpOrderTable.createdAt,
+      orderId: crmCpOrderTable.orderId,
+      phone: crmCustomerTable.phoneNumber,
+      licensePlate: crmVehicleTable.licensePlate,
+      name: crmCpOrderItemTable.name,
+      partNumber: warehouseProductTable.partNumber,
+      employeeName: sql3`STRING_AGG(${companyEmployeeTable.firstname}, ', ')`.as("employee_name"),
+      quantity: crmCpOrderItemTable.quantity,
+      priceBuy: warehouseProductTable.priceBuy,
+      price: crmCpOrderItemTable.priceUnit,
+      discount: sql3`${crmDiscountApplyTable.priceAfterDiscount} - ${crmDiscountApplyTable.priceBeforeDiscount}`.as("discount"),
+      priceAfterDiscount: crmDiscountApplyTable.priceAfterDiscount,
+      totalPrice: sql3`CASE WHEN ${crmCpOrderTable.isNoat} = FALSE THEN ${crmCpOrderItemTable.priceTotal} ELSE 0 END`.as("total_price"),
+      totalPriceNoat: sql3`CASE WHEN ${crmCpOrderTable.isNoat} = TRUE THEN ${crmCpOrderItemTable.priceTotal} * 1.1 ELSE 0 END`.as("total_price_noat")
+    }).from(crmCpOrderItemTable).leftJoin(crmCpOrderTable, eq(crmCpOrderTable.id, crmCpOrderItemTable.cpOrderId)).leftJoin(crmCustomerTable, eq(crmCustomerTable.id, crmCpOrderTable.customerId)).leftJoin(crmVehicleTable, eq(crmVehicleTable.id, crmCpOrderTable.vehicleId)).leftJoin(warehouseProductTable, eq(warehouseProductTable.productId, crmCpOrderItemTable.companyProductId)).leftJoin(companyServiceKindTable, eq(companyServiceKindTable.id, crmCpOrderItemTable.companyServiceKindId)).leftJoin(crmCpOrderItemEmployeeTable, eq(crmCpOrderItemEmployeeTable.cpOrderItemId, crmCpOrderItemTable.id)).leftJoin(companyEmployeeTable, eq(companyEmployeeTable.id, crmCpOrderItemEmployeeTable.employeeId)).leftJoin(crmDiscountApplyTable, eq(crmDiscountApplyTable.cpOrderItemId, crmCpOrderItemTable.id)).where(and(eq(crmCpOrderTable.companyId, user2.companyId), eq(crmCpOrderTable.companyBranchId, user2.branchId).if(user2.kind === "CUSTOMER"), isNotNull(crmCpOrderItemTable.companyProductId).if(query.type === "Product"), isNotNull(crmCpOrderItemTable.companyServiceKindId).if(query.type === "Service"))).groupBy((t2) => [
+      t2.createdAt,
+      t2.orderId,
+      t2.phone,
+      t2.licensePlate,
+      t2.name,
+      t2.partNumber,
+      t2.quantity,
+      t2.priceBuy,
+      t2.price,
+      t2.priceAfterDiscount,
+      t2.discount,
+      t2.totalPrice,
+      t2.totalPriceNoat
+    ]);
+    return result;
+  };
 })(CrmReportsLogic ||= {});
 var logic_default18 = CrmReportsLogic;
 
@@ -152285,6 +152325,9 @@ var CrmReportsModel;
       totalPages: t.Number()
     })
   });
+  CrmReportsModel.cpOrderReport = t.Object({
+    type: t.UnionEnum(["Product", "Service"])
+  });
 })(CrmReportsModel ||= {});
 var model_default14 = CrmReportsModel;
 
@@ -152339,6 +152382,8 @@ var reportsRoutes = new Elysia({
   return csvData;
 }, {
   query: model_default14.csvExportQuery
+}).get("/cp-order", ({ query, user: user2 }) => logic_default18.cpOrderReport(query, user2), {
+  query: model_default14.cpOrderReport
 });
 var reports_default = reportsRoutes;
 
@@ -152554,7 +152599,7 @@ var vehicleRoutes = new Elysia({
 }).post("/many", async ({ body }) => {
   for (const v of body.licensePlate) {
     await logic_default11.findOrCreate({
-      licensePlate: v.trim().replaceAll(" ", "")
+      licensePlate: v.trim().replaceAll(" ", "").replaceAll("-", "")
     });
   }
 }, {
@@ -152570,7 +152615,7 @@ var vehicleRoutes = new Elysia({
     model: techdocVehicleKindTable.name,
     gas: crmVehicleTable.gasType,
     cc: crmVehicleTable.engineCc
-  }).from(crmVehicleTable).where(inArray(crmVehicleTable.licensePlate, body.licensePlate.map((i2) => i2.trim().replaceAll(" ", "")))).leftJoin(techdocVehicleKindTable, eq(techdocVehicleKindTable.id, crmVehicleTable.vehicleKindId));
+  }).from(crmVehicleTable).where(inArray(crmVehicleTable.licensePlate, body.licensePlate.map((i2) => i2.trim().replaceAll(" ", "").replaceAll("-", "")))).leftJoin(techdocVehicleKindTable, eq(techdocVehicleKindTable.id, crmVehicleTable.vehicleKindId));
   return res;
 }, {
   body: t.Object({
@@ -153320,7 +153365,10 @@ var WarehouseItemModel;
   const createSchema = createInsertSchema(warehouseItemTable);
   const updateSchema = createUpdateSchema(warehouseItemTable);
   WarehouseItemModel.create = OmitBaseSchema(createSchema);
-  WarehouseItemModel.update = t.Omit(OmitBaseSchema(updateSchema), ["quantity"]);
+  WarehouseItemModel.update = t.Composite([
+    t.Omit(OmitBaseSchema(updateSchema), ["quantity"]),
+    t.Pick(updateSchema, ["deletedAt"])
+  ]);
   WarehouseItemModel.createMany = t.Array(WarehouseItemModel.create, {
     minItems: 1
   });

package/package.json

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