autosync_backend2 1.1.63 → 1.1.65

package/dist/index.d.ts

@@ -2484,6 +2484,7 @@ export declare const app: Elysia<"", {
                     body: unknown;
                     params: {};
                     query: {
+                        companyId?: string | undefined;
                         regNumber?: string | null | undefined;
                         phone?: string | undefined;
                         firstname?: string | undefined;
@@ -2971,6 +2972,7 @@ export declare const app: Elysia<"", {
                         branchId?: string | undefined;
                         kind?: "ADMIN" | "COMPANY_ADMIN" | "CUSTOMER" | "INSPECTION" | undefined;
                         employeeId?: string | null | undefined;
+                        password?: string | undefined;
                         permissions: never[];
                     };
                     params: {

package/dist/index.js

@@ -151311,7 +151311,13 @@ var CompanyEmployeeModel;
   CompanyEmployeeModel.create = OmitBaseSchema(createSchema);
   CompanyEmployeeModel.update = OmitBaseSchema(updateSchema);
   CompanyEmployeeModel.select = t.Composite([
-    t.Partial(t.Pick(selectSchema, ["phone", "regNumber", "firstname", "lastname"])),
+    t.Partial(t.Pick(selectSchema, [
+      "phone",
+      "regNumber",
+      "firstname",
+      "lastname",
+      "companyId"
+    ])),
     PaginationSchema
   ]);
 })(CompanyEmployeeModel ||= {});
@@ -151565,6 +151571,15 @@ var WarehouseProductLogic;
         key: "oen",
         header: "OEN",
         width: 20
+      },
+      {
+        header: "\u0410\u044E\u0443\u043B\u0433\u04AF\u0439 \u04AF\u043B\u0434\u044D\u0433\u0434\u044D\u043B"
+      },
+      {
+        header: "\u0422\u043E\u043E \u0448\u0438\u0440\u0445\u044D\u0433"
+      },
+      {
+        header: "\u0422\u0430\u0432\u0438\u0443\u0440\u0438\u0439\u043D \u0434\u0443\u0433\u0430\u0430\u0440"
       }
     ];
     for (const row of rows) {
@@ -155025,9 +155040,10 @@ var CrmCpOrderLogic;
         const ad = appliedDiscounts.filter((i2) => i2.apply.cpOrderId === item.order.id);
         const totalDiscount = ad.map((i2) => i2.apply.valueApplied).reduce((a12, b) => a12 + b, 0);
         const packageAmount = packageAmounts.find((p) => p.cpOrderId === item.order.id);
+        const ta = ((totalAmount?.amount ?? 0) + (packageAmount?.amount ?? 0)) * (totalAmount?.isNoat ? 1.1 : 1) - totalDiscount;
         return {
           ...item,
-          totalAmount: !totalAmount ? 0 : totalAmount.amount * (totalAmount.isNoat ? 1.1 : 1) - totalDiscount + (packageAmount ? packageAmount.amount : 0),
+          totalAmount: ta,
           paidAmount: payments.filter((i2) => i2.cpOrderId === item.order.id).map((i2) => i2.amount).reduce((a12, b) => a12 + b, 0)
         };
       }),
@@ -156158,7 +156174,7 @@ var CrmSpPackageServiceLogic;
   CrmSpPackageServiceLogic.remove = async (id) => {
     await db_default.update(crmSpPackageServiceTable).set({
       deletedAt: nowSql_helper_default
-    }).where(and(eq(crmSpPackageServiceTable.id, id)));
+    }).where(eq(crmSpPackageServiceTable.id, id));
   };
 })(CrmSpPackageServiceLogic ||= {});
 var logic_default15 = CrmSpPackageServiceLogic;
@@ -156862,6 +156878,13 @@ var UserLogic;
     return await db_default.transaction(async (db2) => {
       const isAdmin = user2.kind === "ADMIN";
       const [updatedUser] = await db2.update(user).set(body).where(and(eq(user.id, id), eq(user.companyId, user2.companyId).if(!isAdmin), eq(user.branchId, user2.branchId).if(!isAdmin))).returning();
+      if (body.password) {
+        await auth2.api.resetPassword({
+          body: {
+            newPassword: body.password
+          }
+        });
+      }
       if (!updatedUser) {
         return status("Not Found", "\u0425\u044D\u0440\u044D\u0433\u043B\u044D\u0433\u0447 \u043E\u043B\u0434\u0441\u043E\u043D\u0433\u04AF\u0439.");
       }
@@ -156889,9 +156912,10 @@ var createUserSchema = t.Composite([
   })
 ]);
 var updateUserSchema = t.Composite([
-  t.Omit(update, ["password"]),
+  update,
   t.Object({
-    permissions: t.Array(StringEnum(permissionList.map((permission) => permission.code)))
+    permissions: t.Array(StringEnum(permissionList.map((permission) => permission.code))),
+    password: t.Optional(t.String())
   })
 ]);
 

package/package.json

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