diff --git a/lib/config/dependency_injection.dart b/lib/config/dependency_injection.dart index 970a88a..b7f4909 100644 --- a/lib/config/dependency_injection.dart +++ b/lib/config/dependency_injection.dart @@ -48,6 +48,7 @@ class AppDependencies { injector.registerSingleton(() => BranchRepoImp()); injector.registerSingleton(() => ShippingRepoImp()); injector.registerSingleton(() => SettingOptionsRepoImp()); + injector.registerSingleton(() => LocationService()); // } diff --git a/lib/models/provider_branches_models/profile/document.dart b/lib/models/provider_branches_models/profile/document.dart index eb6d2f8..d82aa02 100644 --- a/lib/models/provider_branches_models/profile/document.dart +++ b/lib/models/provider_branches_models/profile/document.dart @@ -21,14 +21,16 @@ class Document { int? messageStatus; String? message; - factory Document.fromJson(Map json) => Document( + factory Document.fromJson(Map json) => + Document( totalItemsCount: json["totalItemsCount"], data: json["data"] == null ? null : List.from(json["data"].map((x) => DocumentData.fromJson(x))), messageStatus: json["messageStatus"], message: json["message"], ); - Map toJson() => { + Map toJson() => + { "totalItemsCount": totalItemsCount, "data": data == null ? null : List.from(data!.map((x) => x.toJson())), "messageStatus": messageStatus, @@ -50,6 +52,7 @@ class DocumentData { this.fileExt, this.documentName, this.isLocalFile, + this.description, }); int? id; @@ -64,22 +67,26 @@ class DocumentData { String? statusText; String? documentName; bool? isLocalFile; + String? description; - factory DocumentData.fromJson(Map json) => DocumentData( - id: json["id"], - serviceProviderId: json["serviceProviderID"], - documentId: json["documentID"], - documentUrl: json["documentURL"], - status: json["status"], - statusText: json["statusText"], - comment: json["comment"], - isActive: json["isActive"], - document: null, - fileExt: null, - documentName: json["documentName"], - isLocalFile: false); + factory DocumentData.fromJson(Map json) => + DocumentData( + id: json["id"], + serviceProviderId: json["serviceProviderID"], + documentId: json["documentID"], + documentUrl: json["documentURL"], + status: json["status"], + statusText: json["statusText"], + comment: json["comment"], + isActive: json["isActive"], + document: null, + fileExt: null, + documentName: json["documentName"], + isLocalFile: false, + description: null); - Map toJson() => { + Map toJson() => + { "id": id, "serviceProviderID": serviceProviderId, "documentID": documentId, diff --git a/lib/models/subscriptions_models/subscription_model.dart b/lib/models/subscriptions_models/subscription_model.dart index 89fba26..ea7330d 100644 --- a/lib/models/subscriptions_models/subscription_model.dart +++ b/lib/models/subscriptions_models/subscription_model.dart @@ -60,6 +60,7 @@ class Subscription { this.totalAds, this.branchesRemaining, this.subUsersRemaining, + this.subscriptionType, this.adsRemaining}); int? id; @@ -81,6 +82,7 @@ class Subscription { SubscriptionTypeEnum? subscriptionTypeEnum; bool? isMyCurrentPackage; bool? isRenewable; + int? subscriptionType; int? subscriptionBranches; int? subscriptionSubUsers; @@ -121,5 +123,6 @@ class Subscription { branchesRemaining: json["branchesRemaining"], subUsersRemaining: json["subUsersRemaining"], adsRemaining: json["adsRemaining"], + subscriptionType: json["subscriptionType"], ); } diff --git a/lib/services/common_auth_service.dart b/lib/services/common_auth_service.dart index 1f52e02..c1b5969 100644 --- a/lib/services/common_auth_service.dart +++ b/lib/services/common_auth_service.dart @@ -2,7 +2,6 @@ import 'dart:io'; import 'package:device_info_plus/device_info_plus.dart'; import 'package:flutter/services.dart'; -import 'package:huawei_fido/huawei_fido.dart'; import 'package:local_auth/local_auth.dart'; import 'package:local_auth_android/local_auth_android.dart'; import 'package:local_auth_darwin/types/auth_messages_ios.dart'; @@ -61,11 +60,11 @@ class CommonAuthImp implements CommonAuthServices { return await localAuth.getAvailableBiometrics(); } - Future getHuaweiAuth() async { - DeviceInfoPlugin deviceInfo = DeviceInfoPlugin(); - AndroidDeviceInfo androidInfo = await deviceInfo.androidInfo; - // if (androidInfo.brand == "HUAWEI") { - // huawei.canAuth(); - // } - } +// Future getHuaweiAuth() async { +// DeviceInfoPlugin deviceInfo = DeviceInfoPlugin(); +// AndroidDeviceInfo androidInfo = await deviceInfo.androidInfo; +// // if (androidInfo.brand == "HUAWEI") { +// // huawei.canAuth(); +// // } +// } } diff --git a/lib/services/common_services.dart b/lib/services/common_services.dart index 53ffe31..b1788e5 100644 --- a/lib/services/common_services.dart +++ b/lib/services/common_services.dart @@ -6,6 +6,7 @@ import 'package:geolocator/geolocator.dart'; import 'package:image_picker/image_picker.dart'; import 'package:mc_common_app/main.dart'; import 'package:mc_common_app/utils/app_permission_handler.dart'; +import 'package:mc_common_app/utils/utils.dart'; abstract class CommonAppServices { Future> pickMultipleImages(); diff --git a/lib/services/payments_service.dart b/lib/services/payments_service.dart index fc8acb2..1a495f8 100644 --- a/lib/services/payments_service.dart +++ b/lib/services/payments_service.dart @@ -26,16 +26,8 @@ abstract class PaymentService { class PaymentServiceImp implements PaymentService { MyInAppBrowser? myInAppBrowser; - - // var inAppBrowserOptions = InAppBrowserClassOptions( - // inAppWebViewGroupOptions: - // InAppWebViewGroupOptions(crossPlatform: InAppWebViewOptions(useShouldOverrideUrlLoading: true, transparentBackground: false), ios: IOSInAppWebViewOptions(applePayAPIEnabled: true)), - // crossPlatform: InAppBrowserOptions(hideUrlBar: true, toolbarTopBackgroundColor: Colors.black), - // android: AndroidInAppBrowserOptions(), - // ios: - // IOSInAppBrowserOptions(hideToolbarBottom: true, toolbarBottomBackgroundColor: Colors.white, closeButtonColor: Colors.white, presentationStyle: IOSUIModalPresentationStyle.OVER_FULL_SCREEN)); - var inAppBrowserOptions = InAppBrowserClassSettings( + webViewSettings: InAppWebViewSettings( useShouldOverrideUrlLoading: false, transparentBackground: false, @@ -113,10 +105,13 @@ class PaymentServiceImp implements PaymentService { onBrowserLoadStart(onFailure: onFailure, onSuccess: onSuccess, url: url); }); await myInAppBrowser!.openUrlRequest( - // Uri.parse(urlRequest) - urlRequest: URLRequest(url: WebUri(urlRequest)), + urlRequest: URLRequest( + url: WebUri(urlRequest, forceToStringRawValue: true), + allowsCellularAccess: true, + allowsConstrainedNetworkAccess: true, + allowsExpensiveNetworkAccess: true, + ), settings: inAppBrowserOptions, - // in: inAppBrowserOptions, ); } diff --git a/lib/utils/enums.dart b/lib/utils/enums.dart index be3aa1c..0657413 100644 --- a/lib/utils/enums.dart +++ b/lib/utils/enums.dart @@ -215,9 +215,9 @@ enum ChatTypeEnum { } enum SubscriptionTypeEnum { - current, - upgrade, - downgrade, + current, //1 + upgrade, //2 + downgrade, //3 } enum SubscriptionActionTypeEnum { diff --git a/lib/view_models/payment_view_model.dart b/lib/view_models/payment_view_model.dart index 1dbaddc..9201598 100644 --- a/lib/view_models/payment_view_model.dart +++ b/lib/view_models/payment_view_model.dart @@ -215,7 +215,7 @@ class PaymentVM extends ChangeNotifier { context.read().onNavbarTapped(1); } navigateReplaceWithNameUntilRoute(context, AppRoutes.dashboard); - } + } Future onVisaCardSelected(BuildContext context, PaymentTypes paymentType) async { currentPaymentType = paymentType; diff --git a/pubspec.yaml b/pubspec.yaml index 8d2b33c..2911386 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -18,11 +18,11 @@ dependencies: easy_localization: ^3.0.3 http: ^1.2.2 permission_handler: ^11.3.1 - flutter_svg: ^2.0.14 - sizer: ^3.0.4 + flutter_svg: ^2.0.9 + sizer: any fluttertoast: ^8.0.8 shared_preferences: ^2.0.6 - file_picker: ^8.0.7 + file_picker: ^8.1.2 image_picker: ^1.1.2 equatable: ^2.0.3 logger: ^2.4.0 @@ -34,7 +34,7 @@ dependencies: badges: ^3.0.2 carousel_slider: 5.0.0 dropdown_button2: ^2.0.0 - flutter_inappwebview: ^6.0.0 + flutter_inappwebview: ^6.1.5 country_code_picker: ^3.0.0 table_calendar: ^3.0.9 intl: any @@ -47,8 +47,8 @@ dependencies: # Firebase Packages - firebase_messaging: ^15.0.4 - firebase_core: ^3.3.0 + firebase_messaging: ^15.1.3 + firebase_core: ^3.6.0 flutter_local_notifications: ^18.0.0 @@ -61,9 +61,9 @@ dependencies: # Auth local_auth: ^2.2.0 - huawei_fido: ^6.3.0+305 - device_info_plus: ^10.1.0 - + #huawei_fido: ^6.3.0+305 + device_info_plus: ^11.0.0 + flutter_lints: any dev_dependencies: flutter_test: