diff --git a/assets/images/new/body_parts/female/abdomin.svg b/assets/images/new/body_parts/female/abdomin.svg
new file mode 100644
index 00000000..cc1dd1d0
--- /dev/null
+++ b/assets/images/new/body_parts/female/abdomin.svg
@@ -0,0 +1,345 @@
+
diff --git a/assets/images/new/body_parts/female/anal.svg b/assets/images/new/body_parts/female/anal.svg
new file mode 100644
index 00000000..96c9734d
--- /dev/null
+++ b/assets/images/new/body_parts/female/anal.svg
@@ -0,0 +1,236 @@
+
diff --git a/assets/images/new/body_parts/female/axilla.svg b/assets/images/new/body_parts/female/axilla.svg
new file mode 100644
index 00000000..257b1c08
--- /dev/null
+++ b/assets/images/new/body_parts/female/axilla.svg
@@ -0,0 +1,346 @@
+
diff --git a/assets/images/new/body_parts/female/back.svg b/assets/images/new/body_parts/female/back.svg
new file mode 100644
index 00000000..96eba049
--- /dev/null
+++ b/assets/images/new/body_parts/female/back.svg
@@ -0,0 +1,236 @@
+
diff --git a/assets/images/new/body_parts/female/bikini.svg b/assets/images/new/body_parts/female/bikini.svg
new file mode 100644
index 00000000..24892c80
--- /dev/null
+++ b/assets/images/new/body_parts/female/bikini.svg
@@ -0,0 +1,345 @@
+
diff --git a/assets/images/new/body_parts/female/bikini_line.svg b/assets/images/new/body_parts/female/bikini_line.svg
new file mode 100644
index 00000000..f1f94b7f
--- /dev/null
+++ b/assets/images/new/body_parts/female/bikini_line.svg
@@ -0,0 +1,345 @@
+
diff --git a/assets/images/new/body_parts/female/buttocks.svg b/assets/images/new/body_parts/female/buttocks.svg
new file mode 100644
index 00000000..59cd0071
--- /dev/null
+++ b/assets/images/new/body_parts/female/buttocks.svg
@@ -0,0 +1,236 @@
+
diff --git a/assets/images/new/body_parts/female/cheeks.svg b/assets/images/new/body_parts/female/cheeks.svg
new file mode 100644
index 00000000..6305ce65
--- /dev/null
+++ b/assets/images/new/body_parts/female/cheeks.svg
@@ -0,0 +1,130 @@
+
diff --git a/assets/images/new/body_parts/female/chest.svg b/assets/images/new/body_parts/female/chest.svg
new file mode 100644
index 00000000..3b681f90
--- /dev/null
+++ b/assets/images/new/body_parts/female/chest.svg
@@ -0,0 +1,345 @@
+
diff --git a/assets/images/new/body_parts/female/chest_line.svg b/assets/images/new/body_parts/female/chest_line.svg
new file mode 100644
index 00000000..dc4f8b25
--- /dev/null
+++ b/assets/images/new/body_parts/female/chest_line.svg
@@ -0,0 +1,345 @@
+
diff --git a/assets/images/new/body_parts/female/chin.svg b/assets/images/new/body_parts/female/chin.svg
new file mode 100644
index 00000000..37da45b4
--- /dev/null
+++ b/assets/images/new/body_parts/female/chin.svg
@@ -0,0 +1,129 @@
+
diff --git a/assets/images/new/body_parts/female/ears.svg b/assets/images/new/body_parts/female/ears.svg
new file mode 100644
index 00000000..758a69e6
--- /dev/null
+++ b/assets/images/new/body_parts/female/ears.svg
@@ -0,0 +1,130 @@
+
diff --git a/assets/images/new/body_parts/female/eyebrows.svg b/assets/images/new/body_parts/female/eyebrows.svg
new file mode 100644
index 00000000..9657daa7
--- /dev/null
+++ b/assets/images/new/body_parts/female/eyebrows.svg
@@ -0,0 +1,130 @@
+
diff --git a/assets/images/new/body_parts/female/full_leg.svg b/assets/images/new/body_parts/female/full_leg.svg
new file mode 100644
index 00000000..e1a5e46d
--- /dev/null
+++ b/assets/images/new/body_parts/female/full_leg.svg
@@ -0,0 +1,348 @@
+
diff --git a/assets/images/new/body_parts/female/full_neck.svg b/assets/images/new/body_parts/female/full_neck.svg
new file mode 100644
index 00000000..f73f07f8
--- /dev/null
+++ b/assets/images/new/body_parts/female/full_neck.svg
@@ -0,0 +1,129 @@
+
diff --git a/assets/images/new/body_parts/female/half_neck.svg b/assets/images/new/body_parts/female/half_neck.svg
new file mode 100644
index 00000000..78e4cfab
--- /dev/null
+++ b/assets/images/new/body_parts/female/half_neck.svg
@@ -0,0 +1,129 @@
+
diff --git a/assets/images/new/body_parts/female/hydra_facial.svg b/assets/images/new/body_parts/female/hydra_facial.svg
new file mode 100644
index 00000000..6a468211
--- /dev/null
+++ b/assets/images/new/body_parts/female/hydra_facial.svg
@@ -0,0 +1,128 @@
+
diff --git a/assets/images/new/body_parts/female/lower_arm.svg b/assets/images/new/body_parts/female/lower_arm.svg
new file mode 100644
index 00000000..6d5d2f39
--- /dev/null
+++ b/assets/images/new/body_parts/female/lower_arm.svg
@@ -0,0 +1,346 @@
+
diff --git a/assets/images/new/body_parts/female/lower_leg.svg b/assets/images/new/body_parts/female/lower_leg.svg
new file mode 100644
index 00000000..4961af4b
--- /dev/null
+++ b/assets/images/new/body_parts/female/lower_leg.svg
@@ -0,0 +1,346 @@
+
diff --git a/assets/images/new/body_parts/female/shoulder.svg b/assets/images/new/body_parts/female/shoulder.svg
new file mode 100644
index 00000000..ce611e29
--- /dev/null
+++ b/assets/images/new/body_parts/female/shoulder.svg
@@ -0,0 +1,346 @@
+
diff --git a/assets/images/new/body_parts/female/side_burn.svg b/assets/images/new/body_parts/female/side_burn.svg
new file mode 100644
index 00000000..123216e7
--- /dev/null
+++ b/assets/images/new/body_parts/female/side_burn.svg
@@ -0,0 +1,130 @@
+
diff --git a/assets/images/new/body_parts/female/upper_arm.svg b/assets/images/new/body_parts/female/upper_arm.svg
new file mode 100644
index 00000000..ec126ffd
--- /dev/null
+++ b/assets/images/new/body_parts/female/upper_arm.svg
@@ -0,0 +1,346 @@
+
diff --git a/assets/images/new/body_parts/female/upper_leg.svg b/assets/images/new/body_parts/female/upper_leg.svg
new file mode 100644
index 00000000..b1fd3a95
--- /dev/null
+++ b/assets/images/new/body_parts/female/upper_leg.svg
@@ -0,0 +1,346 @@
+
diff --git a/assets/images/new/body_parts/female/upper_lips.svg b/assets/images/new/body_parts/female/upper_lips.svg
new file mode 100644
index 00000000..72043376
--- /dev/null
+++ b/assets/images/new/body_parts/female/upper_lips.svg
@@ -0,0 +1,129 @@
+
diff --git a/assets/images/new/body_parts/male/abdomin.svg b/assets/images/new/body_parts/male/abdomin.svg
new file mode 100644
index 00000000..82e2d556
--- /dev/null
+++ b/assets/images/new/body_parts/male/abdomin.svg
@@ -0,0 +1,185 @@
+
diff --git a/assets/images/new/body_parts/male/axilla.svg b/assets/images/new/body_parts/male/axilla.svg
new file mode 100644
index 00000000..85abbfda
--- /dev/null
+++ b/assets/images/new/body_parts/male/axilla.svg
@@ -0,0 +1,186 @@
+
diff --git a/assets/images/new/body_parts/male/back.svg b/assets/images/new/body_parts/male/back.svg
new file mode 100644
index 00000000..7d9aeb46
--- /dev/null
+++ b/assets/images/new/body_parts/male/back.svg
@@ -0,0 +1,188 @@
+
diff --git a/assets/images/new/body_parts/male/bikini.svg b/assets/images/new/body_parts/male/bikini.svg
new file mode 100644
index 00000000..1c545916
--- /dev/null
+++ b/assets/images/new/body_parts/male/bikini.svg
@@ -0,0 +1,185 @@
+
diff --git a/assets/images/new/body_parts/male/bikini_line.svg b/assets/images/new/body_parts/male/bikini_line.svg
new file mode 100644
index 00000000..7fdc51d1
--- /dev/null
+++ b/assets/images/new/body_parts/male/bikini_line.svg
@@ -0,0 +1,185 @@
+
diff --git a/assets/images/new/body_parts/male/cheek.svg b/assets/images/new/body_parts/male/cheek.svg
new file mode 100644
index 00000000..984a59f8
--- /dev/null
+++ b/assets/images/new/body_parts/male/cheek.svg
@@ -0,0 +1,87 @@
+
diff --git a/assets/images/new/body_parts/male/chest.svg b/assets/images/new/body_parts/male/chest.svg
new file mode 100644
index 00000000..85a761fe
--- /dev/null
+++ b/assets/images/new/body_parts/male/chest.svg
@@ -0,0 +1,185 @@
+
diff --git a/assets/images/new/body_parts/male/chest_line.svg b/assets/images/new/body_parts/male/chest_line.svg
new file mode 100644
index 00000000..806ddb0c
--- /dev/null
+++ b/assets/images/new/body_parts/male/chest_line.svg
@@ -0,0 +1,185 @@
+
diff --git a/assets/images/new/body_parts/male/chin.svg b/assets/images/new/body_parts/male/chin.svg
new file mode 100644
index 00000000..9fdee93e
--- /dev/null
+++ b/assets/images/new/body_parts/male/chin.svg
@@ -0,0 +1,86 @@
+
diff --git a/assets/images/new/body_parts/male/ears.svg b/assets/images/new/body_parts/male/ears.svg
new file mode 100644
index 00000000..1c9600c3
--- /dev/null
+++ b/assets/images/new/body_parts/male/ears.svg
@@ -0,0 +1,87 @@
+
diff --git a/assets/images/new/body_parts/male/eyebrows.svg b/assets/images/new/body_parts/male/eyebrows.svg
new file mode 100644
index 00000000..ea385230
--- /dev/null
+++ b/assets/images/new/body_parts/male/eyebrows.svg
@@ -0,0 +1,87 @@
+
diff --git a/assets/images/new/body_parts/male/full_leg.svg b/assets/images/new/body_parts/male/full_leg.svg
new file mode 100644
index 00000000..b5755167
--- /dev/null
+++ b/assets/images/new/body_parts/male/full_leg.svg
@@ -0,0 +1,230 @@
+
diff --git a/assets/images/new/body_parts/male/full_neck.svg b/assets/images/new/body_parts/male/full_neck.svg
new file mode 100644
index 00000000..43183598
--- /dev/null
+++ b/assets/images/new/body_parts/male/full_neck.svg
@@ -0,0 +1,86 @@
+
diff --git a/assets/images/new/body_parts/male/half_neck.svg b/assets/images/new/body_parts/male/half_neck.svg
new file mode 100644
index 00000000..4e57b51c
--- /dev/null
+++ b/assets/images/new/body_parts/male/half_neck.svg
@@ -0,0 +1,86 @@
+
diff --git a/assets/images/new/body_parts/male/hydra_facial.svg b/assets/images/new/body_parts/male/hydra_facial.svg
new file mode 100644
index 00000000..10516304
--- /dev/null
+++ b/assets/images/new/body_parts/male/hydra_facial.svg
@@ -0,0 +1,85 @@
+
diff --git a/assets/images/new/body_parts/male/lower_arm.svg b/assets/images/new/body_parts/male/lower_arm.svg
new file mode 100644
index 00000000..c8dbf48d
--- /dev/null
+++ b/assets/images/new/body_parts/male/lower_arm.svg
@@ -0,0 +1,312 @@
+
diff --git a/assets/images/new/body_parts/male/lower_leg.svg b/assets/images/new/body_parts/male/lower_leg.svg
new file mode 100644
index 00000000..091c29a4
--- /dev/null
+++ b/assets/images/new/body_parts/male/lower_leg.svg
@@ -0,0 +1,228 @@
+
diff --git a/assets/images/new/body_parts/male/shoulders.svg b/assets/images/new/body_parts/male/shoulders.svg
new file mode 100644
index 00000000..bd6cac52
--- /dev/null
+++ b/assets/images/new/body_parts/male/shoulders.svg
@@ -0,0 +1,312 @@
+
diff --git a/assets/images/new/body_parts/male/side_burn.svg b/assets/images/new/body_parts/male/side_burn.svg
new file mode 100644
index 00000000..156b30f1
--- /dev/null
+++ b/assets/images/new/body_parts/male/side_burn.svg
@@ -0,0 +1,87 @@
+
diff --git a/assets/images/new/body_parts/male/upper_arm.svg b/assets/images/new/body_parts/male/upper_arm.svg
new file mode 100644
index 00000000..7d959a0d
--- /dev/null
+++ b/assets/images/new/body_parts/male/upper_arm.svg
@@ -0,0 +1,186 @@
+
diff --git a/assets/images/new/body_parts/male/upper_leg.svg b/assets/images/new/body_parts/male/upper_leg.svg
new file mode 100644
index 00000000..342cfd84
--- /dev/null
+++ b/assets/images/new/body_parts/male/upper_leg.svg
@@ -0,0 +1,210 @@
+
diff --git a/assets/images/new/body_parts/male/upper_lips.svg b/assets/images/new/body_parts/male/upper_lips.svg
new file mode 100644
index 00000000..b7ae6e0f
--- /dev/null
+++ b/assets/images/new/body_parts/male/upper_lips.svg
@@ -0,0 +1,86 @@
+
diff --git a/lib/config/config.dart b/lib/config/config.dart
index ceccdc44..92cafb4b 100644
--- a/lib/config/config.dart
+++ b/lib/config/config.dart
@@ -362,6 +362,8 @@ const SEND_CHECK_IN_NFC_REQUEST =
const HAS_DENTAL_PLAN =
'Services/Doctors.svc/REST/Dental_IsPatientHasOnGoingEstimation';
+const LASER_BODY_PARTS = 'Services/Patients.svc/REST/Laser_GetBodyPartsByCategory';
+
//URL to get medicine and pharmacies list
const CHANNEL = 3;
const GENERAL_ID = 'Cs2020@2016\$2958';
diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart
index ae7d045d..56113044 100644
--- a/lib/config/localized_values.dart
+++ b/lib/config/localized_values.dart
@@ -64,6 +64,7 @@ const Map localizedValues = {
'appointmentSuccess': {'en': 'Appointment is successfully booked', 'ar': 'تم حجز الموعد بنجاح'},
'docQualifications': {'en': 'Doctor Qualifications', 'ar': 'مؤهلات الطبيب'},
'pressAgain': {'en': 'Press again to exit the app', 'ar': 'اضغط مرة أخرى للخروج من التطبيق'},
+ 'laserMaxLimitReach': {'en': "Maximum limit is 90 minutes", 'ar': "الحد الأقصى هو 90 دقيقة"},
'confirmAppoHeading': {'en': 'Kindly review your Appointment', 'ar': 'يرجى تأكيد موعدك'},
'patientInfo': {'en': 'Patient Information', 'ar': 'معلومات المريض'},
'doctorFilter': {'en': 'Doctors will be filtered based on your gender and age', 'ar': 'سيتم تصفية الأطباء بناءً على جنسك وعمرك'},
@@ -816,6 +817,11 @@ const Map localizedValues = {
"respiration-signs": {"en": "Respiration", "ar": "تنفس"},
"sys-dias": {"en": "SBP/DBP", "ar": "إنقباض/إنبساط"},
"body": {"en": "Body Mass", "ar": "كتلة\nالجسم"},
+ "body_string": {"en": "Body", "ar": "الجسم"},
+ "face": {"en": "Face", "ar": "وجه"},
+ "retouch": {"en": "Retouch", "ar": "تنميق"},
+ "bikini": {"en": "Bikini", "ar": "بيكيني"},
+ "totalMinutes": {"en": "Total Minutes", "ar": "إجمالي الدقائق"},
"feedback": {"en": "Feedback", "ar": "رأيك يهمنا"},
"send": {"en": "Send", "ar": "أرسل"},
"status": {"en": "Status", "ar": "الحالة"},
diff --git a/lib/config/shared_pref_kay.dart b/lib/config/shared_pref_kay.dart
index c256d0c1..723e17a0 100644
--- a/lib/config/shared_pref_kay.dart
+++ b/lib/config/shared_pref_kay.dart
@@ -21,6 +21,7 @@ const THEME_VALUE = 'is_vibration';
const MAIN_USER = 'main-user';
const PHARMACY_LAST_VISITED_PRODUCTS = 'last-visited';
const PHARMACY_CUSTOMER_ID = 'costumer-id';
+const PHARMACY_CUSTOMER_GUID = 'customer-guid';
const PHARMACY_CUSTOMER_OBJECT = 'pharmacy-customer-object';
const IS_ROBOT_VISIBLE = 'robot-visible';
const IS_ROBOT_INIT = 'robot-init';
diff --git a/lib/core/service/AlHabibMedicalService/customer_addresses_service.dart b/lib/core/service/AlHabibMedicalService/customer_addresses_service.dart
index bd2e94e4..6b6112bb 100644
--- a/lib/core/service/AlHabibMedicalService/customer_addresses_service.dart
+++ b/lib/core/service/AlHabibMedicalService/customer_addresses_service.dart
@@ -39,7 +39,8 @@ class CustomerAddressesService extends BaseService {
Map queryParams = {'fields': 'addresses'};
hasError = false;
var customerID = await sharedPref.getObject(PHARMACY_CUSTOMER_ID);
- await baseAppClient.getPharmacy("$BASE_PHARMACY_URL$GET_CUSTOMER_ADDRESSES$customerID", onSuccess: (dynamic response, int statusCode) {
+ var customerGUID = await sharedPref.getObject(PHARMACY_CUSTOMER_GUID);
+ await baseAppClient.getPharmacy("$BASE_PHARMACY_URL$GET_CUSTOMER_ADDRESSES$customerID/$customerGUID", onSuccess: (dynamic response, int statusCode) {
addressesList.clear();
response["customers"][0]["addresses"].forEach((data) {
addressesList.add(AddressInfo.fromJson(data));
diff --git a/lib/core/service/parmacyModule/order-preview-service.dart b/lib/core/service/parmacyModule/order-preview-service.dart
index 899cc66b..8b56b739 100644
--- a/lib/core/service/parmacyModule/order-preview-service.dart
+++ b/lib/core/service/parmacyModule/order-preview-service.dart
@@ -21,10 +21,11 @@ class OrderPreviewService extends BaseService {
Future getAddresses() async {
var customerId = await sharedPref.getString(PHARMACY_CUSTOMER_ID);
+ var customerGUID = await sharedPref.getString(PHARMACY_CUSTOMER_GUID);
Map queryParams = {'fields': 'addresses'};
hasError = false;
try {
- await baseAppClient.getPharmacy("$GET_CUSTOMERS_ADDRESSES$customerId", onSuccess: (dynamic response, int statusCode) {
+ await baseAppClient.getPharmacy("$GET_CUSTOMERS_ADDRESSES$customerId/$customerGUID", onSuccess: (dynamic response, int statusCode) {
addresses.clear();
response['customers'][0]['addresses'].forEach((item) {
addresses.add(Addresses.fromJson(item));
@@ -58,13 +59,15 @@ class OrderPreviewService extends BaseService {
Future