Commit Graph

593 Commits (378562b78110ab73331a8bdec5dde4507724aacc)

Author SHA1 Message Date
mosazaid 378562b781 adding some changes in order pages like translate texts 4 years ago
mosazaid 4c9a1862d2 make pharmacy home page load data even without login, and some mini changes 4 years ago
haroon amjad 257dc3d76d Merge branch 'pharmacy_module_feature_home_page' into 'pharmacy'
create terms-condition in pharmacy order page

See merge request Cloud_Solution/diplomatic-quarter!154
4 years ago
mosazaid 7ee7ef58c4 working on dynamic title on pharmacy 4 years ago
umasoodch b5413d1749 Merge branch 'master' into pharmacy
# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
mosazaid 709ba2ce97 create terms-condition in pharmacy order page 4 years ago
mosazaid 2a91ae787f commit 4 years ago
mosazaid 35d0d3e441 finsi lakum points task 4 years ago
Elham Rababah 713e44cf8b Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hhc_cmc
 Conflicts:
	lib/config/localized_values.dart
	lib/uitl/translations_delegate_base.dart
4 years ago
Elham Rababah ea195ea9bf Finish translate CMC HHC 4 years ago
haroon amjad 4f1f7dcefd ereferral implementation completed 4 years ago
haroon amjad 65fbd7af8e referral finalised 4 years ago
mosazaid 98f660e29b Merge branch 'pharmacy' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_module_feature_home_page
 Conflicts:
	lib/config/config.dart
	lib/config/localized_values.dart
	lib/core/service/client/base_app_client.dart
	lib/locator.dart
	lib/uitl/translations_delegate_base.dart
	lib/widgets/others/app_scaffold_widget.dart
4 years ago
mosazaid 951c77feb5 working on lakum account 4 years ago
mosazaid 4e5d6a9a00 finish pharmacy home page , cart page, orders and payment page, recently viewed , and lakum module almost finished 4 years ago
Elham Rababah 5bf63174c9 First step from translations 4 years ago
haroon amjad 82e23efd32 working on ereferral 4 years ago
umasoodch 0431eb1ac8 Merge branch 'master' into pharmacy
# Conflicts:
#	lib/config/config.dart
#	lib/locator.dart
#	lib/pages/base/base_view.dart
#	lib/pages/landing/home_page.dart
#	lib/widgets/others/app_scaffold_widget.dart
#	pubspec.yaml
4 years ago
haroon amjad 6846a8501a Merge branch 'master' 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
haroon amjad 0181043da8 Ereferral fixes, smartwatch health data integration 4 years ago
Mohammad Aljammal 2185f5ce11 Merge branch 'hhc_cmc' into 'master'
Hhc cmc

See merge request Cloud_Solution/diplomatic-quarter!138
4 years ago
Elham Rababah 1e1677a365 naming issue fix 4 years ago
Elham Rababah 05deaa6322 Address Added Successfully 4 years ago
Elham Rababah 68e4b92717 Address Added Successfully 4 years ago
Elham Rababah ed56476d81 second step from location fixes 4 years ago
Mohammad Aljammal 54d8965773 done child Vaccination 4 years ago
haroon amjad 97b8aeeff5 Version Control finished 4 years ago
Elham Rababah 7aa7af6de7 finish CMC module 4 years ago
Elham Rababah fd80afeb5a finish hhc module 4 years ago
Elham Rababah 3ef22be7da Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hhc_cmc
 Conflicts:
	lib/config/config.dart
4 years ago
Elham Rababah a87855f445 Fix issues on hhc module 4 years ago
Mohammad Aljammal 49974f81db add translations to child Vaccination 4 years ago
Mohammad Aljammal fa01d132c7 merger DQ live and fix some issues on Child Vaccines 4 years ago
Mohammad Aljammal a556e8c1f8 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter
 Conflicts:
	lib/config/config.dart
	lib/pages/landing/home_page.dart
	lib/pages/landing/landing_page.dart
4 years ago
Mohammad Aljammal 482ec536de Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fixing
 Conflicts:
	lib/config/config.dart
4 years ago
Mohammad Aljammal b6d2878cf1 add Radiology translations and colors 4 years ago
Fatimah Alshammari d328c74fc4 fix order and orderdetails 4 years ago
Sultan Khan 22676fcbd1 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Sultan Khan 5bb780c4ac push 4 years ago
Mohammad Aljammal d0891ba16b Merge branch 'hot_fixing' into 'diplomatic-quarter-live'
fix lab result translations and colors

See merge request Cloud_Solution/diplomatic-quarter!128
4 years ago
Mohammad Aljammal b504f379de fix lab result translations and colors 4 years ago
Mohammad Aljammal 2731c5b1d4 Merge branch 'sultan' into 'diplomatic-quarter-live'
Sultan

See merge request Cloud_Solution/diplomatic-quarter!127
4 years ago
Sultan Khan d6a0188c76 fingerprint 4 years ago
Sultan Khan 7c33c06c0c fingerprint 4 years ago
Sultan Khan 1b678e0aca fingerprint 4 years ago
Sultan Khan 6a14214a0f no message 4 years ago
Mohammad Aljammal 0ac599ea1c fix vital Sign 4 years ago
haroon amjad 10025103ac Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 4 years ago
haroon amjad 21c7c94ef2 updates & fixes 4 years ago
Sultan Khan b61e734f80 feedback permission 4 years ago