From ed68eed9dfcbd2e863d204551b3565b09312e11e Mon Sep 17 00:00:00 2001 From: Fatimah Alshammari Date: Mon, 7 Dec 2020 12:18:57 +0300 Subject: [PATCH] added links for profile --- lib/pages/landing/landing_page_pharmcy.dart | 8 +++++--- lib/pages/pharmacy/order/OrderDetails.dart | 22 ++++++++++----------- lib/pages/pharmacy/profile/profile.dart | 2 +- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/lib/pages/landing/landing_page_pharmcy.dart b/lib/pages/landing/landing_page_pharmcy.dart index 4308e186..59492370 100644 --- a/lib/pages/landing/landing_page_pharmcy.dart +++ b/lib/pages/landing/landing_page_pharmcy.dart @@ -2,6 +2,7 @@ import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart'; import 'package:diplomaticquarterapp/pages/parent_categorise_page.dart'; import 'package:diplomaticquarterapp/pages/pharmacies/screens/cart-order-page.dart'; import 'package:diplomaticquarterapp/pages/pharmacies/screens/pharmacy_module_page.dart'; +import 'package:diplomaticquarterapp/pages/pharmacy/profile/profile.dart'; import 'package:diplomaticquarterapp/pages/pharmacy_categorise.dart'; import 'package:diplomaticquarterapp/pages/search_products_page.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; @@ -136,9 +137,10 @@ class _LandingPagePharmacyState extends State { PharmacyPage(), PharmacyCategorisePage(), OffersCategorisePage(), - Container( - child: Text('text'), - ), + PharmacyProfilePage(), +// Container( +// child: Text('text'), +// ), CartOrderPage(), ], // Please do not remove the BookingOptions from this array ), diff --git a/lib/pages/pharmacy/order/OrderDetails.dart b/lib/pages/pharmacy/order/OrderDetails.dart index 3c6e62b1..94b1aba2 100644 --- a/lib/pages/pharmacy/order/OrderDetails.dart +++ b/lib/pages/pharmacy/order/OrderDetails.dart @@ -544,23 +544,23 @@ class _OrderDetailsPageState extends State { okText: TranslationBase.of(context).confirm, cancelText: TranslationBase.of(context).cancel_nocaps, okFunction: () => { - cancelOrderDetail(widget.orderModel.id), +// cancelOrderDetail(widget.orderModel.id), ConfirmDialog.closeAlertDialog(context) }, cancelFunction: () => {}); dialog.showAlertDialog(context); } - cancelOrderDetail(order){ - if(widget.orderModel.canCancel && widget.orderModel.canRefund == false){ -// setState(() { - cancelOrderDetail(order); - AppToast.showSuccessToast(message: "Request Sent Successfully"); -// }); -// return OrderPage(); - } - else{} - } +// cancelOrderDetail(order){ +// if(widget.orderModel.canCancel && widget.orderModel.canRefund == false){ +//// setState(() { +// cancelOrderDetail(order); +// AppToast.showSuccessToast(message: "Request Sent Successfully"); +//// }); +//// return OrderPage(); +// } +// else{} +// } getLanguageID() async { var languageID = await sharedPref.getString(APP_LANGUAGE); diff --git a/lib/pages/pharmacy/profile/profile.dart b/lib/pages/pharmacy/profile/profile.dart index ec19ae8d..0336370c 100644 --- a/lib/pages/pharmacy/profile/profile.dart +++ b/lib/pages/pharmacy/profile/profile.dart @@ -1,6 +1,6 @@ import 'package:diplomaticquarterapp/pages/ContactUs/LiveChat/livechat_page.dart'; import 'package:diplomaticquarterapp/pages/ContactUs/findus/findus_page.dart'; -import 'package:diplomaticquarterapp/pages/family/my-family.dart'; +import 'package:diplomaticquarterapp/pages/DrawerPages/family/my-family.dart'; import 'package:diplomaticquarterapp/pages/medical/prescriptions/prescriptions_home_page.dart'; import 'package:diplomaticquarterapp/pages/pharmacies/wishlist.dart'; import 'package:diplomaticquarterapp/pages/pharmacy/order/Order.dart';