diplomatic-quarter

Commit Graph

Author	SHA1	Message	Date
Fatimah Alshammari	239ad530ce	fixed isuues	3 years ago
Fatimah Alshammari	f3b545ff74	fixed products issues	3 years ago
Zohaib Iqbal Kambrani	bf303a7be0	RRT Implementation	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
Mohammad Aljammal	cacb6722b9	Merge branch 'pharmacy-bugs' into 'development' daynimic listing See merge request Cloud_Solution/diplomatic-quarter!279	4 years ago
hussam al-habibeh	2723422bbf	daynimic listing	4 years ago
Mohammad Aljammal	50a45528d1	Merge branch 'pharmacy-bug-fixes' into 'development' bug-fixes See merge request Cloud_Solution/diplomatic-quarter!276	4 years ago
Fatimah Alshammari	8624d695dc	fixed order details	4 years ago
mosazaid	44287db553	bug-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
mosazaid	f3cdd08857	adding fharmacy payment feature	4 years ago
Fatimah Alshammari	ac32ba998c	fixed order isuee	4 years ago
Zohaib Iqbal Kambrani	516df96e21	no message	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	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	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
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
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
mosazaid	6ac8d67b83	finish address add/edit/delete/select	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	4e5d6a9a00	finish pharmacy home page , cart page, orders and payment page, recently viewed , and lakum module almost finished	4 years ago
Fatimah Alshammari	d328c74fc4	fix order and orderdetails	4 years ago
mosazaid	9a169ff77b	finish home page and start working on order preview page	4 years ago
hussam al-habibeh	e92cb2e1ac	Design and return Pharmacy List	4 years ago
hussam al-habibeh	31d2816e64	design for search medicine and return medicine list	4 years ago

31 Commits (2669378da422bbfc4975f9d764a2231a88d31f2e)