aamir_dev
Aamir Muhammad 1 year ago
parent 2eb1f22a24
commit fd684e9649

@ -260,8 +260,10 @@ class UserVM extends BaseVM {
//("Surname is mandatory"); //("Surname is mandatory");
isValid = false; isValid = false;
} else if (companyName!.isEmpty) { } else if (companyName!.isEmpty) {
Utils.showToast(LocaleKeys.companyNameMandatory.tr()); if (AppState().currentAppType == AppType.provider) {
isValid = false; Utils.showToast(LocaleKeys.companyNameMandatory.tr());
isValid = false;
}
} else if (email!.isNotEmpty) { } else if (email!.isNotEmpty) {
if (!Utils.isEmailValid(email)) { if (!Utils.isEmailValid(email)) {
Utils.showToast(LocaleKeys.enterValidEmail.tr()); Utils.showToast(LocaleKeys.enterValidEmail.tr());
@ -592,6 +594,7 @@ class UserVM extends BaseVM {
? phoneNum ? phoneNum
: phoneNum, : phoneNum,
password); password);
Utils.hideLoading(context); Utils.hideLoading(context);
LoginPasswordRespModel user = LoginPasswordRespModel.fromJson(jsonDecode(response.body)); LoginPasswordRespModel user = LoginPasswordRespModel.fromJson(jsonDecode(response.body));
if (user.messageStatus == 1) { if (user.messageStatus == 1) {

@ -2,6 +2,7 @@ import 'dart:developer';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.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/classes/consts.dart';
import 'package:mc_common_app/config/routes.dart'; import 'package:mc_common_app/config/routes.dart';
import 'package:mc_common_app/extensions/int_extensions.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/generated/locale_keys.g.dart';
import 'package:mc_common_app/models/chat_models/chat_message_model.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/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/enums.dart';
import 'package:mc_common_app/utils/navigator.dart'; import 'package:mc_common_app/utils/navigator.dart';
import 'package:mc_common_app/utils/utils.dart'; import 'package:mc_common_app/utils/utils.dart';
@ -66,20 +68,27 @@ Future buildSendOfferBottomSheet({
if (requestDetail.requestType == RequestsTypeEnum.serviceRequest.getIdFromRequestTypeEnum()) ...[ if (requestDetail.requestType == RequestsTypeEnum.serviceRequest.getIdFromRequestTypeEnum()) ...[
12.height, 12.height,
TxtField( 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, errorValue: requestsVM.offerPriceError,
hint: LocaleKeys.createdBy.tr(), hint: LocaleKeys.createdBy.tr(),
onChanged: (v) => requestsVM.updateItemManufacturer(v), onChanged: (v) => requestsVM.updateItemManufacturer(v),
), ),
12.height, 12.height,
TxtField( TxtField(
isButtonEnable: false,
isBackgroundEnabled: true,
errorValue: "", errorValue: "",
hint: LocaleKeys.createdOn.tr(), hint: LocaleKeys.createdOn.tr(),
value: requestsVM.serviceItemCreatedOn, value: DateHelper.formatAsYearMonthDay(DateTime.now()),
isNeedClickAll: true, isNeedClickAll: true,
postfixData: Icons.calendar_month_rounded, postfixData: Icons.calendar_month_rounded,
postFixDataColor: MyColors.darkTextColor, postFixDataColor: MyColors.darkTextColor,
onTap: () async { onTap: () async {
return;
final formattedDate = await Utils.pickDateFromDatePicker(context, firstDate: DateTime(2020), lastDate: DateTime.now()); final formattedDate = await Utils.pickDateFromDatePicker(context, firstDate: DateTime(2020), lastDate: DateTime.now());
requestsVM.updateServiceItemCreatedOn(formattedDate); requestsVM.updateServiceItemCreatedOn(formattedDate);
}, },
@ -145,6 +154,10 @@ Future buildSendOfferBottomSheet({
title: offerId == null ? LocaleKeys.submit.tr() : LocaleKeys.update.tr(), title: offerId == null ? LocaleKeys.submit.tr() : LocaleKeys.update.tr(),
maxHeight: 55, maxHeight: 55,
onPressed: () { onPressed: () {
requestsVM.updateItemManufacturer(
"${AppState().getUser.data!.userInfo!.firstName} ${AppState().getUser.data!.userInfo!.lastName}",
);
requestsVM.updateServiceItemCreatedOn(DateHelper.formatAsYearMonthDay(DateTime.now()));
if (offerId == null) { if (offerId == null) {
requestsVM.onSendOfferPressed( requestsVM.onSendOfferPressed(
context: context, context: context,

Loading…
Cancel
Save