Mohammad Aljammal
|
c0cf2f71a2
|
Merge branch 'bottom_nav_pharmacy' into 'development'
Bottom nav pharmacy
See merge request Cloud_Solution/diplomatic-quarter!478
|
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 |
haroon amjad
|
fa5fd8e323
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
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
|
62974b7b72
|
Updates & fixes
|
4 years ago |
haroon amjad
|
b08dfb117c
|
Updates & fixes
|
4 years ago |
Elham Rababh
|
2c30b5a494
|
fix issues
|
4 years ago |
haroon amjad
|
df7d8a8603
|
Blood donation fixes
|
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 |
haroon amjad
|
6f92a093ab
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/config/config.dart
|
4 years ago |
Zohaib Iqbal Kambrani
|
8b1ac05012
|
Merge branch 'development_new_design_2.0' into zik_new_design_2.0
* development_new_design_2.0: (105 commits)
app bar back icon issue
improvements
emergency nearest ui changes
Zoom Avatar implementation
no message
Child Vaccine 3
register
register page
Working on Health data
Child Vaccine 2
registration
Ereferral fixed, HHC moved to new APIs, Notification new design implemented
registration done
Child Vaccine 1.0
In App Review
In App Review
oder log merge fix
design fixes 3
Chart fix & In-App update implemented
design fixes 1.1
...
# Conflicts:
# lib/config/config.dart
# lib/pages/landing/fragments/home_page_fragment2.dart
|
4 years ago |
haroon amjad
|
1fff2dad25
|
Smartwatch updates
|
4 years ago |
Zohaib Iqbal Kambrani
|
aad071ac67
|
Packages and Offers apply token
|
4 years ago |
haroon amjad
|
3db4094585
|
Ereferral fixed, HHC moved to new APIs, Notification new design implemented
|
4 years ago |
haroon amjad
|
494b1f221d
|
Updates & fixes
|
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 |
haroon amjad
|
5f963b0327
|
Translation updates, CMC, HHC & RRT APIs updates
|
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 |
Sikander Saleem
|
ae85f75e81
|
Merge branch 'new_design_sikander' into development_new_design_2.0
# Conflicts:
# lib/config/localized_values.dart
# lib/pages/feedback/status_feedback_page.dart
# lib/uitl/translations_delegate_base.dart
|
4 years ago |
Sikander Saleem
|
a026fbf940
|
feedback status added.
|
4 years ago |
haroon amjad
|
07a98d75c6
|
My tracker fixes
|
4 years ago |
Sultan Khan
|
160049973e
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design
|
4 years ago |
Sultan Khan
|
e3a7c08e7c
|
blood type changes
|
4 years ago |
Sikander Saleem
|
ad98dfce67
|
Merge branch 'new_design_sikander' into development_new_design_2.0
# Conflicts:
# lib/pages/AlHabibMedicalService/h2o/h2o_page.dart
|
4 years ago |
Sikander Saleem
|
1223ab7a17
|
h20 week & month graph updated & improvements.
|
4 years ago |
Elham Rababh
|
2526d6bc6f
|
fix issue in cart page
|
4 years ago |
haroon amjad
|
e62e3dae1b
|
CMC APIs coverting to RC
|
4 years ago |
haroon amjad
|
0a9d0e5eaa
|
fixes
|
4 years ago |
haroon amjad
|
3f3ddd7af0
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/pages/MyAppointments/SchedulePage.dart
|
4 years ago |
Sikander Saleem
|
f509679173
|
Merge branch 'new_design_sikander' into development_new_design_2.0
|
4 years ago |
Sikander Saleem
|
1346eab593
|
h2o today page, prescription & schedule appointment improvements.
|
4 years ago |
haroon amjad
|
022b1bd000
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
haroon amjad
|
cb220031dd
|
Updates & fixes
|
4 years ago |
Mirza.Shafique
|
d48a4ff4e3
|
Back Button on Landing Page
|
4 years ago |
haroon amjad
|
259581c4f8
|
updates & fixes
|
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 |
haroon amjad
|
829fcd1461
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/pages/ErService/rapid-response-team/rrt-order-list-item.dart
|
4 years ago |
haroon amjad
|
2c4ff16f0c
|
updates & fixes
|
4 years ago |
Sultan Khan
|
2c1d7c511e
|
family file changes
|
4 years ago |
haroon amjad
|
01ca8b8f84
|
updates & fixes
|
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 |
haroon amjad
|
2690bddcac
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/pages/MyAppointments/AppointmentDetails.dart
# lib/uitl/translations_delegate_base.dart
|
4 years ago |
haroon amjad
|
5163c826ad
|
Updates & fixes
|
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 |
Sikander Saleem
|
5410b826c3
|
prescriptions new ui updated.
|
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 |
haroon amjad
|
22c6a8ce42
|
no message
|
4 years ago |
Mohammad Aljammal
|
9e31d497ed
|
fix wish list issue
|
4 years ago |
Sikander Saleem
|
28c0450544
|
lab result filterName improvement.
|
4 years ago |
haroon amjad
|
f6d779431a
|
fixes
|
4 years ago |
haroon amjad
|
46cc73bdd7
|
CMC changes
|
4 years ago |
mosazaid
|
185d66e342
|
fix bugs pharmacy home
|
4 years ago |
Sikander Saleem
|
3403e07aba
|
recall prescription order log when refill or cancel order.
|
4 years ago |
mosazaid
|
f47d59c43f
|
fix bugs pharmacy home
|
4 years ago |
Haroon Amjad
|
062ca5c11c
|
EReferral fixes
|
4 years ago |
haroon amjad
|
dfeb249a54
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
haroon amjad
|
a4a2389a78
|
updates & fixes
|
4 years ago |
mosazaid
|
fdb61c78c5
|
fix bugs pharmacy home
|
4 years ago |
Sultan Khan
|
fc9f2fc34e
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design
|
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
|
f329eea798
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_fix_bugs
|
4 years ago |
mosazaid
|
01a77d5352
|
fix bugs pharmacy
|
4 years ago |
hussam al-habibeh
|
dbf7ebf287
|
fix most viewed & best sellers moduls
|
4 years ago |
haroon amjad
|
46d800c0c6
|
UI updates & fixes
|
4 years ago |
haroon amjad
|
af7b27258c
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
Sultan Khan
|
d535cb421d
|
bug fixes
|
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
|
298a8f4cff
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/config/config.dart
# lib/core/service/AlHabibMedicalService/customer_addresses_service.dart
# lib/pages/DrawerPages/family/my-family.dart
|
4 years ago |
Sultan Khan
|
dd58b8637b
|
bug fixs
|
4 years ago |
Fatimah Alshammari
|
7ebeb8cb4b
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
# Conflicts:
# lib/pages/parent_categorise_page.dart
# lib/pages/sub_categorise_page.dart
|
4 years ago |
Mohammad Aljammal
|
473f372a85
|
Merge branch 'blood_pressure' into 'development'
fix pharmacy products filtering
See merge request Cloud_Solution/diplomatic-quarter!388
|
4 years ago |
hussam al-habibeh
|
cb9d8cb9d9
|
fix pharmacy products filtering
|
4 years ago |
haroon amjad
|
7467da7409
|
Imports organized
|
4 years ago |
Fatimah Alshammari
|
8c0dca781c
|
fixed compare issues and arabic version
|
4 years ago |
Sultan Khan
|
32f62fbe56
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0
|
4 years ago |
haroon amjad
|
948f4fc6b8
|
CMC Add address fixes
|
4 years ago |
Sultan Khan
|
4d00664045
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0
|
4 years ago |
Sultan Khan
|
c6404a2a0b
|
tracker services
|
4 years ago |
Mirza.Shafique
|
e890c80831
|
CMC 1.3
|
4 years ago |
haroon amjad
|
25fb5decc0
|
Ask Doctor page fixes
|
4 years ago |
haroon amjad
|
d4a4165ef3
|
Minor fixes in Eye Measurements
|
4 years ago |
haroon amjad
|
9ffe064a3b
|
updates & fixes
|
4 years ago |
Fatimah Alshammari
|
62167baec5
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
|
4 years ago |
Fatimah Alshammari
|
6d72be2a73
|
fixed cart order issues
|
4 years ago |
Sikander Saleem
|
ef5f737084
|
Merge branch 'development' into development_new_design_2.0
|
4 years ago |
haroon amjad
|
e679c7df0d
|
updates & fixes
|
4 years ago |
Sikander Saleem
|
a61fea551c
|
Merge branch 'development' into development_new_design_2.0
# Conflicts:
# lib/config/localized_values.dart
# lib/pages/ErService/AmbulanceRequestIndexPages/Summary.dart
# lib/uitl/translations_delegate_base.dart
|
4 years ago |
haroon amjad
|
8cb9a5e619
|
updates
|
4 years ago |
haroon amjad
|
faff3b90cb
|
Merge branch 'development' into Haroon
# Conflicts:
# lib/core/service/er/am_service.dart
|
4 years ago |
haroon amjad
|
e9ec2e2faf
|
Ambulance request APIs revamped
|
4 years ago |
Sultan Khan
|
abcd207554
|
schedule page fix
|
4 years ago |
Sikander Saleem
|
1a0e1f47a6
|
Merge branch 'development' into development_new_design_2.0
# Conflicts:
# lib/config/localized_values.dart
# lib/pages/BookAppointment/components/DocAvailableAppointments.dart
# lib/pages/MyAppointments/AppointmentDetails.dart
# lib/uitl/translations_delegate_base.dart
|
4 years ago |
Sultan Khan
|
1726f8cc11
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
4 years ago |
haroon amjad
|
4c2b70fcb5
|
Merge branch 'development' into Haroon
|
4 years ago |
haroon amjad
|
21c3686e05
|
Ambulance request services revamping
|
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
|
72ba0c7c74
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
|
4 years ago |
Fatimah Alshammari
|
f3b545ff74
|
fixed products issues
|
4 years ago |
Sultan Khan
|
5fe6a6c3dd
|
doctor schedule
|
4 years ago |
Sikander Saleem
|
bb18645d85
|
Merge branch 'development' into development_new_design_2.0
# Conflicts:
# lib/config/localized_values.dart
# lib/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart
# lib/pages/MyAppointments/AppointmentDetails.dart
# lib/pages/landing/landing_page.dart
# lib/pages/medical/medical_profile_page.dart
# lib/uitl/translations_delegate_base.dart
|
4 years ago |
Sultan Khan
|
9e31a3c560
|
bug fixes
|
4 years ago |
Sultan Khan
|
57d87dfc03
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
4 years ago |
Sultan Khan
|
11ffed2ae3
|
bug fixes
|
4 years ago |
Sikander Saleem
|
458dc2474b
|
Merge branch 'development' into development_new_design_2.0
# Conflicts:
# lib/uitl/translations_delegate_base.dart
|
4 years ago |
Sikander Saleem
|
197e7d5742
|
Merge branch 'development' into development_new_design_2.0
# Conflicts:
# lib/config/localized_values.dart
# lib/pages/medical/patient_sick_leave_page.dart
# lib/uitl/translations_delegate_base.dart
# lib/uitl/utils.dart
|
4 years ago |
Fatimah Alshammari
|
787b55a803
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
# Conflicts:
# lib/pages/medical/my_trackers/blood_pressure/AddBloodPressurePage.dart
# lib/uitl/translations_delegate_base.dart
|
4 years ago |
Mohammad Aljammal
|
d9fabbab17
|
Fix feedback
|
4 years ago |
Fatimah Alshammari
|
74d0826342
|
fixed issues
|
4 years ago |
hussam al-habibeh
|
0a3c44b5e8
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into medication_availability
Conflicts:
lib/config/localized_values.dart
lib/uitl/translations_delegate_base.dart
|
4 years ago |
Sikander Saleem
|
4db432b351
|
lab results working(cont.) & improvements
|
5 years ago |
Zohaib Iqbal Kambrani
|
429fcb1e60
|
Merge branch 'development' into ZohaibIqbalKambrani
* development: (32 commits)
changes
package name changed
Jira Fixes
Jira fixes
PAP-664
PAP-664
PAP-664
langauge issue
bug fix
PAP-777
PAP-729
fix button
fix translate issues
CONFIG
PAP-715 : Y –axis and X –axis values should be display in the yearly graph details.
bug fixes
fix bugs
fixing dashboard issue
fixing dashboard issue
jira bugs
...
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/core/service/client/base_app_client.dart
# lib/uitl/translations_delegate_base.dart
# lib/uitl/utils.dart
|
5 years ago |
hussam al-habibeh
|
d3868844de
|
Medication availability
|
5 years ago |
Zohaib Iqbal Kambrani
|
bf303a7be0
|
RRT Implementation
|
5 years ago |
Zohaib Iqbal Kambrani
|
e4256d6874
|
RRT in progress (Service implementations)
|
5 years ago |
Sultan Khan
|
d88e3faa6b
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
5 years ago |
Zohaib Iqbal Kambrani
|
4da163d186
|
RRT in progress in stage
|
5 years ago |
Sultan Khan
|
23ca95b9b6
|
bug fixes
|
5 years ago |
Zohaib Iqbal Kambrani
|
4abdd9bde7
|
no message
|
5 years ago |
Elham Rababh
|
86414b46fd
|
PAP-304 : show CBC details
|
5 years ago |
Sultan Khan
|
14ef096c32
|
changes and fixes
|
5 years ago |
Sultan khan
|
15f620d720
|
Merge branch 'Jul_fixes' into 'development'
Jul fixes
See merge request Cloud_Solution/diplomatic-quarter!322
|
5 years ago |
hussam al-habibeh
|
fefde8f575
|
jira bugs
|
5 years ago |
Sultan khan
|
924f9bedc0
|
Merge branch 'bug_fixing' into 'development'
Bug fixing
See merge request Cloud_Solution/diplomatic-quarter!319
|
5 years ago |
Sultan khan
|
10f8ee5e81
|
Merge branch 'bug_fix_mirza' into 'development'
Bug Fix: 873, 878 to 881
See merge request Cloud_Solution/diplomatic-quarter!320
|
5 years ago |
Mirza.Shafique
|
58d5734f1a
|
Bug Fix: 873, 878 to 881
|
5 years ago |
Sikander Saleem
|
38f134b6ff
|
Bug PAP-884 fixed, email was not updating.
|
5 years ago |
hussam al-habibeh
|
446021eb90
|
adding doctor list to health calculator
|
5 years ago |
hussam al-habibeh
|
854352d9ce
|
jira bugs
|
5 years ago |
Sikander Saleem
|
b2e9060c3f
|
Bug PAP-877 fixed, blood tracker exception.
|
5 years ago |
Elham Rababh
|
2e1c9780d7
|
PAP-610: prevent show send email button if user have no vaccine
|
5 years ago |