diff --git a/assets/images/pharmacy/call.svg b/assets/images/pharmacy/call.svg
new file mode 100644
index 00000000..677d4123
--- /dev/null
+++ b/assets/images/pharmacy/call.svg
@@ -0,0 +1,7 @@
+
diff --git a/assets/images/pharmacy/instagram.png b/assets/images/pharmacy/instagram.png
new file mode 100644
index 00000000..a03f47bd
Binary files /dev/null and b/assets/images/pharmacy/instagram.png differ
diff --git a/assets/images/pharmacy/location.svg b/assets/images/pharmacy/location.svg
new file mode 100644
index 00000000..a52cc72e
--- /dev/null
+++ b/assets/images/pharmacy/location.svg
@@ -0,0 +1,3 @@
+
diff --git a/assets/images/pharmacy/whatsapp.svg b/assets/images/pharmacy/whatsapp.svg
new file mode 100644
index 00000000..ee18370c
--- /dev/null
+++ b/assets/images/pharmacy/whatsapp.svg
@@ -0,0 +1,3 @@
+
diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
index ec89ac71..e13174af 100644
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@@ -94,5 +94,13 @@
io.flutter.embedded_views_preview
+ LSApplicationQueriesSchemes
+
+ comgooglemaps
+ baidumap
+ iosamap
+
+
+
diff --git a/lib/config/config.dart b/lib/config/config.dart
index dafe7ab9..3ed8d764 100644
--- a/lib/config/config.dart
+++ b/lib/config/config.dart
@@ -15,7 +15,7 @@ const PACKAGES_CUSTOMER = '/api/customers';
const PACKAGES_SHOPPING_CART = '/api/shopping_cart_items';
const PACKAGES_ORDERS = '/api/orders';
const PACKAGES_TAMARA_OPT = '/api/orders/paymentoptions/tamara';
-const BASE_URL = 'https://uat.hmgwebservices.com/';
+ const BASE_URL = 'https://uat.hmgwebservices.com/';
// const BASE_URL = 'https://hmgwebservices.com/';
// Pharmacy UAT URLs
@@ -68,7 +68,9 @@ const GET_DOCTOR_RATING_DETAILS =
const GET_DOCTOR_RATING = 'Services/Doctors.svc/REST/dr_GetAvgDoctorRating';
///Prescriptions
-const PRESCRIPTIONS = 'Services/Patients.svc/REST/GetPrescriptionApptList';
+// const PRESCRIPTIONS = 'Services/Patients.svc/REST/GetPrescriptionApptList';
+const PRESCRIPTIONS = 'Services/Patients.svc/REST/GetPrescriptionApptList_Async';
+
const GET_PRESCRIPTIONS_ALL_ORDERS =
'Services/Patients.svc/REST/PatientER_GetPatientAllPresOrders';
const GET_PRESCRIPTION_REPORT =
@@ -255,7 +257,7 @@ const GET_PATIENT_SHARE =
//URL to get patient appointment history
const GET_PATIENT_APPOINTMENT_HISTORY =
- "Services/Doctors.svc/REST/PateintHasAppoimentHistory";
+ "Services/Doctors.svc/REST/PateintHasAppoimentHistory_Async";
const DOCTOR_SCHEDULE_URL =
'Services/Doctors.svc/REST/GetDoctorWorkingHoursTable';
@@ -570,7 +572,10 @@ const TRANSFER_YAHALA_LOYALITY_POINTS =
"Services/Patients.svc/REST/TransferYaHalaLoyaltyPoints";
const LAKUM_GET_USER_TERMS_AND_CONDITIONS =
"Services/ERP.svc/REST/GetUserTermsAndConditionsForEPharmcy";
-const PRESCRIPTION = 'Services/Patients.svc/REST/GetPrescriptionApptList';
+
+// const PRESCRIPTION = 'Services/Patients.svc/REST/GetPrescriptionApptList';
+const PRESCRIPTION = 'Services/Patients.svc/REST/GetPrescriptionApptList_Async';
+
const GET_RECOMMENDED_PRODUCT = 'alsoProduct/';
const GET_MOST_VIEWED_PRODUCTS = "mostview";
const GET_NEW_PRODUCTS = "newproducts";
diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart
index babdd9c1..83fedc90 100644
--- a/lib/config/localized_values.dart
+++ b/lib/config/localized_values.dart
@@ -50,7 +50,8 @@ const Map localizedValues = {
'searchByDocText': {'en': 'Type the name of the doctor to help you find him', 'ar': 'اكتب اسم الطبيب لمساعدتك في العثور عليه'},
'enterDocName': {'en': 'Enter Doctor name', 'ar': 'أدخل إسم الطبيب'},
'search': {'en': 'Search', 'ar': 'بحث'},
- 'noResultFound': {'en': 'No Result Found', 'ar': 'لم يتم العثور على نتائج'},
+ 'noResultFound': {'en': 'No Result Found', 'ar': 'لم يتم العثور على نتائج '},
+ 'noSearchResultFound': {'en': 'No Result Found', 'ar': 'لم يتم العثور على نتائج الرجاء تغيير لغة البحث'},
'pleaseEnterProductName': {'en': 'Please Enter Product Name', 'ar': 'ادخل اسم المنتج'},
'bookNow': {'en': 'BOOK NOW', 'ar': 'احجز الآن'},
'docInfo': {'en': 'Doctor Information', 'ar': 'معلومات الطبيب'},
@@ -277,6 +278,8 @@ const Map localizedValues = {
"viewAll": {"en": "View All", 'ar': 'عرض الكل'},
"view": {"en": "View", 'ar': 'عرض'},
"ContactUs": {"en": "Contact Us", 'ar': 'الوصول إلينا'},
+ "contactUsLocation": {"en": "P.O.Box: 91877 - Riyadh 11643, King Fahad Road - Olaya - Kingdom of Saudi Arabia", 'ar': 'صندوق بريد: 91877 - الرياض 11643 ، طريق الملك فهد - العليا - المملكة العربية السعودية'},
+ "contactUsTime": {"en": "Saturday - Wednesday 8:00 AM - 10 PM, Thursday 8:00 AM- 8:00 PM, Friday 2:00 PM - 8:00 PM", 'ar': " السبت – الأربعاء 08:00 ص – 10:00 م , الخميس 08:00 ص – 08:00 م, الجمعة 02:00 م - 08:00 م"},
"ViewAllWaysReachUs": {"en": "View All Ways Reach Us", 'ar': 'جميع طرق الاتصال بنا'},
"medicalProfile": {"en": "Medical Profile", 'ar': 'الملف الطبي'},
"consultation": {"en": "Consultation", "ar": "استشارة"},
@@ -507,7 +510,11 @@ const Map localizedValues = {
"reachUs": {"en": "Reach Us", "ar": "الوصول لنا"},
"ourLocations": {"en": "Our Locations", "ar": "مواقعنا"},
"edit": {"en": "Edit", "ar": "تعديل"},
+ "whatsApp": {"en": "Whats App", "ar": " واتس اب"},
+ "phone": {"en": "Phone", "ar": " موبايل"},
"delete": {"en": "Delete", "ar": " حذف"},
+ "deleteAddress": {"en": "Are you sure want to delete", "ar": " هل انت متأكد تريد حذف هذا العنوان"},
+ "deletedAddres": {"en": "Address has been deleted", "ar": " تم حذف العنوان"},
"addAddress": {"en": "ADD A NEW ADDRESS", "ar": " اضافة عنوان جديد"},
"addNewAddress": {"en": "Add New Address", "ar": " اضافة عنوان جديد"},
"order": {"en": "My Order", "ar": " طلباتي"},
@@ -802,7 +809,7 @@ const Map localizedValues = {
"HealthTipsBasedOnCurrentWeather": {"en": "Health Tips Based On Current Weather", 'ar': ' نصائح صحية بناءاً على الطقس الحالي '},
"MoreDetails": {"en": "More details", "ar": " المزيد من التفاصيل "},
"SendCopy": {"en": "Send Copy", "ar": "ارسال نسخة"},
- "ResendOrder": {"en": "Refill Order & Delivery", "ar": "إعادة طلب و توصيل"},
+ "ResendOrder": {"en": "Re-Order & Delivery", "ar": "إعادة طلب و توصيل"},
"Ports": {"en": "Ports", "ar": "المنافذ"},
"Way": {"en": "Way", "ar": "الطريقة"},
"Average": {"en": "Average", "ar": "متوسط"},
diff --git a/lib/core/model/labs/patient_lab_special_result.dart b/lib/core/model/labs/patient_lab_special_result.dart
index 2fbcb832..8e24a04d 100644
--- a/lib/core/model/labs/patient_lab_special_result.dart
+++ b/lib/core/model/labs/patient_lab_special_result.dart
@@ -3,7 +3,7 @@ class PatientLabSpecialResult {
String moduleID;
String resultData;
String resultDataHTML;
- Null resultDataTxt;
+ dynamic resultDataTxt;
PatientLabSpecialResult(
{this.invoiceNo,
diff --git a/lib/core/model/pharmacies/PointsAmountPerMonth.dart b/lib/core/model/pharmacies/PointsAmountPerMonth.dart
index 71cf3498..c5b96bd8 100644
--- a/lib/core/model/pharmacies/PointsAmountPerMonth.dart
+++ b/lib/core/model/pharmacies/PointsAmountPerMonth.dart
@@ -1,11 +1,11 @@
import 'PointsAmountPerday.dart';
class PointsAmountPerMonth {
- double amountPerMonth;
- String month;
+ dynamic amountPerMonth;
+ dynamic month;
int monthNumber;
List pointsAmountPerday;
- double pointsPerMonth;
+ dynamic pointsPerMonth;
PointsAmountPerMonth(
{this.amountPerMonth,
diff --git a/lib/core/model/pharmacies/orders_model.dart b/lib/core/model/pharmacies/orders_model.dart
index cef20c30..ad2c533a 100644
--- a/lib/core/model/pharmacies/orders_model.dart
+++ b/lib/core/model/pharmacies/orders_model.dart
@@ -31,6 +31,7 @@ class Orders {
String orderStatusn;
bool canCancel;
bool canRefund;
+ String orderGuid;
dynamic customerId;
dynamic orderSubtotalExclTax;
dynamic orderShippingExclTax;
@@ -47,6 +48,7 @@ class Orders {
this.orderStatusn,
this.canCancel,
this.canRefund,
+ this.orderGuid,
this.customerId,
this.orderShippingExclTax,
this.orderSubtotalExclTax,
@@ -63,6 +65,7 @@ class Orders {
orderStatusn = json['order_statusn'];
canCancel = json['can_cancel'];
canRefund = json['can_refund'];
+ orderGuid = json['order_guid'];
customerId = json['customer_id'];
orderSubtotalExclTax= json["order_subtotal_excl_tax"];
orderShippingExclTax= json["order_shipping_excl_tax"];
diff --git a/lib/core/service/client/base_app_client.dart b/lib/core/service/client/base_app_client.dart
index ced7eb9c..52def3eb 100644
--- a/lib/core/service/client/base_app_client.dart
+++ b/lib/core/service/client/base_app_client.dart
@@ -490,6 +490,7 @@ class BaseAppClient {
}) async {
String url = fullUrl;
print("URL Query String: $url");
+ print("body: $body");
if (await Utils.checkConnection()) {
headers.addAll({'Content-Type': 'application/json', 'Accept': 'application/json'});
@@ -502,6 +503,8 @@ class BaseAppClient {
print("statusCode :$statusCode");
if (await handleUnauthorized(statusCode, forUrl: fullUrl)) simplePost(fullUrl, onFailure: onFailure, onSuccess: onSuccess, body: body, headers: headers);
+ print(response.body.toString());
+
if (statusCode < 200 || statusCode >= 400 || json == null) {
onFailure('Error While Fetching data', statusCode);
} else {
diff --git a/lib/core/service/parmacyModule/order-preview-service.dart b/lib/core/service/parmacyModule/order-preview-service.dart
index 52892641..b9368180 100644
--- a/lib/core/service/parmacyModule/order-preview-service.dart
+++ b/lib/core/service/parmacyModule/order-preview-service.dart
@@ -201,7 +201,7 @@ class OrderPreviewService extends BaseService {
orderBody['custom_values_xml'] = "PaymentOption:${getPaymentOptionName(paymentCheckoutData.paymentOption)}";
orderBody['shippingOption'] = paymentCheckoutData.shippingOption;
orderBody['shipping_address'] = paymentCheckoutData.address;
- orderBody['lakum_amount'] = paymentCheckoutData.usedLakumPoints;
+ // orderBody['lakum_amount'] = paymentCheckoutData.usedLakumPoints;
List