From 75423e550137a5bb6dc93a54835991a026181529 Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Thu, 25 Nov 2021 09:36:02 +0300 Subject: [PATCH] Updates --- .../images/pharmacy_module/payment/applePay.png | Bin 0 -> 11172 bytes .../service/PrescriptionDeliveryService.dart | 2 +- .../service/medical/prescriptions_service.dart | 4 ++-- .../parmacyModule/order-preview-service.dart | 3 +++ .../medical/prescriptions_view_model.dart | 4 ++-- .../pharmacyModule/OrderPreviewViewModel.dart | 2 ++ .../prescriptions_history_details_page.dart | 2 +- lib/widgets/pharmacy/product_tile.dart | 2 +- .../pickupLocation/PickupLocationFromMap.dart | 1 + 9 files changed, 13 insertions(+), 7 deletions(-) create mode 100644 assets/images/pharmacy_module/payment/applePay.png diff --git a/assets/images/pharmacy_module/payment/applePay.png b/assets/images/pharmacy_module/payment/applePay.png new file mode 100644 index 0000000000000000000000000000000000000000..fd167e1cbc4137579b849ae5fda13c497babbe61 GIT binary patch literal 11172 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 body = Map(); body['ID'] = orderID; - await baseAppClient.post(GET_ALL_PRESCRIPTION_INFO_RC + "?PatientId=" + patientID.toString(), onSuccess: (dynamic response, int statusCode) { + await baseAppClient.post(GET_ALL_PRESCRIPTION_INFO_RC + "?PatientId=" + patientID.toString(), isRCService: true, onSuccess: (dynamic response, int statusCode) { response['response']['report'].forEach((prescriptionsOrder) { prescriptionsOrderListRC.add(PrescriptionInfoRCModel.fromJson(prescriptionsOrder)); }); @@ -69,7 +69,7 @@ class PrescriptionsService extends BaseService { prescriptionsOrderList.clear(); Map body = Map(); // body['isDentalAllowedBackend'] = false; - await baseAppClient.post(GET_ALL_PRESCRIPTION_ORDERS_RC, onSuccess: (dynamic response, int statusCode) { + await baseAppClient.post(GET_ALL_PRESCRIPTION_ORDERS_RC, isRCService: true, onSuccess: (dynamic response, int statusCode) { response['response'].forEach((prescriptionsOrder) { prescriptionsOrderList.add(GetCMCAllOrdersResponseModel.fromJson(prescriptionsOrder)); }); diff --git a/lib/core/service/parmacyModule/order-preview-service.dart b/lib/core/service/parmacyModule/order-preview-service.dart index 8b56b739..52892641 100644 --- a/lib/core/service/parmacyModule/order-preview-service.dart +++ b/lib/core/service/parmacyModule/order-preview-service.dart @@ -248,6 +248,9 @@ class OrderPreviewService extends BaseService { case 4: return "INSTALLMENT"; break; + case 5: + return "ApplePay"; + break; default: return ""; } diff --git a/lib/core/viewModels/medical/prescriptions_view_model.dart b/lib/core/viewModels/medical/prescriptions_view_model.dart index f480fb56..dd1030c6 100644 --- a/lib/core/viewModels/medical/prescriptions_view_model.dart +++ b/lib/core/viewModels/medical/prescriptions_view_model.dart @@ -147,9 +147,9 @@ class PrescriptionsViewModel extends BaseViewModel { } } - getPrescriptionReportDetailsRC() async { + getPrescriptionReportDetailsRC(int orderID, dynamic patientID) async { setState(ViewState.Busy); - await _prescriptionsService.getPrescriptionsInfoRC(4, 2001273); + await _prescriptionsService.getPrescriptionsInfoRC(orderID, patientID); if (_prescriptionsService.hasError) { error = _prescriptionsService.error; setState(ViewState.Error); diff --git a/lib/core/viewModels/pharmacyModule/OrderPreviewViewModel.dart b/lib/core/viewModels/pharmacyModule/OrderPreviewViewModel.dart index 6d212d2b..12623290 100644 --- a/lib/core/viewModels/pharmacyModule/OrderPreviewViewModel.dart +++ b/lib/core/viewModels/pharmacyModule/OrderPreviewViewModel.dart @@ -156,6 +156,8 @@ class OrderPreviewViewModel extends BaseViewModel { case 4: return "${assetFile}installment.png"; break; + case 5: + return "${assetFile}applePay.png"; default: return ""; } diff --git a/lib/pages/medical/prescriptions/prescriptions_history_details_page.dart b/lib/pages/medical/prescriptions/prescriptions_history_details_page.dart index e9b1dfb6..1343f479 100644 --- a/lib/pages/medical/prescriptions/prescriptions_history_details_page.dart +++ b/lib/pages/medical/prescriptions/prescriptions_history_details_page.dart @@ -21,7 +21,7 @@ class PrescriptionsHistoryDetailsPage extends StatelessWidget { Widget build(BuildContext context) { ProjectViewModel projectViewModel = Provider.of(context); return BaseView( - onModelReady: (model) => model.getPrescriptionReportDetailsRC(), + onModelReady: (model) => model.getPrescriptionReportDetailsRC(prescriptionsOrder.iD, projectViewModel.user.patientID), builder: (_, model, widget) { int status = prescriptionsOrder.statusId; String _statusDisp = prescriptionsOrder.statusText; diff --git a/lib/widgets/pharmacy/product_tile.dart b/lib/widgets/pharmacy/product_tile.dart index 23a6dd9b..65a77132 100644 --- a/lib/widgets/pharmacy/product_tile.dart +++ b/lib/widgets/pharmacy/product_tile.dart @@ -253,7 +253,7 @@ class productTile extends StatelessWidget { : Container(), // this.isOrderDetails == true && model.order[0].orderStatusId == 30? - if (status == 30 && this.isOrderDetails == true) + if (status == 30 || status == 997 && this.isOrderDetails == true) Expanded( child: Row( mainAxisAlignment: MainAxisAlignment.spaceAround, diff --git a/lib/widgets/pickupLocation/PickupLocationFromMap.dart b/lib/widgets/pickupLocation/PickupLocationFromMap.dart index 73edbe08..9a3ff303 100644 --- a/lib/widgets/pickupLocation/PickupLocationFromMap.dart +++ b/lib/widgets/pickupLocation/PickupLocationFromMap.dart @@ -48,6 +48,7 @@ class PickupLocationFromMap extends StatelessWidget { autocompleteLanguage: projectViewModel.currentLanguage, enableMapTypeButton: true, selectInitialPosition: true, + region: "SA", onPlacePicked: (PickResult result) { print(result.adrAddress); onPick(result);