Commit Graph

244 Commits (4823919fcb701a4adc3894db34bc5eec32b700c3)

Author SHA1 Message Date
haroon amjad d630c6c45f Pharmacy fixes 3 years ago
Fatimah Alshammari f5de786745 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design 3 years ago
haroon amjad 3ec2f990b1 product detail page updates 3 years ago
Fatimah Alshammari c4e185ea60 fixed issues 3 years ago
haroon amjad 11d37d26e5 Product Detail page fix 3 years ago
haroon amjad 14b85cc407 Family files API changes 3 years ago
haroon amjad 6ffa07392c Product detail page updates 3 years ago
haroon amjad 925e3cb686 Merge branch 'development' into haroon-new-design
# Conflicts:
#	lib/core/viewModels/pharmacyModule/product_detail_view_model.dart
#	lib/main.dart
#	lib/pages/final_products_page.dart
#	lib/pages/landing/landing_page_pharmcy.dart
#	lib/pages/login/login.dart
#	lib/pages/pharmacies/screens/pharmacy_module_page.dart
#	lib/pages/pharmacies/screens/product-details/product-detail.dart
#	lib/pages/pharmacies/screens/product-details/shared/product_details_app_bar.dart
#	lib/pages/pharmacy/profile/profile.dart
#	lib/services/pharmacy_services/product_detail_service.dart
#	lib/widgets/others/app_scaffold_widget.dart
#	lib/widgets/pharmacy/bottom_nav_pharmacy_bar.dart
3 years ago
haroon amjad 0853ecdc27 Body added 3 years ago
mosazaid 4939fe63d1 pharmacy cart fixe counter 3 years ago
haroon amjad 57ea450662 LiveCare Schedule fixes 3 years ago
haroon amjad 853ca033d2 LiveCare Schedule API fix 3 years ago
Sultan Khan a59c60f79a Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 3 years ago
Sultan Khan 496c6ce32e registration done 3 years ago
Sikander Saleem 706832a1cb Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/core/service/client/base_app_client.dart
#	lib/core/service/parmacyModule/parmacy_module_service.dart
#	lib/core/service/parmacyModule/prescription_service.dart
#	lib/core/viewModels/pharmacyModule/pharmacy_module_view_model.dart
#	lib/core/viewModels/pharmacyModule/product_detail_view_model.dart
#	lib/locator.dart
#	lib/main.dart
#	lib/pages/final_products_page.dart
#	lib/pages/landing/home_page.dart
#	lib/pages/parent_categorise_page.dart
#	lib/pages/pharmacies/product_detail.dart
#	lib/pages/pharmacies/screens/cart-order-preview.dart
#	lib/pages/pharmacies/screens/pharmacy_module_page.dart
#	lib/pages/pharmacies/widgets/ProductTileItem.dart
#	lib/pages/search_products_page.dart
#	lib/services/pharmacy_services/product_detail_service.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/widgets/buttons/secondary_button.dart
#	lib/widgets/others/app_scaffold_widget.dart
#	lib/widgets/others/app_scafold_detail_page.dart
#	lib/widgets/pharmacy/bottom_nav_pharmacy_bar.dart
3 years ago
Sultan Khan e3a7c08e7c blood type changes 3 years ago
mosazaid 9a1dc3c678 pharmacy cart and wishlist fixes 3 years ago
Haroon Amjad 1fa6a4409b Family files fixes 3 years ago
haroon amjad 01ccd484f4 Calendar plugin changed 3 years ago
haroon amjad 7264d03818 Family Files previleges fix 3 years ago
Mohammad Aljammal 29d0afdea4 Merge branch 'product_detail_page' into 'development'
fix bottom sheet functions

See merge request Cloud_Solution/diplomatic-quarter!424
3 years ago
Elham Rababh be21cb352b return recommended products 3 years ago
haroon amjad 01ca8b8f84 updates & fixes 3 years ago
Fatimah Alshammari 8baad999c5 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
# Conflicts:
#	lib/config/config.dart
#	lib/pages/parent_categorise_page.dart
#	lib/pages/pharmacies/screens/pharmacy_module_page.dart
#	lib/pages/pharmacies/wishlist.dart
3 years ago
Fatimah Alshammari 4309952b17 fixed subCategories 3 years ago
Elham Rababh b0b278a7e3 fix bugs 3 years ago
Sultan Khan 76e16594ba FAMILY FILES 3 years ago
mosazaid 594b2710b3 fix bugs pharmacy home 3 years ago
Sultan Khan fc9f2fc34e Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 3 years ago
Sultan Khan 08933632d3 tracker services done rrt in progress 3 years ago
Mohammad Aljammal 43e7bb9ff3 fix bottom navigation bar 3 years ago
haroon amjad 184942e891 Covid Payment fixes 3 years ago
haroon amjad ab8030416c Updates & fixes 3 years ago
haroon amjad 46d800c0c6 UI updates & fixes 3 years ago
haroon amjad b0f4cfcff3 Family file fixes 3 years ago
haroon amjad 4ac0845003 updates & fixes 3 years ago
haroon amjad bf4709fef6 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/medical/prescriptions/prescription_details_page.dart
3 years ago
Sultan Khan 2ebfdcfdd7 login issue fixed 3 years ago
haroon amjad 05354f72cc pharmacy import fixes 3 years ago
haroon amjad b51989e798 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/pharmacies/compare.dart
#	lib/pages/pharmacies/my_reviews.dart
#	lib/pages/pharmacies/wishlist.dart
3 years ago
Sikander Saleem f0bb94c422 Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
3 years ago
haroon amjad 7467da7409 Imports organized 3 years ago
Fatimah Alshammari 8c0dca781c fixed compare issues and arabic version 3 years ago
haroon amjad 2d7c7239c5 Health Converters fixes 3 years ago
haroon amjad f795ba24c5 updates & fixes 3 years ago
haroon amjad 3bb0a8b85b Apple Pay finalized, Translation issues fixed, other updates 3 years ago
haroon amjad 8e7786cb96 updates & fixes 3 years ago
Sikander Saleem bdb7f29d4c Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/core/service/parmacyModule/prescription_service.dart
#	lib/pages/BookAppointment/DentalComplaints.dart
#	lib/pages/login/login.dart
3 years ago
Mohammad Aljammal 8abbb04f02 Merge branch 'fatima-new' into 'development'
Fatima new

See merge request Cloud_Solution/diplomatic-quarter!373
3 years ago
haroon amjad e9c26ee85f Dental procedures implemented 3 years ago