Commit Graph

13 Commits (116a4af845c856a1bf45e00fa665f1deae18240b)

Author SHA1 Message Date
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
Mohammad Aljammal 0098345d05 add Prescription Delivery Address Page amd fix the Authentication Pharmacy 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
Fatimah Alshammari 5fa5e9b7c8 fixed orders and profile 4 years ago
Fatimah Alshammari fda101840a fixed order isuues 4 years ago
Fatimah Alshammari 4a84483698 fixed order details 4 years ago
Mohammad Aljammal 77dcb918c3 Revert "Merge branch 'pharmacy-hussam' into 'master'"
This reverts merge request !149
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