vms-nest-prisma-api-document 23.0.0 → 25.0.0

package/dist/services/main/users/user_organisation_service.js

@@ -65,20 +65,6 @@ var numberOptional = (fieldName, min = 0, max = 1e9, defaultValue = 0) => {
     z.number({ invalid_type_error: `${fieldName} must be a number.` }).min(min, `${fieldName} must be at least ${min}.`).max(max, `${fieldName} must be at most ${max}.`).optional().default(defaultValue)
   );
 };
-var doubleOptionalLatLng = (fieldName, defaultValue = 0) => {
-  return z.preprocess(
-    (val) => {
-      if (typeof val === "string") {
-        val = parseFloat(val);
-      }
-      if (typeof val === "number") {
-        return parseFloat(val.toFixed(6));
-      }
-      return val;
-    },
-    z.number({ invalid_type_error: `${fieldName} must be a number.` }).min(-180, `${fieldName} must be at least -180.`).max(180, `${fieldName} must be at most 180.`).default(defaultValue)
-  ).optional();
-};
 var enumMandatory = (fieldName, enumType, defaultValue) => {
   return z.union([
     z.nativeEnum(enumType, {
@@ -179,6 +165,8 @@ var LoginFrom = /* @__PURE__ */ ((LoginFrom2) => {
   LoginFrom2["Web"] = "Web";
   LoginFrom2["Android"] = "Android";
   LoginFrom2["IPhone"] = "IPhone";
+  LoginFrom2["AndroidPWA"] = "AndroidPWA";
+  LoginFrom2["iOSPWA"] = "iOSPWA";
   return LoginFrom2;
 })(LoginFrom || {});
 var Status = /* @__PURE__ */ ((Status2) => {
@@ -288,28 +276,38 @@ var UserOrganisationSchema = z3.object({
   ),
   organisation_logo_url: stringOptional("Organisation Logo URL", 0, 300),
   organisation_logo_key: stringOptional("Organisation Logo Key", 0, 300),
+  // Billing Address
   company_cin: stringOptional("Company CIN", 0, 50),
   company_tin_gstin: stringOptional("Company TIN/GSTIN", 0, 50),
-  billing_address: stringOptional("Billing Address", 0, 100),
-  billing_locality: stringOptional("Billing Locality", 0, 100),
-  billing_city_district_town: stringOptional(
-    "Billing City/District/Town",
+  billing_address_line1: stringOptional("Billing Address Line 1", 0, 150),
+  billing_address_line2: stringOptional("Billing Address Line 2", 0, 150),
+  billing_locality_landmark: stringOptional(
+    "Billing Locality Landmark",
+    0,
+    150
+  ),
+  billing_neighborhood: stringOptional("Billing Neighborhood", 0, 100),
+  billing_town_city: stringOptional("Billing Town/City", 0, 100),
+  billing_district_county: stringOptional("Billing District/County", 0, 100),
+  billing_state_province_region: stringOptional(
+    "Billing State/Province/Region",
     0,
     100
   ),
-  billing_state: stringOptional("Billing State", 0, 100),
-  billing_zip_code: stringOptional("Billing Zip Code", 0, 10),
-  billing_landmark: stringOptional("Billing Landmark", 0, 100),
-  billing_latitude: doubleOptionalLatLng("Billing Latitude"),
-  billing_longitude: doubleOptionalLatLng("Billing Longitude"),
-  address: stringOptional("Address", 0, 100),
-  locality: stringOptional("Locality", 0, 100),
-  city_district_town: stringOptional("City/District/Town", 0, 100),
-  state: stringOptional("State", 0, 100),
-  zip_code: stringOptional("Zip Code", 0, 10),
-  landmark: stringOptional("Landmark", 0, 100),
-  latitude: doubleOptionalLatLng("Latitude"),
-  longitude: doubleOptionalLatLng("Longitude"),
+  billing_postal_code: stringOptional("Billing Postal Code", 0, 20),
+  billing_country: stringOptional("Billing Country", 0, 100),
+  billing_country_code: stringOptional("Billing Country Code", 0, 5),
+  // Address
+  address_line1: stringOptional("Address Line 1", 0, 150),
+  address_line2: stringOptional("Address Line 2", 0, 150),
+  locality_landmark: stringOptional("Locality Landmark", 0, 150),
+  neighborhood: stringOptional("Neighborhood", 0, 100),
+  town_city: stringOptional("Town/City", 0, 100),
+  district_county: stringOptional("District/County", 0, 100),
+  state_province_region: stringOptional("State/Province/Region", 0, 100),
+  postal_code: stringOptional("Postal Code", 0, 20),
+  country: stringOptional("Country", 0, 100),
+  country_code: stringOptional("Country Code", 0, 5),
   status: enumMandatory("Status", Status, "Active" /* Active */),
   industry_id: single_select_mandatory("Industry ID"),
   // Single selection -> MasterMainIndustry
@@ -323,6 +321,8 @@ var UserOrganisationSchema = z3.object({
   // Single selection -> MasterMainCurrency
   date_format_id: single_select_optional("Date Format ID"),
   // Single selection -> MasterMainDateFormat
+  language_id: single_select_optional("Language ID"),
+  // Single selection -> MasterMainLanguage
   distance_unit_id: single_select_optional("Distance Unit ID"),
   // Single selection -> MasterMainUnitDistance
   mileage_unit_id: single_select_optional("Mileage Unit ID"),
@@ -343,6 +343,8 @@ var UserOrganisationQuerySchema = BaseQuerySchema.extend({
   // Multi-selection -> MasterMainCurrency
   date_format_ids: multi_select_optional("Date Format IDs", 100, []),
   // Multi-selection -> MasterMainDateFormat
+  language_ids: multi_select_optional("Language IDs", 100, []),
+  // Multi-selection -> MasterMainDateFormat  
   distance_unit_ids: multi_select_optional("Distance Unit IDs", 100, []),
   // Multi-selection -> MasterMainUnitDistance
   mileage_unit_ids: multi_select_optional("Mileage Unit IDs", 100, []),
@@ -366,29 +368,34 @@ var toUserOrganisationPayload = (organisation) => ({
   time_zone_id: organisation.time_zone_id ?? "",
   currency_id: organisation.currency_id ?? "",
   date_format_id: organisation.date_format_id ?? "",
+  language_id: organisation.language_id ?? "",
   distance_unit_id: organisation.distance_unit_id ?? "",
   mileage_unit_id: organisation.mileage_unit_id ?? "",
   volume_unit_id: organisation.volume_unit_id ?? "",
   // Billing Information
   company_cin: organisation.company_cin ?? "",
   company_tin_gstin: organisation.company_tin_gstin ?? "",
-  billing_address: organisation.billing_address ?? "",
-  billing_locality: organisation.billing_locality ?? "",
-  billing_city_district_town: organisation.billing_city_district_town ?? "",
-  billing_state: organisation.billing_state ?? "",
-  billing_zip_code: organisation.billing_zip_code ?? "",
-  billing_landmark: organisation.billing_landmark ?? "",
-  billing_latitude: organisation.billing_latitude ?? void 0,
-  billing_longitude: organisation.billing_longitude ?? void 0,
+  billing_address_line1: organisation.billing_address_line1 ?? "",
+  billing_address_line2: organisation.billing_address_line2 ?? "",
+  billing_locality_landmark: organisation.billing_locality_landmark ?? "",
+  billing_neighborhood: organisation.billing_neighborhood ?? "",
+  billing_town_city: organisation.billing_town_city ?? "",
+  billing_district_county: organisation.billing_district_county ?? "",
+  billing_state_province_region: organisation.billing_state_province_region ?? "",
+  billing_postal_code: organisation.billing_postal_code ?? "",
+  billing_country: organisation.billing_country ?? "",
+  billing_country_code: organisation.billing_country_code ?? "",
   // Company Address
-  address: organisation.address ?? "",
-  locality: organisation.locality ?? "",
-  city_district_town: organisation.city_district_town ?? "",
-  state: organisation.state ?? "",
-  zip_code: organisation.zip_code ?? "",
-  landmark: organisation.landmark ?? "",
-  latitude: organisation.latitude ?? void 0,
-  longitude: organisation.longitude ?? void 0
+  address_line1: organisation.address_line1 ?? "",
+  address_line2: organisation.address_line2 ?? "",
+  locality_landmark: organisation.locality_landmark ?? "",
+  neighborhood: organisation.neighborhood ?? "",
+  town_city: organisation.town_city ?? "",
+  district_county: organisation.district_county ?? "",
+  state_province_region: organisation.state_province_region ?? "",
+  postal_code: organisation.postal_code ?? "",
+  country: organisation.country ?? "",
+  country_code: organisation.country_code ?? ""
 });
 var newUserOrganisationPayload = () => ({
   organisation_name: "",
@@ -404,29 +411,34 @@ var newUserOrganisationPayload = () => ({
   time_zone_id: "",
   currency_id: "",
   date_format_id: "",
+  language_id: "",
   distance_unit_id: "",
   mileage_unit_id: "",
   volume_unit_id: "",
   // Billing Information
   company_cin: "",
   company_tin_gstin: "",
-  billing_address: "",
-  billing_locality: "",
-  billing_city_district_town: "",
-  billing_state: "",
-  billing_zip_code: "",
-  billing_landmark: "",
-  billing_latitude: void 0,
-  billing_longitude: void 0,
+  billing_address_line1: "",
+  billing_address_line2: "",
+  billing_locality_landmark: "",
+  billing_neighborhood: "",
+  billing_town_city: "",
+  billing_district_county: "",
+  billing_state_province_region: "",
+  billing_postal_code: "",
+  billing_country: "",
+  billing_country_code: "",
   // Company Address
-  address: "",
-  locality: "",
-  city_district_town: "",
-  state: "",
-  zip_code: "",
-  landmark: "",
-  latitude: void 0,
-  longitude: void 0
+  address_line1: "",
+  address_line2: "",
+  locality_landmark: "",
+  neighborhood: "",
+  town_city: "",
+  district_county: "",
+  state_province_region: "",
+  postal_code: "",
+  country: "",
+  country_code: ""
 });
 var findUserOrganisations = async (data) => {
   return apiPost(

package/dist/services/main/users/user_service.d.ts

@@ -1,6 +1,6 @@
 import '../../../core/Enums.js';
 import '../../../core/BaseResponse.js';
 import 'zod';
-export { h2 as CreateUserDTO, h1 as CreateUserSchema, a as User, g_ as UserAccessControl, h0 as UserAccessControlDTO, g$ as UserAccessControlSchema, he as UserDefaultDateFormatDTO, hd as UserDefaultDateFormatSchema, ha as UserDefaultLanguageDTO, h9 as UserDefaultLanguageSchema, h6 as UserDefaultPageDTO, h5 as UserDefaultPageSchema, h8 as UserDefaultThemeDTO, h7 as UserDefaultThemeSchema, hc as UserDefaultTimeZoneDTO, hb as UserDefaultTimeZoneSchema, hg as UserLoginPushDTO, hf as UserLoginPushSchema, h4 as UserQueryDTO, h3 as UserQuerySchema, hk as createUser, hv as createUserLoginPush, hm as deleteUser, hx as deleteUserLoginPush, hj as findUsers, hn as getUserCache, ho as getUserCacheSimple, hp as getUserPresignedUrl, hh as newUserPayload, hi as toUserPayload, hl as updateUser, hu as updateUserDefaultDateformat, hs as updateUserDefaultLanguage, hq as updateUserDefaultPage, hr as updateUserDefaultTheme, ht as updateUserDefaultTimezone, hw as updateUserLoginPush } from '../../../user_organisation_service-djKCoZTQ.js';
+export { h0 as CreateUserDTO, g$ as CreateUserSchema, a as User, h8 as UserDefaultDateFormatDTO, h7 as UserDefaultDateFormatSchema, h4 as UserDefaultLanguageDTO, h3 as UserDefaultLanguageSchema, h6 as UserDefaultTimeZoneDTO, h5 as UserDefaultTimeZoneSchema, h2 as UserQueryDTO, h1 as UserQuerySchema, g_ as UserVehicleLink, hc as createUser, he as deleteUser, hb as findUsers, hf as getUserCache, hg as getUserCacheSimple, hh as getUserPresignedUrl, h9 as newUserPayload, ha as toUserPayload, hd as updateUser, hk as updateUserDefaultDateformat, hi as updateUserDefaultLanguage, hj as updateUserDefaultTimezone } from '../../../user_organisation_service-B5QmuUSK.js';
 import '../../../zod_utils/zod_base_schema.js';
 import '../../master/main/master_main_sim_provider_service.js';

package/dist/services/main/users/user_service.js

@@ -106,10 +106,6 @@ var enumArrayOptional = (fieldName, enumType, defaultValue = getAllEnums(enumTyp
   return schema.optional().default(() => defaultValue);
 };
 var dynamicJsonSchema = (fieldName, defaultValue = {}) => z.record(z.any()).optional().default(() => defaultValue);
-var single_select_mandatory = (fieldName) => {
-  const schema = z.string().trim().nonempty(`Please select ${fieldName}.`).transform(handleNullOrUndefined);
-  return schema;
-};
 var single_select_optional = (fieldName) => {
   r_log(fieldName);
   const schema = z.string().trim().transform(handleNullOrUndefined);
@@ -165,6 +161,8 @@ var LoginFrom = /* @__PURE__ */ ((LoginFrom2) => {
   LoginFrom2["Web"] = "Web";
   LoginFrom2["Android"] = "Android";
   LoginFrom2["IPhone"] = "IPhone";
+  LoginFrom2["AndroidPWA"] = "AndroidPWA";
+  LoginFrom2["iOSPWA"] = "iOSPWA";
   return LoginFrom2;
 })(LoginFrom || {});
 var Status = /* @__PURE__ */ ((Status2) => {
@@ -256,219 +254,110 @@ var ENDPOINTS = {
   // Presigned URL for file uploads
   presignedUrl: (fileName) => `${URL}/presigned_url/${fileName}`,
   // Default Settings
-  updateDefaultPage: (id) => `${URL}/default_page/${id}`,
-  updateDefaultTheme: (id) => `${URL}/default_theme/${id}`,
   updateDefaultLanguage: (id) => `${URL}/default_language/${id}`,
   updateDefaultTimezone: (id) => `${URL}/default_timezone/${id}`,
-  updateDefaultDateformat: (id) => `${URL}/default_date_format/${id}`,
-  // User Login Push
-  createLoginPush: `${URL}/login_push`,
-  updateLoginPush: (id) => `${URL}/login_push/${id}`,
-  deleteLoginPush: (id) => `${URL}/login_push/${id}`
+  updateDefaultDateformat: (id) => `${URL}/default_date_format/${id}`
 };
-var UserAccessControlSchema = z3.object({
-  vehicles_view: enumMandatory("Vehicles View", YesNo, "Yes" /* Yes */),
-  vehicles_edit: enumMandatory("Vehicles Edit", YesNo, "No" /* No */),
-  vehicles_delete: enumMandatory("Vehicles Delete", YesNo, "No" /* No */),
-  users_view: enumMandatory("Users View", YesNo, "Yes" /* Yes */),
-  users_edit: enumMandatory("Users Edit", YesNo, "No" /* No */),
-  users_delete: enumMandatory("Users Delete", YesNo, "No" /* No */),
-  drivers_view: enumMandatory("Drivers View", YesNo, "Yes" /* Yes */),
-  drivers_edit: enumMandatory("Drivers Edit", YesNo, "No" /* No */),
-  drivers_delete: enumMandatory("Drivers Delete", YesNo, "No" /* No */),
-  account_view: enumMandatory("Account View", YesNo, "Yes" /* Yes */),
-  account_edit: enumMandatory("Account Edit", YesNo, "No" /* No */),
-  account_delete: enumMandatory("Account Delete", YesNo, "No" /* No */),
-  masters_view: enumMandatory("Masters View", YesNo, "Yes" /* Yes */),
-  masters_edit: enumMandatory("Masters Edit", YesNo, "No" /* No */),
-  masters_delete: enumMandatory("Masters Delete", YesNo, "No" /* No */),
-  gps_view: enumMandatory("GPS View", YesNo, "Yes" /* Yes */),
-  gps_edit: enumMandatory("GPS Edit", YesNo, "No" /* No */),
-  gps_delete: enumMandatory("GPS Delete", YesNo, "No" /* No */),
-  fleet_view: enumMandatory("Fleet View", YesNo, "Yes" /* Yes */),
-  fleet_edit: enumMandatory("Fleet Edit", YesNo, "No" /* No */),
-  fleet_delete: enumMandatory("Fleet Delete", YesNo, "No" /* No */),
-  trips_view: enumMandatory("Trips View", YesNo, "Yes" /* Yes */),
-  trips_edit: enumMandatory("Trips Edit", YesNo, "No" /* No */),
-  trips_delete: enumMandatory("Trips Delete", YesNo, "No" /* No */),
-  warehouse_view: enumMandatory("Warehouse View", YesNo, "Yes" /* Yes */),
-  warehouse_edit: enumMandatory("Warehouse Edit", YesNo, "No" /* No */),
-  warehouse_delete: enumMandatory("Warehouse Delete", YesNo, "No" /* No */),
-  accounts_view: enumMandatory("Accounts View", YesNo, "Yes" /* Yes */),
-  accounts_edit: enumMandatory("Accounts Edit", YesNo, "No" /* No */),
-  accounts_delete: enumMandatory("Accounts Delete", YesNo, "No" /* No */),
-  user_id: single_select_optional("User ID"),
-  // Single selection -> User
-  status: enumMandatory("Status", Status, "Active" /* Active */)
-});
 var CreateUserSchema = z3.object({
   first_name: stringMandatory("First Name", 2, 100),
   last_name: stringOptional("Last Name", 0, 100),
   email: stringMandatory("Email", 2, 100),
-  is_google_login: enumMandatory("Is Google Login", YesNo, "No" /* No */),
-  google_login_data: stringOptional("Google Login Data", 0, 500),
-  password: stringOptional("Password", 0, 20),
+  username: stringOptional("Mobile", 0, 100),
   mobile: stringOptional("Mobile", 0, 20),
+  password: stringOptional("Password", 0, 20),
   can_login: enumMandatory("Can Login", YesNo, "No" /* No */),
-  is_activated: enumMandatory("Is Activated", YesNo, "No" /* No */),
   is_root_user: enumMandatory("Is Root User", YesNo, "No" /* No */),
+  all_vehicles: enumMandatory("All Vehicles", YesNo, "No" /* No */),
+  vehicle_ids: multi_select_optional("MasterVehicle"),
+  // Multi selection -> MasterVehicle
   user_image_url: stringOptional("User Image URL", 0, 300),
   user_image_key: stringOptional("User Image Key", 0, 300),
-  organisation_id: single_select_mandatory("Organisation ID"),
-  // Single selection -> UserOrganisation
-  language_id: single_select_optional("Language ID"),
-  // Single selection -> MasterMainLanguage
-  country_id: single_select_optional("Country ID"),
-  // Single selection -> MasterMainCountry
-  user_role_id: single_select_optional("User Role ID"),
-  // Single selection -> MasterUserRole
-  user_status_id: single_select_optional("User Status ID"),
-  // Single selection -> MasterUserStatus
-  default_module_name: stringOptional("Default Module Name", 0, 50),
-  default_page_name: stringOptional("Default Page Name", 0, 50),
-  default_page_url: stringOptional("Default Page URL", 0, 200),
-  default_theme: stringOptional("Default Theme", 0, 50),
-  status: enumMandatory("Status", Status, "Active" /* Active */),
-  user_access_control: UserAccessControlSchema.optional()
+  organisation_id: single_select_optional("UserOrganisation"),
+  // ✅ Single-Selection -> UserOrganisation
+  user_role_id: single_select_optional("MasterUserRole"),
+  // ✅ Single-Selection -> MasterUserRole
+  user_status_id: single_select_optional("MasterUserStatus"),
+  // ✅ Single-Selection -> MasterUserStatus
+  language_id: single_select_optional("MasterMainLanguage"),
+  // ✅ Single-Selection -> MasterMainLanguage
+  time_zone_id: single_select_optional("MasterMainTimeZone"),
+  // ✅ Single-Selection -> MasterMainTimeZone
+  date_format_id: single_select_optional("MasterMainDateFormat"),
+  // ✅ Single-Selection -> MasterMainDateFormat
+  status: enumMandatory("Status", Status, "Active" /* Active */)
 });
 var UserQuerySchema = BaseQuerySchema.extend({
-  organisation_ids: multi_select_optional("Organisation IDs", 100, []),
-  // Multi-selection -> UserOrganisation
-  language_ids: multi_select_optional("Language IDs", 100, []),
-  // Multi-selection -> MasterMainLanguage
-  country_ids: multi_select_optional("Country IDs", 100, []),
-  // Multi-selection -> MasterMainCountry
-  user_role_ids: multi_select_optional("User Role IDs", 100, []),
-  // Multi-selection -> MasterUserRole
-  user_status_ids: multi_select_optional("User Status IDs", 100, []),
-  // Multi-selection -> MasterUserStatus
-  user_ids: multi_select_optional("User IDs", 100, []),
-  // Multi-selection -> User
+  organisation_ids: multi_select_optional("UserOrganisation"),
+  // ✅ Multi-Selection -> UserOrganisation
+  user_role_ids: multi_select_optional("MasterUserRole"),
+  // ✅ Multi-Selection -> MasterUserRole
+  user_status_ids: multi_select_optional("MasterUserStatus"),
+  // ✅ Multi-Selection -> MasterUserStatus
+  language_ids: multi_select_optional("MasterMainLanguage"),
+  // ✅ Multi-Selection -> MasterMainLanguage
+  time_zone_ids: multi_select_optional("MasterMainTimeZone"),
+  // ✅ Multi-Selection -> MasterMainTimeZone
+  date_format_ids: multi_select_optional("MasterMainDateFormat"),
+  // ✅ Multi-Selection -> MasterMainDateFormat
+  user_ids: multi_select_optional("User"),
+  // ✅ Multi-Selection -> User
   can_login: enumArrayOptional("Can Login", YesNo),
-  is_activated: enumArrayOptional("Is Activated", YesNo)
-});
-var UserDefaultPageSchema = z3.object({
-  default_module_name: stringOptional("Default Module Name", 0, 50),
-  default_page_name: stringOptional("Default Page Name", 0, 50),
-  default_page_url: stringOptional("Default Page URL", 0, 200)
-});
-var UserDefaultThemeSchema = z3.object({
-  default_theme: stringOptional("Default Theme", 0, 50)
+  is_root_user: enumArrayOptional("Is Root User", YesNo),
+  all_vehicles: enumArrayOptional("All Vehicles", YesNo)
 });
 var UserDefaultLanguageSchema = z3.object({
-  language_id: single_select_optional("Language ID")
-  // Single selection -> MasterMainLanguage
+  language_id: single_select_optional("MasterMainLanguage")
+  // ✅ Single-Selection -> MasterMainLanguage
 });
 var UserDefaultTimeZoneSchema = z3.object({
-  time_zone_id: single_select_optional("Timezone ID")
-  // Single selection -> MasterMainTimeZone
+  time_zone_id: single_select_optional("MasterMainTimeZone")
+  // ✅ Single-Selection -> MasterMainTimeZone
 });
 var UserDefaultDateFormatSchema = z3.object({
-  date_format_id: single_select_optional("Date Format ID")
-  // Single selection -> MasterMainDateFormat
-});
-var UserLoginPushSchema = z3.object({
-  login_from: enumMandatory("Login From", LoginFrom, "Web" /* Web */),
-  web_token: stringOptional("Web Token", 0, 500),
-  android_token: stringOptional("Android Token", 0, 500),
-  iphone_token: stringOptional("IPhone Token", 0, 500),
-  organisation_id: single_select_mandatory("Organisation ID"),
-  // Single selection -> UserOrganisation
-  user_id: single_select_mandatory("User ID"),
-  // Single selection -> User
-  status: enumMandatory("Status", Status, "Active" /* Active */)
+  date_format_id: single_select_optional("MasterMainDateFormat")
+  // ✅ Single-Selection -> MasterMainDateFormat
 });
-var defaultUserAccessControl = {
-  vehicles_view: "No" /* No */,
-  vehicles_edit: "No" /* No */,
-  vehicles_delete: "No" /* No */,
-  users_view: "No" /* No */,
-  users_edit: "No" /* No */,
-  users_delete: "No" /* No */,
-  drivers_view: "No" /* No */,
-  drivers_edit: "No" /* No */,
-  drivers_delete: "No" /* No */,
-  account_view: "No" /* No */,
-  account_edit: "No" /* No */,
-  account_delete: "No" /* No */,
-  masters_view: "No" /* No */,
-  masters_edit: "No" /* No */,
-  masters_delete: "No" /* No */,
-  gps_view: "No" /* No */,
-  gps_edit: "No" /* No */,
-  gps_delete: "No" /* No */,
-  fleet_view: "No" /* No */,
-  fleet_edit: "No" /* No */,
-  fleet_delete: "No" /* No */,
-  trips_view: "No" /* No */,
-  trips_edit: "No" /* No */,
-  trips_delete: "No" /* No */,
-  warehouse_view: "No" /* No */,
-  warehouse_edit: "No" /* No */,
-  warehouse_delete: "No" /* No */,
-  accounts_view: "No" /* No */,
-  accounts_edit: "No" /* No */,
-  accounts_delete: "No" /* No */,
-  user_id: "",
-  status: "Active" /* Active */
-};
 var newUserPayload = () => ({
   first_name: "",
   last_name: "",
   email: "",
-  is_google_login: "No" /* No */,
-  google_login_data: "",
-  password: "",
+  username: "",
   mobile: "",
+  password: "",
   can_login: "No" /* No */,
-  is_activated: "No" /* No */,
   is_root_user: "No" /* No */,
+  all_vehicles: "Yes" /* Yes */,
+  vehicle_ids: [],
   user_image_url: "",
   user_image_key: "",
   organisation_id: "",
-  language_id: "",
-  country_id: "",
   user_role_id: "",
   user_status_id: "",
-  default_module_name: "",
-  default_page_name: "",
-  default_page_url: "",
-  default_theme: "",
-  status: "Active" /* Active */,
-  user_access_control: { ...defaultUserAccessControl }
+  language_id: "",
+  time_zone_id: "",
+  date_format_id: "",
+  status: "Active" /* Active */
 });
-var toUserPayload = (user) => ({
-  first_name: user.first_name,
-  last_name: user.last_name ?? "",
-  email: user.email,
-  is_google_login: user.is_google_login,
-  google_login_data: user.google_login_data ?? "",
-  password: user.password ?? "",
-  mobile: user.mobile ?? "",
-  can_login: user.can_login,
-  is_activated: user.is_activated,
-  is_root_user: user.is_root_user,
-  user_image_url: user.user_image_url ?? "",
-  user_image_key: user.user_image_key ?? "",
-  organisation_id: user.organisation_id ?? "",
-  language_id: user.language_id ?? "",
-  country_id: user.country_id ?? "",
-  user_role_id: user.user_role_id ?? "",
-  user_status_id: user.user_status_id ?? "",
-  default_module_name: user.default_module_name ?? "",
-  default_page_name: user.default_page_name ?? "",
-  default_page_url: user.default_page_url ?? "",
-  default_theme: user.default_theme ?? "",
-  status: user.status,
-  // User Access Control
-  user_access_control: user.UserAccessControl ? {
-    ...defaultUserAccessControl,
-    // Ensure all fields exist
-    ...user.UserAccessControl,
-    // Overwrite with user-specific values
-    user_id: user.user_id
-    // Ensure user_id is correctly assigned
-  } : { ...defaultUserAccessControl }
+var toUserPayload = (data) => ({
+  first_name: data.first_name,
+  last_name: data.last_name ?? "",
+  email: data.email,
+  mobile: data.mobile ?? "",
+  username: data.username ?? "",
+  password: data.password ?? "",
+  can_login: data.can_login,
+  is_root_user: data.is_root_user,
+  all_vehicles: data.all_vehicles,
+  user_image_url: data.user_image_url ?? "",
+  user_image_key: data.user_image_key ?? "",
+  organisation_id: data.organisation_id ?? "",
+  user_role_id: data.user_role_id ?? "",
+  user_status_id: data.user_status_id ?? "",
+  language_id: data.language_id ?? "",
+  date_format_id: data.date_format_id ?? "",
+  time_zone_id: data.time_zone_id ?? "",
+  status: data.status,
+  vehicle_ids: data.UserVehicleLink?.map((v) => v.vehicle_id) ?? []
 });
 var findUsers = async (data) => {
   return apiPost(ENDPOINTS.find, data);
@@ -491,18 +380,6 @@ var getUserCacheSimple = async (organisation_id) => {
 var getUserPresignedUrl = async (fileName) => {
   return apiGet(ENDPOINTS.presignedUrl(fileName));
 };
-var updateUserDefaultPage = async (id, data) => {
-  return apiPatch(
-    ENDPOINTS.updateDefaultPage(id),
-    data
-  );
-};
-var updateUserDefaultTheme = async (id, data) => {
-  return apiPatch(
-    ENDPOINTS.updateDefaultTheme(id),
-    data
-  );
-};
 var updateUserDefaultLanguage = async (id, data) => {
   return apiPatch(
     ENDPOINTS.updateDefaultLanguage(id),
@@ -521,29 +398,14 @@ var updateUserDefaultDateformat = async (id, data) => {
     data
   );
 };
-var createUserLoginPush = async (data) => {
-  return apiPost(ENDPOINTS.createLoginPush, data);
-};
-var updateUserLoginPush = async (id, data) => {
-  return apiPatch(ENDPOINTS.updateLoginPush(id), data);
-};
-var deleteUserLoginPush = async (id) => {
-  return apiDelete(ENDPOINTS.deleteLoginPush(id));
-};
 export {
   CreateUserSchema,
-  UserAccessControlSchema,
   UserDefaultDateFormatSchema,
   UserDefaultLanguageSchema,
-  UserDefaultPageSchema,
-  UserDefaultThemeSchema,
   UserDefaultTimeZoneSchema,
-  UserLoginPushSchema,
   UserQuerySchema,
   createUser,
-  createUserLoginPush,
   deleteUser,
-  deleteUserLoginPush,
   findUsers,
   getUserCache,
   getUserCacheSimple,
@@ -553,8 +415,5 @@ export {
   updateUser,
   updateUserDefaultDateformat,
   updateUserDefaultLanguage,
-  updateUserDefaultPage,
-  updateUserDefaultTheme,
-  updateUserDefaultTimezone,
-  updateUserLoginPush
+  updateUserDefaultTimezone
 };

package/dist/services/main/vehicle/childs/vehicle_odometer_history.d.ts

@@ -1,7 +1,7 @@
 import { OdometerSource, Status, PAGING, LoadParents, LoadChild, LoadChildCount, OrderBy, YesNo } from '../../../../core/Enums.js';
 import { FBR, SBR } from '../../../../core/BaseResponse.js';
 import { z } from 'zod';
-import { U as UserOrganisation, M as MasterVehicle } from '../../../../user_organisation_service-djKCoZTQ.js';
+import { U as UserOrganisation, M as MasterVehicle } from '../../../../user_organisation_service-B5QmuUSK.js';
 import '../../../../zod_utils/zod_base_schema.js';
 import '../../../master/main/master_main_sim_provider_service.js';
 

package/dist/services/main/vehicle/childs/vehicle_odometer_history.js

@@ -201,6 +201,8 @@ var LoginFrom = /* @__PURE__ */ ((LoginFrom2) => {
   LoginFrom2["Web"] = "Web";
   LoginFrom2["Android"] = "Android";
   LoginFrom2["IPhone"] = "IPhone";
+  LoginFrom2["AndroidPWA"] = "AndroidPWA";
+  LoginFrom2["iOSPWA"] = "iOSPWA";
   return LoginFrom2;
 })(LoginFrom || {});
 var Status = /* @__PURE__ */ ((Status2) => {

package/dist/services/main/vehicle/master_vehicle_service.d.ts

@@ -2,5 +2,5 @@ import '../../../core/Enums.js';
 import '../../../core/BaseResponse.js';
 import 'zod';
 import '../../../zod_utils/zod_base_schema.js';
-export { M as MasterVehicle, fn as MasterVehicleDropdown, fC as SimpleFindQueryDTO, fB as SimpleFindQuerySchema, fu as VehicleDTO, fo as VehicleDetailBody, fE as VehicleDetailBodyDTO, fD as VehicleDetailBodySchema, fr as VehicleDetailGPS, fK as VehicleDetailGPSAnalyticsDTO, fJ as VehicleDetailGPSAnalyticsSchema, fI as VehicleDetailGPSDataDTO, fH as VehicleDetailGPSDataSchema, fG as VehicleDetailGPSMainDTO, fF as VehicleDetailGPSMainSchema, fp as VehicleDetailLifeCycle, fM as VehicleDetailLifeCycleDto, fL as VehicleDetailLifeCycleSchema, fq as VehicleDetailPurchase, fO as VehicleDetailPurchaseDTO, fN as VehicleDetailPurchaseSchema, fs as VehicleDetailTrip, fQ as VehicleDetailTripDTO, fP as VehicleDetailTripSchema, fw as VehicleDeviceLinkDTO, fv as VehicleDeviceLinkSchema, fy as VehicleDeviceUnlinkDTO, fx as VehicleDeviceUnlinkSchema, fA as VehicleDriverLinkDTO, fz as VehicleDriverLinkSchema, fU as VehicleGPSQueryDTO, fT as VehicleGPSQuerySchema, fS as VehicleQueryDTO, fR as VehicleQuerySchema, ft as VehicleSchema, g2 as createVehicle, g4 as deleteVehicle, g1 as findVehicleGPSDetails, f$ as findVehicles, g0 as findVehiclesLiveDashboard, gj as getDeviceLinkHistoryByDevice, gi as getDeviceLinkHistoryByVehicle, gf as getDriverLinkHistoryByDriver, ge as getDriverLinkHistoryByVehicle, gk as getVehicleCache, gn as getVehicleParentCache, gl as getVehicleSimpleCache, gm as getVehicleSimpleDropdownCustom, gg as linkDeviceToVehicle, gc as linkDriverToVehicle, fW as newVehiclePayload, f_ as toVehicleDetailLifeCyclePayload, fZ as toVehicleDetailPurchasePayload, fY as toVehicleDetailsBodyPayload, fX as toVehicleDetailsGPSPayload, fV as toVehiclePayload, gh as unlinkDeviceFromVehicle, gd as unlinkDriverFromVehicle, g3 as updateVehicle, g5 as updateVehicleBodyDetails, ga as updateVehicleGPSDetailsAnalytics, g9 as updateVehicleGPSDetailsData, g8 as updateVehicleGPSDetailsMain, g6 as updateVehicleLifeCycleDetails, g7 as updateVehiclePurchaseDetails, gb as updateVehicleTripDetails } from '../../../user_organisation_service-djKCoZTQ.js';
+export { M as MasterVehicle, fn as MasterVehicleDropdown, fC as SimpleFindQueryDTO, fB as SimpleFindQuerySchema, fu as VehicleDTO, fo as VehicleDetailBody, fE as VehicleDetailBodyDTO, fD as VehicleDetailBodySchema, fr as VehicleDetailGPS, fK as VehicleDetailGPSAnalyticsDTO, fJ as VehicleDetailGPSAnalyticsSchema, fI as VehicleDetailGPSDataDTO, fH as VehicleDetailGPSDataSchema, fG as VehicleDetailGPSMainDTO, fF as VehicleDetailGPSMainSchema, fp as VehicleDetailLifeCycle, fM as VehicleDetailLifeCycleDto, fL as VehicleDetailLifeCycleSchema, fq as VehicleDetailPurchase, fO as VehicleDetailPurchaseDTO, fN as VehicleDetailPurchaseSchema, fs as VehicleDetailTrip, fQ as VehicleDetailTripDTO, fP as VehicleDetailTripSchema, fw as VehicleDeviceLinkDTO, fv as VehicleDeviceLinkSchema, fy as VehicleDeviceUnlinkDTO, fx as VehicleDeviceUnlinkSchema, fA as VehicleDriverLinkDTO, fz as VehicleDriverLinkSchema, fU as VehicleGPSQueryDTO, fT as VehicleGPSQuerySchema, fS as VehicleQueryDTO, fR as VehicleQuerySchema, ft as VehicleSchema, g2 as createVehicle, g4 as deleteVehicle, g1 as findVehicleGPSDetails, f$ as findVehicles, g0 as findVehiclesLiveDashboard, gj as getDeviceLinkHistoryByDevice, gi as getDeviceLinkHistoryByVehicle, gf as getDriverLinkHistoryByDriver, ge as getDriverLinkHistoryByVehicle, gk as getVehicleCache, gn as getVehicleParentCache, gl as getVehicleSimpleCache, gm as getVehicleSimpleDropdownCustom, gg as linkDeviceToVehicle, gc as linkDriverToVehicle, fW as newVehiclePayload, f_ as toVehicleDetailLifeCyclePayload, fZ as toVehicleDetailPurchasePayload, fY as toVehicleDetailsBodyPayload, fX as toVehicleDetailsGPSPayload, fV as toVehiclePayload, gh as unlinkDeviceFromVehicle, gd as unlinkDriverFromVehicle, g3 as updateVehicle, g5 as updateVehicleBodyDetails, ga as updateVehicleGPSDetailsAnalytics, g9 as updateVehicleGPSDetailsData, g8 as updateVehicleGPSDetailsMain, g6 as updateVehicleLifeCycleDetails, g7 as updateVehiclePurchaseDetails, gb as updateVehicleTripDetails } from '../../../user_organisation_service-B5QmuUSK.js';
 import '../../master/main/master_main_sim_provider_service.js';

package/dist/services/main/vehicle/master_vehicle_service.js

@@ -223,6 +223,8 @@ var LoginFrom = /* @__PURE__ */ ((LoginFrom2) => {
   LoginFrom2["Web"] = "Web";
   LoginFrom2["Android"] = "Android";
   LoginFrom2["IPhone"] = "IPhone";
+  LoginFrom2["AndroidPWA"] = "AndroidPWA";
+  LoginFrom2["iOSPWA"] = "iOSPWA";
   return LoginFrom2;
 })(LoginFrom || {});
 var Status = /* @__PURE__ */ ((Status2) => {

package/dist/services/master/device/master_device_manufacturer_service.d.ts

@@ -1,6 +1,6 @@
 import '../../../core/Enums.js';
 import '../../../core/BaseResponse.js';
 import 'zod';
-export { bE as MasterDeviceManufacturer, bG as MasterDeviceManufacturerDTO, bI as MasterDeviceManufacturerQueryDTO, bH as MasterDeviceManufacturerQuerySchema, bF as MasterDeviceManufacturerSchema, bM as createMasterDeviceManufacturer, bO as deleteMasterDeviceManufacturer, bL as findMasterDeviceManufacturers, bP as getMasterDeviceManufacturerCache, bR as getMasterDeviceManufacturerCacheChild, bQ as getMasterDeviceManufacturerCacheCount, bK as newMasterDeviceManufacturerPayload, bJ as toMasterDeviceManufacturerPayload, bN as updateMasterDeviceManufacturer } from '../../../user_organisation_service-djKCoZTQ.js';
+export { bE as MasterDeviceManufacturer, bG as MasterDeviceManufacturerDTO, bI as MasterDeviceManufacturerQueryDTO, bH as MasterDeviceManufacturerQuerySchema, bF as MasterDeviceManufacturerSchema, bM as createMasterDeviceManufacturer, bO as deleteMasterDeviceManufacturer, bL as findMasterDeviceManufacturers, bP as getMasterDeviceManufacturerCache, bR as getMasterDeviceManufacturerCacheChild, bQ as getMasterDeviceManufacturerCacheCount, bK as newMasterDeviceManufacturerPayload, bJ as toMasterDeviceManufacturerPayload, bN as updateMasterDeviceManufacturer } from '../../../user_organisation_service-B5QmuUSK.js';
 import '../../../zod_utils/zod_base_schema.js';
 import '../main/master_main_sim_provider_service.js';