Elham Rababah
96117fd191
PAP-625: add option “not classified”.
4 years ago
Elham Rababah
6e7f62ca21
PAP-612: show ok and cancel options
4 years ago
Mohammad Aljammal
6fa79ef8d0
Merge branch 'pharmacy-bugs' into 'development'
...
jira bug PAP-530
See merge request Cloud_Solution/diplomatic-quarter!300
4 years ago
Elham Rababah
66a9239698
PAP-558: Remove the choose Drop-off
4 years ago
Elham Rababah
1b393d6601
PAP-559: remove the km
4 years ago
hussam al-habibeh
1ce10f4d78
jira bug PAP-530
4 years ago
Mohammad Aljammal
0a4f17dc88
Merge branch 'pharmacy-Fatima' into 'development'
...
Pharmacy fatima
See merge request Cloud_Solution/diplomatic-quarter!298
4 years ago
Mohammad Aljammal
dcc98a35ac
Merge branch 'fix_advance_payment' into 'development'
...
fix advance payment
See merge request Cloud_Solution/diplomatic-quarter!299
4 years ago
Mohammad Aljammal
9a850d0ca3
fix advance payment
4 years ago
haroon amjad
a6a9a92c6f
JIRA bug fixes
4 years ago
Fatimah Alshammari
bb622f248c
Merge branch 'development' into pharmacy-Fatima
...
# Conflicts:
# lib/pages/pharmacy_categorise.dart
4 years ago
Fatimah Alshammari
235fdfba54
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development
4 years ago
Fatimah Alshammari
71a393df68
fixed categories issue
4 years ago
haroon amjad
f754e48034
Merge branch 'development' into Haroon
...
# Conflicts:
# lib/widgets/in_app_browser/InAppBrowser.dart
4 years ago
haroon amjad
49c454b132
fixes
4 years ago
Mohammad Aljammal
008a39f043
Merge branch 'fix_bugs_Mar' into 'development'
...
Fix bugs mar
See merge request Cloud_Solution/diplomatic-quarter!297
4 years ago
Elham Rababah
86dda2b6d6
PAP-560: fix design
4 years ago
Elham Rababah
a1ecfbf16a
PAP-560: fix design
4 years ago
Elham Rababah
efb6ea68b8
PAP-561: fix design
4 years ago
Sultan Khan
d4c3b03a5f
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
4 years ago
Sultan Khan
1b770420be
bug fixes
4 years ago
Elham Rababah
2e035e2c6b
PAP-576: fix design
4 years ago
mosazaid
b623bd0dce
Merge branch 'development' into fix_bugs
4 years ago
mosazaid
e5474b3062
fix perscription pages bugs
4 years ago
Fatimah Alshammari
39daaa16a7
added buttens in categories page
4 years ago
Mohammad Aljammal
126fad61c0
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_eye_balance
...
Conflicts:
lib/core/service/client/base_app_client.dart
4 years ago
Mohammad Aljammal
53e4dfa99d
Merge branch 'ZohaibIqbalKambrani' into 'development'
...
Zohaib iqbal kambrani
See merge request Cloud_Solution/diplomatic-quarter!292
4 years ago
Mohammad Aljammal
7c1fd8043b
fix chart and eye and balance
4 years ago
Zohaib Iqbal Kambrani
b91ce441e2
Merge branch 'development' into ZohaibIqbalKambrani
...
# Conflicts: Resolved
# lib/core/model/pharmacies/order_model.dart
# lib/core/service/client/base_app_client.dart
# lib/main.dart
# lib/pages/landing/home_page.dart
# lib/pages/pharmacy/order/OrderDetails.dart
# lib/pages/pharmacy/order/TrackDriver.dart
# lib/routes.dart
# lib/uitl/translations_delegate_base.dart
# lib/uitl/utils.dart
# lib/widgets/in_app_browser/InAppBrowser.dart
# lib/widgets/others/app_scaffold_widget.dart
# pubspec.yaml
4 years ago
hussam al-habibeh
a6ec7326b2
jira bugs
4 years ago
hussam al-habibeh
f9b8191a5e
jira bugs
4 years ago
Zohaib Iqbal Kambrani
6f2c947687
Packages And offers..
4 years ago
haroon amjad
9c1fdf96f4
Merge branch 'development' into Haroon
4 years ago
haroon amjad
33e1bf8103
Jira fixes
4 years ago
Mohammad Aljammal
a613fe08e4
Merge branch 'fix_theme_issues' into 'development'
...
fix the line chart issues
See merge request Cloud_Solution/diplomatic-quarter!289
4 years ago
haroon amjad
accc39d972
jira bug fixes
4 years ago
Mohammad Aljammal
ced7761a32
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_theme_issues
4 years ago
Mohammad Aljammal
b36e00d2a5
fix the line chart issues
4 years ago
Sultan Khan
ca2a48e860
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
4 years ago
Sultan Khan
0445011e53
bug fixes
4 years ago
Mohammad Aljammal
ad88f6de04
fix theme issues
4 years ago
haroon amjad
8d16d0a69d
Merge branch 'development' into Haroon
4 years ago
haroon amjad
12c4250654
home page ereferral fix
4 years ago
Sultan Khan
35c940a209
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
4 years ago
Sultan Khan
80d96ba785
Privilege issue fixed
4 years ago
haroon amjad
573f5110f5
Merge branch 'development' into Haroon
4 years ago
haroon amjad
454957ebba
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development
...
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
4 years ago
Sultan Khan
616212828d
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
4 years ago
Sultan Khan
66acce3b40
ancillary order pages added
4 years ago
haroon amjad
74671d2f25
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development
...
# Conflicts:
# lib/core/service/client/base_app_client.dart
# lib/core/service/parmacyModule/order-preview-service.dart
# lib/pages/pharmacies/screens/cart-order-preview.dart
4 years ago
haroon amjad
e0ebb922ed
pharmacy fixes
4 years ago
Zohaib Iqbal Kambrani
f410ce20ca
Packages and Offers in Progress
4 years ago
mosazaid
ed1626f8ee
Merge branch 'development' into fix_order_checkout_payment
4 years ago
mosazaid
74dd274502
working on pharmacy some fixes on cart page and request body
4 years ago
haroon amjad
ed3dba3eb3
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development
...
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
4 years ago
haroon amjad
b9a12341d5
updates & fixes
4 years ago
Mohammad Aljammal
4dcb70d7eb
Merge branch 'pharmacy-bugs' into 'development'
...
Pharmacy bugs
See merge request Cloud_Solution/diplomatic-quarter!282
4 years ago
hussam al-habibeh
a534b1415e
products filtering fix
4 years ago
Mohammad Aljammal
861dba9a94
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into ed_online
...
Conflicts:
lib/config/localized_values.dart
lib/uitl/translations_delegate_base.dart
4 years ago
Mohammad Aljammal
ec401d4848
Done Ed online
4 years ago
Mohammad Aljammal
cacb6722b9
Merge branch 'pharmacy-bugs' into 'development'
...
daynimic listing
See merge request Cloud_Solution/diplomatic-quarter!279
4 years ago
hussam al-habibeh
b39e88d9c8
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-bugs
4 years ago
Sultan Khan
a6196d3c30
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
4 years ago
Sultan Khan
b891c1bd80
theme issue
4 years ago
hussam al-habibeh
2723422bbf
daynimic listing
4 years ago
haroon amjad
798840ee2f
Merge branch 'development' into Haroon
4 years ago
Mohammad Aljammal
123b1de1a4
Merge branch 'pharmacy-bugs' into 'development'
...
hussam
See merge request Cloud_Solution/diplomatic-quarter!278
4 years ago
Mohammad Aljammal
50a45528d1
Merge branch 'pharmacy-bug-fixes' into 'development'
...
bug-fixes
See merge request Cloud_Solution/diplomatic-quarter!276
4 years ago
hussam al-habibeh
299a1bed25
hussam
4 years ago
hussam al-habibeh
790fbbcf6c
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-bugs
...
Conflicts:
lib/pages/pharmacy_categorise.dart
4 years ago
hussam al-habibeh
3af37a6a5c
hussam
4 years ago
Fatimah Alshammari
8624d695dc
fixed order details
4 years ago
Fatimah Alshammari
747763c4be
Merge branch 'development' into pharmacy-Fatima
...
# Conflicts:
# lib/config/localized_values.dart
# lib/locator.dart
# lib/uitl/translations_delegate_base.dart
# pubspec.yaml
4 years ago
haroon amjad
44b041d499
Merge branch 'development' into Haroon
4 years ago
haroon amjad
5fb92c7816
covid drive-thru
4 years ago
mosazaid
44287db553
bug-fixes
4 years ago
Mohammad Aljammal
576181a72e
Merge branch 'sultan-patientapp' into 'development'
...
Sultan patientapp
See merge request Cloud_Solution/diplomatic-quarter!251
4 years ago
Sultan Khan
6f68cf5a15
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
4 years ago
Fatimah Alshammari
a46dddea9a
Merge branch 'development' into pharmacy-Fatima
...
# Conflicts:
# lib/core/model/pharmacies/order_model.dart
# lib/pages/pharmacies/product-brands.dart
# lib/pages/pharmacies/screens/pharmacy_module_page.dart
# lib/pages/pharmacy/order/Order.dart
# lib/pages/pharmacy/order/OrderDetails.dart
# lib/pages/pharmacy/profile/profile.dart
4 years ago
mosazaid
dfeb70c892
Merge branch 'development' into pharmacy-payment-feature
...
# Conflicts:
# lib/pages/pharmacy/order/OrderDetails.dart
4 years ago
mosazaid
0b2002d4dd
finish payment order
4 years ago
Sultan Khan
1a35fe37b6
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
4 years ago
Sultan Khan
e61c26b853
Auto SMS, Themes, Voice Command
4 years ago
Fatimah Alshammari
c629fcb85c
fixed recommended products new design
4 years ago
haroon amjad
da3ad90ddd
added app-wide route transition animation
4 years ago
Fatimah Alshammari
e5829d8513
fix recommended for you
4 years ago
haroon amjad
d8e11f7187
Merge branch 'development' into Haroon
4 years ago
haroon amjad
deb0b40cfe
fixes
4 years ago
mosazaid
c64769e422
Merge branch 'development' into pharmacy-payment-feature
4 years ago
mosazaid
f3cdd08857
adding fharmacy payment feature
4 years ago
enadhilal
0cb493d56c
Merge branch 'development' into enad_pharmacy2
...
# Conflicts:
# lib/pages/pharmacies/product_detail.dart
4 years ago
enadhilal
0c6fb67718
fixed issues
4 years ago
Fatimah Alshammari
42bf76f712
Merge branch 'development' into pharmacy-Fatima
...
# Conflicts:
# lib/config/config.dart
# lib/core/service/parmacyModule/parmacy_module_service.dart
# lib/pages/pharmacies/product_detail.dart
# lib/pages/pharmacies/screens/pharmacy_module_page.dart
4 years ago
Zohaib Iqbal Kambrani
15ec3ec9b9
Translation Track Driver, enhancement, initial camera
4 years ago
Zohaib Iqbal Kambrani
63663f1b24
Track Delivery Driver Completed
4 years ago
Fatimah Alshammari
ac32ba998c
fixed order isuee
4 years ago
Zohaib Iqbal Kambrani
516df96e21
no message
4 years ago
hussam al-habibeh
8c58dced7d
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-bugs
...
Conflicts:
lib/core/service/pharmacy_categorise_service.dart
lib/pages/final_products_page.dart
4 years ago
hussam al-habibeh
1b76d9c192
pharmacy bugs fixed
4 years ago
mosazaid
125dd27a00
Merge branch 'development' into fix-pharmacy
4 years ago
mosazaid
5d0a122689
fix bugs
4 years ago
Mohammad Aljammal
e6da54c201
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
...
Conflicts:
lib/config/localized_values.dart
lib/core/service/client/base_app_client.dart
lib/uitl/translations_delegate_base.dart
4 years ago
Mohammad Aljammal
20ad10b9dc
Merge branches 'development' and 'fix-pharmacy' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix-pharmacy
...
Conflicts:
lib/config/localized_values.dart
lib/core/service/client/base_app_client.dart
lib/uitl/translations_delegate_base.dart
4 years ago
Mohammad Aljammal
8899bdf460
Done Prescription Delivery Address
4 years ago
mosazaid
d02b74142a
Merge branch 'development' into fix-pharmacy
...
# Conflicts:
# lib/core/service/client/base_app_client.dart
4 years ago
mosazaid
1a45f99606
some fixes on pharmacy
4 years ago
haroon amjad
5e8e3806d6
Covid Drive-Thru implemented
4 years ago
Sultan Khan
144ef52c70
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
4 years ago
Sultan Khan
b3e6c4efda
voice command changes
4 years ago
haroon amjad
ba10014b46
Merge branch 'development' into Haroon
4 years ago
enadhilal
60648d368f
Merge branch 'development' into enad_pharmacy2
4 years ago
enadhilal
830e871e2c
Merge branch 'development' into enad_pharmacy2
...
# Conflicts:
# lib/config/config.dart
# lib/core/viewModels/AlHabibMedicalService/health-calculator/Bariatrics-viewmodel.dart
4 years ago
Mohammad Aljammal
0098345d05
add Prescription Delivery Address Page amd fix the Authentication Pharmacy
4 years ago
haroon amjad
83cca264f1
Merge branch 'LamaHerbish' into Haroon
4 years ago
HMG\Lama.Herbish
031be1ac56
fixes
4 years ago
enadhilal
292e983614
fixing issues
4 years ago
haroon amjad
f72c860516
Merge branch 'development' into Haroon
4 years ago
Mohammad Aljammal
87ad027d33
Merge branch 'improve_hhc' into 'development'
...
Improve hhc
See merge request Cloud_Solution/diplomatic-quarter!264
4 years ago
haroon amjad
13f6015cf0
Merge branch 'development' into Haroon
4 years ago
haroon amjad
69649ff7f8
added verified icon in homepage when patient is logged in
4 years ago
Mohammad Aljammal
29f4e6acb6
Merge branch 'hmg-services-fixing' into 'development'
...
Hmg services fixing
See merge request Cloud_Solution/diplomatic-quarter!262
4 years ago
haroon amjad
9ecf745747
fixes
4 years ago
haroon amjad
b6c617888b
Merge branch 'development' into Haroon
...
# Conflicts:
# lib/config/localized_values.dart
4 years ago
Fatimah Alshammari
ef8312f2b8
Merge branch 'development' into pharmacy-Fatima
...
# Conflicts:
# lib/core/service/parmacyModule/parmacy_module_service.dart
# lib/core/service/parmacyModule/prescription_service.dart
# lib/pages/pharmacies/product_detail.dart
4 years ago
Fatimah Alshammari
ce64da11e4
homepage and product details design
4 years ago
mosazaid
cbe422cbc6
Merge branch 'hmg-services-fixing' into development
...
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/core/service/client/base_app_client.dart
# lib/uitl/translations_delegate_base.dart
4 years ago
mosazaid
0444b21101
Merge branch 'development' into hmg-services-fixing
...
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
4 years ago
Elham Rababah
94ee969406
hhc msg translation
4 years ago
Elham Rababah
8a1924cca2
fix images in hhc
4 years ago
Sultan Khan
d33918c932
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
4 years ago
Sultan Khan
9fca52efca
voice command
4 years ago
Mohammad Aljammal
e964afd4f2
Merge branch 'fix_security_issue' into 'development'
...
fix security issues in pharmacy
See merge request Cloud_Solution/diplomatic-quarter!261
4 years ago
Mohammad Aljammal
d477481856
fix security issues in pharmacy
4 years ago
Mohammad Aljammal
63657cb7c4
Merge branch 'h2o_improvement' into 'development'
...
H2O feature, setting page added
See merge request Cloud_Solution/diplomatic-quarter!260
4 years ago
Sikander Saleem
e40ad85d61
H2O feature, setting page added
4 years ago
Mohammad Aljammal
1d724a8db6
Merge branch 'h2o_improvement' into 'development'
...
H2o improvement
See merge request Cloud_Solution/diplomatic-quarter!259
4 years ago
Sikander Saleem
bd062150c1
H2O feature improvement
4 years ago
Sikander Saleem
aef4c7bfac
H2O feature improvement
4 years ago
haroon amjad
0b83089b86
Merge branch 'development' into Haroon
4 years ago
haroon amjad
3832cee1ad
Translation fixes
4 years ago
Sikander Saleem
3b4e791017
H2O feature improvement
4 years ago
Mohammad Aljammal
bb42647c91
Merge branch 'development' into 'fix_pharmacy'
...
# Conflicts:
# lib/pages/login/login.dart
4 years ago
Mohammad Aljammal
ab53ca82b1
fix colors issues
4 years ago
mosazaid
822defbd04
working on bmi calculator design and functionality
4 years ago
haroon amjad
3bad0a3804
Merge branch 'development' into Haroon
4 years ago
haroon amjad
146019432a
LiveCare schedule implemented
4 years ago
Sikander Saleem
8f37fbf260
Qr icon added, notify me api added & improvements
4 years ago
Sultan Khan
3ac69692be
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
4 years ago
Sultan Khan
0213264b7f
bug fixes
4 years ago
Mohammad Aljammal
3e441c55b2
fix bottom nav bar
4 years ago
Mohammad Aljammal
9d8c1ddf63
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into my_tracker
...
Conflicts:
lib/uitl/translations_delegate_base.dart
4 years ago
Mohammad Aljammal
484cca086e
fix my my Trackers
4 years ago
haroon amjad
ab158e14e9
Merge branch 'development' into Haroon
...
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
4 years ago
haroon amjad
7c538b350f
LiveCare Scheduling finalized, Appointments in ToDo list categorized
4 years ago
hussam al-habibeh
97919c217f
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into health-converter
...
Conflicts:
lib/config/localized_values.dart
lib/uitl/translations_delegate_base.dart
4 years ago
hussam al-habibeh
1ce0ef7b6c
health-converter fix
4 years ago
haroon amjad
dde10cd27b
working in LiveCare Scheduling
4 years ago
Mohammad Aljammal
db2376f50c
fix blood and weight on my trackers
4 years ago
Sultan Khan
ccd2fc5068
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
4 years ago
haroon amjad
6945230965
Merge branch 'development' into Haroon
...
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/pages/Covid-DriveThru/covid-drivethru-location.dart
# lib/pages/landing/home_page.dart
# lib/pages/medical/smart_watch_health_data/health_data_list.dart
# lib/pages/medical/smart_watch_health_data/smart_watch_instructions.dart
# lib/uitl/translations_delegate_base.dart
# pubspec.yaml
4 years ago
mosazaid
38d52b52c8
Merge branch 'development' into fix_design
...
# Conflicts:
# lib/config/localized_values.dart
# lib/locator.dart
4 years ago
Sultan Khan
68f7a9ff9c
login chnages
4 years ago
mosazaid
174534d8a5
fix Blood donation functionality and design
4 years ago
Mohammad Aljammal
405f67be1e
Merge branch 'pharmacy-Fatima' into 'development'
...
Pharmacy fatima
See merge request Cloud_Solution/diplomatic-quarter!249
4 years ago
Fatimah Alshammari
7a516cae51
Merge branch 'development' into pharmacy-Fatima
...
# Conflicts:
# lib/pages/pharmacy/order/Order.dart
# lib/pages/pharmacy/order/OrderDetails.dart
4 years ago
Mohammad Aljammal
f883e1bd78
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into my_tracker
...
Conflicts:
lib/config/localized_values.dart
4 years ago
Mohammad Aljammal
0b1014a91c
fix blood sugar service on my tracker
4 years ago
Fatimah Alshammari
0f22a50a5d
Merge branch 'development' into pharmacy-Fatima
...
# Conflicts:
# lib/pages/pharmacy/profile/profile.dart
4 years ago
Zohaib Iqbal Kambrani
9a5daed5c3
Merge branch 'development' into ZohaibIqbalKambrani
...
* development:
re-design child vaccine and fix some funcrionalities
Fix ER service
first step from fix CMC
fix issue on cmc
return CMC HHC
Nearest Er fix design
solving NearestEr design problem
simple fix
hot fixing
fix design issues
# Conflicts:
# lib/config/localized_values.dart
4 years ago
Sultan Khan
c65983bfdb
code merged
4 years ago
Sultan Khan
86cf9300e1
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
...
* 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter : (136 commits)
Fix ER service
first step from fix CMC
fix issue on cmc
return CMC HHC
Nearest Er fix design
solving NearestEr design problem
simple fix
hot fixing
fix design issues
some design enhancments
fix design
fix android
fix merge issues
fix merge issues
commit
fix merge issues
change color
return privilege
return privilege
fix issues
...
4 years ago
Zohaib Iqbal Kambrani
bbd953ae43
Order Delivery Driver tracking [inprogress]
4 years ago
mosazaid
3a45239059
Merge branch 'development' into fix_design
...
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
4 years ago
mosazaid
f5d478fd27
re-design child vaccine and fix some funcrionalities
4 years ago
Mohammad Aljammal
4457b5f109
add translation to ER service
4 years ago
Mohammad Aljammal
200334d8f8
Fix ER service
4 years ago
Elham Rababah
4ecce79258
first step from fix CMC
4 years ago
Elham Rababah
c9edb37a3c
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_hhc_cmc
...
Conflicts:
lib/config/localized_values.dart
lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/cmc_page.dart
lib/uitl/translations_delegate_base.dart
4 years ago
Elham Rababah
d7a046f9ca
fix issue on cmc
4 years ago
Mohammad Aljammal
1cb5e250ed
Merge branch 'fix_design' into 'development'
...
Fix design
See merge request Cloud_Solution/diplomatic-quarter!241
4 years ago
Mohammad Aljammal
b63025a9b3
return CMC HHC
4 years ago
mosazaid
5bcc67b77d
Nearest Er fix design
4 years ago
mosazaid
01bfe84644
solving NearestEr design problem
4 years ago
mosazaid
e71a56ed51
Merge branch 'development' into fix_design
4 years ago
mosazaid
d2e1a323ce
simple fix
4 years ago
Zohaib Iqbal Kambrani
e2bce87e34
resolve merge conflicts.
4 years ago
Mohammad Aljammal
30ddea6419
hot fixing
4 years ago
Zohaib Iqbal Kambrani
dc83b476d6
Merge branch 'development' into ZohaibIqbalKambrani
...
# Conflicts:
# android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/utils/HMGUtils.kt
# ios/Flutter/.last_build_id
# lib/pages/landing/landing_page.dart
# lib/pages/medical/medical_profile_page.dart
# lib/widgets/drawer/app_drawer_widget.dart
4 years ago
Mohammad Aljammal
ed729689a9
Merge branch 'design_issues' into 'development'
...
fix design issues
See merge request Cloud_Solution/diplomatic-quarter!237
4 years ago
Mohammad Aljammal
634c874eee
fix design issues
4 years ago
Fatimah Alshammari
a1b2709ac8
fixed orders
4 years ago
Fatimah Alshammari
ba4003cb56
Merge branch 'pharmacy' into pharmacy-Fatima
...
# Conflicts:
# lib/locator.dart
# lib/pages/pharmacies/screens/pharmacy_module_page.dart
# lib/pages/pharmacy/profile/profile.dart
4 years ago
Fatimah Alshammari
52fa0f6f89
fixed orders
4 years ago
mosazaid
2843b1393e
some design enhancments
4 years ago
Mohammad Aljammal
de1b7cc1d0
fix merge issues
4 years ago
Mohammad Aljammal
3fb522e15f
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_merge
...
Conflicts:
lib/config/config.dart
lib/config/localized_values.dart
lib/config/shared_pref_kay.dart
lib/core/model/pharmacies/LakumInquiryInformationObjVersion.dart
lib/core/model/pharmacies/order_model.dart
lib/core/viewModels/pharmacyModule/PharmacyAddressesViewModel.dart
lib/core/viewModels/pharmacyModule/order_model_view_model.dart
lib/locator.dart
lib/main.dart
lib/pages/landing/landing_page_pharmcy.dart
lib/pages/parent_categorise_page.dart
lib/pages/pharmacies/screens/cart-order-page.dart
lib/pages/pharmacies/screens/cart-order-preview.dart
lib/pages/pharmacies/screens/pharmacy_module_page.dart
lib/pages/pharmacies/wishlist.dart
lib/pages/pharmacy/order/Order.dart
lib/pages/pharmacy/order/OrderDetails.dart
lib/pages/pharmacy/order/ProductReview.dart
lib/pages/pharmacy/pharmacyAddresses/AddAddress.dart
lib/pages/pharmacy/pharmacyAddresses/PharmacyAddresses.dart
lib/pages/pharmacy/profile/profile.dart
lib/services/pharmacy_services/orderDetails_service.dart
lib/services/pharmacy_services/order_service.dart
lib/services/pharmacy_services/pharmacyAddress_service.dart
lib/services/pharmacy_services/wishList_service.dart
lib/uitl/translations_delegate_base.dart
lib/widgets/buttons/borderedButton.dart
lib/widgets/others/app_scaffold_widget.dart
lib/widgets/pharmacy/product_tile.dart
4 years ago
Mohammad Aljammal
c82f01cd1a
fix merge issues
4 years ago
Mohammad Aljammal
16d1f667d4
Merge branch 'pharmacy' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima_merge
...
Conflicts:
android/app/build.gradle
lib/config/config.dart
lib/pages/pharmacy/profile/profile.dart
lib/widgets/pharmacy/product_tile.dart
4 years ago
mosazaid
d77a607b78
commit
4 years ago
mosazaid
38d58ebaaf
Merge branch 'pharmacy' into pharmacy_mosa_branch
...
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/core/viewModels/pharmacyModule/PharmacyAddressesViewModel.dart
# lib/pages/pharmacy/pharmacyAddresses/PharmacyAddresses.dart
# lib/services/pharmacy_services/pharmacyAddress_service.dart
# lib/uitl/translations_delegate_base.dart
4 years ago