diff --git a/lib/config/config.dart b/lib/config/config.dart index 37de357c..dc5b02f9 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -21,8 +21,8 @@ var PACKAGES_ORDERS = '/api/orders'; var PACKAGES_ORDER_HISTORY = '/api/orders/items'; var PACKAGES_TAMARA_OPT = '/api/orders/paymentoptions/tamara'; // var BASE_URL = 'http://10.50.100.198:2018/'; -var BASE_URL = 'https://uat.hmgwebservices.com/'; -// var BASE_URL = 'https://hmgwebservices.com/'; +// var BASE_URL = 'https://uat.hmgwebservices.com/'; +var BASE_URL = 'https://hmgwebservices.com/'; // var BASE_URL = 'http://10.201.204.103/'; // var BASE_URL = 'https://orash.cloudsolutions.com.sa/'; // var BASE_URL = 'https://vidauat.cloudsolutions.com.sa/'; @@ -357,7 +357,7 @@ var CAN_PAY_FOR_FOR_WALKIN_APPOINTMENT = 'Services/Doctors.svc/REST/CanPayForWal var CHANNEL = 3; var GENERAL_ID = 'Cs2020@2016\$2958'; var IP_ADDRESS = '10.20.10.20'; -var VERSION_ID = 19.4; +var VERSION_ID = 19.5; var SETUP_ID = '91877'; var LANGUAGE = 2; // var PATIENT_OUT_SA = 0; @@ -709,10 +709,10 @@ var GET_PRESCRIPTION_INSTRUCTIONS_PDF = 'Services/ChatBot_Service.svc/REST/Chatb //PAYFORT var getPayFortProjectDetails = "Services/PayFort_Serv.svc/REST/GetPayFortProjectDetails"; var addPayFortApplePayResponse = "Services/PayFort_Serv.svc/REST/AddResponse"; -// var payFortEnvironment = FortEnvironment.production; -// var applePayMerchantId = "merchant.com.hmgwebservices"; -var payFortEnvironment = FortEnvironment.test; -var applePayMerchantId = "merchant.com.hmgwebservices.uat"; +var payFortEnvironment = FortEnvironment.production; +var applePayMerchantId = "merchant.com.hmgwebservices"; +// var payFortEnvironment = FortEnvironment.test; +// var applePayMerchantId = "merchant.com.hmgwebservices.uat"; class AppGlobal { static var context; diff --git a/lib/pages/landing/fragments/offer_details_page.dart b/lib/pages/landing/fragments/offer_details_page.dart index 1b8a8de9..da17f891 100644 --- a/lib/pages/landing/fragments/offer_details_page.dart +++ b/lib/pages/landing/fragments/offer_details_page.dart @@ -76,15 +76,19 @@ class _OfferDetailsPageState extends State { child: Column( children: [ /// Banner - SvgPicture.asset( - "assets/images/svg/details_page_banner.svg", - height: 120, - fit: BoxFit.fill, - ), + projectViewModel.hisProjectOffers.first.projectArabic!.split("\$").length > 1 + ? SvgPicture.network( + projectViewModel.isArabic + ? projectViewModel.hisProjectOffers.first.projectArabic!.split("\$")[1].trim() + : projectViewModel.hisProjectOffers.first.projectEnglish!.split("\$")[1].trim(), + height: 120, + fit: BoxFit.cover, + ) + : SizedBox.shrink(), /// Arabic Offer Section Padding( - padding: const EdgeInsets.symmetric(horizontal: 24.0, vertical: 32.0), + padding: const EdgeInsets.symmetric(horizontal: 24.0, vertical: 12.0), child: Column( children: [ // Padding( @@ -142,9 +146,10 @@ class _OfferDetailsPageState extends State { style: TextStyle( fontSize: 22, fontWeight: FontWeight.bold, - color: Color(0xff008b4c), + // color: Color(0xff008b4c), ), ), + SizedBox(height: 12), Text( projectViewModel.isArabic ? projectViewModel.hisProjectOffers.first.descriptionArabic! : projectViewModel.hisProjectOffers.first.descriptionEnglish!, style: TextStyle( @@ -511,7 +516,8 @@ class _OfferDetailsPageState extends State { List projectsListLocal = []; projectViewModel.hisProjectOffers.forEach((project) { - projectsListLocal.add(new HospitalsModel(iD: project.projectId, name: project.projectEnglish, nameN: project.projectArabic, amountWithTax: project.amountWithTax)); + projectsListLocal.add( + new HospitalsModel(iD: project.projectId, name: project.projectEnglish!.split("\$")[0].trim(), nameN: project.projectArabic!.split("\$")[0].trim(), amountWithTax: project.amountWithTax)); }); showDialog( diff --git a/lib/widgets/in_app_browser/InAppBrowser.dart b/lib/widgets/in_app_browser/InAppBrowser.dart index f9e46c61..4059edf7 100644 --- a/lib/widgets/in_app_browser/InAppBrowser.dart +++ b/lib/widgets/in_app_browser/InAppBrowser.dart @@ -40,9 +40,9 @@ class MyInAppBrowser extends InAppBrowser { // static String SERVICE_URL = 'https://hmgwebservices.com/PayFortWeb/pages/SendPayFortRequest.aspx'; // Payfort Payment Gateway URL UAT - static String SERVICE_URL = 'https://uat.hmgwebservices.com/HMGPayment/pages/SendPayFortRequest.aspx'; // Payfort Payment Gateway URL UAT + // static String SERVICE_URL = 'https://uat.hmgwebservices.com/HMGPayment/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 diff --git a/pubspec.yaml b/pubspec.yaml index 9b445b44..dc67cc00 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,8 +1,8 @@ name: hmg_patient_app description: A new Flutter application. -#version: 4.6.019+1 -version: 4.6.0979+40500979 +#version: 4.6.020+1 +version: 4.6.0980+40500980 environment: # sdk: ">=3.0.0 <3.13.0"