Commit Graph

79 Commits (2def9f37447592d0be9431ef47c3461a52b870c9)

Author SHA1 Message Date
Aamir Muhammad b4bc99369f Changes into Rating Bar 2 years ago
Sultan khan c96c151f44 null safety issue fixed. 2 years ago
Sultan khan 04244675e1 code updated. 2 years ago
Sultan khan b45cbbcf29 updates 2 years ago
Fatimah Alshammari a55ca33c1b Merge branch 'development_new_design_2.0' into Fatima-New-Design
# Conflicts:
#	lib/pages/search_products_page.dart
#	lib/widgets/pharmacy/product_tile.dart
4 years ago
Fatimah Alshammari bc9fc5a878 fix issue 4 years ago
haroon amjad 75423e5501 Updates 4 years ago
Fatimah Alshammari 127096ec04 fixed wishlist design 4 years ago
Fatimah Alshammari 21c315c1a3 fix wishlist issue 4 years ago
haroon amjad a646677fae Pharmacy & smart watch data fixes 4 years ago
Elham Rababh 05e4e7be45 fix bottom bar in cart page 4 years ago
Fatimah Alshammari c4e185ea60 fixed issues 4 years ago
Fatimah Alshammari 23acdfd494 fix loader issue and design 4 years ago
haroon amjad 5943522163 UI fixes 4 years ago
haroon amjad 8d6278a59b Pharmacy fixes 4 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
4 years ago
Mohammad Aljammal c0cf2f71a2 Merge branch 'bottom_nav_pharmacy' into 'development'
Bottom nav pharmacy

See merge request Cloud_Solution/diplomatic-quarter!478
4 years ago
hussam al-habibeh 46d7e7ee14 show bottom nav in pharmacy all pages 4 years ago
haroon amjad f029aaa1c6 Fixes & code optimizations 4 years ago
Mohammad Aljammal d4283c0116 fix merge issue 4 years ago
Mohammad Aljammal 4cb63e353b Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_fix_bugs
 Conflicts:
	lib/pages/pharmacies/screens/product-details/product-detail.dart
4 years ago
hussam al-habibeh bc91b9ad88 bottom nav pharmacy 4 years ago
mosazaid 4939fe63d1 pharmacy cart fixe counter 4 years ago
Elham Rababh 2c30b5a494 fix issues 4 years ago
haroon amjad 3dc82a0547 Pharmacy updates 4 years ago
haroon amjad 41822d2cf1 Merge branch 'development' into haroon-new-design 4 years ago
Fatimah Alshammari e494c9304d fixed issues 4 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
4 years ago
hussam al-habibeh a8fb7152b1 add to cart fix 4 years ago
hussam al-habibeh 75ef3fde80 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_fix
 Conflicts:
	lib/widgets/pharmacy/bottom_nav_pharmacy_item.dart
4 years ago
hussam al-habibeh 66acda38a3 add to cart fix 4 years ago
Elham Rababh 75fdadafbd refactor widget in the cart preview 4 years ago
mosazaid b779c250a4 pharmacy cart and wishlist fixes 4 years ago
Mohammad Aljammal eb19daa98f fix car count 4 years ago
hussam al-habibeh f3000d0ee3 My account design fix 4 years ago
hussam al-habibeh d4fd95606e add pharmacy icons for bottom nav 4 years ago
Mohammad Aljammal 43e7bb9ff3 fix bottom navigation bar 4 years ago
hussam al-habibeh 7427cd68ff fix bottom nav bar ui 4 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
4 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
4 years ago
haroon amjad 7467da7409 Imports organized 4 years ago
Mirza.Shafique 96b971ef01 CMC 1.6 4 years ago
Fatimah Alshammari 6d72be2a73 fixed cart order issues 4 years ago
Fatimah Alshammari 239ad530ce fixed isuues 4 years ago
Fatimah Alshammari 2481e4c9ea fixed categories issues and home page button 5 years ago
Sultan Khan a6196d3c30 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan Khan b891c1bd80 theme issue 5 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
5 years ago
haroon amjad da3ad90ddd added app-wide route transition animation 5 years ago
mosazaid f3cdd08857 adding fharmacy payment feature 5 years ago