Merge branch 'develop' into dev

* develop:
  fixed dialog reset password

src/modules/02_users/views/01_user.vue

@@ -36,7 +36,7 @@ const {
   hideLoader,
   success,
   dialogConfirm,
-  dialogMessageNotify,
+  dialogMessage,
 } = useCounterMixin();
 
 const NODE_ENV = ref<string>(process.env.NODE_ENV || "development");
@@ -454,8 +454,18 @@ function onReSetPassword(id: string) {
         await http.post(config.API.resetPassword, {
           keycloak: id,
         });
-        success($q, "รีเซ็ตรหัสผ่านสำเร็จ");
+        // success($q, "รีเซ็ตรหัสผ่านสำเร็จ");
-        dialogMessageNotify($q, messsage);
+        dialogMessage(
+          $q,
+          "รีเซ็ตรหัสผ่านสำเร็จ",
+          messsage,
+          "mdi-check-circle",
+          "ตกลง",
+          "green",
+          () => {},
+          () => {},
+          true,
+        );
       } catch (error) {
         messageError($q, error);
       } finally {