issues fixed

aamir_dev
Faiz Hashmi 1 year ago
parent 7453c7e2e5
commit 3d9099d9e7

@ -88,7 +88,7 @@ abstract class BranchRepo {
Future<List<ItemData>> getServiceItems(int serviceId); Future<List<ItemData>> getServiceItems(int serviceId);
Future<ProviderProfileModel> getBranchAndServicesByProviderId(int providerId); Future<ProviderProfileModel> getBranchAndServicesByProviderId(int providerId, {double? latitude, double? longitude});
Future<List<BranchDetailModel>> getBranchesByFilters({ Future<List<BranchDetailModel>> getBranchesByFilters({
List<int>? providerIdsList, List<int>? providerIdsList,
@ -191,9 +191,7 @@ class BranchRepoImp implements BranchRepo {
}; };
String? token = AppState().getUser.data?.accessToken; String? token = AppState().getUser.data?.accessToken;
debugPrint(token); debugPrint(token);
return await injector return await injector.get<ApiClient>().getJsonForObject((json) => Document.fromJson(json), ApiConsts.fetProviderDocument, queryParameters: queryParameters, token: AppState().getUser.data!.accessToken ?? "");
.get<ApiClient>()
.getJsonForObject((json) => Document.fromJson(json), ApiConsts.fetProviderDocument, queryParameters: queryParameters, token: AppState().getUser.data!.accessToken ?? "");
} }
@override @override
@ -434,10 +432,16 @@ class BranchRepoImp implements BranchRepo {
} }
@override @override
Future<ProviderProfileModel> getBranchAndServicesByProviderId(int providerId) async { Future<ProviderProfileModel> getBranchAndServicesByProviderId(int providerId, {double? latitude, double? longitude}) async {
var postParams = {"serviceProviderID": providerId.toString()}; var postParams = {
GenericRespModel adsGenericModel = "serviceProviderID": providerId.toString(),
await apiClient.getJsonForObject((json) => GenericRespModel.fromJson(json), ApiConsts.branchesAndServices, token: appState.getUser.data!.accessToken, queryParameters: postParams); };
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); return ProviderProfileModel.fromJson(adsGenericModel.data);
} }

@ -899,9 +899,11 @@ class AppointmentsVM extends BaseVM {
} }
Future<void> getProviderProfileWithBranchesAndServices(int providerId) async { Future<void> getProviderProfileWithBranchesAndServices(int providerId) async {
double latitude = AppState().currentLocation.latitude;
double longitude = AppState().currentLocation.longitude;
setState(ViewState.busy); setState(ViewState.busy);
try { try {
providerProfileModel = await branchRepo.getBranchAndServicesByProviderId(providerId); providerProfileModel = await branchRepo.getBranchAndServicesByProviderId(providerId, latitude: latitude, longitude: longitude);
} catch (e, s) { } catch (e, s) {
logger.e(s); logger.e(s);
setState(ViewState.idle); setState(ViewState.idle);

@ -585,7 +585,7 @@ class RequestsVM extends BaseVM {
vehicleCityId = SelectionModel(selectedOption: "", selectedId: -1, errorValue: ""); vehicleCityId = SelectionModel(selectedOption: "", selectedId: -1, errorValue: "");
vehicleConditionId = SelectionModel(selectedOption: "", selectedId: -1, errorValue: ""); vehicleConditionId = SelectionModel(selectedOption: "", selectedId: -1, errorValue: "");
pickedVehicleImages.clear(); pickedVehicleImages.clear();
price = ''; price = '1.0';
model = ""; model = "";
brand = ""; brand = "";
description = ''; description = '';
@ -713,7 +713,7 @@ class RequestsVM extends BaseVM {
// 1 for new, 2 for Used // 1 for new, 2 for Used
countryID: vehicleCountryId.selectedId, countryID: vehicleCountryId.selectedId,
cityID: vehicleCityId.selectedId, cityID: vehicleCityId.selectedId,
price: price, price: price.isEmpty ? "1.0" : price,
description: description, description: description,
address: address, address: address,
isSpecialServiceNeeded: false, isSpecialServiceNeeded: false,

@ -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/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/setting_utils_models/contact_infos_model.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/theme/colors.dart';
import 'package:mc_common_app/utils/enums.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/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/views/advertisement/components/picked_images_container_widget.dart';
import 'package:mc_common_app/widgets/common_widgets/app_bar.dart'; import 'package:mc_common_app/widgets/common_widgets/app_bar.dart';
@ -75,7 +73,7 @@ class _SettingOptionsContactUsState extends State<SettingOptionsContactUs> {
16.height, 16.height,
Expanded( Expanded(
child: RefreshIndicator( child: RefreshIndicator(
onRefresh: () async => await settingsOptionsVM.getAllFaqs(), onRefresh: () async => await settingsOptionsVM.getAllContactInfosList(),
child: (settingsOptionsVM.state == ViewState.busy) child: (settingsOptionsVM.state == ViewState.busy)
? const Center(child: CircularProgressIndicator()) ? const Center(child: CircularProgressIndicator())
: settingsOptionsVM.contactInfosList.isEmpty : settingsOptionsVM.contactInfosList.isEmpty

@ -79,7 +79,7 @@ class _SettingOptionsFAQsState extends State<SettingOptionsFAQs> {
collapsedBackgroundColor: Colors.transparent, collapsedBackgroundColor: Colors.transparent,
initiallyExpanded: settingsOptionsVM.faqsList[index].isCollapsed ?? false, initiallyExpanded: settingsOptionsVM.faqsList[index].isCollapsed ?? false,
trailing: (settingsOptionsVM.faqsList[index].isCollapsed ?? false) ? const Icon(Icons.keyboard_arrow_up) : const Icon(Icons.keyboard_arrow_down), 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: [ children: [
Column( Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,

Loading…
Cancel
Save