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 |
Fatimah Alshammari
|
9cf0794cf6
|
Fixed out of stuck items issues
|
4 years ago |
Fatimah Alshammari
|
e2763a5bd5
|
fixed cart shopping issues
|
4 years ago |
Elham Rababh
|
2526d6bc6f
|
fix issue in cart page
|
4 years ago |
Mohammad Aljammal
|
29d0afdea4
|
Merge branch 'product_detail_page' into 'development'
fix bottom sheet functions
See merge request Cloud_Solution/diplomatic-quarter!424
|
4 years ago |
Elham Rababh
|
8fac62bcb1
|
fix bottom sheet functions
|
4 years ago |
mosazaid
|
c1f3d3cc1c
|
fixes
|
4 years ago |
Mohammad Aljammal
|
0150bc4684
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_product_tile
Conflicts:
lib/pages/pharmacies/ProductCheckTypeWidget.dart
lib/pages/pharmacies/screens/cart-order-page.dart
lib/pages/pharmacies/screens/pharmacy_module_page.dart
|
4 years ago |
Mohammad Aljammal
|
eb19daa98f
|
fix car count
|
4 years ago |
Elham Rababh
|
b0b278a7e3
|
fix bugs
|
4 years ago |
mosazaid
|
4d37bc2958
|
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
lib/pages/pharmacies/screens/product-details/recommended_products.dart
lib/pages/pharmacies/screens/product-details/shared/product_details_app_bar.dart
lib/widgets/others/app_scafold_detail_page.dart
|
4 years ago |
mosazaid
|
a41980b252
|
fix bugs pharmacy wishlist
|
4 years ago |
Elham Rababh
|
7dfc700d26
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into product_detail_page
|
4 years ago |
Elham Rababh
|
47e19c4ab5
|
add loader and cache on images
|
4 years ago |
Mohammad Aljammal
|
b175fb7ce0
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_product_tile
|
4 years ago |
mosazaid
|
6acb8031d0
|
fix bugs pharmacy home
|
4 years ago |
mosazaid
|
594b2710b3
|
fix bugs pharmacy home
|
4 years ago |
Mohammad Aljammal
|
9e31d497ed
|
fix wish list issue
|
4 years ago |
mosazaid
|
185d66e342
|
fix bugs pharmacy home
|
4 years ago |
mosazaid
|
f47d59c43f
|
fix bugs pharmacy home
|
4 years ago |
mosazaid
|
fdb61c78c5
|
fix bugs pharmacy home
|
4 years ago |
Sultan Khan
|
08933632d3
|
tracker services done rrt in progress
|
4 years ago |
mosazaid
|
a398ede172
|
fix bugs pharmacy home
|
4 years ago |
mosazaid
|
01a77d5352
|
fix bugs pharmacy
|
4 years ago |
haroon amjad
|
05354f72cc
|
pharmacy import fixes
|
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 |
Fatimah Alshammari
|
8c0dca781c
|
fixed compare issues and arabic version
|
4 years ago |
haroon amjad
|
948f4fc6b8
|
CMC Add address fixes
|
4 years ago |
Fatimah Alshammari
|
6d72be2a73
|
fixed cart order issues
|
4 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
|
4 years ago |
Mohammad Aljammal
|
36142f0f6d
|
Merge branch 'fix_bug_pharmacy' into 'development'
fix bugs pharmacy
See merge request Cloud_Solution/diplomatic-quarter!375
|
4 years ago |
mosazaid
|
a2e60e7584
|
fix bugs pharmacy
|
4 years ago |
Sikander Saleem
|
ca363adee2
|
merge & improvements
|
4 years ago |
Fatimah Alshammari
|
f3b545ff74
|
fixed products issues
|
4 years ago |
Fatimah Alshammari
|
265d13b970
|
fixed an issue in recommended page
|
5 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
|
5 years ago |
haroon amjad
|
db0fcd51cc
|
pharmacy updates
|
5 years ago |
mosazaid
|
74dd274502
|
working on pharmacy some fixes on cart page and request body
|
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 |
Fatimah Alshammari
|
c629fcb85c
|
fixed recommended products new design
|
5 years ago |
mosazaid
|
f3cdd08857
|
adding fharmacy payment feature
|
5 years ago |
enadhilal
|
0cb493d56c
|
Merge branch 'development' into enad_pharmacy2
# Conflicts:
# lib/pages/pharmacies/product_detail.dart
|
5 years ago |
enadhilal
|
0c6fb67718
|
fixed issues
|
5 years ago |
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
|
5 years ago |
Fatimah Alshammari
|
ac32ba998c
|
fixed order isuee
|
5 years ago |
Zohaib Iqbal Kambrani
|
516df96e21
|
no message
|
5 years ago |
mosazaid
|
1a45f99606
|
some fixes on pharmacy
|
5 years ago |
Fatimah Alshammari
|
ef8312f2b8
|
Merge branch 'development' into pharmacy-Fatima
# Conflicts:
# lib/core/service/parmacyModule/parmacy_module_service.dart
# lib/core/service/parmacyModule/prescription_service.dart
# lib/pages/pharmacies/product_detail.dart
|
5 years ago |