diff --git a/assets/images/new/payment/tamara.png b/assets/images/new/payment/tamara.png deleted file mode 100644 index ce9a2b15..00000000 Binary files a/assets/images/new/payment/tamara.png and /dev/null differ diff --git a/assets/images/new/payment/tamara_ar.png b/assets/images/new/payment/tamara_ar.png new file mode 100644 index 00000000..f1587ad6 Binary files /dev/null and b/assets/images/new/payment/tamara_ar.png differ diff --git a/assets/images/new/payment/tamara_en.png b/assets/images/new/payment/tamara_en.png new file mode 100644 index 00000000..84d85b2c Binary files /dev/null and b/assets/images/new/payment/tamara_en.png differ diff --git a/lib/config/config.dart b/lib/config/config.dart index aff82d3f..afd3cbe5 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -408,7 +408,7 @@ var UPDATE_COVID_QUESTIONNAIRE = 'Services/Doctors.svc/REST/COVID19_Questionnar var CHANNEL = 3; var GENERAL_ID = 'Cs2020@2016\$2958'; var IP_ADDRESS = '10.20.10.20'; -var VERSION_ID = 9.4; +var VERSION_ID = 9.5; var SETUP_ID = '91877'; var LANGUAGE = 2; // var PATIENT_OUT_SA = 0; diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index b488fc39..73595711 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -1843,7 +1843,7 @@ const Map localizedValues = { "privacyPolicy": {"en": "Privacy Policy", "ar": "سياسة الخصوصية"}, "termsConditions": {"en": "Terms & Conditions", "ar": "الأحكام والشروط"}, "prescriptionDeliveryError": {"en": "This clinic does not support refill & delivery.", "ar": "هذه العيادة لا تدعم إعادة التعبئة والتسليم."}, - "liveCarePermissions": {"en": "LiveCare requires Camera & Microphone permissions, Please allow these to proceed.", "ar": "يتطلب لايف كير أذونات الكاميرا والميكروفون ، يرجى السماح لها بالمتابعة."}, + "liveCarePermissions": {"en": "LiveCare requires Camera, Microphone & Location permissions, Please allow these to proceed.", "ar": "يتطلب لايف كير أذونات الكاميرا والميكروفون والموقع، يرجى السماح لها بالمتابعة."}, "lakumUnhold": { "en": "The account has already been activated", "ar": "لقد تم تفعيل الحساب من قبل" }, "lakumDiscontinue": { "en": "The account is closed", "ar": "الحساب مغلق" }, "lakumSuccess": { "en": "The account has been activated successfully", "ar": "تم تفعيل الحساب بنجاح" }, diff --git a/lib/core/service/client/base_app_client.dart b/lib/core/service/client/base_app_client.dart index c1c83ca5..f7d0068d 100644 --- a/lib/core/service/client/base_app_client.dart +++ b/lib/core/service/client/base_app_client.dart @@ -149,7 +149,7 @@ class BaseAppClient { // body['IdentificationNo'] = 1023854217; // body['MobileNo'] = "531940021"; - // body['PatientID'] = 1231755; //3844083 + // body['PatientID'] = 3775256; //3844083 // body['TokenID'] = "@dm!n"; // Patient ID: 3027574 diff --git a/lib/pages/ToDoList/payment_method_select.dart b/lib/pages/ToDoList/payment_method_select.dart index 24215533..58503af5 100644 --- a/lib/pages/ToDoList/payment_method_select.dart +++ b/lib/pages/ToDoList/payment_method_select.dart @@ -243,7 +243,7 @@ class _PaymentMethodState extends State { height: 60.0, padding: EdgeInsets.all(0.0), width: 60, - child: SvgPicture.asset("assets/images/new/payment/tamara.svg"), + child: projectViewModel.isArabic ? Image.asset("assets/images/new/payment/tamara_ar.png") : Image.asset("assets/images/new/payment/tamara_en.png"), ), mFlex(1), if (selectedPaymentMethod == "TAMARA") diff --git a/lib/pages/landing/widgets/services_view.dart b/lib/pages/landing/widgets/services_view.dart index f9942feb..1a505e03 100644 --- a/lib/pages/landing/widgets/services_view.dart +++ b/lib/pages/landing/widgets/services_view.dart @@ -57,7 +57,7 @@ class ServicesView extends StatelessWidget { return InkWell( onTap: () { if (index == 0) { - openLiveCare(context); + openLiveCare(context); } else if (index == 1) { showCovidDialog(context); locator().hmgServices.logServiceName('covid-test drive-thru'); @@ -296,13 +296,9 @@ class ServicesView extends StatelessWidget { } openLiveCare(BuildContext context) { - locationUtils = new LocationUtils(isShowConfirmDialog: true, context: context); - locationUtils.getCurrentLocation(callBack: (value) { - print(value); - locator().hmgServices.logServiceName('live care service'); - Navigator.push(context, FadePage(page: LiveCareHome())).then((value) { - LiveCareHome.isLiveCareTypeSelected = false; - }); + locator().hmgServices.logServiceName('live care service'); + Navigator.push(context, FadePage(page: LiveCareHome())).then((value) { + LiveCareHome.isLiveCareTypeSelected = false; }); } diff --git a/lib/pages/livecare/live_care_payment_page.dart b/lib/pages/livecare/live_care_payment_page.dart index 3bd667d3..375249b3 100644 --- a/lib/pages/livecare/live_care_payment_page.dart +++ b/lib/pages/livecare/live_care_payment_page.dart @@ -5,6 +5,7 @@ import 'package:diplomaticquarterapp/models/LiveCare/ERAppointmentFeesResponse.d import 'package:diplomaticquarterapp/theme/colors.dart'; import 'package:diplomaticquarterapp/uitl/PlatformBridge.dart'; import 'package:diplomaticquarterapp/uitl/app_toast.dart'; +import 'package:diplomaticquarterapp/uitl/location_util.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/uitl/utils_new.dart'; import 'package:diplomaticquarterapp/widgets/buttons/defaultButton.dart'; @@ -31,6 +32,7 @@ class _LiveCarePatmentPageState extends State { int _selected = 0; ProjectViewModel projectViewModel; + LocationUtils locationUtils; @override Widget build(BuildContext context) { @@ -289,6 +291,10 @@ class _LiveCarePatmentPageState extends State { } else { askVideoCallPermission().then((value) async { if (value) { + locationUtils = new LocationUtils(isShowConfirmDialog: false, context: context); + locationUtils.getCurrentLocation(callBack: (value) { + print(value); + }); if (Platform.isAndroid && !(await PlatformBridge.shared().isDrawOverAppsPermissionAllowed())) { await drawOverAppsMessageDialog(context).then((value) { return false; @@ -316,7 +322,7 @@ class _LiveCarePatmentPageState extends State { } Future askVideoCallPermission() async { - if (!(await Permission.camera.request().isGranted) || !(await Permission.microphone.request().isGranted)) { + if (!(await Permission.camera.request().isGranted) || !(await Permission.microphone.request().isGranted) || !(await Permission.location.request().isGranted)) { return false; } return true; diff --git a/lib/uitl/utils.dart b/lib/uitl/utils.dart index 439c1e55..dbfdac5a 100644 --- a/lib/uitl/utils.dart +++ b/lib/uitl/utils.dart @@ -365,6 +365,7 @@ class Utils { medical.add(InkWell( onTap: () => projectViewModel.havePrivilege(85) ? Navigator.push(context, FadePage(page: AnicllaryOrders())) : null, + // onTap: () => Navigator.push(context, FadePage(page: AnicllaryOrders())), child: MedicalProfileItem( title: TranslationBase.of(context).anicllaryOrders, imagePath: 'ancillary.svg', diff --git a/lib/uitl/utils_new.dart b/lib/uitl/utils_new.dart index ec71ff24..b0065d82 100644 --- a/lib/uitl/utils_new.dart +++ b/lib/uitl/utils_new.dart @@ -34,14 +34,14 @@ Widget getPaymentMethods() { children: [ Image.asset("assets/images/new/payment/Mada.png", width: 50, height: 50), + Image.asset("assets/images/new/payment/tamara_en.png", + width: 50, height: 50), Image.asset("assets/images/new/payment/visa.png", width: 50, height: 50), Image.asset("assets/images/new/payment/Mastercard.png", width: 50, height: 50), Image.asset("assets/images/new/payment/Apple_Pay.png", width: 50, height: 50), - Image.asset("assets/images/new/payment/installments.png", - width: 50, height: 50), ], ), );