32 Commits (e5829d8513b83875d9ef00ff2c7e287b059ce303)

Author	SHA1	Message	Date
Fatimah Alshammari	e5829d8513	fix recommended for you	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
mosazaid	1a45f99606	some fixes on pharmacy	4 years ago
Fatimah Alshammari	ce64da11e4	homepage and product details design	4 years ago
Fatimah Alshammari	7a516cae51	Merge branch 'development' into pharmacy-Fatima ... # Conflicts: # lib/pages/pharmacy/order/Order.dart # lib/pages/pharmacy/order/OrderDetails.dart	4 years ago
Fatimah Alshammari	0f22a50a5d	Merge branch 'development' into pharmacy-Fatima ... # Conflicts: # lib/pages/pharmacy/profile/profile.dart	4 years ago
Zohaib Iqbal Kambrani	bbd953ae43	Order Delivery Driver tracking [inprogress]	4 years ago
Fatimah Alshammari	a1b2709ac8	fixed orders	4 years ago
Fatimah Alshammari	ba4003cb56	Merge branch 'pharmacy' into pharmacy-Fatima ... # Conflicts: # lib/locator.dart # lib/pages/pharmacies/screens/pharmacy_module_page.dart # lib/pages/pharmacy/profile/profile.dart	4 years ago
Fatimah Alshammari	52fa0f6f89	fixed orders	4 years ago
mosazaid	2843b1393e	some design enhancments	4 years ago
Mohammad Aljammal	de1b7cc1d0	fix merge issues	4 years ago
Mohammad Aljammal	c82f01cd1a	fix merge issues	4 years ago
Mohammad Aljammal	16d1f667d4	Merge branch 'pharmacy' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima_merge ... Conflicts: android/app/build.gradle lib/config/config.dart lib/pages/pharmacy/profile/profile.dart lib/widgets/pharmacy/product_tile.dart	4 years ago
mosazaid	d77a607b78	commit	4 years ago
mosazaid	38d58ebaaf	Merge branch 'pharmacy' into pharmacy_mosa_branch ... # Conflicts: # lib/config/config.dart # lib/config/localized_values.dart # lib/core/viewModels/pharmacyModule/PharmacyAddressesViewModel.dart # lib/pages/pharmacy/pharmacyAddresses/PharmacyAddresses.dart # lib/services/pharmacy_services/pharmacyAddress_service.dart # lib/uitl/translations_delegate_base.dart	4 years ago
enadhilal	10734d5994	connecting pages. ... trnaslate. calling API. review page. product details page. Wishlist page. Brands page.	4 years ago
Fatimah Alshammari	c0920e7099	Merge branch 'pharmacy' into pharmacy-Fatima ... # Conflicts: # lib/widgets/pharmacy/product_tile.dart	4 years ago
Fatimah Alshammari	5fa5e9b7c8	fixed orders and profile	4 years ago
Fatimah Alshammari	e5bf7acc52	Merge branch 'pharmacy-Fatima' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-Fatima ... # Conflicts: # lib/core/viewModels/pharmacyModule/order_model_view_model.dart # lib/pages/pharmacy/order/OrderDetails.dart # lib/widgets/pharmacy/product_tile.dart	4 years ago
Fatimah Alshammari	fda101840a	fixed order isuues	4 years ago
mosazaid	359eba2da0	make some updates in firebase version and update gradle, finish review order	4 years ago
Fatimah Alshammari	4a84483698	fixed order details	4 years ago
mosazaid	c058cf0e93	finish address add/edit/delete/select	4 years ago
mosazaid	6ac8d67b83	finish address add/edit/delete/select	4 years ago
Fatimah Alshammari	ed68eed9df	added links for profile	4 years ago
Fatimah Alshammari	9b8103bfd6	fixe order and order details	4 years ago
Fatimah Alshammari	d328c74fc4	fix order and orderdetails	4 years ago
Fatimah Alshammari	f137bd44c0	created order and order details UI pages	4 years ago
Fatimah Alshammari	1e00b9a4d8	added my-profile	4 years ago
Fatimah Alshammari	d05988a679	added pharmacy folder	4 years ago