diff --git a/Runner 2021-01-01 21-59-41/DiplomaticQuarter.ipa b/Runner 2021-01-01 21-59-41/DiplomaticQuarter.ipa
new file mode 100644
index 00000000..ca720a76
Binary files /dev/null and b/Runner 2021-01-01 21-59-41/DiplomaticQuarter.ipa differ
diff --git a/assets/app_icons/config.json b/assets/app_icons/config.json
index e2e1afdb..ceb65b05 100644
--- a/assets/app_icons/config.json
+++ b/assets/app_icons/config.json
@@ -271,6 +271,184 @@
"search": [
"roboticon"
]
+ },
+ {
+ "uid": "8ce732688587909ad0a9d8323eaca8ad",
+ "css": "marquee",
+ "code": 59590,
+ "src": "fontelico"
+ },
+ {
+ "uid": "ec8496ef645f3be7b28147ec60cd9ab1",
+ "css": "crown-minus",
+ "code": 59589,
+ "src": "fontelico"
+ },
+ {
+ "uid": "36ef9feb0754335302784521267a9ad4",
+ "css": "crown-plus",
+ "code": 59588,
+ "src": "fontelico"
+ },
+ {
+ "uid": "186dec7a13156bbe2550790c158fb85d",
+ "css": "crown",
+ "code": 59587,
+ "src": "fontelico"
+ },
+ {
+ "uid": "2a46f1d1c9bd036e17a74e46613c1636",
+ "css": "ie",
+ "code": 59586,
+ "src": "fontelico"
+ },
+ {
+ "uid": "9c2b737b16ae2c8d66b7bfd29ba5ecd8",
+ "css": "chrome",
+ "code": 59584,
+ "src": "fontelico"
+ },
+ {
+ "uid": "45861dd1e5ce4fde338bcccf01eeb808",
+ "css": "opera",
+ "code": 59585,
+ "src": "fontelico"
+ },
+ {
+ "uid": "2bd5f98482d86649958312ea2ab5bb40",
+ "css": "emo-laugh",
+ "code": 59576,
+ "src": "fontelico"
+ },
+ {
+ "uid": "fc92480dedc439d274d4e3e4b425edf4",
+ "css": "emo-squint",
+ "code": 59575,
+ "src": "fontelico"
+ },
+ {
+ "uid": "4843d0d6050dd508d4c101a334f46db2",
+ "css": "emo-shoot",
+ "code": 59574,
+ "src": "fontelico"
+ },
+ {
+ "uid": "04688d76a33ce7a7950e40fae79c08ac",
+ "css": "emo-cry",
+ "code": 59573,
+ "src": "fontelico"
+ },
+ {
+ "uid": "e4b163acaaa08255819f2f78afe8f075",
+ "css": "cart_menu_icon",
+ "code": 59412,
+ "src": "custom_icons",
+ "selected": true,
+ "svg": {
+ "path": "M367.1 624.3H972.6A33.2 33.2 0 0 0 1004.7 601.7L1138.2 164.7A29.6 29.6 0 0 0 1132.9 137.3 34.3 34.3 0 0 0 1106.3 124.9H289.9L266.3 24.5A33 33 0 0 0 233.7 0H33.4A32.4 32.4 0 0 0 0 31.2 32.4 32.4 0 0 0 33.4 62.4H206.9L327.4 569.6A93.8 93.8 0 0 0 267.1 655.5 97.1 97.1 0 0 0 367.2 749.1H972.6A31.3 31.3 0 1 0 972.6 686.7H367.2A31.3 31.3 0 1 1 367.2 624.3ZM1061.9 187.3L947.4 561.9H394L305 187.3ZM1061.9 187.3M315.3 894.6A105.4 105.4 0 1 0 420.7 789.2 105.4 105.4 0 0 0 315.3 894.6ZM420.7 859.4A35.2 35.2 0 1 1 385.6 894.6 35.2 35.2 0 0 1 420.7 859.4ZM420.7 859.4M735.4 894.6A105.4 105.4 0 1 0 840.9 789.2 105.4 105.4 0 0 0 735.4 894.6ZM840.9 859.4A35.2 35.2 0 1 1 805.7 894.6 35.2 35.2 0 0 1 840.9 859.4ZM840.9 859.4",
+ "width": 1140
+ },
+ "search": [
+ "cart_menu_icon"
+ ]
+ },
+ {
+ "uid": "45f50872f02e050e19f0910ca3e0e8e6",
+ "css": "categories_menu_icon",
+ "code": 59413,
+ "src": "custom_icons",
+ "selected": true,
+ "svg": {
+ "path": "M332.7 458.9H126.3A126.3 126.3 0 0 1 0 332.7V126.3A126.3 126.3 0 0 1 126.3 0H332.7A126.3 126.3 0 0 1 459 126.3V332.7A126.3 126.3 0 0 1 332.7 458.9ZM126.3 61.2A65.1 65.1 0 0 0 61.2 126.3V332.7A65.1 65.1 0 0 0 126.3 397.8H332.7A65.1 65.1 0 0 0 397.8 332.7V126.3A65.1 65.1 0 0 0 332.7 61.2ZM873.8 458.9H667.3A126.3 126.3 0 0 1 541 332.6V126.3A126.3 126.3 0 0 1 667.3 0H873.9A126.3 126.3 0 0 1 1000.2 126.3V332.7A126.3 126.3 0 0 1 873.8 458.9ZM667.3 61.2A65.1 65.1 0 0 0 602.2 126.3V332.7A65.1 65.1 0 0 0 667.3 397.8H873.9A65.1 65.1 0 0 0 938.9 332.7V126.3A65.1 65.1 0 0 0 873.9 61.3ZM332.7 999.9H126.3A126.3 126.3 0 0 1 0 873.7V667.3A126.3 126.3 0 0 1 126.3 541H332.7A126.3 126.3 0 0 1 459 667.3V873.9A126.3 126.3 0 0 1 332.7 999.9ZM126.3 602.2A65.1 65.1 0 0 0 61.2 667.3V873.9A65.1 65.1 0 0 0 126.3 938.8H332.7A65.1 65.1 0 0 0 397.8 873.8V667.3A65.1 65.1 0 0 0 332.7 602.3ZM873.8 999.9H667.3A126.3 126.3 0 0 1 541 873.7V667.3A126.3 126.3 0 0 1 667.3 541H873.8A126.3 126.3 0 0 1 1000.1 667.3V873.9A126.3 126.3 0 0 1 873.8 999.9ZM667.3 602.2A65.1 65.1 0 0 0 602.2 667.3V873.9A65.1 65.1 0 0 0 667.3 938.8H873.8A65.1 65.1 0 0 0 938.8 873.8V667.3A65.1 65.1 0 0 0 873.8 602.3Z",
+ "width": 1000
+ },
+ "search": [
+ "categories_menu_icon"
+ ]
+ },
+ {
+ "uid": "de65d94899c08a719eb8f9b723f73fc4",
+ "css": "hmg_logo_icon",
+ "code": 59414,
+ "src": "custom_icons",
+ "selected": true,
+ "svg": {
+ "path": "M146 835.7S180.9 835.5 205.5 835.5L392.2 836.4C414.4 836.4 433 812.7 434 778.5L434 622.5C434 589.3 448.9 563.3 472 561.7L529.2 561.2C552.3 562.7 568.1 588.9 568.1 622L568.1 778.9C569.2 813.1 584.7 835.5 607.1 835.5L858.4 836.1 858.8 643.3C858.8 610.2 842.9 584.4 819.8 583L718.8 582.5C696.5 582.5 678.9 558.9 677.9 524.7L677.5 472.6C678.6 438.4 696.4 414.8 718.7 414.8L820.2 415.1C843.3 413.6 858.3 386.4 858.3 353.3L858.5 112.8A102.4 102.4 0 0 1 780.8 161.4L610.2 161.4C587.9 161.4 569.4 185.7 568.3 219.9V374.6C567.2 408.8 549.8 432.9 527.5 432.9L475.8 432C453.4 432 435.6 408.6 434.5 374.7L434.5 218.4C433.4 184.3 415.6 161.2 393.4 161.2L145.6 161.2 145.6 353.4C145.6 386.6 161.2 413.1 184.3 414.7L285.8 414.3C308.8 415.8 325.1 443.2 325.1 476.2L324.8 520.7C324.8 553.8 309.1 580.4 286 581.9L184.3 581.7C161.2 583.3 145.6 609.5 145.6 642.6ZM999.3 99.1V902.8A102.2 102.2 0 0 1 896 1000H102.8A101.9 101.9 0 0 1 0 902.8L0 97.6A102.3 102.3 0 0 1 103 0L895.4 0.3A104 104 0 0 1 999.3 99.1Z",
+ "width": 999
+ },
+ "search": [
+ "hmg_logo_icon"
+ ]
+ },
+ {
+ "uid": "baf8798b7336aad03b1d61cacc015142",
+ "css": "user_menu_icon",
+ "code": 59415,
+ "src": "custom_icons",
+ "selected": true,
+ "svg": {
+ "path": "M853.6 146.4A500 500 0 0 0 146.4 853.6 500 500 0 0 0 853.6 146.4ZM217 838.5A286.1 286.1 0 0 1 500 586.7 285 285 0 0 1 783 838.5 440.5 440.5 0 0 1 217 838.5ZM500 526.3A151.8 151.8 0 1 1 651.8 374.5 152.1 152.1 0 0 1 500 526.3ZM833.4 788.8A344.4 344.4 0 0 0 617.6 548.7 210.5 210.5 0 1 0 382.1 548.7 344.2 344.2 0 0 0 166.3 788.7 441.4 441.4 0 1 1 833.2 788.7ZM833.4 788.8",
+ "width": 1000
+ },
+ "search": [
+ "user_menu_icon"
+ ]
+ },
+ {
+ "uid": "d3f621623139837ff2fb5fe09cf16994",
+ "css": "cart_menu_icon-1",
+ "code": 59416,
+ "src": "custom_icons",
+ "selected": true,
+ "svg": {
+ "path": "M367.1 624.3H972.6A33.2 33.2 0 0 0 1004.7 601.7L1138.2 164.7A29.6 29.6 0 0 0 1132.9 137.3 34.3 34.3 0 0 0 1106.3 124.9H289.9L266.3 24.5A33 33 0 0 0 233.7 0H33.4A32.4 32.4 0 0 0 0 31.2 32.4 32.4 0 0 0 33.4 62.4H206.9L327.4 569.6A93.8 93.8 0 0 0 267.1 655.5 97.1 97.1 0 0 0 367.2 749.1H972.6A31.3 31.3 0 1 0 972.6 686.7H367.2A31.3 31.3 0 1 1 367.2 624.3ZM1061.9 187.3L947.4 561.9H394L305 187.3ZM1061.9 187.3M315.3 894.6A105.4 105.4 0 1 0 420.7 789.2 105.4 105.4 0 0 0 315.3 894.6ZM420.7 859.4A35.2 35.2 0 1 1 385.6 894.6 35.2 35.2 0 0 1 420.7 859.4ZM420.7 859.4M735.4 894.6A105.4 105.4 0 1 0 840.9 789.2 105.4 105.4 0 0 0 735.4 894.6ZM840.9 859.4A35.2 35.2 0 1 1 805.7 894.6 35.2 35.2 0 0 1 840.9 859.4ZM840.9 859.4",
+ "width": 1140
+ },
+ "search": [
+ "cart_menu_icon"
+ ]
+ },
+ {
+ "uid": "6aac6f399374da0b9c4811b6a7110627",
+ "css": "categories_menu_icon-1",
+ "code": 59417,
+ "src": "custom_icons",
+ "selected": true,
+ "svg": {
+ "path": "M332.7 458.9H126.3A126.3 126.3 0 0 1 0 332.7V126.3A126.3 126.3 0 0 1 126.3 0H332.7A126.3 126.3 0 0 1 459 126.3V332.7A126.3 126.3 0 0 1 332.7 458.9ZM126.3 61.2A65.1 65.1 0 0 0 61.2 126.3V332.7A65.1 65.1 0 0 0 126.3 397.8H332.7A65.1 65.1 0 0 0 397.8 332.7V126.3A65.1 65.1 0 0 0 332.7 61.2ZM873.8 458.9H667.3A126.3 126.3 0 0 1 541 332.6V126.3A126.3 126.3 0 0 1 667.3 0H873.9A126.3 126.3 0 0 1 1000.2 126.3V332.7A126.3 126.3 0 0 1 873.8 458.9ZM667.3 61.2A65.1 65.1 0 0 0 602.2 126.3V332.7A65.1 65.1 0 0 0 667.3 397.8H873.9A65.1 65.1 0 0 0 938.9 332.7V126.3A65.1 65.1 0 0 0 873.9 61.3ZM332.7 999.9H126.3A126.3 126.3 0 0 1 0 873.7V667.3A126.3 126.3 0 0 1 126.3 541H332.7A126.3 126.3 0 0 1 459 667.3V873.9A126.3 126.3 0 0 1 332.7 999.9ZM126.3 602.2A65.1 65.1 0 0 0 61.2 667.3V873.9A65.1 65.1 0 0 0 126.3 938.8H332.7A65.1 65.1 0 0 0 397.8 873.8V667.3A65.1 65.1 0 0 0 332.7 602.3ZM873.8 999.9H667.3A126.3 126.3 0 0 1 541 873.7V667.3A126.3 126.3 0 0 1 667.3 541H873.8A126.3 126.3 0 0 1 1000.1 667.3V873.9A126.3 126.3 0 0 1 873.8 999.9ZM667.3 602.2A65.1 65.1 0 0 0 602.2 667.3V873.9A65.1 65.1 0 0 0 667.3 938.8H873.8A65.1 65.1 0 0 0 938.8 873.8V667.3A65.1 65.1 0 0 0 873.8 602.3Z",
+ "width": 1000
+ },
+ "search": [
+ "categories_menu_icon"
+ ]
+ },
+ {
+ "uid": "0a4cf1ff2671b9ea852d635e27df1e69",
+ "css": "hmg_logo_icon-1",
+ "code": 59418,
+ "src": "custom_icons",
+ "selected": true,
+ "svg": {
+ "path": "M146 835.7S180.9 835.5 205.5 835.5L392.2 836.4C414.4 836.4 433 812.7 434 778.5L434 622.5C434 589.3 448.9 563.3 472 561.7L529.2 561.2C552.3 562.7 568.1 588.9 568.1 622L568.1 778.9C569.2 813.1 584.7 835.5 607.1 835.5L858.4 836.1 858.8 643.3C858.8 610.2 842.9 584.4 819.8 583L718.8 582.5C696.5 582.5 678.9 558.9 677.9 524.7L677.5 472.6C678.6 438.4 696.4 414.8 718.7 414.8L820.2 415.1C843.3 413.6 858.3 386.4 858.3 353.3L858.5 112.8A102.4 102.4 0 0 1 780.8 161.4L610.2 161.4C587.9 161.4 569.4 185.7 568.3 219.9V374.6C567.2 408.8 549.8 432.9 527.5 432.9L475.8 432C453.4 432 435.6 408.6 434.5 374.7L434.5 218.4C433.4 184.3 415.6 161.2 393.4 161.2L145.6 161.2 145.6 353.4C145.6 386.6 161.2 413.1 184.3 414.7L285.8 414.3C308.8 415.8 325.1 443.2 325.1 476.2L324.8 520.7C324.8 553.8 309.1 580.4 286 581.9L184.3 581.7C161.2 583.3 145.6 609.5 145.6 642.6ZM999.3 99.1V902.8A102.2 102.2 0 0 1 896 1000H102.8A101.9 101.9 0 0 1 0 902.8L0 97.6A102.3 102.3 0 0 1 103 0L895.4 0.3A104 104 0 0 1 999.3 99.1Z",
+ "width": 999
+ },
+ "search": [
+ "hmg_logo_icon"
+ ]
+ },
+ {
+ "uid": "d19eb878f1dee49848276b6d0faa6602",
+ "css": "wishlist_menu_icon",
+ "code": 59411,
+ "src": "custom_icons",
+ "selected": false,
+ "svg": {
+ "path": "M877.6 0A394.8 394.8 0 0 0 600.7 112.2 394.8 394.8 0 0 0 323.8 0 332.4 332.4 0 0 0 0 349 515.4 515.4 0 0 0 138.3 679.5 1351.1 1351.1 0 0 0 580.3 995.3 46.9 46.9 0 0 0 621.1 995.3 1351.1 1351.1 0 0 0 1063.1 679.5 515.4 515.4 0 0 0 1201.4 349 332.5 332.5 0 0 0 877.6 0ZM991.8 618.5A1233.8 1233.8 0 0 1 600.7 900.8 1233.7 1233.7 0 0 1 209.5 618.5 418.4 418.4 0 0 1 93.8 349 239.1 239.1 0 0 1 323.8 93.8 297.2 297.2 0 0 1 500.6 150.7 283.5 283.5 0 0 1 562 209.5 46.5 46.5 0 0 0 600.5 230H600.5A46.9 46.9 0 0 0 639.1 209.3 301.2 301.2 0 0 1 877.2 93.8 239.2 239.2 0 0 1 1107.1 349 418.4 418.4 0 0 1 991.8 618.5Z",
+ "width": 1201
+ },
+ "search": [
+ "wishlist_menu_icon"
+ ]
}
]
}
\ No newline at end of file
diff --git a/assets/app_icons/fonts/DQIcons.ttf b/assets/app_icons/fonts/DQIcons.ttf
index bc92c83d..e0a15c88 100644
Binary files a/assets/app_icons/fonts/DQIcons.ttf and b/assets/app_icons/fonts/DQIcons.ttf differ
diff --git a/assets/images/new/Comprehensive checkup.svg b/assets/images/new/Comprehensive checkup.svg
new file mode 100644
index 00000000..b3f2feb1
--- /dev/null
+++ b/assets/images/new/Comprehensive checkup.svg
@@ -0,0 +1,6 @@
+
diff --git a/assets/images/new/Live Care.svg b/assets/images/new/Live Care.svg
new file mode 100644
index 00000000..b5a367d7
--- /dev/null
+++ b/assets/images/new/Live Care.svg
@@ -0,0 +1,11 @@
+
diff --git a/assets/images/new/blood donation.svg b/assets/images/new/blood donation.svg
new file mode 100644
index 00000000..95d0904f
--- /dev/null
+++ b/assets/images/new/blood donation.svg
@@ -0,0 +1,5 @@
+
diff --git a/assets/images/new/book appointment.svg b/assets/images/new/book appointment.svg
new file mode 100644
index 00000000..590ea8de
--- /dev/null
+++ b/assets/images/new/book appointment.svg
@@ -0,0 +1,5 @@
+
diff --git a/assets/images/new/child vaccines.svg b/assets/images/new/child vaccines.svg
new file mode 100644
index 00000000..d3f38a5e
--- /dev/null
+++ b/assets/images/new/child vaccines.svg
@@ -0,0 +1,89 @@
+
diff --git a/assets/images/new/covid drive thru.svg b/assets/images/new/covid drive thru.svg
new file mode 100644
index 00000000..563de151
--- /dev/null
+++ b/assets/images/new/covid drive thru.svg
@@ -0,0 +1,20 @@
+
diff --git a/assets/images/new/health calculator.svg b/assets/images/new/health calculator.svg
new file mode 100644
index 00000000..ac73e868
--- /dev/null
+++ b/assets/images/new/health calculator.svg
@@ -0,0 +1,15 @@
+
diff --git a/assets/images/new/health converter.svg b/assets/images/new/health converter.svg
new file mode 100644
index 00000000..961adc51
--- /dev/null
+++ b/assets/images/new/health converter.svg
@@ -0,0 +1,14 @@
+
diff --git a/assets/images/new/latest news.svg b/assets/images/new/latest news.svg
new file mode 100644
index 00000000..5b9cd805
--- /dev/null
+++ b/assets/images/new/latest news.svg
@@ -0,0 +1,17 @@
+
diff --git a/assets/images/new/medical file.svg b/assets/images/new/medical file.svg
new file mode 100644
index 00000000..0849b7a0
--- /dev/null
+++ b/assets/images/new/medical file.svg
@@ -0,0 +1,6 @@
+
diff --git a/assets/images/new/my family.svg b/assets/images/new/my family.svg
new file mode 100644
index 00000000..41d0b8a9
--- /dev/null
+++ b/assets/images/new/my family.svg
@@ -0,0 +1,47 @@
+
diff --git a/assets/images/new/not_found.svg b/assets/images/new/not_found.svg
new file mode 100644
index 00000000..80aed53a
--- /dev/null
+++ b/assets/images/new/not_found.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/images/new/parking details.svg b/assets/images/new/parking details.svg
new file mode 100644
index 00000000..dc25eb0e
--- /dev/null
+++ b/assets/images/new/parking details.svg
@@ -0,0 +1,9 @@
+
diff --git a/assets/images/new/reach us.svg b/assets/images/new/reach us.svg
new file mode 100644
index 00000000..b4634170
--- /dev/null
+++ b/assets/images/new/reach us.svg
@@ -0,0 +1,6 @@
+
diff --git a/assets/images/new/referral.svg b/assets/images/new/referral.svg
new file mode 100644
index 00000000..fb6b8591
--- /dev/null
+++ b/assets/images/new/referral.svg
@@ -0,0 +1,9 @@
+
diff --git a/assets/images/new/smart watch.svg b/assets/images/new/smart watch.svg
new file mode 100644
index 00000000..0667e31d
--- /dev/null
+++ b/assets/images/new/smart watch.svg
@@ -0,0 +1,12 @@
+
diff --git a/assets/images/new/todo.svg b/assets/images/new/todo.svg
new file mode 100644
index 00000000..be869c1d
--- /dev/null
+++ b/assets/images/new/todo.svg
@@ -0,0 +1,19 @@
+
diff --git a/assets/images/new/update insurance card.svg b/assets/images/new/update insurance card.svg
new file mode 100644
index 00000000..0139e27d
--- /dev/null
+++ b/assets/images/new/update insurance card.svg
@@ -0,0 +1,21 @@
+
diff --git a/assets/images/new/virtual tour.svg b/assets/images/new/virtual tour.svg
new file mode 100644
index 00000000..733f433e
--- /dev/null
+++ b/assets/images/new/virtual tour.svg
@@ -0,0 +1,9 @@
+
diff --git a/assets/images/pharmacy_module/bg_1.png b/assets/images/pharmacy_module/bg_1.png
index 9505e556..0155a7b3 100644
Binary files a/assets/images/pharmacy_module/bg_1.png and b/assets/images/pharmacy_module/bg_1.png differ
diff --git a/assets/images/pharmacy_module/bg_2.png b/assets/images/pharmacy_module/bg_2.png
index 96cfd3bc..0a1bc5cb 100644
Binary files a/assets/images/pharmacy_module/bg_2.png and b/assets/images/pharmacy_module/bg_2.png differ
diff --git a/assets/images/pharmacy_module/bg_3.png b/assets/images/pharmacy_module/bg_3.png
index 127c2669..3a28d5f9 100644
Binary files a/assets/images/pharmacy_module/bg_3.png and b/assets/images/pharmacy_module/bg_3.png differ
diff --git a/assets/images/pharmacy_module/bg_4.png b/assets/images/pharmacy_module/bg_4.png
index 423ab421..234ebe7b 100644
Binary files a/assets/images/pharmacy_module/bg_4.png and b/assets/images/pharmacy_module/bg_4.png differ
diff --git a/lib/config/config.dart b/lib/config/config.dart
index acb8d80a..a6565ecf 100644
--- a/lib/config/config.dart
+++ b/lib/config/config.dart
@@ -6,7 +6,7 @@ import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart';
const MAX_SMALL_SCREEN = 660;
// PACKAGES and OFFERS
-const EXA_CART_API_BASE_URL = 'http://10.200.101.75:9000';
+const EXA_CART_API_BASE_URL = 'http://10.50.100.217:1010/offersdiscounts'; // http://10.200.101.75:9000
const PACKAGES_CATEGORIES = '/api/categories';
const PACKAGES_PRODUCTS = '/api/products';
const PACKAGES_CUSTOMER = '/api/customers';
@@ -19,7 +19,7 @@ const BASE_URL = 'https://uat.hmgwebservices.com/';
// const BASE_PHARMACY_URL = 'https://uat.hmgwebservices.com/epharmacy/api/';
// const PHARMACY_BASE_URL = 'https://uat.hmgwebservices.com/epharmacy/api/';
-// Pharmacy Production URLs
+// // Pharmacy Production URLs
const BASE_PHARMACY_URL = 'https://mdlaboratories.com/exacartapi/api/';
const PHARMACY_BASE_URL = 'https://mdlaboratories.com/exacartapi/api/';
@@ -420,8 +420,8 @@ const TRANSFER_YAHALA_LOYALITY_POINTS = "Services/Patients.svc/REST/TransferYaHa
const LAKUM_GET_USER_TERMS_AND_CONDITIONS = "Services/ERP.svc/REST/GetUserTermsAndConditionsForEPharmcy";
const PRESCRIPTION = 'Services/Patients.svc/REST/GetPrescriptionApptList';
const GET_RECOMMENDED_PRODUCT = 'alsoProduct/';
-const GET_MOST_VIEWED_PRODUCTS = "mostview?";
-const GET_NEW_PRODUCTS = "newproducts?";
+const GET_MOST_VIEWED_PRODUCTS = "mostview";
+const GET_NEW_PRODUCTS = "newproducts";
// Home Health Care
const HHC_GET_ALL_SERVICES = "Services/Patients.svc/REST/PatientER_HHC_GetAllServices";
@@ -438,9 +438,19 @@ const PHARMACY_MAKE_REVIEW = 'epharmacy/api/insertreviews';
const BLOOD_DONATION_REGISTER_BLOOD_TYPE = 'Services/PatientVarification.svc/REST/BloodDonation_RegisterBloodType';
const ADD_USER_AGREEMENT_FOR_BLOOD_DONATION = 'Services/PatientVarification.svc/REST/AddUserAgreementForBloodDonation';
+// HHC RC SERVICES
+const HHC_GET_ALL_SERVICES_RC = "rc/api/HHC/getallhhc";
+const ADD_HHC_ORDER_RC = "rc/api/HHC/add";
+const GET_ALL_HHC_ORDERS_RC = 'rc/api/hhc/list';
+
// CMC RC SERVICES
const GET_ALL_CMC_SERVICES_RC = 'rc/api/cmc/getallcmc';
const ADD_CMC_ORDER_RC = 'rc/api/cmc/add';
+const GET_ALL_CMC_ORDERS_RC = 'rc/api/cmc/list';
+const UPDATE_CMC_ORDER_RC = 'rc/api/cmc/update';
+
+// RRT RC SERVICES
+const ADD_RRT_ORDER_RC = "rc/api/rrt/add";
//Pharmacy wishlist
const GET_WISHLIST = "shopping_cart_items/";
diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart
index 8c86993f..d9080ddb 100644
--- a/lib/config/localized_values.dart
+++ b/lib/config/localized_values.dart
@@ -105,13 +105,15 @@ const Map localizedValues = {
'add': {'en': 'Add', 'ar': 'إضافة'},
'reminder': {'en': 'Reminder', 'ar': 'تذكير'},
'location': {'en': 'Locations', 'ar': 'مواقعنا'},
- 'online': {'en': 'Online', 'ar': 'الالكترونية'},
+ 'online': {'en': 'Online', 'ar': 'الالكتروني'},
'payment': {'en': 'Payment', 'ar': 'الدفع'},
+ 'onlinePayment': {'en': 'Online', 'ar': 'الدفع'},
+ 'onlinePaymentSubtitle': {'en': 'Payment', 'ar': 'الالكتروني'},
'cancel-nocaps': {'en': 'Cancel', 'ar': 'الغاء'},
'set-reminder': {'en': 'Set Reminder', 'ar': 'إضافة تذكير'},
"national-id-number": {"en": "National ID Number", "ar": "رقم الهوية الوطنية / الاقامة"},
"medical-file-number": {"en": "Medical File Number", "ar": "رقم الملف الطبي"},
- 'login': {'en': 'Login', 'ar': 'تسجيل الدخول'},
+ 'login': {'en': 'Login', 'ar': 'دخول'},
'loginregister': {'en': 'Login / Register', 'ar': 'دخول/ تسجيل'},
'poweredBy': {'en': 'Powered by', 'ar': 'مشغل بواسطة'},
"welcome": {"en": "Welcome", "ar": "مرحبا"},
@@ -309,23 +311,24 @@ const Map localizedValues = {
"branch": {"en": "Branch:", "ar": "الفرع"},
"emergencyServices": {"en": "Emergency Services", "ar": "خدمات الطوارئ"},
"nearester": {"en": "Nearest ER", "ar": "أقرب طوارى"},
- "locationa": {"en": "location", "ar": "الموقع"},
+ "locationa": {"en": "Location", "ar": "الموقع"},
+ "call_now": {"en": "Call now", "ar": "اتصل الان"},
"ambulancerequest": {"en": "Ambulance", "ar": "طلب نقل "},
"requestA": {"en": "Request", "ar": "اسعاف"},
- "MyAppointments": {"en": "My", "ar": "مواعيدي"},
"NoBookedAppointments": {"en": "No Booked Appointments", "ar": "لا توجد مواعيد محجوزة"},
"NoConfirmedAppointments": {"en": "No Confirmed Appointments", "ar": "لا توجد مواعيد مؤكدة"},
"noArrivedAppointments": {"en": "No Arrived Appointments", "ar": "لم يتم حضورها"},
- "MyAppointmentsList": {"en": "Appointments", "ar": "قائمة بمواعيدي"},
+ "MyAppointmentsList": {"en": "Appointments", "ar": "بمواعيدي"},
+ "MyAppointments": {"en": "My", "ar": "قائمة"},
"Radiology": {"en": "Radiology", "ar": "الأشعة"},
"RadiologySubtitle": {"en": "Result", "ar": "صور وتقارير"},
- "Lab": {"en": "Lab", "ar": "تحليل المختبر"},
- "LabSubtitle": {"en": "Result", "ar": "نتائج"},
+ "Lab": {"en": "Lab", "ar": "نتائج"},
+ "LabSubtitle": {"en": "Results", "ar": "تحليل المختبر"},
"Medicines": {"en": "Medicines", "ar": "الوصفات"},
- "MedicinesSubtitle": {"en": "Prescriptions", "ar": "الوصفات الطبية"},
- "VitalSigns": {"en": "Vital Signs", "ar": "المؤشرات الحيوية"},
- "VitalSignsSubTitle": {"en": "Reports", "ar": "قراءات"},
- "MyMedical": {"en": "Active", "ar": "قراءات"},
+ "MedicinesSubtitle": {"en": "Prescriptions", "ar": "الطبية"},
+ "VitalSigns": {"en": "Vital Signs", "ar": "المؤشرات"},
+ "VitalSignsSubTitle": {"en": "Reports", "ar": "الحيوية"},
+ "MyMedical": {"en": "Active", "ar": "الأدوية"},
"MyMedicalSubtitle": {"en": "Medications", "ar": "النشطة"},
"MyDoctor": {"en": "My Doctor", "ar": "اطبائي"},
"MyDoctorSubtitle": {"en": "List", "ar": "قمت بزيارتهم"},
@@ -333,26 +336,26 @@ const Map localizedValues = {
"EyeSubtitle": {"en": "Measurement", "ar": "النظر"},
"Insurance": {"en": "Insurance", "ar": "بطاقات"},
"InsuranceSubtitle": {"en": "Card", "ar": "التأمين"},
- "UpdateInsurance": {"en": "Update Insurance", "ar": "تحديث التأمين"},
- "UpdateInsuranceSubtitle": {"en": "Card", "ar": "التأمين"},
- "InsuranceApproval": {"en": "Insurance Approval", "ar": "موافقات"},
- "InsuranceApprovalSubtitle": {"en": "Approvals", "ar": "موافقات التأمين"},
- "Allergies": {"en": "Allergies", "ar": "الحساسية"},
- "AllergiesSubtitle": {"en": "Diagnosed", "ar": "مسجلة"},
- "MyVaccines": {"en": "My Vaccines", "ar": "تطعيماتي"},
- "MyVaccinesSubtitle": {"en": "List", "ar": "قائمة"},
+ "UpdateInsurance": {"en": "Update", "ar": "تحديث"},
+ "UpdateInsuranceSubtitle": {"en": "Insurance", "ar": "التأمين"},
+ "InsuranceApproval": {"en": "Insurance", "ar": "موافقات"},
+ "InsuranceApprovalSubtitle": {"en": "Approvals", "ar": "التأمين"},
+ "Allergies": {"en": "Allergies", "ar": "قائمة"},
+ "AllergiesSubtitle": {"en": "List", "ar": "الحساسية"},
+ "MyVaccines": {"en": "My Vaccines", "ar": "قائمة"},
+ "MyVaccinesSubtitle": {"en": "List", "ar": "تطعيماتي"},
"Medical": {"en": "Medical", "ar": "التقارير"},
"MedicalSubtitle": {"en": "Report", "ar": "الطبية"},
- "Monthly": {"en": "Monthly", "ar": "تقارير"},
+ "Monthly": {"en": "Monthly", "ar": "التقارير"},
"MonthlySubtitle": {"en": "Report", "ar": "الشهرية"},
"Sick": {"en": "Sick", "ar": "الإجازات"},
"SickSubtitle": {"en": "Leaves", "ar": "المرضية"},
- "MyBalance": {"en": "My Balance", "ar": "رصيدي"},
- "MyBalanceSubtitle": {"en": "Credit", "ar": "المبالغ"},
+ "MyBalance": {"en": "My Balance", "ar": "رصيد"},
+ "MyBalanceSubtitle": {"en": "Credit", "ar": "محفظتي"},
"PatientCall": {"en": "Patient Call", "ar": "النداء للموعد"},
"PatientCallSubtitle": {"en": "Service", "ar": "خدمة"},
"SmartWatches": {"en": "Smart Watches", "ar": "الساعات الذكية"},
- "SmartWatchesSubtitle": {"en": "Pairing", "ar": "ربط البيانات"},
+ "SmartWatchesSubtitle": {"en": "Pairing", "ar": "ربط بيانات"},
"MyTrackers": {"en": "My Trackers", "ar": "تتبع قراءاتي"},
"MyTrackersSubtitle": {"en": "Service", "ar": "الطبية"},
"AskYour": {"en": "Ask Your", "ar": "إسال طبيبك"},
@@ -395,17 +398,19 @@ const Map localizedValues = {
"MyBalances": {"en": "My Balances", "ar": "رصيدي"},
"BalanceAmount": {"en": "Wallet Amount", "ar": "مبلغ المحفظة"},
"TotalBalance": {"en": "Total Amount", "ar": "المبلغ الإجمالي"},
- "CreateAdvancedPayment": {"en": "Recharge Wallet", "ar": "إعادة شحن المحفظة"},
+ "CreateAdvancedPayment": {"en": "Recharge Wallet", "ar": "شحن المحفظة"},
"AdvancePayment": {"en": "Advance Payment", "ar": "الدفع مقدما"},
"AdvancePaymentLabel": {"en": "You can create and add an Advanced Payment for your account or other accounts.", "ar": "يمكنك تحويل مبلغ لحسابك لدى المجموعة أو لحساب احد المراجعين"},
"FileNumber": {"en": "File Number", "ar": "رقم الملف"},
- "Amount": {"en": "Amount *", "ar": "الكمية *"},
+ "Amount": {"en": "Amount *", "ar": "المبلغ *"},
"DepositorEmail": {"en": "Depositor Email *", "ar": "البريد الإلكتروني للمودع *"},
"Notes": {"en": "Notes", "ar": "ملاحظات"},
"SelectPatientName": {"en": "Select Patient Name", "ar": "اختر اسم المريض"},
"SelectFamilyPatientName": {"en": "Family Members", "ar": "أفراد الأسرة"},
"SelectHospital": {"en": "Select Hospital", "ar": "اختر المستشفى"},
"selectCity": {"en": "Select City", "ar": "اختر المدينة"},
+ "city": {"en": "City", "ar": "مدينة"},
+ "distance": {"en": "Distance", "ar": "مسافه"},
"MyAccount": {"en": "My Account", "ar": "حسابي"},
"OtherAccount": {"en": "Other Account", "ar": "حساب آخر"},
"SelectBeneficiary": {"en": "Select Beneficiary", "ar": "حدد المستفيد"},
@@ -414,8 +419,9 @@ const Map localizedValues = {
"MobileNumber": {"en": "Mobile Number", "ar": "رقم الجوال"},
"phone-number": {"en": "Phone Number", "ar": "رقم الجوال"},
"country": {"en": "Country", "ar": "دولة"},
- "Ok": {"en": "Ok", "ar": "حسنا"},
+ "Ok": {"en": "Ok", "ar": "موافق"},
"averageWaitingTime": {"en": "Average Waiting Time:", "ar": "متوسط وقت الانتظار:"},
+ "waitingTime": {"en": "Waiting Time:", "ar": "وقت الانتظار:"},
"WaterConsumedInWeek": {"en": "Water consumed in a week", "ar": "معدل شرب الماء خلال الاسبوع"},
"WaterConsumedInMonth": {"en": "Water consumed in a month", "ar": "معدل شرب الماء خلال الشهر"},
"TheVerificationCodeExpiresIn": {"en": "The Verification Code Expires in", "ar": "تنتهي صلاحية رمز التحقق في"},
@@ -508,13 +514,13 @@ const Map localizedValues = {
"review": {"en": " reviews", "ar": "تقييمات"},
"viewMedicalFile": {"en": "View Details", "ar": "عرض الملف الطبي"},
"viewAllServices": {"en": "View All Services", "ar": "عرض جميع الخدمات"},
- "medicalFile": {"en": "Medical File", "ar": "ملف طبي"},
+ "medicalFile": {"en": "Medical File", "ar": "ملفي الطبي"},
"verified": {"en": "Verified", "ar": "تم التحقق"},
"checkup": {"en": "Checkup", "ar": "فحص"},
"hhcHome": {"en": "Home", "ar": "الرعاية"},
"refferal": {"en": "E-Refferal", "ar": "الإحالة الإلكترونية"},
"healthCare": {"en": "Health Care", "ar": "الصحية المزلية"},
- "emergency": {"en": "Emergency", "ar": "طارئ"},
+ "emergency": {"en": "Emergency", "ar": "الطوارئ"},
"cantSeeProfile": {"en": "Can’t see your medical File?", "ar": "لا تستطيع رؤية ملفك الطبي؟"},
"loginRegisterNow": {"en": "Login or Register Now", "ar": "تسجيل الدخول أو التسجيل الآن"},
"HMGPharmacy": {"en": "HMG Pharmacy", "ar": "صيدلية HMG"},
@@ -751,6 +757,8 @@ const Map localizedValues = {
"permissions": {"en": "Permission", "ar": "الصلاحيات"},
"camera-permission": {"en": "Camera", "ar": "الكاميرا"},
"location-permission": {"en": "Location", "ar": "تحديد المواقع"},
+ "needPrescription": {"en": "This product requires a prescription", "ar": " هذا المنتج يتطلب وصفة طبية"},
+ "outOfStockMsg": {"en": "You have added product which is out of stock now, Please remove that!", "ar": "لقد قمت بإضافة المنتج الذي نفذ من المخزون الآن. يرجى إزالة ذلك"},
"accessibility": {"en": "Accessibility Mode", "ar": "وضع امكانية الوصول"},
"orderStatus": {"en": "Order Status", "ar": "حالة الطلب"},
"CancelOrder": {"en": "Cancel Order", "ar": "الغاء الطلب"},
@@ -766,7 +774,7 @@ const Map localizedValues = {
"ResendOrder": {"en": "Refill Order & Delivery", "ar": "إعادة طلب و توصيل"},
"Ports": {"en": "Ports", "ar": "المنافذ"},
"Way": {"en": "Way", "ar": "الطريقة"},
- "Average": {"en": "Average", "ar": "المعدل"},
+ "Average": {"en": "Average", "ar": "متوسط"},
"DailyDoses": {"en": "Daily Doses", "ar": "جرعات يومية"},
"Period": {"en": "Period", "ar": "الفترة"},
"duration": {"en": "Duration", "ar": "المدة"},
@@ -835,8 +843,8 @@ const Map localizedValues = {
"report": {"en": "Radiology Report", "ar": "تقرير الاشعة"},
"open-rad": {"en": "Open Image", "ar": "فتح صور الاشعة"},
"send-copy": {"en": "Email the Report", "ar": "أرسل التقرير"},
- "appoSurvey": {"en": "Survey", "ar": "إستبيان"},
- "appoSurveySubtitle": {"en": "Survey", "ar": "إستبيان"},
+ "appoSurvey": {"en": "Survey", "ar": "الاستبيان"},
+ "appoSurveySubtitle": {"en": "Survey", "ar": "الاستبيان"},
"labResults": {"en": "Lab Results", "ar": "نتيجة المختبر"},
"doctorRating": {"en": "Doctor Rating", "ar": "تقييم الطبيب"},
"good": {"en": "Good", "ar": "جيد"},
@@ -1030,6 +1038,7 @@ const Map localizedValues = {
"quantitySize": {"en": "Quantity", "ar": "كميه"},
"addToCart": {"en": "Add to Cart", "ar": "إضف للسلة"},
"addToWishlist": {"en": "Add to Wishlist", "ar": "اضف للمفضلة"},
+ "removeFromWishlist": {"en": "Remove From Wishlist", "ar": "احذف للمفضلة"},
"noData": {"en": "There is no data", "ar": "لايوجد بيانات"},
"no_data": {"en": "No data", "ar": "لايوجد بيانات"},
"buyNow": {"en": "buy now", "ar": "إشتري الان"},
@@ -1357,8 +1366,8 @@ const Map localizedValues = {
"en": "This service allows you to make an online virtual consultation via video call directly with the doctor from anywhere at any time.",
"ar": "تتيح لك هذه الخدمة إجراء استشارة عبر مكالمة فيديو مباشرة مع الطبيب من أي مكان وفي أي وقت"
},
- "my-invoice": {"en": "My Invoice", "ar": "فواتيري"},
- "invoice-list": {"en": "Invoices List", "ar": "فائمة الفواتير"},
+ "my-invoice": {"en": "List", "ar": "فواتيري"},
+ "invoice-list": {"en": "My Invoice", "ar": "قائمة"},
"thisItemIsNotAvailable": {"en": "This item is not available", "ar": "هذا العنصر غير متوفر"},
"beforeAfterImages": {"en": "Before & After Images", "ar": "الصور قبل وبعد"},
"clinic-accept-livecare": {
@@ -1499,7 +1508,7 @@ const Map localizedValues = {
"selectSlot": {"en": "Please select Time Slot to continue", "ar": "الرجاء تحديد فترة زمنية للمتابعة"},
"years": {"en": "Years", "ar": "سنوات"},
"respirationBPM": {"en": "bpm", "ar": "نفس"},
- "extremeObese": {"en": "Extreme Obese", "ar": "السمنة المفرطة"},
+ "extremeObese": {"en": "Extreme Obese", "ar": "سمنة مفرطة"},
"invoiceDetails": {"en": "Invoice Details", "ar": "تفاصيل الفاتورة"},
"appoDetails": {"en": "Appointment Details", "ar": "تفاصيل الموعد"},
"appoPaymentConfirm": {"en": "Are you sure you Want to make payment for this appointment?", "ar": "هل أنت متأكد من أنك تريد سداد هذا الموعد؟"},
@@ -1523,4 +1532,34 @@ const Map localizedValues = {
"inPrgress": {"en": "In Progress", "ar": "في تقدم"},
"locked": {"en": "Locked", "ar": "مقفل"},
"personalInfo": {"en": "Personal Information", "ar": "معلومات شخصية"},
+ "cmcTitle": {"en": "Comprehensive", "ar": "خدمة"},
+ "cmcSubtitle": {"en": "Medical Checkup", "ar": "الفحص الشامل"},
+ "emergencyTitle": {"en": "Emergency", "ar": "خدمات"},
+ "emergencySubtitle": {"en": "Services", "ar": "الطوارئ"},
+ "ereferralTitle": {"en": "E-Referral", "ar": "خدمة"},
+ "ereferralSubtitle": {"en": "Service", "ar": "الإحالة الإلكترونية"},
+ "medicalFileTitle": {"en": "Medical File", 'ar': 'الملف الطبي'},
+ "My_File_Details": {"en": "My File Details", "ar": "تفاصيل ملفي"},
+ "Ecommerce": {"en": "Ecommerce", "ar": "التجارة الإلكترونية"},
+ "Family_Files": {"en": "Family Files", "ar": "ملفات العائلة"},
+ "My_Child": {"en": "My Child", "ar": "طفلي"},
+ "Vaccines": {"en": "Vaccines", "ar": "اللقاحات"},
+ "Todo": {"en": "Todo", "ar": "لكى يفعل"},
+ "List": {"en": "List", "ar": "قائمة"},
+ "Blood": {"en": "Blood", "ar": "دم"},
+ "Donation": {"en": "Donation", "ar": "هبة"},
+ "Health": {"en": "Health", "ar": "الصحة"},
+ "Calculator": {"en": "Calculator", "ar": "آلة حاسبة"},
+ "Converter": {"en": "Converter", "ar": "محول"},
+ "Smart": {"en": "Smart", "ar": "ذكي"},
+ "Watches": {"en": "Watches", "ar": "ساعات"},
+ "Parking": {"en": "Parking", "ar": "موقف سيارات"},
+ "Details": {"en": "Details", "ar": "تفاصيل"},
+ "Virtual": {"en": "Virtual", "ar": "افتراضية"},
+ "News": {"en": "News", "ar": "أخبار"},
+ "Latest": {"en": "Latest", "ar": "أحدث"},
+ "Tour": {"en": "Tour", "ar": "رحلة"},
+ "mostViewed": {"en": "Most Viewed", "ar": "الأكثر مشاهدة"},
+ "newProducts": {"en": "New Products", "ar": "منتجات جديدة"},
+ "paymentSelected": {"en": "Selected", "ar": "المحدد"},
};
diff --git a/lib/core/model/AlHabibMedicalService/ComprehensiveMedicalCheckup/GetCMCAllOrdersResponseModel.dart b/lib/core/model/AlHabibMedicalService/ComprehensiveMedicalCheckup/GetCMCAllOrdersResponseModel.dart
new file mode 100644
index 00000000..341d9e52
--- /dev/null
+++ b/lib/core/model/AlHabibMedicalService/ComprehensiveMedicalCheckup/GetCMCAllOrdersResponseModel.dart
@@ -0,0 +1,345 @@
+class GetCMCAllOrdersResponseModel {
+ int iD;
+ int patientId;
+ int patientOutSa;
+ bool isOutPatient;
+ int projectId;
+ int nearestProjectId;
+ dynamic longitude;
+ dynamic latitude;
+ dynamic appointmentNo;
+ dynamic dischargeId;
+ int statusId;
+ int serviceId;
+ int channel;
+ Orderpayment orderpayment;
+ dynamic orderselectedservice;
+ dynamic wforder;
+ dynamic orderapprovalobj;
+ String created;
+ dynamic createdBy;
+ dynamic modified;
+ dynamic modifiedBy;
+ bool isDeleted;
+ String statusText;
+ int paymentStatus;
+ dynamic clientRequestid;
+ dynamic paymentStatusText;
+ String projectName;
+ String nearestProjectName;
+ dynamic paymentAmount;
+ WFOrder wFOrder;
+ String serviceText;
+ bool isSentForApproval;
+ int exaCartOrderId;
+ bool isTimer;
+ int timeSeconds;
+ int totalPendingSeconds;
+ int timeMinute;
+ int timeHour;
+ int timeTotalSeconds;
+ int timeTotalMinute;
+ int timeTotalHour;
+ dynamic approvalStatus;
+ bool isActive;
+ int clickButton;
+ List procedures;
+ dynamic pickupLocation;
+ dynamic dropOffLocation;
+ dynamic clinicName;
+ dynamic doctorName;
+ dynamic branch;
+ dynamic time;
+ dynamic notes;
+
+ GetCMCAllOrdersResponseModel(
+ {this.iD,
+ this.patientId,
+ this.patientOutSa,
+ this.isOutPatient,
+ this.projectId,
+ this.nearestProjectId,
+ this.longitude,
+ this.latitude,
+ this.appointmentNo,
+ this.dischargeId,
+ this.statusId,
+ this.serviceId,
+ this.channel,
+ this.orderpayment,
+ this.orderselectedservice,
+ this.wforder,
+ this.orderapprovalobj,
+ this.created,
+ this.createdBy,
+ this.modified,
+ this.modifiedBy,
+ this.isDeleted,
+ this.statusText,
+ this.paymentStatus,
+ this.clientRequestid,
+ this.paymentStatusText,
+ this.projectName,
+ this.nearestProjectName,
+ this.paymentAmount,
+ this.wFOrder,
+ this.serviceText,
+ this.isSentForApproval,
+ this.exaCartOrderId,
+ this.isTimer,
+ this.timeSeconds,
+ this.totalPendingSeconds,
+ this.timeMinute,
+ this.timeHour,
+ this.timeTotalSeconds,
+ this.timeTotalMinute,
+ this.timeTotalHour,
+ this.approvalStatus,
+ this.isActive,
+ this.clickButton,
+ this.procedures,
+ this.pickupLocation,
+ this.dropOffLocation,
+ this.clinicName,
+ this.doctorName,
+ this.branch,
+ this.time,
+ this.notes});
+
+ GetCMCAllOrdersResponseModel.fromJson(Map json) {
+ iD = json['ID'];
+ patientId = json['PatientId'];
+ patientOutSa = json['PatientOutSa'];
+ isOutPatient = json['IsOutPatient'];
+ projectId = json['ProjectId'];
+ nearestProjectId = json['NearestProjectId'];
+ longitude = json['Longitude'];
+ latitude = json['Latitude'];
+ appointmentNo = json['AppointmentNo'];
+ dischargeId = json['DischargeId'];
+ statusId = json['StatusId'];
+ serviceId = json['ServiceId'];
+ channel = json['Channel'];
+ orderpayment = json['orderpayment'] != null
+ ? new Orderpayment.fromJson(json['orderpayment'])
+ : null;
+ orderselectedservice = json['orderselectedservice'];
+ wforder = json['wforder'];
+ orderapprovalobj = json['orderapprovalobj'];
+ created = json['Created'];
+ createdBy = json['CreatedBy'];
+ modified = json['Modified'];
+ modifiedBy = json['ModifiedBy'];
+ isDeleted = json['IsDeleted'];
+ statusText = json['StatusText'];
+ paymentStatus = json['PaymentStatus'];
+ clientRequestid = json['ClientRequestid'];
+ paymentStatusText = json['PaymentStatusText'];
+ projectName = json['ProjectName'];
+ nearestProjectName = json['NearestProjectName'];
+ paymentAmount = json['PaymentAmount'];
+ wFOrder = json['WF_order'] != null
+ ? new WFOrder.fromJson(json['WF_order'])
+ : null;
+ serviceText = json['ServiceText'];
+ isSentForApproval = json['isSentForApproval'];
+ exaCartOrderId = json['ExaCart_OrderId'];
+ isTimer = json['isTimer'];
+ timeSeconds = json['TimeSeconds'];
+ totalPendingSeconds = json['TotalPendingSeconds'];
+ timeMinute = json['TimeMinute'];
+ timeHour = json['TimeHour'];
+ timeTotalSeconds = json['TimeTotalSeconds'];
+ timeTotalMinute = json['TimeTotalMinute'];
+ timeTotalHour = json['TimeTotalHour'];
+ approvalStatus = json['ApprovalStatus'];
+ isActive = json['isActive'];
+ clickButton = json['ClickButton'];
+ pickupLocation = json['PickupLocation'];
+ dropOffLocation = json['DropOffLocation'];
+ clinicName = json['clinicName'];
+ doctorName = json['DoctorName'];
+ branch = json['Branch'];
+ time = json['Time'];
+ notes = json['Notes'];
+ }
+
+ Map toJson() {
+ final Map data = new Map();
+ data['ID'] = this.iD;
+ data['PatientId'] = this.patientId;
+ data['PatientOutSa'] = this.patientOutSa;
+ data['IsOutPatient'] = this.isOutPatient;
+ data['ProjectId'] = this.projectId;
+ data['NearestProjectId'] = this.nearestProjectId;
+ data['Longitude'] = this.longitude;
+ data['Latitude'] = this.latitude;
+ data['AppointmentNo'] = this.appointmentNo;
+ data['DischargeId'] = this.dischargeId;
+ data['StatusId'] = this.statusId;
+ data['ServiceId'] = this.serviceId;
+ data['Channel'] = this.channel;
+ if (this.orderpayment != null) {
+ data['orderpayment'] = this.orderpayment.toJson();
+ }
+ data['orderselectedservice'] = this.orderselectedservice;
+
+ data['wforder'] = this.wforder;
+ data['orderapprovalobj'] = this.orderapprovalobj;
+ data['Created'] = this.created;
+ data['CreatedBy'] = this.createdBy;
+ data['Modified'] = this.modified;
+ data['ModifiedBy'] = this.modifiedBy;
+ data['IsDeleted'] = this.isDeleted;
+ data['StatusText'] = this.statusText;
+ data['PaymentStatus'] = this.paymentStatus;
+ data['ClientRequestid'] = this.clientRequestid;
+ data['PaymentStatusText'] = this.paymentStatusText;
+ data['ProjectName'] = this.projectName;
+ data['NearestProjectName'] = this.nearestProjectName;
+ data['PaymentAmount'] = this.paymentAmount;
+ if (this.wFOrder != null) {
+ data['WF_order'] = this.wFOrder.toJson();
+ }
+ data['ServiceText'] = this.serviceText;
+ data['isSentForApproval'] = this.isSentForApproval;
+ data['ExaCart_OrderId'] = this.exaCartOrderId;
+ data['isTimer'] = this.isTimer;
+ data['TimeSeconds'] = this.timeSeconds;
+ data['TotalPendingSeconds'] = this.totalPendingSeconds;
+ data['TimeMinute'] = this.timeMinute;
+ data['TimeHour'] = this.timeHour;
+ data['TimeTotalSeconds'] = this.timeTotalSeconds;
+ data['TimeTotalMinute'] = this.timeTotalMinute;
+ data['TimeTotalHour'] = this.timeTotalHour;
+ data['ApprovalStatus'] = this.approvalStatus;
+ data['isActive'] = this.isActive;
+ data['ClickButton'] = this.clickButton;
+ data['PickupLocation'] = this.pickupLocation;
+ data['DropOffLocation'] = this.dropOffLocation;
+ data['clinicName'] = this.clinicName;
+ data['DoctorName'] = this.doctorName;
+ data['Branch'] = this.branch;
+ data['Time'] = this.time;
+ data['Notes'] = this.notes;
+ return data;
+ }
+}
+
+class Orderpayment {
+ int iD;
+ int orderId;
+ dynamic clientRequestId;
+ dynamic totalAmount;
+ int paymentStatus;
+ dynamic order;
+ String created;
+ dynamic createdBy;
+ dynamic modified;
+ dynamic modifiedBy;
+ bool isDeleted;
+
+ Orderpayment(
+ {this.iD,
+ this.orderId,
+ this.clientRequestId,
+ this.totalAmount,
+ this.paymentStatus,
+ this.order,
+ this.created,
+ this.createdBy,
+ this.modified,
+ this.modifiedBy,
+ this.isDeleted});
+
+ Orderpayment.fromJson(Map json) {
+ iD = json['ID'];
+ orderId = json['OrderId'];
+ clientRequestId = json['ClientRequestId'];
+ totalAmount = json['TotalAmount'];
+ paymentStatus = json['PaymentStatus'];
+ order = json['Order'];
+ created = json['Created'];
+ createdBy = json['CreatedBy'];
+ modified = json['Modified'];
+ modifiedBy = json['ModifiedBy'];
+ isDeleted = json['IsDeleted'];
+ }
+
+ Map toJson() {
+ final Map data = new Map();
+ data['ID'] = this.iD;
+ data['OrderId'] = this.orderId;
+ data['ClientRequestId'] = this.clientRequestId;
+ data['TotalAmount'] = this.totalAmount;
+ data['PaymentStatus'] = this.paymentStatus;
+ data['Order'] = this.order;
+ data['Created'] = this.created;
+ data['CreatedBy'] = this.createdBy;
+ data['Modified'] = this.modified;
+ data['ModifiedBy'] = this.modifiedBy;
+ data['IsDeleted'] = this.isDeleted;
+ return data;
+ }
+}
+
+class WFOrder {
+ dynamic wfButtonsDTO;
+ int iD;
+ int orderId;
+ int previousStep;
+ int nextStep;
+ int serviceId;
+ dynamic order;
+ String created;
+ dynamic createdBy;
+ dynamic modified;
+ dynamic modifiedBy;
+ bool isDeleted;
+
+ WFOrder(
+ {this.wfButtonsDTO,
+ this.iD,
+ this.orderId,
+ this.previousStep,
+ this.nextStep,
+ this.serviceId,
+ this.order,
+ this.created,
+ this.createdBy,
+ this.modified,
+ this.modifiedBy,
+ this.isDeleted});
+
+ WFOrder.fromJson(Map json) {
+ wfButtonsDTO = json['wf_ButtonsDTO'];
+ iD = json['ID'];
+ orderId = json['OrderId'];
+ previousStep = json['PreviousStep'];
+ nextStep = json['NextStep'];
+ serviceId = json['ServiceId'];
+ order = json['Order'];
+ created = json['Created'];
+ createdBy = json['CreatedBy'];
+ modified = json['Modified'];
+ modifiedBy = json['ModifiedBy'];
+ isDeleted = json['IsDeleted'];
+ }
+
+ Map toJson() {
+ final Map data = new Map();
+ data['wf_ButtonsDTO'] = this.wfButtonsDTO;
+ data['ID'] = this.iD;
+ data['OrderId'] = this.orderId;
+ data['PreviousStep'] = this.previousStep;
+ data['NextStep'] = this.nextStep;
+ data['ServiceId'] = this.serviceId;
+ data['Order'] = this.order;
+ data['Created'] = this.created;
+ data['CreatedBy'] = this.createdBy;
+ data['Modified'] = this.modified;
+ data['ModifiedBy'] = this.modifiedBy;
+ data['IsDeleted'] = this.isDeleted;
+ return data;
+ }
+}
diff --git a/lib/core/model/AlHabibMedicalService/ComprehensiveMedicalCheckup/cmc_insert_pres_order_request_model.dart b/lib/core/model/AlHabibMedicalService/ComprehensiveMedicalCheckup/cmc_insert_pres_order_request_model.dart
index 8cece1f5..7c621f35 100644
--- a/lib/core/model/AlHabibMedicalService/ComprehensiveMedicalCheckup/cmc_insert_pres_order_request_model.dart
+++ b/lib/core/model/AlHabibMedicalService/ComprehensiveMedicalCheckup/cmc_insert_pres_order_request_model.dart
@@ -73,12 +73,10 @@ class CMCInsertPresOrderRequestModel {
data['LanguageID'] = this.languageID;
data['IPAdress'] = this.iPAdress;
data['generalid'] = this.generalid;
- data['patientOutSa'] = this.patientOutSA;
data['isOutPatient'] = this.patientOutSA == 0 ? false : true;
data['SessionID'] = this.sessionID;
data['isDentalAllowedBackend'] = this.isDentalAllowedBackend;
data['DeviceTypeID'] = this.deviceTypeID;
- data['patientId'] = this.patientID.toString();
data['TokenID'] = this.tokenID;
data['PatientTypeID'] = this.patientTypeID;
data['PatientType'] = this.patientType;
diff --git a/lib/core/model/AlHabibMedicalService/ComprehensiveMedicalCheckup/get_cmc_service_response_model.dart b/lib/core/model/AlHabibMedicalService/ComprehensiveMedicalCheckup/get_cmc_service_response_model.dart
index 42d2fb99..335366cd 100644
--- a/lib/core/model/AlHabibMedicalService/ComprehensiveMedicalCheckup/get_cmc_service_response_model.dart
+++ b/lib/core/model/AlHabibMedicalService/ComprehensiveMedicalCheckup/get_cmc_service_response_model.dart
@@ -1,5 +1,5 @@
class GetCMCServicesResponseModel {
- int id;
+ int iD;
String serviceID;
int orderServiceID;
String text;
@@ -12,7 +12,7 @@ class GetCMCServicesResponseModel {
int quantity;
GetCMCServicesResponseModel(
- {this.id,
+ {this.iD,
this.serviceID,
this.orderServiceID,
this.text,
@@ -25,32 +25,32 @@ class GetCMCServicesResponseModel {
this.quantity});
GetCMCServicesResponseModel.fromJson(Map json) {
- id = json['id'];
- serviceID = json['serviceID'];
- orderServiceID = json['orderServiceID'];
- text = json['text'];
- textN = json['textN'];
- price = json['price'];
- priceVAT = json['priceVAT'];
- priceTotal = json['priceTotal'];
- isEnabled = json['isEnabled'];
- orderId = json['orderId'];
- quantity = json['quantity'];
+ iD = json['ID'];
+ serviceID = json['ServiceID'];
+ orderServiceID = json['OrderServiceID'];
+ text = json['Text'];
+ textN = json['TextN'];
+ price = json['Price'];
+ priceVAT = json['PriceVAT'];
+ priceTotal = json['PriceTotal'];
+ isEnabled = json['IsEnabled'];
+ orderId = json['OrderId'];
+ quantity = json['Quantity'];
}
Map toJson() {
final Map data = new Map();
- data['id'] = this.id;
- data['serviceID'] = this.serviceID;
- data['orderServiceID'] = this.orderServiceID;
- data['text'] = this.text;
- data['textN'] = this.textN;
- data['price'] = this.price;
- data['priceVAT'] = this.priceVAT;
- data['priceTotal'] = this.priceTotal;
- data['isEnabled'] = this.isEnabled;
- data['orderId'] = this.orderId;
- data['quantity'] = this.quantity;
+ data['ID'] = this.iD;
+ data['ServiceID'] = this.serviceID;
+ data['OrderServiceID'] = this.orderServiceID;
+ data['Text'] = this.text;
+ data['TextN'] = this.textN;
+ data['Price'] = this.price;
+ data['PriceVAT'] = this.priceVAT;
+ data['PriceTotal'] = this.priceTotal;
+ data['IsEnabled'] = this.isEnabled;
+ data['OrderId'] = this.orderId;
+ data['Quantity'] = this.quantity;
return data;
}
}
diff --git a/lib/core/model/AlHabibMedicalService/HomeHealthCare/HHC_get_all_services_response_model.dart b/lib/core/model/AlHabibMedicalService/HomeHealthCare/HHC_get_all_services_response_model.dart
index e2f39733..bc5c4b97 100644
--- a/lib/core/model/AlHabibMedicalService/HomeHealthCare/HHC_get_all_services_response_model.dart
+++ b/lib/core/model/AlHabibMedicalService/HomeHealthCare/HHC_get_all_services_response_model.dart
@@ -1,32 +1,56 @@
class HHCGetAllServicesResponseModel {
int iD;
- int serviceID;
- String description;
- String descriptionN;
- bool isActive;
+ String serviceID;
+ int orderServiceID;
+ String text;
+ String textN;
+ dynamic price;
+ dynamic priceVAT;
+ dynamic priceTotal;
+ bool isEnabled;
+ int orderId;
+ int quantity;
HHCGetAllServicesResponseModel(
{this.iD,
this.serviceID,
- this.description,
- this.descriptionN,
- this.isActive});
+ this.orderServiceID,
+ this.text,
+ this.textN,
+ this.price,
+ this.priceVAT,
+ this.priceTotal,
+ this.isEnabled,
+ this.orderId,
+ this.quantity});
HHCGetAllServicesResponseModel.fromJson(Map json) {
iD = json['ID'];
serviceID = json['ServiceID'];
- description = json['Description'];
- descriptionN = json['DescriptionN'];
- isActive = json['IsActive'];
+ orderServiceID = json['OrderServiceID'];
+ text = json['Text'];
+ textN = json['TextN'];
+ price = json['Price'];
+ priceVAT = json['PriceVAT'];
+ priceTotal = json['PriceTotal'];
+ isEnabled = json['IsEnabled'];
+ orderId = json['OrderId'];
+ quantity = json['Quantity'];
}
Map toJson() {
final Map data = new Map();
data['ID'] = this.iD;
data['ServiceID'] = this.serviceID;
- data['Description'] = this.description;
- data['DescriptionN'] = this.descriptionN;
- data['IsActive'] = this.isActive;
+ data['OrderServiceID'] = this.orderServiceID;
+ data['Text'] = this.text;
+ data['TextN'] = this.textN;
+ data['Price'] = this.price;
+ data['PriceVAT'] = this.priceVAT;
+ data['PriceTotal'] = this.priceTotal;
+ data['IsEnabled'] = this.isEnabled;
+ data['OrderId'] = this.orderId;
+ data['Quantity'] = this.quantity;
return data;
}
}
diff --git a/lib/core/model/AlHabibMedicalService/HomeHealthCare/PatientERHHCInsertServicesList.dart b/lib/core/model/AlHabibMedicalService/HomeHealthCare/PatientERHHCInsertServicesList.dart
index bc5a4ddf..0fe85c6a 100644
--- a/lib/core/model/AlHabibMedicalService/HomeHealthCare/PatientERHHCInsertServicesList.dart
+++ b/lib/core/model/AlHabibMedicalService/HomeHealthCare/PatientERHHCInsertServicesList.dart
@@ -16,7 +16,7 @@ class PatientERHHCInsertServicesList {
Map toJson() {
final Map data = new Map();
data['RecordID'] = this.recordID;
- data['ServiceID'] = this.serviceID;
+ data['ServiceID'] = this.serviceID.toString();
data['ServiceName'] = this.serviceName;
return data;
}
diff --git a/lib/core/model/AlHabibMedicalService/HomeHealthCare/patient_er_insert_pres_order_request_model.dart b/lib/core/model/AlHabibMedicalService/HomeHealthCare/patient_er_insert_pres_order_request_model.dart
index 6987ee44..bc57a88f 100644
--- a/lib/core/model/AlHabibMedicalService/HomeHealthCare/patient_er_insert_pres_order_request_model.dart
+++ b/lib/core/model/AlHabibMedicalService/HomeHealthCare/patient_er_insert_pres_order_request_model.dart
@@ -76,7 +76,8 @@ class PatientERInsertPresOrderRequestModel {
data['LanguageID'] = this.languageID;
data['IPAdress'] = this.iPAdress;
data['generalid'] = this.generalid;
- data['PatientOutSA'] = this.patientOutSA;
+ data['isOutPatient'] = this.patientOutSA == 0 ? false : true;
+ // data['PatientOutSA'] = this.patientOutSA;
data['SessionID'] = this.sessionID;
data['isDentalAllowedBackend'] = this.isDentalAllowedBackend;
data['DeviceTypeID'] = this.deviceTypeID;
@@ -84,12 +85,12 @@ class PatientERInsertPresOrderRequestModel {
data['TokenID'] = this.tokenID;
data['PatientTypeID'] = this.patientTypeID;
data['PatientType'] = this.patientType;
- data['Latitude'] = this.latitude;
- data['Longitude'] = this.longitude;
- data['CreatedBy'] = this.createdBy;
+ data['latitude'] = this.latitude;
+ data['longitude'] = this.longitude;
+ // data['CreatedBy'] = this.createdBy;
data['OrderServiceID'] = this.orderServiceID;
if (this.patientERHHCInsertServicesList != null) {
- data['PatientER_HHC_InsertServicesList'] =
+ data['procedures'] =
this.patientERHHCInsertServicesList.map((v) => v.toJson()).toList();
}
return data;
diff --git a/lib/core/model/AlHabibMedicalService/HomeHealthCare/update_pres_oreder_request_model.dart b/lib/core/model/AlHabibMedicalService/HomeHealthCare/update_pres_oreder_request_model.dart
index 3b0ef151..68be644d 100644
--- a/lib/core/model/AlHabibMedicalService/HomeHealthCare/update_pres_oreder_request_model.dart
+++ b/lib/core/model/AlHabibMedicalService/HomeHealthCare/update_pres_oreder_request_model.dart
@@ -71,7 +71,8 @@ class UpdatePresOrderRequestModel {
data['TokenID'] = this.tokenID;
data['PatientTypeID'] = this.patientTypeID;
data['PatientType'] = this.patientType;
- data['PresOrderID'] = this.presOrderID;
+ data['Id'] = this.presOrderID;
+ data['ClickButton'] = 14;
data['PresOrderStatus'] = this.presOrderStatus;
data['EditedBy'] = this.editedBy;
data['RejectionReason'] = this.rejectionReason;
diff --git a/lib/core/model/pharmacies/PharmacyProduct.dart b/lib/core/model/pharmacies/PharmacyProduct.dart
index f69d035b..dbef5737 100644
--- a/lib/core/model/pharmacies/PharmacyProduct.dart
+++ b/lib/core/model/pharmacies/PharmacyProduct.dart
@@ -108,10 +108,10 @@ class PharmacyProduct {
List manufacturerIds;
List reviews;
List images;
- List attributes;
+ List attributes;
List specifications;
- List associatedProductIds;
- List tags;
+ List associatedProductIds;
+ List tags;
int vendorId;
String seName;
@@ -367,7 +367,7 @@ class PharmacyProduct {
});
}
if (json['attributes'] != null) {
- attributes = new List();
+ attributes = new List();
json['attributes'].forEach((v) {
attributes.add(v);
});
diff --git a/lib/core/model/pharmacies/ShoppingCartResponse.dart b/lib/core/model/pharmacies/ShoppingCartResponse.dart
index 96b751ae..332f63b6 100644
--- a/lib/core/model/pharmacies/ShoppingCartResponse.dart
+++ b/lib/core/model/pharmacies/ShoppingCartResponse.dart
@@ -1,7 +1,7 @@
import 'package:diplomaticquarterapp/core/model/pharmacies/ShoppingCart.dart';
import 'package:flutter/material.dart';
-class ShoppingCartResponse with ChangeNotifier {
+class ShoppingCartResponse {
int itemCount;
int quantityCount;
double subtotal;
@@ -11,17 +11,15 @@ class ShoppingCartResponse with ChangeNotifier {
List shoppingCarts;
ShoppingCartResponse(
- {this.itemCount,
- this.quantityCount,
- this.subtotal,
- this.subtotalWithVat,
- this.subtotalVatAmount,
- this.subtotalVatRate,
+ {this.itemCount =0,
+ this.quantityCount =0,
+ this.subtotal=0.0,
+ this.subtotalWithVat = 0.0,
+ this.subtotalVatAmount = 0.0,
+ this.subtotalVatRate = 0.0 ,
this.shoppingCarts});
- void updateShoppingCard() {
- notifyListeners();
- }
+
ShoppingCartResponse.fromJson(Map json) {
itemCount = json['item_count'];
diff --git a/lib/core/model/pharmacies/payment-checkout-data.dart b/lib/core/model/pharmacies/payment-checkout-data.dart
index dd9e0e54..5d91c829 100644
--- a/lib/core/model/pharmacies/payment-checkout-data.dart
+++ b/lib/core/model/pharmacies/payment-checkout-data.dart
@@ -5,7 +5,7 @@ import 'package:flutter/material.dart';
import 'ShippingOption.dart';
-class PaymentCheckoutData with ChangeNotifier{
+class PaymentCheckoutData {
Addresses address;
PaymentOption paymentOption;
LacumAccountInformation lacumInformation;
@@ -15,7 +15,5 @@ class PaymentCheckoutData with ChangeNotifier{
PaymentCheckoutData({this.address, this.paymentOption, this.lacumInformation, this.cartDataVisible = false, this.shippingOption, this.usedLakumPoints = 0});
- void updateData() {
- notifyListeners();
- }
+
}
diff --git a/lib/core/service/AlHabibMedicalService/cmc_service.dart b/lib/core/service/AlHabibMedicalService/cmc_service.dart
index b79b6fdb..7fc23cc9 100644
--- a/lib/core/service/AlHabibMedicalService/cmc_service.dart
+++ b/lib/core/service/AlHabibMedicalService/cmc_service.dart
@@ -1,12 +1,12 @@
import 'package:diplomaticquarterapp/config/config.dart';
import 'package:diplomaticquarterapp/core/enum/OrderService.dart';
+import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/ComprehensiveMedicalCheckup/GetCMCAllOrdersResponseModel.dart';
import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/ComprehensiveMedicalCheckup/cmc_get_items_request_model.dart';
import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/ComprehensiveMedicalCheckup/cmc_get_items_response_model.dart';
import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/ComprehensiveMedicalCheckup/cmc_insert_pres_order_request_model.dart';
import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/ComprehensiveMedicalCheckup/get_cmc_service_request_model.dart';
import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/ComprehensiveMedicalCheckup/get_cmc_service_response_model.dart';
import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/HomeHealthCare/get_hHC_all_pres_orders_request_model.dart';
-import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/HomeHealthCare/get_hhc_all_pres_orders_response_model.dart';
import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/HomeHealthCare/get_order_detail_by_order_iD_request_model.dart';
import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/HomeHealthCare/get_order_detail_by_order_iD_response_model.dart';
import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/HomeHealthCare/update_pres_oreder_request_model.dart';
@@ -15,7 +15,7 @@ import '../base_service.dart';
class CMCService extends BaseService {
List cmcAllServicesList = List();
- List cmcAllPresOrdersList = List();
+ List cmcAllPresOrdersList = List();
List cmcAllOrderDetail = List();
List checkupItemsList = List();
@@ -30,7 +30,7 @@ class CMCService extends BaseService {
// RC IMPLEMENTATION
await baseAppClient.post(GET_ALL_CMC_SERVICES_RC + "?patientID=" + user.patientID.toString(), isAllowAny: true, onSuccess: (dynamic response, int statusCode) {
cmcAllServicesList.clear();
- response.forEach((data) {
+ response['response'].forEach((data) {
cmcAllServicesList.add(GetCMCServicesResponseModel.fromJson(data));
});
}, onFailure: (String error, int statusCode) {
@@ -55,8 +55,8 @@ class CMCService extends BaseService {
await baseAppClient.post(GET_PATIENT_ALL_PRES_ORDERS, onSuccess: (dynamic response, int statusCode) {
cmcAllPresOrdersList.clear();
cmcAllOrderDetail.clear();
- response['PatientER_GetPatientAllPresOrdersList'].forEach((data) {
- if (data['ServiceID'] == OrderService.Comprehensive_Medical_Checkup.getIdOrderService()) cmcAllPresOrdersList.add(GetHHCAllPresOrdersResponseModel.fromJson(data));
+ response['response'].forEach((data) {
+ if (data['ServiceID'] == OrderService.Comprehensive_Medical_Checkup.getIdOrderService()) cmcAllPresOrdersList.add(GetCMCAllOrdersResponseModel.fromJson(data));
});
}, onFailure: (String error, int statusCode) {
hasError = true;
@@ -64,6 +64,26 @@ class CMCService extends BaseService {
}, body: getHHCAllPresOrdersRequestModel.toJson());
}
+ Future getCmcAllPresOrdersRC() async {
+ GetHHCAllPresOrdersRequestModel getHHCAllPresOrdersRequestModel = GetHHCAllPresOrdersRequestModel();
+ hasError = false;
+ await baseAppClient.post(GET_ALL_CMC_ORDERS_RC, onSuccess: (dynamic response, int statusCode) {
+ cmcAllPresOrdersList.clear();
+ cmcAllOrderDetail.clear();
+
+ response['response'].forEach((data) {
+ cmcAllPresOrdersList.add(GetCMCAllOrdersResponseModel.fromJson(data));
+ });
+
+ // response['PatientER_GetPatientAllPresOrdersList'].forEach((data) {
+ // if (data['ServiceID'] == OrderService.Comprehensive_Medical_Checkup.getIdOrderService()) cmcAllPresOrdersList.add(GetHHCAllPresOrdersResponseModel.fromJson(data));
+ // });
+ }, onFailure: (String error, int statusCode) {
+ hasError = true;
+ super.error = error;
+ }, body: getHHCAllPresOrdersRequestModel.toJson());
+ }
+
Future getOrderDetailByOrderID(GetOrderDetailByOrderIDRequestModel getOrderDetailByOrderIDRequestModel) async {
hasError = false;
await baseAppClient.post(GET_CMC_ORDER_DETAIL_BY_ID, onSuccess: (dynamic response, int statusCode) {
@@ -100,12 +120,22 @@ class CMCService extends BaseService {
}, body: updatePresOrderRequestModel.toJson());
}
+ Future updateCmcPresOrderRC(UpdatePresOrderRequestModel updatePresOrderRequestModel) async {
+ hasError = false;
+ await baseAppClient.post(UPDATE_CMC_ORDER_RC, onSuccess: (dynamic response, int statusCode) {
+ isOrderUpdated = true;
+ }, onFailure: (String error, int statusCode) {
+ hasError = true;
+ super.error = error;
+ }, body: updatePresOrderRequestModel.toJson());
+ }
+
Future insertCMCOrderRC({CMCInsertPresOrderRequestModel order}) async {
hasError = false;
String reqId = "";
await baseAppClient.post(ADD_CMC_ORDER_RC, onSuccess: (dynamic response, int statusCode) {
isOrderUpdated = true;
- reqId = response['RequestNo'].toString();
+ reqId = response['response'].toString();
}, onFailure: (String error, int statusCode) {
hasError = true;
super.error = error;
diff --git a/lib/core/service/AlHabibMedicalService/home_health_care_service.dart b/lib/core/service/AlHabibMedicalService/home_health_care_service.dart
index 5c0b13f4..00d44f6a 100644
--- a/lib/core/service/AlHabibMedicalService/home_health_care_service.dart
+++ b/lib/core/service/AlHabibMedicalService/home_health_care_service.dart
@@ -1,5 +1,6 @@
import 'package:diplomaticquarterapp/config/config.dart';
import 'package:diplomaticquarterapp/core/enum/OrderService.dart';
+import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/ComprehensiveMedicalCheckup/GetCMCAllOrdersResponseModel.dart';
import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/HomeHealthCare/HHC_get_all_services_request_modle.dart';
import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/HomeHealthCare/HHC_get_all_services_response_model.dart';
import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/HomeHealthCare/get_hHC_all_pres_orders_request_model.dart';
@@ -13,7 +14,7 @@ import '../base_service.dart';
class HomeHealthCareService extends BaseService {
List hhcAllServicesList = List();
- List hhcAllPresOrdersList = List();
+ List hhcAllPresOrdersList = List();
List hhcAllOrderDetail = List();
List addressesList = List();
@@ -21,6 +22,7 @@ class HomeHealthCareService extends BaseService {
bool isOrderUpdated;
CustomerInfo customerInfo;
int requestNo;
+
Future getHHCAllServices(HHCGetAllServicesRequestModel hHCGetAllServicesRequestModel) async {
hasError = false;
await baseAppClient.post(HHC_GET_ALL_SERVICES, onSuccess: (dynamic response, int statusCode) {
@@ -34,14 +36,42 @@ class HomeHealthCareService extends BaseService {
}, body: hHCGetAllServicesRequestModel.toJson());
}
+ Future getHHCAllServicesRC(HHCGetAllServicesRequestModel hHCGetAllServicesRequestModel) async {
+ hasError = false;
+ await baseAppClient.post(HHC_GET_ALL_SERVICES_RC + "?PatientID=" + user.patientID.toString(), onSuccess: (dynamic response, int statusCode) {
+ hhcAllServicesList.clear();
+ response['response'].forEach((data) {
+ hhcAllServicesList.add(HHCGetAllServicesResponseModel.fromJson(data));
+ });
+ }, onFailure: (String error, int statusCode) {
+ hasError = true;
+ super.error = error;
+ }, body: hHCGetAllServicesRequestModel.toJson());
+ }
+
+ Future getHHCAllPresOrdersRC() async {
+ GetHHCAllPresOrdersRequestModel getHHCAllPresOrdersRequestModel = GetHHCAllPresOrdersRequestModel();
+ hasError = false;
+ await baseAppClient.post(GET_ALL_HHC_ORDERS_RC, onSuccess: (dynamic response, int statusCode) {
+ hhcAllPresOrdersList.clear();
+ hhcAllOrderDetail.clear();
+ response['response'].forEach((data) {
+ hhcAllPresOrdersList.add(GetCMCAllOrdersResponseModel.fromJson(data));
+ });
+ }, onFailure: (String error, int statusCode) {
+ hasError = true;
+ super.error = error;
+ }, body: getHHCAllPresOrdersRequestModel.toJson());
+ }
+
Future getHHCAllPresOrders() async {
GetHHCAllPresOrdersRequestModel getHHCAllPresOrdersRequestModel = GetHHCAllPresOrdersRequestModel();
hasError = false;
await baseAppClient.post(GET_PATIENT_ALL_PRES_ORD, onSuccess: (dynamic response, int statusCode) {
hhcAllPresOrdersList.clear();
- response['PatientER_GetPatientAllPresOrdersList'].forEach((data) {
- if (data['ServiceID'] == OrderService.HOME_HEALTH_CARE.getIdOrderService()) hhcAllPresOrdersList.add(GetHHCAllPresOrdersResponseModel.fromJson(data));
- });
+ // response['PatientER_GetPatientAllPresOrdersList'].forEach((data) {
+ // if (data['ServiceID'] == OrderService.HOME_HEALTH_CARE.getIdOrderService()) hhcAllPresOrdersList.add(GetHHCAllPresOrdersResponseModel.fromJson(data));
+ // });
}, onFailure: (String error, int statusCode) {
hasError = true;
super.error = error;
@@ -84,4 +114,15 @@ class HomeHealthCareService extends BaseService {
super.error = error;
}, body: order.toJson());
}
+
+ Future insertHHCOrderRC({PatientERInsertPresOrderRequestModel order}) async {
+ hasError = false;
+ await baseAppClient.post(ADD_HHC_ORDER_RC, onSuccess: (dynamic response, int statusCode) {
+ hhcResponse = response;
+ requestNo = response["response"];
+ }, onFailure: (String error, int statusCode) {
+ hasError = true;
+ super.error = error;
+ }, body: order.toJson());
+ }
}
diff --git a/lib/core/service/client/base_app_client.dart b/lib/core/service/client/base_app_client.dart
index ac96e35e..0dd5c750 100644
--- a/lib/core/service/client/base_app_client.dart
+++ b/lib/core/service/client/base_app_client.dart
@@ -29,7 +29,8 @@ AppSharedPreferences sharedPref = new AppSharedPreferences();
/// onFailure: (String error, int statusCode) {},
/// body: Map();
///
-AuthenticatedUserObject authenticatedUserObject = locator();
+AuthenticatedUserObject authenticatedUserObject =
+ locator();
VitalSignService _vitalSignService = locator();
class BaseAppClient {
@@ -113,18 +114,8 @@ class BaseAppClient {
}
}
- // For RC Services
- // if(body.containsKey("patientId"))
- // body.remove("PatientID");
- //
- // if(body.containsKey("patientOutSa"))
- // body.remove("PatientOutSA");
- //
// body['PatientID'] = 1018977;
// body['TokenID'] = "@dm!n";
- // body['IdentificationNo'] = "1009199553";
- // body['MobileNo'] = "966545156035";
- // body['PatientMobileNumber'] = "966545156035";
print("URL : $url");
final jsonBody = json.encode(body);
@@ -162,12 +153,12 @@ class BaseAppClient {
} else if (parsed['Result'] == 'OK') {
onSuccess(parsed, statusCode);
} else {
- if (parsed != null) {
- onSuccess(parsed, statusCode);
- } else {
+ // if (parsed != null) {
+ // onSuccess(parsed, statusCode);
+ // } else {
onFailure(parsed['ErrorEndUserMessage'] ?? parsed['ErrorMessage'], statusCode);
- logout();
- }
+ // logout();
+ // }
}
} else if (parsed['MessageStatus'] == 1 || parsed['SMSLoginRequired'] == true) {
onSuccess(parsed, statusCode);
@@ -445,13 +436,14 @@ class BaseAppClient {
'Mobilenumber': user != null ? Utils.getPhoneNumberWithoutZero(user['MobileNumber'].toString()) : "",
'Statictoken': 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9',
'Username': user != null ? user['PatientID'].toString() : "",
+ 'Host': "mdlaboratories.com",
});
final int statusCode = response.statusCode;
print("statusCode :$statusCode");
if (statusCode < 200 || statusCode >= 400 || json == null) {
if (statusCode == 401) {
- AppToast.showErrorToast(message: TranslationBase.of(AppGlobal.context).pharmacyRelogin);
+ onFailure(TranslationBase.of(AppGlobal.context).pharmacyRelogin, statusCode);
Navigator.of(AppGlobal.context).pushNamed(HOME);
} else {
onFailure('Error While Fetching data', statusCode);
@@ -706,7 +698,8 @@ class BaseAppClient {
final int statusCode = response.statusCode;
print("statusCode :$statusCode");
if (statusCode < 200 || statusCode >= 400 || json == null) {
- onFailure('Error While Fetching data', statusCode);
+ var parsed = json.decode(utf8.decode(response.bodyBytes));
+ onFailure(parsed['error']['ErrorEndUserMsg'] ??'Error While Fetching data', statusCode);
} else {
// var parsed = json.decode(response.body.toString());
var parsed = json.decode(utf8.decode(response.bodyBytes));
diff --git a/lib/core/service/feedback/feedback_service.dart b/lib/core/service/feedback/feedback_service.dart
index 37c0c7be..67ebc641 100644
--- a/lib/core/service/feedback/feedback_service.dart
+++ b/lib/core/service/feedback/feedback_service.dart
@@ -83,9 +83,24 @@ class FeedbackService extends BaseService {
Future searchFeedback(String countryCode, String phoneNumber, int type, String idNumber) async {
hasError = false;
Map body = new Map();
- body['IdentificationNo'] = idNumber;
+ if (type == 1) {
+ body['IdentificationNo'] = 0;
+ body['PatientID'] = num.tryParse(idNumber);
+ body['ItemID'] = 0;
+ } else if (type == 2) {
+ body['IdentificationNo'] = idNumber;
+ body['PatientID'] = 0;
+ body['ItemID'] = 0;
+ } else {
+ body['IdentificationNo'] = 0;
+ body['PatientID'] = 0;
+ body['ItemID'] = idNumber;
+ }
+
+ body['PatientOutSA'] = countryCode.contains("966") ? 0 : 1;
+
body['MobileNo'] = countryCode + Utils.getPhoneNumberWithoutZero(phoneNumber);
- body['Searching_type'] = "$type";
+ body['Searching_type'] = type;
if (BASE_URL.contains('uat')) {
body['ForDemo'] = true;
}
diff --git a/lib/core/service/parmacyModule/order-preview-service.dart b/lib/core/service/parmacyModule/order-preview-service.dart
index 0ada84e7..0364d64f 100644
--- a/lib/core/service/parmacyModule/order-preview-service.dart
+++ b/lib/core/service/parmacyModule/order-preview-service.dart
@@ -62,6 +62,8 @@ class OrderPreviewService extends BaseService {
Future