You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
PatientApp-KKUMC/lib/core/service
Mohammad Aljammal 3fb522e15f Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_merge
 Conflicts:
	lib/config/config.dart
	lib/config/localized_values.dart
	lib/config/shared_pref_kay.dart
	lib/core/model/pharmacies/LakumInquiryInformationObjVersion.dart
	lib/core/model/pharmacies/order_model.dart
	lib/core/viewModels/pharmacyModule/PharmacyAddressesViewModel.dart
	lib/core/viewModels/pharmacyModule/order_model_view_model.dart
	lib/locator.dart
	lib/main.dart
	lib/pages/landing/landing_page_pharmcy.dart
	lib/pages/parent_categorise_page.dart
	lib/pages/pharmacies/screens/cart-order-page.dart
	lib/pages/pharmacies/screens/cart-order-preview.dart
	lib/pages/pharmacies/screens/pharmacy_module_page.dart
	lib/pages/pharmacies/wishlist.dart
	lib/pages/pharmacy/order/Order.dart
	lib/pages/pharmacy/order/OrderDetails.dart
	lib/pages/pharmacy/order/ProductReview.dart
	lib/pages/pharmacy/pharmacyAddresses/AddAddress.dart
	lib/pages/pharmacy/pharmacyAddresses/PharmacyAddresses.dart
	lib/pages/pharmacy/profile/profile.dart
	lib/services/pharmacy_services/orderDetails_service.dart
	lib/services/pharmacy_services/order_service.dart
	lib/services/pharmacy_services/pharmacyAddress_service.dart
	lib/services/pharmacy_services/wishList_service.dart
	lib/uitl/translations_delegate_base.dart
	lib/widgets/buttons/borderedButton.dart
	lib/widgets/others/app_scaffold_widget.dart
	lib/widgets/pharmacy/product_tile.dart
5 years ago
..
AlHabibMedicalService referral finalised 5 years ago
blood Blood Denote 5 years ago
childvaccines done child Vaccination 5 years ago
client Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_merge 5 years ago
contactus fix LiveChatPage Service LabOrderResult MedicineSearch issues 5 years ago
er done ER service 5 years ago
feedback no message 5 years ago
geofencing Geofence Android Finished 5 years ago
medical fix issues 5 years ago
packages_offers Geofencing in progress 5 years ago
parmacyModule fix merge issues 5 years ago
AuthenticatedUserObject.dart Geofencing work in progress on android 5 years ago
appointment_rate_service.dart add time line and appointment rate 6 years ago
base_service.dart fix Authenticated User Object 5 years ago
dashboard_service.dart add time line and appointment rate 6 years ago
hospital_service.dart hot fixes 5 years ago
insurance_service.dart fix Medical profile 5 years ago
notifications_service.dart no message 5 years ago
pharmacies_service.dart hot fixes 5 years ago
privilege_service.dart fix issues 5 years ago
qr_service.dart parking service 6 years ago
vaccine_service.dart add my vaccines item screen 6 years ago
weather_service.dart bug fixes 5 years ago