diff --git a/assets/images/new/add_to_cart.svg b/assets/images/new/add_to_cart.svg
new file mode 100644
index 00000000..f01f6033
--- /dev/null
+++ b/assets/images/new/add_to_cart.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/images/new/body_parts/female/abdomin.png b/assets/images/new/body_parts/female/abdomin.png
new file mode 100644
index 00000000..f4918d71
Binary files /dev/null and b/assets/images/new/body_parts/female/abdomin.png differ
diff --git a/assets/images/new/body_parts/female/anal.png b/assets/images/new/body_parts/female/anal.png
new file mode 100644
index 00000000..d96ef288
Binary files /dev/null and b/assets/images/new/body_parts/female/anal.png differ
diff --git a/assets/images/new/body_parts/female/axilla.png b/assets/images/new/body_parts/female/axilla.png
new file mode 100644
index 00000000..f38be6b3
Binary files /dev/null and b/assets/images/new/body_parts/female/axilla.png differ
diff --git a/assets/images/new/body_parts/female/back.png b/assets/images/new/body_parts/female/back.png
new file mode 100644
index 00000000..65d9ef19
Binary files /dev/null and b/assets/images/new/body_parts/female/back.png differ
diff --git a/assets/images/new/body_parts/female/bikini.png b/assets/images/new/body_parts/female/bikini.png
new file mode 100644
index 00000000..a1a68423
Binary files /dev/null and b/assets/images/new/body_parts/female/bikini.png differ
diff --git a/assets/images/new/body_parts/female/bikini_line.png b/assets/images/new/body_parts/female/bikini_line.png
new file mode 100644
index 00000000..12fc0e6e
Binary files /dev/null and b/assets/images/new/body_parts/female/bikini_line.png differ
diff --git a/assets/images/new/body_parts/female/buttocks.png b/assets/images/new/body_parts/female/buttocks.png
new file mode 100644
index 00000000..b83576f3
Binary files /dev/null and b/assets/images/new/body_parts/female/buttocks.png differ
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.png b/assets/images/new/body_parts/female/chest.png
new file mode 100644
index 00000000..727ebe7a
Binary files /dev/null and b/assets/images/new/body_parts/female/chest.png differ
diff --git a/assets/images/new/body_parts/female/chest_line.png b/assets/images/new/body_parts/female/chest_line.png
new file mode 100644
index 00000000..0b4fecb8
Binary files /dev/null and b/assets/images/new/body_parts/female/chest_line.png differ
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_legs.png b/assets/images/new/body_parts/female/full_legs.png
new file mode 100644
index 00000000..5a365a7e
Binary files /dev/null and b/assets/images/new/body_parts/female/full_legs.png differ
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.png b/assets/images/new/body_parts/female/lower_arm.png
new file mode 100644
index 00000000..717b2cde
Binary files /dev/null and b/assets/images/new/body_parts/female/lower_arm.png differ
diff --git a/assets/images/new/body_parts/female/lower_leg.png b/assets/images/new/body_parts/female/lower_leg.png
new file mode 100644
index 00000000..88ccacef
Binary files /dev/null and b/assets/images/new/body_parts/female/lower_leg.png differ
diff --git a/assets/images/new/body_parts/female/shoulders.png b/assets/images/new/body_parts/female/shoulders.png
new file mode 100644
index 00000000..e1f253a8
Binary files /dev/null and b/assets/images/new/body_parts/female/shoulders.png differ
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.png b/assets/images/new/body_parts/female/upper_arm.png
new file mode 100644
index 00000000..1edb873c
Binary files /dev/null and b/assets/images/new/body_parts/female/upper_arm.png differ
diff --git a/assets/images/new/body_parts/female/upper_legs.png b/assets/images/new/body_parts/female/upper_legs.png
new file mode 100644
index 00000000..a8aa2ec7
Binary files /dev/null and b/assets/images/new/body_parts/female/upper_legs.png differ
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.png b/assets/images/new/body_parts/male/abdomin.png
new file mode 100644
index 00000000..1b180b42
Binary files /dev/null and b/assets/images/new/body_parts/male/abdomin.png differ
diff --git a/assets/images/new/body_parts/male/axilla.png b/assets/images/new/body_parts/male/axilla.png
new file mode 100644
index 00000000..61af9492
Binary files /dev/null and b/assets/images/new/body_parts/male/axilla.png differ
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.png b/assets/images/new/body_parts/male/bikini.png
new file mode 100644
index 00000000..aa98ea74
Binary files /dev/null and b/assets/images/new/body_parts/male/bikini.png differ
diff --git a/assets/images/new/body_parts/male/bikini_line.png b/assets/images/new/body_parts/male/bikini_line.png
new file mode 100644
index 00000000..60ed64e2
Binary files /dev/null and b/assets/images/new/body_parts/male/bikini_line.png differ
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.png b/assets/images/new/body_parts/male/chest.png
new file mode 100644
index 00000000..b7cec070
Binary files /dev/null and b/assets/images/new/body_parts/male/chest.png differ
diff --git a/assets/images/new/body_parts/male/chest_line.png b/assets/images/new/body_parts/male/chest_line.png
new file mode 100644
index 00000000..41e779f3
Binary files /dev/null and b/assets/images/new/body_parts/male/chest_line.png differ
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_legs.png b/assets/images/new/body_parts/male/full_legs.png
new file mode 100644
index 00000000..eee2fa07
Binary files /dev/null and b/assets/images/new/body_parts/male/full_legs.png differ
diff --git a/assets/images/new/body_parts/male/full_neck.png b/assets/images/new/body_parts/male/full_neck.png
new file mode 100644
index 00000000..a75159f6
Binary files /dev/null and b/assets/images/new/body_parts/male/full_neck.png differ
diff --git a/assets/images/new/body_parts/male/half_neck.png b/assets/images/new/body_parts/male/half_neck.png
new file mode 100644
index 00000000..5ee0249c
Binary files /dev/null and b/assets/images/new/body_parts/male/half_neck.png differ
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.png b/assets/images/new/body_parts/male/lower_arm.png
new file mode 100644
index 00000000..120242ed
Binary files /dev/null and b/assets/images/new/body_parts/male/lower_arm.png differ
diff --git a/assets/images/new/body_parts/male/lower_legs.png b/assets/images/new/body_parts/male/lower_legs.png
new file mode 100644
index 00000000..8367aa8c
Binary files /dev/null and b/assets/images/new/body_parts/male/lower_legs.png differ
diff --git a/assets/images/new/body_parts/male/shoulders.png b/assets/images/new/body_parts/male/shoulders.png
new file mode 100644
index 00000000..907f2dd7
Binary files /dev/null and b/assets/images/new/body_parts/male/shoulders.png differ
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.png b/assets/images/new/body_parts/male/upper_arm.png
new file mode 100644
index 00000000..f80a75da
Binary files /dev/null and b/assets/images/new/body_parts/male/upper_arm.png differ
diff --git a/assets/images/new/body_parts/male/upper_legs.png b/assets/images/new/body_parts/male/upper_legs.png
new file mode 100644
index 00000000..e0c973b7
Binary files /dev/null and b/assets/images/new/body_parts/male/upper_legs.png differ
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/assets/images/new/cart.svg b/assets/images/new/cart.svg
new file mode 100644
index 00000000..334b86ba
--- /dev/null
+++ b/assets/images/new/cart.svg
@@ -0,0 +1,7 @@
+
diff --git a/assets/images/pharmacy_module/lakum/akum_transfer.png b/assets/images/pharmacy_module/lakum/akum_transfer.png
new file mode 100644
index 00000000..30785b08
Binary files /dev/null and b/assets/images/pharmacy_module/lakum/akum_transfer.png differ
diff --git a/ios/Flutter/AppFrameworkInfo.plist b/ios/Flutter/AppFrameworkInfo.plist
index 6b4c0f78..cb6be309 100644
--- a/ios/Flutter/AppFrameworkInfo.plist
+++ b/ios/Flutter/AppFrameworkInfo.plist
@@ -2,25 +2,25 @@
- CFBundleDevelopmentRegion
- $(DEVELOPMENT_LANGUAGE)
- CFBundleExecutable
- App
- CFBundleIdentifier
- io.flutter.flutter.app
- CFBundleInfoDictionaryVersion
- 6.0
- CFBundleName
- App
- CFBundlePackageType
- FMWK
- CFBundleShortVersionString
- 1.0
- CFBundleSignature
- ????
- CFBundleVersion
- 1.0
- MinimumOSVersion
- 8.0
+ CFBundleDevelopmentRegion
+ $(DEVELOPMENT_LANGUAGE)
+ CFBundleExecutable
+ App
+ CFBundleIdentifier
+ io.flutter.flutter.app
+ CFBundleInfoDictionaryVersion
+ 6.0
+ CFBundleName
+ App
+ CFBundlePackageType
+ FMWK
+ CFBundleShortVersionString
+ 1.0
+ CFBundleSignature
+ ????
+ CFBundleVersion
+ 1.0
+ MinimumOSVersion
+ 11.0
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
index e83c3bf5..1eb27a20 100644
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -1,128 +1,128 @@
{
- "images":[
- {
- "idiom":"iphone",
- "size":"20x20",
- "scale":"2x",
- "filename":"Icon-App-20x20@2x.png"
- },
- {
- "idiom":"iphone",
- "size":"20x20",
- "scale":"3x",
- "filename":"Icon-App-20x20@3x.png"
- },
- {
- "idiom":"iphone",
- "size":"29x29",
- "scale":"1x",
- "filename":"Icon-App-29x29@1x.png"
- },
- {
- "idiom":"iphone",
- "size":"29x29",
- "scale":"2x",
- "filename":"Icon-App-29x29@2x.png"
- },
- {
- "idiom":"iphone",
- "size":"29x29",
- "scale":"3x",
- "filename":"Icon-App-29x29@3x.png"
- },
- {
- "idiom":"iphone",
- "size":"40x40",
- "scale":"2x",
- "filename":"Icon-App-40x40@2x.png"
- },
- {
- "idiom":"iphone",
- "size":"40x40",
- "scale":"3x",
- "filename":"Icon-App-40x40@3x.png"
- },
- {
- "idiom":"iphone",
- "size":"60x60",
- "scale":"2x",
- "filename":"Icon-App-60x60@2x.png"
- },
- {
- "idiom":"iphone",
- "size":"60x60",
- "scale":"3x",
- "filename":"Icon-App-60x60@3x.png"
- },
- {
- "idiom":"iphone",
- "size":"76x76",
- "scale":"2x",
- "filename":"Icon-App-76x76@2x.png"
- },
- {
- "idiom":"ipad",
- "size":"20x20",
- "scale":"1x",
- "filename":"Icon-App-20x20@1x.png"
- },
- {
- "idiom":"ipad",
- "size":"20x20",
- "scale":"2x",
- "filename":"Icon-App-20x20@2x.png"
- },
- {
- "idiom":"ipad",
- "size":"29x29",
- "scale":"1x",
- "filename":"Icon-App-29x29@1x.png"
- },
- {
- "idiom":"ipad",
- "size":"29x29",
- "scale":"2x",
- "filename":"Icon-App-29x29@2x.png"
- },
- {
- "idiom":"ipad",
- "size":"40x40",
- "scale":"1x",
- "filename":"Icon-App-40x40@1x.png"
- },
- {
- "idiom":"ipad",
- "size":"40x40",
- "scale":"2x",
- "filename":"Icon-App-40x40@2x.png"
- },
- {
- "idiom":"ipad",
- "size":"76x76",
- "scale":"1x",
- "filename":"Icon-App-76x76@1x.png"
- },
- {
- "idiom":"ipad",
- "size":"76x76",
- "scale":"2x",
- "filename":"Icon-App-76x76@2x.png"
- },
- {
- "idiom":"ipad",
- "size":"83.5x83.5",
- "scale":"2x",
- "filename":"Icon-App-83.5x83.5@2x.png"
- },
- {
- "size" : "1024x1024",
- "idiom" : "ios-marketing",
- "scale" : "1x",
- "filename" : "ItunesArtwork@2x.png"
- }
- ],
- "info":{
- "version":1,
- "author":"easyappicon"
+ "images" : [
+ {
+ "filename" : "Icon-App-20x20@2x.png",
+ "idiom" : "iphone",
+ "scale" : "2x",
+ "size" : "20x20"
+ },
+ {
+ "filename" : "Icon-App-20x20@3x.png",
+ "idiom" : "iphone",
+ "scale" : "3x",
+ "size" : "20x20"
+ },
+ {
+ "filename" : "Icon-App-29x29@1x.png",
+ "idiom" : "iphone",
+ "scale" : "1x",
+ "size" : "29x29"
+ },
+ {
+ "filename" : "Icon-App-29x29@2x.png",
+ "idiom" : "iphone",
+ "scale" : "2x",
+ "size" : "29x29"
+ },
+ {
+ "filename" : "Icon-App-29x29@3x.png",
+ "idiom" : "iphone",
+ "scale" : "3x",
+ "size" : "29x29"
+ },
+ {
+ "filename" : "Icon-App-40x40@2x.png",
+ "idiom" : "iphone",
+ "scale" : "2x",
+ "size" : "40x40"
+ },
+ {
+ "filename" : "Icon-App-40x40@3x.png",
+ "idiom" : "iphone",
+ "scale" : "3x",
+ "size" : "40x40"
+ },
+ {
+ "filename" : "Icon-App-60x60@2x.png",
+ "idiom" : "iphone",
+ "scale" : "2x",
+ "size" : "60x60"
+ },
+ {
+ "filename" : "Icon-App-60x60@3x.png",
+ "idiom" : "iphone",
+ "scale" : "3x",
+ "size" : "60x60"
+ },
+ {
+ "filename" : "Icon-App-20x20@1x.png",
+ "idiom" : "ipad",
+ "scale" : "1x",
+ "size" : "20x20"
+ },
+ {
+ "filename" : "Icon-App-20x20@2x.png",
+ "idiom" : "ipad",
+ "scale" : "2x",
+ "size" : "20x20"
+ },
+ {
+ "filename" : "Icon-App-29x29@1x.png",
+ "idiom" : "ipad",
+ "scale" : "1x",
+ "size" : "29x29"
+ },
+ {
+ "filename" : "Icon-App-29x29@2x.png",
+ "idiom" : "ipad",
+ "scale" : "2x",
+ "size" : "29x29"
+ },
+ {
+ "filename" : "Icon-App-40x40@1x.png",
+ "idiom" : "ipad",
+ "scale" : "1x",
+ "size" : "40x40"
+ },
+ {
+ "filename" : "Icon-App-40x40@2x.png",
+ "idiom" : "ipad",
+ "scale" : "2x",
+ "size" : "40x40"
+ },
+ {
+ "filename" : "Icon-App-76x76@1x.png",
+ "idiom" : "ipad",
+ "scale" : "1x",
+ "size" : "76x76"
+ },
+ {
+ "filename" : "Icon-App-76x76@2x.png",
+ "idiom" : "ipad",
+ "scale" : "2x",
+ "size" : "76x76"
+ },
+ {
+ "filename" : "Icon-App-83.5x83.5@2x.png",
+ "idiom" : "ipad",
+ "scale" : "2x",
+ "size" : "83.5x83.5"
+ },
+ {
+ "filename" : "icon.jpg",
+ "idiom" : "ios-marketing",
+ "scale" : "1x",
+ "size" : "1024x1024"
+ },
+ {
+ "filename" : "Icon-App-76x76@2x.png",
+ "idiom" : "iphone",
+ "scale" : "2x",
+ "size" : "76x76"
}
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
}
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png
deleted file mode 100644
index dc9ada47..00000000
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png and /dev/null differ
diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
index 72bd4ac9..ec89ac71 100644
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@@ -15,50 +15,73 @@
CFBundlePackageType
APPL
CFBundleShortVersionString
- $(FLUTTER_BUILD_NAME)
+ $(MARKETING_VERSION)
CFBundleSignature
????
CFBundleVersion
$(FLUTTER_BUILD_NUMBER)
LSRequiresIPhoneOS
+ MinimumOSVersion
+ 11.0
+ NSAppTransportSecurity
+
+ NSAllowsArbitraryLoads
+
+ NSAllowsArbitraryLoadsForMedia
+
+ NSAllowsArbitraryLoadsInWebContent
+
+
+ NSAppleMusicUsageDescription
+ Required by another plugin, Please let us know if you find this functionality anywhere in the app.
+ NSBluetoothAlwaysUsageDescription
+ This App requires access to Bluetooth to connect blood pressure & blood sugar devices with the app to analyze the data.
+ NSBluetoothPeripheralUsageDescription
+ This App requires access to Bluetooth to connect blood pressure & blood sugar devices with the app to analyze the data.
NSCalendarsUsageDescription
- We need access to record you event in to calender.
+ This app requires calendar access to set reminders for Virtual & Normal Appointments.
NSCameraUsageDescription
- Need camera access for uploading images
+ This app requires camera access to enable virtual consultation between patient & doctor
+ NSContactsUsageDescription
+ This app requires contacts access to show incoming virtual consultation request.
+ NSFaceIDUsageDescription
+ This app requires Face ID to allow biometric authentication for app login.
+ NSHealthShareUsageDescription
+ This App need access to HealthKit to read heart rate & other data from your smart watch.
+ NSHealthUpdateUsageDescription
+ This App need access to HealthKit to read heart rate & other data from your smart watch.
NSLocationAlwaysAndWhenInUseUsageDescription
- This app will use your location to show cool stuffs near you.
+ This App requires access to your location to show the nearest hospitals & ER Locations from your location.
NSLocationAlwaysUsageDescription
- This app will use your location to show cool stuffs near you.
- NSLocationUsageDescription
- Need location access for updating nearby friends
+ This App requires access to your location to show the nearest hospitals from your location.
NSLocationWhenInUseUsageDescription
- This app will use your location to show cool stuffs near you.
+ This App requires access to your location to show the nearest hospitals from your location.
NSMicrophoneUsageDescription
- Need microphone access for uploading videos
+ This app requires microphone access to enable virtual consultation between patient & doctor
+ NSMotionUsageDescription
+ This app requires motion detection access to function properly.
NSPhotoLibraryUsageDescription
- Need photo library access for uploading images
+ This app requires photo library access to select image as document & upload it.
+ NSRemindersUsageDescription
+ This app requires calendar access to set reminders for Virtual & Normal Appointments.
+ NSSpeechRecognitionUsageDescription
+ This app requires speech recognition access to access voice command features.
+ NSUserActivityTypes
+
UIBackgroundModes
- fetch
+ audio
location
- processing
+ remote-notification
UILaunchStoryboardName
LaunchScreen
UIMainStoryboardFile
Main
- UIRequiredDeviceCapabilities
-
- location-services
- gps
- armv7
-
UISupportedInterfaceOrientations
UIInterfaceOrientationPortrait
- UIInterfaceOrientationLandscapeLeft
- UIInterfaceOrientationLandscapeRight
UISupportedInterfaceOrientations~ipad
diff --git a/lib/config/config.dart b/lib/config/config.dart
index d71b2b92..42861cce 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..94e7349f 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': 'سيتم تصفية الأطباء بناءً على جنسك وعمرك'},
@@ -170,6 +171,7 @@ const Map localizedValues = {
"minute": {"en": "Minutes", "ar": "دقيقة"},
"hour": {"en": "Hour", "ar": "ساعة"},
"reminderSuccess": {"en": "The reminder has been added successfully", "ar": "تمت إضافة التذكير بنجاح"},
+ "reminderCancelSuccess": {"en": "The reminder has been cancelled successfully", "ar": "تم إلغاء التذكير بنجاح"},
"patientShareToDo": {"en": "Amount before tax: ", "ar": "المبلغ قبل الضريبة:"},
"patientTaxToDo": {"en": "Tax amount: ", "ar": "قيمة الضريبة:"},
"patientShareTotalToDo": {"en": "Total amount Due: ", "ar": "المبلغ الإجمالي المستحق:"},
@@ -244,6 +246,7 @@ const Map localizedValues = {
"companyName": {"en": "Company Name:", "ar": "اسم الشركة: "},
"receiptOn": {"en": "Receipt on:", "ar": "تاريخ الفاتورة: "},
"expiryDate": {"en": "Expiry Date:", "ar": "تاريخ الانتهاء: "},
+ "expiryPoints": {"en": "Expired", "ar": " منتهية الصلاحية"},
"expiryOn": {"en": "Expiry on:", "ar": "تاريخ الانتهاء: "},
"procedureName": {"en": "Procedure Name:", "ar": "اسم الاجراء:"},
"procedure": {"en": "Procedure", "ar": "اسم الاجراء:"},
@@ -448,6 +451,7 @@ const Map localizedValues = {
"Frequency": {"en": "Frequency", "ar": "المعدل"},
"DailyQuantity": {"en": "Daily Quantity :", "ar": "جرعات يومية"},
"AddReminder": {"en": "Add Reminder", "ar": "إضافة تذكير"},
+ "CancelReminder": {"en": "Cancel Reminder", "ar": "إلغاء تذكير"},
"reminderDes": {
"en": "Please select treatment start day and time to be notified when it\'s time to take the medicine",
"ar": "يرجى تحديد يوم بدء العلاج والوقت ليتم ارسال تنبيه عندما يحين الوقت لتناول الدواء"
@@ -552,6 +556,7 @@ const Map localizedValues = {
"shipping": {"en": "Shipping", "ar": " الشحن"},
"shipBy": {"en": "SHIP BY:", "ar": "الشحن عن طريق:"},
"lakumPoints": {"en": "Lakum Points", "ar": "نقاط برنامج لكم"},
+ "useLakumPoints": {"en": "Use Lakum points", "ar": "استخدم برنامج لكم"},
"use": {"en": "USE", "ar": "استخدم"},
"proceedPay": {"en": "PROCEED TO PAY", "ar": "المتابعة للدفع"},
"vat": {"en": "VAT (15%)", "ar": "(15%) القيمة المضافة"},
@@ -816,6 +821,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": "الحالة"},
@@ -1346,7 +1356,7 @@ const Map localizedValues = {
"en": " This service allows you to activate your LAKUM account after registering completed.",
"ar": " تتيح لك هذه الخدمة تفعيل حساب برنامج الولاء لكم بعد اكتمال التسجيل. "
},
- "pointsToTransfer": {"en": "Point's to Transfer:", "ar": "النقاط المراد تحويلها:"},
+ "pointsToTransfer": {"en": "Points to Transfer:", "ar": "النقاط المراد تحويلها:"},
"enterBeneficiaryAccountNo": {"en": "Enter Beneficiary Account No.", "ar": "أدخل رقم حساب المستفيد"},
"confirm-prescription": {"en": "Are you sure !! you want to send this request", "ar": "تاكيد ارسال الطلب؟"},
"you-already-have-order": {"en": "You already have this order! do you want to view it?", "ar": "لديك هذا الطلب بالفعل! هل تريد مشاهدته؟"},
@@ -1685,8 +1695,7 @@ const Map localizedValues = {
"lowLimits": {"en": "Please check the value you have entered, since the body fat percentage cannot be this low.", "ar": "يرجى التحقق من القيمة التي أدخلتها ، حيث لا يمكن أن تكون نسبة الدهون في الجسم منخفضة."},
"estimates": {"en": "Estimates the total body fat based on\nthe size", "ar": "تقدير إجمالي الدهون في الجسم بناءً على \ n الحجم"},
-
- "myCart": {"en": "Cart", "ar": "عربة التسوق"},
+ "myCart": {"en": "My Cart", "ar": "عربة التسوق"},
"browseOffers": {"en": "Browse offers by clinic", "ar": "تصفح العروض حسب العيادة"},
"inactiveAct":{"en":"Almost inactive (little or no exercise)","ar":"غير نشط تقريبا (ممارسة الرياضة قليلة أو منعدمة)"},
"light":{"en":"Lightly active (1-3) days per week","ar":"خفيف النشاط (1-3 أيام في الأسبوع)"},
@@ -1721,4 +1730,8 @@ const Map localizedValues = {
"gramsPerDay": {"en": "Grams Per Day", "ar": "غرام في اليوم"},
"gr": {"en": "gr", "ar": "غرام"},
"gramsPerMeal": {"en": "Grams Per Meal", "ar": "عدد الجرامات لكل وجبة"},
+ "syncSuccess": {"en": "Data Synced Successfully", "ar": "تمت مزامنة البيانات بنجاح"},
+ "points": {"en": "Points", "ar": "نقاط"},
+ "availableBalance": {"en": "Available Balance", "ar": "الرصيد المتوفر"},
+ "ordersDashboard": {"en": "My Orders", "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/model/pharmacies/LakumInquiryInformationObjVersion.dart b/lib/core/model/pharmacies/LakumInquiryInformationObjVersion.dart
index c609fa0b..e7948d7d 100644
--- a/lib/core/model/pharmacies/LakumInquiryInformationObjVersion.dart
+++ b/lib/core/model/pharmacies/LakumInquiryInformationObjVersion.dart
@@ -2,35 +2,35 @@ import 'PointsAmountPerYear.dart';
import 'PointsDetails.dart';
class LakumInquiryInformationObjVersion {
- int accountNumber;
+ num accountNumber;
String accountStatus;
String barCode;
- int consumedPoints;
+ num consumedPoints;
String consumedPointsAmount;
List consumedPointsAmountPerYear;
List consumedPointsDetails;
String createdDate;
- int expiredPoints;
+ num expiredPoints;
String expiryDate;
- int gainedPoints;
+ num gainedPoints;
List gainedPointsAmountPerYear;
List gainedPointsDetails;
String lakumMessageStatus;
String memberName;
String memberUniversalId;
String mobileNumber;
- int pointsBalance;
- int pointsBalanceAmount;
- int pointsWillBeExpired;
+ num pointsBalance;
+ num pointsBalanceAmount;
+ num pointsWillBeExpired;
String prefLang;
- int statusCode;
- int transferPoints;
+ num statusCode;
+ num transferPoints;
List transferPointsAmountPerYear;
List transferPointsDetails;
dynamic waitingPoints;
dynamic loyalityAmount;
dynamic loyalityPoints;
- int purchaseRate;
+ num purchaseRate;
LakumInquiryInformationObjVersion(
{this.accountNumber,
diff --git a/lib/core/model/pharmacies/PointsAmountPerYear.dart b/lib/core/model/pharmacies/PointsAmountPerYear.dart
index eef74064..2d25855f 100644
--- a/lib/core/model/pharmacies/PointsAmountPerYear.dart
+++ b/lib/core/model/pharmacies/PointsAmountPerYear.dart
@@ -1,10 +1,10 @@
import 'PointsAmountPerMonth.dart';
class PointsAmountPerYear {
- int amountPerYear;
+ num amountPerYear;
List pointsAmountPerMonth;
- int pointsPerYear;
- int year;
+ num pointsPerYear;
+ num year;
PointsAmountPerYear(
{this.amountPerYear,
diff --git a/lib/core/model/pharmacies/payment-checkout-data.dart b/lib/core/model/pharmacies/payment-checkout-data.dart
index 5d91c829..f6f93fa2 100644
--- a/lib/core/model/pharmacies/payment-checkout-data.dart
+++ b/lib/core/model/pharmacies/payment-checkout-data.dart
@@ -11,7 +11,7 @@ class PaymentCheckoutData {
LacumAccountInformation lacumInformation;
bool cartDataVisible;
ShippingOption shippingOption;
- int usedLakumPoints;
+ num usedLakumPoints;
PaymentCheckoutData({this.address, this.paymentOption, this.lacumInformation, this.cartDataVisible = false, this.shippingOption, this.usedLakumPoints = 0});
diff --git a/lib/core/service/AlHabibMedicalService/customer_addresses_service.dart b/lib/core/service/AlHabibMedicalService/customer_addresses_service.dart
index b66ce951..2f92fe5e 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/client/base_app_client.dart b/lib/core/service/client/base_app_client.dart
index 1f6ca580..f9361e90 100644
--- a/lib/core/service/client/base_app_client.dart
+++ b/lib/core/service/client/base_app_client.dart
@@ -467,7 +467,9 @@ class BaseAppClient {
onFailure(TranslationBase.of(AppGlobal.context).pharmacyRelogin, statusCode);
Navigator.of(AppGlobal.context).pushNamed(HOME);
} else {
- onFailure('Error While Fetching data', statusCode);
+ var bodyUtf = json.decode(utf8.decode(response.bodyBytes));
+ print(bodyUtf);
+ onFailure(bodyUtf['error']['ErrorEndUserMsg'], statusCode);
}
} else {
// var parsed = json.decode(response.body.toString());
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