27 Commits (2669378da422bbfc4975f9d764a2231a88d31f2e)

Author	SHA1	Message	Date
Sikander Saleem	bdb7f29d4c	Merge branch 'development' into development_new_design_2.0 ... # Conflicts: # lib/core/service/parmacyModule/prescription_service.dart # lib/pages/BookAppointment/DentalComplaints.dart # lib/pages/login/login.dart	3 years ago
mosazaid	a2e60e7584	fix bugs pharmacy	3 years ago
Sikander Saleem	ca363adee2	merge & improvements	3 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
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
mosazaid	74dd274502	working on pharmacy some fixes on cart page and request body	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
Fatimah Alshammari	ac32ba998c	fixed order isuee	4 years ago
Zohaib Iqbal Kambrani	516df96e21	no message	4 years ago
Mohammad Aljammal	8899bdf460	Done Prescription Delivery Address	4 years ago
mosazaid	b70c7d7d05	fix pharmacy auth	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
Mohammad Aljammal	d477481856	fix security issues in pharmacy	4 years ago
Sikander Saleem	8f37fbf260	Qr icon added, notify me api added & improvements	4 years ago
Fatimah Alshammari	0f22a50a5d	Merge branch 'development' into pharmacy-Fatima ... # Conflicts: # lib/pages/pharmacy/profile/profile.dart	4 years ago
Fatimah Alshammari	52fa0f6f89	fixed orders	4 years ago
Mohammad Aljammal	de1b7cc1d0	fix merge issues	4 years ago
Mohammad Aljammal	7167d58ce2	fix merge issues	4 years ago
Mohammad Aljammal	77dcb918c3	Revert "Merge branch 'pharmacy-hussam' into 'master'" ... This reverts merge request !149	4 years ago
mosazaid	4c9a1862d2	make pharmacy home page load data even without login, and some mini changes	4 years ago
mosazaid	709ba2ce97	create terms-condition in pharmacy order page	4 years ago
mosazaid	35d0d3e441	finsi lakum points task	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
mosazaid	9a169ff77b	finish home page and start working on order preview page	4 years ago
mosazaid	d1ac4080ca	working on pharmacy home page	4 years ago