diff --git a/lib/views/branches/branch_detail_view.dart b/lib/views/branches/branch_detail_view.dart index 717aa65..a3c89bb 100644 --- a/lib/views/branches/branch_detail_view.dart +++ b/lib/views/branches/branch_detail_view.dart @@ -107,25 +107,35 @@ class _BranchDetailViewState extends State { Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - Row( - mainAxisAlignment: MainAxisAlignment.center, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - LocaleKeys.openMapLocation.tr().toText( - fontSize: 12, - isBold: true, - color: MyColors.primaryColor, - isUnderLine: true, - ), - 4.width, - Image.asset( - MyAssets.icRightUpPng, - height: 6, - width: 6, - color: MyColors.primaryColor, - ), - ], - ).padding(EdgeInsets.symmetric(vertical: 6, horizontal: 2)), + if ((widget.branchDetailModel.latitude != null && widget.branchDetailModel.latitude!.isNotEmpty) && (widget.branchDetailModel.longitude != null && widget.branchDetailModel.longitude!.isNotEmpty)) ...[ + Row( + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + LocaleKeys.openMapLocation.tr().toText( + fontSize: 12, + isBold: true, + color: MyColors.primaryColor, + isUnderLine: true, + ), + 4.width, + Image.asset( + MyAssets.icRightUpPng, + height: 6, + width: 6, + color: MyColors.primaryColor, + ), + ], + ).padding(EdgeInsets.symmetric(vertical: 6, horizontal: 2)).onPress(() async { + double latitude, longitude = 0.0; + + latitude = double.parse(widget.branchDetailModel.latitude!); + longitude = double.parse(widget.branchDetailModel.longitude!); + await Utils.openLocationInMaps(latitude: latitude, longitude: longitude); + }), + ] else ...[ + SizedBox(), + ], Row( mainAxisAlignment: MainAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center, diff --git a/lib/views/dashboard/fragments/appointments_fragment.dart b/lib/views/dashboard/fragments/appointments_fragment.dart index 8beea72..530a36b 100644 --- a/lib/views/dashboard/fragments/appointments_fragment.dart +++ b/lib/views/dashboard/fragments/appointments_fragment.dart @@ -59,7 +59,7 @@ class AppointmentsFragment extends StatelessWidget { Expanded( child: RefreshIndicator( onRefresh: () async { - appointmentsVM.getMyAppointments(); + appointmentsVM.getMyAppointmentsForCustomer(); }, child: appointmentsVM.state == ViewState.busy ? const Center(child: CircularProgressIndicator())