autosync_backend2 1.2.13 → 1.2.15

package/dist/index.d.ts

@@ -994,6 +994,7 @@ export declare const app: Elysia<"", {
                         warehouseId?: string | undefined;
                         safetyStock?: number | undefined;
                         shelfNumber?: string | undefined;
+                        isOrdered?: boolean | undefined;
                         isSafetyStock?: boolean | undefined;
                         pagination: {
                             size: number;
@@ -4071,7 +4072,9 @@ export declare const app: Elysia<"", {
             "cp-order": {
                 sell: {
                     post: {
-                        body: unknown;
+                        body: {
+                            customerId?: string | undefined;
+                        };
                         params: {};
                         query: unknown;
                         headers: unknown;
@@ -4094,6 +4097,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;
+                            };
                         };
                     };
                 };

package/dist/index.js

@@ -147103,7 +147103,7 @@ var logic_default5 = WarehouseProductLogic;
 var WarehouseItemLogic;
 ((WarehouseItemLogic) => {
   WarehouseItemLogic.select = async (query, user2) => {
-    const filter = and(softDeletedFilter(warehouseItemTable).if(query.isActive), isNotNull(warehouseItemTable.deletedAt).if(query.isActive !== undefined && query.isActive === false), ...query.product ? [logic_default5.getFilter(query.product, user2)] : [], eq(warehouseItemTable.safetyStock, query.safetyStock ?? 0).if(query.safetyStock), lte(warehouseItemTable.quantity, warehouseItemTable.safetyStock).if(query.isSafetyStock), ilike(warehouseItemTable.shelfNumber, `%${query.shelfNumber}%`).if(query.shelfNumber), eq(warehouseItemTable.warehouseId, query.warehouseId).if(query.warehouseId));
+    const filter = and(softDeletedFilter(warehouseItemTable).if(query.isActive), isNotNull(warehouseItemTable.deletedAt).if(query.isActive !== undefined && query.isActive === false), ...query.product ? [logic_default5.getFilter(query.product, user2)] : [], eq(warehouseItemTable.safetyStock, query.safetyStock ?? 0).if(query.safetyStock), lte(warehouseItemTable.quantity, warehouseItemTable.safetyStock).if(query.isSafetyStock), ilike(warehouseItemTable.shelfNumber, `%${query.shelfNumber}%`).if(query.shelfNumber), eq(warehouseItemTable.warehouseId, query.warehouseId).if(query.warehouseId), eq(warehouseItemTable.isOrdered, query.isOrdered).if(query.isOrdered));
     const baseQuery = db_default.select({
       item: warehouseItemTable,
       supplier: techdocSupplierTable,
@@ -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 () => {
+    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)).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;
 
@@ -152554,7 +152594,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 +152610,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({
@@ -153334,7 +153374,8 @@ var WarehouseItemModel;
       isActive: t.Boolean({
         default: true
       }),
-      isSafetyStock: t.Boolean()
+      isSafetyStock: t.Boolean(),
+      isOrdered: t.Boolean()
     }))
   ]);
   WarehouseItemModel.selectTransaction = t.Composite([

package/package.json

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