Updates #333

Merged
Haroon6138 merged 1 commits from haroon_dev into master 3 days ago

@ -211,7 +211,7 @@ class ApiClientImp implements ApiClient {
}
body['TokenID'] = "@dm!n";
// body['PatientID'] = 4774598;
// body['PatientID'] = 6424682;
// body['PatientID'] = 89754444;
// body['PatientTypeID'] = 1;
// body['PatientOutSA'] = 0;

@ -47,17 +47,16 @@ class AppState {
AuthenticatedUser? _authenticatedChildUser;
bool isPaytabsEnabled = false;
bool isPayfortHostedPageEnabled = true;
void setIsPaytabsEnabled(bool value) {
// isPaytabsEnabled = value;
isPaytabsEnabled = false;
isPaytabsEnabled = value;
// isPaytabsEnabled = true;
}
void setIsPayfortHostedPageEnabled(bool value) {
isPayfortHostedPageEnabled = value;
// isPayfortHostedPageEnabled = false;
// isPayfortHostedPageEnabled = true;
}
int? _superUserID;

@ -451,6 +451,7 @@ class _OTPVerificationScreenState extends State<OTPVerificationScreen> {
@override
void initState() {
Clarity.setCurrentScreenName('OTP Verification Screen');
super.initState();
_otpController = TextEditingController();
_startResendTimer();

@ -844,7 +844,7 @@ class BookAppointmentsViewModel extends ChangeNotifier {
Future<void> getDoctorFreeSlots({bool isBookingForLiveCare = false, Function(dynamic)? onSuccess, Function(String)? onError}) async {
docFreeSlots.clear();
DateTime date;
final DateFormat formatter = DateFormat('HH:mm');
final DateFormat formatter = DateFormat('HH:mm', "en-US");
final DateFormat dateFormatter = DateFormat('yyyy-MM-dd');
Map<DateTime, List> _eventsParsed;

@ -121,8 +121,8 @@ class ImmediateLiveCareViewModel extends ChangeNotifier {
}
Future<void> getLiveCareImmediateAppointmentFees({Function(dynamic)? onSuccess, Function(String)? onError}) async {
final result =
await immediateLiveCareRepo.getLiveCareImmediateAppointmentFees(_appState.getAuthenticatedUser()!.age!, _appState.getAuthenticatedUser()!.gender!, immediateLiveCareSelectedClinic.serviceID!);
final result = await immediateLiveCareRepo.getLiveCareImmediateAppointmentFees(
_appState.getAuthenticatedUser()!.age ?? 22, _appState.getAuthenticatedUser()!.gender ?? 1, immediateLiveCareSelectedClinic.serviceID ?? 1);
result.fold(
(failure) async {

@ -25,6 +25,7 @@ class AppointmentRatingViewModel extends ChangeNotifier {
bool isRateClinic = false;
Future<void> getLastRatingAppointment({Function(dynamic)? onSuccess, Function(String)? onError}) async {
appointmentRatedList.clear();
final result = await myAppointmentsRepo.getLastRatingAppointment();
result.fold(

@ -65,7 +65,7 @@ class PayTabsViewModel extends ChangeNotifier {
"12626"),
alternativePaymentMethods: [],
linkBillingNameWithCardHolderName: true,
simplifyApplePayValidation: true,
simplifyApplePayValidation: false,
);
paymentConfiguration.iOSThemeConfigurations = IOSThemeConfigurations(

@ -60,7 +60,7 @@ class AppointmentDoctorCard extends StatelessWidget {
Column(
children: [
Utils.buildImgWithNetwork(
url: patientAppointmentHistoryResponseModel.doctorImageURL!,
url: patientAppointmentHistoryResponseModel.doctorImageURL ?? "https://hmgwebservices.com/Images/MobileImages/DUBAI/unkown.png",
iconColor: AppColors.transparent,
width: 63.h,
height: 63.h,

@ -1,3 +1,4 @@
import 'package:clarity_flutter/clarity_flutter.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/gestures.dart';
import 'package:flutter/material.dart';
@ -31,6 +32,7 @@ class _RegisterNew extends State<RegisterNew> {
@override
void initState() {
Clarity.setCurrentScreenName('Registration Step 1 Screen');
super.initState();
_nationalIdFocusNode = FocusNode();
_dobFocusNode = FocusNode();

@ -1,3 +1,4 @@
import 'package:clarity_flutter/clarity_flutter.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart';
import 'package:hmg_patient_app_new/core/app_assets.dart';
@ -34,6 +35,7 @@ class _RegisterNew extends State<RegisterNewStep2> {
@override
void initState() {
Clarity.setCurrentScreenName('Registration Step 2 Screen');
super.initState();
authVM = context.read<AuthenticationViewModel>();
insuranceVM = context.read<InsuranceViewModel>();

@ -1,11 +1,13 @@
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart';
import 'package:hmg_patient_app_new/core/app_assets.dart';
import 'package:hmg_patient_app_new/core/app_state.dart';
import 'package:hmg_patient_app_new/core/dependencies.dart';
import 'package:hmg_patient_app_new/core/utils/size_utils.dart';
import 'package:hmg_patient_app_new/core/utils/utils.dart';
import 'package:hmg_patient_app_new/extensions/string_extensions.dart';
import 'package:hmg_patient_app_new/extensions/widget_extensions.dart';
import 'package:hmg_patient_app_new/features/authentication/authentication_view_model.dart';
import 'package:hmg_patient_app_new/features/book_appointments/models/resp_models/get_clinic_list_response_model.dart';
import 'package:hmg_patient_app_new/features/immediate_livecare/immediate_livecare_view_model.dart';
import 'package:hmg_patient_app_new/features/immediate_livecare/models/resp_models/get_livecare_immediate_clinics_response_model.dart';
@ -114,11 +116,11 @@ class SelectLivecareClinicPage extends StatelessWidget {
),
),
),
Column(
children: [
CustomButton(
text: LocaleKeys.yesPleasImInAHurry.tr(context: context),
onPressed: () async {
getIt.get<AppState>().isAuthenticated
? Column(children: [
CustomButton(
text: LocaleKeys.yesPleasImInAHurry.tr(context: context),
onPressed: () async {
Navigator.pop(context);
GetLiveCareClinicListResponseModel liveCareClinic = GetLiveCareClinicListResponseModel(
iD: selectedClinic.liveCareClinicID,
@ -177,8 +179,24 @@ class SelectLivecareClinicPage extends StatelessWidget {
height: 50.h,
).paddingSymmetrical(24.h, 0.h),
SizedBox(height: 24.h),
],
),
])
: CustomButton(
text: LocaleKeys.loginToUseServiceLiveCare.tr(),
onPressed: () async {
await getIt.get<AuthenticationViewModel>().onLoginPressed();
},
backgroundColor: AppColors.primaryRedColor,
borderColor: AppColors.primaryRedColor,
textColor: AppColors.whiteColor,
fontSize: 16.f,
isBold: true,
borderRadius: 12.r,
padding: EdgeInsets.fromLTRB(10, 0, 10, 0),
height: 50.h,
icon: AppAssets.login1,
iconColor: AppColors.whiteColor,
iconSize: 24.h,
).paddingSymmetrical(24.h, 120.h),
],
),
);

Loading…
Cancel
Save