haroon amjad
|
c2b0326676
|
Updates & fixes
|
5 years ago |
|
haroon amjad
|
75423e5501
|
Updates
|
5 years ago |
|
haroon amjad
|
a646677fae
|
Pharmacy & smart watch data fixes
|
5 years ago |
Elham Rababh
|
6ff829ab91
|
fix cart order page
|
5 years ago |
Haroon Amjad
|
464ad9a3cb
|
Shopping cart fix
|
5 years ago |
|
haroon amjad
|
7a8ed5b014
|
Total amount calculation fixes
|
5 years ago |
|
haroon amjad
|
be771917f0
|
pharmacy fixes
|
5 years ago |
|
haroon amjad
|
8d6278a59b
|
Pharmacy fixes
|
5 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
|
5 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
|
5 years ago |
mosazaid
|
4939fe63d1
|
pharmacy cart fixe counter
|
5 years ago |
|
haroon amjad
|
ddf764897a
|
Pharmacy Payment method design fix, Blood Donation fix
|
5 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
|
5 years ago |
Fatimah Alshammari
|
9cf0794cf6
|
Fixed out of stuck items issues
|
5 years ago |
|
Fatimah Alshammari
|
e2763a5bd5
|
fixed cart shopping issues
|
5 years ago |
|
Elham Rababh
|
2526d6bc6f
|
fix issue in cart page
|
5 years ago |
|
mosazaid
|
c1f3d3cc1c
|
fixes
|
5 years ago |
|
Mohammad Aljammal
|
eb19daa98f
|
fix car count
|
5 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
|
5 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
|
5 years ago |
|
haroon amjad
|
7467da7409
|
Imports organized
|
5 years ago |
|
Fatimah Alshammari
|
6d72be2a73
|
fixed cart order issues
|
5 years ago |
|
Sikander Saleem
|
ca363adee2
|
merge & improvements
|
5 years ago |
|
mosazaid
|
74dd274502
|
working on pharmacy some fixes on cart page and request body
|
5 years ago |
|
mosazaid
|
f3cdd08857
|
adding fharmacy payment feature
|
5 years ago |
|
Mohammad Aljammal
|
de1b7cc1d0
|
fix merge issues
|
6 years ago |
Mohammad Aljammal
|
77dcb918c3
|
Revert "Merge branch 'pharmacy-hussam' into 'master'"
This reverts merge request !149
|
6 years ago |
|
mosazaid
|
4e5d6a9a00
|
finish pharmacy home page , cart page, orders and payment page, recently viewed , and lakum module almost finished
|
6 years ago |
|
mosazaid
|
9a169ff77b
|
finish home page and start working on order preview page
|
6 years ago |