Pharma LiveCare updates

sultan_v3.3
haroon amjad 3 years ago
parent f686013692
commit da423fe12a

@ -20,8 +20,8 @@ var PACKAGES_ORDERS = '/api/orders';
var PACKAGES_ORDER_HISTORY = '/api/orders/items'; var PACKAGES_ORDER_HISTORY = '/api/orders/items';
var PACKAGES_TAMARA_OPT = '/api/orders/paymentoptions/tamara'; var PACKAGES_TAMARA_OPT = '/api/orders/paymentoptions/tamara';
// var BASE_URL = 'http://10.50.100.198:3334/'; // var BASE_URL = 'http://10.50.100.198:3334/';
var BASE_URL = 'https://uat.hmgwebservices.com/'; // var BASE_URL = 'https://uat.hmgwebservices.com/';
// var BASE_URL = 'https://hmgwebservices.com/'; var BASE_URL = 'https://hmgwebservices.com/';
// Pharmacy UAT URLs // Pharmacy UAT URLs
// var BASE_PHARMACY_URL = 'https://uat.hmgwebservices.com/epharmacy/api/'; // var BASE_PHARMACY_URL = 'https://uat.hmgwebservices.com/epharmacy/api/';

@ -1870,4 +1870,5 @@ const Map localizedValues = {
"pendingActivation": {"en": "Pending Activation", "ar": "في انتظار التنشيط"}, "pendingActivation": {"en": "Pending Activation", "ar": "في انتظار التنشيط"},
"awaitingApproval": {"en": "Awaiting Approval", "ar": "انتظر القبول"}, "awaitingApproval": {"en": "Awaiting Approval", "ar": "انتظر القبول"},
"liveCareSupportContact": {"en": "LiveCare Support Contact: ", "ar": "اتصل لايف كير: "}, "liveCareSupportContact": {"en": "LiveCare Support Contact: ", "ar": "اتصل لايف كير: "},
"pharmaLiveCare": {"en": "Pharma LiveCare", "ar": "لايف كير الصيدلية"},
}; };

@ -1,14 +1,12 @@
import 'package:barcode_scan2/barcode_scan2.dart'; import 'package:barcode_scan2/barcode_scan2.dart';
import 'package:diplomaticquarterapp/config/shared_pref_kay.dart'; import 'package:diplomaticquarterapp/config/shared_pref_kay.dart';
import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
import 'package:diplomaticquarterapp/pages/livecare/livecare_home.dart';
import 'package:diplomaticquarterapp/services/livecare_services/livecare_provider.dart'; import 'package:diplomaticquarterapp/services/livecare_services/livecare_provider.dart';
import 'package:diplomaticquarterapp/theme/colors.dart'; import 'package:diplomaticquarterapp/theme/colors.dart';
import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart'; import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart';
import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart'; import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_svg/flutter_svg.dart'; import 'package:flutter_svg/flutter_svg.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
@ -103,7 +101,9 @@ class _LiveCareTypeSelectState extends State<LiveCareTypeSelect> {
children: [ children: [
_loginOptionButton(TranslationBase.of(context).livecareOption1, 'assets/images/new/Live_Care.svg', 1), _loginOptionButton(TranslationBase.of(context).livecareOption1, 'assets/images/new/Live_Care.svg', 1),
_loginOptionButton(TranslationBase.of(context).livecareOption4, 'assets/images/new/book appointment.svg', 2), _loginOptionButton(TranslationBase.of(context).livecareOption4, 'assets/images/new/book appointment.svg', 2),
_loginOptionButton("Pharma LiveCare", 'assets/images/new/Live_Care.svg', 3), _loginOptionButton(TranslationBase.of(context).pharmaLiveCare, 'assets/images/new/pharma.svg', 3,
// isEnable: projectViewModel.havePrivilege(99)
),
], ],
), ),
SizedBox( SizedBox(
@ -116,7 +116,7 @@ class _LiveCareTypeSelectState extends State<LiveCareTypeSelect> {
); );
} }
Widget _loginOptionButton(String _title, String _icon, int _loginIndex) { Widget _loginOptionButton(String _title, String _icon, int _loginIndex, {bool isEnable = true}) {
return InkWell( return InkWell(
onTap: () { onTap: () {
if (_loginIndex == 1) { if (_loginIndex == 1) {
@ -127,53 +127,78 @@ class _LiveCareTypeSelectState extends State<LiveCareTypeSelect> {
projectViewModel.analytics.liveCare.livecare_schedule_video_call(); projectViewModel.analytics.liveCare.livecare_schedule_video_call();
} else { } else {
//Pharmacy LiveCare //Pharmacy LiveCare
readQRCode(); if (isEnable) readQRCode();
} }
}, },
child: Container( child: Stack(children: [
padding: EdgeInsets.only(left: 20, right: 20, bottom: 3, top: 28), AspectRatio(
decoration: BoxDecoration( aspectRatio: 1.0,
borderRadius: BorderRadius.circular(15), child: Container(
color: Colors.white, padding: EdgeInsets.only(left: 20, right: 20, bottom: 3, top: 28),
border: Border.all( decoration: BoxDecoration(
color: Color(0xffefefef), borderRadius: BorderRadius.circular(15),
width: 1, color: Colors.white,
), border: Border.all(
), color: Color(0xffefefef),
child: Column( width: 1,
crossAxisAlignment: CrossAxisAlignment.start, ),
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: <Widget>[
SvgPicture.asset(
_icon,
height: _loginIndex == 1 ? 60 : 50,
width: _loginIndex == 1 ? 60 : 50,
), ),
Text( child: Column(
_title, crossAxisAlignment: CrossAxisAlignment.start,
style: TextStyle(fontSize: 16, fontWeight: FontWeight.w600, color: Color(0xff2B353E), letterSpacing: -0.48, height: 20 / 16), mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: <Widget>[
SvgPicture.asset(
_icon,
height: _loginIndex == 3 ? 80 : 60,
width: _loginIndex == 3 ? 80 : 60,
),
Text(
_title,
style: TextStyle(fontSize: 16, fontWeight: FontWeight.w600, color: Color(0xff2B353E), letterSpacing: -0.48, height: 20 / 16),
),
],
), ),
], ),
), ),
), isEnable
? Container()
: Container(
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(15),
color: Colors.grey.withOpacity(0.6),
border: Border.all(
color: Color(0xffefefef),
width: 1,
),
),
width: double.infinity,
height: double.infinity,
child: Icon(
Icons.lock_outline,
size: 40,
),
)
]),
); );
} }
readQRCode() async { readQRCode() async {
pharmacyLiveCareQRCode = (await BarcodeScanner.scan())?.rawContent; pharmacyLiveCareQRCode = (await BarcodeScanner.scan())?.rawContent;
GifLoaderDialogUtils.showMyDialog(context); if (pharmacyLiveCareQRCode != "") {
LiveCareService service = new LiveCareService(); GifLoaderDialogUtils.showMyDialog(context);
service.getPatientInfoByQR(pharmacyLiveCareQRCode, context).then((res) { LiveCareService service = new LiveCareService();
GifLoaderDialogUtils.hideDialog(context); service.getPatientInfoByQR(pharmacyLiveCareQRCode, context).then((res) {
}).catchError((err) { GifLoaderDialogUtils.hideDialog(context);
GifLoaderDialogUtils.hideDialog(context); }).catchError((err) {
print(err); GifLoaderDialogUtils.hideDialog(context);
startPharmacyLiveCareProcess(); print(err);
}); startPharmacyLiveCareProcess();
});
} else {}
} }
startPharmacyLiveCareProcess() { startPharmacyLiveCareProcess() {
sharedPref.setString(LIVECARE_CLINIC_DATA, "Pharmacy LiveCare" + "-" + "501" + "-" + "7"); sharedPref.setString(LIVECARE_CLINIC_DATA, "Pharmacy LiveCare" + "-" + "501" + "-" + "1");
Navigator.pop(context, "pharmacy/$pharmacyLiveCareQRCode"); Navigator.pop(context, "pharmacy/$pharmacyLiveCareQRCode");
// Navigator.push(context, FadePage(page: LiveCareHome(isPharmacyLiveCare: true, pharmacyLiveCareQRCode: pharmacyLiveCareQRCode,))); // Navigator.push(context, FadePage(page: LiveCareHome(isPharmacyLiveCare: true, pharmacyLiveCareQRCode: pharmacyLiveCareQRCode,)));
} }

@ -572,12 +572,12 @@ class _clinic_listState extends State<ClinicList> {
.then((value) async { .then((value) async {
if (value == null) { if (value == null) {
Navigator.pop(context); Navigator.pop(context);
} else if (value.contains("-")) { } else if (value.contains("/")) {
widget.isPharmacyLiveCare = true; widget.isPharmacyLiveCare = true;
widget.pharmacyLiveCareQRCode = value.split("/")[1]; widget.pharmacyLiveCareQRCode = value.split("/")[1];
liveCareClinicIDs = await sharedPref.getString(LIVECARE_CLINIC_DATA); liveCareClinicIDs = await sharedPref.getString(LIVECARE_CLINIC_DATA);
selectedClinicID = int.parse(liveCareClinicIDs.split("-")[2]); selectedClinicID = 1;
selectedClinicName = liveCareClinicIDs.split("-")[0]; selectedClinicName = TranslationBase.of(context).pharmaLiveCare;
sharedPref.remove(LIVECARE_CLINIC_DATA); sharedPref.remove(LIVECARE_CLINIC_DATA);
startLiveCare(); startLiveCare();
} else { } else {

@ -2878,6 +2878,7 @@ class TranslationBase {
String get awaitingApproval => localizedValues["awaitingApproval"][locale.languageCode]; String get awaitingApproval => localizedValues["awaitingApproval"][locale.languageCode];
String get liveCareSupportContact => localizedValues["liveCareSupportContact"][locale.languageCode]; String get liveCareSupportContact => localizedValues["liveCareSupportContact"][locale.languageCode];
String get scanNFC => localizedValues["scanNFC"][locale.languageCode]; String get scanNFC => localizedValues["scanNFC"][locale.languageCode];
String get pharmaLiveCare => localizedValues["pharmaLiveCare"][locale.languageCode];
} }

@ -37,9 +37,9 @@ class MyInAppBrowser extends InAppBrowser {
// static String APPLE_PAY_PAYFORT_URL = 'https://hmgwebservices.com/PayFortWebLive/PayFortApi/MakeApplePayRequest'; // Payfort Payment Gateway URL LIVE // static String APPLE_PAY_PAYFORT_URL = 'https://hmgwebservices.com/PayFortWebLive/PayFortApi/MakeApplePayRequest'; // Payfort Payment Gateway URL LIVE
static String APPLE_PAY_PAYFORT_URL = 'https://hmgwebservices.com/PayFortWebLive/PayFortApi/MakeApplePayRequest'; // Payfort Payment Gateway URL UAT static String APPLE_PAY_PAYFORT_URL = 'https://hmgwebservices.com/PayFortWebLive/PayFortApi/MakeApplePayRequest'; // Payfort Payment Gateway URL UAT
static String SERVICE_URL = 'https://hmgwebservices.com/PayFortWeb/pages/SendPayFortRequest.aspx'; // Payfort Payment Gateway URL UAT // static String SERVICE_URL = 'https://hmgwebservices.com/PayFortWeb/pages/SendPayFortRequest.aspx'; // Payfort Payment Gateway URL UAT
// static String SERVICE_URL = 'https://hmgwebservices.com/PayFortWebLive/pages/SendPayFortRequest.aspx'; //Payfort Payment Gateway URL LIVE static String SERVICE_URL = 'https://hmgwebservices.com/PayFortWebLive/pages/SendPayFortRequest.aspx'; //Payfort Payment Gateway URL LIVE
// static String PRESCRIPTION_PAYMENT_WITH_ORDERID = // static String PRESCRIPTION_PAYMENT_WITH_ORDERID =
// 'https://uat.hmgwebservices.com/epharmacy/checkout/OpcCompleteRedirectionPaymentClientbyOrder?orderID='; // 'https://uat.hmgwebservices.com/epharmacy/checkout/OpcCompleteRedirectionPaymentClientbyOrder?orderID=';

Loading…
Cancel
Save