30 Commits (1607aecb4a8ef99d0be4a0dd182c9bb147d4fe89)

Author	SHA1	Message	Date
Fatimah Alshammari	265d13b970	fixed an issue in recommended page	4 years ago
haroon amjad	e0ebb922ed	pharmacy fixes	4 years ago
Fatimah Alshammari	a46dddea9a	Merge branch 'development' into pharmacy-Fatima ... # Conflicts: # lib/core/model/pharmacies/order_model.dart # lib/pages/pharmacies/product-brands.dart # lib/pages/pharmacies/screens/pharmacy_module_page.dart # lib/pages/pharmacy/order/Order.dart # lib/pages/pharmacy/order/OrderDetails.dart # lib/pages/pharmacy/profile/profile.dart	4 years ago
Fatimah Alshammari	c629fcb85c	fixed recommended products new design	4 years ago
mosazaid	f3cdd08857	adding fharmacy payment feature	4 years ago
enadhilal	0c6fb67718	fixed issues	4 years ago
Fatimah Alshammari	ac32ba998c	fixed order isuee	4 years ago
enadhilal	830e871e2c	Merge branch 'development' into enad_pharmacy2 ... # Conflicts: # lib/config/config.dart # lib/core/viewModels/AlHabibMedicalService/health-calculator/Bariatrics-viewmodel.dart	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	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
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	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
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	6ac8d67b83	finish address add/edit/delete/select	4 years ago
enadhilal	9c55571072	Merge branch 'pharmacy' into enad_pharmacy2	4 years ago
enadhilal	c22ca4e29e	Merge branch 'pharmacy' into enad_pharmacy2 ... # Conflicts: # lib/config/config.dart # lib/core/service/client/base_app_client.dart # lib/locator.dart # lib/pages/base/base_view.dart # lib/pages/landing/home_page.dart # lib/widgets/others/app_scaffold_widget.dart # lib/widgets/pharmacy/product_tile.dart	4 years ago
enadhilal	888a74fb9b	add these pages ... ​Product Tile Component Product Detail Page ​Wishlist Page ​Reviews Page Brands Page + Search	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
enadhilal	068382e76f	add call for backend service	4 years ago
enadhilal	815bc39268	add wishlist page	4 years ago