diff --git a/lib/config/config.dart b/lib/config/config.dart index 3337dc6d..eb532d8a 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/'; @@ -92,6 +92,7 @@ var PRESCRIPTIONS = 'Services/Patients.svc/REST/GetPrescriptionApptList_Async'; var GET_PRESCRIPTIONS_ALL_ORDERS = 'Services/Patients.svc/REST/PatientER_GetPatientAllPresOrders'; var GET_PRESCRIPTION_REPORT = 'Services/Patients.svc/REST/INP_GetPrescriptionReport'; var SEND_PRESCRIPTION_EMAIL = 'Services/Notifications.svc/REST/SendPrescriptionEmail'; +var SEND_PRESCRIPTION_EMAIL_NEW = 'Services/Notifications.svc/REST/SendPrescriptionEmail_New'; var GET_PRESCRIPTION_REPORT_ENH = 'Services/Patients.svc/REST/GetPrescriptionReport_enh'; ///Lab Order diff --git a/lib/pages/landing/fragments/home_page_fragment2.dart b/lib/pages/landing/fragments/home_page_fragment2.dart index 29570011..05b7bbbb 100644 --- a/lib/pages/landing/fragments/home_page_fragment2.dart +++ b/lib/pages/landing/fragments/home_page_fragment2.dart @@ -170,7 +170,8 @@ class _HomePageFragment2State extends State { child: SvgPicture.network( // "https://marathoon.com/service/hmgvideo/Banner_English.svg", // "https://marathoon.com/service/hmgvideo/Banner_Arabic.svg", - BASE_URL.contains("uat.") ? "https://marathoon.com/service/hmgvideo/Banner_English.svg" : projectViewModel.isArabic ? projectViewModel.hisProjectOffers.first.titleArabic!.split("\$")[1].trim() : projectViewModel.hisProjectOffers.first.titleName!.split("\$")[1].trim(), + // BASE_URL.contains("uat.") ? "https://marathoon.com/service/hmgvideo/Banner_English.svg" : projectViewModel.isArabic ? projectViewModel.hisProjectOffers.first.titleArabic!.split("\$")[1].trim() : projectViewModel.hisProjectOffers.first.titleName!.split("\$")[1].trim(), + projectViewModel.isArabic ? projectViewModel.hisProjectOffers.first.titleArabic!.split("\$")[1].trim() : projectViewModel.hisProjectOffers.first.titleName!.split("\$")[1].trim(), // height: 300, width: MediaQuery.of(context).size.width, fit: BoxFit.contain, diff --git a/lib/pages/landing/fragments/offer_details_page.dart b/lib/pages/landing/fragments/offer_details_page.dart index c56e7984..bb5eb70e 100644 --- a/lib/pages/landing/fragments/offer_details_page.dart +++ b/lib/pages/landing/fragments/offer_details_page.dart @@ -79,12 +79,15 @@ class _OfferDetailsPageState extends State { children: [ /// Banner 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( + width: double.infinity, + child: SvgPicture.network( + projectViewModel.isArabic + ? projectViewModel.hisProjectOffers.first.projectArabic!.split("\$")[1].trim() + : projectViewModel.hisProjectOffers.first.projectEnglish!.split("\$")[1].trim(), + height: 180, + fit: BoxFit.cover, + ), ) : SizedBox.shrink(), @@ -175,7 +178,7 @@ class _OfferDetailsPageState extends State { const SizedBox(height: 24), /// Hospital Dropdown (mock UI) - projectViewModel.havePrivilege(113) + projectViewModel.havePrivilege(114) ? Container() : Padding( padding: const EdgeInsets.symmetric(horizontal: 16), @@ -241,7 +244,7 @@ class _OfferDetailsPageState extends State { SizedBox( width: MediaQuery.of(context).size.width - 24, height: 50, - child: projectViewModel.havePrivilege(113) + child: projectViewModel.havePrivilege(114) ? DefaultButton(TranslationBase.of(context).downloadNewApp, () { if (Platform.isAndroid) { _launchURL("https://play.google.com/store/apps/details?id=com.cloudsolutions.HMGPatientApp");