Commit Graph

9 Commits (b36e00d2a5f2d126242e28c8f35897e2a7e07be0)

Author SHA1 Message Date
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
5 years ago
haroon amjad e0ebb922ed pharmacy fixes 5 years ago
mosazaid 74dd274502 working on pharmacy some fixes on cart page and request body 5 years ago
Mohammad Aljammal d477481856 fix security issues in pharmacy 5 years ago
Mohammad Aljammal de1b7cc1d0 fix merge issues 5 years ago
Mohammad Aljammal 7167d58ce2 fix merge issues 5 years ago
Mohammad Aljammal 77dcb918c3 Revert "Merge branch 'pharmacy-hussam' into 'master'"
This reverts merge request !149
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
mosazaid 9a169ff77b finish home page and start working on order preview page 5 years ago