haroon amjad
|
61a406085b
|
lakum fixes
|
4 years ago |
haroon amjad
|
79d99dd48a
|
Pharmacy security updates applied
|
4 years ago |
haroon amjad
|
f533dd5356
|
Merge branch 'nov_fixes' into 'development_new_design_2.0'
fix cart order page
See merge request Cloud_Solution/diplomatic-quarter!515
|
4 years ago |
Elham Rababh
|
6ff829ab91
|
fix cart order page
|
4 years ago |
haroon amjad
|
d630c6c45f
|
Pharmacy fixes
|
4 years ago |
Haroon Amjad
|
464ad9a3cb
|
Shopping cart fix
|
4 years ago |
haroon amjad
|
67b6fd4ab6
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
haroon amjad
|
7a8ed5b014
|
Total amount calculation fixes
|
4 years ago |
hussam al-habibeh
|
1a382bfc80
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hussam_pharmacy_fix
Conflicts:
lib/config/config.dart
lib/pages/parent_categorise_page.dart
lib/pages/pharmacies/screens/cart-page/cart-order-page.dart
lib/pages/pharmacies/screens/product-details/product-detail.dart
lib/pages/sub_categorise_page.dart
|
4 years ago |
Fatimah Alshammari
|
f5de786745
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design
|
4 years ago |
haroon amjad
|
3ec2f990b1
|
product detail page updates
|
4 years ago |
Fatimah Alshammari
|
c4e185ea60
|
fixed issues
|
4 years ago |
hussam al-habibeh
|
b2b786d157
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hussam_pharmacy_fix
|
4 years ago |
haroon amjad
|
6ffa07392c
|
Product detail page updates
|
4 years ago |
hussam al-habibeh
|
5927f3e35f
|
pharmacy home page update
|
4 years ago |
Fatimah Alshammari
|
ca11fe3134
|
fix issues
|
4 years ago |
Fatimah Alshammari
|
23acdfd494
|
fix loader issue and design
|
4 years ago |
Fatimah Alshammari
|
6f63250252
|
fix issues
|
4 years ago |
haroon amjad
|
be771917f0
|
pharmacy 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
|
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 |
mosazaid
|
4939fe63d1
|
pharmacy cart fixe counter
|
4 years ago |
Fatimah Alshammari
|
42e74759e4
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design
# Conflicts:
# lib/pages/search_products_page.dart
|
4 years ago |
haroon amjad
|
b08dfb117c
|
Updates & fixes
|
4 years ago |
Elham Rababh
|
2c30b5a494
|
fix issues
|
4 years ago |
haroon amjad
|
ddf764897a
|
Pharmacy Payment method design fix, Blood Donation fix
|
4 years ago |
haroon amjad
|
eed4fd2509
|
Pharmacy prescriptions page design
|
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 |
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 |