Commit Graph

255 Commits (ff508de9f78e295f331e3c3ce1d4d2e7b3d4dc2e)

Author SHA1 Message Date
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
5 years ago
mosazaid 951c77feb5 working on lakum account 5 years ago
mosazaid 4e5d6a9a00 finish pharmacy home page , cart page, orders and payment page, recently viewed , and lakum module almost finished 5 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
5 years ago
mosazaid 9a169ff77b finish home page and start working on order preview page 5 years ago