diff --git a/ios/Podfile b/ios/Podfile index e4393e8d..c92f7e80 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -52,6 +52,7 @@ post_install do |installer| 'PERMISSION_REMINDERS=1', ] build_configuration.build_settings['EXCLUDED_ARCHS[sdk=iphonesimulator*]'] = 'arm64 i386' + build_configuration.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '13.0' if build_configuration.build_settings['WRAPPER_EXTENSION'] == 'bundle' build_configuration.build_settings['DEVELOPMENT_TEAM'] = '3A359E86ZF' end diff --git a/lib/config/config.dart b/lib/config/config.dart index 96c71d2c..cd192911 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -20,8 +20,8 @@ var PACKAGES_ORDERS = '/api/orders'; var PACKAGES_ORDER_HISTORY = '/api/orders/items'; var PACKAGES_TAMARA_OPT = '/api/orders/paymentoptions/tamara'; // var BASE_URL = 'http://10.50.100.198:2018/'; - var BASE_URL = 'https://uat.hmgwebservices.com/'; -//var BASE_URL = 'https://hmgwebservices.com/'; + // var BASE_URL = 'https://uat.hmgwebservices.com/'; +var BASE_URL = 'https://hmgwebservices.com/'; // var BASE_URL = 'https://orash.cloudsolutions.com.sa/'; // var BASE_URL = 'https://vidauat.cloudsolutions.com.sa/'; @@ -323,7 +323,7 @@ var UPDATE_COVID_QUESTIONNAIRE = 'Services/Doctors.svc/REST/COVID19_Questionnari var CHANNEL = 3; var GENERAL_ID = 'Cs2020@2016\$2958'; var IP_ADDRESS = '10.20.10.20'; -var VERSION_ID = 10.3; +var VERSION_ID = 10.4; var SETUP_ID = '91877'; var LANGUAGE = 2; // var PATIENT_OUT_SA = 0; diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index 1c02644e..5fe40ec1 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -1865,7 +1865,7 @@ const Map localizedValues = { "NFCNotSupported": { "en": "Your device does not support NFC. Please visit reception to Check-In", "ar": "جهازك لا يدعم NFC. يرجى زيارة مكتب الاستقبال لتسجيل الوصول" }, "enter-workplace-name": {"en": "Please enter your workplace name:", "ar": "رجاء إدخال مكان العمل:"}, "workplaceName": {"en": "Workplace name:", "ar": "مكان العمل:"}, - "callLiveCareSupport": {"en": "Call LiveCare Support", "ar": "اتصل بدعم لايف كير"}, + "callLiveCareSupport": {"en": "Call LiveCare Support", "ar": "اتصل بدعم اللايف كير"}, "needApproval": {"en": "Your sick leave is under process in medical administration, you will be notified once approved.", "ar": "جازتك المرضية تحت الإجراء في الإدارة الطبية ، سوف يتم إشعارك فور الموافقه عليها."}, "pendingActivation": {"en": "Pending Activation", "ar": "في انتظار التنشيط"}, "awaitingApproval": {"en": "Awaiting Approval", "ar": "انتظر القبول"}, diff --git a/lib/core/service/client/base_app_client.dart b/lib/core/service/client/base_app_client.dart index a87d71e7..9cb81a41 100644 --- a/lib/core/service/client/base_app_client.dart +++ b/lib/core/service/client/base_app_client.dart @@ -158,11 +158,11 @@ class BaseAppClient { body.removeWhere((key, value) => key == null || value == null); - if (AppGlobal.isNetworkDebugEnabled) { + // if (AppGlobal.isNetworkDebugEnabled) { print("URL : $url"); final jsonBody = json.encode(body); print(jsonBody); - } + // } if (await Utils.checkConnection(bypassConnectionCheck: bypassConnectionCheck)) { final response = await http.post(Uri.parse(url.trim()), body: json.encode(body), headers: headers); diff --git a/lib/core/service/geofencing/GeofencingServices.dart b/lib/core/service/geofencing/GeofencingServices.dart index 362416da..fe679984 100644 --- a/lib/core/service/geofencing/GeofencingServices.dart +++ b/lib/core/service/geofencing/GeofencingServices.dart @@ -32,6 +32,8 @@ class GeofencingServices extends BaseService { AppSharedPreferences pref = AppSharedPreferences(); await pref.setString(HMG_GEOFENCES, _zonesJsonString); + var res = await sharedPref.getStringWithDefaultValue(HMG_GEOFENCES, "[]"); + print("-------GEO ZONES----------: $res"); return geoZones; } diff --git a/lib/pages/livecare/widgets/LiveCarePendingRequest.dart b/lib/pages/livecare/widgets/LiveCarePendingRequest.dart index a866cc0b..a5392c8d 100644 --- a/lib/pages/livecare/widgets/LiveCarePendingRequest.dart +++ b/lib/pages/livecare/widgets/LiveCarePendingRequest.dart @@ -96,15 +96,15 @@ class _LiveCarePendingRequestState extends State { child: Text(TranslationBase.of(context).yourTurn + " " + widget.pendingERRequestHistoryList.patCount.toString() + " " + TranslationBase.of(context).patients, style: TextStyle(fontSize: 12.0, fontWeight: FontWeight.w600, letterSpacing: -0.48)), ), - Row( - children: [ - Container( - padding: const EdgeInsets.all(5.0), - child: Text(TranslationBase.of(context).liveCareSupportContact, style: TextStyle(fontSize: 12.0, fontWeight: FontWeight.w600, letterSpacing: -0.48)), - ), - Directionality(textDirection: TextDirection.ltr, child: Text("011 525 9553", style: TextStyle(fontSize: 12.0, fontWeight: FontWeight.w600, letterSpacing: -0.48))) - ], - ), + // Row( + // children: [ + // Container( + // padding: const EdgeInsets.all(5.0), + // child: Text(TranslationBase.of(context).liveCareSupportContact, style: TextStyle(fontSize: 12.0, fontWeight: FontWeight.w600, letterSpacing: -0.48)), + // ), + // Directionality(textDirection: TextDirection.ltr, child: Text("011 525 9553", style: TextStyle(fontSize: 12.0, fontWeight: FontWeight.w600, letterSpacing: -0.48))) + // ], + // ), mHeight(12.0), Container( child: DefaultButton(TranslationBase.of(context).callLiveCareSupport, () { diff --git a/lib/pages/login/register-info.dart b/lib/pages/login/register-info.dart index ee58f8d5..1b81dbfb 100644 --- a/lib/pages/login/register-info.dart +++ b/lib/pages/login/register-info.dart @@ -6,8 +6,7 @@ import 'package:diplomaticquarterapp/core/viewModels/appointment_rate_view_model import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart'; import 'package:diplomaticquarterapp/locator.dart'; import 'package:diplomaticquarterapp/models/Appointments/toDoCountProviderModel.dart'; -import 'package:diplomaticquarterapp/models/Authentication/check_activation_code_response.dart' - as checkActivation; +import 'package:diplomaticquarterapp/models/Authentication/check_activation_code_response.dart' as checkActivation; import 'package:diplomaticquarterapp/models/Authentication/check_paitent_authentication_req.dart'; import 'package:diplomaticquarterapp/models/Authentication/countries_list.dart'; import 'package:diplomaticquarterapp/models/Authentication/register_info_response.dart'; @@ -38,8 +37,7 @@ class RegisterInfo extends StatefulWidget { final Function changePageViewIndex; final int page; - const RegisterInfo({Key key, this.changePageViewIndex, this.page = 1}) - : super(key: key); + const RegisterInfo({Key key, this.changePageViewIndex, this.page = 1}) : super(key: key); @override _RegisterInfo createState() => _RegisterInfo(); @@ -48,7 +46,7 @@ class RegisterInfo extends StatefulWidget { class _RegisterInfo extends State { final authService = new AuthProvider(); final sharedPref = new AppSharedPreferences(); - RegisterInfoResponse registerInfo =RegisterInfoResponse(); + RegisterInfoResponse registerInfo = RegisterInfoResponse(); bool isLoading; int page; final List locationList = [ @@ -63,25 +61,23 @@ class _RegisterInfo extends State { ]; final List genderList = [ new Language(name: 'Male', value: 'M', nameAr: "ذكر"), - new Language(name: 'Female', value: 'F',nameAr: "أنثى"), + new Language(name: 'Female', value: 'F', nameAr: "أنثى"), ]; final List maritalList = [ new Language(name: 'Married', value: 'M', nameAr: "متزوج"), - new Language(name: 'Single', value: 'S',nameAr: "اعزب"), - new Language(name: 'Divorce', value: 'D',nameAr:"الطلاق"), + new Language(name: 'Single', value: 'S', nameAr: "اعزب"), + new Language(name: 'Divorce', value: 'D', nameAr: "الطلاق"), ]; String email = ''; List countriesList = []; ToDoCountProviderModel toDoProvider; String location = '1'; - AuthenticatedUserObject authenticatedUserObject = - locator(); + AuthenticatedUserObject authenticatedUserObject = locator(); ProjectViewModel projectViewModel; - AppointmentRateViewModel appointmentRateViewModel = - locator(); - bool isDubai =false; + AppointmentRateViewModel appointmentRateViewModel = locator(); + bool isDubai = false; RegisterInfoResponse data = RegisterInfoResponse(); CheckPatientAuthenticationReq data2; String gender = 'M'; @@ -90,15 +86,14 @@ class _RegisterInfo extends State { @override void initState() { - - if(widget.page ==1) { - getCountries(); - } - WidgetsBinding.instance.addPostFrameCallback((timeStamp) { - getRegisterInfo(); - }); - page = widget.page; - super.initState(); + if (widget.page == 1) { + getCountries(); + } + WidgetsBinding.instance.addPostFrameCallback((timeStamp) { + getRegisterInfo(); + }); + page = widget.page; + super.initState(); } @override @@ -106,23 +101,17 @@ class _RegisterInfo extends State { projectViewModel = Provider.of(context); toDoProvider = Provider.of(context); return AppScaffold( - appBarTitle: TranslationBase - .of(context) - .register, + appBarTitle: TranslationBase.of(context).register, isShowAppBar: false, isShowDecPage: false, body: SingleChildScrollView( padding: EdgeInsets.all(30), - child: - Column(crossAxisAlignment: CrossAxisAlignment.start, children: < - Widget>[ + child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [ Row( children: [ Expanded( child: AppText( - TranslationBase - .of(context) - .personalInfo, + TranslationBase.of(context).personalInfo, fontSize: 16, textAlign: TextAlign.left, fontWeight: FontWeight.bold, @@ -134,395 +123,277 @@ class _RegisterInfo extends State { SizedBox(height: 20), (isDubai && page == 1) ? Column( - children: [ - SizedBox(height: 20), - getnameField( - TranslationBase - .of(context) - .identificationNumber, - registerd_data.patientIdentificationID, - TranslationBase - .of(context) - .mobileNumber, - registerd_data.patientMobileNumber.toString()), - // SizedBox(height: 20), - projectViewModel.isArabic ? getnameField( - '', - - - inputWidget( "First Name","First Name English",'fNameEn'), - '', - inputWidget( "Last Name", "Last Name English",'lNameEn'), - ) :SizedBox(height: 0,), - getnameField( - '', - - - inputWidget( TranslationBase - .of(context) - .firstName, TranslationBase - .of(context) - .firstName,'fName'), - '', - inputWidget( TranslationBase - .of(context) - .middleName, TranslationBase - .of(context) - .middleName,'sName'), - ), - - getnameField( - '', - inputWidget( TranslationBase - .of(context) - .lastName, TranslationBase - .of(context) - .lastName, 'lName'), + children: [ + SizedBox(height: 20), + getnameField(TranslationBase.of(context).identificationNumber, registerd_data.patientIdentificationID, TranslationBase.of(context).mobileNumber, + registerd_data.patientMobileNumber.toString()), + // SizedBox(height: 20), + projectViewModel.isArabic + ? getnameField( + '', + inputWidget("First Name", "First Name English", 'fNameEn'), + '', + inputWidget("Last Name", "Last Name English", 'lNameEn'), + ) + : SizedBox( + height: 0, + ), + getnameField( + '', + inputWidget(TranslationBase.of(context).firstName, TranslationBase.of(context).firstName, 'fName'), + '', + inputWidget(TranslationBase.of(context).middleName, TranslationBase.of(context).middleName, 'sName'), + ), - TranslationBase - .of(context) - .gender, - Container( - height: 20, - child: DropdownButtonHideUnderline( - child: DropdownButton( - isExpanded: true, - value: gender, - hint: Text(TranslationBase - .of(context) - .gender), - iconSize: 40, - elevation: 16, - onChanged: (value) => - { - setState(() { - gender = value; - registerInfo.gender = value; - }) - }, - items: genderList - .map>( - (Language value) { - return DropdownMenuItem( - value: value.value, - child: Text( projectViewModel.isArabic ==1 ? value.nameAr : value.name , - ), - ); - }).toList()))), - ), - SizedBox(height: 20), - getnameField( - TranslationBase - .of(context) - .maritalStatus, - Container( - height: 18, - child: DropdownButtonHideUnderline( - child: DropdownButton( - isExpanded: true, - value: maritalStatus, - hint: Text(TranslationBase - .of(context) - .maritalStatus), - iconSize: 40, - elevation: 16, - onChanged: (value) => - { - setState(() { - maritalStatus = value; - registerInfo.maritalStatusCode = value; - }) - }, - items: maritalList - .map>( - (Language value) { + getnameField( + '', + inputWidget(TranslationBase.of(context).lastName, TranslationBase.of(context).lastName, 'lName'), + TranslationBase.of(context).gender, + Container( + height: 20, + child: DropdownButtonHideUnderline( + child: DropdownButton( + isExpanded: true, + value: gender, + hint: Text(TranslationBase.of(context).gender), + iconSize: 40, + elevation: 16, + onChanged: (value) => { + setState(() { + gender = value; + registerInfo.gender = value; + }) + }, + items: genderList.map>((Language value) { return DropdownMenuItem( value: value.value, - child: Text( projectViewModel.isArabic ==1 ? value.nameAr : value.name , + child: Text( + projectViewModel.isArabic == 1 ? value.nameAr : value.name, ), ); }).toList()))), - TranslationBase - .of(context) - .nationality, - Container( - height: 22, - child: DropdownButtonHideUnderline( - child: DropdownButton( - isExpanded: true, - value: nationality, - hint: Text(TranslationBase - .of(context) - .nationality), - iconSize: 40, - elevation: 16, - onChanged: (value) => - { - setState(() { - nationality = value; - registerInfo.nationalityCode = value; - }) - }, - items: countriesList - .map>( - (CountriesLists value) { - return DropdownMenuItem( - value: value.iD, - child: Text(value.name , - ), - ); - }).toList())))), - SizedBox(height: 20), - getnameField( - TranslationBase - .of(context) - .dateOfBirth, - registerd_data.dob, - "", ""), - SizedBox(height: 20), - ], - ) + ), + SizedBox(height: 20), + getnameField( + TranslationBase.of(context).maritalStatus, + Container( + height: 18, + child: DropdownButtonHideUnderline( + child: DropdownButton( + isExpanded: true, + value: maritalStatus, + hint: Text(TranslationBase.of(context).maritalStatus), + iconSize: 40, + elevation: 16, + onChanged: (value) => { + setState(() { + maritalStatus = value; + registerInfo.maritalStatusCode = value; + }) + }, + items: maritalList.map>((Language value) { + return DropdownMenuItem( + value: value.value, + child: Text( + projectViewModel.isArabic == 1 ? value.nameAr : value.name, + ), + ); + }).toList()))), + TranslationBase.of(context).nationality, + Container( + height: 22, + child: DropdownButtonHideUnderline( + child: DropdownButton( + isExpanded: true, + value: nationality, + hint: Text(TranslationBase.of(context).nationality), + iconSize: 40, + elevation: 16, + onChanged: (value) => { + setState(() { + nationality = value; + registerInfo.nationalityCode = value; + }) + }, + items: countriesList.map>((CountriesLists value) { + return DropdownMenuItem( + value: value.iD, + child: Text( + value.name, + ), + ); + }).toList())))), + SizedBox(height: 20), + getnameField(TranslationBase.of(context).dateOfBirth, registerd_data.dob, "", ""), + SizedBox(height: 20), + ], + ) : (registerInfo.healthId != null && page == 1) - ? Column( - children: [ - SizedBox(height: 20), - getnameField( - TranslationBase - .of(context) - .identificationNumber, - registerInfo.idNumber, - TranslationBase - .of(context) - .firstName, - registerInfo.firstNameEn == '-' - ? registerInfo.firstNameAr - : registerInfo.firstNameEn), - SizedBox(height: 20), - getnameField( - TranslationBase - .of(context) - .middleName, - registerInfo.secondNameEn == '-' - ? registerInfo.secondNameEn - : registerInfo.secondNameEn, - TranslationBase - .of(context) - .lastName, - registerInfo.lastNameEn == '-' - ? registerInfo.lastNameEn - : registerInfo.lastNameEn), - SizedBox(height: 20), - getnameField( - TranslationBase - .of(context) - .gender, - registerInfo.maritalStatusCode == 'U' - ? 'Unknown' - : registerInfo.maritalStatusCode == 'M' - ? 'Male' - : 'Female', - TranslationBase - .of(context) - .maritalStatus, - registerInfo.maritalStatus), - SizedBox(height: 20), - getnameField( - TranslationBase - .of(context) - .nationality, - registerInfo.nationality, - TranslationBase - .of(context) - .mobileNumber, - registerd_data.patientMobileNumber.toString()), - SizedBox(height: 20), - getnameField(TranslationBase - .of(context) - .dateOfBirth, - registerInfo.dateOfBirth, "", ""), - SizedBox(height: 20), - ], - ) - : widget.page == 2 - ? Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Container( - width: double.infinity, - decoration: containerRadius(Colors.white, 12), - padding: EdgeInsets.only( - left: 10, right: 10, top: 5, bottom: 25), - child: Row(children: [ - Flexible( - child: Column( - crossAxisAlignment: - CrossAxisAlignment.start, - children: [ - Text( - TranslationBase - .of(context) - .prefferedLanguage, - style: TextStyle( - fontSize: 11, - letterSpacing: -0.44, - fontWeight: FontWeight.w600, - ), - ), - Container( - height: 18, - child: - DropdownButtonHideUnderline( - child: DropdownButton( - isExpanded: true, - value: language, - hint: Text(TranslationBase - .of(context) - .prefferedLanguage), - iconSize: 40, - elevation: 16, - onChanged: (value) => - { - setState(() { - language = - value; - }) - }, - items: languageList.map< - DropdownMenuItem< - String>>( - (Language value) { - return DropdownMenuItem< - String>( - value: - value.value, - child: Text( - projectViewModel.isArabic ==1 ? value.nameAr : value.name , - ), - ); - }).toList()))) - ])) - ])), - SizedBox( - height: 20, - ), - Container( - width: double.infinity, - decoration: containerRadius(Colors.white, 12), - padding: EdgeInsets.only( - left: 10, right: 10, top: 5, bottom: 25), - child: Row(children: [ - Flexible( - child: Column( - crossAxisAlignment: - CrossAxisAlignment.start, - children: [ - Text( - TranslationBase - .of(context) - .selectLocation, - style: TextStyle( - fontSize: 11, - letterSpacing: -0.44, - fontWeight: FontWeight.w600, - ), - ), - Container( - height: 18, - child: - DropdownButtonHideUnderline( - child: DropdownButton( - isExpanded: true, - value: location, - hint: Text( - TranslationBase - .of( - context) - .selectLocation), - iconSize: 40, - elevation: 16, - onChanged: (value) => - { - setState(() { - location = - value; - }) - }, - items: locationList.map< - DropdownMenuItem< - String>>( - (Location value) { - return DropdownMenuItem< - String>( - value: - value.value, - child: Text( - projectViewModel.isArabic ==1 ? value.nameAr : value.name , - ), - ); - }).toList()))) - ])) - ])), - SizedBox( - height: 20, - ), - Container( - width: double.infinity, - decoration: containerRadius(Colors.white, 12), - padding: EdgeInsets.only( - left: 10, right: 10, top: 5, bottom: 12), - margin: EdgeInsets.only(bottom: 0), - child: Row(children: [ - Flexible( - child: Column( - crossAxisAlignment: - CrossAxisAlignment.start, - children: [ - Text( - TranslationBase - .of(context) - .email, - style: TextStyle( - fontSize: 11, - letterSpacing: -0.44, - fontWeight: FontWeight.w600, - ), - ), - Container( - child: TextField( - onChanged: (value) { - setState(() { - email = value; - }); - }, - style: TextStyle( - fontSize: 14, - height: 21 / 14, - fontWeight: FontWeight.w400, - color: Color(0xff2B353E), - letterSpacing: -0.44, + ? Column( + children: [ + SizedBox(height: 20), + getnameField(TranslationBase.of(context).identificationNumber, registerInfo.idNumber, TranslationBase.of(context).firstName, + registerInfo.firstNameEn == '-' ? registerInfo.firstNameAr : registerInfo.firstNameEn), + SizedBox(height: 20), + getnameField(TranslationBase.of(context).middleName, registerInfo.secondNameEn == '-' ? registerInfo.secondNameEn : registerInfo.secondNameEn, + TranslationBase.of(context).lastName, registerInfo.lastNameEn == '-' ? registerInfo.lastNameEn : registerInfo.lastNameEn), + SizedBox(height: 20), + getnameField( + TranslationBase.of(context).gender, + registerInfo.maritalStatusCode == 'U' + ? 'Unknown' + : registerInfo.maritalStatusCode == 'M' + ? 'Male' + : 'Female', + TranslationBase.of(context).maritalStatus, + registerInfo.maritalStatus), + SizedBox(height: 20), + getnameField(TranslationBase.of(context).nationality, registerInfo.nationality, TranslationBase.of(context).mobileNumber, registerd_data.patientMobileNumber.toString()), + SizedBox(height: 20), + getnameField(TranslationBase.of(context).dateOfBirth, registerInfo.dateOfBirth, "", ""), + SizedBox(height: 20), + ], + ) + : widget.page == 2 + ? Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + width: double.infinity, + decoration: containerRadius(Colors.white, 12), + padding: EdgeInsets.only(left: 10, right: 10, top: 5, bottom: 25), + child: Row(children: [ + Flexible( + child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [ + Text( + TranslationBase.of(context).prefferedLanguage, + style: TextStyle( + fontSize: 11, + letterSpacing: -0.44, + fontWeight: FontWeight.w600, + ), + ), + Container( + height: 18, + child: DropdownButtonHideUnderline( + child: DropdownButton( + isExpanded: true, + value: language, + hint: Text(TranslationBase.of(context).prefferedLanguage), + iconSize: 40, + elevation: 16, + onChanged: (value) => { + setState(() { + language = value; + }) + }, + items: languageList.map>((Language value) { + return DropdownMenuItem( + value: value.value, + child: Text( + projectViewModel.isArabic == 1 ? value.nameAr : value.name, + ), + ); + }).toList()))) + ])) + ])), + SizedBox( + height: 20, + ), + Container( + width: double.infinity, + decoration: containerRadius(Colors.white, 12), + padding: EdgeInsets.only(left: 10, right: 10, top: 5, bottom: 25), + child: Row(children: [ + Flexible( + child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [ + Text( + TranslationBase.of(context).selectLocation, + style: TextStyle( + fontSize: 11, + letterSpacing: -0.44, + fontWeight: FontWeight.w600, + ), ), - decoration: InputDecoration( - isDense: true, - hintStyle: TextStyle( + Container( + height: 18, + child: DropdownButtonHideUnderline( + child: DropdownButton( + isExpanded: true, + value: location, + hint: Text(TranslationBase.of(context).selectLocation), + iconSize: 40, + elevation: 16, + onChanged: (value) => { + setState(() { + location = value; + }) + }, + items: locationList.map>((Location value) { + return DropdownMenuItem( + value: value.value, + child: Text( + projectViewModel.isArabic == 1 ? value.nameAr : value.name, + ), + ); + }).toList()))) + ])) + ])), + SizedBox( + height: 20, + ), + Container( + width: double.infinity, + decoration: containerRadius(Colors.white, 12), + padding: EdgeInsets.only(left: 10, right: 10, top: 5, bottom: 12), + margin: EdgeInsets.only(bottom: 0), + child: Row(children: [ + Flexible( + child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [ + Text( + TranslationBase.of(context).email, + style: TextStyle( + fontSize: 11, + letterSpacing: -0.44, + fontWeight: FontWeight.w600, + ), + ), + Container( + child: TextField( + keyboardType: TextInputType.emailAddress, + onChanged: (value) { + setState(() { + email = value; + }); + }, + style: TextStyle( fontSize: 14, height: 21 / 14, fontWeight: FontWeight.w400, - color: Color(0xff575757), - letterSpacing: -0.56, + color: Color(0xff2B353E), + letterSpacing: -0.44, ), - prefixIconConstraints: - BoxConstraints(minWidth: 50), - contentPadding: EdgeInsets.zero, - border: InputBorder.none, - focusedBorder: InputBorder.none, - enabledBorder: InputBorder.none, - ), - )) - ])) - ])), - ], - ) - : SizedBox(), + decoration: InputDecoration( + isDense: true, + hintStyle: TextStyle( + fontSize: 14, + height: 21 / 14, + fontWeight: FontWeight.w400, + color: Color(0xff575757), + letterSpacing: -0.56, + ), + prefixIconConstraints: BoxConstraints(minWidth: 50), + contentPadding: EdgeInsets.zero, + border: InputBorder.none, + focusedBorder: InputBorder.none, + enabledBorder: InputBorder.none, + ), + )) + ])) + ])), + ], + ) + : SizedBox(), ]), ), bottomSheet: Container( @@ -533,148 +404,105 @@ class _RegisterInfo extends State { Expanded( child: Padding( padding: EdgeInsets.all(10), - child: - DefaultButton(TranslationBase - .of(context) - .cancel, () { + child: DefaultButton(TranslationBase.of(context).cancel, () { Navigator.of(context).pop(); - locator() - .loginRegistration - .registration_cancel( - step: page == 1 - ? 'personal info' - : 'other details'); + locator().loginRegistration.registration_cancel(step: page == 1 ? 'personal info' : 'other details'); }, textColor: Colors.white, color: Color(0xffD02127))), ), Expanded( child: Padding( padding: EdgeInsets.all(10), - child: DefaultButton( - page == 1 - ? TranslationBase - .of(context) - .next - : TranslationBase - .of(context) - .register, () { + child: DefaultButton(page == 1 ? TranslationBase.of(context).next : TranslationBase.of(context).register, () { nextPage(); - page == 1 - ? locator() - .loginRegistration - .registration_personal_info() - : locator() - .loginRegistration - .registration_patient_info(); - }, - textColor: Colors.white, - color: isValid() == true - ? Color(0xff359846) - : Colors.grey)), + page == 1 ? locator().loginRegistration.registration_personal_info() : locator().loginRegistration.registration_patient_info(); + }, textColor: Colors.white, color: isValid() == true ? Color(0xff359846) : Colors.grey)), ), ], ))); } - nextPage() async{ + nextPage() async { if (page == 1) { - if(isDubai) { - await setRegisterData(); + if (isDubai) { + await setRegisterData(); + widget.changePageViewIndex(2); + } else { widget.changePageViewIndex(2); - } - else{ - widget.changePageViewIndex(2); - } + } } else { registerNow(); } } - setRegisterData() async{ + setRegisterData() async { registerInfo.gender = gender; - registerInfo.maritalStatusCode =maritalStatus; - registerInfo.nationalityCode =nationality; - projectViewModel.setRegisterData(registerInfo); - // await sharedPref.setObject(REGISTER_INFO_DUBAI, registerInfo); + registerInfo.maritalStatusCode = maritalStatus; + registerInfo.nationalityCode = nationality; + projectViewModel.setRegisterData(registerInfo); + // await sharedPref.setObject(REGISTER_INFO_DUBAI, registerInfo); } + registerNow() { dynamic request; - if(isDubai) + if (isDubai) request = getTempUserRequestDubai(); - else - request = getTempUserRequest(); + else + request = getTempUserRequest(); - GifLoaderDialogUtils.showMyDialog(context); + GifLoaderDialogUtils.showMyDialog(context); dynamic res; this .authService .registerUser(request) - .then((result) => - { - GifLoaderDialogUtils.hideDialog(context), - if (result is String) - { - new ConfirmDialog( - context: context, - confirmMessage: result, - okText: TranslationBase - .of(context) - .ok, - cancelText: TranslationBase - .of(context) - .cancel_nocaps, - okFunction: () => - {ConfirmDialog.closeAlertDialog(context)}, - cancelFunction: () => - { - ConfirmDialog.closeAlertDialog(context) - }).showAlertDialog(context) - } - else - { - res = result, - result = checkActivation.CheckActivationCode.fromJson(result), - // result.list.isFamily = false, - // sharedPref.setObject(USER_PROFILE, result.list), - // this.sharedPref.setObject(MAIN_USER, result.list), - // sharedPref.setObject(LOGIN_TOKEN_ID, result.logInTokenID), - // sharedPref.setString(TOKEN, result.authenticationTokenID), - // this.setUser(result), - sharedPref.remove(FAMILY_FILE), - result.list.isFamily = false, - - sharedPref.setString(BLOOD_TYPE, result.patientBloodType), - authenticatedUserObject.user = result.list, - projectViewModel.setPrivilege(privilegeList: res), - sharedPref.setObject(MAIN_USER, result.list), - sharedPref.setObject(USER_PROFILE, result.list), - - sharedPref.setObject(LOGIN_TOKEN_ID, result.logInTokenID), - sharedPref.setString(TOKEN, result.authenticationTokenID), - AppToast.showSuccessToast( - message: TranslationBase - .of(context) - .successRegister), - checkIfUserAgreedBefore(result), - projectViewModel.analytics.loginRegistration - .registration_confirmation() - } - }) + .then((result) => { + GifLoaderDialogUtils.hideDialog(context), + if (result is String) + { + new ConfirmDialog( + context: context, + confirmMessage: result, + okText: TranslationBase.of(context).ok, + cancelText: TranslationBase.of(context).cancel_nocaps, + okFunction: () => {ConfirmDialog.closeAlertDialog(context)}, + cancelFunction: () => {ConfirmDialog.closeAlertDialog(context)}).showAlertDialog(context) + } + else + { + res = result, + result = checkActivation.CheckActivationCode.fromJson(result), + // result.list.isFamily = false, + // sharedPref.setObject(USER_PROFILE, result.list), + // this.sharedPref.setObject(MAIN_USER, result.list), + // sharedPref.setObject(LOGIN_TOKEN_ID, result.logInTokenID), + // sharedPref.setString(TOKEN, result.authenticationTokenID), + // this.setUser(result), + sharedPref.remove(FAMILY_FILE), + result.list.isFamily = false, + + sharedPref.setString(BLOOD_TYPE, result.patientBloodType), + authenticatedUserObject.user = result.list, + projectViewModel.setPrivilege(privilegeList: res), + sharedPref.setObject(MAIN_USER, result.list), + sharedPref.setObject(USER_PROFILE, result.list), + + sharedPref.setObject(LOGIN_TOKEN_ID, result.logInTokenID), + sharedPref.setString(TOKEN, result.authenticationTokenID), + AppToast.showSuccessToast(message: TranslationBase.of(context).successRegister), + checkIfUserAgreedBefore(result), + projectViewModel.analytics.loginRegistration.registration_confirmation() + } + }) .catchError((err) { // GifLoaderDialogUtils.hideDialog(context); ConfirmDialog dialog = new ConfirmDialog( context: context, confirmMessage: err, - okText: TranslationBase - .of(context) - .confirm, - cancelText: TranslationBase - .of(context) - .cancel_nocaps, + okText: TranslationBase.of(context).confirm, + cancelText: TranslationBase.of(context).cancel_nocaps, okFunction: () => {ConfirmDialog.closeAlertDialog(context)}, cancelFunction: () => {ConfirmDialog.closeAlertDialog(context)}); dialog.showAlertDialog(context); - projectViewModel.analytics.loginRegistration - .registration_fail(errorType: err); + projectViewModel.analytics.loginRegistration.registration_fail(errorType: err); }); } @@ -688,45 +516,33 @@ class _RegisterInfo extends State { } getRegisterInfo() async { - if (await sharedPref.getObject(NHIC_DATA) != null) { - data = - RegisterInfoResponse.fromJson(await sharedPref.getObject(NHIC_DATA)); + data = RegisterInfoResponse.fromJson(await sharedPref.getObject(NHIC_DATA)); this.registerInfo = data; } if (await sharedPref.getObject(REGISTER_DATA_FOR_LOGIIN) != null) { - data2 = CheckPatientAuthenticationReq.fromJson( - await sharedPref.getObject(REGISTER_DATA_FOR_LOGIIN)); + data2 = CheckPatientAuthenticationReq.fromJson(await sharedPref.getObject(REGISTER_DATA_FOR_LOGIIN)); setState(() { - - this.registerd_data = data2; isDubai = data2.patientOutSA == 1 ? true : false; - if(isDubai) location ='2'; + if (isDubai) location = '2'; }); } } getTempUserRequest() { - - DateFormat dateFormat = DateFormat("mm/dd/yyyy"); print(dateFormat.parse(registerInfo.dateOfBirth)); - var hDate = - new HijriCalendar.fromDate(dateFormat.parse(registerInfo.dateOfBirth)); + var hDate = new HijriCalendar.fromDate(dateFormat.parse(registerInfo.dateOfBirth)); var date = hDate.toString(); return { "Patientobject": { "TempValue": true, - "PatientIdentificationType": - registerInfo.idNumber.substring(0, 1) == "1" ? 1 : 2, + "PatientIdentificationType": registerInfo.idNumber.substring(0, 1) == "1" ? 1 : 2, "PatientIdentificationNo": registerInfo.idNumber, "MobileNumber": registerd_data.patientMobileNumber, - "PatientOutSA": (registerd_data.zipCode == '966' || - registerd_data.zipCode == '+966') - ? 0 - : 1, + "PatientOutSA": (registerd_data.zipCode == '966' || registerd_data.zipCode == '+966') ? 0 : 1, "FirstNameN": registerInfo.firstNameAr, "FirstName": registerInfo.firstNameEn, "MiddleNameN": registerInfo.secondNameAr, @@ -734,9 +550,8 @@ class _RegisterInfo extends State { "LastNameN": registerInfo.lastNameAr, "LastName": registerInfo.lastNameEn, "StrDateofBirth": registerInfo.dateOfBirth, - "DateofBirth": DateUtil.convertISODateToJsonDate( - registerInfo.dateOfBirth.replaceAll('/', '-')), - "Gender": registerInfo.gender== 'M' ? 1 : 2, + "DateofBirth": DateUtil.convertISODateToJsonDate(registerInfo.dateOfBirth.replaceAll('/', '-')), + "Gender": registerInfo.gender == 'M' ? 1 : 2, "NationalityID": registerInfo.nationalityCode, "eHealthIDField": registerInfo.healthId, "DateofBirthN": date, @@ -746,24 +561,19 @@ class _RegisterInfo extends State { "Marital": registerInfo.maritalStatusCode == 'U' ? '0' : registerInfo.maritalStatusCode == 'M' - ? '1' - : '2', + ? '1' + : '2', }, "PatientIdentificationID": registerInfo.idNumber, - "PatientMobileNumber": - registerd_data.patientMobileNumber.toString()[0] == '0' - ? registerd_data.patientMobileNumber - : '0' + registerd_data.patientMobileNumber.toString(), + "PatientMobileNumber": registerd_data.patientMobileNumber.toString()[0] == '0' ? registerd_data.patientMobileNumber : '0' + registerd_data.patientMobileNumber.toString(), }; } - - getTempUserRequestDubai(){ + getTempUserRequestDubai() { DateFormat dateFormat = DateFormat("mm/dd/yyyy"); - registerInfo= projectViewModel.registerInfo; + registerInfo = projectViewModel.registerInfo; print(dateFormat.parse(registerd_data.dob)); - var hDate = - new HijriCalendar.fromDate(dateFormat.parse(registerd_data.dob)); + var hDate = new HijriCalendar.fromDate(dateFormat.parse(registerd_data.dob)); var date = hDate.toString(); final DateFormat dateFormat1 = DateFormat('MM/dd/yyyy'); final DateFormat dateFormat2 = DateFormat('dd/MM/yyyy'); @@ -771,27 +581,21 @@ class _RegisterInfo extends State { return { "Patientobject": { "TempValue": true, - "PatientIdentificationType": - registerd_data.patientIdentificationID.substring(0, 1) == "1" ? 1 : 2, + "PatientIdentificationType": registerd_data.patientIdentificationID.substring(0, 1) == "1" ? 1 : 2, "PatientIdentificationNo": registerd_data.patientIdentificationID, "MobileNumber": registerd_data.patientMobileNumber, - "PatientOutSA": (registerd_data.zipCode == '966' || - registerd_data.zipCode == '+966') - ? 0 - : 1, - "FirstNameN": registerInfo.firstNameAr ??"", - "FirstName": registerInfo.firstNameEn??"", - "MiddleNameN": registerInfo.secondNameAr?? "", - "MiddleName": registerInfo.secondNameEn ??"", - "LastNameN": registerInfo.lastNameAr ??"", - "LastName":registerInfo.lastNameEn ??"", - "StrDateofBirth": dateFormat1.format( - dateFormat2.parse(registerd_data.dob)), - "DateofBirth": DateUtil.convertISODateToJsonDate( - registerd_data.dob.replaceAll('/', '-')), - "Gender": registerInfo.gender== 'M' ? 1 : 2, + "PatientOutSA": (registerd_data.zipCode == '966' || registerd_data.zipCode == '+966') ? 0 : 1, + "FirstNameN": registerInfo.firstNameAr ?? "", + "FirstName": registerInfo.firstNameEn ?? "", + "MiddleNameN": registerInfo.secondNameAr ?? ".", + "MiddleName": registerInfo.secondNameEn ?? ".", + "LastNameN": registerInfo.lastNameAr ?? "", + "LastName": registerInfo.lastNameEn ?? "", + "StrDateofBirth": dateFormat1.format(dateFormat2.parse(registerd_data.dob)), + "DateofBirth": DateUtil.convertISODateToJsonDate(registerd_data.dob.replaceAll('/', '-')), + "Gender": registerInfo.gender == 'M' ? 1 : 2, "NationalityID": registerInfo.nationalityCode, - "eHealthIDField":null, + "eHealthIDField": null, "DateofBirthN": date, "EmailAddress": email, "SourceType": location, @@ -799,23 +603,20 @@ class _RegisterInfo extends State { "Marital": registerInfo.maritalStatusCode == 'U' ? '0' : registerInfo.maritalStatusCode == 'M' - ? '1' - : '2', + ? '1' + : '2', }, "PatientIdentificationID": registerd_data.patientIdentificationID, - "PatientMobileNumber": - registerd_data.patientMobileNumber.toString()[0] == '0' - ? registerd_data.patientMobileNumber - : '0' + registerd_data.patientMobileNumber.toString(), - "DOB":registerd_data.dob, - "IsHijri":registerd_data.isHijri + "PatientMobileNumber": registerd_data.patientMobileNumber.toString()[0] == '0' ? registerd_data.patientMobileNumber : '0' + registerd_data.patientMobileNumber.toString(), + "DOB": registerd_data.dob, + "IsHijri": registerd_data.isHijri }; } bool isValid() { - if ((location != null && - language != null && - Utils.validEmail(email) == true) || (registerInfo.firstNameEn !=null && registerInfo.secondNameEn !=null && registerInfo.lastNameEn !=null) || (projectViewModel.isArabic && registerInfo.firstNameEn !=null && registerInfo.firstNameAr !=null && registerInfo.lastNameEn !=null && registerInfo.secondNameAr !=null && registerInfo.lastNameAr !=null)) { + if ((location != null && language != null && Utils.validEmail(email) == true) || + (registerInfo.firstNameEn != null && registerInfo.lastNameEn != null) || + (projectViewModel.isArabic && registerInfo.firstNameEn != null && registerInfo.firstNameAr != null && registerInfo.lastNameEn != null && registerInfo.lastNameAr != null)) { return true; } else { return false; @@ -841,13 +642,13 @@ class _RegisterInfo extends State { ), value1 is String ? Text( - value1, - style: TextStyle( - fontSize: 12, - fontWeight: FontWeight.w600, - letterSpacing: -0.44, - ), - ) + value1, + style: TextStyle( + fontSize: 12, + fontWeight: FontWeight.w600, + letterSpacing: -0.44, + ), + ) : value1, ], ))), @@ -867,13 +668,13 @@ class _RegisterInfo extends State { ), value2 is String ? Text( - value2, - style: TextStyle( - fontSize: 12, - fontWeight: FontWeight.w600, - letterSpacing: -0.44, - ), - ) + value2, + style: TextStyle( + fontSize: 12, + fontWeight: FontWeight.w600, + letterSpacing: -0.44, + ), + ) : value2, ], ))) @@ -892,10 +693,7 @@ class _RegisterInfo extends State { insertIMEI() async { var selectedOption = await sharedPref.getInt(LAST_LOGIN); - authService - .insertDeviceImei(selectedOption) - .then((value) => {goToHome()}) - .catchError((err) { + authService.insertDeviceImei(selectedOption).then((value) => {goToHome()}).catchError((err) { print(err); }); } @@ -908,29 +706,28 @@ class _RegisterInfo extends State { await authenticatedUserObject.getUser(getUser: true); appointmentRateViewModel .getIsLastAppointmentRatedList() - .then((value) => - { - getToDoCount(), - GifLoaderDialogUtils.hideDialog(AppGlobal.context), - if (appointmentRateViewModel.isHaveAppointmentNotRate) - { - Navigator.pushAndRemoveUntil( - context, - FadePage( - page: RateAppointmentDoctor(), - ), - (r) => false) - } - else - { - Navigator.pushAndRemoveUntil( - context, - FadePage( - page: LandingPage(), - ), - (r) => false) - } - }) + .then((value) => { + getToDoCount(), + GifLoaderDialogUtils.hideDialog(AppGlobal.context), + if (appointmentRateViewModel.isHaveAppointmentNotRate) + { + Navigator.pushAndRemoveUntil( + context, + FadePage( + page: RateAppointmentDoctor(), + ), + (r) => false) + } + else + { + Navigator.pushAndRemoveUntil( + context, + FadePage( + page: LandingPage(), + ), + (r) => false) + } + }) .catchError((err) { print(err); //GifLoaderDialogUtils.hideDialog(context); @@ -954,19 +751,15 @@ class _RegisterInfo extends State { ClinicListService service = new ClinicListService(); service.getCountries().then((res) { if (res['MessageStatus'] == 1) { + res['ListNationality'].forEach((items) => {countriesList.add(CountriesLists.fromJson(items))}); - res['ListNationality'].forEach((items) => { - countriesList.add(CountriesLists.fromJson(items)) - }); - - setState(() {}); + setState(() {}); } }).catchError((err) { print(err); }); } - Widget inputWidget(String _labelText, String _hintText, String name, {String prefix, bool isEnable = true, bool hasSelection = false}) { return Container( padding: EdgeInsets.only(left: 10, right: 10, bottom: 5, top: 5), @@ -1000,54 +793,51 @@ class _RegisterInfo extends State { TextField( enabled: isEnable, scrollPadding: EdgeInsets.zero, - keyboardType: TextInputType.number, + keyboardType: TextInputType.text, // controller: _controller, onChanged: (value) => { - setState((){ - switch(name) { - case 'fName': - { - if(projectViewModel.isArabic) { - registerInfo.firstNameAr = value; - - }else{ - registerInfo.firstNameEn =value; - registerInfo.firstNameAr ='...'; - } - } - break; - case 'sName': - { - if(projectViewModel.isArabic) { - registerInfo.secondNameAr = value; - registerInfo.secondNameEn ='...'; - }else{ - registerInfo.secondNameEn =value; - registerInfo.secondNameAr ='...'; - } - } - break; - case 'lName': - { - if(projectViewModel.isArabic) { - registerInfo.lastNameAr = value; - - }else{ - registerInfo.lastNameEn =value; - registerInfo.lastNameAr ='...'; - } - } - break; - case 'fNameEn': - registerInfo.firstNameEn = value; - break; - case 'lNameEn': - registerInfo.lastNameEn = value; - break; - } + setState(() { + switch (name) { + case 'fName': + { + if (projectViewModel.isArabic) { + registerInfo.firstNameAr = value; + } else { + registerInfo.firstNameEn = value; + registerInfo.firstNameAr = '...'; + } + } + break; + case 'sName': + { + if (projectViewModel.isArabic) { + registerInfo.secondNameAr = value.isEmpty ? "." : value; + registerInfo.secondNameEn = '...'; + } else { + registerInfo.secondNameEn = value.isEmpty ? "." : value; + registerInfo.secondNameAr = '...'; + } + } + break; + case 'lName': + { + if (projectViewModel.isArabic) { + registerInfo.lastNameAr = value; + } else { + registerInfo.lastNameEn = value; + registerInfo.lastNameAr = '...'; + } + } + break; + case 'fNameEn': + registerInfo.firstNameEn = value; + break; + case 'lNameEn': + registerInfo.lastNameEn = value; + break; + } }) //_controller.text =value - }, style: TextStyle( fontSize: 14, @@ -1067,7 +857,6 @@ class _RegisterInfo extends State { letterSpacing: -0.56, ), prefixIconConstraints: BoxConstraints(minWidth: 50), - contentPadding: EdgeInsets.zero, border: InputBorder.none, focusedBorder: InputBorder.none, @@ -1083,14 +872,13 @@ class _RegisterInfo extends State { ), ); } - } - class Language { final String name; final String value; final String nameAr; + Language({this.name, this.value, this.nameAr}); } diff --git a/lib/pages/medical/patient_sick_leave_page.dart b/lib/pages/medical/patient_sick_leave_page.dart index f132741e..1ca32e02 100644 --- a/lib/pages/medical/patient_sick_leave_page.dart +++ b/lib/pages/medical/patient_sick_leave_page.dart @@ -57,8 +57,8 @@ class _PatientSickLeavePageState extends State { subName: model.sickLeaveList[index].clinicName, isSortByClinic: false, isInOutPatient: model.sickLeaveList[index].isInOutPatient, - isSickLeave: true, - sickLeaveStatus: model.sickLeaveList[index].status, + // isSickLeave: true, + // sickLeaveStatus: model.sickLeaveList[index].status, onEmailTap: () { showConfirmMessage(model, index); }, @@ -69,13 +69,13 @@ class _PatientSickLeavePageState extends State { } void showConfirmMessage(PatientSickLeaveViewMode model, int index) { - if (model.sickLeaveList[index].status == 1) { - openWorkPlaceUpdatePage(model.sickLeaveList[index].requestNo, model.sickLeaveList[index].setupID, model, index, model.sickLeaveList[index].projectID); - } else if (model.sickLeaveList[index].status == 2) { + // if (model.sickLeaveList[index].status == 1) { + // openWorkPlaceUpdatePage(model.sickLeaveList[index].requestNo, model.sickLeaveList[index].setupID, model, index, model.sickLeaveList[index].projectID); + // } else if (model.sickLeaveList[index].status == 2) { showEmailDialog(model, index); - } else { - showApprovalDialog(); - } + // } else { + // showApprovalDialog(); + // } } void showApprovalDialog() { diff --git a/lib/uitl/push-notification-handler.dart b/lib/uitl/push-notification-handler.dart index d8b59782..3e765c17 100644 --- a/lib/uitl/push-notification-handler.dart +++ b/lib/uitl/push-notification-handler.dart @@ -303,6 +303,10 @@ class PushNotificationHandler { onToken(token); }); + FirebaseMessaging.instance.getAPNSToken().then((value) { + print("Push APNS getToken: " + value); + }); + FirebaseMessaging.onBackgroundMessage(backgroundMessageHandler); } diff --git a/lib/widgets/in_app_browser/InAppBrowser.dart b/lib/widgets/in_app_browser/InAppBrowser.dart index f62248b8..e91990b4 100644 --- a/lib/widgets/in_app_browser/InAppBrowser.dart +++ b/lib/widgets/in_app_browser/InAppBrowser.dart @@ -37,9 +37,9 @@ class MyInAppBrowser extends InAppBrowser { // static String APPLE_PAY_PAYFORT_URL = 'https://hmgwebservices.com/PayFortWebLive/PayFortApi/MakeApplePayRequest'; // Payfort Payment Gateway URL LIVE static String APPLE_PAY_PAYFORT_URL = 'https://hmgwebservices.com/PayFortWebLive/PayFortApi/MakeApplePayRequest'; // Payfort Payment Gateway URL UAT - static String SERVICE_URL = 'https://hmgwebservices.com/PayFortWeb/pages/SendPayFortRequest.aspx'; // Payfort Payment Gateway URL UAT + // static String SERVICE_URL = 'https://hmgwebservices.com/PayFortWeb/pages/SendPayFortRequest.aspx'; // Payfort Payment Gateway URL UAT - // static String SERVICE_URL = 'https://hmgwebservices.com/PayFortWebLive/pages/SendPayFortRequest.aspx'; //Payfort Payment Gateway URL LIVE + static String SERVICE_URL = 'https://hmgwebservices.com/PayFortWebLive/pages/SendPayFortRequest.aspx'; //Payfort Payment Gateway URL LIVE // static String SERVICE_URL = 'https://uat.hmgwebservices.com/payfortforvidaplus/pages/SendPayFortRequest.aspx'; //Payfort Payment Gateway URL UAT VIDA PLUS diff --git a/pubspec.yaml b/pubspec.yaml index 46d8b2f1..834913a8 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,7 +1,7 @@ name: diplomaticquarterapp description: A new Flutter application. -version: 4.5.62+1 +version: 4.5.63+1 environment: sdk: ">=2.7.0 <3.0.0"