haroon amjad
|
efced34ffa
|
Updates
|
4 years ago |
haroon amjad
|
0acc134e6e
|
Updates & fixes
|
4 years ago |
haroon amjad
|
e45c2c5652
|
covid & pharmacy updates
|
4 years ago |
haroon amjad
|
693f8cb090
|
Updates & fixes
|
4 years ago |
haroon amjad
|
40d649dfa4
|
Updates & fixes
|
4 years ago |
Fatimah Alshammari
|
e5f0f5777b
|
Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima_v2
# Conflicts:
# lib/services/pharmacy_services/product_detail_service.dart
|
4 years ago |
haroon amjad
|
6d88607631
|
Updates & fixes
|
4 years ago |
Fatimah Alshammari
|
57d10d9e1f
|
fix compare issue
|
4 years ago |
haroon amjad
|
c05772c63a
|
pharmacy fixes
|
4 years ago |
haroon amjad
|
b15bd2362b
|
Updates & fixes
|
4 years ago |
haroon amjad
|
3107d1e86d
|
Updates & fixes
|
4 years ago |
haroon amjad
|
7733c74f00
|
Updates & fixes
|
4 years ago |
haroon amjad
|
330f2d6c86
|
Fixes & updates
|
4 years ago |
Elham Rababh
|
34596163d1
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into nov_fixes
|
4 years ago |
Elham Rababh
|
12e47aba82
|
fix as first step
|
4 years ago |
haroon amjad
|
333b41632c
|
fixes
|
4 years ago |
Fatimah Alshammari
|
5dc1561992
|
fixed notify issue
|
4 years ago |
haroon amjad
|
47b7b0db58
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/pages/pharmacy/order/Order.dart
|
4 years ago |
Sikander Saleem
|
5a8c887117
|
Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0
|
4 years ago |
haroon amjad
|
777d88be30
|
updates
|
4 years ago |
Sikander Saleem
|
014074c414
|
Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0
# Conflicts:
# lib/pages/Blood/blood_donation.dart
# lib/pages/BookAppointment/components/SearchByClinic.dart
|
4 years ago |
haroon amjad
|
79d99dd48a
|
Pharmacy security updates applied
|
4 years ago |
haroon amjad
|
d630c6c45f
|
Pharmacy fixes
|
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 |
haroon amjad
|
11d37d26e5
|
Product Detail page fix
|
4 years ago |
haroon amjad
|
14b85cc407
|
Family files API changes
|
4 years ago |
haroon amjad
|
6ffa07392c
|
Product detail page updates
|
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 |
Sikander Saleem
|
d6a5f68312
|
Merge branch 'new_design_sikander' into development_new_design_2.0
# Conflicts:
# lib/pages/Blood/blood_donation.dart
# lib/pages/BookAppointment/components/SearchByClinic.dart
|
4 years ago |
Sikander Saleem
|
cd81f05a8d
|
laser clinic design (cont.)
|
4 years ago |
haroon amjad
|
0853ecdc27
|
Body added
|
4 years ago |
mosazaid
|
4939fe63d1
|
pharmacy cart fixe counter
|
4 years ago |
haroon amjad
|
57ea450662
|
LiveCare Schedule fixes
|
4 years ago |
haroon amjad
|
853ca033d2
|
LiveCare Schedule API fix
|
4 years ago |
Sultan Khan
|
a59c60f79a
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design
|
4 years ago |
Sultan Khan
|
496c6ce32e
|
registration done
|
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 |
Sultan Khan
|
e3a7c08e7c
|
blood type changes
|
4 years ago |
mosazaid
|
9a1dc3c678
|
pharmacy cart and wishlist fixes
|
4 years ago |
Haroon Amjad
|
1fa6a4409b
|
Family files fixes
|
4 years ago |
haroon amjad
|
01ccd484f4
|
Calendar plugin changed
|
4 years ago |
haroon amjad
|
7264d03818
|
Family Files previleges fix
|
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
|
be21cb352b
|
return recommended products
|
4 years ago |
haroon amjad
|
01ca8b8f84
|
updates & fixes
|
4 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
|
4 years ago |
Fatimah Alshammari
|
4309952b17
|
fixed subCategories
|
4 years ago |
Elham Rababh
|
b0b278a7e3
|
fix bugs
|
4 years ago |