fixes & updates

king_kahild_app_updated_3.32
haroon amjad 1 year ago
parent 8636180de3
commit faf5280338

@ -337,7 +337,20 @@ class _BookConfirmState extends State<BookConfirm> {
Future.delayed(Duration(milliseconds: 500), () {
// checkPatientNphiesEligibility(docObject, res['AppointmentNo'], context);
getToDoCount();
getPatientShare(context, res['AppointmentNo'], docObject.clinicID!, docObject.projectID!, docObject);
// getPatientShare(context, res['AppointmentNo'], docObject.clinicID!, docObject.projectID!, docObject);
Navigator.push(
context,
FadePage(
page: BookReminderPage(
docObject: docObject,
patientShareResponse: new PatientShareResponse(),
appoDateFormatted: widget.appoDateFormatted,
appoTimeFormatted: widget.selectedTime,
dateTime: getDateTime(),
isCash: isCash,
),
),
);
});
widget.service.logDoctorFreeSlots(docObject.doctorID!, docObject.clinicID!, docObject.projectID!, decodedLogs, res['AppointmentNo'], context).then((res) {
if (res['MessageStatus'] == 1) {

@ -916,6 +916,7 @@ class _ConfirmLogin extends State<ConfirmLogin> {
page: LandingPage(),
),
(r) => false);
insertIMEI();
// appointmentRateViewModel
// .getIsLastAppointmentRatedList(projectViewModel.isArabic ? 1 : 2)
// .then((value) =>

@ -162,25 +162,25 @@ class PrescriptionDetailsPageINP extends StatelessWidget {
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
Expanded(
child: DefaultButton(
TranslationBase.of(context).availability,
() {
Navigator.push(
context,
FadePage(
page: PharmacyForPrescriptionsPage(
itemID: prescriptionReport!.itemID,
prescriptionReport: PrescriptionReport.fromJson(prescriptionReport!.toJson()),
),
),
);
},
iconData: Icons.location_on,
color: Color(0xff359846),
),
),
SizedBox(width: 10),
// Expanded(
// child: DefaultButton(
// TranslationBase.of(context).availability,
// () {
// Navigator.push(
// context,
// FadePage(
// page: PharmacyForPrescriptionsPage(
// itemID: prescriptionReport!.itemID,
// prescriptionReport: PrescriptionReport.fromJson(prescriptionReport!.toJson()),
// ),
// ),
// );
// },
// iconData: Icons.location_on,
// color: Color(0xff359846),
// ),
// ),
// SizedBox(width: 10),
Expanded(
child: DefaultButton(
TranslationBase.of(context).addReminder,

@ -185,25 +185,25 @@ class _PrescriptionDetailsPageState extends State<PrescriptionDetailsPage> {
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
Expanded(
child: DefaultButton(
TranslationBase.of(context).availability,
() {
Navigator.push(
context,
FadePage(
page: PharmacyForPrescriptionsPage(
itemID: widget.prescriptionReport!.itemID,
prescriptionReport: widget.prescriptionReport,
),
),
);
},
iconData: Icons.location_on,
color: Color(0xff359846),
),
),
SizedBox(width: 10),
// Expanded(
// child: DefaultButton(
// TranslationBase.of(context).availability,
// () {
// Navigator.push(
// context,
// FadePage(
// page: PharmacyForPrescriptionsPage(
// itemID: widget.prescriptionReport!.itemID,
// prescriptionReport: widget.prescriptionReport,
// ),
// ),
// );
// },
// iconData: Icons.location_on,
// color: Color(0xff359846),
// ),
// ),
// SizedBox(width: 10),
Expanded(
child: DefaultButton(
hasReminder ? TranslationBase.of(context).cancelReminder : TranslationBase.of(context).addReminder,

@ -388,31 +388,31 @@ class PrescriptionItemsPage extends StatelessWidget {
),
),
),
Container(
color: Colors.white,
padding: EdgeInsets.only(top: 16, bottom: 16, right: 21, left: 21),
child: DefaultButton(
TranslationBase.of(context).resendOrder,
() {
if (model.isMedDeliveryAllowed == false) {
AppToast.showErrorToast(message: TranslationBase.of(context).prescriptionDeliveryError);
} else {
Navigator.push(
context,
FadePage(
page: PrescriptionDeliveryAddressPage(
prescriptions: prescriptions,
prescriptionReportList: model.prescriptionReportList,
prescriptionReportEnhList: model.prescriptionReportEnhList,
),
),
);
}
},
color: model.isMedDeliveryAllowed == false ? Color(0xff575757) : Color(0xff359846),
disabledColor: Color(0xff575757),
),
),
// Container(
// color: Colors.white,
// padding: EdgeInsets.only(top: 16, bottom: 16, right: 21, left: 21),
// child: DefaultButton(
// TranslationBase.of(context).resendOrder,
// () {
// if (model.isMedDeliveryAllowed == false) {
// AppToast.showErrorToast(message: TranslationBase.of(context).prescriptionDeliveryError);
// } else {
// Navigator.push(
// context,
// FadePage(
// page: PrescriptionDeliveryAddressPage(
// prescriptions: prescriptions,
// prescriptionReportList: model.prescriptionReportList,
// prescriptionReportEnhList: model.prescriptionReportEnhList,
// ),
// ),
// );
// }
// },
// color: model.isMedDeliveryAllowed == false ? Color(0xff575757) : Color(0xff359846),
// disabledColor: Color(0xff575757),
// ),
// ),
],
)
: Container(),

Loading…
Cancel
Save