Commit Graph

227 Commits (a9bd9f1fdf771e0d57ea381f99f4e0b946916250)

Author SHA1 Message Date
hussam al-habibeh 5dc3c53550 mousa and hussam branch 4 years ago
mosazaid 4c9a1862d2 make pharmacy home page load data even without login, and some mini changes 4 years ago
mosazaid 7ee7ef58c4 working on dynamic title on pharmacy 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
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
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
Zohaib Kambrani 27182ee8db no message 4 years ago
haroon amjad 92db2b2be9 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 4 years ago
Mohammad Aljammal 0d098def04 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_master
 Conflicts:
	assets/app_icons/config.json
	assets/app_icons/fonts/DQIcons.ttf
	lib/config/config.dart
	lib/config/shared_pref_kay.dart
	lib/d_q_icons_icons.dart
	lib/locator.dart
	lib/pages/landing/home_page.dart
	lib/pages/landing/landing_page.dart
	lib/pages/rateAppointment/rate_appointment_doctor.dart
	lib/uitl/utils.dart
	lib/widgets/others/app_scaffold_widget.dart
4 years ago
Mohammad Aljammal 939840bbe7 fix master 4 years ago
Mohammad Aljammal 3c1257b379 fix Medicine Search 4 years ago
Mohammad Aljammal b785f87dac fix App drawer after logout 4 years ago
Mohammad Aljmma 20ece68ddb fix issue # 6 & 7 & 8 4 years ago
Zohaib Kambrani 0c71fbad5f no message 4 years ago
haroon amjad 9868a43e7b Merge branch 'master' into pharmacy
# Conflicts:
#	lib/config/config.dart
#	lib/core/service/client/base_app_client.dart
#	lib/pages/landing/home_page.dart
4 years ago
mosazaid 9a169ff77b finish home page and start working on order preview page 4 years ago
Elham Rababah fa88e9055f make loader center 4 years ago
enadhilal 7ca6e6caa7 fix widget of product_tile 4 years ago
enadhilal d6d1c26c9a add product_tile widget 4 years ago
enadhilal 068382e76f add call for backend service 4 years ago
enadhilal 815bc39268 add wishlist page 4 years ago
hussam al-habibeh e92cb2e1ac Design and return Pharmacy List 4 years ago
hussam al-habibeh 31d2816e64 design for search medicine and return medicine list 4 years ago