From fd684e9649b62948e53275235e9a10ed28451c64 Mon Sep 17 00:00:00 2001 From: Aamir Date: Sun, 22 Dec 2024 11:07:51 +0300 Subject: [PATCH] fix --- lib/view_models/user_view_model.dart | 7 +++++-- lib/views/requests/request_bottomsheets.dart | 17 +++++++++++++++-- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/lib/view_models/user_view_model.dart b/lib/view_models/user_view_model.dart index dcf67a9..24a983e 100644 --- a/lib/view_models/user_view_model.dart +++ b/lib/view_models/user_view_model.dart @@ -260,8 +260,10 @@ class UserVM extends BaseVM { //("Surname is mandatory"); isValid = false; } else if (companyName!.isEmpty) { - Utils.showToast(LocaleKeys.companyNameMandatory.tr()); - isValid = false; + if (AppState().currentAppType == AppType.provider) { + Utils.showToast(LocaleKeys.companyNameMandatory.tr()); + isValid = false; + } } else if (email!.isNotEmpty) { if (!Utils.isEmailValid(email)) { Utils.showToast(LocaleKeys.enterValidEmail.tr()); @@ -592,6 +594,7 @@ class UserVM extends BaseVM { ? phoneNum : phoneNum, password); + Utils.hideLoading(context); LoginPasswordRespModel user = LoginPasswordRespModel.fromJson(jsonDecode(response.body)); if (user.messageStatus == 1) { diff --git a/lib/views/requests/request_bottomsheets.dart b/lib/views/requests/request_bottomsheets.dart index 0a358d3..fc52f80 100644 --- a/lib/views/requests/request_bottomsheets.dart +++ b/lib/views/requests/request_bottomsheets.dart @@ -2,6 +2,7 @@ import 'dart:developer'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; +import 'package:mc_common_app/classes/app_state.dart'; import 'package:mc_common_app/classes/consts.dart'; import 'package:mc_common_app/config/routes.dart'; import 'package:mc_common_app/extensions/int_extensions.dart'; @@ -9,6 +10,7 @@ import 'package:mc_common_app/extensions/string_extensions.dart'; import 'package:mc_common_app/generated/locale_keys.g.dart'; import 'package:mc_common_app/models/chat_models/chat_message_model.dart'; import 'package:mc_common_app/theme/colors.dart'; +import 'package:mc_common_app/utils/date_helper.dart'; import 'package:mc_common_app/utils/enums.dart'; import 'package:mc_common_app/utils/navigator.dart'; import 'package:mc_common_app/utils/utils.dart'; @@ -66,20 +68,27 @@ Future buildSendOfferBottomSheet({ if (requestDetail.requestType == RequestsTypeEnum.serviceRequest.getIdFromRequestTypeEnum()) ...[ 12.height, TxtField( - value: requestsVM.itemManufacturer, + onTap: () {}, + isNeedClickAll: true, + isButtonEnable: false, + isBackgroundEnabled: true, + value: "${AppState().getUser.data!.userInfo!.firstName} ${AppState().getUser.data!.userInfo!.lastName}", errorValue: requestsVM.offerPriceError, hint: LocaleKeys.createdBy.tr(), onChanged: (v) => requestsVM.updateItemManufacturer(v), ), 12.height, TxtField( + isButtonEnable: false, + isBackgroundEnabled: true, errorValue: "", hint: LocaleKeys.createdOn.tr(), - value: requestsVM.serviceItemCreatedOn, + value: DateHelper.formatAsYearMonthDay(DateTime.now()), isNeedClickAll: true, postfixData: Icons.calendar_month_rounded, postFixDataColor: MyColors.darkTextColor, onTap: () async { + return; final formattedDate = await Utils.pickDateFromDatePicker(context, firstDate: DateTime(2020), lastDate: DateTime.now()); requestsVM.updateServiceItemCreatedOn(formattedDate); }, @@ -145,6 +154,10 @@ Future buildSendOfferBottomSheet({ title: offerId == null ? LocaleKeys.submit.tr() : LocaleKeys.update.tr(), maxHeight: 55, onPressed: () { + requestsVM.updateItemManufacturer( + "${AppState().getUser.data!.userInfo!.firstName} ${AppState().getUser.data!.userInfo!.lastName}", + ); + requestsVM.updateServiceItemCreatedOn(DateHelper.formatAsYearMonthDay(DateTime.now())); if (offerId == null) { requestsVM.onSendOfferPressed( context: context,