27 Commits (ef8312f2b89b7df66ad11a441c0c0faf98772741)

Author	SHA1	Message	Date
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
Sikander Saleem	8f37fbf260	Qr icon added, notify me api added & improvements	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
mosazaid	d2e1a323ce	simple fix	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	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	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
mosazaid	6ac8d67b83	finish address add/edit/delete/select	4 years ago
mosazaid	378562b781	adding some changes in order pages like translate texts	4 years ago
Mohammad Aljammal	77dcb918c3	Revert "Merge branch 'pharmacy-hussam' into 'master'" ... This reverts merge request !149	4 years ago
hussam al-habibeh	5dc3c53550	mousa and hussam branch	4 years ago
mosazaid	4c9a1862d2	make pharmacy home page load data even without login, and some mini changes	4 years ago
mosazaid	7ee7ef58c4	working on dynamic title on pharmacy	4 years ago
mosazaid	709ba2ce97	create terms-condition in pharmacy order page	4 years ago
mosazaid	2a91ae787f	commit	4 years ago
mosazaid	35d0d3e441	finsi lakum points task	4 years ago
mosazaid	98f660e29b	Merge branch 'pharmacy' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_module_feature_home_page ... Conflicts: lib/config/config.dart lib/config/localized_values.dart lib/core/service/client/base_app_client.dart lib/locator.dart lib/uitl/translations_delegate_base.dart lib/widgets/others/app_scaffold_widget.dart	4 years ago
mosazaid	951c77feb5	working on lakum account	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
haroon amjad	9868a43e7b	Merge branch 'master' into pharmacy ... # Conflicts: # lib/config/config.dart # lib/core/service/client/base_app_client.dart # lib/pages/landing/home_page.dart	4 years ago
mosazaid	9a169ff77b	finish home page and start working on order preview page	4 years ago