diff --git a/lib/views/appoinments/appoinment_detail_list_page.dart b/lib/views/appoinments/appoinment_detail_list_page.dart index 9550c36..90e831c 100644 --- a/lib/views/appoinments/appoinment_detail_list_page.dart +++ b/lib/views/appoinments/appoinment_detail_list_page.dart @@ -11,7 +11,6 @@ import 'package:mc_common_app/widgets/common_widgets/app_bar.dart'; import 'package:provider/provider.dart'; import 'package:easy_localization/easy_localization.dart'; - class AppointmentDetailListPage extends StatelessWidget { const AppointmentDetailListPage({Key? key}) : super(key: key); @@ -19,7 +18,7 @@ class AppointmentDetailListPage extends StatelessWidget { Widget build(BuildContext context) { return Scaffold( appBar: CustomAppBar( - title:LocaleKeys.appointment_details.tr(), + title: LocaleKeys.appointment_details.tr(), ), body: SizedBox( width: double.infinity, @@ -55,14 +54,16 @@ class AppointmentDetailListPage extends StatelessWidget { } }), ), - ShowFillButton( - title: LocaleKeys.mergeAppointments.tr(), - maxWidth: double.infinity, - margin: const EdgeInsets.all(21), - onPressed: () { - navigateWithName(context, ProviderAppRoutes.mergeAppointments); - }, - ), + context.read().isShowMergeButton() + ? ShowFillButton( + title: LocaleKeys.mergeAppointments.tr(), + maxWidth: double.infinity, + margin: const EdgeInsets.all(21), + onPressed: () { + navigateWithName(context, ProviderAppRoutes.mergeAppointments); + }, + ) + : SizedBox(), ], )), ); diff --git a/lib/views/settings/schedule/add_schedules_page.dart b/lib/views/settings/schedule/add_schedules_page.dart index d11973c..619efe3 100644 --- a/lib/views/settings/schedule/add_schedules_page.dart +++ b/lib/views/settings/schedule/add_schedules_page.dart @@ -48,8 +48,11 @@ class _AddSchedulesPageState extends State { // mModel.selectedServicesItems.clear(); scheduleData.scheduleServices?.forEach((element) { - mModel.selectedServicesItems.add(PickerItem(id: element.providerServiceId ?? 0, title: element.serviceDescription ?? "")); + print("Services Elements"); + print(element); + mModel.selectedServicesItems.add(PickerItem(id: element.serviceProviderServiceId ?? 0, title: element.serviceDescription ?? "")); }); + logger.d(mModel.selectedServicesItems.first.id); mModel.selectedDaysItems.clear(); scheduleData.weeklyOffDays?.forEach((element) { for (var daysElement in initDaysList) { @@ -331,6 +334,7 @@ class _AddSchedulesPageState extends State { "serviceGroupDescription": "string" }; + GenericRespModel servicesResponse = await model.addServicesInSchedule(map1); Utils.hideLoading(context); if (servicesResponse.messageStatus == 1) { @@ -363,7 +367,7 @@ class _AddSchedulesPageState extends State { "fromDate": startDate, "toDate": endDate, "startTime": startTime, - "endTime": endDate, + "endTime": endTime, "slotDurationMinute": slotsTime, "perSlotAppointment": appointmentPerSlot, "deliveryServiceType": 1,