autosync_backend2 1.2.15 → 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;
@@ -7040,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",
@@ -152208,7 +152208,7 @@ var CrmReportsLogic;
     ]);
     return formatCSV(headers, rows);
   };
-  CrmReportsLogic.cpOrderReport = async () => {
+  CrmReportsLogic.cpOrderReport = async (query, user2) => {
     const result = await db_default.select({
       createdAt: crmCpOrderTable.createdAt,
       orderId: crmCpOrderTable.orderId,
@@ -152224,7 +152224,7 @@ var CrmReportsLogic;
       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)).groupBy((t2) => [
+    }).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,
@@ -152325,6 +152325,9 @@ var CrmReportsModel;
       totalPages: t.Number()
     })
   });
+  CrmReportsModel.cpOrderReport = t.Object({
+    type: t.UnionEnum(["Product", "Service"])
+  });
 })(CrmReportsModel ||= {});
 var model_default14 = CrmReportsModel;
 
@@ -152379,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;
 
@@ -153360,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.15",
+  "version": "1.2.16",
   "module": "src/index.ts",
   "type": "module",
   "main": "dist/index.js",