diff --git a/lib/repositories/branch_repo.dart b/lib/repositories/branch_repo.dart index 76d096c..1809a7a 100644 --- a/lib/repositories/branch_repo.dart +++ b/lib/repositories/branch_repo.dart @@ -88,7 +88,7 @@ abstract class BranchRepo { Future> getServiceItems(int serviceId); - Future getBranchAndServicesByProviderId(int providerId); + Future getBranchAndServicesByProviderId(int providerId, {double? latitude, double? longitude}); Future> getBranchesByFilters({ List? providerIdsList, @@ -191,9 +191,7 @@ class BranchRepoImp implements BranchRepo { }; String? token = AppState().getUser.data?.accessToken; debugPrint(token); - return await injector - .get() - .getJsonForObject((json) => Document.fromJson(json), ApiConsts.fetProviderDocument, queryParameters: queryParameters, token: AppState().getUser.data!.accessToken ?? ""); + return await injector.get().getJsonForObject((json) => Document.fromJson(json), ApiConsts.fetProviderDocument, queryParameters: queryParameters, token: AppState().getUser.data!.accessToken ?? ""); } @override @@ -434,10 +432,16 @@ class BranchRepoImp implements BranchRepo { } @override - Future getBranchAndServicesByProviderId(int providerId) async { - var postParams = {"serviceProviderID": providerId.toString()}; - GenericRespModel adsGenericModel = - await apiClient.getJsonForObject((json) => GenericRespModel.fromJson(json), ApiConsts.branchesAndServices, token: appState.getUser.data!.accessToken, queryParameters: postParams); + Future getBranchAndServicesByProviderId(int providerId, {double? latitude, double? longitude}) async { + var postParams = { + "serviceProviderID": providerId.toString(), + }; + + if (latitude != null && longitude != null) { + postParams.addAll({"Longitude": "$latitude"}); + postParams.addAll({"Latitude": "$longitude"}); + } + GenericRespModel adsGenericModel = await apiClient.getJsonForObject((json) => GenericRespModel.fromJson(json), ApiConsts.branchesAndServices, token: appState.getUser.data!.accessToken, queryParameters: postParams); return ProviderProfileModel.fromJson(adsGenericModel.data); } diff --git a/lib/view_models/appointments_view_model.dart b/lib/view_models/appointments_view_model.dart index a690fac..0f4b9ae 100644 --- a/lib/view_models/appointments_view_model.dart +++ b/lib/view_models/appointments_view_model.dart @@ -899,9 +899,11 @@ class AppointmentsVM extends BaseVM { } Future getProviderProfileWithBranchesAndServices(int providerId) async { + double latitude = AppState().currentLocation.latitude; + double longitude = AppState().currentLocation.longitude; setState(ViewState.busy); try { - providerProfileModel = await branchRepo.getBranchAndServicesByProviderId(providerId); + providerProfileModel = await branchRepo.getBranchAndServicesByProviderId(providerId, latitude: latitude, longitude: longitude); } catch (e, s) { logger.e(s); setState(ViewState.idle); diff --git a/lib/view_models/requests_view_model.dart b/lib/view_models/requests_view_model.dart index 5ed5056..ecb3210 100644 --- a/lib/view_models/requests_view_model.dart +++ b/lib/view_models/requests_view_model.dart @@ -585,7 +585,7 @@ class RequestsVM extends BaseVM { vehicleCityId = SelectionModel(selectedOption: "", selectedId: -1, errorValue: ""); vehicleConditionId = SelectionModel(selectedOption: "", selectedId: -1, errorValue: ""); pickedVehicleImages.clear(); - price = ''; + price = '1.0'; model = ""; brand = ""; description = ''; @@ -713,7 +713,7 @@ class RequestsVM extends BaseVM { // 1 for new, 2 for Used countryID: vehicleCountryId.selectedId, cityID: vehicleCityId.selectedId, - price: price, + price: price.isEmpty ? "1.0" : price, description: description, address: address, isSpecialServiceNeeded: false, diff --git a/lib/views/setting_options/setting_options_contact_us.dart b/lib/views/setting_options/setting_options_contact_us.dart index 05bf650..027990d 100644 --- a/lib/views/setting_options/setting_options_contact_us.dart +++ b/lib/views/setting_options/setting_options_contact_us.dart @@ -6,10 +6,8 @@ import 'package:mc_common_app/extensions/int_extensions.dart'; 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/setting_utils_models/contact_infos_model.dart'; -import 'package:mc_common_app/models/setting_utils_models/faqs_model.dart'; import 'package:mc_common_app/theme/colors.dart'; import 'package:mc_common_app/utils/enums.dart'; -import 'package:mc_common_app/view_models/ad_view_model.dart'; import 'package:mc_common_app/view_models/setting_options_view_model.dart'; import 'package:mc_common_app/views/advertisement/components/picked_images_container_widget.dart'; import 'package:mc_common_app/widgets/common_widgets/app_bar.dart'; @@ -75,7 +73,7 @@ class _SettingOptionsContactUsState extends State { 16.height, Expanded( child: RefreshIndicator( - onRefresh: () async => await settingsOptionsVM.getAllFaqs(), + onRefresh: () async => await settingsOptionsVM.getAllContactInfosList(), child: (settingsOptionsVM.state == ViewState.busy) ? const Center(child: CircularProgressIndicator()) : settingsOptionsVM.contactInfosList.isEmpty diff --git a/lib/views/setting_options/setting_options_faqs.dart b/lib/views/setting_options/setting_options_faqs.dart index d6e7bfa..34bf366 100644 --- a/lib/views/setting_options/setting_options_faqs.dart +++ b/lib/views/setting_options/setting_options_faqs.dart @@ -79,7 +79,7 @@ class _SettingOptionsFAQsState extends State { collapsedBackgroundColor: Colors.transparent, initiallyExpanded: settingsOptionsVM.faqsList[index].isCollapsed ?? false, trailing: (settingsOptionsVM.faqsList[index].isCollapsed ?? false) ? const Icon(Icons.keyboard_arrow_up) : const Icon(Icons.keyboard_arrow_down), - subtitle: ("Channel: ${faqModel.channel.toString()}").toText(color: MyColors.lightTextColor).paddingOnly(left: 8, right: 8), + // subtitle: ("Channel: ${faqModel.channel.toString()}").toText(color: MyColors.lightTextColor).paddingOnly(left: 8, right: 8), children: [ Column( crossAxisAlignment: CrossAxisAlignment.start,