Merge branch 'development' into Haroon

merge-update-with-lab-changes
haroon amjad 5 years ago
commit 0dc35f1270

@ -12,8 +12,8 @@ const EXA_CART_API_BASE_URL = 'https://mdlaboratories.com/exacartapi';
const PACKAGES_CATEGORIES = '/api/categories';
const PACKAGES_PRODUCTS = '/api/products';
// const BASE_URL = 'https://uat.hmgwebservices.com/';
const BASE_URL = 'https://hmgwebservices.com/';
const BASE_URL = 'https://uat.hmgwebservices.com/';
// const BASE_URL = 'https://hmgwebservices.com/';
//const BASE_PHARMACY_URL = 'http://swd-pharapp-01:7200/api/';
const BASE_PHARMACY_URL = 'https://uat.hmgwebservices.com/epharmacy/api/';
@ -227,7 +227,7 @@ const GET_PATIENT_HEALTH_STATS = 'Services/Patients.svc/REST/Med_GetTransactions
const CHANNEL = 3;
const GENERAL_ID = 'Cs2020@2016\$2958';
const IP_ADDRESS = '10.20.10.20';
const VERSION_ID = 5.8;
const VERSION_ID = 6.1;
const SETUP_ID = '91877';
const LANGUAGE = 2;
const PATIENT_OUT_SA = 0;

@ -1328,6 +1328,10 @@ const Map localizedValues = {
"submitncontinue": {"en": "Submit and continue", "ar": "إرسال ومتابعة"},
"areyousure": {"en": "Are you sure you want to Add", "ar": "هل أنت متأكد أنك تريد إضافة"},
"preferredunit": {"en": "Select the preferred unit", "ar": "اختر الوحدة المفضلة"},
"select-unit": {"en": "Select unit", "ar": "اختر وحدة القياس"}
"select-unit": {"en": "Select unit", "ar": "اختر وحدة القياس"},
"app-update": {
"en": "UPDATE THE APP",
"ar": "تحديث التطبيق"
},
// "visit": {"en" : "Visit", "ar": "الزيارة"},
};

@ -67,6 +67,7 @@ class PharmacyModuleService extends BaseService {
}
Future generatePharmacyToken() async {
await getUser();
Map<String, String> queryParams = {
'Filenumber':user.patientID.toString(),
'MobileNumber':user.mobileNumber,

@ -946,7 +946,7 @@ class TranslationBase {
String get deletedChild => localizedValues['deleted-child'][locale.languageCode];
String get addInstructions => localizedValues['add-instructions'][locale.languageCode];
String get addedChild => localizedValues['added-child'][locale.languageCode];
String get appUpdate => localizedValues['appUpdate'][locale.languageCode];
String get appUpdate => localizedValues['app-update'][locale.languageCode];
String get ereferralSaveSuccess => localizedValues['ereferralSaveSuccess'][locale.languageCode];
String get year => localizedValues['Year'][locale.languageCode];
String get month => localizedValues['Month'][locale.languageCode];

Loading…
Cancel
Save