updates & fixes

Dev_3.3_MedicalReportCR
haroon amjad 3 years ago
parent dfc2889df7
commit dc859b01f7

@ -1788,7 +1788,7 @@ const Map localizedValues = {
"productOutOfStock": {"en": "Out Of Stock", "ar": "إنتهى من المخزن"}, "productOutOfStock": {"en": "Out Of Stock", "ar": "إنتهى من المخزن"},
"productQuantity": {"en": "Quantity", "ar": "كمية"}, "productQuantity": {"en": "Quantity", "ar": "كمية"},
"yourTurn": {"en": "your turn is after", "ar": "دورك بعد"}, "yourTurn": {"en": "your turn is after", "ar": "دورك بعد"},
"patients": {"en": "patients", "ar": "مرضي"}, "patients": {"en": "patients", "ar": "مريض"},
"group": {"en": "Group", "ar": "مجموعة"}, "group": {"en": "Group", "ar": "مجموعة"},
"covidTestTodo": {"en": "Covid-19 Test", "ar": "فحص كورونا"}, "covidTestTodo": {"en": "Covid-19 Test", "ar": "فحص كورونا"},
"ancillaryOrdersPaymentConfirm": {"en": "Are you sure you want to make payment for selected orders?", "ar": "هل أنت متأكد أنك تريد سداد قيمة الطلبات المختارة؟"}, "ancillaryOrdersPaymentConfirm": {"en": "Are you sure you want to make payment for selected orders?", "ar": "هل أنت متأكد أنك تريد سداد قيمة الطلبات المختارة؟"},

@ -460,112 +460,126 @@ class _HomePageFragment2State extends State<HomePageFragment2> {
flex: 1, flex: 1,
child: InkWell( child: InkWell(
onTap: () { onTap: () {
widget.onPharmacyClick(); if (projectViewModel.havePrivilege(100)) widget.onPharmacyClick();
}, },
child: Container( child: Stack(children: [
width: double.infinity, Container(
height: double.infinity, width: double.infinity,
clipBehavior: Clip.antiAlias, height: double.infinity,
decoration: containerRadiusWithGradientServices(20, lightColor: CustomColors.lightGreyColor, darkColor: CustomColors.lightGreyColor), clipBehavior: Clip.antiAlias,
child: Stack( decoration: containerRadiusWithGradientServices(20, lightColor: CustomColors.lightGreyColor, darkColor: CustomColors.lightGreyColor),
children: [ child: Stack(
Container( children: [
width: double.infinity, Container(
height: double.infinity, width: double.infinity,
// color: Color(0xFF2B353E), height: double.infinity,
decoration: containerRadius(Color(0xFF359846), 20), // color: Color(0xFF2B353E),
), decoration: containerRadius(Color(0xFF359846), 20),
Container(
width: double.infinity,
height: double.infinity,
clipBehavior: Clip.antiAlias,
decoration: projectViewModel.isArabic
? containerBottomRightRadiusWithGradientForAr(60, lightColor: CustomColors.lightGreyColor, darkColor: CustomColors.lightGreyColor)
: containerBottomRightRadiusWithGradient(60, lightColor: CustomColors.lightGreyColor, darkColor: CustomColors.lightGreyColor),
child: Stack(
children: [
SvgPicture.asset(
"assets/images/new/strips.svg",
width: double.infinity,
height: double.infinity,
fit: BoxFit.cover,
),
],
), ),
), Container(
projectViewModel.isArabic width: double.infinity,
? Positioned( height: double.infinity,
left: 20, clipBehavior: Clip.antiAlias,
top: 12, decoration: projectViewModel.isArabic
child: Opacity( ? containerBottomRightRadiusWithGradientForAr(60, lightColor: CustomColors.lightGreyColor, darkColor: CustomColors.lightGreyColor)
opacity: 0.04, : containerBottomRightRadiusWithGradient(60, lightColor: CustomColors.lightGreyColor, darkColor: CustomColors.lightGreyColor),
child: SvgPicture.asset( child: Stack(
"assets/images/new/Pharmacy.svg", children: [
height: MediaQuery.of(context).size.width * 0.15, SvgPicture.asset(
"assets/images/new/strips.svg",
width: double.infinity,
height: double.infinity,
fit: BoxFit.cover,
),
],
),
),
projectViewModel.isArabic
? Positioned(
left: 20,
top: 12,
child: Opacity(
opacity: 0.04,
child: SvgPicture.asset(
"assets/images/new/Pharmacy.svg",
height: MediaQuery.of(context).size.width * 0.15,
),
),
)
: Positioned(
right: 20,
top: 12,
child: Opacity(
opacity: 0.04,
child: SvgPicture.asset(
"assets/images/new/Pharmacy.svg",
height: MediaQuery.of(context).size.width * 0.15,
),
), ),
), ),
) Container(
: Positioned( width: double.infinity,
right: 20, height: double.infinity,
top: 12, padding: EdgeInsets.all(SizeConfig.widthMultiplier * 3.4),
child: Opacity( child: Column(
opacity: 0.04, crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.center,
children: [
Container(
color: Colors.yellow,
// width: MediaQuery.of(context).size.width * 0.065,
child: SvgPicture.asset( child: SvgPicture.asset(
"assets/images/new/Pharmacy.svg", "assets/images/new/Pharmacy.svg",
height: MediaQuery.of(context).size.width * 0.15, height: MediaQuery.of(context).size.width * 0.08,
), ),
), ),
), mFlex(1),
Container( Column(
width: double.infinity, crossAxisAlignment: CrossAxisAlignment.start,
height: double.infinity, mainAxisAlignment: MainAxisAlignment.center,
padding: EdgeInsets.all(SizeConfig.widthMultiplier * 3.4), children: [
child: Column( Text(
crossAxisAlignment: CrossAxisAlignment.start, TranslationBase.of(context).onlinePharmacy,
mainAxisAlignment: MainAxisAlignment.center, style: TextStyle(
children: [ color: Colors.black,
Container( fontSize: 14,
color: Colors.yellow, fontWeight: FontWeight.bold,
// width: MediaQuery.of(context).size.width * 0.065, letterSpacing: -0.45,
child: SvgPicture.asset( height: 1,
"assets/images/new/Pharmacy.svg", ),
height: MediaQuery.of(context).size.width * 0.08,
),
),
mFlex(1),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.center,
children: [
Text(
TranslationBase.of(context).onlinePharmacy,
style: TextStyle(
color: Colors.black,
fontSize: 14,
fontWeight: FontWeight.bold,
letterSpacing: -0.45,
height: 1,
), ),
), projectViewModel.isArabic ? mHeight(5) : Container(),
projectViewModel.isArabic ? mHeight(5) : Container(), Text(
Text( TranslationBase.of(context).ecommerceSolution,
TranslationBase.of(context).ecommerceSolution, style: TextStyle(
style: TextStyle( color: Colors.black,
color: Colors.black, fontSize: 9,
fontSize: 9, fontWeight: FontWeight.w600,
fontWeight: FontWeight.w600, letterSpacing: -0.27,
letterSpacing: -0.27, height: projectViewModel.isArabic ? 0.2 : 1,
height: projectViewModel.isArabic ? 0.2 : 1, ),
), ),
), ],
], ),
), ],
], ),
), ),
), ],
], ),
), ),
), projectViewModel.havePrivilege(100)
? Container()
: Container(
width: double.infinity,
height: double.infinity,
clipBehavior: Clip.antiAlias,
decoration: containerRadiusWithGradientServices(20, lightColor: CustomColors.lightGreyColor.withOpacity(0.7), darkColor: CustomColors.lightGreyColor.withOpacity(0.7)),
child: Icon(
Icons.lock_outline,
size: 40,
),
)
]),
), ),
); );
} }

@ -37,9 +37,11 @@ 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 SERVICE_URL = 'https://uat.hmgwebservices.com/payfortforvidaplus/pages/SendPayFortRequest.aspx'; //Payfort Payment Gateway URL UAT VIDA PLUS
// 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